r25327 - in /desktop/experimental/gtk+3.0/debian: changelog patches/070_mandatory-relibtoolize.patch

sjoerd at users.alioth.debian.org sjoerd at users.alioth.debian.org
Sat Oct 9 19:36:17 UTC 2010


Author: sjoerd
Date: Sat Oct  9 19:36:15 2010
New Revision: 25327

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=25327
Log:
* debian/patches/070_mandatory-relibtoolize.patch
  + Updated

Modified:
    desktop/experimental/gtk+3.0/debian/changelog
    desktop/experimental/gtk+3.0/debian/patches/070_mandatory-relibtoolize.patch

Modified: desktop/experimental/gtk+3.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/changelog?rev=25327&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/changelog [utf-8] Sat Oct  9 19:36:15 2010
@@ -12,8 +12,10 @@
   * debian/patches/009_gtk-export-filechooser.patch:
     + Removed. Doesn't apply anymore and was only needed for hildon
   * Update build-depends to cairo >= 1.10.0 and glib-2.0 >= 2.27.0
-
- -- Sjoerd Simons <sjoerd at debian.org>  Sat, 09 Oct 2010 20:27:15 +0100
+  * debian/patches/070_mandatory-relibtoolize.patch
+    + Updated
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Sat, 09 Oct 2010 20:35:55 +0100
 
 gtk+2.0 (2.21.5-1) experimental; urgency=low
 

Modified: desktop/experimental/gtk+3.0/debian/patches/070_mandatory-relibtoolize.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/patches/070_mandatory-relibtoolize.patch?rev=25327&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/patches/070_mandatory-relibtoolize.patch [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/patches/070_mandatory-relibtoolize.patch [utf-8] Sat Oct  9 19:36:15 2010
@@ -1,38 +1,21 @@
-Index: gtk+3.0-2.90.6/Makefile.in
-===================================================================
---- gtk+3.0-2.90.6.orig/Makefile.in
-+++ gtk+3.0-2.90.6/Makefile.in
-@@ -50,7 +50,10 @@
+diff --git a/Makefile.in b/Makefile.in
+index 30b2cb0..81f450b 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -50,8 +50,10 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
  subdir = .
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
--	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-+	$(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.ac
+ am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+-	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/acinclude.m4 \
+-	$(top_srcdir)/configure.ac
++	$(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.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
-@@ -106,7 +109,8 @@
- 	distdir dist dist-all distcheck
- ETAGS = etags
- CTAGS = ctags
--DIST_SUBDIRS = $(SUBDIRS)
-+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)
-@@ -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@
-@@ -355,6 +360,7 @@
+@@ -359,6 +361,7 @@ libdir = @libdir@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -40,22 +23,10 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  ms_librarian = @ms_librarian@
-@@ -450,7 +456,10 @@
- 	|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
- 	&& DISPLAY=:$$XID && export DISPLAY
- 
--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 gtk modules demos tests $(MAYBE_PERF)
- SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros build
- ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
- MAINTAINERCLEANFILES = \
-Index: gtk+3.0-2.90.6/aclocal.m4
-===================================================================
---- gtk+3.0-2.90.6.orig/aclocal.m4
-+++ gtk+3.0-2.90.6/aclocal.m4
+diff --git a/aclocal.m4 b/aclocal.m4
+index 2fc0a2f..e10f5c4 100644
+--- a/aclocal.m4
++++ b/aclocal.m4
 @@ -13,8 +13,8 @@
  
  m4_ifndef([AC_AUTOCONF_VERSION],
@@ -67,9 +38,9 @@
  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'.])])
-@@ -726,8043 +726,6 @@
-   AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"])
- ])
+@@ -664,8043 +664,6 @@ sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
+ fi])
+ 
  
 -# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 -#
@@ -8111,27 +8082,27 @@
  # pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
  # serial 1 (pkg-config-0.24)
  # 
-@@ -8900,7 +863,7 @@
+@@ -8838,7 +801,7 @@ $$1_PKG_ERRORS
  Consider adjusting the PKG_CONFIG_PATH environment variable if you
  installed software in a non-standard prefix.
  
 -_PKG_TEXT])
-+_PKG_TEXT])dnl
++_PKG_TEXT])[]dnl
          ])
  elif test $pkg_failed = untried; then
       	AC_MSG_RESULT([no])
-@@ -8911,7 +874,7 @@
+@@ -8849,7 +812,7 @@ path to pkg-config.
  
  _PKG_TEXT
  
 -To get pkg-config, see <http://pkg-config.freedesktop.org/>.])
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])dnl
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
          ])
  else
  	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-@@ -9941,4 +1904,9 @@
- ]) # _AM_PROG_TAR
+@@ -9880,4 +1843,9 @@ AC_SUBST([am__untar])
  
+ m4_include([m4/gtk-doc.m4])
  m4_include([m4/introspection.m4])
 +m4_include([m4/libtool.m4])
 +m4_include([m4/ltoptions.m4])
@@ -8139,31 +8110,24 @@
 +m4_include([m4/ltversion.m4])
 +m4_include([m4/lt~obsolete.m4])
  m4_include([acinclude.m4])
-Index: gtk+3.0-2.90.6/build/Makefile.in
-===================================================================
---- gtk+3.0-2.90.6.orig/build/Makefile.in
-+++ gtk+3.0-2.90.6/build/Makefile.in
-@@ -40,7 +40,10 @@
+diff --git a/build/Makefile.in b/build/Makefile.in
+index a455416..795f77e 100644
+--- a/build/Makefile.in
++++ b/build/Makefile.in
+@@ -40,8 +40,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
  subdir = build
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
--	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-+	$(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.ac
+ am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+-	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/acinclude.m4 \
+-	$(top_srcdir)/configure.ac
++	$(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.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  mkinstalldirs = $(install_sh) -d
-@@ -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@
-@@ -308,6 +312,7 @@
+@@ -312,6 +314,7 @@ libdir = @libdir@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -8171,31 +8135,24 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  ms_librarian = @ms_librarian@
-Index: gtk+3.0-2.90.6/build/win32/Makefile.in
-===================================================================
---- gtk+3.0-2.90.6.orig/build/win32/Makefile.in
-+++ gtk+3.0-2.90.6/build/win32/Makefile.in
-@@ -40,7 +40,10 @@
+diff --git a/build/win32/Makefile.in b/build/win32/Makefile.in
+index 1e17853..7f15294 100644
+--- a/build/win32/Makefile.in
++++ b/build/win32/Makefile.in
+@@ -40,8 +40,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
  subdir = build/win32
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
--	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-+	$(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.ac
+ am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+-	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/acinclude.m4 \
+-	$(top_srcdir)/configure.ac
++	$(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.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  mkinstalldirs = $(install_sh) -d
-@@ -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@
-@@ -308,6 +312,7 @@
+@@ -312,6 +314,7 @@ libdir = @libdir@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -8203,31 +8160,24 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  ms_librarian = @ms_librarian@
-Index: gtk+3.0-2.90.6/build/win32/vs9/Makefile.in
-===================================================================
---- gtk+3.0-2.90.6.orig/build/win32/vs9/Makefile.in
-+++ gtk+3.0-2.90.6/build/win32/vs9/Makefile.in
-@@ -40,7 +40,10 @@
+diff --git a/build/win32/vs9/Makefile.in b/build/win32/vs9/Makefile.in
+index c685605..d35aa45 100644
+--- a/build/win32/vs9/Makefile.in
++++ b/build/win32/vs9/Makefile.in
+@@ -40,8 +40,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
  subdir = build/win32/vs9
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
--	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-+	$(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.ac
+ am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+-	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/acinclude.m4 \
+-	$(top_srcdir)/configure.ac
++	$(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.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  mkinstalldirs = $(install_sh) -d
-@@ -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@
-@@ -268,6 +272,7 @@
+@@ -272,6 +274,7 @@ libdir = @libdir@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -8235,305 +8185,19 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  ms_librarian = @ms_librarian@
-Index: gtk+3.0-2.90.6/config.h.in~
-===================================================================
---- /dev/null
-+++ gtk+3.0-2.90.6/config.h.in~
-@@ -0,0 +1,281 @@
-+/* config.h.in.  Generated from configure.ac by autoheader.  */
-+
-+/* always defined to indicate that i18n is enabled */
-+#undef ENABLE_NLS
-+
-+/* The prefix for our gettext translation domains. */
-+#undef GETTEXT_PACKAGE
-+
-+/* Define if debugging is enabled */
-+#undef GTK_COMPILED_WITH_DEBUGGING
-+
-+/* Define the location where the catalogs will be installed */
-+#undef GTK_LOCALEDIR
-+
-+/* Define to 1 if you have the `bind_textdomain_codeset' function. */
-+#undef HAVE_BIND_TEXTDOMAIN_CODESET
-+
-+/* Is the wctype implementation broken */
-+#undef HAVE_BROKEN_WCTYPE
-+
-+/* Define to 1 if you have the <crt_externs.h> header file. */
-+#undef HAVE_CRT_EXTERNS_H
-+
-+/* Define to 1 if CUPS 1.2 API is available */
-+#undef HAVE_CUPS_API_1_2
-+
-+/* Define to 1 if you have the `dcgettext' function. */
-+#undef HAVE_DCGETTEXT
-+
-+/* Define to 1 if you have the <dlfcn.h> header file. */
-+#undef HAVE_DLFCN_H
-+
-+/* Define to 1 if you have the `flockfile' function. */
-+#undef HAVE_FLOCKFILE
-+
-+/* Define to 1 if you have the <ftw.h> header file. */
-+#undef HAVE_FTW_H
-+
-+/* Define to 1 if you have the `getc_unlocked' function. */
-+#undef HAVE_GETC_UNLOCKED
-+
-+/* Define to 1 if you have the `getpagesize' function. */
-+#undef HAVE_GETPAGESIZE
-+
-+/* Define to 1 if you have the `getresuid' function. */
-+#undef HAVE_GETRESUID
-+
-+/* Define if the GNU gettext() function is already present or preinstalled. */
-+#undef HAVE_GETTEXT
-+
-+/* Have GNU ftw */
-+#undef HAVE_GNU_FTW
-+
-+/* Define to 1 if you have the `httpGetAuthString' function. */
-+#undef HAVE_HTTPGETAUTHSTRING
-+
-+/* Define if cups http_t authstring field is accessible */
-+#undef HAVE_HTTP_AUTHSTRING
-+
-+/* Define to 1 if you have the <inttypes.h> header file. */
-+#undef HAVE_INTTYPES_H
-+
-+/* Define to 1 if ipc.h is available */
-+#undef HAVE_IPC_H
-+
-+/* Define if your <locale.h> file defines LC_MESSAGES. */
-+#undef HAVE_LC_MESSAGES
-+
-+/* Define to 1 if you have the <locale.h> header file. */
-+#undef HAVE_LOCALE_H
-+
-+/* Define to 1 if you have the `localtime_r' function. */
-+#undef HAVE_LOCALTIME_R
-+
-+/* Define to 1 if you have the `lstat' function. */
-+#undef HAVE_LSTAT
-+
-+/* Define to 1 if you have the `mallinfo' function. */
-+#undef HAVE_MALLINFO
-+
-+/* Define to 1 if you have the <memory.h> header file. */
-+#undef HAVE_MEMORY_H
-+
-+/* Define to 1 if you have the `mkstemp' function. */
-+#undef HAVE_MKSTEMP
-+
-+/* Define to 1 if you have a working `mmap' system call. */
-+#undef HAVE_MMAP
-+
-+/* Define to 1 if libpapi available */
-+#undef HAVE_PAPI
-+
-+/* Define to 1 if you have the <pwd.h> header file. */
-+#undef HAVE_PWD_H
-+
-+/* Have the Xrandr extension library */
-+#undef HAVE_RANDR
-+
-+/* Define to 1 if shm.h is available */
-+#undef HAVE_SHM_H
-+
-+/* Define to 1 if sigsetjmp is available */
-+#undef HAVE_SIGSETJMP
-+
-+/* Have the sockaddr_un.sun_len member */
-+#undef HAVE_SOCKADDR_UN_SUN_LEN
-+
-+/* Define to 1 if solaris xinerama is available */
-+#undef HAVE_SOLARIS_XINERAMA
-+
-+/* Define to 1 if you have the <stdint.h> header file. */
-+#undef HAVE_STDINT_H
-+
-+/* Define to 1 if you have the <stdlib.h> header file. */
-+#undef HAVE_STDLIB_H
-+
-+/* Define to 1 if you have the <strings.h> header file. */
-+#undef HAVE_STRINGS_H
-+
-+/* Define to 1 if you have the <string.h> header file. */
-+#undef HAVE_STRING_H
-+
-+/* Define to 1 if you have the <sys/param.h> header file. */
-+#undef HAVE_SYS_PARAM_H
-+
-+/* Define to 1 if sys/select.h is available */
-+#undef HAVE_SYS_SELECT_H
-+
-+/* Define to 1 if you have the <sys/stat.h> header file. */
-+#undef HAVE_SYS_STAT_H
-+
-+/* Define to 1 if sys/sysinfo.h is available */
-+#undef HAVE_SYS_SYSINFO_H
-+
-+/* Define to 1 if sys/systeminfo.h is available */
-+#undef HAVE_SYS_SYSTEMINFO_H
-+
-+/* Define to 1 if you have the <sys/time.h> header file. */
-+#undef HAVE_SYS_TIME_H
-+
-+/* Define to 1 if you have the <sys/types.h> header file. */
-+#undef HAVE_SYS_TYPES_H
-+
-+/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
-+#undef HAVE_SYS_WAIT_H
-+
-+/* Define to 1 if you have the <unistd.h> header file. */
-+#undef HAVE_UNISTD_H
-+
-+/* Have uxtheme.h include file */
-+#undef HAVE_UXTHEME_H
-+
-+/* Have wchar.h include file */
-+#undef HAVE_WCHAR_H
-+
-+/* Have wctype.h include file */
-+#undef HAVE_WCTYPE_H
-+
-+/* Define if we have X11R6 */
-+#undef HAVE_X11R6
-+
-+/* Have the XCOMPOSITE X extension */
-+#undef HAVE_XCOMPOSITE
-+
-+/* Define to 1 if you have the `XConvertCase' function. */
-+#undef HAVE_XCONVERTCASE
-+
-+/* Have the Xcursor library */
-+#undef HAVE_XCURSOR
-+
-+/* Have the XDAMAGE X extension */
-+#undef HAVE_XDAMAGE
-+
-+/* Have the XFIXES X extension */
-+#undef HAVE_XFIXES
-+
-+/* Define to 1 if XFree Xinerama is available */
-+#undef HAVE_XFREE_XINERAMA
-+
-+/* Define to 1 if xinerama is available */
-+#undef HAVE_XINERAMA
-+
-+/* Define to 1 if you have the `XInternAtoms' function. */
-+#undef HAVE_XINTERNATOMS
-+
-+/* Define to use XKB extension */
-+#undef HAVE_XKB
-+
-+/* Define to 1 if xshm.h is available */
-+#undef HAVE_XSHM_H
-+
-+/* Have the SYNC extension library */
-+#undef HAVE_XSYNC
-+
-+/* Define if _NL_MEASUREMENT_MEASUREMENT is available */
-+#undef HAVE__NL_MEASUREMENT_MEASUREMENT
-+
-+/* Define if _NL_PAPER_HEIGHT is available */
-+#undef HAVE__NL_PAPER_HEIGHT
-+
-+/* Define if _NL_PAPER_WIDTH is available */
-+#undef HAVE__NL_PAPER_WIDTH
-+
-+/* Define if _NL_TIME_FIRST_WEEKDAY is available */
-+#undef HAVE__NL_TIME_FIRST_WEEKDAY
-+
-+/* Define to 1 if you have the `_NSGetEnviron' function. */
-+#undef HAVE__NSGETENVIRON
-+
-+/* Define to the sub-directory in which libtool stores uninstalled libraries.
-+   */
-+#undef LT_OBJDIR
-+
-+/* Define if <X11/extensions/XIproto.h> needed for xReply */
-+#undef NEED_XIPROTO_H_FOR_XREPLY
-+
-+/* Define to 1 if fd_set is not available */
-+#undef NO_FD_SET
-+
-+/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-+#undef NO_MINUS_C_MINUS_O
-+
-+/* Define to the address where bug reports for this package should be sent. */
-+#undef PACKAGE_BUGREPORT
-+
-+/* Define to the full name of this package. */
-+#undef PACKAGE_NAME
-+
-+/* Define to the full name and version of this package. */
-+#undef PACKAGE_STRING
-+
-+/* Define to the one symbol short name of this package. */
-+#undef PACKAGE_TARNAME
-+
-+/* Define to the home page for this package. */
-+#undef PACKAGE_URL
-+
-+/* Define to the version of this package. */
-+#undef PACKAGE_VERSION
-+
-+/* Define as the return type of signal handlers (`int' or `void'). */
-+#undef RETSIGTYPE
-+
-+/* Define to 1 if you have the ANSI C header files. */
-+#undef STDC_HEADERS
-+
-+/* Define to 1 if gmodule works and should be used */
-+#undef USE_GMODULE
-+
-+/* Define to 1 if medialib is available and should be used */
-+#undef USE_MEDIALIB
-+
-+/* Define to 1 if medialib 2.5 is available */
-+#undef USE_MEDIALIB25
-+
-+/* Define to 1 if XInput 2.0 is available */
-+#undef XINPUT_2
-+
-+/* Define to 1 if no XInput should be used */
-+#undef XINPUT_NONE
-+
-+/* Define to 1 if XFree XInput should be used */
-+#undef XINPUT_XFREE
-+
-+/* Define to 1 if the X Window System is missing or not being used. */
-+#undef X_DISPLAY_MISSING
-+
-+/* Number of bits in a file offset, on hosts where this is settable. */
-+#undef _FILE_OFFSET_BITS
-+
-+/* Define for large files, on AIX-style hosts. */
-+#undef _LARGE_FILES
-+
-+/* Define to empty if `const' does not conform to ANSI C. */
-+#undef const
-+
-+/* Define to `int' if <sys/types.h> doesn't define. */
-+#undef gid_t
-+
-+/* Define to `int' if <sys/types.h> doesn't define. */
-+#undef uid_t
-Index: gtk+3.0-2.90.6/configure
-===================================================================
---- gtk+3.0-2.90.6.orig/configure
-+++ gtk+3.0-2.90.6/configure
+diff --git a/configure b/configure
+index 4846633..d1f9650 100755
+--- a/configure
++++ b/configure
 @@ -1,6 +1,6 @@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.66 for gtk+ 2.90.6.
-+# Generated by GNU Autoconf 2.67 for gtk+ 2.90.6.
+-# Generated by GNU Autoconf 2.66 for gtk+ 2.91.0.
++# Generated by GNU Autoconf 2.67 for gtk+ 2.91.0.
  #
  # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B>.
  #
-@@ -173,14 +173,6 @@
+@@ -173,14 +173,6 @@ test x\$exitcode = x0 || exit 1"
    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
@@ -8548,7 +8212,7 @@
  test \$(( 1 + 1 )) = 2 || exit 1"
    if (eval "$as_required") 2>/dev/null; then :
    as_have_required=yes
-@@ -537,8 +529,155 @@
+@@ -537,8 +529,155 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
  # Sed expression to map a string onto a valid variable name.
  as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
  
@@ -8704,24 +8368,7 @@
  
  test -n "$DJDIR" || exec 7<&0 </dev/null
  exec 6>&1
-@@ -674,6 +813,7 @@
- GDK_DEP_LIBS
- GDK_EXTRA_CFLAGS
- GDK_EXTRA_LIBS
-+GDK_PRIVATE_PACKAGES
- GDK_PACKAGES
- USE_DIRECTFB_FALSE
- USE_DIRECTFB_TRUE
-@@ -790,6 +930,8 @@
- CCASDEPMODE
- CCASFLAGS
- CCAS
-+ENABLE_STATIC_FALSE
-+ENABLE_STATIC_TRUE
- CXXCPP
- CPP
- OTOOL64
-@@ -797,6 +939,7 @@
+@@ -793,6 +932,7 @@ OTOOL
  LIPO
  NMEDIT
  DSYMUTIL
@@ -8729,18 +8376,25 @@
  RANLIB
  AR
  LN_S
-@@ -944,6 +1087,10 @@
- enable_shm
+@@ -940,7 +1080,6 @@ with_pic
+ enable_fast_install
+ with_gnu_ld
+ enable_libtool_lock
+-with_gnu_ld
+ enable_largefile
+ enable_debug
  enable_xkb
- enable_xinerama
-+enable_xrandr
-+enable_xfixes
-+enable_xcomposite
-+enable_xdamage
- enable_rebuilds
- enable_visibility
- with_xinput
-@@ -1052,8 +1199,9 @@
+@@ -975,9 +1114,6 @@ LIBS
+ CPPFLAGS
+ CXX
+ CXXFLAGS
+-LDFLAGS
+-LIBS
+-CPPFLAGS
+ CCC
+ CPP
+ CXXCPP
+@@ -1053,8 +1189,9 @@ do
    fi
  
    case $ac_option in
@@ -8752,29 +8406,16 @@
    esac
  
    # Accept the important Cygnus configure options, so we can diagnose typos.
-@@ -1631,6 +1779,12 @@
-   --enable-xkb            support XKB [default=maybe]
-   --enable-xinerama       support xinerama extension if available
-                           [default=yes]
-+  --enable-xrandr         support XRandR extension if available [default=yes]
-+  --enable-xfixes         support XFixes extension if available [default=yes]
-+  --enable-xcomposite     support X Composite extension if available
-+                          [default=yes]
-+  --enable-xdamage        support X Damage extension if available
-+                          [default=yes]
-   --disable-rebuilds      disable all source autogeneration rules
-   --disable-visibility    do not use ELF visibility attributes
-   --enable-explicit-deps=[yes/no/auto]
-@@ -1769,7 +1923,7 @@
+@@ -1764,7 +1901,7 @@ test -n "$ac_init_help" && exit $ac_status
  if $ac_init_version; then
    cat <<\_ACEOF
- gtk+ configure 2.90.6
+ gtk+ configure 2.91.0
 -generated by GNU Autoconf 2.66
 +generated by GNU Autoconf 2.67
  
  Copyright (C) 2010 Free Software Foundation, Inc.
  This configure script is free software; the Free Software Foundation
-@@ -1956,7 +2110,7 @@
+@@ -1951,7 +2088,7 @@ $as_echo "$ac_try_echo"; } >&5
      mv -f conftest.er1 conftest.err
    fi
    $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
@@ -8783,7 +8424,7 @@
  	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
  	 test ! -s conftest.err
         }; then :
-@@ -2102,7 +2256,7 @@
+@@ -2097,7 +2234,7 @@ $as_echo "$ac_try_echo"; } >&5
      mv -f conftest.er1 conftest.err
    fi
    $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
@@ -8792,7 +8433,7 @@
  	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
  	 test ! -s conftest.err
         }; then :
-@@ -2211,7 +2365,7 @@
+@@ -2206,7 +2343,7 @@ if ac_fn_c_try_cpp "$LINENO"; then :
  else
    ac_header_preproc=no
  fi
@@ -8801,16 +8442,16 @@
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
  $as_echo "$ac_header_preproc" >&6; }
  
-@@ -2316,7 +2470,7 @@
+@@ -2311,7 +2448,7 @@ This file contains any messages produced by compilers while
  running configure, to aid debugging if configure makes a mistake.
  
- It was created by gtk+ $as_me 2.90.6, which was
+ It was created by gtk+ $as_me 2.91.0, which was
 -generated by GNU Autoconf 2.66.  Invocation command line was
 +generated by GNU Autoconf 2.67.  Invocation command line was
  
    $ $0 $@
  
-@@ -2574,7 +2728,7 @@
+@@ -2569,7 +2706,7 @@ $as_echo "$as_me: loading site script $ac_site_file" >&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 $? "failed to load site script $ac_site_file
@@ -8819,7 +8460,7 @@
    fi
  done
  
-@@ -2810,11 +2964,11 @@
+@@ -2805,11 +2942,11 @@ am_lf='
  '
  case `pwd` in
    *[\\\"\#\$\&\'\`$am_lf]*)
@@ -8833,7 +8474,7 @@
  esac
  
  # Do `set' in a subshell so we don't clobber the current shell's
-@@ -3568,7 +3722,7 @@
+@@ -3563,7 +3700,7 @@ fi
  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
@@ -8842,7 +8483,7 @@
  
  # Provide some information about the compiler.
  $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-@@ -3683,7 +3837,7 @@
+@@ -3678,7 +3815,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
  { { $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
@@ -8851,7 +8492,7 @@
  else
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
-@@ -3726,7 +3880,7 @@
+@@ -3721,7 +3858,7 @@ 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
@@ -8860,7 +8501,7 @@
  fi
  rm -f conftest conftest$ac_cv_exeext
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-@@ -3785,7 +3939,7 @@
+@@ -3780,7 +3917,7 @@ $as_echo "$ac_try_echo"; } >&5
  $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  as_fn_error $? "cannot run C compiled programs.
  If you meant to cross compile, use \`--host'.
@@ -8869,7 +8510,7 @@
      fi
    fi
  fi
-@@ -3837,7 +3991,7 @@
+@@ -3832,7 +3969,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
  { { $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
@@ -8878,7 +8519,7 @@
  fi
  rm -f conftest.$ac_cv_objext conftest.$ac_ext
  fi
-@@ -4714,7 +4868,7 @@
+@@ -4709,7 +4846,7 @@ fi
  $as_echo "$ac_cv_build" >&6; }
  case $ac_cv_build in
  *-*-*) ;;
@@ -8887,7 +8528,7 @@
  esac
  build=$ac_cv_build
  ac_save_IFS=$IFS; IFS='-'
-@@ -4747,7 +4901,7 @@
+@@ -4742,7 +4879,7 @@ fi
  $as_echo "$ac_cv_host" >&6; }
  case $ac_cv_host in
  *-*-*) ;;
@@ -8896,7 +8537,7 @@
  esac
  host=$ac_cv_host
  ac_save_IFS=$IFS; IFS='-'
-@@ -5372,8 +5526,8 @@
+@@ -5367,8 +5504,8 @@ esac
  
  
  
@@ -8907,7 +8548,7 @@
  
  
  
-@@ -5389,75 +5543,6 @@
+@@ -5384,75 +5521,6 @@ macro_revision='1.3175'
  
  ltmain="$ac_aux_dir/ltmain.sh"
  
@@ -8983,7 +8624,7 @@
  { $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 :
-@@ -5923,11 +6008,8 @@
+@@ -5918,11 +5986,8 @@ if test "$lt_cv_path_NM" != "no"; then
    NM="$lt_cv_path_NM"
  else
    # Didn't find any BSD compatible name lister, look for dumpbin.
@@ -8997,7 +8638,7 @@
    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
-@@ -5971,7 +6053,7 @@
+@@ -5966,7 +6031,7 @@ fi
  fi
  if test -z "$DUMPBIN"; then
    ac_ct_DUMPBIN=$DUMPBIN
@@ -9006,7 +8647,7 @@
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
-@@ -6026,15 +6108,6 @@
+@@ -6021,15 +6086,6 @@ esac
    fi
  fi
  
@@ -9022,24 +8663,24 @@
  
    if test "$DUMPBIN" != ":"; then
      NM="$DUMPBIN"
-@@ -6054,13 +6127,13 @@
+@@ -6049,13 +6105,13 @@ if test "${lt_cv_nm_interface+set}" = set; then :
  else
    lt_cv_nm_interface="BSD nm"
    echo "int some_variable = 0;" > conftest.$ac_ext
 -  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)
-+  (eval echo "\"\$as_me:6130: $ac_compile\"" >&5)
++  (eval echo "\"\$as_me:6108: $ac_compile\"" >&5)
    (eval "$ac_compile" 2>conftest.err)
    cat conftest.err >&5
 -  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+  (eval echo "\"\$as_me:6133: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++  (eval echo "\"\$as_me:6111: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
    (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
    cat conftest.err >&5
 -  (eval echo "\"\$as_me:$LINENO: output\"" >&5)
-+  (eval echo "\"\$as_me:6136: output\"" >&5)
++  (eval echo "\"\$as_me:6114: output\"" >&5)
    cat conftest.out >&5
    if $GREP 'External.*some_variable' conftest.out > /dev/null; then
      lt_cv_nm_interface="MS dumpbin"
-@@ -6117,11 +6190,6 @@
+@@ -6112,11 +6168,6 @@ else
      lt_cv_sys_max_cmd_len=8192;
      ;;
  
@@ -9051,7 +8692,7 @@
    amigaos*)
      # On AmigaOS with pdksh, this test takes hours, literally.
      # So we just punt and use a minimum line length of 8192.
-@@ -6186,8 +6254,8 @@
+@@ -6181,8 +6232,8 @@ else
        # 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.
@@ -9062,7 +8703,7 @@
  	      test $i != 17 # 1/2 MB should be enough
        do
          i=`expr $i + 1`
-@@ -6455,18 +6523,16 @@
+@@ -6450,18 +6501,16 @@ mingw* | pw32*)
    # Base MSYS/MinGW do not provide the 'file' command needed by
    # func_win32_libid shell function, so use a weaker test based on 'objdump',
    # unless we find 'file', for example because we are cross-compiling.
@@ -9084,7 +8725,7 @@
    # 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'
-@@ -6496,10 +6562,6 @@
+@@ -6491,10 +6540,6 @@ gnu*)
    lt_cv_deplibs_check_method=pass_all
    ;;
  
@@ -9095,7 +8736,7 @@
  hpux10.20* | hpux11*)
    lt_cv_file_magic_cmd=/usr/bin/file
    case $host_cpu in
-@@ -6508,11 +6570,11 @@
+@@ -6503,11 +6548,11 @@ hpux10.20* | hpux11*)
      lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
      ;;
    hppa*64*)
@@ -9109,7 +8750,7 @@
      lt_cv_file_magic_test_file=/usr/lib/libc.sl
      ;;
    esac
-@@ -6538,7 +6600,7 @@
+@@ -6533,7 +6578,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
    lt_cv_deplibs_check_method=pass_all
    ;;
  
@@ -9118,7 +8759,7 @@
    if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
      lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
    else
-@@ -6950,18 +7012,6 @@
+@@ -6945,18 +6990,6 @@ if test -n "$RANLIB"; then
    old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
  fi
  
@@ -9137,7 +8778,7 @@
  
  
  
-@@ -7131,8 +7181,8 @@
+@@ -7126,8 +7159,8 @@ _LT_EOF
    test $ac_status = 0; }; then
      # Now try to grab the symbols.
      nlist=conftest.nm
@@ -9148,16 +8789,16 @@
    ac_status=$?
    $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
    test $ac_status = 0; } && test -s "$nlist"; then
-@@ -7286,7 +7336,7 @@
+@@ -7281,7 +7314,7 @@ ia64-*-hpux*)
    ;;
  *-*-irix6*)
    # Find out which ABI we are using.
 -  echo '#line '$LINENO' "configure"' > conftest.$ac_ext
-+  echo '#line 7339 "configure"' > conftest.$ac_ext
++  echo '#line 7317 "configure"' > conftest.$ac_ext
    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
-@@ -7998,38 +8048,6 @@
+@@ -7993,38 +8026,6 @@ rm -f core conftest.err conftest.$ac_objext \
  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; }
@@ -9196,7 +8837,7 @@
      case $host_os in
      rhapsody* | darwin1.[012])
        _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-@@ -8057,7 +8075,7 @@
+@@ -8052,7 +8053,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
      else
        _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
      fi
@@ -9205,7 +8846,7 @@
        _lt_dsymutil='~$DSYMUTIL $lib || :'
      else
        _lt_dsymutil=
-@@ -8107,7 +8125,7 @@
+@@ -8102,7 +8103,7 @@ else
    # Broken: fails on valid input.
  continue
  fi
@@ -9214,7 +8855,7 @@
  
    # OK, works on sane cases.  Now check whether nonexistent headers
    # can be detected and how.
-@@ -8123,11 +8141,11 @@
+@@ -8118,11 +8119,11 @@ else
  ac_preproc_ok=:
  break
  fi
@@ -9228,7 +8869,7 @@
  if $ac_preproc_ok; then :
    break
  fi
-@@ -8166,7 +8184,7 @@
+@@ -8161,7 +8162,7 @@ else
    # Broken: fails on valid input.
  continue
  fi
@@ -9237,7 +8878,7 @@
  
    # OK, works on sane cases.  Now check whether nonexistent headers
    # can be detected and how.
-@@ -8182,18 +8200,18 @@
+@@ -8177,18 +8178,18 @@ else
  ac_preproc_ok=:
  break
  fi
@@ -9259,49 +8900,10 @@
  fi
  
  ac_ext=c
-@@ -8347,52 +8365,27 @@
+@@ -8342,6 +8343,530 @@ done
  
  
  
--
--
--# Set options
--# Check whether --enable-static was given.
--if test "${enable_static+set}" = set; then :
--  enableval=$enable_static; p=${PACKAGE-default}
--    case $enableval in
--    yes) enable_static=yes ;;
--    no) enable_static=no ;;
--    *)
--     enable_static=no
--      # Look at the argument we got.  We use all the common list separators.
--      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
--      for pkg in $enableval; do
--	IFS="$lt_save_ifs"
--	if test "X$pkg" = "X$p"; then
--	  enable_static=yes
--	fi
--      done
--      IFS="$lt_save_ifs"
--      ;;
--    esac
--else
--  enable_static=no
--fi
--
--
--
--
--
--
--
--enable_win32_dll=yes
--
--case $host in
--*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
--  if test -n "$ac_tool_prefix"; then
--  # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
--set dummy ${ac_tool_prefix}as; ac_word=$2
 +ac_ext=cpp
 +ac_cpp='$CXXCPP $CPPFLAGS'
 +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -9316,138 +8918,101 @@
 +  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_AS+set}" = set; then :
++{ $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 "$AS"; then
--  ac_cv_prog_AS="$AS" # Let the user override the test.
++  $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
-@@ -8401,7 +8394,7 @@
-   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_AS="${ac_tool_prefix}as"
++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
-@@ -8411,28 +8404,32 @@
- 
- fi
- fi
--AS=$ac_cv_prog_AS
--if test -n "$AS"; then
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS" >&5
--$as_echo "$AS" >&6; }
++    $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
- 
- 
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++
 +    test -n "$CXX" && break
 +  done
- fi
--if test -z "$ac_cv_prog_AS"; then
--  ac_ct_AS=$AS
--  # Extract the first word of "as", so it can be a program name with args.
--set dummy as; ac_word=$2
++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_AS+set}" = set; then :
++{ $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_AS"; then
--  ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test.
++  $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
-@@ -8441,7 +8438,7 @@
-   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_AS="as"
++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
-@@ -8451,17 +8448,21 @@
- 
- fi
- fi
--ac_ct_AS=$ac_cv_prog_ac_ct_AS
--if test -n "$ac_ct_AS"; then
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5
--$as_echo "$ac_ct_AS" >&6; }
++    $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
- 
--  if test "x$ac_ct_AS" = x; then
--    AS="false"
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
 +
 +  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:)
-@@ -8469,30 +8470,571 @@
- $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- ac_tool_warned=yes ;;
- esac
--    AS=$ac_ct_AS
++  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
--else
--  AS="$ac_cv_prog_AS"
- fi
- 
--  if test -n "$ac_tool_prefix"; then
--  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
--set dummy ${ac_tool_prefix}dlltool; ac_word=$2
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_DLLTOOL+set}" = set; then :
--  $as_echo_n "(cached) " >&6
--else
--  if test -n "$DLLTOOL"; then
--  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
--else
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--    for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++  fi
++fi
++
 +  fi
 +fi
 +# Provide some information about the compiler.
@@ -9863,156 +9428,19 @@
 +fi
 +
 +
-+
-+
-+# Set options
-+# Check whether --enable-static was given.
-+if test "${enable_static+set}" = set; then :
-+  enableval=$enable_static; p=${PACKAGE-default}
-+    case $enableval in
-+    yes) enable_static=yes ;;
-+    no) enable_static=no ;;
-+    *)
-+     enable_static=no
-+      # Look at the argument we got.  We use all the common list separators.
-+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-+      for pkg in $enableval; do
-+	IFS="$lt_save_ifs"
-+	if test "X$pkg" = "X$p"; then
-+	  enable_static=yes
-+	fi
-+      done
-+      IFS="$lt_save_ifs"
-+      ;;
-+    esac
-+else
-+  enable_static=no
-+fi
-+
-+
-+
-+
-+
-+
-+
-+enable_win32_dll=yes
-+
-+case $host in
+ 
+ 
+ # Set options
+@@ -8377,7 +8902,7 @@ fi
+ 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
-+{ $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_AS+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$AS"; then
-+  ac_cv_prog_AS="$AS" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_AS="${ac_tool_prefix}as"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+AS=$ac_cv_prog_AS
-+if test -n "$AS"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS" >&5
-+$as_echo "$AS" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+fi
-+if test -z "$ac_cv_prog_AS"; then
-+  ac_ct_AS=$AS
-+  # Extract the first word of "as", so it can be a program name with args.
-+set dummy as; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_ac_ct_AS+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$ac_ct_AS"; then
-+  ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_ac_ct_AS="as"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_AS=$ac_cv_prog_ac_ct_AS
-+if test -n "$ac_ct_AS"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5
-+$as_echo "$ac_ct_AS" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+  if test "x$ac_ct_AS" = x; then
-+    AS="false"
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    AS=$ac_ct_AS
-+  fi
-+else
-+  AS="$ac_cv_prog_AS"
-+fi
-+
-+  if test -n "$ac_tool_prefix"; then
-+  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_DLLTOOL+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$DLLTOOL"; then
-+  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
-     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -8798,7 +9340,6 @@
+   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
+@@ -8793,7 +9318,6 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
  
  
  
@@ -10020,16 +9448,10 @@
  test -z "$LN_S" && LN_S="ln -s"
  
  
-@@ -8841,9 +9382,22 @@
+@@ -8843,6 +9367,19 @@ _ACEOF
  
  
  
--cat >>confdefs.h <<_ACEOF
--#define LT_OBJDIR "$lt_cv_objdir/"
--_ACEOF
-+cat >>confdefs.h <<_ACEOF
-+#define LT_OBJDIR "$lt_cv_objdir/"
-+_ACEOF
 +
 +
 +
@@ -10043,10 +9465,10 @@
 +
 +
 +
- 
- 
- 
-@@ -8860,6 +9414,23 @@
+ case $host_os in
+ aix3*)
+   # AIX sometimes has problems with the GCC collect2 program.  For some
+@@ -8855,6 +9392,23 @@ aix3*)
    ;;
  esac
  
@@ -10070,7 +9492,7 @@
  # Global variables:
  ofile=libtool
  can_build_shared=yes
-@@ -8888,7 +9459,7 @@
+@@ -8883,7 +9437,7 @@ for cc_temp in $compiler""; do
      *) break;;
    esac
  done
@@ -10079,7 +9501,7 @@
  
  
  # Only perform the check for file, if the check method requires it
-@@ -9088,17 +9659,16 @@
+@@ -9083,17 +9637,16 @@ _lt_linker_boilerplate=`cat conftest.err`
  $RM -r conftest*
  
  
@@ -10102,17 +9524,17 @@
  
    { $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; }
-@@ -9118,15 +9688,15 @@
+@@ -9113,15 +9666,15 @@ else
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9691: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:9669: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+   echo "$as_me:9695: \$? = $ac_status" >&5
++   echo "$as_me:9673: \$? = $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.
@@ -10121,7 +9543,7 @@
       $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
-@@ -9204,12 +9774,6 @@
+@@ -9199,12 +9752,6 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
        lt_prog_compiler_pic='-fno-common'
        ;;
  
@@ -10134,7 +9556,7 @@
      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
-@@ -9252,13 +9816,6 @@
+@@ -9247,13 +9794,6 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
        lt_prog_compiler_pic='-fPIC'
        ;;
      esac
@@ -10148,7 +9570,7 @@
    else
      # PORTME Check for flag to pass linker flags through the system compiler.
      case $host_os in
-@@ -9321,7 +9878,7 @@
+@@ -9316,7 +9856,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  	lt_prog_compiler_pic='--shared'
  	lt_prog_compiler_static='--static'
  	;;
@@ -10157,7 +9579,7 @@
          # Portland Group compilers (*not* the Pentium gcc compiler,
  	# which looks to be a dead project)
  	lt_prog_compiler_wl='-Wl,'
-@@ -9333,26 +9890,26 @@
+@@ -9328,26 +9868,26 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
          # All Alpha code is PIC.
          lt_prog_compiler_static='-non_shared'
          ;;
@@ -10192,7 +9614,7 @@
  	esac
  	;;
        esac
-@@ -9383,7 +9940,7 @@
+@@ -9378,7 +9918,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
        lt_prog_compiler_pic='-KPIC'
        lt_prog_compiler_static='-Bstatic'
        case $cc_basename in
@@ -10201,17 +9623,17 @@
  	lt_prog_compiler_wl='-Qoption ld ';;
        *)
  	lt_prog_compiler_wl='-Wl,';;
-@@ -9470,15 +10027,15 @@
+@@ -9465,15 +10005,15 @@ else
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:10030: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:10008: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+   echo "$as_me:10034: \$? = $ac_status" >&5
++   echo "$as_me:10012: \$? = $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.
@@ -10220,7 +9642,7 @@
       $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
-@@ -9526,7 +10083,7 @@
+@@ -9521,7 +10061,7 @@ else
       if test -s conftest.err; then
         # Append any errors to the config.log.
         cat conftest.err 1>&5
@@ -10229,17 +9651,17 @@
         $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
         if diff conftest.exp conftest.er2 >/dev/null; then
           lt_cv_prog_compiler_static_works=yes
-@@ -9575,16 +10132,16 @@
+@@ -9570,16 +10110,16 @@ else
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:10135: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:10113: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
 -   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+   echo "$as_me:10139: \$? = $ac_status" >&5
++   echo "$as_me:10117: \$? = $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
@@ -10249,17 +9671,17 @@
       $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
-@@ -9630,16 +10187,16 @@
+@@ -9625,16 +10165,16 @@ else
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:10190: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:10168: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
 -   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+   echo "$as_me:10194: \$? = $ac_status" >&5
++   echo "$as_me:10172: \$? = $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
@@ -10269,7 +9691,7 @@
       $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
-@@ -9749,36 +10306,13 @@
+@@ -9744,36 +10284,13 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
    openbsd*)
      with_gnu_ld=no
      ;;
@@ -10309,7 +9731,7 @@
      # If archive_cmds runs LD, not CC, wlarc should be empty
      wlarc='${wl}'
  
-@@ -9812,12 +10346,11 @@
+@@ -9807,12 +10324,11 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
  	ld_shlibs=no
  	cat <<_LT_EOF 1>&2
  
@@ -10325,7 +9747,7 @@
  
  _LT_EOF
        fi
-@@ -9853,7 +10386,6 @@
+@@ -9848,7 +10364,6 @@ _LT_EOF
        # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
        # as there is no search path for DLLs.
        hardcode_libdir_flag_spec='-L$libdir'
@@ -10333,7 +9755,7 @@
        allow_undefined_flag=unsupported
        always_export_symbols=no
        enable_shared_with_static_runtimes=yes
-@@ -9875,11 +10407,6 @@
+@@ -9870,11 +10385,6 @@ _LT_EOF
        fi
        ;;
  
@@ -10345,7 +9767,7 @@
      interix[3-9]*)
        hardcode_direct=no
        hardcode_shlibpath_var=no
-@@ -9909,12 +10436,11 @@
+@@ -9904,12 +10414,11 @@ _LT_EOF
  	tmp_sharedflag='-shared'
  	case $cc_basename,$host_cpu in
          pgcc*)				# Portland Group C compiler
@@ -10361,7 +9783,7 @@
  	  tmp_addflag=' $pic_flag -Mnomain' ;;
  	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
  	  tmp_addflag=' -i_dynamic' ;;
-@@ -9925,17 +10451,13 @@
+@@ -9920,17 +10429,13 @@ _LT_EOF
  	lf95*)				# Lahey Fortran 8.1
  	  whole_archive_flag_spec=
  	  tmp_sharedflag='--shared' ;;
@@ -10381,7 +9803,7 @@
  	  compiler_needs_object=yes
  	  tmp_sharedflag='-G' ;;
  	*Sun\ F*)			# Sun Fortran 8.3
-@@ -9951,17 +10473,17 @@
+@@ -9946,17 +10451,17 @@ _LT_EOF
          fi
  
  	case $cc_basename in
@@ -10402,7 +9824,7 @@
  	  fi
  	  ;;
  	esac
-@@ -9970,7 +10492,7 @@
+@@ -9965,7 +10470,7 @@ _LT_EOF
        fi
        ;;
  
@@ -10411,7 +9833,7 @@
        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
  	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
  	wlarc=
-@@ -10082,10 +10604,8 @@
+@@ -10077,10 +10582,8 @@ _LT_EOF
        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
@@ -10423,7 +9845,7 @@
  	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
-@@ -10147,6 +10667,7 @@
+@@ -10142,6 +10645,7 @@ _LT_EOF
  	if test "$aix_use_runtimelinking" = yes; then
  	  shared_flag="$shared_flag "'${wl}-G'
  	fi
@@ -10431,7 +9853,7 @@
        else
  	# not using gcc
  	if test "$host_cpu" = ia64; then
-@@ -10203,7 +10724,7 @@
+@@ -10198,7 +10702,7 @@ rm -f core conftest.err conftest.$ac_objext \
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
          hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -10440,7 +9862,7 @@
        else
  	if test "$host_cpu" = ia64; then
  	  hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
-@@ -10247,13 +10768,8 @@
+@@ -10242,13 +10746,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  	  # -berok will link without error, but may produce a broken library.
  	  no_undefined_flag=' ${wl}-bernotok'
  	  allow_undefined_flag=' ${wl}-berok'
@@ -10456,7 +9878,7 @@
  	  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'
-@@ -10292,7 +10808,7 @@
+@@ -10287,7 +10786,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
        # Tell ltmain to make .dll files, not .so files.
        shrext_cmds=".dll"
        # FIXME: Setting linknames here is a bad hack.
@@ -10465,7 +9887,7 @@
        # The linker will automatically build a .lib file if we build a DLL.
        old_archive_from_new_cmds='true'
        # FIXME: Should let the user specify the lib program.
-@@ -10308,11 +10824,7 @@
+@@ -10303,11 +10802,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
    hardcode_direct=no
    hardcode_automatic=yes
    hardcode_shlibpath_var=unsupported
@@ -10478,7 +9900,7 @@
    link_all_deplibs=yes
    allow_undefined_flag="$_lt_dar_allow_undefined"
    case $cc_basename in
-@@ -10320,7 +10832,7 @@
+@@ -10315,7 +10810,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       *) _lt_dar_can_shared=$GCC ;;
    esac
    if test "$_lt_dar_can_shared" = "yes"; then
@@ -10487,7 +9909,7 @@
      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}"
-@@ -10386,7 +10898,7 @@
+@@ -10381,7 +10876,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
        ;;
  
      hpux10*)
@@ -10496,7 +9918,7 @@
  	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'
-@@ -10405,7 +10917,7 @@
+@@ -10400,7 +10895,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
        ;;
  
      hpux11*)
@@ -10505,7 +9927,7 @@
  	case $host_cpu in
  	hppa*64*)
  	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-@@ -10426,46 +10938,7 @@
+@@ -10421,46 +10916,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
  	  ;;
  	*)
@@ -10553,7 +9975,7 @@
  	  ;;
  	esac
        fi
-@@ -10493,7 +10966,7 @@
+@@ -10488,7 +10944,7 @@ fi
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -10562,7 +9984,7 @@
  	# 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.
-@@ -10504,15 +10977,15 @@
+@@ -10499,15 +10955,15 @@ fi
  int foo(void) {}
  _ACEOF
  if ac_fn_c_try_link "$LINENO"; then :
@@ -10581,7 +10003,7 @@
        fi
        archive_cmds_need_lc='no'
        hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-@@ -10521,7 +10994,7 @@
+@@ -10516,7 +10972,7 @@ rm -f core conftest.err conftest.$ac_objext \
        link_all_deplibs=yes
        ;;
  
@@ -10590,7 +10012,7 @@
        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
  	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
-@@ -10574,17 +11047,17 @@
+@@ -10569,17 +11025,17 @@ rm -f core conftest.err conftest.$ac_objext \
        hardcode_libdir_flag_spec='-L$libdir'
        hardcode_minus_L=yes
        allow_undefined_flag=unsupported
@@ -10611,7 +10033,7 @@
        fi
        archive_cmds_need_lc='no'
        hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-@@ -10594,13 +11067,13 @@
+@@ -10589,13 +11045,13 @@ rm -f core conftest.err conftest.$ac_objext \
      osf4* | osf5*)	# as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
  	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -10628,7 +10050,7 @@
  
  	# Both c and cxx compiler support -rpath directly
  	hardcode_libdir_flag_spec='-rpath $libdir'
-@@ -10803,50 +11276,44 @@
+@@ -10798,50 +11254,44 @@ x|xyes)
        # 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; }
@@ -10708,7 +10130,7 @@
        ;;
      esac
    fi
-@@ -11017,23 +11484,16 @@
+@@ -11012,23 +11462,16 @@ if test "$GCC" = yes; then
      darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
      *) lt_awk_arg="/^libraries:/" ;;
    esac
@@ -10738,7 +10160,7 @@
    # 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=
-@@ -11046,7 +11506,7 @@
+@@ -11041,7 +11484,7 @@ if test "$GCC" = yes; then
  	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
      fi
    done
@@ -10747,7 +10169,7 @@
  BEGIN {RS=" "; FS="/|\n";} {
    lt_foo="";
    lt_count=0;
-@@ -11066,13 +11526,7 @@
+@@ -11061,13 +11504,7 @@ BEGIN {RS=" "; FS="/|\n";} {
    if (lt_foo != "") { lt_freq[lt_foo]++; }
    if (lt_freq[lt_foo] == 1) { print lt_foo; }
  }'`
@@ -10762,7 +10184,7 @@
  else
    sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
  fi
-@@ -11160,7 +11614,7 @@
+@@ -11155,7 +11592,7 @@ amigaos*)
    m68k)
      library_names_spec='$libname.ixlibrary $libname.a'
      # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -10771,7 +10193,7 @@
      ;;
    esac
    ;;
-@@ -11213,12 +11667,23 @@
+@@ -11208,12 +11645,23 @@ cygwin* | mingw* | pw32* | cegcc*)
      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}'
@@ -10797,7 +10219,7 @@
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
-@@ -11318,19 +11783,6 @@
+@@ -11313,19 +11761,6 @@ gnu*)
    hardcode_into_libs=yes
    ;;
  
@@ -10817,7 +10239,7 @@
  hpux9* | hpux10* | hpux11*)
    # Give a soname corresponding to the major version so that dld.sl refuses to
    # link against other versions.
-@@ -11373,10 +11825,8 @@
+@@ -11368,10 +11803,8 @@ hpux9* | hpux10* | hpux11*)
      soname_spec='${libname}${release}${shared_ext}$major'
      ;;
    esac
@@ -10829,7 +10251,7 @@
    ;;
  
  interix[3-9]*)
-@@ -11443,17 +11893,12 @@
+@@ -11438,17 +11871,12 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=no
@@ -10852,7 +10274,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -11466,31 +11911,23 @@
+@@ -11461,31 +11889,23 @@ main ()
  _ACEOF
  if ac_fn_c_try_link "$LINENO"; then :
    if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
@@ -10889,7 +10311,7 @@
    fi
  
    # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -11502,6 +11939,18 @@
+@@ -11497,6 +11917,18 @@ fi
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -10908,7 +10330,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -11792,11 +12241,6 @@
+@@ -11787,11 +12219,6 @@ fi
  
  
  
@@ -10920,16 +10342,16 @@
    { $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=
-@@ -12127,7 +12571,7 @@
+@@ -12122,7 +12549,7 @@ else
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<_LT_EOF
 -#line $LINENO "configure"
-+#line 12574 "configure"
++#line 12552 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -12168,13 +12612,7 @@
+@@ -12163,13 +12590,7 @@ else
  #  endif
  #endif
  
@@ -10944,7 +10366,7 @@
  int main ()
  {
    void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-@@ -12183,11 +12621,7 @@
+@@ -12178,11 +12599,7 @@ int main ()
    if (self)
      {
        if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
@@ -10957,16 +10379,16 @@
        /* dlclose (self); */
      }
    else
-@@ -12233,7 +12667,7 @@
+@@ -12228,7 +12645,7 @@ else
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<_LT_EOF
 -#line $LINENO "configure"
-+#line 12670 "configure"
++#line 12648 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -12274,13 +12708,7 @@
+@@ -12269,13 +12686,7 @@ else
  #  endif
  #endif
  
@@ -10981,7 +10403,7 @@
  int main ()
  {
    void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-@@ -12289,11 +12717,7 @@
+@@ -12284,11 +12695,7 @@ int main ()
    if (self)
      {
        if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
@@ -10994,46 +10416,10 @@
        /* dlclose (self); */
      }
    else
-@@ -12414,181 +12838,42 @@
-   # On AIX, shared libraries and static libraries use the same namespace, and
-   # are all built from PIC.
-   case $host_os in
--  aix3*)
--    test "$enable_shared" = yes && enable_static=no
--    if test -n "$RANLIB"; then
--      archive_cmds="$archive_cmds~\$RANLIB \$lib"
--      postinstall_cmds='$RANLIB $lib'
--    fi
--    ;;
--
--  aix[4-9]*)
--    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
--      test "$enable_shared" = yes && enable_static=no
--    fi
--    ;;
--  esac
--  { $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"
--
+@@ -12445,145 +12852,6 @@ 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
@@ -11099,25 +10485,10 @@
 -if $ac_preproc_ok; then :
 -  break
 -fi
-+  aix3*)
-+    test "$enable_shared" = yes && enable_static=no
-+    if test -n "$RANLIB"; then
-+      archive_cmds="$archive_cmds~\$RANLIB \$lib"
-+      postinstall_cmds='$RANLIB $lib'
-+    fi
-+    ;;
- 
+-
 -    done
 -    ac_cv_prog_CXXCPP=$CXXCPP
-+  aix[4-9]*)
-+    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-+      test "$enable_shared" = yes && enable_static=no
-+    fi
-+    ;;
-+  esac
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
-+$as_echo "$enable_shared" >&6; }
- 
+-
 -fi
 -  CXXCPP=$ac_cv_prog_CXXCPP
 -else
@@ -11144,19 +10515,13 @@
 -		     Syntax error
 -_ACEOF
 -if ac_fn_cxx_try_cpp "$LINENO"; then :
-+  { $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; }
- 
+-
 -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
@@ -11172,34 +10537,32 @@
 -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
--
- 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
- 
+-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'
-@@ -12615,8 +12900,6 @@
+@@ -12610,8 +12878,6 @@ module_cmds_CXX=
  module_expsym_cmds_CXX=
  link_all_deplibs_CXX=unknown
  old_archive_cmds_CXX=$old_archive_cmds
@@ -11208,7 +10571,7 @@
  no_undefined_flag_CXX=
  whole_archive_flag_spec_CXX=
  enable_shared_with_static_runtimes_CXX=no
-@@ -12699,7 +12982,7 @@
+@@ -12694,7 +12960,7 @@ $RM -r conftest*
      *) break;;
    esac
  done
@@ -11217,7 +10580,7 @@
  
  
    if test -n "$compiler"; then
-@@ -12861,7 +13144,7 @@
+@@ -12856,7 +13122,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
        # Commands to make compiler produce verbose output that lists
        # what "hidden" libraries, object files and flags are used when
        # linking a shared library.
@@ -11226,7 +10589,7 @@
  
      else
        GXX=no
-@@ -13003,7 +13286,7 @@
+@@ -12998,7 +13264,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
            hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
  
@@ -11235,7 +10598,7 @@
          else
            if test "$host_cpu" = ia64; then
  	    hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
-@@ -13047,13 +13330,8 @@
+@@ -13042,13 +13308,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  	    # -berok will link without error, but may produce a broken library.
  	    no_undefined_flag_CXX=' ${wl}-bernotok'
  	    allow_undefined_flag_CXX=' ${wl}-berok'
@@ -11251,7 +10614,7 @@
  	    archive_cmds_need_lc_CXX=yes
  	    # This is similar to how AIX traditionally builds its shared
  	    # libraries.
-@@ -13086,7 +13364,6 @@
+@@ -13081,7 +13342,6 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
          # _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'
@@ -11259,7 +10622,7 @@
          allow_undefined_flag_CXX=unsupported
          always_export_symbols_CXX=no
          enable_shared_with_static_runtimes_CXX=yes
-@@ -13113,11 +13390,7 @@
+@@ -13108,11 +13368,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
    hardcode_direct_CXX=no
    hardcode_automatic_CXX=yes
    hardcode_shlibpath_var_CXX=unsupported
@@ -11272,7 +10635,7 @@
    link_all_deplibs_CXX=yes
    allow_undefined_flag_CXX="$_lt_dar_allow_undefined"
    case $cc_basename in
-@@ -13125,7 +13398,7 @@
+@@ -13120,7 +13376,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       *) _lt_dar_can_shared=$GCC ;;
    esac
    if test "$_lt_dar_can_shared" = "yes"; then
@@ -11281,7 +10644,7 @@
      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}"
-@@ -13178,11 +13451,6 @@
+@@ -13173,11 +13429,6 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
        gnu*)
          ;;
  
@@ -11293,7 +10656,7 @@
        hpux9*)
          hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
          hardcode_libdir_separator_CXX=:
-@@ -13207,7 +13475,7 @@
+@@ -13202,7 +13453,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
              # 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.
@@ -11302,7 +10665,7 @@
              ;;
            *)
              if test "$GXX" = yes; then
-@@ -13272,7 +13540,7 @@
+@@ -13267,7 +13518,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  	    # 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.
@@ -11311,7 +10674,7 @@
  	    ;;
            *)
  	    if test "$GXX" = yes; then
-@@ -13315,7 +13583,7 @@
+@@ -13310,7 +13561,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
          case $cc_basename in
            CC*)
  	    # SGI C++
@@ -11320,7 +10683,7 @@
  
  	    # Archives containing C++ object files must be created using
  	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-@@ -13326,9 +13594,9 @@
+@@ -13321,9 +13572,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
            *)
  	    if test "$GXX" = yes; then
  	      if test "$with_gnu_ld" = no; then
@@ -11332,7 +10695,7 @@
  	      fi
  	    fi
  	    link_all_deplibs_CXX=yes
-@@ -13357,7 +13625,7 @@
+@@ -13352,7 +13603,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  	    # 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.
@@ -11341,7 +10704,7 @@
  
  	    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
  	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -13394,26 +13662,26 @@
+@@ -13389,26 +13640,26 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
            pgCC* | pgcpp*)
              # Portland Group C++ compiler
  	    case `$CC -V` in
@@ -11374,7 +10737,7 @@
  	      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'
  	      ;;
-@@ -13421,7 +13689,7 @@
+@@ -13416,7 +13667,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
  	    hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
  	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
@@ -11383,7 +10746,7 @@
              ;;
  	  cxx*)
  	    # Compaq C++
-@@ -13440,9 +13708,9 @@
+@@ -13435,9 +13686,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  	    # 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.
@@ -11395,7 +10758,7 @@
  	    # 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'
-@@ -13462,13 +13730,13 @@
+@@ -13457,13 +13708,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  	      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'
@@ -11411,7 +10774,7 @@
  
  	      # Archives containing C++ object files must be created using
  	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
-@@ -13537,7 +13805,7 @@
+@@ -13532,7 +13783,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  	    export_dynamic_flag_spec_CXX='${wl}-E'
  	    whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
  	  fi
@@ -11420,7 +10783,7 @@
  	else
  	  ld_shlibs_CXX=no
  	fi
-@@ -13572,15 +13840,15 @@
+@@ -13567,15 +13818,15 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  	    case $host in
  	      osf3*)
  	        allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -11439,7 +10802,7 @@
  	          $RM $lib.exp'
  	        hardcode_libdir_flag_spec_CXX='-rpath $libdir'
  		;;
-@@ -13596,17 +13864,17 @@
+@@ -13591,17 +13842,17 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  	    # 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.
@@ -11460,7 +10823,7 @@
  		  ;;
  	      esac
  
-@@ -13616,7 +13884,7 @@
+@@ -13611,7 +13862,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  	      # Commands to make compiler produce verbose output that lists
  	      # what "hidden" libraries, object files and flags are used when
  	      # linking a shared library.
@@ -11469,7 +10832,7 @@
  
  	    else
  	      # FIXME: insert proper C++ library support
-@@ -13652,7 +13920,7 @@
+@@ -13647,7 +13898,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
        solaris*)
          case $cc_basename in
@@ -11478,7 +10841,7 @@
  	    # Sun C++ 4.2, 5.x and Centerline C++
              archive_cmds_need_lc_CXX=yes
  	    no_undefined_flag_CXX=' -zdefs'
-@@ -13673,7 +13941,7 @@
+@@ -13668,7 +13919,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  	    esac
  	    link_all_deplibs_CXX=yes
  
@@ -11487,7 +10850,7 @@
  
  	    # Archives containing C++ object files must be created using
  	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
-@@ -13700,7 +13968,7 @@
+@@ -13695,7 +13946,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  	        # Commands to make compiler produce verbose output that lists
  	        # what "hidden" libraries, object files and flags are used when
  	        # linking a shared library.
@@ -11496,7 +10859,7 @@
  	      else
  	        # g++ 2.7 appears to require `-G' NOT `-shared' on this
  	        # platform.
-@@ -13711,7 +13979,7 @@
+@@ -13706,7 +13957,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  	        # Commands to make compiler produce verbose output that lists
  	        # what "hidden" libraries, object files and flags are used when
  	        # linking a shared library.
@@ -11505,7 +10868,7 @@
  	      fi
  
  	      hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
-@@ -13765,10 +14033,6 @@
+@@ -13760,10 +14011,6 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
            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'
@@ -11516,7 +10879,7 @@
  	    ;;
  	  *)
  	    archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-@@ -13950,7 +14214,7 @@
+@@ -13945,7 +14192,7 @@ linux*)
  
  solaris*)
    case $cc_basename in
@@ -11525,7 +10888,7 @@
      # The more standards-conforming stlport4 library is
      # incompatible with the Cstd library. Avoid specifying
      # it if it's in CXXFLAGS. Ignore libCrun as
-@@ -14066,11 +14330,6 @@
+@@ -14061,11 +14308,6 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
        # DJGPP does not support shared libraries at all
        lt_prog_compiler_pic_CXX=
        ;;
@@ -11537,7 +10900,7 @@
      interix[3-9]*)
        # Interix 3.x gcc -fpic/-fPIC options generate broken code.
        # Instead, we relocate shared libraries at runtime.
-@@ -14209,8 +14468,8 @@
+@@ -14204,8 +14446,8 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  	    lt_prog_compiler_pic_CXX=
  	    lt_prog_compiler_static_CXX='-non_shared'
  	    ;;
@@ -11548,7 +10911,7 @@
  	    lt_prog_compiler_wl_CXX='-Wl,'
  	    lt_prog_compiler_pic_CXX='-qpic'
  	    lt_prog_compiler_static_CXX='-qstaticlink'
-@@ -14240,7 +14499,7 @@
+@@ -14235,7 +14477,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  	    ;;
  	esac
  	;;
@@ -11557,7 +10920,7 @@
  	;;
        *qnx* | *nto*)
          # QNX uses GNU C++, but need to define -shared option too, otherwise
-@@ -14272,7 +14531,7 @@
+@@ -14267,7 +14509,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  	;;
        solaris*)
  	case $cc_basename in
@@ -11566,17 +10929,17 @@
  	    # Sun C++ 4.2, 5.x and Centerline C++
  	    lt_prog_compiler_pic_CXX='-KPIC'
  	    lt_prog_compiler_static_CXX='-Bstatic'
-@@ -14364,15 +14623,15 @@
+@@ -14359,15 +14601,15 @@ else
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:14626: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:14604: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+   echo "$as_me:14630: \$? = $ac_status" >&5
++   echo "$as_me:14608: \$? = $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.
@@ -11585,7 +10948,7 @@
       $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
-@@ -14417,7 +14676,7 @@
+@@ -14412,7 +14654,7 @@ else
       if test -s conftest.err; then
         # Append any errors to the config.log.
         cat conftest.err 1>&5
@@ -11594,17 +10957,17 @@
         $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
         if diff conftest.exp conftest.er2 >/dev/null; then
           lt_cv_prog_compiler_static_works_CXX=yes
-@@ -14463,16 +14722,16 @@
+@@ -14458,16 +14700,16 @@ else
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:14725: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:14703: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
 -   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+   echo "$as_me:14729: \$? = $ac_status" >&5
++   echo "$as_me:14707: \$? = $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
@@ -11614,17 +10977,17 @@
       $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
-@@ -14515,16 +14774,16 @@
+@@ -14510,16 +14752,16 @@ else
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:14777: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:14755: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
 -   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+   echo "$as_me:14781: \$? = $ac_status" >&5
++   echo "$as_me:14759: \$? = $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
@@ -11634,7 +10997,7 @@
       $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
-@@ -14579,10 +14838,8 @@
+@@ -14574,10 +14816,8 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
    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
@@ -11646,7 +11009,7 @@
      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
-@@ -14593,6 +14850,9 @@
+@@ -14588,6 +14828,9 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
    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'
    ;;
@@ -11656,7 +11019,7 @@
    *)
      export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
    ;;
-@@ -14629,50 +14889,44 @@
+@@ -14624,50 +14867,44 @@ x|xyes)
        # 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; }
@@ -11736,7 +11099,7 @@
        ;;
      esac
    fi
-@@ -14829,7 +15083,7 @@
+@@ -14824,7 +15061,7 @@ amigaos*)
    m68k)
      library_names_spec='$libname.ixlibrary $libname.a'
      # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -11745,7 +11108,7 @@
      ;;
    esac
    ;;
-@@ -14882,11 +15136,23 @@
+@@ -14877,11 +15114,23 @@ cygwin* | mingw* | pw32* | cegcc*)
      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}'
@@ -11770,7 +11133,7 @@
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
-@@ -14985,19 +15251,6 @@
+@@ -14980,19 +15229,6 @@ gnu*)
    hardcode_into_libs=yes
    ;;
  
@@ -11790,7 +11153,7 @@
  hpux9* | hpux10* | hpux11*)
    # Give a soname corresponding to the major version so that dld.sl refuses to
    # link against other versions.
-@@ -15040,10 +15293,8 @@
+@@ -15035,10 +15271,8 @@ hpux9* | hpux10* | hpux11*)
      soname_spec='${libname}${release}${shared_ext}$major'
      ;;
    esac
@@ -11802,7 +11165,7 @@
    ;;
  
  interix[3-9]*)
-@@ -15110,17 +15361,12 @@
+@@ -15105,17 +15339,12 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=no
@@ -11825,7 +11188,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -15133,31 +15379,23 @@
+@@ -15128,31 +15357,23 @@ main ()
  _ACEOF
  if ac_fn_cxx_try_link "$LINENO"; then :
    if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
@@ -11862,7 +11225,7 @@
    fi
  
    # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -15169,6 +15407,18 @@
+@@ -15164,6 +15385,18 @@ fi
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -11881,7 +11244,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -15408,8 +15658,6 @@
+@@ -15403,8 +15636,6 @@ fi
  
  
  
@@ -11890,7 +11253,7 @@
      { $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=
-@@ -15497,15 +15745,16 @@
+@@ -15492,15 +15723,16 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
  : ${CONFIG_LT=./config.lt}
  { $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_LT" >&5
  $as_echo "$as_me: creating $CONFIG_LT" >&6;}
@@ -11912,7 +11275,7 @@
  ## -------------------- ##
  ## M4sh Initialization. ##
  ## -------------------- ##
-@@ -15630,6 +15879,7 @@
+@@ -15625,6 +15857,7 @@ export LANGUAGE
  (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
  
  
@@ -11920,7 +11283,7 @@
  # as_fn_error STATUS ERROR [LINENO LOG_FD]
  # ----------------------------------------
  # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-@@ -15838,7 +16088,7 @@
+@@ -15833,7 +16066,7 @@ $as_echo X"$as_dir" |
        test -d "$as_dir" && break
      done
      test -z "$as_dirs" || eval "mkdir $as_dirs"
@@ -11929,7 +11292,7 @@
  
  
  } # as_fn_mkdir_p
-@@ -15879,15 +16129,8 @@
+@@ -15874,15 +16107,8 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
  as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
  
  
@@ -11946,10 +11309,10 @@
  exec 5>>config.log
  {
    echo
-@@ -15912,9 +16155,9 @@
+@@ -15907,9 +16133,9 @@ Report bugs to <bug-libtool at gnu.org>."
  
  lt_cl_version="\
- gtk+ config.lt 2.90.6
+ gtk+ config.lt 2.91.0
 -configured by $0, generated by GNU Autoconf 2.66.
 +configured by $0, generated by GNU Autoconf 2.67.
  
@@ -11958,7 +11321,7 @@
  This config.lt script is free software; the Free Software Foundation
  gives unlimited permision to copy, distribute and modify it."
  
-@@ -15931,10 +16174,10 @@
+@@ -15926,10 +16152,10 @@ do
        lt_cl_silent=: ;;
  
      -*) as_fn_error $? "unrecognized option: $1
@@ -11971,7 +11334,7 @@
    esac
    shift
  done
-@@ -15954,203 +16197,186 @@
+@@ -15949,203 +16175,186 @@ cat >>"$CONFIG_LT" <<_LTEOF
  sed_quote_subst='$sed_quote_subst'
  double_quote_subst='$double_quote_subst'
  delay_variable_subst='$delay_variable_subst'
@@ -12349,7 +11712,7 @@
  GREP \
  EGREP \
  FGREP \
-@@ -16173,6 +16399,8 @@
+@@ -16168,6 +16377,8 @@ lt_cv_sys_global_symbol_pipe \
  lt_cv_sys_global_symbol_to_cdecl \
  lt_cv_sys_global_symbol_to_c_name_address \
  lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -12358,7 +11721,7 @@
  lt_prog_compiler_no_builtin_flag \
  lt_prog_compiler_wl \
  lt_prog_compiler_pic \
-@@ -16202,7 +16430,6 @@
+@@ -16197,7 +16408,6 @@ variables_saved_for_relink \
  libname_spec \
  library_names_spec \
  soname_spec \
@@ -12366,7 +11729,7 @@
  finish_eval \
  old_striplib \
  striplib \
-@@ -16213,7 +16440,6 @@
+@@ -16208,7 +16418,6 @@ predeps \
  postdeps \
  compiler_lib_search_path \
  LD_CXX \
@@ -12374,7 +11737,7 @@
  compiler_CXX \
  lt_prog_compiler_no_builtin_flag_CXX \
  lt_prog_compiler_wl_CXX \
-@@ -16239,9 +16465,9 @@
+@@ -16234,9 +16443,9 @@ postdep_objects_CXX \
  predeps_CXX \
  postdeps_CXX \
  compiler_lib_search_path_CXX; do
@@ -12386,7 +11749,7 @@
        ;;
      *)
        eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-@@ -16268,7 +16494,6 @@
+@@ -16263,7 +16472,6 @@ postuninstall_cmds \
  finish_cmds \
  sys_lib_search_path_spec \
  sys_lib_dlsearch_path_spec \
@@ -12394,7 +11757,7 @@
  old_archive_cmds_CXX \
  old_archive_from_new_cmds_CXX \
  old_archive_from_expsyms_cmds_CXX \
-@@ -16278,9 +16503,9 @@
+@@ -16273,9 +16481,9 @@ module_cmds_CXX \
  module_expsym_cmds_CXX \
  export_symbols_cmds_CXX \
  prelink_cmds_CXX; do
@@ -12406,7 +11769,7 @@
        ;;
      *)
        eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-@@ -16288,6 +16513,12 @@
+@@ -16283,6 +16491,12 @@ prelink_cmds_CXX; do
      esac
  done
  
@@ -12419,7 +11782,7 @@
  ac_aux_dir='$ac_aux_dir'
  xsi_shell='$xsi_shell'
  lt_shell_append='$lt_shell_append'
-@@ -16335,8 +16566,7 @@
+@@ -16330,8 +16544,7 @@ $as_echo "$as_me: creating $ofile" >&6;}
  # NOTE: Changes made to this file will be lost: look at ltmain.sh.
  #
  #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -12429,7 +11792,7 @@
  #   Written by Gordon Matzigkeit, 1996
  #
  #   This file is part of GNU Libtool.
-@@ -16376,13 +16606,13 @@
+@@ -16371,13 +16584,13 @@ macro_revision=$macro_revision
  build_old_libs=$enable_static
  
  # Assembler program.
@@ -12446,7 +11809,7 @@
  
  # Whether or not to build shared libraries.
  build_libtool_libs=$enable_shared
-@@ -16393,12 +16623,6 @@
+@@ -16388,12 +16601,6 @@ pic_mode=$pic_mode
  # Whether or not to optimize for fast installation.
  fast_install=$enable_fast_install
  
@@ -12459,7 +11822,7 @@
  # The host system.
  host_alias=$host_alias
  host=$host
-@@ -16448,6 +16672,10 @@
+@@ -16443,6 +16650,10 @@ SP2NL=$lt_lt_SP2NL
  # turn newlines into spaces.
  NL2SP=$lt_lt_NL2SP
  
@@ -12470,7 +11833,7 @@
  # Method to check whether dependent libraries are shared objects.
  deplibs_check_method=$lt_deplibs_check_method
  
-@@ -16466,9 +16694,6 @@
+@@ -16461,9 +16672,6 @@ RANLIB=$lt_RANLIB
  old_postinstall_cmds=$lt_old_postinstall_cmds
  old_postuninstall_cmds=$lt_old_postuninstall_cmds
  
@@ -12480,7 +11843,7 @@
  # A C compiler.
  LTCC=$lt_CC
  
-@@ -16490,6 +16715,12 @@
+@@ -16485,6 +16693,12 @@ global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name
  # The name of the directory that contains temporary libtool files.
  objdir=$objdir
  
@@ -12493,7 +11856,7 @@
  # Used to examine libraries when file_magic_cmd begins with "file".
  MAGIC_CMD=$MAGIC_CMD
  
-@@ -16552,9 +16783,6 @@
+@@ -16547,9 +16761,6 @@ library_names_spec=$lt_library_names_spec
  # The coded name of the library, if different from the real name.
  soname_spec=$lt_soname_spec
  
@@ -12503,7 +11866,7 @@
  # Command to use after installation of a shared archive.
  postinstall_cmds=$lt_postinstall_cmds
  
-@@ -16594,10 +16822,6 @@
+@@ -16589,10 +16800,6 @@ striplib=$lt_striplib
  # The linker used to build libraries.
  LD=$lt_LD
  
@@ -12514,7 +11877,7 @@
  # Commands used to build an old-style archive.
  old_archive_cmds=$lt_old_archive_cmds
  
-@@ -16871,7 +17095,7 @@
+@@ -16866,7 +17073,7 @@ _LT_EOF
  func_dirname ()
  {
    # Extract subdirectory from the argument.
@@ -12523,7 +11886,7 @@
    if test "X$func_dirname_result" = "X${1}"; then
      func_dirname_result="${3}"
    else
-@@ -16882,7 +17106,7 @@
+@@ -16877,7 +17084,7 @@ func_dirname ()
  # func_basename file
  func_basename ()
  {
@@ -12532,7 +11895,7 @@
  }
  
  
-@@ -16895,8 +17119,10 @@
+@@ -16890,8 +17097,10 @@ func_basename ()
  func_stripname ()
  {
    case ${2} in
@@ -12545,7 +11908,7 @@
    esac
  }
  
-@@ -16907,20 +17133,20 @@
+@@ -16902,20 +17111,20 @@ my_sed_long_arg='1s/^-[^=]*=//'
  # func_opt_split
  func_opt_split ()
  {
@@ -12570,7 +11933,7 @@
  }
  
  # func_arith arithmetic-term...
-@@ -16981,10 +17207,6 @@
+@@ -16976,10 +17185,6 @@ _LT_EOF
  # The linker used to build libraries.
  LD=$lt_LD_CXX
  
@@ -12581,7 +11944,7 @@
  # Commands used to build an old-style archive.
  old_archive_cmds=$lt_old_archive_cmds_CXX
  
-@@ -17139,13 +17361,24 @@
+@@ -17134,13 +17339,15 @@ chmod +x "$CONFIG_LT"
  # 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.
@@ -12601,55 +11964,19 @@
 +  exec 5>>config.log
 +  $lt_cl_success || as_fn_exit 1
 +fi
-+
-+
-+ if test "$enable_static" = yes; then
-+  ENABLE_STATIC_TRUE=
-+  ENABLE_STATIC_FALSE='#'
-+else
-+  ENABLE_STATIC_TRUE='#'
-+  ENABLE_STATIC_FALSE=
-+fi
  
  
  # Make sure we use 64-bit versions of various file stuff.
-@@ -17742,6 +17975,26 @@
-   enable_xinerama="yes"
- fi
- 
-+# Check whether --enable-xrandr was given.
-+if test "${enable_xrandr+set}" = set; then :
-+  enableval=$enable_xrandr;
-+fi
-+
-+# Check whether --enable-xfixes was given.
-+if test "${enable_xfixes+set}" = set; then :
-+  enableval=$enable_xfixes;
-+fi
-+
-+# Check whether --enable-xcomposite was given.
-+if test "${enable_xcomposite+set}" = set; then :
-+  enableval=$enable_xcomposite;
-+fi
-+
-+# Check whether --enable-xdamage was given.
-+if test "${enable_xdamage+set}" = set; then :
-+  enableval=$enable_xdamage;
-+fi
-+
- # Check whether --enable-rebuilds was given.
- if test "${enable_rebuilds+set}" = set; then :
-   enableval=$enable_rebuilds;
-@@ -17780,7 +18033,7 @@
+@@ -17761,7 +17968,7 @@ fi
  
  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 ;;
+   x11|win32|quartz) ;;
+-  *) as_fn_error $? "Invalid target for GDK: use x11, quartz or win32." "$LINENO" 5;;
++  *) as_fn_error $? "Invalid target for GDK: use x11, quartz or win32." "$LINENO" 5 ;;
  esac
  
  gdktargetlib=libgdk-$gdktarget-$GTK_API_VERSION.la
-@@ -17825,11 +18078,11 @@
+@@ -17801,11 +18008,11 @@ am_lf='
  '
  case `pwd` in
    *[\\\"\#\$\&\'\`$am_lf]*)
@@ -12663,7 +11990,7 @@
  esac
  
  # Do `set' in a subshell so we don't clobber the current shell's
-@@ -18119,7 +18372,6 @@
+@@ -18095,7 +18302,6 @@ installed software in a non-standard prefix.
  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
@@ -12671,7 +11998,7 @@
  elif test $pkg_failed = untried; then
       	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
-@@ -18134,8 +18386,7 @@
+@@ -18110,8 +18316,7 @@ and BASE_DEPENDENCIES_LIBS to avoid the need to call pkg-config.
  See the pkg-config man page for more details.
  
  To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -12681,7 +12008,7 @@
  else
  	BASE_DEPENDENCIES_CFLAGS=$pkg_cv_BASE_DEPENDENCIES_CFLAGS
  	BASE_DEPENDENCIES_LIBS=$pkg_cv_BASE_DEPENDENCIES_LIBS
-@@ -18221,7 +18472,6 @@
+@@ -18197,7 +18402,6 @@ installed software in a non-standard prefix.
  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
@@ -12689,7 +12016,7 @@
  elif test $pkg_failed = untried; then
       	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
-@@ -18236,8 +18486,7 @@
+@@ -18212,8 +18416,7 @@ and CAIRO_BACKEND_LIBS to avoid the need to call pkg-config.
  See the pkg-config man page for more details.
  
  To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -12699,7 +12026,7 @@
  else
  	CAIRO_BACKEND_CFLAGS=$pkg_cv_CAIRO_BACKEND_CFLAGS
  	CAIRO_BACKEND_LIBS=$pkg_cv_CAIRO_BACKEND_LIBS
-@@ -20472,7 +20721,7 @@
+@@ -20416,7 +20619,7 @@ if ac_fn_c_try_cpp "$LINENO"; then :
  else
    gdk_wchar_h=no
  fi
@@ -12708,7 +12035,7 @@
  if test $gdk_wchar_h = yes; then
  
  $as_echo "#define HAVE_WCHAR_H 1" >>confdefs.h
-@@ -20493,7 +20742,7 @@
+@@ -20437,7 +20640,7 @@ if ac_fn_c_try_cpp "$LINENO"; then :
  else
    gdk_wctype_h=no
  fi
@@ -12717,7 +12044,7 @@
  if test $gdk_wctype_h = yes; then
  
  $as_echo "#define HAVE_WCTYPE_H 1" >>confdefs.h
-@@ -20611,7 +20860,7 @@
+@@ -20555,7 +20758,7 @@ if ac_fn_c_try_cpp "$LINENO"; then :
  else
    gtk_uxtheme_h=no
  fi
@@ -12726,7 +12053,7 @@
  if test $gtk_uxtheme_h = yes; then
  
  $as_echo "#define HAVE_UXTHEME_H 1" >>confdefs.h
-@@ -21255,7 +21504,7 @@
+@@ -21199,7 +21402,7 @@ if test "x$with_x" = xno; then
    have_x=disabled
  else
    case $x_includes,$x_libraries in #(
@@ -12735,7 +12062,7 @@
      *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
-@@ -21359,7 +21608,7 @@
+@@ -21303,7 +21506,7 @@ else
    fi
  done
  fi
@@ -12744,101 +12071,7 @@
  fi # $ac_x_includes = no
  
  if test "$ac_x_libraries" = no; then
-@@ -22388,7 +22637,8 @@
- 
- 
-   # Check for the RANDR extension
--  if $PKG_CONFIG --exists "xrandr >= 1.2.99" ; then
-+  if test x"$enable_xrandr" != xno && \
-+     $PKG_CONFIG --exists "xrandr >= 1.2.99" ; then
- 
- $as_echo "#define HAVE_RANDR 1" >>confdefs.h
- 
-@@ -22408,7 +22658,8 @@
- 
-   # Checks for XFixes extension
- 
--  if $PKG_CONFIG --exists xfixes ; then
-+  if test x"$enable_xfixes" != xno && \
-+     $PKG_CONFIG --exists xfixes ; then
- 
- $as_echo "#define HAVE_XFIXES 1" >>confdefs.h
- 
-@@ -22419,7 +22670,8 @@
- 
-   # Checks for Xcomposite extension
- 
--  if $PKG_CONFIG --exists xcomposite ; then
-+  if test x"$enable_xcomposite" != xno && \
-+     $PKG_CONFIG --exists xcomposite ; then
- 
- $as_echo "#define HAVE_XCOMPOSITE 1" >>confdefs.h
- 
-@@ -22430,7 +22682,7 @@
- 
-   # Checks for Xdamage extension
- 
--  if $PKG_CONFIG --exists xdamage ; then
-+  if test x"$enable_xdamage" != xno && $PKG_CONFIG --exists xdamage ; then
- 
- $as_echo "#define HAVE_XDAMAGE 1" >>confdefs.h
- 
-@@ -22607,7 +22859,6 @@
- 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; }
-@@ -22622,8 +22873,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
-@@ -22716,20 +22966,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 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 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_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-pixbuf-2.0"
-   GDK_EXTRA_LIBS=
-+else
-+  GDK_PACKAGES="$GDK_PACKAGES $GDK_PRIVATE_PACKAGES"
- fi
- 
- 
-@@ -22739,6 +22992,7 @@
- 
- 
- 
-+
- ########################################
- # Check for Accessibility Toolkit flags
- ########################################
-@@ -24091,6 +24345,14 @@
+@@ -23796,6 +23999,10 @@ if test -z "${HAVE_OBJC_TRUE}" && test -z "${HAVE_OBJC_FALSE}"; then
    as_fn_error $? "conditional \"HAVE_OBJC\" was never defined.
  Usually this means the macro was only invoked conditionally." "$LINENO" 5
  fi
@@ -12846,32 +12079,28 @@
 +  as_fn_error $? "conditional \"am__fastdepCXX\" 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__fastdepCCAS_TRUE}" && test -z "${am__fastdepCCAS_FALSE}"; then
    as_fn_error $? "conditional \"am__fastdepCCAS\" was never defined.
  Usually this means the macro was only invoked conditionally." "$LINENO" 5
-@@ -24712,7 +24974,7 @@
+@@ -24409,7 +24616,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
  # values after options handling.
  ac_log="
- This file was extended by gtk+ $as_me 2.90.6, which was
+ This file was extended by gtk+ $as_me 2.91.0, which was
 -generated by GNU Autoconf 2.66.  Invocation command line was
 +generated by GNU Autoconf 2.67.  Invocation command line was
  
    CONFIG_FILES    = $CONFIG_FILES
    CONFIG_HEADERS  = $CONFIG_HEADERS
-@@ -24778,7 +25040,7 @@
+@@ -24475,7 +24682,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
  ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
  ac_cs_version="\\
- gtk+ config.status 2.90.6
+ gtk+ config.status 2.91.0
 -configured by $0, generated by GNU Autoconf 2.66,
 +configured by $0, generated by GNU Autoconf 2.67,
    with options \\"\$ac_cs_config\\"
  
  Copyright (C) 2010 Free Software Foundation, Inc.
-@@ -24799,11 +25061,16 @@
+@@ -24496,11 +24703,16 @@ ac_need_defaults=:
  while test $# != 0
  do
    case $1 in
@@ -12889,7 +12118,7 @@
    *)
      ac_option=$1
      ac_optarg=$2
-@@ -24825,6 +25092,7 @@
+@@ -24522,6 +24734,7 @@ do
      $ac_shift
      case $ac_optarg in
      *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
@@ -12897,7 +12126,7 @@
      esac
      as_fn_append CONFIG_FILES " '$ac_optarg'"
      ac_need_defaults=false;;
-@@ -24900,203 +25168,186 @@
+@@ -24597,203 +24810,186 @@ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
  sed_quote_subst='$sed_quote_subst'
  double_quote_subst='$double_quote_subst'
  delay_variable_subst='$delay_variable_subst'
@@ -13275,7 +12504,7 @@
  GREP \
  EGREP \
  FGREP \
-@@ -25119,6 +25370,8 @@
+@@ -24816,6 +25012,8 @@ lt_cv_sys_global_symbol_pipe \
  lt_cv_sys_global_symbol_to_cdecl \
  lt_cv_sys_global_symbol_to_c_name_address \
  lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -13284,7 +12513,7 @@
  lt_prog_compiler_no_builtin_flag \
  lt_prog_compiler_wl \
  lt_prog_compiler_pic \
-@@ -25148,7 +25401,6 @@
+@@ -24845,7 +25043,6 @@ variables_saved_for_relink \
  libname_spec \
  library_names_spec \
  soname_spec \
@@ -13292,7 +12521,7 @@
  finish_eval \
  old_striplib \
  striplib \
-@@ -25159,7 +25411,6 @@
+@@ -24856,7 +25053,6 @@ predeps \
  postdeps \
  compiler_lib_search_path \
  LD_CXX \
@@ -13300,7 +12529,7 @@
  compiler_CXX \
  lt_prog_compiler_no_builtin_flag_CXX \
  lt_prog_compiler_wl_CXX \
-@@ -25185,9 +25436,9 @@
+@@ -24882,9 +25078,9 @@ postdep_objects_CXX \
  predeps_CXX \
  postdeps_CXX \
  compiler_lib_search_path_CXX; do
@@ -13312,7 +12541,7 @@
        ;;
      *)
        eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-@@ -25214,7 +25465,6 @@
+@@ -24911,7 +25107,6 @@ postuninstall_cmds \
  finish_cmds \
  sys_lib_search_path_spec \
  sys_lib_dlsearch_path_spec \
@@ -13320,7 +12549,7 @@
  old_archive_cmds_CXX \
  old_archive_from_new_cmds_CXX \
  old_archive_from_expsyms_cmds_CXX \
-@@ -25224,9 +25474,9 @@
+@@ -24921,9 +25116,9 @@ module_cmds_CXX \
  module_expsym_cmds_CXX \
  export_symbols_cmds_CXX \
  prelink_cmds_CXX; do
@@ -13332,7 +12561,7 @@
        ;;
      *)
        eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-@@ -25234,6 +25484,12 @@
+@@ -24931,6 +25126,12 @@ prelink_cmds_CXX; do
      esac
  done
  
@@ -13345,7 +12574,7 @@
  ac_aux_dir='$ac_aux_dir'
  xsi_shell='$xsi_shell'
  lt_shell_append='$lt_shell_append'
-@@ -25366,7 +25622,7 @@
+@@ -25059,7 +25260,7 @@ do
      "modules/printbackends/test/Makefile") CONFIG_FILES="$CONFIG_FILES modules/printbackends/test/Makefile" ;;
      "perf/Makefile") CONFIG_FILES="$CONFIG_FILES perf/Makefile" ;;
  
@@ -13354,7 +12583,7 @@
    esac
  done
  
-@@ -25682,7 +25938,7 @@
+@@ -25375,7 +25576,7 @@ do
    esac
    case $ac_mode$ac_tag in
    :[FHL]*:*);;
@@ -13363,7 +12592,7 @@
    :[FH]-) ac_tag=-:-;;
    :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
    esac
-@@ -25710,7 +25966,7 @@
+@@ -25403,7 +25604,7 @@ do
  	   [\\/$]*) false;;
  	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
  	   esac ||
@@ -13372,7 +12601,7 @@
        esac
        case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
        as_fn_append ac_file_inputs " '$ac_f'"
-@@ -25737,7 +25993,7 @@
+@@ -25430,7 +25631,7 @@ $as_echo "$as_me: creating $ac_file" >&6;}
  
      case $ac_tag in
      *:-:* | *:-) cat >"$tmp/stdin" \
@@ -13381,7 +12610,7 @@
      esac
      ;;
    esac
-@@ -26073,8 +26329,7 @@
+@@ -25766,8 +25967,7 @@ $as_echo X"$file" |
  # NOTE: Changes made to this file will be lost: look at ltmain.sh.
  #
  #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -13391,7 +12620,7 @@
  #   Written by Gordon Matzigkeit, 1996
  #
  #   This file is part of GNU Libtool.
-@@ -26114,13 +26369,13 @@
+@@ -25807,13 +26007,13 @@ macro_revision=$macro_revision
  build_old_libs=$enable_static
  
  # Assembler program.
@@ -13408,7 +12637,7 @@
  
  # Whether or not to build shared libraries.
  build_libtool_libs=$enable_shared
-@@ -26131,12 +26386,6 @@
+@@ -25824,12 +26024,6 @@ pic_mode=$pic_mode
  # Whether or not to optimize for fast installation.
  fast_install=$enable_fast_install
  
@@ -13421,7 +12650,7 @@
  # The host system.
  host_alias=$host_alias
  host=$host
-@@ -26186,6 +26435,10 @@
+@@ -25879,6 +26073,10 @@ SP2NL=$lt_lt_SP2NL
  # turn newlines into spaces.
  NL2SP=$lt_lt_NL2SP
  
@@ -13432,7 +12661,7 @@
  # Method to check whether dependent libraries are shared objects.
  deplibs_check_method=$lt_deplibs_check_method
  
-@@ -26204,9 +26457,6 @@
+@@ -25897,9 +26095,6 @@ RANLIB=$lt_RANLIB
  old_postinstall_cmds=$lt_old_postinstall_cmds
  old_postuninstall_cmds=$lt_old_postuninstall_cmds
  
@@ -13442,7 +12671,7 @@
  # A C compiler.
  LTCC=$lt_CC
  
-@@ -26228,6 +26478,12 @@
+@@ -25921,6 +26116,12 @@ global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name
  # The name of the directory that contains temporary libtool files.
  objdir=$objdir
  
@@ -13455,7 +12684,7 @@
  # Used to examine libraries when file_magic_cmd begins with "file".
  MAGIC_CMD=$MAGIC_CMD
  
-@@ -26290,9 +26546,6 @@
+@@ -25983,9 +26184,6 @@ library_names_spec=$lt_library_names_spec
  # The coded name of the library, if different from the real name.
  soname_spec=$lt_soname_spec
  
@@ -13465,7 +12694,7 @@
  # Command to use after installation of a shared archive.
  postinstall_cmds=$lt_postinstall_cmds
  
-@@ -26332,10 +26585,6 @@
+@@ -26025,10 +26223,6 @@ striplib=$lt_striplib
  # The linker used to build libraries.
  LD=$lt_LD
  
@@ -13476,7 +12705,7 @@
  # Commands used to build an old-style archive.
  old_archive_cmds=$lt_old_archive_cmds
  
-@@ -26609,7 +26858,7 @@
+@@ -26302,7 +26496,7 @@ _LT_EOF
  func_dirname ()
  {
    # Extract subdirectory from the argument.
@@ -13485,7 +12714,7 @@
    if test "X$func_dirname_result" = "X${1}"; then
      func_dirname_result="${3}"
    else
-@@ -26620,7 +26869,7 @@
+@@ -26313,7 +26507,7 @@ func_dirname ()
  # func_basename file
  func_basename ()
  {
@@ -13494,7 +12723,7 @@
  }
  
  
-@@ -26633,8 +26882,10 @@
+@@ -26326,8 +26520,10 @@ func_basename ()
  func_stripname ()
  {
    case ${2} in
@@ -13507,7 +12736,7 @@
    esac
  }
  
-@@ -26645,20 +26896,20 @@
+@@ -26338,20 +26534,20 @@ my_sed_long_arg='1s/^-[^=]*=//'
  # func_opt_split
  func_opt_split ()
  {
@@ -13532,7 +12761,7 @@
  }
  
  # func_arith arithmetic-term...
-@@ -26719,10 +26970,6 @@
+@@ -26412,10 +26608,6 @@ _LT_EOF
  # The linker used to build libraries.
  LD=$lt_LD_CXX
  
@@ -13543,31 +12772,24 @@
  # Commands used to build an old-style archive.
  old_archive_cmds=$lt_old_archive_cmds_CXX
  
-Index: gtk+3.0-2.90.6/demos/Makefile.in
-===================================================================
---- gtk+3.0-2.90.6.orig/demos/Makefile.in
-+++ gtk+3.0-2.90.6/demos/Makefile.in
-@@ -44,7 +44,10 @@
+diff --git a/demos/Makefile.in b/demos/Makefile.in
+index 4add85a..d89d8ce 100644
+--- a/demos/Makefile.in
++++ b/demos/Makefile.in
+@@ -44,8 +44,10 @@ noinst_PROGRAMS = testanimation$(EXEEXT) testpixbuf-color$(EXEEXT) \
  subdir = demos
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
--	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-+	$(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.ac
+ am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+-	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/acinclude.m4 \
+-	$(top_srcdir)/configure.ac
++	$(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.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  mkinstalldirs = $(install_sh) -d
-@@ -205,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@
-@@ -356,6 +360,7 @@
+@@ -360,6 +362,7 @@ libdir = @libdir@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -13575,31 +12797,24 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  ms_librarian = @ms_librarian@
-Index: gtk+3.0-2.90.6/demos/gtk-demo/Makefile.in
-===================================================================
---- gtk+3.0-2.90.6.orig/demos/gtk-demo/Makefile.in
-+++ gtk+3.0-2.90.6/demos/gtk-demo/Makefile.in
-@@ -43,7 +43,10 @@
+diff --git a/demos/gtk-demo/Makefile.in b/demos/gtk-demo/Makefile.in
+index f066922..76f3871 100644
+--- a/demos/gtk-demo/Makefile.in
++++ b/demos/gtk-demo/Makefile.in
+@@ -43,8 +43,10 @@ bin_PROGRAMS = gtk3-demo$(EXEEXT)
  subdir = demos/gtk-demo
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
--	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-+	$(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.ac
+ am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+-	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/acinclude.m4 \
+-	$(top_srcdir)/configure.ac
++	$(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.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  mkinstalldirs = $(install_sh) -d
-@@ -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@
-@@ -344,6 +348,7 @@
+@@ -348,6 +350,7 @@ libdir = @libdir@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -13607,31 +12822,24 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  ms_librarian = @ms_librarian@
-Index: gtk+3.0-2.90.6/docs/Makefile.in
-===================================================================
---- gtk+3.0-2.90.6.orig/docs/Makefile.in
-+++ gtk+3.0-2.90.6/docs/Makefile.in
-@@ -40,7 +40,10 @@
+diff --git a/docs/Makefile.in b/docs/Makefile.in
+index 342d555..43d905d 100644
+--- a/docs/Makefile.in
++++ b/docs/Makefile.in
+@@ -40,8 +40,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
  subdir = docs
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
--	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-+	$(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.ac
+ am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+-	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/acinclude.m4 \
+-	$(top_srcdir)/configure.ac
++	$(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.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  mkinstalldirs = $(install_sh) -d
-@@ -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@
-@@ -308,6 +312,7 @@
+@@ -312,6 +314,7 @@ libdir = @libdir@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -13639,31 +12847,24 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  ms_librarian = @ms_librarian@
-Index: gtk+3.0-2.90.6/docs/faq/Makefile.in
-===================================================================
---- gtk+3.0-2.90.6.orig/docs/faq/Makefile.in
-+++ gtk+3.0-2.90.6/docs/faq/Makefile.in
-@@ -40,7 +40,10 @@
+diff --git a/docs/faq/Makefile.in b/docs/faq/Makefile.in
+index 943cd5c..2045973 100644
+--- a/docs/faq/Makefile.in
++++ b/docs/faq/Makefile.in
+@@ -40,8 +40,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
  subdir = docs/faq
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
--	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-+	$(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.ac
+ am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+-	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/acinclude.m4 \
+-	$(top_srcdir)/configure.ac
++	$(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.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  mkinstalldirs = $(install_sh) -d
-@@ -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@
-@@ -268,6 +272,7 @@
+@@ -272,6 +274,7 @@ libdir = @libdir@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -13671,31 +12872,24 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  ms_librarian = @ms_librarian@
-Index: gtk+3.0-2.90.6/docs/reference/Makefile.in
-===================================================================
---- gtk+3.0-2.90.6.orig/docs/reference/Makefile.in
-+++ gtk+3.0-2.90.6/docs/reference/Makefile.in
-@@ -40,7 +40,10 @@
+diff --git a/docs/reference/Makefile.in b/docs/reference/Makefile.in
+index 85a4245..faf8a96 100644
+--- a/docs/reference/Makefile.in
++++ b/docs/reference/Makefile.in
+@@ -40,8 +40,10 @@ DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
  subdir = docs/reference
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
--	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-+	$(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.ac
+ am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+-	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/acinclude.m4 \
+-	$(top_srcdir)/configure.ac
++	$(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.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  mkinstalldirs = $(install_sh) -d
-@@ -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@
-@@ -308,6 +312,7 @@
+@@ -312,6 +314,7 @@ libdir = @libdir@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -13703,31 +12897,24 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  ms_librarian = @ms_librarian@
-Index: gtk+3.0-2.90.6/docs/reference/gdk/Makefile.in
-===================================================================
---- gtk+3.0-2.90.6.orig/docs/reference/gdk/Makefile.in
-+++ gtk+3.0-2.90.6/docs/reference/gdk/Makefile.in
-@@ -47,7 +47,10 @@
+diff --git a/docs/reference/gdk/Makefile.in b/docs/reference/gdk/Makefile.in
+index b83b78e..e781b61 100644
+--- a/docs/reference/gdk/Makefile.in
++++ b/docs/reference/gdk/Makefile.in
+@@ -47,8 +47,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
  subdir = docs/reference/gdk
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
--	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-+	$(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.ac
+ am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+-	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/acinclude.m4 \
+-	$(top_srcdir)/configure.ac
++	$(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.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  mkinstalldirs = $(install_sh) -d
-@@ -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@
-@@ -275,6 +279,7 @@
+@@ -279,6 +281,7 @@ libdir = @libdir@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -13735,31 +12922,24 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  ms_librarian = @ms_librarian@
-Index: gtk+3.0-2.90.6/docs/reference/gtk/Makefile.in
-===================================================================
---- gtk+3.0-2.90.6.orig/docs/reference/gtk/Makefile.in
-+++ gtk+3.0-2.90.6/docs/reference/gtk/Makefile.in
-@@ -47,7 +47,10 @@
+diff --git a/docs/reference/gtk/Makefile.in b/docs/reference/gtk/Makefile.in
+index 7cdcdc3..fd106e7 100644
+--- a/docs/reference/gtk/Makefile.in
++++ b/docs/reference/gtk/Makefile.in
+@@ -47,8 +47,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
  subdir = docs/reference/gtk
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
--	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-+	$(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.ac
+ am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+-	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/acinclude.m4 \
+-	$(top_srcdir)/configure.ac
++	$(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.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  mkinstalldirs = $(install_sh) -d
-@@ -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@
-@@ -300,6 +304,7 @@
+@@ -304,6 +306,7 @@ libdir = @libdir@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -13767,31 +12947,24 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  ms_librarian = @ms_librarian@
-Index: gtk+3.0-2.90.6/docs/reference/libgail-util/Makefile.in
-===================================================================
---- gtk+3.0-2.90.6.orig/docs/reference/libgail-util/Makefile.in
-+++ gtk+3.0-2.90.6/docs/reference/libgail-util/Makefile.in
-@@ -46,7 +46,10 @@
+diff --git a/docs/reference/libgail-util/Makefile.in b/docs/reference/libgail-util/Makefile.in
+index 3bf364f..1b5fd7b 100644
+--- a/docs/reference/libgail-util/Makefile.in
++++ b/docs/reference/libgail-util/Makefile.in
+@@ -46,8 +46,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
  subdir = docs/reference/libgail-util
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
--	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-+	$(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.ac
+ am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+-	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/acinclude.m4 \
+-	$(top_srcdir)/configure.ac
++	$(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.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  mkinstalldirs = $(install_sh) -d
-@@ -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@
-@@ -274,6 +278,7 @@
+@@ -278,6 +280,7 @@ libdir = @libdir@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -13799,31 +12972,24 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  ms_librarian = @ms_librarian@
-Index: gtk+3.0-2.90.6/docs/tools/Makefile.in
-===================================================================
---- gtk+3.0-2.90.6.orig/docs/tools/Makefile.in
-+++ gtk+3.0-2.90.6/docs/tools/Makefile.in
-@@ -42,7 +42,10 @@
+diff --git a/docs/tools/Makefile.in b/docs/tools/Makefile.in
+index 5edba8e..bf33478 100644
+--- a/docs/tools/Makefile.in
++++ b/docs/tools/Makefile.in
+@@ -42,8 +42,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
  subdir = docs/tools
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
--	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-+	$(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.ac
+ am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+-	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/acinclude.m4 \
+-	$(top_srcdir)/configure.ac
++	$(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.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  mkinstalldirs = $(install_sh) -d
-@@ -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@
-@@ -303,6 +307,7 @@
+@@ -307,6 +309,7 @@ libdir = @libdir@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -13831,31 +12997,24 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  ms_librarian = @ms_librarian@
-Index: gtk+3.0-2.90.6/docs/tutorial/Makefile.in
-===================================================================
---- gtk+3.0-2.90.6.orig/docs/tutorial/Makefile.in
-+++ gtk+3.0-2.90.6/docs/tutorial/Makefile.in
-@@ -40,7 +40,10 @@
+diff --git a/docs/tutorial/Makefile.in b/docs/tutorial/Makefile.in
+index fc1bbf6..4c494b8 100644
+--- a/docs/tutorial/Makefile.in
++++ b/docs/tutorial/Makefile.in
+@@ -40,8 +40,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
  subdir = docs/tutorial
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
--	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-+	$(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.ac
+ am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+-	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/acinclude.m4 \
+-	$(top_srcdir)/configure.ac
++	$(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.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  mkinstalldirs = $(install_sh) -d
-@@ -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@
-@@ -268,6 +272,7 @@
+@@ -272,6 +274,7 @@ libdir = @libdir@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -13863,31 +13022,24 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  ms_librarian = @ms_librarian@
-Index: gtk+3.0-2.90.6/gdk/Makefile.in
-===================================================================
---- gtk+3.0-2.90.6.orig/gdk/Makefile.in
-+++ gtk+3.0-2.90.6/gdk/Makefile.in
-@@ -46,7 +46,10 @@
+diff --git a/gdk/Makefile.in b/gdk/Makefile.in
+index da35cf1..48b92a6 100644
+--- a/gdk/Makefile.in
++++ b/gdk/Makefile.in
+@@ -47,8 +47,10 @@ DIST_COMMON = $(gdkinclude_HEADERS) $(srcdir)/Makefile.am \
  subdir = gdk
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
--	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-+	$(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.ac
+ am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+-	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/acinclude.m4 \
+-	$(top_srcdir)/configure.ac
++	$(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.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  mkinstalldirs = $(install_sh) -d
-@@ -301,6 +304,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@
-@@ -452,6 +456,7 @@
+@@ -433,6 +435,7 @@ libdir = @libdir@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -13895,31 +13047,24 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  ms_librarian = @ms_librarian@
-Index: gtk+3.0-2.90.6/gdk/directfb/Makefile.in
-===================================================================
---- gtk+3.0-2.90.6.orig/gdk/directfb/Makefile.in
-+++ gtk+3.0-2.90.6/gdk/directfb/Makefile.in
-@@ -42,7 +42,10 @@
- subdir = gdk/directfb
+diff --git a/gdk/quartz/Makefile.in b/gdk/quartz/Makefile.in
+index 78c47e9..d984644 100644
+--- a/gdk/quartz/Makefile.in
++++ b/gdk/quartz/Makefile.in
+@@ -42,8 +42,10 @@ DIST_COMMON = $(libgdkinclude_HEADERS) $(srcdir)/Makefile.am \
+ subdir = gdk/quartz
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
--	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-+	$(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.ac
+ am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+-	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/acinclude.m4 \
+-	$(top_srcdir)/configure.ac
++	$(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.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  mkinstalldirs = $(install_sh) -d
-@@ -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@
-@@ -331,6 +335,7 @@
+@@ -335,6 +337,7 @@ libdir = @libdir@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -13927,31 +13072,24 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  ms_librarian = @ms_librarian@
-Index: gtk+3.0-2.90.6/gdk/quartz/Makefile.in
-===================================================================
---- gtk+3.0-2.90.6.orig/gdk/quartz/Makefile.in
-+++ gtk+3.0-2.90.6/gdk/quartz/Makefile.in
-@@ -42,7 +42,10 @@
- subdir = gdk/quartz
+diff --git a/gdk/tests/Makefile.in b/gdk/tests/Makefile.in
+index 87c229f..21a6424 100644
+--- a/gdk/tests/Makefile.in
++++ b/gdk/tests/Makefile.in
+@@ -42,8 +42,10 @@ TESTS = $(am__EXEEXT_1)
+ subdir = gdk/tests
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
--	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-+	$(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.ac
+ am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+-	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/acinclude.m4 \
+-	$(top_srcdir)/configure.ac
++	$(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.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  mkinstalldirs = $(install_sh) -d
-@@ -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@
-@@ -331,6 +335,7 @@
+@@ -277,6 +279,7 @@ libdir = @libdir@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -13959,31 +13097,24 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  ms_librarian = @ms_librarian@
-Index: gtk+3.0-2.90.6/gdk/tests/Makefile.in
-===================================================================
---- gtk+3.0-2.90.6.orig/gdk/tests/Makefile.in
-+++ gtk+3.0-2.90.6/gdk/tests/Makefile.in
-@@ -42,7 +42,10 @@
- subdir = gdk/tests
+diff --git a/gdk/win32/Makefile.in b/gdk/win32/Makefile.in
+index c37d461..0034d81 100644
+--- a/gdk/win32/Makefile.in
++++ b/gdk/win32/Makefile.in
+@@ -42,8 +42,10 @@ DIST_COMMON = $(libgdkinclude_HEADERS) $(srcdir)/Makefile.am \
+ subdir = gdk/win32
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
--	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-+	$(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.ac
+ am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+-	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/acinclude.m4 \
+-	$(top_srcdir)/configure.ac
++	$(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.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  mkinstalldirs = $(install_sh) -d
-@@ -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@
-@@ -273,6 +277,7 @@
+@@ -372,6 +374,7 @@ libdir = @libdir@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -13991,31 +13122,24 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  ms_librarian = @ms_librarian@
-Index: gtk+3.0-2.90.6/gdk/win32/Makefile.in
-===================================================================
---- gtk+3.0-2.90.6.orig/gdk/win32/Makefile.in
-+++ gtk+3.0-2.90.6/gdk/win32/Makefile.in
-@@ -42,7 +42,10 @@
- subdir = gdk/win32
+diff --git a/gdk/win32/rc/Makefile.in b/gdk/win32/rc/Makefile.in
+index 368ef31..b66b64f 100644
+--- a/gdk/win32/rc/Makefile.in
++++ b/gdk/win32/rc/Makefile.in
+@@ -41,8 +41,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ subdir = gdk/win32/rc
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
--	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-+	$(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.ac
+ am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+-	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/acinclude.m4 \
+-	$(top_srcdir)/configure.ac
++	$(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.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  mkinstalldirs = $(install_sh) -d
-@@ -217,6 +220,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@
-@@ -368,6 +372,7 @@
+@@ -274,6 +276,7 @@ libdir = @libdir@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -14023,31 +13147,24 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  ms_librarian = @ms_librarian@
-Index: gtk+3.0-2.90.6/gdk/win32/rc/Makefile.in
-===================================================================
---- gtk+3.0-2.90.6.orig/gdk/win32/rc/Makefile.in
-+++ gtk+3.0-2.90.6/gdk/win32/rc/Makefile.in
-@@ -41,7 +41,10 @@
- subdir = gdk/win32/rc
+diff --git a/gdk/x11/Makefile.in b/gdk/x11/Makefile.in
+index b219ce8..0b23dd3 100644
+--- a/gdk/x11/Makefile.in
++++ b/gdk/x11/Makefile.in
+@@ -57,8 +57,10 @@ TESTS = checksettings$(EXEEXT)
+ subdir = gdk/x11
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
--	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-+	$(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.ac
+ am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+-	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/acinclude.m4 \
+-	$(top_srcdir)/configure.ac
++	$(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.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  mkinstalldirs = $(install_sh) -d
-@@ -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@
-@@ -270,6 +274,7 @@
+@@ -379,6 +381,7 @@ libdir = @libdir@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -14055,31 +13172,24 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  ms_librarian = @ms_librarian@
-Index: gtk+3.0-2.90.6/gdk/x11/Makefile.in
-===================================================================
---- gtk+3.0-2.90.6.orig/gdk/x11/Makefile.in
-+++ gtk+3.0-2.90.6/gdk/x11/Makefile.in
-@@ -57,7 +57,10 @@
- subdir = gdk/x11
+diff --git a/gtk/Makefile.in b/gtk/Makefile.in
+index 0e027f0..e04b5e3 100644
+--- a/gtk/Makefile.in
++++ b/gtk/Makefile.in
+@@ -78,8 +78,10 @@ bin_PROGRAMS = gtk-query-immodules-3.0$(EXEEXT) \
+ subdir = gtk
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
--	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-+	$(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.ac
+ am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+-	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/acinclude.m4 \
+-	$(top_srcdir)/configure.ac
++	$(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.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  mkinstalldirs = $(install_sh) -d
-@@ -225,6 +228,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@
-@@ -376,6 +380,7 @@
+@@ -774,6 +776,7 @@ libdir = @libdir@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -14087,31 +13197,24 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  ms_librarian = @ms_librarian@
-Index: gtk+3.0-2.90.6/gtk/Makefile.in
-===================================================================
---- gtk+3.0-2.90.6.orig/gtk/Makefile.in
-+++ gtk+3.0-2.90.6/gtk/Makefile.in
-@@ -78,7 +78,10 @@
- subdir = gtk
+diff --git a/gtk/tests/Makefile.in b/gtk/tests/Makefile.in
+index 0732bc6..8930bd9 100644
+--- a/gtk/tests/Makefile.in
++++ b/gtk/tests/Makefile.in
+@@ -43,8 +43,10 @@ noinst_PROGRAMS = $(am__EXEEXT_2) $(am__EXEEXT_3)
+ subdir = gtk/tests
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
--	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-+	$(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.ac
+ am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+-	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/acinclude.m4 \
+-	$(top_srcdir)/configure.ac
++	$(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.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  mkinstalldirs = $(install_sh) -d
-@@ -703,6 +706,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@
-@@ -854,6 +858,7 @@
+@@ -372,6 +374,7 @@ libdir = @libdir@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -14119,70 +13222,24 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  ms_librarian = @ms_librarian@
-@@ -943,6 +948,8 @@
- 	-I$(top_srcdir) -I../gdk			\
- 	-I$(top_srcdir)/gdk				\
- 	-DGDK_DISABLE_DEPRECATED			\
-+	-DMAEMO_CHANGES					\
-+	-DGTK_FILE_CHOOSER_ENABLE_UNSUPPORTED		\
- 	-DGTK_DISABLE_DEPRECATED			\
- 	-DGTK_FILE_SYSTEM_ENABLE_UNSUPPORTED		\
- 	-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED		\
-@@ -1185,17 +1192,21 @@
- # Installed header files without compatibility guarantees
- # that are not included in gtk/gtk.h
- gtk_semi_private_h_sources = \
--	gtktextlayout.h
-+	gtktextlayout.h         \
-+	gtkfilesystem.h		\
-+	gtkfilesystemmodel.h	\
-+	gtkfilechooserprivate.h	\
-+	gtkfilechooserutils.h	\
-+	gtkquery.h		\
-+	gtksearchengine.h
- 
- 
- # GTK+ header files that don't get installed
--gtk_private_h_sources = gtkquery.h gtksearchengine.h \
--	gtksearchenginesimple.h gtkdndcursors.h gtkentryprivate.h \
--	gtkbuilderprivate.h gtkcustompaperunixdialog.h \
--	gtkfilechooserdefault.h gtkfilechooserembed.h \
--	gtkfilechooserentry.h gtkfilechooserprivate.h \
--	gtkfilechoosersettings.h gtkfilechooserutils.h gtkfilesystem.h \
--	gtkfilesystemmodel.h gtkiconcache.h gtkintl.h gtkkeyhash.h \
-+gtk_private_h_sources = gtksearchenginesimple.h gtkdndcursors.h \
-+	gtkentryprivate.h gtkbuilderprivate.h \
-+	gtkcustompaperunixdialog.h gtkfilechooserdefault.h \
-+	gtkfilechooserembed.h gtkfilechooserentry.h \
-+	gtkfilechoosersettings.h gtkiconcache.h gtkintl.h gtkkeyhash.h \
- 	gtkmnemonichash.h gtkmountoperationprivate.h gtkpango.h \
- 	gtkpathbar.h gtkplugprivate.h gtkprintoperation-private.h \
- 	gtkprintutils.h gtkrbtree.h gtkrecentchooserdefault.h \
-Index: gtk+3.0-2.90.6/gtk/tests/Makefile.in
-===================================================================
---- gtk+3.0-2.90.6.orig/gtk/tests/Makefile.in
-+++ gtk+3.0-2.90.6/gtk/tests/Makefile.in
-@@ -43,7 +43,10 @@
- subdir = gtk/tests
+diff --git a/gtk/theme-bits/Makefile.in b/gtk/theme-bits/Makefile.in
+index 0dfb27a..0d908fc 100644
+--- a/gtk/theme-bits/Makefile.in
++++ b/gtk/theme-bits/Makefile.in
+@@ -42,8 +42,10 @@ noinst_PROGRAMS = decompose-bits$(EXEEXT)
+ subdir = gtk/theme-bits
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
--	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-+	$(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.ac
+ am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+-	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/acinclude.m4 \
+-	$(top_srcdir)/configure.ac
++	$(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.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  mkinstalldirs = $(install_sh) -d
-@@ -217,6 +220,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@
-@@ -368,6 +372,7 @@
+@@ -304,6 +306,7 @@ libdir = @libdir@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -14190,59 +13247,47 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  ms_librarian = @ms_librarian@
-Index: gtk+3.0-2.90.6/gtk/theme-bits/Makefile.in
-===================================================================
---- gtk+3.0-2.90.6.orig/gtk/theme-bits/Makefile.in
-+++ gtk+3.0-2.90.6/gtk/theme-bits/Makefile.in
-@@ -42,7 +42,10 @@
- subdir = gtk/theme-bits
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
--	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-+	$(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.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
- mkinstalldirs = $(install_sh) -d
-@@ -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@
-@@ -300,6 +304,7 @@
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- ms_librarian = @ms_librarian@
-Index: gtk+3.0-2.90.6/ltmain.sh
-===================================================================
---- gtk+3.0-2.90.6.orig/ltmain.sh
-+++ gtk+3.0-2.90.6/ltmain.sh
-@@ -1,10 +1,9 @@
- # Generated from ltmain.m4sh.
- 
+diff --git a/ltmain.sh b/ltmain.sh
+deleted file mode 100755
+index d8efb57..0000000
+--- a/ltmain.sh
++++ /dev/null
+@@ -1,8745 +0,0 @@
+-# 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
- 
+-# 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.
- #
+-# This is free software; see the source for copying conditions.  There is NO
+-# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+-
+-# GNU Libtool is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2 of the License, or
+-# (at your option) any later version.
+-#
+-# As a special exception to the GNU General Public License,
+-# if you distribute this file as part of a program or library that
+-# is built using GNU Libtool, you may include this file under the
+-# same distribution terms that you use for the rest of that program.
+-#
+-# GNU Libtool is distributed in the hope that it will be useful, but
+-# WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+-# General Public License for more details.
+-#
+-# You should have received a copy of the GNU General Public License
+-# along with GNU Libtool; see the file COPYING.  If not, a copy
+-# can be downloaded from http://www.gnu.org/licenses/gpl.html,
+-# or obtained by writing to the Free Software Foundation, Inc.,
+-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+-
+-# Usage: $progname [OPTION]... [MODE-ARG]...
+-#
+-# Provide generalized library-building support services.
+-#
 -#       --config             show all configuration variables
 -#       --debug              enable verbose shell tracing
 -#   -n, --dry-run            display commands without modifying any files
@@ -14257,20 +13302,9 @@
 -#       --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:
- #
+-#
+-# 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
@@ -14278,22 +13312,14 @@
 -#         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:
- #
+-# 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
@@ -14302,32 +13328,29 @@
 -#         $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-2ubuntu1
-+#       automake:		$automake_version
-+#       autoconf:		$autoconf_version
- #
- # Report bugs to <bug-libtool at gnu.org>.
- 
+-#
+-# Report bugs to <bug-libtool at gnu.org>.
+-
 -PROGRAM=libtool
-+PROGRAM=ltmain.sh
- PACKAGE=libtool
+-PACKAGE=libtool
 -VERSION=2.2.10
-+VERSION="2.2.6b Debian-2.2.6b-2ubuntu1"
- TIMESTAMP=""
+-TIMESTAMP=""
 -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
- 
+-
+-# Be Bourne compatible
+-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+-  emulate sh
+-  NULLCMD=:
+-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+-  # is contrary to our usage.  Disable this feature.
+-  alias -g '${1+"$@"}'='"$@"'
+-  setopt NO_GLOB_SUBST
+-else
+-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+-fi
+-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 ()
 -{
@@ -14336,56 +13359,91 @@
 -_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
+-# NLS nuisances: We save the old values to restore during execute mode.
+-lt_user_locale=
+-lt_safe_locale=
+-for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+-do
+-  eval "if test \"\${$lt_var+set}\" = set; then
+-          save_$lt_var=\$$lt_var
+-          $lt_var=C
+-	  export $lt_var
+-	  lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\"
+-	  lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
+-	fi"
+-done
 -LC_ALL=C
 -LANGUAGE=C
 -export LANGUAGE LC_ALL
- 
- $lt_unset CDPATH
- 
- 
+-
+-$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"}
+-
+-
+-
+-: ${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.
+-: ${EGREP="/bin/grep -E"}
+-: ${FGREP="/bin/grep -F"}
+-: ${GREP="/bin/grep"}
+-: ${LN_S="ln -s"}
+-: ${MAKE="make"}
+-: ${MKDIR="mkdir"}
+-: ${MV="mv -f"}
+-: ${RM="rm -f"}
+-: ${SED="/bin/sed"}
+-: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
+-: ${Xsed="$SED -e 1s/^X//"}
+-
+-# Global variables:
+-EXIT_SUCCESS=0
+-EXIT_FAILURE=1
+-EXIT_MISMATCH=63  # $? = 63 is used to indicate version mismatch to missing.
+-EXIT_SKIP=77	  # $? = 77 is used to indicate a skipped test to automake.
+-
+-exit_status=$EXIT_SUCCESS
+-
+-# Make sure IFS has a sensible default
+-lt_nl='
+-'
+-IFS=" 	$lt_nl"
+-
+-dirname="s,/[^/]*$,,"
+-basename="s,^.*/,,"
+-
+-# func_dirname_and_basename file append nondir_replacement
+-# perform func_basename and func_dirname in a single function
+-# call:
+-#   dirname:  Compute the dirname of FILE.  If nonempty,
+-#             add APPEND to the result, otherwise set result
+-#             to NONDIR_REPLACEMENT.
+-#             value returned in "$func_dirname_result"
+-#   basename: Compute filename of FILE.
+-#             value retuned in "$func_basename_result"
+-# Implementation must be kept synchronized with func_dirname
+-# and func_basename. For efficiency, we do not delegate to
+-# those functions but instead duplicate the functionality here.
+-func_dirname_and_basename ()
+-{
+-  # Extract subdirectory from the argument.
 -  func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
-+  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
+-  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.
- 
+-}
+-
+-# Generated shell functions inserted here.
+-
 -# These SED scripts presuppose an absolute path with a trailing slash.
 -pathcar='s,^/\([^/]*\).*$,\1,'
 -pathcdr='s,^/[^/]*,,'
@@ -14533,28 +13591,83 @@
 -    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 @@
-     :
- }
- 
+-
+-# The name of this program:
+-func_dirname_and_basename "$progpath"
+-progname=$func_basename_result
+-
+-# Make sure we have an absolute path for reexecution:
+-case $progpath in
+-  [\\/]*|[A-Za-z]:\\*) ;;
+-  *[\\/]*)
+-     progdir=$func_dirname_result
+-     progdir=`cd "$progdir" && pwd`
+-     progpath="$progdir/$progname"
+-     ;;
+-  *)
+-     save_IFS="$IFS"
+-     IFS=:
+-     for progdir in $PATH; do
+-       IFS="$save_IFS"
+-       test -x "$progdir/$progname" && break
+-     done
+-     IFS="$save_IFS"
+-     test -n "$progdir" || progdir=`pwd`
+-     progpath="$progdir/$progname"
+-     ;;
+-esac
+-
+-# Sed substitution that helps us do robust quoting.  It backslashifies
+-# metacharacters that are still active within double-quoted strings.
+-Xsed="${SED}"' -e 1s/^X//'
+-sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
+-
+-# Same as above, but do not quote variable references.
+-double_quote_subst='s/\(["`\\]\)/\\\1/g'
+-
+-# Re-`\' parameter expansions in output of double_quote_subst that were
+-# `\'-ed in input to the same.  If an odd number of `\' preceded a '$'
+-# in input to double_quote_subst, that '$' was protected from expansion.
+-# Since each input `\' is now two `\'s, look for any number of runs of
+-# four `\'s followed by two `\'s and then a '$'.  `\' that '$'.
+-bs='\\'
+-bs2='\\\\'
+-bs4='\\\\\\\\'
+-dollar='\$'
+-sed_double_backslash="\
+-  s/$bs4/&\\
+-/g
+-  s/^$bs2$dollar/$bs&/
+-  s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g
+-  s/\n//g"
+-
+-# Standard options:
+-opt_dry_run=false
+-opt_help=false
+-opt_quiet=false
+-opt_verbose=false
+-opt_warning=:
+-
+-# func_echo arg...
+-# Echo program name prefixed message, along with the current mode
+-# name if it has been set yet.
+-func_echo ()
+-{
+-    $ECHO "$progname${mode+: }$mode: $*"
+-}
+-
+-# func_verbose arg...
+-# Echo program name prefixed message in verbose mode only.
+-func_verbose ()
+-{
+-    $opt_verbose && func_echo ${1+"$@"}
+-
+-    # A bug in bash halts the script if the last line of a function
+-    # fails when set -e is in force, so we need another command to
+-    # work around that:
+-    :
+-}
+-
 -# func_echo_all arg...
 -# Invoke $ECHO with all args, space-separated.
 -func_echo_all ()
@@ -14562,59 +13675,241 @@
 -    $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
+-# func_error arg...
+-# Echo program name prefixed message to standard error.
+-func_error ()
+-{
+-    $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2
+-}
+-
+-# func_warning arg...
+-# Echo program name prefixed warning message to standard error.
+-func_warning ()
+-{
+-    $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2
+-
+-    # bash bug again:
+-    :
+-}
+-
+-# func_fatal_error arg...
+-# Echo program name prefixed message to standard error, and exit.
+-func_fatal_error ()
+-{
+-    func_error ${1+"$@"}
+-    exit $EXIT_FAILURE
+-}
+-
+-# func_fatal_help arg...
+-# Echo program name prefixed message to standard error, followed by
+-# a help hint, and exit.
+-func_fatal_help ()
+-{
+-    func_error ${1+"$@"}
+-    func_fatal_error "$help"
+-}
+-help="Try \`$progname --help' for more information."  ## default
+-
+-
+-# func_grep expression filename
+-# Check whether EXPRESSION matches any line of FILENAME, without output.
+-func_grep ()
+-{
+-    $GREP "$1" "$2" >/dev/null 2>&1
+-}
+-
+-
+-# func_mkdir_p directory-path
+-# Make sure the entire path to DIRECTORY-PATH is available.
+-func_mkdir_p ()
+-{
+-    my_directory_path="$1"
+-    my_dir_list=
+-
+-    if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then
+-
+-      # Protect directory names starting with `-'
+-      case $my_directory_path in
+-        -*) my_directory_path="./$my_directory_path" ;;
+-      esac
+-
+-      # While some portion of DIR does not yet exist...
+-      while test ! -d "$my_directory_path"; do
+-        # ...make a list in topmost first order.  Use a colon delimited
+-	# list incase some portion of path contains whitespace.
+-        my_dir_list="$my_directory_path:$my_dir_list"
+-
+-        # If the last portion added has no slash in it, the list is done
+-        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
+-      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
- 
+-
+-      save_mkdir_p_IFS="$IFS"; IFS=':'
+-      for my_dir in $my_dir_list; do
+-	IFS="$save_mkdir_p_IFS"
+-        # mkdir can fail with a `File exist' error if two processes
+-        # try to create one of the directories concurrently.  Don't
+-        # stop in that case!
+-        $MKDIR "$my_dir" 2>/dev/null || :
+-      done
+-      IFS="$save_mkdir_p_IFS"
+-
+-      # Bail out if we (or some other process) failed to create a directory.
+-      test -d "$my_directory_path" || \
+-        func_fatal_error "Failed to create \`$1'"
+-    fi
+-}
+-
+-
+-# func_mktempdir [string]
+-# Make a temporary directory that won't clash with other running
+-# libtool processes, and avoids race conditions if possible.  If
+-# given, STRING is the basename for that directory.
+-func_mktempdir ()
+-{
+-    my_template="${TMPDIR-/tmp}/${1-$progname}"
+-
+-    if test "$opt_dry_run" = ":"; then
+-      # Return a directory name, but don't create it in dry-run mode
+-      my_tmpdir="${my_template}-$$"
+-    else
+-
+-      # If mktemp works, use that first and foremost
+-      my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
+-
+-      if test ! -d "$my_tmpdir"; then
+-        # Failing that, at least try and use $RANDOM to avoid a race
+-        my_tmpdir="${my_template}-${RANDOM-0}$$"
+-
+-        save_mktempdir_umask=`umask`
+-        umask 0077
+-        $MKDIR "$my_tmpdir"
+-        umask $save_mktempdir_umask
+-      fi
+-
+-      # If we're not in dry-run mode, bomb out on failure
+-      test -d "$my_tmpdir" || \
+-        func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
+-    fi
+-
 -    $ECHO "$my_tmpdir"
-+    $ECHO "X$my_tmpdir" | $Xsed
- }
- 
- 
-@@ -554,7 +392,7 @@
- {
-     case $1 in
-       *[\\\`\"\$]*)
+-}
+-
+-
+-# func_quote_for_eval arg
+-# Aesthetically quote ARG to be evaled later.
+-# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT
+-# is double-quoted, suitable for a subsequent eval, whereas
+-# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters
+-# which are still active within double quotes backslashified.
+-func_quote_for_eval ()
+-{
+-    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
-       *[\\\`\"]*)
+-      *)
+-        func_quote_for_eval_unquoted_result="$1" ;;
+-    esac
+-
+-    case $func_quote_for_eval_unquoted_result in
+-      # Double-quote args containing shell metacharacters to delay
+-      # word splitting, command substitution and and variable
+-      # expansion for a subsequent eval.
+-      # Many Bourne shells cannot handle close brackets correctly
+-      # in scan sets, so we specify it separately.
+-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+-        func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\""
+-        ;;
+-      *)
+-        func_quote_for_eval_result="$func_quote_for_eval_unquoted_result"
+-    esac
+-}
+-
+-
+-# func_quote_for_expand arg
+-# Aesthetically quote ARG to be evaled later; same as above,
+-# but do not quote variable references.
+-func_quote_for_expand ()
+-{
+-    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 ()
- {
+-	    -e "$double_quote_subst" -e "$sed_double_backslash"` ;;
+-      *)
+-        my_arg="$1" ;;
+-    esac
+-
+-    case $my_arg in
+-      # Double-quote args containing shell metacharacters to delay
+-      # word splitting and command substitution for a subsequent eval.
+-      # Many Bourne shells cannot handle close brackets correctly
+-      # in scan sets, so we specify it separately.
+-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+-        my_arg="\"$my_arg\""
+-        ;;
+-    esac
+-
+-    func_quote_for_expand_result="$my_arg"
+-}
+-
+-
+-# func_show_eval cmd [fail_exp]
+-# Unless opt_silent is true, then output CMD.  Then, if opt_dryrun is
+-# not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
+-# is given, then evaluate it.
+-func_show_eval ()
+-{
+-    my_cmd="$1"
+-    my_fail_exp="${2-:}"
+-
+-    ${opt_silent-false} || {
+-      func_quote_for_expand "$my_cmd"
+-      eval "func_echo $func_quote_for_expand_result"
+-    }
+-
+-    if ${opt_dry_run-false}; then :; else
+-      eval "$my_cmd"
+-      my_status=$?
+-      if test "$my_status" -eq 0; then :; else
+-	eval "(exit $my_status); $my_fail_exp"
+-      fi
+-    fi
+-}
+-
+-
+-# func_show_eval_locale cmd [fail_exp]
+-# Unless opt_silent is true, then output CMD.  Then, if opt_dryrun is
+-# not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
+-# is given, then evaluate it.  Use the saved locale for evaluation.
+-func_show_eval_locale ()
+-{
+-    my_cmd="$1"
+-    my_fail_exp="${2-:}"
+-
+-    ${opt_silent-false} || {
+-      func_quote_for_expand "$my_cmd"
+-      eval "func_echo $func_quote_for_expand_result"
+-    }
+-
+-    if ${opt_dry_run-false}; then :; else
+-      eval "$lt_user_locale
+-	    $my_cmd"
+-      my_status=$?
+-      eval "$lt_safe_locale"
+-      if test "$my_status" -eq 0; then :; else
+-	eval "(exit $my_status); $my_fail_exp"
+-      fi
+-    fi
+-}
+-
+-
+-# func_version
+-# Echo version message to standard output and exit.
+-func_version ()
+-{
 -    $SED -n '/(C)/!b go
 -	:more
 -	/\./!{
@@ -14624,248 +13919,1143 @@
 -	}
 -	: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 ()
- {
+-        s/^# //
+-	s/^# *$//
+-        s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
+-        p
+-     }' < "$progpath"
+-     exit $?
+-}
+-
+-# func_usage
+-# 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"
+-        s/^# //
+-	s/^# *$//
+-	s/\$progname/'$progname'/
+-	p
+-    }' < "$progpath"
 -    echo
-+    $ECHO
-     $ECHO "run \`$progname --help | more' for full usage"
-     exit $?
- }
- 
+-    $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"
+-func_help ()
+-{
+-    $SED -n '/^# Usage:/,/# Report bugs to/ {
+-        s/^# //
+-	s/^# *$//
+-	s*\$progname*'$progname'*
+-	s*\$host*'"$host"'*
+-	s*\$SHELL*'"$SHELL"'*
+-	s*\$LTCC*'"$LTCC"'*
+-	s*\$LTCFLAGS*'"$LTCFLAGS"'*
+-	s*\$LD*'"$LD"'*
+-	s/\$with_gnu_ld/'"$with_gnu_ld"'/
+-	s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
+-	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_missing_arg argname
+-# Echo program name prefixed message to standard error and set global
+-# 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 ()
- {
+-    exit_cmd=exit
+-}
+-
+-exit_cmd=:
+-
+-
+-
+-
+-
+-
+-magic="%%%MAGIC variable%%%"
+-magic_exe="%%%MAGIC EXE variable%%%"
+-
+-# Global variables.
+-# $mode is unset
+-nonopt=
+-execute_dlfiles=
+-preserve_args=
+-lo2o="s/\\.lo\$/.${objext}/"
+-o2lo="s/\\.${objext}\$/.lo/"
+-extracted_archives=
+-extracted_serial=0
+-
+-opt_dry_run=false
+-opt_duplicate_deps=false
+-opt_silent=false
+-opt_debug=:
+-
+-# If this variable is set in any of the actions, the command in it
+-# will be execed at the end.  This prevents here-documents from being
+-# left over by shells.
+-exec_cmd=
+-
+-# func_fatal_configuration arg...
+-# Echo program name prefixed message to standard error, followed by
+-# a configuration failure hint, and exit.
+-func_fatal_configuration ()
+-{
+-    func_error ${1+"$@"}
+-    func_error "See the $PACKAGE documentation for more information."
+-    func_fatal_error "Fatal configuration error."
+-}
+-
+-
+-# func_config
+-# Display the configuration for all the tags in this script.
+-func_config ()
+-{
+-    re_begincf='^# ### BEGIN LIBTOOL'
+-    re_endcf='^# ### END LIBTOOL'
+-
+-    # Default configuration.
+-    $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" < "$progpath"
+-
+-    # Now print the configurations for the tags.
+-    for tagname in $taglist; do
+-      $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$progpath"
+-    done
+-
+-    exit $?
+-}
+-
+-# func_features
+-# Display the features supported by this script.
+-func_features ()
+-{
 -    echo "host: $host"
-+    $ECHO "host: $host"
-     if test "$build_libtool_libs" = yes; then
+-    if test "$build_libtool_libs" = yes; then
 -      echo "enable shared libraries"
-+      $ECHO "enable shared libraries"
-     else
+-    else
 -      echo "disable shared libraries"
-+      $ECHO "disable shared libraries"
-     fi
-     if test "$build_old_libs" = yes; then
+-    fi
+-    if test "$build_old_libs" = yes; then
 -      echo "enable static libraries"
-+      $ECHO "enable static libraries"
-     else
+-    else
 -      echo "disable static libraries"
-+      $ECHO "disable static libraries"
-     fi
- 
-     exit $?
-@@ -920,21 +772,10 @@
- 
-       --quiet|--silent)	preserve_args="$preserve_args $opt"
- 			opt_silent=:
+-    fi
+-
+-    exit $?
+-}
+-
+-# func_enable_tag tagname
+-# Verify that TAGNAME is valid, and either flag an error and exit, or
+-# enable the TAGNAME tag.  We also add TAGNAME to the global $taglist
+-# variable here.
+-func_enable_tag ()
+-{
+-  # Global variable:
+-  tagname="$1"
+-
+-  re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$"
+-  re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$"
+-  sed_extractcf="/$re_begincf/,/$re_endcf/p"
+-
+-  # Validate tagname.
+-  case $tagname in
+-    *[!-_A-Za-z0-9,/]*)
+-      func_fatal_error "invalid tag name: $tagname"
+-      ;;
+-  esac
+-
+-  # Don't test for the "default" C tag, as we know it's
+-  # there but not specially marked.
+-  case $tagname in
+-    CC) ;;
+-    *)
+-      if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then
+-	taglist="$taglist $tagname"
+-
+-	# Evaluate the configuration.  Be careful to quote the path
+-	# and the sed script, to avoid splitting on whitespace, but
+-	# also don't use non-portable quotes within backquotes within
+-	# quotes we have to do it in 2 steps:
+-	extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"`
+-	eval "$extractedcf"
+-      else
+-	func_error "ignoring unknown tag $tagname"
+-      fi
+-      ;;
+-  esac
+-}
+-
+-# Parse options once, thoroughly.  This comes as soon as possible in
+-# the script to make things like `libtool --version' happen quickly.
+-{
+-
+-  # Shorthand for --mode=foo, only valid as the first argument
+-  case $1 in
+-  clean|clea|cle|cl)
+-    shift; set dummy --mode clean ${1+"$@"}; shift
+-    ;;
+-  compile|compil|compi|comp|com|co|c)
+-    shift; set dummy --mode compile ${1+"$@"}; shift
+-    ;;
+-  execute|execut|execu|exec|exe|ex|e)
+-    shift; set dummy --mode execute ${1+"$@"}; shift
+-    ;;
+-  finish|finis|fini|fin|fi|f)
+-    shift; set dummy --mode finish ${1+"$@"}; shift
+-    ;;
+-  install|instal|insta|inst|ins|in|i)
+-    shift; set dummy --mode install ${1+"$@"}; shift
+-    ;;
+-  link|lin|li|l)
+-    shift; set dummy --mode link ${1+"$@"}; shift
+-    ;;
+-  uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
+-    shift; set dummy --mode uninstall ${1+"$@"}; shift
+-    ;;
+-  esac
+-
+-  # Parse non-mode specific arguments:
+-  while test "$#" -gt 0; do
+-    opt="$1"
+-    shift
+-
+-    case $opt in
+-      --config)		func_config					;;
+-
+-      --debug)		preserve_args="$preserve_args $opt"
+-			func_echo "enabling shell trace mode"
+-			opt_debug='set -x'
+-			$opt_debug
+-			;;
+-
+-      -dlopen)		test "$#" -eq 0 && func_missing_arg "$opt" && break
+-			execute_dlfiles="$execute_dlfiles $1"
+-			shift
+-			;;
+-
+-      --dry-run | -n)	opt_dry_run=:					;;
+-      --features)       func_features					;;
+-      --finish)		mode="finish"					;;
+-
+-      --mode)		test "$#" -eq 0 && func_missing_arg "$opt" && break
+-			case $1 in
+-			  # Valid mode arguments:
+-			  clean)	;;
+-			  compile)	;;
+-			  execute)	;;
+-			  finish)	;;
+-			  install)	;;
+-			  link)		;;
+-			  relink)	;;
+-			  uninstall)	;;
+-
+-			  # Catch anything else as an error
+-			  *) func_error "invalid argument for $opt"
+-			     exit_cmd=exit
+-			     break
+-			     ;;
+-		        esac
+-
+-			mode="$1"
+-			shift
+-			;;
+-
+-      --preserve-dup-deps)
+-			opt_duplicate_deps=:				;;
+-
+-      --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
+-			;;
+-
+-      --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=:					;;
+-			;;
+-
+-      --tag)		test "$#" -eq 0 && func_missing_arg "$opt" && break
+-			preserve_args="$preserve_args $opt $1"
+-			func_enable_tag "$1"	# tagname is set here
+-			shift
+-			;;
+-
+-      # Separate optargs to long options:
+-      -dlopen=*|--mode=*|--tag=*)
+-			func_opt_split "$opt"
+-			set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"}
+-			shift
+-			;;
+-
+-      -\?|-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
+-      --version)	func_version					;;
+-
+-      -*)		func_fatal_help "unrecognized option \`$opt'"	;;
+-
+-      *)		nonopt="$opt"
+-			break
+-			;;
+-    esac
+-  done
+-
+-
+-  case $host in
+-    *cygwin* | *mingw* | *pw32* | *cegcc*)
+-      # don't eliminate duplications in $postdeps and $predeps
+-      opt_duplicate_compiler_generated_deps=:
+-      ;;
+-    *)
+-      opt_duplicate_compiler_generated_deps=$opt_duplicate_deps
+-      ;;
+-  esac
+-
+-  # Having warned about all mis-specified options, bail out if
+-  # anything was wrong.
+-  $exit_cmd $EXIT_FAILURE
+-}
+-
+-# func_check_version_match
+-# Ensure that we are using m4 macros, and libtool script from the same
+-# release of libtool.
+-func_check_version_match ()
+-{
+-  if test "$package_revision" != "$macro_revision"; then
+-    if test "$VERSION" != "$macro_version"; then
+-      if test -z "$macro_version"; then
+-        cat >&2 <<_LT_EOF
+-$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
+-$progname: definition of this LT_INIT comes from an older release.
+-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
+-$progname: and run autoconf again.
+-_LT_EOF
+-      else
+-        cat >&2 <<_LT_EOF
+-$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
+-$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
+-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
+-$progname: and run autoconf again.
+-_LT_EOF
+-      fi
+-    else
+-      cat >&2 <<_LT_EOF
+-$progname: Version mismatch error.  This is $PACKAGE $VERSION, revision $package_revision,
+-$progname: but the definition of this LT_INIT comes from revision $macro_revision.
+-$progname: You should recreate aclocal.m4 with macros from revision $package_revision
+-$progname: of $PACKAGE $VERSION and run autoconf again.
+-_LT_EOF
+-    fi
+-
+-    exit $EXIT_MISMATCH
+-  fi
+-}
+-
+-
+-## ----------- ##
+-##    Main.    ##
+-## ----------- ##
+-
+-$opt_help || {
+-  # Sanity checks first:
+-  func_check_version_match
+-
+-  if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
+-    func_fatal_configuration "not configured to build any kind of library"
+-  fi
+-
+-  test -z "$mode" && func_fatal_error "error: you must specify a MODE."
+-
+-
+-  # Darwin sucks
+-  eval std_shrext=\"$shrext_cmds\"
+-
+-
+-  # Only execute mode is allowed to have -dlopen flags.
+-  if test -n "$execute_dlfiles" && test "$mode" != execute; then
+-    func_error "unrecognized option \`-dlopen'"
+-    $ECHO "$help" 1>&2
+-    exit $EXIT_FAILURE
+-  fi
+-
+-  # Change the help message to a mode-specific one.
+-  generic_help="$help"
+-  help="Try \`$progname --help --mode=$mode' for more information."
+-}
+-
+-
+-# func_lalib_p file
+-# True iff FILE is a libtool `.la' library or `.lo' object file.
+-# This function is only a basic sanity check; it will hardly flush out
+-# determined imposters.
+-func_lalib_p ()
+-{
+-    test -f "$1" &&
+-      $SED -e 4q "$1" 2>/dev/null \
+-        | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
+-}
+-
+-# func_lalib_unsafe_p file
+-# True iff FILE is a libtool `.la' library or `.lo' object file.
+-# This function implements the same check as func_lalib_p without
+-# resorting to external programs.  To this end, it redirects stdin and
+-# closes it afterwards, without saving the original file descriptor.
+-# As a safety measure, use it only where a negative result would be
+-# fatal anyway.  Works if `file' does not exist.
+-func_lalib_unsafe_p ()
+-{
+-    lalib_p=no
+-    if test -f "$1" && test -r "$1" && exec 5<&0 <"$1"; then
+-	for lalib_p_l in 1 2 3 4
+-	do
+-	    read lalib_p_line
+-	    case "$lalib_p_line" in
+-		\#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;;
+-	    esac
+-	done
+-	exec 0<&5 5<&-
+-    fi
+-    test "$lalib_p" = yes
+-}
+-
+-# func_ltwrapper_script_p file
+-# True iff FILE is a libtool wrapper script
+-# This function is only a basic sanity check; it will hardly flush out
+-# determined imposters.
+-func_ltwrapper_script_p ()
+-{
+-    func_lalib_p "$1"
+-}
+-
+-# func_ltwrapper_executable_p file
+-# True iff FILE is a libtool wrapper executable
+-# This function is only a basic sanity check; it will hardly flush out
+-# determined imposters.
+-func_ltwrapper_executable_p ()
+-{
+-    func_ltwrapper_exec_suffix=
+-    case $1 in
+-    *.exe) ;;
+-    *) func_ltwrapper_exec_suffix=.exe ;;
+-    esac
+-    $GREP "$magic_exe" "$1$func_ltwrapper_exec_suffix" >/dev/null 2>&1
+-}
+-
+-# func_ltwrapper_scriptname file
+-# Assumes file is an ltwrapper_executable
+-# uses $file to determine the appropriate filename for a
+-# temporary ltwrapper_script.
+-func_ltwrapper_scriptname ()
+-{
+-    func_ltwrapper_scriptname_result=""
+-    if func_ltwrapper_executable_p "$1"; then
+-	func_dirname_and_basename "$1" "" "."
+-	func_stripname '' '.exe' "$func_basename_result"
+-	func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
+-    fi
+-}
+-
+-# func_ltwrapper_p file
+-# True iff FILE is a libtool wrapper script or wrapper executable
+-# This function is only a basic sanity check; it will hardly flush out
+-# determined imposters.
+-func_ltwrapper_p ()
+-{
+-    func_ltwrapper_script_p "$1" || func_ltwrapper_executable_p "$1"
+-}
+-
+-
+-# func_execute_cmds commands fail_cmd
+-# Execute tilde-delimited COMMANDS.
+-# If FAIL_CMD is given, eval that upon failure.
+-# FAIL_CMD may read-access the current command in variable CMD!
+-func_execute_cmds ()
+-{
+-    $opt_debug
+-    save_ifs=$IFS; IFS='~'
+-    for cmd in $1; do
+-      IFS=$save_ifs
+-      eval cmd=\"$cmd\"
+-      func_show_eval "$cmd" "${2-:}"
+-    done
+-    IFS=$save_ifs
+-}
+-
+-
+-# func_source file
+-# Source FILE, adding directory component if necessary.
+-# Note that it is not necessary on cygwin/mingw to append a dot to
+-# FILE even if both FILE and FILE.exe exist: automatic-append-.exe
+-# behavior happens only for exec(3), not for open(2)!  Also, sourcing
+-# `FILE.' does not work on cygwin managed mounts.
+-func_source ()
+-{
+-    $opt_debug
+-    case $1 in
+-    */* | *\\*)	. "$1" ;;
+-    *)		. "./$1" ;;
+-    esac
+-}
+-
+-
+-# func_infer_tag arg
+-# Infer tagged configuration to use if any are available and
+-# if one wasn't chosen via the "--tag" command line option.
+-# Only attempt this if the compiler in the base compile
+-# command doesn't match the default compiler.
+-# arg is usually of the form 'gcc ...'
+-func_infer_tag ()
+-{
+-    $opt_debug
+-    if test -n "$available_tags" && test -z "$tagname"; then
+-      CC_quoted=
+-      for arg in $CC; do
+-        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.
+-      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
+-      # Blanks at the start of $base_compile will cause this to fail
+-      # if we don't check for them as well.
+-      *)
+-	for z in $available_tags; do
+-	  if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
+-	    # Evaluate the configuration.
+-	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
+-	    CC_quoted=
+-	    for arg in $CC; do
+-	      # Double-quote args containing other shell metacharacters.
+-	      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
+-	    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 | \
+-	      # The compiler in the base compile command matches
+-	      # the one in the tagged configuration.
+-	      # Assume this is the tagged configuration we want.
+-	      tagname=$z
+-	      break
+-	      ;;
+-	    esac
+-	  fi
+-	done
+-	# If $tagname still isn't set, then no tagged configuration
+-	# was found and let the user know that the "--tag" command
+-	# line option must be used.
+-	if test -z "$tagname"; then
+-	  func_echo "unable to infer tagged configuration"
+-	  func_fatal_error "specify a tag with \`--tag'"
+-#	else
+-#	  func_verbose "using $tagname tagged configuration"
+-	fi
+-	;;
+-      esac
+-    fi
+-}
+-
+-
+-
+-# func_write_libtool_object output_name pic_name nonpic_name
+-# Create a libtool object file (analogous to a ".la" file),
+-# but don't create it if we're doing a dry run.
+-func_write_libtool_object ()
+-{
+-    write_libobj=${1}
+-    if test "$build_libtool_libs" = yes; then
+-      write_lobj=\'${2}\'
+-    else
+-      write_lobj=none
+-    fi
+-
+-    if test "$build_old_libs" = yes; then
+-      write_oldobj=\'${3}\'
+-    else
+-      write_oldobj=none
+-    fi
+-
+-    $opt_dry_run || {
+-      cat >${write_libobj}T <<EOF
+-# $write_libobj - a libtool object file
+-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+-#
+-# Please DO NOT delete this file!
+-# It is necessary for linking the library.
+-
+-# Name of the PIC object.
+-pic_object=$write_lobj
+-
+-# Name of the non-PIC object
+-non_pic_object=$write_oldobj
+-
+-EOF
+-      $MV "${write_libobj}T" "${write_libobj}"
+-    }
+-}
+-
+-# func_mode_compile arg...
+-func_mode_compile ()
+-{
+-    $opt_debug
+-    # Get the compilation command and the source file.
+-    base_compile=
+-    srcfile="$nonopt"  #  always keep a non-empty value in "srcfile"
+-    suppress_opt=yes
+-    suppress_output=
+-    arg_mode=normal
+-    libobj=
+-    later=
+-    pie_flag=
+-
+-    for arg
+-    do
+-      case $arg_mode in
+-      arg  )
+-	# do not "continue".  Instead, add this to base_compile
+-	lastarg="$arg"
+-	arg_mode=normal
+-	;;
+-
+-      target )
+-	libobj="$arg"
+-	arg_mode=normal
+-	continue
+-	;;
+-
+-      normal )
+-	# Accept any command-line options.
+-	case $arg in
+-	-o)
+-	  test -n "$libobj" && \
+-	    func_fatal_error "you cannot specify \`-o' more than once"
+-	  arg_mode=target
+-	  continue
+-	  ;;
+-
+-	-pie | -fpie | -fPIE)
+-          pie_flag="$pie_flag $arg"
+-	  continue
+-	  ;;
+-
+-	-shared | -static | -prefer-pic | -prefer-non-pic)
+-	  later="$later $arg"
+-	  continue
+-	  ;;
+-
+-	-no-suppress)
+-	  suppress_opt=no
+-	  continue
+-	  ;;
+-
+-	-Xcompiler)
+-	  arg_mode=arg  #  the next one goes into the "base_compile" arg list
+-	  continue      #  The current "srcfile" will either be retained or
+-	  ;;            #  replaced later.  I would guess that would be a bug.
+-
+-	-Wc,*)
+-	  func_stripname '-Wc,' '' "$arg"
+-	  args=$func_stripname_result
+-	  lastarg=
+-	  save_ifs="$IFS"; IFS=','
+-	  for arg in $args; do
+-	    IFS="$save_ifs"
+-	    func_quote_for_eval "$arg"
+-	    lastarg="$lastarg $func_quote_for_eval_result"
+-	  done
+-	  IFS="$save_ifs"
+-	  func_stripname ' ' '' "$lastarg"
+-	  lastarg=$func_stripname_result
+-
+-	  # Add the arguments to base_compile.
+-	  base_compile="$base_compile $lastarg"
+-	  continue
+-	  ;;
+-
+-	*)
+-	  # Accept the current argument as the source file.
+-	  # The previous "srcfile" becomes the current argument.
+-	  #
+-	  lastarg="$srcfile"
+-	  srcfile="$arg"
+-	  ;;
+-	esac  #  case $arg
+-	;;
+-      esac    #  case $arg_mode
+-
+-      # Aesthetically quote the previous argument.
+-      func_quote_for_eval "$lastarg"
+-      base_compile="$base_compile $func_quote_for_eval_result"
+-    done # for arg
+-
+-    case $arg_mode in
+-    arg)
+-      func_fatal_error "you must specify an argument for -Xcompile"
+-      ;;
+-    target)
+-      func_fatal_error "you must specify a target with \`-o'"
+-      ;;
+-    *)
+-      # Get the name of the library object.
+-      test -z "$libobj" && {
+-	func_basename "$srcfile"
+-	libobj="$func_basename_result"
+-      }
+-      ;;
+-    esac
+-
+-    # Recognize several different file suffixes.
+-    # If the user specifies -o file.o, it is replaced with file.lo
+-    case $libobj in
+-    *.[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
+-      func_xform "$libobj"
+-      libobj=$func_xform_result
+-      ;;
+-    esac
+-
+-    case $libobj in
+-    *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;;
+-    *)
+-      func_fatal_error "cannot determine name of library object from \`$libobj'"
+-      ;;
+-    esac
+-
+-    func_infer_tag $base_compile
+-
+-    for arg in $later; do
+-      case $arg in
+-      -shared)
+-	test "$build_libtool_libs" != yes && \
+-	  func_fatal_configuration "can not build a shared library"
+-	build_old_libs=no
+-	continue
+-	;;
+-
+-      -static)
+-	build_libtool_libs=no
+-	build_old_libs=yes
+-	continue
+-	;;
+-
+-      -prefer-pic)
+-	pic_mode=yes
+-	continue
+-	;;
+-
+-      -prefer-non-pic)
+-	pic_mode=no
+-	continue
+-	;;
+-      esac
+-    done
+-
+-    func_quote_for_eval "$libobj"
+-    test "X$libobj" != "X$func_quote_for_eval_result" \
+-      && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"'	 &()|`$[]' \
+-      && func_warning "libobj name \`$libobj' may not contain shell special characters."
+-    func_dirname_and_basename "$obj" "/" ""
+-    objname="$func_basename_result"
+-    xdir="$func_dirname_result"
+-    lobj=${xdir}$objdir/$objname
+-
+-    test -z "$base_compile" && \
+-      func_fatal_help "you must specify a compilation command"
+-
+-    # Delete any leftover library objects.
+-    if test "$build_old_libs" = yes; then
+-      removelist="$obj $lobj $libobj ${libobj}T"
+-    else
+-      removelist="$lobj $libobj ${libobj}T"
+-    fi
+-
+-    # On Cygwin there's no "real" PIC flag so we must build both object types
+-    case $host_os in
+-    cygwin* | mingw* | pw32* | os2* | cegcc*)
+-      pic_mode=default
+-      ;;
+-    esac
+-    if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
+-      # non-PIC code in shared libraries is not supported
+-      pic_mode=default
+-    fi
+-
+-    # Calculate the filename of the output object if compiler does
+-    # not support -o with -c
+-    if test "$compiler_c_o" = no; then
 -      output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext}
-+      output_obj=`$ECHO "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
-       lockfile="$output_obj.lock"
-     else
-       output_obj=
-@@ -1611,7 +1445,7 @@
- }
- 
- $opt_help || {
+-      lockfile="$output_obj.lock"
+-    else
+-      output_obj=
+-      need_locks=no
+-      lockfile=
+-    fi
+-
+-    # Lock this critical section if it is needed
+-    # We use this script file to make the link, it avoids creating a new file
+-    if test "$need_locks" = yes; then
+-      until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
+-	func_echo "Waiting for $lockfile to be removed"
+-	sleep 2
+-      done
+-    elif test "$need_locks" = warn; then
+-      if test -f "$lockfile"; then
+-	$ECHO "\
+-*** ERROR, $lockfile exists and contains:
+-`cat $lockfile 2>/dev/null`
+-
+-This indicates that another process is trying to use the same
+-temporary object file, and libtool could not work around it because
+-your compiler does not support \`-c' and \`-o' together.  If you
+-repeat this compilation, it may succeed, by chance, but you had better
+-avoid parallel builds (make -j) in this platform, or get a better
+-compiler."
+-
+-	$opt_dry_run || $RM $removelist
+-	exit $EXIT_FAILURE
+-      fi
+-      removelist="$removelist $output_obj"
+-      $ECHO "$srcfile" > "$lockfile"
+-    fi
+-
+-    $opt_dry_run || $RM $removelist
+-    removelist="$removelist $lockfile"
+-    trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
+-
+-    if test -n "$fix_srcfile_path"; then
+-      eval srcfile=\"$fix_srcfile_path\"
+-    fi
+-    func_quote_for_eval "$srcfile"
+-    qsrcfile=$func_quote_for_eval_result
+-
+-    # Only build a PIC object if we are building libtool libraries.
+-    if test "$build_libtool_libs" = yes; then
+-      # Without this assignment, base_compile gets emptied.
+-      fbsd_hideous_sh_bug=$base_compile
+-
+-      if test "$pic_mode" != no; then
+-	command="$base_compile $qsrcfile $pic_flag"
+-      else
+-	# Don't build PIC code
+-	command="$base_compile $qsrcfile"
+-      fi
+-
+-      func_mkdir_p "$xdir$objdir"
+-
+-      if test -z "$output_obj"; then
+-	# Place PIC objects in $objdir
+-	command="$command -o $lobj"
+-      fi
+-
+-      func_show_eval_locale "$command"	\
+-          'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE'
+-
+-      if test "$need_locks" = warn &&
+-	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
+-	$ECHO "\
+-*** ERROR, $lockfile contains:
+-`cat $lockfile 2>/dev/null`
+-
+-but it should contain:
+-$srcfile
+-
+-This indicates that another process is trying to use the same
+-temporary object file, and libtool could not work around it because
+-your compiler does not support \`-c' and \`-o' together.  If you
+-repeat this compilation, it may succeed, by chance, but you had better
+-avoid parallel builds (make -j) in this platform, or get a better
+-compiler."
+-
+-	$opt_dry_run || $RM $removelist
+-	exit $EXIT_FAILURE
+-      fi
+-
+-      # Just move the object if needed, then go on to compile the next one
+-      if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then
+-	func_show_eval '$MV "$output_obj" "$lobj"' \
+-	  'error=$?; $opt_dry_run || $RM $removelist; exit $error'
+-      fi
+-
+-      # Allow error messages only from the first compilation.
+-      if test "$suppress_opt" = yes; then
+-	suppress_output=' >/dev/null 2>&1'
+-      fi
+-    fi
+-
+-    # Only build a position-dependent object if we build old libraries.
+-    if test "$build_old_libs" = yes; then
+-      if test "$pic_mode" != yes; then
+-	# Don't build PIC code
+-	command="$base_compile $qsrcfile$pie_flag"
+-      else
+-	command="$base_compile $qsrcfile $pic_flag"
+-      fi
+-      if test "$compiler_c_o" = yes; then
+-	command="$command -o $obj"
+-      fi
+-
+-      # Suppress compiler output if we already did a PIC compilation.
+-      command="$command$suppress_output"
+-      func_show_eval_locale "$command" \
+-        '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
+-
+-      if test "$need_locks" = warn &&
+-	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
+-	$ECHO "\
+-*** ERROR, $lockfile contains:
+-`cat $lockfile 2>/dev/null`
+-
+-but it should contain:
+-$srcfile
+-
+-This indicates that another process is trying to use the same
+-temporary object file, and libtool could not work around it because
+-your compiler does not support \`-c' and \`-o' together.  If you
+-repeat this compilation, it may succeed, by chance, but you had better
+-avoid parallel builds (make -j) in this platform, or get a better
+-compiler."
+-
+-	$opt_dry_run || $RM $removelist
+-	exit $EXIT_FAILURE
+-      fi
+-
+-      # Just move the object if needed
+-      if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then
+-	func_show_eval '$MV "$output_obj" "$obj"' \
+-	  'error=$?; $opt_dry_run || $RM $removelist; exit $error'
+-      fi
+-    fi
+-
+-    $opt_dry_run || {
+-      func_write_libtool_object "$libobj" "$objdir/$objname" "$objname"
+-
+-      # Unlock the critical section if it was locked
+-      if test "$need_locks" != no; then
+-	removelist=$lockfile
+-        $RM "$lockfile"
+-      fi
+-    }
+-
+-    exit $EXIT_SUCCESS
+-}
+-
+-$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
+-}
+-
+-func_mode_help ()
+-{
+-    # We need to display help for each of the modes.
+-    case $mode in
+-      "")
+-        # Generic help is extracted from the usage comments
+-        # at the start of this file.
+-        func_help
+-        ;;
+-
+-      clean)
+-        $ECHO \
+-"Usage: $progname [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
+-
+-Remove files from the build directory.
+-
+-RM is the name of the program to use to delete files associated with each FILE
+-(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
+-to RM.
+-
+-If FILE is a libtool library, object or program, all the files associated
+-with it are deleted. Otherwise, only FILE itself is deleted using RM."
+-        ;;
+-
+-      compile)
+-      $ECHO \
+-"Usage: $progname [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
+-
+-Compile a source file into a libtool library object.
+-
+-This mode accepts the following additional options:
+-
+-  -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
+-  -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:
- 
+-
+-COMPILE-COMMAND is a command to be used in creating a \`standard' object file
+-from the given SOURCEFILE.
+-
+-The output file name is determined by removing the directory component from
+-SOURCEFILE, then substituting the C source code suffix \`.c' with the
+-library object suffix, \`.lo'."
+-        ;;
+-
+-      execute)
+-        $ECHO \
+-"Usage: $progname [OPTION]... --mode=execute COMMAND [ARGS]...
+-
+-Automatically set library path, then run a program.
+-
+-This mode accepts the following additional options:
+-
+-  -dlopen FILE      add the directory containing FILE to the library path
+-
+-This mode sets the library path environment variable according to \`-dlopen'
+-flags.
+-
+-If any of the ARGS are libtool executable wrappers, then they are translated
+-into their corresponding uninstalled binary, and any of their required library
+-directories are added to the library path.
+-
+-Then, COMMAND is executed, with ARGS as arguments."
+-        ;;
+-
+-      finish)
+-        $ECHO \
+-"Usage: $progname [OPTION]... --mode=finish [LIBDIR]...
+-
+-Complete the installation of libtool libraries.
+-
+-Each LIBDIR is a directory that contains libtool libraries.
+-
+-The commands that this mode executes may require superuser privileges.  Use
+-the \`--dry-run' option if you just want to see what would be executed."
+-        ;;
+-
+-      install)
+-        $ECHO \
+-"Usage: $progname [OPTION]... --mode=install INSTALL-COMMAND...
+-
+-Install executables or libraries.
+-
+-INSTALL-COMMAND is the installation command.  The first component should be
+-either the \`install' or \`cp' program.
+-
+-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
+-
+-The rest of the components are interpreted as arguments to that command (only
+-BSD-compatible install options are recognized)."
+-        ;;
+-
+-      link)
+-        $ECHO \
+-"Usage: $progname [OPTION]... --mode=link LINK-COMMAND...
+-
+-Link object files or libraries together to form another library, or to
+-create an executable program.
+-
+-LINK-COMMAND is a command using the C compiler that you would use to create
+-a program from several object files.
+-
+-The following components of LINK-COMMAND are treated specially:
+-
+-  -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
+-  -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
+-  -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
+-  -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
+-  -export-symbols SYMFILE
+-                    try to export only the symbols listed in SYMFILE
+-  -export-symbols-regex REGEX
+-                    try to export only the symbols matching REGEX
+-  -LLIBDIR          search LIBDIR for required installed libraries
+-  -lNAME            OUTPUT-FILE requires the installed library libNAME
+-  -module           build a library that can dlopened
+-  -no-fast-install  disable the fast-install mode
+-  -no-install       link a not-installable executable
+-  -no-undefined     declare that a library does not refer to external symbols
+-  -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
+-  -objectlist FILE  Use a list of object files found in FILE to specify objects
+-  -precious-files-regex REGEX
+-                    don't remove output files matching REGEX
+-  -release RELEASE  specify package release information
+-  -rpath LIBDIR     the created library will eventually be installed in LIBDIR
+-  -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
+-  -shared           only do dynamic linking of libtool libraries
+-  -shrext SUFFIX    override the standard shared library file extension
+-  -static           do not do any dynamic linking of uninstalled libtool libraries
+-  -static-libtool-libs
+-                    do not do any dynamic linking of libtool libraries
+-  -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
- 
+-
+-All other options (arguments beginning with \`-') are ignored.
+-
+-Every other argument is treated as a filename.  Files ending in \`.la' are
+-treated as uninstalled libtool libraries, other files are standard or library
+-object files.
+-
+-If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
+-only library objects (\`.lo' files) may be specified, and \`-rpath' is
+-required, except when creating a convenience library.
+-
+-If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
+-using \`ar' and \`ranlib', or on Windows using \`lib'.
+-
+-If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
+-is created, otherwise an executable program is created."
+-        ;;
+-
+-      uninstall)
+-        $ECHO \
+-"Usage: $progname [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
+-
+-Remove libraries from an installation directory.
+-
+-RM is the name of the program to use to delete files associated with each FILE
+-(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
+-to RM.
+-
+-If FILE is a libtool library, all the files associated with it are deleted.
+-Otherwise, only FILE itself is deleted using RM."
+-        ;;
+-
+-      *)
+-        func_fatal_help "invalid operation mode \`$mode'"
+-        ;;
+-    esac
+-
 -    echo
-+    $ECHO
-     $ECHO "Try \`$progname --help' for more information about other modes."
-+
-+    exit $?
- }
- 
+-    $ECHO "Try \`$progname --help' for more information about other modes."
+-}
+-
 -# Now that we've collected a possible --mode arg, show help if necessary
 -if $opt_help; then
 -  if test "$opt_help" = :; then
@@ -14896,165 +15086,312 @@
 -  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
+-
+-
+-# func_mode_execute arg...
+-func_mode_execute ()
+-{
+-    $opt_debug
+-    # The first argument is the command name.
+-    cmd="$nonopt"
+-    test -z "$cmd" && \
+-      func_fatal_help "you must specify a COMMAND"
+-
+-    # Handle -dlopen flags immediately.
+-    for file in $execute_dlfiles; do
+-      test -f "$file" \
+-	|| func_fatal_help "\`$file' is not a file"
+-
+-      dir=
+-      case $file in
+-      *.la)
+-	# Check to see that this really is a libtool archive.
+-	func_lalib_unsafe_p "$file" \
+-	  || func_fatal_help "\`$lib' is not a valid libtool archive"
+-
+-	# Read the libtool library.
+-	dlname=
+-	library_names=
+-	func_source "$file"
+-
+-	# Skip this library if it cannot be dlopened.
+-	if test -z "$dlname"; then
+-	  # Warn if it was a shared library.
+-	  test -n "$library_names" && \
+-	    func_warning "\`$file' was not linked with \`-export-dynamic'"
+-	  continue
+-	fi
+-
+-	func_dirname "$file" "" "."
+-	dir="$func_dirname_result"
+-
+-	if test -f "$dir/$objdir/$dlname"; then
+-	  dir="$dir/$objdir"
+-	else
+-	  if test ! -f "$dir/$dlname"; then
+-	    func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
+-	  fi
+-	fi
+-	;;
+-
+-      *.lo)
+-	# Just add the directory containing the .lo file.
+-	func_dirname "$file" "" "."
+-	dir="$func_dirname_result"
+-	;;
+-
+-      *)
+-	func_warning "\`-dlopen' is ignored for non-libtool libraries and objects"
+-	continue
+-	;;
+-      esac
+-
+-      # Get the absolute pathname.
+-      absdir=`cd "$dir" && pwd`
+-      test -n "$absdir" && dir="$absdir"
+-
+-      # Now add the directory to shlibpath_var.
+-      if eval "test -z \"\$$shlibpath_var\""; then
+-	eval "$shlibpath_var=\"\$dir\""
+-      else
+-	eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
+-      fi
+-    done
+-
+-    # This variable tells wrapper scripts just to set shlibpath_var
+-    # rather than running their programs.
+-    libtool_execute_magic="$magic"
+-
+-    # Check if any of the arguments is a wrapper script.
+-    args=
+-    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\""
+-      *)
+-	# Do a test to see if this is really a libtool program.
+-	if func_ltwrapper_script_p "$file"; then
+-	  func_source "$file"
+-	  # Transform arg to wrapped name.
+-	  file="$progdir/$program"
+-	elif func_ltwrapper_executable_p "$file"; then
+-	  func_ltwrapper_scriptname "$file"
+-	  func_source "$func_ltwrapper_scriptname_result"
+-	  # Transform arg to wrapped name.
+-	  file="$progdir/$program"
+-	fi
+-	;;
+-      esac
+-      # Quote arguments (to preserve shell metacharacters).
+-      func_quote_for_eval "$file"
+-      args="$args $func_quote_for_eval_result"
+-    done
+-
+-    if test "X$opt_dry_run" = Xfalse; then
+-      if test -n "$shlibpath_var"; then
+-	# Export the shlibpath_var.
+-	eval "export $shlibpath_var"
+-      fi
+-
+-      # Restore saved environment variables
+-      for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+-      do
+-	eval "if test \"\${save_$lt_var+set}\" = set; then
+-                $lt_var=\$save_$lt_var; export $lt_var
+-	      else
+-		$lt_unset $lt_var
+-	      fi"
+-      done
+-
+-      # Now prepare to actually exec the command.
+-      exec_cmd="\$cmd$args"
+-    else
+-      # Display what would be done.
+-      if test -n "$shlibpath_var"; then
+-	eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
 -	echo "export $shlibpath_var"
-+	$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
- 
+-      fi
+-      $ECHO "$cmd$args"
+-      exit $EXIT_SUCCESS
+-    fi
+-}
+-
+-test "$mode" = execute && func_mode_execute ${1+"$@"}
+-
+-
+-# func_mode_finish arg...
+-func_mode_finish ()
+-{
+-    $opt_debug
+-    libdirs="$nonopt"
+-    admincmds=
+-
+-    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
+-      for dir
+-      do
+-	libdirs="$libdirs $dir"
+-      done
+-
+-      for libdir in $libdirs; do
+-	if test -n "$finish_cmds"; then
+-	  # Do each command in the finish commands.
+-	  func_execute_cmds "$finish_cmds" 'admincmds="$admincmds
+-'"$cmd"'"'
+-	fi
+-	if test -n "$finish_eval"; then
+-	  # Do the single finish_eval.
+-	  eval cmds=\"$finish_eval\"
+-	  $opt_dry_run || eval "$cmds" || admincmds="$admincmds
+-       $cmds"
+-	fi
+-      done
+-    fi
+-
+-    # 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
+-    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
+-    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
+-    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
+-    fi
+-    if test -n "$hardcode_libdir_flag_spec"; then
+-      libdir=LIBDIR
+-      eval flag=\"$hardcode_libdir_flag_spec\"
+-
+-      $ECHO "   - use the \`$flag' linker flag"
+-    fi
+-    if test -n "$admincmds"; then
+-      $ECHO "   - have your system administrator run these commands:$admincmds"
+-    fi
+-    if test -f /etc/ld.so.conf; then
 -      echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
-+      $ECHO "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
-     fi
+-    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])
+-    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
+-        ;;
+-    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.
+-    exit $EXIT_SUCCESS
+-}
+-
+-test "$mode" = finish && func_mode_finish ${1+"$@"}
+-
+-
+-# func_mode_install arg...
+-func_mode_install ()
+-{
+-    $opt_debug
+-    # There may be an optional sh(1) argument at the beginning of
+-    # install_prog (especially on Windows NT).
+-    if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
+-       # 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"
+-      # Aesthetically quote it.
+-      func_quote_for_eval "$nonopt"
+-      install_prog="$func_quote_for_eval_result "
+-      arg=$1
+-      shift
+-    else
+-      install_prog=
+-      arg=$nonopt
+-    fi
+-
+-    # The real first argument should be the name of the installation program.
+-    # 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=
+-
+-    # We need to accept at least all the BSD install flags.
+-    dest=
+-    files=
+-    opts=
+-    prev=
+-    install_type=
+-    isdir=no
+-    stripme=
 -    no_mode=:
-     for arg
-     do
+-    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 test -n "$dest"; then
+-	files="$files $dest"
+-	dest=$arg
+-	continue
+-      fi
+-
+-      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
+-	;;
+-      -g | -m | -o)
+-	prev=$arg
+-	;;
+-      -s)
+-	stripme=" -s"
+-	continue
+-	;;
+-      -*)
+-	;;
+-      *)
+-	# 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"
+-	  prev=
+-	else
+-	  dest=$arg
+-	  continue
+-	fi
+-	;;
+-      esac
+-
+-      # 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"
- 
+-    done
+-
+-    test -z "$install_prog" && \
+-      func_fatal_help "you must specify an install program"
+-
+-    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"
@@ -15062,192 +15399,687 @@
 -      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.
+-    if test -z "$files"; then
+-      if test -z "$dest"; then
+-	func_fatal_help "no file or destination specified"
+-      else
+-	func_fatal_help "you must specify a destination"
+-      fi
+-    fi
+-
+-    # Strip any trailing slash from the destination.
+-    func_stripname '' '/' "$dest"
+-    dest=$func_stripname_result
+-
+-    # Check to see that the destination is a directory.
+-    test -d "$dest" && isdir=yes
+-    if test "$isdir" = yes; then
+-      destdir="$dest"
+-      destname=
+-    else
+-      func_dirname_and_basename "$dest" "" "."
+-      destdir="$func_dirname_result"
+-      destname="$func_basename_result"
+-
+-      # Not a directory, so check to see that there is only one file specified.
+-      set dummy $files; shift
+-      test "$#" -gt 1 && \
+-	func_fatal_help "\`$dest' is not a directory"
+-    fi
+-    case $destdir in
+-    [\\/]* | [A-Za-z]:[\\/]*) ;;
+-    *)
+-      for file in $files; do
+-	case $file in
+-	*.lo) ;;
+-	*)
+-	  func_fatal_help "\`$destdir' must be an absolute directory name"
+-	  ;;
+-	esac
+-      done
+-      ;;
+-    esac
+-
+-    # This variable tells wrapper scripts just to set variables rather
+-    # than running their programs.
+-    libtool_install_magic="$magic"
+-
+-    staticlibs=
+-    future_libdirs=
+-    current_libdirs=
+-    for file in $files; do
+-
+-      # Do each installation.
+-      case $file in
+-      *.$libext)
+-	# Do the static libraries later.
+-	staticlibs="$staticlibs $file"
+-	;;
+-
+-      *.la)
+-	# Check to see that this really is a libtool archive.
+-	func_lalib_unsafe_p "$file" \
+-	  || func_fatal_help "\`$file' is not a valid libtool archive"
+-
+-	library_names=
+-	old_library=
+-	relink_command=
+-	func_source "$file"
+-
+-	# Add the libdir to current_libdirs if it is the destination.
+-	if test "X$destdir" = "X$libdir"; then
+-	  case "$current_libdirs " in
+-	  *" $libdir "*) ;;
+-	  *) current_libdirs="$current_libdirs $libdir" ;;
+-	  esac
+-	else
+-	  # Note the libdir as a future libdir.
+-	  case "$future_libdirs " in
+-	  *" $libdir "*) ;;
+-	  *) future_libdirs="$future_libdirs $libdir" ;;
+-	  esac
+-	fi
+-
+-	func_dirname "$file" "/" ""
+-	dir="$func_dirname_result"
+-	dir="$dir$objdir"
+-
+-	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.
+-
+-	  # Don't allow the user to place us outside of our expected
+-	  # location b/c this prevents finding dependent libraries that
+-	  # are installed to the same prefix.
+-	  # At present, this check doesn't affect windows .dll's that
+-	  # are installed into $libdir/../bin (currently, that works fine)
+-	  # but it's something to keep an eye on.
+-	  test "$inst_prefix_dir" = "$destdir" && \
+-	    func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
+-
+-	  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
+-	  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.
+-	  fi
+-
+-	  func_warning "relinking \`$file'"
+-	  func_show_eval "$relink_command" \
+-	    'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"'
+-	fi
+-
+-	# See the names of the shared library.
+-	set dummy $library_names; shift
+-	if test -n "$1"; then
+-	  realname="$1"
+-	  shift
+-
+-	  srcname="$realname"
+-	  test -n "$relink_command" && srcname="$realname"T
+-
+-	  # Install the shared library and build the symlinks.
 -	  func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \
-+	  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
+-	      'exit $?'
+-	  tstripme="$stripme"
+-	  case $host_os in
+-	  cygwin* | mingw* | pw32* | cegcc*)
+-	    case $realname in
+-	    *.dll.a)
+-	      tstripme=""
+-	      ;;
+-	    esac
+-	    ;;
+-	  esac
+-	  if test -n "$tstripme" && test -n "$striplib"; then
+-	    func_show_eval "$striplib $destdir/$realname" 'exit $?'
+-	  fi
+-
+-	  if test "$#" -gt 0; then
+-	    # Delete the old symlinks, and create new ones.
+-	    # Try `ln -sf' first, because the `ln' binary might depend on
+-	    # the symlink we replace!  Solaris /bin/ln does not understand -f,
+-	    # so we also need to try rm && ln -s.
+-	    for linkname
+-	    do
+-	      test "$linkname" != "$realname" \
+-		&& func_show_eval "(cd $destdir && { $LN_S -f $realname $linkname || { $RM $linkname && $LN_S $realname $linkname; }; })"
+-	    done
+-	  fi
+-
+-	  # Do each command in the postinstall commands.
+-	  lib="$destdir/$realname"
+-	  func_execute_cmds "$postinstall_cmds" 'exit $?'
+-	fi
+-
+-	# Install the pseudo-library for information purposes.
+-	func_basename "$file"
+-	name="$func_basename_result"
+-	instname="$dir/$name"i
+-	func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
+-
+-	# Maybe install the static library, too.
+-	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
+-	;;
+-
+-      *.lo)
+-	# Install (i.e. copy) a libtool object.
+-
+-	# Figure out destination file name, if it wasn't already specified.
+-	if test -n "$destname"; then
+-	  destfile="$destdir/$destname"
+-	else
+-	  func_basename "$file"
+-	  destfile="$func_basename_result"
+-	  destfile="$destdir/$destfile"
+-	fi
+-
+-	# Deduce the name of the destination old-style object file.
+-	case $destfile in
+-	*.lo)
+-	  func_lo2o "$destfile"
+-	  staticdest=$func_lo2o_result
+-	  ;;
+-	*.$objext)
+-	  staticdest="$destfile"
+-	  destfile=
+-	  ;;
+-	*)
+-	  func_fatal_help "cannot copy a libtool object to \`$destfile'"
+-	  ;;
+-	esac
+-
+-	# Install the libtool object if requested.
+-	test -n "$destfile" && \
+-	  func_show_eval "$install_prog $file $destfile" 'exit $?'
+-
+-	# Install the old object if enabled.
+-	if test "$build_old_libs" = yes; then
+-	  # Deduce the name of the old-style object file.
+-	  func_lo2o "$file"
+-	  staticobj=$func_lo2o_result
+-	  func_show_eval "$install_prog \$staticobj \$staticdest" 'exit $?'
+-	fi
+-	exit $EXIT_SUCCESS
+-	;;
+-
+-      *)
+-	# Figure out destination file name, if it wasn't already specified.
+-	if test -n "$destname"; then
+-	  destfile="$destdir/$destname"
+-	else
+-	  func_basename "$file"
+-	  destfile="$func_basename_result"
+-	  destfile="$destdir/$destfile"
+-	fi
+-
+-	# If the file is missing, and there is a .exe on the end, strip it
+-	# because it is most likely a libtool script we actually want to
+-	# install
+-	stripped_ext=""
+-	case $file in
+-	  *.exe)
+-	    if test ! -f "$file"; then
+-	      func_stripname '' '.exe' "$file"
+-	      file=$func_stripname_result
+-	      stripped_ext=".exe"
+-	    fi
+-	    ;;
+-	esac
+-
+-	# Do a test to see if this is really a libtool program.
+-	case $host in
+-	*cygwin* | *mingw*)
+-	    if func_ltwrapper_executable_p "$file"; then
+-	      func_ltwrapper_scriptname "$file"
+-	      wrapper=$func_ltwrapper_scriptname_result
+-	    else
+-	      func_stripname '' '.exe' "$file"
+-	      wrapper=$func_stripname_result
+-	    fi
+-	    ;;
+-	*)
+-	    wrapper=$file
+-	    ;;
+-	esac
+-	if func_ltwrapper_script_p "$wrapper"; then
+-	  notinst_deplibs=
+-	  relink_command=
+-
+-	  func_source "$wrapper"
+-
+-	  # Check the variables that should have been set.
+-	  test -z "$generated_by_libtool_version" && \
+-	    func_fatal_error "invalid libtool wrapper script \`$wrapper'"
+-
+-	  finalize=yes
+-	  for lib in $notinst_deplibs; do
+-	    # Check to see that each library is installed.
+-	    libdir=
+-	    if test -f "$lib"; then
+-	      func_source "$lib"
+-	    fi
 -	    libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test
-+	    libfile="$libdir/"`$ECHO "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.
+-	    if test -n "$libdir" && test ! -f "$libfile"; then
+-	      func_warning "\`$lib' has not been installed in \`$libdir'"
+-	      finalize=no
+-	    fi
+-	  done
+-
+-	  relink_command=
+-	  func_source "$wrapper"
+-
+-	  outputname=
+-	  if test "$fast_install" = no && test -n "$relink_command"; then
+-	    $opt_dry_run || {
+-	      if test "$finalize" = yes; then
+-	        tmpdir=`func_mktempdir`
+-		func_basename "$file$stripped_ext"
+-		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.
+-
+-	        $opt_silent || {
+-	          func_quote_for_expand "$relink_command"
+-		  eval "func_echo $func_quote_for_expand_result"
+-	        }
+-	        if eval "$relink_command"; then :
+-	          else
+-		  func_error "error: relink \`$file' with the above command before installing it"
+-		  $opt_dry_run || ${RM}r "$tmpdir"
+-		  continue
+-	        fi
+-	        file="$outputname"
+-	      else
+-	        func_warning "cannot relink \`$file'"
+-	      fi
+-	    }
+-	  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
- 
+-	  fi
+-	fi
+-
+-	# remove .exe since cygwin /usr/bin/install will append another
+-	# one anyway
+-	case $install_prog,$host in
+-	*/usr/bin/install*,*cygwin*)
+-	  case $file:$destfile in
+-	  *.exe:*.exe)
+-	    # this is ok
+-	    ;;
+-	  *.exe:*)
+-	    destfile=$destfile.exe
+-	    ;;
+-	  *:*.exe)
+-	    func_stripname '' '.exe' "$destfile"
+-	    destfile=$func_stripname_result
+-	    ;;
+-	  esac
+-	  ;;
+-	esac
+-	func_show_eval "$install_prog\$stripme \$file \$destfile" 'exit $?'
+-	$opt_dry_run || if test -n "$outputname"; then
+-	  ${RM}r "$tmpdir"
+-	fi
+-	;;
+-      esac
+-    done
+-
+-    for file in $staticlibs; do
+-      func_basename "$file"
+-      name="$func_basename_result"
+-
+-      # Set up the ranlib parameters.
+-      oldlib="$destdir/$name"
+-
+-      func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
+-
+-      if test -n "$stripme" && test -n "$old_striplib"; then
+-	func_show_eval "$old_striplib $oldlib" 'exit $?'
+-      fi
+-
+-      # Do each command in the postinstall commands.
+-      func_execute_cmds "$old_postinstall_cmds" 'exit $?'
+-    done
+-
+-    test -n "$future_libdirs" && \
+-      func_warning "remember to run \`$progname --finish$future_libdirs'"
+-
+-    if test -n "$current_libdirs"; then
+-      # Maybe just do a dry run.
+-      $opt_dry_run && current_libdirs=" -n$current_libdirs"
+-      exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
+-    else
+-      exit $EXIT_SUCCESS
+-    fi
+-}
+-
+-test "$mode" = install && func_mode_install ${1+"$@"}
+-
+-
+-# func_generate_dlsyms outputname originator pic_p
+-# Extract symbols from dlprefiles and create ${outputname}S.o with
+-# a dlpreopen symbol table.
+-func_generate_dlsyms ()
+-{
+-    $opt_debug
+-    my_outputname="$1"
+-    my_originator="$2"
+-    my_pic_p="${3-no}"
+-    my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'`
+-    my_dlsyms=
+-
+-    if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+-      if test -n "$NM" && test -n "$global_symbol_pipe"; then
+-	my_dlsyms="${my_outputname}S.c"
+-      else
+-	func_error "not configured to extract global symbols from dlpreopened files"
+-      fi
+-    fi
+-
+-    if test -n "$my_dlsyms"; then
+-      case $my_dlsyms in
+-      "") ;;
+-      *.c)
+-	# Discover the nlist of each of the dlfiles.
+-	nlist="$output_objdir/${my_outputname}.nm"
+-
+-	func_show_eval "$RM $nlist ${nlist}S ${nlist}T"
+-
+-	# Parse the name list into a source file.
+-	func_verbose "creating $output_objdir/$my_dlsyms"
+-
+-	$opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\
+-/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */
+-/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */
+-
+-#ifdef __cplusplus
+-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.
+-/* External symbol declarations for the compiler. */\
+-"
+-
+-	if test "$dlself" = yes; then
+-	  func_verbose "generating symbol list for \`$output'"
+-
+-	  $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
+-	  for progfile in $progfiles; do
+-	    func_verbose "extracting global C symbols from \`$progfile'"
+-	    $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'"
+-	  done
+-
+-	  if test -n "$exclude_expsyms"; then
+-	    $opt_dry_run || {
+-	      eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
+-	      eval '$MV "$nlist"T "$nlist"'
+-	    }
+-	  fi
+-
+-	  if test -n "$export_symbols_regex"; then
+-	    $opt_dry_run || {
+-	      eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
+-	      eval '$MV "$nlist"T "$nlist"'
+-	    }
+-	  fi
+-
+-	  # Prepare the list of exported symbols
+-	  if test -z "$export_symbols"; then
+-	    export_symbols="$output_objdir/$outputname.exp"
+-	    $opt_dry_run || {
+-	      $RM $export_symbols
+-	      eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
+-	      case $host in
+-	      *cygwin* | *mingw* | *cegcc* )
+-                eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
+-                eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
+-	        ;;
+-	      esac
+-	    }
+-	  else
+-	    $opt_dry_run || {
+-	      eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
+-	      eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
+-	      eval '$MV "$nlist"T "$nlist"'
+-	      case $host in
 -	        *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
+-	          eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
+-	          eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
+-	          ;;
+-	      esac
+-	    }
+-	  fi
+-	fi
+-
+-	for dlprefile in $dlprefiles; do
+-	  func_verbose "extracting global C symbols from \`$dlprefile'"
+-	  func_basename "$dlprefile"
+-	  name="$func_basename_result"
+-	  $opt_dry_run || {
+-	    eval '$ECHO ": $name " >> "$nlist"'
+-	    eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'"
+-	  }
+-	done
+-
+-	$opt_dry_run || {
+-	  # Make sure we have at least an empty file.
+-	  test -f "$nlist" || : > "$nlist"
+-
+-	  if test -n "$exclude_expsyms"; then
+-	    $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
+-	    $MV "$nlist"T "$nlist"
+-	  fi
+-
+-	  # Try sorting and uniquifying the output.
+-	  if $GREP -v "^: " < "$nlist" |
+-	      if sort -k 3 </dev/null >/dev/null 2>&1; then
+-		sort -k 3
+-	      else
+-		sort +2
+-	      fi |
+-	      uniq > "$nlist"S; then
+-	    :
+-	  else
+-	    $GREP -v "^: " < "$nlist" > "$nlist"S
+-	  fi
+-
+-	  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
- 
+-	  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* )
+-
+-/* The mapping between symbol names and symbols.  */
+-typedef struct {
+-  const char *name;
+-  void *address;
+-} lt_dlsymlist;
+-"
+-	  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
- 
+-/* DATA imports from DLLs on WIN32 con't be const, because
+-   runtime relocations are performed -- see ld's documentation
+-   on pseudo-relocs.  */"
+-	    lt_dlsym_const= ;;
+-	  *osf5*)
+-	    echo >> "$output_objdir/$my_dlsyms" "\
+-/* This system does not cope well with relocations in const data */"
+-	    lt_dlsym_const= ;;
+-	  *)
+-	    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
+-extern $lt_dlsym_const lt_dlsymlist
+-lt_${my_prefix}_LTX_preloaded_symbols[];
+-$lt_dlsym_const lt_dlsymlist
+-lt_${my_prefix}_LTX_preloaded_symbols[] =
+-{\
+-  { \"$my_originator\", (void *) 0 },"
+-
+-	  case $need_lib_prefix in
+-	  no)
+-	    eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$my_dlsyms"
+-	    ;;
+-	  *)
+-	    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
+-  {0, (void *) 0}
+-};
+-
+-/* This works around a problem in FreeBSD linker */
+-#ifdef FREEBSD_WORKAROUND
+-static const void *lt_preloaded_setup() {
+-  return lt_${my_prefix}_LTX_preloaded_symbols;
+-}
+-#endif
+-
+-#ifdef __cplusplus
+-}
+-#endif\
+-"
+-	} # !$opt_dry_run
+-
+-	pic_flag_for_symtable=
+-	case "$compile_command " in
+-	*" -static "*) ;;
+-	*)
+-	  case $host in
+-	  # compiling the symbol table file with pic_flag works around
+-	  # a FreeBSD bug that causes programs to crash when -lm is
+-	  # linked before any other PIC object.  But we must not use
+-	  # pic_flag when linking with -static.  The problem exists in
+-	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
+-	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
+-	    pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
+-	  *-*-hpux*)
+-	    pic_flag_for_symtable=" $pic_flag"  ;;
+-	  *)
+-	    if test "X$my_pic_p" != Xno; then
+-	      pic_flag_for_symtable=" $pic_flag"
+-	    fi
+-	    ;;
+-	  esac
+-	  ;;
+-	esac
+-	symtab_cflags=
+-	for arg in $LTCFLAGS; do
+-	  case $arg in
+-	  -pie | -fpie | -fPIE) ;;
+-	  *) symtab_cflags="$symtab_cflags $arg" ;;
+-	  esac
+-	done
+-
+-	# Now compile the dynamic symbol file.
+-	func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?'
+-
+-	# Clean up the generated files.
+-	func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"'
+-
+-	# Transform the symbol file into the correct name.
+-	symfileobj="$output_objdir/${my_outputname}S.$objext"
+-	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
+-	  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
- 	  ;;
- 	*)
+-	  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.
+-	  ;;
+-	esac
+-	;;
+-      *)
+-	func_fatal_error "unknown suffix for \`$my_dlsyms'"
+-	;;
+-      esac
+-    else
+-      # We keep going just in case the user didn't refer to
+-      # lt_preloaded_symbols.  The linker will fail if global_symbol_pipe
+-      # 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.
+-    fi
+-}
+-
+-# func_win32_libid arg
+-# return the library type of file 'arg'
+-#
+-# 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
+-func_win32_libid ()
+-{
+-  $opt_debug
+-  win32_libid_type="unknown"
+-  win32_fileres=`file -L $1 2>/dev/null`
+-  case $win32_fileres in
+-  *ar\ archive\ import\ library*) # definitely import
+-    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 |
+-    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"
+-      win32_nmres=`eval $NM -f posix -A $1 |
+-	$SED -n -e '
+-	    1,100{
+-		/ I /{
+-		    s,.*,import,
+-		    p
+-		    q
+-		}
+-	    }'`
+-      case $win32_nmres in
+-      import*)  win32_libid_type="x86 archive import";;
+-      *)        win32_libid_type="x86 archive static";;
+-      esac
+-    fi
+-    ;;
+-  *DLL*)
+-    win32_libid_type="x86 DLL"
+-    ;;
+-  *executable*) # but shell scripts are "executable" too...
+-    case $win32_fileres in
+-    *MS\ Windows\ PE\ Intel*)
+-      win32_libid_type="x86 DLL"
+-      ;;
+-    esac
+-    ;;
+-  esac
+-  $ECHO "$win32_libid_type"
+-}
+-
+-
+-
+-# func_extract_an_archive dir oldlib
+-func_extract_an_archive ()
+-{
+-    $opt_debug
+-    f_ex_an_ar_dir="$1"; shift
+-    f_ex_an_ar_oldlib="$1"
 -    if test "$lock_old_archive_extraction" = yes; then
 -      lockfile=$f_ex_an_ar_oldlib.lock
 -      until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
@@ -15260,31 +16092,98 @@
 -    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
+-    if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
+-     :
+-    else
+-      func_fatal_error "object name conflicts in archive: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib"
+-    fi
+-}
+-
+-
+-# func_extract_archives gentop oldlib ...
+-func_extract_archives ()
+-{
+-    $opt_debug
+-    my_gentop="$1"; shift
+-    my_oldlibs=${1+"$@"}
+-    my_oldobjs=""
+-    my_xlib=""
+-    my_xabs=""
+-    my_xdir=""
+-
+-    for my_xlib in $my_oldlibs; do
+-      # Extract the objects.
+-      case $my_xlib in
+-	[\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
+-	*) my_xabs=`pwd`"/$my_xlib" ;;
+-      esac
+-      func_basename "$my_xlib"
+-      my_xlib="$func_basename_result"
+-      my_xlib_u=$my_xlib
+-      while :; do
+-        case " $extracted_archives " in
+-	*" $my_xlib_u "*)
+-	  func_arith $extracted_serial + 1
+-	  extracted_serial=$func_arith_result
+-	  my_xlib_u=lt$extracted_serial-$my_xlib ;;
+-	*) break ;;
+-	esac
+-      done
+-      extracted_archives="$extracted_archives $my_xlib_u"
+-      my_xdir="$my_gentop/$my_xlib_u"
+-
+-      func_mkdir_p "$my_xdir"
+-
+-      case $host in
+-      *-darwin*)
+-	func_verbose "Extracting $my_xabs"
+-	# Do not bother doing anything if just a dry run
+-	$opt_dry_run || {
+-	  darwin_orig_dir=`pwd`
+-	  cd $my_xdir || exit $?
+-	  darwin_archive=$my_xabs
+-	  darwin_curdir=`pwd`
+-	  darwin_base_archive=`basename "$darwin_archive"`
+-	  darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true`
+-	  if test -n "$darwin_arches"; then
+-	    darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'`
+-	    darwin_arch=
+-	    func_verbose "$darwin_base_archive has multiple architectures $darwin_arches"
+-	    for darwin_arch in  $darwin_arches ; do
+-	      func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
+-	      $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
+-	      cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
+-	      func_extract_an_archive "`pwd`" "${darwin_base_archive}"
+-	      cd "$darwin_curdir"
+-	      $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
+-	    done # $darwin_arches
+-            ## Okay now we've a bunch of thin objects, gotta fatten them up :)
+-	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u`
+-	    darwin_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
+-	      $LIPO -create -output "$darwin_file" $darwin_files
+-	    done # $darwin_filelist
+-	    $RM -rf unfat-$$
+-	    cd "$darwin_orig_dir"
+-	  else
+-	    cd $darwin_orig_dir
+-	    func_extract_an_archive "$my_xdir" "$my_xabs"
+-	  fi # $darwin_arches
+-	} # !$opt_dry_run
+-	;;
+-      *)
+-        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"
- }
- 
- 
+-    done
+-
+-    func_extract_archives_result="$my_oldobjs"
+-}
+-
+-
 -# func_emit_wrapper [arg=no]
 -#
 -# Emit a libtool wrapper script on stdout.
@@ -15293,9 +16192,7 @@
 -# 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
@@ -15304,30 +16201,51 @@
 -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
+-
+-	$ECHO "\
+-#! $SHELL
+-
+-# $output - temporary wrapper script for $objdir/$outputname
+-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+-#
+-# The $output program cannot be directly executed until all the libtool
+-# libraries that it depends on are installed.
+-#
+-# This wrapper script should never be moved out of the build directory.
+-# If it is, it will not operate correctly.
+-
+-# Sed substitution that helps us do robust quoting.  It backslashifies
+-# metacharacters that are still active within double-quoted strings.
+-sed_quote_subst='$sed_quote_subst'
+-
+-# Be Bourne compatible
+-if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
+-  emulate sh
+-  NULLCMD=:
+-  # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
+-  # is contrary to our usage.  Disable this feature.
+-  alias -g '\${1+\"\$@\"}'='\"\$@\"'
+-  setopt NO_GLOB_SUBST
+-else
+-  case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
+-fi
+-BIN_SH=xpg4; export BIN_SH # for Tru64
+-DUALCASE=1; export DUALCASE # for MKS sh
+-
+-# 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
+-
+-relink_command=\"$relink_command\"
+-
+-# This environment variable determines our operation mode.
+-if test \"\$libtool_install_magic\" = \"$magic\"; then
+-  # install mode needs the following variables:
+-  generated_by_libtool_version='$macro_version'
+-  notinst_deplibs='$notinst_deplibs'
+-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"`
@@ -15419,21 +16337,7 @@
 -        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 "\
@@ -15459,299 +16363,336 @@
 -
 -  # Parse options
 -  func_parse_lt_options \"\$0\" \${1+\"\$@\"}
-+	$ECHO "\
- 
-   # Find the directory that this script lives in.
+-
+-  # 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.
+-  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
+-  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
- 
+-
+-    # If there was a directory component, then change thisdir.
+-    if test \"x\$destdir\" != \"x\$file\"; then
+-      case \"\$destdir\" in
+-      [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
+-      *) thisdir=\"\$thisdir/\$destdir\" ;;
+-      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.
+-  done
+-
+-  # 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
+-  if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
+-    # special case for '.'
+-    if test \"\$thisdir\" = \".\"; then
+-      thisdir=\`pwd\`
+-    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
+-    $objdir )   thisdir=. ;;
+-    esac
+-  fi
+-
+-  # Try to get the absolute directory name.
+-  absdir=\`cd \"\$thisdir\" && pwd\`
+-  test -n \"\$absdir\" && thisdir=\"\$absdir\"
+-"
+-
+-	if test "$fast_install" = yes; then
+-	  $ECHO "\
+-  program=lt-'$outputname'$exeext
+-  progdir=\"\$thisdir/$objdir\"
+-
+-  if test ! -f \"\$progdir/\$program\" ||
+-     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
+-       test \"X\$file\" != \"X\$progdir/\$program\"; }; then
+-
+-    file=\"\$\$-\$program\"
+-
+-    if test ! -d \"\$progdir\"; then
+-      $MKDIR \"\$progdir\"
+-    else
+-      $RM \"\$progdir/\$file\"
+-    fi"
+-
+-	  $ECHO "\
+-
+-    # relink executable if necessary
+-    if test -n \"\$relink_command\"; then
+-      if relink_command_output=\`eval \$relink_command 2>&1\`; then :
+-      else
+-	$ECHO \"\$relink_command_output\" >&2
+-	$RM \"\$progdir/\$file\"
+-	exit 1
+-      fi
+-    fi
+-
+-    $MV \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
+-    { $RM \"\$progdir/\$program\";
+-      $MV \"\$progdir/\$file\" \"\$progdir/\$program\"; }
+-    $RM \"\$progdir/\$file\"
+-  fi"
+-	else
+-	  $ECHO "\
+-  program='$outputname'
+-  progdir=\"\$thisdir/$objdir\"
+-"
+-	fi
+-
+-	$ECHO "\
+-
+-  if test -f \"\$progdir/\$program\"; then"
+-
+-	# Export our shlibpath_var if we have one.
+-	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+-	  $ECHO "\
+-    # Add our own library path to $shlibpath_var
+-    $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
+-
+-    # 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.
+-
+-    export $shlibpath_var
+-"
+-	fi
+-
+-	# fixup the dll searchpath if we need to.
+-	if test -n "$dllsearchpath"; then
+-	  $ECHO "\
+-    # Add the dll search path components to the executable PATH
+-    PATH=$dllsearchpath:\$PATH
+-"
+-	fi
+-
+-	$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
+-    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"
+-    exit 1
+-  fi
+-fi\
+-"
+-}
+-
+-
+-# func_to_host_path arg
+-#
+-# Convert paths to host format when used with build tools.
+-# Intended for use with "native" mingw (where libtool itself
+-# is running under the msys shell), or in the following cross-
+-# build environments:
+-#    $build          $host
+-#    mingw (msys)    mingw  [e.g. native]
+-#    cygwin          mingw
+-#    *nix + wine     mingw
+-# where wine is equipped with the `winepath' executable.
+-# In the native mingw case, the (msys) shell automatically
+-# converts paths for any non-msys applications it launches,
+-# but that facility isn't available from inside the cwrapper.
+-# Similar accommodations are necessary for $host mingw and
+-# $build cygwin.  Calling this function does no harm for other
+-# $host/$build combinations not listed above.
+-#
+-# ARG is the path (on $build) that should be converted to
+-# the proper representation for $host. The result is stored
+-# in $func_to_host_path_result.
+-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
+-    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* )
+-            ;;
+-          *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
+-            ;;
+-          * )
+-            # Unfortunately, winepath does not exit with a non-zero
+-            # error code, so we are forced to check the contents of
+-            # stdout. On the other hand, if the command is not
+-            # found, the shell will set an exit code of 127 and print
+-            # *an error message* to stdout. So we must check for both
+-            # error code of zero AND non-empty stdout, which explains
+-            # the odd construction:
+-            func_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.
+-                $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"
+-            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"
+-          func_error "Continuing, but uninstalled executables may not work."
+-          # Fallback:
+-          func_to_host_path_result="$1"
+-        fi
+-        ;;
+-    esac
+-  fi
+-}
+-# end: func_to_host_path
+-
+-# func_to_host_pathlist arg
+-#
+-# Convert pathlists to host format when used with build tools.
+-# See func_to_host_path(), above. This function supports the
+-# following $build/$host combinations (but does no harm for
+-# combinations not listed here):
+-#    $build          $host
+-#    mingw (msys)    mingw  [e.g. native]
+-#    cygwin          mingw
+-#    *nix + wine     mingw
+-#
+-# Path separators are also converted from $build format to
+-# $host format. If ARG begins or ends with a path separator
+-# character, it is preserved (but converted to $host format)
+-# on output.
+-#
+-# ARG is a pathlist (on $build) that should be converted to
+-# the proper representation on $host. The result is stored
+-# in $func_to_host_pathlist_result.
+-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.
+-    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.
+-        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* )
+-            ;;
+-          *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
+-              $SED -e "$lt_sed_naive_backslashify"`
+-            ;;
+-          * )
+-            # unfortunately, winepath doesn't convert pathlists
+-            func_to_host_pathlist_result=""
+-            func_to_host_pathlist_oldIFS=$IFS
+-            IFS=:
+-            for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do
+-              IFS=$func_to_host_pathlist_oldIFS
+-              if test -n "$func_to_host_pathlist_f" ; then
+-                func_to_host_path "$func_to_host_pathlist_f"
+-                if test -n "$func_to_host_path_result" ; then
+-                  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
+-                  fi
+-                fi
+-              fi
+-            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 "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_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
+-          # below, but for the user to provide a working wine installation
+-          # with winepath so that path translation in the cross-to-mingw
+-          # case works properly.
+-          lt_replace_pathsep_nix_to_dos="s|:|;|g"
+-          func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\
+-            $SED -e "$lt_replace_pathsep_nix_to_dos"`
+-        fi
+-        # Now, add the leading and trailing path separators back
+-        case "$1" in
+-          :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result"
+-            ;;
+-        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"
+-            ;;
+-        esac
+-        ;;
+-    esac
+-  fi
+-}
+-# end: func_to_host_pathlist
+-
+-# func_emit_cwrapperexe_src
+-# emit the source code for a wrapper executable on stdout
+-# Must ONLY be called from within func_mode_link because
+-# it depends on a number of variable set therein.
+-func_emit_cwrapperexe_src ()
+-{
+-	cat <<EOF
+-
+-/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
+-   Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+-
+-   The $output program cannot be directly executed until all the libtool
+-   libraries that it depends on are installed.
+-
+-   This wrapper executable should never be moved out of the build directory.
+-   If it is, it will not operate correctly.
+-*/
+-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>
- 
+-#include <stdio.h>
+-#include <stdlib.h>
+-#ifdef _MSC_VER
+-# include <direct.h>
+-# include <process.h>
+-# include <io.h>
+-#else
+-# include <unistd.h>
+-# include <stdint.h>
+-# ifdef __CYGWIN__
+-#  include <io.h>
+-# endif
+-#endif
+-#include <malloc.h>
+-#include <stdarg.h>
+-#include <assert.h>
+-#include <string.h>
+-#include <ctype.h>
+-#include <errno.h>
+-#include <fcntl.h>
+-#include <sys/stat.h>
+-
 -/* declarations of non-ANSI functions */
 -#if defined(__MINGW32__)
 -# ifdef __STRICT_ANSI__
@@ -15790,153 +16731,178 @@
 -/* #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
- 
+-#if defined(PATH_MAX)
+-# define LT_PATHMAX PATH_MAX
+-#elif defined(MAXPATHLEN)
+-# define LT_PATHMAX MAXPATHLEN
+-#else
+-# define LT_PATHMAX 1024
+-#endif
+-
+-#ifndef S_IXOTH
+-# define S_IXOTH 0
+-#endif
+-#ifndef S_IXGRP
+-# 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)
- 
+-#ifndef DIR_SEPARATOR
+-# define DIR_SEPARATOR '/'
+-# define PATH_SEPARATOR ':'
+-#endif
+-
+-#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
+-  defined (__OS2__)
+-# define HAVE_DOS_BASED_FILE_SYSTEM
+-# define FOPEN_WB "wb"
+-# ifndef DIR_SEPARATOR_2
+-#  define DIR_SEPARATOR_2 '\\'
+-# endif
+-# ifndef PATH_SEPARATOR_2
+-#  define PATH_SEPARATOR_2 ';'
+-# endif
+-#endif
+-
+-#ifndef DIR_SEPARATOR_2
+-# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
+-#else /* DIR_SEPARATOR_2 */
+-# define IS_DIR_SEPARATOR(ch) \
+-	(((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
+-#endif /* DIR_SEPARATOR_2 */
+-
+-#ifndef PATH_SEPARATOR_2
+-# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR)
+-#else /* PATH_SEPARATOR_2 */
+-# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
+-#endif /* PATH_SEPARATOR_2 */
+-
+-#ifndef FOPEN_WB
+-# define FOPEN_WB "w"
+-#endif
+-#ifndef _O_BINARY
+-# define _O_BINARY 0
+-#endif
+-
+-#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
+-#define XFREE(stale) do { \
+-  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
+-#else
 -static int lt_debug = 0;
-+# define LTWRAPPER_DEBUGPRINTF(args)
- #endif
- 
+-#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 *xmalloc (size_t num);
+-char *xstrdup (const char *string);
+-const char *base_name (const char *name);
+-char *find_executable (const char *wrapper);
+-char *chase_symlinks (const char *pathspec);
+-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);
+-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_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";
+-EOF
+-
+-	    cat <<EOF
+-const char * MAGIC_EXE = "$magic_exe";
+-const char * LIB_PATH_VARNAME = "$shlibpath_var";
+-EOF
+-
+-	    if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+-              func_to_host_pathlist "$temp_rpath"
+-	      cat <<EOF
+-const char * LIB_PATH_VALUE   = "$func_to_host_pathlist_result";
+-EOF
+-	    else
+-	      cat <<"EOF"
+-const char * LIB_PATH_VALUE   = "";
+-EOF
+-	    fi
+-
+-	    if test -n "$dllsearchpath"; then
+-              func_to_host_pathlist "$dllsearchpath:"
+-	      cat <<EOF
+-const char * EXE_PATH_VARNAME = "PATH";
+-const char * EXE_PATH_VALUE   = "$func_to_host_pathlist_result";
+-EOF
+-	    else
+-	      cat <<"EOF"
+-const char * EXE_PATH_VARNAME = "";
+-const char * EXE_PATH_VALUE   = "";
+-EOF
+-	    fi
+-
+-	    if test "$fast_install" = yes; then
+-	      cat <<EOF
+-const char * TARGET_PROGRAM_NAME = "lt-$outputname"; /* hopefully, no .exe */
+-EOF
+-	    else
+-	      cat <<EOF
+-const char * TARGET_PROGRAM_NAME = "$outputname"; /* hopefully, no .exe */
+-EOF
+-	    fi
+-
+-
+-	    cat <<"EOF"
+-
+-#define LTWRAPPER_OPTION_PREFIX         "--lt-"
+-
+-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]));
+-
+-int
+-main (int argc, char *argv[])
+-{
+-  char **newargz;
+-  int  newargc;
+-  char *tmp_pathspec;
+-  char *actual_cwrapper_path;
+-  char *actual_cwrapper_name;
+-  char *target_name;
+-  char *lt_argv_zero;
+-  intptr_t rval = 127;
+-
+-  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"
+-  for (i = 1; i < argc; i++)
+-    {
+-      if (strcmp (argv[i], dumpscript_opt) == 0)
+-	{
+-EOF
+-	    case "$host" in
+-	      *mingw* | *cygwin* )
+-		# make stdout use "unix" line endings
+-		echo "          setmode(1,_O_BINARY);"
+-		;;
+-	      esac
+-
+-	    cat <<"EOF"
 -	  lt_dump_script (stdout);
-+	  printf ("%s", script_text_part1);
-+	  printf ("%s", script_text_part2);
- 	  return 0;
- 	}
+-	  return 0;
+-	}
 -      if (strcmp (argv[i], debug_opt) == 0)
 -	{
 -          lt_debug = 1;
@@ -15959,7 +16925,7 @@
 -        }
 -      /* otherwise ... */
 -      newargz[++newargc] = xstrdup (argv[i]);
-     }
+-    }
 -  newargz[++newargc] = NULL;
 -
 -EOF
@@ -15970,241 +16936,388 @@
 -	    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)
+-
+-  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);
+-
+-  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);
- 
+-  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;
- 
+-  strendzap (actual_cwrapper_path, actual_cwrapper_name);
+-
+-  /* wrapper name transforms */
+-  strendzap (actual_cwrapper_name, ".exe");
+-  tmp_pathspec = lt_extend_str (actual_cwrapper_name, ".exe", 1);
+-  XFREE (actual_cwrapper_name);
+-  actual_cwrapper_name = tmp_pathspec;
+-  tmp_pathspec = 0;
+-
+-  /* target_name transforms -- use actual target program name; might have lt- prefix */
+-  target_name = xstrdup (base_name (TARGET_PROGRAM_NAME));
+-  strendzap (target_name, ".exe");
+-  tmp_pathspec = lt_extend_str (target_name, ".exe", 1);
+-  XFREE (target_name);
+-  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);
- 
+-EOF
+-
+-	    cat <<EOF
+-  newargz[0] =
+-    XMALLOC (char, (strlen (actual_cwrapper_path) +
+-		    strlen ("$objdir") + 1 + strlen (actual_cwrapper_name) + 1));
+-  strcpy (newargz[0], actual_cwrapper_path);
+-  strcat (newargz[0], "$objdir");
+-  strcat (newargz[0], "/");
+-EOF
+-
+-	    cat <<"EOF"
+-  /* stop here, and copy so we don't have to do this twice */
+-  tmp_pathspec = xstrdup (newargz[0]);
+-
+-  /* do NOT want the lt- prefix here, so use actual_cwrapper_name */
+-  strcat (newargz[0], actual_cwrapper_name);
+-
+-  /* DO want the lt- prefix here if it exists, so use target_name */
+-  lt_argv_zero = lt_extend_str (tmp_pathspec, target_name, 1);
+-  XFREE (tmp_pathspec);
+-  tmp_pathspec = NULL;
+-EOF
+-
+-	    case $host_os in
+-	      mingw*)
+-	    cat <<"EOF"
+-  {
+-    char* p;
+-    while ((p = strchr (newargz[0], '\\')) != NULL)
+-      {
+-	*p = '/';
+-      }
+-    while ((p = strchr (lt_argv_zero, '\\')) != NULL)
+-      {
+-	*p = '/';
+-      }
+-  }
+-EOF
+-	    ;;
+-	    esac
+-
+-	    cat <<"EOF"
+-  XFREE (target_name);
+-  XFREE (actual_cwrapper_path);
+-  XFREE (actual_cwrapper_name);
+-
+-  lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
+-  lt_setenv ("DUALCASE", "1");  /* for MSK sh */
+-  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++)
-     {
+-  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 */
+-    }
+-
+-EOF
+-
+-	    case $host_os in
+-	      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 */
+-  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)
+-      return 127;
+-    }
+-  return rval;
+-EOF
+-		;;
+-	      *)
+-		cat <<"EOF"
+-  execv (lt_argv_zero, newargz);
+-  return rval; /* =127, but avoids unused variable warning */
+-EOF
+-		;;
+-	    esac
+-
+-	    cat <<"EOF"
+-}
+-
+-void *
+-xmalloc (size_t num)
+-{
+-  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;
- 
+-
+-  return p;
+-}
+-
+-char *
+-xstrdup (const char *string)
+-{
+-  return string ? strcpy ((char *) xmalloc (strlen (string) + 1),
+-			  string) : NULL;
+-}
+-
+-const char *
+-base_name (const char *name)
+-{
+-  const char *base;
+-
+-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+-  /* Skip over the disk name in MSDOS pathnames. */
+-  if (isalpha ((unsigned char) name[0]) && name[1] == ':')
+-    name += 2;
+-#endif
+-
+-  for (base = name; *name; name++)
+-    if (IS_DIR_SEPARATOR (*name))
+-      base = name + 1;
+-  return base;
+-}
+-
+-int
+-check_executable (const char *path)
+-{
+-  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;
- 
+-  if ((!path) || (!*path))
+-    return 0;
+-
+-  if ((stat (path, &st) >= 0)
+-      && (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)))
+-    return 1;
+-  else
+-    return 0;
+-}
+-
+-int
+-make_executable (const char *path)
+-{
+-  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;
- 
+-  if ((!path) || (!*path))
+-    return 0;
+-
+-  if (stat (path, &st) >= 0)
+-    {
+-      rval = chmod (path, st.st_mode | S_IXOTH | S_IXGRP | S_IXUSR);
+-    }
+-  return rval;
+-}
+-
+-/* Searches for the full path of the wrapper.  Returns
+-   newly allocated full path name if found, NULL otherwise
+-   Does not chase symlinks, even on platforms that support them.
+-*/
+-char *
+-find_executable (const char *wrapper)
+-{
+-  int has_slash = 0;
+-  const char *p;
+-  const char *p_next;
+-  /* static buffer for getcwd */
+-  char tmp[LT_PATHMAX + 1];
+-  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)
+-
+-  if ((wrapper == NULL) || (*wrapper == '\0'))
+-    return NULL;
+-
+-  /* Absolute path? */
+-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+-  if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':')
+-    {
+-      concat_name = xstrdup (wrapper);
+-      if (check_executable (concat_name))
+-	return concat_name;
+-      XFREE (concat_name);
+-    }
+-  else
+-    {
+-#endif
+-      if (IS_DIR_SEPARATOR (wrapper[0]))
+-	{
+-	  concat_name = xstrdup (wrapper);
+-	  if (check_executable (concat_name))
+-	    return concat_name;
+-	  XFREE (concat_name);
+-	}
+-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+-    }
+-#endif
+-
+-  for (p = wrapper; *p; p++)
+-    if (*p == '/')
+-      {
+-	has_slash = 1;
+-	break;
+-      }
+-  if (!has_slash)
+-    {
+-      /* no slashes; search PATH */
+-      const char *path = getenv ("PATH");
+-      if (path != NULL)
+-	{
+-	  for (p = path; *p; p = p_next)
+-	    {
+-	      const char *q;
+-	      size_t p_len;
+-	      for (q = p; *q; q++)
+-		if (IS_PATH_SEPARATOR (*q))
+-		  break;
+-	      p_len = q - p;
+-	      p_next = (*q == '\0' ? q : q + 1);
+-	      if (p_len == 0)
+-		{
+-		  /* 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)
+-		  tmp_len = strlen (tmp);
+-		  concat_name =
+-		    XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
+-		  memcpy (concat_name, tmp, tmp_len);
+-		  concat_name[tmp_len] = '/';
+-		  strcpy (concat_name + tmp_len + 1, wrapper);
+-		}
+-	      else
+-		{
+-		  concat_name =
+-		    XMALLOC (char, p_len + 1 + strlen (wrapper) + 1);
+-		  memcpy (concat_name, p, p_len);
+-		  concat_name[p_len] = '/';
+-		  strcpy (concat_name + p_len + 1, wrapper);
+-		}
+-	      if (check_executable (concat_name))
+-		return concat_name;
+-	      XFREE (concat_name);
+-	    }
+-	}
+-      /* not found in PATH; assume curdir */
+-    }
+-  /* 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)
-     {
+-  tmp_len = strlen (tmp);
+-  concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
+-  memcpy (concat_name, tmp, tmp_len);
+-  concat_name[tmp_len] = '/';
+-  strcpy (concat_name + tmp_len + 1, wrapper);
+-
+-  if (check_executable (concat_name))
+-    return concat_name;
+-  XFREE (concat_name);
+-  return NULL;
+-}
+-
+-char *
+-chase_symlinks (const char *pathspec)
+-{
+-#ifndef S_ISLNK
+-  return xstrdup (pathspec);
+-#else
+-  char buf[LT_PATHMAX];
+-  struct stat s;
+-  char *tmp_pathspec = xstrdup (pathspec);
+-  char *p;
+-  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
- 	{
+-      if (lstat (tmp_pathspec, &s) == 0)
+-	{
+-	  if (S_ISLNK (s.st_mode) != 0)
+-	    {
+-	      has_symlinks = 1;
+-	      break;
+-	    }
+-
+-	  /* search backwards for last DIR_SEPARATOR */
+-	  p = tmp_pathspec + strlen (tmp_pathspec) - 1;
+-	  while ((p > tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
+-	    p--;
+-	  if ((p == tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
+-	    {
+-	      /* no more DIR_SEPARATORS left */
+-	      break;
+-	    }
+-	  *p = '\0';
+-	}
+-      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)
-     {
+-	}
+-    }
+-  XFREE (tmp_pathspec);
+-
+-  if (!has_symlinks)
+-    {
+-      return xstrdup (pathspec);
+-    }
+-
+-  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;
- }
- 
+-    }
+-  return xstrdup (tmp_pathspec);
+-#endif
+-}
+-
+-char *
+-strendzap (char *str, const char *pat)
+-{
+-  size_t len, patlen;
+-
+-  assert (str != NULL);
+-  assert (pat != NULL);
+-
+-  len = strlen (str);
+-  patlen = strlen (pat);
+-
+-  if (patlen <= len)
+-    {
+-      str += len - patlen;
+-      if (strcmp (str, pat) == 0)
+-	*str = '\0';
+-    }
+-  return str;
+-}
+-
 -void
 -lt_debugprintf (const char *file, int line, const char *fmt, ...)
 -{
@@ -16218,31 +17331,28 @@
 -    }
 -}
 -
- static void
+-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)
- {
+-	       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
+-  vfprintf (stderr, message, ap);
+-  fprintf (stderr, ".\n");
+-
+-  if (exit_status >= 0)
+-    exit (exit_status);
+-}
+-
+-void
 -lt_fatal (const char *file, int line, const char *message, ...)
-+lt_fatal (const char *message, ...)
- {
-   va_list ap;
-   va_start (ap, 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);
- }
- 
+-  va_end (ap);
+-}
+-
 -static const char *
 -nonnull (const char *s)
 -{
@@ -16255,134 +17365,92 @@
 -  return (s && !*s) ? "(empty)" : nonnull (s);
 -}
 -
- void
- lt_setenv (const char *name, const char *value)
- {
+-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)
- {
+-  {
+-#ifdef HAVE_SETENV
+-    /* always make a copy, for consistency with !HAVE_SETENV */
+-    char *str = xstrdup (value);
+-    setenv (name, str, 1);
+-#else
+-    int len = strlen (name) + 1 + strlen (value) + 1;
+-    char *str = XMALLOC (char, len);
+-    sprintf (str, "%s=%s", name, value);
+-    if (putenv (str) != EXIT_SUCCESS)
+-      {
+-        XFREE (str);
+-      }
+-#endif
+-  }
+-}
+-
+-char *
+-lt_extend_str (const char *orig_value, const char *add, int to_end)
+-{
+-  char *new_value;
+-  if (orig_value && *orig_value)
+-    {
+-      int orig_value_len = strlen (orig_value);
+-      int add_len = strlen (add);
+-      new_value = XMALLOC (char, add_len + orig_value_len + 1);
+-      if (to_end)
+-        {
+-          strcpy (new_value, orig_value);
+-          strcpy (new_value + orig_value_len, add);
+-        }
+-      else
+-        {
+-          strcpy (new_value, add);
+-          strcpy (new_value + add_len, orig_value);
+-        }
+-    }
+-  else
+-    {
+-      new_value = xstrdup (add);
+-    }
+-  return new_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)
- {
+-
+-  if (name && *name && value && *value)
+-    {
+-      char *new_value = lt_extend_str (getenv (name), value, 0);
+-      /* some systems can't cope with a ':'-terminated path #' */
+-      int len = strlen (new_value);
+-      while (((len = strlen (new_value)) > 0) && IS_PATH_SEPARATOR (new_value[len-1]))
+-        {
+-          new_value[len-1] = '\0';
+-        }
+-      lt_setenv (name, new_value);
+-      XFREE (new_value);
+-    }
+-}
+-
+-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 @@
-     }
- }
- 
+-
+-  if (name && *name && value && *value)
+-    {
+-      char *new_value = lt_extend_str (getenv (name), value, 0);
+-      lt_setenv (name, new_value);
+-      XFREE (new_value);
+-    }
+-}
+-
 -EOF
 -	    case $host_os in
 -	      mingw*)
@@ -16511,13 +17579,13 @@
 -	    func_emit_wrapper yes |
 -              $SED -e 's/\([\\"]\)/\\\1/g' \
 -	           -e 's/^/  fputs ("/' -e 's/$/\\n", f);/'
- 
+-
 -            cat <<"EOF"
 -}
- EOF
- }
- # end: func_emit_cwrapperexe_src
- 
+-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 ()
@@ -16529,72 +17597,743 @@
 -    esac
 -}
 -
- # func_mode_link arg...
- func_mode_link ()
- {
-@@ -4386,7 +4072,6 @@
-     new_inherited_linker_flags=
- 
-     avoid_version=no
+-# func_mode_link arg...
+-func_mode_link ()
+-{
+-    $opt_debug
+-    case $host in
+-    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+-      # It is impossible to link a dll without this setting, and
+-      # we shouldn't force the makefile maintainer to figure out
+-      # which system we are compiling for in order to pass an extra
+-      # flag for every libtool invocation.
+-      # allow_undefined=no
+-
+-      # FIXME: Unfortunately, there are problems with the above when trying
+-      # to make a dll which has undefined symbols, in which case not
+-      # even a static library is built.  For now, we need to specify
+-      # -no-undefined on the libtool link line when we can be certain
+-      # that all symbols are satisfied, otherwise we get a static library.
+-      allow_undefined=yes
+-      ;;
+-    *)
+-      allow_undefined=yes
+-      ;;
+-    esac
+-    libtool_args=$nonopt
+-    base_compile="$nonopt $@"
+-    compile_command=$nonopt
+-    finalize_command=$nonopt
+-
+-    compile_rpath=
+-    finalize_rpath=
+-    compile_shlibpath=
+-    finalize_shlibpath=
+-    convenience=
+-    old_convenience=
+-    deplibs=
+-    old_deplibs=
+-    compiler_flags=
+-    linker_flags=
+-    dllsearchpath=
+-    lib_search_path=`pwd`
+-    inst_prefix_dir=
+-    new_inherited_linker_flags=
+-
+-    avoid_version=no
 -    bindir=
-     dlfiles=
-     dlprefiles=
-     dlself=no
-@@ -4479,11 +4164,6 @@
- 	esac
- 
- 	case $prev in
+-    dlfiles=
+-    dlprefiles=
+-    dlself=no
+-    export_dynamic=no
+-    export_symbols=
+-    export_symbols_regex=
+-    generated=
+-    libobjs=
+-    ltlibs=
+-    module=no
+-    no_install=no
+-    objs=
+-    non_pic_objects=
+-    precious_files_regex=
+-    prefer_static_libs=no
+-    preload=no
+-    prev=
+-    prevarg=
+-    release=
+-    rpath=
+-    xrpath=
+-    perm_rpath=
+-    temp_rpath=
+-    thread_safe=no
+-    vinfo=
+-    vinfo_number=no
+-    weak_libs=
+-    single_module="${wl}-single_module"
+-    func_infer_tag $base_compile
+-
+-    # We need to know -static, to get the right output filenames.
+-    for arg
+-    do
+-      case $arg in
+-      -shared)
+-	test "$build_libtool_libs" != yes && \
+-	  func_fatal_configuration "can not build a shared library"
+-	build_old_libs=no
+-	break
+-	;;
+-      -all-static | -static | -static-libtool-libs)
+-	case $arg in
+-	-all-static)
+-	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
+-	    func_warning "complete static linking is impossible in this configuration"
+-	  fi
+-	  if test -n "$link_static_flag"; then
+-	    dlopen_self=$dlopen_self_static
+-	  fi
+-	  prefer_static_libs=yes
+-	  ;;
+-	-static)
+-	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
+-	    dlopen_self=$dlopen_self_static
+-	  fi
+-	  prefer_static_libs=built
+-	  ;;
+-	-static-libtool-libs)
+-	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
+-	    dlopen_self=$dlopen_self_static
+-	  fi
+-	  prefer_static_libs=yes
+-	  ;;
+-	esac
+-	build_libtool_libs=no
+-	build_old_libs=yes
+-	break
+-	;;
+-      esac
+-    done
+-
+-    # See if our shared archives depend on static archives.
+-    test -n "$old_archive_from_new_cmds" && build_old_libs=yes
+-
+-    # Go through the arguments, transforming them on the way.
+-    while test "$#" -gt 0; do
+-      arg="$1"
+-      shift
+-      func_quote_for_eval "$arg"
+-      qarg=$func_quote_for_eval_unquoted_result
+-      func_append libtool_args " $func_quote_for_eval_result"
+-
+-      # If the previous option needs an argument, assign it.
+-      if test -n "$prev"; then
+-	case $prev in
+-	output)
+-	  func_append compile_command " @OUTPUT@"
+-	  func_append finalize_command " @OUTPUT@"
+-	  ;;
+-	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
- 	;;
- 
+-	dlfiles|dlprefiles)
+-	  if test "$preload" = no; then
+-	    # Add the symbol object into the linking commands.
+-	    func_append compile_command " @SYMFILE@"
+-	    func_append finalize_command " @SYMFILE@"
+-	    preload=yes
+-	  fi
+-	  case $arg in
+-	  *.la | *.lo) ;;  # We handle these cases below.
+-	  force)
+-	    if test "$dlself" = no; then
+-	      dlself=needless
+-	      export_dynamic=yes
+-	    fi
+-	    prev=
+-	    continue
+-	    ;;
+-	  self)
+-	    if test "$prev" = dlprefiles; then
+-	      dlself=yes
+-	    elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
+-	      dlself=yes
+-	    else
+-	      dlself=needless
+-	      export_dynamic=yes
+-	    fi
+-	    prev=
+-	    continue
+-	    ;;
+-	  *)
+-	    if test "$prev" = dlfiles; then
+-	      dlfiles="$dlfiles $arg"
+-	    else
+-	      dlprefiles="$dlprefiles $arg"
+-	    fi
+-	    prev=
+-	    continue
+-	    ;;
+-	  esac
+-	  ;;
+-	expsyms)
+-	  export_symbols="$arg"
+-	  test -f "$arg" \
+-	    || func_fatal_error "symbol file \`$arg' does not exist"
+-	  prev=
+-	  continue
+-	  ;;
+-	expsyms_regex)
+-	  export_symbols_regex="$arg"
+-	  prev=
+-	  continue
+-	  ;;
+-	framework)
+-	  case $host in
+-	    *-*-darwin*)
+-	      case "$deplibs " in
+-		*" $qarg.ltframework "*) ;;
+-		*) deplibs="$deplibs $qarg.ltframework" # this is fixed later
+-		   ;;
+-	      esac
+-	      ;;
+-	  esac
+-	  prev=
+-	  continue
+-	  ;;
+-	inst_prefix)
+-	  inst_prefix_dir="$arg"
+-	  prev=
+-	  continue
+-	  ;;
+-	objectlist)
+-	  if test -f "$arg"; then
+-	    save_arg=$arg
+-	    moreargs=
+-	    for fil in `cat "$save_arg"`
+-	    do
+-#	      moreargs="$moreargs $fil"
+-	      arg=$fil
+-	      # A libtool-controlled object.
+-
+-	      # Check to see that this really is a libtool object.
+-	      if func_lalib_unsafe_p "$arg"; then
+-		pic_object=
+-		non_pic_object=
+-
+-		# Read the .lo file
+-		func_source "$arg"
+-
+-		if test -z "$pic_object" ||
+-		   test -z "$non_pic_object" ||
+-		   test "$pic_object" = none &&
+-		   test "$non_pic_object" = none; then
+-		  func_fatal_error "cannot find name of object for \`$arg'"
+-		fi
+-
+-		# Extract subdirectory from the argument.
+-		func_dirname "$arg" "/" ""
+-		xdir="$func_dirname_result"
+-
+-		if test "$pic_object" != none; then
+-		  # Prepend the subdirectory the object is found in.
+-		  pic_object="$xdir$pic_object"
+-
+-		  if test "$prev" = dlfiles; then
+-		    if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+-		      dlfiles="$dlfiles $pic_object"
+-		      prev=
+-		      continue
+-		    else
+-		      # If libtool objects are unsupported, then we need to preload.
+-		      prev=dlprefiles
+-		    fi
+-		  fi
+-
+-		  # CHECK ME:  I think I busted this.  -Ossama
+-		  if test "$prev" = dlprefiles; then
+-		    # Preload the old-style object.
+-		    dlprefiles="$dlprefiles $pic_object"
+-		    prev=
+-		  fi
+-
+-		  # A PIC object.
+-		  func_append libobjs " $pic_object"
+-		  arg="$pic_object"
+-		fi
+-
+-		# Non-PIC object.
+-		if test "$non_pic_object" != none; then
+-		  # Prepend the subdirectory the object is found in.
+-		  non_pic_object="$xdir$non_pic_object"
+-
+-		  # A standard non-PIC object
+-		  func_append non_pic_objects " $non_pic_object"
+-		  if test -z "$pic_object" || test "$pic_object" = none ; then
+-		    arg="$non_pic_object"
+-		  fi
+-		else
+-		  # If the PIC object exists, use it instead.
+-		  # $xdir was prepended to $pic_object above.
+-		  non_pic_object="$pic_object"
+-		  func_append non_pic_objects " $non_pic_object"
+-		fi
+-	      else
+-		# Only an error if not doing a dry-run.
+-		if $opt_dry_run; then
+-		  # Extract subdirectory from the argument.
+-		  func_dirname "$arg" "/" ""
+-		  xdir="$func_dirname_result"
+-
+-		  func_lo2o "$arg"
+-		  pic_object=$xdir$objdir/$func_lo2o_result
+-		  non_pic_object=$xdir$func_lo2o_result
+-		  func_append libobjs " $pic_object"
+-		  func_append non_pic_objects " $non_pic_object"
+-	        else
+-		  func_fatal_error "\`$arg' is not a valid libtool object"
+-		fi
+-	      fi
+-	    done
+-	  else
+-	    func_fatal_error "link input file \`$arg' does not exist"
+-	  fi
+-	  arg=$save_arg
+-	  prev=
+-	  continue
+-	  ;;
+-	precious_regex)
+-	  precious_files_regex="$arg"
+-	  prev=
+-	  continue
+-	  ;;
+-	release)
+-	  release="-$arg"
+-	  prev=
+-	  continue
+-	  ;;
+-	rpath | xrpath)
+-	  # We need an absolute path.
+-	  case $arg in
+-	  [\\/]* | [A-Za-z]:[\\/]*) ;;
+-	  *)
+-	    func_fatal_error "only absolute run-paths are allowed"
+-	    ;;
+-	  esac
+-	  if test "$prev" = rpath; then
+-	    case "$rpath " in
+-	    *" $arg "*) ;;
+-	    *) rpath="$rpath $arg" ;;
+-	    esac
+-	  else
+-	    case "$xrpath " in
+-	    *" $arg "*) ;;
+-	    *) xrpath="$xrpath $arg" ;;
+-	    esac
+-	  fi
+-	  prev=
+-	  continue
+-	  ;;
+-	shrext)
+-	  shrext_cmds="$arg"
+-	  prev=
+-	  continue
+-	  ;;
+-	weak)
+-	  weak_libs="$weak_libs $arg"
+-	  prev=
+-	  continue
+-	  ;;
+-	xcclinker)
+-	  linker_flags="$linker_flags $qarg"
+-	  compiler_flags="$compiler_flags $qarg"
+-	  prev=
+-	  func_append compile_command " $qarg"
+-	  func_append finalize_command " $qarg"
+-	  continue
+-	  ;;
+-	xcompiler)
+-	  compiler_flags="$compiler_flags $qarg"
+-	  prev=
+-	  func_append compile_command " $qarg"
+-	  func_append finalize_command " $qarg"
+-	  continue
+-	  ;;
+-	xlinker)
+-	  linker_flags="$linker_flags $qarg"
+-	  compiler_flags="$compiler_flags $wl$qarg"
+-	  prev=
+-	  func_append compile_command " $wl$qarg"
+-	  func_append finalize_command " $wl$qarg"
+-	  continue
+-	  ;;
+-	*)
+-	  eval "$prev=\"\$arg\""
+-	  prev=
+-	  continue
+-	  ;;
+-	esac
+-      fi # test -n "$prev"
+-
+-      prevarg="$arg"
+-
+-      case $arg in
+-      -all-static)
+-	if test -n "$link_static_flag"; then
+-	  # See comment for -static flag below, for more details.
+-	  func_append compile_command " $link_static_flag"
+-	  func_append finalize_command " $link_static_flag"
+-	fi
+-	continue
+-	;;
+-
+-      -allow-undefined)
+-	# FIXME: remove this flag sometime in the future.
+-	func_fatal_error "\`-allow-undefined' must not be used because it is the default"
+-	;;
+-
+-      -avoid-version)
+-	avoid_version=yes
+-	continue
+-	;;
+-
 -      -bindir)
 -	prev=bindir
 -	continue
 -	;;
 -
-       -dlopen)
- 	prev=dlfiles
- 	continue
-@@ -4828,7 +4503,7 @@
- 	esac
- 	case $host in
- 	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+-      -dlopen)
+-	prev=dlfiles
+-	continue
+-	;;
+-
+-      -dlpreopen)
+-	prev=dlprefiles
+-	continue
+-	;;
+-
+-      -export-dynamic)
+-	export_dynamic=yes
+-	continue
+-	;;
+-
+-      -export-symbols | -export-symbols-regex)
+-	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
+-	  func_fatal_error "more than one -exported-symbols argument is not allowed"
+-	fi
+-	if test "X$arg" = "X-export-symbols"; then
+-	  prev=expsyms
+-	else
+-	  prev=expsyms_regex
+-	fi
+-	continue
+-	;;
+-
+-      -framework)
+-	prev=framework
+-	continue
+-	;;
+-
+-      -inst-prefix-dir)
+-	prev=inst_prefix
+-	continue
+-	;;
+-
+-      # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
+-      # so, if we see these flags be careful not to treat them like -L
+-      -L[A-Z][A-Z]*:*)
+-	case $with_gcc/$host in
+-	no/*-*-irix* | /*-*-irix*)
+-	  func_append compile_command " $arg"
+-	  func_append finalize_command " $arg"
+-	  ;;
+-	esac
+-	continue
+-	;;
+-
+-      -L*)
+-	func_stripname '-L' '' "$arg"
+-	dir=$func_stripname_result
+-	if test -z "$dir"; then
+-	  if test "$#" -gt 0; then
+-	    func_fatal_error "require no space between \`-L' and \`$1'"
+-	  else
+-	    func_fatal_error "need path for \`-L' option"
+-	  fi
+-	fi
+-	# We need an absolute path.
+-	case $dir in
+-	[\\/]* | [A-Za-z]:[\\/]*) ;;
+-	*)
+-	  absdir=`cd "$dir" && pwd`
+-	  test -z "$absdir" && \
+-	    func_fatal_error "cannot determine absolute directory name of \`$dir'"
+-	  dir="$absdir"
+-	  ;;
+-	esac
+-	case "$deplibs " in
+-	*" -L$dir "*) ;;
+-	*)
+-	  deplibs="$deplibs -L$dir"
+-	  lib_search_path="$lib_search_path $dir"
+-	  ;;
+-	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
+-	  case :$dllsearchpath: in
+-	  *":$dir:"*) ;;
+-	  ::) dllsearchpath=$dir;;
+-	  *) dllsearchpath="$dllsearchpath:$dir";;
+-	  esac
+-	  case :$dllsearchpath: in
+-	  *":$testbindir:"*) ;;
+-	  ::) dllsearchpath=$testbindir;;
+-	  *) dllsearchpath="$dllsearchpath:$testbindir";;
+-	  esac
+-	  ;;
+-	esac
+-	continue
+-	;;
+-
+-      -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"
+-	    # These systems don't actually have a C or math library (as such)
+-	    continue
+-	    ;;
+-	  *-*-os2*)
+-	    # These systems don't actually have a C library (as such)
+-	    test "X$arg" = "X-lc" && continue
+-	    ;;
+-	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+-	    # Do not include libc due to us having libc/libc_r.
+-	    test "X$arg" = "X-lc" && continue
+-	    ;;
+-	  *-*-rhapsody* | *-*-darwin1.[012])
+-	    # Rhapsody C and math libraries are in the System framework
+-	    deplibs="$deplibs System.ltframework"
+-	    continue
+-	    ;;
+-	  *-*-sco3.2v5* | *-*-sco5v6*)
+-	    # Causes problems with __ctype
+-	    test "X$arg" = "X-lc" && continue
+-	    ;;
+-	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
+-	    # Compiler inserts libc in the correct place for threads to work
+-	    test "X$arg" = "X-lc" && continue
+-	    ;;
+-	  esac
+-	elif test "X$arg" = "X-lc_r"; then
+-	 case $host in
+-	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+-	   # Do not include libc_r directly, use -pthread flag.
+-	   continue
+-	   ;;
+-	 esac
+-	fi
+-	deplibs="$deplibs $arg"
+-	continue
+-	;;
+-
+-      -module)
+-	module=yes
+-	continue
+-	;;
+-
+-      # Tru64 UNIX uses -model [arg] to determine the layout of C++
+-      # classes, name mangling, and exception handling.
+-      # Darwin uses the -arch flag to determine output architecture.
+-      -model|-arch|-isysroot)
+-	compiler_flags="$compiler_flags $arg"
+-	func_append compile_command " $arg"
+-	func_append finalize_command " $arg"
+-	prev=xcompiler
+-	continue
+-	;;
+-
+-      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+-	compiler_flags="$compiler_flags $arg"
+-	func_append compile_command " $arg"
+-	func_append finalize_command " $arg"
+-	case "$new_inherited_linker_flags " in
+-	    *" $arg "*) ;;
+-	    * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;;
+-	esac
+-	continue
+-	;;
+-
+-      -multi_module)
+-	single_module="${wl}-multi_module"
+-	continue
+-	;;
+-
+-      -no-fast-install)
+-	fast_install=no
+-	continue
+-	;;
+-
+-      -no-install)
+-	case $host in
+-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
+-	  # The PATH hackery in wrapper scripts is required on Windows
+-	  # and Darwin in order for the loader to find any dlls it needs.
+-	  func_warning "\`-no-install' is ignored for $host"
+-	  func_warning "assuming \`-no-fast-install' instead"
+-	  fast_install=no
+-	  ;;
+-	*) no_install=yes ;;
+-	esac
+-	continue
+-	;;
+-
+-      -no-undefined)
+-	allow_undefined=no
+-	continue
+-	;;
+-
+-      -objectlist)
+-	prev=objectlist
+-	continue
+-	;;
+-
+-      -o) prev=output ;;
+-
+-      -precious-files-regex)
+-	prev=precious_regex
+-	continue
+-	;;
+-
+-      -release)
+-	prev=release
+-	continue
+-	;;
+-
+-      -rpath)
+-	prev=rpath
+-	continue
+-	;;
+-
+-      -R)
+-	prev=xrpath
+-	continue
+-	;;
+-
+-      -R*)
+-	func_stripname '-R' '' "$arg"
+-	dir=$func_stripname_result
+-	# We need an absolute path.
+-	case $dir in
+-	[\\/]* | [A-Za-z]:[\\/]*) ;;
+-	*)
+-	  func_fatal_error "only absolute run-paths are allowed"
+-	  ;;
+-	esac
+-	case "$xrpath " in
+-	*" $dir "*) ;;
+-	*) xrpath="$xrpath $dir" ;;
+-	esac
+-	continue
+-	;;
+-
+-      -shared)
+-	# The effects of -shared are defined in a previous loop.
+-	continue
+-	;;
+-
+-      -shrext)
+-	prev=shrext
+-	continue
+-	;;
+-
+-      -static | -static-libtool-libs)
+-	# The effects of -static are defined in a previous loop.
+-	# We used to do the same as -all-static on platforms that
+-	# didn't have a PIC flag, but the assumption that the effects
+-	# would be equivalent was wrong.  It would break on at least
+-	# Digital Unix and AIX.
+-	continue
+-	;;
+-
+-      -thread-safe)
+-	thread_safe=yes
+-	continue
+-	;;
+-
+-      -version-info)
+-	prev=vinfo
+-	continue
+-	;;
+-
+-      -version-number)
+-	prev=vinfo
+-	vinfo_number=yes
+-	continue
+-	;;
+-
+-      -weak)
+-        prev=weak
+-	continue
+-	;;
+-
+-      -Wc,*)
+-	func_stripname '-Wc,' '' "$arg"
+-	args=$func_stripname_result
+-	arg=
+-	save_ifs="$IFS"; IFS=','
+-	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"
- 	;;
- 
+-	  compiler_flags="$compiler_flags $func_quote_for_eval_result"
+-	done
+-	IFS="$save_ifs"
+-	func_stripname ' ' '' "$arg"
+-	arg=$func_stripname_result
+-	;;
+-
+-      -Wl,*)
+-	func_stripname '-Wl,' '' "$arg"
+-	args=$func_stripname_result
+-	arg=
+-	save_ifs="$IFS"; IFS=','
+-	for flag in $args; do
+-	  IFS="$save_ifs"
+-          func_quote_for_eval "$flag"
+-	  arg="$arg $wl$func_quote_for_eval_result"
+-	  compiler_flags="$compiler_flags $wl$func_quote_for_eval_result"
+-	  linker_flags="$linker_flags $func_quote_for_eval_result"
+-	done
+-	IFS="$save_ifs"
+-	func_stripname ' ' '' "$arg"
+-	arg=$func_stripname_result
+-	;;
+-
+-      -Xcompiler)
+-	prev=xcompiler
+-	continue
+-	;;
+-
+-      -Xlinker)
+-	prev=xlinker
+-	continue
+-	;;
+-
+-      -XCClinker)
+-	prev=xcclinker
+-	continue
+-	;;
+-
+-      # -msg_* for osf cc
+-      -msg_*)
+-	func_quote_for_eval "$arg"
+-	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
@@ -16606,120 +18345,590 @@
 -      # -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*| \
+-      -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
+-        func_quote_for_eval "$arg"
+-	arg="$func_quote_for_eval_result"
+-        func_append compile_command " $arg"
+-        func_append finalize_command " $arg"
+-        compiler_flags="$compiler_flags $arg"
+-        continue
+-        ;;
+-
+-      # Some other compiler flag.
+-      -* | +*)
+-        func_quote_for_eval "$arg"
+-	arg="$func_quote_for_eval_result"
+-	;;
+-
+-      *.$objext)
+-	# A standard object.
+-	objs="$objs $arg"
+-	;;
+-
+-      *.lo)
+-	# A libtool-controlled object.
+-
+-	# Check to see that this really is a libtool object.
+-	if func_lalib_unsafe_p "$arg"; then
+-	  pic_object=
+-	  non_pic_object=
+-
+-	  # Read the .lo file
+-	  func_source "$arg"
+-
+-	  if test -z "$pic_object" ||
+-	     test -z "$non_pic_object" ||
+-	     test "$pic_object" = none &&
+-	     test "$non_pic_object" = none; then
+-	    func_fatal_error "cannot find name of object for \`$arg'"
+-	  fi
+-
+-	  # Extract subdirectory from the argument.
+-	  func_dirname "$arg" "/" ""
+-	  xdir="$func_dirname_result"
+-
+-	  if test "$pic_object" != none; then
+-	    # Prepend the subdirectory the object is found in.
+-	    pic_object="$xdir$pic_object"
+-
+-	    if test "$prev" = dlfiles; then
+-	      if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+-		dlfiles="$dlfiles $pic_object"
+-		prev=
+-		continue
+-	      else
+-		# If libtool objects are unsupported, then we need to preload.
+-		prev=dlprefiles
+-	      fi
+-	    fi
+-
+-	    # CHECK ME:  I think I busted this.  -Ossama
+-	    if test "$prev" = dlprefiles; then
+-	      # Preload the old-style object.
+-	      dlprefiles="$dlprefiles $pic_object"
+-	      prev=
+-	    fi
+-
+-	    # A PIC object.
+-	    func_append libobjs " $pic_object"
+-	    arg="$pic_object"
+-	  fi
+-
+-	  # Non-PIC object.
+-	  if test "$non_pic_object" != none; then
+-	    # Prepend the subdirectory the object is found in.
+-	    non_pic_object="$xdir$non_pic_object"
+-
+-	    # A standard non-PIC object
+-	    func_append non_pic_objects " $non_pic_object"
+-	    if test -z "$pic_object" || test "$pic_object" = none ; then
+-	      arg="$non_pic_object"
+-	    fi
+-	  else
+-	    # If the PIC object exists, use it instead.
+-	    # $xdir was prepended to $pic_object above.
+-	    non_pic_object="$pic_object"
+-	    func_append non_pic_objects " $non_pic_object"
+-	  fi
+-	else
+-	  # Only an error if not doing a dry-run.
+-	  if $opt_dry_run; then
+-	    # Extract subdirectory from the argument.
+-	    func_dirname "$arg" "/" ""
+-	    xdir="$func_dirname_result"
+-
+-	    func_lo2o "$arg"
+-	    pic_object=$xdir$objdir/$func_lo2o_result
+-	    non_pic_object=$xdir$func_lo2o_result
+-	    func_append libobjs " $pic_object"
+-	    func_append non_pic_objects " $non_pic_object"
+-	  else
+-	    func_fatal_error "\`$arg' is not a valid libtool object"
+-	  fi
+-	fi
+-	;;
+-
+-      *.$libext)
+-	# An archive.
+-	deplibs="$deplibs $arg"
+-	old_deplibs="$old_deplibs $arg"
+-	continue
+-	;;
+-
+-      *.la)
+-	# A libtool-controlled library.
+-
+-	if test "$prev" = dlfiles; then
+-	  # This library was specified with -dlopen.
+-	  dlfiles="$dlfiles $arg"
+-	  prev=
+-	elif test "$prev" = dlprefiles; then
+-	  # The library was specified with -dlpreopen.
+-	  dlprefiles="$dlprefiles $arg"
+-	  prev=
+-	else
+-	  deplibs="$deplibs $arg"
+-	fi
+-	continue
+-	;;
+-
+-      # Some other compiler argument.
+-      *)
+-	# Unknown arguments in both finalize_command and compile_command need
+-	# to be aesthetically quoted because they are evaled later.
+-	func_quote_for_eval "$arg"
+-	arg="$func_quote_for_eval_result"
+-	;;
+-      esac # arg
+-
+-      # Now actually substitute the argument into the commands.
+-      if test -n "$arg"; then
+-	func_append compile_command " $arg"
+-	func_append finalize_command " $arg"
+-      fi
+-    done # argument parsing loop
+-
+-    test -n "$prev" && \
+-      func_fatal_help "the \`$prevarg' option requires an argument"
+-
+-    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
+-      eval arg=\"$export_dynamic_flag_spec\"
+-      func_append compile_command " $arg"
+-      func_append finalize_command " $arg"
+-    fi
+-
+-    oldlibs=
+-    # calculate the name of the file, without its directory
+-    func_basename "$output"
+-    outputname="$func_basename_result"
+-    libobjs_save="$libobjs"
+-
+-    if test -n "$shlibpath_var"; then
+-      # get the directories listed in $shlibpath_var
 -      eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\`
-+      eval shlib_search_path=\`\$ECHO \"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" ;;
+-    else
+-      shlib_search_path=
+-    fi
+-    eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
+-    eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
+-
+-    func_dirname "$output" "/" ""
+-    output_objdir="$func_dirname_result$objdir"
+-    # Create the object directory.
+-    func_mkdir_p "$output_objdir"
+-
+-    # Determine the type of output
+-    case $output in
+-    "")
+-      func_fatal_help "you must specify an output file"
+-      ;;
+-    *.$libext) linkmode=oldlib ;;
+-    *.lo | *.$objext) linkmode=obj ;;
+-    *.la) linkmode=lib ;;
+-    *) linkmode=prog ;; # Anything else should be a program.
+-    esac
+-
+-    specialdeplibs=
+-
+-    libs=
+-    # Find all interdependent deplibs by searching for libraries
+-    # that are linked more than once (e.g. -la -lb -la)
+-    for deplib in $deplibs; do
+-      if $opt_duplicate_deps ; then
+-	case "$libs " in
+-	*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+-	esac
+-      fi
+-      libs="$libs $deplib"
+-    done
+-
+-    if test "$linkmode" = lib; then
+-      libs="$predeps $libs $compiler_lib_search_path $postdeps"
+-
+-      # Compute libraries that are listed more than once in $predeps
+-      # $postdeps and mark them as special (i.e., whose duplicates are
+-      # not to be eliminated).
+-      pre_post_deps=
+-      if $opt_duplicate_compiler_generated_deps; then
+-	for pre_post_dep in $predeps $postdeps; do
+-	  case "$pre_post_deps " in
+-	  *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
+-	  esac
+-	  pre_post_deps="$pre_post_deps $pre_post_dep"
+-	done
+-      fi
+-      pre_post_deps=
+-    fi
+-
+-    deplibs=
+-    newdependency_libs=
+-    newlib_search_path=
+-    need_relink=no # whether we're linking any uninstalled libtool libraries
+-    notinst_deplibs= # not-installed libtool libraries
+-    notinst_path= # paths that contain not-installed libtool libraries
+-
+-    case $linkmode in
+-    lib)
+-	passes="conv dlpreopen link"
+-	for file in $dlfiles $dlprefiles; do
+-	  case $file in
+-	  *.la) ;;
+-	  *)
+-	    func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file"
+-	    ;;
+-	  esac
+-	done
+-	;;
+-    prog)
+-	compile_deplibs=
+-	finalize_deplibs=
+-	alldeplibs=no
+-	newdlfiles=
+-	newdlprefiles=
+-	passes="conv scan dlopen dlpreopen link"
+-	;;
+-    *)  passes="conv"
+-	;;
+-    esac
+-
+-    for pass in $passes; do
+-      # The preopen pass in lib mode reverses $deplibs; put it back here
+-      # so that -L comes before libs that need it for instance...
+-      if test "$linkmode,$pass" = "lib,link"; then
+-	## FIXME: Find the place where the list is rebuilt in the wrong
+-	##        order, and fix it there properly
+-        tmp_deplibs=
+-	for deplib in $deplibs; do
+-	  tmp_deplibs="$deplib $tmp_deplibs"
+-	done
+-	deplibs="$tmp_deplibs"
+-      fi
+-
+-      if test "$linkmode,$pass" = "lib,link" ||
+-	 test "$linkmode,$pass" = "prog,scan"; then
+-	libs="$deplibs"
+-	deplibs=
+-      fi
+-      if test "$linkmode" = prog; then
+-	case $pass in
+-	dlopen) libs="$dlfiles" ;;
+-	dlpreopen) libs="$dlprefiles" ;;
 -	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
-+	link)
-+	  libs="$deplibs %DEPLIBS%"
-+	  test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
-+	  ;;
- 	esac
-       fi
-       if test "$linkmode,$pass" = "lib,dlpreopen"; then
-@@ -5374,8 +5051,7 @@
- 	  # Collect preopened libtool deplibs, except any this library
- 	  # has declared as weak libs
- 	  for deplib in $dependency_libs; do
+-	esac
+-      fi
+-      if test "$linkmode,$pass" = "lib,dlpreopen"; then
+-	# Collect and forward deplibs of preopened libtool libs
+-	for lib in $dlprefiles; do
+-	  # Ignore non-libtool-libs
+-	  dependency_libs=
+-	  case $lib in
+-	  *.la)	func_source "$lib" ;;
+-	  esac
+-
+-	  # 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 \(.*\)"`
+-	    case " $weak_libs " in
+-	    *" $deplib_base "*) ;;
+-	    *) deplibs="$deplibs $deplib" ;;
+-	    esac
+-	  done
+-	done
+-	libs="$dlprefiles"
+-      fi
+-      if test "$pass" = dlopen; then
+-	# Collect dlpreopened libraries
+-	save_deplibs="$deplibs"
+-	deplibs=
+-      fi
+-
+-      for deplib in $libs; do
+-	lib=
+-	found=no
+-	case $deplib in
+-	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+-	  if test "$linkmode,$pass" = "prog,link"; then
+-	    compile_deplibs="$deplib $compile_deplibs"
+-	    finalize_deplibs="$deplib $finalize_deplibs"
+-	  else
+-	    compiler_flags="$compiler_flags $deplib"
+-	    if test "$linkmode" = lib ; then
+-		case "$new_inherited_linker_flags " in
+-		    *" $deplib "*) ;;
+-		    * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
+-		esac
+-	    fi
+-	  fi
+-	  continue
+-	  ;;
+-	-l*)
+-	  if test "$linkmode" != lib && test "$linkmode" != prog; then
+-	    func_warning "\`-l' is ignored for archives/objects"
+-	    continue
+-	  fi
+-	  func_stripname '-l' '' "$deplib"
+-	  name=$func_stripname_result
+-	  if test "$linkmode" = lib; then
+-	    searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
+-	  else
+-	    searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
+-	  fi
+-	  for searchdir in $searchdirs; do
+-	    for search_ext in .la $std_shrext .so .a; do
+-	      # Search the libtool library
+-	      lib="$searchdir/lib${name}${search_ext}"
+-	      if test -f "$lib"; then
+-		if test "$search_ext" = ".la"; then
+-		  found=yes
+-		else
+-		  found=no
+-		fi
+-		break 2
+-	      fi
+-	    done
+-	  done
+-	  if test "$found" != yes; then
+-	    # deplib doesn't seem to be a libtool library
+-	    if test "$linkmode,$pass" = "prog,link"; then
+-	      compile_deplibs="$deplib $compile_deplibs"
+-	      finalize_deplibs="$deplib $finalize_deplibs"
+-	    else
+-	      deplibs="$deplib $deplibs"
+-	      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
+-	    fi
+-	    continue
+-	  else # deplib is a libtool library
+-	    # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
+-	    # We need to do some special things here, and not later.
+-	    if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+-	      case " $predeps $postdeps " in
+-	      *" $deplib "*)
+-		if func_lalib_p "$lib"; then
+-		  library_names=
+-		  old_library=
+-		  func_source "$lib"
+-		  for l in $old_library $library_names; do
+-		    ll="$l"
+-		  done
+-		  if test "X$ll" = "X$old_library" ; then # only static version available
+-		    found=no
+-		    func_dirname "$lib" "" "."
+-		    ladir="$func_dirname_result"
+-		    lib=$ladir/$old_library
+-		    if test "$linkmode,$pass" = "prog,link"; then
+-		      compile_deplibs="$deplib $compile_deplibs"
+-		      finalize_deplibs="$deplib $finalize_deplibs"
+-		    else
+-		      deplibs="$deplib $deplibs"
+-		      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
+-		    fi
+-		    continue
+-		  fi
+-		fi
+-		;;
+-	      *) ;;
+-	      esac
+-	    fi
+-	  fi
+-	  ;; # -l
+-	*.ltframework)
+-	  if test "$linkmode,$pass" = "prog,link"; then
+-	    compile_deplibs="$deplib $compile_deplibs"
+-	    finalize_deplibs="$deplib $finalize_deplibs"
+-	  else
+-	    deplibs="$deplib $deplibs"
+-	    if test "$linkmode" = lib ; then
+-		case "$new_inherited_linker_flags " in
+-		    *" $deplib "*) ;;
+-		    * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
+-		esac
+-	    fi
+-	  fi
+-	  continue
+-	  ;;
+-	-L*)
+-	  case $linkmode in
+-	  lib)
+-	    deplibs="$deplib $deplibs"
+-	    test "$pass" = conv && continue
+-	    newdependency_libs="$deplib $newdependency_libs"
+-	    func_stripname '-L' '' "$deplib"
+-	    newlib_search_path="$newlib_search_path $func_stripname_result"
+-	    ;;
+-	  prog)
+-	    if test "$pass" = conv; then
+-	      deplibs="$deplib $deplibs"
+-	      continue
+-	    fi
+-	    if test "$pass" = scan; then
+-	      deplibs="$deplib $deplibs"
+-	    else
+-	      compile_deplibs="$deplib $compile_deplibs"
+-	      finalize_deplibs="$deplib $finalize_deplibs"
+-	    fi
+-	    func_stripname '-L' '' "$deplib"
+-	    newlib_search_path="$newlib_search_path $func_stripname_result"
+-	    ;;
+-	  *)
+-	    func_warning "\`-L' is ignored for archives/objects"
+-	    ;;
+-	  esac # linkmode
+-	  continue
+-	  ;; # -L
+-	-R*)
+-	  if test "$pass" = link; then
+-	    func_stripname '-R' '' "$deplib"
+-	    dir=$func_stripname_result
+-	    # Make sure the xrpath contains only unique directories.
+-	    case "$xrpath " in
+-	    *" $dir "*) ;;
+-	    *) xrpath="$xrpath $dir" ;;
+-	    esac
+-	  fi
+-	  deplibs="$deplib $deplibs"
+-	  continue
+-	  ;;
+-	*.la) lib="$deplib" ;;
+-	*.$libext)
+-	  if test "$pass" = conv; then
+-	    deplibs="$deplib $deplibs"
+-	    continue
+-	  fi
+-	  case $linkmode in
+-	  lib)
+-	    # Linking convenience modules into shared libraries is allowed,
+-	    # but linking other static libraries is non-portable.
+-	    case " $dlpreconveniencelibs " in
+-	    *" $deplib "*) ;;
+-	    *)
+-	      valid_a_lib=no
+-	      case $deplibs_check_method in
+-		match_pattern*)
+-		  set dummy $deplibs_check_method; shift
+-		  match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
 -		  if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \
-+		  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
+-		    | $EGREP "$match_pattern_regex" > /dev/null; then
+-		    valid_a_lib=yes
+-		  fi
+-		;;
+-		pass_all)
+-		  valid_a_lib=yes
+-		;;
+-	      esac
+-	      if test "$valid_a_lib" != yes; then
 -		echo
-+		$ECHO
- 		$ECHO "*** Warning: Trying to link with static lib archive $deplib."
+-		$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
+-	      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
+-		$ECHO "*** Warning: Linking the shared library $output against the"
+-		$ECHO "*** static library $deplib is not portable!"
+-		deplibs="$deplib $deplibs"
+-	      fi
+-	      ;;
+-	    esac
+-	    continue
+-	    ;;
+-	  prog)
+-	    if test "$pass" != link; then
+-	      deplibs="$deplib $deplibs"
+-	    else
+-	      compile_deplibs="$deplib $compile_deplibs"
+-	      finalize_deplibs="$deplib $finalize_deplibs"
+-	    fi
+-	    continue
+-	    ;;
+-	  esac # linkmode
+-	  ;; # *.$libext
+-	*.lo | *.$objext)
+-	  if test "$pass" = conv; then
+-	    deplibs="$deplib $deplibs"
+-	  elif test "$linkmode" = prog; then
+-	    if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
+-	      # If there is no dlopen support or we're linking statically,
+-	      # we need to preload.
+-	      newdlprefiles="$newdlprefiles $deplib"
+-	      compile_deplibs="$deplib $compile_deplibs"
+-	      finalize_deplibs="$deplib $finalize_deplibs"
+-	    else
+-	      newdlfiles="$newdlfiles $deplib"
+-	    fi
+-	  fi
+-	  continue
+-	  ;;
+-	%DEPLIBS%)
+-	  alldeplibs=yes
+-	  continue
+-	  ;;
+-	esac # case $deplib
+-
+-	if test "$found" = yes || test -f "$lib"; then :
+-	else
+-	  func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'"
+-	fi
+-
+-	# Check to see that this really is a libtool archive.
+-	func_lalib_unsafe_p "$lib" \
+-	  || func_fatal_error "\`$lib' is not a valid libtool archive"
+-
+-	func_dirname "$lib" "" "."
+-	ladir="$func_dirname_result"
+-
+-	dlname=
+-	dlopen=
+-	dlpreopen=
+-	libdir=
+-	library_names=
+-	old_library=
+-	inherited_linker_flags=
+-	# If the library was installed with an old release of libtool,
+-	# it will not redefine variables installed, or shouldnotlink
+-	installed=yes
+-	shouldnotlink=no
+-	avoidtemprpath=
+-
+-
+-	# Read the .la file
+-	func_source "$lib"
+-
+-	# 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
+-	  for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
+-	    case " $new_inherited_linker_flags " in
+-	      *" $tmp_inherited_linker_flag "*) ;;
+-	      *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";;
+-	    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"
-+	    tmp_libs=
-+	    for deplib in $dependency_libs; do
-+	      deplibs="$deplib $deplibs"
-+	      if $opt_duplicate_deps ; then
-+		case "$tmp_libs " in
-+		*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-+		esac
-+	      fi
-+	      tmp_libs="$tmp_libs $deplib"
-+	    done
- 	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
- 	    func_fatal_error "\`$lib' is not a convenience library"
- 	  fi
+-	if test "$linkmode,$pass" = "lib,link" ||
+-	   test "$linkmode,$pass" = "prog,scan" ||
+-	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
+-	  test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
+-	  test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
+-	fi
+-
+-	if test "$pass" = conv; then
+-	  # Only check for convenience libraries
+-	  deplibs="$lib $deplibs"
+-	  if test -z "$libdir"; then
+-	    if test -z "$old_library"; then
+-	      func_fatal_error "cannot find name of link library for \`$lib'"
+-	    fi
+-	    # 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"
+-	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
+-	    func_fatal_error "\`$lib' is not a convenience library"
+-	  fi
 -	  tmp_libs=
 -	  for deplib in $dependency_libs; do
 -	    deplibs="$deplib $deplibs"
@@ -16730,579 +18939,2764 @@
 -	    fi
 -	    tmp_libs="$tmp_libs $deplib"
 -	  done
- 	  continue
- 	fi # $pass = conv
- 
-@@ -5907,7 +5583,7 @@
- 	    fi
- 	  done
- 	  if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
+-	  continue
+-	fi # $pass = conv
+-
+-
+-	# Get the name of the library we link against.
+-	linklib=
+-	for l in $old_library $library_names; do
+-	  linklib="$l"
+-	done
+-	if test -z "$linklib"; then
+-	  func_fatal_error "cannot find name of link library for \`$lib'"
+-	fi
+-
+-	# This library was specified with -dlopen.
+-	if test "$pass" = dlopen; then
+-	  if test -z "$libdir"; then
+-	    func_fatal_error "cannot -dlopen a convenience library: \`$lib'"
+-	  fi
+-	  if test -z "$dlname" ||
+-	     test "$dlopen_support" != yes ||
+-	     test "$build_libtool_libs" = no; then
+-	    # If there is no dlname, no dlopen support or we're linking
+-	    # statically, we need to preload.  We also need to preload any
+-	    # dependent libraries so libltdl's deplib preloader doesn't
+-	    # bomb out in the load deplibs phase.
+-	    dlprefiles="$dlprefiles $lib $dependency_libs"
+-	  else
+-	    newdlfiles="$newdlfiles $lib"
+-	  fi
+-	  continue
+-	fi # $pass = dlopen
+-
+-	# We need an absolute path.
+-	case $ladir in
+-	[\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
+-	*)
+-	  abs_ladir=`cd "$ladir" && pwd`
+-	  if test -z "$abs_ladir"; then
+-	    func_warning "cannot determine absolute directory name of \`$ladir'"
+-	    func_warning "passing it literally to the linker, although it might fail"
+-	    abs_ladir="$ladir"
+-	  fi
+-	  ;;
+-	esac
+-	func_basename "$lib"
+-	laname="$func_basename_result"
+-
+-	# Find the relevant object directory and library name.
+-	if test "X$installed" = Xyes; then
+-	  if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+-	    func_warning "library \`$lib' was moved."
+-	    dir="$ladir"
+-	    absdir="$abs_ladir"
+-	    libdir="$abs_ladir"
+-	  else
+-	    dir="$libdir"
+-	    absdir="$libdir"
+-	  fi
+-	  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
+-	else
+-	  if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+-	    dir="$ladir"
+-	    absdir="$abs_ladir"
+-	    # Remove this search path later
+-	    notinst_path="$notinst_path $abs_ladir"
+-	  else
+-	    dir="$ladir/$objdir"
+-	    absdir="$abs_ladir/$objdir"
+-	    # Remove this search path later
+-	    notinst_path="$notinst_path $abs_ladir"
+-	  fi
+-	fi # $installed = yes
+-	func_stripname 'lib' '.la' "$laname"
+-	name=$func_stripname_result
+-
+-	# This library was specified with -dlpreopen.
+-	if test "$pass" = dlpreopen; then
+-	  if test -z "$libdir" && test "$linkmode" = prog; then
+-	    func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
+-	  fi
+-	  # Prefer using a static library (so that no silly _DYNAMIC symbols
+-	  # are required to link).
+-	  if test -n "$old_library"; then
+-	    newdlprefiles="$newdlprefiles $dir/$old_library"
+-	    # Keep a list of preopened convenience libraries to check
+-	    # that they are being used correctly in the link pass.
+-	    test -z "$libdir" && \
+-		dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library"
+-	  # Otherwise, use the dlname, so that lt_dlopen finds it.
+-	  elif test -n "$dlname"; then
+-	    newdlprefiles="$newdlprefiles $dir/$dlname"
+-	  else
+-	    newdlprefiles="$newdlprefiles $dir/$linklib"
+-	  fi
+-	fi # $pass = dlpreopen
+-
+-	if test -z "$libdir"; then
+-	  # Link the convenience library
+-	  if test "$linkmode" = lib; then
+-	    deplibs="$dir/$old_library $deplibs"
+-	  elif test "$linkmode,$pass" = "prog,link"; then
+-	    compile_deplibs="$dir/$old_library $compile_deplibs"
+-	    finalize_deplibs="$dir/$old_library $finalize_deplibs"
+-	  else
+-	    deplibs="$lib $deplibs" # used for prog,scan pass
+-	  fi
+-	  continue
+-	fi
+-
+-
+-	if test "$linkmode" = prog && test "$pass" != link; then
+-	  newlib_search_path="$newlib_search_path $ladir"
+-	  deplibs="$lib $deplibs"
+-
+-	  linkalldeplibs=no
+-	  if test "$link_all_deplibs" != no || test -z "$library_names" ||
+-	     test "$build_libtool_libs" = no; then
+-	    linkalldeplibs=yes
+-	  fi
+-
+-	  tmp_libs=
+-	  for deplib in $dependency_libs; do
+-	    case $deplib in
+-	    -L*) func_stripname '-L' '' "$deplib"
+-	         newlib_search_path="$newlib_search_path $func_stripname_result"
+-		 ;;
+-	    esac
+-	    # Need to link against all dependency_libs?
+-	    if test "$linkalldeplibs" = yes; then
+-	      deplibs="$deplib $deplibs"
+-	    else
+-	      # Need to hardcode shared library paths
+-	      # or/and link against static libraries
+-	      newdependency_libs="$deplib $newdependency_libs"
+-	    fi
+-	    if $opt_duplicate_deps ; then
+-	      case "$tmp_libs " in
+-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+-	      esac
+-	    fi
+-	    tmp_libs="$tmp_libs $deplib"
+-	  done # for deplib
+-	  continue
+-	fi # $linkmode = prog...
+-
+-	if test "$linkmode,$pass" = "prog,link"; then
+-	  if test -n "$library_names" &&
+-	     { { test "$prefer_static_libs" = no ||
+-	         test "$prefer_static_libs,$installed" = "built,yes"; } ||
+-	       test -z "$old_library"; }; then
+-	    # We need to hardcode the library path
+-	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
+-	      # Make sure the rpath contains only unique directories.
+-	      case "$temp_rpath:" in
+-	      *"$absdir:"*) ;;
+-	      *) temp_rpath="$temp_rpath$absdir:" ;;
+-	      esac
+-	    fi
+-
+-	    # Hardcode the library path.
+-	    # Skip directories that are in the system default run-time
+-	    # search path.
+-	    case " $sys_lib_dlsearch_path " in
+-	    *" $absdir "*) ;;
+-	    *)
+-	      case "$compile_rpath " in
+-	      *" $absdir "*) ;;
+-	      *) compile_rpath="$compile_rpath $absdir"
+-	      esac
+-	      ;;
+-	    esac
+-	    case " $sys_lib_dlsearch_path " in
+-	    *" $libdir "*) ;;
+-	    *)
+-	      case "$finalize_rpath " in
+-	      *" $libdir "*) ;;
+-	      *) finalize_rpath="$finalize_rpath $libdir"
+-	      esac
+-	      ;;
+-	    esac
+-	  fi # $linkmode,$pass = prog,link...
+-
+-	  if test "$alldeplibs" = yes &&
+-	     { test "$deplibs_check_method" = pass_all ||
+-	       { test "$build_libtool_libs" = yes &&
+-		 test -n "$library_names"; }; }; then
+-	    # We only need to search for static libraries
+-	    continue
+-	  fi
+-	fi
+-
+-	link_static=no # Whether the deplib will be linked statically
+-	use_static_libs=$prefer_static_libs
+-	if test "$use_static_libs" = built && test "$installed" = yes; then
+-	  use_static_libs=no
+-	fi
+-	if test -n "$library_names" &&
+-	   { test "$use_static_libs" = no || test -z "$old_library"; }; then
+-	  case $host in
+-	  *cygwin* | *mingw* | *cegcc*)
+-	      # No point in relinking DLLs because paths are not encoded
+-	      notinst_deplibs="$notinst_deplibs $lib"
+-	      need_relink=no
+-	    ;;
+-	  *)
+-	    if test "$installed" = no; then
+-	      notinst_deplibs="$notinst_deplibs $lib"
+-	      need_relink=yes
+-	    fi
+-	    ;;
+-	  esac
+-	  # This is a shared library
+-
+-	  # Warn about portability, can't link against -module's on some
+-	  # systems (darwin).  Don't bleat about dlopened modules though!
+-	  dlopenmodule=""
+-	  for dlpremoduletest in $dlprefiles; do
+-	    if test "X$dlpremoduletest" = "X$lib"; then
+-	      dlopenmodule="$dlpremoduletest"
+-	      break
+-	    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
+-	    if test "$linkmode" = prog; then
+-	      $ECHO "*** Warning: Linking the executable $output against the loadable module"
+-	    else
+-	      $ECHO "*** Warning: Linking the shared library $output against the loadable module"
+-	    fi
+-	    $ECHO "*** $linklib is not portable!"
+-	  fi
+-	  if test "$linkmode" = lib &&
+-	     test "$hardcode_into_libs" = yes; then
+-	    # Hardcode the library path.
+-	    # Skip directories that are in the system default run-time
+-	    # search path.
+-	    case " $sys_lib_dlsearch_path " in
+-	    *" $absdir "*) ;;
+-	    *)
+-	      case "$compile_rpath " in
+-	      *" $absdir "*) ;;
+-	      *) compile_rpath="$compile_rpath $absdir"
+-	      esac
+-	      ;;
+-	    esac
+-	    case " $sys_lib_dlsearch_path " in
+-	    *" $libdir "*) ;;
+-	    *)
+-	      case "$finalize_rpath " in
+-	      *" $libdir "*) ;;
+-	      *) finalize_rpath="$finalize_rpath $libdir"
+-	      esac
+-	      ;;
+-	    esac
+-	  fi
+-
+-	  if test -n "$old_archive_from_expsyms_cmds"; then
+-	    # figure out the soname
+-	    set dummy $library_names
+-	    shift
+-	    realname="$1"
+-	    shift
+-	    libname=`eval "\\$ECHO \"$libname_spec\""`
+-	    # use dlname if we got it. it's perfectly good, no?
+-	    if test -n "$dlname"; then
+-	      soname="$dlname"
+-	    elif test -n "$soname_spec"; then
+-	      # bleh windows
+-	      case $host in
+-	      *cygwin* | mingw* | *cegcc*)
+-	        func_arith $current - $age
+-		major=$func_arith_result
+-		versuffix="-$major"
+-		;;
+-	      esac
+-	      eval soname=\"$soname_spec\"
+-	    else
+-	      soname="$realname"
+-	    fi
+-
+-	    # Make a new name for the extract_expsyms_cmds to use
+-	    soroot="$soname"
+-	    func_basename "$soroot"
+-	    soname="$func_basename_result"
+-	    func_stripname 'lib' '.dll' "$soname"
+-	    newlib=libimp-$func_stripname_result.a
+-
+-	    # If the library has no export list, then create one now
+-	    if test -f "$output_objdir/$soname-def"; then :
+-	    else
+-	      func_verbose "extracting exported symbol list from \`$soname'"
+-	      func_execute_cmds "$extract_expsyms_cmds" 'exit $?'
+-	    fi
+-
+-	    # Create $newlib
+-	    if test -f "$output_objdir/$newlib"; then :; else
+-	      func_verbose "generating import library for \`$soname'"
+-	      func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?'
+-	    fi
+-	    # make sure the library variables are pointing to the new library
+-	    dir=$output_objdir
+-	    linklib=$newlib
+-	  fi # test -n "$old_archive_from_expsyms_cmds"
+-
+-	  if test "$linkmode" = prog || test "$mode" != relink; then
+-	    add_shlibpath=
+-	    add_dir=
+-	    add=
+-	    lib_linked=yes
+-	    case $hardcode_action in
+-	    immediate | unsupported)
+-	      if test "$hardcode_direct" = no; then
+-		add="$dir/$linklib"
+-		case $host in
+-		  *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;;
+-		  *-*-sysv4*uw2*) add_dir="-L$dir" ;;
+-		  *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
+-		    *-*-unixware7*) add_dir="-L$dir" ;;
+-		  *-*-darwin* )
+-		    # if the lib is a (non-dlopened) module then we can not
+-		    # link against it, someone is ignoring the earlier warnings
+-		    if /usr/bin/file -L $add 2> /dev/null |
+-			 $GREP ": [^:]* bundle" >/dev/null ; then
+-		      if test "X$dlopenmodule" != "X$lib"; then
+-			$ECHO "*** Warning: lib $linklib is a module, not a shared library"
+-			if test -z "$old_library" ; then
 -			  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.
+-			else
+-			  add="$dir/$old_library"
+-			fi
+-		      elif test -n "$old_library"; then
+-			add="$dir/$old_library"
+-		      fi
+-		    fi
+-		esac
+-	      elif test "$hardcode_minus_L" = no; then
+-		case $host in
+-		*-*-sunos*) add_shlibpath="$dir" ;;
+-		esac
+-		add_dir="-L$dir"
+-		add="-l$name"
+-	      elif test "$hardcode_shlibpath_var" = no; then
+-		add_shlibpath="$dir"
+-		add="-l$name"
+-	      else
+-		lib_linked=no
+-	      fi
+-	      ;;
+-	    relink)
+-	      if test "$hardcode_direct" = yes &&
+-	         test "$hardcode_direct_absolute" = no; then
+-		add="$dir/$linklib"
+-	      elif test "$hardcode_minus_L" = yes; then
+-		add_dir="-L$dir"
+-		# Try looking first in the location we're being installed to.
+-		if test -n "$inst_prefix_dir"; then
+-		  case $libdir in
+-		    [\\/]*)
+-		      add_dir="$add_dir -L$inst_prefix_dir$libdir"
+-		      ;;
+-		  esac
+-		fi
+-		add="-l$name"
+-	      elif test "$hardcode_shlibpath_var" = yes; then
+-		add_shlibpath="$dir"
+-		add="-l$name"
+-	      else
+-		lib_linked=no
+-	      fi
+-	      ;;
+-	    *) lib_linked=no ;;
+-	    esac
+-
+-	    if test "$lib_linked" != yes; then
+-	      func_fatal_configuration "unsupported hardcode properties"
+-	    fi
+-
+-	    if test -n "$add_shlibpath"; then
+-	      case :$compile_shlibpath: in
+-	      *":$add_shlibpath:"*) ;;
+-	      *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
+-	      esac
+-	    fi
+-	    if test "$linkmode" = prog; then
+-	      test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
+-	      test -n "$add" && compile_deplibs="$add $compile_deplibs"
+-	    else
+-	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
+-	      test -n "$add" && deplibs="$add $deplibs"
+-	      if test "$hardcode_direct" != yes &&
+-		 test "$hardcode_minus_L" != yes &&
+-		 test "$hardcode_shlibpath_var" = yes; then
+-		case :$finalize_shlibpath: in
+-		*":$libdir:"*) ;;
+-		*) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
+-		esac
+-	      fi
+-	    fi
+-	  fi
+-
+-	  if test "$linkmode" = prog || test "$mode" = relink; then
+-	    add_shlibpath=
+-	    add_dir=
+-	    add=
+-	    # Finalize command for both is simple: just hardcode it.
+-	    if test "$hardcode_direct" = yes &&
+-	       test "$hardcode_direct_absolute" = no; then
+-	      add="$libdir/$linklib"
+-	    elif test "$hardcode_minus_L" = yes; then
+-	      add_dir="-L$libdir"
+-	      add="-l$name"
+-	    elif test "$hardcode_shlibpath_var" = yes; then
+-	      case :$finalize_shlibpath: in
+-	      *":$libdir:"*) ;;
+-	      *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
+-	      esac
+-	      add="-l$name"
+-	    elif test "$hardcode_automatic" = yes; then
+-	      if test -n "$inst_prefix_dir" &&
+-		 test -f "$inst_prefix_dir$libdir/$linklib" ; then
+-		add="$inst_prefix_dir$libdir/$linklib"
+-	      else
+-		add="$libdir/$linklib"
+-	      fi
+-	    else
+-	      # We cannot seem to hardcode it, guess we'll fake it.
+-	      add_dir="-L$libdir"
+-	      # Try looking first in the location we're being installed to.
+-	      if test -n "$inst_prefix_dir"; then
+-		case $libdir in
+-		  [\\/]*)
+-		    add_dir="$add_dir -L$inst_prefix_dir$libdir"
+-		    ;;
+-		esac
+-	      fi
+-	      add="-l$name"
+-	    fi
+-
+-	    if test "$linkmode" = prog; then
+-	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
+-	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
+-	    else
+-	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
+-	      test -n "$add" && deplibs="$add $deplibs"
+-	    fi
+-	  fi
+-	elif test "$linkmode" = prog; then
+-	  # Here we assume that one of hardcode_direct or hardcode_minus_L
+-	  # is not unsupported.  This is valid on all known static and
+-	  # shared platforms.
+-	  if test "$hardcode_direct" != unsupported; then
+-	    test -n "$old_library" && linklib="$old_library"
+-	    compile_deplibs="$dir/$linklib $compile_deplibs"
+-	    finalize_deplibs="$dir/$linklib $finalize_deplibs"
+-	  else
+-	    compile_deplibs="-l$name -L$dir $compile_deplibs"
+-	    finalize_deplibs="-l$name -L$dir $finalize_deplibs"
+-	  fi
+-	elif test "$build_libtool_libs" = yes; then
+-	  # Not a shared library
+-	  if test "$deplibs_check_method" != pass_all; then
+-	    # We're trying link a shared library against a static one
+-	    # but the system doesn't support it.
+-
+-	    # Just print a warning and add the library to dependency_libs so
+-	    # that the program can be linked against the static library.
 -	    echo
-+	    $ECHO
- 	    $ECHO "*** Warning: This system can not link to static lib archive $lib."
+-	    $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
+-	    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
+-	      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
+-	      fi
+-	      if test "$build_old_libs" = no; then
+-		build_libtool_libs=module
+-		build_old_libs=yes
+-	      else
+-		build_libtool_libs=no
+-	      fi
+-	    fi
+-	  else
+-	    deplibs="$dir/$old_library $deplibs"
+-	    link_static=yes
+-	  fi
+-	fi # link shared/static library?
+-
+-	if test "$linkmode" = lib; then
+-	  if test -n "$dependency_libs" &&
+-	     { test "$hardcode_into_libs" != yes ||
+-	       test "$build_old_libs" = yes ||
+-	       test "$link_static" = yes; }; then
+-	    # Extract -R from dependency_libs
+-	    temp_deplibs=
+-	    for libdir in $dependency_libs; do
+-	      case $libdir in
+-	      -R*) func_stripname '-R' '' "$libdir"
+-	           temp_xrpath=$func_stripname_result
+-		   case " $xrpath " in
+-		   *" $temp_xrpath "*) ;;
+-		   *) xrpath="$xrpath $temp_xrpath";;
+-		   esac;;
+-	      *) temp_deplibs="$temp_deplibs $libdir";;
+-	      esac
+-	    done
+-	    dependency_libs="$temp_deplibs"
+-	  fi
+-
+-	  newlib_search_path="$newlib_search_path $absdir"
+-	  # Link against this library
+-	  test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
+-	  # ... and its dependency_libs
+-	  tmp_libs=
+-	  for deplib in $dependency_libs; do
+-	    newdependency_libs="$deplib $newdependency_libs"
+-	    if $opt_duplicate_deps ; then
+-	      case "$tmp_libs " in
+-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+-	      esac
+-	    fi
+-	    tmp_libs="$tmp_libs $deplib"
+-	  done
+-
+-	  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)
+-	        func_dirname "$deplib" "" "."
+-		dir="$func_dirname_result"
+-		# We need an absolute path.
+-		case $dir in
+-		[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
+-		*)
+-		  absdir=`cd "$dir" && pwd`
+-		  if test -z "$absdir"; then
+-		    func_warning "cannot determine absolute directory name of \`$dir'"
+-		    absdir="$dir"
+-		  fi
+-		  ;;
+-		esac
+-		if $GREP "^installed=no" $deplib > /dev/null; then
+-		case $host in
+-		*-*-darwin*)
+-		  depdepl=
+-		  eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
+-		  if test -n "$deplibrary_names" ; then
+-		    for tmp in $deplibrary_names ; do
+-		      depdepl=$tmp
+-		    done
+-		    if test -f "$absdir/$objdir/$depdepl" ; then
+-		      depdepl="$absdir/$objdir/$depdepl"
+-		      darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
+-                      if test -z "$darwin_install_name"; then
+-                          darwin_install_name=`${OTOOL64} -L $depdepl  | awk '{if (NR == 2) {print $1;exit}}'`
+-                      fi
+-		      compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
+-		      linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}"
+-		      path=
+-		    fi
+-		  fi
+-		  ;;
+-		*)
+-		  path="-L$absdir/$objdir"
+-		  ;;
+-		esac
+-		else
+-		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+-		  test -z "$libdir" && \
+-		    func_fatal_error "\`$deplib' is not a valid libtool archive"
+-		  test "$absdir" != "$libdir" && \
+-		    func_warning "\`$deplib' seems to be moved"
+-
+-		  path="-L$absdir"
+-		fi
+-		;;
+-	      esac
+-	      case " $deplibs " in
+-	      *" $path "*) ;;
+-	      *) deplibs="$path $deplibs" ;;
+-	      esac
+-	    done
+-	  fi # link_all_deplibs != no
+-	fi # linkmode = lib
+-      done # for deplib in $libs
+-      if test "$pass" = link; then
+-	if test "$linkmode" = "prog"; then
+-	  compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
+-	  finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
+-	else
 -	  compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
-+	  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
+-	fi
+-      fi
+-      dependency_libs="$newdependency_libs"
+-      if test "$pass" = dlpreopen; then
+-	# Link the dlpreopened libraries before other libraries
+-	for deplib in $save_deplibs; do
+-	  deplibs="$deplib $deplibs"
+-	done
+-      fi
+-      if test "$pass" != dlopen; then
+-	if test "$pass" != conv; then
+-	  # Make sure lib_search_path contains only unique directories.
+-	  lib_search_path=
+-	  for dir in $newlib_search_path; do
+-	    case "$lib_search_path " in
+-	    *" $dir "*) ;;
+-	    *) lib_search_path="$lib_search_path $dir" ;;
+-	    esac
+-	  done
+-	  newlib_search_path=
+-	fi
+-
+-	if test "$linkmode,$pass" != "prog,link"; then
+-	  vars="deplibs"
+-	else
+-	  vars="compile_deplibs finalize_deplibs"
+-	fi
+-	for var in $vars dependency_libs; do
+-	  # Add libraries to $var in reverse order
+-	  eval tmp_libs=\"\$$var\"
+-	  new_libs=
+-	  for deplib in $tmp_libs; do
+-	    # FIXME: Pedantically, this is the right thing to do, so
+-	    #        that some nasty dependency loop isn't accidentally
+-	    #        broken:
+-	    #new_libs="$deplib $new_libs"
+-	    # Pragmatically, this seems to cause very few problems in
+-	    # practice:
+-	    case $deplib in
+-	    -L*) new_libs="$deplib $new_libs" ;;
+-	    -R*) ;;
+-	    *)
+-	      # And here is the reason: when a library appears more
+-	      # than once as an explicit dependence of a library, or
+-	      # is implicitly linked in more than once by the
+-	      # compiler, it is considered special, and multiple
+-	      # occurrences thereof are not removed.  Compare this
+-	      # with having the same library being listed as a
+-	      # dependency of multiple other libraries: in this case,
+-	      # we know (pedantically, we assume) the library does not
+-	      # need to be listed more than once, so we keep only the
+-	      # last copy.  This is not always right, but it is rare
+-	      # enough that we require users that really mean to play
+-	      # such unportable linking tricks to link the library
+-	      # using -Wl,-lname, so that libtool does not consider it
+-	      # for duplicate removal.
+-	      case " $specialdeplibs " in
+-	      *" $deplib "*) new_libs="$deplib $new_libs" ;;
+-	      *)
+-		case " $new_libs " in
+-		*" $deplib "*) ;;
+-		*) new_libs="$deplib $new_libs" ;;
+-		esac
+-		;;
+-	      esac
+-	      ;;
+-	    esac
+-	  done
+-	  tmp_libs=
+-	  for deplib in $new_libs; do
+-	    case $deplib in
+-	    -L*)
+-	      case " $tmp_libs " in
+-	      *" $deplib "*) ;;
+-	      *) tmp_libs="$tmp_libs $deplib" ;;
+-	      esac
+-	      ;;
+-	    *) tmp_libs="$tmp_libs $deplib" ;;
+-	    esac
+-	  done
+-	  eval $var=\"$tmp_libs\"
+-	done # for var
+-      fi
+-      # Last step: remove runtime libs from dependency_libs
+-      # (they stay in deplibs)
+-      tmp_libs=
+-      for i in $dependency_libs ; do
+-	case " $predeps $postdeps $compiler_lib_search_path " in
+-	*" $i "*)
+-	  i=""
+-	  ;;
+-	esac
+-	if test -n "$i" ; then
+-	  tmp_libs="$tmp_libs $i"
+-	fi
+-      done
+-      dependency_libs=$tmp_libs
+-    done # for pass
+-    if test "$linkmode" = prog; then
+-      dlfiles="$newdlfiles"
+-    fi
+-    if test "$linkmode" = prog || test "$linkmode" = lib; then
+-      dlprefiles="$newdlprefiles"
+-    fi
+-
+-    case $linkmode in
+-    oldlib)
+-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+-	func_warning "\`-dlopen' is ignored for archives"
+-      fi
+-
+-      case " $deplibs" in
+-      *\ -l* | *\ -L*)
+-	func_warning "\`-l' and \`-L' are ignored for archives" ;;
+-      esac
+-
+-      test -n "$rpath" && \
+-	func_warning "\`-rpath' is ignored for archives"
+-
+-      test -n "$xrpath" && \
+-	func_warning "\`-R' is ignored for archives"
+-
+-      test -n "$vinfo" && \
+-	func_warning "\`-version-info/-version-number' is ignored for archives"
+-
+-      test -n "$release" && \
+-	func_warning "\`-release' is ignored for archives"
+-
+-      test -n "$export_symbols$export_symbols_regex" && \
+-	func_warning "\`-export-symbols' is ignored for archives"
+-
+-      # Now set the variables for building old libraries.
+-      build_libtool_libs=no
+-      oldlibs="$output"
+-      objs="$objs$old_deplibs"
+-      ;;
+-
+-    lib)
+-      # Make sure we only generate libraries of the form `libNAME.la'.
+-      case $outputname in
+-      lib*)
+-	func_stripname 'lib' '.la' "$outputname"
+-	name=$func_stripname_result
+-	eval shared_ext=\"$shrext_cmds\"
+-	eval libname=\"$libname_spec\"
+-	;;
+-      *)
+-	test "$module" = no && \
+-	  func_fatal_help "libtool library \`$output' must begin with \`lib'"
+-
+-	if test "$need_lib_prefix" != no; then
+-	  # Add the "lib" prefix for modules if required
+-	  func_stripname '' '.la' "$outputname"
+-	  name=$func_stripname_result
+-	  eval shared_ext=\"$shrext_cmds\"
+-	  eval libname=\"$libname_spec\"
+-	else
+-	  func_stripname '' '.la' "$outputname"
+-	  libname=$func_stripname_result
+-	fi
+-	;;
+-      esac
+-
+-      if test -n "$objs"; then
+-	if test "$deplibs_check_method" != pass_all; then
+-	  func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"
+-	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"
- 	    ;;
+-	  $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
+-	  $ECHO "*** objects $objs is not portable!"
+-	  libobjs="$libobjs $objs"
+-	fi
+-      fi
+-
+-      test "$dlself" != no && \
+-	func_warning "\`-dlopen self' is ignored for libtool libraries"
+-
+-      set dummy $rpath
+-      shift
+-      test "$#" -gt 1 && \
+-	func_warning "ignoring multiple \`-rpath's for a libtool library"
+-
+-      install_libdir="$1"
+-
+-      oldlibs=
+-      if test -z "$rpath"; then
+-	if test "$build_libtool_libs" = yes; then
+-	  # Building a libtool convenience library.
+-	  # Some compilers have problems with a `.al' extension so
+-	  # convenience libraries should have the same extension an
+-	  # archive normally would.
+-	  oldlibs="$output_objdir/$libname.$libext $oldlibs"
+-	  build_libtool_libs=convenience
+-	  build_old_libs=yes
+-	fi
+-
+-	test -n "$vinfo" && \
+-	  func_warning "\`-version-info/-version-number' is ignored for convenience libraries"
+-
+-	test -n "$release" && \
+-	  func_warning "\`-release' is ignored for convenience libraries"
+-      else
+-
+-	# Parse the version information argument.
+-	save_ifs="$IFS"; IFS=':'
+-	set dummy $vinfo 0 0 0
+-	shift
+-	IFS="$save_ifs"
+-
+-	test -n "$7" && \
+-	  func_fatal_help "too many parameters to \`-version-info'"
+-
+-	# convert absolute version numbers to libtool ages
+-	# this retains compatibility with .la files and attempts
+-	# to make the code below a bit more comprehensible
+-
+-	case $vinfo_number in
+-	yes)
+-	  number_major="$1"
+-	  number_minor="$2"
+-	  number_revision="$3"
+-	  #
+-	  # There are really only two kinds -- those that
+-	  # use the current revision as the major version
+-	  # and those that subtract age and use age as
+-	  # a minor version.  But, then there is irix
+-	  # which has an extra 1 added just for fun
+-	  #
+-	  case $version_type in
+-	  darwin|linux|osf|windows|none)
+-	    func_arith $number_major + $number_minor
+-	    current=$func_arith_result
+-	    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
- 	    ;;
-+	  *)
-+	    func_fatal_configuration "$modename: unknown library version type \`$version_type'"
-+	    ;;
- 	  esac
- 	  ;;
- 	no)
-@@ -6756,14 +6435,14 @@
- 	oldlibs="$oldlibs $output_objdir/$libname.$libext"
- 
- 	# Transform .lo files to .o files.
+-	    current="$number_major"
+-	    revision="$number_minor"
+-	    age="0"
+-	    ;;
+-	  irix|nonstopux)
+-	    func_arith $number_major + $number_minor
+-	    current=$func_arith_result
+-	    age="$number_minor"
+-	    revision="$number_minor"
+-	    lt_irix_increment=no
+-	    ;;
+-	  esac
+-	  ;;
+-	no)
+-	  current="$1"
+-	  revision="$2"
+-	  age="$3"
+-	  ;;
+-	esac
+-
+-	# Check that each of the things are valid numbers.
+-	case $current in
+-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+-	*)
+-	  func_error "CURRENT \`$current' must be a nonnegative integer"
+-	  func_fatal_error "\`$vinfo' is not valid version information"
+-	  ;;
+-	esac
+-
+-	case $revision in
+-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+-	*)
+-	  func_error "REVISION \`$revision' must be a nonnegative integer"
+-	  func_fatal_error "\`$vinfo' is not valid version information"
+-	  ;;
+-	esac
+-
+-	case $age in
+-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+-	*)
+-	  func_error "AGE \`$age' must be a nonnegative integer"
+-	  func_fatal_error "\`$vinfo' is not valid version information"
+-	  ;;
+-	esac
+-
+-	if test "$age" -gt "$current"; then
+-	  func_error "AGE \`$age' is greater than the current interface number \`$current'"
+-	  func_fatal_error "\`$vinfo' is not valid version information"
+-	fi
+-
+-	# Calculate the version variables.
+-	major=
+-	versuffix=
+-	verstring=
+-	case $version_type in
+-	none) ;;
+-
+-	darwin)
+-	  # Like Linux, but with the current version available in
+-	  # verstring for coding it into the library header
+-	  func_arith $current - $age
+-	  major=.$func_arith_result
+-	  versuffix="$major.$age.$revision"
+-	  # Darwin ld doesn't like 0 for these options...
+-	  func_arith $current + 1
+-	  minor_current=$func_arith_result
+-	  xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
+-	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+-	  ;;
+-
+-	freebsd-aout)
+-	  major=".$current"
+-	  versuffix=".$current.$revision";
+-	  ;;
+-
+-	freebsd-elf)
+-	  major=".$current"
+-	  versuffix=".$current"
+-	  ;;
+-
+-	irix | nonstopux)
+-	  if test "X$lt_irix_increment" = "Xno"; then
+-	    func_arith $current - $age
+-	  else
+-	    func_arith $current - $age + 1
+-	  fi
+-	  major=$func_arith_result
+-
+-	  case $version_type in
+-	    nonstopux) verstring_prefix=nonstopux ;;
+-	    *)         verstring_prefix=sgi ;;
+-	  esac
+-	  verstring="$verstring_prefix$major.$revision"
+-
+-	  # Add in all the interfaces that we are compatible with.
+-	  loop=$revision
+-	  while test "$loop" -ne 0; do
+-	    func_arith $revision - $loop
+-	    iface=$func_arith_result
+-	    func_arith $loop - 1
+-	    loop=$func_arith_result
+-	    verstring="$verstring_prefix$major.$iface:$verstring"
+-	  done
+-
+-	  # Before this point, $major must not contain `.'.
+-	  major=.$major
+-	  versuffix="$major.$revision"
+-	  ;;
+-
+-	linux)
+-	  func_arith $current - $age
+-	  major=.$func_arith_result
+-	  versuffix="$major.$age.$revision"
+-	  ;;
+-
+-	osf)
+-	  func_arith $current - $age
+-	  major=.$func_arith_result
+-	  versuffix=".$current.$age.$revision"
+-	  verstring="$current.$age.$revision"
+-
+-	  # Add in all the interfaces that we are compatible with.
+-	  loop=$age
+-	  while test "$loop" -ne 0; do
+-	    func_arith $current - $loop
+-	    iface=$func_arith_result
+-	    func_arith $loop - 1
+-	    loop=$func_arith_result
+-	    verstring="$verstring:${iface}.0"
+-	  done
+-
+-	  # Make executables depend on our current version.
+-	  verstring="$verstring:${current}.0"
+-	  ;;
+-
+-	qnx)
+-	  major=".$current"
+-	  versuffix=".$current"
+-	  ;;
+-
+-	sunos)
+-	  major=".$current"
+-	  versuffix=".$current.$revision"
+-	  ;;
+-
+-	windows)
+-	  # Use '-' rather than '.', since we only want one
+-	  # extension on DOS 8.3 filesystems.
+-	  func_arith $current - $age
+-	  major=$func_arith_result
+-	  versuffix="-$major"
+-	  ;;
+-
+-	*)
+-	  func_fatal_configuration "unknown library version type \`$version_type'"
+-	  ;;
+-	esac
+-
+-	# Clear the version info if we defaulted, and they specified a release.
+-	if test -z "$vinfo" && test -n "$release"; then
+-	  major=
+-	  case $version_type in
+-	  darwin)
+-	    # we can't check for "0.0" in archive_cmds due to quoting
+-	    # problems, so we reset it completely
+-	    verstring=
+-	    ;;
+-	  *)
+-	    verstring="0.0"
+-	    ;;
+-	  esac
+-	  if test "$need_version" = no; then
+-	    versuffix=
+-	  else
+-	    versuffix=".0.0"
+-	  fi
+-	fi
+-
+-	# Remove version info from name if versioning should be avoided
+-	if test "$avoid_version" = yes && test "$need_version" = no; then
+-	  major=
+-	  versuffix=
+-	  verstring=""
+-	fi
+-
+-	# Check to see if the archive will have undefined symbols.
+-	if test "$allow_undefined" = yes; then
+-	  if test "$allow_undefined_flag" = unsupported; then
+-	    func_warning "undefined symbols not allowed in $host shared libraries"
+-	    build_libtool_libs=no
+-	    build_old_libs=yes
+-	  fi
+-	else
+-	  # Don't allow undefined symbols.
+-	  allow_undefined_flag="$no_undefined_flag"
+-	fi
+-
+-      fi
+-
+-      func_generate_dlsyms "$libname" "$libname" "yes"
+-      libobjs="$libobjs $symfileobj"
+-      test "X$libobjs" = "X " && libobjs=
+-
+-      if test "$mode" != relink; then
+-	# Remove our outputs, but don't remove object files since they
+-	# may have been created when compiling PIC objects.
+-	removelist=
+-	tempremovelist=`$ECHO "$output_objdir/*"`
+-	for p in $tempremovelist; do
+-	  case $p in
+-	    *.$objext | *.gcno)
+-	       ;;
+-	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
+-	       if test "X$precious_files_regex" != "X"; then
+-		 if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
+-		 then
+-		   continue
+-		 fi
+-	       fi
+-	       removelist="$removelist $p"
+-	       ;;
+-	    *) ;;
+-	  esac
+-	done
+-	test -n "$removelist" && \
+-	  func_show_eval "${RM}r \$removelist"
+-      fi
+-
+-      # Now set the variables for building old libraries.
+-      if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
+-	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
+-      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
+-      #done
+-
+-      if test -n "$xrpath"; then
+-	# If the user specified any rpath flags, then add them.
+-	temp_xrpath=
+-	for libdir in $xrpath; do
+-	  temp_xrpath="$temp_xrpath -R$libdir"
+-	  case "$finalize_rpath " in
+-	  *" $libdir "*) ;;
+-	  *) finalize_rpath="$finalize_rpath $libdir" ;;
+-	  esac
+-	done
+-	if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
+-	  dependency_libs="$temp_xrpath $dependency_libs"
+-	fi
+-      fi
+-
+-      # Make sure dlfiles contains only unique files that won't be dlpreopened
+-      old_dlfiles="$dlfiles"
+-      dlfiles=
+-      for lib in $old_dlfiles; do
+-	case " $dlprefiles $dlfiles " in
+-	*" $lib "*) ;;
+-	*) dlfiles="$dlfiles $lib" ;;
+-	esac
+-      done
+-
+-      # Make sure dlprefiles contains only unique files
+-      old_dlprefiles="$dlprefiles"
+-      dlprefiles=
+-      for lib in $old_dlprefiles; do
+-	case "$dlprefiles " in
+-	*" $lib "*) ;;
+-	*) dlprefiles="$dlprefiles $lib" ;;
+-	esac
+-      done
+-
+-      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
+-	    # these systems don't actually have a c library (as such)!
+-	    ;;
+-	  *-*-rhapsody* | *-*-darwin1.[012])
+-	    # Rhapsody C library is in the System framework
+-	    deplibs="$deplibs System.ltframework"
+-	    ;;
+-	  *-*-netbsd*)
+-	    # Don't link with libc until the a.out ld.so is fixed.
+-	    ;;
+-	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+-	    # Do not include libc due to us having libc/libc_r.
+-	    ;;
+-	  *-*-sco3.2v5* | *-*-sco5v6*)
+-	    # Causes problems with __ctype
+-	    ;;
+-	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
+-	    # Compiler inserts libc in the correct place for threads to work
+-	    ;;
+-	  *)
+-	    # Add libc to deplibs on all other systems if necessary.
+-	    if test "$build_libtool_need_lc" = "yes"; then
+-	      deplibs="$deplibs -lc"
+-	    fi
+-	    ;;
+-	  esac
+-	fi
+-
+-	# Transform deplibs into only deplibs that can be linked in shared.
+-	name_save=$name
+-	libname_save=$libname
+-	release_save=$release
+-	versuffix_save=$versuffix
+-	major_save=$major
+-	# I'm not sure if I'm treating the release correctly.  I think
+-	# release should show up in the -l (ie -lgmp5) so we don't want to
+-	# add it in twice.  Is that correct?
+-	release=""
+-	versuffix=""
+-	major=""
+-	newdeplibs=
+-	droppeddeps=no
+-	case $deplibs_check_method in
+-	pass_all)
+-	  # Don't check for shared/static.  Everything works.
+-	  # This might be a little naive.  We might want to check
+-	  # whether the library exists or not.  But this is on
+-	  # osf3 & osf4 and I'm not really sure... Just
+-	  # implementing what was already the behavior.
+-	  newdeplibs=$deplibs
+-	  ;;
+-	test_compile)
+-	  # This code stresses the "libraries are programs" paradigm to its
+-	  # limits. Maybe even breaks it.  We compile a program, linking it
+-	  # against the deplibs as a proxy for the library.  Then we can check
+-	  # whether they linked in statically or dynamically with ldd.
+-	  $opt_dry_run || $RM conftest.c
+-	  cat > conftest.c <<EOF
+-	  int main() { return 0; }
+-EOF
+-	  $opt_dry_run || $RM conftest
+-	  if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
+-	    ldd_output=`ldd conftest`
+-	    for i in $deplibs; do
+-	      case $i in
+-	      -l*)
+-		func_stripname -l '' "$i"
+-		name=$func_stripname_result
+-		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+-		  case " $predeps $postdeps " in
+-		  *" $i "*)
+-		    newdeplibs="$newdeplibs $i"
+-		    i=""
+-		    ;;
+-		  esac
+-		fi
+-		if test -n "$i" ; then
+-		  libname=`eval "\\$ECHO \"$libname_spec\""`
+-		  deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
+-		  set dummy $deplib_matches; shift
+-		  deplib_match=$1
+-		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+-		    newdeplibs="$newdeplibs $i"
+-		  else
+-		    droppeddeps=yes
 -		    echo
-+		    $ECHO
- 		    $ECHO "*** Warning: dynamic linker does not accept needed library $i."
+-		    $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
+-		  fi
+-		fi
+-		;;
+-	      *)
+-		newdeplibs="$newdeplibs $i"
+-		;;
+-	      esac
+-	    done
+-	  else
+-	    # Error occurred in the first compile.  Let's try to salvage
+-	    # the situation: Compile a separate program for each library.
+-	    for i in $deplibs; do
+-	      case $i in
+-	      -l*)
+-		func_stripname -l '' "$i"
+-		name=$func_stripname_result
+-		$opt_dry_run || $RM conftest
+-		if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
+-		  ldd_output=`ldd conftest`
+-		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+-		    case " $predeps $postdeps " in
+-		    *" $i "*)
+-		      newdeplibs="$newdeplibs $i"
+-		      i=""
+-		      ;;
+-		    esac
+-		  fi
+-		  if test -n "$i" ; then
+-		    libname=`eval "\\$ECHO \"$libname_spec\""`
+-		    deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
+-		    set dummy $deplib_matches; shift
+-		    deplib_match=$1
+-		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+-		      newdeplibs="$newdeplibs $i"
+-		    else
+-		      droppeddeps=yes
 -		      echo
-+		      $ECHO
- 		      $ECHO "*** Warning: dynamic linker does not accept needed library $i."
+-		      $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
+-		    fi
+-		  fi
+-		else
+-		  droppeddeps=yes
 -		  echo
-+		  $ECHO
- 		  $ECHO "*** Warning!  Library $i is needed by this library but I was not able to"
+-		  $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";;
+-		fi
+-		;;
+-	      *)
+-		newdeplibs="$newdeplibs $i"
+-		;;
+-	      esac
+-	    done
+-	  fi
+-	  ;;
+-	file_magic*)
+-	  set dummy $deplibs_check_method; shift
+-	  file_magic_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
+-	  for a_deplib in $deplibs; do
+-	    case $a_deplib in
+-	    -l*)
+-	      func_stripname -l '' "$a_deplib"
+-	      name=$func_stripname_result
+-	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+-		case " $predeps $postdeps " in
+-		*" $a_deplib "*)
+-		  newdeplibs="$newdeplibs $a_deplib"
+-		  a_deplib=""
+-		  ;;
+-		esac
+-	      fi
+-	      if test -n "$a_deplib" ; then
+-		libname=`eval "\\$ECHO \"$libname_spec\""`
+-		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
+-		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
+-		  for potent_lib in $potential_libs; do
+-		      # Follow soft links.
+-		      if ls -lLd "$potent_lib" 2>/dev/null |
+-			 $GREP " -> " >/dev/null; then
+-			continue
+-		      fi
+-		      # The statement above tries to avoid entering an
+-		      # endless loop below, in case of cyclic links.
+-		      # We might still enter an endless loop, since a link
+-		      # loop can be closed while we follow links,
+-		      # but so what?
+-		      potlib="$potent_lib"
+-		      while test -h "$potlib" 2>/dev/null; do
+-			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
+-			esac
+-		      done
+-		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
+-			 $SED -e 10q |
+-			 $EGREP "$file_magic_regex" > /dev/null; then
+-			newdeplibs="$newdeplibs $a_deplib"
+-			a_deplib=""
+-			break 2
+-		      fi
+-		  done
+-		done
+-	      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 "*** 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 test -z "$potlib" ; then
+-		  $ECHO "*** with $libname but no candidates were found. (...for file magic test)"
+-		else
+-		  $ECHO "*** with $libname and none of the candidates passed a file format test"
+-		  $ECHO "*** using a file magic. Last file checked: $potlib"
+-		fi
+-	      fi
+-	      ;;
+-	    *)
+-	      # Add a -L argument.
+-	      newdeplibs="$newdeplibs $a_deplib"
+-	      ;;
+-	    esac
+-	  done # Gone through all deplibs.
+-	  ;;
+-	match_pattern*)
+-	  set dummy $deplibs_check_method; shift
+-	  match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
+-	  for a_deplib in $deplibs; do
+-	    case $a_deplib in
+-	    -l*)
+-	      func_stripname -l '' "$a_deplib"
+-	      name=$func_stripname_result
+-	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+-		case " $predeps $postdeps " in
+-		*" $a_deplib "*)
+-		  newdeplibs="$newdeplibs $a_deplib"
+-		  a_deplib=""
+-		  ;;
+-		esac
+-	      fi
+-	      if test -n "$a_deplib" ; then
+-		libname=`eval "\\$ECHO \"$libname_spec\""`
+-		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
+-		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
+-		  for potent_lib in $potential_libs; do
+-		    potlib="$potent_lib" # see symlink-check above in file_magic test
 -		    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
+-		       $EGREP "$match_pattern_regex" > /dev/null; then
+-		      newdeplibs="$newdeplibs $a_deplib"
+-		      a_deplib=""
+-		      break 2
+-		    fi
+-		  done
+-		done
+-	      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 "*** 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=""
+-		if test -z "$potlib" ; then
+-		  $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
+-		else
+-		  $ECHO "*** with $libname and none of the candidates passed a file format test"
+-		  $ECHO "*** using a regex pattern. Last file checked: $potlib"
+-		fi
+-	      fi
+-	      ;;
+-	    *)
+-	      # Add a -L argument.
+-	      newdeplibs="$newdeplibs $a_deplib"
+-	      ;;
+-	    esac
+-	  done # Gone through all deplibs.
+-	  ;;
+-	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 '/'
+-	  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
+-	    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
+-	    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
+-	    else
 -	      echo "*** Warning: inter-library dependencies are not known to be supported."
-+	      $ECHO "*** Warning: inter-library dependencies are not known to be supported."
- 	    fi
+-	    fi
 -	    echo "*** All declared inter-library dependencies are being dropped."
-+	    $ECHO "*** All declared inter-library dependencies are being dropped."
- 	    droppeddeps=yes
+-	    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
+-	  ;;
+-	esac
+-	versuffix=$versuffix_save
+-	major=$major_save
+-	release=$release_save
+-	libname=$libname_save
+-	name=$name_save
+-
+-	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
+-	  ;;
+-	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 "*** 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
+-	    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
+-	    fi
+-	    if test "$build_old_libs" = no; then
+-	      oldlibs="$output_objdir/$libname.$libext"
+-	      build_libtool_libs=module
+-	      build_old_libs=yes
+-	    else
+-	      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
+-
+-	    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*)
+-	      if test "$build_old_libs" = no; then
+-		oldlibs="$output_objdir/$libname.$libext"
+-		build_libtool_libs=module
+-		build_old_libs=yes
+-	      else
+-		build_libtool_libs=no
+-	      fi
+-	    fi
+-	  fi
+-	fi
+-	# Done checking deplibs!
+-	deplibs=$newdeplibs
+-      fi
+-      # 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
+-	  ;;
+-      esac
+-
+-      # move library search paths that coincide with paths to not yet
+-      # installed libraries to the beginning of the library search list
+-      new_libs=
+-      for path in $notinst_path; do
+-	case " $new_libs " in
+-	*" -L$path/$objdir "*) ;;
+-	*)
+-	  case " $deplibs " in
+-	  *" -L$path/$objdir "*)
+-	    new_libs="$new_libs -L$path/$objdir" ;;
+-	  esac
+-	  ;;
+-	esac
+-      done
+-      for deplib in $deplibs; do
+-	case $deplib in
+-	-L*)
+-	  case " $new_libs " in
+-	  *" $deplib "*) ;;
+-	  *) new_libs="$new_libs $deplib" ;;
+-	  esac
+-	  ;;
+-	*) new_libs="$new_libs $deplib" ;;
+-	esac
+-      done
+-      deplibs="$new_libs"
+-
+-      # All the library-specific variables (install_libdir is set above).
+-      library_names=
+-      old_library=
+-      dlname=
+-
+-      # Test again, we may have decided not to build it any more
+-      if test "$build_libtool_libs" = yes; then
+-	if test "$hardcode_into_libs" = yes; then
+-	  # Hardcode the library paths
+-	  hardcode_libdirs=
+-	  dep_rpath=
+-	  rpath="$finalize_rpath"
+-	  test "$mode" != relink && rpath="$compile_rpath$rpath"
+-	  for libdir in $rpath; do
+-	    if test -n "$hardcode_libdir_flag_spec"; then
+-	      if test -n "$hardcode_libdir_separator"; then
+-		if test -z "$hardcode_libdirs"; then
+-		  hardcode_libdirs="$libdir"
+-		else
+-		  # Just accumulate the unique libdirs.
+-		  case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+-		  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+-		    ;;
+-		  *)
+-		    hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+-		    ;;
+-		  esac
+-		fi
+-	      else
+-		eval flag=\"$hardcode_libdir_flag_spec\"
+-		dep_rpath="$dep_rpath $flag"
+-	      fi
+-	    elif test -n "$runpath_var"; then
+-	      case "$perm_rpath " in
+-	      *" $libdir "*) ;;
+-	      *) perm_rpath="$perm_rpath $libdir" ;;
+-	      esac
+-	    fi
+-	  done
+-	  # Substitute the hardcoded libdirs into the rpath.
+-	  if test -n "$hardcode_libdir_separator" &&
+-	     test -n "$hardcode_libdirs"; then
+-	    libdir="$hardcode_libdirs"
+-	    if test -n "$hardcode_libdir_flag_spec_ld"; then
+-	      eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
+-	    else
+-	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
+-	    fi
+-	  fi
+-	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
+-	    # We should set the runpath_var.
+-	    rpath=
+-	    for dir in $perm_rpath; do
+-	      rpath="$rpath$dir:"
+-	    done
+-	    eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
+-	  fi
+-	  test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
+-	fi
+-
+-	shlibpath="$finalize_shlibpath"
+-	test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
+-	if test -n "$shlibpath"; then
+-	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
+-	fi
+-
+-	# Get the real and link names of the library.
+-	eval shared_ext=\"$shrext_cmds\"
+-	eval library_names=\"$library_names_spec\"
+-	set dummy $library_names
+-	shift
+-	realname="$1"
+-	shift
+-
+-	if test -n "$soname_spec"; then
+-	  eval soname=\"$soname_spec\"
+-	else
+-	  soname="$realname"
+-	fi
+-	if test -z "$dlname"; then
+-	  dlname=$soname
+-	fi
+-
+-	lib="$output_objdir/$realname"
+-	linknames=
+-	for link
+-	do
+-	  linknames="$linknames $link"
+-	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"
+-	test "X$libobjs" = "X " && libobjs=
+-
+-	delfiles=
+-	if test -n "$export_symbols" && test -n "$include_expsyms"; then
+-	  $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
+-	  export_symbols="$output_objdir/$libname.uexp"
+-	  delfiles="$delfiles $export_symbols"
+-	fi
+-
+-	orig_export_symbols=
+-	case $host_os in
+-	cygwin* | mingw* | cegcc*)
+-	  if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
+-	    # exporting using user supplied symfile
+-	    if test "x`$SED 1q $export_symbols`" != xEXPORTS; then
+-	      # and it's NOT already a .def file. Must figure out
+-	      # which of the given symbols are data symbols and tag
+-	      # them as such. So, trigger use of export_symbols_cmds.
+-	      # export_symbols gets reassigned inside the "prepare
+-	      # the list of exported symbols" if statement, so the
+-	      # include_expsyms logic still works.
+-	      orig_export_symbols="$export_symbols"
+-	      export_symbols=
+-	      always_export_symbols=yes
+-	    fi
+-	  fi
+-	  ;;
+-	esac
+-
+-	# Prepare the list of exported symbols
+-	if test -z "$export_symbols"; then
+-	  if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
+-	    func_verbose "generating symbol list for \`$libname.la'"
+-	    export_symbols="$output_objdir/$libname.exp"
+-	    $opt_dry_run || $RM $export_symbols
+-	    cmds=$export_symbols_cmds
+-	    save_ifs="$IFS"; IFS='~'
+-	    for cmd in $cmds; do
+-	      IFS="$save_ifs"
+-	      eval cmd=\"$cmd\"
+-	      func_len " $cmd"
+-	      len=$func_len_result
+-	      if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+-		func_show_eval "$cmd" 'exit $?'
+-		skipped_export=false
+-	      else
+-		# The command line is too long to execute in one step.
+-		func_verbose "using reloadable object file for export list..."
+-		skipped_export=:
+-		# Break out early, otherwise skipped_export may be
+-		# set to false by a later but shorter cmd.
+-		break
+-	      fi
+-	    done
+-	    IFS="$save_ifs"
+-	    if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then
+-	      func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
+-	      func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
+-	    fi
+-	  fi
+-	fi
+-
+-	if test -n "$export_symbols" && test -n "$include_expsyms"; then
+-	  tmp_export_symbols="$export_symbols"
+-	  test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
 -	  $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
+-	fi
+-
+-	if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
+-	  # The given exports_symbols file has to be filtered, so filter it.
+-	  func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
+-	  # FIXME: $output_objdir/$libname.filter potentially contains lots of
+-	  # 's' commands which not all seds can handle. GNU sed should be fine
+-	  # though. Also, the filter scales superlinearly with the number of
+-	  # global variables. join(1) would be nice here, but unfortunately
+-	  # isn't a blessed tool.
+-	  $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
+-	  delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
+-	  export_symbols=$output_objdir/$libname.def
+-	  $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
+-	fi
+-
+-	tmp_deplibs=
+-	for test_deplib in $deplibs; do
+-	  case " $convenience " in
+-	  *" $test_deplib "*) ;;
+-	  *)
+-	    tmp_deplibs="$tmp_deplibs $test_deplib"
+-	    ;;
+-	  esac
+-	done
+-	deplibs="$tmp_deplibs"
+-
+-	if test -n "$convenience"; then
+-	  if test -n "$whole_archive_flag_spec" &&
+-	    test "$compiler_needs_object" = yes &&
+-	    test -z "$libobjs"; then
+-	    # extract the archives, so we have objects to list.
+-	    # TODO: could optimize this to just extract one archive.
+-	    whole_archive_flag_spec=
+-	  fi
+-	  if test -n "$whole_archive_flag_spec"; then
+-	    save_libobjs=$libobjs
+-	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+-	    test "X$libobjs" = "X " && libobjs=
+-	  else
+-	    gentop="$output_objdir/${outputname}x"
+-	    generated="$generated $gentop"
+-
+-	    func_extract_archives $gentop $convenience
+-	    libobjs="$libobjs $func_extract_archives_result"
+-	    test "X$libobjs" = "X " && libobjs=
+-	  fi
+-	fi
+-
+-	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
+-	  eval flag=\"$thread_safe_flag_spec\"
+-	  linker_flags="$linker_flags $flag"
+-	fi
+-
+-	# Make a backup of the uninstalled library when relinking
+-	if test "$mode" = relink; then
+-	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
+-	fi
+-
+-	# Do each of the archive commands.
+-	if test "$module" = yes && test -n "$module_cmds" ; then
+-	  if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
+-	    eval test_cmds=\"$module_expsym_cmds\"
+-	    cmds=$module_expsym_cmds
+-	  else
+-	    eval test_cmds=\"$module_cmds\"
+-	    cmds=$module_cmds
+-	  fi
+-	else
+-	  if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+-	    eval test_cmds=\"$archive_expsym_cmds\"
+-	    cmds=$archive_expsym_cmds
+-	  else
+-	    eval test_cmds=\"$archive_cmds\"
+-	    cmds=$archive_cmds
+-	  fi
+-	fi
+-
+-	if test "X$skipped_export" != "X:" &&
+-	   func_len " $test_cmds" &&
+-	   len=$func_len_result &&
+-	   test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+-	  :
+-	else
+-	  # The command line is too long to link in one step, link piecewise
+-	  # or, if using GNU ld and skipped_export is not :, use a linker
+-	  # script.
+-
+-	  # Save the value of $output and $libobjs because we want to
+-	  # use them later.  If we have whole_archive_flag_spec, we
+-	  # want to use save_libobjs as it was before
+-	  # whole_archive_flag_spec was expanded, because we can't
+-	  # assume the linker understands whole_archive_flag_spec.
+-	  # This may have to be revisited, in case too many
+-	  # convenience libraries get linked in and end up exceeding
+-	  # the spec.
+-	  if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then
+-	    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"
+-
+-	  # Clear the reloadable object creation command queue and
+-	  # initialize k to one.
+-	  test_cmds=
+-	  concat_cmds=
+-	  objlist=
+-	  last_robj=
+-	  k=1
+-
+-	  if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
+-	    output=${output_objdir}/${output_la}.lnkscript
+-	    func_verbose "creating GNU ld script: $output"
 -	    echo 'INPUT (' > $output
-+	    $ECHO 'INPUT (' > $output
- 	    for obj in $save_libobjs
- 	    do
- 	      $ECHO "$obj" >> $output
- 	    done
+-	    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.
+-	    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
+-	    func_verbose "creating linker input file list: $output"
+-	    : > $output
+-	    set x $save_libobjs
+-	    shift
+-	    firstobj=
+-	    if test "$compiler_needs_object" = yes; then
+-	      firstobj="$1 "
+-	      shift
+-	    fi
+-	    for obj
+-	    do
+-	      $ECHO "$obj" >> $output
+-	    done
+-	    delfiles="$delfiles $output"
+-	    output=$firstobj\"$file_list_spec$output\"
+-	  else
+-	    if test -n "$save_libobjs"; then
+-	      func_verbose "creating reloadable object files..."
+-	      output=$output_objdir/$output_la-${k}.$objext
+-	      eval test_cmds=\"$reload_cmds\"
+-	      func_len " $test_cmds"
+-	      len0=$func_len_result
+-	      len=$len0
+-
+-	      # Loop over the list of objects to be linked.
+-	      for obj in $save_libobjs
+-	      do
+-		func_len " $obj"
+-		func_arith $len + $func_len_result
+-		len=$func_arith_result
+-		if test "X$objlist" = X ||
+-		   test "$len" -lt "$max_cmd_len"; then
+-		  func_append objlist " $obj"
+-		else
+-		  # The command $test_cmds is almost too long, add a
+-		  # command to the queue.
+-		  if test "$k" -eq 1 ; then
+-		    # 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.
+-		  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
+-		  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~
+-		  func_len " $last_robj"
+-		  func_arith $len0 + $func_len_result
+-		  len=$func_arith_result
+-		fi
+-	      done
+-	      # Handle the remaining objects by creating one last
+-	      # 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"
+-	      if test -n "$last_robj"; then
+-	        eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
+-	      fi
+-	      delfiles="$delfiles $output"
+-
+-	    else
+-	      output=
+-	    fi
+-
+-	    if ${skipped_export-false}; then
+-	      func_verbose "generating symbol list for \`$libname.la'"
+-	      export_symbols="$output_objdir/$libname.exp"
+-	      $opt_dry_run || $RM $export_symbols
+-	      libobjs=$output
+-	      # Append the command to create the export file.
+-	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+-	      eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\"
+-	      if test -n "$last_robj"; then
+-		eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
+-	      fi
+-	    fi
+-
+-	    test -n "$save_libobjs" &&
+-	      func_verbose "creating a temporary reloadable object file: $output"
+-
+-	    # Loop through the commands generated above and execute them.
+-	    save_ifs="$IFS"; IFS='~'
+-	    for cmd in $concat_cmds; do
+-	      IFS="$save_ifs"
+-	      $opt_silent || {
+-		  func_quote_for_expand "$cmd"
+-		  eval "func_echo $func_quote_for_expand_result"
+-	      }
+-	      $opt_dry_run || eval "$cmd" || {
+-		lt_exit=$?
+-
+-		# Restore the uninstalled library and exit
+-		if test "$mode" = relink; then
+-		  ( cd "$output_objdir" && \
+-		    $RM "${realname}T" && \
+-		    $MV "${realname}U" "$realname" )
+-		fi
+-
+-		exit $lt_exit
+-	      }
+-	    done
+-	    IFS="$save_ifs"
+-
+-	    if test -n "$export_symbols_regex" && ${skipped_export-false}; then
+-	      func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
+-	      func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
+-	    fi
+-	  fi
+-
+-          if ${skipped_export-false}; then
+-	    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\"
+-	    fi
+-
+-	    if test -n "$orig_export_symbols"; then
+-	      # The given exports_symbols file has to be filtered, so filter it.
+-	      func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
+-	      # FIXME: $output_objdir/$libname.filter potentially contains lots of
+-	      # 's' commands which not all seds can handle. GNU sed should be fine
+-	      # though. Also, the filter scales superlinearly with the number of
+-	      # global variables. join(1) would be nice here, but unfortunately
+-	      # isn't a blessed tool.
+-	      $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
+-	      delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
+-	      export_symbols=$output_objdir/$libname.def
+-	      $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
+-	    fi
+-	  fi
+-
+-	  libobjs=$output
+-	  # Restore the value of output.
+-	  output=$save_output
+-
+-	  if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
+-	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+-	    test "X$libobjs" = "X " && libobjs=
+-	  fi
+-	  # Expand the library linking commands again to reset the
+-	  # value of $libobjs for piecewise linking.
+-
+-	  # Do each of the archive commands.
+-	  if test "$module" = yes && test -n "$module_cmds" ; then
+-	    if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
+-	      cmds=$module_expsym_cmds
+-	    else
+-	      cmds=$module_cmds
+-	    fi
+-	  else
+-	    if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+-	      cmds=$archive_expsym_cmds
+-	    else
+-	      cmds=$archive_cmds
+-	    fi
+-	  fi
+-	fi
+-
+-	if test -n "$delfiles"; then
+-	  # Append the command to remove temporary files to $cmds.
+-	  eval cmds=\"\$cmds~\$RM $delfiles\"
+-	fi
+-
+-	# Add any objects from preloaded convenience libraries
+-	if test -n "$dlprefiles"; then
+-	  gentop="$output_objdir/${outputname}x"
+-	  generated="$generated $gentop"
+-
+-	  func_extract_archives $gentop $dlprefiles
+-	  libobjs="$libobjs $func_extract_archives_result"
+-	  test "X$libobjs" = "X " && libobjs=
+-	fi
+-
+-	save_ifs="$IFS"; IFS='~'
+-	for cmd in $cmds; do
+-	  IFS="$save_ifs"
+-	  eval cmd=\"$cmd\"
+-	  $opt_silent || {
+-	    func_quote_for_expand "$cmd"
+-	    eval "func_echo $func_quote_for_expand_result"
+-	  }
+-	  $opt_dry_run || eval "$cmd" || {
+-	    lt_exit=$?
+-
+-	    # Restore the uninstalled library and exit
+-	    if test "$mode" = relink; then
+-	      ( cd "$output_objdir" && \
+-	        $RM "${realname}T" && \
+-		$MV "${realname}U" "$realname" )
+-	    fi
+-
+-	    exit $lt_exit
+-	  }
+-	done
+-	IFS="$save_ifs"
+-
+-	# Restore the uninstalled library and exit
+-	if test "$mode" = relink; then
+-	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
+-
+-	  if test -n "$convenience"; then
+-	    if test -z "$whole_archive_flag_spec"; then
+-	      func_show_eval '${RM}r "$gentop"'
+-	    fi
+-	  fi
+-
+-	  exit $EXIT_SUCCESS
+-	fi
+-
+-	# Create links to the real library.
+-	for linkname in $linknames; do
+-	  if test "$realname" != "$linkname"; then
+-	    func_show_eval '(cd "$output_objdir" && $RM "$linkname" && $LN_S "$realname" "$linkname")' 'exit $?'
+-	  fi
+-	done
+-
+-	# If -module or -export-dynamic was specified, set the dlname.
+-	if test "$module" = yes || test "$export_dynamic" = yes; then
+-	  # On all known operating systems, these are identical.
+-	  dlname="$soname"
+-	fi
+-      fi
+-      ;;
+-
+-    obj)
+-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+-	func_warning "\`-dlopen' is ignored for objects"
+-      fi
+-
+-      case " $deplibs" in
+-      *\ -l* | *\ -L*)
+-	func_warning "\`-l' and \`-L' are ignored for objects" ;;
+-      esac
+-
+-      test -n "$rpath" && \
+-	func_warning "\`-rpath' is ignored for objects"
+-
+-      test -n "$xrpath" && \
+-	func_warning "\`-R' is ignored for objects"
+-
+-      test -n "$vinfo" && \
+-	func_warning "\`-version-info' is ignored for objects"
+-
+-      test -n "$release" && \
+-	func_warning "\`-release' is ignored for objects"
+-
+-      case $output in
+-      *.lo)
+-	test -n "$objs$old_deplibs" && \
+-	  func_fatal_error "cannot build library object \`$output' from non-libtool objects"
+-
+-	libobj=$output
+-	func_lo2o "$libobj"
+-	obj=$func_lo2o_result
+-	;;
+-      *)
+-	libobj=
+-	obj="$output"
+-	;;
+-      esac
+-
+-      # Delete the old objects.
+-      $opt_dry_run || $RM $obj $libobj
+-
+-      # Objects from convenience libraries.  This assumes
+-      # single-version convenience libraries.  Whenever we create
+-      # different ones for PIC/non-PIC, this we'll have to duplicate
+-      # the extraction.
+-      reload_conv_objs=
+-      gentop=
+-      # reload_cmds runs $LD directly, so let us get rid of
+-      # -Wl from whole_archive_flag_spec and hope we can get by with
+-      # turning comma into space..
+-      wl=
+-
+-      if 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.
+-	else
+-	  gentop="$output_objdir/${obj}x"
+-	  generated="$generated $gentop"
+-
+-	  func_extract_archives $gentop $convenience
+-	  reload_conv_objs="$reload_objs $func_extract_archives_result"
+-	fi
+-      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
+-
+-      output="$obj"
+-      func_execute_cmds "$reload_cmds" 'exit $?'
+-
+-      # Exit if we aren't doing a library object file.
+-      if test -z "$libobj"; then
+-	if test -n "$gentop"; then
+-	  func_show_eval '${RM}r "$gentop"'
+-	fi
+-
+-	exit $EXIT_SUCCESS
+-      fi
+-
+-      if test "$build_libtool_libs" != yes; then
+-	if test -n "$gentop"; then
+-	  func_show_eval '${RM}r "$gentop"'
+-	fi
+-
+-	# Create an invalid libtool object if no PIC, so that we don't
+-	# accidentally link it into a program.
+-	# $show "echo timestamp > $libobj"
+-	# $opt_dry_run || eval "echo timestamp > $libobj" || exit $?
+-	exit $EXIT_SUCCESS
+-      fi
+-
+-      if test -n "$pic_flag" || test "$pic_mode" != default; then
+-	# Only do commands if we really have different PIC objects.
+-	reload_objs="$libobjs $reload_conv_objs"
+-	output="$libobj"
+-	func_execute_cmds "$reload_cmds" 'exit $?'
+-      fi
+-
+-      if test -n "$gentop"; then
+-	func_show_eval '${RM}r "$gentop"'
+-      fi
+-
+-      exit $EXIT_SUCCESS
+-      ;;
+-
+-    prog)
+-      case $host in
+-	*cygwin*) func_stripname '' '.exe' "$output"
+-	          output=$func_stripname_result.exe;;
+-      esac
+-      test -n "$vinfo" && \
+-	func_warning "\`-version-info' is ignored for programs"
+-
+-      test -n "$release" && \
+-	func_warning "\`-release' is ignored for programs"
+-
+-      test "$preload" = yes \
+-        && test "$dlopen_support" = unknown \
+-	&& test "$dlopen_self" = unknown \
+-	&& test "$dlopen_self_static" = unknown && \
+-	  func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support."
+-
+-      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"
+-	;;
+-      esac
+-
+-      case $host in
+-      *-*-darwin*)
+-	# Don't allow lazy linking, it breaks C++ global constructors
+-	# But is supposedly fixed on 10.4 or later (yay!).
+-	if test "$tagname" = CXX ; then
+-	  case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
+-	    10.[0123])
+-	      compile_command="$compile_command ${wl}-bind_at_load"
+-	      finalize_command="$finalize_command ${wl}-bind_at_load"
+-	    ;;
+-	  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.
+-	;;
+-      esac
+-
+-
+-      # move library search paths that coincide with paths to not yet
+-      # installed libraries to the beginning of the library search list
+-      new_libs=
+-      for path in $notinst_path; do
+-	case " $new_libs " in
+-	*" -L$path/$objdir "*) ;;
+-	*)
+-	  case " $compile_deplibs " in
+-	  *" -L$path/$objdir "*)
+-	    new_libs="$new_libs -L$path/$objdir" ;;
+-	  esac
+-	  ;;
+-	esac
+-      done
+-      for deplib in $compile_deplibs; do
+-	case $deplib in
+-	-L*)
+-	  case " $new_libs " in
+-	  *" $deplib "*) ;;
+-	  *) new_libs="$new_libs $deplib" ;;
+-	  esac
+-	  ;;
+-	*) new_libs="$new_libs $deplib" ;;
+-	esac
+-      done
+-      compile_deplibs="$new_libs"
+-
+-
+-      compile_command="$compile_command $compile_deplibs"
+-      finalize_command="$finalize_command $finalize_deplibs"
+-
+-      if test -n "$rpath$xrpath"; then
+-	# If the user specified any rpath flags, then add them.
+-	for libdir in $rpath $xrpath; do
+-	  # This is the magic to use -rpath.
+-	  case "$finalize_rpath " in
+-	  *" $libdir "*) ;;
+-	  *) finalize_rpath="$finalize_rpath $libdir" ;;
+-	  esac
+-	done
+-      fi
+-
+-      # Now hardcode the library paths
+-      rpath=
+-      hardcode_libdirs=
+-      for libdir in $compile_rpath $finalize_rpath; do
+-	if test -n "$hardcode_libdir_flag_spec"; then
+-	  if test -n "$hardcode_libdir_separator"; then
+-	    if test -z "$hardcode_libdirs"; then
+-	      hardcode_libdirs="$libdir"
+-	    else
+-	      # Just accumulate the unique libdirs.
+-	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+-	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+-		;;
+-	      *)
+-		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+-		;;
+-	      esac
+-	    fi
+-	  else
+-	    eval flag=\"$hardcode_libdir_flag_spec\"
+-	    rpath="$rpath $flag"
+-	  fi
+-	elif test -n "$runpath_var"; then
+-	  case "$perm_rpath " in
+-	  *" $libdir "*) ;;
+-	  *) perm_rpath="$perm_rpath $libdir" ;;
+-	  esac
+-	fi
+-	case $host in
+-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
+-	  testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'`
+-	  case :$dllsearchpath: in
+-	  *":$libdir:"*) ;;
+-	  ::) dllsearchpath=$libdir;;
+-	  *) dllsearchpath="$dllsearchpath:$libdir";;
+-	  esac
+-	  case :$dllsearchpath: in
+-	  *":$testbindir:"*) ;;
+-	  ::) dllsearchpath=$testbindir;;
+-	  *) dllsearchpath="$dllsearchpath:$testbindir";;
+-	  esac
+-	  ;;
+-	esac
+-      done
+-      # Substitute the hardcoded libdirs into the rpath.
+-      if test -n "$hardcode_libdir_separator" &&
+-	 test -n "$hardcode_libdirs"; then
+-	libdir="$hardcode_libdirs"
+-	eval rpath=\" $hardcode_libdir_flag_spec\"
+-      fi
+-      compile_rpath="$rpath"
+-
+-      rpath=
+-      hardcode_libdirs=
+-      for libdir in $finalize_rpath; do
+-	if test -n "$hardcode_libdir_flag_spec"; then
+-	  if test -n "$hardcode_libdir_separator"; then
+-	    if test -z "$hardcode_libdirs"; then
+-	      hardcode_libdirs="$libdir"
+-	    else
+-	      # Just accumulate the unique libdirs.
+-	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+-	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+-		;;
+-	      *)
+-		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+-		;;
+-	      esac
+-	    fi
+-	  else
+-	    eval flag=\"$hardcode_libdir_flag_spec\"
+-	    rpath="$rpath $flag"
+-	  fi
+-	elif test -n "$runpath_var"; then
+-	  case "$finalize_perm_rpath " in
+-	  *" $libdir "*) ;;
+-	  *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
+-	  esac
+-	fi
+-      done
+-      # Substitute the hardcoded libdirs into the rpath.
+-      if test -n "$hardcode_libdir_separator" &&
+-	 test -n "$hardcode_libdirs"; then
+-	libdir="$hardcode_libdirs"
+-	eval rpath=\" $hardcode_libdir_flag_spec\"
+-      fi
+-      finalize_rpath="$rpath"
+-
+-      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
+-      fi
+-
+-      func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
+-
+-      # template prelinking step
+-      if test -n "$prelink_cmds"; then
+-	func_execute_cmds "$prelink_cmds" 'exit $?'
+-      fi
+-
+-      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.
+-      *cygwin* | *mingw* )
+-        if test "$build_libtool_libs" != yes; then
+-          wrappers_required=no
+-        fi
+-        ;;
+-      *)
+-        if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
+-          wrappers_required=no
+-        fi
+-        ;;
+-      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="$compile_command$compile_rpath"
+-
+-	# We have no uninstalled library dependencies, so finalize right now.
+-	exit_status=0
+-	func_show_eval "$link_command" 'exit_status=$?'
+-
+-	# Delete the generated files.
+-	if test -f "$output_objdir/${outputname}S.${objext}"; then
+-	  func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
+-	fi
+-
+-	exit $exit_status
+-      fi
+-
+-      if test -n "$compile_shlibpath$finalize_shlibpath"; then
+-	compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
+-      fi
+-      if test -n "$finalize_shlibpath"; then
+-	finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
+-      fi
+-
+-      compile_var=
+-      finalize_var=
+-      if test -n "$runpath_var"; then
+-	if test -n "$perm_rpath"; then
+-	  # We should set the runpath_var.
+-	  rpath=
+-	  for dir in $perm_rpath; do
+-	    rpath="$rpath$dir:"
+-	  done
+-	  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
+-	fi
+-	if test -n "$finalize_perm_rpath"; then
+-	  # We should set the runpath_var.
+-	  rpath=
+-	  for dir in $finalize_perm_rpath; do
+-	    rpath="$rpath$dir:"
+-	  done
+-	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
+-	fi
+-      fi
+-
+-      if test "$no_install" = yes; then
+-	# 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
+-	# Delete the old output file.
+-	$opt_dry_run || $RM $output
+-	# Link the executable and exit
+-	func_show_eval "$link_command" 'exit $?'
+-	exit $EXIT_SUCCESS
+-      fi
+-
+-      if test "$hardcode_action" = relink; then
+-	# Fast installation is not supported
+-	link_command="$compile_var$compile_command$compile_rpath"
+-	relink_command="$finalize_var$finalize_command$finalize_rpath"
+-
+-	func_warning "this platform does not like uninstalled shared libraries"
+-	func_warning "\`$output' will be relinked during installation"
+-      else
+-	if test "$fast_install" != no; then
+-	  link_command="$finalize_var$compile_command$finalize_rpath"
+-	  if test "$fast_install" = yes; then
 -	    relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
-+	    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.
+-	  else
+-	    # fast_install is set to needless
+-	    relink_command=
+-	  fi
+-	else
+-	  link_command="$compile_var$compile_command$compile_rpath"
+-	  relink_command="$finalize_var$finalize_command$finalize_rpath"
+-	fi
+-      fi
+-
+-      # 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)"
+-
+-      # Delete the old output files.
+-      $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
+-
+-      func_show_eval "$link_command" 'exit $?'
+-
+-      # Now create the wrapper script.
+-      func_verbose "creating $output"
+-
+-      # Quote the relink command for shipping.
+-      if test -n "$relink_command"; then
+-	# Preserve any variables that may affect compiler behavior
+-	for var in $variables_saved_for_relink; do
+-	  if eval test -z \"\${$var+set}\"; then
+-	    relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
+-	  elif eval var_value=\$$var; test -z "$var_value"; then
+-	    relink_command="$var=; export $var; $relink_command"
+-	  else
+-	    func_quote_for_eval "$var_value"
+-	    relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
+-	  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
+-      fi
+-
+-      # Only actually do things if not in dry run mode.
+-      $opt_dry_run || {
+-	# win32 will think the script is a binary if it has
+-	# a .exe suffix, so we strip it off here.
+-	case $output in
+-	  *.exe) func_stripname '' '.exe' "$output"
+-	         output=$func_stripname_result ;;
+-	esac
+-	# test for cygwin because mv fails w/o .exe extensions
+-	case $host in
+-	  *cygwin*)
+-	    exeext=.exe
+-	    func_stripname '' '.exe' "$outputname"
+-	    outputname=$func_stripname_result ;;
+-	  *) exeext= ;;
+-	esac
+-	case $host in
+-	  *cygwin* | *mingw* )
+-	    func_dirname_and_basename "$output" "" "."
+-	    output_name=$func_basename_result
+-	    output_path=$func_dirname_result
+-	    cwrappersource="$output_path/$objdir/lt-$output_name.c"
+-	    cwrapper="$output_path/$output_name.exe"
+-	    $RM $cwrappersource $cwrapper
+-	    trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
+-
+-	    func_emit_cwrapperexe_src > $cwrappersource
+-
+-	    # The wrapper executable is built using the $host compiler,
+-	    # because it contains $host paths and files. If cross-
+-	    # compiling, it, like the target executable, must be
+-	    # executed on the $host or under an emulation environment.
+-	    $opt_dry_run || {
+-	      $LTCC $LTCFLAGS -o $cwrapper $cwrappersource
+-	      $STRIP $cwrapper
+-	    }
+-
+-	    # Now, create the wrapper script for func_source use:
+-	    func_ltwrapper_scriptname $cwrapper
+-	    $RM $func_ltwrapper_scriptname_result
+-	    trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15
+-	    $opt_dry_run || {
+-	      # note: this script will not be executed, so do not chmod.
+-	      if test "x$build" = "x$host" ; then
+-		$cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result
+-	      else
+-		func_emit_wrapper no > $func_ltwrapper_scriptname_result
+-	      fi
+-	    }
+-	  ;;
+-	  * )
+-	    $RM $output
+-	    trap "$RM $output; exit $EXIT_FAILURE" 1 2 15
+-
+-	    func_emit_wrapper no > $output
+-	    chmod +x $output
+-	  ;;
+-	esac
+-      }
+-      exit $EXIT_SUCCESS
+-      ;;
+-    esac
+-
+-    # See if we need to build an old-fashioned archive.
+-    for oldlib in $oldlibs; do
+-
+-      if test "$build_libtool_libs" = convenience; then
+-	oldobjs="$libobjs_save $symfileobj"
+-	addlibs="$convenience"
+-	build_libtool_libs=no
+-      else
+-	if test "$build_libtool_libs" = module; then
+-	  oldobjs="$libobjs_save"
+-	  build_libtool_libs=no
+-	else
+-	  oldobjs="$old_deplibs $non_pic_objects"
+-	  if test "$preload" = yes && test -f "$symfileobj"; then
+-	    oldobjs="$oldobjs $symfileobj"
+-	  fi
+-	fi
+-	addlibs="$old_convenience"
+-      fi
+-
+-      if test -n "$addlibs"; then
+-	gentop="$output_objdir/${outputname}x"
+-	generated="$generated $gentop"
+-
+-	func_extract_archives $gentop $addlibs
+-	oldobjs="$oldobjs $func_extract_archives_result"
+-      fi
+-
+-      # Do each command in the archive commands.
+-      if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
+-	cmds=$old_archive_from_new_cmds
+-      else
+-
+-	# Add any objects from preloaded convenience libraries
+-	if test -n "$dlprefiles"; then
+-	  gentop="$output_objdir/${outputname}x"
+-	  generated="$generated $gentop"
+-
+-	  func_extract_archives $gentop $dlprefiles
+-	  oldobjs="$oldobjs $func_extract_archives_result"
+-	fi
+-
+-	# POSIX demands no paths to be encoded in archives.  We have
+-	# to avoid creating archives with duplicate basenames if we
+-	# might have to extract them afterwards, e.g., when creating a
+-	# static archive out of a convenience library, or when linking
+-	# the entirety of a libtool archive into another (currently
+-	# not supported by libtool).
+-	if (for obj in $oldobjs
+-	    do
+-	      func_basename "$obj"
+-	      $ECHO "$func_basename_result"
+-	    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@)"
+-	  gentop="$output_objdir/${outputname}x"
+-	  generated="$generated $gentop"
+-	  func_mkdir_p "$gentop"
+-	  save_oldobjs=$oldobjs
+-	  oldobjs=
+-	  counter=1
+-	  for obj in $save_oldobjs
+-	  do
+-	    func_basename "$obj"
+-	    objbase="$func_basename_result"
+-	    case " $oldobjs " in
+-	    " ") oldobjs=$obj ;;
+-	    *[\ /]"$objbase "*)
+-	      while :; do
+-		# Make sure we don't pick an alternate name that also
+-		# overlaps.
+-		newobj=lt$counter-$objbase
+-		func_arith $counter + 1
+-		counter=$func_arith_result
+-		case " $oldobjs " in
+-		*[\ /]"$newobj "*) ;;
+-		*) if test ! -f "$gentop/$newobj"; then break; fi ;;
+-		esac
+-	      done
+-	      func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
+-	      oldobjs="$oldobjs $gentop/$newobj"
+-	      ;;
+-	    *) oldobjs="$oldobjs $obj" ;;
+-	    esac
+-	  done
+-	fi
+-	eval cmds=\"$old_archive_cmds\"
+-
+-	func_len " $cmds"
+-	len=$func_len_result
+-	if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+-	  cmds=$old_archive_cmds
+-	else
+-	  # the command line is too long to link in one step, link in parts
+-	  func_verbose "using piecewise archive linking..."
+-	  save_RANLIB=$RANLIB
+-	  RANLIB=:
+-	  objlist=
+-	  concat_cmds=
+-	  save_oldobjs=$oldobjs
+-	  oldobjs=
+-	  # Is there a better way of finding the last object in the list?
+-	  for obj in $save_oldobjs
+-	  do
+-	    last_oldobj=$obj
+-	  done
+-	  eval test_cmds=\"$old_archive_cmds\"
+-	  func_len " $test_cmds"
+-	  len0=$func_len_result
+-	  len=$len0
+-	  for obj in $save_oldobjs
+-	  do
+-	    func_len " $obj"
+-	    func_arith $len + $func_len_result
+-	    len=$func_arith_result
+-	    func_append objlist " $obj"
+-	    if test "$len" -lt "$max_cmd_len"; then
+-	      :
+-	    else
+-	      # the above command should be used before it gets too long
+-	      oldobjs=$objlist
+-	      if test "$obj" = "$last_oldobj" ; then
+-		RANLIB=$save_RANLIB
+-	      fi
+-	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+-	      eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
+-	      objlist=
+-	      len=$len0
+-	    fi
+-	  done
+-	  RANLIB=$save_RANLIB
+-	  oldobjs=$objlist
+-	  if test "X$oldobjs" = "X" ; then
+-	    eval cmds=\"\$concat_cmds\"
+-	  else
+-	    eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
+-	  fi
+-	fi
+-      fi
+-      func_execute_cmds "$cmds" 'exit $?'
+-    done
+-
+-    test -n "$generated" && \
+-      func_show_eval "${RM}r$generated"
+-
+-    # Now create the libtool archive.
+-    case $output in
+-    *.la)
+-      old_library=
+-      test "$build_old_libs" = yes && old_library="$libname.$libext"
+-      func_verbose "creating $output"
+-
+-      # Preserve any variables that may affect compiler behavior
+-      for var in $variables_saved_for_relink; do
+-	if eval test -z \"\${$var+set}\"; then
+-	  relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
+-	elif eval var_value=\$$var; test -z "$var_value"; then
+-	  relink_command="$var=; export $var; $relink_command"
+-	else
+-	  func_quote_for_eval "$var_value"
+-	  relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
+-	fi
+-      done
+-      # Quote the link command for shipping.
+-      relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
 -      relink_command=`$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
+-      if test "$hardcode_automatic" = yes ; then
+-	relink_command=
+-      fi
+-
+-      # Only create the output if not a dry run.
+-      $opt_dry_run || {
+-	for installed in no yes; do
+-	  if test "$installed" = yes; then
+-	    if test -z "$install_libdir"; then
+-	      break
+-	    fi
+-	    output="$output_objdir/$outputname"i
+-	    # Replace all uninstalled libtool libraries with the installed ones
+-	    newdependency_libs=
+-	    for deplib in $dependency_libs; do
+-	      case $deplib in
+-	      *.la)
+-		func_basename "$deplib"
+-		name="$func_basename_result"
+-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+-		test -z "$libdir" && \
+-		  func_fatal_error "\`$deplib' is not a valid libtool archive"
+-		newdependency_libs="$newdependency_libs $libdir/$name"
+-		;;
+-	      *) newdependency_libs="$newdependency_libs $deplib" ;;
+-	      esac
+-	    done
+-	    dependency_libs="$newdependency_libs"
+-	    newdlfiles=
+-
+-	    for lib in $dlfiles; do
+-	      case $lib in
+-	      *.la)
+-	        func_basename "$lib"
+-		name="$func_basename_result"
+-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+-		test -z "$libdir" && \
+-		  func_fatal_error "\`$lib' is not a valid libtool archive"
+-		newdlfiles="$newdlfiles $libdir/$name"
+-		;;
+-	      *) newdlfiles="$newdlfiles $lib" ;;
+-	      esac
+-	    done
+-	    dlfiles="$newdlfiles"
+-	    newdlprefiles=
+-	    for lib in $dlprefiles; do
+-	      case $lib in
+-	      *.la)
+-		# Only pass preopened files to the pseudo-archive (for
+-		# eventual linking with the app. that links it) if we
+-		# didn't already link the preopened objects directly into
+-		# the library:
+-		func_basename "$lib"
+-		name="$func_basename_result"
+-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+-		test -z "$libdir" && \
+-		  func_fatal_error "\`$lib' is not a valid libtool archive"
+-		newdlprefiles="$newdlprefiles $libdir/$name"
+-		;;
+-	      esac
+-	    done
+-	    dlprefiles="$newdlprefiles"
+-	  else
+-	    newdlfiles=
+-	    for lib in $dlfiles; do
+-	      case $lib in
+-		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
+-		*) abs=`pwd`"/$lib" ;;
+-	      esac
+-	      newdlfiles="$newdlfiles $abs"
+-	    done
+-	    dlfiles="$newdlfiles"
+-	    newdlprefiles=
+-	    for lib in $dlprefiles; do
+-	      case $lib in
+-		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
+-		*) abs=`pwd`"/$lib" ;;
+-	      esac
+-	      newdlprefiles="$newdlprefiles $abs"
+-	    done
+-	    dlprefiles="$newdlprefiles"
+-	  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,
@@ -17311,8 +21705,8 @@
 -	  # 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
+-	  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 ;
@@ -17324,8043 +21718,312 @@
 -		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+3.0-2.90.6/m4/libtool.m4
-===================================================================
+-	  esac
+-	  $ECHO > $output "\
+-# $outputname - a libtool library file
+-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+-#
+-# Please DO NOT delete this file!
+-# It is necessary for linking the library.
+-
+-# The name that we can dlopen(3).
+-dlname='$tdlname'
+-
+-# Names of this library.
+-library_names='$library_names'
+-
+-# The name of the static archive.
+-old_library='$old_library'
+-
+-# Linker flags that can not go in dependency_libs.
+-inherited_linker_flags='$new_inherited_linker_flags'
+-
+-# Libraries that this one depends upon.
+-dependency_libs='$dependency_libs'
+-
+-# Names of additional weak libraries provided by this library
+-weak_library_names='$weak_libs'
+-
+-# Version information for $libname.
+-current=$current
+-age=$age
+-revision=$revision
+-
+-# Is this an already installed library?
+-installed=$installed
+-
+-# Should we warn about portability when linking against -modules?
+-shouldnotlink=$module
+-
+-# Files to dlopen/dlpreopen
+-dlopen='$dlfiles'
+-dlpreopen='$dlprefiles'
+-
+-# Directory that this library needs to be installed in:
+-libdir='$install_libdir'"
+-	  if test "$installed" = no && test "$need_relink" = yes; then
+-	    $ECHO >> $output "\
+-relink_command=\"$relink_command\""
+-	  fi
+-	done
+-      }
+-
+-      # Do a symbolic link so that the libtool archive can be found in
+-      # LD_LIBRARY_PATH before the program is installed.
+-      func_show_eval '( cd "$output_objdir" && $RM "$outputname" && $LN_S "../$outputname" "$outputname" )' 'exit $?'
+-      ;;
+-    esac
+-    exit $EXIT_SUCCESS
+-}
+-
+-{ test "$mode" = link || test "$mode" = relink; } &&
+-    func_mode_link ${1+"$@"}
+-
+-
+-# func_mode_uninstall arg...
+-func_mode_uninstall ()
+-{
+-    $opt_debug
+-    RM="$nonopt"
+-    files=
+-    rmforce=
+-    exit_status=0
+-
+-    # This variable tells wrapper scripts just to set variables rather
+-    # than running their programs.
+-    libtool_install_magic="$magic"
+-
+-    for arg
+-    do
+-      case $arg in
+-      -f) RM="$RM $arg"; rmforce=yes ;;
+-      -*) RM="$RM $arg" ;;
+-      *) files="$files $arg" ;;
+-      esac
+-    done
+-
+-    test -z "$RM" && \
+-      func_fatal_help "you must specify an RM program"
+-
+-    rmdirs=
+-
+-    origobjdir="$objdir"
+-    for file in $files; do
+-      func_dirname "$file" "" "."
+-      dir="$func_dirname_result"
+-      if test "X$dir" = X.; then
+-	objdir="$origobjdir"
+-      else
+-	objdir="$dir/$origobjdir"
+-      fi
+-      func_basename "$file"
+-      name="$func_basename_result"
+-      test "$mode" = uninstall && objdir="$dir"
+-
+-      # Remember objdir for removal later, being careful to avoid duplicates
+-      if test "$mode" = clean; then
+-	case " $rmdirs " in
+-	  *" $objdir "*) ;;
+-	  *) rmdirs="$rmdirs $objdir" ;;
+-	esac
+-      fi
+-
+-      # Don't error if the file doesn't exist and rm -f was used.
+-      if { test -L "$file"; } >/dev/null 2>&1 ||
+-	 { test -h "$file"; } >/dev/null 2>&1 ||
+-	 test -f "$file"; then
+-	:
+-      elif test -d "$file"; then
+-	exit_status=1
+-	continue
+-      elif test "$rmforce" = yes; then
+-	continue
+-      fi
+-
+-      rmfiles="$file"
+-
+-      case $name in
+-      *.la)
+-	# Possibly a libtool archive, so verify it.
+-	if func_lalib_p "$file"; then
+-	  func_source $dir/$name
+-
+-	  # Delete the libtool libraries and symlinks.
+-	  for n in $library_names; do
+-	    rmfiles="$rmfiles $objdir/$n"
+-	  done
+-	  test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
+-
+-	  case "$mode" in
+-	  clean)
+-	    case "  $library_names " in
+-	    # "  " in the beginning catches empty $dlname
+-	    *" $dlname "*) ;;
+-	    *) rmfiles="$rmfiles $objdir/$dlname" ;;
+-	    esac
+-	    test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
+-	    ;;
+-	  uninstall)
+-	    if test -n "$library_names"; then
+-	      # Do each command in the postuninstall commands.
+-	      func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
+-	    fi
+-
+-	    if test -n "$old_library"; then
+-	      # Do each command in the old_postuninstall commands.
+-	      func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
+-	    fi
+-	    # FIXME: should reinstall the best remaining shared library.
+-	    ;;
+-	  esac
+-	fi
+-	;;
+-
+-      *.lo)
+-	# Possibly a libtool object, so verify it.
+-	if func_lalib_p "$file"; then
+-
+-	  # Read the .lo file
+-	  func_source $dir/$name
+-
+-	  # Add PIC object to the list of files to remove.
+-	  if test -n "$pic_object" &&
+-	     test "$pic_object" != none; then
+-	    rmfiles="$rmfiles $dir/$pic_object"
+-	  fi
+-
+-	  # Add non-PIC object to the list of files to remove.
+-	  if test -n "$non_pic_object" &&
+-	     test "$non_pic_object" != none; then
+-	    rmfiles="$rmfiles $dir/$non_pic_object"
+-	  fi
+-	fi
+-	;;
+-
+-      *)
+-	if test "$mode" = clean ; then
+-	  noexename=$name
+-	  case $file in
+-	  *.exe)
+-	    func_stripname '' '.exe' "$file"
+-	    file=$func_stripname_result
+-	    func_stripname '' '.exe' "$name"
+-	    noexename=$func_stripname_result
+-	    # $file with .exe has already been added to rmfiles,
+-	    # add $file without .exe
+-	    rmfiles="$rmfiles $file"
+-	    ;;
+-	  esac
+-	  # Do a test to see if this is a libtool program.
+-	  if func_ltwrapper_p "$file"; then
+-	    if func_ltwrapper_executable_p "$file"; then
+-	      func_ltwrapper_scriptname "$file"
+-	      relink_command=
+-	      func_source $func_ltwrapper_scriptname_result
+-	      rmfiles="$rmfiles $func_ltwrapper_scriptname_result"
+-	    else
+-	      relink_command=
+-	      func_source $dir/$noexename
+-	    fi
+-
+-	    # note $name still contains .exe if it was in $file originally
+-	    # as does the version of $file that was added into $rmfiles
+-	    rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
+-	    if test "$fast_install" = yes && test -n "$relink_command"; then
+-	      rmfiles="$rmfiles $objdir/lt-$name"
+-	    fi
+-	    if test "X$noexename" != "X$name" ; then
+-	      rmfiles="$rmfiles $objdir/lt-${noexename}.c"
+-	    fi
+-	  fi
+-	fi
+-	;;
+-      esac
+-      func_show_eval "$RM $rmfiles" 'exit_status=1'
+-    done
+-    objdir="$origobjdir"
+-
+-    # Try to remove the ${objdir}s in the directories where we deleted files
+-    for dir in $rmdirs; do
+-      if test -d "$dir"; then
+-	func_show_eval "rmdir $dir >/dev/null 2>&1"
+-      fi
+-    done
+-
+-    exit $exit_status
+-}
+-
+-{ test "$mode" = uninstall || test "$mode" = clean; } &&
+-    func_mode_uninstall ${1+"$@"}
+-
+-test -z "$mode" && {
+-  help="$generic_help"
+-  func_fatal_help "you must specify a MODE"
+-}
+-
+-test -z "$exec_cmd" && \
+-  func_fatal_help "invalid operation mode \`$mode'"
+-
+-if test -n "$exec_cmd"; then
+-  eval exec "$exec_cmd"
+-  exit $EXIT_FAILURE
+-fi
+-
+-exit $exit_status
+-
+-
+-# The TAGs below are defined such that we never get into a situation
+-# in which we disable both kinds of libraries.  Given conflicting
+-# choices, we go for a static library, that is the most portable,
+-# since we can't tell whether shared libraries were disabled because
+-# the user asked for that or because the platform doesn't support
+-# them.  This is particularly important on AIX, because we don't
+-# support having both static and shared libraries enabled at the same
+-# time on that platform, so we default to a shared-only configuration.
+-# If a disable-shared tag is given, we'll fallback to a static-only
+-# configuration.  But we'll never go from static-only to shared-only.
+-
+-# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
+-build_libtool_libs=no
+-build_old_libs=yes
+-# ### END LIBTOOL TAG CONFIG: disable-shared
+-
+-# ### BEGIN LIBTOOL TAG CONFIG: disable-static
+-build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
+-# ### END LIBTOOL TAG CONFIG: disable-static
+-
+-# Local Variables:
+-# mode:shell-script
+-# sh-indentation:2
+-# End:
+-# vi:sw=2
+-
+diff --git a/ltmain.sh b/ltmain.sh
+new file mode 120000
+index 0000000..4159958
 --- /dev/null
-+++ gtk+3.0-2.90.6/m4/libtool.m4
-@@ -0,0 +1,7377 @@
-+# 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.
-+#   Written by Gordon Matzigkeit, 1996
-+#
-+# This file is free software; the Free Software Foundation gives
-+# unlimited permission to copy and/or distribute it, with or without
-+# modifications, as long as this notice is preserved.
-+
-+m4_define([_LT_COPYING], [dnl
-+#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-+#                 2006, 2007, 2008 Free Software Foundation, Inc.
-+#   Written by Gordon Matzigkeit, 1996
-+#
-+#   This file is part of GNU Libtool.
-+#
-+# GNU Libtool is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU General Public License as
-+# published by the Free Software Foundation; either version 2 of
-+# the License, or (at your option) any later version.
-+#
-+# As a special exception to the GNU General Public License,
-+# if you distribute this file as part of a program or library that
-+# is built using GNU Libtool, you may include this file under the
-+# same distribution terms that you use for the rest of that program.
-+#
-+# GNU Libtool is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with GNU Libtool; see the file COPYING.  If not, a copy
-+# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
-+# obtained by writing to the Free Software Foundation, Inc.,
-+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-+])
-+
-+# serial 56 LT_INIT
-+
-+
-+# LT_PREREQ(VERSION)
-+# ------------------
-+# Complain and exit if this libtool version is less that VERSION.
-+m4_defun([LT_PREREQ],
-+[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1,
-+       [m4_default([$3],
-+		   [m4_fatal([Libtool version $1 or higher is required],
-+		             63)])],
-+       [$2])])
-+
-+
-+# _LT_CHECK_BUILDDIR
-+# ------------------
-+# Complain if the absolute build directory name contains unusual characters
-+m4_defun([_LT_CHECK_BUILDDIR],
-+[case `pwd` in
-+  *\ * | *\	*)
-+    AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;;
-+esac
-+])
-+
-+
-+# LT_INIT([OPTIONS])
-+# ------------------
-+AC_DEFUN([LT_INIT],
-+[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
-+AC_BEFORE([$0], [LT_LANG])dnl
-+AC_BEFORE([$0], [LT_OUTPUT])dnl
-+AC_BEFORE([$0], [LTDL_INIT])dnl
-+m4_require([_LT_CHECK_BUILDDIR])dnl
-+
-+dnl Autoconf doesn't catch unexpanded LT_ macros by default:
-+m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl
-+m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl
-+dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4
-+dnl unless we require an AC_DEFUNed macro:
-+AC_REQUIRE([LTOPTIONS_VERSION])dnl
-+AC_REQUIRE([LTSUGAR_VERSION])dnl
-+AC_REQUIRE([LTVERSION_VERSION])dnl
-+AC_REQUIRE([LTOBSOLETE_VERSION])dnl
-+m4_require([_LT_PROG_LTMAIN])dnl
-+
-+dnl Parse OPTIONS
-+_LT_SET_OPTIONS([$0], [$1])
-+
-+# This can be used to rebuild libtool when needed
-+LIBTOOL_DEPS="$ltmain"
-+
-+# Always use our own libtool.
-+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+AC_SUBST(LIBTOOL)dnl
-+
-+_LT_SETUP
-+
-+# Only expand once:
-+m4_define([LT_INIT])
-+])# LT_INIT
-+
-+# Old names:
-+AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT])
-+AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT])
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
-+dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
-+
-+
-+# _LT_CC_BASENAME(CC)
-+# -------------------
-+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
-+m4_defun([_LT_CC_BASENAME],
-+[for cc_temp in $1""; do
-+  case $cc_temp in
-+    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
-+    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
-+    \-*) ;;
-+    *) break;;
-+  esac
-+done
-+cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-+])
-+
-+
-+# _LT_FILEUTILS_DEFAULTS
-+# ----------------------
-+# It is okay to use these file commands and assume they have been set
-+# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'.
-+m4_defun([_LT_FILEUTILS_DEFAULTS],
-+[: ${CP="cp -f"}
-+: ${MV="mv -f"}
-+: ${RM="rm -f"}
-+])# _LT_FILEUTILS_DEFAULTS
-+
-+
-+# _LT_SETUP
-+# ---------
-+m4_defun([_LT_SETUP],
-+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-+_LT_DECL([], [host_alias], [0], [The host system])dnl
-+_LT_DECL([], [host], [0])dnl
-+_LT_DECL([], [host_os], [0])dnl
-+dnl
-+_LT_DECL([], [build_alias], [0], [The build system])dnl
-+_LT_DECL([], [build], [0])dnl
-+_LT_DECL([], [build_os], [0])dnl
-+dnl
-+AC_REQUIRE([AC_PROG_CC])dnl
-+AC_REQUIRE([LT_PATH_LD])dnl
-+AC_REQUIRE([LT_PATH_NM])dnl
-+dnl
-+AC_REQUIRE([AC_PROG_LN_S])dnl
-+test -z "$LN_S" && LN_S="ln -s"
-+_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl
-+dnl
-+AC_REQUIRE([LT_CMD_MAX_LEN])dnl
-+_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl
-+_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
-+dnl
-+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-+m4_require([_LT_CHECK_SHELL_FEATURES])dnl
-+m4_require([_LT_CMD_RELOAD])dnl
-+m4_require([_LT_CHECK_MAGIC_METHOD])dnl
-+m4_require([_LT_CMD_OLD_ARCHIVE])dnl
-+m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
-+
-+_LT_CONFIG_LIBTOOL_INIT([
-+# See if we are running on zsh, and set the options which allow our
-+# commands through without removal of \ escapes INIT.
-+if test -n "\${ZSH_VERSION+set}" ; then
-+   setopt NO_GLOB_SUBST
-+fi
-+])
-+if test -n "${ZSH_VERSION+set}" ; then
-+   setopt NO_GLOB_SUBST
-+fi
-+
-+_LT_CHECK_OBJDIR
-+
-+m4_require([_LT_TAG_COMPILER])dnl
-+_LT_PROG_ECHO_BACKSLASH
-+
-+case $host_os in
-+aix3*)
-+  # AIX sometimes has problems with the GCC collect2 program.  For some
-+  # reason, if we set the COLLECT_NAMES environment variable, the problems
-+  # vanish in a puff of smoke.
-+  if test "X${COLLECT_NAMES+set}" != Xset; then
-+    COLLECT_NAMES=
-+    export COLLECT_NAMES
-+  fi
-+  ;;
-+esac
-+
-+# 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
-+
-+# All known linkers require a `.a' archive for static linking (except MSVC,
-+# which needs '.lib').
-+libext=a
-+
-+with_gnu_ld="$lt_cv_prog_gnu_ld"
-+
-+old_CC="$CC"
-+old_CFLAGS="$CFLAGS"
-+
-+# Set sane defaults for various variables
-+test -z "$CC" && CC=cc
-+test -z "$LTCC" && LTCC=$CC
-+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
-+test -z "$LD" && LD=ld
-+test -z "$ac_objext" && ac_objext=o
-+
-+_LT_CC_BASENAME([$compiler])
-+
-+# Only perform the check for file, if the check method requires it
-+test -z "$MAGIC_CMD" && MAGIC_CMD=file
-+case $deplibs_check_method in
-+file_magic*)
-+  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-+    _LT_PATH_MAGIC
-+  fi
-+  ;;
-+esac
-+
-+# Use C for the default configuration in the libtool script
-+LT_SUPPORTED_TAG([CC])
-+_LT_LANG_C_CONFIG
-+_LT_LANG_DEFAULT_CONFIG
-+_LT_CONFIG_COMMANDS
-+])# _LT_SETUP
-+
-+
-+# _LT_PROG_LTMAIN
-+# ---------------
-+# Note that this code is called both from `configure', and `config.status'
-+# now that we use AC_CONFIG_COMMANDS to generate libtool.  Notably,
-+# `config.status' has no value for ac_aux_dir unless we are using Automake,
-+# so we pass a copy along to make sure it has a sensible value anyway.
-+m4_defun([_LT_PROG_LTMAIN],
-+[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl
-+_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
-+ltmain="$ac_aux_dir/ltmain.sh"
-+])# _LT_PROG_LTMAIN
-+
-+
-+## ------------------------------------- ##
-+## Accumulate code for creating libtool. ##
-+## ------------------------------------- ##
-+
-+# So that we can recreate a full libtool script including additional
-+# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
-+# in macros and then make a single call at the end using the `libtool'
-+# label.
-+
-+
-+# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS])
-+# ----------------------------------------
-+# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later.
-+m4_define([_LT_CONFIG_LIBTOOL_INIT],
-+[m4_ifval([$1],
-+          [m4_append([_LT_OUTPUT_LIBTOOL_INIT],
-+                     [$1
-+])])])
-+
-+# Initialize.
-+m4_define([_LT_OUTPUT_LIBTOOL_INIT])
-+
-+
-+# _LT_CONFIG_LIBTOOL([COMMANDS])
-+# ------------------------------
-+# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later.
-+m4_define([_LT_CONFIG_LIBTOOL],
-+[m4_ifval([$1],
-+          [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS],
-+                     [$1
-+])])])
-+
-+# Initialize.
-+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS])
-+
-+
-+# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS])
-+# -----------------------------------------------------
-+m4_defun([_LT_CONFIG_SAVE_COMMANDS],
-+[_LT_CONFIG_LIBTOOL([$1])
-+_LT_CONFIG_LIBTOOL_INIT([$2])
-+])
-+
-+
-+# _LT_FORMAT_COMMENT([COMMENT])
-+# -----------------------------
-+# Add leading comment marks to the start of each line, and a trailing
-+# full-stop to the whole comment if one is not present already.
-+m4_define([_LT_FORMAT_COMMENT],
-+[m4_ifval([$1], [
-+m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])],
-+              [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.])
-+)])
-+
-+
-+
-+## ------------------------ ##
-+## FIXME: Eliminate VARNAME ##
-+## ------------------------ ##
-+
-+
-+# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?])
-+# -------------------------------------------------------------------
-+# CONFIGNAME is the name given to the value in the libtool script.
-+# VARNAME is the (base) name used in the configure script.
-+# VALUE may be 0, 1 or 2 for a computed quote escaped value based on
-+# VARNAME.  Any other value will be used directly.
-+m4_define([_LT_DECL],
-+[lt_if_append_uniq([lt_decl_varnames], [$2], [, ],
-+    [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name],
-+	[m4_ifval([$1], [$1], [$2])])
-+    lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3])
-+    m4_ifval([$4],
-+	[lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])])
-+    lt_dict_add_subkey([lt_decl_dict], [$2],
-+	[tagged?], [m4_ifval([$5], [yes], [no])])])
-+])
-+
-+
-+# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION])
-+# --------------------------------------------------------
-+m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])])
-+
-+
-+# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...])
-+# ------------------------------------------------
-+m4_define([lt_decl_tag_varnames],
-+[_lt_decl_filter([tagged?], [yes], $@)])
-+
-+
-+# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..])
-+# ---------------------------------------------------------
-+m4_define([_lt_decl_filter],
-+[m4_case([$#],
-+  [0], [m4_fatal([$0: too few arguments: $#])],
-+  [1], [m4_fatal([$0: too few arguments: $#: $1])],
-+  [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)],
-+  [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)],
-+  [lt_dict_filter([lt_decl_dict], $@)])[]dnl
-+])
-+
-+
-+# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...])
-+# --------------------------------------------------
-+m4_define([lt_decl_quote_varnames],
-+[_lt_decl_filter([value], [1], $@)])
-+
-+
-+# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...])
-+# ---------------------------------------------------
-+m4_define([lt_decl_dquote_varnames],
-+[_lt_decl_filter([value], [2], $@)])
-+
-+
-+# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
-+# ---------------------------------------------------
-+m4_define([lt_decl_varnames_tagged],
-+[m4_assert([$# <= 2])dnl
-+_$0(m4_quote(m4_default([$1], [[, ]])),
-+    m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]),
-+    m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))])
-+m4_define([_lt_decl_varnames_tagged],
-+[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])])
-+
-+
-+# lt_decl_all_varnames([SEPARATOR], [VARNAME1...])
-+# ------------------------------------------------
-+m4_define([lt_decl_all_varnames],
-+[_$0(m4_quote(m4_default([$1], [[, ]])),
-+     m4_if([$2], [],
-+	   m4_quote(lt_decl_varnames),
-+	m4_quote(m4_shift($@))))[]dnl
-+])
-+m4_define([_lt_decl_all_varnames],
-+[lt_join($@, lt_decl_varnames_tagged([$1],
-+			lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl
-+])
-+
-+
-+# _LT_CONFIG_STATUS_DECLARE([VARNAME])
-+# ------------------------------------
-+# Quote a variable value, and forward it to `config.status' so that its
-+# declaration there will have the same value as in `configure'.  VARNAME
-+# must have a single quote delimited value for this to work.
-+m4_define([_LT_CONFIG_STATUS_DECLARE],
-+[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`'])
-+
-+
-+# _LT_CONFIG_STATUS_DECLARATIONS
-+# ------------------------------
-+# We delimit libtool config variables with single quotes, so when
-+# we write them to config.status, we have to be sure to quote all
-+# embedded single quotes properly.  In configure, this macro expands
-+# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
-+#
-+#    <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`'
-+m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
-+[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
-+    [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
-+
-+
-+# _LT_LIBTOOL_TAGS
-+# ----------------
-+# Output comment and list of tags supported by the script
-+m4_defun([_LT_LIBTOOL_TAGS],
-+[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
-+available_tags="_LT_TAGS"dnl
-+])
-+
-+
-+# _LT_LIBTOOL_DECLARE(VARNAME, [TAG])
-+# -----------------------------------
-+# Extract the dictionary values for VARNAME (optionally with TAG) and
-+# expand to a commented shell variable setting:
-+#
-+#    # Some comment about what VAR is for.
-+#    visible_name=$lt_internal_name
-+m4_define([_LT_LIBTOOL_DECLARE],
-+[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1],
-+					   [description])))[]dnl
-+m4_pushdef([_libtool_name],
-+    m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl
-+m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])),
-+    [0], [_libtool_name=[$]$1],
-+    [1], [_libtool_name=$lt_[]$1],
-+    [2], [_libtool_name=$lt_[]$1],
-+    [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl
-+m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl
-+])
-+
-+
-+# _LT_LIBTOOL_CONFIG_VARS
-+# -----------------------
-+# Produce commented declarations of non-tagged libtool config variables
-+# suitable for insertion in the LIBTOOL CONFIG section of the `libtool'
-+# script.  Tagged libtool config variables (even for the LIBTOOL CONFIG
-+# section) are produced by _LT_LIBTOOL_TAG_VARS.
-+m4_defun([_LT_LIBTOOL_CONFIG_VARS],
-+[m4_foreach([_lt_var],
-+    m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)),
-+    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])])
-+
-+
-+# _LT_LIBTOOL_TAG_VARS(TAG)
-+# -------------------------
-+m4_define([_LT_LIBTOOL_TAG_VARS],
-+[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames),
-+    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])])
-+
-+
-+# _LT_TAGVAR(VARNAME, [TAGNAME])
-+# ------------------------------
-+m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])
-+
-+
-+# _LT_CONFIG_COMMANDS
-+# -------------------
-+# Send accumulated output to $CONFIG_STATUS.  Thanks to the lists of
-+# variables for single and double quote escaping we saved from calls
-+# to _LT_DECL, we can put quote escaped variables declarations
-+# into `config.status', and then the shell code to quote escape them in
-+# for loops in `config.status'.  Finally, any additional code accumulated
-+# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
-+m4_defun([_LT_CONFIG_COMMANDS],
-+[AC_PROVIDE_IFELSE([LT_OUTPUT],
-+	dnl If the libtool generation code has been placed in $CONFIG_LT,
-+	dnl instead of duplicating it all over again into config.status,
-+	dnl then we will have config.status run $CONFIG_LT later, so it
-+	dnl needs to know what name is stored there:
-+        [AC_CONFIG_COMMANDS([libtool],
-+            [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])],
-+    dnl If the libtool generation code is destined for config.status,
-+    dnl expand the accumulated commands and init code now:
-+    [AC_CONFIG_COMMANDS([libtool],
-+        [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])])
-+])#_LT_CONFIG_COMMANDS
-+
-+
-+# Initialize.
-+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT],
-+[
-+
-+# The HP-UX ksh and POSIX shell print the target directory to stdout
-+# if CDPATH is set.
-+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-+
-+sed_quote_subst='$sed_quote_subst'
-+double_quote_subst='$double_quote_subst'
-+delay_variable_subst='$delay_variable_subst'
-+_LT_CONFIG_STATUS_DECLARATIONS
-+LTCC='$LTCC'
-+LTCFLAGS='$LTCFLAGS'
-+compiler='$compiler_DEFAULT'
-+
-+# Quote evaled strings.
-+for var in lt_decl_all_varnames([[ \
-+]], lt_decl_quote_varnames); do
-+    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
-+    *[[\\\\\\\`\\"\\\$]]*)
-+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
-+      ;;
-+    *)
-+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-+      ;;
-+    esac
-+done
-+
-+# Double-quote double-evaled strings.
-+for var in lt_decl_all_varnames([[ \
-+]], lt_decl_dquote_varnames); do
-+    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
-+    *[[\\\\\\\`\\"\\\$]]*)
-+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
-+      ;;
-+    *)
-+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-+      ;;
-+    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_OUTPUT
-+# ---------
-+# This macro allows early generation of the libtool script (before
-+# AC_OUTPUT is called), incase it is used in configure for compilation
-+# tests.
-+AC_DEFUN([LT_OUTPUT],
-+[: ${CONFIG_LT=./config.lt}
-+AC_MSG_NOTICE([creating $CONFIG_LT])
-+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}
-+_LTEOF
-+
-+cat >>"$CONFIG_LT" <<\_LTEOF
-+AS_SHELL_SANITIZE
-+_AS_PREPARE
-+
-+exec AS_MESSAGE_FD>&1
-+exec AS_MESSAGE_LOG_FD>>config.log
-+{
-+  echo
-+  AS_BOX([Running $as_me.])
-+} >&AS_MESSAGE_LOG_FD
-+
-+lt_cl_help="\
-+\`$as_me' creates a local libtool stub from the current configuration,
-+for use in further configure time tests before the real libtool is
-+generated.
-+
-+Usage: $[0] [[OPTIONS]]
-+
-+  -h, --help      print this help, then exit
-+  -V, --version   print version number, then exit
-+  -q, --quiet     do not print progress messages
-+  -d, --debug     don't remove temporary files
-+
-+Report bugs to <bug-libtool at gnu.org>."
-+
-+lt_cl_version="\
-+m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
-+m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
-+configured by $[0], generated by m4_PACKAGE_STRING.
-+
-+Copyright (C) 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."
-+
-+while test $[#] != 0
-+do
-+  case $[1] in
-+    --version | --v* | -V )
-+      echo "$lt_cl_version"; exit 0 ;;
-+    --help | --h* | -h )
-+      echo "$lt_cl_help"; exit 0 ;;
-+    --debug | --d* | -d )
-+      debug=: ;;
-+    --quiet | --q* | --silent | --s* | -q )
-+      lt_cl_silent=: ;;
-+
-+    -*) AC_MSG_ERROR([unrecognized option: $[1]
-+Try \`$[0] --help' for more information.]) ;;
-+
-+    *) AC_MSG_ERROR([unrecognized argument: $[1]
-+Try \`$[0] --help' for more information.]) ;;
-+  esac
-+  shift
-+done
-+
-+if $lt_cl_silent; then
-+  exec AS_MESSAGE_FD>/dev/null
-+fi
-+_LTEOF
-+
-+cat >>"$CONFIG_LT" <<_LTEOF
-+_LT_OUTPUT_LIBTOOL_COMMANDS_INIT
-+_LTEOF
-+
-+cat >>"$CONFIG_LT" <<\_LTEOF
-+AC_MSG_NOTICE([creating $ofile])
-+_LT_OUTPUT_LIBTOOL_COMMANDS
-+AS_EXIT(0)
-+_LTEOF
-+chmod +x "$CONFIG_LT"
-+
-+# configure is writing to config.log, but config.lt does its own redirection,
-+# appending to config.log, which fails on DOS, as config.log is still kept
-+# open by configure.  Here we exec the FD to /dev/null, effectively closing
-+# config.log, so it can be properly (re)opened and appended to by config.lt.
-+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_OUTPUT
-+
-+
-+# _LT_CONFIG(TAG)
-+# ---------------
-+# If TAG is the built-in tag, create an initial libtool script with a
-+# default configuration from the untagged config vars.  Otherwise add code
-+# to config.status for appending the configuration named by TAG from the
-+# matching tagged config vars.
-+m4_defun([_LT_CONFIG],
-+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-+_LT_CONFIG_SAVE_COMMANDS([
-+  m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl
-+  m4_if(_LT_TAG, [C], [
-+    # See if we are running on zsh, and set the options which allow our
-+    # commands through without removal of \ escapes.
-+    if test -n "${ZSH_VERSION+set}" ; then
-+      setopt NO_GLOB_SUBST
-+    fi
-+
-+    cfgfile="${ofile}T"
-+    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
-+    $RM "$cfgfile"
-+
-+    cat <<_LT_EOF >> "$cfgfile"
-+#! $SHELL
-+
-+# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-+# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
-+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-+#
-+_LT_COPYING
-+_LT_LIBTOOL_TAGS
-+
-+# ### BEGIN LIBTOOL CONFIG
-+_LT_LIBTOOL_CONFIG_VARS
-+_LT_LIBTOOL_TAG_VARS
-+# ### END LIBTOOL CONFIG
-+
-+_LT_EOF
-+
-+  case $host_os in
-+  aix3*)
-+    cat <<\_LT_EOF >> "$cfgfile"
-+# AIX sometimes has problems with the GCC collect2 program.  For some
-+# reason, if we set the COLLECT_NAMES environment variable, the problems
-+# vanish in a puff of smoke.
-+if test "X${COLLECT_NAMES+set}" != Xset; then
-+  COLLECT_NAMES=
-+  export COLLECT_NAMES
-+fi
-+_LT_EOF
-+    ;;
-+  esac
-+
-+  _LT_PROG_LTMAIN
-+
-+  # We use sed instead of cat because bash on DJGPP gets confused if
-+  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
-+  # text mode, it properly converts lines to CR/LF.  This bash problem
-+  # is reportedly fixed, but why not run on old versions too?
-+  sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
-+    || (rm -f "$cfgfile"; exit 1)
-+
-+  _LT_PROG_XSI_SHELLFNS
-+
-+  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
-+    || (rm -f "$cfgfile"; exit 1)
-+
-+  mv -f "$cfgfile" "$ofile" ||
-+    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-+  chmod +x "$ofile"
-+],
-+[cat <<_LT_EOF >> "$ofile"
-+
-+dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded
-+dnl in a comment (ie after a #).
-+# ### BEGIN LIBTOOL TAG CONFIG: $1
-+_LT_LIBTOOL_TAG_VARS(_LT_TAG)
-+# ### END LIBTOOL TAG CONFIG: $1
-+_LT_EOF
-+])dnl /m4_if
-+],
-+[m4_if([$1], [], [
-+    PACKAGE='$PACKAGE'
-+    VERSION='$VERSION'
-+    TIMESTAMP='$TIMESTAMP'
-+    RM='$RM'
-+    ofile='$ofile'], [])
-+])dnl /_LT_CONFIG_SAVE_COMMANDS
-+])# _LT_CONFIG
-+
-+
-+# LT_SUPPORTED_TAG(TAG)
-+# ---------------------
-+# Trace this macro to discover what tags are supported by the libtool
-+# --tag option, using:
-+#    autoconf --trace 'LT_SUPPORTED_TAG:$1'
-+AC_DEFUN([LT_SUPPORTED_TAG], [])
-+
-+
-+# C support is built-in for now
-+m4_define([_LT_LANG_C_enabled], [])
-+m4_define([_LT_TAGS], [])
-+
-+
-+# LT_LANG(LANG)
-+# -------------
-+# Enable libtool support for the given language if not already enabled.
-+AC_DEFUN([LT_LANG],
-+[AC_BEFORE([$0], [LT_OUTPUT])dnl
-+m4_case([$1],
-+  [C],			[_LT_LANG(C)],
-+  [C++],		[_LT_LANG(CXX)],
-+  [Java],		[_LT_LANG(GCJ)],
-+  [Fortran 77],		[_LT_LANG(F77)],
-+  [Fortran],		[_LT_LANG(FC)],
-+  [Windows Resource],	[_LT_LANG(RC)],
-+  [m4_ifdef([_LT_LANG_]$1[_CONFIG],
-+    [_LT_LANG($1)],
-+    [m4_fatal([$0: unsupported language: "$1"])])])dnl
-+])# LT_LANG
-+
-+
-+# _LT_LANG(LANGNAME)
-+# ------------------
-+m4_defun([_LT_LANG],
-+[m4_ifdef([_LT_LANG_]$1[_enabled], [],
-+  [LT_SUPPORTED_TAG([$1])dnl
-+  m4_append([_LT_TAGS], [$1 ])dnl
-+  m4_define([_LT_LANG_]$1[_enabled], [])dnl
-+  _LT_LANG_$1_CONFIG($1)])dnl
-+])# _LT_LANG
-+
-+
-+# _LT_LANG_DEFAULT_CONFIG
-+# -----------------------
-+m4_defun([_LT_LANG_DEFAULT_CONFIG],
-+[AC_PROVIDE_IFELSE([AC_PROG_CXX],
-+  [LT_LANG(CXX)],
-+  [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])])
-+
-+AC_PROVIDE_IFELSE([AC_PROG_F77],
-+  [LT_LANG(F77)],
-+  [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])])
-+
-+AC_PROVIDE_IFELSE([AC_PROG_FC],
-+  [LT_LANG(FC)],
-+  [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])])
-+
-+dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal
-+dnl pulling things in needlessly.
-+AC_PROVIDE_IFELSE([AC_PROG_GCJ],
-+  [LT_LANG(GCJ)],
-+  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
-+    [LT_LANG(GCJ)],
-+    [AC_PROVIDE_IFELSE([LT_PROG_GCJ],
-+      [LT_LANG(GCJ)],
-+      [m4_ifdef([AC_PROG_GCJ],
-+	[m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])])
-+       m4_ifdef([A][M_PROG_GCJ],
-+	[m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])])
-+       m4_ifdef([LT_PROG_GCJ],
-+	[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
-+
-+AC_PROVIDE_IFELSE([LT_PROG_RC],
-+  [LT_LANG(RC)],
-+  [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
-+])# _LT_LANG_DEFAULT_CONFIG
-+
-+# Obsolete macros:
-+AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)])
-+AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
-+AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
-+AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
-+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], [])
-+
-+
-+# _LT_TAG_COMPILER
-+# ----------------
-+m4_defun([_LT_TAG_COMPILER],
-+[AC_REQUIRE([AC_PROG_CC])dnl
-+
-+_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl
-+_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl
-+_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl
-+_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl
-+
-+# If no C compiler was specified, use CC.
-+LTCC=${LTCC-"$CC"}
-+
-+# If no C compiler flags were specified, use CFLAGS.
-+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-+
-+# Allow CC to be a program name with arguments.
-+compiler=$CC
-+])# _LT_TAG_COMPILER
-+
-+
-+# _LT_COMPILER_BOILERPLATE
-+# ------------------------
-+# Check for compiler boilerplate output or warnings with
-+# the simple compiler test code.
-+m4_defun([_LT_COMPILER_BOILERPLATE],
-+[m4_require([_LT_DECL_SED])dnl
-+ac_outfile=conftest.$ac_objext
-+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
-+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-+_lt_compiler_boilerplate=`cat conftest.err`
-+$RM conftest*
-+])# _LT_COMPILER_BOILERPLATE
-+
-+
-+# _LT_LINKER_BOILERPLATE
-+# ----------------------
-+# Check for linker boilerplate output or warnings with
-+# the simple link test code.
-+m4_defun([_LT_LINKER_BOILERPLATE],
-+[m4_require([_LT_DECL_SED])dnl
-+ac_outfile=conftest.$ac_objext
-+echo "$lt_simple_link_test_code" >conftest.$ac_ext
-+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-+_lt_linker_boilerplate=`cat conftest.err`
-+$RM -r conftest*
-+])# _LT_LINKER_BOILERPLATE
-+
-+# _LT_REQUIRED_DARWIN_CHECKS
-+# -------------------------
-+m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
-+  case $host_os in
-+    rhapsody* | darwin*)
-+    AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
-+    AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
-+    AC_CHECK_TOOL([LIPO], [lipo], [:])
-+    AC_CHECK_TOOL([OTOOL], [otool], [:])
-+    AC_CHECK_TOOL([OTOOL64], [otool64], [:])
-+    _LT_DECL([], [DSYMUTIL], [1],
-+      [Tool to manipulate archived DWARF debug symbol files on Mac OS X])
-+    _LT_DECL([], [NMEDIT], [1],
-+      [Tool to change global to local symbols on Mac OS X])
-+    _LT_DECL([], [LIPO], [1],
-+      [Tool to manipulate fat objects and archives on Mac OS X])
-+    _LT_DECL([], [OTOOL], [1],
-+      [ldd/readelf like tool for Mach-O binaries on Mac OS X])
-+    _LT_DECL([], [OTOOL64], [1],
-+      [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4])
-+
-+    AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
-+      [lt_cv_apple_cc_single_mod=no
-+      if test -z "${LT_MULTI_MODULE}"; then
-+	# By default we will add the -single_module flag. You can override
-+	# by either setting the environment variable LT_MULTI_MODULE
-+	# non-empty at configure time, or by adding -multi_module to the
-+	# link flags.
-+	rm -rf libconftest.dylib*
-+	echo "int foo(void){return 1;}" > conftest.c
-+	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-+-dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD
-+	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-+	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
-+        _lt_result=$?
-+	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
-+	  lt_cv_apple_cc_single_mod=yes
-+	else
-+	  cat conftest.err >&AS_MESSAGE_LOG_FD
-+	fi
-+	rm -rf libconftest.dylib*
-+	rm -f conftest.*
-+      fi])
-+    AC_CACHE_CHECK([for -exported_symbols_list linker flag],
-+      [lt_cv_ld_exported_symbols_list],
-+      [lt_cv_ld_exported_symbols_list=no
-+      save_LDFLAGS=$LDFLAGS
-+      echo "_main" > conftest.sym
-+      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
-+      AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
-+	[lt_cv_ld_exported_symbols_list=yes],
-+	[lt_cv_ld_exported_symbols_list=no])
-+	LDFLAGS="$save_LDFLAGS"
-+    ])
-+    case $host_os in
-+    rhapsody* | darwin1.[[012]])
-+      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-+    darwin1.*)
-+      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-+    darwin*) # darwin 5.x on
-+      # if running on 10.5 or later, the deployment target defaults
-+      # to the OS version, if on x86, and 10.4, the deployment
-+      # target defaults to 10.4. Don't you love it?
-+      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
-+	10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
-+	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-+	10.[[012]]*)
-+	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-+	10.*)
-+	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-+      esac
-+    ;;
-+  esac
-+    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
-+      _lt_dar_single_mod='$single_module'
-+    fi
-+    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
-+      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
-+    else
-+      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+    fi
-+    if test "$DSYMUTIL" != ":"; then
-+      _lt_dsymutil='~$DSYMUTIL $lib || :'
-+    else
-+      _lt_dsymutil=
-+    fi
-+    ;;
-+  esac
-+])
-+
-+
-+# _LT_DARWIN_LINKER_FEATURES
-+# --------------------------
-+# Checks for linker and compiler features on darwin
-+m4_defun([_LT_DARWIN_LINKER_FEATURES],
-+[
-+  m4_require([_LT_REQUIRED_DARWIN_CHECKS])
-+  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-+  _LT_TAGVAR(hardcode_direct, $1)=no
-+  _LT_TAGVAR(hardcode_automatic, $1)=yes
-+  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-+  _LT_TAGVAR(whole_archive_flag_spec, $1)=''
-+  _LT_TAGVAR(link_all_deplibs, $1)=yes
-+  _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
-+  case $cc_basename in
-+     ifort*) _lt_dar_can_shared=yes ;;
-+     *) _lt_dar_can_shared=$GCC ;;
-+  esac
-+  if test "$_lt_dar_can_shared" = "yes"; then
-+    output_verbose_link_cmd=echo
-+    _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-+    _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-+    _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-+    _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
-+    m4_if([$1], [CXX],
-+[   if test "$lt_cv_apple_cc_single_mod" != "yes"; then
-+      _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
-+      _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
-+    fi
-+],[])
-+  else
-+  _LT_TAGVAR(ld_shlibs, $1)=no
-+  fi
-+])
-+
-+# _LT_SYS_MODULE_PATH_AIX
-+# -----------------------
-+# Links a minimal program and checks the executable
-+# for the system default hardcoded library path. In most cases,
-+# this is /usr/lib:/lib, but when the MPI compilers are used
-+# the location of the communication and MPI libs are included too.
-+# If we don't find anything, use the default library path according
-+# to the aix ld manual.
-+m4_defun([_LT_SYS_MODULE_PATH_AIX],
-+[m4_require([_LT_DECL_SED])dnl
-+AC_LINK_IFELSE(AC_LANG_PROGRAM,[
-+lt_aix_libpath_sed='
-+    /Import File Strings/,/^$/ {
-+	/^0/ {
-+	    s/^0  *\(.*\)$/\1/
-+	    p
-+	}
-+    }'
-+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-+# Check for a 64-bit object if we didn't find anything.
-+if test -z "$aix_libpath"; then
-+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-+fi],[])
-+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-+])# _LT_SYS_MODULE_PATH_AIX
-+
-+
-+# _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
-+
-+
-+# _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.
-+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','`
-+  ;;
-+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)
-+])
-+_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
-+_LT_DECL([], [ECHO], [1],
-+    [An echo program that does not interpret backslashes])
-+])# _LT_PROG_ECHO_BACKSLASH
-+
-+
-+# _LT_ENABLE_LOCK
-+# ---------------
-+m4_defun([_LT_ENABLE_LOCK],
-+[AC_ARG_ENABLE([libtool-lock],
-+  [AS_HELP_STRING([--disable-libtool-lock],
-+    [avoid locking (might break parallel builds)])])
-+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-+
-+# Some flags need to be propagated to the compiler or linker for good
-+# libtool support.
-+case $host in
-+ia64-*-hpux*)
-+  # Find out which ABI we are using.
-+  echo 'int i;' > conftest.$ac_ext
-+  if AC_TRY_EVAL(ac_compile); then
-+    case `/usr/bin/file conftest.$ac_objext` in
-+      *ELF-32*)
-+	HPUX_IA64_MODE="32"
-+	;;
-+      *ELF-64*)
-+	HPUX_IA64_MODE="64"
-+	;;
-+    esac
-+  fi
-+  rm -rf conftest*
-+  ;;
-+*-*-irix6*)
-+  # Find out which ABI we are using.
-+  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
-+  if AC_TRY_EVAL(ac_compile); then
-+    if test "$lt_cv_prog_gnu_ld" = yes; then
-+      case `/usr/bin/file conftest.$ac_objext` in
-+	*32-bit*)
-+	  LD="${LD-ld} -melf32bsmip"
-+	  ;;
-+	*N32*)
-+	  LD="${LD-ld} -melf32bmipn32"
-+	  ;;
-+	*64-bit*)
-+	  LD="${LD-ld} -melf64bmip"
-+	;;
-+      esac
-+    else
-+      case `/usr/bin/file conftest.$ac_objext` in
-+	*32-bit*)
-+	  LD="${LD-ld} -32"
-+	  ;;
-+	*N32*)
-+	  LD="${LD-ld} -n32"
-+	  ;;
-+	*64-bit*)
-+	  LD="${LD-ld} -64"
-+	  ;;
-+      esac
-+    fi
-+  fi
-+  rm -rf conftest*
-+  ;;
-+
-+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
-+s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
-+  # Find out which ABI we are using.
-+  echo 'int i;' > conftest.$ac_ext
-+  if AC_TRY_EVAL(ac_compile); then
-+    case `/usr/bin/file conftest.o` in
-+      *32-bit*)
-+	case $host in
-+	  x86_64-*kfreebsd*-gnu)
-+	    LD="${LD-ld} -m elf_i386_fbsd"
-+	    ;;
-+	  x86_64-*linux*)
-+	    LD="${LD-ld} -m elf_i386"
-+	    ;;
-+	  ppc64-*linux*|powerpc64-*linux*)
-+	    LD="${LD-ld} -m elf32ppclinux"
-+	    ;;
-+	  s390x-*linux*)
-+	    LD="${LD-ld} -m elf_s390"
-+	    ;;
-+	  sparc64-*linux*)
-+	    LD="${LD-ld} -m elf32_sparc"
-+	    ;;
-+	esac
-+	;;
-+      *64-bit*)
-+	case $host in
-+	  x86_64-*kfreebsd*-gnu)
-+	    LD="${LD-ld} -m elf_x86_64_fbsd"
-+	    ;;
-+	  x86_64-*linux*)
-+	    LD="${LD-ld} -m elf_x86_64"
-+	    ;;
-+	  ppc*-*linux*|powerpc*-*linux*)
-+	    LD="${LD-ld} -m elf64ppc"
-+	    ;;
-+	  s390*-*linux*|s390*-*tpf*)
-+	    LD="${LD-ld} -m elf64_s390"
-+	    ;;
-+	  sparc*-*linux*)
-+	    LD="${LD-ld} -m elf64_sparc"
-+	    ;;
-+	esac
-+	;;
-+    esac
-+  fi
-+  rm -rf conftest*
-+  ;;
-+
-+*-*-sco3.2v5*)
-+  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-+  SAVE_CFLAGS="$CFLAGS"
-+  CFLAGS="$CFLAGS -belf"
-+  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
-+    [AC_LANG_PUSH(C)
-+     AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
-+     AC_LANG_POP])
-+  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-+    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-+    CFLAGS="$SAVE_CFLAGS"
-+  fi
-+  ;;
-+sparc*-*solaris*)
-+  # Find out which ABI we are using.
-+  echo 'int i;' > conftest.$ac_ext
-+  if AC_TRY_EVAL(ac_compile); then
-+    case `/usr/bin/file conftest.o` in
-+    *64-bit*)
-+      case $lt_cv_prog_gnu_ld in
-+      yes*) LD="${LD-ld} -m elf64_sparc" ;;
-+      *)
-+	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
-+	  LD="${LD-ld} -64"
-+	fi
-+	;;
-+      esac
-+      ;;
-+    esac
-+  fi
-+  rm -rf conftest*
-+  ;;
-+esac
-+
-+need_locks="$enable_libtool_lock"
-+])# _LT_ENABLE_LOCK
-+
-+
-+# _LT_CMD_OLD_ARCHIVE
-+# -------------------
-+m4_defun([_LT_CMD_OLD_ARCHIVE],
-+[AC_CHECK_TOOL(AR, ar, false)
-+test -z "$AR" && AR=ar
-+test -z "$AR_FLAGS" && AR_FLAGS=cru
-+_LT_DECL([], [AR], [1], [The archiver])
-+_LT_DECL([], [AR_FLAGS], [1])
-+
-+AC_CHECK_TOOL(STRIP, strip, :)
-+test -z "$STRIP" && STRIP=:
-+_LT_DECL([], [STRIP], [1], [A symbol stripping program])
-+
-+AC_CHECK_TOOL(RANLIB, ranlib, :)
-+test -z "$RANLIB" && RANLIB=:
-+_LT_DECL([], [RANLIB], [1],
-+    [Commands used to install an old-style archive])
-+
-+# Determine commands to create old-style static archives.
-+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
-+old_postinstall_cmds='chmod 644 $oldlib'
-+old_postuninstall_cmds=
-+
-+if test -n "$RANLIB"; then
-+  case $host_os in
-+  openbsd*)
-+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
-+    ;;
-+  *)
-+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
-+    ;;
-+  esac
-+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-+fi
-+_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_CMD_OLD_ARCHIVE
-+
-+
-+# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-+#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
-+# ----------------------------------------------------------------
-+# Check whether the given compiler option works
-+AC_DEFUN([_LT_COMPILER_OPTION],
-+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-+m4_require([_LT_DECL_SED])dnl
-+AC_CACHE_CHECK([$1], [$2],
-+  [$2=no
-+   m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
-+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-+   lt_compiler_flag="$3"
-+   # Insert the option either (1) after the last *FLAGS variable, or
-+   # (2) before a word containing "conftest.", or (3) at the end.
-+   # Note that $ac_compile itself does not contain backslashes and begins
-+   # with a dollar sign (not a hyphen), so the echo should work correctly.
-+   # The option is referenced via a variable to avoid confusing sed.
-+   lt_compile=`echo "$ac_compile" | $SED \
-+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-+   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-+   -e 's:$: $lt_compiler_flag:'`
-+   (eval echo "\"\$as_me:__oline__: $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
-+   if (exit $ac_status) && test -s "$ac_outfile"; then
-+     # The compiler can only warn and ignore the option if not recognized
-+     # So say no if there are warnings other than the usual output.
-+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-+       $2=yes
-+     fi
-+   fi
-+   $RM conftest*
-+])
-+
-+if test x"[$]$2" = xyes; then
-+    m4_if([$5], , :, [$5])
-+else
-+    m4_if([$6], , :, [$6])
-+fi
-+])# _LT_COMPILER_OPTION
-+
-+# Old name:
-+AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION])
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [])
-+
-+
-+# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-+#                  [ACTION-SUCCESS], [ACTION-FAILURE])
-+# ----------------------------------------------------
-+# Check whether the given linker option works
-+AC_DEFUN([_LT_LINKER_OPTION],
-+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-+m4_require([_LT_DECL_SED])dnl
-+AC_CACHE_CHECK([$1], [$2],
-+  [$2=no
-+   save_LDFLAGS="$LDFLAGS"
-+   LDFLAGS="$LDFLAGS $3"
-+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-+     # The linker can only warn and ignore the option if not recognized
-+     # So say no if there are warnings
-+     if test -s conftest.err; then
-+       # Append any errors to the config.log.
-+       cat conftest.err 1>&AS_MESSAGE_LOG_FD
-+       $ECHO "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
-+         $2=yes
-+       fi
-+     else
-+       $2=yes
-+     fi
-+   fi
-+   $RM -r conftest*
-+   LDFLAGS="$save_LDFLAGS"
-+])
-+
-+if test x"[$]$2" = xyes; then
-+    m4_if([$4], , :, [$4])
-+else
-+    m4_if([$5], , :, [$5])
-+fi
-+])# _LT_LINKER_OPTION
-+
-+# Old name:
-+AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION])
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], [])
-+
-+
-+# LT_CMD_MAX_LEN
-+#---------------
-+AC_DEFUN([LT_CMD_MAX_LEN],
-+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+# find the maximum length of command line arguments
-+AC_MSG_CHECKING([the maximum length of command line arguments])
-+AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
-+  i=0
-+  teststring="ABCD"
-+
-+  case $build_os in
-+  msdosdjgpp*)
-+    # On DJGPP, this test can blow up pretty badly due to problems in libc
-+    # (any single argument exceeding 2000 bytes causes a buffer overrun
-+    # during glob expansion).  Even if it were fixed, the result of this
-+    # check would be larger than it should be.
-+    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
-+    ;;
-+
-+  gnu*)
-+    # Under GNU Hurd, this test is not required because there is
-+    # no limit to the length of command line arguments.
-+    # Libtool will interpret -1 as no limit whatsoever
-+    lt_cv_sys_max_cmd_len=-1;
-+    ;;
-+
-+  cygwin* | mingw* | cegcc*)
-+    # On Win9x/ME, this test blows up -- it succeeds, but takes
-+    # about 5 minutes as the teststring grows exponentially.
-+    # Worse, since 9x/ME are not pre-emptively multitasking,
-+    # you end up with a "frozen" computer, even though with patience
-+    # the test eventually succeeds (with a max line length of 256k).
-+    # Instead, let's just punt: use the minimum linelength reported by
-+    # all of the supported platforms: 8192 (on NT/2K/XP).
-+    lt_cv_sys_max_cmd_len=8192;
-+    ;;
-+
-+  amigaos*)
-+    # On AmigaOS with pdksh, this test takes hours, literally.
-+    # So we just punt and use a minimum line length of 8192.
-+    lt_cv_sys_max_cmd_len=8192;
-+    ;;
-+
-+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
-+    # This has been around since 386BSD, at least.  Likely further.
-+    if test -x /sbin/sysctl; then
-+      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-+    elif test -x /usr/sbin/sysctl; then
-+      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
-+    else
-+      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
-+    fi
-+    # And add a safety zone
-+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-+    ;;
-+
-+  interix*)
-+    # We know the value 262144 and hardcode it with a safety zone (like BSD)
-+    lt_cv_sys_max_cmd_len=196608
-+    ;;
-+
-+  osf*)
-+    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
-+    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
-+    # nice to cause kernel panics so lets avoid the loop below.
-+    # First set a reasonable default.
-+    lt_cv_sys_max_cmd_len=16384
-+    #
-+    if test -x /sbin/sysconfig; then
-+      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
-+        *1*) lt_cv_sys_max_cmd_len=-1 ;;
-+      esac
-+    fi
-+    ;;
-+  sco3.2v5*)
-+    lt_cv_sys_max_cmd_len=102400
-+    ;;
-+  sysv5* | sco5v6* | sysv4.2uw2*)
-+    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
-+    if test -n "$kargmax"; then
-+      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[	 ]]//'`
-+    else
-+      lt_cv_sys_max_cmd_len=32768
-+    fi
-+    ;;
-+  *)
-+    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-+    if test -n "$lt_cv_sys_max_cmd_len"; then
-+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-+    else
-+      # Make teststring a little bigger before we do anything with it.
-+      # a 1K string should be a reasonable start.
-+      for i in 1 2 3 4 5 6 7 8 ; do
-+        teststring=$teststring$teststring
-+      done
-+      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-+      # If test is not a shell built-in, we'll probably end up computing a
-+      # maximum length that is only half of the actual maximum length, but
-+      # we can't tell.
-+      while { test "X"`$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`
-+        teststring=$teststring$teststring
-+      done
-+      # Only check the string length outside the loop.
-+      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
-+      teststring=
-+      # Add a significant safety factor because C++ compilers can tack on
-+      # massive amounts of additional arguments before passing them to the
-+      # linker.  It appears as though 1/2 is a usable value.
-+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-+    fi
-+    ;;
-+  esac
-+])
-+if test -n $lt_cv_sys_max_cmd_len ; then
-+  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
-+else
-+  AC_MSG_RESULT(none)
-+fi
-+max_cmd_len=$lt_cv_sys_max_cmd_len
-+_LT_DECL([], [max_cmd_len], [0],
-+    [What is the maximum length of a command?])
-+])# LT_CMD_MAX_LEN
-+
-+# Old name:
-+AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN])
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], [])
-+
-+
-+# _LT_HEADER_DLFCN
-+# ----------------
-+m4_defun([_LT_HEADER_DLFCN],
-+[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl
-+])# _LT_HEADER_DLFCN
-+
-+
-+# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
-+#                      ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
-+# ----------------------------------------------------------------
-+m4_defun([_LT_TRY_DLOPEN_SELF],
-+[m4_require([_LT_HEADER_DLFCN])dnl
-+if test "$cross_compiling" = yes; then :
-+  [$4]
-+else
-+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-+  lt_status=$lt_dlunknown
-+  cat > conftest.$ac_ext <<_LT_EOF
-+[#line __oline__ "configure"
-+#include "confdefs.h"
-+
-+#if HAVE_DLFCN_H
-+#include <dlfcn.h>
-+#endif
-+
-+#include <stdio.h>
-+
-+#ifdef RTLD_GLOBAL
-+#  define LT_DLGLOBAL		RTLD_GLOBAL
-+#else
-+#  ifdef DL_GLOBAL
-+#    define LT_DLGLOBAL		DL_GLOBAL
-+#  else
-+#    define LT_DLGLOBAL		0
-+#  endif
-+#endif
-+
-+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-+   find out it does not work in some platform. */
-+#ifndef LT_DLLAZY_OR_NOW
-+#  ifdef RTLD_LAZY
-+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-+#  else
-+#    ifdef DL_LAZY
-+#      define LT_DLLAZY_OR_NOW		DL_LAZY
-+#    else
-+#      ifdef RTLD_NOW
-+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-+#      else
-+#        ifdef DL_NOW
-+#          define LT_DLLAZY_OR_NOW	DL_NOW
-+#        else
-+#          define LT_DLLAZY_OR_NOW	0
-+#        endif
-+#      endif
-+#    endif
-+#  endif
-+#endif
-+
-+void fnord() { int i=42;}
-+int main ()
-+{
-+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-+  int status = $lt_dlunknown;
-+
-+  if (self)
-+    {
-+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-+      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-+      /* dlclose (self); */
-+    }
-+  else
-+    puts (dlerror ());
-+
-+  return status;
-+}]
-+_LT_EOF
-+  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
-+    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
-+    lt_status=$?
-+    case x$lt_status in
-+      x$lt_dlno_uscore) $1 ;;
-+      x$lt_dlneed_uscore) $2 ;;
-+      x$lt_dlunknown|x*) $3 ;;
-+    esac
-+  else :
-+    # compilation failed
-+    $3
-+  fi
-+fi
-+rm -fr conftest*
-+])# _LT_TRY_DLOPEN_SELF
-+
-+
-+# LT_SYS_DLOPEN_SELF
-+# ------------------
-+AC_DEFUN([LT_SYS_DLOPEN_SELF],
-+[m4_require([_LT_HEADER_DLFCN])dnl
-+if test "x$enable_dlopen" != xyes; then
-+  enable_dlopen=unknown
-+  enable_dlopen_self=unknown
-+  enable_dlopen_self_static=unknown
-+else
-+  lt_cv_dlopen=no
-+  lt_cv_dlopen_libs=
-+
-+  case $host_os in
-+  beos*)
-+    lt_cv_dlopen="load_add_on"
-+    lt_cv_dlopen_libs=
-+    lt_cv_dlopen_self=yes
-+    ;;
-+
-+  mingw* | pw32* | cegcc*)
-+    lt_cv_dlopen="LoadLibrary"
-+    lt_cv_dlopen_libs=
-+    ;;
-+
-+  cygwin*)
-+    lt_cv_dlopen="dlopen"
-+    lt_cv_dlopen_libs=
-+    ;;
-+
-+  darwin*)
-+  # if libdl is installed we need to link against it
-+    AC_CHECK_LIB([dl], [dlopen],
-+		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
-+    lt_cv_dlopen="dyld"
-+    lt_cv_dlopen_libs=
-+    lt_cv_dlopen_self=yes
-+    ])
-+    ;;
-+
-+  *)
-+    AC_CHECK_FUNC([shl_load],
-+	  [lt_cv_dlopen="shl_load"],
-+      [AC_CHECK_LIB([dld], [shl_load],
-+	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
-+	[AC_CHECK_FUNC([dlopen],
-+	      [lt_cv_dlopen="dlopen"],
-+	  [AC_CHECK_LIB([dl], [dlopen],
-+		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
-+	    [AC_CHECK_LIB([svld], [dlopen],
-+		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
-+	      [AC_CHECK_LIB([dld], [dld_link],
-+		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
-+	      ])
-+	    ])
-+	  ])
-+	])
-+      ])
-+    ;;
-+  esac
-+
-+  if test "x$lt_cv_dlopen" != xno; then
-+    enable_dlopen=yes
-+  else
-+    enable_dlopen=no
-+  fi
-+
-+  case $lt_cv_dlopen in
-+  dlopen)
-+    save_CPPFLAGS="$CPPFLAGS"
-+    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-+
-+    save_LDFLAGS="$LDFLAGS"
-+    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-+
-+    save_LIBS="$LIBS"
-+    LIBS="$lt_cv_dlopen_libs $LIBS"
-+
-+    AC_CACHE_CHECK([whether a program can dlopen itself],
-+	  lt_cv_dlopen_self, [dnl
-+	  _LT_TRY_DLOPEN_SELF(
-+	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
-+	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
-+    ])
-+
-+    if test "x$lt_cv_dlopen_self" = xyes; then
-+      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-+      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
-+	  lt_cv_dlopen_self_static, [dnl
-+	  _LT_TRY_DLOPEN_SELF(
-+	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
-+	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
-+      ])
-+    fi
-+
-+    CPPFLAGS="$save_CPPFLAGS"
-+    LDFLAGS="$save_LDFLAGS"
-+    LIBS="$save_LIBS"
-+    ;;
-+  esac
-+
-+  case $lt_cv_dlopen_self in
-+  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-+  *) enable_dlopen_self=unknown ;;
-+  esac
-+
-+  case $lt_cv_dlopen_self_static in
-+  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-+  *) enable_dlopen_self_static=unknown ;;
-+  esac
-+fi
-+_LT_DECL([dlopen_support], [enable_dlopen], [0],
-+	 [Whether dlopen is supported])
-+_LT_DECL([dlopen_self], [enable_dlopen_self], [0],
-+	 [Whether dlopen of programs is supported])
-+_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0],
-+	 [Whether dlopen of statically linked programs is supported])
-+])# LT_SYS_DLOPEN_SELF
-+
-+# Old name:
-+AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF])
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [])
-+
-+
-+# _LT_COMPILER_C_O([TAGNAME])
-+# ---------------------------
-+# Check to see if options -c and -o are simultaneously supported by compiler.
-+# This macro does not hard code the compiler like AC_PROG_CC_C_O.
-+m4_defun([_LT_COMPILER_C_O],
-+[m4_require([_LT_DECL_SED])dnl
-+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-+m4_require([_LT_TAG_COMPILER])dnl
-+AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
-+  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
-+  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
-+   $RM -r conftest 2>/dev/null
-+   mkdir conftest
-+   cd conftest
-+   mkdir out
-+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-+
-+   lt_compiler_flag="-o out/conftest2.$ac_objext"
-+   # Insert the option either (1) after the last *FLAGS variable, or
-+   # (2) before a word containing "conftest.", or (3) at the end.
-+   # Note that $ac_compile itself does not contain backslashes and begins
-+   # with a dollar sign (not a hyphen), so the echo should work correctly.
-+   lt_compile=`echo "$ac_compile" | $SED \
-+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-+   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-+   -e 's:$: $lt_compiler_flag:'`
-+   (eval echo "\"\$as_me:__oline__: $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
-+   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
-+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-+       _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-+     fi
-+   fi
-+   chmod u+w . 2>&AS_MESSAGE_LOG_FD
-+   $RM conftest*
-+   # SGI C++ compiler will create directory out/ii_files/ for
-+   # template instantiation
-+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
-+   $RM out/* && rmdir out
-+   cd ..
-+   $RM -r conftest
-+   $RM conftest*
-+])
-+_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1],
-+	[Does compiler simultaneously support -c and -o options?])
-+])# _LT_COMPILER_C_O
-+
-+
-+# _LT_COMPILER_FILE_LOCKS([TAGNAME])
-+# ----------------------------------
-+# Check to see if we can do hard links to lock some files if needed
-+m4_defun([_LT_COMPILER_FILE_LOCKS],
-+[m4_require([_LT_ENABLE_LOCK])dnl
-+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-+_LT_COMPILER_C_O([$1])
-+
-+hard_links="nottested"
-+if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
-+  # do not overwrite the value of need_locks provided by the user
-+  AC_MSG_CHECKING([if we can lock with hard links])
-+  hard_links=yes
-+  $RM conftest*
-+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-+  touch conftest.a
-+  ln conftest.a conftest.b 2>&5 || hard_links=no
-+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-+  AC_MSG_RESULT([$hard_links])
-+  if test "$hard_links" = no; then
-+    AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
-+    need_locks=warn
-+  fi
-+else
-+  need_locks=no
-+fi
-+_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?])
-+])# _LT_COMPILER_FILE_LOCKS
-+
-+
-+# _LT_CHECK_OBJDIR
-+# ----------------
-+m4_defun([_LT_CHECK_OBJDIR],
-+[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
-+[rm -f .libs 2>/dev/null
-+mkdir .libs 2>/dev/null
-+if test -d .libs; then
-+  lt_cv_objdir=.libs
-+else
-+  # MS-DOS does not allow filenames that begin with a dot.
-+  lt_cv_objdir=_libs
-+fi
-+rmdir .libs 2>/dev/null])
-+objdir=$lt_cv_objdir
-+_LT_DECL([], [objdir], [0],
-+         [The name of the directory that contains temporary libtool files])dnl
-+m4_pattern_allow([LT_OBJDIR])dnl
-+AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/",
-+  [Define to the sub-directory in which libtool stores uninstalled libraries.])
-+])# _LT_CHECK_OBJDIR
-+
-+
-+# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME])
-+# --------------------------------------
-+# Check hardcoding attributes.
-+m4_defun([_LT_LINKER_HARDCODE_LIBPATH],
-+[AC_MSG_CHECKING([how to hardcode library paths into programs])
-+_LT_TAGVAR(hardcode_action, $1)=
-+if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" ||
-+   test -n "$_LT_TAGVAR(runpath_var, $1)" ||
-+   test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
-+
-+  # We can hardcode non-existent directories.
-+  if test "$_LT_TAGVAR(hardcode_direct, $1)" != no &&
-+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-+     # have to relink, otherwise we might link with an installed library
-+     # when we should be linking with a yet-to-be-installed one
-+     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
-+     test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then
-+    # Linking always hardcodes the temporary library directory.
-+    _LT_TAGVAR(hardcode_action, $1)=relink
-+  else
-+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-+    _LT_TAGVAR(hardcode_action, $1)=immediate
-+  fi
-+else
-+  # We cannot hardcode anything, or else we can only hardcode existing
-+  # directories.
-+  _LT_TAGVAR(hardcode_action, $1)=unsupported
-+fi
-+AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)])
-+
-+if test "$_LT_TAGVAR(hardcode_action, $1)" = relink ||
-+   test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then
-+  # Fast installation is not supported
-+  enable_fast_install=no
-+elif test "$shlibpath_overrides_runpath" = yes ||
-+     test "$enable_shared" = no; then
-+  # Fast installation is not necessary
-+  enable_fast_install=needless
-+fi
-+_LT_TAGDECL([], [hardcode_action], [0],
-+    [How to hardcode a shared library path into an executable])
-+])# _LT_LINKER_HARDCODE_LIBPATH
-+
-+
-+# _LT_CMD_STRIPLIB
-+# ----------------
-+m4_defun([_LT_CMD_STRIPLIB],
-+[m4_require([_LT_DECL_EGREP])
-+striplib=
-+old_striplib=
-+AC_MSG_CHECKING([whether stripping libraries is possible])
-+if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
-+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-+  AC_MSG_RESULT([yes])
-+else
-+# FIXME - insert some real tests, host_os isn't really good enough
-+  case $host_os in
-+  darwin*)
-+    if test -n "$STRIP" ; then
-+      striplib="$STRIP -x"
-+      old_striplib="$STRIP -S"
-+      AC_MSG_RESULT([yes])
-+    else
-+      AC_MSG_RESULT([no])
-+    fi
-+    ;;
-+  *)
-+    AC_MSG_RESULT([no])
-+    ;;
-+  esac
-+fi
-+_LT_DECL([], [old_striplib], [1], [Commands to strip libraries])
-+_LT_DECL([], [striplib], [1])
-+])# _LT_CMD_STRIPLIB
-+
-+
-+# _LT_SYS_DYNAMIC_LINKER([TAG])
-+# -----------------------------
-+# PORTME Fill in your ld.so characteristics
-+m4_defun([_LT_SYS_DYNAMIC_LINKER],
-+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+m4_require([_LT_DECL_EGREP])dnl
-+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-+m4_require([_LT_DECL_OBJDUMP])dnl
-+m4_require([_LT_DECL_SED])dnl
-+AC_MSG_CHECKING([dynamic linker characteristics])
-+m4_if([$1],
-+	[], [
-+if test "$GCC" = yes; then
-+  case $host_os in
-+    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
-+    *) lt_awk_arg="/^libraries:/" ;;
-+  esac
-+  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 -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=
-+  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
-+  for lt_sys_path in $lt_search_path_spec; do
-+    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
-+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
-+    else
-+      test -d "$lt_sys_path" && \
-+	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
-+    fi
-+  done
-+  lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
-+BEGIN {RS=" "; FS="/|\n";} {
-+  lt_foo="";
-+  lt_count=0;
-+  for (lt_i = NF; lt_i > 0; lt_i--) {
-+    if ($lt_i != "" && $lt_i != ".") {
-+      if ($lt_i == "..") {
-+        lt_count++;
-+      } else {
-+        if (lt_count == 0) {
-+          lt_foo="/" $lt_i lt_foo;
-+        } else {
-+          lt_count--;
-+        }
-+      }
-+    }
-+  }
-+  if (lt_foo != "") { lt_freq[[lt_foo]]++; }
-+  if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
-+}'`
-+  sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
-+else
-+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-+fi])
-+library_names_spec=
-+libname_spec='lib$name'
-+soname_spec=
-+shrext_cmds=".so"
-+postinstall_cmds=
-+postuninstall_cmds=
-+finish_cmds=
-+finish_eval=
-+shlibpath_var=
-+shlibpath_overrides_runpath=unknown
-+version_type=none
-+dynamic_linker="$host_os ld.so"
-+sys_lib_dlsearch_path_spec="/lib /usr/lib"
-+need_lib_prefix=unknown
-+hardcode_into_libs=no
-+
-+# when you set need_version to no, make sure it does not cause -set_version
-+# flags to be left without arguments
-+need_version=unknown
-+
-+case $host_os in
-+aix3*)
-+  version_type=linux
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-+  shlibpath_var=LIBPATH
-+
-+  # AIX 3 has no versioning support, so we append a major version to the name.
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  ;;
-+
-+aix[[4-9]]*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  hardcode_into_libs=yes
-+  if test "$host_cpu" = ia64; then
-+    # AIX 5 supports IA64
-+    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-+    shlibpath_var=LD_LIBRARY_PATH
-+  else
-+    # With GCC up to 2.95.x, collect2 would create an import file
-+    # for dependence libraries.  The import file would start with
-+    # the line `#! .'.  This would cause the generated library to
-+    # depend on `.', always an invalid library.  This was fixed in
-+    # development snapshots of GCC prior to 3.0.
-+    case $host_os in
-+      aix4 | aix4.[[01]] | aix4.[[01]].*)
-+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-+	   echo ' yes '
-+	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
-+	:
-+      else
-+	can_build_shared=no
-+      fi
-+      ;;
-+    esac
-+    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-+    # soname into executable. Probably we can add versioning support to
-+    # collect2, so additional links can be useful in future.
-+    if test "$aix_use_runtimelinking" = yes; then
-+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-+      # instead of lib<name>.a to let people know that these are not
-+      # typical AIX shared libraries.
-+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+    else
-+      # We preserve .a as extension for shared libraries through AIX4.2
-+      # and later when we are not doing run time linking.
-+      library_names_spec='${libname}${release}.a $libname.a'
-+      soname_spec='${libname}${release}${shared_ext}$major'
-+    fi
-+    shlibpath_var=LIBPATH
-+  fi
-+  ;;
-+
-+amigaos*)
-+  case $host_cpu in
-+  powerpc)
-+    # Since July 2007 AmigaOS4 officially supports .so libraries.
-+    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+    ;;
-+  m68k)
-+    library_names_spec='$libname.ixlibrary $libname.a'
-+    # Create ${libname}_ixlibrary.a entries in /sys/libs.
-+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$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
-+  ;;
-+
-+beos*)
-+  library_names_spec='${libname}${shared_ext}'
-+  dynamic_linker="$host_os ld.so"
-+  shlibpath_var=LIBRARY_PATH
-+  ;;
-+
-+bsdi[[45]]*)
-+  version_type=linux
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-+  # the default ld.so.conf also contains /usr/contrib/lib and
-+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-+  # libtool to hard-code these into programs
-+  ;;
-+
-+cygwin* | mingw* | pw32* | cegcc*)
-+  version_type=windows
-+  shrext_cmds=".dll"
-+  need_version=no
-+  need_lib_prefix=no
-+
-+  case $GCC,$host_os in
-+  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
-+    library_names_spec='$libname.dll.a'
-+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-+    postinstall_cmds='base_file=`basename \${file}`~
-+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
-+      dldir=$destdir/`dirname \$dlpath`~
-+      test -d \$dldir || mkdir -p \$dldir~
-+      $install_prog $dir/$dlname \$dldir/$dlname~
-+      chmod a+x \$dldir/$dlname~
-+      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
-+        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
-+      fi'
-+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-+      dlpath=$dir/\$dldll~
-+       $RM \$dlpath'
-+    shlibpath_overrides_runpath=yes
-+
-+    case $host_os in
-+    cygwin*)
-+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-+      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-+      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'
-+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-+      ;;
-+    esac
-+    ;;
-+
-+  *)
-+    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
-+    ;;
-+  esac
-+  dynamic_linker='Win32 ld.exe'
-+  # FIXME: first we should search . and the directory the executable is in
-+  shlibpath_var=PATH
-+  ;;
-+
-+darwin* | rhapsody*)
-+  dynamic_linker="$host_os dyld"
-+  version_type=darwin
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-+  soname_spec='${libname}${release}${major}$shared_ext'
-+  shlibpath_overrides_runpath=yes
-+  shlibpath_var=DYLD_LIBRARY_PATH
-+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-+m4_if([$1], [],[
-+  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
-+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-+  ;;
-+
-+dgux*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  ;;
-+
-+freebsd1*)
-+  dynamic_linker=no
-+  ;;
-+
-+freebsd* | dragonfly*)
-+  # DragonFly does not have aout.  When/if they implement a new
-+  # versioning mechanism, adjust this.
-+  if test -x /usr/bin/objformat; then
-+    objformat=`/usr/bin/objformat`
-+  else
-+    case $host_os in
-+    freebsd[[123]]*) objformat=aout ;;
-+    *) objformat=elf ;;
-+    esac
-+  fi
-+  version_type=freebsd-$objformat
-+  case $version_type in
-+    freebsd-elf*)
-+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+      need_version=no
-+      need_lib_prefix=no
-+      ;;
-+    freebsd-*)
-+      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-+      need_version=yes
-+      ;;
-+  esac
-+  shlibpath_var=LD_LIBRARY_PATH
-+  case $host_os in
-+  freebsd2*)
-+    shlibpath_overrides_runpath=yes
-+    ;;
-+  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
-+    shlibpath_overrides_runpath=yes
-+    hardcode_into_libs=yes
-+    ;;
-+  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
-+  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
-+    shlibpath_overrides_runpath=no
-+    hardcode_into_libs=yes
-+    ;;
-+  *) # from 4.6 on, and DragonFly
-+    shlibpath_overrides_runpath=yes
-+    hardcode_into_libs=yes
-+    ;;
-+  esac
-+  ;;
-+
-+gnu*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  hardcode_into_libs=yes
-+  ;;
-+
-+hpux9* | hpux10* | hpux11*)
-+  # Give a soname corresponding to the major version so that dld.sl refuses to
-+  # link against other versions.
-+  version_type=sunos
-+  need_lib_prefix=no
-+  need_version=no
-+  case $host_cpu in
-+  ia64*)
-+    shrext_cmds='.so'
-+    hardcode_into_libs=yes
-+    dynamic_linker="$host_os dld.so"
-+    shlibpath_var=LD_LIBRARY_PATH
-+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+    soname_spec='${libname}${release}${shared_ext}$major'
-+    if test "X$HPUX_IA64_MODE" = X32; then
-+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-+    else
-+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-+    fi
-+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-+    ;;
-+  hppa*64*)
-+    shrext_cmds='.sl'
-+    hardcode_into_libs=yes
-+    dynamic_linker="$host_os dld.sl"
-+    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+    soname_spec='${libname}${release}${shared_ext}$major'
-+    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-+    ;;
-+  *)
-+    shrext_cmds='.sl'
-+    dynamic_linker="$host_os dld.sl"
-+    shlibpath_var=SHLIB_PATH
-+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+    soname_spec='${libname}${release}${shared_ext}$major'
-+    ;;
-+  esac
-+  # HP-UX runs *really* slowly unless shared libraries are mode 555.
-+  postinstall_cmds='chmod 555 $lib'
-+  ;;
-+
-+interix[[3-9]]*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  ;;
-+
-+irix5* | irix6* | nonstopux*)
-+  case $host_os in
-+    nonstopux*) version_type=nonstopux ;;
-+    *)
-+	if test "$lt_cv_prog_gnu_ld" = yes; then
-+		version_type=linux
-+	else
-+		version_type=irix
-+	fi ;;
-+  esac
-+  need_lib_prefix=no
-+  need_version=no
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-+  case $host_os in
-+  irix5* | nonstopux*)
-+    libsuff= shlibsuff=
-+    ;;
-+  *)
-+    case $LD in # libtool.m4 will add one of these switches to LD
-+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-+      libsuff= shlibsuff= libmagic=32-bit;;
-+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-+      libsuff=32 shlibsuff=N32 libmagic=N32;;
-+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-+    *) libsuff= shlibsuff= libmagic=never-match;;
-+    esac
-+    ;;
-+  esac
-+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-+  shlibpath_overrides_runpath=no
-+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-+  hardcode_into_libs=yes
-+  ;;
-+
-+# No shared lib support for Linux oldld, aout, or coff.
-+linux*oldld* | linux*aout* | linux*coff*)
-+  dynamic_linker=no
-+  ;;
-+
-+# This must be Linux ELF.
-+linux* | k*bsd*-gnu | kopensolaris*-gnu)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  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
-+
-+  # This implies no fast_install, which is unacceptable.
-+  # Some rework will be needed to allow for fast_install
-+  # before this can be enabled.
-+  hardcode_into_libs=yes
-+
-+  # Append ld.so.conf contents to the search path
-+  if test -f /etc/ld.so.conf; then
-+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-+  fi
-+
-+  # We used to test for /lib/ld.so.1 and disable shared libraries on
-+  # powerpc, because MkLinux only supported shared libraries with the
-+  # GNU dynamic linker.  Since this was broken with cross compilers,
-+  # most powerpc-linux boxes support dynamic linking these days and
-+  # people can always --disable-shared, the test was removed, and we
-+  # assume the GNU/Linux dynamic linker is in use.
-+  dynamic_linker='GNU/Linux ld.so'
-+  ;;
-+
-+netbsdelf*-gnu)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  dynamic_linker='NetBSD ld.elf_so'
-+  ;;
-+
-+netbsd*)
-+  version_type=sunos
-+  need_lib_prefix=no
-+  need_version=no
-+  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+    dynamic_linker='NetBSD (a.out) ld.so'
-+  else
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+    soname_spec='${libname}${release}${shared_ext}$major'
-+    dynamic_linker='NetBSD ld.elf_so'
-+  fi
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  hardcode_into_libs=yes
-+  ;;
-+
-+newsos6)
-+  version_type=linux
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  ;;
-+
-+*nto* | *qnx*)
-+  version_type=qnx
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  dynamic_linker='ldqnx.so'
-+  ;;
-+
-+openbsd*)
-+  version_type=sunos
-+  sys_lib_dlsearch_path_spec="/usr/lib"
-+  need_lib_prefix=no
-+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-+  case $host_os in
-+    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
-+    *)				need_version=no  ;;
-+  esac
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+    case $host_os in
-+      openbsd2.[[89]] | openbsd2.[[89]].*)
-+	shlibpath_overrides_runpath=no
-+	;;
-+      *)
-+	shlibpath_overrides_runpath=yes
-+	;;
-+      esac
-+  else
-+    shlibpath_overrides_runpath=yes
-+  fi
-+  ;;
-+
-+os2*)
-+  libname_spec='$name'
-+  shrext_cmds=".dll"
-+  need_lib_prefix=no
-+  library_names_spec='$libname${shared_ext} $libname.a'
-+  dynamic_linker='OS/2 ld.exe'
-+  shlibpath_var=LIBPATH
-+  ;;
-+
-+osf3* | osf4* | osf5*)
-+  version_type=osf
-+  need_lib_prefix=no
-+  need_version=no
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-+  ;;
-+
-+rdos*)
-+  dynamic_linker=no
-+  ;;
-+
-+solaris*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  hardcode_into_libs=yes
-+  # ldd complains unless libraries are executable
-+  postinstall_cmds='chmod +x $lib'
-+  ;;
-+
-+sunos4*)
-+  version_type=sunos
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  if test "$with_gnu_ld" = yes; then
-+    need_lib_prefix=no
-+  fi
-+  need_version=yes
-+  ;;
-+
-+sysv4 | sysv4.3*)
-+  version_type=linux
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  case $host_vendor in
-+    sni)
-+      shlibpath_overrides_runpath=no
-+      need_lib_prefix=no
-+      runpath_var=LD_RUN_PATH
-+      ;;
-+    siemens)
-+      need_lib_prefix=no
-+      ;;
-+    motorola)
-+      need_lib_prefix=no
-+      need_version=no
-+      shlibpath_overrides_runpath=no
-+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-+      ;;
-+  esac
-+  ;;
-+
-+sysv4*MP*)
-+  if test -d /usr/nec ;then
-+    version_type=linux
-+    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-+    soname_spec='$libname${shared_ext}.$major'
-+    shlibpath_var=LD_LIBRARY_PATH
-+  fi
-+  ;;
-+
-+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-+  version_type=freebsd-elf
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  hardcode_into_libs=yes
-+  if test "$with_gnu_ld" = yes; then
-+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-+  else
-+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-+    case $host_os in
-+      sco3.2v5*)
-+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-+	;;
-+    esac
-+  fi
-+  sys_lib_dlsearch_path_spec='/usr/lib'
-+  ;;
-+
-+tpf*)
-+  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  ;;
-+
-+uts4*)
-+  version_type=linux
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  ;;
-+
-+*)
-+  dynamic_linker=no
-+  ;;
-+esac
-+AC_MSG_RESULT([$dynamic_linker])
-+test "$dynamic_linker" = no && can_build_shared=no
-+
-+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-+if test "$GCC" = yes; then
-+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-+fi
-+
-+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-+  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-+fi
-+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-+  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-+fi
-+
-+_LT_DECL([], [variables_saved_for_relink], [1],
-+    [Variables whose values should be saved in libtool wrapper scripts and
-+    restored at link time])
-+_LT_DECL([], [need_lib_prefix], [0],
-+    [Do we need the "lib" prefix for modules?])
-+_LT_DECL([], [need_version], [0], [Do we need a version for libraries?])
-+_LT_DECL([], [version_type], [0], [Library versioning type])
-+_LT_DECL([], [runpath_var], [0],  [Shared library runtime path variable])
-+_LT_DECL([], [shlibpath_var], [0],[Shared library path variable])
-+_LT_DECL([], [shlibpath_overrides_runpath], [0],
-+    [Is shlibpath searched before the hard-coded library search path?])
-+_LT_DECL([], [libname_spec], [1], [Format of library name prefix])
-+_LT_DECL([], [library_names_spec], [1],
-+    [[List of archive names.  First name is the real one, the rest are links.
-+    The last name is the one that the linker finds with -lNAME]])
-+_LT_DECL([], [soname_spec], [1],
-+    [[The coded name of the library, if different from the real name]])
-+_LT_DECL([], [postinstall_cmds], [2],
-+    [Command to use after installation of a shared archive])
-+_LT_DECL([], [postuninstall_cmds], [2],
-+    [Command to use after uninstallation of a shared archive])
-+_LT_DECL([], [finish_cmds], [2],
-+    [Commands used to finish a libtool library installation in a directory])
-+_LT_DECL([], [finish_eval], [1],
-+    [[As "finish_cmds", except a single script fragment to be evaled but
-+    not shown]])
-+_LT_DECL([], [hardcode_into_libs], [0],
-+    [Whether we should hardcode library paths into libraries])
-+_LT_DECL([], [sys_lib_search_path_spec], [2],
-+    [Compile-time system search path for libraries])
-+_LT_DECL([], [sys_lib_dlsearch_path_spec], [2],
-+    [Run-time system search path for libraries])
-+])# _LT_SYS_DYNAMIC_LINKER
-+
-+
-+# _LT_PATH_TOOL_PREFIX(TOOL)
-+# --------------------------
-+# find a file program which can recognize shared library
-+AC_DEFUN([_LT_PATH_TOOL_PREFIX],
-+[m4_require([_LT_DECL_EGREP])dnl
-+AC_MSG_CHECKING([for $1])
-+AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
-+[case $MAGIC_CMD in
-+[[\\/*] |  ?:[\\/]*])
-+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-+  ;;
-+*)
-+  lt_save_MAGIC_CMD="$MAGIC_CMD"
-+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-+dnl $ac_dummy forces splitting on constant user-supplied paths.
-+dnl POSIX.2 word splitting is done only on the output of word expansions,
-+dnl not every word.  This closes a longstanding sh security hole.
-+  ac_dummy="m4_if([$2], , $PATH, [$2])"
-+  for ac_dir in $ac_dummy; do
-+    IFS="$lt_save_ifs"
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/$1; then
-+      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
-+      if test -n "$file_magic_test_file"; then
-+	case $deplibs_check_method in
-+	"file_magic "*)
-+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
-+	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-+	    $EGREP "$file_magic_regex" > /dev/null; then
-+	    :
-+	  else
-+	    cat <<_LT_EOF 1>&2
-+
-+*** Warning: the command libtool uses to detect shared libraries,
-+*** $file_magic_cmd, produces output that libtool cannot recognize.
-+*** The result is that libtool may fail to recognize shared libraries
-+*** as such.  This will affect the creation of libtool libraries that
-+*** depend on shared libraries, but programs linked with such libtool
-+*** libraries will work regardless of this problem.  Nevertheless, you
-+*** may want to report the problem to your system manager and/or to
-+*** bug-libtool at gnu.org
-+
-+_LT_EOF
-+	  fi ;;
-+	esac
-+      fi
-+      break
-+    fi
-+  done
-+  IFS="$lt_save_ifs"
-+  MAGIC_CMD="$lt_save_MAGIC_CMD"
-+  ;;
-+esac])
-+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-+if test -n "$MAGIC_CMD"; then
-+  AC_MSG_RESULT($MAGIC_CMD)
-+else
-+  AC_MSG_RESULT(no)
-+fi
-+_LT_DECL([], [MAGIC_CMD], [0],
-+	 [Used to examine libraries when file_magic_cmd begins with "file"])dnl
-+])# _LT_PATH_TOOL_PREFIX
-+
-+# Old name:
-+AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX])
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], [])
-+
-+
-+# _LT_PATH_MAGIC
-+# --------------
-+# find a file program which can recognize a shared library
-+m4_defun([_LT_PATH_MAGIC],
-+[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
-+if test -z "$lt_cv_path_MAGIC_CMD"; then
-+  if test -n "$ac_tool_prefix"; then
-+    _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
-+  else
-+    MAGIC_CMD=:
-+  fi
-+fi
-+])# _LT_PATH_MAGIC
-+
-+
-+# LT_PATH_LD
-+# ----------
-+# find the pathname to the GNU or non-GNU linker
-+AC_DEFUN([LT_PATH_LD],
-+[AC_REQUIRE([AC_PROG_CC])dnl
-+AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-+m4_require([_LT_DECL_SED])dnl
-+m4_require([_LT_DECL_EGREP])dnl
-+
-+AC_ARG_WITH([gnu-ld],
-+    [AS_HELP_STRING([--with-gnu-ld],
-+	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
-+    [test "$withval" = no || with_gnu_ld=yes],
-+    [with_gnu_ld=no])dnl
-+
-+ac_prog=ld
-+if test "$GCC" = yes; then
-+  # Check if gcc -print-prog-name=ld gives a path.
-+  AC_MSG_CHECKING([for ld used by $CC])
-+  case $host in
-+  *-*-mingw*)
-+    # gcc leaves a trailing carriage return which upsets mingw
-+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-+  *)
-+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-+  esac
-+  case $ac_prog in
-+    # Accept absolute paths.
-+    [[\\/]]* | ?:[[\\/]]*)
-+      re_direlt='/[[^/]][[^/]]*/\.\./'
-+      # Canonicalize the pathname of ld
-+      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
-+      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
-+	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
-+      done
-+      test -z "$LD" && LD="$ac_prog"
-+      ;;
-+  "")
-+    # If it fails, then pretend we aren't using GCC.
-+    ac_prog=ld
-+    ;;
-+  *)
-+    # If it is relative, then search for the first ld in PATH.
-+    with_gnu_ld=unknown
-+    ;;
-+  esac
-+elif test "$with_gnu_ld" = yes; then
-+  AC_MSG_CHECKING([for GNU ld])
-+else
-+  AC_MSG_CHECKING([for non-GNU ld])
-+fi
-+AC_CACHE_VAL(lt_cv_path_LD,
-+[if test -z "$LD"; then
-+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-+  for ac_dir in $PATH; do
-+    IFS="$lt_save_ifs"
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-+      lt_cv_path_LD="$ac_dir/$ac_prog"
-+      # Check to see if the program is GNU ld.  I'd rather use --version,
-+      # but apparently some variants of GNU ld only accept -v.
-+      # Break only if it was the GNU/non-GNU ld that we prefer.
-+      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-+      *GNU* | *'with BFD'*)
-+	test "$with_gnu_ld" != no && break
-+	;;
-+      *)
-+	test "$with_gnu_ld" != yes && break
-+	;;
-+      esac
-+    fi
-+  done
-+  IFS="$lt_save_ifs"
-+else
-+  lt_cv_path_LD="$LD" # Let the user override the test with a path.
-+fi])
-+LD="$lt_cv_path_LD"
-+if test -n "$LD"; then
-+  AC_MSG_RESULT($LD)
-+else
-+  AC_MSG_RESULT(no)
-+fi
-+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-+_LT_PATH_LD_GNU
-+AC_SUBST([LD])
-+
-+_LT_TAGDECL([], [LD], [1], [The linker used to build libraries])
-+])# LT_PATH_LD
-+
-+# Old names:
-+AU_ALIAS([AM_PROG_LD], [LT_PATH_LD])
-+AU_ALIAS([AC_PROG_LD], [LT_PATH_LD])
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AM_PROG_LD], [])
-+dnl AC_DEFUN([AC_PROG_LD], [])
-+
-+
-+# _LT_PATH_LD_GNU
-+#- --------------
-+m4_defun([_LT_PATH_LD_GNU],
-+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
-+[# I'd rather use --version here, but apparently some GNU lds only accept -v.
-+case `$LD -v 2>&1 </dev/null` in
-+*GNU* | *'with BFD'*)
-+  lt_cv_prog_gnu_ld=yes
-+  ;;
-+*)
-+  lt_cv_prog_gnu_ld=no
-+  ;;
-+esac])
-+with_gnu_ld=$lt_cv_prog_gnu_ld
-+])# _LT_PATH_LD_GNU
-+
-+
-+# _LT_CMD_RELOAD
-+# --------------
-+# find reload flag for linker
-+#   -- PORTME Some linkers may need a different reload flag.
-+m4_defun([_LT_CMD_RELOAD],
-+[AC_CACHE_CHECK([for $LD option to reload object files],
-+  lt_cv_ld_reload_flag,
-+  [lt_cv_ld_reload_flag='-r'])
-+reload_flag=$lt_cv_ld_reload_flag
-+case $reload_flag in
-+"" | " "*) ;;
-+*) reload_flag=" $reload_flag" ;;
-+esac
-+reload_cmds='$LD$reload_flag -o $output$reload_objs'
-+case $host_os in
-+  darwin*)
-+    if test "$GCC" = yes; then
-+      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
-+    else
-+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
-+    fi
-+    ;;
-+esac
-+_LT_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl
-+_LT_DECL([], [reload_cmds], [2])dnl
-+])# _LT_CMD_RELOAD
-+
-+
-+# _LT_CHECK_MAGIC_METHOD
-+# ----------------------
-+# how to check for library dependencies
-+#  -- PORTME fill in with the dynamic library characteristics
-+m4_defun([_LT_CHECK_MAGIC_METHOD],
-+[m4_require([_LT_DECL_EGREP])
-+m4_require([_LT_DECL_OBJDUMP])
-+AC_CACHE_CHECK([how to recognize dependent libraries],
-+lt_cv_deplibs_check_method,
-+[lt_cv_file_magic_cmd='$MAGIC_CMD'
-+lt_cv_file_magic_test_file=
-+lt_cv_deplibs_check_method='unknown'
-+# Need to set the preceding variable on all platforms that support
-+# interlibrary dependencies.
-+# 'none' -- dependencies not supported.
-+# `unknown' -- same as none, but documents that we really don't know.
-+# 'pass_all' -- all dependencies passed with no checks.
-+# 'test_compile' -- check by making test program.
-+# 'file_magic [[regex]]' -- check by looking for files in library path
-+# which responds to the $file_magic_cmd with a given extended regex.
-+# If you have `file' or equivalent on your system and you're not sure
-+# whether `pass_all' will *always* work, you probably want this one.
-+
-+case $host_os in
-+aix[[4-9]]*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+beos*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+bsdi[[45]]*)
-+  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
-+  lt_cv_file_magic_cmd='/usr/bin/file -L'
-+  lt_cv_file_magic_test_file=/shlib/libc.so
-+  ;;
-+
-+cygwin*)
-+  # func_win32_libid is a shell function defined in ltmain.sh
-+  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-+  lt_cv_file_magic_cmd='func_win32_libid'
-+  ;;
-+
-+mingw* | pw32*)
-+  # Base MSYS/MinGW do not provide the 'file' command needed by
-+  # func_win32_libid shell function, so use a weaker test based on 'objdump',
-+  # unless we find 'file', for example because we are cross-compiling.
-+  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
-+    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-+    lt_cv_file_magic_cmd='$OBJDUMP -f'
-+  fi
-+  ;;
-+
-+cegcc)
-+  # use the weaker test based on 'objdump'. See mingw*.
-+  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
-+  lt_cv_file_magic_cmd='$OBJDUMP -f'
-+  ;;
-+
-+darwin* | rhapsody*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+freebsd* | dragonfly*)
-+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-+    case $host_cpu in
-+    i*86 )
-+      # Not sure whether the presence of OpenBSD here was a mistake.
-+      # Let's accept both of them until this is cleared up.
-+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
-+      lt_cv_file_magic_cmd=/usr/bin/file
-+      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-+      ;;
-+    esac
-+  else
-+    lt_cv_deplibs_check_method=pass_all
-+  fi
-+  ;;
-+
-+gnu*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+hpux10.20* | hpux11*)
-+  lt_cv_file_magic_cmd=/usr/bin/file
-+  case $host_cpu in
-+  ia64*)
-+    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
-+    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-+    ;;
-+  hppa*64*)
-+    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
-+    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
-+    ;;
-+  *)
-+    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
-+    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-+    ;;
-+  esac
-+  ;;
-+
-+interix[[3-9]]*)
-+  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
-+  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
-+  ;;
-+
-+irix5* | irix6* | nonstopux*)
-+  case $LD in
-+  *-32|*"-32 ") libmagic=32-bit;;
-+  *-n32|*"-n32 ") libmagic=N32;;
-+  *-64|*"-64 ") libmagic=64-bit;;
-+  *) libmagic=never-match;;
-+  esac
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+# This must be Linux ELF.
-+linux* | k*bsd*-gnu | kopensolaris*-gnu)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+netbsd* | netbsdelf*-gnu)
-+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-+  else
-+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
-+  fi
-+  ;;
-+
-+newos6*)
-+  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
-+  lt_cv_file_magic_cmd=/usr/bin/file
-+  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-+  ;;
-+
-+*nto* | *qnx*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+openbsd*)
-+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
-+  else
-+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-+  fi
-+  ;;
-+
-+osf3* | osf4* | osf5*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+rdos*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+solaris*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+sysv4 | sysv4.3*)
-+  case $host_vendor in
-+  motorola)
-+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
-+    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-+    ;;
-+  ncr)
-+    lt_cv_deplibs_check_method=pass_all
-+    ;;
-+  sequent)
-+    lt_cv_file_magic_cmd='/bin/file'
-+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
-+    ;;
-+  sni)
-+    lt_cv_file_magic_cmd='/bin/file'
-+    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
-+    lt_cv_file_magic_test_file=/lib/libc.so
-+    ;;
-+  siemens)
-+    lt_cv_deplibs_check_method=pass_all
-+    ;;
-+  pc)
-+    lt_cv_deplibs_check_method=pass_all
-+    ;;
-+  esac
-+  ;;
-+
-+tpf*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+esac
-+])
-+file_magic_cmd=$lt_cv_file_magic_cmd
-+deplibs_check_method=$lt_cv_deplibs_check_method
-+test -z "$deplibs_check_method" && deplibs_check_method=unknown
-+
-+_LT_DECL([], [deplibs_check_method], [1],
-+    [Method to check whether dependent libraries are shared objects])
-+_LT_DECL([], [file_magic_cmd], [1],
-+    [Command to use when deplibs_check_method == "file_magic"])
-+])# _LT_CHECK_MAGIC_METHOD
-+
-+
-+# LT_PATH_NM
-+# ----------
-+# find the pathname to a BSD- or MS-compatible name lister
-+AC_DEFUN([LT_PATH_NM],
-+[AC_REQUIRE([AC_PROG_CC])dnl
-+AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM,
-+[if test -n "$NM"; then
-+  # Let the user override the test.
-+  lt_cv_path_NM="$NM"
-+else
-+  lt_nm_to_check="${ac_tool_prefix}nm"
-+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
-+    lt_nm_to_check="$lt_nm_to_check nm"
-+  fi
-+  for lt_tmp_nm in $lt_nm_to_check; do
-+    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-+    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
-+      IFS="$lt_save_ifs"
-+      test -z "$ac_dir" && ac_dir=.
-+      tmp_nm="$ac_dir/$lt_tmp_nm"
-+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
-+	# Check to see if the nm accepts a BSD-compat flag.
-+	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
-+	#   nm: unknown option "B" ignored
-+	# Tru64's nm complains that /dev/null is an invalid object file
-+	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-+	*/dev/null* | *'Invalid file or object type'*)
-+	  lt_cv_path_NM="$tmp_nm -B"
-+	  break
-+	  ;;
-+	*)
-+	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-+	  */dev/null*)
-+	    lt_cv_path_NM="$tmp_nm -p"
-+	    break
-+	    ;;
-+	  *)
-+	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-+	    continue # so that we can try to find one that supports BSD flags
-+	    ;;
-+	  esac
-+	  ;;
-+	esac
-+      fi
-+    done
-+    IFS="$lt_save_ifs"
-+  done
-+  : ${lt_cv_path_NM=no}
-+fi])
-+if test "$lt_cv_path_NM" != "no"; then
-+  NM="$lt_cv_path_NM"
-+else
-+  # Didn't find any BSD compatible name lister, look for dumpbin.
-+  AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :)
-+  AC_SUBST([DUMPBIN])
-+  if test "$DUMPBIN" != ":"; then
-+    NM="$DUMPBIN"
-+  fi
-+fi
-+test -z "$NM" && NM=nm
-+AC_SUBST([NM])
-+_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl
-+
-+AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
-+  [lt_cv_nm_interface="BSD nm"
-+  echo "int some_variable = 0;" > conftest.$ac_ext
-+  (eval echo "\"\$as_me:__oline__: $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 "$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)
-+  cat conftest.out >&AS_MESSAGE_LOG_FD
-+  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
-+    lt_cv_nm_interface="MS dumpbin"
-+  fi
-+  rm -f conftest*])
-+])# LT_PATH_NM
-+
-+# Old names:
-+AU_ALIAS([AM_PROG_NM], [LT_PATH_NM])
-+AU_ALIAS([AC_PROG_NM], [LT_PATH_NM])
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AM_PROG_NM], [])
-+dnl AC_DEFUN([AC_PROG_NM], [])
-+
-+
-+# LT_LIB_M
-+# --------
-+# check for math library
-+AC_DEFUN([LT_LIB_M],
-+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+LIBM=
-+case $host in
-+*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
-+  # These system don't have libm, or don't need it
-+  ;;
-+*-ncr-sysv4.3*)
-+  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
-+  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
-+  ;;
-+*)
-+  AC_CHECK_LIB(m, cos, LIBM="-lm")
-+  ;;
-+esac
-+AC_SUBST([LIBM])
-+])# LT_LIB_M
-+
-+# Old name:
-+AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M])
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_CHECK_LIBM], [])
-+
-+
-+# _LT_COMPILER_NO_RTTI([TAGNAME])
-+# -------------------------------
-+m4_defun([_LT_COMPILER_NO_RTTI],
-+[m4_require([_LT_TAG_COMPILER])dnl
-+
-+_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-+
-+if test "$GCC" = yes; then
-+  _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
-+
-+  _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
-+    lt_cv_prog_compiler_rtti_exceptions,
-+    [-fno-rtti -fno-exceptions], [],
-+    [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
-+fi
-+_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1],
-+	[Compiler flag to turn off builtin functions])
-+])# _LT_COMPILER_NO_RTTI
-+
-+
-+# _LT_CMD_GLOBAL_SYMBOLS
-+# ----------------------
-+m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
-+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+AC_REQUIRE([AC_PROG_CC])dnl
-+AC_REQUIRE([LT_PATH_NM])dnl
-+AC_REQUIRE([LT_PATH_LD])dnl
-+m4_require([_LT_DECL_SED])dnl
-+m4_require([_LT_DECL_EGREP])dnl
-+m4_require([_LT_TAG_COMPILER])dnl
-+
-+# Check for command to grab the raw symbol name followed by C symbol from nm.
-+AC_MSG_CHECKING([command to parse $NM output from $compiler object])
-+AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
-+[
-+# These are sane defaults that work on at least a few old systems.
-+# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
-+
-+# Character class describing NM global symbol codes.
-+symcode='[[BCDEGRST]]'
-+
-+# Regexp to match symbols that can be accessed directly from C.
-+sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
-+
-+# Define system-specific variables.
-+case $host_os in
-+aix*)
-+  symcode='[[BCDT]]'
-+  ;;
-+cygwin* | mingw* | pw32* | cegcc*)
-+  symcode='[[ABCDGISTW]]'
-+  ;;
-+hpux*)
-+  if test "$host_cpu" = ia64; then
-+    symcode='[[ABCDEGRST]]'
-+  fi
-+  ;;
-+irix* | nonstopux*)
-+  symcode='[[BCDEGRST]]'
-+  ;;
-+osf*)
-+  symcode='[[BCDEGQRST]]'
-+  ;;
-+solaris*)
-+  symcode='[[BDRT]]'
-+  ;;
-+sco3.2v5*)
-+  symcode='[[DT]]'
-+  ;;
-+sysv4.2uw2*)
-+  symcode='[[DT]]'
-+  ;;
-+sysv5* | sco5v6* | unixware* | OpenUNIX*)
-+  symcode='[[ABDT]]'
-+  ;;
-+sysv4)
-+  symcode='[[DFNSTU]]'
-+  ;;
-+esac
-+
-+# If we're using GNU nm, then use its standard symbol codes.
-+case `$NM -V 2>&1` in
-+*GNU* | *'with BFD'*)
-+  symcode='[[ABCDGIRSTW]]' ;;
-+esac
-+
-+# Transform an extracted symbol line into a proper C declaration.
-+# Some systems (esp. on ia64) link data and code symbols differently,
-+# so use this general approach.
-+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-+
-+# Transform an extracted symbol line into symbol name and symbol address
-+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p'"
-+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
-+
-+# Handle CRLF in mingw tool chain
-+opt_cr=
-+case $build_os in
-+mingw*)
-+  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
-+  ;;
-+esac
-+
-+# Try without a prefix underscore, then with it.
-+for ac_symprfx in "" "_"; do
-+
-+  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
-+  symxfrm="\\1 $ac_symprfx\\2 \\2"
-+
-+  # Write the raw and C identifiers.
-+  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-+    # Fake it for dumpbin and say T for any non-static function
-+    # and D for any global variable.
-+    # Also find C++ and __fastcall symbols from MSVC++,
-+    # which start with @ or ?.
-+    lt_cv_sys_global_symbol_pipe="$AWK ['"\
-+"     {last_section=section; section=\$ 3};"\
-+"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
-+"     \$ 0!~/External *\|/{next};"\
-+"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
-+"     {if(hide[section]) next};"\
-+"     {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
-+"     {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
-+"     s[1]~/^[@?]/{print s[1], s[1]; next};"\
-+"     s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
-+"     ' prfx=^$ac_symprfx]"
-+  else
-+    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[	 ]]\($symcode$symcode*\)[[	 ]][[	 ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
-+  fi
-+
-+  # Check to see that the pipe works correctly.
-+  pipe_works=no
-+
-+  rm -f conftest*
-+  cat > conftest.$ac_ext <<_LT_EOF
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+char nm_test_var;
-+void nm_test_func(void);
-+void nm_test_func(void){}
-+#ifdef __cplusplus
-+}
-+#endif
-+int main(){nm_test_var='a';nm_test_func();return(0);}
-+_LT_EOF
-+
-+  if AC_TRY_EVAL(ac_compile); then
-+    # Now try to grab the symbols.
-+    nlist=conftest.nm
-+    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
-+      # Try sorting and uniquifying the output.
-+      if sort "$nlist" | uniq > "$nlist"T; then
-+	mv -f "$nlist"T "$nlist"
-+      else
-+	rm -f "$nlist"T
-+      fi
-+
-+      # Make sure that we snagged all the symbols we need.
-+      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
-+	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
-+	  cat <<_LT_EOF > conftest.$ac_ext
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+_LT_EOF
-+	  # Now generate the symbol file.
-+	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
-+
-+	  cat <<_LT_EOF >> conftest.$ac_ext
-+
-+/* The mapping between symbol names and symbols.  */
-+const struct {
-+  const char *name;
-+  void       *address;
-+}
-+lt__PROGRAM__LTX_preloaded_symbols[[]] =
-+{
-+  { "@PROGRAM@", (void *) 0 },
-+_LT_EOF
-+	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
-+	  cat <<\_LT_EOF >> conftest.$ac_ext
-+  {0, (void *) 0}
-+};
-+
-+/* This works around a problem in FreeBSD linker */
-+#ifdef FREEBSD_WORKAROUND
-+static const void *lt_preloaded_setup() {
-+  return lt__PROGRAM__LTX_preloaded_symbols;
-+}
-+#endif
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+_LT_EOF
-+	  # Now try linking the two files.
-+	  mv conftest.$ac_objext conftstm.$ac_objext
-+	  lt_save_LIBS="$LIBS"
-+	  lt_save_CFLAGS="$CFLAGS"
-+	  LIBS="conftstm.$ac_objext"
-+	  CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
-+	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
-+	    pipe_works=yes
-+	  fi
-+	  LIBS="$lt_save_LIBS"
-+	  CFLAGS="$lt_save_CFLAGS"
-+	else
-+	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
-+	fi
-+      else
-+	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
-+      fi
-+    else
-+      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
-+    fi
-+  else
-+    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
-+    cat conftest.$ac_ext >&5
-+  fi
-+  rm -rf conftest* conftst*
-+
-+  # Do not use the global_symbol_pipe unless it works.
-+  if test "$pipe_works" = yes; then
-+    break
-+  else
-+    lt_cv_sys_global_symbol_pipe=
-+  fi
-+done
-+])
-+if test -z "$lt_cv_sys_global_symbol_pipe"; then
-+  lt_cv_sys_global_symbol_to_cdecl=
-+fi
-+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-+  AC_MSG_RESULT(failed)
-+else
-+  AC_MSG_RESULT(ok)
-+fi
-+
-+_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
-+    [Take the output of nm and produce a listing of raw symbols and C names])
-+_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
-+    [Transform the output of nm in a proper C declaration])
-+_LT_DECL([global_symbol_to_c_name_address],
-+    [lt_cv_sys_global_symbol_to_c_name_address], [1],
-+    [Transform the output of nm in a C name address pair])
-+_LT_DECL([global_symbol_to_c_name_address_lib_prefix],
-+    [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
-+    [Transform the output of nm in a C name address pair when lib prefix is needed])
-+]) # _LT_CMD_GLOBAL_SYMBOLS
-+
-+
-+# _LT_COMPILER_PIC([TAGNAME])
-+# ---------------------------
-+m4_defun([_LT_COMPILER_PIC],
-+[m4_require([_LT_TAG_COMPILER])dnl
-+_LT_TAGVAR(lt_prog_compiler_wl, $1)=
-+_LT_TAGVAR(lt_prog_compiler_pic, $1)=
-+_LT_TAGVAR(lt_prog_compiler_static, $1)=
-+
-+AC_MSG_CHECKING([for $compiler option to produce PIC])
-+m4_if([$1], [CXX], [
-+  # C++ specific cases for pic, static, wl, etc.
-+  if test "$GXX" = yes; then
-+    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-+
-+    case $host_os in
-+    aix*)
-+      # All AIX code is PIC.
-+      if test "$host_cpu" = ia64; then
-+	# AIX 5 now supports IA64 processor
-+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+      fi
-+      ;;
-+
-+    amigaos*)
-+      case $host_cpu in
-+      powerpc)
-+            # see comment about AmigaOS4 .so support
-+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-+        ;;
-+      m68k)
-+            # FIXME: we need at least 68020 code to build shared libraries, but
-+            # adding the `-m68020' flag to GCC prevents building anything better,
-+            # like `-m68040'.
-+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
-+        ;;
-+      esac
-+      ;;
-+
-+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-+      # PIC is the default for these OSes.
-+      ;;
-+    mingw* | cygwin* | os2* | pw32* | cegcc*)
-+      # This hack is so that the source file can tell whether it is being
-+      # built for inclusion in a dll (and should export symbols for example).
-+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-+      # (--disable-auto-import) libraries
-+      m4_if([$1], [GCJ], [],
-+	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-+      ;;
-+    darwin* | rhapsody*)
-+      # PIC is the default on this platform
-+      # Common symbols not allowed in MH_DYLIB files
-+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-+      ;;
-+    *djgpp*)
-+      # DJGPP does not support shared libraries at all
-+      _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-+      ;;
-+    interix[[3-9]]*)
-+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-+      # Instead, we relocate shared libraries at runtime.
-+      ;;
-+    sysv4*MP*)
-+      if test -d /usr/nec; then
-+	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-+      fi
-+      ;;
-+    hpux*)
-+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
-+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
-+      # sets the default TLS model and affects inlining.
-+      case $host_cpu in
-+      hppa*64*)
-+	;;
-+      *)
-+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-+	;;
-+      esac
-+      ;;
-+    *qnx* | *nto*)
-+      # QNX uses GNU C++, but need to define -shared option too, otherwise
-+      # it will coredump.
-+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-+      ;;
-+    *)
-+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-+      ;;
-+    esac
-+  else
-+    case $host_os in
-+      aix[[4-9]]*)
-+	# All AIX code is PIC.
-+	if test "$host_cpu" = ia64; then
-+	  # AIX 5 now supports IA64 processor
-+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+	else
-+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-+	fi
-+	;;
-+      chorus*)
-+	case $cc_basename in
-+	cxch68*)
-+	  # Green Hills C++ Compiler
-+	  # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
-+	  ;;
-+	esac
-+	;;
-+      dgux*)
-+	case $cc_basename in
-+	  ec++*)
-+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+	    ;;
-+	  ghcx*)
-+	    # Green Hills C++ Compiler
-+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-+	    ;;
-+	  *)
-+	    ;;
-+	esac
-+	;;
-+      freebsd* | dragonfly*)
-+	# FreeBSD uses GNU C++
-+	;;
-+      hpux9* | hpux10* | hpux11*)
-+	case $cc_basename in
-+	  CC*)
-+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-+	    if test "$host_cpu" != ia64; then
-+	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-+	    fi
-+	    ;;
-+	  aCC*)
-+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-+	    case $host_cpu in
-+	    hppa*64*|ia64*)
-+	      # +Z the default
-+	      ;;
-+	    *)
-+	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-+	      ;;
-+	    esac
-+	    ;;
-+	  *)
-+	    ;;
-+	esac
-+	;;
-+      interix*)
-+	# This is c89, which is MS Visual C++ (no shared libs)
-+	# Anyone wants to do a port?
-+	;;
-+      irix5* | irix6* | nonstopux*)
-+	case $cc_basename in
-+	  CC*)
-+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-+	    # CC pic flag -KPIC is the default.
-+	    ;;
-+	  *)
-+	    ;;
-+	esac
-+	;;
-+      linux* | k*bsd*-gnu | kopensolaris*-gnu)
-+	case $cc_basename in
-+	  KCC*)
-+	    # KAI C++ Compiler
-+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-+	    ;;
-+	  ecpc* )
-+	    # old Intel C++ for x86_64 which still supported -KPIC.
-+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-+	    ;;
-+	  icpc* )
-+	    # Intel C++, used to be incompatible with GCC.
-+	    # ICC 10 doesn't accept -KPIC any more.
-+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-+	    ;;
-+	  pgCC* | pgcpp*)
-+	    # Portland Group C++ compiler
-+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+	    ;;
-+	  cxx*)
-+	    # Compaq C++
-+	    # Make sure the PIC flag is empty.  It appears that all Alpha
-+	    # Linux and Compaq Tru64 Unix objects are PIC.
-+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-+	    ;;
-+	  xlc* | xlC*)
-+	    # IBM XL 8.0 on PPC
-+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
-+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
-+	    ;;
-+	  *)
-+	    case `$CC -V 2>&1 | sed 5q` in
-+	    *Sun\ C*)
-+	      # Sun C++ 5.9
-+	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+	      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+	      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-+	      ;;
-+	    esac
-+	    ;;
-+	esac
-+	;;
-+      lynxos*)
-+	;;
-+      m88k*)
-+	;;
-+      mvs*)
-+	case $cc_basename in
-+	  cxx*)
-+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
-+	    ;;
-+	  *)
-+	    ;;
-+	esac
-+	;;
-+      netbsd* | netbsdelf*-gnu)
-+	;;
-+      *qnx* | *nto*)
-+        # QNX uses GNU C++, but need to define -shared option too, otherwise
-+        # it will coredump.
-+        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-+        ;;
-+      osf3* | osf4* | osf5*)
-+	case $cc_basename in
-+	  KCC*)
-+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-+	    ;;
-+	  RCC*)
-+	    # Rational C++ 2.4.1
-+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-+	    ;;
-+	  cxx*)
-+	    # Digital/Compaq C++
-+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+	    # Make sure the PIC flag is empty.  It appears that all Alpha
-+	    # Linux and Compaq Tru64 Unix objects are PIC.
-+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-+	    ;;
-+	  *)
-+	    ;;
-+	esac
-+	;;
-+      psos*)
-+	;;
-+      solaris*)
-+	case $cc_basename in
-+	  CC*)
-+	    # Sun C++ 4.2, 5.x and Centerline C++
-+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-+	    ;;
-+	  gcx*)
-+	    # Green Hills C++ Compiler
-+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-+	    ;;
-+	  *)
-+	    ;;
-+	esac
-+	;;
-+      sunos4*)
-+	case $cc_basename in
-+	  CC*)
-+	    # Sun C++ 4.x
-+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+	    ;;
-+	  lcc*)
-+	    # Lucid
-+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-+	    ;;
-+	  *)
-+	    ;;
-+	esac
-+	;;
-+      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-+	case $cc_basename in
-+	  CC*)
-+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+	    ;;
-+	esac
-+	;;
-+      tandem*)
-+	case $cc_basename in
-+	  NCC*)
-+	    # NonStop-UX NCC 3.20
-+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+	    ;;
-+	  *)
-+	    ;;
-+	esac
-+	;;
-+      vxworks*)
-+	;;
-+      *)
-+	_LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-+	;;
-+    esac
-+  fi
-+],
-+[
-+  if test "$GCC" = yes; then
-+    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-+
-+    case $host_os in
-+      aix*)
-+      # All AIX code is PIC.
-+      if test "$host_cpu" = ia64; then
-+	# AIX 5 now supports IA64 processor
-+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+      fi
-+      ;;
-+
-+    amigaos*)
-+      case $host_cpu in
-+      powerpc)
-+            # see comment about AmigaOS4 .so support
-+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-+        ;;
-+      m68k)
-+            # FIXME: we need at least 68020 code to build shared libraries, but
-+            # adding the `-m68020' flag to GCC prevents building anything better,
-+            # like `-m68040'.
-+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
-+        ;;
-+      esac
-+      ;;
-+
-+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-+      # PIC is the default for these OSes.
-+      ;;
-+
-+    mingw* | cygwin* | pw32* | os2* | cegcc*)
-+      # This hack is so that the source file can tell whether it is being
-+      # built for inclusion in a dll (and should export symbols for example).
-+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-+      # (--disable-auto-import) libraries
-+      m4_if([$1], [GCJ], [],
-+	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-+      ;;
-+
-+    darwin* | rhapsody*)
-+      # PIC is the default on this platform
-+      # Common symbols not allowed in MH_DYLIB files
-+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-+      ;;
-+
-+    hpux*)
-+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
-+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
-+      # sets the default TLS model and affects inlining.
-+      case $host_cpu in
-+      hppa*64*)
-+	# +Z the default
-+	;;
-+      *)
-+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-+	;;
-+      esac
-+      ;;
-+
-+    interix[[3-9]]*)
-+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-+      # Instead, we relocate shared libraries at runtime.
-+      ;;
-+
-+    msdosdjgpp*)
-+      # Just because we use GCC doesn't mean we suddenly get shared libraries
-+      # on systems that don't support them.
-+      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-+      enable_shared=no
-+      ;;
-+
-+    *nto* | *qnx*)
-+      # QNX uses GNU C++, but need to define -shared option too, otherwise
-+      # it will coredump.
-+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-+      ;;
-+
-+    sysv4*MP*)
-+      if test -d /usr/nec; then
-+	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-+      fi
-+      ;;
-+
-+    *)
-+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-+      ;;
-+    esac
-+  else
-+    # PORTME Check for flag to pass linker flags through the system compiler.
-+    case $host_os in
-+    aix*)
-+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+      if test "$host_cpu" = ia64; then
-+	# AIX 5 now supports IA64 processor
-+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+      else
-+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-+      fi
-+      ;;
-+
-+    mingw* | cygwin* | pw32* | os2* | cegcc*)
-+      # This hack is so that the source file can tell whether it is being
-+      # built for inclusion in a dll (and should export symbols for example).
-+      m4_if([$1], [GCJ], [],
-+	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-+      ;;
-+
-+    hpux9* | hpux10* | hpux11*)
-+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-+      # not for PA HP-UX.
-+      case $host_cpu in
-+      hppa*64*|ia64*)
-+	# +Z the default
-+	;;
-+      *)
-+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-+	;;
-+      esac
-+      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-+      _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-+      ;;
-+
-+    irix5* | irix6* | nonstopux*)
-+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+      # PIC (with -KPIC) is the default.
-+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-+      ;;
-+
-+    linux* | k*bsd*-gnu | kopensolaris*-gnu)
-+      case $cc_basename in
-+      # old Intel for x86_64 which still supported -KPIC.
-+      ecc*)
-+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-+        ;;
-+      # icc used to be incompatible with GCC.
-+      # ICC 10 doesn't accept -KPIC any more.
-+      icc* | ifort*)
-+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-+        ;;
-+      # Lahey Fortran 8.1.
-+      lf95*)
-+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
-+	_LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
-+	;;
-+      pgcc* | pgf77* | pgf90* | pgf95*)
-+        # Portland Group compilers (*not* the Pentium gcc compiler,
-+	# which looks to be a dead project)
-+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+        ;;
-+      ccc*)
-+        _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+        # All Alpha code is PIC.
-+        _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-+        ;;
-+      xl*)
-+	# IBM XL C 8.0/Fortran 10.1 on PPC
-+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
-+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
-+	;;
-+      *)
-+	case `$CC -V 2>&1 | sed 5q` in
-+	*Sun\ C*)
-+	  # Sun C 5.9
-+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-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
-+      ;;
-+
-+    newsos6)
-+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+      ;;
-+
-+    *nto* | *qnx*)
-+      # QNX uses GNU C++, but need to define -shared option too, otherwise
-+      # it will coredump.
-+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-+      ;;
-+
-+    osf3* | osf4* | osf5*)
-+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+      # All OSF/1 code is PIC.
-+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-+      ;;
-+
-+    rdos*)
-+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-+      ;;
-+
-+    solaris*)
-+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+      case $cc_basename in
-+      f77* | f90* | f95*)
-+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
-+      *)
-+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
-+      esac
-+      ;;
-+
-+    sunos4*)
-+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+      ;;
-+
-+    sysv4 | sysv4.2uw2* | sysv4.3*)
-+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+      ;;
-+
-+    sysv4*MP*)
-+      if test -d /usr/nec ;then
-+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
-+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+      fi
-+      ;;
-+
-+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+      ;;
-+
-+    unicos*)
-+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-+      ;;
-+
-+    uts4*)
-+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+      ;;
-+
-+    *)
-+      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-+      ;;
-+    esac
-+  fi
-+])
-+case $host_os in
-+  # For platforms which do not support PIC, -DPIC is meaningless:
-+  *djgpp*)
-+    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-+    ;;
-+  *)
-+    _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t at m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
-+    ;;
-+esac
-+AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
-+_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
-+	[How to pass a linker flag through the compiler])
-+
-+#
-+# Check to make sure the PIC flag actually works.
-+#
-+if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
-+  _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works],
-+    [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)],
-+    [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t at m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [],
-+    [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in
-+     "" | " "*) ;;
-+     *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;;
-+     esac],
-+    [_LT_TAGVAR(lt_prog_compiler_pic, $1)=
-+     _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
-+fi
-+_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
-+	[Additional compiler flags for building library objects])
-+
-+#
-+# Check to make sure the static flag actually works.
-+#
-+wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\"
-+_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
-+  _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1),
-+  $lt_tmp_static_flag,
-+  [],
-+  [_LT_TAGVAR(lt_prog_compiler_static, $1)=])
-+_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
-+	[Compiler flag to prevent dynamic linking])
-+])# _LT_COMPILER_PIC
-+
-+
-+# _LT_LINKER_SHLIBS([TAGNAME])
-+# ----------------------------
-+# See if the linker supports building shared libraries.
-+m4_defun([_LT_LINKER_SHLIBS],
-+[AC_REQUIRE([LT_PATH_LD])dnl
-+AC_REQUIRE([LT_PATH_NM])dnl
-+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-+m4_require([_LT_DECL_EGREP])dnl
-+m4_require([_LT_DECL_SED])dnl
-+m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
-+m4_require([_LT_TAG_COMPILER])dnl
-+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-+m4_if([$1], [CXX], [
-+  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-+  case $host_os in
-+  aix[[4-9]]*)
-+    # If we're using GNU nm, then we don't want the "-C" option.
-+    # -C means demangle to AIX nm, but means don't demangle with GNU nm
-+    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'
-+    else
-+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-+    fi
-+    ;;
-+  pw32*)
-+    _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
-+  ;;
-+  cygwin* | mingw* | cegcc*)
-+    _LT_TAGVAR(export_symbols_cmds, $1)='$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'
-+  ;;
-+  linux* | k*bsd*-gnu)
-+    _LT_TAGVAR(link_all_deplibs, $1)=no
-+  ;;
-+  *)
-+    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-+  ;;
-+  esac
-+  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
-+], [
-+  runpath_var=
-+  _LT_TAGVAR(allow_undefined_flag, $1)=
-+  _LT_TAGVAR(always_export_symbols, $1)=no
-+  _LT_TAGVAR(archive_cmds, $1)=
-+  _LT_TAGVAR(archive_expsym_cmds, $1)=
-+  _LT_TAGVAR(compiler_needs_object, $1)=no
-+  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-+  _LT_TAGVAR(export_dynamic_flag_spec, $1)=
-+  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-+  _LT_TAGVAR(hardcode_automatic, $1)=no
-+  _LT_TAGVAR(hardcode_direct, $1)=no
-+  _LT_TAGVAR(hardcode_direct_absolute, $1)=no
-+  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-+  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-+  _LT_TAGVAR(hardcode_libdir_separator, $1)=
-+  _LT_TAGVAR(hardcode_minus_L, $1)=no
-+  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-+  _LT_TAGVAR(inherit_rpath, $1)=no
-+  _LT_TAGVAR(link_all_deplibs, $1)=unknown
-+  _LT_TAGVAR(module_cmds, $1)=
-+  _LT_TAGVAR(module_expsym_cmds, $1)=
-+  _LT_TAGVAR(old_archive_from_new_cmds, $1)=
-+  _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)=
-+  _LT_TAGVAR(thread_safe_flag_spec, $1)=
-+  _LT_TAGVAR(whole_archive_flag_spec, $1)=
-+  # include_expsyms should be a list of space-separated symbols to be *always*
-+  # included in the symbol list
-+  _LT_TAGVAR(include_expsyms, $1)=
-+  # exclude_expsyms can be an extended regexp of symbols to exclude
-+  # it will be wrapped by ` (' and `)$', so one must not match beginning or
-+  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-+  # as well as any symbol that contains `d'.
-+  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
-+  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-+  # platforms (ab)use it in PIC code, but their linkers get confused if
-+  # the symbol is explicitly referenced.  Since portable code cannot
-+  # rely on this symbol name, it's probably fine to never include it in
-+  # preloaded symbol tables.
-+  # Exclude shared library initialization/finalization symbols.
-+dnl Note also adjust exclude_expsyms for C++ above.
-+  extract_expsyms_cmds=
-+
-+  case $host_os in
-+  cygwin* | mingw* | pw32* | cegcc*)
-+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-+    # When not using gcc, we currently assume that we are using
-+    # Microsoft Visual C++.
-+    if test "$GCC" != yes; then
-+      with_gnu_ld=no
-+    fi
-+    ;;
-+  interix*)
-+    # we just hope/assume this is gcc and not c89 (= MSVC++)
-+    with_gnu_ld=yes
-+    ;;
-+  openbsd*)
-+    with_gnu_ld=no
-+    ;;
-+  linux* | k*bsd*-gnu)
-+    _LT_TAGVAR(link_all_deplibs, $1)=no
-+    ;;
-+  esac
-+
-+  _LT_TAGVAR(ld_shlibs, $1)=yes
-+  if test "$with_gnu_ld" = yes; then
-+    # If archive_cmds runs LD, not CC, wlarc should be empty
-+    wlarc='${wl}'
-+
-+    # Set some defaults for GNU ld with shared library support. These
-+    # are reset later if shared libraries are not supported. Putting them
-+    # here allows them to be overridden if necessary.
-+    runpath_var=LD_RUN_PATH
-+    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-+    # ancient GNU ld didn't support --whole-archive et. al.
-+    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
-+      _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+    else
-+      _LT_TAGVAR(whole_archive_flag_spec, $1)=
-+    fi
-+    supports_anon_versioning=no
-+    case `$LD -v 2>&1` in
-+      *GNU\ gold*) supports_anon_versioning=yes ;;
-+      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
-+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-+      *\ 2.11.*) ;; # other 2.11 versions
-+      *) supports_anon_versioning=yes ;;
-+    esac
-+
-+    # See if GNU ld supports shared libraries.
-+    case $host_os in
-+    aix[[3-9]]*)
-+      # On AIX/PPC, the GNU linker is very broken
-+      if test "$host_cpu" != ia64; then
-+	_LT_TAGVAR(ld_shlibs, $1)=no
-+	cat <<_LT_EOF 1>&2
-+
-+*** Warning: the GNU linker, at least up to release 2.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 modify your PATH
-+*** so that a non-GNU linker is found, and then restart.
-+
-+_LT_EOF
-+      fi
-+      ;;
-+
-+    amigaos*)
-+      case $host_cpu in
-+      powerpc)
-+            # see comment about AmigaOS4 .so support
-+            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+            _LT_TAGVAR(archive_expsym_cmds, $1)=''
-+        ;;
-+      m68k)
-+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-+            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+            _LT_TAGVAR(hardcode_minus_L, $1)=yes
-+        ;;
-+      esac
-+      ;;
-+
-+    beos*)
-+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-+	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
-+	# support --undefined.  This deserves some investigation.  FIXME
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+      else
-+	_LT_TAGVAR(ld_shlibs, $1)=no
-+      fi
-+      ;;
-+
-+    cygwin* | mingw* | pw32* | cegcc*)
-+      # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-+      # as there is no search path for DLLs.
-+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-+      _LT_TAGVAR(always_export_symbols, $1)=no
-+      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
-+
-+      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-+	# If the export-symbols file already is a .def file (1st line
-+	# is EXPORTS), use it as is; otherwise, prepend...
-+	_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-+	  cp $export_symbols $output_objdir/$soname.def;
-+	else
-+	  echo EXPORTS > $output_objdir/$soname.def;
-+	  cat $export_symbols >> $output_objdir/$soname.def;
-+	fi~
-+	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-+      else
-+	_LT_TAGVAR(ld_shlibs, $1)=no
-+      fi
-+      ;;
-+
-+    interix[[3-9]]*)
-+      _LT_TAGVAR(hardcode_direct, $1)=no
-+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-+      # Instead, shared libraries are loaded at an image base (0x10000000 by
-+      # default) and relocated if they conflict, which is a slow very memory
-+      # consuming and fragmenting process.  To avoid this, we pick a random,
-+      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-+      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-+      _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-+      ;;
-+
-+    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
-+      tmp_diet=no
-+      if test "$host_os" = linux-dietlibc; then
-+	case $cc_basename in
-+	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
-+	esac
-+      fi
-+      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
-+	 && test "$tmp_diet" = no
-+      then
-+	tmp_addflag=
-+	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'
-+	  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'
-+	  tmp_addflag=' $pic_flag -Mnomain' ;;
-+	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
-+	  tmp_addflag=' -i_dynamic' ;;
-+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
-+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-+	ifc* | ifort*)			# Intel Fortran compiler
-+	  tmp_addflag=' -nofor_main' ;;
-+	lf95*)				# Lahey Fortran 8.1
-+	  _LT_TAGVAR(whole_archive_flag_spec, $1)=
-+	  tmp_sharedflag='--shared' ;;
-+	xl[[cC]]*)			# IBM XL C 8.0 on PPC (deal with xlf below)
-+	  tmp_sharedflag='-qmkshrobj'
-+	  tmp_addflag= ;;
-+	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(compiler_needs_object, $1)=yes
-+	  tmp_sharedflag='-G' ;;
-+	*Sun\ F*)			# Sun Fortran 8.3
-+	  tmp_sharedflag='-G' ;;
-+	esac
-+	_LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+
-+        if test "x$supports_anon_versioning" = xyes; then
-+          _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-+	    cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-+	    echo "local: *; };" >> $output_objdir/$libname.ver~
-+	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+        fi
-+
-+	case $cc_basename in
-+	xlf*)
-+	  # 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'
-+	  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'
-+	  fi
-+	  ;;
-+	esac
-+      else
-+        _LT_TAGVAR(ld_shlibs, $1)=no
-+      fi
-+      ;;
-+
-+    netbsd* | netbsdelf*-gnu)
-+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-+	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-+	wlarc=
-+      else
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+      fi
-+      ;;
-+
-+    solaris*)
-+      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
-+	_LT_TAGVAR(ld_shlibs, $1)=no
-+	cat <<_LT_EOF 1>&2
-+
-+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-+*** create shared libraries on Solaris systems.  Therefore, libtool
-+*** is disabling shared libraries support.  We urge you to upgrade GNU
-+*** binutils to release 2.9.1 or newer.  Another option is to modify
-+*** your PATH or compiler configuration so that the native linker is
-+*** used, and then restart.
-+
-+_LT_EOF
-+      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+      else
-+	_LT_TAGVAR(ld_shlibs, $1)=no
-+      fi
-+      ;;
-+
-+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-+      case `$LD -v 2>&1` in
-+        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
-+	_LT_TAGVAR(ld_shlibs, $1)=no
-+	cat <<_LT_EOF 1>&2
-+
-+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
-+*** reliably create shared libraries on SCO systems.  Therefore, libtool
-+*** is disabling shared libraries support.  We urge you to upgrade GNU
-+*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
-+*** your PATH or compiler configuration so that the native linker is
-+*** used, and then restart.
-+
-+_LT_EOF
-+	;;
-+	*)
-+	  # For security reasons, it is highly recommended that you always
-+	  # use absolute paths for naming shared libraries, and exclude the
-+	  # DT_RUNPATH tag from executables and libraries.  But doing so
-+	  # requires that you compile everything twice, which is a pain.
-+	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+	  else
-+	    _LT_TAGVAR(ld_shlibs, $1)=no
-+	  fi
-+	;;
-+      esac
-+      ;;
-+
-+    sunos4*)
-+      _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+      wlarc=
-+      _LT_TAGVAR(hardcode_direct, $1)=yes
-+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      ;;
-+
-+    *)
-+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+      else
-+	_LT_TAGVAR(ld_shlibs, $1)=no
-+      fi
-+      ;;
-+    esac
-+
-+    if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then
-+      runpath_var=
-+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-+      _LT_TAGVAR(export_dynamic_flag_spec, $1)=
-+      _LT_TAGVAR(whole_archive_flag_spec, $1)=
-+    fi
-+  else
-+    # PORTME fill in a description of your system's linker (not GNU ld)
-+    case $host_os in
-+    aix3*)
-+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-+      _LT_TAGVAR(always_export_symbols, $1)=yes
-+      _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-+      # Note: this linker hardcodes the directories in LIBPATH if there
-+      # are no directories specified by -L.
-+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-+      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
-+	# Neither direct hardcoding nor static linking is supported with a
-+	# broken collect2.
-+	_LT_TAGVAR(hardcode_direct, $1)=unsupported
-+      fi
-+      ;;
-+
-+    aix[[4-9]]*)
-+      if test "$host_cpu" = ia64; then
-+	# On IA64, the linker does run time linking by default, so we don't
-+	# have to do anything special.
-+	aix_use_runtimelinking=no
-+	exp_sym_flag='-Bexport'
-+	no_entry_flag=""
-+      else
-+	# If we're using GNU nm, then we don't want the "-C" option.
-+	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-+	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'
-+	else
-+	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-+	fi
-+	aix_use_runtimelinking=no
-+
-+	# Test if we are trying to use run time linking or normal
-+	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-+	# need to do runtime linking.
-+	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
-+	  for ld_flag in $LDFLAGS; do
-+	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-+	    aix_use_runtimelinking=yes
-+	    break
-+	  fi
-+	  done
-+	  ;;
-+	esac
-+
-+	exp_sym_flag='-bexport'
-+	no_entry_flag='-bnoentry'
-+      fi
-+
-+      # When large executables or shared objects are built, AIX ld can
-+      # have problems creating the table of contents.  If linking a library
-+      # or program results in "error TOC overflow" add -mminimal-toc to
-+      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-+      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-+
-+      _LT_TAGVAR(archive_cmds, $1)=''
-+      _LT_TAGVAR(hardcode_direct, $1)=yes
-+      _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-+      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-+      _LT_TAGVAR(link_all_deplibs, $1)=yes
-+      _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
-+
-+      if test "$GCC" = yes; then
-+	case $host_os in aix4.[[012]]|aix4.[[012]].*)
-+	# We only want to do this on AIX 4.2 and lower, the check
-+	# below for broken collect2 doesn't work under 4.3+
-+	  collect2name=`${CC} -print-prog-name=collect2`
-+	  if test -f "$collect2name" &&
-+	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
-+	  then
-+	  # We have reworked collect2
-+	  :
-+	  else
-+	  # We have old collect2
-+	  _LT_TAGVAR(hardcode_direct, $1)=unsupported
-+	  # It fails to find uninstalled libraries when the uninstalled
-+	  # path is not listed in the libpath.  Setting hardcode_minus_L
-+	  # to unsupported forces relinking
-+	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
-+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+	  _LT_TAGVAR(hardcode_libdir_separator, $1)=
-+	  fi
-+	  ;;
-+	esac
-+	shared_flag='-shared'
-+	if test "$aix_use_runtimelinking" = yes; then
-+	  shared_flag="$shared_flag "'${wl}-G'
-+	fi
-+	_LT_TAGVAR(link_all_deplibs, $1)=no
-+      else
-+	# not using gcc
-+	if test "$host_cpu" = ia64; then
-+	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-+	# chokes on -Wl,-G. The following line is correct:
-+	  shared_flag='-G'
-+	else
-+	  if test "$aix_use_runtimelinking" = yes; then
-+	    shared_flag='${wl}-G'
-+	  else
-+	    shared_flag='${wl}-bM:SRE'
-+	  fi
-+	fi
-+      fi
-+
-+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
-+      # It seems that -bexpall does not export symbols beginning with
-+      # underscore (_), so it is better to generate a list of symbols to export.
-+      _LT_TAGVAR(always_export_symbols, $1)=yes
-+      if test "$aix_use_runtimelinking" = yes; then
-+	# Warning - without using the other runtime loading flags (-brtl),
-+	# -berok will link without error, but may produce a broken library.
-+	_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
-+        # Determine the default libpath from the value encoded in an
-+        # empty executable.
-+        _LT_SYS_MODULE_PATH_AIX
-+        _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"
-+      else
-+	if test "$host_cpu" = ia64; then
-+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-+	  _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-+	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-+	else
-+	 # Determine the default libpath from the value encoded in an
-+	 # empty executable.
-+	 _LT_SYS_MODULE_PATH_AIX
-+	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-+	  # Warning - without using the other run time loading flags,
-+	  # -berok will link without error, but may produce a broken library.
-+	  _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-+	  _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-+	  # Exported symbols can be pulled into shared objects from archives
-+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-+	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-+	  # This is similar to how AIX traditionally builds its shared libraries.
-+	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-+	fi
-+      fi
-+      ;;
-+
-+    amigaos*)
-+      case $host_cpu in
-+      powerpc)
-+            # see comment about AmigaOS4 .so support
-+            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+            _LT_TAGVAR(archive_expsym_cmds, $1)=''
-+        ;;
-+      m68k)
-+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-+            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+            _LT_TAGVAR(hardcode_minus_L, $1)=yes
-+        ;;
-+      esac
-+      ;;
-+
-+    bsdi[[45]]*)
-+      _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
-+      ;;
-+
-+    cygwin* | mingw* | pw32* | cegcc*)
-+      # When not using gcc, we currently assume that we are using
-+      # Microsoft Visual C++.
-+      # hardcode_libdir_flag_spec is actually meaningless, as there is
-+      # no search path for DLLs.
-+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-+      # Tell ltmain to make .lib files, not .a files.
-+      libext=lib
-+      # Tell ltmain to make .dll files, not .so files.
-+      shrext_cmds=".dll"
-+      # FIXME: Setting linknames here is a bad hack.
-+      _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
-+      # The linker will automatically build a .lib file if we build a DLL.
-+      _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
-+      # FIXME: Should let the user specify the lib program.
-+      _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
-+      _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
-+      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-+      ;;
-+
-+    darwin* | rhapsody*)
-+      _LT_DARWIN_LINKER_FEATURES($1)
-+      ;;
-+
-+    dgux*)
-+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      ;;
-+
-+    freebsd1*)
-+      _LT_TAGVAR(ld_shlibs, $1)=no
-+      ;;
-+
-+    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-+    # support.  Future versions do this automatically, but an explicit c++rt0.o
-+    # does not break anything, and helps significantly (at the cost of a little
-+    # extra space).
-+    freebsd2.2*)
-+      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+      _LT_TAGVAR(hardcode_direct, $1)=yes
-+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      ;;
-+
-+    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-+    freebsd2*)
-+      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+      _LT_TAGVAR(hardcode_direct, $1)=yes
-+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      ;;
-+
-+    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-+    freebsd* | dragonfly*)
-+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+      _LT_TAGVAR(hardcode_direct, $1)=yes
-+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      ;;
-+
-+    hpux9*)
-+      if test "$GCC" = yes; then
-+	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-+      else
-+	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-+      fi
-+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+      _LT_TAGVAR(hardcode_direct, $1)=yes
-+
-+      # hardcode_minus_L: Not really in the search PATH,
-+      # but as the default location of the library.
-+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+      ;;
-+
-+    hpux10*)
-+      if test "$GCC" = yes -a "$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'
-+      fi
-+      if test "$with_gnu_ld" = no; then
-+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-+	_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-+	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+	_LT_TAGVAR(hardcode_direct, $1)=yes
-+	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+	# hardcode_minus_L: Not really in the search PATH,
-+	# but as the default location of the library.
-+	_LT_TAGVAR(hardcode_minus_L, $1)=yes
-+      fi
-+      ;;
-+
-+    hpux11*)
-+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-+	case $host_cpu in
-+	hppa*64*)
-+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	  ;;
-+	ia64*)
-+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-+	  ;;
-+	*)
-+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-+	  ;;
-+	esac
-+      else
-+	case $host_cpu in
-+	hppa*64*)
-+	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	  ;;
-+	ia64*)
-+	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-+	  ;;
-+	*)
-+	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-+	  ;;
-+	esac
-+      fi
-+      if test "$with_gnu_ld" = no; then
-+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-+	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+
-+	case $host_cpu in
-+	hppa*64*|ia64*)
-+	  _LT_TAGVAR(hardcode_direct, $1)=no
-+	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+	  ;;
-+	*)
-+	  _LT_TAGVAR(hardcode_direct, $1)=yes
-+	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+
-+	  # hardcode_minus_L: Not really in the search PATH,
-+	  # but as the default location of the library.
-+	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
-+	  ;;
-+	esac
-+      fi
-+      ;;
-+
-+    irix5* | irix6* | nonstopux*)
-+      if test "$GCC" = yes; then
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $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.
-+        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'
-+        )
-+        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'
-+      fi
-+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+      _LT_TAGVAR(inherit_rpath, $1)=yes
-+      _LT_TAGVAR(link_all_deplibs, $1)=yes
-+      ;;
-+
-+    netbsd* | netbsdelf*-gnu)
-+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-+	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-+      else
-+	_LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-+      fi
-+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+      _LT_TAGVAR(hardcode_direct, $1)=yes
-+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      ;;
-+
-+    newsos6)
-+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+      _LT_TAGVAR(hardcode_direct, $1)=yes
-+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      ;;
-+
-+    *nto* | *qnx*)
-+      ;;
-+
-+    openbsd*)
-+      if test -f /usr/libexec/ld.so; then
-+	_LT_TAGVAR(hardcode_direct, $1)=yes
-+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-+	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+	else
-+	  case $host_os in
-+	   openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
-+	     _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+	     ;;
-+	   *)
-+	     _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+	     ;;
-+	  esac
-+	fi
-+      else
-+	_LT_TAGVAR(ld_shlibs, $1)=no
-+      fi
-+      ;;
-+
-+    os2*)
-+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-+      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-+      _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-+      ;;
-+
-+    osf3*)
-+      if test "$GCC" = yes; then
-+	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${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'
-+      fi
-+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+      ;;
-+
-+    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-+      if test "$GCC" = yes; then
-+	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $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(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_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'
-+
-+	# Both c and cxx compiler support -rpath directly
-+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-+      fi
-+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+      ;;
-+
-+    solaris*)
-+      _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
-+      if test "$GCC" = yes; then
-+	wlarc='${wl}'
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-+	  $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-+      else
-+	case `$CC -V 2>&1` in
-+	*"Compilers 5.0"*)
-+	  wlarc=''
-+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-+	  $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
-+	  ;;
-+	*)
-+	  wlarc='${wl}'
-+	  _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
-+	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-+	  $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-+	  ;;
-+	esac
-+      fi
-+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      case $host_os in
-+      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-+      *)
-+	# The compiler driver will combine and reorder linker options,
-+	# but understands `-z linker_flag'.  GCC discards it without `$wl',
-+	# but is careful enough not to reorder.
-+	# Supported since Solaris 2.6 (maybe 2.5.1?)
-+	if test "$GCC" = yes; then
-+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-+	else
-+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
-+	fi
-+	;;
-+      esac
-+      _LT_TAGVAR(link_all_deplibs, $1)=yes
-+      ;;
-+
-+    sunos4*)
-+      if test "x$host_vendor" = xsequent; then
-+	# Use $CC to link under sequent, because it throws in some extra .o
-+	# files that make .init and .fini sections work.
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-+      else
-+	_LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-+      fi
-+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+      _LT_TAGVAR(hardcode_direct, $1)=yes
-+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      ;;
-+
-+    sysv4)
-+      case $host_vendor in
-+	sni)
-+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+	  _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true???
-+	;;
-+	siemens)
-+	  ## LD is ld it makes a PLAMLIB
-+	  ## CC just makes a GrossModule.
-+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-+	  _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
-+	  _LT_TAGVAR(hardcode_direct, $1)=no
-+        ;;
-+	motorola)
-+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+	  _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
-+	;;
-+      esac
-+      runpath_var='LD_RUN_PATH'
-+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      ;;
-+
-+    sysv4.3*)
-+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
-+      ;;
-+
-+    sysv4*MP*)
-+      if test -d /usr/nec; then
-+	_LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+	runpath_var=LD_RUN_PATH
-+	hardcode_runpath_var=yes
-+	_LT_TAGVAR(ld_shlibs, $1)=yes
-+      fi
-+      ;;
-+
-+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
-+      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      runpath_var='LD_RUN_PATH'
-+
-+      if test "$GCC" = yes; then
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+      else
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+      fi
-+      ;;
-+
-+    sysv5* | sco3.2v5* | sco5v6*)
-+      # Note: We can NOT use -z defs as we might desire, because we do not
-+      # link with -lc, and that would cause any symbols used from libc to
-+      # always be unresolved, which means just about no library would
-+      # ever link correctly.  If we're not using GNU ld we use -z text
-+      # though, which does catch some bad symbols but isn't as heavy-handed
-+      # as -z defs.
-+      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-+      _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
-+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
-+      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-+      _LT_TAGVAR(link_all_deplibs, $1)=yes
-+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
-+      runpath_var='LD_RUN_PATH'
-+
-+      if test "$GCC" = yes; then
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+      else
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+      fi
-+      ;;
-+
-+    uts4*)
-+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      ;;
-+
-+    *)
-+      _LT_TAGVAR(ld_shlibs, $1)=no
-+      ;;
-+    esac
-+
-+    if test x$host_vendor = xsni; then
-+      case $host in
-+      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym'
-+	;;
-+      esac
-+    fi
-+  fi
-+])
-+AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
-+test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-+
-+_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld
-+
-+_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl
-+_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl
-+_LT_DECL([], [extract_expsyms_cmds], [2],
-+    [The commands to extract the exported symbol list from a shared archive])
-+
-+#
-+# Do we need to explicitly link libc?
-+#
-+case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in
-+x|xyes)
-+  # Assume -lc should be added
-+  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-+
-+  if test "$enable_shared" = yes && test "$GCC" = yes; then
-+    case $_LT_TAGVAR(archive_cmds, $1) in
-+    *'~'*)
-+      # FIXME: we may have to deal with multi-command sequences.
-+      ;;
-+    '$CC '*)
-+      # Test whether the compiler implicitly links with -lc since on some
-+      # systems, -lgcc has to come before -lc. If gcc already passes -lc
-+      # to ld, don't add -lc before -lgcc.
-+      AC_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)])
-+      ;;
-+    esac
-+  fi
-+  ;;
-+esac
-+
-+_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0],
-+    [Whether or not to add -lc for building shared libraries])
-+_LT_TAGDECL([allow_libtool_libs_with_static_runtimes],
-+    [enable_shared_with_static_runtimes], [0],
-+    [Whether or not to disallow shared libs when runtime libs are static])
-+_LT_TAGDECL([], [export_dynamic_flag_spec], [1],
-+    [Compiler flag to allow reflexive dlopens])
-+_LT_TAGDECL([], [whole_archive_flag_spec], [1],
-+    [Compiler flag to generate shared objects directly from archives])
-+_LT_TAGDECL([], [compiler_needs_object], [1],
-+    [Whether the compiler copes with passing no objects directly])
-+_LT_TAGDECL([], [old_archive_from_new_cmds], [2],
-+    [Create an old-style archive from a shared archive])
-+_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2],
-+    [Create a temporary old-style archive to link instead of a shared archive])
-+_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive])
-+_LT_TAGDECL([], [archive_expsym_cmds], [2])
-+_LT_TAGDECL([], [module_cmds], [2],
-+    [Commands used to build a loadable module if different from building
-+    a shared archive.])
-+_LT_TAGDECL([], [module_expsym_cmds], [2])
-+_LT_TAGDECL([], [with_gnu_ld], [1],
-+    [Whether we are building with GNU ld or not])
-+_LT_TAGDECL([], [allow_undefined_flag], [1],
-+    [Flag that allows shared libraries with undefined symbols to be built])
-+_LT_TAGDECL([], [no_undefined_flag], [1],
-+    [Flag that enforces no undefined symbols])
-+_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
-+    [Flag to hardcode $libdir into a binary during linking.
-+    This must work even if $libdir does not exist])
-+_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1],
-+    [[If ld is used when linking, flag to hardcode $libdir into a binary
-+    during linking.  This must work even if $libdir does not exist]])
-+_LT_TAGDECL([], [hardcode_libdir_separator], [1],
-+    [Whether we need a single "-rpath" flag with a separated argument])
-+_LT_TAGDECL([], [hardcode_direct], [0],
-+    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
-+    DIR into the resulting binary])
-+_LT_TAGDECL([], [hardcode_direct_absolute], [0],
-+    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
-+    DIR into the resulting binary and the resulting library dependency is
-+    "absolute", i.e impossible to change by setting ${shlibpath_var} if the
-+    library is relocated])
-+_LT_TAGDECL([], [hardcode_minus_L], [0],
-+    [Set to "yes" if using the -LDIR flag during linking hardcodes DIR
-+    into the resulting binary])
-+_LT_TAGDECL([], [hardcode_shlibpath_var], [0],
-+    [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
-+    into the resulting binary])
-+_LT_TAGDECL([], [hardcode_automatic], [0],
-+    [Set to "yes" if building a shared library automatically hardcodes DIR
-+    into the library and all subsequent libraries and executables linked
-+    against it])
-+_LT_TAGDECL([], [inherit_rpath], [0],
-+    [Set to yes if linker adds runtime paths of dependent libraries
-+    to runtime path list])
-+_LT_TAGDECL([], [link_all_deplibs], [0],
-+    [Whether libtool must link a program against all its dependency libraries])
-+_LT_TAGDECL([], [fix_srcfile_path], [1],
-+    [Fix the shell variable $srcfile for the compiler])
-+_LT_TAGDECL([], [always_export_symbols], [0],
-+    [Set to "yes" if exported symbols are required])
-+_LT_TAGDECL([], [export_symbols_cmds], [2],
-+    [The commands to list exported symbols])
-+_LT_TAGDECL([], [exclude_expsyms], [1],
-+    [Symbols that should not be listed in the preloaded symbols])
-+_LT_TAGDECL([], [include_expsyms], [1],
-+    [Symbols that must always be exported])
-+_LT_TAGDECL([], [prelink_cmds], [2],
-+    [Commands necessary for linking programs (against libraries) with templates])
-+_LT_TAGDECL([], [file_list_spec], [1],
-+    [Specify filename containing input files])
-+dnl FIXME: Not yet implemented
-+dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1],
-+dnl    [Compiler flag to generate thread safe objects])
-+])# _LT_LINKER_SHLIBS
-+
-+
-+# _LT_LANG_C_CONFIG([TAG])
-+# ------------------------
-+# Ensure that the configuration variables for a C compiler are suitably
-+# defined.  These variables are subsequently used by _LT_CONFIG to write
-+# the compiler configuration to `libtool'.
-+m4_defun([_LT_LANG_C_CONFIG],
-+[m4_require([_LT_DECL_EGREP])dnl
-+lt_save_CC="$CC"
-+AC_LANG_PUSH(C)
-+
-+# Source file extension for C test sources.
-+ac_ext=c
-+
-+# Object file extension for compiled C test sources.
-+objext=o
-+_LT_TAGVAR(objext, $1)=$objext
-+
-+# Code to be used in simple compile tests
-+lt_simple_compile_test_code="int some_variable = 0;"
-+
-+# Code to be used in simple link tests
-+lt_simple_link_test_code='int main(){return(0);}'
-+
-+_LT_TAG_COMPILER
-+# Save the default compiler, since it gets overwritten when the other
-+# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
-+compiler_DEFAULT=$CC
-+
-+# save warnings/boilerplate of simple test code
-+_LT_COMPILER_BOILERPLATE
-+_LT_LINKER_BOILERPLATE
-+
-+## CAVEAT EMPTOR:
-+## There is no encapsulation within the following macros, do not change
-+## the running order or otherwise move them around unless you know exactly
-+## what you are doing...
-+if test -n "$compiler"; then
-+  _LT_COMPILER_NO_RTTI($1)
-+  _LT_COMPILER_PIC($1)
-+  _LT_COMPILER_C_O($1)
-+  _LT_COMPILER_FILE_LOCKS($1)
-+  _LT_LINKER_SHLIBS($1)
-+  _LT_SYS_DYNAMIC_LINKER($1)
-+  _LT_LINKER_HARDCODE_LIBPATH($1)
-+  LT_SYS_DLOPEN_SELF
-+  _LT_CMD_STRIPLIB
-+
-+  # Report which library types will actually be built
-+  AC_MSG_CHECKING([if libtool supports shared libraries])
-+  AC_MSG_RESULT([$can_build_shared])
-+
-+  AC_MSG_CHECKING([whether to build shared libraries])
-+  test "$can_build_shared" = "no" && enable_shared=no
-+
-+  # On AIX, shared libraries and static libraries use the same namespace, and
-+  # are all built from PIC.
-+  case $host_os in
-+  aix3*)
-+    test "$enable_shared" = yes && enable_static=no
-+    if test -n "$RANLIB"; then
-+      archive_cmds="$archive_cmds~\$RANLIB \$lib"
-+      postinstall_cmds='$RANLIB $lib'
-+    fi
-+    ;;
-+
-+  aix[[4-9]]*)
-+    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-+      test "$enable_shared" = yes && enable_static=no
-+    fi
-+    ;;
-+  esac
-+  AC_MSG_RESULT([$enable_shared])
-+
-+  AC_MSG_CHECKING([whether to build static libraries])
-+  # Make sure either enable_shared or enable_static is yes.
-+  test "$enable_shared" = yes || enable_static=yes
-+  AC_MSG_RESULT([$enable_static])
-+
-+  _LT_CONFIG($1)
-+fi
-+AC_LANG_POP
-+CC="$lt_save_CC"
-+])# _LT_LANG_C_CONFIG
-+
-+
-+# _LT_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
-+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-+    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-+    (test "X$CXX" != "Xg++"))) ; then
-+  AC_PROG_CXXCPP
-+else
-+  _lt_caught_CXX_error=yes
-+fi
-+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
-+_LT_TAGVAR(allow_undefined_flag, $1)=
-+_LT_TAGVAR(always_export_symbols, $1)=no
-+_LT_TAGVAR(archive_expsym_cmds, $1)=
-+_LT_TAGVAR(compiler_needs_object, $1)=no
-+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-+_LT_TAGVAR(hardcode_direct, $1)=no
-+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-+_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-+_LT_TAGVAR(hardcode_libdir_separator, $1)=
-+_LT_TAGVAR(hardcode_minus_L, $1)=no
-+_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-+_LT_TAGVAR(hardcode_automatic, $1)=no
-+_LT_TAGVAR(inherit_rpath, $1)=no
-+_LT_TAGVAR(module_cmds, $1)=
-+_LT_TAGVAR(module_expsym_cmds, $1)=
-+_LT_TAGVAR(link_all_deplibs, $1)=unknown
-+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-+_LT_TAGVAR(no_undefined_flag, $1)=
-+_LT_TAGVAR(whole_archive_flag_spec, $1)=
-+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-+
-+# Source file extension for C++ test sources.
-+ac_ext=cpp
-+
-+# Object file extension for compiled C++ test sources.
-+objext=o
-+_LT_TAGVAR(objext, $1)=$objext
-+
-+# No sense in running all these tests if we already determined that
-+# the CXX compiler isn't working.  Some variables (like enable_shared)
-+# are currently assumed to apply to all compilers on this platform,
-+# and will be corrupted by setting them based on a non-working compiler.
-+if test "$_lt_caught_CXX_error" != yes; then
-+  # Code to be used in simple compile tests
-+  lt_simple_compile_test_code="int some_variable = 0;"
-+
-+  # Code to be used in simple link tests
-+  lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
-+
-+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-+  _LT_TAG_COMPILER
-+
-+  # save warnings/boilerplate of simple test code
-+  _LT_COMPILER_BOILERPLATE
-+  _LT_LINKER_BOILERPLATE
-+
-+  # Allow CC to be a program name with arguments.
-+  lt_save_CC=$CC
-+  lt_save_LD=$LD
-+  lt_save_GCC=$GCC
-+  GCC=$GXX
-+  lt_save_with_gnu_ld=$with_gnu_ld
-+  lt_save_path_LD=$lt_cv_path_LD
-+  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
-+    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
-+  else
-+    $as_unset lt_cv_prog_gnu_ld
-+  fi
-+  if test -n "${lt_cv_path_LDCXX+set}"; then
-+    lt_cv_path_LD=$lt_cv_path_LDCXX
-+  else
-+    $as_unset lt_cv_path_LD
-+  fi
-+  test -z "${LDCXX+set}" || LD=$LDCXX
-+  CC=${CXX-"c++"}
-+  compiler=$CC
-+  _LT_TAGVAR(compiler, $1)=$CC
-+  _LT_CC_BASENAME([$compiler])
-+
-+  if test -n "$compiler"; then
-+    # We don't want -fno-exception when compiling C++ code, so set the
-+    # no_builtin_flag separately
-+    if test "$GXX" = yes; then
-+      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
-+    else
-+      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-+    fi
-+
-+    if test "$GXX" = yes; then
-+      # Set up default GNU C++ configuration
-+
-+      LT_PATH_LD
-+
-+      # Check if GNU C++ uses GNU ld as the underlying linker, since the
-+      # archiving commands below assume that GNU ld is being used.
-+      if test "$with_gnu_ld" = yes; then
-+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+
-+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-+
-+        # If archive_cmds runs LD, not CC, wlarc should be empty
-+        # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
-+        #     investigate it a little bit more. (MM)
-+        wlarc='${wl}'
-+
-+        # ancient GNU ld didn't support --whole-archive et. al.
-+        if eval "`$CC -print-prog-name=ld` --help 2>&1" |
-+	  $GREP 'no-whole-archive' > /dev/null; then
-+          _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+        else
-+          _LT_TAGVAR(whole_archive_flag_spec, $1)=
-+        fi
-+      else
-+        with_gnu_ld=no
-+        wlarc=
-+
-+        # A generic and very simple default shared library creation
-+        # command for GNU C++ for the case where it uses the native
-+        # linker, instead of GNU ld.  If possible, this setting should
-+        # overridden to take advantage of the native linker features on
-+        # the platform it is being used on.
-+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-+      fi
-+
-+      # Commands to make compiler produce verbose output that lists
-+      # what "hidden" libraries, object files and flags are used when
-+      # linking a shared library.
-+      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
-+
-+    else
-+      GXX=no
-+      with_gnu_ld=no
-+      wlarc=
-+    fi
-+
-+    # PORTME: fill in a description of your system's C++ link characteristics
-+    AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-+    _LT_TAGVAR(ld_shlibs, $1)=yes
-+    case $host_os in
-+      aix3*)
-+        # FIXME: insert proper C++ library support
-+        _LT_TAGVAR(ld_shlibs, $1)=no
-+        ;;
-+      aix[[4-9]]*)
-+        if test "$host_cpu" = ia64; then
-+          # On IA64, the linker does run time linking by default, so we don't
-+          # have to do anything special.
-+          aix_use_runtimelinking=no
-+          exp_sym_flag='-Bexport'
-+          no_entry_flag=""
-+        else
-+          aix_use_runtimelinking=no
-+
-+          # Test if we are trying to use run time linking or normal
-+          # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-+          # need to do runtime linking.
-+          case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
-+	    for ld_flag in $LDFLAGS; do
-+	      case $ld_flag in
-+	      *-brtl*)
-+	        aix_use_runtimelinking=yes
-+	        break
-+	        ;;
-+	      esac
-+	    done
-+	    ;;
-+          esac
-+
-+          exp_sym_flag='-bexport'
-+          no_entry_flag='-bnoentry'
-+        fi
-+
-+        # When large executables or shared objects are built, AIX ld can
-+        # have problems creating the table of contents.  If linking a library
-+        # or program results in "error TOC overflow" add -mminimal-toc to
-+        # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-+        # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-+
-+        _LT_TAGVAR(archive_cmds, $1)=''
-+        _LT_TAGVAR(hardcode_direct, $1)=yes
-+        _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-+        _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-+        _LT_TAGVAR(link_all_deplibs, $1)=yes
-+        _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
-+
-+        if test "$GXX" = yes; then
-+          case $host_os in aix4.[[012]]|aix4.[[012]].*)
-+          # We only want to do this on AIX 4.2 and lower, the check
-+          # below for broken collect2 doesn't work under 4.3+
-+	  collect2name=`${CC} -print-prog-name=collect2`
-+	  if test -f "$collect2name" &&
-+	     strings "$collect2name" | $GREP resolve_lib_name >/dev/null
-+	  then
-+	    # We have reworked collect2
-+	    :
-+	  else
-+	    # We have old collect2
-+	    _LT_TAGVAR(hardcode_direct, $1)=unsupported
-+	    # It fails to find uninstalled libraries when the uninstalled
-+	    # path is not listed in the libpath.  Setting hardcode_minus_L
-+	    # to unsupported forces relinking
-+	    _LT_TAGVAR(hardcode_minus_L, $1)=yes
-+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=
-+	  fi
-+          esac
-+          shared_flag='-shared'
-+	  if test "$aix_use_runtimelinking" = yes; then
-+	    shared_flag="$shared_flag "'${wl}-G'
-+	  fi
-+        else
-+          # not using gcc
-+          if test "$host_cpu" = ia64; then
-+	  # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-+	  # chokes on -Wl,-G. The following line is correct:
-+	  shared_flag='-G'
-+          else
-+	    if test "$aix_use_runtimelinking" = yes; then
-+	      shared_flag='${wl}-G'
-+	    else
-+	      shared_flag='${wl}-bM:SRE'
-+	    fi
-+          fi
-+        fi
-+
-+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
-+        # It seems that -bexpall does not export symbols beginning with
-+        # underscore (_), so it is better to generate a list of symbols to
-+	# export.
-+        _LT_TAGVAR(always_export_symbols, $1)=yes
-+        if test "$aix_use_runtimelinking" = yes; then
-+          # Warning - without using the other runtime loading flags (-brtl),
-+          # -berok will link without error, but may produce a broken library.
-+          _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
-+          # Determine the default libpath from the value encoded in an empty
-+          # executable.
-+          _LT_SYS_MODULE_PATH_AIX
-+          _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"
-+        else
-+          if test "$host_cpu" = ia64; then
-+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-+	    _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-+	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-+          else
-+	    # Determine the default libpath from the value encoded in an
-+	    # empty executable.
-+	    _LT_SYS_MODULE_PATH_AIX
-+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-+	    # Warning - without using the other run time loading flags,
-+	    # -berok will link without error, but may produce a broken library.
-+	    _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-+	    _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-+	    # Exported symbols can be pulled into shared objects from archives
-+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-+	    _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-+	    # This is similar to how AIX traditionally builds its shared
-+	    # libraries.
-+	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-+          fi
-+        fi
-+        ;;
-+
-+      beos*)
-+	if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-+	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-+	  # Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
-+	  # support --undefined.  This deserves some investigation.  FIXME
-+	  _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	else
-+	  _LT_TAGVAR(ld_shlibs, $1)=no
-+	fi
-+	;;
-+
-+      chorus*)
-+        case $cc_basename in
-+          *)
-+	  # FIXME: insert proper C++ library support
-+	  _LT_TAGVAR(ld_shlibs, $1)=no
-+	  ;;
-+        esac
-+        ;;
-+
-+      cygwin* | mingw* | pw32* | cegcc*)
-+        # _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(allow_undefined_flag, $1)=unsupported
-+        _LT_TAGVAR(always_export_symbols, $1)=no
-+        _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-+
-+        if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-+          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-+          # If the export-symbols file already is a .def file (1st line
-+          # is EXPORTS), use it as is; otherwise, prepend...
-+          _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-+	    cp $export_symbols $output_objdir/$soname.def;
-+          else
-+	    echo EXPORTS > $output_objdir/$soname.def;
-+	    cat $export_symbols >> $output_objdir/$soname.def;
-+          fi~
-+          $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-+        else
-+          _LT_TAGVAR(ld_shlibs, $1)=no
-+        fi
-+        ;;
-+      darwin* | rhapsody*)
-+        _LT_DARWIN_LINKER_FEATURES($1)
-+	;;
-+
-+      dgux*)
-+        case $cc_basename in
-+          ec++*)
-+	    # FIXME: insert proper C++ library support
-+	    _LT_TAGVAR(ld_shlibs, $1)=no
-+	    ;;
-+          ghcx*)
-+	    # Green Hills C++ Compiler
-+	    # FIXME: insert proper C++ library support
-+	    _LT_TAGVAR(ld_shlibs, $1)=no
-+	    ;;
-+          *)
-+	    # FIXME: insert proper C++ library support
-+	    _LT_TAGVAR(ld_shlibs, $1)=no
-+	    ;;
-+        esac
-+        ;;
-+
-+      freebsd[[12]]*)
-+        # C++ shared libraries reported to be fairly broken before
-+	# switch to ELF
-+        _LT_TAGVAR(ld_shlibs, $1)=no
-+        ;;
-+
-+      freebsd-elf*)
-+        _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-+        ;;
-+
-+      freebsd* | dragonfly*)
-+        # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-+        # conventions
-+        _LT_TAGVAR(ld_shlibs, $1)=yes
-+        ;;
-+
-+      gnu*)
-+        ;;
-+
-+      hpux9*)
-+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-+        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+        _LT_TAGVAR(hardcode_direct, $1)=yes
-+        _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-+				             # but as the default
-+				             # location of the library.
-+
-+        case $cc_basename in
-+          CC*)
-+            # FIXME: insert proper C++ library support
-+            _LT_TAGVAR(ld_shlibs, $1)=no
-+            ;;
-+          aCC*)
-+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-+            # Commands to make compiler produce verbose output that lists
-+            # what "hidden" libraries, object files and flags are used when
-+            # linking a shared library.
-+            #
-+            # There doesn't appear to be a way to prevent this compiler from
-+            # explicitly linking system object files so we need to strip them
-+            # from the output so that they don't get included in the library
-+            # dependencies.
-+            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
-+            ;;
-+          *)
-+            if test "$GXX" = yes; then
-+              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-+            else
-+              # FIXME: insert proper C++ library support
-+              _LT_TAGVAR(ld_shlibs, $1)=no
-+            fi
-+            ;;
-+        esac
-+        ;;
-+
-+      hpux10*|hpux11*)
-+        if test $with_gnu_ld = no; then
-+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-+	  _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+
-+          case $host_cpu in
-+            hppa*64*|ia64*)
-+              ;;
-+            *)
-+	      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+              ;;
-+          esac
-+        fi
-+        case $host_cpu in
-+          hppa*64*|ia64*)
-+            _LT_TAGVAR(hardcode_direct, $1)=no
-+            _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+            ;;
-+          *)
-+            _LT_TAGVAR(hardcode_direct, $1)=yes
-+            _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-+            _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-+					         # but as the default
-+					         # location of the library.
-+            ;;
-+        esac
-+
-+        case $cc_basename in
-+          CC*)
-+	    # FIXME: insert proper C++ library support
-+	    _LT_TAGVAR(ld_shlibs, $1)=no
-+	    ;;
-+          aCC*)
-+	    case $host_cpu in
-+	      hppa*64*)
-+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+	        ;;
-+	      ia64*)
-+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+	        ;;
-+	      *)
-+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+	        ;;
-+	    esac
-+	    # Commands to make compiler produce verbose output that lists
-+	    # what "hidden" libraries, object files and flags are used when
-+	    # linking a shared library.
-+	    #
-+	    # There doesn't appear to be a way to prevent this compiler from
-+	    # explicitly linking system object files so we need to strip them
-+	    # from the output so that they don't get included in the library
-+	    # dependencies.
-+	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
-+	    ;;
-+          *)
-+	    if test "$GXX" = yes; then
-+	      if test $with_gnu_ld = no; then
-+	        case $host_cpu in
-+	          hppa*64*)
-+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+	            ;;
-+	          ia64*)
-+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+	            ;;
-+	          *)
-+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+	            ;;
-+	        esac
-+	      fi
-+	    else
-+	      # FIXME: insert proper C++ library support
-+	      _LT_TAGVAR(ld_shlibs, $1)=no
-+	    fi
-+	    ;;
-+        esac
-+        ;;
-+
-+      interix[[3-9]]*)
-+	_LT_TAGVAR(hardcode_direct, $1)=no
-+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+	# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-+	# Instead, shared libraries are loaded at an image base (0x10000000 by
-+	# default) and relocated if they conflict, which is a slow very memory
-+	# consuming and fragmenting process.  To avoid this, we pick a random,
-+	# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-+	# time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-+	_LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-+	;;
-+      irix5* | irix6*)
-+        case $cc_basename in
-+          CC*)
-+	    # SGI C++
-+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $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
-+	    # necessary to make sure instantiated templates are included
-+	    # in the archive.
-+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
-+	    ;;
-+          *)
-+	    if test "$GXX" = yes; then
-+	      if test "$with_gnu_ld" = no; then
-+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -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
-+	        _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'
-+	      fi
-+	    fi
-+	    _LT_TAGVAR(link_all_deplibs, $1)=yes
-+	    ;;
-+        esac
-+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+        _LT_TAGVAR(inherit_rpath, $1)=yes
-+        ;;
-+
-+      linux* | k*bsd*-gnu | kopensolaris*-gnu)
-+        case $cc_basename in
-+          KCC*)
-+	    # Kuck and Associates, Inc. (KAI) C++ Compiler
-+
-+	    # KCC will only create a shared library if the output file
-+	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
-+	    # to its proper name (with version) after linking.
-+	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-+	    _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
-+	    # Commands to make compiler produce verbose output that lists
-+	    # what "hidden" libraries, object files and flags are used when
-+	    # linking a shared library.
-+	    #
-+	    # There doesn't appear to be a way to prevent this compiler from
-+	    # explicitly linking system object files so we need to strip them
-+	    # from the output so that they don't get included in the library
-+	    # dependencies.
-+	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
-+
-+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-+
-+	    # Archives containing C++ object files must be created using
-+	    # "CC -Bstatic", where "CC" is the KAI C++ compiler.
-+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
-+	    ;;
-+	  icpc* | ecpc* )
-+	    # Intel C++
-+	    with_gnu_ld=yes
-+	    # version 8.0 and above of icpc choke on multiply defined symbols
-+	    # if we add $predep_objects and $postdep_objects, however 7.1 and
-+	    # earlier do not add the objects themselves.
-+	    case `$CC -V 2>&1` in
-+	      *"Version 7."*)
-+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+		;;
-+	      *)  # Version 8.0 or newer
-+	        tmp_idyn=
-+	        case $host_cpu in
-+		  ia64*) tmp_idyn=' -i_dynamic';;
-+		esac
-+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+		;;
-+	    esac
-+	    _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-+	    ;;
-+          pgCC* | pgcpp*)
-+            # Portland Group C++ compiler
-+	    case `$CC -V` in
-+	    *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*)
-+	      _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
-+		rm -rf $tpldir~
-+		$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
-+		compile_command="$compile_command `find $tpldir -name \*.o | $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`~
-+		$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'
-+	      _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'
-+	      ;;
-+	    *) # Version 6 will use weak symbols
-+	      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-+	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-+	      ;;
-+	    esac
-+
-+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-+            ;;
-+	  cxx*)
-+	    # Compaq C++
-+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
-+
-+	    runpath_var=LD_RUN_PATH
-+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+
-+	    # Commands to make compiler produce verbose output that lists
-+	    # what "hidden" libraries, object files and flags are used when
-+	    # linking a shared library.
-+	    #
-+	    # There doesn't appear to be a way to prevent this compiler from
-+	    # explicitly linking system object files so we need to strip them
-+	    # from the output so that they don't get included in the library
-+	    # dependencies.
-+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$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'
-+	    ;;
-+	  xl*)
-+	    # IBM XL 8.0 on PPC, with GNU ld
-+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-+	    _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	    if test "x$supports_anon_versioning" = xyes; then
-+	      _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-+		cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-+		echo "local: *; };" >> $output_objdir/$libname.ver~
-+		$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+	    fi
-+	    ;;
-+	  *)
-+	    case `$CC -V 2>&1 | sed 5q` in
-+	    *Sun\ C*)
-+	      # Sun C++ 5.9
-+	      _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-+	      _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
-+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$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'
-+
-+	      # Archives containing C++ object files must be created using
-+	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
-+	      # necessary to make sure instantiated templates are included
-+	      # in the archive.
-+	      _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
-+	      ;;
-+	    esac
-+	    ;;
-+	esac
-+	;;
-+
-+      lynxos*)
-+        # FIXME: insert proper C++ library support
-+	_LT_TAGVAR(ld_shlibs, $1)=no
-+	;;
-+
-+      m88k*)
-+        # FIXME: insert proper C++ library support
-+        _LT_TAGVAR(ld_shlibs, $1)=no
-+	;;
-+
-+      mvs*)
-+        case $cc_basename in
-+          cxx*)
-+	    # FIXME: insert proper C++ library support
-+	    _LT_TAGVAR(ld_shlibs, $1)=no
-+	    ;;
-+	  *)
-+	    # FIXME: insert proper C++ library support
-+	    _LT_TAGVAR(ld_shlibs, $1)=no
-+	    ;;
-+	esac
-+	;;
-+
-+      netbsd*)
-+        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-+	  _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
-+	  wlarc=
-+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+	  _LT_TAGVAR(hardcode_direct, $1)=yes
-+	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+	fi
-+	# Workaround some broken pre-1.5 toolchains
-+	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
-+	;;
-+
-+      *nto* | *qnx*)
-+        _LT_TAGVAR(ld_shlibs, $1)=yes
-+	;;
-+
-+      openbsd2*)
-+        # C++ shared libraries are fairly broken
-+	_LT_TAGVAR(ld_shlibs, $1)=no
-+	;;
-+
-+      openbsd*)
-+	if test -f /usr/libexec/ld.so; then
-+	  _LT_TAGVAR(hardcode_direct, $1)=yes
-+	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+	    _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+	  fi
-+	  output_verbose_link_cmd=echo
-+	else
-+	  _LT_TAGVAR(ld_shlibs, $1)=no
-+	fi
-+	;;
-+
-+      osf3* | osf4* | osf5*)
-+        case $cc_basename in
-+          KCC*)
-+	    # Kuck and Associates, Inc. (KAI) C++ Compiler
-+
-+	    # KCC will only create a shared library if the output file
-+	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
-+	    # to its proper name (with version) after linking.
-+	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-+
-+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+
-+	    # Archives containing C++ object files must be created using
-+	    # the KAI C++ compiler.
-+	    case $host in
-+	      osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;;
-+	      *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;;
-+	    esac
-+	    ;;
-+          RCC*)
-+	    # Rational C++ 2.4.1
-+	    # FIXME: insert proper C++ library support
-+	    _LT_TAGVAR(ld_shlibs, $1)=no
-+	    ;;
-+          cxx*)
-+	    case $host in
-+	      osf3*)
-+	        _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -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_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~
-+	          $RM $lib.exp'
-+	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-+		;;
-+	    esac
-+
-+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+
-+	    # Commands to make compiler produce verbose output that lists
-+	    # what "hidden" libraries, object files and flags are used when
-+	    # linking a shared library.
-+	    #
-+	    # There doesn't appear to be a way to prevent this compiler from
-+	    # explicitly linking system object files so we need to strip them
-+	    # from the output so that they don't get included in the library
-+	    # dependencies.
-+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$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
-+	      _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}-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
-+
-+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+	      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+
-+	      # Commands to make compiler produce verbose output that lists
-+	      # what "hidden" libraries, object files and flags are used when
-+	      # linking a shared library.
-+	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
-+
-+	    else
-+	      # FIXME: insert proper C++ library support
-+	      _LT_TAGVAR(ld_shlibs, $1)=no
-+	    fi
-+	    ;;
-+        esac
-+        ;;
-+
-+      psos*)
-+        # FIXME: insert proper C++ library support
-+        _LT_TAGVAR(ld_shlibs, $1)=no
-+        ;;
-+
-+      sunos4*)
-+        case $cc_basename in
-+          CC*)
-+	    # Sun C++ 4.x
-+	    # FIXME: insert proper C++ library support
-+	    _LT_TAGVAR(ld_shlibs, $1)=no
-+	    ;;
-+          lcc*)
-+	    # Lucid
-+	    # FIXME: insert proper C++ library support
-+	    _LT_TAGVAR(ld_shlibs, $1)=no
-+	    ;;
-+          *)
-+	    # FIXME: insert proper C++ library support
-+	    _LT_TAGVAR(ld_shlibs, $1)=no
-+	    ;;
-+        esac
-+        ;;
-+
-+      solaris*)
-+        case $cc_basename in
-+          CC*)
-+	    # Sun C++ 4.2, 5.x and Centerline C++
-+            _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
-+	    _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-+	    _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-+	      $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-+
-+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+	    _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+	    case $host_os in
-+	      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-+	      *)
-+		# The compiler driver will combine and reorder linker options,
-+		# but understands `-z linker_flag'.
-+	        # Supported since Solaris 2.6 (maybe 2.5.1?)
-+		_LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
-+	        ;;
-+	    esac
-+	    _LT_TAGVAR(link_all_deplibs, $1)=yes
-+
-+	    output_verbose_link_cmd='echo'
-+
-+	    # Archives containing C++ object files must be created using
-+	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
-+	    # necessary to make sure instantiated templates are included
-+	    # in the archive.
-+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
-+	    ;;
-+          gcx*)
-+	    # Green Hills C++ Compiler
-+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-+
-+	    # The C++ compiler must be used to create the archive.
-+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-+	    ;;
-+          *)
-+	    # GNU C++ compiler with Solaris linker
-+	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-+	      _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
-+	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
-+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-+	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-+		  $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-+
-+	        # Commands to make compiler produce verbose output that lists
-+	        # what "hidden" libraries, object files and flags are used when
-+	        # linking a shared library.
-+	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
-+	      else
-+	        # g++ 2.7 appears to require `-G' NOT `-shared' on this
-+	        # platform.
-+	        _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-+	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-+		  $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-+
-+	        # Commands to make compiler produce verbose output that lists
-+	        # what "hidden" libraries, object files and flags are used when
-+	        # linking a shared library.
-+	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
-+	      fi
-+
-+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
-+	      case $host_os in
-+		solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-+		*)
-+		  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-+		  ;;
-+	      esac
-+	    fi
-+	    ;;
-+        esac
-+        ;;
-+
-+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
-+      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      runpath_var='LD_RUN_PATH'
-+
-+      case $cc_basename in
-+        CC*)
-+	  _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	  ;;
-+	*)
-+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	  ;;
-+      esac
-+      ;;
-+
-+      sysv5* | sco3.2v5* | sco5v6*)
-+	# Note: We can NOT use -z defs as we might desire, because we do not
-+	# link with -lc, and that would cause any symbols used from libc to
-+	# always be unresolved, which means just about no library would
-+	# ever link correctly.  If we're not using GNU ld we use -z text
-+	# though, which does catch some bad symbols but isn't as heavy-handed
-+	# as -z defs.
-+	_LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-+	_LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
-+	_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
-+	_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-+	_LT_TAGVAR(link_all_deplibs, $1)=yes
-+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
-+	runpath_var='LD_RUN_PATH'
-+
-+	case $cc_basename in
-+          CC*)
-+	    _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	    ;;
-+	  *)
-+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	    ;;
-+	esac
-+      ;;
-+
-+      tandem*)
-+        case $cc_basename in
-+          NCC*)
-+	    # NonStop-UX NCC 3.20
-+	    # FIXME: insert proper C++ library support
-+	    _LT_TAGVAR(ld_shlibs, $1)=no
-+	    ;;
-+          *)
-+	    # FIXME: insert proper C++ library support
-+	    _LT_TAGVAR(ld_shlibs, $1)=no
-+	    ;;
-+        esac
-+        ;;
-+
-+      vxworks*)
-+        # FIXME: insert proper C++ library support
-+        _LT_TAGVAR(ld_shlibs, $1)=no
-+        ;;
-+
-+      *)
-+        # FIXME: insert proper C++ library support
-+        _LT_TAGVAR(ld_shlibs, $1)=no
-+        ;;
-+    esac
-+
-+    AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
-+    test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-+
-+    _LT_TAGVAR(GCC, $1)="$GXX"
-+    _LT_TAGVAR(LD, $1)="$LD"
-+
-+    ## CAVEAT EMPTOR:
-+    ## There is no encapsulation within the following macros, do not change
-+    ## the running order or otherwise move them around unless you know exactly
-+    ## what you are doing...
-+    _LT_SYS_HIDDEN_LIBDEPS($1)
-+    _LT_COMPILER_PIC($1)
-+    _LT_COMPILER_C_O($1)
-+    _LT_COMPILER_FILE_LOCKS($1)
-+    _LT_LINKER_SHLIBS($1)
-+    _LT_SYS_DYNAMIC_LINKER($1)
-+    _LT_LINKER_HARDCODE_LIBPATH($1)
-+
-+    _LT_CONFIG($1)
-+  fi # test -n "$compiler"
-+
-+  CC=$lt_save_CC
-+  LDCXX=$LD
-+  LD=$lt_save_LD
-+  GCC=$lt_save_GCC
-+  with_gnu_ld=$lt_save_with_gnu_ld
-+  lt_cv_path_LDCXX=$lt_cv_path_LD
-+  lt_cv_path_LD=$lt_save_path_LD
-+  lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
-+  lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-+fi # test "$_lt_caught_CXX_error" != yes
-+
-+AC_LANG_POP
-+])# _LT_LANG_CXX_CONFIG
-+
-+
-+# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
-+# ---------------------------------
-+# Figure out "hidden" library dependencies from verbose
-+# compiler output when linking a shared library.
-+# Parse the compiler output and extract the necessary
-+# objects, libraries and library flags.
-+m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
-+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-+# Dependencies to place before and after the object being linked:
-+_LT_TAGVAR(predep_objects, $1)=
-+_LT_TAGVAR(postdep_objects, $1)=
-+_LT_TAGVAR(predeps, $1)=
-+_LT_TAGVAR(postdeps, $1)=
-+_LT_TAGVAR(compiler_lib_search_path, $1)=
-+
-+dnl we can't use the lt_simple_compile_test_code here,
-+dnl because it contains code intended for an executable,
-+dnl not a library.  It's possible we should let each
-+dnl tag define a new lt_????_link_test_code variable,
-+dnl but it's only used here...
-+m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF
-+int a;
-+void foo (void) { a = 0; }
-+_LT_EOF
-+], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF
-+class Foo
-+{
-+public:
-+  Foo (void) { a = 0; }
-+private:
-+  int a;
-+};
-+_LT_EOF
-+], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF
-+      subroutine foo
-+      implicit none
-+      integer*4 a
-+      a=0
-+      return
-+      end
-+_LT_EOF
-+], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF
-+      subroutine foo
-+      implicit none
-+      integer a
-+      a=0
-+      return
-+      end
-+_LT_EOF
-+], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF
-+public class foo {
-+  private int a;
-+  public void bar (void) {
-+    a = 0;
-+  }
-+};
-+_LT_EOF
-+])
-+dnl Parse the compiler output and extract the necessary
-+dnl objects, libraries and library flags.
-+if AC_TRY_EVAL(ac_compile); then
-+  # Parse the compiler output and extract the necessary
-+  # objects, libraries and library flags.
-+
-+  # Sentinel used to keep track of whether or not we are before
-+  # the conftest object file.
-+  pre_test_object_deps_done=no
-+
-+  for p in `eval "$output_verbose_link_cmd"`; do
-+    case $p in
-+
-+    -L* | -R* | -l*)
-+       # Some compilers place space between "-{L,R}" and the path.
-+       # Remove the space.
-+       if test $p = "-L" ||
-+          test $p = "-R"; then
-+	 prev=$p
-+	 continue
-+       else
-+	 prev=
-+       fi
-+
-+       if test "$pre_test_object_deps_done" = no; then
-+	 case $p in
-+	 -L* | -R*)
-+	   # Internal compiler library paths should come after those
-+	   # provided the user.  The postdeps already come after the
-+	   # user supplied libs so there is no need to process them.
-+	   if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then
-+	     _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
-+	   else
-+	     _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
-+	   fi
-+	   ;;
-+	 # The "-l" case would never come before the object being
-+	 # linked, so don't bother handling this case.
-+	 esac
-+       else
-+	 if test -z "$_LT_TAGVAR(postdeps, $1)"; then
-+	   _LT_TAGVAR(postdeps, $1)="${prev}${p}"
-+	 else
-+	   _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
-+	 fi
-+       fi
-+       ;;
-+
-+    *.$objext)
-+       # This assumes that the test object file only shows up
-+       # once in the compiler output.
-+       if test "$p" = "conftest.$objext"; then
-+	 pre_test_object_deps_done=yes
-+	 continue
-+       fi
-+
-+       if test "$pre_test_object_deps_done" = no; then
-+	 if test -z "$_LT_TAGVAR(predep_objects, $1)"; then
-+	   _LT_TAGVAR(predep_objects, $1)="$p"
-+	 else
-+	   _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p"
-+	 fi
-+       else
-+	 if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then
-+	   _LT_TAGVAR(postdep_objects, $1)="$p"
-+	 else
-+	   _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p"
-+	 fi
-+       fi
-+       ;;
-+
-+    *) ;; # Ignore the rest.
-+
-+    esac
-+  done
-+
-+  # Clean up.
-+  rm -f a.out a.exe
-+else
-+  echo "libtool.m4: error: problem compiling $1 test program"
-+fi
-+
-+$RM -f confest.$objext
-+
-+# PORTME: override above test on systems where it is broken
-+m4_if([$1], [CXX],
-+[case $host_os in
-+interix[[3-9]]*)
-+  # Interix 3.5 installs completely hosed .la files for C++, so rather than
-+  # hack all around it, let's just trust "g++" to DTRT.
-+  _LT_TAGVAR(predep_objects,$1)=
-+  _LT_TAGVAR(postdep_objects,$1)=
-+  _LT_TAGVAR(postdeps,$1)=
-+  ;;
-+
-+linux*)
-+  case `$CC -V 2>&1 | sed 5q` in
-+  *Sun\ C*)
-+    # Sun C++ 5.9
-+
-+    # The more standards-conforming stlport4 library is
-+    # incompatible with the Cstd library. Avoid specifying
-+    # it if it's in CXXFLAGS. Ignore libCrun as
-+    # -library=stlport4 depends on it.
-+    case " $CXX $CXXFLAGS " in
-+    *" -library=stlport4 "*)
-+      solaris_use_stlport4=yes
-+      ;;
-+    esac
-+
-+    if test "$solaris_use_stlport4" != yes; then
-+      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
-+    fi
-+    ;;
-+  esac
-+  ;;
-+
-+solaris*)
-+  case $cc_basename in
-+  CC*)
-+    # The more standards-conforming stlport4 library is
-+    # incompatible with the Cstd library. Avoid specifying
-+    # it if it's in CXXFLAGS. Ignore libCrun as
-+    # -library=stlport4 depends on it.
-+    case " $CXX $CXXFLAGS " in
-+    *" -library=stlport4 "*)
-+      solaris_use_stlport4=yes
-+      ;;
-+    esac
-+
-+    # Adding this requires a known-good setup of shared libraries for
-+    # Sun compiler versions before 5.6, else PIC objects from an old
-+    # archive will be linked into the output, leading to subtle bugs.
-+    if test "$solaris_use_stlport4" != yes; then
-+      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
-+    fi
-+    ;;
-+  esac
-+  ;;
-+esac
-+])
-+
-+case " $_LT_TAGVAR(postdeps, $1) " in
-+*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;;
-+esac
-+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=
-+if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then
-+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
-+fi
-+_LT_TAGDECL([], [compiler_lib_search_dirs], [1],
-+    [The directories searched by this compiler when creating a shared library])
-+_LT_TAGDECL([], [predep_objects], [1],
-+    [Dependencies to place before and after the objects being linked to
-+    create a shared library])
-+_LT_TAGDECL([], [postdep_objects], [1])
-+_LT_TAGDECL([], [predeps], [1])
-+_LT_TAGDECL([], [postdeps], [1])
-+_LT_TAGDECL([], [compiler_lib_search_path], [1],
-+    [The library search path used internally by the compiler when linking
-+    a shared library])
-+])# _LT_SYS_HIDDEN_LIBDEPS
-+
-+
-+# _LT_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)
-+
-+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-+_LT_TAGVAR(allow_undefined_flag, $1)=
-+_LT_TAGVAR(always_export_symbols, $1)=no
-+_LT_TAGVAR(archive_expsym_cmds, $1)=
-+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-+_LT_TAGVAR(hardcode_direct, $1)=no
-+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-+_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-+_LT_TAGVAR(hardcode_libdir_separator, $1)=
-+_LT_TAGVAR(hardcode_minus_L, $1)=no
-+_LT_TAGVAR(hardcode_automatic, $1)=no
-+_LT_TAGVAR(inherit_rpath, $1)=no
-+_LT_TAGVAR(module_cmds, $1)=
-+_LT_TAGVAR(module_expsym_cmds, $1)=
-+_LT_TAGVAR(link_all_deplibs, $1)=unknown
-+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-+_LT_TAGVAR(no_undefined_flag, $1)=
-+_LT_TAGVAR(whole_archive_flag_spec, $1)=
-+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-+
-+# Source file extension for f77 test sources.
-+ac_ext=f
-+
-+# Object file extension for compiled f77 test sources.
-+objext=o
-+_LT_TAGVAR(objext, $1)=$objext
-+
-+# No sense in running all these tests if we already determined that
-+# the F77 compiler isn't working.  Some variables (like enable_shared)
-+# are currently assumed to apply to all compilers on this platform,
-+# and will be corrupted by setting them based on a non-working compiler.
-+if test "$_lt_disable_F77" != yes; then
-+  # Code to be used in simple compile tests
-+  lt_simple_compile_test_code="\
-+      subroutine t
-+      return
-+      end
-+"
-+
-+  # Code to be used in simple link tests
-+  lt_simple_link_test_code="\
-+      program t
-+      end
-+"
-+
-+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-+  _LT_TAG_COMPILER
-+
-+  # save warnings/boilerplate of simple test code
-+  _LT_COMPILER_BOILERPLATE
-+  _LT_LINKER_BOILERPLATE
-+
-+  # Allow CC to be a program name with arguments.
-+  lt_save_CC="$CC"
-+  lt_save_GCC=$GCC
-+  CC=${F77-"f77"}
-+  compiler=$CC
-+  _LT_TAGVAR(compiler, $1)=$CC
-+  _LT_CC_BASENAME([$compiler])
-+  GCC=$G77
-+  if test -n "$compiler"; then
-+    AC_MSG_CHECKING([if libtool supports shared libraries])
-+    AC_MSG_RESULT([$can_build_shared])
-+
-+    AC_MSG_CHECKING([whether to build shared libraries])
-+    test "$can_build_shared" = "no" && enable_shared=no
-+
-+    # On AIX, shared libraries and static libraries use the same namespace, and
-+    # are all built from PIC.
-+    case $host_os in
-+      aix3*)
-+        test "$enable_shared" = yes && enable_static=no
-+        if test -n "$RANLIB"; then
-+          archive_cmds="$archive_cmds~\$RANLIB \$lib"
-+          postinstall_cmds='$RANLIB $lib'
-+        fi
-+        ;;
-+      aix[[4-9]]*)
-+	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-+	  test "$enable_shared" = yes && enable_static=no
-+	fi
-+        ;;
-+    esac
-+    AC_MSG_RESULT([$enable_shared])
-+
-+    AC_MSG_CHECKING([whether to build static libraries])
-+    # Make sure either enable_shared or enable_static is yes.
-+    test "$enable_shared" = yes || enable_static=yes
-+    AC_MSG_RESULT([$enable_static])
-+
-+    _LT_TAGVAR(GCC, $1)="$G77"
-+    _LT_TAGVAR(LD, $1)="$LD"
-+
-+    ## CAVEAT EMPTOR:
-+    ## There is no encapsulation within the following macros, do not change
-+    ## the running order or otherwise move them around unless you know exactly
-+    ## what you are doing...
-+    _LT_COMPILER_PIC($1)
-+    _LT_COMPILER_C_O($1)
-+    _LT_COMPILER_FILE_LOCKS($1)
-+    _LT_LINKER_SHLIBS($1)
-+    _LT_SYS_DYNAMIC_LINKER($1)
-+    _LT_LINKER_HARDCODE_LIBPATH($1)
-+
-+    _LT_CONFIG($1)
-+  fi # test -n "$compiler"
-+
-+  GCC=$lt_save_GCC
-+  CC="$lt_save_CC"
-+fi # test "$_lt_disable_F77" != yes
-+
-+AC_LANG_POP
-+])# _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)
-+
-+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-+_LT_TAGVAR(allow_undefined_flag, $1)=
-+_LT_TAGVAR(always_export_symbols, $1)=no
-+_LT_TAGVAR(archive_expsym_cmds, $1)=
-+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-+_LT_TAGVAR(hardcode_direct, $1)=no
-+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-+_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-+_LT_TAGVAR(hardcode_libdir_separator, $1)=
-+_LT_TAGVAR(hardcode_minus_L, $1)=no
-+_LT_TAGVAR(hardcode_automatic, $1)=no
-+_LT_TAGVAR(inherit_rpath, $1)=no
-+_LT_TAGVAR(module_cmds, $1)=
-+_LT_TAGVAR(module_expsym_cmds, $1)=
-+_LT_TAGVAR(link_all_deplibs, $1)=unknown
-+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-+_LT_TAGVAR(no_undefined_flag, $1)=
-+_LT_TAGVAR(whole_archive_flag_spec, $1)=
-+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-+
-+# Source file extension for fc test sources.
-+ac_ext=${ac_fc_srcext-f}
-+
-+# Object file extension for compiled fc test sources.
-+objext=o
-+_LT_TAGVAR(objext, $1)=$objext
-+
-+# No sense in running all these tests if we already determined that
-+# the FC compiler isn't working.  Some variables (like enable_shared)
-+# are currently assumed to apply to all compilers on this platform,
-+# and will be corrupted by setting them based on a non-working compiler.
-+if test "$_lt_disable_FC" != yes; then
-+  # Code to be used in simple compile tests
-+  lt_simple_compile_test_code="\
-+      subroutine t
-+      return
-+      end
-+"
-+
-+  # Code to be used in simple link tests
-+  lt_simple_link_test_code="\
-+      program t
-+      end
-+"
-+
-+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-+  _LT_TAG_COMPILER
-+
-+  # save warnings/boilerplate of simple test code
-+  _LT_COMPILER_BOILERPLATE
-+  _LT_LINKER_BOILERPLATE
-+
-+  # Allow CC to be a program name with arguments.
-+  lt_save_CC="$CC"
-+  lt_save_GCC=$GCC
-+  CC=${FC-"f95"}
-+  compiler=$CC
-+  GCC=$ac_cv_fc_compiler_gnu
-+
-+  _LT_TAGVAR(compiler, $1)=$CC
-+  _LT_CC_BASENAME([$compiler])
-+
-+  if test -n "$compiler"; then
-+    AC_MSG_CHECKING([if libtool supports shared libraries])
-+    AC_MSG_RESULT([$can_build_shared])
-+
-+    AC_MSG_CHECKING([whether to build shared libraries])
-+    test "$can_build_shared" = "no" && enable_shared=no
-+
-+    # On AIX, shared libraries and static libraries use the same namespace, and
-+    # are all built from PIC.
-+    case $host_os in
-+      aix3*)
-+        test "$enable_shared" = yes && enable_static=no
-+        if test -n "$RANLIB"; then
-+          archive_cmds="$archive_cmds~\$RANLIB \$lib"
-+          postinstall_cmds='$RANLIB $lib'
-+        fi
-+        ;;
-+      aix[[4-9]]*)
-+	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-+	  test "$enable_shared" = yes && enable_static=no
-+	fi
-+        ;;
-+    esac
-+    AC_MSG_RESULT([$enable_shared])
-+
-+    AC_MSG_CHECKING([whether to build static libraries])
-+    # Make sure either enable_shared or enable_static is yes.
-+    test "$enable_shared" = yes || enable_static=yes
-+    AC_MSG_RESULT([$enable_static])
-+
-+    _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu"
-+    _LT_TAGVAR(LD, $1)="$LD"
-+
-+    ## CAVEAT EMPTOR:
-+    ## There is no encapsulation within the following macros, do not change
-+    ## the running order or otherwise move them around unless you know exactly
-+    ## what you are doing...
-+    _LT_SYS_HIDDEN_LIBDEPS($1)
-+    _LT_COMPILER_PIC($1)
-+    _LT_COMPILER_C_O($1)
-+    _LT_COMPILER_FILE_LOCKS($1)
-+    _LT_LINKER_SHLIBS($1)
-+    _LT_SYS_DYNAMIC_LINKER($1)
-+    _LT_LINKER_HARDCODE_LIBPATH($1)
-+
-+    _LT_CONFIG($1)
-+  fi # test -n "$compiler"
-+
-+  GCC=$lt_save_GCC
-+  CC="$lt_save_CC"
-+fi # test "$_lt_disable_FC" != yes
-+
-+AC_LANG_POP
-+])# _LT_LANG_FC_CONFIG
-+
-+
-+# _LT_LANG_GCJ_CONFIG([TAG])
-+# --------------------------
-+# Ensure that the configuration variables for the GNU Java Compiler compiler
-+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
-+# to write the compiler configuration to `libtool'.
-+m4_defun([_LT_LANG_GCJ_CONFIG],
-+[AC_REQUIRE([LT_PROG_GCJ])dnl
-+AC_LANG_SAVE
-+
-+# Source file extension for Java test sources.
-+ac_ext=java
-+
-+# Object file extension for compiled Java test sources.
-+objext=o
-+_LT_TAGVAR(objext, $1)=$objext
-+
-+# Code to be used in simple compile tests
-+lt_simple_compile_test_code="class foo {}"
-+
-+# Code to be used in simple link tests
-+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
-+
-+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-+_LT_TAG_COMPILER
-+
-+# save warnings/boilerplate of simple test code
-+_LT_COMPILER_BOILERPLATE
-+_LT_LINKER_BOILERPLATE
-+
-+# Allow CC to be a program name with arguments.
-+lt_save_CC="$CC"
-+lt_save_GCC=$GCC
-+GCC=yes
-+CC=${GCJ-"gcj"}
-+compiler=$CC
-+_LT_TAGVAR(compiler, $1)=$CC
-+_LT_TAGVAR(LD, $1)="$LD"
-+_LT_CC_BASENAME([$compiler])
-+
-+# GCJ did not exist at the time GCC didn't implicitly link libc in.
-+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-+
-+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-+
-+## CAVEAT EMPTOR:
-+## There is no encapsulation within the following macros, do not change
-+## the running order or otherwise move them around unless you know exactly
-+## what you are doing...
-+if test -n "$compiler"; then
-+  _LT_COMPILER_NO_RTTI($1)
-+  _LT_COMPILER_PIC($1)
-+  _LT_COMPILER_C_O($1)
-+  _LT_COMPILER_FILE_LOCKS($1)
-+  _LT_LINKER_SHLIBS($1)
-+  _LT_LINKER_HARDCODE_LIBPATH($1)
-+
-+  _LT_CONFIG($1)
-+fi
-+
-+AC_LANG_RESTORE
-+
-+GCC=$lt_save_GCC
-+CC="$lt_save_CC"
-+])# _LT_LANG_GCJ_CONFIG
-+
-+
-+# _LT_LANG_RC_CONFIG([TAG])
-+# -------------------------
-+# Ensure that the configuration variables for the Windows resource compiler
-+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
-+# to write the compiler configuration to `libtool'.
-+m4_defun([_LT_LANG_RC_CONFIG],
-+[AC_REQUIRE([LT_PROG_RC])dnl
-+AC_LANG_SAVE
-+
-+# Source file extension for RC test sources.
-+ac_ext=rc
-+
-+# Object file extension for compiled RC test sources.
-+objext=o
-+_LT_TAGVAR(objext, $1)=$objext
-+
-+# Code to be used in simple compile tests
-+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
-+
-+# Code to be used in simple link tests
-+lt_simple_link_test_code="$lt_simple_compile_test_code"
-+
-+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-+_LT_TAG_COMPILER
-+
-+# save warnings/boilerplate of simple test code
-+_LT_COMPILER_BOILERPLATE
-+_LT_LINKER_BOILERPLATE
-+
-+# Allow CC to be a program name with arguments.
-+lt_save_CC="$CC"
-+lt_save_GCC=$GCC
-+GCC=
-+CC=${RC-"windres"}
-+compiler=$CC
-+_LT_TAGVAR(compiler, $1)=$CC
-+_LT_CC_BASENAME([$compiler])
-+_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-+
-+if test -n "$compiler"; then
-+  :
-+  _LT_CONFIG($1)
-+fi
-+
-+GCC=$lt_save_GCC
-+AC_LANG_RESTORE
-+CC="$lt_save_CC"
-+])# _LT_LANG_RC_CONFIG
-+
-+
-+# LT_PROG_GCJ
-+# -----------
-+AC_DEFUN([LT_PROG_GCJ],
-+[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ],
-+  [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ],
-+    [AC_CHECK_TOOL(GCJ, gcj,)
-+      test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
-+      AC_SUBST(GCJFLAGS)])])[]dnl
-+])
-+
-+# Old name:
-+AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ])
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
-+
-+
-+# LT_PROG_RC
-+# ----------
-+AC_DEFUN([LT_PROG_RC],
-+[AC_CHECK_TOOL(RC, windres,)
-+])
-+
-+# Old name:
-+AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC])
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([LT_AC_PROG_RC], [])
-+
-+
-+# _LT_DECL_EGREP
-+# --------------
-+# If we don't have a new enough Autoconf to choose the best grep
-+# available, choose the one first in the user's PATH.
-+m4_defun([_LT_DECL_EGREP],
-+[AC_REQUIRE([AC_PROG_EGREP])dnl
-+AC_REQUIRE([AC_PROG_FGREP])dnl
-+test -z "$GREP" && GREP=grep
-+_LT_DECL([], [GREP], [1], [A grep program that handles long lines])
-+_LT_DECL([], [EGREP], [1], [An ERE matcher])
-+_LT_DECL([], [FGREP], [1], [A literal string matcher])
-+dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too
-+AC_SUBST([GREP])
-+])
-+
-+
-+# _LT_DECL_OBJDUMP
-+# --------------
-+# If we don't have a new enough Autoconf to choose the best objdump
-+# available, choose the one first in the user's PATH.
-+m4_defun([_LT_DECL_OBJDUMP],
-+[AC_CHECK_TOOL(OBJDUMP, objdump, false)
-+test -z "$OBJDUMP" && OBJDUMP=objdump
-+_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
-+AC_SUBST([OBJDUMP])
-+])
-+
-+
-+# _LT_DECL_SED
-+# ------------
-+# Check for a fully-functional sed program, that truncates
-+# as few characters as possible.  Prefer GNU sed if found.
-+m4_defun([_LT_DECL_SED],
-+[AC_PROG_SED
-+test -z "$SED" && SED=sed
-+Xsed="$SED -e 1s/^X//"
-+_LT_DECL([], [SED], [1], [A sed program that does not truncate output])
-+_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"],
-+    [Sed that helps us avoid accidentally triggering echo(1) options like -n])
-+])# _LT_DECL_SED
-+
-+m4_ifndef([AC_PROG_SED], [
-+############################################################
-+# NOTE: This macro has been submitted for inclusion into   #
-+#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
-+#  a released version of Autoconf we should remove this    #
-+#  macro and use it instead.                               #
-+############################################################
-+
-+m4_defun([AC_PROG_SED],
-+[AC_MSG_CHECKING([for a sed that does not truncate output])
-+AC_CACHE_VAL(lt_cv_path_SED,
-+[# Loop through the user's path and test for sed and gsed.
-+# Then use that list of sed's as ones to test for truncation.
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for lt_ac_prog in sed gsed; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
-+        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
-+      fi
-+    done
-+  done
-+done
-+IFS=$as_save_IFS
-+lt_ac_max=0
-+lt_ac_count=0
-+# Add /usr/xpg4/bin/sed as it is typically found on Solaris
-+# along with /bin/sed that truncates output.
-+for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
-+  test ! -f $lt_ac_sed && continue
-+  cat /dev/null > conftest.in
-+  lt_ac_count=0
-+  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-+  # Check for GNU sed and select it if it is found.
-+  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
-+    lt_cv_path_SED=$lt_ac_sed
-+    break
-+  fi
-+  while true; do
-+    cat conftest.in conftest.in >conftest.tmp
-+    mv conftest.tmp conftest.in
-+    cp conftest.in conftest.nl
-+    echo >>conftest.nl
-+    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
-+    cmp -s conftest.out conftest.nl || break
-+    # 10000 chars as input seems more than enough
-+    test $lt_ac_count -gt 10 && break
-+    lt_ac_count=`expr $lt_ac_count + 1`
-+    if test $lt_ac_count -gt $lt_ac_max; then
-+      lt_ac_max=$lt_ac_count
-+      lt_cv_path_SED=$lt_ac_sed
-+    fi
-+  done
-+done
-+])
-+SED=$lt_cv_path_SED
-+AC_SUBST([SED])
-+AC_MSG_RESULT([$SED])
-+])#AC_PROG_SED
-+])#m4_ifndef
-+
-+# Old name:
-+AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED])
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([LT_AC_PROG_SED], [])
-+
-+
-+# _LT_CHECK_SHELL_FEATURES
-+# ------------------------
-+# Find out whether the shell is Bourne or XSI compatible,
-+# or has some other useful features.
-+m4_defun([_LT_CHECK_SHELL_FEATURES],
-+[AC_MSG_CHECKING([whether the shell understands some XSI constructs])
-+# Try some XSI features
-+xsi_shell=no
-+( _lt_dummy="a/b/c"
-+  test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
-+      = c,a/b,, \
-+    && eval 'test $(( 1 + 1 )) -eq 2 \
-+    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
-+  && xsi_shell=yes
-+AC_MSG_RESULT([$xsi_shell])
-+_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell'])
-+
-+AC_MSG_CHECKING([whether the shell understands "+="])
-+lt_shell_append=no
-+( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \
-+    >/dev/null 2>&1 \
-+  && lt_shell_append=yes
-+AC_MSG_RESULT([$lt_shell_append])
-+_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append'])
-+
-+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-+  lt_unset=unset
-+else
-+  lt_unset=false
-+fi
-+_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl
-+
-+# test EBCDIC or ASCII
-+case `echo X|tr X '\101'` in
-+ A) # ASCII based system
-+    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
-+  lt_SP2NL='tr \040 \012'
-+  lt_NL2SP='tr \015\012 \040\040'
-+  ;;
-+ *) # EBCDIC based system
-+  lt_SP2NL='tr \100 \n'
-+  lt_NL2SP='tr \r\n \100\100'
-+  ;;
-+esac
-+_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl
-+_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
-+])# _LT_CHECK_SHELL_FEATURES
-+
-+
-+# _LT_PROG_XSI_SHELLFNS
-+# ---------------------
-+# Bourne and XSI compatible variants of some useful shell functions.
-+m4_defun([_LT_PROG_XSI_SHELLFNS],
-+[case $xsi_shell in
-+  yes)
-+    cat << \_LT_EOF >> "$cfgfile"
-+
-+# func_dirname file append nondir_replacement
-+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-+# otherwise set result to NONDIR_REPLACEMENT.
-+func_dirname ()
-+{
-+  case ${1} in
-+    */*) func_dirname_result="${1%/*}${2}" ;;
-+    *  ) func_dirname_result="${3}" ;;
-+  esac
-+}
-+
-+# func_basename file
-+func_basename ()
-+{
-+  func_basename_result="${1##*/}"
-+}
-+
-+# func_dirname_and_basename file append nondir_replacement
-+# perform func_basename and func_dirname in a single function
-+# call:
-+#   dirname:  Compute the dirname of FILE.  If nonempty,
-+#             add APPEND to the result, otherwise set result
-+#             to NONDIR_REPLACEMENT.
-+#             value returned in "$func_dirname_result"
-+#   basename: Compute filename of FILE.
-+#             value retuned in "$func_basename_result"
-+# Implementation must be kept synchronized with func_dirname
-+# and func_basename. For efficiency, we do not delegate to
-+# those functions but instead duplicate the functionality here.
-+func_dirname_and_basename ()
-+{
-+  case ${1} in
-+    */*) func_dirname_result="${1%/*}${2}" ;;
-+    *  ) func_dirname_result="${3}" ;;
-+  esac
-+  func_basename_result="${1##*/}"
-+}
-+
-+# func_stripname prefix suffix name
-+# strip PREFIX and SUFFIX off of NAME.
-+# PREFIX and SUFFIX must not contain globbing or regex special
-+# characters, hashes, percent signs, but SUFFIX may contain a leading
-+# dot (in which case that matches only a dot).
-+func_stripname ()
-+{
-+  # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
-+  # positional parameters, so assign one to ordinary parameter first.
-+  func_stripname_result=${3}
-+  func_stripname_result=${func_stripname_result#"${1}"}
-+  func_stripname_result=${func_stripname_result%"${2}"}
-+}
-+
-+# func_opt_split
-+func_opt_split ()
-+{
-+  func_opt_split_opt=${1%%=*}
-+  func_opt_split_arg=${1#*=}
-+}
-+
-+# func_lo2o object
-+func_lo2o ()
-+{
-+  case ${1} in
-+    *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
-+    *)    func_lo2o_result=${1} ;;
-+  esac
-+}
-+
-+# func_xform libobj-or-source
-+func_xform ()
-+{
-+  func_xform_result=${1%.*}.lo
-+}
-+
-+# func_arith arithmetic-term...
-+func_arith ()
-+{
-+  func_arith_result=$(( $[*] ))
-+}
-+
-+# func_len string
-+# STRING may not start with a hyphen.
-+func_len ()
-+{
-+  func_len_result=${#1}
-+}
-+
-+_LT_EOF
-+    ;;
-+  *) # Bourne compatible functions.
-+    cat << \_LT_EOF >> "$cfgfile"
-+
-+# func_dirname file append nondir_replacement
-+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-+# otherwise set result to NONDIR_REPLACEMENT.
-+func_dirname ()
-+{
-+  # Extract subdirectory from the argument.
-+  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 file
-+func_basename ()
-+{
-+  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
-+}
-+
-+dnl func_dirname_and_basename
-+dnl A portable version of this function is already defined in general.m4sh
-+dnl so there is no need for it here.
-+
-+# func_stripname prefix suffix name
-+# strip PREFIX and SUFFIX off of NAME.
-+# PREFIX and SUFFIX must not contain globbing or regex special
-+# characters, hashes, percent signs, but SUFFIX may contain a leading
-+# dot (in which case that matches only a dot).
-+# func_strip_suffix prefix name
-+func_stripname ()
-+{
-+  case ${2} in
-+    .*) func_stripname_result=`$ECHO "X${3}" \
-+           | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
-+    *)  func_stripname_result=`$ECHO "X${3}" \
-+           | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
-+  esac
-+}
-+
-+# sed scripts:
-+my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q'
-+my_sed_long_arg='1s/^-[[^=]]*=//'
-+
-+# 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_lo2o object
-+func_lo2o ()
-+{
-+  func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
-+}
-+
-+# func_xform libobj-or-source
-+func_xform ()
-+{
-+  func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'`
-+}
-+
-+# func_arith arithmetic-term...
-+func_arith ()
-+{
-+  func_arith_result=`expr "$[@]"`
-+}
-+
-+# func_len string
-+# STRING may not start with a hyphen.
-+func_len ()
-+{
-+  func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len`
-+}
-+
-+_LT_EOF
-+esac
-+
-+case $lt_shell_append in
-+  yes)
-+    cat << \_LT_EOF >> "$cfgfile"
-+
-+# func_append var value
-+# Append VALUE to the end of shell variable VAR.
-+func_append ()
-+{
-+  eval "$[1]+=\$[2]"
-+}
-+_LT_EOF
-+    ;;
-+  *)
-+    cat << \_LT_EOF >> "$cfgfile"
-+
-+# func_append var value
-+# Append VALUE to the end of shell variable VAR.
-+func_append ()
-+{
-+  eval "$[1]=\$$[1]\$[2]"
-+}
-+
-+_LT_EOF
-+    ;;
-+  esac
-+])
-Index: gtk+3.0-2.90.6/m4/ltoptions.m4
-===================================================================
---- /dev/null
-+++ gtk+3.0-2.90.6/m4/ltoptions.m4
-@@ -0,0 +1,368 @@
-+# Helper functions for option handling.                    -*- Autoconf -*-
-+#
-+#   Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
-+#   Written by Gary V. Vaughan, 2004
-+#
-+# This file is free software; the Free Software Foundation gives
-+# unlimited permission to copy and/or distribute it, with or without
-+# modifications, as long as this notice is preserved.
-+
-+# serial 6 ltoptions.m4
-+
-+# This is to help aclocal find these macros, as it can't see m4_define.
-+AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
-+
-+
-+# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME)
-+# ------------------------------------------
-+m4_define([_LT_MANGLE_OPTION],
-+[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])])
-+
-+
-+# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME)
-+# ---------------------------------------
-+# Set option OPTION-NAME for macro MACRO-NAME, and if there is a
-+# matching handler defined, dispatch to it.  Other OPTION-NAMEs are
-+# saved as a flag.
-+m4_define([_LT_SET_OPTION],
-+[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
-+m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
-+        _LT_MANGLE_DEFUN([$1], [$2]),
-+    [m4_warning([Unknown $1 option `$2'])])[]dnl
-+])
-+
-+
-+# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET])
-+# ------------------------------------------------------------
-+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-+m4_define([_LT_IF_OPTION],
-+[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])])
-+
-+
-+# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET)
-+# -------------------------------------------------------
-+# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME
-+# are set.
-+m4_define([_LT_UNLESS_OPTIONS],
-+[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
-+	    [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option),
-+		      [m4_define([$0_found])])])[]dnl
-+m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3
-+])[]dnl
-+])
-+
-+
-+# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST)
-+# ----------------------------------------
-+# OPTION-LIST is a space-separated list of Libtool options associated
-+# with MACRO-NAME.  If any OPTION has a matching handler declared with
-+# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about
-+# the unknown option and exit.
-+m4_defun([_LT_SET_OPTIONS],
-+[# Set options
-+m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
-+    [_LT_SET_OPTION([$1], _LT_Option)])
-+
-+m4_if([$1],[LT_INIT],[
-+  dnl
-+  dnl Simply set some default values (i.e off) if boolean options were not
-+  dnl specified:
-+  _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no
-+  ])
-+  _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no
-+  ])
-+  dnl
-+  dnl If no reference was made to various pairs of opposing options, then
-+  dnl we run the default mode handler for the pair.  For example, if neither
-+  dnl `shared' nor `disable-shared' was passed, we enable building of shared
-+  dnl archives by default:
-+  _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
-+  _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
-+  _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
-+  _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
-+  		   [_LT_ENABLE_FAST_INSTALL])
-+  ])
-+])# _LT_SET_OPTIONS
-+
-+
-+## --------------------------------- ##
-+## Macros to handle LT_INIT options. ##
-+## --------------------------------- ##
-+
-+# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME)
-+# -----------------------------------------
-+m4_define([_LT_MANGLE_DEFUN],
-+[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])])
-+
-+
-+# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE)
-+# -----------------------------------------------
-+m4_define([LT_OPTION_DEFINE],
-+[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl
-+])# LT_OPTION_DEFINE
-+
-+
-+# dlopen
-+# ------
-+LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes
-+])
-+
-+AU_DEFUN([AC_LIBTOOL_DLOPEN],
-+[_LT_SET_OPTION([LT_INIT], [dlopen])
-+AC_DIAGNOSE([obsolete],
-+[$0: Remove this warning and the call to _LT_SET_OPTION when you
-+put the `dlopen' option into LT_INIT's first parameter.])
-+])
-+
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], [])
-+
-+
-+# win32-dll
-+# ---------
-+# Declare package support for building win32 dll's.
-+LT_OPTION_DEFINE([LT_INIT], [win32-dll],
-+[enable_win32_dll=yes
-+
-+case $host in
-+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
-+  AC_CHECK_TOOL(AS, as, false)
-+  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-+  AC_CHECK_TOOL(OBJDUMP, objdump, false)
-+  ;;
-+esac
-+
-+test -z "$AS" && AS=as
-+_LT_DECL([], [AS],      [0], [Assembler program])dnl
-+
-+test -z "$DLLTOOL" && DLLTOOL=dlltool
-+_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl
-+
-+test -z "$OBJDUMP" && OBJDUMP=objdump
-+_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl
-+])# win32-dll
-+
-+AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
-+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+_LT_SET_OPTION([LT_INIT], [win32-dll])
-+AC_DIAGNOSE([obsolete],
-+[$0: Remove this warning and the call to _LT_SET_OPTION when you
-+put the `win32-dll' option into LT_INIT's first parameter.])
-+])
-+
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
-+
-+
-+# _LT_ENABLE_SHARED([DEFAULT])
-+# ----------------------------
-+# implement the --enable-shared flag, and supports the `shared' and
-+# `disable-shared' LT_INIT options.
-+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-+m4_define([_LT_ENABLE_SHARED],
-+[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
-+AC_ARG_ENABLE([shared],
-+    [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
-+	[build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])],
-+    [p=${PACKAGE-default}
-+    case $enableval in
-+    yes) enable_shared=yes ;;
-+    no) enable_shared=no ;;
-+    *)
-+      enable_shared=no
-+      # Look at the argument we got.  We use all the common list separators.
-+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-+      for pkg in $enableval; do
-+	IFS="$lt_save_ifs"
-+	if test "X$pkg" = "X$p"; then
-+	  enable_shared=yes
-+	fi
-+      done
-+      IFS="$lt_save_ifs"
-+      ;;
-+    esac],
-+    [enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
-+
-+    _LT_DECL([build_libtool_libs], [enable_shared], [0],
-+	[Whether or not to build shared libraries])
-+])# _LT_ENABLE_SHARED
-+
-+LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])])
-+LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])])
-+
-+# Old names:
-+AC_DEFUN([AC_ENABLE_SHARED],
-+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared])
-+])
-+
-+AC_DEFUN([AC_DISABLE_SHARED],
-+[_LT_SET_OPTION([LT_INIT], [disable-shared])
-+])
-+
-+AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
-+AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
-+
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AM_ENABLE_SHARED], [])
-+dnl AC_DEFUN([AM_DISABLE_SHARED], [])
-+
-+
-+
-+# _LT_ENABLE_STATIC([DEFAULT])
-+# ----------------------------
-+# implement the --enable-static flag, and support the `static' and
-+# `disable-static' LT_INIT options.
-+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-+m4_define([_LT_ENABLE_STATIC],
-+[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
-+AC_ARG_ENABLE([static],
-+    [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@],
-+	[build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])],
-+    [p=${PACKAGE-default}
-+    case $enableval in
-+    yes) enable_static=yes ;;
-+    no) enable_static=no ;;
-+    *)
-+     enable_static=no
-+      # Look at the argument we got.  We use all the common list separators.
-+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-+      for pkg in $enableval; do
-+	IFS="$lt_save_ifs"
-+	if test "X$pkg" = "X$p"; then
-+	  enable_static=yes
-+	fi
-+      done
-+      IFS="$lt_save_ifs"
-+      ;;
-+    esac],
-+    [enable_static=]_LT_ENABLE_STATIC_DEFAULT)
-+
-+    _LT_DECL([build_old_libs], [enable_static], [0],
-+	[Whether or not to build static libraries])
-+])# _LT_ENABLE_STATIC
-+
-+LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])])
-+LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])])
-+
-+# Old names:
-+AC_DEFUN([AC_ENABLE_STATIC],
-+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static])
-+])
-+
-+AC_DEFUN([AC_DISABLE_STATIC],
-+[_LT_SET_OPTION([LT_INIT], [disable-static])
-+])
-+
-+AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
-+AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
-+
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AM_ENABLE_STATIC], [])
-+dnl AC_DEFUN([AM_DISABLE_STATIC], [])
-+
-+
-+
-+# _LT_ENABLE_FAST_INSTALL([DEFAULT])
-+# ----------------------------------
-+# implement the --enable-fast-install flag, and support the `fast-install'
-+# and `disable-fast-install' LT_INIT options.
-+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-+m4_define([_LT_ENABLE_FAST_INSTALL],
-+[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
-+AC_ARG_ENABLE([fast-install],
-+    [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
-+    [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
-+    [p=${PACKAGE-default}
-+    case $enableval in
-+    yes) enable_fast_install=yes ;;
-+    no) enable_fast_install=no ;;
-+    *)
-+      enable_fast_install=no
-+      # Look at the argument we got.  We use all the common list separators.
-+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-+      for pkg in $enableval; do
-+	IFS="$lt_save_ifs"
-+	if test "X$pkg" = "X$p"; then
-+	  enable_fast_install=yes
-+	fi
-+      done
-+      IFS="$lt_save_ifs"
-+      ;;
-+    esac],
-+    [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
-+
-+_LT_DECL([fast_install], [enable_fast_install], [0],
-+	 [Whether or not to optimize for fast installation])dnl
-+])# _LT_ENABLE_FAST_INSTALL
-+
-+LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])])
-+LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])])
-+
-+# Old names:
-+AU_DEFUN([AC_ENABLE_FAST_INSTALL],
-+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
-+AC_DIAGNOSE([obsolete],
-+[$0: Remove this warning and the call to _LT_SET_OPTION when you put
-+the `fast-install' option into LT_INIT's first parameter.])
-+])
-+
-+AU_DEFUN([AC_DISABLE_FAST_INSTALL],
-+[_LT_SET_OPTION([LT_INIT], [disable-fast-install])
-+AC_DIAGNOSE([obsolete],
-+[$0: Remove this warning and the call to _LT_SET_OPTION when you put
-+the `disable-fast-install' option into LT_INIT's first parameter.])
-+])
-+
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
-+dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
-+
-+
-+# _LT_WITH_PIC([MODE])
-+# --------------------
-+# implement the --with-pic flag, and support the `pic-only' and `no-pic'
-+# LT_INIT options.
-+# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
-+m4_define([_LT_WITH_PIC],
-+[AC_ARG_WITH([pic],
-+    [AS_HELP_STRING([--with-pic],
-+	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
-+    [pic_mode="$withval"],
-+    [pic_mode=default])
-+
-+test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
-+
-+_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
-+])# _LT_WITH_PIC
-+
-+LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])])
-+LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])])
-+
-+# Old name:
-+AU_DEFUN([AC_LIBTOOL_PICMODE],
-+[_LT_SET_OPTION([LT_INIT], [pic-only])
-+AC_DIAGNOSE([obsolete],
-+[$0: Remove this warning and the call to _LT_SET_OPTION when you
-+put the `pic-only' option into LT_INIT's first parameter.])
-+])
-+
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_LIBTOOL_PICMODE], [])
-+
-+## ----------------- ##
-+## LTDL_INIT Options ##
-+## ----------------- ##
-+
-+m4_define([_LTDL_MODE], [])
-+LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive],
-+		 [m4_define([_LTDL_MODE], [nonrecursive])])
-+LT_OPTION_DEFINE([LTDL_INIT], [recursive],
-+		 [m4_define([_LTDL_MODE], [recursive])])
-+LT_OPTION_DEFINE([LTDL_INIT], [subproject],
-+		 [m4_define([_LTDL_MODE], [subproject])])
-+
-+m4_define([_LTDL_TYPE], [])
-+LT_OPTION_DEFINE([LTDL_INIT], [installable],
-+		 [m4_define([_LTDL_TYPE], [installable])])
-+LT_OPTION_DEFINE([LTDL_INIT], [convenience],
-+		 [m4_define([_LTDL_TYPE], [convenience])])
-Index: gtk+3.0-2.90.6/m4/ltsugar.m4
-===================================================================
---- /dev/null
-+++ gtk+3.0-2.90.6/m4/ltsugar.m4
-@@ -0,0 +1,123 @@
-+# ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
-+#
-+# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
-+# Written by Gary V. Vaughan, 2004
-+#
-+# This file is free software; the Free Software Foundation gives
-+# unlimited permission to copy and/or distribute it, with or without
-+# modifications, as long as this notice is preserved.
-+
-+# serial 6 ltsugar.m4
-+
-+# This is to help aclocal find these macros, as it can't see m4_define.
-+AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
-+
-+
-+# lt_join(SEP, ARG1, [ARG2...])
-+# -----------------------------
-+# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their
-+# associated separator.
-+# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier
-+# versions in m4sugar had bugs.
-+m4_define([lt_join],
-+[m4_if([$#], [1], [],
-+       [$#], [2], [[$2]],
-+       [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])])
-+m4_define([_lt_join],
-+[m4_if([$#$2], [2], [],
-+       [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])])
-+
-+
-+# lt_car(LIST)
-+# lt_cdr(LIST)
-+# ------------
-+# Manipulate m4 lists.
-+# These macros are necessary as long as will still need to support
-+# Autoconf-2.59 which quotes differently.
-+m4_define([lt_car], [[$1]])
-+m4_define([lt_cdr],
-+[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
-+       [$#], 1, [],
-+       [m4_dquote(m4_shift($@))])])
-+m4_define([lt_unquote], $1)
-+
-+
-+# lt_append(MACRO-NAME, STRING, [SEPARATOR])
-+# ------------------------------------------
-+# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
-+# Note that neither SEPARATOR nor STRING are expanded; they are appended
-+# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
-+# No SEPARATOR is output if MACRO-NAME was previously undefined (different
-+# than defined and empty).
-+#
-+# This macro is needed until we can rely on Autoconf 2.62, since earlier
-+# versions of m4sugar mistakenly expanded SEPARATOR but not STRING.
-+m4_define([lt_append],
-+[m4_define([$1],
-+	   m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])])
-+
-+
-+
-+# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...])
-+# ----------------------------------------------------------
-+# Produce a SEP delimited list of all paired combinations of elements of
-+# PREFIX-LIST with SUFFIX1 through SUFFIXn.  Each element of the list
-+# has the form PREFIXmINFIXSUFFIXn.
-+# Needed until we can rely on m4_combine added in Autoconf 2.62.
-+m4_define([lt_combine],
-+[m4_if(m4_eval([$# > 3]), [1],
-+       [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl
-+[[m4_foreach([_Lt_prefix], [$2],
-+	     [m4_foreach([_Lt_suffix],
-+		]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[,
-+	[_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])])
-+
-+
-+# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])
-+# -----------------------------------------------------------------------
-+# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited
-+# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ.
-+m4_define([lt_if_append_uniq],
-+[m4_ifdef([$1],
-+	  [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1],
-+		 [lt_append([$1], [$2], [$3])$4],
-+		 [$5])],
-+	  [lt_append([$1], [$2], [$3])$4])])
-+
-+
-+# lt_dict_add(DICT, KEY, VALUE)
-+# -----------------------------
-+m4_define([lt_dict_add],
-+[m4_define([$1($2)], [$3])])
-+
-+
-+# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE)
-+# --------------------------------------------
-+m4_define([lt_dict_add_subkey],
-+[m4_define([$1($2:$3)], [$4])])
-+
-+
-+# lt_dict_fetch(DICT, KEY, [SUBKEY])
-+# ----------------------------------
-+m4_define([lt_dict_fetch],
-+[m4_ifval([$3],
-+	m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]),
-+    m4_ifdef([$1($2)], [m4_defn([$1($2)])]))])
-+
-+
-+# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE])
-+# -----------------------------------------------------------------
-+m4_define([lt_if_dict_fetch],
-+[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4],
-+	[$5],
-+    [$6])])
-+
-+
-+# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...])
-+# --------------------------------------------------------------
-+m4_define([lt_dict_filter],
-+[m4_if([$5], [], [],
-+  [lt_join(m4_quote(m4_default([$4], [[, ]])),
-+           lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]),
-+		      [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl
-+])
-Index: gtk+3.0-2.90.6/m4/ltversion.m4
-===================================================================
---- /dev/null
-+++ gtk+3.0-2.90.6/m4/ltversion.m4
-@@ -0,0 +1,23 @@
-+# ltversion.m4 -- version numbers			-*- Autoconf -*-
-+#
-+#   Copyright (C) 2004 Free Software Foundation, Inc.
-+#   Written by Scott James Remnant, 2004
-+#
-+# This file is free software; the Free Software Foundation gives
-+# unlimited permission to copy and/or distribute it, with or without
-+# modifications, as long as this notice is preserved.
-+
-+# Generated from ltversion.in.
-+
-+# serial 3017 ltversion.m4
-+# This file is part of GNU Libtool
-+
-+m4_define([LT_PACKAGE_VERSION], [2.2.6b])
-+m4_define([LT_PACKAGE_REVISION], [1.3017])
-+
-+AC_DEFUN([LTVERSION_VERSION],
-+[macro_version='2.2.6b'
-+macro_revision='1.3017'
-+_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
-+_LT_DECL(, macro_revision, 0)
-+])
-Index: gtk+3.0-2.90.6/m4/lt~obsolete.m4
-===================================================================
---- /dev/null
-+++ gtk+3.0-2.90.6/m4/lt~obsolete.m4
-@@ -0,0 +1,92 @@
-+# lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
-+#
-+#   Copyright (C) 2004, 2005, 2007 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
-+
-+# These exist entirely to fool aclocal when bootstrapping libtool.
-+#
-+# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
-+# which have later been changed to m4_define as they aren't part of the
-+# exported API, or moved to Autoconf or Automake where they belong.
-+#
-+# The trouble is, aclocal is a bit thick.  It'll see the old AC_DEFUN
-+# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us
-+# using a macro with the same name in our local m4/libtool.m4 it'll
-+# pull the old libtool.m4 in (it doesn't see our shiny new m4_define
-+# and doesn't know about Autoconf macros at all.)
-+#
-+# So we provide this file, which has a silly filename so it's always
-+# included after everything else.  This provides aclocal with the
-+# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
-+# because those macros already exist, or will be overwritten later.
-+# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. 
-+#
-+# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
-+# Yes, that means every name once taken will need to remain here until
-+# we give up compatibility with versions before 1.7, at which point
-+# we need to keep only those names which we still refer to.
-+
-+# This is to help aclocal find these macros, as it can't see m4_define.
-+AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])])
-+
-+m4_ifndef([AC_LIBTOOL_LINKER_OPTION],	[AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])])
-+m4_ifndef([AC_PROG_EGREP],		[AC_DEFUN([AC_PROG_EGREP])])
-+m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])])
-+m4_ifndef([_LT_AC_SHELL_INIT],		[AC_DEFUN([_LT_AC_SHELL_INIT])])
-+m4_ifndef([_LT_AC_SYS_LIBPATH_AIX],	[AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])])
-+m4_ifndef([_LT_PROG_LTMAIN],		[AC_DEFUN([_LT_PROG_LTMAIN])])
-+m4_ifndef([_LT_AC_TAGVAR],		[AC_DEFUN([_LT_AC_TAGVAR])])
-+m4_ifndef([AC_LTDL_ENABLE_INSTALL],	[AC_DEFUN([AC_LTDL_ENABLE_INSTALL])])
-+m4_ifndef([AC_LTDL_PREOPEN],		[AC_DEFUN([AC_LTDL_PREOPEN])])
-+m4_ifndef([_LT_AC_SYS_COMPILER],	[AC_DEFUN([_LT_AC_SYS_COMPILER])])
-+m4_ifndef([_LT_AC_LOCK],		[AC_DEFUN([_LT_AC_LOCK])])
-+m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE],	[AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])])
-+m4_ifndef([_LT_AC_TRY_DLOPEN_SELF],	[AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])])
-+m4_ifndef([AC_LIBTOOL_PROG_CC_C_O],	[AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])])
-+m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])])
-+m4_ifndef([AC_LIBTOOL_OBJDIR],		[AC_DEFUN([AC_LIBTOOL_OBJDIR])])
-+m4_ifndef([AC_LTDL_OBJDIR],		[AC_DEFUN([AC_LTDL_OBJDIR])])
-+m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])])
-+m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP],	[AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])])
-+m4_ifndef([AC_PATH_MAGIC],		[AC_DEFUN([AC_PATH_MAGIC])])
-+m4_ifndef([AC_PROG_LD_GNU],		[AC_DEFUN([AC_PROG_LD_GNU])])
-+m4_ifndef([AC_PROG_LD_RELOAD_FLAG],	[AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])])
-+m4_ifndef([AC_DEPLIBS_CHECK_METHOD],	[AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])])
-+m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])])
-+m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])])
-+m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])])
-+m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS],	[AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])])
-+m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP],	[AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])])
-+m4_ifndef([LT_AC_PROG_EGREP],		[AC_DEFUN([LT_AC_PROG_EGREP])])
-+m4_ifndef([LT_AC_PROG_SED],		[AC_DEFUN([LT_AC_PROG_SED])])
-+m4_ifndef([_LT_CC_BASENAME],		[AC_DEFUN([_LT_CC_BASENAME])])
-+m4_ifndef([_LT_COMPILER_BOILERPLATE],	[AC_DEFUN([_LT_COMPILER_BOILERPLATE])])
-+m4_ifndef([_LT_LINKER_BOILERPLATE],	[AC_DEFUN([_LT_LINKER_BOILERPLATE])])
-+m4_ifndef([_AC_PROG_LIBTOOL],		[AC_DEFUN([_AC_PROG_LIBTOOL])])
-+m4_ifndef([AC_LIBTOOL_SETUP],		[AC_DEFUN([AC_LIBTOOL_SETUP])])
-+m4_ifndef([_LT_AC_CHECK_DLFCN],		[AC_DEFUN([_LT_AC_CHECK_DLFCN])])
-+m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER],	[AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])])
-+m4_ifndef([_LT_AC_TAGCONFIG],		[AC_DEFUN([_LT_AC_TAGCONFIG])])
-+m4_ifndef([AC_DISABLE_FAST_INSTALL],	[AC_DEFUN([AC_DISABLE_FAST_INSTALL])])
-+m4_ifndef([_LT_AC_LANG_CXX],		[AC_DEFUN([_LT_AC_LANG_CXX])])
-+m4_ifndef([_LT_AC_LANG_F77],		[AC_DEFUN([_LT_AC_LANG_F77])])
-+m4_ifndef([_LT_AC_LANG_GCJ],		[AC_DEFUN([_LT_AC_LANG_GCJ])])
-+m4_ifndef([AC_LIBTOOL_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])])
-+m4_ifndef([_LT_AC_LANG_CXX_CONFIG],	[AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])])
-+m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])])
-+m4_ifndef([_LT_AC_LANG_F77_CONFIG],	[AC_DEFUN([_LT_AC_LANG_F77_CONFIG])])
-+m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])])
-+m4_ifndef([_LT_AC_LANG_GCJ_CONFIG],	[AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])])
-+m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])])
-+m4_ifndef([_LT_AC_LANG_RC_CONFIG],	[AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
-+m4_ifndef([AC_LIBTOOL_CONFIG],		[AC_DEFUN([AC_LIBTOOL_CONFIG])])
-+m4_ifndef([_LT_AC_FILE_LTDLL_C],	[AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
-Index: gtk+3.0-2.90.6/m4macros/Makefile.in
-===================================================================
---- gtk+3.0-2.90.6.orig/m4macros/Makefile.in
-+++ gtk+3.0-2.90.6/m4macros/Makefile.in
-@@ -41,7 +41,10 @@
++++ b/ltmain.sh
+@@ -0,0 +1 @@
++/usr/share/libtool/config/ltmain.sh
+\ No newline at end of file
+diff --git a/m4macros/Makefile.in b/m4macros/Makefile.in
+index 04ea87e..409b84e 100644
+--- a/m4macros/Makefile.in
++++ b/m4macros/Makefile.in
+@@ -41,8 +41,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
  subdir = m4macros
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
--	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-+	$(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.ac
+ am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+-	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/acinclude.m4 \
+-	$(top_srcdir)/configure.ac
++	$(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.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  mkinstalldirs = $(install_sh) -d
-@@ -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@
-@@ -292,6 +296,7 @@
+@@ -296,6 +298,7 @@ libdir = @libdir@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -25368,31 +22031,24 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  ms_librarian = @ms_librarian@
-Index: gtk+3.0-2.90.6/modules/Makefile.in
-===================================================================
---- gtk+3.0-2.90.6.orig/modules/Makefile.in
-+++ gtk+3.0-2.90.6/modules/Makefile.in
-@@ -41,7 +41,10 @@
+diff --git a/modules/Makefile.in b/modules/Makefile.in
+index 44c13f2..c75286d 100644
+--- a/modules/Makefile.in
++++ b/modules/Makefile.in
+@@ -41,8 +41,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
  subdir = modules
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
--	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-+	$(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.ac
+ am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+-	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/acinclude.m4 \
+-	$(top_srcdir)/configure.ac
++	$(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.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  mkinstalldirs = $(install_sh) -d
-@@ -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@
-@@ -309,6 +313,7 @@
+@@ -313,6 +315,7 @@ libdir = @libdir@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -25400,31 +22056,24 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  ms_librarian = @ms_librarian@
-Index: gtk+3.0-2.90.6/modules/engines/Makefile.in
-===================================================================
---- gtk+3.0-2.90.6.orig/modules/engines/Makefile.in
-+++ gtk+3.0-2.90.6/modules/engines/Makefile.in
-@@ -40,7 +40,10 @@
+diff --git a/modules/engines/Makefile.in b/modules/engines/Makefile.in
+index d9f26dc..fb626ec 100644
+--- a/modules/engines/Makefile.in
++++ b/modules/engines/Makefile.in
+@@ -40,8 +40,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
  subdir = modules/engines
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
--	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-+	$(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.ac
+ am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+-	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/acinclude.m4 \
+-	$(top_srcdir)/configure.ac
++	$(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.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  mkinstalldirs = $(install_sh) -d
-@@ -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@
-@@ -308,6 +312,7 @@
+@@ -312,6 +314,7 @@ libdir = @libdir@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -25432,31 +22081,24 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  ms_librarian = @ms_librarian@
-Index: gtk+3.0-2.90.6/modules/engines/ms-windows/Makefile.in
-===================================================================
---- gtk+3.0-2.90.6.orig/modules/engines/ms-windows/Makefile.in
-+++ gtk+3.0-2.90.6/modules/engines/ms-windows/Makefile.in
-@@ -41,7 +41,10 @@
+diff --git a/modules/engines/ms-windows/Makefile.in b/modules/engines/ms-windows/Makefile.in
+index b178438..729641c 100644
+--- a/modules/engines/ms-windows/Makefile.in
++++ b/modules/engines/ms-windows/Makefile.in
+@@ -41,8 +41,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
  subdir = modules/engines/ms-windows
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
--	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-+	$(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.ac
+ am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+-	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/acinclude.m4 \
+-	$(top_srcdir)/configure.ac
++	$(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.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  mkinstalldirs = $(install_sh) -d
-@@ -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@
-@@ -365,6 +369,7 @@
+@@ -369,6 +371,7 @@ libdir = @libdir@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -25464,31 +22106,24 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  ms_librarian = @ms_librarian@
-Index: gtk+3.0-2.90.6/modules/engines/ms-windows/Theme/Makefile.in
-===================================================================
---- gtk+3.0-2.90.6.orig/modules/engines/ms-windows/Theme/Makefile.in
-+++ gtk+3.0-2.90.6/modules/engines/ms-windows/Theme/Makefile.in
-@@ -40,7 +40,10 @@
+diff --git a/modules/engines/ms-windows/Theme/Makefile.in b/modules/engines/ms-windows/Theme/Makefile.in
+index 3678631..e0ed037 100644
+--- a/modules/engines/ms-windows/Theme/Makefile.in
++++ b/modules/engines/ms-windows/Theme/Makefile.in
+@@ -40,8 +40,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
  subdir = modules/engines/ms-windows/Theme
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
--	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-+	$(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.ac
+ am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+-	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/acinclude.m4 \
+-	$(top_srcdir)/configure.ac
++	$(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.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  mkinstalldirs = $(install_sh) -d
-@@ -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@
-@@ -308,6 +312,7 @@
+@@ -312,6 +314,7 @@ libdir = @libdir@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -25496,31 +22131,24 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  ms_librarian = @ms_librarian@
-Index: gtk+3.0-2.90.6/modules/engines/ms-windows/Theme/gtk-3.0/Makefile.in
-===================================================================
---- gtk+3.0-2.90.6.orig/modules/engines/ms-windows/Theme/gtk-3.0/Makefile.in
-+++ gtk+3.0-2.90.6/modules/engines/ms-windows/Theme/gtk-3.0/Makefile.in
-@@ -41,7 +41,10 @@
+diff --git a/modules/engines/ms-windows/Theme/gtk-3.0/Makefile.in b/modules/engines/ms-windows/Theme/gtk-3.0/Makefile.in
+index d15121e..0f359c6 100644
+--- a/modules/engines/ms-windows/Theme/gtk-3.0/Makefile.in
++++ b/modules/engines/ms-windows/Theme/gtk-3.0/Makefile.in
+@@ -41,8 +41,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
  subdir = modules/engines/ms-windows/Theme/gtk-3.0
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
--	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-+	$(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.ac
+ am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+-	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/acinclude.m4 \
+-	$(top_srcdir)/configure.ac
++	$(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.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  mkinstalldirs = $(install_sh) -d
-@@ -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@
-@@ -292,6 +296,7 @@
+@@ -296,6 +298,7 @@ libdir = @libdir@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -25528,31 +22156,24 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  ms_librarian = @ms_librarian@
-Index: gtk+3.0-2.90.6/modules/engines/pixbuf/Makefile.in
-===================================================================
---- gtk+3.0-2.90.6.orig/modules/engines/pixbuf/Makefile.in
-+++ gtk+3.0-2.90.6/modules/engines/pixbuf/Makefile.in
-@@ -41,7 +41,10 @@
+diff --git a/modules/engines/pixbuf/Makefile.in b/modules/engines/pixbuf/Makefile.in
+index 4dce362..b2c874d 100644
+--- a/modules/engines/pixbuf/Makefile.in
++++ b/modules/engines/pixbuf/Makefile.in
+@@ -41,8 +41,10 @@ DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
  subdir = modules/engines/pixbuf
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
--	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-+	$(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.ac
+ am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+-	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/acinclude.m4 \
+-	$(top_srcdir)/configure.ac
++	$(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.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  mkinstalldirs = $(install_sh) -d
-@@ -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@
-@@ -328,6 +332,7 @@
+@@ -332,6 +334,7 @@ libdir = @libdir@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -25560,31 +22181,24 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  ms_librarian = @ms_librarian@
-Index: gtk+3.0-2.90.6/modules/input/Makefile.in
-===================================================================
---- gtk+3.0-2.90.6.orig/modules/input/Makefile.in
-+++ gtk+3.0-2.90.6/modules/input/Makefile.in
-@@ -42,7 +42,10 @@
+diff --git a/modules/input/Makefile.in b/modules/input/Makefile.in
+index b0b4565..ed82907 100644
+--- a/modules/input/Makefile.in
++++ b/modules/input/Makefile.in
+@@ -42,8 +42,10 @@ DIST_COMMON = $(dist_imconffile_DATA) $(srcdir)/Makefile.am \
  subdir = modules/input
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
--	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-+	$(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.ac
+ am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+-	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/acinclude.m4 \
+-	$(top_srcdir)/configure.ac
++	$(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.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  mkinstalldirs = $(install_sh) -d
-@@ -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@
-@@ -529,6 +533,7 @@
+@@ -533,6 +535,7 @@ libdir = @libdir@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -25592,41 +22206,24 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  ms_librarian = @ms_librarian@
-@@ -694,7 +699,8 @@
- @INCLUDE_IM_MULTIPRESS_FALSE at MULTIPRESS_MODULE = im-multipress.la
- imconffiledir = $(sysconfdir)/gtk-3.0
- dist_imconffile_DATA = im-multipress.conf
-- at CROSS_COMPILING_FALSE@RUN_QUERY_IMMODULES_TEST = test -z "$(DESTDIR)"
-+ at CROSS_COMPILING_FALSE@@ENABLE_STATIC_FALSE at RUN_QUERY_IMMODULES_TEST = test -z "$(DESTDIR)"
-+ at CROSS_COMPILING_FALSE@@ENABLE_STATIC_TRUE at RUN_QUERY_IMMODULES_TEST = false
- @CROSS_COMPILING_TRUE at RUN_QUERY_IMMODULES_TEST = false
- @BUILD_DYNAMIC_MODULES_TRUE at module_LTLIBRARIES = \
- @BUILD_DYNAMIC_MODULES_TRUE@	$(AM_ET_MODULE)			\
-Index: gtk+3.0-2.90.6/modules/other/Makefile.in
-===================================================================
---- gtk+3.0-2.90.6.orig/modules/other/Makefile.in
-+++ gtk+3.0-2.90.6/modules/other/Makefile.in
-@@ -40,7 +40,10 @@
+diff --git a/modules/other/Makefile.in b/modules/other/Makefile.in
+index 66c16ce..03c4b3d 100644
+--- a/modules/other/Makefile.in
++++ b/modules/other/Makefile.in
+@@ -40,8 +40,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
  subdir = modules/other
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
--	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-+	$(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.ac
+ am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+-	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/acinclude.m4 \
+-	$(top_srcdir)/configure.ac
++	$(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.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  mkinstalldirs = $(install_sh) -d
-@@ -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@
-@@ -308,6 +312,7 @@
+@@ -312,6 +314,7 @@ libdir = @libdir@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -25634,31 +22231,24 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  ms_librarian = @ms_librarian@
-Index: gtk+3.0-2.90.6/modules/other/gail/Makefile.in
-===================================================================
---- gtk+3.0-2.90.6.orig/modules/other/gail/Makefile.in
-+++ gtk+3.0-2.90.6/modules/other/gail/Makefile.in
-@@ -42,7 +42,10 @@
+diff --git a/modules/other/gail/Makefile.in b/modules/other/gail/Makefile.in
+index 317eb60..b5ae8a1 100644
+--- a/modules/other/gail/Makefile.in
++++ b/modules/other/gail/Makefile.in
+@@ -42,8 +42,10 @@ DIST_COMMON = $(libgailinclude_HEADERS) $(srcdir)/Makefile.am \
  subdir = modules/other/gail
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
--	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-+	$(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.ac
+ am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+-	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/acinclude.m4 \
+-	$(top_srcdir)/configure.ac
++	$(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.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  mkinstalldirs = $(install_sh) -d
-@@ -245,6 +248,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@
-@@ -396,6 +400,7 @@
+@@ -399,6 +401,7 @@ libdir = @libdir@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -25666,31 +22256,24 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  ms_librarian = @ms_librarian@
-Index: gtk+3.0-2.90.6/modules/other/gail/libgail-util/Makefile.in
-===================================================================
---- gtk+3.0-2.90.6.orig/modules/other/gail/libgail-util/Makefile.in
-+++ gtk+3.0-2.90.6/modules/other/gail/libgail-util/Makefile.in
-@@ -43,7 +43,10 @@
+diff --git a/modules/other/gail/libgail-util/Makefile.in b/modules/other/gail/libgail-util/Makefile.in
+index f35313d..b9924e5 100644
+--- a/modules/other/gail/libgail-util/Makefile.in
++++ b/modules/other/gail/libgail-util/Makefile.in
+@@ -43,8 +43,10 @@ DIST_COMMON = $(libgailutilinclude_HEADERS) $(srcdir)/Makefile.am \
  subdir = modules/other/gail/libgail-util
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
--	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-+	$(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.ac
+ am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+-	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/acinclude.m4 \
+-	$(top_srcdir)/configure.ac
++	$(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.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  mkinstalldirs = $(install_sh) -d
-@@ -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@
-@@ -333,6 +337,7 @@
+@@ -337,6 +339,7 @@ libdir = @libdir@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -25698,31 +22281,24 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  ms_librarian = @ms_librarian@
-Index: gtk+3.0-2.90.6/modules/other/gail/tests/Makefile.in
-===================================================================
---- gtk+3.0-2.90.6.orig/modules/other/gail/tests/Makefile.in
-+++ gtk+3.0-2.90.6/modules/other/gail/tests/Makefile.in
-@@ -41,7 +41,10 @@
+diff --git a/modules/other/gail/tests/Makefile.in b/modules/other/gail/tests/Makefile.in
+index 6a68ff6..eb7eeda 100644
+--- a/modules/other/gail/tests/Makefile.in
++++ b/modules/other/gail/tests/Makefile.in
+@@ -41,8 +41,10 @@ DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
  subdir = modules/other/gail/tests
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
--	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-+	$(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.ac
+ am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+-	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/acinclude.m4 \
+-	$(top_srcdir)/configure.ac
++	$(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.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  mkinstalldirs = $(install_sh) -d
-@@ -313,6 +316,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@
-@@ -464,6 +468,7 @@
+@@ -468,6 +470,7 @@ libdir = @libdir@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -25730,31 +22306,24 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  ms_librarian = @ms_librarian@
-Index: gtk+3.0-2.90.6/modules/printbackends/Makefile.in
-===================================================================
---- gtk+3.0-2.90.6.orig/modules/printbackends/Makefile.in
-+++ gtk+3.0-2.90.6/modules/printbackends/Makefile.in
-@@ -43,7 +43,10 @@
+diff --git a/modules/printbackends/Makefile.in b/modules/printbackends/Makefile.in
+index 399101f..ec4d4f2 100644
+--- a/modules/printbackends/Makefile.in
++++ b/modules/printbackends/Makefile.in
+@@ -43,8 +43,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
  subdir = modules/printbackends
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
--	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-+	$(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.ac
+ am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+-	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/acinclude.m4 \
+-	$(top_srcdir)/configure.ac
++	$(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.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  mkinstalldirs = $(install_sh) -d
-@@ -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@
-@@ -310,6 +314,7 @@
+@@ -314,6 +316,7 @@ libdir = @libdir@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -25762,31 +22331,24 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  ms_librarian = @ms_librarian@
-Index: gtk+3.0-2.90.6/modules/printbackends/cups/Makefile.in
-===================================================================
---- gtk+3.0-2.90.6.orig/modules/printbackends/cups/Makefile.in
-+++ gtk+3.0-2.90.6/modules/printbackends/cups/Makefile.in
-@@ -42,7 +42,10 @@
+diff --git a/modules/printbackends/cups/Makefile.in b/modules/printbackends/cups/Makefile.in
+index f450d04..7261d3f 100644
+--- a/modules/printbackends/cups/Makefile.in
++++ b/modules/printbackends/cups/Makefile.in
+@@ -42,8 +42,10 @@ DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
  subdir = modules/printbackends/cups
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
--	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-+	$(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.ac
+ am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+-	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/acinclude.m4 \
+-	$(top_srcdir)/configure.ac
++	$(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.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  mkinstalldirs = $(install_sh) -d
-@@ -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@
-@@ -332,6 +336,7 @@
+@@ -336,6 +338,7 @@ libdir = @libdir@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -25794,31 +22356,24 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  ms_librarian = @ms_librarian@
-Index: gtk+3.0-2.90.6/modules/printbackends/file/Makefile.in
-===================================================================
---- gtk+3.0-2.90.6.orig/modules/printbackends/file/Makefile.in
-+++ gtk+3.0-2.90.6/modules/printbackends/file/Makefile.in
-@@ -42,7 +42,10 @@
+diff --git a/modules/printbackends/file/Makefile.in b/modules/printbackends/file/Makefile.in
+index 13d1366..8200a87 100644
+--- a/modules/printbackends/file/Makefile.in
++++ b/modules/printbackends/file/Makefile.in
+@@ -42,8 +42,10 @@ DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
  subdir = modules/printbackends/file
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
--	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-+	$(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.ac
+ am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+-	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/acinclude.m4 \
+-	$(top_srcdir)/configure.ac
++	$(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.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  mkinstalldirs = $(install_sh) -d
-@@ -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@
-@@ -331,6 +335,7 @@
+@@ -335,6 +337,7 @@ libdir = @libdir@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -25826,31 +22381,24 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  ms_librarian = @ms_librarian@
-Index: gtk+3.0-2.90.6/modules/printbackends/lpr/Makefile.in
-===================================================================
---- gtk+3.0-2.90.6.orig/modules/printbackends/lpr/Makefile.in
-+++ gtk+3.0-2.90.6/modules/printbackends/lpr/Makefile.in
-@@ -42,7 +42,10 @@
+diff --git a/modules/printbackends/lpr/Makefile.in b/modules/printbackends/lpr/Makefile.in
+index 44e6205..26f2f72 100644
+--- a/modules/printbackends/lpr/Makefile.in
++++ b/modules/printbackends/lpr/Makefile.in
+@@ -42,8 +42,10 @@ DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
  subdir = modules/printbackends/lpr
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
--	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-+	$(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.ac
+ am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+-	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/acinclude.m4 \
+-	$(top_srcdir)/configure.ac
++	$(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.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  mkinstalldirs = $(install_sh) -d
-@@ -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@
-@@ -329,6 +333,7 @@
+@@ -333,6 +335,7 @@ libdir = @libdir@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -25858,31 +22406,24 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  ms_librarian = @ms_librarian@
-Index: gtk+3.0-2.90.6/modules/printbackends/papi/Makefile.in
-===================================================================
---- gtk+3.0-2.90.6.orig/modules/printbackends/papi/Makefile.in
-+++ gtk+3.0-2.90.6/modules/printbackends/papi/Makefile.in
-@@ -40,7 +40,10 @@
+diff --git a/modules/printbackends/papi/Makefile.in b/modules/printbackends/papi/Makefile.in
+index 122f0bb..6a04785 100644
+--- a/modules/printbackends/papi/Makefile.in
++++ b/modules/printbackends/papi/Makefile.in
+@@ -40,8 +40,10 @@ DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
  	$(srcdir)/Makefile.in
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
--	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-+	$(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.ac
+ am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+-	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/acinclude.m4 \
+-	$(top_srcdir)/configure.ac
++	$(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.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  mkinstalldirs = $(install_sh) -d
-@@ -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@
-@@ -329,6 +333,7 @@
+@@ -333,6 +335,7 @@ libdir = @libdir@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -25890,31 +22431,24 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  ms_librarian = @ms_librarian@
-Index: gtk+3.0-2.90.6/modules/printbackends/test/Makefile.in
-===================================================================
---- gtk+3.0-2.90.6.orig/modules/printbackends/test/Makefile.in
-+++ gtk+3.0-2.90.6/modules/printbackends/test/Makefile.in
-@@ -42,7 +42,10 @@
+diff --git a/modules/printbackends/test/Makefile.in b/modules/printbackends/test/Makefile.in
+index 778983d..51ed53e 100644
+--- a/modules/printbackends/test/Makefile.in
++++ b/modules/printbackends/test/Makefile.in
+@@ -42,8 +42,10 @@ DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
  subdir = modules/printbackends/test
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
--	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-+	$(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.ac
+ am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+-	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/acinclude.m4 \
+-	$(top_srcdir)/configure.ac
++	$(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.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  mkinstalldirs = $(install_sh) -d
-@@ -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@
-@@ -330,6 +334,7 @@
+@@ -334,6 +336,7 @@ libdir = @libdir@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -25922,31 +22456,24 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  ms_librarian = @ms_librarian@
-Index: gtk+3.0-2.90.6/perf/Makefile.in
-===================================================================
---- gtk+3.0-2.90.6.orig/perf/Makefile.in
-+++ gtk+3.0-2.90.6/perf/Makefile.in
-@@ -42,7 +42,10 @@
+diff --git a/perf/Makefile.in b/perf/Makefile.in
+index a10334b..4fbc5ca 100644
+--- a/perf/Makefile.in
++++ b/perf/Makefile.in
+@@ -42,8 +42,10 @@ noinst_PROGRAMS = testperf$(EXEEXT)
  subdir = perf
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
--	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-+	$(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.ac
+ am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+-	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/acinclude.m4 \
+-	$(top_srcdir)/configure.ac
++	$(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.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  mkinstalldirs = $(install_sh) -d
-@@ -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@
-@@ -303,6 +307,7 @@
+@@ -307,6 +309,7 @@ libdir = @libdir@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -25954,31 +22481,24 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  ms_librarian = @ms_librarian@
-Index: gtk+3.0-2.90.6/tests/Makefile.in
-===================================================================
---- gtk+3.0-2.90.6.orig/tests/Makefile.in
-+++ gtk+3.0-2.90.6/tests/Makefile.in
-@@ -75,7 +75,10 @@
+diff --git a/tests/Makefile.in b/tests/Makefile.in
+index 7f39801..dbc1161 100644
+--- a/tests/Makefile.in
++++ b/tests/Makefile.in
+@@ -77,8 +77,10 @@ noinst_PROGRAMS = $(am__EXEEXT_1) simple$(EXEEXT) flicker$(EXEEXT) \
  subdir = tests
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/introspection.m4 \
--	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-+	$(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.ac
+ am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+-	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/acinclude.m4 \
+-	$(top_srcdir)/configure.ac
++	$(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.ac
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
  mkinstalldirs = $(install_sh) -d
-@@ -404,6 +407,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@
-@@ -555,6 +559,7 @@
+@@ -570,6 +572,7 @@ libdir = @libdir@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@




More information about the pkg-gnome-commits mailing list