r24864 - in /desktop/experimental/gtk+2.0/debian: ./ patches/
slomo at users.alioth.debian.org
slomo at users.alioth.debian.org
Thu Jul 22 16:08:35 UTC 2010
Author: slomo
Date: Thu Jul 22 16:08:34 2010
New Revision: 24864
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=24864
Log:
* New upstream development release:
+ debian/control.in,
debian/rules,
debian/*:
- Remove all mentions of gdk-pixbuf and (build-) depend on it.
+ debian/libgtk2.0-0.postinst.in,
debian/libgtk2.0-0.postrm.in,
debian/libgtk2.0-0.triggers.in,
debian/dh_gtkmodules.in:
- Handle immodules by triggers and deprecate dh_gtkmodules.
+ debian/patches/*:
- Refreshed.
- Remove gdk-pixbuf and immodule patches.
Added:
desktop/experimental/gtk+2.0/debian/libgtk2.0-0.triggers.in
desktop/experimental/gtk+2.0/debian/patches/011_immodule-cache-dir.patch
Removed:
desktop/experimental/gtk+2.0/debian/libgtk2.0-doc.doc-base.gdk-pixbuf
desktop/experimental/gtk+2.0/debian/patches/010_gdkpixbuf_-lm.patch
desktop/experimental/gtk+2.0/debian/patches/020_immodules-files-d.patch
desktop/experimental/gtk+2.0/debian/patches/021_loader-files-d.patch
desktop/experimental/gtk+2.0/debian/patches/022_module-files-append-compat-module-files-d.patch
Modified:
desktop/experimental/gtk+2.0/debian/changelog
desktop/experimental/gtk+2.0/debian/control
desktop/experimental/gtk+2.0/debian/control.in
desktop/experimental/gtk+2.0/debian/dh_gtkmodules.in
desktop/experimental/gtk+2.0/debian/libgtk2.0-0-udeb.install.in
desktop/experimental/gtk+2.0/debian/libgtk2.0-0.install.in
desktop/experimental/gtk+2.0/debian/libgtk2.0-0.postinst.in
desktop/experimental/gtk+2.0/debian/libgtk2.0-0.postrm.in
desktop/experimental/gtk+2.0/debian/libgtk2.0-bin.links.in
desktop/experimental/gtk+2.0/debian/libgtk2.0-dev.install.in
desktop/experimental/gtk+2.0/debian/libgtk2.0-doc.links.in
desktop/experimental/gtk+2.0/debian/patches/001_static-linking-dont-query-immodules.patch
desktop/experimental/gtk+2.0/debian/patches/002_static-linking-dont-build-perf.patch
desktop/experimental/gtk+2.0/debian/patches/003_gdk.pc_privates.patch
desktop/experimental/gtk+2.0/debian/patches/004_gtk+-ximian-gtk2-filesel-navbutton-5.patch
desktop/experimental/gtk+2.0/debian/patches/005_support_disabling_x11_extensions.patch
desktop/experimental/gtk+2.0/debian/patches/009_gtk-export-filechooser.patch
desktop/experimental/gtk+2.0/debian/patches/015_default-fallback-icon-theme.patch
desktop/experimental/gtk+2.0/debian/patches/022_disable-viqr-im-for-vi-locale.patch
desktop/experimental/gtk+2.0/debian/patches/041_ia32-libs.patch
desktop/experimental/gtk+2.0/debian/patches/042_treeview_single-focus.patch
desktop/experimental/gtk+2.0/debian/patches/060_ignore-random-icons.patch
desktop/experimental/gtk+2.0/debian/patches/061_use_pdf_as_default_printing_standard.patch
desktop/experimental/gtk+2.0/debian/patches/070_mandatory-relibtoolize.patch
desktop/experimental/gtk+2.0/debian/patches/series
desktop/experimental/gtk+2.0/debian/rules
Modified: desktop/experimental/gtk+2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/changelog?rev=24864&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/changelog [utf-8] Thu Jul 22 16:08:34 2010
@@ -1,3 +1,21 @@
+gtk+2.0 (2.21.5-1) UNRELEASED; urgency=low
+
+ * New upstream development release:
+ + debian/control.in,
+ debian/rules,
+ debian/*:
+ - Remove all mentions of gdk-pixbuf and (build-) depend on it.
+ + debian/libgtk2.0-0.postinst.in,
+ debian/libgtk2.0-0.postrm.in,
+ debian/libgtk2.0-0.triggers.in,
+ debian/dh_gtkmodules.in:
+ - Handle immodules by triggers and deprecate dh_gtkmodules.
+ + debian/patches/*:
+ - Refreshed.
+ - Remove gdk-pixbuf and immodule patches.
+
+ -- Sebastian Dröge <slomo at debian.org> Thu, 22 Jul 2010 18:05:38 +0200
+
gtk+2.0 (2.21.2-1) experimental; urgency=low
* New upstream development release:
Modified: desktop/experimental/gtk+2.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/control?rev=24864&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/control [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/control [utf-8] Thu Jul 22 16:08:34 2010
@@ -8,6 +8,7 @@
pkg-config,
autotools-dev,
libglib2.0-dev (>= 2.25.8),
+ libgdk-pixbuf2.0-dev (>= 2.21.0),
libpango1.0-dev (>= 1.20),
libatk1.0-dev (>= 1.29.2),
libx11-dev (>= 2:1.3.3-2),
@@ -24,10 +25,6 @@
libxinerama-dev (>= 2:1.1-3),
libxfixes-dev (>= 1:3.0.0-3),
libcairo2-dev (>= 1.6.4-6.1),
- libtiff4-dev,
- libjpeg62-dev,
- libjasper-dev,
- libpng12-dev,
gnome-pkg-tools (>= 0.11),
chrpath,
dpkg-dev (>= 1.13.19),
@@ -122,6 +119,7 @@
${misc:Depends},
${shlibs:Depends},
libglib2.0-dev (>= 2.25.8),
+ libgdk-pixbuf2.0-dev (>= 2.21.0),
libpango1.0-dev (>= 1.20),
libatk1.0-dev (>= 1.29.2),
libcairo2-dev (>= 1.6.4-6.1),
Modified: desktop/experimental/gtk+2.0/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/control.in?rev=24864&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/control.in [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/control.in [utf-8] Thu Jul 22 16:08:34 2010
@@ -8,6 +8,7 @@
pkg-config,
autotools-dev,
libglib2.0-dev (>= 2.25.8),
+ libgdk-pixbuf2.0-dev (>= 2.21.0),
libpango1.0-dev (>= 1.20),
libatk1.0-dev (>= 1.29.2),
libx11-dev (>= 2:1.3.3-2),
@@ -24,10 +25,6 @@
libxinerama-dev (>= 2:1.1-3),
libxfixes-dev (>= 1:3.0.0-3),
libcairo2-dev (>= 1.6.4-6.1),
- libtiff4-dev,
- libjpeg62-dev,
- libjasper-dev,
- libpng12-dev,
gnome-pkg-tools (>= 0.11),
chrpath,
dpkg-dev (>= 1.13.19),
@@ -122,6 +119,7 @@
${misc:Depends},
${shlibs:Depends},
libglib2.0-dev (>= 2.25.8),
+ libgdk-pixbuf2.0-dev (>= 2.21.0),
libpango1.0-dev (>= 1.20),
libatk1.0-dev (>= 1.29.2),
libcairo2-dev (>= 1.6.4-6.1),
Modified: desktop/experimental/gtk+2.0/debian/dh_gtkmodules.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/dh_gtkmodules.in?rev=24864&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/dh_gtkmodules.in [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/dh_gtkmodules.in [utf-8] Thu Jul 22 16:08:34 2010
@@ -41,6 +41,9 @@
=cut
init();
+
+warning("This program is deprecated, everything is handled by triggers now.");
+exit 0
# 'abs_path' from Cwd resolves symlinks, and we don't want that to happen
# (otherwise it's harder to remove the prefix of the generated output)
Modified: desktop/experimental/gtk+2.0/debian/libgtk2.0-0-udeb.install.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/libgtk2.0-0-udeb.install.in?rev=24864&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/libgtk2.0-0-udeb.install.in [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/libgtk2.0-0-udeb.install.in [utf-8] Thu Jul 22 16:08:34 2010
@@ -1,3 +1,2 @@
# from the shared flavor
-debian/install/shared_udeb/@MODULES_BASE_PATH@/loaders/libpixbufloader-png.so @MODULES_BASE_PATH@/loaders
debian/install/shared_udeb/@LIBDIR@/libg?k*.so.* @LIBDIR@
Modified: desktop/experimental/gtk+2.0/debian/libgtk2.0-0.install.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/libgtk2.0-0.install.in?rev=24864&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/libgtk2.0-0.install.in [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/libgtk2.0-0.install.in [utf-8] Thu Jul 22 16:08:34 2010
@@ -3,10 +3,8 @@
debian/update-gtk-immodules @LIBDIR@/@SHARED_PKG@
# from the shared flavor
debian/install/shared/etc/gtk- at APIVER@/im-multipress.conf etc/gtk- at APIVER@
-debian/install/shared/usr/bin/gdk-pixbuf-query-loaders @LIBDIR@/@SHARED_PKG@
debian/install/shared/usr/bin/gtk-query-immodules-2.0 @LIBDIR@/@SHARED_PKG@
debian/install/shared/usr/bin/gtk-update-icon-cache @LIBDIR@/@SHARED_PKG@
-debian/install/shared/@MODULES_BASE_PATH@/loaders/*.so @MODULES_BASE_PATH@/loaders
debian/install/shared/@MODULES_BASE_PATH@/immodules/*.so @MODULES_BASE_PATH@/immodules
debian/install/shared/@MODULES_BASE_PATH@/printbackends/*.so @MODULES_BASE_PATH@/printbackends
debian/install/shared/@LIBDIR@/libgtk*.so.* @LIBDIR@
Modified: desktop/experimental/gtk+2.0/debian/libgtk2.0-0.postinst.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/libgtk2.0-0.postinst.in?rev=24864&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/libgtk2.0-0.postinst.in [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/libgtk2.0-0.postinst.in [utf-8] Thu Jul 22 16:08:34 2010
@@ -1,15 +1,26 @@
#!/bin/sh
-
set -e
-# versions prior to 2.10.1-1 used the 2.4.0 binary version and generated module
-# files below /etc/gtk-2.0 which will we can not leave behind (since they
-# reference modules not on the system anymore)
-if [ "$1" = "configure" ] && dpkg --compare-versions "$2" lt-nl "2.10.3-2"; then
- echo "Removing generated module files coming from the previous Gtk binary version..."
- rm -v -f /etc/gtk-2.0/gdk-pixbuf.loaders
- rm -v -f /etc/gtk-2.0/gtk.immodules
+if [ "$1" = triggered ]; then
+ for trigger in $2; do
+ if ! [ -d $trigger ]; then
+ continue
+ fi
+ case $trigger in
+ @MODULES_BASE_PATH@/immodules)
+ # This is triggered everytime an application installs a
+ # GTK immodule loader
+ @LIBDIR@/@SHARED_PKG@/gtk-query-immodules-2.0 @MODULES_BASE_PATH@/immodules/*.so > @MODULES_BASE_PATH@/gtk.immodules || true
+ ;;
+ esac
+ done
+ exit 0
fi
#DEBHELPER#
+# Also handle the initial installation
+if [ -d @MODULES_BASE_PATH@/immodules ]; then
+ @LIBDIR@/@SHARED_PKG@/gtk-query-immodules-2.0 @MODULES_BASE_PATH@/immodules/*.so > @MODULES_BASE_PATH@/gtk.immodules || true
+fi
+
Modified: desktop/experimental/gtk+2.0/debian/libgtk2.0-0.postrm.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/libgtk2.0-0.postrm.in?rev=24864&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/libgtk2.0-0.postrm.in [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/libgtk2.0-0.postrm.in [utf-8] Thu Jul 22 16:08:34 2010
@@ -10,3 +10,8 @@
#DEBHELPER#
+if [ -d @MODULES_BASE_PATH@/immodules ]; then
+ # Purge the cache
+ rm -f @MODULES_BASE_PATH@/gtk.immodules
+ rmdir -p --ignore-fail-on-non-empty @MODULES_BASE_PATH@
+fi
Added: desktop/experimental/gtk+2.0/debian/libgtk2.0-0.triggers.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/libgtk2.0-0.triggers.in?rev=24864&op=file
==============================================================================
--- desktop/experimental/gtk+2.0/debian/libgtk2.0-0.triggers.in (added)
+++ desktop/experimental/gtk+2.0/debian/libgtk2.0-0.triggers.in [utf-8] Thu Jul 22 16:08:34 2010
@@ -1,0 +1,1 @@
+interest @MODULES_BASE_PATH@/immodules
Modified: desktop/experimental/gtk+2.0/debian/libgtk2.0-bin.links.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/libgtk2.0-bin.links.in?rev=24864&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/libgtk2.0-bin.links.in [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/libgtk2.0-bin.links.in [utf-8] Thu Jul 22 16:08:34 2010
@@ -1,4 +1,3 @@
- at LIBDIR@/@SHARED_PKG@/gdk-pixbuf-query-loaders usr/bin/gdk-pixbuf-query-loaders
@LIBDIR@/@SHARED_PKG@/gtk-query-immodules- at APIVER@ usr/bin/gtk-query-immodules- at APIVER@
@LIBDIR@/@SHARED_PKG@/gtk-update-icon-cache usr/bin/gtk-update-icon-cache
@LIBDIR@/@SHARED_PKG@/update-gtk-immodules usr/sbin/update-gtk-immodules
Modified: desktop/experimental/gtk+2.0/debian/libgtk2.0-dev.install.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/libgtk2.0-dev.install.in?rev=24864&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/libgtk2.0-dev.install.in [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/libgtk2.0-dev.install.in [utf-8] Thu Jul 22 16:08:34 2010
@@ -1,7 +1,6 @@
# from Debian
debian/dh_gtkmodules usr/bin
# from the shared flavor
-debian/install/shared/usr/bin/gdk-pixbuf-csource usr/bin
debian/install/shared/usr/bin/gtk-builder-convert usr/bin
debian/install/shared/usr/include/gtk* usr/include
debian/install/shared/@LIBDIR@/libg?k*.la @LIBDIR@
@@ -9,6 +8,5 @@
debian/install/shared/@LIBDIR@/pkgconfig/g?k* @LIBDIR@/pkgconfig
debian/install/shared/@LIBDIR@/gtk- at APIVER@/include @LIBDIR@/gtk- at APIVER@
debian/install/shared/usr/share/aclocal usr/share
-docs/reference/gdk-pixbuf/gdk-pixbuf-csource.1 usr/share/man/man1/
# from the static flavor
debian/install/static/@LIBDIR@/libg?k*.a @LIBDIR@
Modified: desktop/experimental/gtk+2.0/debian/libgtk2.0-doc.links.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/libgtk2.0-doc.links.in?rev=24864&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/libgtk2.0-doc.links.in [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/libgtk2.0-doc.links.in [utf-8] Thu Jul 22 16:08:34 2010
@@ -1,5 +1,4 @@
usr/share/doc/@DOC_PKG@/gdk usr/share/gtk-doc/html/gdk
-usr/share/doc/@DOC_PKG@/gdk-pixbuf usr/share/gtk-doc/html/gdk-pixbuf
usr/share/doc/@DOC_PKG@/gtk usr/share/gtk-doc/html/gtk
usr/share/doc/@DOC_PKG@/faq usr/share/gtk-doc/html/gtk-faq
usr/share/doc/@DOC_PKG@/tutorial usr/share/gtk-doc/html/gtk-tutorial
Modified: desktop/experimental/gtk+2.0/debian/patches/001_static-linking-dont-query-immodules.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/001_static-linking-dont-query-immodules.patch?rev=24864&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/001_static-linking-dont-query-immodules.patch [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/patches/001_static-linking-dont-query-immodules.patch [utf-8] Thu Jul 22 16:08:34 2010
@@ -2,11 +2,11 @@
when --disable-shared was given
Bug: http://bugzilla.gnome.org/show_bug.cgi?id=346531
-Index: b/configure.in
+Index: gtk+2.0-2.21.5/configure.in
===================================================================
---- a/configure.in 2010-04-10 14:52:05.069943955 +0200
-+++ b/configure.in 2010-04-10 14:52:06.769944806 +0200
-@@ -162,6 +162,7 @@
+--- gtk+2.0-2.21.5.orig/configure.in 2010-07-12 18:23:54.000000000 +0200
++++ gtk+2.0-2.21.5/configure.in 2010-07-22 17:53:08.402066616 +0200
+@@ -150,6 +150,7 @@
dnl Initialize libtool
AC_PROG_CC
AM_DISABLE_STATIC
@@ -14,11 +14,11 @@
dnl
dnl Check for a working C++ compiler, but do not bail out, if none is found.
-Index: b/modules/input/Makefile.am
+Index: gtk+2.0-2.21.5/modules/input/Makefile.am
===================================================================
---- a/modules/input/Makefile.am 2010-04-10 14:52:05.089945386 +0200
-+++ b/modules/input/Makefile.am 2010-04-10 14:52:06.769944806 +0200
-@@ -178,8 +178,12 @@
+--- gtk+2.0-2.21.5.orig/modules/input/Makefile.am 2010-07-12 18:23:45.000000000 +0200
++++ gtk+2.0-2.21.5/modules/input/Makefile.am 2010-07-22 17:53:08.406083537 +0200
+@@ -176,8 +176,12 @@
if CROSS_COMPILING
RUN_QUERY_IMMODULES_TEST=false
else
@@ -31,7 +31,7 @@
# Running this if cross compiling or if DESTDIR is set is going to
# not work at all, so skip it.
-@@ -240,7 +244,18 @@
+@@ -238,7 +242,18 @@
included-modules: $(noinst_LTLIBRARIES)
gtk.immodules: Makefile.am $(module_LTLIBRARIES)
Modified: desktop/experimental/gtk+2.0/debian/patches/002_static-linking-dont-build-perf.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/002_static-linking-dont-build-perf.patch?rev=24864&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/002_static-linking-dont-build-perf.patch [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/patches/002_static-linking-dont-build-perf.patch [utf-8] Thu Jul 22 16:08:34 2010
@@ -1,21 +1,21 @@
Description: don't build perf measurement tools in static builds
Bug: http://bugzilla.gnome.org/show_bug.cgi?id=346559
-Index: b/Makefile.am
+Index: gtk+2.0-2.21.5/Makefile.am
===================================================================
---- a/Makefile.am 2010-04-10 14:52:04.949938994 +0200
-+++ b/Makefile.am 2010-04-10 14:52:07.085945966 +0200
+--- gtk+2.0-2.21.5.orig/Makefile.am 2010-07-12 18:23:43.000000000 +0200
++++ gtk+2.0-2.21.5/Makefile.am 2010-07-22 17:54:31.193051851 +0200
@@ -1,7 +1,12 @@
## Makefile.am for GTK+
include $(top_srcdir)/Makefile.decl
--SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib
+-SRC_SUBDIRS = gdk gtk modules demos tests perf
+# don't build perf measurement tools in static builds
+if !ENABLE_STATIC
+MAYBE_PERF = perf
+endif
+
-+SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests $(MAYBE_PERF) contrib
++SRC_SUBDIRS = gdk gtk modules demos tests $(MAYBE_PERF)
SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build
# require automake 1.4
Modified: desktop/experimental/gtk+2.0/debian/patches/003_gdk.pc_privates.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/003_gdk.pc_privates.patch?rev=24864&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/003_gdk.pc_privates.patch [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/patches/003_gdk.pc_privates.patch [utf-8] Thu Jul 22 16:08:34 2010
@@ -1,30 +1,30 @@
-Index: b/configure.in
+Index: gtk+2.0-2.21.5/configure.in
===================================================================
---- a/configure.in 2010-04-10 14:52:06.769944806 +0200
-+++ b/configure.in 2010-04-10 14:52:07.373945222 +0200
-@@ -1722,23 +1722,27 @@
+--- gtk+2.0-2.21.5.orig/configure.in 2010-07-22 17:53:08.402066616 +0200
++++ gtk+2.0-2.21.5/configure.in 2010-07-22 17:54:32.685052226 +0200
+@@ -1310,23 +1310,27 @@
# Pull in gio-unix for GDesktopAppInfo usage, see at least gdkapplaunchcontext-x11.c
if test "x$gdktarget" = "xx11"; then
-- GDK_PACKAGES="$PANGO_PACKAGES gio-unix-2.0 $X_PACKAGES cairo-$cairo_backend"
-+ GDK_PACKAGES="$PANGO_PACKAGES"
+- GDK_PACKAGES="$PANGO_PACKAGES gio-unix-2.0 $X_PACKAGES gdk-pixbuf-2.0 cairo-$cairo_backend"
++ GDK_PACKAGES="$PANGO_PACKAGES gdk-pixbuf-2.0"
+ GDK_PRIVATE_PACKAGES="gio-unix-2.0 $X_PACKAGES cairo-$cairo_backend"
else
-- GDK_PACKAGES="$PANGO_PACKAGES $X_PACKAGES cairo-$cairo_backend"
-+ GDK_PACKAGES="$PANGO_PACKAGES"
-+ GDK_PRIVATE_PACKAGES="$X_PACKAGES cairo-$cairo_backend"
+- GDK_PACKAGES="$PANGO_PACKAGES gio-2.0 gdk-pixbuf-2.0 cairo-$cairo_backend"
++ GDK_PACKAGES="$PANGO_PACKAGES gdk-pixbuf-2.0"
++ GDK_PRIVATE_PACKAGES="gio-2.0 cairo-$cairo_backend"
fi
--GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS"
--GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS"
-+GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $GDK_PRIVATE_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS"
-+GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $GDK_PRIVATE_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS"
+-GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PACKAGES`"
+-GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PACKAGES` $GDK_EXTRA_CFLAGS"
++GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PACKAGES $GDK_PRIVATE_PACKAGES`"
++GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PACKAGES $GDK_PRIVATE_PACKAGES` $GDK_EXTRA_CFLAGS"
#
# If we aren't writing explicit dependencies, then don't put the extra libraries we need
# into the pkg-config files
#
if test $enable_explicit_deps != yes ; then
-- GDK_PACKAGES="$PANGO_PACKAGES"
+- GDK_PACKAGES="$PANGO_PACKAGES gdk-pixbuf-2.0"
GDK_EXTRA_LIBS=
+else
+ GDK_PACKAGES="$GDK_PACKAGES $GDK_PRIVATE_PACKAGES"
@@ -35,14 +35,14 @@
AC_SUBST(GDK_EXTRA_LIBS)
AC_SUBST(GDK_EXTRA_CFLAGS)
AC_SUBST(GDK_DEP_LIBS)
-Index: b/gdk-2.0.pc.in
+Index: gtk+2.0-2.21.5/gdk-2.0.pc.in
===================================================================
---- a/gdk-2.0.pc.in 2010-04-10 14:52:04.881945980 +0200
-+++ b/gdk-2.0.pc.in 2010-04-10 14:52:07.373945222 +0200
+--- gtk+2.0-2.21.5.orig/gdk-2.0.pc.in 2010-07-12 18:23:43.000000000 +0200
++++ gtk+2.0-2.21.5/gdk-2.0.pc.in 2010-07-22 17:54:32.685052226 +0200
@@ -8,5 +8,6 @@
Description: GTK+ Drawing Kit (${target} target)
Version: @VERSION@
- Requires: gdk-pixbuf-2.0 @GDK_PACKAGES@
+ Requires: @GDK_PACKAGES@
+Requires.private: @GDK_PRIVATE_PACKAGES@
Libs: -L${libdir} -lgdk-${target}- at GTK_API_VERSION@ @GDK_EXTRA_LIBS@
Cflags: -I${includedir}/gtk-2.0 -I${libdir}/gtk-2.0/include @GDK_EXTRA_CFLAGS@
Modified: desktop/experimental/gtk+2.0/debian/patches/004_gtk+-ximian-gtk2-filesel-navbutton-5.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/004_gtk%2B-ximian-gtk2-filesel-navbutton-5.patch?rev=24864&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/004_gtk+-ximian-gtk2-filesel-navbutton-5.patch [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/patches/004_gtk+-ximian-gtk2-filesel-navbutton-5.patch [utf-8] Thu Jul 22 16:08:34 2010
@@ -1,7 +1,7 @@
-Index: b/gtk/gtkfilesel.c
+Index: gtk+2.0-2.21.5/gtk/gtkfilesel.c
===================================================================
---- a/gtk/gtkfilesel.c 2010-04-10 14:52:04.761941596 +0200
-+++ b/gtk/gtkfilesel.c 2010-04-10 14:52:07.733941648 +0200
+--- gtk+2.0-2.21.5.orig/gtk/gtkfilesel.c 2010-07-12 18:23:44.000000000 +0200
++++ gtk+2.0-2.21.5/gtk/gtkfilesel.c 2010-07-22 17:54:34.257053706 +0200
@@ -80,9 +80,13 @@
#include "gtkeventbox.h"
#include "gtkoptionmenu.h"
@@ -388,10 +388,10 @@
static gint
gtk_file_selection_key_press (GtkWidget *widget,
GdkEventKey *event,
-Index: b/gtk/stock-icons/ximian-icons.h
+Index: gtk+2.0-2.21.5/gtk/stock-icons/ximian-icons.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ b/gtk/stock-icons/ximian-icons.h 2010-04-10 14:52:07.762499475 +0200
++++ gtk+2.0-2.21.5/gtk/stock-icons/ximian-icons.h 2010-07-22 17:54:34.261053795 +0200
@@ -0,0 +1,825 @@
+/* GdkPixbuf RGBA C-Source image dump 1-byte-run-length-encoded */
+
Modified: desktop/experimental/gtk+2.0/debian/patches/005_support_disabling_x11_extensions.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/005_support_disabling_x11_extensions.patch?rev=24864&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/005_support_disabling_x11_extensions.patch [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/patches/005_support_disabling_x11_extensions.patch [utf-8] Thu Jul 22 16:08:34 2010
@@ -3,11 +3,11 @@
Support disabling X11 extensions
-Index: b/configure.in
+Index: gtk+2.0-2.21.5/configure.in
===================================================================
---- a/configure.in 2010-04-10 14:52:07.373945222 +0200
-+++ b/configure.in 2010-04-10 14:52:08.109945409 +0200
-@@ -253,6 +253,18 @@
+--- gtk+2.0-2.21.5.orig/configure.in 2010-07-22 17:54:32.685052226 +0200
++++ gtk+2.0-2.21.5/configure.in 2010-07-22 17:54:36.285051810 +0200
+@@ -241,6 +241,18 @@
[AC_HELP_STRING([--enable-xinerama],
[support xinerama extension if available [default=yes]])],,
[enable_xinerama="yes"])
@@ -26,7 +26,7 @@
AC_ARG_ENABLE(rebuilds,
[AC_HELP_STRING([--disable-rebuilds],
[disable all source autogeneration rules])],,
-@@ -1590,7 +1602,8 @@
+@@ -1187,7 +1199,8 @@
AM_CONDITIONAL(XINPUT_XFREE, test x$with_xinput = xxfree || test x$with_xinput = xyes)
# Check for the RANDR extension
@@ -36,7 +36,7 @@
AC_DEFINE(HAVE_RANDR, 1, [Have the Xrandr extension library])
X_PACKAGES="$X_PACKAGES xrandr"
-@@ -1606,7 +1619,8 @@
+@@ -1203,7 +1216,8 @@
# Checks for XFixes extension
@@ -46,7 +46,7 @@
AC_DEFINE(HAVE_XFIXES, 1, [Have the XFIXES X extension])
X_PACKAGES="$X_PACKAGES xfixes"
-@@ -1615,7 +1629,8 @@
+@@ -1212,7 +1226,8 @@
# Checks for Xcomposite extension
@@ -56,7 +56,7 @@
AC_DEFINE(HAVE_XCOMPOSITE, 1, [Have the XCOMPOSITE X extension])
X_PACKAGES="$X_PACKAGES xcomposite"
-@@ -1624,7 +1639,7 @@
+@@ -1221,7 +1236,7 @@
# Checks for Xdamage extension
Modified: desktop/experimental/gtk+2.0/debian/patches/009_gtk-export-filechooser.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/009_gtk-export-filechooser.patch?rev=24864&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/009_gtk-export-filechooser.patch [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/patches/009_gtk-export-filechooser.patch [utf-8] Thu Jul 22 16:08:34 2010
@@ -34,20 +34,20 @@
* tests/autotestfilechooser.c: build with
GTK_FILE_CHOOSER_ENABLE_UNSUPPORTED
-Index: b/gtk/Makefile.am
-===================================================================
---- a/gtk/Makefile.am 2010-04-10 14:52:04.441943282 +0200
-+++ b/gtk/Makefile.am 2010-04-10 14:52:08.761942152 +0200
-@@ -52,6 +52,8 @@
+Index: gtk+2.0-2.21.5/gtk/Makefile.am
+===================================================================
+--- gtk+2.0-2.21.5.orig/gtk/Makefile.am 2010-07-12 18:23:44.000000000 +0200
++++ gtk+2.0-2.21.5/gtk/Makefile.am 2010-07-22 17:54:37.921095291 +0200
+@@ -49,6 +49,8 @@
+ -I$(top_srcdir) -I../gdk \
-I$(top_srcdir)/gdk \
- -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf \
-DGDK_DISABLE_DEPRECATED \
+ -DMAEMO_CHANGES \
+ -DGTK_FILE_CHOOSER_ENABLE_UNSUPPORTED \
-DGTK_DISABLE_DEPRECATED \
-DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED \
-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \
-@@ -360,12 +362,16 @@
+@@ -356,12 +358,16 @@
# Installed header files without compatibility guarantees
# that are not included in gtk/gtk.h
gtk_semi_private_h_sources = \
@@ -67,7 +67,7 @@
gtksearchenginesimple.h \
gtkdndcursors.h \
gtkentryprivate.h \
-@@ -374,11 +380,7 @@
+@@ -370,11 +376,7 @@
gtkfilechooserdefault.h \
gtkfilechooserembed.h \
gtkfilechooserentry.h \
@@ -79,11 +79,11 @@
gtkiconcache.h \
gtkintl.h \
gtkkeyhash.h \
-Index: b/gtk/gtk.symbols
-===================================================================
---- a/gtk/gtk.symbols 2010-04-10 14:52:04.489943535 +0200
-+++ b/gtk/gtk.symbols 2010-04-10 14:52:08.765946852 +0200
-@@ -1633,6 +1633,12 @@
+Index: gtk+2.0-2.21.5/gtk/gtk.symbols
+===================================================================
+--- gtk+2.0-2.21.5.orig/gtk/gtk.symbols 2010-07-12 18:57:41.000000000 +0200
++++ gtk+2.0-2.21.5/gtk/gtk.symbols 2010-07-22 17:54:37.941054321 +0200
+@@ -1639,6 +1639,12 @@
#endif
#endif
@@ -96,10 +96,10 @@
#if IN_HEADER(__GTK_FILE_CHOOSER_WIDGET_H__)
#if IN_FILE(__GTK_FILE_CHOOSER_WIDGET_C__)
gtk_file_chooser_widget_get_type G_GNUC_CONST
-Index: b/gtk/gtkfilechooserprivate.h
-===================================================================
---- a/gtk/gtkfilechooserprivate.h 2010-04-10 14:52:04.461944715 +0200
-+++ b/gtk/gtkfilechooserprivate.h 2010-04-10 14:52:08.765946852 +0200
+Index: gtk+2.0-2.21.5/gtk/gtkfilechooserprivate.h
+===================================================================
+--- gtk+2.0-2.21.5.orig/gtk/gtkfilechooserprivate.h 2010-06-16 17:27:01.000000000 +0200
++++ gtk+2.0-2.21.5/gtk/gtkfilechooserprivate.h 2010-07-22 17:54:37.941054321 +0200
@@ -21,6 +21,14 @@
#ifndef __GTK_FILE_CHOOSER_PRIVATE_H__
#define __GTK_FILE_CHOOSER_PRIVATE_H__
@@ -115,10 +115,10 @@
#include "gtkfilechooser.h"
#include "gtkfilesystem.h"
#include "gtkfilesystemmodel.h"
-Index: b/gtk/gtkfilechooserutils.c
-===================================================================
---- a/gtk/gtkfilechooserutils.c 2010-04-10 14:52:04.469943779 +0200
-+++ b/gtk/gtkfilechooserutils.c 2010-04-10 14:52:08.765946852 +0200
+Index: gtk+2.0-2.21.5/gtk/gtkfilechooserutils.c
+===================================================================
+--- gtk+2.0-2.21.5.orig/gtk/gtkfilechooserutils.c 2010-07-12 18:23:44.000000000 +0200
++++ gtk+2.0-2.21.5/gtk/gtkfilechooserutils.c 2010-07-22 17:54:37.949054430 +0200
@@ -122,6 +122,22 @@
"create-folders");
}
@@ -149,10 +149,10 @@
+
+#define __GTK_FILE_CHOOSER_UTILS_C__
+#include "gtkaliasdef.c"
-Index: b/gtk/gtkfilechooserutils.h
-===================================================================
---- a/gtk/gtkfilechooserutils.h 2010-04-10 14:52:04.429939517 +0200
-+++ b/gtk/gtkfilechooserutils.h 2010-04-10 14:52:08.765946852 +0200
+Index: gtk+2.0-2.21.5/gtk/gtkfilechooserutils.h
+===================================================================
+--- gtk+2.0-2.21.5.orig/gtk/gtkfilechooserutils.h 2010-07-12 18:23:44.000000000 +0200
++++ gtk+2.0-2.21.5/gtk/gtkfilechooserutils.h 2010-07-22 17:54:37.961058330 +0200
@@ -22,6 +22,14 @@
#ifndef __GTK_FILE_CHOOSER_UTILS_H__
#define __GTK_FILE_CHOOSER_UTILS_H__
@@ -178,10 +178,10 @@
void _gtk_file_chooser_delegate_iface_init (GtkFileChooserIface *iface);
void _gtk_file_chooser_set_delegate (GtkFileChooser *receiver,
-Index: b/gtk/gtkfilesystemmodel.h
-===================================================================
---- a/gtk/gtkfilesystemmodel.h 2010-04-10 14:52:04.525944493 +0200
-+++ b/gtk/gtkfilesystemmodel.h 2010-04-10 14:52:08.765946852 +0200
+Index: gtk+2.0-2.21.5/gtk/gtkfilesystemmodel.h
+===================================================================
+--- gtk+2.0-2.21.5.orig/gtk/gtkfilesystemmodel.h 2010-06-16 17:27:02.000000000 +0200
++++ gtk+2.0-2.21.5/gtk/gtkfilesystemmodel.h 2010-07-22 17:54:37.961058330 +0200
@@ -21,6 +21,10 @@
#ifndef __GTK_FILE_SYSTEM_MODEL_H__
#define __GTK_FILE_SYSTEM_MODEL_H__
@@ -193,10 +193,10 @@
#include <gio/gio.h>
#include <gtk/gtkfilefilter.h>
#include <gtk/gtktreemodel.h>
-Index: b/gtk/gtkquery.h
-===================================================================
---- a/gtk/gtkquery.h 2010-04-10 14:52:04.409943955 +0200
-+++ b/gtk/gtkquery.h 2010-04-10 14:52:08.765946852 +0200
+Index: gtk+2.0-2.21.5/gtk/gtkquery.h
+===================================================================
+--- gtk+2.0-2.21.5.orig/gtk/gtkquery.h 2009-04-02 15:54:56.000000000 +0200
++++ gtk+2.0-2.21.5/gtk/gtkquery.h 2010-07-22 17:54:37.977054916 +0200
@@ -23,6 +23,14 @@
#ifndef __GTK_QUERY_H__
#define __GTK_QUERY_H__
@@ -212,10 +212,10 @@
#include <glib-object.h>
G_BEGIN_DECLS
-Index: b/gtk/gtksearchengine.h
-===================================================================
---- a/gtk/gtksearchengine.h 2010-04-10 14:52:04.501945345 +0200
-+++ b/gtk/gtksearchengine.h 2010-04-10 14:52:08.765946852 +0200
+Index: gtk+2.0-2.21.5/gtk/gtksearchengine.h
+===================================================================
+--- gtk+2.0-2.21.5.orig/gtk/gtksearchengine.h 2010-04-09 04:29:58.000000000 +0200
++++ gtk+2.0-2.21.5/gtk/gtksearchengine.h 2010-07-22 17:54:37.977054916 +0200
@@ -23,6 +23,14 @@
#ifndef __GTK_SEARCH_ENGINE_H__
#define __GTK_SEARCH_ENGINE_H__
Added: desktop/experimental/gtk+2.0/debian/patches/011_immodule-cache-dir.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/011_immodule-cache-dir.patch?rev=24864&op=file
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/011_immodule-cache-dir.patch (added)
+++ desktop/experimental/gtk+2.0/debian/patches/011_immodule-cache-dir.patch [utf-8] Thu Jul 22 16:08:34 2010
@@ -1,0 +1,13 @@
+Index: gtk+2.0-2.21.5/gtk/gtkrc.c
+===================================================================
+--- gtk+2.0-2.21.5.orig/gtk/gtkrc.c 2010-07-12 18:23:45.000000000 +0200
++++ gtk+2.0-2.21.5/gtk/gtkrc.c 2010-07-22 17:55:14.909054236 +0200
+@@ -450,7 +450,7 @@
+ if (im_module_file)
+ result = g_strdup (im_module_file);
+ else
+- result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL);
++ result = g_build_filename (GTK_LIBDIR, "gtk-2.0", "gtk.immodules", NULL);
+ }
+
+ return result;
Modified: desktop/experimental/gtk+2.0/debian/patches/015_default-fallback-icon-theme.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/015_default-fallback-icon-theme.patch?rev=24864&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/015_default-fallback-icon-theme.patch [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/patches/015_default-fallback-icon-theme.patch [utf-8] Thu Jul 22 16:08:34 2010
@@ -1,7 +1,7 @@
-Index: b/gtk/gtksettings.c
+Index: gtk+2.0-2.21.5/gtk/gtksettings.c
===================================================================
---- a/gtk/gtksettings.c 2010-04-10 14:52:04.289945999 +0200
-+++ b/gtk/gtksettings.c 2010-04-10 14:52:09.473946523 +0200
+--- gtk+2.0-2.21.5.orig/gtk/gtksettings.c 2010-07-12 18:23:45.000000000 +0200
++++ gtk+2.0-2.21.5/gtk/gtksettings.c 2010-07-22 17:55:16.033053648 +0200
@@ -310,7 +310,7 @@
g_param_spec_string ("gtk-fallback-icon-theme",
P_("Fallback Icon Theme Name"),
Modified: desktop/experimental/gtk+2.0/debian/patches/022_disable-viqr-im-for-vi-locale.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/022_disable-viqr-im-for-vi-locale.patch?rev=24864&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/022_disable-viqr-im-for-vi-locale.patch [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/patches/022_disable-viqr-im-for-vi-locale.patch [utf-8] Thu Jul 22 16:08:34 2010
@@ -1,7 +1,7 @@
-Index: b/modules/input/imviqr.c
+Index: gtk+2.0-2.21.5/modules/input/imviqr.c
===================================================================
---- a/modules/input/imviqr.c 2010-04-10 14:52:04.009941613 +0200
-+++ b/modules/input/imviqr.c 2010-04-10 14:52:10.389945321 +0200
+--- gtk+2.0-2.21.5.orig/modules/input/imviqr.c 2010-06-16 17:27:05.000000000 +0200
++++ gtk+2.0-2.21.5/modules/input/imviqr.c 2010-07-22 17:56:01.021052474 +0200
@@ -244,7 +244,7 @@
N_("Vietnamese (VIQR)"), /* Human readable name */
GETTEXT_PACKAGE, /* Translation domain */
Modified: desktop/experimental/gtk+2.0/debian/patches/041_ia32-libs.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/041_ia32-libs.patch?rev=24864&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/041_ia32-libs.patch [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/patches/041_ia32-libs.patch [utf-8] Thu Jul 22 16:08:34 2010
@@ -1,52 +1,25 @@
-Index: b/gdk-pixbuf/gdk-pixbuf-io.c
+Index: gtk+2.0-2.21.5/gtk/gtkrc.c
===================================================================
---- a/gdk-pixbuf/gdk-pixbuf-io.c 2010-04-10 14:52:10.685945884 +0200
-+++ b/gdk-pixbuf/gdk-pixbuf-io.c 2010-04-10 14:52:10.997945392 +0200
-@@ -308,8 +308,20 @@
- gchar *result = g_strdup (g_getenv ("GDK_PIXBUF_MODULE_FILE"));
-
- if (!result)
-- result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gdk-pixbuf.loaders", NULL);
--
-+ {
-+#if defined(__linux__) && ( defined(__i386__) || defined (__x86_64__) || defined(__ia64__) )
-+# if defined (__i386__)
-+ result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gdk-pixbuf.loaders.32", NULL);
-+# else
-+ result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gdk-pixbuf.loaders.64", NULL);
-+#endif
-+ /* Prefer compat gdk-pixbuf.loaders file if it's usable. */
-+ if (g_file_test(result, G_FILE_TEST_EXISTS))
-+ return result;
-+ g_free (result);
-+#endif
-+ result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gdk-pixbuf.loaders", NULL);
-+ }
- return result;
- }
-
-Index: b/gtk/gtkrc.c
-===================================================================
---- a/gtk/gtkrc.c 2010-04-10 14:52:03.789945438 +0200
-+++ b/gtk/gtkrc.c 2010-04-10 14:52:11.025941140 +0200
+--- gtk+2.0-2.21.5.orig/gtk/gtkrc.c 2010-07-22 17:55:14.000000000 +0200
++++ gtk+2.0-2.21.5/gtk/gtkrc.c 2010-07-22 17:57:19.657052790 +0200
@@ -450,7 +450,20 @@
if (im_module_file)
result = g_strdup (im_module_file);
else
-- result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL);
+- result = g_build_filename (GTK_LIBDIR, "gtk-2.0", "gtk.immodules", NULL);
+ {
+#if defined(__linux__) && ( defined(__i386__) || defined (__x86_64__) || defined(__ia64__) )
+# if defined (__i386__)
-+ result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules.32", NULL);
++ result = g_build_filename (GTK_LIBDIR, "gtk-2.0", "gtk.immodules.32", NULL);
+# else
-+ result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules.64", NULL);
++ result = g_build_filename (GTK_LIBDIR, "gtk-2.0", "gtk.immodules.64", NULL);
+# endif
+ /* Prefer compat gtk.immodules file if it's usable. */
+ if (g_file_test(result, G_FILE_TEST_EXISTS))
+ return result;
+ g_free (result);
+#endif
-+ result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL);
++ result = g_build_filename (GTK_LIBDIR, "gtk-2.0", "gtk.immodules", NULL);
+ }
}
Modified: desktop/experimental/gtk+2.0/debian/patches/042_treeview_single-focus.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/042_treeview_single-focus.patch?rev=24864&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/042_treeview_single-focus.patch [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/patches/042_treeview_single-focus.patch [utf-8] Thu Jul 22 16:08:34 2010
@@ -1,8 +1,8 @@
-Index: b/gtk/gtktreeview.c
+Index: gtk+2.0-2.21.5/gtk/gtktreeview.c
===================================================================
---- a/gtk/gtktreeview.c 2010-04-10 14:52:03.729940590 +0200
-+++ b/gtk/gtktreeview.c 2010-04-10 14:52:11.345946704 +0200
-@@ -9570,7 +9570,8 @@
+--- gtk+2.0-2.21.5.orig/gtk/gtktreeview.c 2010-07-12 18:32:54.000000000 +0200
++++ gtk+2.0-2.21.5/gtk/gtktreeview.c 2010-07-22 17:57:20.833053801 +0200
+@@ -9591,7 +9591,8 @@
if (cursor_path)
{
Modified: desktop/experimental/gtk+2.0/debian/patches/060_ignore-random-icons.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/060_ignore-random-icons.patch?rev=24864&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/060_ignore-random-icons.patch [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/patches/060_ignore-random-icons.patch [utf-8] Thu Jul 22 16:08:34 2010
@@ -1,7 +1,7 @@
-Index: b/gtk/updateiconcache.c
+Index: gtk+2.0-2.21.5/gtk/updateiconcache.c
===================================================================
---- a/gtk/updateiconcache.c 2010-04-10 14:52:03.669943004 +0200
-+++ b/gtk/updateiconcache.c 2010-04-10 14:52:11.645942185 +0200
+--- gtk+2.0-2.21.5.orig/gtk/updateiconcache.c 2010-05-08 06:39:07.000000000 +0200
++++ gtk+2.0-2.21.5/gtk/updateiconcache.c 2010-07-22 17:57:21.973055310 +0200
@@ -660,7 +660,7 @@
directories = g_list_append (directories, g_strdup (subdir));
}
Modified: desktop/experimental/gtk+2.0/debian/patches/061_use_pdf_as_default_printing_standard.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/061_use_pdf_as_default_printing_standard.patch?rev=24864&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/061_use_pdf_as_default_printing_standard.patch [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/patches/061_use_pdf_as_default_printing_standard.patch [utf-8] Thu Jul 22 16:08:34 2010
@@ -1,8 +1,8 @@
-Index: b/modules/printbackends/cups/gtkprintbackendcups.c
+Index: gtk+2.0-2.21.5/modules/printbackends/cups/gtkprintbackendcups.c
===================================================================
---- a/modules/printbackends/cups/gtkprintbackendcups.c 2010-04-10 14:52:03.613942573 +0200
-+++ b/modules/printbackends/cups/gtkprintbackendcups.c 2010-04-10 14:52:11.941944957 +0200
-@@ -343,8 +343,9 @@
+--- gtk+2.0-2.21.5.orig/modules/printbackends/cups/gtkprintbackendcups.c 2010-06-28 01:19:39.000000000 +0200
++++ gtk+2.0-2.21.5/modules/printbackends/cups/gtkprintbackendcups.c 2010-07-22 17:57:22.973051749 +0200
+@@ -344,8 +344,9 @@
/* TODO: check if it is a ps or pdf printer */
@@ -13,7 +13,7 @@
ppd_file = gtk_printer_cups_get_ppd (GTK_PRINTER_CUPS (printer));
if (ppd_file != NULL)
-@@ -402,6 +403,7 @@
+@@ -403,6 +404,7 @@
if (level == 3)
cairo_ps_surface_restrict_to_level (surface, CAIRO_PS_LEVEL_3);
@@ -21,10 +21,10 @@
cairo_surface_set_fallback_resolution (surface,
2.0 * gtk_print_settings_get_printer_lpi (settings),
-Index: b/modules/printbackends/lpr/gtkprintbackendlpr.c
+Index: gtk+2.0-2.21.5/modules/printbackends/lpr/gtkprintbackendlpr.c
===================================================================
---- a/modules/printbackends/lpr/gtkprintbackendlpr.c 2010-04-10 14:52:03.585944592 +0200
-+++ b/modules/printbackends/lpr/gtkprintbackendlpr.c 2010-04-10 14:52:11.941944957 +0200
+--- gtk+2.0-2.21.5.orig/modules/printbackends/lpr/gtkprintbackendlpr.c 2010-06-16 17:27:06.000000000 +0200
++++ gtk+2.0-2.21.5/modules/printbackends/lpr/gtkprintbackendlpr.c 2010-07-22 17:57:23.001065368 +0200
@@ -31,6 +31,8 @@
#include <cairo.h>
#include <cairo-ps.h>
Modified: desktop/experimental/gtk+2.0/debian/patches/070_mandatory-relibtoolize.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/070_mandatory-relibtoolize.patch?rev=24864&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/070_mandatory-relibtoolize.patch [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/patches/070_mandatory-relibtoolize.patch [utf-8] Thu Jul 22 16:08:34 2010
@@ -1,7 +1,19 @@
-diff -Naur gtk+2.0-2.21.2.old/aclocal.m4 gtk+2.0-2.21.2/aclocal.m4
---- gtk+2.0-2.21.2.old/aclocal.m4 2010-06-10 19:18:17.000000000 +0200
-+++ gtk+2.0-2.21.2/aclocal.m4 2010-06-11 12:26:08.807614317 +0200
-@@ -664,8017 +664,6 @@
+Index: gtk+2.0-2.21.5/aclocal.m4
+===================================================================
+--- gtk+2.0-2.21.5.orig/aclocal.m4 2010-07-22 17:59:09.889062200 +0200
++++ gtk+2.0-2.21.5/aclocal.m4 2010-07-22 17:58:41.518052047 +0200
+@@ -13,8 +13,8 @@
+
+ m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.66],,
+-[m4_warning([this file was generated for autoconf 2.66.
++m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
++[m4_warning([this file was generated for autoconf 2.65.
+ You have another version of autoconf. It may work, but is not guaranteed to.
+ If you have problems, you may need to regenerate the build system entirely.
+ To do so, use the procedure documented by the package, typically `autoreconf'.])])
+@@ -664,8105 +664,6 @@
fi])
@@ -70,7 +82,8 @@
-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
--# 2006, 2007, 2008 Free Software Foundation, Inc.
+-# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+-# Inc.
-# Written by Gordon Matzigkeit, 1996
-#
-# This file is free software; the Free Software Foundation gives
@@ -79,7 +92,8 @@
-
-m4_define([_LT_COPYING], [dnl
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
--# 2006, 2007, 2008 Free Software Foundation, Inc.
+-# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+-# Inc.
-# Written by Gordon Matzigkeit, 1996
-#
-# This file is part of GNU Libtool.
@@ -106,7 +120,7 @@
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-])
-
--# serial 56 LT_INIT
+-# serial 57 LT_INIT
-
-
-# LT_PREREQ(VERSION)
@@ -135,6 +149,7 @@
-# ------------------
-AC_DEFUN([LT_INIT],
-[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
+-AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
-AC_BEFORE([$0], [LT_LANG])dnl
-AC_BEFORE([$0], [LT_OUTPUT])dnl
-AC_BEFORE([$0], [LTDL_INIT])dnl
@@ -150,6 +165,8 @@
-AC_REQUIRE([LTVERSION_VERSION])dnl
-AC_REQUIRE([LTOBSOLETE_VERSION])dnl
-m4_require([_LT_PROG_LTMAIN])dnl
+-
+-_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])
-
-dnl Parse OPTIONS
-_LT_SET_OPTIONS([$0], [$1])
@@ -187,7 +204,7 @@
- *) break;;
- esac
-done
--cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
-])
-
-
@@ -207,6 +224,9 @@
-m4_defun([_LT_SETUP],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+-AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
+-AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
+-
-_LT_DECL([], [host_alias], [0], [The host system])dnl
-_LT_DECL([], [host], [0])dnl
-_LT_DECL([], [host_os], [0])dnl
@@ -248,7 +268,6 @@
-_LT_CHECK_OBJDIR
-
-m4_require([_LT_TAG_COMPILER])dnl
--_LT_PROG_ECHO_BACKSLASH
-
-case $host_os in
-aix3*)
@@ -262,23 +281,6 @@
- ;;
-esac
-
--# Sed substitution that helps us do robust quoting. It backslashifies
--# metacharacters that are still active within double-quoted strings.
--sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
--
--# Same as above, but do not quote variable references.
--double_quote_subst='s/\([["`\\]]\)/\\\1/g'
--
--# Sed substitution to delay expansion of an escaped shell variable in a
--# double_quote_subst'ed string.
--delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
--
--# Sed substitution to delay expansion of an escaped single quote.
--delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
--
--# Sed substitution to avoid accidental globbing in evaled expressions
--no_glob_subst='s/\*/\\\*/g'
--
-# Global variables:
-ofile=libtool
-can_build_shared=yes
@@ -318,6 +320,28 @@
-_LT_CONFIG_COMMANDS
-])# _LT_SETUP
-
+-
+-# _LT_PREPARE_SED_QUOTE_VARS
+-# --------------------------
+-# Define a few sed substitution that help us do robust quoting.
+-m4_defun([_LT_PREPARE_SED_QUOTE_VARS],
+-[# Backslashify metacharacters that are still active within
+-# double-quoted strings.
+-sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
+-
+-# Same as above, but do not quote variable references.
+-double_quote_subst='s/\([["`\\]]\)/\\\1/g'
+-
+-# Sed substitution to delay expansion of an escaped shell variable in a
+-# double_quote_subst'ed string.
+-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+-
+-# Sed substitution to delay expansion of an escaped single quote.
+-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+-
+-# Sed substitution to avoid accidental globbing in evaled expressions
+-no_glob_subst='s/\*/\\\*/g'
+-])
-
-# _LT_PROG_LTMAIN
-# ---------------
@@ -471,7 +495,7 @@
-# declaration there will have the same value as in `configure'. VARNAME
-# must have a single quote delimited value for this to work.
-m4_define([_LT_CONFIG_STATUS_DECLARE],
--[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`'])
+-[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
-
-
-# _LT_CONFIG_STATUS_DECLARATIONS
@@ -481,7 +505,7 @@
-# embedded single quotes properly. In configure, this macro expands
-# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
-#
--# <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`'
+-# <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`'
-m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
-[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
- [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
@@ -580,12 +604,20 @@
-LTCFLAGS='$LTCFLAGS'
-compiler='$compiler_DEFAULT'
-
+-# A function that is used when there is no print builtin or printf.
+-func_fallback_echo ()
+-{
+- eval 'cat <<_LTECHO_EOF
+-\$[]1
+-_LTECHO_EOF'
+-}
+-
-# Quote evaled strings.
-for var in lt_decl_all_varnames([[ \
-]], lt_decl_quote_varnames); do
-- case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+- case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
- *[[\\\\\\\`\\"\\\$]]*)
-- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
- ;;
- *)
- eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -596,9 +628,9 @@
-# Double-quote double-evaled strings.
-for var in lt_decl_all_varnames([[ \
-]], lt_decl_dquote_varnames); do
-- case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+- case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
- *[[\\\\\\\`\\"\\\$]]*)
-- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
- ;;
- *)
- eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -606,16 +638,38 @@
- esac
-done
-
--# Fix-up fallback echo if it was mangled by the above quoting rules.
--case \$lt_ECHO in
--*'\\\[$]0 --fallback-echo"')dnl "
-- lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\`
-- ;;
--esac
--
-_LT_OUTPUT_LIBTOOL_INIT
-])
-
+-# _LT_GENERATED_FILE_INIT(FILE, [COMMENT])
+-# ------------------------------------
+-# Generate a child script FILE with all initialization necessary to
+-# reuse the environment learned by the parent script, and make the
+-# file executable. If COMMENT is supplied, it is inserted after the
+-# `#!' sequence but before initialization text begins. After this
+-# macro, additional text can be appended to FILE to form the body of
+-# the child script. The macro ends with non-zero status if the
+-# file could not be fully written (such as if the disk is full).
+-m4_ifdef([AS_INIT_GENERATED],
+-[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])],
+-[m4_defun([_LT_GENERATED_FILE_INIT],
+-[m4_require([AS_PREPARE])]dnl
+-[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl
+-[lt_write_fail=0
+-cat >$1 <<_ASEOF || lt_write_fail=1
+-#! $SHELL
+-# Generated by $as_me.
+-$2
+-SHELL=\${CONFIG_SHELL-$SHELL}
+-export SHELL
+-_ASEOF
+-cat >>$1 <<\_ASEOF || lt_write_fail=1
+-AS_SHELL_SANITIZE
+-_AS_PREPARE
+-exec AS_MESSAGE_FD>&1
+-_ASEOF
+-test $lt_write_fail = 0 && chmod +x $1[]dnl
+-m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
-
-# LT_OUTPUT
-# ---------
@@ -625,20 +679,11 @@
-AC_DEFUN([LT_OUTPUT],
-[: ${CONFIG_LT=./config.lt}
-AC_MSG_NOTICE([creating $CONFIG_LT])
--cat >"$CONFIG_LT" <<_LTEOF
--#! $SHELL
--# Generated by $as_me.
--# Run this file to recreate a libtool stub with the current configuration.
--
+-_LT_GENERATED_FILE_INIT(["$CONFIG_LT"],
+-[# Run this file to recreate a libtool stub with the current configuration.])
+-
+-cat >>"$CONFIG_LT" <<\_LTEOF
-lt_cl_silent=false
--SHELL=\${CONFIG_SHELL-$SHELL}
--_LTEOF
--
--cat >>"$CONFIG_LT" <<\_LTEOF
--AS_SHELL_SANITIZE
--_AS_PREPARE
--
--exec AS_MESSAGE_FD>&1
-exec AS_MESSAGE_LOG_FD>>config.log
-{
- echo
@@ -664,7 +709,7 @@
-m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
-configured by $[0], generated by m4_PACKAGE_STRING.
-
--Copyright (C) 2008 Free Software Foundation, Inc.
+-Copyright (C) 2010 Free Software Foundation, Inc.
-This config.lt script is free software; the Free Software Foundation
-gives unlimited permision to copy, distribute and modify it."
-
@@ -709,15 +754,13 @@
-# appending to config.log, which fails on DOS, as config.log is still kept
-# open by configure. Here we exec the FD to /dev/null, effectively closing
-# config.log, so it can be properly (re)opened and appended to by config.lt.
--if test "$no_create" != yes; then
-- lt_cl_success=:
-- test "$silent" = yes &&
-- lt_config_lt_args="$lt_config_lt_args --quiet"
-- exec AS_MESSAGE_LOG_FD>/dev/null
-- $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
-- exec AS_MESSAGE_LOG_FD>>config.log
-- $lt_cl_success || AS_EXIT(1)
--fi
+-lt_cl_success=:
+-test "$silent" = yes &&
+- lt_config_lt_args="$lt_config_lt_args --quiet"
+-exec AS_MESSAGE_LOG_FD>/dev/null
+-$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
+-exec AS_MESSAGE_LOG_FD>>config.log
+-$lt_cl_success || AS_EXIT(1)
-])# LT_OUTPUT
-
-
@@ -894,11 +937,13 @@
-AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
-AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
-AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
+-AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
-dnl AC_DEFUN([AC_LIBTOOL_F77], [])
-dnl AC_DEFUN([AC_LIBTOOL_FC], [])
-dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
+-dnl AC_DEFUN([AC_LIBTOOL_RC], [])
-
-
-# _LT_TAG_COMPILER
@@ -1003,6 +1048,31 @@
- [lt_cv_ld_exported_symbols_list=no])
- LDFLAGS="$save_LDFLAGS"
- ])
+- AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
+- [lt_cv_ld_force_load=no
+- cat > conftest.c << _LT_EOF
+-int forced_loaded() { return 2;}
+-_LT_EOF
+- echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
+- $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
+- echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
+- $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
+- echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
+- $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
+- cat > conftest.c << _LT_EOF
+-int main() { return 0;}
+-_LT_EOF
+- echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
+- $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
+- _lt_result=$?
+- if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
+- lt_cv_ld_force_load=yes
+- else
+- cat conftest.err >&AS_MESSAGE_LOG_FD
+- fi
+- rm -f conftest.err libconftest.a conftest conftest.c
+- rm -rf conftest.dSYM
+- ])
- case $host_os in
- rhapsody* | darwin1.[[012]])
- _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
@@ -1030,7 +1100,7 @@
- else
- _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
- fi
-- if test "$DSYMUTIL" != ":"; then
+- if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
- _lt_dsymutil='~$DSYMUTIL $lib || :'
- else
- _lt_dsymutil=
@@ -1050,7 +1120,11 @@
- _LT_TAGVAR(hardcode_direct, $1)=no
- _LT_TAGVAR(hardcode_automatic, $1)=yes
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-- _LT_TAGVAR(whole_archive_flag_spec, $1)=''
+- if test "$lt_cv_ld_force_load" = "yes"; then
+- _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+- else
+- _LT_TAGVAR(whole_archive_flag_spec, $1)=''
+- fi
- _LT_TAGVAR(link_all_deplibs, $1)=yes
- _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
- case $cc_basename in
@@ -1058,7 +1132,7 @@
- *) _lt_dar_can_shared=$GCC ;;
- esac
- if test "$_lt_dar_can_shared" = "yes"; then
-- output_verbose_link_cmd=echo
+- output_verbose_link_cmd=func_echo_all
- _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
- _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
- _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
@@ -1104,170 +1178,65 @@
-# _LT_SHELL_INIT(ARG)
-# -------------------
-m4_define([_LT_SHELL_INIT],
--[ifdef([AC_DIVERSION_NOTICE],
-- [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
-- [AC_DIVERT_PUSH(NOTICE)])
--$1
--AC_DIVERT_POP
--])# _LT_SHELL_INIT
+-[m4_divert_text([M4SH-INIT], [$1
+-])])# _LT_SHELL_INIT
+-
-
-
-# _LT_PROG_ECHO_BACKSLASH
-# -----------------------
--# Add some code to the start of the generated configure script which
--# will find an echo command which doesn't interpret backslashes.
+-# Find how we can fake an echo command that does not interpret backslash.
+-# In particular, with Autoconf 2.60 or later we add some code to the start
+-# of the generated configure script which will find a shell with a builtin
+-# printf (which we can use as an echo command).
-m4_defun([_LT_PROG_ECHO_BACKSLASH],
--[_LT_SHELL_INIT([
--# Check that we are running under the correct shell.
--SHELL=${CONFIG_SHELL-/bin/sh}
--
--case X$lt_ECHO in
--X*--fallback-echo)
-- # Remove one level of quotation (which was required for Make).
-- ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
-- ;;
+-[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+-
+-AC_MSG_CHECKING([how to print strings])
+-# Test print first, because it will be a builtin if present.
+-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
+- test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
+- ECHO='print -r --'
+-elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
+- ECHO='printf %s\n'
+-else
+- # Use this function as a fallback that always works.
+- func_fallback_echo ()
+- {
+- eval 'cat <<_LTECHO_EOF
+-$[]1
+-_LTECHO_EOF'
+- }
+- ECHO='func_fallback_echo'
+-fi
+-
+-# func_echo_all arg...
+-# Invoke $ECHO with all args, space-separated.
+-func_echo_all ()
+-{
+- $ECHO "$*"
+-}
+-
+-case "$ECHO" in
+- printf*) AC_MSG_RESULT([printf]) ;;
+- print*) AC_MSG_RESULT([print -r]) ;;
+- *) AC_MSG_RESULT([cat]) ;;
-esac
-
--ECHO=${lt_ECHO-echo}
--if test "X[$]1" = X--no-reexec; then
-- # Discard the --no-reexec flag, and continue.
-- shift
--elif test "X[$]1" = X--fallback-echo; then
-- # Avoid inline document here, it may be left over
-- :
--elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
-- # Yippee, $ECHO works!
-- :
--else
-- # Restart under the correct shell.
-- exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
--fi
--
--if test "X[$]1" = X--fallback-echo; then
-- # used as fallback echo
-- shift
-- cat <<_LT_EOF
--[$]*
--_LT_EOF
-- exit 0
--fi
--
--# The HP-UX ksh and POSIX shell print the target directory to stdout
--# if CDPATH is set.
--(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
--
--if test -z "$lt_ECHO"; then
-- if test "X${echo_test_string+set}" != Xset; then
-- # find a string as large as possible, as long as the shell can cope with it
-- for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
-- # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-- if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
-- { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
-- then
-- break
-- fi
-- done
-- fi
--
-- if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
-- echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
-- test "X$echo_testing_string" = "X$echo_test_string"; then
-- :
-- else
-- # The Solaris, AIX, and Digital Unix default echo programs unquote
-- # backslashes. This makes it impossible to quote backslashes using
-- # echo "$something" | sed 's/\\/\\\\/g'
-- #
-- # So, first we look for a working echo in the user's PATH.
--
-- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-- for dir in $PATH /usr/ucb; do
-- IFS="$lt_save_ifs"
-- if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
-- test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
-- echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
-- test "X$echo_testing_string" = "X$echo_test_string"; then
-- ECHO="$dir/echo"
-- break
-- fi
-- done
-- IFS="$lt_save_ifs"
--
-- if test "X$ECHO" = Xecho; then
-- # We didn't find a better echo, so look for alternatives.
-- if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
-- echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
-- test "X$echo_testing_string" = "X$echo_test_string"; then
-- # This shell has a builtin print -r that does the trick.
-- ECHO='print -r'
-- elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
-- test "X$CONFIG_SHELL" != X/bin/ksh; then
-- # If we have ksh, try running configure again with it.
-- ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-- export ORIGINAL_CONFIG_SHELL
-- CONFIG_SHELL=/bin/ksh
-- export CONFIG_SHELL
-- exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
-- else
-- # Try using printf.
-- ECHO='printf %s\n'
-- if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
-- echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
-- test "X$echo_testing_string" = "X$echo_test_string"; then
-- # Cool, printf works
-- :
-- elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
-- test "X$echo_testing_string" = 'X\t' &&
-- echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-- test "X$echo_testing_string" = "X$echo_test_string"; then
-- CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
-- export CONFIG_SHELL
-- SHELL="$CONFIG_SHELL"
-- export SHELL
-- ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
-- elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
-- test "X$echo_testing_string" = 'X\t' &&
-- echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-- test "X$echo_testing_string" = "X$echo_test_string"; then
-- ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
-- else
-- # maybe with a smaller string...
-- prev=:
--
-- for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
-- if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
-- then
-- break
-- fi
-- prev="$cmd"
-- done
--
-- if test "$prev" != 'sed 50q "[$]0"'; then
-- echo_test_string=`eval $prev`
-- export echo_test_string
-- exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
-- else
-- # Oops. We lost completely, so just stick with echo.
-- ECHO=echo
-- fi
-- fi
-- fi
-- fi
-- fi
--fi
--
--# Copy echo and quote the copy suitably for passing to libtool from
--# the Makefile, instead of quoting the original, which is used later.
--lt_ECHO=$ECHO
--if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
-- lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
--fi
--
--AC_SUBST(lt_ECHO)
--])
+-m4_ifdef([_AS_DETECT_SUGGESTED],
+-[_AS_DETECT_SUGGESTED([
+- test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || (
+- ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+- ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+- ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+- PATH=/empty FPATH=/empty; export PATH FPATH
+- test "X`printf %s $ECHO`" = "X$ECHO" \
+- || test "X`print -r -- $ECHO`" = "X$ECHO" )])])
+-
-_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
--_LT_DECL([], [ECHO], [1],
-- [An echo program that does not interpret backslashes])
+-_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
-])# _LT_PROG_ECHO_BACKSLASH
-
-
@@ -1299,7 +1268,7 @@
- ;;
-*-*-irix6*)
- # Find out which ABI we are using.
-- echo '[#]line __oline__ "configure"' > conftest.$ac_ext
+- echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
- if AC_TRY_EVAL(ac_compile); then
- if test "$lt_cv_prog_gnu_ld" = yes; then
- case `/usr/bin/file conftest.$ac_objext` in
@@ -1451,10 +1420,19 @@
- esac
- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-fi
+-
+-case $host_os in
+- darwin*)
+- lock_old_archive_extraction=yes ;;
+- *)
+- lock_old_archive_extraction=no ;;
+-esac
-_LT_DECL([], [old_postinstall_cmds], [2])
-_LT_DECL([], [old_postuninstall_cmds], [2])
-_LT_TAGDECL([], [old_archive_cmds], [2],
- [Commands used to build an old-style archive])
+-_LT_DECL([], [lock_old_archive_extraction], [0],
+- [Whether to use a lock for old archive extraction])
-])# _LT_CMD_OLD_ARCHIVE
-
-
@@ -1479,15 +1457,15 @@
- -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:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+- (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
- (eval "$lt_compile" 2>conftest.err)
- ac_status=$?
- cat conftest.err >&AS_MESSAGE_LOG_FD
-- echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+- echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
- if (exit $ac_status) && test -s "$ac_outfile"; then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings other than the usual output.
-- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+- $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
- if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
- $2=yes
@@ -1527,7 +1505,7 @@
- if test -s conftest.err; then
- # Append any errors to the config.log.
- cat conftest.err 1>&AS_MESSAGE_LOG_FD
-- $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+- $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
- if diff conftest.exp conftest.er2 >/dev/null; then
- $2=yes
@@ -1587,6 +1565,11 @@
- # the test eventually succeeds (with a max line length of 256k).
- # Instead, let's just punt: use the minimum linelength reported by
- # all of the supported platforms: 8192 (on NT/2K/XP).
+- lt_cv_sys_max_cmd_len=8192;
+- ;;
+-
+- mint*)
+- # On MiNT this can take a long time and run out of memory.
- lt_cv_sys_max_cmd_len=8192;
- ;;
-
@@ -1654,8 +1637,8 @@
- # If test is not a shell built-in, we'll probably end up computing a
- # maximum length that is only half of the actual maximum length, but
- # we can't tell.
-- while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
-- = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
+- while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
+- = "X$teststring$teststring"; } >/dev/null 2>&1 &&
- test $i != 17 # 1/2 MB should be enough
- do
- i=`expr $i + 1`
@@ -1706,7 +1689,7 @@
- lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
- lt_status=$lt_dlunknown
- cat > conftest.$ac_ext <<_LT_EOF
--[#line __oline__ "configure"
+-[#line $LINENO "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
@@ -1747,7 +1730,13 @@
-# endif
-#endif
-
--void fnord() { int i=42;}
+-/* When -fvisbility=hidden is used, assume the code has been annotated
+- correspondingly for the symbols needed. */
+-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+-void fnord () __attribute__((visibility("default")));
+-#endif
+-
+-void fnord () { int i=42; }
-int main ()
-{
- void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
@@ -1756,7 +1745,11 @@
- if (self)
- {
- if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
-- else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+- else
+- {
+- if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+- else puts (dlerror ());
+- }
- /* dlclose (self); */
- }
- else
@@ -1932,16 +1925,16 @@
- -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:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+- (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&AS_MESSAGE_LOG_FD
-- echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+- echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
- if (exit $ac_status) && test -s out/conftest2.$ac_objext
- then
- # The compiler can only warn and ignore the option if not recognized
- # So say no if there are warnings
-- $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+- $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
- $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
- if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
- _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
@@ -2100,6 +2093,7 @@
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_OBJDUMP])dnl
-m4_require([_LT_DECL_SED])dnl
+-m4_require([_LT_CHECK_SHELL_FEATURES])dnl
-AC_MSG_CHECKING([dynamic linker characteristics])
-m4_if([$1],
- [], [
@@ -2108,16 +2102,23 @@
- darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
- *) lt_awk_arg="/^libraries:/" ;;
- esac
-- lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-- if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
+- case $host_os in
+- mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;;
+- *) lt_sed_strip_eq="s,=/,/,g" ;;
+- esac
+- lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
+- case $lt_search_path_spec in
+- *\;*)
- # if the path contains ";" then we assume it to be the separator
- # otherwise default to the standard path separator (i.e. ":") - it is
- # assumed that no part of a normal pathname contains ";" but that should
- # okay in the real world where ";" in dirpaths is itself problematic.
-- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
-- else
-- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-- fi
+- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
+- ;;
+- *)
+- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
+- ;;
+- esac
- # Ok, now we have the path, separated by spaces, we can step through it
- # and add multilib dir if necessary.
- lt_tmp_lt_search_path_spec=
@@ -2130,7 +2131,7 @@
- lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
- fi
- done
-- lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
+- lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
-BEGIN {RS=" "; FS="/|\n";} {
- lt_foo="";
- lt_count=0;
@@ -2150,7 +2151,13 @@
- if (lt_foo != "") { lt_freq[[lt_foo]]++; }
- if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
-}'`
-- sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
+- # AWK program above erroneously prepends '/' to C:/dos/paths
+- # for these hosts.
+- case $host_os in
+- mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
+- $SED 's,/\([[A-Za-z]]:\),\1,g'` ;;
+- esac
+- sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
-else
- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi])
@@ -2238,7 +2245,7 @@
- m68k)
- library_names_spec='$libname.ixlibrary $libname.a'
- # Create ${libname}_ixlibrary.a entries in /sys/libs.
-- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
- ;;
- esac
- ;;
@@ -2291,23 +2298,12 @@
- cygwin*)
- # Cygwin DLLs use 'cyg' prefix rather than 'lib'
- soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-- sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+-m4_if([$1], [],[
+- sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
- ;;
- mingw* | cegcc*)
- # MinGW DLLs use traditional 'lib' prefix
- soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-- sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-- if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
-- # It is most probably a Windows format PATH printed by
-- # mingw gcc, but we are running on Cygwin. Gcc prints its search
-- # path with ; separators, and with drive letters. We can handle the
-- # drive letters (cygwin fileutils understands them), so leave them,
-- # especially as we might pass files found there to a mingw objdump,
-- # which wouldn't understand a cygwinified path. Ahh.
-- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-- else
-- sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-- fi
- ;;
- pw32*)
- # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -2407,6 +2403,19 @@
- hardcode_into_libs=yes
- ;;
-
+-haiku*)
+- version_type=linux
+- need_lib_prefix=no
+- need_version=no
+- dynamic_linker="$host_os runtime_loader"
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+- soname_spec='${libname}${release}${shared_ext}$major'
+- shlibpath_var=LIBRARY_PATH
+- shlibpath_overrides_runpath=yes
+- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
+- hardcode_into_libs=yes
+- ;;
+-
-hpux9* | hpux10* | hpux11*)
- # Give a soname corresponding to the major version so that dld.sl refuses to
- # link against other versions.
@@ -2449,8 +2458,10 @@
- soname_spec='${libname}${release}${shared_ext}$major'
- ;;
- esac
-- # HP-UX runs *really* slowly unless shared libraries are mode 555.
+- # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
- postinstall_cmds='chmod 555 $lib'
+- # or fails outright, so override atomically:
+- install_override_mode=555
- ;;
-
-interix[[3-9]]*)
@@ -2508,7 +2519,7 @@
- ;;
-
-# This must be Linux ELF.
--linux* | k*bsd*-gnu)
+-linux* | k*bsd*-gnu | kopensolaris*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
@@ -2517,16 +2528,21 @@
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
+-
- # Some binutils ld are patched to set DT_RUNPATH
-- save_LDFLAGS=$LDFLAGS
-- save_libdir=$libdir
-- eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
-- LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
-- AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
-- [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
-- [shlibpath_overrides_runpath=yes])])
-- LDFLAGS=$save_LDFLAGS
-- libdir=$save_libdir
+- AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath],
+- [lt_cv_shlibpath_overrides_runpath=no
+- save_LDFLAGS=$LDFLAGS
+- save_libdir=$libdir
+- eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
+- LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
+- AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+- [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
+- [lt_cv_shlibpath_overrides_runpath=yes])])
+- LDFLAGS=$save_LDFLAGS
+- libdir=$save_libdir
+- ])
+- shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
-
- # This implies no fast_install, which is unacceptable.
- # Some rework will be needed to allow for fast_install
@@ -2538,8 +2554,9 @@
-
- # Append ld.so.conf contents to the search path
- if test -f /etc/ld.so.conf; then
-- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
+-
- fi
-
- # We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -2771,6 +2788,8 @@
- The last name is the one that the linker finds with -lNAME]])
-_LT_DECL([], [soname_spec], [1],
- [[The coded name of the library, if different from the real name]])
+-_LT_DECL([], [install_override_mode], [1],
+- [Permission mode override for installation of shared libraries])
-_LT_DECL([], [postinstall_cmds], [2],
- [Command to use after installation of a shared archive])
-_LT_DECL([], [postuninstall_cmds], [2],
@@ -2883,6 +2902,7 @@
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_DECL_EGREP])dnl
+-m4_require([_LT_PROG_ECHO_BACKSLASH])dnl
-
-AC_ARG_WITH([gnu-ld],
- [AS_HELP_STRING([--with-gnu-ld],
@@ -3012,8 +3032,8 @@
- fi
- ;;
-esac
--_LT_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl
--_LT_DECL([], [reload_cmds], [2])dnl
+-_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl
+-_LT_TAGDECL([], [reload_cmds], [2])dnl
-])# _LT_CMD_RELOAD
-
-
@@ -3065,16 +3085,18 @@
- # Base MSYS/MinGW do not provide the 'file' command needed by
- # func_win32_libid shell function, so use a weaker test based on 'objdump',
- # unless we find 'file', for example because we are cross-compiling.
-- if ( file / ) >/dev/null 2>&1; then
+- # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
+- if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
- lt_cv_file_magic_cmd='func_win32_libid'
- else
-- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+- # Keep this pattern in sync with the one in func_win32_libid.
+- lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
- lt_cv_file_magic_cmd='$OBJDUMP -f'
- fi
- ;;
-
--cegcc)
+-cegcc*)
- # use the weaker test based on 'objdump'. See mingw*.
- lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
- lt_cv_file_magic_cmd='$OBJDUMP -f'
@@ -3104,6 +3126,10 @@
- lt_cv_deplibs_check_method=pass_all
- ;;
-
+-haiku*)
+- lt_cv_deplibs_check_method=pass_all
+- ;;
+-
-hpux10.20* | hpux11*)
- lt_cv_file_magic_cmd=/usr/bin/file
- case $host_cpu in
@@ -3112,11 +3138,11 @@
- lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
- ;;
- hppa*64*)
-- [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
+- [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]']
- lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
- ;;
- *)
-- lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
+- lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library'
- lt_cv_file_magic_test_file=/usr/lib/libc.sl
- ;;
- esac
@@ -3138,7 +3164,7 @@
- ;;
-
-# This must be Linux ELF.
--linux* | k*bsd*-gnu)
+-linux* | k*bsd*-gnu | kopensolaris*-gnu)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
@@ -3280,7 +3306,19 @@
- NM="$lt_cv_path_NM"
-else
- # Didn't find any BSD compatible name lister, look for dumpbin.
-- AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :)
+- if test -n "$DUMPBIN"; then :
+- # Let the user override the test.
+- else
+- AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :)
+- case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
+- *COFF*)
+- DUMPBIN="$DUMPBIN -symbols"
+- ;;
+- *)
+- DUMPBIN=:
+- ;;
+- esac
+- fi
- AC_SUBST([DUMPBIN])
- if test "$DUMPBIN" != ":"; then
- NM="$DUMPBIN"
@@ -3293,13 +3331,13 @@
-AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
- [lt_cv_nm_interface="BSD nm"
- echo "int some_variable = 0;" > conftest.$ac_ext
-- (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
+- (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
- (eval "$ac_compile" 2>conftest.err)
- cat conftest.err >&AS_MESSAGE_LOG_FD
-- (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
+- (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
- (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
- cat conftest.err >&AS_MESSAGE_LOG_FD
-- (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD)
+- (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD)
- cat conftest.out >&AS_MESSAGE_LOG_FD
- if $GREP 'External.*some_variable' conftest.out > /dev/null; then
- lt_cv_nm_interface="MS dumpbin"
@@ -3322,7 +3360,7 @@
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-LIBM=
-case $host in
--*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
+-*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
- # These system don't have libm, or don't need it
- ;;
-*-ncr-sysv4.3*)
@@ -3350,7 +3388,12 @@
-_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-
-if test "$GCC" = yes; then
-- _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+- case $cc_basename in
+- nvcc*)
+- _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
+- *)
+- _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;;
+- esac
-
- _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
- lt_cv_prog_compiler_rtti_exceptions,
@@ -3367,6 +3410,7 @@
-m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_PROG_CC])dnl
+-AC_REQUIRE([AC_PROG_AWK])dnl
-AC_REQUIRE([LT_PATH_NM])dnl
-AC_REQUIRE([LT_PATH_LD])dnl
-m4_require([_LT_DECL_SED])dnl
@@ -3492,7 +3536,7 @@
- if AC_TRY_EVAL(ac_compile); then
- # Now try to grab the symbols.
- nlist=conftest.nm
-- if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
+- if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
- # Try sorting and uniquifying the output.
- if sort "$nlist" | uniq > "$nlist"T; then
- mv -f "$nlist"T "$nlist"
@@ -3653,6 +3697,11 @@
- *djgpp*)
- # DJGPP does not support shared libraries at all
- _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+- ;;
+- haiku*)
+- # PIC is the default for Haiku.
+- # The "-static" flag exists, but is broken.
+- _LT_TAGVAR(lt_prog_compiler_static, $1)=
- ;;
- interix[[3-9]]*)
- # Interix 3.x gcc -fpic/-fPIC options generate broken code.
@@ -3759,7 +3808,7 @@
- ;;
- esac
- ;;
-- linux* | k*bsd*-gnu)
+- linux* | k*bsd*-gnu | kopensolaris*-gnu)
- case $cc_basename in
- KCC*)
- # KAI C++ Compiler
@@ -3792,8 +3841,8 @@
- _LT_TAGVAR(lt_prog_compiler_pic, $1)=
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
- ;;
-- xlc* | xlC*)
-- # IBM XL 8.0 on PPC
+- xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*)
+- # IBM XL 8.0, 9.0 on PPC and BlueGene
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
@@ -3855,7 +3904,7 @@
- ;;
- solaris*)
- case $cc_basename in
-- CC*)
+- CC* | sunCC*)
- # Sun C++ 4.2, 5.x and Centerline C++
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
@@ -3959,6 +4008,12 @@
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
- ;;
-
+- haiku*)
+- # PIC is the default for Haiku.
+- # The "-static" flag exists, but is broken.
+- _LT_TAGVAR(lt_prog_compiler_static, $1)=
+- ;;
+-
- hpux*)
- # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
- # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
@@ -3999,6 +4054,13 @@
-
- *)
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+- ;;
+- esac
+-
+- case $cc_basename in
+- nvcc*) # Cuda Compiler Driver 2.2
+- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
+- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC'
- ;;
- esac
- else
@@ -4043,7 +4105,7 @@
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
- ;;
-
-- linux* | k*bsd*-gnu)
+- linux* | k*bsd*-gnu | kopensolaris*-gnu)
- case $cc_basename in
- # old Intel for x86_64 which still supported -KPIC.
- ecc*)
@@ -4064,7 +4126,7 @@
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
- ;;
-- pgcc* | pgf77* | pgf90* | pgf95*)
+- pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
- # Portland Group compilers (*not* the Pentium gcc compiler,
- # which looks to be a dead project)
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
@@ -4076,26 +4138,26 @@
- # All Alpha code is PIC.
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
- ;;
-- xl*)
-- # IBM XL C 8.0/Fortran 10.1 on PPC
+- xl* | bgxl* | bgf* | mpixl*)
+- # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
- ;;
- *)
- case `$CC -V 2>&1 | sed 5q` in
+- *Sun\ F* | *Sun*Fortran*)
+- # Sun Fortran 8.3 passes all unrecognized flags to the linker
+- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+- _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
+- ;;
- *Sun\ C*)
- # Sun C 5.9
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- ;;
-- *Sun\ F*)
-- # Sun Fortran 8.3 passes all unrecognized flags to the linker
-- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-- _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
-- ;;
- esac
- ;;
- esac
@@ -4126,7 +4188,7 @@
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- case $cc_basename in
-- f77* | f90* | f95*)
+- f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
- *)
- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
@@ -4236,8 +4298,10 @@
- aix[[4-9]]*)
- # If we're using GNU nm, then we don't want the "-C" option.
- # -C means demangle to AIX nm, but means don't demangle with GNU nm
+- # Also, AIX nm treats weak defined symbols like other global defined
+- # symbols, whereas GNU nm marks them as "W".
- if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
- else
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
- fi
@@ -4315,7 +4379,33 @@
- esac
-
- _LT_TAGVAR(ld_shlibs, $1)=yes
+-
+- # On some targets, GNU ld is compatible enough with the native linker
+- # that we're better off using the native interface for both.
+- lt_use_gnu_ld_interface=no
- if test "$with_gnu_ld" = yes; then
+- case $host_os in
+- aix*)
+- # The AIX port of GNU ld has always aspired to compatibility
+- # with the native linker. However, as the warning in the GNU ld
+- # block says, versions before 2.19.5* couldn't really create working
+- # shared libraries, regardless of the interface used.
+- case `$LD -v 2>&1` in
+- *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
+- *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;;
+- *\ \(GNU\ Binutils\)\ [[3-9]]*) ;;
+- *)
+- lt_use_gnu_ld_interface=yes
+- ;;
+- esac
+- ;;
+- *)
+- lt_use_gnu_ld_interface=yes
+- ;;
+- esac
+- fi
+-
+- if test "$lt_use_gnu_ld_interface" = yes; then
- # If archive_cmds runs LD, not CC, wlarc should be empty
- wlarc='${wl}'
-
@@ -4333,6 +4423,7 @@
- fi
- supports_anon_versioning=no
- case `$LD -v 2>&1` in
+- *GNU\ gold*) supports_anon_versioning=yes ;;
- *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
- *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
- *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
@@ -4348,11 +4439,12 @@
- _LT_TAGVAR(ld_shlibs, $1)=no
- cat <<_LT_EOF 1>&2
-
--*** Warning: the GNU linker, at least up to release 2.9.1, is reported
+-*** Warning: the GNU linker, at least up to release 2.19, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support. If you
--*** really care for shared libraries, you may want to modify your PATH
--*** so that a non-GNU linker is found, and then restart.
+-*** really care for shared libraries, you may want to install binutils
+-*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
+-*** You will then need to restart the configuration process.
-
-_LT_EOF
- fi
@@ -4388,6 +4480,7 @@
- # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
- # as there is no search path for DLLs.
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
- _LT_TAGVAR(always_export_symbols, $1)=no
- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
@@ -4409,6 +4502,11 @@
- fi
- ;;
-
+- haiku*)
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+- _LT_TAGVAR(link_all_deplibs, $1)=yes
+- ;;
+-
- interix[[3-9]]*)
- _LT_TAGVAR(hardcode_direct, $1)=no
- _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -4424,7 +4522,7 @@
- _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- ;;
-
-- gnu* | linux* | tpf* | k*bsd*-gnu)
+- gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
- tmp_diet=no
- if test "$host_os" = linux-dietlibc; then
- case $cc_basename in
@@ -4438,11 +4536,12 @@
- tmp_sharedflag='-shared'
- case $cc_basename,$host_cpu in
- pgcc*) # Portland Group C compiler
-- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
- tmp_addflag=' $pic_flag'
- ;;
-- pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers
-- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+- pgf77* | pgf90* | pgf95* | pgfortran*)
+- # Portland Group f77 and f90 compilers
+- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
- tmp_addflag=' $pic_flag -Mnomain' ;;
- ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
- tmp_addflag=' -i_dynamic' ;;
@@ -4453,13 +4552,17 @@
- lf95*) # Lahey Fortran 8.1
- _LT_TAGVAR(whole_archive_flag_spec, $1)=
- tmp_sharedflag='--shared' ;;
-- xl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
+- xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
- tmp_sharedflag='-qmkshrobj'
- tmp_addflag= ;;
+- nvcc*) # Cuda Compiler Driver 2.2
+- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+- _LT_TAGVAR(compiler_needs_object, $1)=yes
+- ;;
- esac
- case `$CC -V 2>&1 | sed 5q` in
- *Sun\ C*) # Sun C 5.9
-- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
- _LT_TAGVAR(compiler_needs_object, $1)=yes
- tmp_sharedflag='-G' ;;
- *Sun\ F*) # Sun Fortran 8.3
@@ -4475,17 +4578,17 @@
- fi
-
- case $cc_basename in
-- xlf*)
+- xlf* | bgf* | bgxlf* | mpixlf*)
- # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
- _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
- _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
-- _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
+- _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
- if test "x$supports_anon_versioning" = xyes; then
- _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
- echo "local: *; };" >> $output_objdir/$libname.ver~
-- $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+- $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
- fi
- ;;
- esac
@@ -4606,8 +4709,10 @@
- else
- # If we're using GNU nm, then we don't want the "-C" option.
- # -C means demangle to AIX nm, but means don't demangle with GNU nm
+- # Also, AIX nm treats weak defined symbols like other global
+- # defined symbols, whereas GNU nm marks them as "W".
- if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
- else
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
- fi
@@ -4696,7 +4801,7 @@
- # empty executable.
- _LT_SYS_MODULE_PATH_AIX
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
- else
- if test "$host_cpu" = ia64; then
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
@@ -4711,8 +4816,13 @@
- # -berok will link without error, but may produce a broken library.
- _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-- # Exported symbols can be pulled into shared objects from archives
-- _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+- if test "$with_gnu_ld" = yes; then
+- # We only use this code for GNU lds that support --whole-archive.
+- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+- else
+- # Exported symbols can be pulled into shared objects from archives
+- _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+- fi
- _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
- # This is similar to how AIX traditionally builds its shared libraries.
- _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
@@ -4751,7 +4861,7 @@
- # Tell ltmain to make .dll files, not .so files.
- shrext_cmds=".dll"
- # FIXME: Setting linknames here is a bad hack.
-- _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
+- _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
- # The linker will automatically build a .lib file if we build a DLL.
- _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
- # FIXME: Should let the user specify the lib program.
@@ -4818,7 +4928,7 @@
- ;;
-
- hpux10*)
-- if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+- if test "$GCC" = yes && test "$with_gnu_ld" = no; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
- else
- _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
@@ -4837,7 +4947,7 @@
- ;;
-
- hpux11*)
-- if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+- if test "$GCC" = yes && test "$with_gnu_ld" = no; then
- case $host_cpu in
- hppa*64*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -4858,7 +4968,14 @@
- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
- ;;
- *)
-- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+- m4_if($1, [], [
+- # Older versions of the 11.00 compiler do not understand -b yet
+- # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
+- _LT_LINKER_OPTION([if $CC understands -b],
+- _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b],
+- [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
+- [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])],
+- [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'])
- ;;
- esac
- fi
@@ -4886,19 +5003,19 @@
-
- irix5* | irix6* | nonstopux*)
- if test "$GCC" = yes; then
-- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- # Try to use the -exported_symbol ld option, if it does not
- # work, assume that -exports_file does not work either and
- # implicitly export all symbols.
- save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
- AC_LINK_IFELSE(int foo(void) {},
-- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
- )
- LDFLAGS="$save_LDFLAGS"
- else
-- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
- fi
- _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
@@ -4960,17 +5077,17 @@
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_TAGVAR(hardcode_minus_L, $1)=yes
- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-- _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+- _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
- _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
- ;;
-
- osf3*)
- if test "$GCC" = yes; then
- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- else
- _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
- fi
- _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
@@ -4980,13 +5097,13 @@
- osf4* | osf5*) # as osf3* with the addition of -msym flag
- if test "$GCC" = yes; then
- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- else
- _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-- $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+- $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
-
- # Both c and cxx compiler support -rpath directly
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
@@ -5177,36 +5294,38 @@
- # Test whether the compiler implicitly links with -lc since on some
- # systems, -lgcc has to come before -lc. If gcc already passes -lc
- # to ld, don't add -lc before -lgcc.
-- AC_MSG_CHECKING([whether -lc should be explicitly linked in])
-- $RM conftest*
-- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
--
-- if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
-- soname=conftest
-- lib=conftest
-- libobjs=conftest.$ac_objext
-- deplibs=
-- wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
-- pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
-- compiler_flags=-v
-- linker_flags=-v
-- verstring=
-- output_objdir=.
-- libname=conftest
-- lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
-- _LT_TAGVAR(allow_undefined_flag, $1)=
-- if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
-- then
-- _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-- else
-- _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-- fi
-- _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
-- else
-- cat conftest.err 1>&5
-- fi
-- $RM conftest*
-- AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)])
+- AC_CACHE_CHECK([whether -lc should be explicitly linked in],
+- [lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1),
+- [$RM conftest*
+- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+-
+- if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
+- soname=conftest
+- lib=conftest
+- libobjs=conftest.$ac_objext
+- deplibs=
+- wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
+- pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
+- compiler_flags=-v
+- linker_flags=-v
+- verstring=
+- output_objdir=.
+- libname=conftest
+- lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
+- _LT_TAGVAR(allow_undefined_flag, $1)=
+- if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
+- then
+- lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+- else
+- lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+- fi
+- _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
+- else
+- cat conftest.err 1>&5
+- fi
+- $RM conftest*
+- ])
+- _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)
- ;;
- esac
- fi
@@ -5372,14 +5491,14 @@
-])# _LT_LANG_C_CONFIG
-
-
--# _LT_PROG_CXX
--# ------------
--# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++
--# compiler, we have our own version here.
--m4_defun([_LT_PROG_CXX],
--[
--pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes])
--AC_PROG_CXX
+-# _LT_LANG_CXX_CONFIG([TAG])
+-# --------------------------
+-# Ensure that the configuration variables for a C++ compiler are suitably
+-# defined. These variables are subsequently used by _LT_CONFIG to write
+-# the compiler configuration to `libtool'.
+-m4_defun([_LT_LANG_CXX_CONFIG],
+-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+-m4_require([_LT_DECL_EGREP])dnl
-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
- (test "X$CXX" != "Xg++"))) ; then
@@ -5387,22 +5506,6 @@
-else
- _lt_caught_CXX_error=yes
-fi
--popdef([AC_MSG_ERROR])
--])# _LT_PROG_CXX
--
--dnl aclocal-1.4 backwards compatibility:
--dnl AC_DEFUN([_LT_PROG_CXX], [])
--
--
--# _LT_LANG_CXX_CONFIG([TAG])
--# --------------------------
--# Ensure that the configuration variables for a C++ compiler are suitably
--# defined. These variables are subsequently used by _LT_CONFIG to write
--# the compiler configuration to `libtool'.
--m4_defun([_LT_LANG_CXX_CONFIG],
--[AC_REQUIRE([_LT_PROG_CXX])dnl
--m4_require([_LT_FILEUTILS_DEFAULTS])dnl
--m4_require([_LT_DECL_EGREP])dnl
-
-AC_LANG_PUSH(C++)
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
@@ -5424,6 +5527,8 @@
-_LT_TAGVAR(module_expsym_cmds, $1)=
-_LT_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+-_LT_TAGVAR(reload_flag, $1)=$reload_flag
+-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-_LT_TAGVAR(no_undefined_flag, $1)=
-_LT_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
@@ -5526,7 +5631,7 @@
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
-- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-
- else
- GXX=no
@@ -5638,7 +5743,7 @@
- _LT_SYS_MODULE_PATH_AIX
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-
-- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
- else
- if test "$host_cpu" = ia64; then
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
@@ -5653,8 +5758,13 @@
- # -berok will link without error, but may produce a broken library.
- _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-- # Exported symbols can be pulled into shared objects from archives
-- _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+- if test "$with_gnu_ld" = yes; then
+- # We only use this code for GNU lds that support --whole-archive.
+- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+- else
+- # Exported symbols can be pulled into shared objects from archives
+- _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+- fi
- _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
- # This is similar to how AIX traditionally builds its shared
- # libraries.
@@ -5687,6 +5797,7 @@
- # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
- # as there is no search path for DLLs.
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
- _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
- _LT_TAGVAR(always_export_symbols, $1)=no
- _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
@@ -5747,6 +5858,11 @@
- gnu*)
- ;;
-
+- haiku*)
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+- _LT_TAGVAR(link_all_deplibs, $1)=yes
+- ;;
+-
- hpux9*)
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
- _LT_TAGVAR(hardcode_libdir_separator, $1)=:
@@ -5771,7 +5887,7 @@
- # explicitly linking system object files so we need to strip them
- # from the output so that they don't get included in the library
- # dependencies.
-- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
- ;;
- *)
- if test "$GXX" = yes; then
@@ -5836,7 +5952,7 @@
- # explicitly linking system object files so we need to strip them
- # from the output so that they don't get included in the library
- # dependencies.
-- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
- ;;
- *)
- if test "$GXX" = yes; then
@@ -5879,7 +5995,7 @@
- case $cc_basename in
- CC*)
- # SGI C++
-- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-
- # Archives containing C++ object files must be created using
- # "CC -ar", where "CC" is the IRIX C++ compiler. This is
@@ -5890,9 +6006,9 @@
- *)
- if test "$GXX" = yes; then
- if test "$with_gnu_ld" = no; then
-- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- else
-- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib'
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
- fi
- fi
- _LT_TAGVAR(link_all_deplibs, $1)=yes
@@ -5903,7 +6019,7 @@
- _LT_TAGVAR(inherit_rpath, $1)=yes
- ;;
-
-- linux* | k*bsd*-gnu)
+- linux* | k*bsd*-gnu | kopensolaris*-gnu)
- case $cc_basename in
- KCC*)
- # Kuck and Associates, Inc. (KAI) C++ Compiler
@@ -5921,7 +6037,7 @@
- # explicitly linking system object files so we need to strip them
- # from the output so that they don't get included in the library
- # dependencies.
-- output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+- output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
@@ -5958,26 +6074,26 @@
- pgCC* | pgcpp*)
- # Portland Group C++ compiler
- case `$CC -V` in
-- *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*)
+- *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*)
- _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
- rm -rf $tpldir~
- $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
-- compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
+- compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
- _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
- rm -rf $tpldir~
- $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
-- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
+- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
- $RANLIB $oldlib'
- _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
- rm -rf $tpldir~
- $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
- rm -rf $tpldir~
- $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
- ;;
-- *) # Version 6 will use weak symbols
+- *) # Version 6 and above use weak symbols
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
- ;;
@@ -5985,7 +6101,7 @@
-
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
- ;;
- cxx*)
- # Compaq C++
@@ -6004,9 +6120,9 @@
- # explicitly linking system object files so we need to strip them
- # from the output so that they don't get included in the library
- # dependencies.
-- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "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 "X$list" | $Xsed'
+- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
- ;;
-- xl*)
+- xl* | mpixl* | bgxl*)
- # IBM XL 8.0 on PPC, with GNU ld
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
@@ -6026,13 +6142,13 @@
- _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
- _LT_TAGVAR(compiler_needs_object, $1)=yes
-
- # Not sure whether something based on
- # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
- # would be better.
-- output_verbose_link_cmd='echo'
+- output_verbose_link_cmd='func_echo_all'
-
- # Archives containing C++ object files must be created using
- # "CC -xar", where "CC" is the Sun C++ compiler. This is
@@ -6101,7 +6217,7 @@
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
- _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
- fi
-- output_verbose_link_cmd=echo
+- output_verbose_link_cmd=func_echo_all
- else
- _LT_TAGVAR(ld_shlibs, $1)=no
- fi
@@ -6136,15 +6252,15 @@
- case $host in
- osf3*)
- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- ;;
- *)
- _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
- echo "-hidden">> $lib.exp~
-- $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~
+- $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~
- $RM $lib.exp'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
- ;;
@@ -6160,17 +6276,17 @@
- # explicitly linking system object files so we need to strip them
- # from the output so that they don't get included in the library
- # dependencies.
-- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "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 "X$list" | $Xsed'
+- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
- ;;
- *)
- if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- case $host in
- osf3*)
-- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- ;;
- *)
-- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- ;;
- esac
-
@@ -6180,7 +6296,7 @@
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
-- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-
- else
- # FIXME: insert proper C++ library support
@@ -6216,7 +6332,7 @@
-
- solaris*)
- case $cc_basename in
-- CC*)
+- CC* | sunCC*)
- # Sun C++ 4.2, 5.x and Centerline C++
- _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
- _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
@@ -6237,7 +6353,7 @@
- esac
- _LT_TAGVAR(link_all_deplibs, $1)=yes
-
-- output_verbose_link_cmd='echo'
+- output_verbose_link_cmd='func_echo_all'
-
- # Archives containing C++ object files must be created using
- # "CC -xar", where "CC" is the Sun C++ compiler. This is
@@ -6264,7 +6380,7 @@
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
-- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
- else
- # g++ 2.7 appears to require `-G' NOT `-shared' on this
- # platform.
@@ -6275,7 +6391,7 @@
- # Commands to make compiler produce verbose output that lists
- # what "hidden" libraries, object files and flags are used when
- # linking a shared library.
-- output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+- output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
- fi
-
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
@@ -6329,6 +6445,10 @@
- CC*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+- _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~
+- '"$_LT_TAGVAR(old_archive_cmds, $1)"
+- _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
+- '"$_LT_TAGVAR(reload_cmds, $1)"
- ;;
- *)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -6575,7 +6695,7 @@
-
-solaris*)
- case $cc_basename in
-- CC*)
+- CC* | sunCC*)
- # The more standards-conforming stlport4 library is
- # incompatible with the Cstd library. Avoid specifying
- # it if it's in CXXFLAGS. Ignore libCrun as
@@ -6619,32 +6739,16 @@
-])# _LT_SYS_HIDDEN_LIBDEPS
-
-
--# _LT_PROG_F77
--# ------------
--# Since AC_PROG_F77 is broken, in that it returns the empty string
--# if there is no fortran compiler, we have our own version here.
--m4_defun([_LT_PROG_F77],
--[
--pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes])
--AC_PROG_F77
--if test -z "$F77" || test "X$F77" = "Xno"; then
-- _lt_disable_F77=yes
--fi
--popdef([AC_MSG_ERROR])
--])# _LT_PROG_F77
--
--dnl aclocal-1.4 backwards compatibility:
--dnl AC_DEFUN([_LT_PROG_F77], [])
--
--
-# _LT_LANG_F77_CONFIG([TAG])
-# --------------------------
-# Ensure that the configuration variables for a Fortran 77 compiler are
-# suitably defined. These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_F77_CONFIG],
--[AC_REQUIRE([_LT_PROG_F77])dnl
--AC_LANG_PUSH(Fortran 77)
+-[AC_LANG_PUSH(Fortran 77)
+-if test -z "$F77" || test "X$F77" = "Xno"; then
+- _lt_disable_F77=yes
+-fi
-
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_TAGVAR(allow_undefined_flag, $1)=
@@ -6663,6 +6767,8 @@
-_LT_TAGVAR(module_expsym_cmds, $1)=
-_LT_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+-_LT_TAGVAR(reload_flag, $1)=$reload_flag
+-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-_LT_TAGVAR(no_undefined_flag, $1)=
-_LT_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
@@ -6762,32 +6868,17 @@
-])# _LT_LANG_F77_CONFIG
-
-
--# _LT_PROG_FC
--# -----------
--# Since AC_PROG_FC is broken, in that it returns the empty string
--# if there is no fortran compiler, we have our own version here.
--m4_defun([_LT_PROG_FC],
--[
--pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes])
--AC_PROG_FC
--if test -z "$FC" || test "X$FC" = "Xno"; then
-- _lt_disable_FC=yes
--fi
--popdef([AC_MSG_ERROR])
--])# _LT_PROG_FC
--
--dnl aclocal-1.4 backwards compatibility:
--dnl AC_DEFUN([_LT_PROG_FC], [])
--
--
-# _LT_LANG_FC_CONFIG([TAG])
-# -------------------------
-# Ensure that the configuration variables for a Fortran compiler are
-# suitably defined. These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_FC_CONFIG],
--[AC_REQUIRE([_LT_PROG_FC])dnl
--AC_LANG_PUSH(Fortran)
+-[AC_LANG_PUSH(Fortran)
+-
+-if test -z "$FC" || test "X$FC" = "Xno"; then
+- _lt_disable_FC=yes
+-fi
-
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_TAGVAR(allow_undefined_flag, $1)=
@@ -6806,6 +6897,8 @@
-_LT_TAGVAR(module_expsym_cmds, $1)=
-_LT_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+-_LT_TAGVAR(reload_flag, $1)=$reload_flag
+-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-_LT_TAGVAR(no_undefined_flag, $1)=
-_LT_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
@@ -6951,6 +7044,8 @@
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+-_LT_TAGVAR(reload_flag, $1)=$reload_flag
+-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-
-if test -n "$compiler"; then
- _LT_COMPILER_NO_RTTI($1)
@@ -7312,7 +7407,7 @@
-func_dirname ()
-{
- # Extract subdirectory from the argument.
-- func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
+- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
- if test "X$func_dirname_result" = "X${1}"; then
- func_dirname_result="${3}"
- else
@@ -7323,7 +7418,7 @@
-# func_basename file
-func_basename ()
-{
-- func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
+- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
-}
-
-dnl func_dirname_and_basename
@@ -7339,10 +7434,8 @@
-func_stripname ()
-{
- case ${2} in
-- .*) func_stripname_result=`$ECHO "X${3}" \
-- | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
-- *) func_stripname_result=`$ECHO "X${3}" \
-- | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
+- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
+- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
- esac
-}
-
@@ -7353,20 +7446,20 @@
-# func_opt_split
-func_opt_split ()
-{
-- func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
-- func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
+- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
+- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
-}
-
-# func_lo2o object
-func_lo2o ()
-{
-- func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
+- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
-}
-
-# func_xform libobj-or-source
-func_xform ()
-{
-- func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'`
+- func_xform_result=`$ECHO "${1}" | $SED 's/\.[[^.]]*$/.lo/'`
-}
-
-# func_arith arithmetic-term...
@@ -7414,14 +7507,15 @@
-
-# Helper functions for option handling. -*- Autoconf -*-
-#
--# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
+-# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
-# Written by Gary V. Vaughan, 2004
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
--# serial 6 ltoptions.m4
+-# serial 7 ltoptions.m4
-
-# This is to help aclocal find these macros, as it can't see m4_define.
-AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
@@ -7536,7 +7630,7 @@
-[enable_win32_dll=yes
-
-case $host in
--*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
+-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
- AC_CHECK_TOOL(AS, as, false)
- AC_CHECK_TOOL(DLLTOOL, dlltool, false)
- AC_CHECK_TOOL(OBJDUMP, objdump, false)
@@ -7544,13 +7638,13 @@
-esac
-
-test -z "$AS" && AS=as
--_LT_DECL([], [AS], [0], [Assembler program])dnl
+-_LT_DECL([], [AS], [1], [Assembler program])dnl
-
-test -z "$DLLTOOL" && DLLTOOL=dlltool
--_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl
+-_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl
-
-test -z "$OBJDUMP" && OBJDUMP=objdump
--_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl
+-_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl
-])# win32-dll
-
-AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
@@ -7910,29 +8004,29 @@
-
-# Generated from ltversion.in.
-
--# serial 3017 ltversion.m4
+-# serial 3175 ltversion.m4
-# This file is part of GNU Libtool
-
--m4_define([LT_PACKAGE_VERSION], [2.2.6b])
--m4_define([LT_PACKAGE_REVISION], [1.3017])
+-m4_define([LT_PACKAGE_VERSION], [2.2.10])
+-m4_define([LT_PACKAGE_REVISION], [1.3175])
-
-AC_DEFUN([LTVERSION_VERSION],
--[macro_version='2.2.6b'
--macro_revision='1.3017'
+-[macro_version='2.2.10'
+-macro_revision='1.3175'
-_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
-_LT_DECL(, macro_revision, 0)
-])
-
-# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*-
-#
--# Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
+-# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
-# Written by Scott James Remnant, 2004.
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
--# serial 4 lt~obsolete.m4
+-# serial 5 lt~obsolete.m4
-
-# These exist entirely to fool aclocal when bootstrapping libtool.
-#
@@ -8002,7 +8096,6 @@
-m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])])
-m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])])
-m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])])
--m4_ifndef([AC_LIBTOOL_RC], [AC_DEFUN([AC_LIBTOOL_RC])])
-m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
-m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
-m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
@@ -8015,11 +8108,99 @@
-m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
-m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])])
-m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
+-m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS], [AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])
+-m4_ifndef([_LT_AC_PROG_CXXCPP], [AC_DEFUN([_LT_AC_PROG_CXXCPP])])
+-m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS], [AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])
+-m4_ifndef([_LT_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])
+-m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])])
+-m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])])
+-m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])])
-
# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
# serial 1 (pkg-config-0.24)
#
-@@ -9922,5 +1911,11 @@
+@@ -8808,7 +709,7 @@
+ AC_MSG_RESULT([no])
+ PKG_CONFIG=""
+ fi
+-fi[]
++fi[]dnl
+ ])# PKG_PROG_PKG_CONFIG
+
+ # PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+@@ -8822,12 +723,12 @@
+ # have to call PKG_CHECK_EXISTS manually
+ # --------------------------------------------------------------
+ AC_DEFUN([PKG_CHECK_EXISTS],
+-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+ if test -n "$PKG_CONFIG" && \
+ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
+ m4_default([$2], [:])
+ m4_ifvaln([$3], [else
+- $3])
++ $3])dnl
+ fi])
+
+ # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+@@ -8841,7 +742,7 @@
+ [pkg_failed=yes])
+ else
+ pkg_failed=untried
+-fi[]
++fi[]dnl
+ ])# _PKG_CONFIG
+
+ # _PKG_SHORT_ERRORS_SUPPORTED
+@@ -8852,7 +753,7 @@
+ _pkg_short_errors_supported=yes
+ else
+ _pkg_short_errors_supported=no
+-fi[]
++fi[]dnl
+ ])# _PKG_SHORT_ERRORS_SUPPORTED
+
+
+@@ -8867,9 +768,9 @@
+ #
+ # --------------------------------------------------------------
+ AC_DEFUN([PKG_CHECK_MODULES],
+-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+-AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])
+-AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])
++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
++AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
++AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
+
+ pkg_failed=no
+ AC_MSG_CHECKING([for $1])
+@@ -8900,7 +801,7 @@
+ Consider adjusting the PKG_CONFIG_PATH environment variable if you
+ installed software in a non-standard prefix.
+
+-_PKG_TEXT])
++_PKG_TEXT])dnl
+ ])
+ elif test $pkg_failed = untried; then
+ AC_MSG_RESULT([no])
+@@ -8911,14 +812,14 @@
+
+ _PKG_TEXT
+
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.])dnl
+ ])
+ else
+ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+ AC_MSG_RESULT([yes])
+ $3
+-fi[]
++fi[]dnl
+ ])# PKG_CHECK_MODULES
+
+ # Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+@@ -10010,5 +1911,11 @@
AC_SUBST([am__untar])
]) # _AM_PROG_TAR
@@ -8031,9 +8212,10 @@
+m4_include([m4/ltversion.m4])
+m4_include([m4/lt~obsolete.m4])
m4_include([acinclude.m4])
-diff -Naur gtk+2.0-2.21.2.old/build/Makefile.in gtk+2.0-2.21.2/build/Makefile.in
---- gtk+2.0-2.21.2.old/build/Makefile.in 2010-06-10 19:18:21.000000000 +0200
-+++ gtk+2.0-2.21.2/build/Makefile.in 2010-06-11 12:26:15.334613346 +0200
+Index: gtk+2.0-2.21.5/build/Makefile.in
+===================================================================
+--- gtk+2.0-2.21.5.orig/build/Makefile.in 2010-07-22 17:59:08.757060229 +0200
++++ gtk+2.0-2.21.5/build/Makefile.in 2010-07-22 17:58:44.326051820 +0200
@@ -39,11 +39,14 @@
$(top_srcdir)/Makefile.decl
subdir = build
@@ -8051,17 +8233,26 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -170,6 +173,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
+@@ -157,6 +160,7 @@
+ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.2.old/build/win32/Makefile.in gtk+2.0-2.21.2/build/win32/Makefile.in
---- gtk+2.0-2.21.2.old/build/win32/Makefile.in 2010-06-10 19:18:21.000000000 +0200
-+++ gtk+2.0-2.21.2/build/win32/Makefile.in 2010-06-11 12:26:15.502613115 +0200
+@@ -307,6 +311,7 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ ms_librarian = @ms_librarian@
+Index: gtk+2.0-2.21.5/build/win32/Makefile.in
+===================================================================
+--- gtk+2.0-2.21.5.orig/build/win32/Makefile.in 2010-07-22 17:59:08.705081202 +0200
++++ gtk+2.0-2.21.5/build/win32/Makefile.in 2010-07-22 17:58:44.394051311 +0200
@@ -39,11 +39,14 @@
$(top_srcdir)/Makefile.decl
subdir = build/win32
@@ -8079,17 +8270,26 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -170,6 +173,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
+@@ -157,6 +160,7 @@
+ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.2.old/build/win32/vs9/Makefile.in gtk+2.0-2.21.2/build/win32/vs9/Makefile.in
---- gtk+2.0-2.21.2.old/build/win32/vs9/Makefile.in 2010-06-10 19:18:21.000000000 +0200
-+++ gtk+2.0-2.21.2/build/win32/vs9/Makefile.in 2010-06-11 12:26:15.674613616 +0200
+@@ -307,6 +311,7 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ ms_librarian = @ms_librarian@
+Index: gtk+2.0-2.21.5/build/win32/vs9/Makefile.in
+===================================================================
+--- gtk+2.0-2.21.5.orig/build/win32/vs9/Makefile.in 2010-07-22 17:59:08.641050994 +0200
++++ gtk+2.0-2.21.5/build/win32/vs9/Makefile.in 2010-07-22 17:58:44.458050848 +0200
@@ -39,11 +39,14 @@
$(top_srcdir)/Makefile.decl
subdir = build/win32/vs9
@@ -8107,18 +8307,259 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -130,6 +133,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
+@@ -117,6 +120,7 @@
+ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.2.old/configure gtk+2.0-2.21.2/configure
---- gtk+2.0-2.21.2.old/configure 2010-06-10 19:18:28.000000000 +0200
-+++ gtk+2.0-2.21.2/configure 2010-06-11 12:26:12.126613446 +0200
-@@ -816,6 +816,7 @@
+@@ -267,6 +271,7 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ ms_librarian = @ms_librarian@
+Index: gtk+2.0-2.21.5/configure
+===================================================================
+--- gtk+2.0-2.21.5.orig/configure 2010-07-22 17:59:08.553063831 +0200
++++ gtk+2.0-2.21.5/configure 2010-07-22 17:58:43.046052744 +0200
+@@ -1,13 +1,13 @@
+ #! /bin/sh
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by GNU Autoconf 2.66 for gtk+ 2.21.5.
++# Generated by GNU Autoconf 2.65 for gtk+ 2.21.5.
+ #
+ # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B>.
+ #
+ #
+ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+-# Foundation, Inc.
++# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
++# Inc.
+ #
+ #
+ # This configure script is free software; the Free Software Foundation
+@@ -173,14 +173,6 @@
+ as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
+ eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
+ test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
+-
+- test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || (
+- ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+- ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
+- ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
+- PATH=/empty FPATH=/empty; export PATH FPATH
+- test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\
+- || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1
+ test \$(( 1 + 1 )) = 2 || exit 1"
+ if (eval "$as_required") 2>/dev/null; then :
+ as_have_required=yes
+@@ -328,7 +320,7 @@
+ test -d "$as_dir" && break
+ done
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
+- } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
++ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+
+
+ } # as_fn_mkdir_p
+@@ -368,19 +360,19 @@
+ fi # as_fn_arith
+
+
+-# as_fn_error STATUS ERROR [LINENO LOG_FD]
+-# ----------------------------------------
++# as_fn_error ERROR [LINENO LOG_FD]
++# ---------------------------------
+ # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+ # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+-# script with STATUS, using 1 if that was 0.
++# script with status $?, using 1 if that was 0.
+ as_fn_error ()
+ {
+- as_status=$1; test $as_status -eq 0 && as_status=1
+- if test "$4"; then
+- as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+- $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
++ as_status=$?; test $as_status -eq 0 && as_status=1
++ if test "$3"; then
++ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+ fi
+- $as_echo "$as_me: error: $2" >&2
++ $as_echo "$as_me: error: $1" >&2
+ as_fn_exit $as_status
+ } # as_fn_error
+
+@@ -537,14 +529,161 @@
+ # Sed expression to map a string onto a valid variable name.
+ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
++
++
++# Check that we are running under the correct shell.
+ SHELL=${CONFIG_SHELL-/bin/sh}
+
++case X$lt_ECHO in
++X*--fallback-echo)
++ # Remove one level of quotation (which was required for Make).
++ ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','`
++ ;;
++esac
++
++ECHO=${lt_ECHO-echo}
++if test "X$1" = X--no-reexec; then
++ # Discard the --no-reexec flag, and continue.
++ shift
++elif test "X$1" = X--fallback-echo; then
++ # Avoid inline document here, it may be left over
++ :
++elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
++ # Yippee, $ECHO works!
++ :
++else
++ # Restart under the correct shell.
++ exec $SHELL "$0" --no-reexec ${1+"$@"}
++fi
++
++if test "X$1" = X--fallback-echo; then
++ # used as fallback echo
++ shift
++ cat <<_LT_EOF
++$*
++_LT_EOF
++ exit 0
++fi
++
++# The HP-UX ksh and POSIX shell print the target directory to stdout
++# if CDPATH is set.
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
++
++if test -z "$lt_ECHO"; then
++ if test "X${echo_test_string+set}" != Xset; then
++ # find a string as large as possible, as long as the shell can cope with it
++ for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
++ # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
++ if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
++ { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
++ then
++ break
++ fi
++ done
++ fi
++
++ if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
++ echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
++ test "X$echo_testing_string" = "X$echo_test_string"; then
++ :
++ else
++ # The Solaris, AIX, and Digital Unix default echo programs unquote
++ # backslashes. This makes it impossible to quote backslashes using
++ # echo "$something" | sed 's/\\/\\\\/g'
++ #
++ # So, first we look for a working echo in the user's PATH.
++
++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++ for dir in $PATH /usr/ucb; do
++ IFS="$lt_save_ifs"
++ if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
++ test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
++ echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
++ test "X$echo_testing_string" = "X$echo_test_string"; then
++ ECHO="$dir/echo"
++ break
++ fi
++ done
++ IFS="$lt_save_ifs"
++
++ if test "X$ECHO" = Xecho; then
++ # We didn't find a better echo, so look for alternatives.
++ if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
++ echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
++ test "X$echo_testing_string" = "X$echo_test_string"; then
++ # This shell has a builtin print -r that does the trick.
++ ECHO='print -r'
++ elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
++ test "X$CONFIG_SHELL" != X/bin/ksh; then
++ # If we have ksh, try running configure again with it.
++ ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
++ export ORIGINAL_CONFIG_SHELL
++ CONFIG_SHELL=/bin/ksh
++ export CONFIG_SHELL
++ exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
++ else
++ # Try using printf.
++ ECHO='printf %s\n'
++ if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
++ echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
++ test "X$echo_testing_string" = "X$echo_test_string"; then
++ # Cool, printf works
++ :
++ elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
++ test "X$echo_testing_string" = 'X\t' &&
++ echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
++ test "X$echo_testing_string" = "X$echo_test_string"; then
++ CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
++ export CONFIG_SHELL
++ SHELL="$CONFIG_SHELL"
++ export SHELL
++ ECHO="$CONFIG_SHELL $0 --fallback-echo"
++ elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
++ test "X$echo_testing_string" = 'X\t' &&
++ echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
++ test "X$echo_testing_string" = "X$echo_test_string"; then
++ ECHO="$CONFIG_SHELL $0 --fallback-echo"
++ else
++ # maybe with a smaller string...
++ prev=:
++
++ for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
++ if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
++ then
++ break
++ fi
++ prev="$cmd"
++ done
++
++ if test "$prev" != 'sed 50q "$0"'; then
++ echo_test_string=`eval $prev`
++ export echo_test_string
++ exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
++ else
++ # Oops. We lost completely, so just stick with echo.
++ ECHO=echo
++ fi
++ fi
++ fi
++ fi
++ fi
++fi
++
++# Copy echo and quote the copy suitably for passing to libtool from
++# the Makefile, instead of quoting the original, which is used later.
++lt_ECHO=$ECHO
++if test "X$lt_ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
++ lt_ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
++fi
++
++
++
+
+ test -n "$DJDIR" || exec 7<&0 </dev/null
+ exec 6>&1
+
+ # Name of the host.
+-# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
++# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+ # so uname gets run too.
+ ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+
+@@ -673,6 +812,7 @@
GDK_DEP_LIBS
GDK_EXTRA_CFLAGS
GDK_EXTRA_LIBS
@@ -8126,7 +8567,15 @@
GDK_PACKAGES
USE_DIRECTFB_FALSE
USE_DIRECTFB_TRUE
-@@ -1026,6 +1027,8 @@
+@@ -797,6 +937,7 @@
+ LIPO
+ NMEDIT
+ DSYMUTIL
++lt_ECHO
+ RANLIB
+ AR
+ LN_S
+@@ -822,6 +963,8 @@
CXXFLAGS
ac_ct_CXX
CXX
@@ -8135,7 +8584,7 @@
am__fastdepCC_FALSE
am__fastdepCC_TRUE
CCDEPMODE
-@@ -1149,6 +1152,10 @@
+@@ -941,6 +1084,10 @@
enable_shm
enable_xkb
enable_xinerama
@@ -8146,7 +8595,134 @@
enable_rebuilds
enable_visibility
with_xinput
-@@ -1841,6 +1848,12 @@
+@@ -1094,7 +1241,7 @@
+ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+ # Reject names that are not valid shell variable names.
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+- as_fn_error $? "invalid feature name: $ac_useropt"
++ as_fn_error "invalid feature name: $ac_useropt"
+ ac_useropt_orig=$ac_useropt
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ case $ac_user_opts in
+@@ -1120,7 +1267,7 @@
+ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+ # Reject names that are not valid shell variable names.
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+- as_fn_error $? "invalid feature name: $ac_useropt"
++ as_fn_error "invalid feature name: $ac_useropt"
+ ac_useropt_orig=$ac_useropt
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ case $ac_user_opts in
+@@ -1324,7 +1471,7 @@
+ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+ # Reject names that are not valid shell variable names.
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+- as_fn_error $? "invalid package name: $ac_useropt"
++ as_fn_error "invalid package name: $ac_useropt"
+ ac_useropt_orig=$ac_useropt
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ case $ac_user_opts in
+@@ -1340,7 +1487,7 @@
+ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+ # Reject names that are not valid shell variable names.
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+- as_fn_error $? "invalid package name: $ac_useropt"
++ as_fn_error "invalid package name: $ac_useropt"
+ ac_useropt_orig=$ac_useropt
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ case $ac_user_opts in
+@@ -1370,8 +1517,8 @@
+ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
+ x_libraries=$ac_optarg ;;
+
+- -*) as_fn_error $? "unrecognized option: \`$ac_option'
+-Try \`$0 --help' for more information"
++ -*) as_fn_error "unrecognized option: \`$ac_option'
++Try \`$0 --help' for more information."
+ ;;
+
+ *=*)
+@@ -1379,7 +1526,7 @@
+ # Reject names that are not valid shell variable names.
+ case $ac_envvar in #(
+ '' | [0-9]* | *[!_$as_cr_alnum]* )
+- as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
++ as_fn_error "invalid variable name: \`$ac_envvar'" ;;
+ esac
+ eval $ac_envvar=\$ac_optarg
+ export $ac_envvar ;;
+@@ -1397,13 +1544,13 @@
+
+ if test -n "$ac_prev"; then
+ ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+- as_fn_error $? "missing argument to $ac_option"
++ as_fn_error "missing argument to $ac_option"
+ fi
+
+ if test -n "$ac_unrecognized_opts"; then
+ case $enable_option_checking in
+ no) ;;
+- fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
++ fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
+ *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+ esac
+ fi
+@@ -1426,7 +1573,7 @@
+ [\\/$]* | ?:[\\/]* ) continue;;
+ NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
+ esac
+- as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
++ as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
+ done
+
+ # There might be people who depend on the old broken behavior: `$host'
+@@ -1440,8 +1587,8 @@
+ if test "x$host_alias" != x; then
+ if test "x$build_alias" = x; then
+ cross_compiling=maybe
+- $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
+- If a cross compiler is detected then cross compile mode will be used" >&2
++ $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
++ If a cross compiler is detected then cross compile mode will be used." >&2
+ elif test "x$build_alias" != "x$host_alias"; then
+ cross_compiling=yes
+ fi
+@@ -1456,9 +1603,9 @@
+ ac_pwd=`pwd` && test -n "$ac_pwd" &&
+ ac_ls_di=`ls -di .` &&
+ ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
+- as_fn_error $? "working directory cannot be determined"
++ as_fn_error "working directory cannot be determined"
+ test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
+- as_fn_error $? "pwd does not report name of working directory"
++ as_fn_error "pwd does not report name of working directory"
+
+
+ # Find the source files, if location was not specified.
+@@ -1497,11 +1644,11 @@
+ fi
+ if test ! -r "$srcdir/$ac_unique_file"; then
+ test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
+- as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
++ as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
+ fi
+ ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
+ ac_abs_confdir=`(
+- cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
++ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
+ pwd)`
+ # When building in place, set srcdir=.
+ if test "$ac_abs_confdir" = "$ac_pwd"; then
+@@ -1541,7 +1688,7 @@
+ --help=short display options specific to this package
+ --help=recursive display the short help of all the included packages
+ -V, --version display version information and exit
+- -q, --quiet, --silent do not print \`checking ...' messages
++ -q, --quiet, --silent do not print \`checking...' messages
+ --cache-file=FILE cache test results in FILE [disabled]
+ -C, --config-cache alias for \`--cache-file=config.cache'
+ -n, --no-create do not create output files
+@@ -1627,6 +1774,12 @@
--enable-xkb support XKB [default=maybe]
--enable-xinerama support xinerama extension if available
[default=yes]
@@ -8159,7 +8735,375 @@
--disable-rebuilds disable all source autogeneration rules
--disable-visibility don't use ELF visibility attributes
--enable-explicit-deps=[yes/no/auto]
-@@ -4594,6 +4607,14 @@
+@@ -1764,9 +1917,9 @@
+ if $ac_init_version; then
+ cat <<\_ACEOF
+ gtk+ configure 2.21.5
+-generated by GNU Autoconf 2.66
++generated by GNU Autoconf 2.65
+
+-Copyright (C) 2010 Free Software Foundation, Inc.
++Copyright (C) 2009 Free Software Foundation, Inc.
+ This configure script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it.
+ _ACEOF
+@@ -1908,7 +2061,7 @@
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+ $as_echo_n "checking for $2... " >&6; }
+-if eval "test \"\${$3+set}\"" = set; then :
++if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -2017,7 +2170,7 @@
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+ $as_echo_n "checking for $2... " >&6; }
+-if eval "test \"\${$3+set}\"" = set; then :
++if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -2167,10 +2320,10 @@
+ ac_fn_c_check_header_mongrel ()
+ {
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+- if eval "test \"\${$3+set}\"" = set; then :
++ if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+ $as_echo_n "checking for $2... " >&6; }
+-if eval "test \"\${$3+set}\"" = set; then :
++if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
+ fi
+ eval ac_res=\$$3
+@@ -2229,15 +2382,17 @@
+ $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+ $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+-( $as_echo "## --------------------------------------------------------------------- ##
++( cat <<\_ASBOX
++## --------------------------------------------------------------------- ##
+ ## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B ##
+-## --------------------------------------------------------------------- ##"
++## --------------------------------------------------------------------- ##
++_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+ esac
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+ $as_echo_n "checking for $2... " >&6; }
+-if eval "test \"\${$3+set}\"" = set; then :
++if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
+ else
+ eval "$3=\$ac_header_compiler"
+@@ -2259,7 +2414,7 @@
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
+ $as_echo_n "checking for $2.$3... " >&6; }
+-if eval "test \"\${$4+set}\"" = set; then :
++if { as_var=$4; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -2311,7 +2466,7 @@
+ running configure, to aid debugging if configure makes a mistake.
+
+ It was created by gtk+ $as_me 2.21.5, which was
+-generated by GNU Autoconf 2.66. Invocation command line was
++generated by GNU Autoconf 2.65. Invocation command line was
+
+ $ $0 $@
+
+@@ -2421,9 +2576,11 @@
+ {
+ echo
+
+- $as_echo "## ---------------- ##
++ cat <<\_ASBOX
++## ---------------- ##
+ ## Cache variables. ##
+-## ---------------- ##"
++## ---------------- ##
++_ASBOX
+ echo
+ # The following way of writing the cache mishandles newlines in values,
+ (
+@@ -2457,9 +2614,11 @@
+ )
+ echo
+
+- $as_echo "## ----------------- ##
++ cat <<\_ASBOX
++## ----------------- ##
+ ## Output variables. ##
+-## ----------------- ##"
++## ----------------- ##
++_ASBOX
+ echo
+ for ac_var in $ac_subst_vars
+ do
+@@ -2472,9 +2631,11 @@
+ echo
+
+ if test -n "$ac_subst_files"; then
+- $as_echo "## ------------------- ##
++ cat <<\_ASBOX
++## ------------------- ##
+ ## File substitutions. ##
+-## ------------------- ##"
++## ------------------- ##
++_ASBOX
+ echo
+ for ac_var in $ac_subst_files
+ do
+@@ -2488,9 +2649,11 @@
+ fi
+
+ if test -s confdefs.h; then
+- $as_echo "## ----------- ##
++ cat <<\_ASBOX
++## ----------- ##
+ ## confdefs.h. ##
+-## ----------- ##"
++## ----------- ##
++_ASBOX
+ echo
+ cat confdefs.h
+ echo
+@@ -2545,12 +2708,7 @@
+ ac_site_file1=NONE
+ ac_site_file2=NONE
+ if test -n "$CONFIG_SITE"; then
+- # We do not want a PATH search for config.site.
+- case $CONFIG_SITE in #((
+- -*) ac_site_file1=./$CONFIG_SITE;;
+- */*) ac_site_file1=$CONFIG_SITE;;
+- *) ac_site_file1=./$CONFIG_SITE;;
+- esac
++ ac_site_file1=$CONFIG_SITE
+ elif test "x$prefix" != xNONE; then
+ ac_site_file1=$prefix/share/config.site
+ ac_site_file2=$prefix/etc/config.site
+@@ -2565,11 +2723,7 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+ $as_echo "$as_me: loading site script $ac_site_file" >&6;}
+ sed 's/^/| /' "$ac_site_file" >&5
+- . "$ac_site_file" \
+- || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "failed to load site script $ac_site_file
+-See \`config.log' for more details" "$LINENO" 5; }
++ . "$ac_site_file"
+ fi
+ done
+
+@@ -2648,7 +2802,7 @@
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+ $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+- as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
++ as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+ fi
+ ## -------------------- ##
+ ## Main body of script. ##
+@@ -2673,22 +2827,16 @@
+
+ ac_aux_dir=
+ for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
+- if test -f "$ac_dir/install-sh"; then
+- ac_aux_dir=$ac_dir
+- ac_install_sh="$ac_aux_dir/install-sh -c"
+- break
+- elif test -f "$ac_dir/install.sh"; then
+- ac_aux_dir=$ac_dir
+- ac_install_sh="$ac_aux_dir/install.sh -c"
+- break
+- elif test -f "$ac_dir/shtool"; then
+- ac_aux_dir=$ac_dir
+- ac_install_sh="$ac_aux_dir/shtool install -c"
+- break
+- fi
++ for ac_t in install-sh install.sh shtool; do
++ if test -f "$ac_dir/$ac_t"; then
++ ac_aux_dir=$ac_dir
++ ac_install_sh="$ac_aux_dir/$ac_t -c"
++ break 2
++ fi
++ done
+ done
+ if test -z "$ac_aux_dir"; then
+- as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
++ as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
+ fi
+
+ # These three variables are undocumented and unsupported,
+@@ -2804,11 +2952,11 @@
+ '
+ case `pwd` in
+ *[\\\"\#\$\&\'\`$am_lf]*)
+- as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
++ as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
+ esac
+ case $srcdir in
+ *[\\\"\#\$\&\'\`$am_lf\ \ ]*)
+- as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
++ as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
+ esac
+
+ # Do `set' in a subshell so we don't clobber the current shell's
+@@ -2830,7 +2978,7 @@
+ # if, for instance, CONFIG_SHELL is bash and it inherits a
+ # broken ls alias from the environment. This has actually
+ # happened. Such a system could not be considered "sane".
+- as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
++ as_fn_error "ls -t appears to fail. Make sure there is not a broken
+ alias in your environment" "$LINENO" 5
+ fi
+
+@@ -2840,7 +2988,7 @@
+ # Ok.
+ :
+ else
+- as_fn_error $? "newly created file is older than distributed files!
++ as_fn_error "newly created file is older than distributed files!
+ Check your system clock" "$LINENO" 5
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+@@ -3078,7 +3226,7 @@
+ $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+ set x ${MAKE-make}
+ ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
++if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat >conftest.make <<\_ACEOF
+@@ -3086,7 +3234,7 @@
+ all:
+ @echo '@@@%%%=$(MAKE)=@@@%%%'
+ _ACEOF
+-# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
++# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+ case `${MAKE-make} -f conftest.make 2>/dev/null` in
+ *@@@%%%=?*=@@@%%%*)
+ eval ac_cv_prog_make_${ac_make}_set=yes;;
+@@ -3120,7 +3268,7 @@
+ am__isrc=' -I$(srcdir)'
+ # test to see if srcdir already configured
+ if test -f $srcdir/config.status; then
+- as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
++ as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
+ fi
+ fi
+
+@@ -3250,7 +3398,7 @@
+
+ # Make sure we can run config.sub.
+ $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+- as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
++ as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+ $as_echo_n "checking build system type... " >&6; }
+@@ -3261,16 +3409,16 @@
+ test "x$ac_build_alias" = x &&
+ ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+ test "x$ac_build_alias" = x &&
+- as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
++ as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
+ ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+- as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
++ as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+ $as_echo "$ac_cv_build" >&6; }
+ case $ac_cv_build in
+ *-*-*) ;;
+-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
++*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
+ esac
+ build=$ac_cv_build
+ ac_save_IFS=$IFS; IFS='-'
+@@ -3295,7 +3443,7 @@
+ ac_cv_host=$ac_cv_build
+ else
+ ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+- as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
++ as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+ fi
+
+ fi
+@@ -3303,7 +3451,7 @@
+ $as_echo "$ac_cv_host" >&6; }
+ case $ac_cv_host in
+ *-*-*) ;;
+-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
++*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
+ esac
+ host=$ac_cv_host
+ ac_save_IFS=$IFS; IFS='-'
+@@ -3653,8 +3801,8 @@
+
+ test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "no acceptable C compiler found in \$PATH
+-See \`config.log' for more details" "$LINENO" 5; }
++as_fn_error "no acceptable C compiler found in \$PATH
++See \`config.log' for more details." "$LINENO" 5; }
+
+ # Provide some information about the compiler.
+ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+@@ -3768,8 +3916,9 @@
+
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error 77 "C compiler cannot create executables
+-See \`config.log' for more details" "$LINENO" 5; }
++{ as_fn_set_status 77
++as_fn_error "C compiler cannot create executables
++See \`config.log' for more details." "$LINENO" 5; }; }
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+@@ -3811,8 +3960,8 @@
+ else
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "cannot compute suffix of executables: cannot compile and link
+-See \`config.log' for more details" "$LINENO" 5; }
++as_fn_error "cannot compute suffix of executables: cannot compile and link
++See \`config.log' for more details." "$LINENO" 5; }
+ fi
+ rm -f conftest conftest$ac_cv_exeext
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+@@ -3869,9 +4018,9 @@
+ else
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "cannot run C compiled programs.
++as_fn_error "cannot run C compiled programs.
+ If you meant to cross compile, use \`--host'.
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details." "$LINENO" 5; }
+ fi
+ fi
+ fi
+@@ -3922,8 +4071,8 @@
+
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "cannot compute suffix of object files: cannot compile
+-See \`config.log' for more details" "$LINENO" 5; }
++as_fn_error "cannot compute suffix of object files: cannot compile
++See \`config.log' for more details." "$LINENO" 5; }
+ fi
+ rm -f conftest.$ac_cv_objext conftest.$ac_ext
+ fi
+@@ -4363,6 +4512,14 @@
@@ -8174,29 +9118,274 @@
if test -n "$ac_tool_prefix"; then
for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl
-@@ -6074,13 +6095,13 @@
+@@ -4934,7 +5091,7 @@
+ enable_win32_dll=yes
+
+ case $host in
+-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
++*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}as; ac_word=$2
+@@ -5242,8 +5399,8 @@
+
+
+
+-macro_version='2.2.10'
+-macro_revision='1.3175'
++macro_version='2.2.6b'
++macro_revision='1.3017'
+
+
+
+@@ -5259,75 +5416,6 @@
+
+ ltmain="$ac_aux_dir/ltmain.sh"
+
+-# Backslashify metacharacters that are still active within
+-# double-quoted strings.
+-sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
+-
+-# Same as above, but do not quote variable references.
+-double_quote_subst='s/\(["`\\]\)/\\\1/g'
+-
+-# Sed substitution to delay expansion of an escaped shell variable in a
+-# double_quote_subst'ed string.
+-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+-
+-# Sed substitution to delay expansion of an escaped single quote.
+-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+-
+-# Sed substitution to avoid accidental globbing in evaled expressions
+-no_glob_subst='s/\*/\\\*/g'
+-
+-ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
+-$as_echo_n "checking how to print strings... " >&6; }
+-# Test print first, because it will be a builtin if present.
+-if test "X`print -r -- -n 2>/dev/null`" = X-n && \
+- test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
+- ECHO='print -r --'
+-elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
+- ECHO='printf %s\n'
+-else
+- # Use this function as a fallback that always works.
+- func_fallback_echo ()
+- {
+- eval 'cat <<_LTECHO_EOF
+-$1
+-_LTECHO_EOF'
+- }
+- ECHO='func_fallback_echo'
+-fi
+-
+-# func_echo_all arg...
+-# Invoke $ECHO with all args, space-separated.
+-func_echo_all ()
+-{
+- $ECHO ""
+-}
+-
+-case "$ECHO" in
+- printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
+-$as_echo "printf" >&6; } ;;
+- print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
+-$as_echo "print -r" >&6; } ;;
+- *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5
+-$as_echo "cat" >&6; } ;;
+-esac
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
+ $as_echo_n "checking for a sed that does not truncate output... " >&6; }
+ if test "${ac_cv_path_SED+set}" = set; then :
+@@ -5385,7 +5473,7 @@
+ done
+ IFS=$as_save_IFS
+ if test -z "$ac_cv_path_SED"; then
+- as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
++ as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5
+ fi
+ else
+ ac_cv_path_SED=$SED
+@@ -5461,7 +5549,7 @@
+ done
+ IFS=$as_save_IFS
+ if test -z "$ac_cv_path_GREP"; then
+- as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
++ as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ fi
+ else
+ ac_cv_path_GREP=$GREP
+@@ -5527,7 +5615,7 @@
+ done
+ IFS=$as_save_IFS
+ if test -z "$ac_cv_path_EGREP"; then
+- as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
++ as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ fi
+ else
+ ac_cv_path_EGREP=$EGREP
+@@ -5594,7 +5682,7 @@
+ done
+ IFS=$as_save_IFS
+ if test -z "$ac_cv_path_FGREP"; then
+- as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
++ as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ fi
+ else
+ ac_cv_path_FGREP=$FGREP
+@@ -5710,7 +5798,7 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+-test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
++test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+ $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+ if test "${lt_cv_prog_gnu_ld+set}" = set; then :
+@@ -5793,11 +5881,8 @@
+ NM="$lt_cv_path_NM"
+ else
+ # Didn't find any BSD compatible name lister, look for dumpbin.
+- if test -n "$DUMPBIN"; then :
+- # Let the user override the test.
+- else
+- if test -n "$ac_tool_prefix"; then
+- for ac_prog in dumpbin "link -dump"
++ if test -n "$ac_tool_prefix"; then
++ for ac_prog in "dumpbin -symbols" "link -dump -symbols"
+ 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
+@@ -5841,7 +5926,7 @@
+ fi
+ if test -z "$DUMPBIN"; then
+ ac_ct_DUMPBIN=$DUMPBIN
+- for ac_prog in dumpbin "link -dump"
++ for ac_prog in "dumpbin -symbols" "link -dump -symbols"
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+@@ -5896,15 +5981,6 @@
+ fi
+ fi
+
+- case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
+- *COFF*)
+- DUMPBIN="$DUMPBIN -symbols"
+- ;;
+- *)
+- DUMPBIN=:
+- ;;
+- esac
+- fi
+
+ if test "$DUMPBIN" != ":"; then
+ NM="$DUMPBIN"
+@@ -5924,13 +6000,13 @@
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
-- (eval echo "\"\$as_me:6077: $ac_compile\"" >&5)
-+ (eval echo "\"\$as_me:6098: $ac_compile\"" >&5)
+- (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)
++ (eval echo "\"\$as_me:6003: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
-- (eval echo "\"\$as_me:6080: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+ (eval echo "\"\$as_me:6101: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+- (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++ (eval echo "\"\$as_me:6006: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
-- (eval echo "\"\$as_me:6083: output\"" >&5)
-+ (eval echo "\"\$as_me:6104: output\"" >&5)
+- (eval echo "\"\$as_me:$LINENO: output\"" >&5)
++ (eval echo "\"\$as_me:6009: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
-@@ -6543,11 +6564,11 @@
+@@ -5987,11 +6063,6 @@
+ lt_cv_sys_max_cmd_len=8192;
+ ;;
+
+- mint*)
+- # On MiNT this can take a long time and run out of memory.
+- lt_cv_sys_max_cmd_len=8192;
+- ;;
+-
+ amigaos*)
+ # On AmigaOS with pdksh, this test takes hours, literally.
+ # So we just punt and use a minimum line length of 8192.
+@@ -6056,8 +6127,8 @@
+ # If test is not a shell built-in, we'll probably end up computing a
+ # maximum length that is only half of the actual maximum length, but
+ # we can't tell.
+- while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
+- = "X$teststring$teststring"; } >/dev/null 2>&1 &&
++ while { test "X"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
++ = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
+ test $i != 17 # 1/2 MB should be enough
+ do
+ i=`expr $i + 1`
+@@ -6325,18 +6396,16 @@
+ # Base MSYS/MinGW do not provide the 'file' command needed by
+ # func_win32_libid shell function, so use a weaker test based on 'objdump',
+ # unless we find 'file', for example because we are cross-compiling.
+- # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
+- if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
++ if ( file / ) >/dev/null 2>&1; then
+ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+ lt_cv_file_magic_cmd='func_win32_libid'
+ else
+- # Keep this pattern in sync with the one in func_win32_libid.
+- lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
++ lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+ lt_cv_file_magic_cmd='$OBJDUMP -f'
+ fi
;;
- # This must be Linux ELF.
--linux* | k*bsd*-gnu)
-+linux* | k*bsd*-gnu | kopensolaris*-gnu)
+-cegcc*)
++cegcc)
+ # use the weaker test based on 'objdump'. See mingw*.
+ lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
+ lt_cv_file_magic_cmd='$OBJDUMP -f'
+@@ -6366,10 +6435,6 @@
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+-haiku*)
+- lt_cv_deplibs_check_method=pass_all
+- ;;
+-
+ hpux10.20* | hpux11*)
+ lt_cv_file_magic_cmd=/usr/bin/file
+ case $host_cpu in
+@@ -6378,11 +6443,11 @@
+ lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+ ;;
+ hppa*64*)
+- lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'
++ lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'
+ lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
+ ;;
+ *)
+- lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library'
++ lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
+ lt_cv_file_magic_test_file=/usr/lib/libc.sl
+ ;;
+ esac
+@@ -6408,7 +6473,7 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -8205,16 +9394,727 @@
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
-@@ -7283,7 +7304,7 @@
+@@ -6820,18 +6885,6 @@
+ old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+ fi
+
+-case $host_os in
+- darwin*)
+- lock_old_archive_extraction=yes ;;
+- *)
+- lock_old_archive_extraction=no ;;
+-esac
+-
+-
+-
+-
+-
+-
+
+
+
+@@ -7001,8 +7054,8 @@
+ test $ac_status = 0; }; then
+ # Now try to grab the symbols.
+ nlist=conftest.nm
+- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5
+- (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5
++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5
++ (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && test -s "$nlist"; then
+@@ -7156,7 +7209,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
-- echo '#line 7286 "configure"' > conftest.$ac_ext
-+ echo '#line 7307 "configure"' > conftest.$ac_ext
+- echo '#line '$LINENO' "configure"' > conftest.$ac_ext
++ echo '#line 7212 "configure"' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -9278,6 +9299,10 @@
+@@ -7868,38 +7921,6 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
+ $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
+-$as_echo_n "checking for -force_load linker flag... " >&6; }
+-if test "${lt_cv_ld_force_load+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- lt_cv_ld_force_load=no
+- cat > conftest.c << _LT_EOF
+-int forced_loaded() { return 2;}
+-_LT_EOF
+- echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5
+- $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
+- echo "$AR cru libconftest.a conftest.o" >&5
+- $AR cru libconftest.a conftest.o 2>&5
+- echo "$RANLIB libconftest.a" >&5
+- $RANLIB libconftest.a 2>&5
+- cat > conftest.c << _LT_EOF
+-int main() { return 0;}
+-_LT_EOF
+- echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
+- $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
+- _lt_result=$?
+- if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
+- lt_cv_ld_force_load=yes
+- else
+- cat conftest.err >&5
+- fi
+- rm -f conftest.err libconftest.a conftest conftest.c
+- rm -rf conftest.dSYM
+-
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
+-$as_echo "$lt_cv_ld_force_load" >&6; }
+ case $host_os in
+ rhapsody* | darwin1.[012])
+ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+@@ -7927,7 +7948,7 @@
+ else
+ _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ fi
+- if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
++ if test "$DSYMUTIL" != ":"; then
+ _lt_dsymutil='~$DSYMUTIL $lib || :'
+ else
+ _lt_dsymutil=
+@@ -8062,8 +8083,8 @@
+ else
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+-See \`config.log' for more details" "$LINENO" 5; }
++as_fn_error "C preprocessor \"$CPP\" fails sanity check
++See \`config.log' for more details." "$LINENO" 5; }
+ fi
+
+ ac_ext=c
+@@ -8192,7 +8213,8 @@
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+ "
+-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+@@ -8217,20 +8239,544 @@
+
+
+
++ac_ext=cpp
++ac_cpp='$CXXCPP $CPPFLAGS'
++ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
++if test -z "$CXX"; then
++ if test -n "$CCC"; then
++ CXX=$CCC
++ else
++ if test -n "$ac_tool_prefix"; then
++ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
++ 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
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_CXX+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++ if test -n "$CXX"; then
++ ac_cv_prog_CXX="$CXX" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++ done
++IFS=$as_save_IFS
+
++fi
++fi
++CXX=$ac_cv_prog_CXX
++if test -n "$CXX"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
++$as_echo "$CXX" >&6; }
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
+
+-# Set options
+
++ test -n "$CXX" && break
++ done
++fi
++if test -z "$CXX"; then
++ ac_ct_CXX=$CXX
++ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
++do
++ # Extract the first word of "$ac_prog", so it can be a program name with args.
++set dummy $ac_prog; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++ if test -n "$ac_ct_CXX"; then
++ ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_prog_ac_ct_CXX="$ac_prog"
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++ done
++IFS=$as_save_IFS
+
++fi
++fi
++ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
++if test -n "$ac_ct_CXX"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
++$as_echo "$ac_ct_CXX" >&6; }
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
+
+- enable_dlopen=no
+
++ test -n "$ac_ct_CXX" && break
++done
+
++ if test "x$ac_ct_CXX" = x; then
++ CXX="g++"
++ else
++ case $cross_compiling:$ac_tool_warned in
++yes:)
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++ac_tool_warned=yes ;;
++esac
++ CXX=$ac_ct_CXX
++ fi
++fi
+
+- # Check whether --enable-shared was given.
+-if test "${enable_shared+set}" = set; then :
+- enableval=$enable_shared; p=${PACKAGE-default}
+- case $enableval in
++ fi
++fi
++# Provide some information about the compiler.
++$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
++set X $ac_compile
++ac_compiler=$2
++for ac_option in --version -v -V -qversion; do
++ { { ac_try="$ac_compiler $ac_option >&5"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++ (eval "$ac_compiler $ac_option >&5") 2>conftest.err
++ ac_status=$?
++ if test -s conftest.err; then
++ sed '10a\
++... rest of stderr output deleted ...
++ 10q' conftest.err >conftest.er1
++ cat conftest.er1 >&5
++ fi
++ rm -f conftest.er1 conftest.err
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }
++done
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
++$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
++if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++
++int
++main ()
++{
++#ifndef __GNUC__
++ choke me
++#endif
++
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_cxx_try_compile "$LINENO"; then :
++ ac_compiler_gnu=yes
++else
++ ac_compiler_gnu=no
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
++
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
++$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
++if test $ac_compiler_gnu = yes; then
++ GXX=yes
++else
++ GXX=
++fi
++ac_test_CXXFLAGS=${CXXFLAGS+set}
++ac_save_CXXFLAGS=$CXXFLAGS
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
++$as_echo_n "checking whether $CXX accepts -g... " >&6; }
++if test "${ac_cv_prog_cxx_g+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++ ac_save_cxx_werror_flag=$ac_cxx_werror_flag
++ ac_cxx_werror_flag=yes
++ ac_cv_prog_cxx_g=no
++ CXXFLAGS="-g"
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++
++int
++main ()
++{
++
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_cxx_try_compile "$LINENO"; then :
++ ac_cv_prog_cxx_g=yes
++else
++ CXXFLAGS=""
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++
++int
++main ()
++{
++
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_cxx_try_compile "$LINENO"; then :
++
++else
++ ac_cxx_werror_flag=$ac_save_cxx_werror_flag
++ CXXFLAGS="-g"
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++
++int
++main ()
++{
++
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_cxx_try_compile "$LINENO"; then :
++ ac_cv_prog_cxx_g=yes
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ ac_cxx_werror_flag=$ac_save_cxx_werror_flag
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
++$as_echo "$ac_cv_prog_cxx_g" >&6; }
++if test "$ac_test_CXXFLAGS" = set; then
++ CXXFLAGS=$ac_save_CXXFLAGS
++elif test $ac_cv_prog_cxx_g = yes; then
++ if test "$GXX" = yes; then
++ CXXFLAGS="-g -O2"
++ else
++ CXXFLAGS="-g"
++ fi
++else
++ if test "$GXX" = yes; then
++ CXXFLAGS="-O2"
++ else
++ CXXFLAGS=
++ fi
++fi
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++depcc="$CXX" am_compiler_list=
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
++$as_echo_n "checking dependency style of $depcc... " >&6; }
++if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++ if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
++ # We make a subdir and do the tests there. Otherwise we can end up
++ # making bogus files that we don't know about and never remove. For
++ # instance it was reported that on HP-UX the gcc test will end up
++ # making a dummy file named `D' -- because `-MD' means `put the output
++ # in D'.
++ mkdir conftest.dir
++ # Copy depcomp to subdir because otherwise we won't find it if we're
++ # using a relative directory.
++ cp "$am_depcomp" conftest.dir
++ cd conftest.dir
++ # We will build objects and dependencies in a subdirectory because
++ # it helps to detect inapplicable dependency modes. For instance
++ # both Tru64's cc and ICC support -MD to output dependencies as a
++ # side effect of compilation, but ICC will put the dependencies in
++ # the current directory while Tru64 will put them in the object
++ # directory.
++ mkdir sub
++
++ am_cv_CXX_dependencies_compiler_type=none
++ if test "$am_compiler_list" = ""; then
++ am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
++ fi
++ am__universal=false
++ case " $depcc " in #(
++ *\ -arch\ *\ -arch\ *) am__universal=true ;;
++ esac
++
++ for depmode in $am_compiler_list; do
++ # Setup a source with many dependencies, because some compilers
++ # like to wrap large dependency lists on column 80 (with \), and
++ # we should not choose a depcomp mode which is confused by this.
++ #
++ # We need to recreate these files for each test, as the compiler may
++ # overwrite some of them when testing with obscure command lines.
++ # This happens at least with the AIX C compiler.
++ : > sub/conftest.c
++ for i in 1 2 3 4 5 6; do
++ echo '#include "conftst'$i'.h"' >> sub/conftest.c
++ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
++ # Solaris 8's {/usr,}/bin/sh.
++ touch sub/conftst$i.h
++ done
++ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
++
++ # We check with `-c' and `-o' for the sake of the "dashmstdout"
++ # mode. It turns out that the SunPro C++ compiler does not properly
++ # handle `-M -o', and we need to detect this. Also, some Intel
++ # versions had trouble with output in subdirs
++ am__obj=sub/conftest.${OBJEXT-o}
++ am__minus_obj="-o $am__obj"
++ case $depmode in
++ gcc)
++ # This depmode causes a compiler race in universal mode.
++ test "$am__universal" = false || continue
++ ;;
++ nosideeffect)
++ # after this tag, mechanisms are not by side-effect, so they'll
++ # only be used when explicitly requested
++ if test "x$enable_dependency_tracking" = xyes; then
++ continue
++ else
++ break
++ fi
++ ;;
++ msvisualcpp | msvcmsys)
++ # This compiler won't grok `-c -o', but also, the minuso test has
++ # not run yet. These depmodes are late enough in the game, and
++ # so weak that their functioning should not be impacted.
++ am__obj=conftest.${OBJEXT-o}
++ am__minus_obj=
++ ;;
++ none) break ;;
++ esac
++ if depmode=$depmode \
++ source=sub/conftest.c object=$am__obj \
++ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
++ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
++ >/dev/null 2>conftest.err &&
++ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
++ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
++ grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
++ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
++ # icc doesn't choke on unknown options, it will just issue warnings
++ # or remarks (even with -Werror). So we grep stderr for any message
++ # that says an option was ignored or not supported.
++ # When given -MP, icc 7.0 and 7.1 complain thusly:
++ # icc: Command line warning: ignoring option '-M'; no argument required
++ # The diagnosis changed in icc 8.0:
++ # icc: Command line remark: option '-MP' not supported
++ if (grep 'ignoring option' conftest.err ||
++ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
++ am_cv_CXX_dependencies_compiler_type=$depmode
++ break
++ fi
++ fi
++ done
++
++ cd ..
++ rm -rf conftest.dir
++else
++ am_cv_CXX_dependencies_compiler_type=none
++fi
++
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5
++$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
++CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
++
++ if
++ test "x$enable_dependency_tracking" != xno \
++ && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
++ am__fastdepCXX_TRUE=
++ am__fastdepCXX_FALSE='#'
++else
++ am__fastdepCXX_TRUE='#'
++ am__fastdepCXX_FALSE=
++fi
++
++
++if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
++ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
++ (test "X$CXX" != "Xg++"))) ; then
++ ac_ext=cpp
++ac_cpp='$CXXCPP $CPPFLAGS'
++ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
++$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
++if test -z "$CXXCPP"; then
++ if test "${ac_cv_prog_CXXCPP+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++ # Double quotes because CXXCPP needs to be expanded
++ for CXXCPP in "$CXX -E" "/lib/cpp"
++ do
++ ac_preproc_ok=false
++for ac_cxx_preproc_warn_flag in '' yes
++do
++ # Use a header file that comes with gcc, so configuring glibc
++ # with a fresh cross-compiler works.
++ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++ # <limits.h> exists even on freestanding compilers.
++ # On the NeXT, cc -E runs the code through the compiler's parser,
++ # not just through cpp. "Syntax error" is here to catch this case.
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++ Syntax error
++_ACEOF
++if ac_fn_cxx_try_cpp "$LINENO"; then :
++
++else
++ # Broken: fails on valid input.
++continue
++fi
++rm -f conftest.err conftest.$ac_ext
++
++ # OK, works on sane cases. Now check whether nonexistent headers
++ # can be detected and how.
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <ac_nonexistent.h>
++_ACEOF
++if ac_fn_cxx_try_cpp "$LINENO"; then :
++ # Broken: success on invalid input.
++continue
++else
++ # Passes both tests.
++ac_preproc_ok=:
++break
++fi
++rm -f conftest.err conftest.$ac_ext
++
++done
++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
++rm -f conftest.err conftest.$ac_ext
++if $ac_preproc_ok; then :
++ break
++fi
++
++ done
++ ac_cv_prog_CXXCPP=$CXXCPP
++
++fi
++ CXXCPP=$ac_cv_prog_CXXCPP
++else
++ ac_cv_prog_CXXCPP=$CXXCPP
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
++$as_echo "$CXXCPP" >&6; }
++ac_preproc_ok=false
++for ac_cxx_preproc_warn_flag in '' yes
++do
++ # Use a header file that comes with gcc, so configuring glibc
++ # with a fresh cross-compiler works.
++ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++ # <limits.h> exists even on freestanding compilers.
++ # On the NeXT, cc -E runs the code through the compiler's parser,
++ # not just through cpp. "Syntax error" is here to catch this case.
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++ Syntax error
++_ACEOF
++if ac_fn_cxx_try_cpp "$LINENO"; then :
++
++else
++ # Broken: fails on valid input.
++continue
++fi
++rm -f conftest.err conftest.$ac_ext
++
++ # OK, works on sane cases. Now check whether nonexistent headers
++ # can be detected and how.
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <ac_nonexistent.h>
++_ACEOF
++if ac_fn_cxx_try_cpp "$LINENO"; then :
++ # Broken: success on invalid input.
++continue
++else
++ # Passes both tests.
++ac_preproc_ok=:
++break
++fi
++rm -f conftest.err conftest.$ac_ext
++
++done
++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
++rm -f conftest.err conftest.$ac_ext
++if $ac_preproc_ok; then :
++
++else
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++_lt_caught_CXX_error=yes; }
++fi
++
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++else
++ _lt_caught_CXX_error=yes
++fi
++
++
++
++
++# Set options
++
++
++
++ enable_dlopen=no
++
++
++
++ # Check whether --enable-shared was given.
++if test "${enable_shared+set}" = set; then :
++ enableval=$enable_shared; p=${PACKAGE-default}
++ case $enableval in
+ yes) enable_shared=yes ;;
+ no) enable_shared=no ;;
+ *)
+@@ -8339,7 +8885,6 @@
+
+
+
+-
+ test -z "$LN_S" && LN_S="ln -s"
+
+
+@@ -8389,6 +8934,19 @@
+
+
+
++
++
++
++
++
++
++
++
++
++
++
++
++
+ case $host_os in
+ aix3*)
+ # AIX sometimes has problems with the GCC collect2 program. For some
+@@ -8401,6 +8959,23 @@
+ ;;
+ esac
+
++# Sed substitution that helps us do robust quoting. It backslashifies
++# metacharacters that are still active within double-quoted strings.
++sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
++
++# Same as above, but do not quote variable references.
++double_quote_subst='s/\(["`\\]\)/\\\1/g'
++
++# Sed substitution to delay expansion of an escaped shell variable in a
++# double_quote_subst'ed string.
++delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
++
++# Sed substitution to delay expansion of an escaped single quote.
++delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
++
++# Sed substitution to avoid accidental globbing in evaled expressions
++no_glob_subst='s/\*/\\\*/g'
++
+ # Global variables:
+ ofile=libtool
+ can_build_shared=yes
+@@ -8429,7 +9004,7 @@
+ *) break;;
+ esac
+ done
+-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
++cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+
+
+ # Only perform the check for file, if the check method requires it
+@@ -8629,17 +9204,16 @@
$RM -r conftest*
@@ -8225,72 +10125,186 @@
if test -n "$compiler"; then
lt_prog_compiler_no_builtin_flag=
-@@ -9303,11 +9328,11 @@
+
+ if test "$GCC" = yes; then
+- case $cc_basename in
+- nvcc*)
+- lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;;
+- *)
+- lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;;
+- esac
++ lt_prog_compiler_no_builtin_flag=' -fno-builtin'
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+ $as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
+@@ -8659,15 +9233,15 @@
-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:9306: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9331: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9236: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9310: \$? = $ac_status" >&5
-+ echo "$as_me:9335: \$? = $ac_status" >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:9240: \$? = $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.
-@@ -9472,7 +9497,7 @@
- lt_prog_compiler_static='-non_shared'
+- $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
++ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+ lt_cv_prog_compiler_rtti_exceptions=yes
+@@ -8745,12 +9319,6 @@
+ lt_prog_compiler_pic='-fno-common'
;;
-- linux* | k*bsd*-gnu)
-+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+- haiku*)
+- # PIC is the default for Haiku.
+- # The "-static" flag exists, but is broken.
+- lt_prog_compiler_static=
+- ;;
+-
+ hpux*)
+ # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+ # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
+@@ -8793,13 +9361,6 @@
+ lt_prog_compiler_pic='-fPIC'
+ ;;
+ esac
+-
+- case $cc_basename in
+- nvcc*) # Cuda Compiler Driver 2.2
+- lt_prog_compiler_wl='-Xlinker '
+- lt_prog_compiler_pic='-Xcompiler -fPIC'
+- ;;
+- esac
+ else
+ # PORTME Check for flag to pass linker flags through the system compiler.
+ case $host_os in
+@@ -8862,7 +9423,7 @@
+ lt_prog_compiler_pic='--shared'
+ lt_prog_compiler_static='--static'
+ ;;
+- pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
++ pgcc* | pgf77* | pgf90* | pgf95*)
+ # Portland Group compilers (*not* the Pentium gcc compiler,
+ # which looks to be a dead project)
+ lt_prog_compiler_wl='-Wl,'
+@@ -8874,26 +9435,26 @@
+ # All Alpha code is PIC.
+ lt_prog_compiler_static='-non_shared'
+ ;;
+- xl* | bgxl* | bgf* | mpixl*)
+- # IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
++ xl*)
++ # IBM XL C 8.0/Fortran 10.1 on PPC
+ lt_prog_compiler_wl='-Wl,'
+ lt_prog_compiler_pic='-qpic'
+ lt_prog_compiler_static='-qstaticlink'
+ ;;
+ *)
+ case `$CC -V 2>&1 | sed 5q` in
+- *Sun\ F* | *Sun*Fortran*)
+- # Sun Fortran 8.3 passes all unrecognized flags to the linker
+- lt_prog_compiler_pic='-KPIC'
+- lt_prog_compiler_static='-Bstatic'
+- lt_prog_compiler_wl=''
+- ;;
+ *Sun\ C*)
+ # Sun C 5.9
+ lt_prog_compiler_pic='-KPIC'
+ lt_prog_compiler_static='-Bstatic'
+ lt_prog_compiler_wl='-Wl,'
+ ;;
++ *Sun\ F*)
++ # Sun Fortran 8.3 passes all unrecognized flags to the linker
++ lt_prog_compiler_pic='-KPIC'
++ lt_prog_compiler_static='-Bstatic'
++ lt_prog_compiler_wl=''
++ ;;
+ esac
+ ;;
+ esac
+@@ -8924,7 +9485,7 @@
+ lt_prog_compiler_pic='-KPIC'
+ lt_prog_compiler_static='-Bstatic'
case $cc_basename in
- # old Intel for x86_64 which still supported -KPIC.
- ecc*)
-@@ -9642,11 +9667,11 @@
+- f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
++ f77* | f90* | f95*)
+ lt_prog_compiler_wl='-Qoption ld ';;
+ *)
+ lt_prog_compiler_wl='-Wl,';;
+@@ -9011,15 +9572,15 @@
-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:9645: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9670: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9575: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9649: \$? = $ac_status" >&5
-+ echo "$as_me:9674: \$? = $ac_status" >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:9579: \$? = $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.
-@@ -9747,11 +9772,11 @@
+- $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
++ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+ lt_cv_prog_compiler_pic_works=yes
+@@ -9067,7 +9628,7 @@
+ if test -s conftest.err; then
+ # Append any errors to the config.log.
+ cat conftest.err 1>&5
+- $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
++ $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if diff conftest.exp conftest.er2 >/dev/null; then
+ lt_cv_prog_compiler_static_works=yes
+@@ -9116,16 +9677,16 @@
-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:9750: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9775: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9680: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:9754: \$? = $ac_status" >&5
-+ echo "$as_me:9779: \$? = $ac_status" >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:9684: \$? = $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
-@@ -9802,11 +9827,11 @@
+ # So say no if there are warnings
+- $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
++ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+ lt_cv_prog_compiler_c_o=yes
+@@ -9171,16 +9732,16 @@
-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:9805: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9830: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9735: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:9809: \$? = $ac_status" >&5
-+ echo "$as_me:9834: \$? = $ac_status" >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:9739: \$? = $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
-@@ -9921,6 +9946,9 @@
+ # So say no if there are warnings
+- $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
++ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+ lt_cv_prog_compiler_c_o=yes
+@@ -9290,36 +9851,13 @@
openbsd*)
with_gnu_ld=no
;;
@@ -8300,24 +10314,130 @@
esac
ld_shlibs=yes
-@@ -9942,6 +9970,7 @@
- fi
- supports_anon_versioning=no
- case `$LD -v 2>&1` in
-+ *GNU\ gold*) supports_anon_versioning=yes ;;
- *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
- *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
- *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-@@ -10033,7 +10062,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'
+-
+- # On some targets, GNU ld is compatible enough with the native linker
+- # that we're better off using the native interface for both.
+- lt_use_gnu_ld_interface=no
+ if test "$with_gnu_ld" = yes; then
+- case $host_os in
+- aix*)
+- # The AIX port of GNU ld has always aspired to compatibility
+- # with the native linker. However, as the warning in the GNU ld
+- # block says, versions before 2.19.5* couldn't really create working
+- # shared libraries, regardless of the interface used.
+- case `$LD -v 2>&1` in
+- *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
+- *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;;
+- *\ \(GNU\ Binutils\)\ [3-9]*) ;;
+- *)
+- lt_use_gnu_ld_interface=yes
+- ;;
+- esac
+- ;;
+- *)
+- lt_use_gnu_ld_interface=yes
+- ;;
+- esac
+- fi
+-
+- if test "$lt_use_gnu_ld_interface" = yes; then
+ # If archive_cmds runs LD, not CC, wlarc should be empty
+ wlarc='${wl}'
+
+@@ -9353,12 +9891,11 @@
+ ld_shlibs=no
+ cat <<_LT_EOF 1>&2
+
+-*** Warning: the GNU linker, at least up to release 2.19, is reported
++*** Warning: the GNU linker, at least up to release 2.9.1, is reported
+ *** to be unable to reliably create shared libraries on AIX.
+ *** Therefore, libtool is disabling shared libraries support. If you
+-*** really care for shared libraries, you may want to install binutils
+-*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
+-*** You will then need to restart the configuration process.
++*** really care for shared libraries, you may want to modify your PATH
++*** so that a non-GNU linker is found, and then restart.
+
+ _LT_EOF
+ fi
+@@ -9394,7 +9931,6 @@
+ # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
+ # as there is no search path for DLLs.
+ hardcode_libdir_flag_spec='-L$libdir'
+- export_dynamic_flag_spec='${wl}--export-all-symbols'
+ allow_undefined_flag=unsupported
+ always_export_symbols=no
+ enable_shared_with_static_runtimes=yes
+@@ -9416,11 +9952,6 @@
+ fi
;;
-- gnu* | linux* | tpf* | k*bsd*-gnu)
-+ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
- tmp_diet=no
- if test "$host_os" = linux-dietlibc; then
+- haiku*)
+- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+- link_all_deplibs=yes
+- ;;
+-
+ interix[3-9]*)
+ hardcode_direct=no
+ hardcode_shlibpath_var=no
+@@ -9450,12 +9981,11 @@
+ tmp_sharedflag='-shared'
+ case $cc_basename,$host_cpu in
+ pgcc*) # Portland Group C compiler
+- whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
++ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+ tmp_addflag=' $pic_flag'
+ ;;
+- pgf77* | pgf90* | pgf95* | pgfortran*)
+- # Portland Group f77 and f90 compilers
+- whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
++ pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers
++ whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+ tmp_addflag=' $pic_flag -Mnomain' ;;
+ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
+ tmp_addflag=' -i_dynamic' ;;
+@@ -9466,17 +9996,13 @@
+ lf95*) # Lahey Fortran 8.1
+ whole_archive_flag_spec=
+ tmp_sharedflag='--shared' ;;
+- xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
++ xl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
+ tmp_sharedflag='-qmkshrobj'
+ tmp_addflag= ;;
+- nvcc*) # Cuda Compiler Driver 2.2
+- whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+- compiler_needs_object=yes
+- ;;
+ esac
+ case `$CC -V 2>&1 | sed 5q` in
+ *Sun\ C*) # Sun C 5.9
+- whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
++ whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+ compiler_needs_object=yes
+ tmp_sharedflag='-G' ;;
+ *Sun\ F*) # Sun Fortran 8.3
+@@ -9492,17 +10018,17 @@
+ fi
+
case $cc_basename in
-@@ -10103,7 +10132,7 @@
+- xlf* | bgf* | bgxlf* | mpixlf*)
++ xlf*)
+ # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
+ whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
+ hardcode_libdir_flag_spec=
+ hardcode_libdir_flag_spec_ld='-rpath $libdir'
+- archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
++ archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
+ if test "x$supports_anon_versioning" = xyes; then
+ archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+ echo "local: *; };" >> $output_objdir/$libname.ver~
+- $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
++ $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+ fi
+ ;;
+ esac
+@@ -9511,7 +10037,7 @@
fi
;;
@@ -8326,7 +10446,19 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -10278,6 +10307,7 @@
+@@ -9623,10 +10149,8 @@
+ else
+ # If we're using GNU nm, then we don't want the "-C" option.
+ # -C means demangle to AIX nm, but means don't demangle with GNU nm
+- # Also, AIX nm treats weak defined symbols like other global
+- # defined symbols, whereas GNU nm marks them as "W".
+ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+- export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
++ export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ else
+ export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ fi
+@@ -9688,6 +10212,7 @@
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
@@ -8334,7 +10466,157 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -10604,7 +10634,7 @@
+@@ -9744,7 +10269,7 @@
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+
+ hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+- archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++ archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ else
+ if test "$host_cpu" = ia64; then
+ hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
+@@ -9788,13 +10313,8 @@
+ # -berok will link without error, but may produce a broken library.
+ no_undefined_flag=' ${wl}-bernotok'
+ allow_undefined_flag=' ${wl}-berok'
+- if test "$with_gnu_ld" = yes; then
+- # We only use this code for GNU lds that support --whole-archive.
+- whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+- else
+- # Exported symbols can be pulled into shared objects from archives
+- whole_archive_flag_spec='$convenience'
+- fi
++ # Exported symbols can be pulled into shared objects from archives
++ whole_archive_flag_spec='$convenience'
+ archive_cmds_need_lc=yes
+ # This is similar to how AIX traditionally builds its shared libraries.
+ archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+@@ -9833,7 +10353,7 @@
+ # Tell ltmain to make .dll files, not .so files.
+ shrext_cmds=".dll"
+ # FIXME: Setting linknames here is a bad hack.
+- archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
++ archive_cmds='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
+ # 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.
+@@ -9849,11 +10369,7 @@
+ hardcode_direct=no
+ hardcode_automatic=yes
+ hardcode_shlibpath_var=unsupported
+- if test "$lt_cv_ld_force_load" = "yes"; then
+- whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+- else
+- whole_archive_flag_spec=''
+- fi
++ whole_archive_flag_spec=''
+ link_all_deplibs=yes
+ allow_undefined_flag="$_lt_dar_allow_undefined"
+ case $cc_basename in
+@@ -9861,7 +10377,7 @@
+ *) _lt_dar_can_shared=$GCC ;;
+ esac
+ if test "$_lt_dar_can_shared" = "yes"; then
+- output_verbose_link_cmd=func_echo_all
++ output_verbose_link_cmd=echo
+ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+@@ -9927,7 +10443,7 @@
+ ;;
+
+ hpux10*)
+- if test "$GCC" = yes && test "$with_gnu_ld" = no; then
++ if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+ archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ else
+ archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+@@ -9946,7 +10462,7 @@
+ ;;
+
+ hpux11*)
+- if test "$GCC" = yes && test "$with_gnu_ld" = no; then
++ if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+ case $host_cpu in
+ hppa*64*)
+ archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+@@ -9967,46 +10483,7 @@
+ archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ *)
+-
+- # Older versions of the 11.00 compiler do not understand -b yet
+- # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
+-$as_echo_n "checking if $CC understands -b... " >&6; }
+-if test "${lt_cv_prog_compiler__b+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- lt_cv_prog_compiler__b=no
+- save_LDFLAGS="$LDFLAGS"
+- LDFLAGS="$LDFLAGS -b"
+- echo "$lt_simple_link_test_code" > conftest.$ac_ext
+- if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+- # The linker can only warn and ignore the option if not recognized
+- # So say no if there are warnings
+- if test -s conftest.err; then
+- # Append any errors to the config.log.
+- cat conftest.err 1>&5
+- $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+- $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+- if diff conftest.exp conftest.er2 >/dev/null; then
+- lt_cv_prog_compiler__b=yes
+- fi
+- else
+- lt_cv_prog_compiler__b=yes
+- fi
+- fi
+- $RM -r conftest*
+- LDFLAGS="$save_LDFLAGS"
+-
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
+-$as_echo "$lt_cv_prog_compiler__b" >&6; }
+-
+-if test x"$lt_cv_prog_compiler__b" = xyes; then
+- archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+-else
+- archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+-fi
+-
++ archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ esac
+ fi
+@@ -10034,7 +10511,7 @@
+
+ irix5* | irix6* | nonstopux*)
+ if test "$GCC" = yes; then
+- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ # Try to use the -exported_symbol ld option, if it does not
+ # work, assume that -exports_file does not work either and
+ # implicitly export all symbols.
+@@ -10045,15 +10522,15 @@
+ int foo(void) {}
+ _ACEOF
+ if ac_fn_c_try_link "$LINENO"; then :
+- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
++ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LDFLAGS="$save_LDFLAGS"
+ else
+- archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+- archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
++ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
++ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
+ fi
+ archive_cmds_need_lc='no'
+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+@@ -10062,7 +10539,7 @@
link_all_deplibs=yes
;;
@@ -8343,16 +10625,289 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -11494,7 +11524,7 @@
+@@ -10115,17 +10592,17 @@
+ hardcode_libdir_flag_spec='-L$libdir'
+ hardcode_minus_L=yes
+ allow_undefined_flag=unsupported
+- archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
++ archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+ old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+ ;;
+
+ osf3*)
+ if test "$GCC" = yes; then
+ allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
+- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ else
+ allow_undefined_flag=' -expect_unresolved \*'
+- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
++ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+ fi
+ archive_cmds_need_lc='no'
+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+@@ -10135,13 +10612,13 @@
+ osf4* | osf5*) # as osf3* with the addition of -msym flag
+ if test "$GCC" = yes; then
+ allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
+- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+ else
+ allow_undefined_flag=' -expect_unresolved \*'
+- archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
++ archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+ archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
+- $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
++ $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+
+ # Both c and cxx compiler support -rpath directly
+ hardcode_libdir_flag_spec='-rpath $libdir'
+@@ -10344,50 +10821,44 @@
+ # to ld, don't add -lc before -lgcc.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
+ $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
+-if test "${lt_cv_archive_cmds_need_lc+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- $RM conftest*
+- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
++ $RM conftest*
++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } 2>conftest.err; then
+- soname=conftest
+- lib=conftest
+- libobjs=conftest.$ac_objext
+- deplibs=
+- wl=$lt_prog_compiler_wl
+- pic_flag=$lt_prog_compiler_pic
+- compiler_flags=-v
+- linker_flags=-v
+- verstring=
+- output_objdir=.
+- libname=conftest
+- lt_save_allow_undefined_flag=$allow_undefined_flag
+- allow_undefined_flag=
+- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
++ soname=conftest
++ lib=conftest
++ libobjs=conftest.$ac_objext
++ deplibs=
++ wl=$lt_prog_compiler_wl
++ pic_flag=$lt_prog_compiler_pic
++ compiler_flags=-v
++ linker_flags=-v
++ verstring=
++ output_objdir=.
++ libname=conftest
++ lt_save_allow_undefined_flag=$allow_undefined_flag
++ allow_undefined_flag=
++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
+ (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+- then
+- lt_cv_archive_cmds_need_lc=no
+- else
+- lt_cv_archive_cmds_need_lc=yes
+- fi
+- allow_undefined_flag=$lt_save_allow_undefined_flag
+- else
+- cat conftest.err 1>&5
+- fi
+- $RM conftest*
+-
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
+-$as_echo "$lt_cv_archive_cmds_need_lc" >&6; }
+- archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc
++ then
++ archive_cmds_need_lc=no
++ else
++ archive_cmds_need_lc=yes
++ fi
++ allow_undefined_flag=$lt_save_allow_undefined_flag
++ else
++ cat conftest.err 1>&5
++ fi
++ $RM conftest*
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5
++$as_echo "$archive_cmds_need_lc" >&6; }
+ ;;
+ esac
+ fi
+@@ -10558,23 +11029,16 @@
+ darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
+ *) lt_awk_arg="/^libraries:/" ;;
+ esac
+- case $host_os in
+- mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;;
+- *) lt_sed_strip_eq="s,=/,/,g" ;;
+- esac
+- lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
+- case $lt_search_path_spec in
+- *\;*)
++ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++ if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
+ # if the path contains ";" then we assume it to be the separator
+ # otherwise default to the standard path separator (i.e. ":") - it is
+ # assumed that no part of a normal pathname contains ";" but that should
+ # okay in the real world where ";" in dirpaths is itself problematic.
+- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
+- ;;
+- *)
+- lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
+- ;;
+- esac
++ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
++ else
++ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
++ fi
+ # Ok, now we have the path, separated by spaces, we can step through it
+ # and add multilib dir if necessary.
+ lt_tmp_lt_search_path_spec=
+@@ -10587,7 +11051,7 @@
+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+ fi
+ done
+- lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
++ lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
+ BEGIN {RS=" "; FS="/|\n";} {
+ lt_foo="";
+ lt_count=0;
+@@ -10607,13 +11071,7 @@
+ if (lt_foo != "") { lt_freq[lt_foo]++; }
+ if (lt_freq[lt_foo] == 1) { print lt_foo; }
+ }'`
+- # AWK program above erroneously prepends '/' to C:/dos/paths
+- # for these hosts.
+- case $host_os in
+- mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
+- $SED 's,/\([A-Za-z]:\),\1,g'` ;;
+- esac
+- sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
++ sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
+ else
+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+ fi
+@@ -10701,7 +11159,7 @@
+ m68k)
+ library_names_spec='$libname.ixlibrary $libname.a'
+ # Create ${libname}_ixlibrary.a entries in /sys/libs.
+- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
++ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+ ;;
+ esac
;;
-
- # This must be Linux ELF.
--linux* | k*bsd*-gnu)
-+linux* | k*bsd*-gnu | kopensolaris*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -11534,13 +11564,10 @@
+@@ -10754,12 +11212,23 @@
+ cygwin*)
+ # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+-
+- sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
++ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+ ;;
+ mingw* | cegcc*)
+ # MinGW DLLs use traditional 'lib' prefix
+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++ sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
++ # It is most probably a Windows format PATH printed by
++ # mingw gcc, but we are running on Cygwin. Gcc prints its search
++ # path with ; separators, and with drive letters. We can handle the
++ # drive letters (cygwin fileutils understands them), so leave them,
++ # especially as we might pass files found there to a mingw objdump,
++ # which wouldn't understand a cygwinified path. Ahh.
++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++ else
++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
++ fi
+ ;;
+ pw32*)
+ # pw32 DLLs use 'pw' prefix rather than 'lib'
+@@ -10859,19 +11328,6 @@
+ hardcode_into_libs=yes
+ ;;
+
+-haiku*)
+- version_type=linux
+- need_lib_prefix=no
+- need_version=no
+- dynamic_linker="$host_os runtime_loader"
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+- soname_spec='${libname}${release}${shared_ext}$major'
+- shlibpath_var=LIBRARY_PATH
+- shlibpath_overrides_runpath=yes
+- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
+- hardcode_into_libs=yes
+- ;;
+-
+ hpux9* | hpux10* | hpux11*)
+ # Give a soname corresponding to the major version so that dld.sl refuses to
+ # link against other versions.
+@@ -10914,10 +11370,8 @@
+ soname_spec='${libname}${release}${shared_ext}$major'
+ ;;
+ esac
+- # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
++ # HP-UX runs *really* slowly unless shared libraries are mode 555.
+ postinstall_cmds='chmod 555 $lib'
+- # or fails outright, so override atomically:
+- install_override_mode=555
+ ;;
+
+ interix[3-9]*)
+@@ -10984,17 +11438,12 @@
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+-
+ # Some binutils ld are patched to set DT_RUNPATH
+- if test "${lt_cv_shlibpath_overrides_runpath+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- lt_cv_shlibpath_overrides_runpath=no
+- save_LDFLAGS=$LDFLAGS
+- save_libdir=$libdir
+- eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
+- LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++ save_LDFLAGS=$LDFLAGS
++ save_libdir=$libdir
++ eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
++ LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ int
+@@ -11007,31 +11456,23 @@
+ _ACEOF
+ if ac_fn_c_try_link "$LINENO"; then :
+ if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
+- lt_cv_shlibpath_overrides_runpath=yes
++ shlibpath_overrides_runpath=yes
+ fi
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+- LDFLAGS=$save_LDFLAGS
+- libdir=$save_libdir
+-
+-fi
+-
+- shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
++ LDFLAGS=$save_LDFLAGS
++ libdir=$save_libdir
+
+ # This implies no fast_install, which is unacceptable.
+ # Some rework will be needed to allow for fast_install
# before this can be enabled.
hardcode_into_libs=yes
@@ -8361,13 +10916,15 @@
-
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
+-
++ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -11552,6 +11579,18 @@
+@@ -11043,6 +11484,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -8386,43 +10943,628 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -12172,7 +12211,7 @@
+@@ -11333,11 +11786,6 @@
+
+
+
+-
+-
+-
+-
+-
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
+ $as_echo_n "checking how to hardcode library paths into programs... " >&6; }
+ hardcode_action=
+@@ -11668,7 +12116,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
--#line 12175 "configure"
-+#line 12214 "configure"
+-#line $LINENO "configure"
++#line 12119 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -12268,7 +12307,7 @@
+@@ -11709,13 +12157,7 @@
+ # endif
+ #endif
+
+-/* When -fvisbility=hidden is used, assume the code has been annotated
+- correspondingly for the symbols needed. */
+-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+-void fnord () __attribute__((visibility("default")));
+-#endif
+-
+-void fnord () { int i=42; }
++void fnord() { int i=42;}
+ int main ()
+ {
+ void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+@@ -11724,11 +12166,7 @@
+ if (self)
+ {
+ if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
+- else
+- {
+- if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+- else puts (dlerror ());
+- }
++ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+ /* dlclose (self); */
+ }
+ else
+@@ -11774,7 +12212,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
--#line 12271 "configure"
-+#line 12310 "configure"
+-#line $LINENO "configure"
++#line 12215 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -13208,7 +13247,7 @@
- inherit_rpath_CXX=yes
+@@ -11815,13 +12253,7 @@
+ # endif
+ #endif
+
+-/* When -fvisbility=hidden is used, assume the code has been annotated
+- correspondingly for the symbols needed. */
+-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+-void fnord () __attribute__((visibility("default")));
+-#endif
+-
+-void fnord () { int i=42; }
++void fnord() { int i=42;}
+ int main ()
+ {
+ void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+@@ -11830,11 +12262,7 @@
+ if (self)
+ {
+ if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
+- else
+- {
+- if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+- else puts (dlerror ());
+- }
++ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+ /* dlclose (self); */
+ }
+ else
+@@ -11970,166 +12398,27 @@
+ ;;
+ esac
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
+-$as_echo "$enable_shared" >&6; }
+-
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
+-$as_echo_n "checking whether to build static libraries... " >&6; }
+- # Make sure either enable_shared or enable_static is yes.
+- test "$enable_shared" = yes || enable_static=yes
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
+-$as_echo "$enable_static" >&6; }
+-
+-
+-
+-
+-fi
+-ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-
+-CC="$lt_save_CC"
+-
+- if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+- (test "X$CXX" != "Xg++"))) ; then
+- ac_ext=cpp
+-ac_cpp='$CXXCPP $CPPFLAGS'
+-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
+-$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
+-if test -z "$CXXCPP"; then
+- if test "${ac_cv_prog_CXXCPP+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- # Double quotes because CXXCPP needs to be expanded
+- for CXXCPP in "$CXX -E" "/lib/cpp"
+- do
+- ac_preproc_ok=false
+-for ac_cxx_preproc_warn_flag in '' yes
+-do
+- # Use a header file that comes with gcc, so configuring glibc
+- # with a fresh cross-compiler works.
+- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- # <limits.h> exists even on freestanding compilers.
+- # On the NeXT, cc -E runs the code through the compiler's parser,
+- # not just through cpp. "Syntax error" is here to catch this case.
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+- Syntax error
+-_ACEOF
+-if ac_fn_cxx_try_cpp "$LINENO"; then :
+-
+-else
+- # Broken: fails on valid input.
+-continue
+-fi
+-rm -f conftest.err conftest.$ac_ext
+-
+- # OK, works on sane cases. Now check whether nonexistent headers
+- # can be detected and how.
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-#include <ac_nonexistent.h>
+-_ACEOF
+-if ac_fn_cxx_try_cpp "$LINENO"; then :
+- # Broken: success on invalid input.
+-continue
+-else
+- # Passes both tests.
+-ac_preproc_ok=:
+-break
+-fi
+-rm -f conftest.err conftest.$ac_ext
+-
+-done
+-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+-rm -f conftest.err conftest.$ac_ext
+-if $ac_preproc_ok; then :
+- break
+-fi
+-
+- done
+- ac_cv_prog_CXXCPP=$CXXCPP
+-
+-fi
+- CXXCPP=$ac_cv_prog_CXXCPP
+-else
+- ac_cv_prog_CXXCPP=$CXXCPP
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
+-$as_echo "$CXXCPP" >&6; }
+-ac_preproc_ok=false
+-for ac_cxx_preproc_warn_flag in '' yes
+-do
+- # Use a header file that comes with gcc, so configuring glibc
+- # with a fresh cross-compiler works.
+- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- # <limits.h> exists even on freestanding compilers.
+- # On the NeXT, cc -E runs the code through the compiler's parser,
+- # not just through cpp. "Syntax error" is here to catch this case.
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+- Syntax error
+-_ACEOF
+-if ac_fn_cxx_try_cpp "$LINENO"; then :
++$as_echo "$enable_shared" >&6; }
+
+-else
+- # Broken: fails on valid input.
+-continue
+-fi
+-rm -f conftest.err conftest.$ac_ext
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
++$as_echo_n "checking whether to build static libraries... " >&6; }
++ # Make sure either enable_shared or enable_static is yes.
++ test "$enable_shared" = yes || enable_static=yes
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
++$as_echo "$enable_static" >&6; }
+
+- # OK, works on sane cases. Now check whether nonexistent headers
+- # can be detected and how.
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-#include <ac_nonexistent.h>
+-_ACEOF
+-if ac_fn_cxx_try_cpp "$LINENO"; then :
+- # Broken: success on invalid input.
+-continue
+-else
+- # Passes both tests.
+-ac_preproc_ok=:
+-break
+-fi
+-rm -f conftest.err conftest.$ac_ext
+
+-done
+-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+-rm -f conftest.err conftest.$ac_ext
+-if $ac_preproc_ok; then :
+
+-else
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
+-See \`config.log' for more details" "$LINENO" 5; }
+-fi
+
++fi
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+-else
+- _lt_caught_CXX_error=yes
+-fi
++CC="$lt_save_CC"
++
+
+ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+@@ -12156,8 +12445,6 @@
+ module_expsym_cmds_CXX=
+ link_all_deplibs_CXX=unknown
+ old_archive_cmds_CXX=$old_archive_cmds
+-reload_flag_CXX=$reload_flag
+-reload_cmds_CXX=$reload_cmds
+ no_undefined_flag_CXX=
+ whole_archive_flag_spec_CXX=
+ enable_shared_with_static_runtimes_CXX=no
+@@ -12240,7 +12527,7 @@
+ *) break;;
+ esac
+ done
+-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
++cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+
+
+ if test -n "$compiler"; then
+@@ -12340,7 +12627,7 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+-test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
++test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+ $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+ if test "${lt_cv_prog_gnu_ld+set}" = set; then :
+@@ -12402,7 +12689,7 @@
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
+- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
++ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+
+ else
+ GXX=no
+@@ -12544,7 +12831,7 @@
+
+ hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
+
+- archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++ archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ else
+ if test "$host_cpu" = ia64; then
+ hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
+@@ -12588,13 +12875,8 @@
+ # -berok will link without error, but may produce a broken library.
+ no_undefined_flag_CXX=' ${wl}-bernotok'
+ allow_undefined_flag_CXX=' ${wl}-berok'
+- if test "$with_gnu_ld" = yes; then
+- # We only use this code for GNU lds that support --whole-archive.
+- whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+- else
+- # Exported symbols can be pulled into shared objects from archives
+- whole_archive_flag_spec_CXX='$convenience'
+- fi
++ # Exported symbols can be pulled into shared objects from archives
++ whole_archive_flag_spec_CXX='$convenience'
+ archive_cmds_need_lc_CXX=yes
+ # This is similar to how AIX traditionally builds its shared
+ # libraries.
+@@ -12627,7 +12909,6 @@
+ # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
+ # as there is no search path for DLLs.
+ hardcode_libdir_flag_spec_CXX='-L$libdir'
+- export_dynamic_flag_spec_CXX='${wl}--export-all-symbols'
+ allow_undefined_flag_CXX=unsupported
+ always_export_symbols_CXX=no
+ enable_shared_with_static_runtimes_CXX=yes
+@@ -12654,11 +12935,7 @@
+ hardcode_direct_CXX=no
+ hardcode_automatic_CXX=yes
+ hardcode_shlibpath_var_CXX=unsupported
+- if test "$lt_cv_ld_force_load" = "yes"; then
+- whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+- else
+- whole_archive_flag_spec_CXX=''
+- fi
++ whole_archive_flag_spec_CXX=''
+ link_all_deplibs_CXX=yes
+ allow_undefined_flag_CXX="$_lt_dar_allow_undefined"
+ case $cc_basename in
+@@ -12666,7 +12943,7 @@
+ *) _lt_dar_can_shared=$GCC ;;
+ esac
+ if test "$_lt_dar_can_shared" = "yes"; then
+- output_verbose_link_cmd=func_echo_all
++ output_verbose_link_cmd=echo
+ archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
+ module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
+ archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
+@@ -12719,11 +12996,6 @@
+ gnu*)
;;
-- linux* | k*bsd*-gnu)
-+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+- haiku*)
+- archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+- link_all_deplibs_CXX=yes
+- ;;
+-
+ hpux9*)
+ hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
+ hardcode_libdir_separator_CXX=:
+@@ -12748,7 +13020,7 @@
+ # explicitly linking system object files so we need to strip them
+ # from the output so that they don't get included in the library
+ # dependencies.
+- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
++ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+ ;;
+ *)
+ if test "$GXX" = yes; then
+@@ -12813,7 +13085,7 @@
+ # explicitly linking system object files so we need to strip them
+ # from the output so that they don't get included in the library
+ # dependencies.
+- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
++ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+ ;;
+ *)
+ if test "$GXX" = yes; then
+@@ -12856,7 +13128,7 @@
case $cc_basename in
- KCC*)
- # Kuck and Associates, Inc. (KAI) C++ Compiler
-@@ -14036,7 +14075,7 @@
+ CC*)
+ # SGI C++
+- archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
++ archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+
+ # Archives containing C++ object files must be created using
+ # "CC -ar", where "CC" is the IRIX C++ compiler. This is
+@@ -12867,9 +13139,9 @@
+ *)
+ if test "$GXX" = yes; then
+ if test "$with_gnu_ld" = no; then
+- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ else
+- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
++ archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib'
+ fi
+ fi
+ link_all_deplibs_CXX=yes
+@@ -12898,7 +13170,7 @@
+ # explicitly linking system object files so we need to strip them
+ # from the output so that they don't get included in the library
+ # dependencies.
+- output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
++ output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+
+ hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+ export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+@@ -12935,26 +13207,26 @@
+ pgCC* | pgcpp*)
+ # Portland Group C++ compiler
+ case `$CC -V` in
+- *pgCC\ [1-5].* | *pgcpp\ [1-5].*)
++ *pgCC\ [1-5]* | *pgcpp\ [1-5]*)
+ prelink_cmds_CXX='tpldir=Template.dir~
+ rm -rf $tpldir~
+ $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
+- compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
++ compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
+ old_archive_cmds_CXX='tpldir=Template.dir~
+ rm -rf $tpldir~
+ $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
+- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
++ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
+ $RANLIB $oldlib'
+ archive_cmds_CXX='tpldir=Template.dir~
+ rm -rf $tpldir~
+ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
++ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+ archive_expsym_cmds_CXX='tpldir=Template.dir~
+ rm -rf $tpldir~
+ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
++ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+ ;;
+- *) # Version 6 and above use weak symbols
++ *) # Version 6 will use weak symbols
+ archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+ archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+ ;;
+@@ -12962,7 +13234,7 @@
+
+ hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
+ export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+- whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
++ whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+ ;;
+ cxx*)
+ # Compaq C++
+@@ -12981,9 +13253,9 @@
+ # explicitly linking system object files so we need to strip them
+ # from the output so that they don't get included in the library
+ # dependencies.
+- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
++ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "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 "X$list" | $Xsed'
;;
- esac
- ;;
-- linux* | k*bsd*-gnu)
-+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
- case $cc_basename in
- KCC*)
- # KAI C++ Compiler
-@@ -14100,7 +14139,7 @@
+- xl* | mpixl* | bgxl*)
++ xl*)
+ # IBM XL 8.0 on PPC, with GNU ld
+ hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+ export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+@@ -13003,13 +13275,13 @@
+ archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
+ hardcode_libdir_flag_spec_CXX='-R$libdir'
+- whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
++ whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+ compiler_needs_object_CXX=yes
+
+ # Not sure whether something based on
+ # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
+ # would be better.
+- output_verbose_link_cmd='func_echo_all'
++ output_verbose_link_cmd='echo'
+
+ # Archives containing C++ object files must be created using
+ # "CC -xar", where "CC" is the Sun C++ compiler. This is
+@@ -13078,7 +13350,7 @@
+ export_dynamic_flag_spec_CXX='${wl}-E'
+ whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ fi
+- output_verbose_link_cmd=func_echo_all
++ output_verbose_link_cmd=echo
+ else
+ ld_shlibs_CXX=no
+ fi
+@@ -13113,15 +13385,15 @@
+ case $host in
+ osf3*)
+ allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
+- archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
++ archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+ hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+ ;;
+ *)
+ allow_undefined_flag_CXX=' -expect_unresolved \*'
+- archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
++ archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+ archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
+ echo "-hidden">> $lib.exp~
+- $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~
++ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~
+ $RM $lib.exp'
+ hardcode_libdir_flag_spec_CXX='-rpath $libdir'
+ ;;
+@@ -13137,17 +13409,17 @@
+ # explicitly linking system object files so we need to strip them
+ # from the output so that they don't get included in the library
+ # dependencies.
+- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
++ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "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 "X$list" | $Xsed'
+ ;;
+ *)
+ if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+ allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
+ case $host in
+ osf3*)
+- archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++ archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ ;;
+ *)
+- archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++ archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ ;;
+ esac
+
+@@ -13157,7 +13429,7 @@
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
+- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
++ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+
+ else
+ # FIXME: insert proper C++ library support
+@@ -13193,7 +13465,7 @@
+
+ solaris*)
+ case $cc_basename in
+- CC* | sunCC*)
++ CC*)
+ # Sun C++ 4.2, 5.x and Centerline C++
+ archive_cmds_need_lc_CXX=yes
+ no_undefined_flag_CXX=' -zdefs'
+@@ -13214,7 +13486,7 @@
+ esac
+ link_all_deplibs_CXX=yes
+
+- output_verbose_link_cmd='func_echo_all'
++ output_verbose_link_cmd='echo'
+
+ # Archives containing C++ object files must be created using
+ # "CC -xar", where "CC" is the Sun C++ compiler. This is
+@@ -13241,7 +13513,7 @@
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
+- output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
++ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+ else
+ # g++ 2.7 appears to require `-G' NOT `-shared' on this
+ # platform.
+@@ -13252,7 +13524,7 @@
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
+- output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
++ output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+ fi
+
+ hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
+@@ -13306,10 +13578,6 @@
+ CC*)
+ archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+- old_archive_cmds_CXX='$CC -Tprelink_objects $oldobjs~
+- '"$old_archive_cmds_CXX"
+- reload_cmds_CXX='$CC -Tprelink_objects $reload_objs~
+- '"$reload_cmds_CXX"
+ ;;
+ *)
+ archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+@@ -13491,7 +13759,7 @@
+
+ solaris*)
+ case $cc_basename in
+- CC* | sunCC*)
++ CC*)
+ # The more standards-conforming stlport4 library is
+ # incompatible with the Cstd library. Avoid specifying
+ # it if it's in CXXFLAGS. Ignore libCrun as
+@@ -13607,11 +13875,6 @@
+ # DJGPP does not support shared libraries at all
+ lt_prog_compiler_pic_CXX=
+ ;;
+- haiku*)
+- # PIC is the default for Haiku.
+- # The "-static" flag exists, but is broken.
+- lt_prog_compiler_static_CXX=
+- ;;
+ interix[3-9]*)
+ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+ # Instead, we relocate shared libraries at runtime.
+@@ -13750,8 +14013,8 @@
+ lt_prog_compiler_pic_CXX=
+ lt_prog_compiler_static_CXX='-non_shared'
+ ;;
+- xlc* | xlC* | bgxl[cC]* | mpixl[cC]*)
+- # IBM XL 8.0, 9.0 on PPC and BlueGene
++ xlc* | xlC*)
++ # IBM XL 8.0 on PPC
+ lt_prog_compiler_wl_CXX='-Wl,'
+ lt_prog_compiler_pic_CXX='-qpic'
+ lt_prog_compiler_static_CXX='-qstaticlink'
+@@ -13781,7 +14044,7 @@
;;
esac
;;
@@ -8431,49 +11573,96 @@
;;
*qnx* | *nto*)
# QNX uses GNU C++, but need to define -shared option too, otherwise
-@@ -14224,11 +14263,11 @@
+@@ -13813,7 +14076,7 @@
+ ;;
+ solaris*)
+ case $cc_basename in
+- CC* | sunCC*)
++ CC*)
+ # Sun C++ 4.2, 5.x and Centerline C++
+ lt_prog_compiler_pic_CXX='-KPIC'
+ lt_prog_compiler_static_CXX='-Bstatic'
+@@ -13905,15 +14168,15 @@
-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:14227: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14266: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14171: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:14231: \$? = $ac_status" >&5
-+ echo "$as_me:14270: \$? = $ac_status" >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:14175: \$? = $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.
-@@ -14323,11 +14362,11 @@
+- $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
++ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+ lt_cv_prog_compiler_pic_works_CXX=yes
+@@ -13958,7 +14221,7 @@
+ if test -s conftest.err; then
+ # Append any errors to the config.log.
+ cat conftest.err 1>&5
+- $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
++ $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if diff conftest.exp conftest.er2 >/dev/null; then
+ lt_cv_prog_compiler_static_works_CXX=yes
+@@ -14004,16 +14267,16 @@
-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:14326: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14365: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14270: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:14330: \$? = $ac_status" >&5
-+ echo "$as_me:14369: \$? = $ac_status" >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:14274: \$? = $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
-@@ -14375,11 +14414,11 @@
+ # So say no if there are warnings
+- $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
++ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+ lt_cv_prog_compiler_c_o_CXX=yes
+@@ -14056,16 +14319,16 @@
-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:14378: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14417: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14322: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:14382: \$? = $ac_status" >&5
-+ echo "$as_me:14421: \$? = $ac_status" >&5
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ echo "$as_me:14326: \$? = $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
-@@ -14451,6 +14490,9 @@
+ # So say no if there are warnings
+- $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
++ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+ lt_cv_prog_compiler_c_o_CXX=yes
+@@ -14120,10 +14383,8 @@
+ aix[4-9]*)
+ # If we're using GNU nm, then we don't want the "-C" option.
+ # -C means demangle to AIX nm, but means don't demangle with GNU nm
+- # Also, AIX nm treats weak defined symbols like other global defined
+- # symbols, whereas GNU nm marks them as "W".
+ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+- export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
++ export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ else
+ export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ fi
+@@ -14134,6 +14395,9 @@
cygwin* | mingw* | cegcc*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
;;
@@ -8483,16 +11672,196 @@
*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
-@@ -14950,7 +14992,7 @@
+@@ -14170,50 +14434,44 @@
+ # to ld, don't add -lc before -lgcc.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
+ $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
+-if test "${lt_cv_archive_cmds_need_lc_CXX+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- $RM conftest*
+- echo "$lt_simple_compile_test_code" > conftest.$ac_ext
++ $RM conftest*
++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } 2>conftest.err; then
+- soname=conftest
+- lib=conftest
+- libobjs=conftest.$ac_objext
+- deplibs=
+- wl=$lt_prog_compiler_wl_CXX
+- pic_flag=$lt_prog_compiler_pic_CXX
+- compiler_flags=-v
+- linker_flags=-v
+- verstring=
+- output_objdir=.
+- libname=conftest
+- lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
+- allow_undefined_flag_CXX=
+- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
++ soname=conftest
++ lib=conftest
++ libobjs=conftest.$ac_objext
++ deplibs=
++ wl=$lt_prog_compiler_wl_CXX
++ pic_flag=$lt_prog_compiler_pic_CXX
++ compiler_flags=-v
++ linker_flags=-v
++ verstring=
++ output_objdir=.
++ libname=conftest
++ lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
++ allow_undefined_flag_CXX=
++ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
+ (eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+- then
+- lt_cv_archive_cmds_need_lc_CXX=no
+- else
+- lt_cv_archive_cmds_need_lc_CXX=yes
+- fi
+- allow_undefined_flag_CXX=$lt_save_allow_undefined_flag
+- else
+- cat conftest.err 1>&5
+- fi
+- $RM conftest*
+-
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc_CXX" >&5
+-$as_echo "$lt_cv_archive_cmds_need_lc_CXX" >&6; }
+- archive_cmds_need_lc_CXX=$lt_cv_archive_cmds_need_lc_CXX
++ then
++ archive_cmds_need_lc_CXX=no
++ else
++ archive_cmds_need_lc_CXX=yes
++ fi
++ allow_undefined_flag_CXX=$lt_save_allow_undefined_flag
++ else
++ cat conftest.err 1>&5
++ fi
++ $RM conftest*
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc_CXX" >&5
++$as_echo "$archive_cmds_need_lc_CXX" >&6; }
+ ;;
+ esac
+ fi
+@@ -14370,7 +14628,7 @@
+ m68k)
+ library_names_spec='$libname.ixlibrary $libname.a'
+ # Create ${libname}_ixlibrary.a entries in /sys/libs.
+- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
++ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+ ;;
+ esac
;;
-
- # This must be Linux ELF.
--linux* | k*bsd*-gnu)
-+linux* | k*bsd*-gnu | kopensolaris*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
-@@ -14990,13 +15032,10 @@
+@@ -14423,11 +14681,23 @@
+ cygwin*)
+ # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+-
++ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+ ;;
+ mingw* | cegcc*)
+ # MinGW DLLs use traditional 'lib' prefix
+ soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++ sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++ if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
++ # It is most probably a Windows format PATH printed by
++ # mingw gcc, but we are running on Cygwin. Gcc prints its search
++ # path with ; separators, and with drive letters. We can handle the
++ # drive letters (cygwin fileutils understands them), so leave them,
++ # especially as we might pass files found there to a mingw objdump,
++ # which wouldn't understand a cygwinified path. Ahh.
++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++ else
++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
++ fi
+ ;;
+ pw32*)
+ # pw32 DLLs use 'pw' prefix rather than 'lib'
+@@ -14526,19 +14796,6 @@
+ hardcode_into_libs=yes
+ ;;
+
+-haiku*)
+- version_type=linux
+- need_lib_prefix=no
+- need_version=no
+- dynamic_linker="$host_os runtime_loader"
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+- soname_spec='${libname}${release}${shared_ext}$major'
+- shlibpath_var=LIBRARY_PATH
+- shlibpath_overrides_runpath=yes
+- sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
+- hardcode_into_libs=yes
+- ;;
+-
+ hpux9* | hpux10* | hpux11*)
+ # Give a soname corresponding to the major version so that dld.sl refuses to
+ # link against other versions.
+@@ -14581,10 +14838,8 @@
+ soname_spec='${libname}${release}${shared_ext}$major'
+ ;;
+ esac
+- # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
++ # HP-UX runs *really* slowly unless shared libraries are mode 555.
+ postinstall_cmds='chmod 555 $lib'
+- # or fails outright, so override atomically:
+- install_override_mode=555
+ ;;
+
+ interix[3-9]*)
+@@ -14651,17 +14906,12 @@
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+-
+ # Some binutils ld are patched to set DT_RUNPATH
+- if test "${lt_cv_shlibpath_overrides_runpath+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- lt_cv_shlibpath_overrides_runpath=no
+- save_LDFLAGS=$LDFLAGS
+- save_libdir=$libdir
+- eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \
+- LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\""
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++ save_LDFLAGS=$LDFLAGS
++ save_libdir=$libdir
++ eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \
++ LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\""
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ int
+@@ -14674,31 +14924,23 @@
+ _ACEOF
+ if ac_fn_cxx_try_link "$LINENO"; then :
+ if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
+- lt_cv_shlibpath_overrides_runpath=yes
++ shlibpath_overrides_runpath=yes
+ fi
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+- LDFLAGS=$save_LDFLAGS
+- libdir=$save_libdir
+-
+-fi
+-
+- shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
++ LDFLAGS=$save_LDFLAGS
++ libdir=$save_libdir
+
+ # This implies no fast_install, which is unacceptable.
+ # Some rework will be needed to allow for fast_install
# before this can be enabled.
hardcode_into_libs=yes
@@ -8501,13 +11870,15 @@
-
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+- lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
+-
++ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -15008,6 +15047,18 @@
+@@ -14710,6 +14952,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -8526,7 +11897,760 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -17579,6 +17630,26 @@
+@@ -14949,8 +15203,6 @@
+
+
+
+-
+-
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
+ $as_echo_n "checking how to hardcode library paths into programs... " >&6; }
+ hardcode_action_CXX=
+@@ -15037,15 +15289,16 @@
+ : ${CONFIG_LT=./config.lt}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_LT" >&5
+ $as_echo "$as_me: creating $CONFIG_LT" >&6;}
+-as_write_fail=0
+-cat >"$CONFIG_LT" <<_ASEOF || as_write_fail=1
++cat >"$CONFIG_LT" <<_LTEOF
+ #! $SHELL
+ # Generated by $as_me.
+ # Run this file to recreate a libtool stub with the current configuration.
++
++lt_cl_silent=false
+ SHELL=\${CONFIG_SHELL-$SHELL}
+-export SHELL
+-_ASEOF
+-cat >>"$CONFIG_LT" <<\_ASEOF || as_write_fail=1
++_LTEOF
++
++cat >>"$CONFIG_LT" <<\_LTEOF
+ ## -------------------- ##
+ ## M4sh Initialization. ##
+ ## -------------------- ##
+@@ -15170,19 +15423,20 @@
+ (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+
+-# as_fn_error STATUS ERROR [LINENO LOG_FD]
+-# ----------------------------------------
++
++# as_fn_error ERROR [LINENO LOG_FD]
++# ---------------------------------
+ # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+ # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+-# script with STATUS, using 1 if that was 0.
++# script with status $?, using 1 if that was 0.
+ as_fn_error ()
+ {
+- as_status=$1; test $as_status -eq 0 && as_status=1
+- if test "$4"; then
+- as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+- $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
++ as_status=$?; test $as_status -eq 0 && as_status=1
++ if test "$3"; then
++ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+ fi
+- $as_echo "$as_me: error: $2" >&2
++ $as_echo "$as_me: error: $1" >&2
+ as_fn_exit $as_status
+ } # as_fn_error
+
+@@ -15378,7 +15632,7 @@
+ test -d "$as_dir" && break
+ done
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
+- } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
++ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" "$LINENO" 5
+
+
+ } # as_fn_mkdir_p
+@@ -15419,15 +15673,8 @@
+ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+
+-exec 6>&1
+-## --------------------------------- ##
+-## Main body of "$CONFIG_LT" script. ##
+-## --------------------------------- ##
+-_ASEOF
+-test $as_write_fail = 0 && chmod +x "$CONFIG_LT"
+
+-cat >>"$CONFIG_LT" <<\_LTEOF
+-lt_cl_silent=false
++exec 6>&1
+ exec 5>>config.log
+ {
+ echo
+@@ -15452,9 +15699,9 @@
+
+ lt_cl_version="\
+ gtk+ config.lt 2.21.5
+-configured by $0, generated by GNU Autoconf 2.66.
++configured by $0, generated by GNU Autoconf 2.65.
+
+-Copyright (C) 2010 Free Software Foundation, Inc.
++Copyright (C) 2008 Free Software Foundation, Inc.
+ This config.lt script is free software; the Free Software Foundation
+ gives unlimited permision to copy, distribute and modify it."
+
+@@ -15470,10 +15717,10 @@
+ --quiet | --q* | --silent | --s* | -q )
+ lt_cl_silent=: ;;
+
+- -*) as_fn_error $? "unrecognized option: $1
++ -*) as_fn_error "unrecognized option: $1
+ Try \`$0 --help' for more information." "$LINENO" 5 ;;
+
+- *) as_fn_error $? "unrecognized argument: $1
++ *) as_fn_error "unrecognized argument: $1
+ Try \`$0 --help' for more information." "$LINENO" 5 ;;
+ esac
+ shift
+@@ -15494,203 +15741,186 @@
+ sed_quote_subst='$sed_quote_subst'
+ double_quote_subst='$double_quote_subst'
+ delay_variable_subst='$delay_variable_subst'
+-enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
+-AS='`$ECHO "$AS" | $SED "$delay_single_quote_subst"`'
+-DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
+-OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
+-macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
+-macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
+-enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
+-pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
+-enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
+-SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
+-ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
+-host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
+-host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
+-host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
+-build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`'
+-build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`'
+-build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`'
+-SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`'
+-Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`'
+-GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`'
+-EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`'
+-FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`'
+-LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`'
+-NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`'
+-LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`'
+-max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`'
+-ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`'
+-exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
+-lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
+-lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
+-lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
+-reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
+-reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
+-deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
+-file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
+-AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
+-AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
+-STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
+-RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
+-old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
+-old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
+-old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`'
+-lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`'
+-CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`'
+-CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`'
+-compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`'
+-GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`'
+-lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`'
+-lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
+-lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
+-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
+-objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
+-MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
+-lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
+-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
+-lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
+-lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
+-lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
+-need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
+-DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
+-NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
+-LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
+-OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`'
+-OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`'
+-libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`'
+-shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`'
+-extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
+-archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`'
+-enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`'
+-export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`'
+-whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`'
+-compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`'
+-old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`'
+-old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
+-archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`'
+-archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`'
+-module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`'
+-module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`'
+-with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`'
+-allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
+-no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
+-hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
+-hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`'
+-hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
+-hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
+-hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
+-hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`'
+-hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`'
+-hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
+-inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
+-link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
+-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
+-always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
+-export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
+-exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
+-include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
+-prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
+-file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
+-variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
+-need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
+-need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`'
+-version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`'
+-runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`'
+-shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`'
+-shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`'
+-libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`'
+-library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`'
+-soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`'
+-install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`'
+-postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`'
+-postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
+-finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'
+-finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
+-hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
+-sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
+-sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`'
+-hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
+-enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
+-enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
+-enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`'
+-old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`'
+-striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`'
+-compiler_lib_search_dirs='`$ECHO "$compiler_lib_search_dirs" | $SED "$delay_single_quote_subst"`'
+-predep_objects='`$ECHO "$predep_objects" | $SED "$delay_single_quote_subst"`'
+-postdep_objects='`$ECHO "$postdep_objects" | $SED "$delay_single_quote_subst"`'
+-predeps='`$ECHO "$predeps" | $SED "$delay_single_quote_subst"`'
+-postdeps='`$ECHO "$postdeps" | $SED "$delay_single_quote_subst"`'
+-compiler_lib_search_path='`$ECHO "$compiler_lib_search_path" | $SED "$delay_single_quote_subst"`'
+-LD_CXX='`$ECHO "$LD_CXX" | $SED "$delay_single_quote_subst"`'
+-reload_flag_CXX='`$ECHO "$reload_flag_CXX" | $SED "$delay_single_quote_subst"`'
+-reload_cmds_CXX='`$ECHO "$reload_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+-old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+-compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`'
+-GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`'
+-lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`'
+-lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`'
+-lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`'
+-lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`'
+-lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`'
+-archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`'
+-enable_shared_with_static_runtimes_CXX='`$ECHO "$enable_shared_with_static_runtimes_CXX" | $SED "$delay_single_quote_subst"`'
+-export_dynamic_flag_spec_CXX='`$ECHO "$export_dynamic_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
+-whole_archive_flag_spec_CXX='`$ECHO "$whole_archive_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
+-compiler_needs_object_CXX='`$ECHO "$compiler_needs_object_CXX" | $SED "$delay_single_quote_subst"`'
+-old_archive_from_new_cmds_CXX='`$ECHO "$old_archive_from_new_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+-old_archive_from_expsyms_cmds_CXX='`$ECHO "$old_archive_from_expsyms_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+-archive_cmds_CXX='`$ECHO "$archive_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+-archive_expsym_cmds_CXX='`$ECHO "$archive_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+-module_cmds_CXX='`$ECHO "$module_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+-module_expsym_cmds_CXX='`$ECHO "$module_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+-with_gnu_ld_CXX='`$ECHO "$with_gnu_ld_CXX" | $SED "$delay_single_quote_subst"`'
+-allow_undefined_flag_CXX='`$ECHO "$allow_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
+-no_undefined_flag_CXX='`$ECHO "$no_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
+-hardcode_libdir_flag_spec_CXX='`$ECHO "$hardcode_libdir_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
+-hardcode_libdir_flag_spec_ld_CXX='`$ECHO "$hardcode_libdir_flag_spec_ld_CXX" | $SED "$delay_single_quote_subst"`'
+-hardcode_libdir_separator_CXX='`$ECHO "$hardcode_libdir_separator_CXX" | $SED "$delay_single_quote_subst"`'
+-hardcode_direct_CXX='`$ECHO "$hardcode_direct_CXX" | $SED "$delay_single_quote_subst"`'
+-hardcode_direct_absolute_CXX='`$ECHO "$hardcode_direct_absolute_CXX" | $SED "$delay_single_quote_subst"`'
+-hardcode_minus_L_CXX='`$ECHO "$hardcode_minus_L_CXX" | $SED "$delay_single_quote_subst"`'
+-hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_single_quote_subst"`'
+-hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`'
+-inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`'
+-link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`'
+-fix_srcfile_path_CXX='`$ECHO "$fix_srcfile_path_CXX" | $SED "$delay_single_quote_subst"`'
+-always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`'
+-export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+-exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
+-include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
+-prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+-file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`'
+-hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`'
+-compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`'
+-predep_objects_CXX='`$ECHO "$predep_objects_CXX" | $SED "$delay_single_quote_subst"`'
+-postdep_objects_CXX='`$ECHO "$postdep_objects_CXX" | $SED "$delay_single_quote_subst"`'
+-predeps_CXX='`$ECHO "$predeps_CXX" | $SED "$delay_single_quote_subst"`'
+-postdeps_CXX='`$ECHO "$postdeps_CXX" | $SED "$delay_single_quote_subst"`'
+-compiler_lib_search_path_CXX='`$ECHO "$compiler_lib_search_path_CXX" | $SED "$delay_single_quote_subst"`'
++enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`'
++AS='`$ECHO "X$AS" | $Xsed -e "$delay_single_quote_subst"`'
++DLLTOOL='`$ECHO "X$DLLTOOL" | $Xsed -e "$delay_single_quote_subst"`'
++OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`'
++macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`'
++macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`'
++enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`'
++pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`'
++enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`'
++host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`'
++host='`$ECHO "X$host" | $Xsed -e "$delay_single_quote_subst"`'
++host_os='`$ECHO "X$host_os" | $Xsed -e "$delay_single_quote_subst"`'
++build_alias='`$ECHO "X$build_alias" | $Xsed -e "$delay_single_quote_subst"`'
++build='`$ECHO "X$build" | $Xsed -e "$delay_single_quote_subst"`'
++build_os='`$ECHO "X$build_os" | $Xsed -e "$delay_single_quote_subst"`'
++SED='`$ECHO "X$SED" | $Xsed -e "$delay_single_quote_subst"`'
++Xsed='`$ECHO "X$Xsed" | $Xsed -e "$delay_single_quote_subst"`'
++GREP='`$ECHO "X$GREP" | $Xsed -e "$delay_single_quote_subst"`'
++EGREP='`$ECHO "X$EGREP" | $Xsed -e "$delay_single_quote_subst"`'
++FGREP='`$ECHO "X$FGREP" | $Xsed -e "$delay_single_quote_subst"`'
++LD='`$ECHO "X$LD" | $Xsed -e "$delay_single_quote_subst"`'
++NM='`$ECHO "X$NM" | $Xsed -e "$delay_single_quote_subst"`'
++LN_S='`$ECHO "X$LN_S" | $Xsed -e "$delay_single_quote_subst"`'
++max_cmd_len='`$ECHO "X$max_cmd_len" | $Xsed -e "$delay_single_quote_subst"`'
++ac_objext='`$ECHO "X$ac_objext" | $Xsed -e "$delay_single_quote_subst"`'
++exeext='`$ECHO "X$exeext" | $Xsed -e "$delay_single_quote_subst"`'
++lt_unset='`$ECHO "X$lt_unset" | $Xsed -e "$delay_single_quote_subst"`'
++lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`'
++lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`'
++reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`'
++reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`'
++file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`'
++AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`'
++AR_FLAGS='`$ECHO "X$AR_FLAGS" | $Xsed -e "$delay_single_quote_subst"`'
++STRIP='`$ECHO "X$STRIP" | $Xsed -e "$delay_single_quote_subst"`'
++RANLIB='`$ECHO "X$RANLIB" | $Xsed -e "$delay_single_quote_subst"`'
++old_postinstall_cmds='`$ECHO "X$old_postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++old_postuninstall_cmds='`$ECHO "X$old_postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++old_archive_cmds='`$ECHO "X$old_archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++CC='`$ECHO "X$CC" | $Xsed -e "$delay_single_quote_subst"`'
++CFLAGS='`$ECHO "X$CFLAGS" | $Xsed -e "$delay_single_quote_subst"`'
++compiler='`$ECHO "X$compiler" | $Xsed -e "$delay_single_quote_subst"`'
++GCC='`$ECHO "X$GCC" | $Xsed -e "$delay_single_quote_subst"`'
++lt_cv_sys_global_symbol_pipe='`$ECHO "X$lt_cv_sys_global_symbol_pipe" | $Xsed -e "$delay_single_quote_subst"`'
++lt_cv_sys_global_symbol_to_cdecl='`$ECHO "X$lt_cv_sys_global_symbol_to_cdecl" | $Xsed -e "$delay_single_quote_subst"`'
++lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address" | $Xsed -e "$delay_single_quote_subst"`'
++lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
++objdir='`$ECHO "X$objdir" | $Xsed -e "$delay_single_quote_subst"`'
++SHELL='`$ECHO "X$SHELL" | $Xsed -e "$delay_single_quote_subst"`'
++ECHO='`$ECHO "X$ECHO" | $Xsed -e "$delay_single_quote_subst"`'
++MAGIC_CMD='`$ECHO "X$MAGIC_CMD" | $Xsed -e "$delay_single_quote_subst"`'
++lt_prog_compiler_no_builtin_flag='`$ECHO "X$lt_prog_compiler_no_builtin_flag" | $Xsed -e "$delay_single_quote_subst"`'
++lt_prog_compiler_wl='`$ECHO "X$lt_prog_compiler_wl" | $Xsed -e "$delay_single_quote_subst"`'
++lt_prog_compiler_pic='`$ECHO "X$lt_prog_compiler_pic" | $Xsed -e "$delay_single_quote_subst"`'
++lt_prog_compiler_static='`$ECHO "X$lt_prog_compiler_static" | $Xsed -e "$delay_single_quote_subst"`'
++lt_cv_prog_compiler_c_o='`$ECHO "X$lt_cv_prog_compiler_c_o" | $Xsed -e "$delay_single_quote_subst"`'
++need_locks='`$ECHO "X$need_locks" | $Xsed -e "$delay_single_quote_subst"`'
++DSYMUTIL='`$ECHO "X$DSYMUTIL" | $Xsed -e "$delay_single_quote_subst"`'
++NMEDIT='`$ECHO "X$NMEDIT" | $Xsed -e "$delay_single_quote_subst"`'
++LIPO='`$ECHO "X$LIPO" | $Xsed -e "$delay_single_quote_subst"`'
++OTOOL='`$ECHO "X$OTOOL" | $Xsed -e "$delay_single_quote_subst"`'
++OTOOL64='`$ECHO "X$OTOOL64" | $Xsed -e "$delay_single_quote_subst"`'
++libext='`$ECHO "X$libext" | $Xsed -e "$delay_single_quote_subst"`'
++shrext_cmds='`$ECHO "X$shrext_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++extract_expsyms_cmds='`$ECHO "X$extract_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++archive_cmds_need_lc='`$ECHO "X$archive_cmds_need_lc" | $Xsed -e "$delay_single_quote_subst"`'
++enable_shared_with_static_runtimes='`$ECHO "X$enable_shared_with_static_runtimes" | $Xsed -e "$delay_single_quote_subst"`'
++export_dynamic_flag_spec='`$ECHO "X$export_dynamic_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
++whole_archive_flag_spec='`$ECHO "X$whole_archive_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
++compiler_needs_object='`$ECHO "X$compiler_needs_object" | $Xsed -e "$delay_single_quote_subst"`'
++old_archive_from_new_cmds='`$ECHO "X$old_archive_from_new_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++old_archive_from_expsyms_cmds='`$ECHO "X$old_archive_from_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++archive_cmds='`$ECHO "X$archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++archive_expsym_cmds='`$ECHO "X$archive_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++module_cmds='`$ECHO "X$module_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++module_expsym_cmds='`$ECHO "X$module_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++with_gnu_ld='`$ECHO "X$with_gnu_ld" | $Xsed -e "$delay_single_quote_subst"`'
++allow_undefined_flag='`$ECHO "X$allow_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
++no_undefined_flag='`$ECHO "X$no_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
++hardcode_libdir_flag_spec='`$ECHO "X$hardcode_libdir_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
++hardcode_libdir_flag_spec_ld='`$ECHO "X$hardcode_libdir_flag_spec_ld" | $Xsed -e "$delay_single_quote_subst"`'
++hardcode_libdir_separator='`$ECHO "X$hardcode_libdir_separator" | $Xsed -e "$delay_single_quote_subst"`'
++hardcode_direct='`$ECHO "X$hardcode_direct" | $Xsed -e "$delay_single_quote_subst"`'
++hardcode_direct_absolute='`$ECHO "X$hardcode_direct_absolute" | $Xsed -e "$delay_single_quote_subst"`'
++hardcode_minus_L='`$ECHO "X$hardcode_minus_L" | $Xsed -e "$delay_single_quote_subst"`'
++hardcode_shlibpath_var='`$ECHO "X$hardcode_shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
++hardcode_automatic='`$ECHO "X$hardcode_automatic" | $Xsed -e "$delay_single_quote_subst"`'
++inherit_rpath='`$ECHO "X$inherit_rpath" | $Xsed -e "$delay_single_quote_subst"`'
++link_all_deplibs='`$ECHO "X$link_all_deplibs" | $Xsed -e "$delay_single_quote_subst"`'
++fix_srcfile_path='`$ECHO "X$fix_srcfile_path" | $Xsed -e "$delay_single_quote_subst"`'
++always_export_symbols='`$ECHO "X$always_export_symbols" | $Xsed -e "$delay_single_quote_subst"`'
++export_symbols_cmds='`$ECHO "X$export_symbols_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++exclude_expsyms='`$ECHO "X$exclude_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
++include_expsyms='`$ECHO "X$include_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
++prelink_cmds='`$ECHO "X$prelink_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++file_list_spec='`$ECHO "X$file_list_spec" | $Xsed -e "$delay_single_quote_subst"`'
++variables_saved_for_relink='`$ECHO "X$variables_saved_for_relink" | $Xsed -e "$delay_single_quote_subst"`'
++need_lib_prefix='`$ECHO "X$need_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
++need_version='`$ECHO "X$need_version" | $Xsed -e "$delay_single_quote_subst"`'
++version_type='`$ECHO "X$version_type" | $Xsed -e "$delay_single_quote_subst"`'
++runpath_var='`$ECHO "X$runpath_var" | $Xsed -e "$delay_single_quote_subst"`'
++shlibpath_var='`$ECHO "X$shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
++shlibpath_overrides_runpath='`$ECHO "X$shlibpath_overrides_runpath" | $Xsed -e "$delay_single_quote_subst"`'
++libname_spec='`$ECHO "X$libname_spec" | $Xsed -e "$delay_single_quote_subst"`'
++library_names_spec='`$ECHO "X$library_names_spec" | $Xsed -e "$delay_single_quote_subst"`'
++soname_spec='`$ECHO "X$soname_spec" | $Xsed -e "$delay_single_quote_subst"`'
++postinstall_cmds='`$ECHO "X$postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++postuninstall_cmds='`$ECHO "X$postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++finish_cmds='`$ECHO "X$finish_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++finish_eval='`$ECHO "X$finish_eval" | $Xsed -e "$delay_single_quote_subst"`'
++hardcode_into_libs='`$ECHO "X$hardcode_into_libs" | $Xsed -e "$delay_single_quote_subst"`'
++sys_lib_search_path_spec='`$ECHO "X$sys_lib_search_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
++sys_lib_dlsearch_path_spec='`$ECHO "X$sys_lib_dlsearch_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
++hardcode_action='`$ECHO "X$hardcode_action" | $Xsed -e "$delay_single_quote_subst"`'
++enable_dlopen='`$ECHO "X$enable_dlopen" | $Xsed -e "$delay_single_quote_subst"`'
++enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quote_subst"`'
++enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`'
++old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`'
++striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`'
++compiler_lib_search_dirs='`$ECHO "X$compiler_lib_search_dirs" | $Xsed -e "$delay_single_quote_subst"`'
++predep_objects='`$ECHO "X$predep_objects" | $Xsed -e "$delay_single_quote_subst"`'
++postdep_objects='`$ECHO "X$postdep_objects" | $Xsed -e "$delay_single_quote_subst"`'
++predeps='`$ECHO "X$predeps" | $Xsed -e "$delay_single_quote_subst"`'
++postdeps='`$ECHO "X$postdeps" | $Xsed -e "$delay_single_quote_subst"`'
++compiler_lib_search_path='`$ECHO "X$compiler_lib_search_path" | $Xsed -e "$delay_single_quote_subst"`'
++LD_CXX='`$ECHO "X$LD_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++old_archive_cmds_CXX='`$ECHO "X$old_archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++compiler_CXX='`$ECHO "X$compiler_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++GCC_CXX='`$ECHO "X$GCC_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "X$lt_prog_compiler_no_builtin_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++lt_prog_compiler_wl_CXX='`$ECHO "X$lt_prog_compiler_wl_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++lt_prog_compiler_pic_CXX='`$ECHO "X$lt_prog_compiler_pic_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++lt_prog_compiler_static_CXX='`$ECHO "X$lt_prog_compiler_static_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++lt_cv_prog_compiler_c_o_CXX='`$ECHO "X$lt_cv_prog_compiler_c_o_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++archive_cmds_need_lc_CXX='`$ECHO "X$archive_cmds_need_lc_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++enable_shared_with_static_runtimes_CXX='`$ECHO "X$enable_shared_with_static_runtimes_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++export_dynamic_flag_spec_CXX='`$ECHO "X$export_dynamic_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++whole_archive_flag_spec_CXX='`$ECHO "X$whole_archive_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++compiler_needs_object_CXX='`$ECHO "X$compiler_needs_object_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++old_archive_from_new_cmds_CXX='`$ECHO "X$old_archive_from_new_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++old_archive_from_expsyms_cmds_CXX='`$ECHO "X$old_archive_from_expsyms_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++archive_cmds_CXX='`$ECHO "X$archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++archive_expsym_cmds_CXX='`$ECHO "X$archive_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++module_cmds_CXX='`$ECHO "X$module_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++module_expsym_cmds_CXX='`$ECHO "X$module_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++with_gnu_ld_CXX='`$ECHO "X$with_gnu_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++allow_undefined_flag_CXX='`$ECHO "X$allow_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++no_undefined_flag_CXX='`$ECHO "X$no_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++hardcode_libdir_flag_spec_CXX='`$ECHO "X$hardcode_libdir_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++hardcode_libdir_flag_spec_ld_CXX='`$ECHO "X$hardcode_libdir_flag_spec_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++hardcode_libdir_separator_CXX='`$ECHO "X$hardcode_libdir_separator_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++hardcode_direct_CXX='`$ECHO "X$hardcode_direct_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++hardcode_direct_absolute_CXX='`$ECHO "X$hardcode_direct_absolute_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++hardcode_minus_L_CXX='`$ECHO "X$hardcode_minus_L_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++hardcode_shlibpath_var_CXX='`$ECHO "X$hardcode_shlibpath_var_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++hardcode_automatic_CXX='`$ECHO "X$hardcode_automatic_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++inherit_rpath_CXX='`$ECHO "X$inherit_rpath_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++link_all_deplibs_CXX='`$ECHO "X$link_all_deplibs_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++fix_srcfile_path_CXX='`$ECHO "X$fix_srcfile_path_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++always_export_symbols_CXX='`$ECHO "X$always_export_symbols_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++export_symbols_cmds_CXX='`$ECHO "X$export_symbols_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++exclude_expsyms_CXX='`$ECHO "X$exclude_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++include_expsyms_CXX='`$ECHO "X$include_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++prelink_cmds_CXX='`$ECHO "X$prelink_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++file_list_spec_CXX='`$ECHO "X$file_list_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++hardcode_action_CXX='`$ECHO "X$hardcode_action_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++compiler_lib_search_dirs_CXX='`$ECHO "X$compiler_lib_search_dirs_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++predep_objects_CXX='`$ECHO "X$predep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++postdep_objects_CXX='`$ECHO "X$postdep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++predeps_CXX='`$ECHO "X$predeps_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++postdeps_CXX='`$ECHO "X$postdeps_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++compiler_lib_search_path_CXX='`$ECHO "X$compiler_lib_search_path_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+
+ LTCC='$LTCC'
+ LTCFLAGS='$LTCFLAGS'
+ compiler='$compiler_DEFAULT'
+
+-# A function that is used when there is no print builtin or printf.
+-func_fallback_echo ()
+-{
+- eval 'cat <<_LTECHO_EOF
+-\$1
+-_LTECHO_EOF'
+-}
+-
+ # Quote evaled strings.
+-for var in AS \
+-DLLTOOL \
+-OBJDUMP \
+-SHELL \
+-ECHO \
+-SED \
++for var in SED \
+ GREP \
+ EGREP \
+ FGREP \
+@@ -15713,6 +15943,8 @@
+ lt_cv_sys_global_symbol_to_cdecl \
+ lt_cv_sys_global_symbol_to_c_name_address \
+ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
++SHELL \
++ECHO \
+ lt_prog_compiler_no_builtin_flag \
+ lt_prog_compiler_wl \
+ lt_prog_compiler_pic \
+@@ -15742,7 +15974,6 @@
+ libname_spec \
+ library_names_spec \
+ soname_spec \
+-install_override_mode \
+ finish_eval \
+ old_striplib \
+ striplib \
+@@ -15753,7 +15984,6 @@
+ postdeps \
+ compiler_lib_search_path \
+ LD_CXX \
+-reload_flag_CXX \
+ compiler_CXX \
+ lt_prog_compiler_no_builtin_flag_CXX \
+ lt_prog_compiler_wl_CXX \
+@@ -15779,9 +16009,9 @@
+ predeps_CXX \
+ postdeps_CXX \
+ compiler_lib_search_path_CXX; do
+- case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
++ case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+ *[\\\\\\\`\\"\\\$]*)
+- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
++ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+ ;;
+ *)
+ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+@@ -15808,7 +16038,6 @@
+ finish_cmds \
+ sys_lib_search_path_spec \
+ sys_lib_dlsearch_path_spec \
+-reload_cmds_CXX \
+ old_archive_cmds_CXX \
+ old_archive_from_new_cmds_CXX \
+ old_archive_from_expsyms_cmds_CXX \
+@@ -15818,9 +16047,9 @@
+ module_expsym_cmds_CXX \
+ export_symbols_cmds_CXX \
+ prelink_cmds_CXX; do
+- case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
++ case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+ *[\\\\\\\`\\"\\\$]*)
+- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
++ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+ ;;
+ *)
+ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+@@ -15828,6 +16057,12 @@
+ esac
+ done
+
++# Fix-up fallback echo if it was mangled by the above quoting rules.
++case \$lt_ECHO in
++*'\\\$0 --fallback-echo"') lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\`
++ ;;
++esac
++
+ ac_aux_dir='$ac_aux_dir'
+ xsi_shell='$xsi_shell'
+ lt_shell_append='$lt_shell_append'
+@@ -15875,8 +16110,7 @@
+ # NOTE: Changes made to this file will be lost: look at ltmain.sh.
+ #
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+-# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+-# Inc.
++# 2006, 2007, 2008 Free Software Foundation, Inc.
+ # Written by Gordon Matzigkeit, 1996
+ #
+ # This file is part of GNU Libtool.
+@@ -15912,13 +16146,13 @@
+ build_old_libs=$enable_static
+
+ # Assembler program.
+-AS=$lt_AS
++AS=$AS
+
+ # DLL creation program.
+-DLLTOOL=$lt_DLLTOOL
++DLLTOOL=$DLLTOOL
+
+ # Object dumper program.
+-OBJDUMP=$lt_OBJDUMP
++OBJDUMP=$OBJDUMP
+
+ # Which release of libtool.m4 was used?
+ macro_version=$macro_version
+@@ -15933,12 +16167,6 @@
+ # Whether or not to optimize for fast installation.
+ fast_install=$enable_fast_install
+
+-# Shell to use when invoking shell scripts.
+-SHELL=$lt_SHELL
+-
+-# An echo program that protects backslashes.
+-ECHO=$lt_ECHO
+-
+ # The host system.
+ host_alias=$host_alias
+ host=$host
+@@ -15988,6 +16216,10 @@
+ # turn newlines into spaces.
+ NL2SP=$lt_lt_NL2SP
+
++# How to create reloadable object files.
++reload_flag=$lt_reload_flag
++reload_cmds=$lt_reload_cmds
++
+ # Method to check whether dependent libraries are shared objects.
+ deplibs_check_method=$lt_deplibs_check_method
+
+@@ -16006,9 +16238,6 @@
+ old_postinstall_cmds=$lt_old_postinstall_cmds
+ old_postuninstall_cmds=$lt_old_postuninstall_cmds
+
+-# Whether to use a lock for old archive extraction.
+-lock_old_archive_extraction=$lock_old_archive_extraction
+-
+ # A C compiler.
+ LTCC=$lt_CC
+
+@@ -16030,6 +16259,12 @@
+ # The name of the directory that contains temporary libtool files.
+ objdir=$objdir
+
++# Shell to use when invoking shell scripts.
++SHELL=$lt_SHELL
++
++# An echo program that does not interpret backslashes.
++ECHO=$lt_ECHO
++
+ # Used to examine libraries when file_magic_cmd begins with "file".
+ MAGIC_CMD=$MAGIC_CMD
+
+@@ -16092,9 +16327,6 @@
+ # The coded name of the library, if different from the real name.
+ soname_spec=$lt_soname_spec
+
+-# Permission mode override for installation of shared libraries.
+-install_override_mode=$lt_install_override_mode
+-
+ # Command to use after installation of a shared archive.
+ postinstall_cmds=$lt_postinstall_cmds
+
+@@ -16134,10 +16366,6 @@
+ # The linker used to build libraries.
+ LD=$lt_LD
+
+-# How to create reloadable object files.
+-reload_flag=$lt_reload_flag
+-reload_cmds=$lt_reload_cmds
+-
+ # Commands used to build an old-style archive.
+ old_archive_cmds=$lt_old_archive_cmds
+
+@@ -16411,7 +16639,7 @@
+ func_dirname ()
+ {
+ # Extract subdirectory from the argument.
+- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
++ func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
+ if test "X$func_dirname_result" = "X${1}"; then
+ func_dirname_result="${3}"
+ else
+@@ -16422,7 +16650,7 @@
+ # func_basename file
+ func_basename ()
+ {
+- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
++ func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
+ }
+
+
+@@ -16435,8 +16663,10 @@
+ func_stripname ()
+ {
+ case ${2} in
+- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
+- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
++ .*) func_stripname_result=`$ECHO "X${3}" \
++ | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
++ *) func_stripname_result=`$ECHO "X${3}" \
++ | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
+ esac
+ }
+
+@@ -16447,20 +16677,20 @@
+ # func_opt_split
+ func_opt_split ()
+ {
+- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
+- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
++ func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
++ func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
+ }
+
+ # func_lo2o object
+ func_lo2o ()
+ {
+- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
++ func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
+ }
+
+ # func_xform libobj-or-source
+ func_xform ()
+ {
+- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
++ func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[^.]*$/.lo/'`
+ }
+
+ # func_arith arithmetic-term...
+@@ -16521,10 +16751,6 @@
+ # The linker used to build libraries.
+ LD=$lt_LD_CXX
+
+-# How to create reloadable object files.
+-reload_flag=$lt_reload_flag_CXX
+-reload_cmds=$lt_reload_cmds_CXX
+-
+ # Commands used to build an old-style archive.
+ old_archive_cmds=$lt_old_archive_cmds_CXX
+
+@@ -16679,13 +16905,15 @@
+ # appending to config.log, which fails on DOS, as config.log is still kept
+ # open by configure. Here we exec the FD to /dev/null, effectively closing
+ # config.log, so it can be properly (re)opened and appended to by config.lt.
+-lt_cl_success=:
+-test "$silent" = yes &&
+- lt_config_lt_args="$lt_config_lt_args --quiet"
+-exec 5>/dev/null
+-$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
+-exec 5>>config.log
+-$lt_cl_success || as_fn_exit 1
++if test "$no_create" != yes; then
++ lt_cl_success=:
++ test "$silent" = yes &&
++ lt_config_lt_args="$lt_config_lt_args --quiet"
++ exec 5>/dev/null
++ $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
++ exec 5>>config.log
++ $lt_cl_success || as_fn_exit 1
++fi
+
+
+
+@@ -17227,7 +17455,7 @@
+ fi
+
+ if test "$WINDRES" = no; then
+- as_fn_error $? "*** Could not find an implementation of windres in your PATH." "$LINENO" 5
++ as_fn_error "*** Could not find an implementation of windres in your PATH." "$LINENO" 5
+ fi
+ # Extract the first word of "lib.exe", so it can be a program name with args.
+ set dummy lib.exe; ac_word=$2
+@@ -17307,6 +17535,26 @@
enable_xinerama="yes"
fi
@@ -8553,7 +12677,450 @@
# Check whether --enable-rebuilds was given.
if test "${enable_rebuilds+set}" = set; then :
enableval=$enable_rebuilds;
-@@ -24038,7 +24109,8 @@
+@@ -17345,7 +17593,7 @@
+
+ case $gdktarget in
+ x11|win32|quartz|directfb) ;;
+- *) as_fn_error $? "Invalid target for GDK: use x11, quartz, directfb or win32." "$LINENO" 5;;
++ *) as_fn_error "Invalid target for GDK: use x11, quartz, directfb or win32." "$LINENO" 5;;
+ esac
+
+ gdktargetlib=libgdk-$gdktarget-$GTK_API_VERSION.la
+@@ -17390,11 +17638,11 @@
+ '
+ case `pwd` in
+ *[\\\"\#\$\&\'\`$am_lf]*)
+- as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
++ as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
+ esac
+ case $srcdir in
+ *[\\\"\#\$\&\'\`$am_lf\ \ ]*)
+- as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
++ as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
+ esac
+
+ # Do `set' in a subshell so we don't clobber the current shell's
+@@ -17416,7 +17664,7 @@
+ # if, for instance, CONFIG_SHELL is bash and it inherits a
+ # broken ls alias from the environment. This has actually
+ # happened. Such a system could not be considered "sane".
+- as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
++ as_fn_error "ls -t appears to fail. Make sure there is not a broken
+ alias in your environment" "$LINENO" 5
+ fi
+
+@@ -17426,7 +17674,7 @@
+ # Ok.
+ :
+ else
+- as_fn_error $? "newly created file is older than distributed files!
++ as_fn_error "newly created file is older than distributed files!
+ Check your system clock" "$LINENO" 5
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+@@ -17789,8 +18037,8 @@
+
+ test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "no acceptable C compiler found in \$PATH
+-See \`config.log' for more details" "$LINENO" 5; }
++as_fn_error "no acceptable C compiler found in \$PATH
++See \`config.log' for more details." "$LINENO" 5; }
+
+ # Provide some information about the compiler.
+ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+@@ -18168,7 +18416,7 @@
+ fi
+ set dummy $CC; ac_cc=`$as_echo "$2" |
+ sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
+-if eval "test \"\${ac_cv_prog_cc_${ac_cc}_c_o+set}\"" = set; then :
++if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -18290,7 +18538,7 @@
+ $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+ set x ${MAKE-make}
+ ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
++if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
+ $as_echo_n "(cached) " >&6
+ else
+ cat >conftest.make <<\_ACEOF
+@@ -18298,7 +18546,7 @@
+ all:
+ @echo '@@@%%%=$(MAKE)=@@@%%%'
+ _ACEOF
+-# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
++# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+ case `${MAKE-make} -f conftest.make 2>/dev/null` in
+ *@@@%%%=?*=@@@%%%*)
+ eval ac_cv_prog_make_${ac_make}_set=yes;;
+@@ -18507,10 +18755,6 @@
+ fi
+ fi
+
+-
+-
+-
+-
+ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BASE_DEPENDENCIES" >&5
+ $as_echo_n "checking for BASE_DEPENDENCIES... " >&6; }
+@@ -18518,8 +18762,7 @@
+ if test -n "$BASE_DEPENDENCIES_CFLAGS"; then
+ pkg_cv_BASE_DEPENDENCIES_CFLAGS="$BASE_DEPENDENCIES_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+-
+-if test -n "$PKG_CONFIG" && \
++ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.25.10 atk >= 1.29.2 pango >= 1.20 cairo >= 1.6 gdk-pixbuf-2.0 >= 2.21.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.25.10 atk >= 1.29.2 pango >= 1.20 cairo >= 1.6 gdk-pixbuf-2.0 >= 2.21.0") 2>&5
+ ac_status=$?
+@@ -18528,17 +18771,14 @@
+ pkg_cv_BASE_DEPENDENCIES_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.25.10 atk >= 1.29.2 pango >= 1.20 cairo >= 1.6 gdk-pixbuf-2.0 >= 2.21.0" 2>/dev/null`
+ else
+ pkg_failed=yes
+-
+ fi
+ else
+ pkg_failed=untried
+ fi
+-
+ if test -n "$BASE_DEPENDENCIES_LIBS"; then
+ pkg_cv_BASE_DEPENDENCIES_LIBS="$BASE_DEPENDENCIES_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+-
+-if test -n "$PKG_CONFIG" && \
++ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.25.10 atk >= 1.29.2 pango >= 1.20 cairo >= 1.6 gdk-pixbuf-2.0 >= 2.21.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.25.10 atk >= 1.29.2 pango >= 1.20 cairo >= 1.6 gdk-pixbuf-2.0 >= 2.21.0") 2>&5
+ ac_status=$?
+@@ -18547,7 +18787,6 @@
+ pkg_cv_BASE_DEPENDENCIES_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.25.10 atk >= 1.29.2 pango >= 1.20 cairo >= 1.6 gdk-pixbuf-2.0 >= 2.21.0" 2>/dev/null`
+ else
+ pkg_failed=yes
+-
+ fi
+ else
+ pkg_failed=untried
+@@ -18555,7 +18794,6 @@
+
+
+
+-
+ if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+@@ -18565,7 +18803,6 @@
+ else
+ _pkg_short_errors_supported=no
+ fi
+-
+ if test $_pkg_short_errors_supported = yes; then
+ BASE_DEPENDENCIES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= 2.25.10 atk >= 1.29.2 pango >= 1.20 cairo >= 1.6 gdk-pixbuf-2.0 >= 2.21.0" 2>&1`
+ else
+@@ -18574,7 +18811,7 @@
+ # Put the nasty error message in config.log where it belongs
+ echo "$BASE_DEPENDENCIES_PKG_ERRORS" >&5
+
+- as_fn_error $? "Package requirements (glib-2.0 >= 2.25.10 atk >= 1.29.2 pango >= 1.20 cairo >= 1.6 gdk-pixbuf-2.0 >= 2.21.0) were not met:
++ as_fn_error "Package requirements (glib-2.0 >= 2.25.10 atk >= 1.29.2 pango >= 1.20 cairo >= 1.6 gdk-pixbuf-2.0 >= 2.21.0) were not met:
+
+ $BASE_DEPENDENCIES_PKG_ERRORS
+
+@@ -18584,13 +18821,12 @@
+ Alternatively, you may set the environment variables BASE_DEPENDENCIES_CFLAGS
+ and BASE_DEPENDENCIES_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details." "$LINENO" 5
+-
+ elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
++as_fn_error "The pkg-config script could not be found or is too old. Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+
+@@ -18599,8 +18835,7 @@
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details" "$LINENO" 5; }
+-
++See \`config.log' for more details." "$LINENO" 5; }
+ else
+ BASE_DEPENDENCIES_CFLAGS=$pkg_cv_BASE_DEPENDENCIES_CFLAGS
+ BASE_DEPENDENCIES_LIBS=$pkg_cv_BASE_DEPENDENCIES_LIBS
+@@ -18609,7 +18844,6 @@
+
+ fi
+
+-
+ ## In addition to checking that cairo is present, we also need to
+ ## check that the correct cairo backend is there. E.g. if the GDK
+ ## target is win32 we need the cairo-win32 backend and so on.
+@@ -18621,9 +18855,6 @@
+ cairo_backend=xlib
+ fi
+
+-
+-
+-
+ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CAIRO_BACKEND" >&5
+ $as_echo_n "checking for CAIRO_BACKEND... " >&6; }
+@@ -18631,8 +18862,7 @@
+ if test -n "$CAIRO_BACKEND_CFLAGS"; then
+ pkg_cv_CAIRO_BACKEND_CFLAGS="$CAIRO_BACKEND_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+-
+-if test -n "$PKG_CONFIG" && \
++ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo-\$cairo_backend >= 1.6\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "cairo-$cairo_backend >= 1.6") 2>&5
+ ac_status=$?
+@@ -18641,17 +18871,14 @@
+ pkg_cv_CAIRO_BACKEND_CFLAGS=`$PKG_CONFIG --cflags "cairo-$cairo_backend >= 1.6" 2>/dev/null`
+ else
+ pkg_failed=yes
+-
+ fi
+ else
+ pkg_failed=untried
+ fi
+-
+ if test -n "$CAIRO_BACKEND_LIBS"; then
+ pkg_cv_CAIRO_BACKEND_LIBS="$CAIRO_BACKEND_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+-
+-if test -n "$PKG_CONFIG" && \
++ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo-\$cairo_backend >= 1.6\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "cairo-$cairo_backend >= 1.6") 2>&5
+ ac_status=$?
+@@ -18660,7 +18887,6 @@
+ pkg_cv_CAIRO_BACKEND_LIBS=`$PKG_CONFIG --libs "cairo-$cairo_backend >= 1.6" 2>/dev/null`
+ else
+ pkg_failed=yes
+-
+ fi
+ else
+ pkg_failed=untried
+@@ -18668,7 +18894,6 @@
+
+
+
+-
+ if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+@@ -18678,7 +18903,6 @@
+ else
+ _pkg_short_errors_supported=no
+ fi
+-
+ if test $_pkg_short_errors_supported = yes; then
+ CAIRO_BACKEND_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "cairo-$cairo_backend >= 1.6" 2>&1`
+ else
+@@ -18687,7 +18911,7 @@
+ # Put the nasty error message in config.log where it belongs
+ echo "$CAIRO_BACKEND_PKG_ERRORS" >&5
+
+- as_fn_error $? "Package requirements (cairo-$cairo_backend >= 1.6) were not met:
++ as_fn_error "Package requirements (cairo-$cairo_backend >= 1.6) were not met:
+
+ $CAIRO_BACKEND_PKG_ERRORS
+
+@@ -18697,13 +18921,12 @@
+ Alternatively, you may set the environment variables CAIRO_BACKEND_CFLAGS
+ and CAIRO_BACKEND_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details." "$LINENO" 5
+-
+ elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
++as_fn_error "The pkg-config script could not be found or is too old. Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+
+@@ -18712,8 +18935,7 @@
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details" "$LINENO" 5; }
+-
++See \`config.log' for more details." "$LINENO" 5; }
+ else
+ CAIRO_BACKEND_CFLAGS=$pkg_cv_CAIRO_BACKEND_CFLAGS
+ CAIRO_BACKEND_LIBS=$pkg_cv_CAIRO_BACKEND_LIBS
+@@ -18722,7 +18944,6 @@
+
+ fi
+
+-
+ if test "$os_win32" != yes; then
+ # libtool option to control which symbols are exported
+ # right now, symbols starting with _ are not exported
+@@ -18756,7 +18977,7 @@
+ ;;
+ yes|no)
+ ;;
+- *) as_fn_error $? "Value given to --enable-explicit-deps must be one of yes, no or auto" "$LINENO" 5
++ *) as_fn_error "Value given to --enable-explicit-deps must be one of yes, no or auto" "$LINENO" 5
+ ;;
+ esac
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_explicit_deps" >&5
+@@ -18871,7 +19092,8 @@
+ do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
++eval as_val=\$$as_ac_var
++ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+@@ -20079,7 +20301,6 @@
+ fi
+ fi
+
+-
+ no_glib=""
+
+ if test "x$PKG_CONFIG" = x ; then
+@@ -20273,7 +20494,7 @@
+ GLIB_GENMARSHAL=""
+ GOBJECT_QUERY=""
+ GLIB_MKENUMS=""
+- as_fn_error $? "
++ as_fn_error "
+ *** GLIB 2.25.10 or better is required. The latest version of
+ *** GLIB is always available from ftp://ftp.gtk.org/pub/gtk/." "$LINENO" 5
+ fi
+@@ -20641,7 +20862,8 @@
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+ "
+-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
++eval as_val=\$$as_ac_Header
++ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+@@ -21240,7 +21462,7 @@
+ if echo "$all_immodules" | egrep "(^|,)$immodule(\$|,)" > /dev/null; then
+ :
+ else
+- as_fn_error $? "the specified input method $immodule does not exist" "$LINENO" 5
++ as_fn_error "the specified input method $immodule does not exist" "$LINENO" 5
+ fi
+
+ INCLUDED_IMMODULE_OBJ="$INCLUDED_IMMODULE_OBJ ../modules/input/libstatic-im-$immodule.la"
+@@ -21667,7 +21889,7 @@
+
+ if test ! -f $srcdir/gtk/gtkbuiltincache.h &&
+ test "x$REBUILD_PNGS" = "x#" ; then
+- as_fn_error $? "
++ as_fn_error "
+ *** gtkbuiltincache.h is not in the tree, and cannot be built
+ *** because you don't have libpng, or (when cross-compiling) you
+ *** don't have a prebuilt gtk-update-icon-cache on the build system." "$LINENO" 5
+@@ -21692,7 +21914,7 @@
+ # settings.
+ #
+ if $PKG_CONFIG --exists fontconfig; then : ; else
+- as_fn_error $? "
++ as_fn_error "
+ *** fontconfig (http://www.fontconfig.org) is required by the X11 backend." "$LINENO" 5
+ fi
+
+@@ -21733,7 +21955,7 @@
+ have_x=disabled
+ else
+ case $x_includes,$x_libraries in #(
+- *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #(
++ *\'*) as_fn_error "cannot use X directory names containing '" "$LINENO" 5;; #(
+ *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+@@ -21751,7 +21973,7 @@
+ @echo libdir='${LIBDIR}'
+ _ACEOF
+ if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then
+- # GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
++ # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+ for ac_var in incroot usrlibdir libdir; do
+ eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
+ done
+@@ -22402,7 +22624,7 @@
+ fi
+
+ if test x$no_x = xyes ; then
+- as_fn_error $? "X development libraries not found" "$LINENO" 5
++ as_fn_error "X development libraries not found" "$LINENO" 5
+ fi
+
+ x_cflags="$X_CFLAGS"
+@@ -22427,21 +22649,21 @@
+ if test "x$ac_cv_func_XOpenDisplay" = x""yes; then :
+ :
+ else
+- as_fn_error $? "*** libX11 not found. Check 'config.log' for more details." "$LINENO" 5
++ as_fn_error "*** libX11 not found. Check 'config.log' for more details." "$LINENO" 5
+ fi
+
+ ac_fn_c_check_func "$LINENO" "XextFindDisplay" "ac_cv_func_XextFindDisplay"
+ if test "x$ac_cv_func_XextFindDisplay" = x""yes; then :
+ :
+ else
+- as_fn_error $? "*** libXext not found. Check 'config.log' for more details." "$LINENO" 5
++ as_fn_error "*** libXext not found. Check 'config.log' for more details." "$LINENO" 5
+ fi
+
+ ac_fn_c_check_func "$LINENO" "XRenderQueryExtension" "ac_cv_func_XRenderQueryExtension"
+ if test "x$ac_cv_func_XRenderQueryExtension" = x""yes; then :
+ :
+ else
+- as_fn_error $? "*** libXrender not found. Check 'config.log' for more details." "$LINENO" 5
++ as_fn_error "*** libXrender not found. Check 'config.log' for more details." "$LINENO" 5
+ fi
+
+
+@@ -22485,7 +22707,7 @@
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown" >&5
+ $as_echo "unknown" >&6; }
+- as_fn_error $? "xReply type unavailable. X11 is too old" "$LINENO" 5
++ as_fn_error "xReply type unavailable. X11 is too old" "$LINENO" 5
+ fi
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+@@ -22497,7 +22719,8 @@
+ do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
++eval as_val=\$$as_ac_var
++ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+@@ -22559,7 +22782,7 @@
+ if test "x$ac_cv_func_XShapeCombineMask" = x""yes; then :
+ :
+ else
+- as_fn_error $? "Shape extension not found, check your development headers" "$LINENO" 5
++ as_fn_error "Shape extension not found, check your development headers" "$LINENO" 5
+ fi
+
+
+@@ -22863,7 +23086,8 @@
# Check for the RANDR extension
@@ -8563,7 +13130,7 @@
$as_echo "#define HAVE_RANDR 1" >>confdefs.h
-@@ -24058,7 +24130,8 @@
+@@ -22883,7 +23107,8 @@
# Checks for XFixes extension
@@ -8573,7 +13140,7 @@
$as_echo "#define HAVE_XFIXES 1" >>confdefs.h
-@@ -24069,7 +24142,8 @@
+@@ -22894,7 +23119,8 @@
# Checks for Xcomposite extension
@@ -8583,7 +13150,7 @@
$as_echo "#define HAVE_XCOMPOSITE 1" >>confdefs.h
-@@ -24080,7 +24154,7 @@
+@@ -22905,7 +23131,7 @@
# Checks for Xdamage extension
@@ -8592,36 +13159,159 @@
$as_echo "#define HAVE_XDAMAGE 1" >>confdefs.h
-@@ -24365,20 +24439,23 @@
+@@ -23008,9 +23234,6 @@
+ $as_echo_n "checking for DirectFB... " >&6; }
+
+
+-
+-
+-
+ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DIRECTFB" >&5
+ $as_echo_n "checking for DIRECTFB... " >&6; }
+@@ -23018,8 +23241,7 @@
+ if test -n "$DIRECTFB_CFLAGS"; then
+ pkg_cv_DIRECTFB_CFLAGS="$DIRECTFB_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+-
+-if test -n "$PKG_CONFIG" && \
++ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"directfb >= \$DIRECTFB_REQUIRED_VERSION\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "directfb >= $DIRECTFB_REQUIRED_VERSION") 2>&5
+ ac_status=$?
+@@ -23028,17 +23250,14 @@
+ pkg_cv_DIRECTFB_CFLAGS=`$PKG_CONFIG --cflags "directfb >= $DIRECTFB_REQUIRED_VERSION" 2>/dev/null`
+ else
+ pkg_failed=yes
+-
+ fi
+ else
+ pkg_failed=untried
+ fi
+-
+ if test -n "$DIRECTFB_LIBS"; then
+ pkg_cv_DIRECTFB_LIBS="$DIRECTFB_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+-
+-if test -n "$PKG_CONFIG" && \
++ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"directfb >= \$DIRECTFB_REQUIRED_VERSION\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "directfb >= $DIRECTFB_REQUIRED_VERSION") 2>&5
+ ac_status=$?
+@@ -23047,7 +23266,6 @@
+ pkg_cv_DIRECTFB_LIBS=`$PKG_CONFIG --libs "directfb >= $DIRECTFB_REQUIRED_VERSION" 2>/dev/null`
+ else
+ pkg_failed=yes
+-
+ fi
+ else
+ pkg_failed=untried
+@@ -23055,7 +23273,6 @@
+
+
+
+-
+ if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+@@ -23065,7 +23282,6 @@
+ else
+ _pkg_short_errors_supported=no
+ fi
+-
+ if test $_pkg_short_errors_supported = yes; then
+ DIRECTFB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "directfb >= $DIRECTFB_REQUIRED_VERSION" 2>&1`
+ else
+@@ -23074,7 +23290,7 @@
+ # Put the nasty error message in config.log where it belongs
+ echo "$DIRECTFB_PKG_ERRORS" >&5
+
+- as_fn_error $? "Package requirements (directfb >= $DIRECTFB_REQUIRED_VERSION) were not met:
++ as_fn_error "Package requirements (directfb >= $DIRECTFB_REQUIRED_VERSION) were not met:
+
+ $DIRECTFB_PKG_ERRORS
+
+@@ -23084,13 +23300,12 @@
+ Alternatively, you may set the environment variables DIRECTFB_CFLAGS
+ and DIRECTFB_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details." "$LINENO" 5
+-
+ elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
++as_fn_error "The pkg-config script could not be found or is too old. Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+
+@@ -23099,8 +23314,7 @@
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details" "$LINENO" 5; }
+-
++See \`config.log' for more details." "$LINENO" 5; }
+ else
+ DIRECTFB_CFLAGS=$pkg_cv_DIRECTFB_CFLAGS
+ DIRECTFB_LIBS=$pkg_cv_DIRECTFB_LIBS
+@@ -23108,7 +23322,6 @@
+ $as_echo "yes" >&6; }
+
+ fi
+-
+ if true; then
+ USE_DIRECTFB_TRUE=
+ USE_DIRECTFB_FALSE='#'
+@@ -23146,7 +23359,7 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PANGO_CFLAGS $PANGO_LIBS" >&5
+ $as_echo "$PANGO_CFLAGS $PANGO_LIBS" >&6; }
+ else
+- as_fn_error $? "
++ as_fn_error "
+ *** Pango not found. Pango built with Cairo support is required
+ *** to build GTK+. See http://www.pango.org for Pango information.
+ " "$LINENO" 5
+@@ -23180,7 +23393,7 @@
+ if ac_fn_c_try_link "$LINENO"; then :
+ :
+ else
+- as_fn_error $? "
++ as_fn_error "
+ *** Can't link to Pango. Pango is required to build
+ *** GTK+. For more information see http://www.pango.org" "$LINENO" 5
+ fi
+@@ -23194,20 +23407,23 @@
# Pull in gio-unix for GDesktopAppInfo usage, see at least gdkapplaunchcontext-x11.c
if test "x$gdktarget" = "xx11"; then
-- GDK_PACKAGES="$PANGO_PACKAGES gio-unix-2.0 $X_PACKAGES cairo-$cairo_backend"
-+ GDK_PACKAGES="$PANGO_PACKAGES"
+- GDK_PACKAGES="$PANGO_PACKAGES gio-unix-2.0 $X_PACKAGES gdk-pixbuf-2.0 cairo-$cairo_backend"
++ GDK_PACKAGES="$PANGO_PACKAGES gdk-pixbuf-2.0"
+ GDK_PRIVATE_PACKAGES="gio-unix-2.0 $X_PACKAGES cairo-$cairo_backend"
else
-- GDK_PACKAGES="$PANGO_PACKAGES $X_PACKAGES cairo-$cairo_backend"
-+ GDK_PACKAGES="$PANGO_PACKAGES"
-+ GDK_PRIVATE_PACKAGES="$X_PACKAGES cairo-$cairo_backend"
+- GDK_PACKAGES="$PANGO_PACKAGES gio-2.0 gdk-pixbuf-2.0 cairo-$cairo_backend"
++ GDK_PACKAGES="$PANGO_PACKAGES gdk-pixbuf-2.0"
++ GDK_PRIVATE_PACKAGES="gio-2.0 cairo-$cairo_backend"
fi
--GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS"
--GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS"
-+GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $GDK_PRIVATE_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS"
-+GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $GDK_PRIVATE_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS"
+-GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PACKAGES`"
+-GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PACKAGES` $GDK_EXTRA_CFLAGS"
++GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PACKAGES $GDK_PRIVATE_PACKAGES`"
++GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PACKAGES $GDK_PRIVATE_PACKAGES` $GDK_EXTRA_CFLAGS"
#
# If we aren't writing explicit dependencies, then don't put the extra libraries we need
# into the pkg-config files
#
if test $enable_explicit_deps != yes ; then
-- GDK_PACKAGES="$PANGO_PACKAGES"
+- GDK_PACKAGES="$PANGO_PACKAGES gdk-pixbuf-2.0"
GDK_EXTRA_LIBS=
+else
+ GDK_PACKAGES="$GDK_PACKAGES $GDK_PRIVATE_PACKAGES"
fi
-@@ -24388,6 +24465,7 @@
+@@ -23217,6 +23433,7 @@
@@ -8629,85 +13319,1352 @@
########################################
# Check for Accessibility Toolkit flags
########################################
-@@ -24462,7 +24540,7 @@
- CAIRO_PREFIX="`pkg-config --variable=prefix cairo`"
-
- if test $enable_explicit_deps != yes ; then
-- GDK_PIXBUF_EXTRA_LIBS=
-+ GDK_PIXBUF_EXTRA_LIBS="$MATH_LIB"
+@@ -23231,7 +23448,7 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ATK_CFLAGS $ATK_LIBS" >&5
+ $as_echo "$ATK_CFLAGS $ATK_LIBS" >&6; }
+ else
+- as_fn_error $? "
++ as_fn_error "
+ *** Accessibility Toolkit not found. Accessibility Toolkit is required
+ *** to build GTK+.
+ " "$LINENO" 5
+@@ -23263,7 +23480,7 @@
+ if ac_fn_c_try_link "$LINENO"; then :
+ :
+ else
+- as_fn_error $? "
++ as_fn_error "
+ *** Cannot link to Accessibility Toolkit. Accessibility Toolkit is required
+ *** to build GTK+" "$LINENO" 5
fi
-
-
-@@ -25693,6 +25771,10 @@
- as_fn_error "conditional \"am__fastdepCC\" was never defined.
+@@ -23582,7 +23799,7 @@
+ fi
+
+ else
+- as_fn_error $? "
++ as_fn_error "
+ *** cups not found.
+ " "$LINENO" 5
+ fi
+@@ -23610,7 +23827,7 @@
+ if test "x$ac_cv_header_cups_cups_h" = x""yes; then :
+
+ else
+- as_fn_error $? "*** Sorry, cups-config present but cups/cups.h missing." "$LINENO" 5
++ as_fn_error "*** Sorry, cups-config present but cups/cups.h missing." "$LINENO" 5
+ fi
+
+
+@@ -23743,7 +23960,7 @@
+ fi
+
+ if test "x$enable_papi" = "xyes" -a "x$have_papi" = "xno"; then
+- as_fn_error $? "
++ as_fn_error "
+ *** papi not found.
+ " "$LINENO" 5
+ fi
+@@ -23765,7 +23982,7 @@
+ if test "x$ac_cv_header_cairo_pdf_h" = x""yes; then :
+
+ else
+- as_fn_error $? "
++ as_fn_error "
+ *** Can't find cairo-pdf.h. You must build Cairo with the pdf
+ *** backend enabled." "$LINENO" 5
+ fi
+@@ -23777,7 +23994,7 @@
+ if test "x$ac_cv_header_cairo_ps_h" = x""yes; then :
+
+ else
+- as_fn_error $? "
++ as_fn_error "
+ *** Can't find cairo-ps.h. You must build Cairo with the
+ *** postscript backend enabled." "$LINENO" 5
+ fi
+@@ -23788,7 +24005,7 @@
+ if test "x$ac_cv_header_cairo_svg_h" = x""yes; then :
+
+ else
+- as_fn_error $? "
++ as_fn_error "
+ *** Can't find cairo-svg.h. You must build Cairo with the
+ *** svg backend enabled." "$LINENO" 5
+ fi
+@@ -23859,8 +24076,7 @@
+ found_introspection="no (disabled, use --enable-introspection to enable)"
+ ;; #(
+ yes) :
+-
+-if test -n "$PKG_CONFIG" && \
++ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0") 2>&5
+ ac_status=$?
+@@ -23868,11 +24084,9 @@
+ test $ac_status = 0; }; then
+ :
+ else
+- as_fn_error $? "gobject-introspection-1.0 is not installed" "$LINENO" 5
+-
++ as_fn_error "gobject-introspection-1.0 is not installed" "$LINENO" 5
+ fi
+-
+-if test -n "$PKG_CONFIG" && \
++ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 0.6.7\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= 0.6.7") 2>&5
+ ac_status=$?
+@@ -23880,13 +24094,11 @@
+ test $ac_status = 0; }; then
+ found_introspection=yes
+ else
+- as_fn_error $? "You need to have gobject-introspection >= 0.6.7 installed to build gtk+" "$LINENO" 5
+-
++ as_fn_error "You need to have gobject-introspection >= 0.6.7 installed to build gtk+" "$LINENO" 5
+ fi
+ ;; #(
+ auto) :
+-
+-if test -n "$PKG_CONFIG" && \
++ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 0.6.7\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= 0.6.7") 2>&5
+ ac_status=$?
+@@ -23895,11 +24107,10 @@
+ found_introspection=yes
+ else
+ found_introspection=no
+-
+ fi
+ ;; #(
+ *) :
+- as_fn_error $? "invalid argument passed to --enable-introspection, should be one of [no/auto/yes]" "$LINENO" 5
++ as_fn_error "invalid argument passed to --enable-introspection, should be one of [no/auto/yes]" "$LINENO" 5
+ ;;
+ esac
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $found_introspection" >&5
+@@ -24095,8 +24306,7 @@
+
+
+ if test x$enable_gtk_doc = xyes; then
+-
+-if test -n "$PKG_CONFIG" && \
++ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.11\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gtk-doc >= 1.11") 2>&5
+ ac_status=$?
+@@ -24104,8 +24314,7 @@
+ test $ac_status = 0; }; then
+ :
+ else
+- as_fn_error $? "You need to have gtk-doc >= 1.11 installed to build $PACKAGE_NAME" "$LINENO" 5
+-
++ as_fn_error "You need to have gtk-doc >= 1.11 installed to build $PACKAGE_NAME" "$LINENO" 5
+ fi
+ fi
+
+@@ -24491,7 +24700,6 @@
+
+ ac_libobjs=
+ ac_ltlibobjs=
+-U=
+ for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
+ # 1. Remove the extension, and $U if already installed.
+ ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
+@@ -24515,235 +24723,243 @@
+ fi
+
+ if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
+- as_fn_error $? "conditional \"AMDEP\" was never defined.
++ as_fn_error "conditional \"AMDEP\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
+- as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
++ as_fn_error "conditional \"am__fastdepCC\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
++fi
+if test -z "${ENABLE_STATIC_TRUE}" && test -z "${ENABLE_STATIC_FALSE}"; then
+ as_fn_error "conditional \"ENABLE_STATIC\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
+- as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
++ as_fn_error "conditional \"am__fastdepCXX\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${HAVE_CXX_TRUE}" && test -z "${HAVE_CXX_FALSE}"; then
+- as_fn_error $? "conditional \"HAVE_CXX\" was never defined.
++ as_fn_error "conditional \"HAVE_CXX\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${HAVE_OBJC_TRUE}" && test -z "${HAVE_OBJC_FALSE}"; then
+- as_fn_error $? "conditional \"HAVE_OBJC\" was never defined.
++ as_fn_error "conditional \"HAVE_OBJC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
- if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
- as_fn_error "conditional \"am__fastdepCXX\" was never defined.
++if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
++ as_fn_error "conditional \"am__fastdepCXX\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
-diff -Naur gtk+2.0-2.21.2.old/contrib/gdk-pixbuf-xlib/Makefile.in gtk+2.0-2.21.2/contrib/gdk-pixbuf-xlib/Makefile.in
---- gtk+2.0-2.21.2.old/contrib/gdk-pixbuf-xlib/Makefile.in 2010-06-10 19:18:21.000000000 +0200
-+++ gtk+2.0-2.21.2/contrib/gdk-pixbuf-xlib/Makefile.in 2010-06-11 12:26:16.074613537 +0200
-@@ -44,11 +44,14 @@
- $(top_srcdir)/Makefile.decl ChangeLog
- subdir = contrib/gdk-pixbuf-xlib
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES = gdk-pixbuf-xlib-2.0.pc
- CONFIG_CLEAN_VPATH_FILES =
-@@ -198,6 +201,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.2.old/contrib/Makefile.in gtk+2.0-2.21.2/contrib/Makefile.in
---- gtk+2.0-2.21.2.old/contrib/Makefile.in 2010-06-10 19:18:21.000000000 +0200
-+++ gtk+2.0-2.21.2/contrib/Makefile.in 2010-06-11 12:26:15.838610992 +0200
-@@ -40,11 +40,14 @@
- @USE_X11_TRUE at am__append_1 = gdk-pixbuf-xlib
- subdir = contrib
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- CONFIG_CLEAN_VPATH_FILES =
-@@ -171,6 +174,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.2.old/demos/gtk-demo/Makefile.in gtk+2.0-2.21.2/demos/gtk-demo/Makefile.in
---- gtk+2.0-2.21.2.old/demos/gtk-demo/Makefile.in 2010-06-10 19:18:21.000000000 +0200
-+++ gtk+2.0-2.21.2/demos/gtk-demo/Makefile.in 2010-06-11 12:26:16.414611354 +0200
+ fi
+ if test -z "${am__fastdepCCAS_TRUE}" && test -z "${am__fastdepCCAS_FALSE}"; then
+- as_fn_error $? "conditional \"am__fastdepCCAS\" was never defined.
++ as_fn_error "conditional \"am__fastdepCCAS\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
+- as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
++ as_fn_error "conditional \"MAINTAINER_MODE\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${PLATFORM_WIN32_TRUE}" && test -z "${PLATFORM_WIN32_FALSE}"; then
+- as_fn_error $? "conditional \"PLATFORM_WIN32\" was never defined.
++ as_fn_error "conditional \"PLATFORM_WIN32\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${OS_WIN32_TRUE}" && test -z "${OS_WIN32_FALSE}"; then
+- as_fn_error $? "conditional \"OS_WIN32\" was never defined.
++ as_fn_error "conditional \"OS_WIN32\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${OS_UNIX_TRUE}" && test -z "${OS_UNIX_FALSE}"; then
+- as_fn_error $? "conditional \"OS_UNIX\" was never defined.
++ as_fn_error "conditional \"OS_UNIX\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${OS_LINUX_TRUE}" && test -z "${OS_LINUX_FALSE}"; then
+- as_fn_error $? "conditional \"OS_LINUX\" was never defined.
++ as_fn_error "conditional \"OS_LINUX\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${MS_LIB_AVAILABLE_TRUE}" && test -z "${MS_LIB_AVAILABLE_FALSE}"; then
+- as_fn_error $? "conditional \"MS_LIB_AVAILABLE\" was never defined.
++ as_fn_error "conditional \"MS_LIB_AVAILABLE\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
+- as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
++ as_fn_error "conditional \"am__fastdepCC\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${DISABLE_EXPLICIT_DEPS_TRUE}" && test -z "${DISABLE_EXPLICIT_DEPS_FALSE}"; then
+- as_fn_error $? "conditional \"DISABLE_EXPLICIT_DEPS\" was never defined.
++ as_fn_error "conditional \"DISABLE_EXPLICIT_DEPS\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${BUILD_DYNAMIC_MODULES_TRUE}" && test -z "${BUILD_DYNAMIC_MODULES_FALSE}"; then
+- as_fn_error $? "conditional \"BUILD_DYNAMIC_MODULES\" was never defined.
++ as_fn_error "conditional \"BUILD_DYNAMIC_MODULES\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${HAVE_INCLUDED_IMMMODULES_TRUE}" && test -z "${HAVE_INCLUDED_IMMMODULES_FALSE}"; then
+- as_fn_error $? "conditional \"HAVE_INCLUDED_IMMMODULES\" was never defined.
++ as_fn_error "conditional \"HAVE_INCLUDED_IMMMODULES\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${INCLUDE_IM_AM_ET_TRUE}" && test -z "${INCLUDE_IM_AM_ET_FALSE}"; then
+- as_fn_error $? "conditional \"INCLUDE_IM_AM_ET\" was never defined.
++ as_fn_error "conditional \"INCLUDE_IM_AM_ET\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${INCLUDE_IM_CEDILLA_TRUE}" && test -z "${INCLUDE_IM_CEDILLA_FALSE}"; then
+- as_fn_error $? "conditional \"INCLUDE_IM_CEDILLA\" was never defined.
++ as_fn_error "conditional \"INCLUDE_IM_CEDILLA\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${INCLUDE_IM_CYRILLIC_TRANSLIT_TRUE}" && test -z "${INCLUDE_IM_CYRILLIC_TRANSLIT_FALSE}"; then
+- as_fn_error $? "conditional \"INCLUDE_IM_CYRILLIC_TRANSLIT\" was never defined.
++ as_fn_error "conditional \"INCLUDE_IM_CYRILLIC_TRANSLIT\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${INCLUDE_IM_IME_TRUE}" && test -z "${INCLUDE_IM_IME_FALSE}"; then
+- as_fn_error $? "conditional \"INCLUDE_IM_IME\" was never defined.
++ as_fn_error "conditional \"INCLUDE_IM_IME\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${INCLUDE_IM_INUKTITUT_TRUE}" && test -z "${INCLUDE_IM_INUKTITUT_FALSE}"; then
+- as_fn_error $? "conditional \"INCLUDE_IM_INUKTITUT\" was never defined.
++ as_fn_error "conditional \"INCLUDE_IM_INUKTITUT\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${INCLUDE_IM_IPA_TRUE}" && test -z "${INCLUDE_IM_IPA_FALSE}"; then
+- as_fn_error $? "conditional \"INCLUDE_IM_IPA\" was never defined.
++ as_fn_error "conditional \"INCLUDE_IM_IPA\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${INCLUDE_IM_MULTIPRESS_TRUE}" && test -z "${INCLUDE_IM_MULTIPRESS_FALSE}"; then
+- as_fn_error $? "conditional \"INCLUDE_IM_MULTIPRESS\" was never defined.
++ as_fn_error "conditional \"INCLUDE_IM_MULTIPRESS\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${INCLUDE_IM_THAI_TRUE}" && test -z "${INCLUDE_IM_THAI_FALSE}"; then
+- as_fn_error $? "conditional \"INCLUDE_IM_THAI\" was never defined.
++ as_fn_error "conditional \"INCLUDE_IM_THAI\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${INCLUDE_IM_TI_ER_TRUE}" && test -z "${INCLUDE_IM_TI_ER_FALSE}"; then
+- as_fn_error $? "conditional \"INCLUDE_IM_TI_ER\" was never defined.
++ as_fn_error "conditional \"INCLUDE_IM_TI_ER\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${INCLUDE_IM_TI_ET_TRUE}" && test -z "${INCLUDE_IM_TI_ET_FALSE}"; then
+- as_fn_error $? "conditional \"INCLUDE_IM_TI_ET\" was never defined.
++ as_fn_error "conditional \"INCLUDE_IM_TI_ET\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${INCLUDE_IM_VIQR_TRUE}" && test -z "${INCLUDE_IM_VIQR_FALSE}"; then
+- as_fn_error $? "conditional \"INCLUDE_IM_VIQR\" was never defined.
++ as_fn_error "conditional \"INCLUDE_IM_VIQR\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${INCLUDE_IM_XIM_TRUE}" && test -z "${INCLUDE_IM_XIM_FALSE}"; then
+- as_fn_error $? "conditional \"INCLUDE_IM_XIM\" was never defined.
++ as_fn_error "conditional \"INCLUDE_IM_XIM\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${USE_MEDIALIB_TRUE}" && test -z "${USE_MEDIALIB_FALSE}"; then
+- as_fn_error $? "conditional \"USE_MEDIALIB\" was never defined.
++ as_fn_error "conditional \"USE_MEDIALIB\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${USE_MEDIALIB25_TRUE}" && test -z "${USE_MEDIALIB25_FALSE}"; then
+- as_fn_error $? "conditional \"USE_MEDIALIB25\" was never defined.
++ as_fn_error "conditional \"USE_MEDIALIB25\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${CROSS_COMPILING_TRUE}" && test -z "${CROSS_COMPILING_FALSE}"; then
+- as_fn_error $? "conditional \"CROSS_COMPILING\" was never defined.
++ as_fn_error "conditional \"CROSS_COMPILING\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${HAVE_X11R6_TRUE}" && test -z "${HAVE_X11R6_FALSE}"; then
+- as_fn_error $? "conditional \"HAVE_X11R6\" was never defined.
++ as_fn_error "conditional \"HAVE_X11R6\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${XINPUT_XFREE_TRUE}" && test -z "${XINPUT_XFREE_FALSE}"; then
+- as_fn_error $? "conditional \"XINPUT_XFREE\" was never defined.
++ as_fn_error "conditional \"XINPUT_XFREE\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${USE_X11_TRUE}" && test -z "${USE_X11_FALSE}"; then
+- as_fn_error $? "conditional \"USE_X11\" was never defined.
++ as_fn_error "conditional \"USE_X11\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${XINPUT_XFREE_TRUE}" && test -z "${XINPUT_XFREE_FALSE}"; then
+- as_fn_error $? "conditional \"XINPUT_XFREE\" was never defined.
++ as_fn_error "conditional \"XINPUT_XFREE\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${USE_X11_TRUE}" && test -z "${USE_X11_FALSE}"; then
+- as_fn_error $? "conditional \"USE_X11\" was never defined.
++ as_fn_error "conditional \"USE_X11\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${HAVE_X11R6_TRUE}" && test -z "${HAVE_X11R6_FALSE}"; then
+- as_fn_error $? "conditional \"HAVE_X11R6\" was never defined.
++ as_fn_error "conditional \"HAVE_X11R6\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${USE_WIN32_TRUE}" && test -z "${USE_WIN32_FALSE}"; then
+- as_fn_error $? "conditional \"USE_WIN32\" was never defined.
++ as_fn_error "conditional \"USE_WIN32\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${USE_WIN32_TRUE}" && test -z "${USE_WIN32_FALSE}"; then
+- as_fn_error $? "conditional \"USE_WIN32\" was never defined.
++ as_fn_error "conditional \"USE_WIN32\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${USE_QUARTZ_TRUE}" && test -z "${USE_QUARTZ_FALSE}"; then
+- as_fn_error $? "conditional \"USE_QUARTZ\" was never defined.
++ as_fn_error "conditional \"USE_QUARTZ\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${USE_QUARTZ_TRUE}" && test -z "${USE_QUARTZ_FALSE}"; then
+- as_fn_error $? "conditional \"USE_QUARTZ\" was never defined.
++ as_fn_error "conditional \"USE_QUARTZ\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${USE_DIRECTFB_TRUE}" && test -z "${USE_DIRECTFB_FALSE}"; then
+- as_fn_error $? "conditional \"USE_DIRECTFB\" was never defined.
++ as_fn_error "conditional \"USE_DIRECTFB\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${USE_DIRECTFB_TRUE}" && test -z "${USE_DIRECTFB_FALSE}"; then
+- as_fn_error $? "conditional \"USE_DIRECTFB\" was never defined.
++ as_fn_error "conditional \"USE_DIRECTFB\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${HAVE_CUPS_TRUE}" && test -z "${HAVE_CUPS_FALSE}"; then
+- as_fn_error $? "conditional \"HAVE_CUPS\" was never defined.
++ as_fn_error "conditional \"HAVE_CUPS\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${HAVE_CUPS_TRUE}" && test -z "${HAVE_CUPS_FALSE}"; then
+- as_fn_error $? "conditional \"HAVE_CUPS\" was never defined.
++ as_fn_error "conditional \"HAVE_CUPS\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${HAVE_CUPS_TRUE}" && test -z "${HAVE_CUPS_FALSE}"; then
+- as_fn_error $? "conditional \"HAVE_CUPS\" was never defined.
++ as_fn_error "conditional \"HAVE_CUPS\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${HAVE_PAPI_TRUE}" && test -z "${HAVE_PAPI_FALSE}"; then
+- as_fn_error $? "conditional \"HAVE_PAPI\" was never defined.
++ as_fn_error "conditional \"HAVE_PAPI\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${HAVE_PAPI_TRUE}" && test -z "${HAVE_PAPI_FALSE}"; then
+- as_fn_error $? "conditional \"HAVE_PAPI\" was never defined.
++ as_fn_error "conditional \"HAVE_PAPI\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${HAVE_PAPI_CUPS_TRUE}" && test -z "${HAVE_PAPI_CUPS_FALSE}"; then
+- as_fn_error $? "conditional \"HAVE_PAPI_CUPS\" was never defined.
++ as_fn_error "conditional \"HAVE_PAPI_CUPS\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${TEST_PRINT_BACKEND_TRUE}" && test -z "${TEST_PRINT_BACKEND_FALSE}"; then
+- as_fn_error $? "conditional \"TEST_PRINT_BACKEND\" was never defined.
++ as_fn_error "conditional \"TEST_PRINT_BACKEND\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${HAVE_INTROSPECTION_TRUE}" && test -z "${HAVE_INTROSPECTION_FALSE}"; then
+- as_fn_error $? "conditional \"HAVE_INTROSPECTION\" was never defined.
++ as_fn_error "conditional \"HAVE_INTROSPECTION\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then
+- as_fn_error $? "conditional \"ENABLE_GTK_DOC\" was never defined.
++ as_fn_error "conditional \"ENABLE_GTK_DOC\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${GTK_DOC_BUILD_HTML_TRUE}" && test -z "${GTK_DOC_BUILD_HTML_FALSE}"; then
+- as_fn_error $? "conditional \"GTK_DOC_BUILD_HTML\" was never defined.
++ as_fn_error "conditional \"GTK_DOC_BUILD_HTML\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${GTK_DOC_BUILD_PDF_TRUE}" && test -z "${GTK_DOC_BUILD_PDF_FALSE}"; then
+- as_fn_error $? "conditional \"GTK_DOC_BUILD_PDF\" was never defined.
++ as_fn_error "conditional \"GTK_DOC_BUILD_PDF\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${GTK_DOC_USE_LIBTOOL_TRUE}" && test -z "${GTK_DOC_USE_LIBTOOL_FALSE}"; then
+- as_fn_error $? "conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
++ as_fn_error "conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${GTK_DOC_USE_REBASE_TRUE}" && test -z "${GTK_DOC_USE_REBASE_FALSE}"; then
+- as_fn_error $? "conditional \"GTK_DOC_USE_REBASE\" was never defined.
++ as_fn_error "conditional \"GTK_DOC_USE_REBASE\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${HAVE_DOCBOOK_TRUE}" && test -z "${HAVE_DOCBOOK_FALSE}"; then
+- as_fn_error $? "conditional \"HAVE_DOCBOOK\" was never defined.
++ as_fn_error "conditional \"HAVE_DOCBOOK\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${ENABLE_MAN_TRUE}" && test -z "${ENABLE_MAN_FALSE}"; then
+- as_fn_error $? "conditional \"ENABLE_MAN\" was never defined.
++ as_fn_error "conditional \"ENABLE_MAN\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+
+@@ -24893,19 +25109,19 @@
+ (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+
+-# as_fn_error STATUS ERROR [LINENO LOG_FD]
+-# ----------------------------------------
++# as_fn_error ERROR [LINENO LOG_FD]
++# ---------------------------------
+ # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+ # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+-# script with STATUS, using 1 if that was 0.
++# script with status $?, using 1 if that was 0.
+ as_fn_error ()
+ {
+- as_status=$1; test $as_status -eq 0 && as_status=1
+- if test "$4"; then
+- as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+- $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
++ as_status=$?; test $as_status -eq 0 && as_status=1
++ if test "$3"; then
++ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+ fi
+- $as_echo "$as_me: error: $2" >&2
++ $as_echo "$as_me: error: $1" >&2
+ as_fn_exit $as_status
+ } # as_fn_error
+
+@@ -25101,7 +25317,7 @@
+ test -d "$as_dir" && break
+ done
+ test -z "$as_dirs" || eval "mkdir $as_dirs"
+- } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
++ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+
+
+ } # as_fn_mkdir_p
+@@ -25155,7 +25371,7 @@
+ # values after options handling.
+ ac_log="
+ This file was extended by gtk+ $as_me 2.21.5, which was
+-generated by GNU Autoconf 2.66. Invocation command line was
++generated by GNU Autoconf 2.65. Invocation command line was
+
+ CONFIG_FILES = $CONFIG_FILES
+ CONFIG_HEADERS = $CONFIG_HEADERS
+@@ -25221,10 +25437,10 @@
+ ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
+ ac_cs_version="\\
+ gtk+ config.status 2.21.5
+-configured by $0, generated by GNU Autoconf 2.66,
++configured by $0, generated by GNU Autoconf 2.65,
+ with options \\"\$ac_cs_config\\"
+
+-Copyright (C) 2010 Free Software Foundation, Inc.
++Copyright (C) 2009 Free Software Foundation, Inc.
+ This config.status script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it."
+
+@@ -25280,7 +25496,7 @@
+ ac_need_defaults=false;;
+ --he | --h)
+ # Conflict between --help and --header
+- as_fn_error $? "ambiguous option: \`$1'
++ as_fn_error "ambiguous option: \`$1'
+ Try \`$0 --help' for more information.";;
+ --help | --hel | -h )
+ $as_echo "$ac_cs_usage"; exit ;;
+@@ -25289,7 +25505,7 @@
+ ac_cs_silent=: ;;
+
+ # This is an error.
+- -*) as_fn_error $? "unrecognized option: \`$1'
++ -*) as_fn_error "unrecognized option: \`$1'
+ Try \`$0 --help' for more information." ;;
+
+ *) as_fn_append ac_config_targets " $1"
+@@ -25343,203 +25559,186 @@
+ sed_quote_subst='$sed_quote_subst'
+ double_quote_subst='$double_quote_subst'
+ delay_variable_subst='$delay_variable_subst'
+-enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
+-AS='`$ECHO "$AS" | $SED "$delay_single_quote_subst"`'
+-DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
+-OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
+-macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
+-macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
+-enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
+-pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
+-enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
+-SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
+-ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
+-host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
+-host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
+-host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
+-build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`'
+-build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`'
+-build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`'
+-SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`'
+-Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`'
+-GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`'
+-EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`'
+-FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`'
+-LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`'
+-NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`'
+-LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`'
+-max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`'
+-ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`'
+-exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
+-lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
+-lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
+-lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
+-reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
+-reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
+-deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
+-file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
+-AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
+-AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
+-STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
+-RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
+-old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
+-old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
+-old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`'
+-lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`'
+-CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`'
+-CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`'
+-compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`'
+-GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`'
+-lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`'
+-lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
+-lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
+-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
+-objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
+-MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
+-lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
+-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
+-lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
+-lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
+-lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
+-need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
+-DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
+-NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
+-LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
+-OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`'
+-OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`'
+-libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`'
+-shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`'
+-extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
+-archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`'
+-enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`'
+-export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`'
+-whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`'
+-compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`'
+-old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`'
+-old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
+-archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`'
+-archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`'
+-module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`'
+-module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`'
+-with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`'
+-allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
+-no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
+-hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
+-hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`'
+-hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
+-hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
+-hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
+-hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`'
+-hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`'
+-hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
+-inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
+-link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
+-fix_srcfile_path='`$ECHO "$fix_srcfile_path" | $SED "$delay_single_quote_subst"`'
+-always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
+-export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
+-exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
+-include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
+-prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
+-file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
+-variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
+-need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
+-need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`'
+-version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`'
+-runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`'
+-shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`'
+-shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`'
+-libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`'
+-library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`'
+-soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`'
+-install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`'
+-postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`'
+-postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
+-finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'
+-finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
+-hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
+-sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
+-sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`'
+-hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
+-enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
+-enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
+-enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`'
+-old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`'
+-striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`'
+-compiler_lib_search_dirs='`$ECHO "$compiler_lib_search_dirs" | $SED "$delay_single_quote_subst"`'
+-predep_objects='`$ECHO "$predep_objects" | $SED "$delay_single_quote_subst"`'
+-postdep_objects='`$ECHO "$postdep_objects" | $SED "$delay_single_quote_subst"`'
+-predeps='`$ECHO "$predeps" | $SED "$delay_single_quote_subst"`'
+-postdeps='`$ECHO "$postdeps" | $SED "$delay_single_quote_subst"`'
+-compiler_lib_search_path='`$ECHO "$compiler_lib_search_path" | $SED "$delay_single_quote_subst"`'
+-LD_CXX='`$ECHO "$LD_CXX" | $SED "$delay_single_quote_subst"`'
+-reload_flag_CXX='`$ECHO "$reload_flag_CXX" | $SED "$delay_single_quote_subst"`'
+-reload_cmds_CXX='`$ECHO "$reload_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+-old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+-compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`'
+-GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`'
+-lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`'
+-lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`'
+-lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`'
+-lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`'
+-lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`'
+-archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`'
+-enable_shared_with_static_runtimes_CXX='`$ECHO "$enable_shared_with_static_runtimes_CXX" | $SED "$delay_single_quote_subst"`'
+-export_dynamic_flag_spec_CXX='`$ECHO "$export_dynamic_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
+-whole_archive_flag_spec_CXX='`$ECHO "$whole_archive_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
+-compiler_needs_object_CXX='`$ECHO "$compiler_needs_object_CXX" | $SED "$delay_single_quote_subst"`'
+-old_archive_from_new_cmds_CXX='`$ECHO "$old_archive_from_new_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+-old_archive_from_expsyms_cmds_CXX='`$ECHO "$old_archive_from_expsyms_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+-archive_cmds_CXX='`$ECHO "$archive_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+-archive_expsym_cmds_CXX='`$ECHO "$archive_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+-module_cmds_CXX='`$ECHO "$module_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+-module_expsym_cmds_CXX='`$ECHO "$module_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+-with_gnu_ld_CXX='`$ECHO "$with_gnu_ld_CXX" | $SED "$delay_single_quote_subst"`'
+-allow_undefined_flag_CXX='`$ECHO "$allow_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
+-no_undefined_flag_CXX='`$ECHO "$no_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
+-hardcode_libdir_flag_spec_CXX='`$ECHO "$hardcode_libdir_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
+-hardcode_libdir_flag_spec_ld_CXX='`$ECHO "$hardcode_libdir_flag_spec_ld_CXX" | $SED "$delay_single_quote_subst"`'
+-hardcode_libdir_separator_CXX='`$ECHO "$hardcode_libdir_separator_CXX" | $SED "$delay_single_quote_subst"`'
+-hardcode_direct_CXX='`$ECHO "$hardcode_direct_CXX" | $SED "$delay_single_quote_subst"`'
+-hardcode_direct_absolute_CXX='`$ECHO "$hardcode_direct_absolute_CXX" | $SED "$delay_single_quote_subst"`'
+-hardcode_minus_L_CXX='`$ECHO "$hardcode_minus_L_CXX" | $SED "$delay_single_quote_subst"`'
+-hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_single_quote_subst"`'
+-hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`'
+-inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`'
+-link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`'
+-fix_srcfile_path_CXX='`$ECHO "$fix_srcfile_path_CXX" | $SED "$delay_single_quote_subst"`'
+-always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`'
+-export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+-exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
+-include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
+-prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+-file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`'
+-hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`'
+-compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`'
+-predep_objects_CXX='`$ECHO "$predep_objects_CXX" | $SED "$delay_single_quote_subst"`'
+-postdep_objects_CXX='`$ECHO "$postdep_objects_CXX" | $SED "$delay_single_quote_subst"`'
+-predeps_CXX='`$ECHO "$predeps_CXX" | $SED "$delay_single_quote_subst"`'
+-postdeps_CXX='`$ECHO "$postdeps_CXX" | $SED "$delay_single_quote_subst"`'
+-compiler_lib_search_path_CXX='`$ECHO "$compiler_lib_search_path_CXX" | $SED "$delay_single_quote_subst"`'
++enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`'
++AS='`$ECHO "X$AS" | $Xsed -e "$delay_single_quote_subst"`'
++DLLTOOL='`$ECHO "X$DLLTOOL" | $Xsed -e "$delay_single_quote_subst"`'
++OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`'
++macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`'
++macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`'
++enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`'
++pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`'
++enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`'
++host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`'
++host='`$ECHO "X$host" | $Xsed -e "$delay_single_quote_subst"`'
++host_os='`$ECHO "X$host_os" | $Xsed -e "$delay_single_quote_subst"`'
++build_alias='`$ECHO "X$build_alias" | $Xsed -e "$delay_single_quote_subst"`'
++build='`$ECHO "X$build" | $Xsed -e "$delay_single_quote_subst"`'
++build_os='`$ECHO "X$build_os" | $Xsed -e "$delay_single_quote_subst"`'
++SED='`$ECHO "X$SED" | $Xsed -e "$delay_single_quote_subst"`'
++Xsed='`$ECHO "X$Xsed" | $Xsed -e "$delay_single_quote_subst"`'
++GREP='`$ECHO "X$GREP" | $Xsed -e "$delay_single_quote_subst"`'
++EGREP='`$ECHO "X$EGREP" | $Xsed -e "$delay_single_quote_subst"`'
++FGREP='`$ECHO "X$FGREP" | $Xsed -e "$delay_single_quote_subst"`'
++LD='`$ECHO "X$LD" | $Xsed -e "$delay_single_quote_subst"`'
++NM='`$ECHO "X$NM" | $Xsed -e "$delay_single_quote_subst"`'
++LN_S='`$ECHO "X$LN_S" | $Xsed -e "$delay_single_quote_subst"`'
++max_cmd_len='`$ECHO "X$max_cmd_len" | $Xsed -e "$delay_single_quote_subst"`'
++ac_objext='`$ECHO "X$ac_objext" | $Xsed -e "$delay_single_quote_subst"`'
++exeext='`$ECHO "X$exeext" | $Xsed -e "$delay_single_quote_subst"`'
++lt_unset='`$ECHO "X$lt_unset" | $Xsed -e "$delay_single_quote_subst"`'
++lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`'
++lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`'
++reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`'
++reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`'
++file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`'
++AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`'
++AR_FLAGS='`$ECHO "X$AR_FLAGS" | $Xsed -e "$delay_single_quote_subst"`'
++STRIP='`$ECHO "X$STRIP" | $Xsed -e "$delay_single_quote_subst"`'
++RANLIB='`$ECHO "X$RANLIB" | $Xsed -e "$delay_single_quote_subst"`'
++old_postinstall_cmds='`$ECHO "X$old_postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++old_postuninstall_cmds='`$ECHO "X$old_postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++old_archive_cmds='`$ECHO "X$old_archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++CC='`$ECHO "X$CC" | $Xsed -e "$delay_single_quote_subst"`'
++CFLAGS='`$ECHO "X$CFLAGS" | $Xsed -e "$delay_single_quote_subst"`'
++compiler='`$ECHO "X$compiler" | $Xsed -e "$delay_single_quote_subst"`'
++GCC='`$ECHO "X$GCC" | $Xsed -e "$delay_single_quote_subst"`'
++lt_cv_sys_global_symbol_pipe='`$ECHO "X$lt_cv_sys_global_symbol_pipe" | $Xsed -e "$delay_single_quote_subst"`'
++lt_cv_sys_global_symbol_to_cdecl='`$ECHO "X$lt_cv_sys_global_symbol_to_cdecl" | $Xsed -e "$delay_single_quote_subst"`'
++lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address" | $Xsed -e "$delay_single_quote_subst"`'
++lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
++objdir='`$ECHO "X$objdir" | $Xsed -e "$delay_single_quote_subst"`'
++SHELL='`$ECHO "X$SHELL" | $Xsed -e "$delay_single_quote_subst"`'
++ECHO='`$ECHO "X$ECHO" | $Xsed -e "$delay_single_quote_subst"`'
++MAGIC_CMD='`$ECHO "X$MAGIC_CMD" | $Xsed -e "$delay_single_quote_subst"`'
++lt_prog_compiler_no_builtin_flag='`$ECHO "X$lt_prog_compiler_no_builtin_flag" | $Xsed -e "$delay_single_quote_subst"`'
++lt_prog_compiler_wl='`$ECHO "X$lt_prog_compiler_wl" | $Xsed -e "$delay_single_quote_subst"`'
++lt_prog_compiler_pic='`$ECHO "X$lt_prog_compiler_pic" | $Xsed -e "$delay_single_quote_subst"`'
++lt_prog_compiler_static='`$ECHO "X$lt_prog_compiler_static" | $Xsed -e "$delay_single_quote_subst"`'
++lt_cv_prog_compiler_c_o='`$ECHO "X$lt_cv_prog_compiler_c_o" | $Xsed -e "$delay_single_quote_subst"`'
++need_locks='`$ECHO "X$need_locks" | $Xsed -e "$delay_single_quote_subst"`'
++DSYMUTIL='`$ECHO "X$DSYMUTIL" | $Xsed -e "$delay_single_quote_subst"`'
++NMEDIT='`$ECHO "X$NMEDIT" | $Xsed -e "$delay_single_quote_subst"`'
++LIPO='`$ECHO "X$LIPO" | $Xsed -e "$delay_single_quote_subst"`'
++OTOOL='`$ECHO "X$OTOOL" | $Xsed -e "$delay_single_quote_subst"`'
++OTOOL64='`$ECHO "X$OTOOL64" | $Xsed -e "$delay_single_quote_subst"`'
++libext='`$ECHO "X$libext" | $Xsed -e "$delay_single_quote_subst"`'
++shrext_cmds='`$ECHO "X$shrext_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++extract_expsyms_cmds='`$ECHO "X$extract_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++archive_cmds_need_lc='`$ECHO "X$archive_cmds_need_lc" | $Xsed -e "$delay_single_quote_subst"`'
++enable_shared_with_static_runtimes='`$ECHO "X$enable_shared_with_static_runtimes" | $Xsed -e "$delay_single_quote_subst"`'
++export_dynamic_flag_spec='`$ECHO "X$export_dynamic_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
++whole_archive_flag_spec='`$ECHO "X$whole_archive_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
++compiler_needs_object='`$ECHO "X$compiler_needs_object" | $Xsed -e "$delay_single_quote_subst"`'
++old_archive_from_new_cmds='`$ECHO "X$old_archive_from_new_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++old_archive_from_expsyms_cmds='`$ECHO "X$old_archive_from_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++archive_cmds='`$ECHO "X$archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++archive_expsym_cmds='`$ECHO "X$archive_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++module_cmds='`$ECHO "X$module_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++module_expsym_cmds='`$ECHO "X$module_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++with_gnu_ld='`$ECHO "X$with_gnu_ld" | $Xsed -e "$delay_single_quote_subst"`'
++allow_undefined_flag='`$ECHO "X$allow_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
++no_undefined_flag='`$ECHO "X$no_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
++hardcode_libdir_flag_spec='`$ECHO "X$hardcode_libdir_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
++hardcode_libdir_flag_spec_ld='`$ECHO "X$hardcode_libdir_flag_spec_ld" | $Xsed -e "$delay_single_quote_subst"`'
++hardcode_libdir_separator='`$ECHO "X$hardcode_libdir_separator" | $Xsed -e "$delay_single_quote_subst"`'
++hardcode_direct='`$ECHO "X$hardcode_direct" | $Xsed -e "$delay_single_quote_subst"`'
++hardcode_direct_absolute='`$ECHO "X$hardcode_direct_absolute" | $Xsed -e "$delay_single_quote_subst"`'
++hardcode_minus_L='`$ECHO "X$hardcode_minus_L" | $Xsed -e "$delay_single_quote_subst"`'
++hardcode_shlibpath_var='`$ECHO "X$hardcode_shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
++hardcode_automatic='`$ECHO "X$hardcode_automatic" | $Xsed -e "$delay_single_quote_subst"`'
++inherit_rpath='`$ECHO "X$inherit_rpath" | $Xsed -e "$delay_single_quote_subst"`'
++link_all_deplibs='`$ECHO "X$link_all_deplibs" | $Xsed -e "$delay_single_quote_subst"`'
++fix_srcfile_path='`$ECHO "X$fix_srcfile_path" | $Xsed -e "$delay_single_quote_subst"`'
++always_export_symbols='`$ECHO "X$always_export_symbols" | $Xsed -e "$delay_single_quote_subst"`'
++export_symbols_cmds='`$ECHO "X$export_symbols_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++exclude_expsyms='`$ECHO "X$exclude_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
++include_expsyms='`$ECHO "X$include_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
++prelink_cmds='`$ECHO "X$prelink_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++file_list_spec='`$ECHO "X$file_list_spec" | $Xsed -e "$delay_single_quote_subst"`'
++variables_saved_for_relink='`$ECHO "X$variables_saved_for_relink" | $Xsed -e "$delay_single_quote_subst"`'
++need_lib_prefix='`$ECHO "X$need_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
++need_version='`$ECHO "X$need_version" | $Xsed -e "$delay_single_quote_subst"`'
++version_type='`$ECHO "X$version_type" | $Xsed -e "$delay_single_quote_subst"`'
++runpath_var='`$ECHO "X$runpath_var" | $Xsed -e "$delay_single_quote_subst"`'
++shlibpath_var='`$ECHO "X$shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
++shlibpath_overrides_runpath='`$ECHO "X$shlibpath_overrides_runpath" | $Xsed -e "$delay_single_quote_subst"`'
++libname_spec='`$ECHO "X$libname_spec" | $Xsed -e "$delay_single_quote_subst"`'
++library_names_spec='`$ECHO "X$library_names_spec" | $Xsed -e "$delay_single_quote_subst"`'
++soname_spec='`$ECHO "X$soname_spec" | $Xsed -e "$delay_single_quote_subst"`'
++postinstall_cmds='`$ECHO "X$postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++postuninstall_cmds='`$ECHO "X$postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++finish_cmds='`$ECHO "X$finish_cmds" | $Xsed -e "$delay_single_quote_subst"`'
++finish_eval='`$ECHO "X$finish_eval" | $Xsed -e "$delay_single_quote_subst"`'
++hardcode_into_libs='`$ECHO "X$hardcode_into_libs" | $Xsed -e "$delay_single_quote_subst"`'
++sys_lib_search_path_spec='`$ECHO "X$sys_lib_search_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
++sys_lib_dlsearch_path_spec='`$ECHO "X$sys_lib_dlsearch_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
++hardcode_action='`$ECHO "X$hardcode_action" | $Xsed -e "$delay_single_quote_subst"`'
++enable_dlopen='`$ECHO "X$enable_dlopen" | $Xsed -e "$delay_single_quote_subst"`'
++enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quote_subst"`'
++enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`'
++old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`'
++striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`'
++compiler_lib_search_dirs='`$ECHO "X$compiler_lib_search_dirs" | $Xsed -e "$delay_single_quote_subst"`'
++predep_objects='`$ECHO "X$predep_objects" | $Xsed -e "$delay_single_quote_subst"`'
++postdep_objects='`$ECHO "X$postdep_objects" | $Xsed -e "$delay_single_quote_subst"`'
++predeps='`$ECHO "X$predeps" | $Xsed -e "$delay_single_quote_subst"`'
++postdeps='`$ECHO "X$postdeps" | $Xsed -e "$delay_single_quote_subst"`'
++compiler_lib_search_path='`$ECHO "X$compiler_lib_search_path" | $Xsed -e "$delay_single_quote_subst"`'
++LD_CXX='`$ECHO "X$LD_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++old_archive_cmds_CXX='`$ECHO "X$old_archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++compiler_CXX='`$ECHO "X$compiler_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++GCC_CXX='`$ECHO "X$GCC_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "X$lt_prog_compiler_no_builtin_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++lt_prog_compiler_wl_CXX='`$ECHO "X$lt_prog_compiler_wl_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++lt_prog_compiler_pic_CXX='`$ECHO "X$lt_prog_compiler_pic_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++lt_prog_compiler_static_CXX='`$ECHO "X$lt_prog_compiler_static_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++lt_cv_prog_compiler_c_o_CXX='`$ECHO "X$lt_cv_prog_compiler_c_o_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++archive_cmds_need_lc_CXX='`$ECHO "X$archive_cmds_need_lc_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++enable_shared_with_static_runtimes_CXX='`$ECHO "X$enable_shared_with_static_runtimes_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++export_dynamic_flag_spec_CXX='`$ECHO "X$export_dynamic_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++whole_archive_flag_spec_CXX='`$ECHO "X$whole_archive_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++compiler_needs_object_CXX='`$ECHO "X$compiler_needs_object_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++old_archive_from_new_cmds_CXX='`$ECHO "X$old_archive_from_new_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++old_archive_from_expsyms_cmds_CXX='`$ECHO "X$old_archive_from_expsyms_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++archive_cmds_CXX='`$ECHO "X$archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++archive_expsym_cmds_CXX='`$ECHO "X$archive_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++module_cmds_CXX='`$ECHO "X$module_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++module_expsym_cmds_CXX='`$ECHO "X$module_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++with_gnu_ld_CXX='`$ECHO "X$with_gnu_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++allow_undefined_flag_CXX='`$ECHO "X$allow_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++no_undefined_flag_CXX='`$ECHO "X$no_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++hardcode_libdir_flag_spec_CXX='`$ECHO "X$hardcode_libdir_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++hardcode_libdir_flag_spec_ld_CXX='`$ECHO "X$hardcode_libdir_flag_spec_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++hardcode_libdir_separator_CXX='`$ECHO "X$hardcode_libdir_separator_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++hardcode_direct_CXX='`$ECHO "X$hardcode_direct_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++hardcode_direct_absolute_CXX='`$ECHO "X$hardcode_direct_absolute_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++hardcode_minus_L_CXX='`$ECHO "X$hardcode_minus_L_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++hardcode_shlibpath_var_CXX='`$ECHO "X$hardcode_shlibpath_var_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++hardcode_automatic_CXX='`$ECHO "X$hardcode_automatic_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++inherit_rpath_CXX='`$ECHO "X$inherit_rpath_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++link_all_deplibs_CXX='`$ECHO "X$link_all_deplibs_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++fix_srcfile_path_CXX='`$ECHO "X$fix_srcfile_path_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++always_export_symbols_CXX='`$ECHO "X$always_export_symbols_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++export_symbols_cmds_CXX='`$ECHO "X$export_symbols_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++exclude_expsyms_CXX='`$ECHO "X$exclude_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++include_expsyms_CXX='`$ECHO "X$include_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++prelink_cmds_CXX='`$ECHO "X$prelink_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++file_list_spec_CXX='`$ECHO "X$file_list_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++hardcode_action_CXX='`$ECHO "X$hardcode_action_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++compiler_lib_search_dirs_CXX='`$ECHO "X$compiler_lib_search_dirs_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++predep_objects_CXX='`$ECHO "X$predep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++postdep_objects_CXX='`$ECHO "X$postdep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++predeps_CXX='`$ECHO "X$predeps_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++postdeps_CXX='`$ECHO "X$postdeps_CXX" | $Xsed -e "$delay_single_quote_subst"`'
++compiler_lib_search_path_CXX='`$ECHO "X$compiler_lib_search_path_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+
+ LTCC='$LTCC'
+ LTCFLAGS='$LTCFLAGS'
+ compiler='$compiler_DEFAULT'
+
+-# A function that is used when there is no print builtin or printf.
+-func_fallback_echo ()
+-{
+- eval 'cat <<_LTECHO_EOF
+-\$1
+-_LTECHO_EOF'
+-}
+-
+ # Quote evaled strings.
+-for var in AS \
+-DLLTOOL \
+-OBJDUMP \
+-SHELL \
+-ECHO \
+-SED \
++for var in SED \
+ GREP \
+ EGREP \
+ FGREP \
+@@ -25562,6 +25761,8 @@
+ lt_cv_sys_global_symbol_to_cdecl \
+ lt_cv_sys_global_symbol_to_c_name_address \
+ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
++SHELL \
++ECHO \
+ lt_prog_compiler_no_builtin_flag \
+ lt_prog_compiler_wl \
+ lt_prog_compiler_pic \
+@@ -25591,7 +25792,6 @@
+ libname_spec \
+ library_names_spec \
+ soname_spec \
+-install_override_mode \
+ finish_eval \
+ old_striplib \
+ striplib \
+@@ -25602,7 +25802,6 @@
+ postdeps \
+ compiler_lib_search_path \
+ LD_CXX \
+-reload_flag_CXX \
+ compiler_CXX \
+ lt_prog_compiler_no_builtin_flag_CXX \
+ lt_prog_compiler_wl_CXX \
+@@ -25628,9 +25827,9 @@
+ predeps_CXX \
+ postdeps_CXX \
+ compiler_lib_search_path_CXX; do
+- case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
++ case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+ *[\\\\\\\`\\"\\\$]*)
+- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
++ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+ ;;
+ *)
+ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+@@ -25657,7 +25856,6 @@
+ finish_cmds \
+ sys_lib_search_path_spec \
+ sys_lib_dlsearch_path_spec \
+-reload_cmds_CXX \
+ old_archive_cmds_CXX \
+ old_archive_from_new_cmds_CXX \
+ old_archive_from_expsyms_cmds_CXX \
+@@ -25667,9 +25865,9 @@
+ module_expsym_cmds_CXX \
+ export_symbols_cmds_CXX \
+ prelink_cmds_CXX; do
+- case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
++ case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+ *[\\\\\\\`\\"\\\$]*)
+- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
++ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+ ;;
+ *)
+ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+@@ -25677,6 +25875,12 @@
+ esac
+ done
+
++# Fix-up fallback echo if it was mangled by the above quoting rules.
++case \$lt_ECHO in
++*'\\\$0 --fallback-echo"') lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\`
++ ;;
++esac
++
+ ac_aux_dir='$ac_aux_dir'
+ xsi_shell='$xsi_shell'
+ lt_shell_append='$lt_shell_append'
+@@ -25811,7 +26015,7 @@
+ "modules/printbackends/test/Makefile") CONFIG_FILES="$CONFIG_FILES modules/printbackends/test/Makefile" ;;
+ "perf/Makefile") CONFIG_FILES="$CONFIG_FILES perf/Makefile" ;;
+
+- *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
++ *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+ esac
+ done
+
+@@ -25849,7 +26053,7 @@
+ {
+ tmp=./conf$$-$RANDOM
+ (umask 077 && mkdir "$tmp")
+-} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
++} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
+
+ # Set up the scripts for CONFIG_FILES section.
+ # No need to generate them if there are no CONFIG_FILES.
+@@ -25866,7 +26070,7 @@
+ fi
+ ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+ if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+- ac_cs_awk_cr='\\r'
++ ac_cs_awk_cr='\r'
+ else
+ ac_cs_awk_cr=$ac_cr
+ fi
+@@ -25880,18 +26084,18 @@
+ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+ echo "_ACEOF"
+ } >conf$$subs.sh ||
+- as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+-ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
++ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
++ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
+ ac_delim='%!_!# '
+ for ac_last_try in false false false false false :; do
+ . ./conf$$subs.sh ||
+- as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
++ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+
+ ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+ if test $ac_delim_n = $ac_delim_num; then
+ break
+ elif $ac_last_try; then
+- as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
++ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+ else
+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+ fi
+@@ -25980,28 +26184,20 @@
+ else
+ cat
+ fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+- || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
++ || as_fn_error "could not setup config files machinery" "$LINENO" 5
+ _ACEOF
+
+-# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
+-# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
++# VPATH may cause trouble with some makes, so we remove $(srcdir),
++# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+ # trailing colons and then remove the whole line if VPATH becomes empty
+ # (actually we leave an empty line to preserve line numbers).
+ if test "x$srcdir" = x.; then
+- ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{
+-h
+-s///
+-s/^/:/
+-s/[ ]*$/:/
+-s/:\$(srcdir):/:/g
+-s/:\${srcdir}:/:/g
+-s/:@srcdir@:/:/g
+-s/^:*//
++ ac_vpsub='/^[ ]*VPATH[ ]*=/{
++s/:*\$(srcdir):*/:/
++s/:*\${srcdir}:*/:/
++s/:*@srcdir@:*/:/
++s/^\([^=]*=[ ]*\):*/\1/
+ s/:*$//
+-x
+-s/\(=[ ]*\).*/\1/
+-G
+-s/\n//
+ s/^[^=]*=[ ]*$//
+ }'
+ fi
+@@ -26029,7 +26225,7 @@
+ if test -z "$ac_t"; then
+ break
+ elif $ac_last_try; then
+- as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
++ as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
+ else
+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+ fi
+@@ -26114,7 +26310,7 @@
+ _ACAWK
+ _ACEOF
+ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+- as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
++ as_fn_error "could not setup config headers machinery" "$LINENO" 5
+ fi # test -n "$CONFIG_HEADERS"
+
+
+@@ -26127,7 +26323,7 @@
+ esac
+ case $ac_mode$ac_tag in
+ :[FHL]*:*);;
+- :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
++ :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
+ :[FH]-) ac_tag=-:-;;
+ :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
+ esac
+@@ -26155,7 +26351,7 @@
+ [\\/$]*) false;;
+ *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
+ esac ||
+- as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
++ as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+ esac
+ case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+ as_fn_append ac_file_inputs " '$ac_f'"
+@@ -26182,7 +26378,7 @@
+
+ case $ac_tag in
+ *:-:* | *:-) cat >"$tmp/stdin" \
+- || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
++ || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
+ esac
+ ;;
+ esac
+@@ -26319,22 +26515,22 @@
+ $ac_datarootdir_hack
+ "
+ eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
+- || as_fn_error $? "could not create $ac_file" "$LINENO" 5
++ || as_fn_error "could not create $ac_file" "$LINENO" 5
+
+ test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+ { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
+ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+-which seems to be undefined. Please make sure it is defined" >&5
++which seems to be undefined. Please make sure it is defined." >&5
+ $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+-which seems to be undefined. Please make sure it is defined" >&2;}
++which seems to be undefined. Please make sure it is defined." >&2;}
+
+ rm -f "$tmp/stdin"
+ case $ac_file in
+ -) cat "$tmp/out" && rm -f "$tmp/out";;
+ *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+ esac \
+- || as_fn_error $? "could not create $ac_file" "$LINENO" 5
++ || as_fn_error "could not create $ac_file" "$LINENO" 5
+ ;;
+ :H)
+ #
+@@ -26345,19 +26541,19 @@
+ $as_echo "/* $configure_input */" \
+ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
+ } >"$tmp/config.h" \
+- || as_fn_error $? "could not create $ac_file" "$LINENO" 5
++ || as_fn_error "could not create $ac_file" "$LINENO" 5
+ if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
+ $as_echo "$as_me: $ac_file is unchanged" >&6;}
+ else
+ rm -f "$ac_file"
+ mv "$tmp/config.h" "$ac_file" \
+- || as_fn_error $? "could not create $ac_file" "$LINENO" 5
++ || as_fn_error "could not create $ac_file" "$LINENO" 5
+ fi
+ else
+ $as_echo "/* $configure_input */" \
+ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
+- || as_fn_error $? "could not create -" "$LINENO" 5
++ || as_fn_error "could not create -" "$LINENO" 5
+ fi
+ # Compute "$ac_file"'s index in $config_headers.
+ _am_arg="$ac_file"
+@@ -26518,8 +26714,7 @@
+ # NOTE: Changes made to this file will be lost: look at ltmain.sh.
+ #
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+-# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
+-# Inc.
++# 2006, 2007, 2008 Free Software Foundation, Inc.
+ # Written by Gordon Matzigkeit, 1996
+ #
+ # This file is part of GNU Libtool.
+@@ -26555,13 +26750,13 @@
+ build_old_libs=$enable_static
+
+ # Assembler program.
+-AS=$lt_AS
++AS=$AS
+
+ # DLL creation program.
+-DLLTOOL=$lt_DLLTOOL
++DLLTOOL=$DLLTOOL
+
+ # Object dumper program.
+-OBJDUMP=$lt_OBJDUMP
++OBJDUMP=$OBJDUMP
+
+ # Which release of libtool.m4 was used?
+ macro_version=$macro_version
+@@ -26576,12 +26771,6 @@
+ # Whether or not to optimize for fast installation.
+ fast_install=$enable_fast_install
+
+-# Shell to use when invoking shell scripts.
+-SHELL=$lt_SHELL
+-
+-# An echo program that protects backslashes.
+-ECHO=$lt_ECHO
+-
+ # The host system.
+ host_alias=$host_alias
+ host=$host
+@@ -26631,6 +26820,10 @@
+ # turn newlines into spaces.
+ NL2SP=$lt_lt_NL2SP
+
++# How to create reloadable object files.
++reload_flag=$lt_reload_flag
++reload_cmds=$lt_reload_cmds
++
+ # Method to check whether dependent libraries are shared objects.
+ deplibs_check_method=$lt_deplibs_check_method
+
+@@ -26649,9 +26842,6 @@
+ old_postinstall_cmds=$lt_old_postinstall_cmds
+ old_postuninstall_cmds=$lt_old_postuninstall_cmds
+
+-# Whether to use a lock for old archive extraction.
+-lock_old_archive_extraction=$lock_old_archive_extraction
+-
+ # A C compiler.
+ LTCC=$lt_CC
+
+@@ -26673,6 +26863,12 @@
+ # The name of the directory that contains temporary libtool files.
+ objdir=$objdir
+
++# Shell to use when invoking shell scripts.
++SHELL=$lt_SHELL
++
++# An echo program that does not interpret backslashes.
++ECHO=$lt_ECHO
++
+ # Used to examine libraries when file_magic_cmd begins with "file".
+ MAGIC_CMD=$MAGIC_CMD
+
+@@ -26735,9 +26931,6 @@
+ # The coded name of the library, if different from the real name.
+ soname_spec=$lt_soname_spec
+
+-# Permission mode override for installation of shared libraries.
+-install_override_mode=$lt_install_override_mode
+-
+ # Command to use after installation of a shared archive.
+ postinstall_cmds=$lt_postinstall_cmds
+
+@@ -26777,10 +26970,6 @@
+ # The linker used to build libraries.
+ LD=$lt_LD
+
+-# How to create reloadable object files.
+-reload_flag=$lt_reload_flag
+-reload_cmds=$lt_reload_cmds
+-
+ # Commands used to build an old-style archive.
+ old_archive_cmds=$lt_old_archive_cmds
+
+@@ -27054,7 +27243,7 @@
+ func_dirname ()
+ {
+ # Extract subdirectory from the argument.
+- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
++ func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
+ if test "X$func_dirname_result" = "X${1}"; then
+ func_dirname_result="${3}"
+ else
+@@ -27065,7 +27254,7 @@
+ # func_basename file
+ func_basename ()
+ {
+- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
++ func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
+ }
+
+
+@@ -27078,8 +27267,10 @@
+ func_stripname ()
+ {
+ case ${2} in
+- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
+- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
++ .*) func_stripname_result=`$ECHO "X${3}" \
++ | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
++ *) func_stripname_result=`$ECHO "X${3}" \
++ | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
+ esac
+ }
+
+@@ -27090,20 +27281,20 @@
+ # func_opt_split
+ func_opt_split ()
+ {
+- func_opt_split_opt=`$ECHO "${1}" | $SED "$my_sed_long_opt"`
+- func_opt_split_arg=`$ECHO "${1}" | $SED "$my_sed_long_arg"`
++ func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
++ func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
+ }
+
+ # func_lo2o object
+ func_lo2o ()
+ {
+- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
++ func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
+ }
+
+ # func_xform libobj-or-source
+ func_xform ()
+ {
+- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
++ func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[^.]*$/.lo/'`
+ }
+
+ # func_arith arithmetic-term...
+@@ -27164,10 +27355,6 @@
+ # The linker used to build libraries.
+ LD=$lt_LD_CXX
+
+-# How to create reloadable object files.
+-reload_flag=$lt_reload_flag_CXX
+-reload_cmds=$lt_reload_cmds_CXX
+-
+ # Commands used to build an old-style archive.
+ old_archive_cmds=$lt_old_archive_cmds_CXX
+
+@@ -27379,7 +27566,7 @@
+ ac_clean_files=$ac_clean_files_save
+
+ test $ac_write_fail = 0 ||
+- as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
++ as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
+
+
+ # configure is writing to config.log, and then calls config.status.
+@@ -27400,7 +27587,7 @@
+ exec 5>>config.log
+ # Use ||, not &&, to avoid exiting from the if with $? = 1, which
+ # would make configure fail if this is the last instruction.
+- $ac_cs_success || as_fn_exit 1
++ $ac_cs_success || as_fn_exit $?
+ fi
+ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+Index: gtk+2.0-2.21.5/demos/gtk-demo/Makefile.in
+===================================================================
+--- gtk+2.0-2.21.5.orig/demos/gtk-demo/Makefile.in 2010-07-22 17:59:02.321064383 +0200
++++ gtk+2.0-2.21.5/demos/gtk-demo/Makefile.in 2010-07-22 17:58:44.718050938 +0200
@@ -42,11 +42,14 @@
bin_PROGRAMS = gtk-demo$(EXEEXT)
subdir = demos/gtk-demo
@@ -8725,19 +14682,28 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES = geninclude.pl
CONFIG_CLEAN_VPATH_FILES =
-@@ -207,6 +210,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
+@@ -193,6 +196,7 @@
+ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.2.old/demos/Makefile.in gtk+2.0-2.21.2/demos/Makefile.in
---- gtk+2.0-2.21.2.old/demos/Makefile.in 2010-06-10 19:18:21.000000000 +0200
-+++ gtk+2.0-2.21.2/demos/Makefile.in 2010-06-11 12:26:16.302611376 +0200
-@@ -46,11 +46,14 @@
- @HAVE_PNG_TRUE at am__append_1 = testpixbuf
+@@ -343,6 +347,7 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ ms_librarian = @ms_librarian@
+Index: gtk+2.0-2.21.5/demos/Makefile.in
+===================================================================
+--- gtk+2.0-2.21.5.orig/demos/Makefile.in 2010-07-22 17:59:02.533064976 +0200
++++ gtk+2.0-2.21.5/demos/Makefile.in 2010-07-22 17:58:44.622052141 +0200
+@@ -44,11 +44,14 @@
+ testpixbuf$(EXEEXT)
subdir = demos
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
@@ -8753,17 +14719,26 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -230,6 +233,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
+@@ -213,6 +216,7 @@
+ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.2.old/docs/faq/Makefile.in gtk+2.0-2.21.2/docs/faq/Makefile.in
---- gtk+2.0-2.21.2.old/docs/faq/Makefile.in 2010-06-10 19:18:21.000000000 +0200
-+++ gtk+2.0-2.21.2/docs/faq/Makefile.in 2010-06-11 12:26:16.586610942 +0200
+@@ -363,6 +367,7 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ ms_librarian = @ms_librarian@
+Index: gtk+2.0-2.21.5/docs/faq/Makefile.in
+===================================================================
+--- gtk+2.0-2.21.5.orig/docs/faq/Makefile.in 2010-07-22 17:59:10.833064793 +0200
++++ gtk+2.0-2.21.5/docs/faq/Makefile.in 2010-07-22 17:58:44.850051099 +0200
@@ -39,11 +39,14 @@
$(top_srcdir)/Makefile.decl
subdir = docs/faq
@@ -8781,17 +14756,26 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -130,6 +133,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
+@@ -117,6 +120,7 @@
+ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.2.old/docs/Makefile.in gtk+2.0-2.21.2/docs/Makefile.in
---- gtk+2.0-2.21.2.old/docs/Makefile.in 2010-06-10 19:18:21.000000000 +0200
-+++ gtk+2.0-2.21.2/docs/Makefile.in 2010-06-11 12:26:16.502611089 +0200
+@@ -267,6 +271,7 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ ms_librarian = @ms_librarian@
+Index: gtk+2.0-2.21.5/docs/Makefile.in
+===================================================================
+--- gtk+2.0-2.21.5.orig/docs/Makefile.in 2010-07-22 17:59:10.446084804 +0200
++++ gtk+2.0-2.21.5/docs/Makefile.in 2010-07-22 17:58:44.786051764 +0200
@@ -39,11 +39,14 @@
$(top_srcdir)/Makefile.decl
subdir = docs
@@ -8809,17 +14793,26 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -170,6 +173,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
+@@ -157,6 +160,7 @@
+ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.2.old/docs/reference/gdk/Makefile.in gtk+2.0-2.21.2/docs/reference/gdk/Makefile.in
---- gtk+2.0-2.21.2.old/docs/reference/gdk/Makefile.in 2010-06-10 19:18:22.000000000 +0200
-+++ gtk+2.0-2.21.2/docs/reference/gdk/Makefile.in 2010-06-11 12:26:17.206610561 +0200
+@@ -307,6 +311,7 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ ms_librarian = @ms_librarian@
+Index: gtk+2.0-2.21.5/docs/reference/gdk/Makefile.in
+===================================================================
+--- gtk+2.0-2.21.5.orig/docs/reference/gdk/Makefile.in 2010-07-22 17:59:11.741060918 +0200
++++ gtk+2.0-2.21.5/docs/reference/gdk/Makefile.in 2010-07-22 17:58:45.002055252 +0200
@@ -46,11 +46,14 @@
$(top_srcdir)/gtk-doc.make
subdir = docs/reference/gdk
@@ -8837,45 +14830,26 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES = version.xml
CONFIG_CLEAN_VPATH_FILES =
-@@ -137,6 +140,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
+@@ -124,6 +127,7 @@
+ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.2.old/docs/reference/gdk-pixbuf/Makefile.in gtk+2.0-2.21.2/docs/reference/gdk-pixbuf/Makefile.in
---- gtk+2.0-2.21.2.old/docs/reference/gdk-pixbuf/Makefile.in 2010-06-10 19:18:22.000000000 +0200
-+++ gtk+2.0-2.21.2/docs/reference/gdk-pixbuf/Makefile.in 2010-06-11 12:26:17.002611089 +0200
-@@ -46,11 +46,14 @@
- $(top_srcdir)/gtk-doc.make
- subdir = docs/reference/gdk-pixbuf
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES = version.xml
- CONFIG_CLEAN_VPATH_FILES =
-@@ -162,6 +165,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.2.old/docs/reference/gtk/Makefile.in gtk+2.0-2.21.2/docs/reference/gtk/Makefile.in
---- gtk+2.0-2.21.2.old/docs/reference/gtk/Makefile.in 2010-06-10 19:18:22.000000000 +0200
-+++ gtk+2.0-2.21.2/docs/reference/gtk/Makefile.in 2010-06-11 12:26:17.442613655 +0200
+@@ -274,6 +278,7 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ ms_librarian = @ms_librarian@
+Index: gtk+2.0-2.21.5/docs/reference/gtk/Makefile.in
+===================================================================
+--- gtk+2.0-2.21.5.orig/docs/reference/gtk/Makefile.in 2010-07-22 17:59:13.962055058 +0200
++++ gtk+2.0-2.21.5/docs/reference/gtk/Makefile.in 2010-07-22 17:58:45.114051124 +0200
@@ -46,11 +46,14 @@
$(top_srcdir)/gtk-doc.make
subdir = docs/reference/gtk
@@ -8893,17 +14867,26 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES = version.xml
CONFIG_CLEAN_VPATH_FILES =
-@@ -162,6 +165,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
+@@ -149,6 +152,7 @@
+ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.2.old/docs/reference/libgail-util/Makefile.in gtk+2.0-2.21.2/docs/reference/libgail-util/Makefile.in
---- gtk+2.0-2.21.2.old/docs/reference/libgail-util/Makefile.in 2010-06-10 19:18:22.000000000 +0200
-+++ gtk+2.0-2.21.2/docs/reference/libgail-util/Makefile.in 2010-06-11 12:26:17.606613205 +0200
+@@ -299,6 +303,7 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ ms_librarian = @ms_librarian@
+Index: gtk+2.0-2.21.5/docs/reference/libgail-util/Makefile.in
+===================================================================
+--- gtk+2.0-2.21.5.orig/docs/reference/libgail-util/Makefile.in 2010-07-22 17:59:10.961053605 +0200
++++ gtk+2.0-2.21.5/docs/reference/libgail-util/Makefile.in 2010-07-22 17:58:45.194051167 +0200
@@ -45,11 +45,14 @@
$(top_srcdir)/Makefile.decl $(top_srcdir)/gtk-doc.make
subdir = docs/reference/libgail-util
@@ -8921,17 +14904,26 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -136,6 +139,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
+@@ -123,6 +126,7 @@
+ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.2.old/docs/reference/Makefile.in gtk+2.0-2.21.2/docs/reference/Makefile.in
---- gtk+2.0-2.21.2.old/docs/reference/Makefile.in 2010-06-10 19:18:22.000000000 +0200
-+++ gtk+2.0-2.21.2/docs/reference/Makefile.in 2010-06-11 12:26:16.734610557 +0200
+@@ -273,6 +277,7 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ ms_librarian = @ms_librarian@
+Index: gtk+2.0-2.21.5/docs/reference/Makefile.in
+===================================================================
+--- gtk+2.0-2.21.5.orig/docs/reference/Makefile.in 2010-07-22 17:59:14.061084683 +0200
++++ gtk+2.0-2.21.5/docs/reference/Makefile.in 2010-07-22 17:58:44.918053382 +0200
@@ -39,11 +39,14 @@
$(top_srcdir)/Makefile.decl AUTHORS COPYING ChangeLog
subdir = docs/reference
@@ -8949,17 +14941,26 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -170,6 +173,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
+@@ -157,6 +160,7 @@
+ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.2.old/docs/tools/Makefile.in gtk+2.0-2.21.2/docs/tools/Makefile.in
---- gtk+2.0-2.21.2.old/docs/tools/Makefile.in 2010-06-10 19:18:22.000000000 +0200
-+++ gtk+2.0-2.21.2/docs/tools/Makefile.in 2010-06-11 12:26:17.706613004 +0200
+@@ -307,6 +311,7 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ ms_librarian = @ms_librarian@
+Index: gtk+2.0-2.21.5/docs/tools/Makefile.in
+===================================================================
+--- gtk+2.0-2.21.5.orig/docs/tools/Makefile.in 2010-07-22 17:59:10.354054471 +0200
++++ gtk+2.0-2.21.5/docs/tools/Makefile.in 2010-07-22 17:58:45.278052772 +0200
@@ -41,11 +41,14 @@
@USE_X11_TRUE at noinst_PROGRAMS = doc-shooter$(EXEEXT)
subdir = docs/tools
@@ -8977,17 +14978,26 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -166,6 +169,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
+@@ -152,6 +155,7 @@
+ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.2.old/docs/tutorial/Makefile.in gtk+2.0-2.21.2/docs/tutorial/Makefile.in
---- gtk+2.0-2.21.2.old/docs/tutorial/Makefile.in 2010-06-10 19:18:22.000000000 +0200
-+++ gtk+2.0-2.21.2/docs/tutorial/Makefile.in 2010-06-11 12:26:17.790612505 +0200
+@@ -302,6 +306,7 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ ms_librarian = @ms_librarian@
+Index: gtk+2.0-2.21.5/docs/tutorial/Makefile.in
+===================================================================
+--- gtk+2.0-2.21.5.orig/docs/tutorial/Makefile.in 2010-07-22 17:59:14.685367311 +0200
++++ gtk+2.0-2.21.5/docs/tutorial/Makefile.in 2010-07-22 17:58:45.350052495 +0200
@@ -39,11 +39,14 @@
$(top_srcdir)/Makefile.decl
subdir = docs/tutorial
@@ -9005,17 +15015,26 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -130,6 +133,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
+@@ -117,6 +120,7 @@
+ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.2.old/gdk/directfb/Makefile.in gtk+2.0-2.21.2/gdk/directfb/Makefile.in
---- gtk+2.0-2.21.2.old/gdk/directfb/Makefile.in 2010-06-10 19:18:23.000000000 +0200
-+++ gtk+2.0-2.21.2/gdk/directfb/Makefile.in 2010-06-11 12:26:18.922613000 +0200
+@@ -267,6 +271,7 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ ms_librarian = @ms_librarian@
+Index: gtk+2.0-2.21.5/gdk/directfb/Makefile.in
+===================================================================
+--- gtk+2.0-2.21.5.orig/gdk/directfb/Makefile.in 2010-07-22 17:59:05.690054680 +0200
++++ gtk+2.0-2.21.5/gdk/directfb/Makefile.in 2010-07-22 17:58:45.602053020 +0200
@@ -41,11 +41,14 @@
$(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl AUTHORS TODO
subdir = gdk/directfb
@@ -9033,19 +15052,28 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -194,6 +197,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
+@@ -181,6 +184,7 @@
+ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.2.old/gdk/Makefile.in gtk+2.0-2.21.2/gdk/Makefile.in
---- gtk+2.0-2.21.2.old/gdk/Makefile.in 2010-06-10 19:18:23.000000000 +0200
-+++ gtk+2.0-2.21.2/gdk/Makefile.in 2010-06-11 12:26:18.686612837 +0200
-@@ -45,11 +45,14 @@
- @HAVE_INTROSPECTION_TRUE at am__append_2 = $(dist_gir_DATA) $(typelibs_DATA)
+@@ -331,6 +335,7 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ ms_librarian = @ms_librarian@
+Index: gtk+2.0-2.21.5/gdk/Makefile.in
+===================================================================
+--- gtk+2.0-2.21.5.orig/gdk/Makefile.in 2010-07-22 17:59:05.594052457 +0200
++++ gtk+2.0-2.21.5/gdk/Makefile.in 2010-07-22 17:58:45.510052218 +0200
+@@ -44,11 +44,14 @@
+ @HAVE_INTROSPECTION_TRUE at am__append_2 = $(gir_DATA) $(typelibs_DATA)
subdir = gdk
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
@@ -9061,17 +15089,26 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -321,6 +324,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
+@@ -303,6 +306,7 @@
+ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.2.old/gdk/quartz/Makefile.in gtk+2.0-2.21.2/gdk/quartz/Makefile.in
---- gtk+2.0-2.21.2.old/gdk/quartz/Makefile.in 2010-06-10 19:18:23.000000000 +0200
-+++ gtk+2.0-2.21.2/gdk/quartz/Makefile.in 2010-06-11 12:26:19.070612888 +0200
+@@ -453,6 +457,7 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ ms_librarian = @ms_librarian@
+Index: gtk+2.0-2.21.5/gdk/quartz/Makefile.in
+===================================================================
+--- gtk+2.0-2.21.5.orig/gdk/quartz/Makefile.in 2010-07-22 17:59:02.789054854 +0200
++++ gtk+2.0-2.21.5/gdk/quartz/Makefile.in 2010-07-22 17:58:45.694051097 +0200
@@ -41,11 +41,14 @@
$(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl
subdir = gdk/quartz
@@ -9089,17 +15126,26 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -193,6 +196,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
+@@ -180,6 +183,7 @@
+ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.2.old/gdk/tests/Makefile.in gtk+2.0-2.21.2/gdk/tests/Makefile.in
---- gtk+2.0-2.21.2.old/gdk/tests/Makefile.in 2010-06-10 19:18:23.000000000 +0200
-+++ gtk+2.0-2.21.2/gdk/tests/Makefile.in 2010-06-11 12:26:19.158612906 +0200
+@@ -330,6 +334,7 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ ms_librarian = @ms_librarian@
+Index: gtk+2.0-2.21.5/gdk/tests/Makefile.in
+===================================================================
+--- gtk+2.0-2.21.5.orig/gdk/tests/Makefile.in 2010-07-22 17:59:04.493054578 +0200
++++ gtk+2.0-2.21.5/gdk/tests/Makefile.in 2010-07-22 17:58:45.766051176 +0200
@@ -41,11 +41,14 @@
TESTS = $(am__EXEEXT_1)
subdir = gdk/tests
@@ -9117,17 +15163,26 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -135,6 +138,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
+@@ -122,6 +125,7 @@
+ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.2.old/gdk/win32/Makefile.in gtk+2.0-2.21.2/gdk/win32/Makefile.in
---- gtk+2.0-2.21.2.old/gdk/win32/Makefile.in 2010-06-10 19:18:23.000000000 +0200
-+++ gtk+2.0-2.21.2/gdk/win32/Makefile.in 2010-06-11 12:26:19.274613266 +0200
+@@ -272,6 +276,7 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ ms_librarian = @ms_librarian@
+Index: gtk+2.0-2.21.5/gdk/win32/Makefile.in
+===================================================================
+--- gtk+2.0-2.21.5.orig/gdk/win32/Makefile.in 2010-07-22 17:59:03.077052908 +0200
++++ gtk+2.0-2.21.5/gdk/win32/Makefile.in 2010-07-22 17:58:45.870051964 +0200
@@ -41,11 +41,14 @@
$(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl
subdir = gdk/win32
@@ -9145,17 +15200,26 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -231,6 +234,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
+@@ -218,6 +221,7 @@
+ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.2.old/gdk/win32/rc/Makefile.in gtk+2.0-2.21.2/gdk/win32/rc/Makefile.in
---- gtk+2.0-2.21.2.old/gdk/win32/rc/Makefile.in 2010-06-10 19:18:23.000000000 +0200
-+++ gtk+2.0-2.21.2/gdk/win32/rc/Makefile.in 2010-06-11 12:26:19.358613600 +0200
+@@ -368,6 +372,7 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ ms_librarian = @ms_librarian@
+Index: gtk+2.0-2.21.5/gdk/win32/rc/Makefile.in
+===================================================================
+--- gtk+2.0-2.21.5.orig/gdk/win32/rc/Makefile.in 2010-07-22 17:59:02.941054548 +0200
++++ gtk+2.0-2.21.5/gdk/win32/rc/Makefile.in 2010-07-22 17:58:45.938052290 +0200
@@ -40,11 +40,14 @@
$(srcdir)/gdk.rc.in $(top_srcdir)/Makefile.decl
subdir = gdk/win32/rc
@@ -9173,17 +15237,26 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES = gdk.rc
CONFIG_CLEAN_VPATH_FILES =
-@@ -132,6 +135,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
+@@ -119,6 +122,7 @@
+ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.2.old/gdk/x11/Makefile.in gtk+2.0-2.21.2/gdk/x11/Makefile.in
---- gtk+2.0-2.21.2.old/gdk/x11/Makefile.in 2010-06-10 19:18:24.000000000 +0200
-+++ gtk+2.0-2.21.2/gdk/x11/Makefile.in 2010-06-11 12:26:19.582613088 +0200
+@@ -269,6 +273,7 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ ms_librarian = @ms_librarian@
+Index: gtk+2.0-2.21.5/gdk/x11/Makefile.in
+===================================================================
+--- gtk+2.0-2.21.5.orig/gdk/x11/Makefile.in 2010-07-22 17:59:03.381053422 +0200
++++ gtk+2.0-2.21.5/gdk/x11/Makefile.in 2010-07-22 17:58:46.038052635 +0200
@@ -46,11 +46,14 @@
TESTS = checksettings$(EXEEXT)
subdir = gdk/x11
@@ -9201,90 +15274,26 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -223,6 +226,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
+@@ -209,6 +212,7 @@
+ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.2.old/gdk-pixbuf/Makefile.in gtk+2.0-2.21.2/gdk-pixbuf/Makefile.in
---- gtk+2.0-2.21.2.old/gdk-pixbuf/Makefile.in 2010-06-10 19:18:23.000000000 +0200
-+++ gtk+2.0-2.21.2/gdk-pixbuf/Makefile.in 2010-06-11 12:26:18.098612887 +0200
-@@ -51,11 +51,14 @@
- @HAVE_INTROSPECTION_TRUE at am__append_2 = $(dist_gir_DATA) $(typelibs_DATA)
- subdir = gdk-pixbuf
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES = gdk_pixbuf.rc gdk-pixbuf-features.h
- CONFIG_CLEAN_VPATH_FILES =
-@@ -779,6 +782,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -1001,6 +1005,7 @@
- libgdk_pixbuf-2.0.la
-
- loaderdir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/loaders
-+loaderfilesdir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/loader-files.d
- module_libs = libgdk_pixbuf-$(GTK_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS)
-
- #
-@@ -1358,7 +1363,7 @@
- $(GDK_PIXBUF_DEP_CFLAGS) \
- -DGDK_PIXBUF_ENABLE_BACKEND
-
--AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" "-DBUILT_MODULES_DIR=\"$(srcdir)/.libs\""
-+AM_CPPFLAGS = "-DPIXBUF_LIBDIR=\"$(loaderdir)\"" "-DPIXBUF_FILES_LIBDIR=\"$(loaderfilesdir)\"" "-DBUILT_MODULES_DIR=\"$(srcdir)/.libs\""
- LDADDS = libgdk_pixbuf-$(GTK_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS)
- test_gdk_pixbuf_LDADD = $(LDADDS)
- gdk_pixbuf_csource_SOURCES = gdk-pixbuf-csource.c
-diff -Naur gtk+2.0-2.21.2.old/gdk-pixbuf/pixops/Makefile.in gtk+2.0-2.21.2/gdk-pixbuf/pixops/Makefile.in
---- gtk+2.0-2.21.2.old/gdk-pixbuf/pixops/Makefile.in 2010-06-10 19:18:23.000000000 +0200
-+++ gtk+2.0-2.21.2/gdk-pixbuf/pixops/Makefile.in 2010-06-11 12:26:18.326612679 +0200
-@@ -42,11 +42,14 @@
- noinst_PROGRAMS = timescale$(EXEEXT)
- subdir = gdk-pixbuf/pixops
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-+ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
-+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
--mkinstalldirs = $(install_sh) -d
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- CONFIG_CLEAN_VPATH_FILES =
-@@ -183,6 +186,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
-+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
- GDK_WLIBS = @GDK_WLIBS@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.2.old/gtk/Makefile.in gtk+2.0-2.21.2/gtk/Makefile.in
---- gtk+2.0-2.21.2.old/gtk/Makefile.in 2010-06-10 19:18:24.000000000 +0200
-+++ gtk+2.0-2.21.2/gtk/Makefile.in 2010-06-11 12:26:20.126611422 +0200
+@@ -359,6 +363,7 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ ms_librarian = @ms_librarian@
+Index: gtk+2.0-2.21.5/gtk/Makefile.in
+===================================================================
+--- gtk+2.0-2.21.5.orig/gtk/Makefile.in 2010-07-22 17:59:08.357065817 +0200
++++ gtk+2.0-2.21.5/gtk/Makefile.in 2010-07-22 17:58:46.370051614 +0200
@@ -77,11 +77,14 @@
subdir = gtk
@@ -9302,24 +15311,32 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES = makefile.msc gtkversion.h gtk-win32.rc
CONFIG_CLEAN_VPATH_FILES =
-@@ -739,6 +742,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
+@@ -722,6 +725,7 @@
+ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -990,6 +994,8 @@
+@@ -872,6 +876,7 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ ms_librarian = @ms_librarian@
+@@ -962,6 +967,8 @@
+ -I$(top_srcdir) -I../gdk \
-I$(top_srcdir)/gdk \
- -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf \
-DGDK_DISABLE_DEPRECATED \
+ -DMAEMO_CHANGES \
+ -DGTK_FILE_CHOOSER_ENABLE_UNSUPPORTED \
-DGTK_DISABLE_DEPRECATED \
-DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED \
-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED \
-@@ -1103,17 +1109,21 @@
+@@ -1074,17 +1081,21 @@
# Installed header files without compatibility guarantees
# that are not included in gtk/gtk.h
gtk_semi_private_h_sources = \
@@ -9349,9 +15366,10 @@
gtkmnemonichash.h gtkmountoperationprivate.h gtkpathbar.h \
gtkplugprivate.h gtkprintoperation-private.h gtkprintutils.h \
gtkrbtree.h gtkrecentchooserdefault.h \
-diff -Naur gtk+2.0-2.21.2.old/gtk/tests/Makefile.in gtk+2.0-2.21.2/gtk/tests/Makefile.in
---- gtk+2.0-2.21.2.old/gtk/tests/Makefile.in 2010-06-10 19:18:24.000000000 +0200
-+++ gtk+2.0-2.21.2/gtk/tests/Makefile.in 2010-06-11 12:26:20.390610750 +0200
+Index: gtk+2.0-2.21.5/gtk/tests/Makefile.in
+===================================================================
+--- gtk+2.0-2.21.5.orig/gtk/tests/Makefile.in 2010-07-22 17:59:08.097053712 +0200
++++ gtk+2.0-2.21.5/gtk/tests/Makefile.in 2010-07-22 17:58:46.486051613 +0200
@@ -42,11 +42,14 @@
@OS_UNIX_TRUE at am__append_1 = defaultvalue
subdir = gtk/tests
@@ -9369,17 +15387,26 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -225,6 +228,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
+@@ -211,6 +214,7 @@
+ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.2.old/gtk/theme-bits/Makefile.in gtk+2.0-2.21.2/gtk/theme-bits/Makefile.in
---- gtk+2.0-2.21.2.old/gtk/theme-bits/Makefile.in 2010-06-10 19:18:24.000000000 +0200
-+++ gtk+2.0-2.21.2/gtk/theme-bits/Makefile.in 2010-06-11 12:26:20.618614522 +0200
+@@ -361,6 +365,7 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ ms_librarian = @ms_librarian@
+Index: gtk+2.0-2.21.5/gtk/theme-bits/Makefile.in
+===================================================================
+--- gtk+2.0-2.21.5.orig/gtk/theme-bits/Makefile.in 2010-07-22 17:59:06.969066211 +0200
++++ gtk+2.0-2.21.5/gtk/theme-bits/Makefile.in 2010-07-22 17:58:46.582051036 +0200
@@ -41,11 +41,14 @@
noinst_PROGRAMS = decompose-bits$(EXEEXT)
subdir = gtk/theme-bits
@@ -9397,36 +15424,2432 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -163,6 +166,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
+@@ -149,6 +152,7 @@
+ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.2.old/ltmain.sh gtk+2.0-2.21.2/ltmain.sh
---- gtk+2.0-2.21.2.old/ltmain.sh 2010-05-01 09:19:03.000000000 +0200
-+++ gtk+2.0-2.21.2/ltmain.sh 2010-06-11 12:26:00.043613020 +0200
-@@ -65,7 +65,7 @@
- # compiler: $LTCC
- # compiler flags: $LTCFLAGS
- # linker: $LD (gnu? $with_gnu_ld)
--# $progname: (GNU libtool) 2.2.6b
+@@ -299,6 +303,7 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ ms_librarian = @ms_librarian@
+Index: gtk+2.0-2.21.5/ltmain.sh
+===================================================================
+--- gtk+2.0-2.21.5.orig/ltmain.sh 2010-07-22 17:59:02.037054460 +0200
++++ gtk+2.0-2.21.5/ltmain.sh 2010-07-22 17:58:36.638055918 +0200
+@@ -1,10 +1,9 @@
+ # Generated from ltmain.m4sh.
+
+-# libtool (GNU libtool) 2.2.10
++# ltmain.sh (GNU libtool) 2.2.6b
+ # Written by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
+
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
+-# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
+ # This is free software; see the source for copying conditions. There is NO
+ # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+@@ -33,54 +32,50 @@
+ #
+ # Provide generalized library-building support services.
+ #
+-# --config show all configuration variables
+-# --debug enable verbose shell tracing
+-# -n, --dry-run display commands without modifying any files
+-# --features display basic configuration information and exit
+-# --mode=MODE use operation mode MODE
+-# --preserve-dup-deps don't remove duplicate dependency libraries
+-# --quiet, --silent don't print informational messages
+-# --no-quiet, --no-silent
+-# print informational messages (default)
+-# --tag=TAG use configuration variables from tag TAG
+-# -v, --verbose print more informational messages than default
+-# --no-verbose don't print the extra informational messages
+-# --version print version information
+-# -h, --help, --help-all print short, long, or detailed help message
++# --config show all configuration variables
++# --debug enable verbose shell tracing
++# -n, --dry-run display commands without modifying any files
++# --features display basic configuration information and exit
++# --mode=MODE use operation mode MODE
++# --preserve-dup-deps don't remove duplicate dependency libraries
++# --quiet, --silent don't print informational messages
++# --tag=TAG use configuration variables from tag TAG
++# -v, --verbose print informational messages (default)
++# --version print version information
++# -h, --help print short or long help message
+ #
+ # MODE must be one of the following:
+ #
+-# clean remove files from the build directory
+-# compile compile a source file into a libtool object
+-# execute automatically set library path, then run a program
+-# finish complete the installation of libtool libraries
+-# install install libraries or executables
+-# link create a library or an executable
+-# uninstall remove libraries from an installed directory
++# clean remove files from the build directory
++# compile compile a source file into a libtool object
++# execute automatically set library path, then run a program
++# finish complete the installation of libtool libraries
++# install install libraries or executables
++# link create a library or an executable
++# uninstall remove libraries from an installed directory
+ #
+-# MODE-ARGS vary depending on the MODE. When passed as first option,
+-# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that.
++# MODE-ARGS vary depending on the MODE.
+ # Try `$progname --help --mode=MODE' for a more detailed description of MODE.
+ #
+ # When reporting a bug, please describe a test case to reproduce it and
+ # include the following information:
+ #
+-# host-triplet: $host
+-# shell: $SHELL
+-# compiler: $LTCC
+-# compiler flags: $LTCFLAGS
+-# linker: $LD (gnu? $with_gnu_ld)
+-# $progname: (GNU libtool) 2.2.10
+-# automake: $automake_version
+-# autoconf: $autoconf_version
++# host-triplet: $host
++# shell: $SHELL
++# compiler: $LTCC
++# compiler flags: $LTCFLAGS
++# linker: $LD (gnu? $with_gnu_ld)
+# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2
- # automake: $automake_version
- # autoconf: $autoconf_version
++# automake: $automake_version
++# autoconf: $autoconf_version
#
-@@ -73,7 +73,7 @@
-
- PROGRAM=ltmain.sh
+ # Report bugs to <bug-libtool at gnu.org>.
+
+-PROGRAM=libtool
++PROGRAM=ltmain.sh
PACKAGE=libtool
--VERSION=2.2.6b
+-VERSION=2.2.10
+VERSION="2.2.6b Debian-2.2.6b-2"
TIMESTAMP=""
- package_revision=1.3017
-
-@@ -5033,7 +5033,10 @@
+-package_revision=1.3175
++package_revision=1.3017
+
+ # Be Bourne compatible
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+@@ -96,15 +91,10 @@
+ BIN_SH=xpg4; export BIN_SH # for Tru64
+ DUALCASE=1; export DUALCASE # for MKS sh
+
+-# A function that is used when there is no print builtin or printf.
+-func_fallback_echo ()
+-{
+- eval 'cat <<_LTECHO_EOF
+-$1
+-_LTECHO_EOF'
+-}
+-
+ # NLS nuisances: We save the old values to restore during execute mode.
++# Only set LANG and LC_ALL to C if already set.
++# These must not be set unconditionally because not all systems understand
++# e.g. LANG=C (notably SCO).
+ lt_user_locale=
+ lt_safe_locale=
+ for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+@@ -117,24 +107,15 @@
+ lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
+ fi"
+ done
+-LC_ALL=C
+-LANGUAGE=C
+-export LANGUAGE LC_ALL
+
+ $lt_unset CDPATH
+
+
+-# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
+-# is ksh but when the shell is invoked as "sh" and the current value of
+-# the _XPG environment variable is not equal to 1 (one), the special
+-# positional parameter $0, within a function call, is the name of the
+-# function.
+-progpath="$0"
+
+
+
+ : ${CP="cp -f"}
+-test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
++: ${ECHO="echo"}
+ : ${EGREP="/bin/grep -E"}
+ : ${FGREP="/bin/grep -F"}
+ : ${GREP="/bin/grep"}
+@@ -178,168 +159,32 @@
+ func_dirname_and_basename ()
+ {
+ # Extract subdirectory from the argument.
+- func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
++ func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
+ if test "X$func_dirname_result" = "X${1}"; then
+ func_dirname_result="${3}"
+ else
+ func_dirname_result="$func_dirname_result${2}"
+ fi
+- func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
++ func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
+ }
+
+ # Generated shell functions inserted here.
+
+-# These SED scripts presuppose an absolute path with a trailing slash.
+-pathcar='s,^/\([^/]*\).*$,\1,'
+-pathcdr='s,^/[^/]*,,'
+-removedotparts=':dotsl
+- s@/\./@/@g
+- t dotsl
+- s,/\.$,/,'
+-collapseslashes='s@/\{1,\}@/@g'
+-finalslash='s,/*$,/,'
+-
+-# func_normal_abspath PATH
+-# Remove doubled-up and trailing slashes, "." path components,
+-# and cancel out any ".." path components in PATH after making
+-# it an absolute path.
+-# value returned in "$func_normal_abspath_result"
+-func_normal_abspath ()
+-{
+- # Start from root dir and reassemble the path.
+- func_normal_abspath_result=
+- func_normal_abspath_tpath=$1
+- func_normal_abspath_altnamespace=
+- case $func_normal_abspath_tpath in
+- "")
+- # Empty path, that just means $cwd.
+- func_stripname '' '/' "`pwd`"
+- func_normal_abspath_result=$func_stripname_result
+- return
+- ;;
+- # The next three entries are used to spot a run of precisely
+- # two leading slashes without using negated character classes;
+- # we take advantage of case's first-match behaviour.
+- ///*)
+- # Unusual form of absolute path, do nothing.
+- ;;
+- //*)
+- # Not necessarily an ordinary path; POSIX reserves leading '//'
+- # and for example Cygwin uses it to access remote file shares
+- # over CIFS/SMB, so we conserve a leading double slash if found.
+- func_normal_abspath_altnamespace=/
+- ;;
+- /*)
+- # Absolute path, do nothing.
+- ;;
+- *)
+- # Relative path, prepend $cwd.
+- func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
+- ;;
+- esac
+- # Cancel out all the simple stuff to save iterations. We also want
+- # the path to end with a slash for ease of parsing, so make sure
+- # there is one (and only one) here.
+- func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
+- -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"`
+- while :; do
+- # Processed it all yet?
+- if test "$func_normal_abspath_tpath" = / ; then
+- # If we ascended to the root using ".." the result may be empty now.
+- if test -z "$func_normal_abspath_result" ; then
+- func_normal_abspath_result=/
+- fi
+- break
+- fi
+- func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
+- -e "$pathcar"`
+- func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
+- -e "$pathcdr"`
+- # Figure out what to do with it
+- case $func_normal_abspath_tcomponent in
+- "")
+- # Trailing empty path component, ignore it.
+- ;;
+- ..)
+- # Parent dir; strip last assembled component from result.
+- func_dirname "$func_normal_abspath_result"
+- func_normal_abspath_result=$func_dirname_result
+- ;;
+- *)
+- # Actual path component, append it.
+- func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent
+- ;;
+- esac
+- done
+- # Restore leading double-slash if one was found on entry.
+- func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
+-}
+-
+-# func_relative_path SRCDIR DSTDIR
+-# generates a relative path from SRCDIR to DSTDIR, with a trailing
+-# slash if non-empty, suitable for immediately appending a filename
+-# without needing to append a separator.
+-# value returned in "$func_relative_path_result"
+-func_relative_path ()
+-{
+- func_relative_path_result=
+- func_normal_abspath "$1"
+- func_relative_path_tlibdir=$func_normal_abspath_result
+- func_normal_abspath "$2"
+- func_relative_path_tbindir=$func_normal_abspath_result
+-
+- # Ascend the tree starting from libdir
+- while :; do
+- # check if we have found a prefix of bindir
+- case $func_relative_path_tbindir in
+- $func_relative_path_tlibdir)
+- # found an exact match
+- func_relative_path_tcancelled=
+- break
+- ;;
+- $func_relative_path_tlibdir*)
+- # found a matching prefix
+- func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"
+- func_relative_path_tcancelled=$func_stripname_result
+- if test -z "$func_relative_path_result"; then
+- func_relative_path_result=.
+- fi
+- break
+- ;;
+- *)
+- func_dirname $func_relative_path_tlibdir
+- func_relative_path_tlibdir=${func_dirname_result}
+- if test "x$func_relative_path_tlibdir" = x ; then
+- # Have to descend all the way to the root!
+- func_relative_path_result=../$func_relative_path_result
+- func_relative_path_tcancelled=$func_relative_path_tbindir
+- break
+- fi
+- func_relative_path_result=../$func_relative_path_result
+- ;;
+- esac
+- done
+-
+- # Now calculate path; take care to avoid doubling-up slashes.
+- func_stripname '' '/' "$func_relative_path_result"
+- func_relative_path_result=$func_stripname_result
+- func_stripname '/' '/' "$func_relative_path_tcancelled"
+- if test "x$func_stripname_result" != x ; then
+- func_relative_path_result=${func_relative_path_result}/${func_stripname_result}
+- fi
+-
+- # Normalisation. If bindir is libdir, return empty string,
+- # else relative path ending with a slash; either way, target
+- # file name can be directly appended.
+- if test ! -z "$func_relative_path_result"; then
+- func_stripname './' '' "$func_relative_path_result/"
+- func_relative_path_result=$func_stripname_result
+- fi
+-}
++# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
++# is ksh but when the shell is invoked as "sh" and the current value of
++# the _XPG environment variable is not equal to 1 (one), the special
++# positional parameter $0, within a function call, is the name of the
++# function.
++progpath="$0"
+
+ # The name of this program:
++# In the unlikely event $progname began with a '-', it would play havoc with
++# func_echo (imagine progname=-n), so we prepend ./ in that case:
+ func_dirname_and_basename "$progpath"
+ progname=$func_basename_result
++case $progname in
++ -*) progname=./$progname ;;
++esac
+
+ # Make sure we have an absolute path for reexecution:
+ case $progpath in
+@@ -413,13 +258,6 @@
+ :
+ }
+
+-# func_echo_all arg...
+-# Invoke $ECHO with all args, space-separated.
+-func_echo_all ()
+-{
+- $ECHO "$*"
+-}
+-
+ # func_error arg...
+ # Echo program name prefixed message to standard error.
+ func_error ()
+@@ -488,9 +326,9 @@
+ case $my_directory_path in */*) ;; *) break ;; esac
+
+ # ...otherwise throw away the child directory and loop
+- my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"`
++ my_directory_path=`$ECHO "X$my_directory_path" | $Xsed -e "$dirname"`
+ done
+- my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'`
++ my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'`
+
+ save_mkdir_p_IFS="$IFS"; IFS=':'
+ for my_dir in $my_dir_list; do
+@@ -540,7 +378,7 @@
+ func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
+ fi
+
+- $ECHO "$my_tmpdir"
++ $ECHO "X$my_tmpdir" | $Xsed
+ }
+
+
+@@ -554,7 +392,7 @@
+ {
+ case $1 in
+ *[\\\`\"\$]*)
+- func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;;
++ func_quote_for_eval_unquoted_result=`$ECHO "X$1" | $Xsed -e "$sed_quote_subst"` ;;
+ *)
+ func_quote_for_eval_unquoted_result="$1" ;;
+ esac
+@@ -581,7 +419,7 @@
+ {
+ case $1 in
+ *[\\\`\"]*)
+- my_arg=`$ECHO "$1" | $SED \
++ my_arg=`$ECHO "X$1" | $Xsed \
+ -e "$double_quote_subst" -e "$sed_double_backslash"` ;;
+ *)
+ my_arg="$1" ;;
+@@ -651,19 +489,14 @@
+ }
+
+
++
++
++
+ # func_version
+ # Echo version message to standard output and exit.
+ func_version ()
+ {
+- $SED -n '/(C)/!b go
+- :more
+- /\./!{
+- N
+- s/\n# / /
+- b more
+- }
+- :go
+- /^# '$PROGRAM' (GNU /,/# warranty; / {
++ $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / {
+ s/^# //
+ s/^# *$//
+ s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
+@@ -676,20 +509,19 @@
+ # Echo short help message to standard output and exit.
+ func_usage ()
+ {
+- $SED -n '/^# Usage:/,/^# *.*--help/ {
++ $SED -n '/^# Usage:/,/# -h/ {
+ s/^# //
+ s/^# *$//
+ s/\$progname/'$progname'/
+ p
+ }' < "$progpath"
+- echo
++ $ECHO
+ $ECHO "run \`$progname --help | more' for full usage"
+ exit $?
+ }
+
+-# func_help [NOEXIT]
+-# Echo long help message to standard output and exit,
+-# unless 'noexit' is passed as argument.
++# func_help
++# Echo long help message to standard output and exit.
+ func_help ()
+ {
+ $SED -n '/^# Usage:/,/# Report bugs to/ {
+@@ -706,10 +538,7 @@
+ s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
+ p
+ }' < "$progpath"
+- ret=$?
+- if test -z "$1"; then
+- exit $ret
+- fi
++ exit $?
+ }
+
+ # func_missing_arg argname
+@@ -717,7 +546,7 @@
+ # exit_cmd.
+ func_missing_arg ()
+ {
+- func_error "missing argument for $1."
++ func_error "missing argument for $1"
+ exit_cmd=exit
+ }
+
+@@ -727,6 +556,29 @@
+
+
+
++# Check that we have a working $ECHO.
++if test "X$1" = X--no-reexec; then
++ # Discard the --no-reexec flag, and continue.
++ shift
++elif test "X$1" = X--fallback-echo; then
++ # Avoid inline document here, it may be left over
++ :
++elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then
++ # Yippee, $ECHO works!
++ :
++else
++ # Restart under the correct shell, and then maybe $ECHO will work.
++ exec $SHELL "$progpath" --no-reexec ${1+"$@"}
++fi
++
++if test "X$1" = X--fallback-echo; then
++ # used as fallback echo
++ shift
++ cat <<EOF
++$*
++EOF
++ exit $EXIT_SUCCESS
++fi
+
+ magic="%%%MAGIC variable%%%"
+ magic_exe="%%%MAGIC EXE variable%%%"
+@@ -784,16 +636,16 @@
+ # Display the features supported by this script.
+ func_features ()
+ {
+- echo "host: $host"
++ $ECHO "host: $host"
+ if test "$build_libtool_libs" = yes; then
+- echo "enable shared libraries"
++ $ECHO "enable shared libraries"
+ else
+- echo "disable shared libraries"
++ $ECHO "disable shared libraries"
+ fi
+ if test "$build_old_libs" = yes; then
+- echo "enable static libraries"
++ $ECHO "enable static libraries"
+ else
+- echo "disable static libraries"
++ $ECHO "disable static libraries"
+ fi
+
+ exit $?
+@@ -920,21 +772,10 @@
+
+ --quiet|--silent) preserve_args="$preserve_args $opt"
+ opt_silent=:
+- opt_verbose=false
+- ;;
+-
+- --no-quiet|--no-silent)
+- preserve_args="$preserve_args $opt"
+- opt_silent=false
+ ;;
+
+ --verbose| -v) preserve_args="$preserve_args $opt"
+ opt_silent=false
+- opt_verbose=:
+- ;;
+-
+- --no-verbose) preserve_args="$preserve_args $opt"
+- opt_verbose=false
+ ;;
+
+ --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break
+@@ -952,7 +793,6 @@
+
+ -\?|-h) func_usage ;;
+ --help) opt_help=: ;;
+- --help-all) opt_help=': help-all' ;;
+ --version) func_version ;;
+
+ -*) func_fatal_help "unrecognized option \`$opt'" ;;
+@@ -1176,13 +1016,10 @@
+ func_quote_for_eval "$arg"
+ CC_quoted="$CC_quoted $func_quote_for_eval_result"
+ done
+- CC_expanded=`func_echo_all $CC`
+- CC_quoted_expanded=`func_echo_all $CC_quoted`
+ case $@ in
+ # Blanks in the command may have been stripped by the calling shell,
+ # but not from the CC environment variable when configure was run.
+- " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
+- " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;;
++ " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) ;;
+ # Blanks at the start of $base_compile will cause this to fail
+ # if we don't check for them as well.
+ *)
+@@ -1196,11 +1033,8 @@
+ func_quote_for_eval "$arg"
+ CC_quoted="$CC_quoted $func_quote_for_eval_result"
+ done
+- CC_expanded=`func_echo_all $CC`
+- CC_quoted_expanded=`func_echo_all $CC_quoted`
+ case "$@ " in
+- " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
+- " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*)
++ " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*)
+ # The compiler in the base compile command matches
+ # the one in the tagged configuration.
+ # Assume this is the tagged configuration we want.
+@@ -1379,7 +1213,7 @@
+ *.[cCFSifmso] | \
+ *.ada | *.adb | *.ads | *.asm | \
+ *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
+- *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup)
++ *.[fF][09]? | *.for | *.java | *.obj | *.sx)
+ func_xform "$libobj"
+ libobj=$func_xform_result
+ ;;
+@@ -1454,7 +1288,7 @@
+ # Calculate the filename of the output object if compiler does
+ # not support -o with -c
+ if test "$compiler_c_o" = no; then
+- output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext}
++ output_obj=`$ECHO "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
+ lockfile="$output_obj.lock"
+ else
+ output_obj=
+@@ -1611,7 +1445,7 @@
+ }
+
+ $opt_help || {
+- test "$mode" = compile && func_mode_compile ${1+"$@"}
++test "$mode" = compile && func_mode_compile ${1+"$@"}
+ }
+
+ func_mode_help ()
+@@ -1648,11 +1482,10 @@
+
+ -o OUTPUT-FILE set the output file name to OUTPUT-FILE
+ -no-suppress do not suppress compiler output for multiple passes
+- -prefer-pic try to build PIC objects only
+- -prefer-non-pic try to build non-PIC objects only
++ -prefer-pic try to building PIC objects only
++ -prefer-non-pic try to building non-PIC objects only
+ -shared do not build a \`.o' file suitable for static linking
+ -static only build a \`.o' file suitable for static linking
+- -Wc,FLAG pass FLAG directly to the compiler
+
+ COMPILE-COMMAND is a command to be used in creating a \`standard' object file
+ from the given SOURCEFILE.
+@@ -1705,7 +1538,7 @@
+
+ The following components of INSTALL-COMMAND are treated specially:
+
+- -inst-prefix-dir PREFIX-DIR Use PREFIX-DIR as a staging area for installation
++ -inst-prefix PREFIX-DIR Use PREFIX-DIR as a staging area for installation
+
+ The rest of the components are interpreted as arguments to that command (only
+ BSD-compatible install options are recognized)."
+@@ -1725,8 +1558,6 @@
+
+ -all-static do not do any dynamic linking at all
+ -avoid-version do not add a version suffix if possible
+- -bindir BINDIR specify path to binaries directory (for systems where
+- libraries must be found in the PATH setting at runtime)
+ -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime
+ -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols
+ -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
+@@ -1755,11 +1586,6 @@
+ -version-info CURRENT[:REVISION[:AGE]]
+ specify library version info [each variable defaults to 0]
+ -weak LIBNAME declare that the target provides the LIBNAME interface
+- -Wc,FLAG
+- -Xcompiler FLAG pass linker-specific FLAG directly to the compiler
+- -Wl,FLAG
+- -Xlinker FLAG pass linker-specific FLAG directly to the linker
+- -XCClinker FLAG pass link-specific FLAG to the compiler driver (CC)
+
+ All other options (arguments beginning with \`-') are ignored.
+
+@@ -1797,40 +1623,14 @@
+ ;;
+ esac
+
+- echo
++ $ECHO
+ $ECHO "Try \`$progname --help' for more information about other modes."
++
++ exit $?
+ }
+
+-# Now that we've collected a possible --mode arg, show help if necessary
+-if $opt_help; then
+- if test "$opt_help" = :; then
+- func_mode_help
+- else
+- {
+- func_help noexit
+- for mode in compile link execute install finish uninstall clean; do
+- func_mode_help
+- done
+- } | sed -n '1p; 2,$s/^Usage:/ or: /p'
+- {
+- func_help noexit
+- for mode in compile link execute install finish uninstall clean; do
+- echo
+- func_mode_help
+- done
+- } |
+- sed '1d
+- /^When reporting/,/^Report/{
+- H
+- d
+- }
+- $x
+- /information about other modes/d
+- /more detailed .*MODE/d
+- s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/'
+- fi
+- exit $?
+-fi
++ # Now that we've collected a possible --mode arg, show help if necessary
++ $opt_help && func_mode_help
+
+
+ # func_mode_execute arg...
+@@ -1912,7 +1712,7 @@
+ for file
+ do
+ case $file in
+- -* | *.la | *.lo ) ;;
++ -*) ;;
+ *)
+ # Do a test to see if this is really a libtool program.
+ if func_ltwrapper_script_p "$file"; then
+@@ -1954,7 +1754,7 @@
+ # Display what would be done.
+ if test -n "$shlibpath_var"; then
+ eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
+- echo "export $shlibpath_var"
++ $ECHO "export $shlibpath_var"
+ fi
+ $ECHO "$cmd$args"
+ exit $EXIT_SUCCESS
+@@ -1995,23 +1795,23 @@
+ # Exit here if they wanted silent mode.
+ $opt_silent && exit $EXIT_SUCCESS
+
+- echo "----------------------------------------------------------------------"
+- echo "Libraries have been installed in:"
++ $ECHO "X----------------------------------------------------------------------" | $Xsed
++ $ECHO "Libraries have been installed in:"
+ for libdir in $libdirs; do
+ $ECHO " $libdir"
+ done
+- echo
+- echo "If you ever happen to want to link against installed libraries"
+- echo "in a given directory, LIBDIR, you must either use libtool, and"
+- echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
+- echo "flag during linking and do at least one of the following:"
++ $ECHO
++ $ECHO "If you ever happen to want to link against installed libraries"
++ $ECHO "in a given directory, LIBDIR, you must either use libtool, and"
++ $ECHO "specify the full pathname of the library, or use the \`-LLIBDIR'"
++ $ECHO "flag during linking and do at least one of the following:"
+ if test -n "$shlibpath_var"; then
+- echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
+- echo " during execution"
++ $ECHO " - add LIBDIR to the \`$shlibpath_var' environment variable"
++ $ECHO " during execution"
+ fi
+ if test -n "$runpath_var"; then
+- echo " - add LIBDIR to the \`$runpath_var' environment variable"
+- echo " during linking"
++ $ECHO " - add LIBDIR to the \`$runpath_var' environment variable"
++ $ECHO " during linking"
+ fi
+ if test -n "$hardcode_libdir_flag_spec"; then
+ libdir=LIBDIR
+@@ -2023,21 +1823,21 @@
+ $ECHO " - have your system administrator run these commands:$admincmds"
+ fi
+ if test -f /etc/ld.so.conf; then
+- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
++ $ECHO " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
+ fi
+- echo
++ $ECHO
+
+- echo "See any operating system documentation about shared libraries for"
++ $ECHO "See any operating system documentation about shared libraries for"
+ case $host in
+ solaris2.[6789]|solaris2.1[0-9])
+- echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
+- echo "pages."
++ $ECHO "more information, such as the ld(1), crle(1) and ld.so(8) manual"
++ $ECHO "pages."
+ ;;
+ *)
+- echo "more information, such as the ld(1) and ld.so(8) manual pages."
++ $ECHO "more information, such as the ld(1) and ld.so(8) manual pages."
+ ;;
+ esac
+- echo "----------------------------------------------------------------------"
++ $ECHO "X----------------------------------------------------------------------" | $Xsed
+ exit $EXIT_SUCCESS
+ }
+
+@@ -2052,7 +1852,7 @@
+ # install_prog (especially on Windows NT).
+ if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
+ # Allow the use of GNU shtool's install command.
+- case $nonopt in *shtool*) :;; *) false;; esac; then
++ $ECHO "X$nonopt" | $GREP shtool >/dev/null; then
+ # Aesthetically quote it.
+ func_quote_for_eval "$nonopt"
+ install_prog="$func_quote_for_eval_result "
+@@ -2067,11 +1867,6 @@
+ # Aesthetically quote it.
+ func_quote_for_eval "$arg"
+ install_prog="$install_prog$func_quote_for_eval_result"
+- install_shared_prog=$install_prog
+- case " $install_prog " in
+- *[\\\ /]cp\ *) install_cp=: ;;
+- *) install_cp=false ;;
+- esac
+
+ # We need to accept at least all the BSD install flags.
+ dest=
+@@ -2081,10 +1876,8 @@
+ install_type=
+ isdir=no
+ stripme=
+- no_mode=:
+ for arg
+ do
+- arg2=
+ if test -n "$dest"; then
+ files="$files $dest"
+ dest=$arg
+@@ -2094,9 +1887,10 @@
+ case $arg in
+ -d) isdir=yes ;;
+ -f)
+- if $install_cp; then :; else
+- prev=$arg
+- fi
++ case " $install_prog " in
++ *[\\\ /]cp\ *) ;;
++ *) prev=$arg ;;
++ esac
+ ;;
+ -g | -m | -o)
+ prev=$arg
+@@ -2110,10 +1904,6 @@
+ *)
+ # If the previous option needed an argument, then skip it.
+ if test -n "$prev"; then
+- if test "x$prev" = x-m && test -n "$install_override_mode"; then
+- arg2=$install_override_mode
+- no_mode=false
+- fi
+ prev=
+ else
+ dest=$arg
+@@ -2125,10 +1915,6 @@
+ # Aesthetically quote the argument.
+ func_quote_for_eval "$arg"
+ install_prog="$install_prog $func_quote_for_eval_result"
+- if test -n "$arg2"; then
+- func_quote_for_eval "$arg2"
+- fi
+- install_shared_prog="$install_shared_prog $func_quote_for_eval_result"
+ done
+
+ test -z "$install_prog" && \
+@@ -2137,13 +1923,6 @@
+ test -n "$prev" && \
+ func_fatal_help "the \`$prev' option requires an argument"
+
+- if test -n "$install_override_mode" && $no_mode; then
+- if $install_cp; then :; else
+- func_quote_for_eval "$install_override_mode"
+- install_shared_prog="$install_shared_prog -m $func_quote_for_eval_result"
+- fi
+- fi
+-
+ if test -z "$files"; then
+ if test -z "$dest"; then
+ func_fatal_help "no file or destination specified"
+@@ -2231,7 +2010,7 @@
+
+ if test -n "$relink_command"; then
+ # Determine the prefix the user has applied to our future dir.
+- inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
++ inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"`
+
+ # Don't allow the user to place us outside of our expected
+ # location b/c this prevents finding dependent libraries that
+@@ -2244,9 +2023,9 @@
+
+ if test -n "$inst_prefix_dir"; then
+ # Stick the inst_prefix_dir data into the link command.
+- relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
++ relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
+ else
+- relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
++ relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%%"`
+ fi
+
+ func_warning "relinking \`$file'"
+@@ -2264,7 +2043,7 @@
+ test -n "$relink_command" && srcname="$realname"T
+
+ # Install the shared library and build the symlinks.
+- func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \
++ func_show_eval "$install_prog $dir/$srcname $destdir/$realname" \
+ 'exit $?'
+ tstripme="$stripme"
+ case $host_os in
+@@ -2404,7 +2183,7 @@
+ if test -f "$lib"; then
+ func_source "$lib"
+ fi
+- libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test
++ libfile="$libdir/"`$ECHO "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
+ if test -n "$libdir" && test ! -f "$libfile"; then
+ func_warning "\`$lib' has not been installed in \`$libdir'"
+ finalize=no
+@@ -2423,7 +2202,7 @@
+ file="$func_basename_result"
+ outputname="$tmpdir/$file"
+ # Replace the output file specification.
+- relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'`
++ relink_command=`$ECHO "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
+
+ $opt_silent || {
+ func_quote_for_expand "$relink_command"
+@@ -2442,7 +2221,7 @@
+ }
+ else
+ # Install the binary that we compiled earlier.
+- file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"`
++ file=`$ECHO "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
+ fi
+ fi
+
+@@ -2544,10 +2323,6 @@
+ extern \"C\" {
+ #endif
+
+-#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
+-#pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
+-#endif
+-
+ /* External symbol declarations for the compiler. */\
+ "
+
+@@ -2557,7 +2332,7 @@
+ $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
+
+ # Add our own program objects to the symbol list.
+- progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
++ progfiles=`$ECHO "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+ for progfile in $progfiles; do
+ func_verbose "extracting global C symbols from \`$progfile'"
+ $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'"
+@@ -2596,7 +2371,7 @@
+ eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
+ eval '$MV "$nlist"T "$nlist"'
+ case $host in
+- *cygwin* | *mingw* | *cegcc* )
++ *cygwin | *mingw* | *cegcc* )
+ eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
+ eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
+ ;;
+@@ -2640,10 +2415,10 @@
+ if test -f "$nlist"S; then
+ eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'
+ else
+- echo '/* NONE */' >> "$output_objdir/$my_dlsyms"
++ $ECHO '/* NONE */' >> "$output_objdir/$my_dlsyms"
+ fi
+
+- echo >> "$output_objdir/$my_dlsyms" "\
++ $ECHO >> "$output_objdir/$my_dlsyms" "\
+
+ /* The mapping between symbol names and symbols. */
+ typedef struct {
+@@ -2653,7 +2428,7 @@
+ "
+ case $host in
+ *cygwin* | *mingw* | *cegcc* )
+- echo >> "$output_objdir/$my_dlsyms" "\
++ $ECHO >> "$output_objdir/$my_dlsyms" "\
+ /* DATA imports from DLLs on WIN32 con't be const, because
+ runtime relocations are performed -- see ld's documentation
+ on pseudo-relocs. */"
+@@ -2666,7 +2441,7 @@
+ lt_dlsym_const=const ;;
+ esac
+
+- echo >> "$output_objdir/$my_dlsyms" "\
++ $ECHO >> "$output_objdir/$my_dlsyms" "\
+ extern $lt_dlsym_const lt_dlsymlist
+ lt_${my_prefix}_LTX_preloaded_symbols[];
+ $lt_dlsym_const lt_dlsymlist
+@@ -2682,7 +2457,7 @@
+ eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms"
+ ;;
+ esac
+- echo >> "$output_objdir/$my_dlsyms" "\
++ $ECHO >> "$output_objdir/$my_dlsyms" "\
+ {0, (void *) 0}
+ };
+
+@@ -2740,16 +2515,16 @@
+ case $host in
+ *cygwin* | *mingw* | *cegcc* )
+ if test -f "$output_objdir/$my_outputname.def"; then
+- compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
+- finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
++ compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
++ finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
+ else
+- compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+- finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
++ compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
++ finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
+ fi
+ ;;
+ *)
+- compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+- finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
++ compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
++ finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
+ ;;
+ esac
+ ;;
+@@ -2763,8 +2538,8 @@
+ # really was required.
+
+ # Nullify the symbol file.
+- compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"`
+- finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"`
++ compile_command=`$ECHO "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
++ finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
+ fi
+ }
+
+@@ -2774,7 +2549,6 @@
+ # Need a lot of goo to handle *both* DLLs and import libs
+ # Has to be a shell function in order to 'eat' the argument
+ # that is supplied when $file_magic_command is called.
+-# Despite the name, also deal with 64 bit binaries.
+ func_win32_libid ()
+ {
+ $opt_debug
+@@ -2785,9 +2559,8 @@
+ win32_libid_type="x86 archive import"
+ ;;
+ *ar\ archive*) # could be an import, or static
+- # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
+ if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
+- $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
++ $EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
+ win32_nmres=`eval $NM -f posix -A $1 |
+ $SED -n -e '
+ 1,100{
+@@ -2825,18 +2598,7 @@
+ $opt_debug
+ f_ex_an_ar_dir="$1"; shift
+ f_ex_an_ar_oldlib="$1"
+- if test "$lock_old_archive_extraction" = yes; then
+- lockfile=$f_ex_an_ar_oldlib.lock
+- until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
+- func_echo "Waiting for $lockfile to be removed"
+- sleep 2
+- done
+- fi
+- func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \
+- 'stat=$?; rm -f "$lockfile"; exit $stat'
+- if test "$lock_old_archive_extraction" = yes; then
+- $opt_dry_run || rm -f "$lockfile"
+- fi
++ func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" 'exit $?'
+ if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
+ :
+ else
+@@ -2907,7 +2669,7 @@
+ darwin_file=
+ darwin_files=
+ for darwin_file in $darwin_filelist; do
+- darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP`
++ darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
+ $LIPO -create -output "$darwin_file" $darwin_files
+ done # $darwin_filelist
+ $RM -rf unfat-$$
+@@ -2922,30 +2684,25 @@
+ func_extract_an_archive "$my_xdir" "$my_xabs"
+ ;;
+ esac
+- my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
++ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
+ done
+
+ func_extract_archives_result="$my_oldobjs"
+ }
+
+
+-# func_emit_wrapper [arg=no]
+-#
+-# Emit a libtool wrapper script on stdout.
+-# Don't directly open a file because we may want to
+-# incorporate the script contents within a cygwin/mingw
+-# wrapper executable. Must ONLY be called from within
+-# func_mode_link because it depends on a number of variables
+-# set therein.
++
++# func_emit_wrapper_part1 [arg=no]
+ #
+-# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
+-# variable will take. If 'yes', then the emitted script
+-# will assume that the directory in which it is stored is
+-# the $objdir directory. This is a cygwin/mingw-specific
+-# behavior.
+-func_emit_wrapper ()
+-{
+- func_emit_wrapper_arg1=${1-no}
++# Emit the first part of a libtool wrapper script on stdout.
++# For more information, see the description associated with
++# func_emit_wrapper(), below.
++func_emit_wrapper_part1 ()
++{
++ func_emit_wrapper_part1_arg1=no
++ if test -n "$1" ; then
++ func_emit_wrapper_part1_arg1=$1
++ fi
+
+ $ECHO "\
+ #! $SHELL
+@@ -2961,6 +2718,7 @@
+
+ # Sed substitution that helps us do robust quoting. It backslashifies
+ # metacharacters that are still active within double-quoted strings.
++Xsed='${SED} -e 1s/^X//'
+ sed_quote_subst='$sed_quote_subst'
+
+ # Be Bourne compatible
+@@ -2991,132 +2749,31 @@
+ else
+ # When we are sourced in execute mode, \$file and \$ECHO are already set.
+ if test \"\$libtool_execute_magic\" != \"$magic\"; then
+- file=\"\$0\""
+-
+- qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"`
+- $ECHO "\
+-
+-# A function that is used when there is no print builtin or printf.
+-func_fallback_echo ()
+-{
+- eval 'cat <<_LTECHO_EOF
+-\$1
+-_LTECHO_EOF'
+-}
+- ECHO=\"$qECHO\"
+- fi
+-
+-# Very basic option parsing. These options are (a) specific to
+-# the libtool wrapper, (b) are identical between the wrapper
+-# /script/ and the wrapper /executable/ which is used only on
+-# windows platforms, and (c) all begin with the string "--lt-"
+-# (application programs are unlikely to have options which match
+-# this pattern).
+-#
+-# There are only two supported options: --lt-debug and
+-# --lt-dump-script. There is, deliberately, no --lt-help.
+-#
+-# The first argument to this parsing function should be the
+-# script's $0 value, followed by "$@".
+-lt_option_debug=
+-func_parse_lt_options ()
+-{
+- lt_script_arg0=\$0
+- shift
+- for lt_opt
+- do
+- case \"\$lt_opt\" in
+- --lt-debug) lt_option_debug=1 ;;
+- --lt-dump-script)
+- lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\`
+- test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=.
+- lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\`
+- cat \"\$lt_dump_D/\$lt_dump_F\"
+- exit 0
+- ;;
+- --lt-*)
+- \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2
+- exit 1
+- ;;
+- esac
+- done
+-
+- # Print the debug banner immediately:
+- if test -n \"\$lt_option_debug\"; then
+- echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2
+- fi
+-}
+-
+-# Used when --lt-debug. Prints its arguments to stdout
+-# (redirection is the responsibility of the caller)
+-func_lt_dump_args ()
+-{
+- lt_dump_args_N=1;
+- for lt_arg
+- do
+- \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\"
+- lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
+- done
+-}
+-
+-# Core function for launching the target application
+-func_exec_program_core ()
+-{
+-"
+- case $host in
+- # Backslashes separate directories on plain windows
+- *-*-mingw | *-*-os2* | *-cegcc*)
+- $ECHO "\
+- if test -n \"\$lt_option_debug\"; then
+- \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2
+- func_lt_dump_args \${1+\"\$@\"} 1>&2
+- fi
+- exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
+-"
+- ;;
+-
+- *)
+- $ECHO "\
+- if test -n \"\$lt_option_debug\"; then
+- \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2
+- func_lt_dump_args \${1+\"\$@\"} 1>&2
+- fi
+- exec \"\$progdir/\$program\" \${1+\"\$@\"}
++ ECHO=\"$qecho\"
++ file=\"\$0\"
++ # Make sure echo works.
++ if test \"X\$1\" = X--no-reexec; then
++ # Discard the --no-reexec flag, and continue.
++ shift
++ elif test \"X\`{ \$ECHO '\t'; } 2>/dev/null\`\" = 'X\t'; then
++ # Yippee, \$ECHO works!
++ :
++ else
++ # Restart under the correct shell, and then maybe \$ECHO will work.
++ exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
++ fi
++ fi\
+ "
+- ;;
+- esac
+- $ECHO "\
+- \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
+- exit 1
+-}
+-
+-# A function to encapsulate launching the target application
+-# Strips options in the --lt-* namespace from \$@ and
+-# launches target application with the remaining arguments.
+-func_exec_program ()
+-{
+- for lt_wr_arg
+- do
+- case \$lt_wr_arg in
+- --lt-*) ;;
+- *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
+- esac
+- shift
+- done
+- func_exec_program_core \${1+\"\$@\"}
+-}
+-
+- # Parse options
+- func_parse_lt_options \"\$0\" \${1+\"\$@\"}
++ $ECHO "\
+
+ # Find the directory that this script lives in.
+- thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\`
++ thisdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
+ test \"x\$thisdir\" = \"x\$file\" && thisdir=.
+
+ # Follow symbolic links until we get to the real thisdir.
+- file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\`
++ file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
+ while test -n \"\$file\"; do
+- destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\`
++ destdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
+
+ # If there was a directory component, then change thisdir.
+ if test \"x\$destdir\" != \"x\$file\"; then
+@@ -3126,13 +2783,30 @@
+ esac
+ fi
+
+- file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\`
+- file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\`
++ file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
++ file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
+ done
++"
++}
++# end: func_emit_wrapper_part1
++
++# func_emit_wrapper_part2 [arg=no]
++#
++# Emit the second part of a libtool wrapper script on stdout.
++# For more information, see the description associated with
++# func_emit_wrapper(), below.
++func_emit_wrapper_part2 ()
++{
++ func_emit_wrapper_part2_arg1=no
++ if test -n "$1" ; then
++ func_emit_wrapper_part2_arg1=$1
++ fi
++
++ $ECHO "\
+
+ # Usually 'no', except on cygwin/mingw when embedded into
+ # the cwrapper.
+- WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1
++ WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_part2_arg1
+ if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
+ # special case for '.'
+ if test \"\$thisdir\" = \".\"; then
+@@ -3140,7 +2814,7 @@
+ fi
+ # remove .libs from thisdir
+ case \"\$thisdir\" in
+- *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;;
++ *[\\\\/]$objdir ) thisdir=\`\$ECHO \"X\$thisdir\" | \$Xsed -e 's%[\\\\/][^\\\\/]*$%%'\` ;;
+ $objdir ) thisdir=. ;;
+ esac
+ fi
+@@ -3203,7 +2877,7 @@
+
+ # Some systems cannot cope with colon-terminated $shlibpath_var
+ # The second colon is a workaround for a bug in BeOS R4 sed
+- $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\`
++ $shlibpath_var=\`\$ECHO \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
+
+ export $shlibpath_var
+ "
+@@ -3220,18 +2894,64 @@
+ $ECHO "\
+ if test \"\$libtool_execute_magic\" != \"$magic\"; then
+ # Run the actual program with our arguments.
+- func_exec_program \${1+\"\$@\"}
++"
++ case $host in
++ # Backslashes separate directories on plain windows
++ *-*-mingw | *-*-os2* | *-cegcc*)
++ $ECHO "\
++ exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
++"
++ ;;
++
++ *)
++ $ECHO "\
++ exec \"\$progdir/\$program\" \${1+\"\$@\"}
++"
++ ;;
++ esac
++ $ECHO "\
++ \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
++ exit 1
+ fi
+ else
+ # The program doesn't exist.
+ \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
+ \$ECHO \"This script is just a wrapper for \$program.\" 1>&2
+- \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
++ $ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
+ exit 1
+ fi
+ fi\
+ "
+ }
++# end: func_emit_wrapper_part2
++
++
++# func_emit_wrapper [arg=no]
++#
++# Emit a libtool wrapper script on stdout.
++# Don't directly open a file because we may want to
++# incorporate the script contents within a cygwin/mingw
++# wrapper executable. Must ONLY be called from within
++# func_mode_link because it depends on a number of variables
++# set therein.
++#
++# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
++# variable will take. If 'yes', then the emitted script
++# will assume that the directory in which it is stored is
++# the $objdir directory. This is a cygwin/mingw-specific
++# behavior.
++func_emit_wrapper ()
++{
++ func_emit_wrapper_arg1=no
++ if test -n "$1" ; then
++ func_emit_wrapper_arg1=$1
++ fi
++
++ # split this up so that func_emit_cwrapperexe_src
++ # can call each part independently.
++ func_emit_wrapper_part1 "${func_emit_wrapper_arg1}"
++ func_emit_wrapper_part2 "${func_emit_wrapper_arg1}"
++}
+
+
+ # func_to_host_path arg
+@@ -3258,19 +2978,23 @@
+ func_to_host_path ()
+ {
+ func_to_host_path_result="$1"
+- if test -n "$1"; then
++ if test -n "$1" ; then
+ case $host in
+ *mingw* )
+ lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
+ case $build in
+ *mingw* ) # actually, msys
+ # awkward: cmd appends spaces to result
+- func_to_host_path_result=`( cmd //c echo "$1" ) 2>/dev/null |
+- $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
++ lt_sed_strip_trailing_spaces="s/[ ]*\$//"
++ func_to_host_path_tmp1=`( cmd //c echo "$1" |\
++ $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
++ func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
++ $SED -e "$lt_sed_naive_backslashify"`
+ ;;
+ *cygwin* )
+- func_to_host_path_result=`cygpath -w "$1" |
+- $SED -e "$lt_sed_naive_backslashify"`
++ func_to_host_path_tmp1=`cygpath -w "$1"`
++ func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
++ $SED -e "$lt_sed_naive_backslashify"`
+ ;;
+ * )
+ # Unfortunately, winepath does not exit with a non-zero
+@@ -3282,17 +3006,17 @@
+ # the odd construction:
+ func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null`
+ if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then
+- func_to_host_path_result=`$ECHO "$func_to_host_path_tmp1" |
++ func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
+ $SED -e "$lt_sed_naive_backslashify"`
+ else
+ # Allow warning below.
+- func_to_host_path_result=
++ func_to_host_path_result=""
+ fi
+ ;;
+ esac
+ if test -z "$func_to_host_path_result" ; then
+ func_error "Could not determine host path corresponding to"
+- func_error " \`$1'"
++ func_error " '$1'"
+ func_error "Continuing, but uninstalled executables may not work."
+ # Fallback:
+ func_to_host_path_result="$1"
+@@ -3325,24 +3049,30 @@
+ func_to_host_pathlist ()
+ {
+ func_to_host_pathlist_result="$1"
+- if test -n "$1"; then
++ if test -n "$1" ; then
+ case $host in
+ *mingw* )
+ lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
+ # Remove leading and trailing path separator characters from
+ # ARG. msys behavior is inconsistent here, cygpath turns them
+ # into '.;' and ';.', and winepath ignores them completely.
+- func_stripname : : "$1"
+- func_to_host_pathlist_tmp1=$func_stripname_result
++ func_to_host_pathlist_tmp2="$1"
++ # Once set for this call, this variable should not be
++ # reassigned. It is used in tha fallback case.
++ func_to_host_pathlist_tmp1=`echo "$func_to_host_pathlist_tmp2" |\
++ $SED -e 's|^:*||' -e 's|:*$||'`
+ case $build in
+ *mingw* ) # Actually, msys.
+ # Awkward: cmd appends spaces to result.
+- func_to_host_pathlist_result=`
+- ( cmd //c echo "$func_to_host_pathlist_tmp1" ) 2>/dev/null |
+- $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
++ lt_sed_strip_trailing_spaces="s/[ ]*\$//"
++ func_to_host_pathlist_tmp2=`( cmd //c echo "$func_to_host_pathlist_tmp1" |\
++ $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
++ func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
++ $SED -e "$lt_sed_naive_backslashify"`
+ ;;
+ *cygwin* )
+- func_to_host_pathlist_result=`cygpath -w -p "$func_to_host_pathlist_tmp1" |
++ func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"`
++ func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
+ $SED -e "$lt_sed_naive_backslashify"`
+ ;;
+ * )
+@@ -3358,17 +3088,18 @@
+ if test -z "$func_to_host_pathlist_result" ; then
+ func_to_host_pathlist_result="$func_to_host_path_result"
+ else
+- func_append func_to_host_pathlist_result ";$func_to_host_path_result"
++ func_to_host_pathlist_result="$func_to_host_pathlist_result;$func_to_host_path_result"
+ fi
+ fi
+ fi
++ IFS=:
+ done
+ IFS=$func_to_host_pathlist_oldIFS
+ ;;
+ esac
+- if test -z "$func_to_host_pathlist_result"; then
++ if test -z "$func_to_host_pathlist_result" ; then
+ func_error "Could not determine the host path(s) corresponding to"
+- func_error " \`$1'"
++ func_error " '$1'"
+ func_error "Continuing, but uninstalled executables may not work."
+ # Fallback. This may break if $1 contains DOS-style drive
+ # specifications. The fix is not to complicate the expression
+@@ -3385,7 +3116,7 @@
+ ;;
+ esac
+ case "$1" in
+- *: ) func_append func_to_host_pathlist_result ";"
++ *: ) func_to_host_pathlist_result="$func_to_host_pathlist_result;"
+ ;;
+ esac
+ ;;
+@@ -3410,23 +3141,31 @@
+
+ This wrapper executable should never be moved out of the build directory.
+ If it is, it will not operate correctly.
++
++ Currently, it simply execs the wrapper *script* "$SHELL $output",
++ but could eventually absorb all of the scripts functionality and
++ exec $objdir/$outputname directly.
+ */
+ EOF
+ cat <<"EOF"
+-#ifdef _MSC_VER
+-# define _CRT_SECURE_NO_DEPRECATE 1
+-#endif
+ #include <stdio.h>
+ #include <stdlib.h>
+ #ifdef _MSC_VER
+ # include <direct.h>
+ # include <process.h>
+ # include <io.h>
++# define setmode _setmode
+ #else
+ # include <unistd.h>
+ # include <stdint.h>
+ # ifdef __CYGWIN__
+ # include <io.h>
++# define HAVE_SETENV
++# ifdef __STRICT_ANSI__
++char *realpath (const char *, char *);
++int putenv (char *);
++int setenv (const char *, const char *, int);
++# endif
+ # endif
+ #endif
+ #include <malloc.h>
+@@ -3438,44 +3177,6 @@
+ #include <fcntl.h>
+ #include <sys/stat.h>
+
+-/* declarations of non-ANSI functions */
+-#if defined(__MINGW32__)
+-# ifdef __STRICT_ANSI__
+-int _putenv (const char *);
+-# endif
+-#elif defined(__CYGWIN__)
+-# ifdef __STRICT_ANSI__
+-char *realpath (const char *, char *);
+-int putenv (char *);
+-int setenv (const char *, const char *, int);
+-# endif
+-/* #elif defined (other platforms) ... */
+-#endif
+-
+-/* portability defines, excluding path handling macros */
+-#if defined(_MSC_VER)
+-# define setmode _setmode
+-# define stat _stat
+-# define chmod _chmod
+-# define getcwd _getcwd
+-# define putenv _putenv
+-# define S_IXUSR _S_IEXEC
+-# ifndef _INTPTR_T_DEFINED
+-# define _INTPTR_T_DEFINED
+-# define intptr_t int
+-# endif
+-#elif defined(__MINGW32__)
+-# define setmode _setmode
+-# define stat _stat
+-# define chmod _chmod
+-# define getcwd _getcwd
+-# define putenv _putenv
+-#elif defined(__CYGWIN__)
+-# define HAVE_SETENV
+-# define FOPEN_WB "wb"
+-/* #elif defined (other platforms) ... */
+-#endif
+-
+ #if defined(PATH_MAX)
+ # define LT_PATHMAX PATH_MAX
+ #elif defined(MAXPATHLEN)
+@@ -3491,7 +3192,14 @@
+ # define S_IXGRP 0
+ #endif
+
+-/* path handling portability macros */
++#ifdef _MSC_VER
++# define S_IXUSR _S_IEXEC
++# define stat _stat
++# ifndef _INTPTR_T_DEFINED
++# define intptr_t int
++# endif
++#endif
++
+ #ifndef DIR_SEPARATOR
+ # define DIR_SEPARATOR '/'
+ # define PATH_SEPARATOR ':'
+@@ -3522,6 +3230,10 @@
+ # define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
+ #endif /* PATH_SEPARATOR_2 */
+
++#ifdef __CYGWIN__
++# define FOPEN_WB "wb"
++#endif
++
+ #ifndef FOPEN_WB
+ # define FOPEN_WB "w"
+ #endif
+@@ -3534,13 +3246,22 @@
+ if (stale) { free ((void *) stale); stale = 0; } \
+ } while (0)
+
+-#if defined(LT_DEBUGWRAPPER)
+-static int lt_debug = 1;
++#undef LTWRAPPER_DEBUGPRINTF
++#if defined DEBUGWRAPPER
++# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args
++static void
++ltwrapper_debugprintf (const char *fmt, ...)
++{
++ va_list args;
++ va_start (args, fmt);
++ (void) vfprintf (stderr, fmt, args);
++ va_end (args);
++}
+ #else
+-static int lt_debug = 0;
++# define LTWRAPPER_DEBUGPRINTF(args)
+ #endif
+
+-const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */
++const char *program_name = NULL;
+
+ void *xmalloc (size_t num);
+ char *xstrdup (const char *string);
+@@ -3550,17 +3271,31 @@
+ int make_executable (const char *path);
+ int check_executable (const char *path);
+ char *strendzap (char *str, const char *pat);
+-void lt_debugprintf (const char *file, int line, const char *fmt, ...);
+-void lt_fatal (const char *file, int line, const char *message, ...);
+-static const char *nonnull (const char *s);
+-static const char *nonempty (const char *s);
++void lt_fatal (const char *message, ...);
+ void lt_setenv (const char *name, const char *value);
+ char *lt_extend_str (const char *orig_value, const char *add, int to_end);
++void lt_opt_process_env_set (const char *arg);
++void lt_opt_process_env_prepend (const char *arg);
++void lt_opt_process_env_append (const char *arg);
++int lt_split_name_value (const char *arg, char** name, char** value);
+ void lt_update_exe_path (const char *name, const char *value);
+ void lt_update_lib_path (const char *name, const char *value);
+-char **prepare_spawn (char **argv);
+-void lt_dump_script (FILE *f);
++
++static const char *script_text_part1 =
++EOF
++
++ func_emit_wrapper_part1 yes |
++ $SED -e 's/\([\\"]\)/\\\1/g' \
++ -e 's/^/ "/' -e 's/$/\\n"/'
++ echo ";"
++ cat <<EOF
++
++static const char *script_text_part2 =
+ EOF
++ func_emit_wrapper_part2 yes |
++ $SED -e 's/\([\\"]\)/\\\1/g' \
++ -e 's/^/ "/' -e 's/$/\\n"/'
++ echo ";"
+
+ cat <<EOF
+ const char * MAGIC_EXE = "$magic_exe";
+@@ -3605,10 +3340,24 @@
+ cat <<"EOF"
+
+ #define LTWRAPPER_OPTION_PREFIX "--lt-"
++#define LTWRAPPER_OPTION_PREFIX_LENGTH 5
+
++static const size_t opt_prefix_len = LTWRAPPER_OPTION_PREFIX_LENGTH;
+ static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
++
+ static const char *dumpscript_opt = LTWRAPPER_OPTION_PREFIX "dump-script";
+-static const char *debug_opt = LTWRAPPER_OPTION_PREFIX "debug";
++
++static const size_t env_set_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 7;
++static const char *env_set_opt = LTWRAPPER_OPTION_PREFIX "env-set";
++ /* argument is putenv-style "foo=bar", value of foo is set to bar */
++
++static const size_t env_prepend_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 11;
++static const char *env_prepend_opt = LTWRAPPER_OPTION_PREFIX "env-prepend";
++ /* argument is putenv-style "foo=bar", new value of foo is bar${foo} */
++
++static const size_t env_append_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 10;
++static const char *env_append_opt = LTWRAPPER_OPTION_PREFIX "env-append";
++ /* argument is putenv-style "foo=bar", new value of foo is ${foo}bar */
+
+ int
+ main (int argc, char *argv[])
+@@ -3625,13 +3374,10 @@
+ int i;
+
+ program_name = (char *) xstrdup (base_name (argv[0]));
+- newargz = XMALLOC (char *, argc + 1);
++ LTWRAPPER_DEBUGPRINTF (("(main) argv[0] : %s\n", argv[0]));
++ LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name));
+
+- /* very simple arg parsing; don't want to rely on getopt
+- * also, copy all non cwrapper options to newargz, except
+- * argz[0], which is handled differently
+- */
+- newargc=0;
++ /* very simple arg parsing; don't want to rely on getopt */
+ for (i = 1; i < argc; i++)
+ {
+ if (strcmp (argv[i], dumpscript_opt) == 0)
+@@ -3645,57 +3391,25 @@
+ esac
+
+ cat <<"EOF"
+- lt_dump_script (stdout);
++ printf ("%s", script_text_part1);
++ printf ("%s", script_text_part2);
+ return 0;
+ }
+- if (strcmp (argv[i], debug_opt) == 0)
+- {
+- lt_debug = 1;
+- continue;
+- }
+- if (strcmp (argv[i], ltwrapper_option_prefix) == 0)
+- {
+- /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
+- namespace, but it is not one of the ones we know about and
+- have already dealt with, above (inluding dump-script), then
+- report an error. Otherwise, targets might begin to believe
+- they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
+- namespace. The first time any user complains about this, we'll
+- need to make LTWRAPPER_OPTION_PREFIX a configure-time option
+- or a configure.ac-settable value.
+- */
+- lt_fatal (__FILE__, __LINE__,
+- "unrecognized %s option: '%s'",
+- ltwrapper_option_prefix, argv[i]);
+- }
+- /* otherwise ... */
+- newargz[++newargc] = xstrdup (argv[i]);
+ }
+- newargz[++newargc] = NULL;
+-
+-EOF
+- cat <<EOF
+- /* The GNU banner must be the first non-error debug message */
+- lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n");
+-EOF
+- cat <<"EOF"
+- lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]);
+- lt_debugprintf (__FILE__, __LINE__, "(main) program_name: %s\n", program_name);
+
++ newargz = XMALLOC (char *, argc + 1);
+ tmp_pathspec = find_executable (argv[0]);
+ if (tmp_pathspec == NULL)
+- lt_fatal (__FILE__, __LINE__, "couldn't find %s", argv[0]);
+- lt_debugprintf (__FILE__, __LINE__,
+- "(main) found exe (before symlink chase) at: %s\n",
+- tmp_pathspec);
++ lt_fatal ("Couldn't find %s", argv[0]);
++ LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n",
++ tmp_pathspec));
+
+ actual_cwrapper_path = chase_symlinks (tmp_pathspec);
+- lt_debugprintf (__FILE__, __LINE__,
+- "(main) found exe (after symlink chase) at: %s\n",
+- actual_cwrapper_path);
++ LTWRAPPER_DEBUGPRINTF (("(main) found exe (after symlink chase) at : %s\n",
++ actual_cwrapper_path));
+ XFREE (tmp_pathspec);
+
+- actual_cwrapper_name = xstrdup (base_name (actual_cwrapper_path));
++ actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path));
+ strendzap (actual_cwrapper_path, actual_cwrapper_name);
+
+ /* wrapper name transforms */
+@@ -3713,9 +3427,8 @@
+ target_name = tmp_pathspec;
+ tmp_pathspec = 0;
+
+- lt_debugprintf (__FILE__, __LINE__,
+- "(main) libtool target name: %s\n",
+- target_name);
++ LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n",
++ target_name));
+ EOF
+
+ cat <<EOF
+@@ -3768,12 +3481,77 @@
+ lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
+ lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
+
+- lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n",
+- nonnull (lt_argv_zero));
++ newargc=0;
++ for (i = 1; i < argc; i++)
++ {
++ if (strncmp (argv[i], env_set_opt, env_set_opt_len) == 0)
++ {
++ if (argv[i][env_set_opt_len] == '=')
++ {
++ const char *p = argv[i] + env_set_opt_len + 1;
++ lt_opt_process_env_set (p);
++ }
++ else if (argv[i][env_set_opt_len] == '\0' && i + 1 < argc)
++ {
++ lt_opt_process_env_set (argv[++i]); /* don't copy */
++ }
++ else
++ lt_fatal ("%s missing required argument", env_set_opt);
++ continue;
++ }
++ if (strncmp (argv[i], env_prepend_opt, env_prepend_opt_len) == 0)
++ {
++ if (argv[i][env_prepend_opt_len] == '=')
++ {
++ const char *p = argv[i] + env_prepend_opt_len + 1;
++ lt_opt_process_env_prepend (p);
++ }
++ else if (argv[i][env_prepend_opt_len] == '\0' && i + 1 < argc)
++ {
++ lt_opt_process_env_prepend (argv[++i]); /* don't copy */
++ }
++ else
++ lt_fatal ("%s missing required argument", env_prepend_opt);
++ continue;
++ }
++ if (strncmp (argv[i], env_append_opt, env_append_opt_len) == 0)
++ {
++ if (argv[i][env_append_opt_len] == '=')
++ {
++ const char *p = argv[i] + env_append_opt_len + 1;
++ lt_opt_process_env_append (p);
++ }
++ else if (argv[i][env_append_opt_len] == '\0' && i + 1 < argc)
++ {
++ lt_opt_process_env_append (argv[++i]); /* don't copy */
++ }
++ else
++ lt_fatal ("%s missing required argument", env_append_opt);
++ continue;
++ }
++ if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0)
++ {
++ /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
++ namespace, but it is not one of the ones we know about and
++ have already dealt with, above (inluding dump-script), then
++ report an error. Otherwise, targets might begin to believe
++ they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
++ namespace. The first time any user complains about this, we'll
++ need to make LTWRAPPER_OPTION_PREFIX a configure-time option
++ or a configure.ac-settable value.
++ */
++ lt_fatal ("Unrecognized option in %s namespace: '%s'",
++ ltwrapper_option_prefix, argv[i]);
++ }
++ /* otherwise ... */
++ newargz[++newargc] = xstrdup (argv[i]);
++ }
++ newargz[++newargc] = NULL;
++
++ LTWRAPPER_DEBUGPRINTF (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>")));
+ for (i = 0; i < newargc; i++)
+ {
+- lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n",
+- i, nonnull (newargz[i]));
++ LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>")));
+ }
+
+ EOF
+@@ -3782,14 +3560,11 @@
+ mingw*)
+ cat <<"EOF"
+ /* execv doesn't actually work on mingw as expected on unix */
+- newargz = prepare_spawn (newargz);
+ rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
+ if (rval == -1)
+ {
+ /* failed to start process */
+- lt_debugprintf (__FILE__, __LINE__,
+- "(main) failed to launch target \"%s\": %s\n",
+- lt_argv_zero, nonnull (strerror (errno)));
++ LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno));
+ return 127;
+ }
+ return rval;
+@@ -3811,7 +3586,7 @@
+ {
+ void *p = (void *) malloc (num);
+ if (!p)
+- lt_fatal (__FILE__, __LINE__, "memory exhausted");
++ lt_fatal ("Memory exhausted");
+
+ return p;
+ }
+@@ -3845,8 +3620,8 @@
+ {
+ struct stat st;
+
+- lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n",
+- nonempty (path));
++ LTWRAPPER_DEBUGPRINTF (("(check_executable) : %s\n",
++ path ? (*path ? path : "EMPTY!") : "NULL!"));
+ if ((!path) || (!*path))
+ return 0;
+
+@@ -3863,8 +3638,8 @@
+ int rval = 0;
+ struct stat st;
+
+- lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n",
+- nonempty (path));
++ LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n",
++ path ? (*path ? path : "EMPTY!") : "NULL!"));
+ if ((!path) || (!*path))
+ return 0;
+
+@@ -3890,8 +3665,8 @@
+ int tmp_len;
+ char *concat_name;
+
+- lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
+- nonempty (wrapper));
++ LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n",
++ wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"));
+
+ if ((wrapper == NULL) || (*wrapper == '\0'))
+ return NULL;
+@@ -3944,8 +3719,7 @@
+ {
+ /* empty path: current directory */
+ if (getcwd (tmp, LT_PATHMAX) == NULL)
+- lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
+- nonnull (strerror (errno)));
++ lt_fatal ("getcwd failed");
+ tmp_len = strlen (tmp);
+ concat_name =
+ XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
+@@ -3970,8 +3744,7 @@
+ }
+ /* Relative path | not found in path: prepend cwd */
+ if (getcwd (tmp, LT_PATHMAX) == NULL)
+- lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
+- nonnull (strerror (errno)));
++ lt_fatal ("getcwd failed");
+ tmp_len = strlen (tmp);
+ concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
+ memcpy (concat_name, tmp, tmp_len);
+@@ -3997,9 +3770,8 @@
+ int has_symlinks = 0;
+ while (strlen (tmp_pathspec) && !has_symlinks)
+ {
+- lt_debugprintf (__FILE__, __LINE__,
+- "checking path component for symlinks: %s\n",
+- tmp_pathspec);
++ LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n",
++ tmp_pathspec));
+ if (lstat (tmp_pathspec, &s) == 0)
+ {
+ if (S_ISLNK (s.st_mode) != 0)
+@@ -4021,9 +3793,8 @@
+ }
+ else
+ {
+- lt_fatal (__FILE__, __LINE__,
+- "error accessing file \"%s\": %s",
+- tmp_pathspec, nonnull (strerror (errno)));
++ char *errstr = strerror (errno);
++ lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr);
+ }
+ }
+ XFREE (tmp_pathspec);
+@@ -4036,8 +3807,7 @@
+ tmp_pathspec = realpath (pathspec, buf);
+ if (tmp_pathspec == 0)
+ {
+- lt_fatal (__FILE__, __LINE__,
+- "could not follow symlinks for %s", pathspec);
++ lt_fatal ("Could not follow symlinks for %s", pathspec);
+ }
+ return xstrdup (tmp_pathspec);
+ #endif
+@@ -4063,25 +3833,11 @@
+ return str;
+ }
+
+-void
+-lt_debugprintf (const char *file, int line, const char *fmt, ...)
+-{
+- va_list args;
+- if (lt_debug)
+- {
+- (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line);
+- va_start (args, fmt);
+- (void) vfprintf (stderr, fmt, args);
+- va_end (args);
+- }
+-}
+-
+ static void
+-lt_error_core (int exit_status, const char *file,
+- int line, const char *mode,
++lt_error_core (int exit_status, const char *mode,
+ const char *message, va_list ap)
+ {
+- fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode);
++ fprintf (stderr, "%s: %s: ", program_name, mode);
+ vfprintf (stderr, message, ap);
+ fprintf (stderr, ".\n");
+
+@@ -4090,32 +3846,20 @@
+ }
+
+ void
+-lt_fatal (const char *file, int line, const char *message, ...)
++lt_fatal (const char *message, ...)
+ {
+ va_list ap;
+ va_start (ap, message);
+- lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap);
++ lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
+ va_end (ap);
+ }
+
+-static const char *
+-nonnull (const char *s)
+-{
+- return s ? s : "(null)";
+-}
+-
+-static const char *
+-nonempty (const char *s)
+-{
+- return (s && !*s) ? "(empty)" : nonnull (s);
+-}
+-
+ void
+ lt_setenv (const char *name, const char *value)
+ {
+- lt_debugprintf (__FILE__, __LINE__,
+- "(lt_setenv) setting '%s' to '%s'\n",
+- nonnull (name), nonnull (value));
++ LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n",
++ (name ? name : "<NULL>"),
++ (value ? value : "<NULL>")));
+ {
+ #ifdef HAVE_SETENV
+ /* always make a copy, for consistency with !HAVE_SETENV */
+@@ -4160,12 +3904,95 @@
+ return new_value;
+ }
+
++int
++lt_split_name_value (const char *arg, char** name, char** value)
++{
++ const char *p;
++ int len;
++ if (!arg || !*arg)
++ return 1;
++
++ p = strchr (arg, (int)'=');
++
++ if (!p)
++ return 1;
++
++ *value = xstrdup (++p);
++
++ len = strlen (arg) - strlen (*value);
++ *name = XMALLOC (char, len);
++ strncpy (*name, arg, len-1);
++ (*name)[len - 1] = '\0';
++
++ return 0;
++}
++
++void
++lt_opt_process_env_set (const char *arg)
++{
++ char *name = NULL;
++ char *value = NULL;
++
++ if (lt_split_name_value (arg, &name, &value) != 0)
++ {
++ XFREE (name);
++ XFREE (value);
++ lt_fatal ("bad argument for %s: '%s'", env_set_opt, arg);
++ }
++
++ lt_setenv (name, value);
++ XFREE (name);
++ XFREE (value);
++}
++
++void
++lt_opt_process_env_prepend (const char *arg)
++{
++ char *name = NULL;
++ char *value = NULL;
++ char *new_value = NULL;
++
++ if (lt_split_name_value (arg, &name, &value) != 0)
++ {
++ XFREE (name);
++ XFREE (value);
++ lt_fatal ("bad argument for %s: '%s'", env_prepend_opt, arg);
++ }
++
++ new_value = lt_extend_str (getenv (name), value, 0);
++ lt_setenv (name, new_value);
++ XFREE (new_value);
++ XFREE (name);
++ XFREE (value);
++}
++
++void
++lt_opt_process_env_append (const char *arg)
++{
++ char *name = NULL;
++ char *value = NULL;
++ char *new_value = NULL;
++
++ if (lt_split_name_value (arg, &name, &value) != 0)
++ {
++ XFREE (name);
++ XFREE (value);
++ lt_fatal ("bad argument for %s: '%s'", env_append_opt, arg);
++ }
++
++ new_value = lt_extend_str (getenv (name), value, 1);
++ lt_setenv (name, new_value);
++ XFREE (new_value);
++ XFREE (name);
++ XFREE (value);
++}
++
+ void
+ lt_update_exe_path (const char *name, const char *value)
+ {
+- lt_debugprintf (__FILE__, __LINE__,
+- "(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
+- nonnull (name), nonnull (value));
++ LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
++ (name ? name : "<NULL>"),
++ (value ? value : "<NULL>")));
+
+ if (name && *name && value && *value)
+ {
+@@ -4184,9 +4011,9 @@
+ void
+ lt_update_lib_path (const char *name, const char *value)
+ {
+- lt_debugprintf (__FILE__, __LINE__,
+- "(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
+- nonnull (name), nonnull (value));
++ LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
++ (name ? name : "<NULL>"),
++ (value ? value : "<NULL>")));
+
+ if (name && *name && value && *value)
+ {
+@@ -4196,152 +4023,11 @@
+ }
+ }
+
+-EOF
+- case $host_os in
+- mingw*)
+- cat <<"EOF"
+-
+-/* Prepares an argument vector before calling spawn().
+- Note that spawn() does not by itself call the command interpreter
+- (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") :
+- ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
+- GetVersionEx(&v);
+- v.dwPlatformId == VER_PLATFORM_WIN32_NT;
+- }) ? "cmd.exe" : "command.com").
+- Instead it simply concatenates the arguments, separated by ' ', and calls
+- CreateProcess(). We must quote the arguments since Win32 CreateProcess()
+- interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a
+- special way:
+- - Space and tab are interpreted as delimiters. They are not treated as
+- delimiters if they are surrounded by double quotes: "...".
+- - Unescaped double quotes are removed from the input. Their only effect is
+- that within double quotes, space and tab are treated like normal
+- characters.
+- - Backslashes not followed by double quotes are not special.
+- - But 2*n+1 backslashes followed by a double quote become
+- n backslashes followed by a double quote (n >= 0):
+- \" -> "
+- \\\" -> \"
+- \\\\\" -> \\"
+- */
+-#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
+-#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
+-char **
+-prepare_spawn (char **argv)
+-{
+- size_t argc;
+- char **new_argv;
+- size_t i;
+-
+- /* Count number of arguments. */
+- for (argc = 0; argv[argc] != NULL; argc++)
+- ;
+-
+- /* Allocate new argument vector. */
+- new_argv = XMALLOC (char *, argc + 1);
+-
+- /* Put quoted arguments into the new argument vector. */
+- for (i = 0; i < argc; i++)
+- {
+- const char *string = argv[i];
+-
+- if (string[0] == '\0')
+- new_argv[i] = xstrdup ("\"\"");
+- else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL)
+- {
+- int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL);
+- size_t length;
+- unsigned int backslashes;
+- const char *s;
+- char *quoted_string;
+- char *p;
+-
+- length = 0;
+- backslashes = 0;
+- if (quote_around)
+- length++;
+- for (s = string; *s != '\0'; s++)
+- {
+- char c = *s;
+- if (c == '"')
+- length += backslashes + 1;
+- length++;
+- if (c == '\\')
+- backslashes++;
+- else
+- backslashes = 0;
+- }
+- if (quote_around)
+- length += backslashes + 1;
+-
+- quoted_string = XMALLOC (char, length + 1);
+-
+- p = quoted_string;
+- backslashes = 0;
+- if (quote_around)
+- *p++ = '"';
+- for (s = string; *s != '\0'; s++)
+- {
+- char c = *s;
+- if (c == '"')
+- {
+- unsigned int j;
+- for (j = backslashes + 1; j > 0; j--)
+- *p++ = '\\';
+- }
+- *p++ = c;
+- if (c == '\\')
+- backslashes++;
+- else
+- backslashes = 0;
+- }
+- if (quote_around)
+- {
+- unsigned int j;
+- for (j = backslashes; j > 0; j--)
+- *p++ = '\\';
+- *p++ = '"';
+- }
+- *p = '\0';
+-
+- new_argv[i] = quoted_string;
+- }
+- else
+- new_argv[i] = (char *) string;
+- }
+- new_argv[argc] = NULL;
+-
+- return new_argv;
+-}
+-EOF
+- ;;
+- esac
+-
+- cat <<"EOF"
+-void lt_dump_script (FILE* f)
+-{
+-EOF
+- func_emit_wrapper yes |
+- $SED -e 's/\([\\"]\)/\\\1/g' \
+- -e 's/^/ fputs ("/' -e 's/$/\\n", f);/'
+
+- cat <<"EOF"
+-}
+ EOF
+ }
+ # end: func_emit_cwrapperexe_src
+
+-# func_win32_import_lib_p ARG
+-# True if ARG is an import lib, as indicated by $file_magic_cmd
+-func_win32_import_lib_p ()
+-{
+- $opt_debug
+- case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
+- *import*) : ;;
+- *) false ;;
+- esac
+-}
+-
+ # func_mode_link arg...
+ func_mode_link ()
+ {
+@@ -4386,7 +4072,6 @@
+ new_inherited_linker_flags=
+
+ avoid_version=no
+- bindir=
+ dlfiles=
+ dlprefiles=
+ dlself=no
+@@ -4479,11 +4164,6 @@
+ esac
+
+ case $prev in
+- bindir)
+- bindir="$arg"
+- prev=
+- continue
+- ;;
+ dlfiles|dlprefiles)
+ if test "$preload" = no; then
+ # Add the symbol object into the linking commands.
+@@ -4745,11 +4425,6 @@
+ continue
+ ;;
+
+- -bindir)
+- prev=bindir
+- continue
+- ;;
+-
+ -dlopen)
+ prev=dlfiles
+ continue
+@@ -4828,7 +4503,7 @@
+ esac
+ case $host in
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+- testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'`
++ testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'`
+ case :$dllsearchpath: in
+ *":$dir:"*) ;;
+ ::) dllsearchpath=$dir;;
+@@ -4847,7 +4522,7 @@
+ -l*)
+ if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
+ case $host in
+- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
++ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*)
+ # These systems don't actually have a C or math library (as such)
+ continue
+ ;;
+@@ -5033,7 +4708,7 @@
+ for flag in $args; do
+ IFS="$save_ifs"
+ func_quote_for_eval "$flag"
+- arg="$arg $func_quote_for_eval_result"
++ arg="$arg $wl$func_quote_for_eval_result"
+ compiler_flags="$compiler_flags $func_quote_for_eval_result"
+ done
+ IFS="$save_ifs"
+@@ -5079,19 +4754,18 @@
+ arg="$func_quote_for_eval_result"
+ ;;
+
+- # Flags to be passed through unchanged, with rationale:
+- # -64, -mips[0-9] enable 64-bit mode for the SGI compiler
+- # -r[0-9][0-9]* specify processor for the SGI compiler
+- # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler
+- # +DA*, +DD* enable 64-bit mode for the HP compiler
+- # -q* compiler args for the IBM compiler
+- # -m*, -t[45]*, -txscale* architecture-specific flags for GCC
+- # -F/path path to uninstalled frameworks, gcc on darwin
+- # -p, -pg, --coverage, -fprofile-* profiling flags for GCC
+- # @file GCC response files
+- # -tp=* Portland pgcc target processor selection
++ # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
++ # -r[0-9][0-9]* specifies the processor on the SGI compiler
++ # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
++ # +DA*, +DD* enable 64-bit mode on the HP compiler
++ # -q* pass through compiler args for the IBM compiler
++ # -m*, -t[45]*, -txscale* pass through architecture-specific
++ # compiler args for GCC
++ # -F/path gives path to uninstalled frameworks, gcc on darwin
++ # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
++ # @file GCC response files
+ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*)
++ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
+ func_quote_for_eval "$arg"
+ arg="$func_quote_for_eval_result"
+ func_append compile_command " $arg"
+@@ -5251,7 +4925,7 @@
+
+ if test -n "$shlibpath_var"; then
+ # get the directories listed in $shlibpath_var
+- eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\`
++ eval shlib_search_path=\`\$ECHO \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
+ else
+ shlib_search_path=
+ fi
+@@ -5359,7 +5033,10 @@
case $pass in
dlopen) libs="$dlfiles" ;;
dlpreopen) libs="$dlprefiles" ;;
@@ -9438,7 +17861,67 @@
esac
fi
if test "$linkmode,$pass" = "lib,dlpreopen"; then
-@@ -5344,19 +5347,19 @@
+@@ -5374,8 +5051,7 @@
+ # Collect preopened libtool deplibs, except any this library
+ # has declared as weak libs
+ for deplib in $dependency_libs; do
+- func_basename "$deplib"
+- deplib_base=$func_basename_result
++ deplib_base=`$ECHO "X$deplib" | $Xsed -e "$basename"`
+ case " $weak_libs " in
+ *" $deplib_base "*) ;;
+ *) deplibs="$deplibs $deplib" ;;
+@@ -5554,7 +5230,7 @@
+ match_pattern*)
+ set dummy $deplibs_check_method; shift
+ match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
+- if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \
++ if eval "\$ECHO \"X$deplib\"" 2>/dev/null | $Xsed -e 10q \
+ | $EGREP "$match_pattern_regex" > /dev/null; then
+ valid_a_lib=yes
+ fi
+@@ -5564,15 +5240,15 @@
+ ;;
+ esac
+ if test "$valid_a_lib" != yes; then
+- echo
++ $ECHO
+ $ECHO "*** Warning: Trying to link with static lib archive $deplib."
+- echo "*** I have the capability to make that library automatically link in when"
+- echo "*** you link to this library. But I can only do this if you have a"
+- echo "*** shared version of the library, which you do not appear to have"
+- echo "*** because the file extensions .$libext of this argument makes me believe"
+- echo "*** that it is just a static archive that I should not use here."
++ $ECHO "*** I have the capability to make that library automatically link in when"
++ $ECHO "*** you link to this library. But I can only do this if you have a"
++ $ECHO "*** shared version of the library, which you do not appear to have"
++ $ECHO "*** because the file extensions .$libext of this argument makes me believe"
++ $ECHO "*** that it is just a static archive that I should not use here."
+ else
+- echo
++ $ECHO
+ $ECHO "*** Warning: Linking the shared library $output against the"
+ $ECHO "*** static library $deplib is not portable!"
+ deplibs="$deplib $deplibs"
+@@ -5645,7 +5321,7 @@
+
+ # Convert "-framework foo" to "foo.ltframework"
+ if test -n "$inherited_linker_flags"; then
+- tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'`
++ tmp_inherited_linker_flags=`$ECHO "X$inherited_linker_flags" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'`
+ for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
+ case " $new_inherited_linker_flags " in
+ *" $tmp_inherited_linker_flag "*) ;;
+@@ -5653,7 +5329,7 @@
+ esac
+ done
+ fi
+- dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
++ dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+ if test "$linkmode,$pass" = "lib,link" ||
+ test "$linkmode,$pass" = "prog,scan" ||
+ { test "$linkmode" != prog && test "$linkmode" != lib; }; then
+@@ -5671,19 +5347,19 @@
# It is a libtool convenience library, so add in its objects.
convenience="$convenience $ladir/$objdir/$old_library"
old_convenience="$old_convenience $ladir/$objdir/$old_library"
@@ -9468,15 +17951,90 @@
continue
fi # $pass = conv
-@@ -5893,6 +5896,7 @@
- if test "$link_all_deplibs" != no; then
- # Add the search paths of all dependency libraries
- for deplib in $dependency_libs; do
-+ path=
- case $deplib in
- -L*) path="$deplib" ;;
- *.la)
-@@ -6206,6 +6210,9 @@
+@@ -5907,7 +5583,7 @@
+ fi
+ done
+ if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
+- echo
++ $ECHO
+ if test "$linkmode" = prog; then
+ $ECHO "*** Warning: Linking the executable $output against the loadable module"
+ else
+@@ -6010,9 +5686,9 @@
+ if test "X$dlopenmodule" != "X$lib"; then
+ $ECHO "*** Warning: lib $linklib is a module, not a shared library"
+ if test -z "$old_library" ; then
+- echo
+- echo "*** And there doesn't seem to be a static archive available"
+- echo "*** The link will probably fail, sorry"
++ $ECHO
++ $ECHO "*** And there doesn't seem to be a static archive available"
++ $ECHO "*** The link will probably fail, sorry"
+ else
+ add="$dir/$old_library"
+ fi
+@@ -6152,21 +5828,21 @@
+
+ # Just print a warning and add the library to dependency_libs so
+ # that the program can be linked against the static library.
+- echo
++ $ECHO
+ $ECHO "*** Warning: This system can not link to static lib archive $lib."
+- echo "*** I have the capability to make that library automatically link in when"
+- echo "*** you link to this library. But I can only do this if you have a"
+- echo "*** shared version of the library, which you do not appear to have."
++ $ECHO "*** I have the capability to make that library automatically link in when"
++ $ECHO "*** you link to this library. But I can only do this if you have a"
++ $ECHO "*** shared version of the library, which you do not appear to have."
+ if test "$module" = yes; then
+- echo "*** But as you try to build a module library, libtool will still create "
+- echo "*** a static module, that should work as long as the dlopening application"
+- echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
++ $ECHO "*** But as you try to build a module library, libtool will still create "
++ $ECHO "*** a static module, that should work as long as the dlopening application"
++ $ECHO "*** is linked with the -dlopen flag to resolve symbols at runtime."
+ if test -z "$global_symbol_pipe"; then
+- echo
+- echo "*** However, this would only work if libtool was able to extract symbol"
+- echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
+- echo "*** not find such a program. So, this module is probably useless."
+- echo "*** \`nm' from GNU binutils and a full rebuild may help."
++ $ECHO
++ $ECHO "*** However, this would only work if libtool was able to extract symbol"
++ $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"
++ $ECHO "*** not find such a program. So, this module is probably useless."
++ $ECHO "*** \`nm' from GNU binutils and a full rebuild may help."
+ fi
+ if test "$build_old_libs" = no; then
+ build_libtool_libs=module
+@@ -6286,7 +5962,7 @@
+ compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
+ finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
+ else
+- compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
++ compiler_flags="$compiler_flags "`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+ fi
+ fi
+ dependency_libs="$newdependency_libs"
+@@ -6454,7 +6130,7 @@
+ if test "$deplibs_check_method" != pass_all; then
+ func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"
+ else
+- echo
++ $ECHO
+ $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
+ $ECHO "*** objects $objs is not portable!"
+ libobjs="$libobjs $objs"
+@@ -6522,7 +6198,7 @@
+ age="$number_minor"
+ revision="$number_revision"
+ ;;
+- freebsd-aout|freebsd-elf|qnx|sunos)
++ freebsd-aout|freebsd-elf|sunos)
+ current="$number_major"
+ revision="$number_minor"
+ age="0"
+@@ -6534,6 +6210,9 @@
revision="$number_minor"
lt_irix_increment=no
;;
@@ -9486,9 +18044,512 @@
esac
;;
no)
-diff -Naur gtk+2.0-2.21.2.old/m4/gtk-doc.m4 gtk+2.0-2.21.2/m4/gtk-doc.m4
---- gtk+2.0-2.21.2.old/m4/gtk-doc.m4 1970-01-01 01:00:00.000000000 +0100
-+++ gtk+2.0-2.21.2/m4/gtk-doc.m4 2010-06-11 12:26:02.899613082 +0200
+@@ -6756,14 +6435,14 @@
+ oldlibs="$oldlibs $output_objdir/$libname.$libext"
+
+ # Transform .lo files to .o files.
+- oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`
++ oldobjs="$objs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
+ fi
+
+ # Eliminate all temporary directories.
+ #for path in $notinst_path; do
+- # lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"`
+- # deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"`
+- # dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"`
++ # lib_search_path=`$ECHO "X$lib_search_path " | $Xsed -e "s% $path % %g"`
++ # deplibs=`$ECHO "X$deplibs " | $Xsed -e "s% -L$path % %g"`
++ # dependency_libs=`$ECHO "X$dependency_libs " | $Xsed -e "s% -L$path % %g"`
+ #done
+
+ if test -n "$xrpath"; then
+@@ -6804,7 +6483,7 @@
+ if test "$build_libtool_libs" = yes; then
+ if test -n "$rpath"; then
+ case $host in
+- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
++ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*)
+ # these systems don't actually have a c library (as such)!
+ ;;
+ *-*-rhapsody* | *-*-darwin1.[012])
+@@ -6889,13 +6568,13 @@
+ newdeplibs="$newdeplibs $i"
+ else
+ droppeddeps=yes
+- echo
++ $ECHO
+ $ECHO "*** Warning: dynamic linker does not accept needed library $i."
+- echo "*** I have the capability to make that library automatically link in when"
+- echo "*** you link to this library. But I can only do this if you have a"
+- echo "*** shared version of the library, which I believe you do not have"
+- echo "*** because a test_compile did reveal that the linker did not use it for"
+- echo "*** its dynamic dependency list that programs get resolved with at runtime."
++ $ECHO "*** I have the capability to make that library automatically link in when"
++ $ECHO "*** you link to this library. But I can only do this if you have a"
++ $ECHO "*** shared version of the library, which I believe you do not have"
++ $ECHO "*** because a test_compile did reveal that the linker did not use it for"
++ $ECHO "*** its dynamic dependency list that programs get resolved with at runtime."
+ fi
+ fi
+ ;;
+@@ -6932,22 +6611,22 @@
+ newdeplibs="$newdeplibs $i"
+ else
+ droppeddeps=yes
+- echo
++ $ECHO
+ $ECHO "*** Warning: dynamic linker does not accept needed library $i."
+- echo "*** I have the capability to make that library automatically link in when"
+- echo "*** you link to this library. But I can only do this if you have a"
+- echo "*** shared version of the library, which you do not appear to have"
+- echo "*** because a test_compile did reveal that the linker did not use this one"
+- echo "*** as a dynamic dependency that programs can get resolved with at runtime."
++ $ECHO "*** I have the capability to make that library automatically link in when"
++ $ECHO "*** you link to this library. But I can only do this if you have a"
++ $ECHO "*** shared version of the library, which you do not appear to have"
++ $ECHO "*** because a test_compile did reveal that the linker did not use this one"
++ $ECHO "*** as a dynamic dependency that programs can get resolved with at runtime."
+ fi
+ fi
+ else
+ droppeddeps=yes
+- echo
++ $ECHO
+ $ECHO "*** Warning! Library $i is needed by this library but I was not able to"
+- echo "*** make it link in! You will probably need to install it or some"
+- echo "*** library that it depends on before this library will be fully"
+- echo "*** functional. Installing it before continuing would be even better."
++ $ECHO "*** make it link in! You will probably need to install it or some"
++ $ECHO "*** library that it depends on before this library will be fully"
++ $ECHO "*** functional. Installing it before continuing would be even better."
+ fi
+ ;;
+ *)
+@@ -6993,7 +6672,7 @@
+ potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
+ case $potliblink in
+ [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
+- *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";;
++ *) potlib=`$ECHO "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
+ esac
+ done
+ if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
+@@ -7008,12 +6687,12 @@
+ fi
+ if test -n "$a_deplib" ; then
+ droppeddeps=yes
+- echo
++ $ECHO
+ $ECHO "*** Warning: linker path does not have real file for library $a_deplib."
+- echo "*** I have the capability to make that library automatically link in when"
+- echo "*** you link to this library. But I can only do this if you have a"
+- echo "*** shared version of the library, which you do not appear to have"
+- echo "*** because I did check the linker path looking for a file starting"
++ $ECHO "*** I have the capability to make that library automatically link in when"
++ $ECHO "*** you link to this library. But I can only do this if you have a"
++ $ECHO "*** shared version of the library, which you do not appear to have"
++ $ECHO "*** because I did check the linker path looking for a file starting"
+ if test -z "$potlib" ; then
+ $ECHO "*** with $libname but no candidates were found. (...for file magic test)"
+ else
+@@ -7051,7 +6730,7 @@
+ potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
+ for potent_lib in $potential_libs; do
+ potlib="$potent_lib" # see symlink-check above in file_magic test
+- if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
++ if eval "\$ECHO \"X$potent_lib\"" 2>/dev/null | $Xsed -e 10q | \
+ $EGREP "$match_pattern_regex" > /dev/null; then
+ newdeplibs="$newdeplibs $a_deplib"
+ a_deplib=""
+@@ -7062,12 +6741,12 @@
+ fi
+ if test -n "$a_deplib" ; then
+ droppeddeps=yes
+- echo
++ $ECHO
+ $ECHO "*** Warning: linker path does not have real file for library $a_deplib."
+- echo "*** I have the capability to make that library automatically link in when"
+- echo "*** you link to this library. But I can only do this if you have a"
+- echo "*** shared version of the library, which you do not appear to have"
+- echo "*** because I did check the linker path looking for a file starting"
++ $ECHO "*** I have the capability to make that library automatically link in when"
++ $ECHO "*** you link to this library. But I can only do this if you have a"
++ $ECHO "*** shared version of the library, which you do not appear to have"
++ $ECHO "*** because I did check the linker path looking for a file starting"
+ if test -z "$potlib" ; then
+ $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
+ else
+@@ -7085,25 +6764,25 @@
+ ;;
+ none | unknown | *)
+ newdeplibs=""
+- tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'`
++ tmp_deplibs=`$ECHO "X $deplibs" | $Xsed \
++ -e 's/ -lc$//' -e 's/ -[LR][^ ]*//g'`
+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ for i in $predeps $postdeps ; do
+ # can't use Xsed below, because $i might contain '/'
+- tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"`
++ tmp_deplibs=`$ECHO "X $tmp_deplibs" | $Xsed -e "s,$i,,"`
+ done
+ fi
+- case $tmp_deplibs in
+- *[!\ \ ]*)
+- echo
++ if $ECHO "X $tmp_deplibs" | $Xsed -e 's/[ ]//g' |
++ $GREP . >/dev/null; then
++ $ECHO
+ if test "X$deplibs_check_method" = "Xnone"; then
+- echo "*** Warning: inter-library dependencies are not supported in this platform."
++ $ECHO "*** Warning: inter-library dependencies are not supported in this platform."
+ else
+- echo "*** Warning: inter-library dependencies are not known to be supported."
++ $ECHO "*** Warning: inter-library dependencies are not known to be supported."
+ fi
+- echo "*** All declared inter-library dependencies are being dropped."
++ $ECHO "*** All declared inter-library dependencies are being dropped."
+ droppeddeps=yes
+- ;;
+- esac
++ fi
+ ;;
+ esac
+ versuffix=$versuffix_save
+@@ -7115,23 +6794,23 @@
+ case $host in
+ *-*-rhapsody* | *-*-darwin1.[012])
+ # On Rhapsody replace the C library with the System framework
+- newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'`
++ newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
+ ;;
+ esac
+
+ if test "$droppeddeps" = yes; then
+ if test "$module" = yes; then
+- echo
+- echo "*** Warning: libtool could not satisfy all declared inter-library"
++ $ECHO
++ $ECHO "*** Warning: libtool could not satisfy all declared inter-library"
+ $ECHO "*** dependencies of module $libname. Therefore, libtool will create"
+- echo "*** a static module, that should work as long as the dlopening"
+- echo "*** application is linked with the -dlopen flag."
++ $ECHO "*** a static module, that should work as long as the dlopening"
++ $ECHO "*** application is linked with the -dlopen flag."
+ if test -z "$global_symbol_pipe"; then
+- echo
+- echo "*** However, this would only work if libtool was able to extract symbol"
+- echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
+- echo "*** not find such a program. So, this module is probably useless."
+- echo "*** \`nm' from GNU binutils and a full rebuild may help."
++ $ECHO
++ $ECHO "*** However, this would only work if libtool was able to extract symbol"
++ $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"
++ $ECHO "*** not find such a program. So, this module is probably useless."
++ $ECHO "*** \`nm' from GNU binutils and a full rebuild may help."
+ fi
+ if test "$build_old_libs" = no; then
+ oldlibs="$output_objdir/$libname.$libext"
+@@ -7141,16 +6820,16 @@
+ build_libtool_libs=no
+ fi
+ else
+- echo "*** The inter-library dependencies that have been dropped here will be"
+- echo "*** automatically added whenever a program is linked with this library"
+- echo "*** or is declared to -dlopen it."
++ $ECHO "*** The inter-library dependencies that have been dropped here will be"
++ $ECHO "*** automatically added whenever a program is linked with this library"
++ $ECHO "*** or is declared to -dlopen it."
+
+ if test "$allow_undefined" = no; then
+- echo
+- echo "*** Since this library must not contain undefined symbols,"
+- echo "*** because either the platform does not support them or"
+- echo "*** it was explicitly requested with -no-undefined,"
+- echo "*** libtool will only create a static version of it."
++ $ECHO
++ $ECHO "*** Since this library must not contain undefined symbols,"
++ $ECHO "*** because either the platform does not support them or"
++ $ECHO "*** it was explicitly requested with -no-undefined,"
++ $ECHO "*** libtool will only create a static version of it."
+ if test "$build_old_libs" = no; then
+ oldlibs="$output_objdir/$libname.$libext"
+ build_libtool_libs=module
+@@ -7167,9 +6846,9 @@
+ # Time to change all our "foo.ltframework" stuff back to "-framework foo"
+ case $host in
+ *-*-darwin*)
+- newdeplibs=`$ECHO " $newdeplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+- new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+- deplibs=`$ECHO " $deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
++ newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
++ new_inherited_linker_flags=`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
++ deplibs=`$ECHO "X $deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+ ;;
+ esac
+
+@@ -7291,7 +6970,7 @@
+ done
+
+ # Use standard objects if they are pic
+- test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP`
++ test -z "$pic_flag" && libobjs=`$ECHO "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+ test "X$libobjs" = "X " && libobjs=
+
+ delfiles=
+@@ -7357,7 +7036,7 @@
+ if test -n "$export_symbols" && test -n "$include_expsyms"; then
+ tmp_export_symbols="$export_symbols"
+ test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
+- $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
++ $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
+ fi
+
+ if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
+@@ -7458,8 +7137,7 @@
+ save_libobjs=$libobjs
+ fi
+ save_output=$output
+- func_basename "$output"
+- output_la=$func_basename_result
++ output_la=`$ECHO "X$output" | $Xsed -e "$basename"`
+
+ # Clear the reloadable object creation command queue and
+ # initialize k to one.
+@@ -7472,12 +7150,12 @@
+ if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
+ output=${output_objdir}/${output_la}.lnkscript
+ func_verbose "creating GNU ld script: $output"
+- echo 'INPUT (' > $output
++ $ECHO 'INPUT (' > $output
+ for obj in $save_libobjs
+ do
+ $ECHO "$obj" >> $output
+ done
+- echo ')' >> $output
++ $ECHO ')' >> $output
+ delfiles="$delfiles $output"
+ elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
+ output=${output_objdir}/${output_la}.lnk
+@@ -7519,19 +7197,17 @@
+ # command to the queue.
+ if test "$k" -eq 1 ; then
+ # The first file doesn't have a previous command to add.
+- reload_objs=$objlist
+- eval concat_cmds=\"$reload_cmds\"
++ eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
+ else
+ # All subsequent reloadable object files will link in
+ # the last one created.
+- reload_objs="$objlist $last_robj"
+- eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
++ eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj~\$RM $last_robj\"
+ fi
+ last_robj=$output_objdir/$output_la-${k}.$objext
+ func_arith $k + 1
+ k=$func_arith_result
+ output=$output_objdir/$output_la-${k}.$objext
+- objlist=" $obj"
++ objlist=$obj
+ func_len " $last_robj"
+ func_arith $len0 + $func_len_result
+ len=$func_arith_result
+@@ -7541,8 +7217,7 @@
+ # reloadable object file. All subsequent reloadable object
+ # files will link in the last one created.
+ test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+- reload_objs="$objlist $last_robj"
+- eval concat_cmds=\"\${concat_cmds}$reload_cmds\"
++ eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
+ if test -n "$last_robj"; then
+ eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
+ fi
+@@ -7601,7 +7276,7 @@
+ if test -n "$export_symbols" && test -n "$include_expsyms"; then
+ tmp_export_symbols="$export_symbols"
+ test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
+- $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
++ $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
+ fi
+
+ if test -n "$orig_export_symbols"; then
+@@ -7766,7 +7441,7 @@
+ if test -n "$convenience"; then
+ if test -n "$whole_archive_flag_spec"; then
+ eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
+- reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
++ reload_conv_objs=$reload_objs\ `$ECHO "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
+ else
+ gentop="$output_objdir/${obj}x"
+ generated="$generated $gentop"
+@@ -7777,7 +7452,7 @@
+ fi
+
+ # Create the old-style object.
+- reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
++ reload_objs="$objs$old_deplibs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
+
+ output="$obj"
+ func_execute_cmds "$reload_cmds" 'exit $?'
+@@ -7837,8 +7512,8 @@
+ case $host in
+ *-*-rhapsody* | *-*-darwin1.[012])
+ # On Rhapsody replace the C library is the System framework
+- compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'`
+- finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'`
++ compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
++ finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
+ ;;
+ esac
+
+@@ -7855,8 +7530,8 @@
+ esac
+ fi
+ # Time to change all our "foo.ltframework" stuff back to "-framework foo"
+- compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+- finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
++ compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
++ finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+ ;;
+ esac
+
+@@ -7993,8 +7668,8 @@
+
+ if test -n "$libobjs" && test "$build_old_libs" = yes; then
+ # Transform all the library objects into standard objects.
+- compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
+- finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
++ compile_command=`$ECHO "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
++ finalize_command=`$ECHO "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+ fi
+
+ func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
+@@ -8006,15 +7681,15 @@
+
+ wrappers_required=yes
+ case $host in
+- *cegcc* | *mingw32ce*)
+- # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
+- wrappers_required=no
+- ;;
+ *cygwin* | *mingw* )
+ if test "$build_libtool_libs" != yes; then
+ wrappers_required=no
+ fi
+ ;;
++ *cegcc)
++ # Disable wrappers for cegcc, we are cross compiling anyway.
++ wrappers_required=no
++ ;;
+ *)
+ if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
+ wrappers_required=no
+@@ -8023,7 +7698,7 @@
+ esac
+ if test "$wrappers_required" = no; then
+ # Replace the output file specification.
+- compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
++ compile_command=`$ECHO "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+ link_command="$compile_command$compile_rpath"
+
+ # We have no uninstalled library dependencies, so finalize right now.
+@@ -8070,7 +7745,7 @@
+ # We don't need to create a wrapper script.
+ link_command="$compile_var$compile_command$compile_rpath"
+ # Replace the output file specification.
+- link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
++ link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+ # Delete the old output file.
+ $opt_dry_run || $RM $output
+ # Link the executable and exit
+@@ -8089,7 +7764,7 @@
+ if test "$fast_install" != no; then
+ link_command="$finalize_var$compile_command$finalize_rpath"
+ if test "$fast_install" = yes; then
+- relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
++ relink_command=`$ECHO "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
+ else
+ # fast_install is set to needless
+ relink_command=
+@@ -8101,7 +7776,7 @@
+ fi
+
+ # Replace the output file specification.
+- link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
++ link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
+
+ # Delete the old output files.
+ $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
+@@ -8125,7 +7800,18 @@
+ fi
+ done
+ relink_command="(cd `pwd`; $relink_command)"
+- relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
++ relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
++ fi
++
++ # Quote $ECHO for shipping.
++ if test "X$ECHO" = "X$SHELL $progpath --fallback-echo"; then
++ case $progpath in
++ [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
++ *) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
++ esac
++ qecho=`$ECHO "X$qecho" | $Xsed -e "$sed_quote_subst"`
++ else
++ qecho=`$ECHO "X$ECHO" | $Xsed -e "$sed_quote_subst"`
+ fi
+
+ # Only actually do things if not in dry run mode.
+@@ -8246,7 +7932,7 @@
+ done | sort | sort -uc >/dev/null 2>&1); then
+ :
+ else
+- echo "copying selected object files to avoid basename conflicts..."
++ $ECHO "copying selected object files to avoid basename conflicts..."
+ gentop="$output_objdir/${outputname}x"
+ generated="$generated $gentop"
+ func_mkdir_p "$gentop"
+@@ -8357,7 +8043,7 @@
+ done
+ # Quote the link command for shipping.
+ relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
+- relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
++ relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+ if test "$hardcode_automatic" = yes ; then
+ relink_command=
+ fi
+@@ -8442,27 +8128,9 @@
+ fi
+ $RM $output
+ # place dlname in correct position for cygwin
+- # In fact, it would be nice if we could use this code for all target
+- # systems that can't hard-code library paths into their executables
+- # and that have no shared library path variable independent of PATH,
+- # but it turns out we can't easily determine that from inspecting
+- # libtool variables, so we have to hard-code the OSs to which it
+- # applies here; at the moment, that means platforms that use the PE
+- # object format with DLL files. See the long comment at the top of
+- # tests/bindir.at for full details.
+ tdlname=$dlname
+ case $host,$output,$installed,$module,$dlname in
+- *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
+- # If a -bindir argument was supplied, place the dll there.
+- if test "x$bindir" != x ;
+- then
+- func_relative_path "$install_libdir" "$bindir"
+- tdlname=$func_relative_path_result$dlname
+- else
+- # Otherwise fall back on heuristic.
+- tdlname=../bin/$dlname
+- fi
+- ;;
++ *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
+ esac
+ $ECHO > $output "\
+ # $outputname - a libtool library file
+Index: gtk+2.0-2.21.5/m4/gtk-doc.m4
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ gtk+2.0-2.21.5/m4/gtk-doc.m4 2010-07-22 17:58:37.342052247 +0200
@@ -0,0 +1,61 @@
+dnl -*- mode: autoconf -*-
+
@@ -9551,9 +18612,10 @@
+ AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"])
+ AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"])
+])
-diff -Naur gtk+2.0-2.21.2.old/m4/libtool.m4 gtk+2.0-2.21.2/m4/libtool.m4
---- gtk+2.0-2.21.2.old/m4/libtool.m4 1970-01-01 01:00:00.000000000 +0100
-+++ gtk+2.0-2.21.2/m4/libtool.m4 2010-06-11 12:26:00.447613734 +0200
+Index: gtk+2.0-2.21.5/m4/libtool.m4
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ gtk+2.0-2.21.5/m4/libtool.m4 2010-07-22 17:58:36.722054309 +0200
@@ -0,0 +1,7377 @@
+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+#
@@ -16932,9 +25994,10 @@
+ ;;
+ esac
+])
-diff -Naur gtk+2.0-2.21.2.old/m4/lt~obsolete.m4 gtk+2.0-2.21.2/m4/lt~obsolete.m4
---- gtk+2.0-2.21.2.old/m4/lt~obsolete.m4 1970-01-01 01:00:00.000000000 +0100
-+++ gtk+2.0-2.21.2/m4/lt~obsolete.m4 2010-06-11 12:26:02.235614387 +0200
+Index: gtk+2.0-2.21.5/m4/lt~obsolete.m4
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ gtk+2.0-2.21.5/m4/lt~obsolete.m4 2010-07-22 17:58:37.094054446 +0200
@@ -0,0 +1,92 @@
+# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*-
+#
@@ -17028,9 +26091,10 @@
+m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
+m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])])
+m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
-diff -Naur gtk+2.0-2.21.2.old/m4/ltoptions.m4 gtk+2.0-2.21.2/m4/ltoptions.m4
---- gtk+2.0-2.21.2.old/m4/ltoptions.m4 1970-01-01 01:00:00.000000000 +0100
-+++ gtk+2.0-2.21.2/m4/ltoptions.m4 2010-06-11 12:26:00.931613307 +0200
+Index: gtk+2.0-2.21.5/m4/ltoptions.m4
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ gtk+2.0-2.21.5/m4/ltoptions.m4 2010-07-22 17:58:36.854053352 +0200
@@ -0,0 +1,368 @@
+# Helper functions for option handling. -*- Autoconf -*-
+#
@@ -17400,9 +26464,10 @@
+ [m4_define([_LTDL_TYPE], [installable])])
+LT_OPTION_DEFINE([LTDL_INIT], [convenience],
+ [m4_define([_LTDL_TYPE], [convenience])])
-diff -Naur gtk+2.0-2.21.2.old/m4/ltsugar.m4 gtk+2.0-2.21.2/m4/ltsugar.m4
---- gtk+2.0-2.21.2.old/m4/ltsugar.m4 1970-01-01 01:00:00.000000000 +0100
-+++ gtk+2.0-2.21.2/m4/ltsugar.m4 2010-06-11 12:26:01.391614090 +0200
+Index: gtk+2.0-2.21.5/m4/ltsugar.m4
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ gtk+2.0-2.21.5/m4/ltsugar.m4 2010-07-22 17:58:36.942056499 +0200
@@ -0,0 +1,123 @@
+# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*-
+#
@@ -17527,9 +26592,10 @@
+ lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]),
+ [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl
+])
-diff -Naur gtk+2.0-2.21.2.old/m4/ltversion.m4 gtk+2.0-2.21.2/m4/ltversion.m4
---- gtk+2.0-2.21.2.old/m4/ltversion.m4 1970-01-01 01:00:00.000000000 +0100
-+++ gtk+2.0-2.21.2/m4/ltversion.m4 2010-06-11 12:26:01.815614146 +0200
+Index: gtk+2.0-2.21.5/m4/ltversion.m4
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ gtk+2.0-2.21.5/m4/ltversion.m4 2010-07-22 17:58:37.010052915 +0200
@@ -0,0 +1,23 @@
+# ltversion.m4 -- version numbers -*- Autoconf -*-
+#
@@ -17554,9 +26620,10 @@
+_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
+_LT_DECL(, macro_revision, 0)
+])
-diff -Naur gtk+2.0-2.21.2.old/m4macros/Makefile.in gtk+2.0-2.21.2/m4macros/Makefile.in
---- gtk+2.0-2.21.2.old/m4macros/Makefile.in 2010-06-10 19:18:24.000000000 +0200
-+++ gtk+2.0-2.21.2/m4macros/Makefile.in 2010-06-11 12:26:20.802613541 +0200
+Index: gtk+2.0-2.21.5/m4macros/Makefile.in
+===================================================================
+--- gtk+2.0-2.21.5.orig/m4macros/Makefile.in 2010-07-22 17:59:02.117065331 +0200
++++ gtk+2.0-2.21.5/m4macros/Makefile.in 2010-07-22 17:58:46.650050811 +0200
@@ -40,11 +40,14 @@
$(top_srcdir)/Makefile.decl
subdir = m4macros
@@ -17574,23 +26641,32 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -154,6 +157,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
+@@ -141,6 +144,7 @@
+ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.2.old/Makefile.in gtk+2.0-2.21.2/Makefile.in
---- gtk+2.0-2.21.2.old/Makefile.in 2010-06-10 19:18:27.000000000 +0200
-+++ gtk+2.0-2.21.2/Makefile.in 2010-06-11 12:26:25.290613553 +0200
-@@ -47,17 +47,20 @@
- $(srcdir)/gtk+-unix-print-2.0.pc.in $(srcdir)/gtk-zip.sh.in \
- $(top_srcdir)/Makefile.decl $(top_srcdir)/configure AUTHORS \
- COPYING ChangeLog INSTALL NEWS compile config.guess config.sub \
-- depcomp install-sh ltmain.sh missing
-+ depcomp install-sh ltmain.sh missing mkinstalldirs
+@@ -291,6 +295,7 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ ms_librarian = @ms_librarian@
+Index: gtk+2.0-2.21.5/Makefile.in
+===================================================================
+--- gtk+2.0-2.21.5.orig/Makefile.in 2010-07-22 17:59:14.750052494 +0200
++++ gtk+2.0-2.21.5/Makefile.in 2010-07-22 17:58:48.926051254 +0200
+@@ -45,17 +45,20 @@
+ $(srcdir)/gtk-zip.sh.in $(top_srcdir)/Makefile.decl \
+ $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
+ compile config.guess config.sub depcomp install-sh ltmain.sh \
+- missing
++ missing mkinstalldirs
@OS_UNIX_TRUE at am__append_1 = gtk+-unix-print-2.0.pc
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -17607,41 +26683,50 @@
-mkinstalldirs = $(install_sh) -d
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = config.h
- CONFIG_CLEAN_FILES = config.h.win32 gtk-zip.sh gdk-pixbuf-2.0.pc \
- gdk-2.0.pc gtk+-2.0.pc gtk+-unix-print-2.0.pc gail.pc \
-@@ -109,7 +112,8 @@
+ CONFIG_CLEAN_FILES = config.h.win32 gtk-zip.sh gdk-2.0.pc gtk+-2.0.pc \
+ gtk+-unix-print-2.0.pc gail.pc gdk-2.0-uninstalled.pc \
+@@ -106,7 +109,8 @@
distdir dist dist-all distcheck
ETAGS = etags
CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
-+DIST_SUBDIRS = po po-properties gdk-pixbuf gdk gtk modules demos tests \
-+ perf contrib docs m4macros build
++DIST_SUBDIRS = po po-properties gdk gtk modules demos tests perf docs \
++ m4macros build
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
-@@ -220,6 +224,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
+@@ -204,6 +208,7 @@
+ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -479,7 +484,10 @@
+@@ -354,6 +359,7 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ ms_librarian = @ms_librarian@
+@@ -455,7 +461,10 @@
|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
&& DISPLAY=:$$XID && export DISPLAY
--SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib
+-SRC_SUBDIRS = gdk gtk modules demos tests perf
+
+# don't build perf measurement tools in static builds
+ at ENABLE_STATIC_FALSE@MAYBE_PERF = perf
-+SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests $(MAYBE_PERF) contrib
++SRC_SUBDIRS = gdk gtk modules demos tests $(MAYBE_PERF)
SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build
# require automake 1.4
-diff -Naur gtk+2.0-2.21.2.old/mkinstalldirs gtk+2.0-2.21.2/mkinstalldirs
---- gtk+2.0-2.21.2.old/mkinstalldirs 1970-01-01 01:00:00.000000000 +0100
-+++ gtk+2.0-2.21.2/mkinstalldirs 2010-06-11 12:26:25.170613454 +0200
+Index: gtk+2.0-2.21.5/mkinstalldirs
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ gtk+2.0-2.21.5/mkinstalldirs 2010-07-22 17:58:48.878051861 +0200
@@ -0,0 +1,162 @@
+#! /bin/sh
+# mkinstalldirs --- make directory hierarchy
@@ -17805,9 +26890,10 @@
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
-diff -Naur gtk+2.0-2.21.2.old/modules/engines/Makefile.in gtk+2.0-2.21.2/modules/engines/Makefile.in
---- gtk+2.0-2.21.2.old/modules/engines/Makefile.in 2010-06-10 19:18:25.000000000 +0200
-+++ gtk+2.0-2.21.2/modules/engines/Makefile.in 2010-06-11 12:26:21.102613326 +0200
+Index: gtk+2.0-2.21.5/modules/engines/Makefile.in
+===================================================================
+--- gtk+2.0-2.21.5.orig/modules/engines/Makefile.in 2010-07-22 17:58:59.382060735 +0200
++++ gtk+2.0-2.21.5/modules/engines/Makefile.in 2010-07-22 17:58:46.794051384 +0200
@@ -39,11 +39,14 @@
$(top_srcdir)/Makefile.decl
subdir = modules/engines
@@ -17825,17 +26911,26 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -170,6 +173,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
+@@ -157,6 +160,7 @@
+ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.2.old/modules/engines/ms-windows/Makefile.in gtk+2.0-2.21.2/modules/engines/ms-windows/Makefile.in
---- gtk+2.0-2.21.2.old/modules/engines/ms-windows/Makefile.in 2010-06-10 19:18:25.000000000 +0200
-+++ gtk+2.0-2.21.2/modules/engines/ms-windows/Makefile.in 2010-06-11 12:26:21.310614139 +0200
+@@ -307,6 +311,7 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ ms_librarian = @ms_librarian@
+Index: gtk+2.0-2.21.5/modules/engines/ms-windows/Makefile.in
+===================================================================
+--- gtk+2.0-2.21.5.orig/modules/engines/ms-windows/Makefile.in 2010-07-22 17:58:59.833069875 +0200
++++ gtk+2.0-2.21.5/modules/engines/ms-windows/Makefile.in 2010-07-22 17:58:46.882050834 +0200
@@ -40,11 +40,14 @@
$(top_srcdir)/Makefile.decl
subdir = modules/engines/ms-windows
@@ -17853,17 +26948,26 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -228,6 +231,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
+@@ -214,6 +217,7 @@
+ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.2.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in gtk+2.0-2.21.2/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in
---- gtk+2.0-2.21.2.old/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2010-06-10 19:18:25.000000000 +0200
-+++ gtk+2.0-2.21.2/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2010-06-11 12:26:21.666612528 +0200
+@@ -364,6 +368,7 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ ms_librarian = @ms_librarian@
+Index: gtk+2.0-2.21.5/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in
+===================================================================
+--- gtk+2.0-2.21.5.orig/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2010-07-22 17:58:59.625052638 +0200
++++ gtk+2.0-2.21.5/modules/engines/ms-windows/Theme/gtk-2.0/Makefile.in 2010-07-22 17:58:47.022050949 +0200
@@ -40,11 +40,14 @@
$(top_srcdir)/Makefile.decl
subdir = modules/engines/ms-windows/Theme/gtk-2.0
@@ -17881,17 +26985,26 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -154,6 +157,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
+@@ -141,6 +144,7 @@
+ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.2.old/modules/engines/ms-windows/Theme/Makefile.in gtk+2.0-2.21.2/modules/engines/ms-windows/Theme/Makefile.in
---- gtk+2.0-2.21.2.old/modules/engines/ms-windows/Theme/Makefile.in 2010-06-10 19:18:25.000000000 +0200
-+++ gtk+2.0-2.21.2/modules/engines/ms-windows/Theme/Makefile.in 2010-06-11 12:26:21.498613095 +0200
+@@ -291,6 +295,7 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ ms_librarian = @ms_librarian@
+Index: gtk+2.0-2.21.5/modules/engines/ms-windows/Theme/Makefile.in
+===================================================================
+--- gtk+2.0-2.21.5.orig/modules/engines/ms-windows/Theme/Makefile.in 2010-07-22 17:58:59.702072908 +0200
++++ gtk+2.0-2.21.5/modules/engines/ms-windows/Theme/Makefile.in 2010-07-22 17:58:46.954051458 +0200
@@ -39,11 +39,14 @@
$(top_srcdir)/Makefile.decl
subdir = modules/engines/ms-windows/Theme
@@ -17909,17 +27022,26 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -170,6 +173,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
+@@ -157,6 +160,7 @@
+ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.2.old/modules/engines/pixbuf/Makefile.in gtk+2.0-2.21.2/modules/engines/pixbuf/Makefile.in
---- gtk+2.0-2.21.2.old/modules/engines/pixbuf/Makefile.in 2010-06-10 19:18:25.000000000 +0200
-+++ gtk+2.0-2.21.2/modules/engines/pixbuf/Makefile.in 2010-06-11 12:26:21.778613147 +0200
+@@ -307,6 +311,7 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ ms_librarian = @ms_librarian@
+Index: gtk+2.0-2.21.5/modules/engines/pixbuf/Makefile.in
+===================================================================
+--- gtk+2.0-2.21.5.orig/modules/engines/pixbuf/Makefile.in 2010-07-22 17:58:59.330054264 +0200
++++ gtk+2.0-2.21.5/modules/engines/pixbuf/Makefile.in 2010-07-22 17:58:47.110052152 +0200
@@ -40,11 +40,14 @@
$(top_srcdir)/Makefile.decl ChangeLog
subdir = modules/engines/pixbuf
@@ -17937,17 +27059,26 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -191,6 +194,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
+@@ -177,6 +180,7 @@
+ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.2.old/modules/input/Makefile.in gtk+2.0-2.21.2/modules/input/Makefile.in
---- gtk+2.0-2.21.2.old/modules/input/Makefile.in 2010-06-10 19:18:25.000000000 +0200
-+++ gtk+2.0-2.21.2/modules/input/Makefile.in 2010-06-11 12:26:21.990612565 +0200
+@@ -327,6 +331,7 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ ms_librarian = @ms_librarian@
+Index: gtk+2.0-2.21.5/modules/input/Makefile.in
+===================================================================
+--- gtk+2.0-2.21.5.orig/modules/input/Makefile.in 2010-07-22 17:58:59.949061219 +0200
++++ gtk+2.0-2.21.5/modules/input/Makefile.in 2010-07-22 17:58:47.290050875 +0200
@@ -41,11 +41,14 @@
$(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl
subdir = modules/input
@@ -17965,15 +27096,23 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -392,6 +395,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
+@@ -378,6 +381,7 @@
+ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -717,7 +721,8 @@
+@@ -528,6 +532,7 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ ms_librarian = @ms_librarian@
+@@ -693,7 +698,8 @@
@INCLUDE_IM_MULTIPRESS_FALSE at MULTIPRESS_MODULE = im-multipress.la
imconffiledir = $(sysconfdir)/gtk-2.0
dist_imconffile_DATA = im-multipress.conf
@@ -17983,7 +27122,7 @@
@CROSS_COMPILING_TRUE at RUN_QUERY_IMMODULES_TEST = false
@BUILD_DYNAMIC_MODULES_TRUE at module_LTLIBRARIES = \
@BUILD_DYNAMIC_MODULES_TRUE@ $(AM_ET_MODULE) \
-@@ -1269,7 +1274,18 @@
+@@ -1245,7 +1251,18 @@
included-modules: $(noinst_LTLIBRARIES)
gtk.immodules: Makefile.am $(module_LTLIBRARIES)
@@ -18003,9 +27142,10 @@
@CROSS_COMPILING_FALSE at all-local: gtk.immodules
-diff -Naur gtk+2.0-2.21.2.old/modules/Makefile.in gtk+2.0-2.21.2/modules/Makefile.in
---- gtk+2.0-2.21.2.old/modules/Makefile.in 2010-06-10 19:18:24.000000000 +0200
-+++ gtk+2.0-2.21.2/modules/Makefile.in 2010-06-11 12:26:20.982613225 +0200
+Index: gtk+2.0-2.21.5/modules/Makefile.in
+===================================================================
+--- gtk+2.0-2.21.5.orig/modules/Makefile.in 2010-07-22 17:59:01.246053515 +0200
++++ gtk+2.0-2.21.5/modules/Makefile.in 2010-07-22 17:58:46.722050609 +0200
@@ -40,11 +40,14 @@
@OS_UNIX_TRUE at am__append_1 = printbackends
subdir = modules
@@ -18023,17 +27163,26 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -171,6 +174,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
+@@ -158,6 +161,7 @@
+ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.2.old/modules/other/gail/libgail-util/Makefile.in gtk+2.0-2.21.2/modules/other/gail/libgail-util/Makefile.in
---- gtk+2.0-2.21.2.old/modules/other/gail/libgail-util/Makefile.in 2010-06-10 19:18:26.000000000 +0200
-+++ gtk+2.0-2.21.2/modules/other/gail/libgail-util/Makefile.in 2010-06-11 12:26:22.926612810 +0200
+@@ -308,6 +312,7 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ ms_librarian = @ms_librarian@
+Index: gtk+2.0-2.21.5/modules/other/gail/libgail-util/Makefile.in
+===================================================================
+--- gtk+2.0-2.21.5.orig/modules/other/gail/libgail-util/Makefile.in 2010-07-22 17:59:00.077053466 +0200
++++ gtk+2.0-2.21.5/modules/other/gail/libgail-util/Makefile.in 2010-07-22 17:58:47.802051353 +0200
@@ -42,11 +42,14 @@
$(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl
subdir = modules/other/gail/libgail-util
@@ -18051,17 +27200,26 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -195,6 +198,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
+@@ -182,6 +185,7 @@
+ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.2.old/modules/other/gail/Makefile.in gtk+2.0-2.21.2/modules/other/gail/Makefile.in
---- gtk+2.0-2.21.2.old/modules/other/gail/Makefile.in 2010-06-10 19:18:26.000000000 +0200
-+++ gtk+2.0-2.21.2/modules/other/gail/Makefile.in 2010-06-11 12:26:22.762612789 +0200
+@@ -332,6 +336,7 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ ms_librarian = @ms_librarian@
+Index: gtk+2.0-2.21.5/modules/other/gail/Makefile.in
+===================================================================
+--- gtk+2.0-2.21.5.orig/modules/other/gail/Makefile.in 2010-07-22 17:59:00.529053303 +0200
++++ gtk+2.0-2.21.5/modules/other/gail/Makefile.in 2010-07-22 17:58:47.682051386 +0200
@@ -41,11 +41,14 @@
$(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl ChangeLog
subdir = modules/other/gail
@@ -18079,17 +27237,26 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -262,6 +265,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
+@@ -248,6 +251,7 @@
+ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.2.old/modules/other/gail/tests/Makefile.in gtk+2.0-2.21.2/modules/other/gail/tests/Makefile.in
---- gtk+2.0-2.21.2.old/modules/other/gail/tests/Makefile.in 2010-06-10 19:18:26.000000000 +0200
-+++ gtk+2.0-2.21.2/modules/other/gail/tests/Makefile.in 2010-06-11 12:26:23.094612728 +0200
+@@ -398,6 +402,7 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ ms_librarian = @ms_librarian@
+Index: gtk+2.0-2.21.5/modules/other/gail/tests/Makefile.in
+===================================================================
+--- gtk+2.0-2.21.5.orig/modules/other/gail/tests/Makefile.in 2010-07-22 17:59:00.445054155 +0200
++++ gtk+2.0-2.21.5/modules/other/gail/tests/Makefile.in 2010-07-22 17:58:47.938051731 +0200
@@ -40,11 +40,14 @@
$(top_srcdir)/Makefile.decl
subdir = modules/other/gail/tests
@@ -18107,17 +27274,26 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -334,6 +337,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
+@@ -321,6 +324,7 @@
+ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.2.old/modules/other/Makefile.in gtk+2.0-2.21.2/modules/other/Makefile.in
---- gtk+2.0-2.21.2.old/modules/other/Makefile.in 2010-06-10 19:18:25.000000000 +0200
-+++ gtk+2.0-2.21.2/modules/other/Makefile.in 2010-06-11 12:26:22.098612955 +0200
+@@ -471,6 +475,7 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ ms_librarian = @ms_librarian@
+Index: gtk+2.0-2.21.5/modules/other/Makefile.in
+===================================================================
+--- gtk+2.0-2.21.5.orig/modules/other/Makefile.in 2010-07-22 17:59:00.609053559 +0200
++++ gtk+2.0-2.21.5/modules/other/Makefile.in 2010-07-22 17:58:47.378051234 +0200
@@ -39,11 +39,14 @@
$(top_srcdir)/Makefile.decl
subdir = modules/other
@@ -18135,17 +27311,26 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -170,6 +173,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
+@@ -157,6 +160,7 @@
+ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.2.old/modules/printbackends/cups/Makefile.in gtk+2.0-2.21.2/modules/printbackends/cups/Makefile.in
---- gtk+2.0-2.21.2.old/modules/printbackends/cups/Makefile.in 2010-06-10 19:18:26.000000000 +0200
-+++ gtk+2.0-2.21.2/modules/printbackends/cups/Makefile.in 2010-06-11 12:26:23.362613410 +0200
+@@ -307,6 +311,7 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ ms_librarian = @ms_librarian@
+Index: gtk+2.0-2.21.5/modules/printbackends/cups/Makefile.in
+===================================================================
+--- gtk+2.0-2.21.5.orig/modules/printbackends/cups/Makefile.in 2010-07-22 17:59:00.825065031 +0200
++++ gtk+2.0-2.21.5/modules/printbackends/cups/Makefile.in 2010-07-22 17:58:48.102051344 +0200
@@ -41,11 +41,14 @@
$(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl
subdir = modules/printbackends/cups
@@ -18163,17 +27348,26 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -194,6 +197,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
+@@ -181,6 +184,7 @@
+ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.2.old/modules/printbackends/file/Makefile.in gtk+2.0-2.21.2/modules/printbackends/file/Makefile.in
---- gtk+2.0-2.21.2.old/modules/printbackends/file/Makefile.in 2010-06-10 19:18:26.000000000 +0200
-+++ gtk+2.0-2.21.2/modules/printbackends/file/Makefile.in 2010-06-11 12:26:23.542613519 +0200
+@@ -331,6 +335,7 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ ms_librarian = @ms_librarian@
+Index: gtk+2.0-2.21.5/modules/printbackends/file/Makefile.in
+===================================================================
+--- gtk+2.0-2.21.5.orig/modules/printbackends/file/Makefile.in 2010-07-22 17:59:00.733053473 +0200
++++ gtk+2.0-2.21.5/modules/printbackends/file/Makefile.in 2010-07-22 17:58:48.194051237 +0200
@@ -41,11 +41,14 @@
$(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl
subdir = modules/printbackends/file
@@ -18191,17 +27385,26 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -193,6 +196,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
+@@ -180,6 +183,7 @@
+ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.2.old/modules/printbackends/lpr/Makefile.in gtk+2.0-2.21.2/modules/printbackends/lpr/Makefile.in
---- gtk+2.0-2.21.2.old/modules/printbackends/lpr/Makefile.in 2010-06-10 19:18:26.000000000 +0200
-+++ gtk+2.0-2.21.2/modules/printbackends/lpr/Makefile.in 2010-06-11 12:26:23.786610740 +0200
+@@ -330,6 +334,7 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ ms_librarian = @ms_librarian@
+Index: gtk+2.0-2.21.5/modules/printbackends/lpr/Makefile.in
+===================================================================
+--- gtk+2.0-2.21.5.orig/modules/printbackends/lpr/Makefile.in 2010-07-22 17:59:00.961064010 +0200
++++ gtk+2.0-2.21.5/modules/printbackends/lpr/Makefile.in 2010-07-22 17:58:48.282051255 +0200
@@ -41,11 +41,14 @@
$(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl
subdir = modules/printbackends/lpr
@@ -18219,17 +27422,26 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -191,6 +194,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
+@@ -178,6 +181,7 @@
+ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.2.old/modules/printbackends/Makefile.in gtk+2.0-2.21.2/modules/printbackends/Makefile.in
---- gtk+2.0-2.21.2.old/modules/printbackends/Makefile.in 2010-06-10 19:18:26.000000000 +0200
-+++ gtk+2.0-2.21.2/modules/printbackends/Makefile.in 2010-06-11 12:26:23.186613465 +0200
+@@ -328,6 +332,7 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ ms_librarian = @ms_librarian@
+Index: gtk+2.0-2.21.5/modules/printbackends/Makefile.in
+===================================================================
+--- gtk+2.0-2.21.5.orig/modules/printbackends/Makefile.in 2010-07-22 17:59:01.189054714 +0200
++++ gtk+2.0-2.21.5/modules/printbackends/Makefile.in 2010-07-22 17:58:48.010051031 +0200
@@ -42,11 +42,14 @@
@HAVE_PAPI_TRUE at am__append_3 = papi
subdir = modules/printbackends
@@ -18247,17 +27459,26 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -172,6 +175,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
+@@ -159,6 +162,7 @@
+ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.2.old/modules/printbackends/papi/Makefile.in gtk+2.0-2.21.2/modules/printbackends/papi/Makefile.in
---- gtk+2.0-2.21.2.old/modules/printbackends/papi/Makefile.in 2010-06-10 19:18:26.000000000 +0200
-+++ gtk+2.0-2.21.2/modules/printbackends/papi/Makefile.in 2010-06-11 12:26:23.970610721 +0200
+@@ -309,6 +313,7 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ ms_librarian = @ms_librarian@
+Index: gtk+2.0-2.21.5/modules/printbackends/papi/Makefile.in
+===================================================================
+--- gtk+2.0-2.21.5.orig/modules/printbackends/papi/Makefile.in 2010-07-22 17:59:00.889053119 +0200
++++ gtk+2.0-2.21.5/modules/printbackends/papi/Makefile.in 2010-07-22 17:58:48.370051195 +0200
@@ -39,11 +39,14 @@
DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
@@ -18275,17 +27496,26 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -191,6 +194,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
+@@ -178,6 +181,7 @@
+ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.2.old/modules/printbackends/test/Makefile.in gtk+2.0-2.21.2/modules/printbackends/test/Makefile.in
---- gtk+2.0-2.21.2.old/modules/printbackends/test/Makefile.in 2010-06-10 19:18:27.000000000 +0200
-+++ gtk+2.0-2.21.2/modules/printbackends/test/Makefile.in 2010-06-11 12:26:24.182613235 +0200
+@@ -328,6 +332,7 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ ms_librarian = @ms_librarian@
+Index: gtk+2.0-2.21.5/modules/printbackends/test/Makefile.in
+===================================================================
+--- gtk+2.0-2.21.5.orig/modules/printbackends/test/Makefile.in 2010-07-22 17:59:00.669063840 +0200
++++ gtk+2.0-2.21.5/modules/printbackends/test/Makefile.in 2010-07-22 17:58:48.462051287 +0200
@@ -41,11 +41,14 @@
$(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl
subdir = modules/printbackends/test
@@ -18303,17 +27533,26 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -192,6 +195,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
+@@ -179,6 +182,7 @@
+ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.2.old/perf/Makefile.in gtk+2.0-2.21.2/perf/Makefile.in
---- gtk+2.0-2.21.2.old/perf/Makefile.in 2010-06-10 19:18:27.000000000 +0200
-+++ gtk+2.0-2.21.2/perf/Makefile.in 2010-06-11 12:26:24.422613698 +0200
+@@ -329,6 +333,7 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ ms_librarian = @ms_librarian@
+Index: gtk+2.0-2.21.5/perf/Makefile.in
+===================================================================
+--- gtk+2.0-2.21.5.orig/perf/Makefile.in 2010-07-22 17:59:14.882053698 +0200
++++ gtk+2.0-2.21.5/perf/Makefile.in 2010-07-22 17:58:48.550051158 +0200
@@ -41,11 +41,14 @@
noinst_PROGRAMS = testperf$(EXEEXT)
subdir = perf
@@ -18331,17 +27570,26 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -166,6 +169,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
+@@ -152,6 +155,7 @@
+ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
-diff -Naur gtk+2.0-2.21.2.old/po/Makefile.in.in gtk+2.0-2.21.2/po/Makefile.in.in
---- gtk+2.0-2.21.2.old/po/Makefile.in.in 2010-06-10 18:41:57.000000000 +0200
-+++ gtk+2.0-2.21.2/po/Makefile.in.in 2010-06-11 12:26:02.775613534 +0200
+@@ -302,6 +306,7 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ ms_librarian = @ms_librarian@
+Index: gtk+2.0-2.21.5/po/Makefile.in.in
+===================================================================
+--- gtk+2.0-2.21.5.orig/po/Makefile.in.in 2010-07-22 17:59:01.753053846 +0200
++++ gtk+2.0-2.21.5/po/Makefile.in.in 2010-07-22 17:58:37.318052549 +0200
@@ -25,23 +25,23 @@
prefix = @prefix@
@@ -18456,19 +27704,11 @@
$(INSTALL_DATA) $(srcdir)/Makefile.in.in \
$(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
else \
-@@ -203,7 +218,7 @@
- rm -f $(GMOFILES)
-
- distdir = ../$(GETTEXT_PACKAGE)-$(VERSION)/$(subdir)
--dist distdir: $(DISTFILES)
-+dist distdir: update-po $(DISTFILES)
- dists="$(DISTFILES)"; \
- for file in $$dists; do \
- ln $(srcdir)/$$file $(distdir) 2> /dev/null \
-diff -Naur gtk+2.0-2.21.2.old/tests/Makefile.in gtk+2.0-2.21.2/tests/Makefile.in
---- gtk+2.0-2.21.2.old/tests/Makefile.in 2010-06-10 19:18:27.000000000 +0200
-+++ gtk+2.0-2.21.2/tests/Makefile.in 2010-06-11 12:26:24.998613791 +0200
-@@ -76,11 +76,14 @@
+Index: gtk+2.0-2.21.5/tests/Makefile.in
+===================================================================
+--- gtk+2.0-2.21.5.orig/tests/Makefile.in 2010-07-22 17:59:10.197053365 +0200
++++ gtk+2.0-2.21.5/tests/Makefile.in 2010-07-22 17:58:48.782052093 +0200
+@@ -73,11 +73,14 @@
@HAVE_CXX_TRUE@@HAVE_OBJC_TRUE at am__append_2 = -DHAVE_OBJC=1 -x objective-c++
subdir = tests
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -18485,11 +27725,19 @@
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-@@ -437,6 +440,7 @@
- GDK_PIXBUF_XLIB_EXTRA_CFLAGS = @GDK_PIXBUF_XLIB_EXTRA_CFLAGS@
- GDK_PIXBUF_XLIB_EXTRA_LIBS = @GDK_PIXBUF_XLIB_EXTRA_LIBS@
- GDK_PIXBUF_XLIB_PACKAGES = @GDK_PIXBUF_XLIB_PACKAGES@
+@@ -402,6 +405,7 @@
+ GDK_PACKAGES = @GDK_PACKAGES@
+ GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
+ GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
+GDK_PRIVATE_PACKAGES = @GDK_PRIVATE_PACKAGES@
GDK_WLIBS = @GDK_WLIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GLIB_CFLAGS = @GLIB_CFLAGS@
+@@ -552,6 +556,7 @@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ ms_librarian = @ms_librarian@
Modified: desktop/experimental/gtk+2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/series?rev=24864&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/patches/series [utf-8] Thu Jul 22 16:08:34 2010
@@ -4,12 +4,9 @@
004_gtk+-ximian-gtk2-filesel-navbutton-5.patch
005_support_disabling_x11_extensions.patch
009_gtk-export-filechooser.patch
-010_gdkpixbuf_-lm.patch
+011_immodule-cache-dir.patch
015_default-fallback-icon-theme.patch
-020_immodules-files-d.patch
-021_loader-files-d.patch
022_disable-viqr-im-for-vi-locale.patch
-022_module-files-append-compat-module-files-d.patch
041_ia32-libs.patch
042_treeview_single-focus.patch
060_ignore-random-icons.patch
Modified: desktop/experimental/gtk+2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/rules?rev=24864&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/rules [utf-8] (original)
+++ desktop/experimental/gtk+2.0/debian/rules [utf-8] Thu Jul 22 16:08:34 2010
@@ -202,7 +202,7 @@
$(STAMP_DIR)/build-stamp-%: $(STAMP_DIR)/configure-stamp-%
dh_testdir
- LD_LIBRARY_PATH=$(builddir)/gdk-pixbuf/.libs:$(builddir)/gtk/.libs:$(builddir)/gdk/.libs:$(LD_LIBRARY_PATH) \
+ LD_LIBRARY_PATH=$(builddir)/gtk/.libs:$(builddir)/gdk/.libs:$(LD_LIBRARY_PATH) \
$(MAKE) $(PARALLEL_FLAGS) -C $(builddir)
touch $@
@@ -212,7 +212,7 @@
dh_testdir
# setting LD_LIBRARY_PATH for "make check" might be needed in the
# future, but doesn't seem necessary right now
- #LD_LIBRARY_PATH=$(builddir)/gdk-pixbuf/.libs:$(builddir)/gtk/.libs:$(builddir)/gdk/.libs:$(LD_LIBRARY_PATH)
+ #LD_LIBRARY_PATH=$(builddir)/gtk/.libs:$(builddir)/gdk/.libs:$(LD_LIBRARY_PATH)
# testsuite failures are ignored
-$(MAKE) -C $(builddir) check
touch $@
@@ -226,11 +226,6 @@
touch $@
install: $(addprefix $(STAMP_DIR)/install-stamp-, $(FLAVORS))
- # Add necessary dependencies for the static build to Libs.private
- a=$$(grep ^Libs: $(installbasedir)/shared/$(LIBDIR)/pkgconfig/gdk-pixbuf-2.0.pc) ; \
- b=$$(grep ^Libs: $(installbasedir)/static/$(LIBDIR)/pkgconfig/gdk-pixbuf-2.0.pc) ; \
- c=$$(for i in $$b; do echo $$a| grep -q -e $$i || echo $$i; done) ; \
- echo Libs.private: $$c >> $(installbasedir)/shared/$(LIBDIR)/pkgconfig/gdk-pixbuf-2.0.pc
# gross kludge to force control generation with the %.in target
clean::
@@ -325,25 +320,6 @@
# of dh_installdocs (ship README.Debian etc. in the first package)
dh_installdocs -p$(PIXBUF_PKG) -s
dh_installman -s
- # fix the permissions of the development package because it ships
- # dh_gtkmodules which we need to invoke in this build
- dh_fixperms -p$(DEV_PKG)
- # generate a dependency on the Gtk binary version
- debian/$(DEV_PKG)/usr/bin/dh_gtkmodules -p$(PIXBUF_PKG)
- # generate an IM module file and a GdkPixbuf loader file for the shared
- # library
- LD_LIBRARY_PATH=debian/$(SHARED_PKG)/$(LIBDIR):$(LD_LIBRARY_PATH) \
- GTK_QUERYLOADERS=$(installbasedir)/shared/usr/bin/gdk-pixbuf-query-loaders \
- GTK_QUERYIMMODULES=$(installbasedir)/shared/usr/bin/gtk-query-immodules-2.0 \
- debian/$(DEV_PKG)/usr/bin/dh_gtkmodules \
- -k \
- -p$(SHARED_PKG)
- # generate a GdkPixbuf loader config file for the udeb
- LD_LIBRARY_PATH=debian/$(UDEB_PKG)/$(LIBDIR):$(LD_LIBRARY_PATH) \
- GTK_QUERYLOADERS=$(installbasedir)/shared_udeb/usr/bin/gdk-pixbuf-query-loaders \
- debian/$(DEV_PKG)/usr/bin/dh_gtkmodules \
- -k \
- -p$(UDEB_PKG)
# generate a minimal MIME cache for the udeb
mkdir -p $(mimedir)/packages
[ -f $(mimexml) ]
More information about the pkg-gnome-commits
mailing list