[DebianGIS-dev] r2622 - in packages/libkml/trunk/debian: . patches

frankie at alioth.debian.org frankie at alioth.debian.org
Thu Dec 10 16:47:37 UTC 2009


Author: frankie
Date: 2009-12-10 16:47:37 +0000 (Thu, 10 Dec 2009)
New Revision: 2622

Modified:
   packages/libkml/trunk/debian/changelog
   packages/libkml/trunk/debian/patches/automake.diff
   packages/libkml/trunk/debian/patches/reautoconfiscated.diff
   packages/libkml/trunk/debian/patches/series
Log:
Updated to 1.1.0


Modified: packages/libkml/trunk/debian/changelog
===================================================================
--- packages/libkml/trunk/debian/changelog	2009-12-10 09:25:53 UTC (rev 2621)
+++ packages/libkml/trunk/debian/changelog	2009-12-10 16:47:37 UTC (rev 2622)
@@ -1,14 +1,19 @@
-libkml (1.0.1-4) unstable; urgency=low
+libkml (1.1.0-1) unstable; urgency=low
 
+  * New upstream release:
+      o In-memory KMZ read support.
+      o Initial Google Maps Data API support.
+      o Various security fixes, particularly in the underlying Zip library.
+  * Patches refreshed: reautoconfiscated.diff and automake.diff.
   * NMU ack: incorporate patch from Jakub Wilk to enable building with Python 2.6. 
     (closes: #557288)
   * Added original copyright from zlib to debian/copyright as originally asked
     by ftpmasters.
   * Added kfreebsd.diff top patch to manage GNU/kFreeBSD flavor.
     (closes: #558208)
-  * Reautoconfiscated.diff patch refreshed due to previous new patch.
+  * Fixed patch ordering.
 
- -- Francesco Paolo Lovergine <frankie at debian.org>  Thu, 10 Dec 2009 10:20:53 +0100
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Thu, 10 Dec 2009 17:30:39 +0100
 
 libkml (1.0.1-3) unstable; urgency=high
 

Modified: packages/libkml/trunk/debian/patches/automake.diff
===================================================================
--- packages/libkml/trunk/debian/patches/automake.diff	2009-12-10 09:25:53 UTC (rev 2621)
+++ packages/libkml/trunk/debian/patches/automake.diff	2009-12-10 16:47:37 UTC (rev 2622)
@@ -1,6 +1,7 @@
-diff -urN libkml-1.0.1.orig/examples/engine/Makefile.am libkml-1.0.1/examples/engine/Makefile.am
---- libkml-1.0.1.orig/examples/engine/Makefile.am	2009-03-21 22:17:47.000000000 +0100
-+++ libkml-1.0.1/examples/engine/Makefile.am	2009-09-30 11:38:58.000000000 +0200
+Index: libkml-1.1.0/examples/engine/Makefile.am
+===================================================================
+--- libkml-1.1.0.orig/examples/engine/Makefile.am	2009-07-23 21:06:17.000000000 +0200
++++ libkml-1.1.0/examples/engine/Makefile.am	2009-12-10 13:01:41.000000000 +0100
 @@ -2,7 +2,7 @@
  	      -I$(top_srcdir)/third_party/boost_1_34_1
  
@@ -10,9 +11,10 @@
  endif
  
  noinst_PROGRAMS = \
-diff -urN libkml-1.0.1.orig/examples/gpx/Makefile.am libkml-1.0.1/examples/gpx/Makefile.am
---- libkml-1.0.1.orig/examples/gpx/Makefile.am	2008-11-05 01:48:06.000000000 +0100
-+++ libkml-1.0.1/examples/gpx/Makefile.am	2009-09-30 11:38:58.000000000 +0200
+Index: libkml-1.1.0/examples/gpx/Makefile.am
+===================================================================
+--- libkml-1.1.0.orig/examples/gpx/Makefile.am	2009-07-23 21:06:17.000000000 +0200
++++ libkml-1.1.0/examples/gpx/Makefile.am	2009-12-10 13:01:41.000000000 +0100
 @@ -2,7 +2,7 @@
  	      -I$(top_srcdir)/third_party/boost_1_34_1
  
@@ -22,9 +24,10 @@
  endif
  
  noinst_PROGRAMS = gpxtracktokml
-diff -urN libkml-1.0.1.orig/examples/gx/Makefile.am libkml-1.0.1/examples/gx/Makefile.am
---- libkml-1.0.1.orig/examples/gx/Makefile.am	2009-03-21 22:17:47.000000000 +0100
-+++ libkml-1.0.1/examples/gx/Makefile.am	2009-09-30 11:38:58.000000000 +0200
+Index: libkml-1.1.0/examples/gx/Makefile.am
+===================================================================
+--- libkml-1.1.0.orig/examples/gx/Makefile.am	2009-07-23 21:06:19.000000000 +0200
++++ libkml-1.1.0/examples/gx/Makefile.am	2009-12-10 13:01:41.000000000 +0100
 @@ -2,7 +2,7 @@
  	      -I$(top_srcdir)/third_party/boost_1_34_1
  
@@ -34,9 +37,10 @@
  endif
  
  noinst_PROGRAMS = \
-diff -urN libkml-1.0.1.orig/examples/hellonet/Makefile.am libkml-1.0.1/examples/hellonet/Makefile.am
---- libkml-1.0.1.orig/examples/hellonet/Makefile.am	2009-06-10 03:01:54.000000000 +0200
-+++ libkml-1.0.1/examples/hellonet/Makefile.am	2009-09-30 11:38:58.000000000 +0200
+Index: libkml-1.1.0/examples/hellonet/Makefile.am
+===================================================================
+--- libkml-1.1.0.orig/examples/hellonet/Makefile.am	2009-10-26 22:45:45.000000000 +0100
++++ libkml-1.1.0/examples/hellonet/Makefile.am	2009-12-10 13:01:41.000000000 +0100
 @@ -4,7 +4,7 @@
  	      -I$(top_srcdir)/third_party/boost_1_34_1
  
@@ -45,10 +49,11 @@
 +AM_CXXFLAGS = -Wall -ansi -pedantic -fno-rtti
  endif
  
- noinst_PROGRAMS = kmlwalk kmzfetch listfeed resolvestyle xsdprint
-diff -urN libkml-1.0.1.orig/examples/helloworld/Makefile.am libkml-1.0.1/examples/helloworld/Makefile.am
---- libkml-1.0.1.orig/examples/helloworld/Makefile.am	2009-03-03 23:27:59.000000000 +0100
-+++ libkml-1.0.1/examples/helloworld/Makefile.am	2009-09-30 11:38:58.000000000 +0200
+ noinst_PROGRAMS = getgmapkml kmlwalk kmzfetch listfeed listgmaps resolvestyle \
+Index: libkml-1.1.0/examples/helloworld/Makefile.am
+===================================================================
+--- libkml-1.1.0.orig/examples/helloworld/Makefile.am	2009-07-23 21:06:19.000000000 +0200
++++ libkml-1.1.0/examples/helloworld/Makefile.am	2009-12-10 13:01:41.000000000 +0100
 @@ -4,7 +4,7 @@
  
  
@@ -58,9 +63,10 @@
  endif
  
  noinst_LTLIBRARIES = libhelloutil.la
-diff -urN libkml-1.0.1.orig/examples/regionator/Makefile.am libkml-1.0.1/examples/regionator/Makefile.am
---- libkml-1.0.1.orig/examples/regionator/Makefile.am	2009-03-03 23:27:59.000000000 +0100
-+++ libkml-1.0.1/examples/regionator/Makefile.am	2009-09-30 11:38:58.000000000 +0200
+Index: libkml-1.1.0/examples/regionator/Makefile.am
+===================================================================
+--- libkml-1.1.0.orig/examples/regionator/Makefile.am	2009-07-23 21:06:18.000000000 +0200
++++ libkml-1.1.0/examples/regionator/Makefile.am	2009-12-10 13:01:41.000000000 +0100
 @@ -3,7 +3,7 @@
                -I$(top_srcdir)/third_party/zlib-1.2.3/contrib
  
@@ -70,9 +76,10 @@
  endif
  
  noinst_PROGRAMS = csvregionator
-diff -urN libkml-1.0.1.orig/examples/xsd/Makefile.am libkml-1.0.1/examples/xsd/Makefile.am
---- libkml-1.0.1.orig/examples/xsd/Makefile.am	2008-11-05 01:48:06.000000000 +0100
-+++ libkml-1.0.1/examples/xsd/Makefile.am	2009-09-30 11:38:58.000000000 +0200
+Index: libkml-1.1.0/examples/xsd/Makefile.am
+===================================================================
+--- libkml-1.1.0.orig/examples/xsd/Makefile.am	2009-07-23 21:06:16.000000000 +0200
++++ libkml-1.1.0/examples/xsd/Makefile.am	2009-12-10 13:01:41.000000000 +0100
 @@ -3,7 +3,7 @@
  	      -I$(top_srcdir)/third_party/boost_1_34_1
  
@@ -82,15 +89,16 @@
  endif
  
  noinst_PROGRAMS = xsdchildren xsdcoverage xsdelements xsdenums xsdfind xsdtypes
-diff -urN libkml-1.0.1.orig/src/kml/base/Makefile.am libkml-1.0.1/src/kml/base/Makefile.am
---- libkml-1.0.1.orig/src/kml/base/Makefile.am	2009-06-10 03:47:14.000000000 +0200
-+++ libkml-1.0.1/src/kml/base/Makefile.am	2009-09-30 11:38:58.000000000 +0200
-@@ -1,14 +1,13 @@
+Index: libkml-1.1.0/src/kml/base/Makefile.am
+===================================================================
+--- libkml-1.1.0.orig/src/kml/base/Makefile.am	2009-10-26 22:45:29.000000000 +0100
++++ libkml-1.1.0/src/kml/base/Makefile.am	2009-12-10 13:04:07.000000000 +0100
+@@ -1,15 +1,14 @@
  AM_CPPFLAGS = -I$(top_srcdir)/src \
                -I$(top_srcdir)/third_party/boost_1_34_1 \
--              -I$(top_srcdir)/third_party/googletest-r108/include \
--              -I$(top_srcdir)/third_party/uriparser-0.7.1/include
-+              -I$(top_srcdir)/third_party/googletest-r108/include
+               -I$(top_srcdir)/third_party/googletest-r108/include \
+-              -I$(top_srcdir)/third_party/uriparser-0.7.1/include \
+               -I$(top_srcdir)/third_party/zlib-1.2.3/contrib
  
  if GCC
 -AM_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -Werror -ansi -pedantic -fno-rtti
@@ -100,21 +108,21 @@
  endif
  
 -libkmlbase_la_LDFLAGS = -lexpat
-+libkmlbase_la_LIBADD = -lexpat -luriparser
++libkmlbase_la_LDFLAGS = -lexpat -luriparser
  
  lib_LTLIBRARIES = libkmlbase.la
  libkmlbase_la_SOURCES = \
-@@ -27,9 +26,6 @@
- 	version.cc \
- 	xml_namespaces.cc
+@@ -31,8 +30,7 @@
+ 	zip_file.cc
  
--libkmlbase_la_LIBADD = \
+ libkmlbase_la_LIBADD = \
+-	$(top_builddir)/third_party/libminizip.la \
 -	$(top_builddir)/third_party/liburiparser.la
--
++	$(top_builddir)/third_party/libminizip.la
+ 
  # These header files will be installed in $(includedir)/kml/base
  libkmlbaseincludedir = $(includedir)/kml/base
- libkmlbaseinclude_HEADERS = \
-@@ -123,8 +119,7 @@
+@@ -130,8 +128,7 @@
  
  net_cache_test_SOURCES = net_cache_test.cc
  net_cache_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
@@ -124,7 +132,7 @@
  	$(top_builddir)/third_party/libgtest.la
  
  referent_test_SOURCES = referent_test.cc
-@@ -149,8 +144,7 @@
+@@ -156,8 +153,7 @@
  
  uri_parser_test_SOURCES = uri_parser_test.cc
  uri_parser_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
@@ -134,9 +142,10 @@
  	$(top_builddir)/third_party/libgtest.la
  
  util_test_SOURCES = util_test.cc
-diff -urN libkml-1.0.1.orig/src/kml/convenience/Makefile.am libkml-1.0.1/src/kml/convenience/Makefile.am
---- libkml-1.0.1.orig/src/kml/convenience/Makefile.am	2009-03-21 22:17:44.000000000 +0100
-+++ libkml-1.0.1/src/kml/convenience/Makefile.am	2009-09-30 11:38:58.000000000 +0200
+Index: libkml-1.1.0/src/kml/convenience/Makefile.am
+===================================================================
+--- libkml-1.1.0.orig/src/kml/convenience/Makefile.am	2009-10-27 00:19:04.000000000 +0100
++++ libkml-1.1.0/src/kml/convenience/Makefile.am	2009-12-10 13:01:41.000000000 +0100
 @@ -3,8 +3,8 @@
                -I$(top_srcdir)/third_party/googletest-r108/include
  
@@ -147,10 +156,11 @@
 +AM_TEST_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -ansi -fno-rtti -DGTEST_HAS_RTTI=0
  endif
  
- lib_LTLIBRARIES = libkmlconvenience.la
-diff -urN libkml-1.0.1.orig/src/kml/dom/Makefile.am libkml-1.0.1/src/kml/dom/Makefile.am
---- libkml-1.0.1.orig/src/kml/dom/Makefile.am	2009-03-21 22:17:41.000000000 +0100
-+++ libkml-1.0.1/src/kml/dom/Makefile.am	2009-09-30 11:38:58.000000000 +0200
+ EXTRA_DIST = \
+Index: libkml-1.1.0/src/kml/dom/Makefile.am
+===================================================================
+--- libkml-1.1.0.orig/src/kml/dom/Makefile.am	2009-07-23 21:05:40.000000000 +0200
++++ libkml-1.1.0/src/kml/dom/Makefile.am	2009-12-10 13:01:41.000000000 +0100
 @@ -3,8 +3,8 @@
  	     -I$(top_srcdir)/third_party/googletest-r108/include
  
@@ -162,10 +172,11 @@
  endif
  
  lib_LTLIBRARIES = libkmldom.la
-diff -urN libkml-1.0.1.orig/src/kml/engine/Makefile.am libkml-1.0.1/src/kml/engine/Makefile.am
---- libkml-1.0.1.orig/src/kml/engine/Makefile.am	2009-03-21 22:17:43.000000000 +0100
-+++ libkml-1.0.1/src/kml/engine/Makefile.am	2009-09-30 11:40:24.000000000 +0200
-@@ -4,8 +4,8 @@
+Index: libkml-1.1.0/src/kml/engine/Makefile.am
+===================================================================
+--- libkml-1.1.0.orig/src/kml/engine/Makefile.am	2009-10-26 22:45:29.000000000 +0100
++++ libkml-1.1.0/src/kml/engine/Makefile.am	2009-12-10 13:01:41.000000000 +0100
+@@ -3,8 +3,8 @@
  	     -I$(top_srcdir)/third_party/googletest-r108/include
  
  if GCC
@@ -176,7 +187,7 @@
  endif
  
  lib_LTLIBRARIES = libkmlengine.la
-@@ -295,10 +295,9 @@
+@@ -301,10 +301,9 @@
  
  style_inliner_test_SOURCES = style_inliner_test.cc
  style_inliner_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
@@ -188,9 +199,10 @@
  	$(top_builddir)/third_party/libgtest.la
  
  style_merger_test_SOURCES = style_merger_test.cc
-diff -urN libkml-1.0.1.orig/src/kml/regionator/Makefile.am libkml-1.0.1/src/kml/regionator/Makefile.am
---- libkml-1.0.1.orig/src/kml/regionator/Makefile.am	2009-03-03 23:27:54.000000000 +0100
-+++ libkml-1.0.1/src/kml/regionator/Makefile.am	2009-09-30 11:38:58.000000000 +0200
+Index: libkml-1.1.0/src/kml/regionator/Makefile.am
+===================================================================
+--- libkml-1.1.0.orig/src/kml/regionator/Makefile.am	2009-07-23 21:05:44.000000000 +0200
++++ libkml-1.1.0/src/kml/regionator/Makefile.am	2009-12-10 13:01:41.000000000 +0100
 @@ -4,8 +4,8 @@
  
  
@@ -202,9 +214,10 @@
  endif
  
  lib_LTLIBRARIES = libkmlregionator.la
-diff -urN libkml-1.0.1.orig/src/kml/xsd/Makefile.am libkml-1.0.1/src/kml/xsd/Makefile.am
---- libkml-1.0.1.orig/src/kml/xsd/Makefile.am	2009-03-03 23:27:58.000000000 +0100
-+++ libkml-1.0.1/src/kml/xsd/Makefile.am	2009-09-30 11:38:58.000000000 +0200
+Index: libkml-1.1.0/src/kml/xsd/Makefile.am
+===================================================================
+--- libkml-1.1.0.orig/src/kml/xsd/Makefile.am	2009-07-23 21:05:48.000000000 +0200
++++ libkml-1.1.0/src/kml/xsd/Makefile.am	2009-12-10 13:01:41.000000000 +0100
 @@ -3,8 +3,8 @@
  	      -I$(top_srcdir)/third_party/googletest-r108/include
  
@@ -216,9 +229,10 @@
  endif
  
  lib_LTLIBRARIES = libkmlxsd.la
-diff -urN libkml-1.0.1.orig/src/swig/Makefile.am libkml-1.0.1/src/swig/Makefile.am
---- libkml-1.0.1.orig/src/swig/Makefile.am	2009-07-03 00:52:27.000000000 +0200
-+++ libkml-1.0.1/src/swig/Makefile.am	2009-09-30 11:38:58.000000000 +0200
+Index: libkml-1.1.0/src/swig/Makefile.am
+===================================================================
+--- libkml-1.1.0.orig/src/swig/Makefile.am	2009-07-23 21:05:49.000000000 +0200
++++ libkml-1.1.0/src/swig/Makefile.am	2009-12-10 13:01:41.000000000 +0100
 @@ -1,8 +1,7 @@
  SUBDIRS = java python
  
@@ -229,9 +243,10 @@
  
  COMMONLIBS = $(top_builddir)/src/kml/engine/libkmlengine.la \
               $(top_builddir)/src/kml/dom/libkmldom.la \
-diff -urN libkml-1.0.1.orig/third_party/Makefile.am libkml-1.0.1/third_party/Makefile.am
---- libkml-1.0.1.orig/third_party/Makefile.am	2009-03-21 22:17:45.000000000 +0100
-+++ libkml-1.0.1/third_party/Makefile.am	2009-09-30 11:38:58.000000000 +0200
+Index: libkml-1.1.0/third_party/Makefile.am
+===================================================================
+--- libkml-1.1.0.orig/third_party/Makefile.am	2009-10-26 22:45:30.000000000 +0100
++++ libkml-1.1.0/third_party/Makefile.am	2009-12-10 13:01:41.000000000 +0100
 @@ -1,9 +1,8 @@
  AM_CPPFLAGS = -I$(top_srcdir)/third_party/zlib-1.2.3/contrib \
 -	      -I$(top_srcdir)/third_party/uriparser-0.7.1/include \
@@ -243,7 +258,7 @@
  noinst_LTLIBRARIES = libgtest.la
  
  libminizip_la_SOURCES = \
-@@ -12,37 +11,6 @@
+@@ -13,37 +12,6 @@
  	zlib-1.2.3/contrib/minizip/zip.c
  libminizip_la_LDFLAGS = -lz
  

Modified: packages/libkml/trunk/debian/patches/reautoconfiscated.diff
===================================================================
--- packages/libkml/trunk/debian/patches/reautoconfiscated.diff	2009-12-10 09:25:53 UTC (rev 2621)
+++ packages/libkml/trunk/debian/patches/reautoconfiscated.diff	2009-12-10 16:47:37 UTC (rev 2622)
@@ -1,6473 +1,55 @@
-Index: libkml-1.0.1/aclocal.m4
+Index: libkml-1.1.0/aclocal.m4
 ===================================================================
---- libkml-1.0.1.orig/aclocal.m4	2009-07-03 01:23:22.000000000 +0200
-+++ libkml-1.0.1/aclocal.m4	2009-12-10 10:19:41.000000000 +0100
+--- libkml-1.1.0.orig/aclocal.m4	2009-12-10 13:05:41.000000000 +0100
++++ libkml-1.1.0/aclocal.m4	2009-12-10 17:29:30.000000000 +0100
 @@ -1,7 +1,7 @@
--# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
+-# generated automatically by aclocal 1.10.2 -*- Autoconf -*-
 +# generated automatically by aclocal 1.11 -*- Autoconf -*-
  
  # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
--# 2005  Free Software Foundation, Inc.
+-# 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 +# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
  # This file is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
-@@ -11,6406 +11,15 @@
- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- # PARTICULAR PURPOSE.
+@@ -13,8 +13,8 @@
  
--# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-+m4_ifndef([AC_AUTOCONF_VERSION],
-+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+ m4_ifndef([AC_AUTOCONF_VERSION],
+   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
+-[m4_warning([this file was generated for autoconf 2.63.
 +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
 +[m4_warning([this file was generated for autoconf 2.65.
-+You have another version of autoconf.  It may work, but is not guaranteed to.
-+If you have problems, you may need to regenerate the build system entirely.
-+To do so, use the procedure documented by the package, typically `autoreconf'.])])
- 
--# serial 48 AC_PROG_LIBTOOL
--
--
--# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
--# -----------------------------------------------------------
--# If this macro is not defined by Autoconf, define it here.
--m4_ifdef([AC_PROVIDE_IFELSE],
--         [],
--         [m4_define([AC_PROVIDE_IFELSE],
--	         [m4_ifdef([AC_PROVIDE_$1],
--		           [$2], [$3])])])
--
--
--# AC_PROG_LIBTOOL
--# ---------------
--AC_DEFUN([AC_PROG_LIBTOOL],
--[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
--dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
--dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
--  AC_PROVIDE_IFELSE([AC_PROG_CXX],
--    [AC_LIBTOOL_CXX],
--    [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
--  ])])
--dnl And a similar setup for Fortran 77 support
--  AC_PROVIDE_IFELSE([AC_PROG_F77],
--    [AC_LIBTOOL_F77],
--    [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
--])])
--
--dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
--dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
--dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
--  AC_PROVIDE_IFELSE([AC_PROG_GCJ],
--    [AC_LIBTOOL_GCJ],
--    [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
--      [AC_LIBTOOL_GCJ],
--      [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
--	[AC_LIBTOOL_GCJ],
--      [ifdef([AC_PROG_GCJ],
--	     [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
--       ifdef([A][M_PROG_GCJ],
--	     [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
--       ifdef([LT_AC_PROG_GCJ],
--	     [define([LT_AC_PROG_GCJ],
--		defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
--])])# AC_PROG_LIBTOOL
--
--
--# _AC_PROG_LIBTOOL
--# ----------------
--AC_DEFUN([_AC_PROG_LIBTOOL],
--[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
--AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
--AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
--AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
--
--# This can be used to rebuild libtool when needed
--LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
--
--# Always use our own libtool.
--LIBTOOL='$(SHELL) $(top_builddir)/libtool'
--AC_SUBST(LIBTOOL)dnl
--
--# Prevent multiple expansion
--define([AC_PROG_LIBTOOL], [])
--])# _AC_PROG_LIBTOOL
--
--
--# AC_LIBTOOL_SETUP
--# ----------------
--AC_DEFUN([AC_LIBTOOL_SETUP],
--[AC_PREREQ(2.50)dnl
--AC_REQUIRE([AC_ENABLE_SHARED])dnl
--AC_REQUIRE([AC_ENABLE_STATIC])dnl
--AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
--AC_REQUIRE([AC_CANONICAL_HOST])dnl
--AC_REQUIRE([AC_CANONICAL_BUILD])dnl
--AC_REQUIRE([AC_PROG_CC])dnl
--AC_REQUIRE([AC_PROG_LD])dnl
--AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
--AC_REQUIRE([AC_PROG_NM])dnl
--
--AC_REQUIRE([AC_PROG_LN_S])dnl
--AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
--# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
--AC_REQUIRE([AC_OBJEXT])dnl
--AC_REQUIRE([AC_EXEEXT])dnl
--dnl
--
--AC_LIBTOOL_SYS_MAX_CMD_LEN
--AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
--AC_LIBTOOL_OBJDIR
--
--AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
--_LT_AC_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.
--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']
--
--# 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 avoid accidental globbing in evaled expressions
--no_glob_subst='s/\*/\\\*/g'
--
--# Constants:
--rm="rm -f"
--
--# Global variables:
--default_ofile=libtool
--can_build_shared=yes
--
--# All known linkers require a `.a' archive for static linking (except MSVC,
--# which needs '.lib').
--libext=a
--ltmain="$ac_aux_dir/ltmain.sh"
--ofile="$default_ofile"
--with_gnu_ld="$lt_cv_prog_gnu_ld"
--
--AC_CHECK_TOOL(AR, ar, false)
--AC_CHECK_TOOL(RANLIB, ranlib, :)
--AC_CHECK_TOOL(STRIP, strip, :)
--
--old_CC="$CC"
--old_CFLAGS="$CFLAGS"
--
--# Set sane defaults for various variables
--test -z "$AR" && AR=ar
--test -z "$AR_FLAGS" && AR_FLAGS=cru
--test -z "$AS" && AS=as
--test -z "$CC" && CC=cc
--test -z "$LTCC" && LTCC=$CC
--test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
--test -z "$DLLTOOL" && DLLTOOL=dlltool
--test -z "$LD" && LD=ld
--test -z "$LN_S" && LN_S="ln -s"
--test -z "$MAGIC_CMD" && MAGIC_CMD=file
--test -z "$NM" && NM=nm
--test -z "$SED" && SED=sed
--test -z "$OBJDUMP" && OBJDUMP=objdump
--test -z "$RANLIB" && RANLIB=:
--test -z "$STRIP" && STRIP=:
--test -z "$ac_objext" && ac_objext=o
--
--# Determine commands to create old-style static archives.
--old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
--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_CC_BASENAME([$compiler])
--
--# Only perform the check for file, if the check method requires it
--case $deplibs_check_method in
--file_magic*)
--  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
--    AC_PATH_MAGIC
--  fi
--  ;;
--esac
--
--AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
--AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
--enable_win32_dll=yes, enable_win32_dll=no)
--
--AC_ARG_ENABLE([libtool-lock],
--    [AC_HELP_STRING([--disable-libtool-lock],
--	[avoid locking (might break parallel builds)])])
--test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
--
--AC_ARG_WITH([pic],
--    [AC_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=default
--
--# Use C for the default configuration in the libtool script
--tagname=
--AC_LIBTOOL_LANG_C_CONFIG
--_LT_AC_TAGCONFIG
--])# AC_LIBTOOL_SETUP
--
--
--# _LT_AC_SYS_COMPILER
--# -------------------
--AC_DEFUN([_LT_AC_SYS_COMPILER],
--[AC_REQUIRE([AC_PROG_CC])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_AC_SYS_COMPILER
--
--
--# _LT_CC_BASENAME(CC)
--# -------------------
--# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
--AC_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_COMPILER_BOILERPLATE
--# ------------------------
--# Check for compiler boilerplate output or warnings with
--# the simple compiler test code.
--AC_DEFUN([_LT_COMPILER_BOILERPLATE],
--[ac_outfile=conftest.$ac_objext
--printf "$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.
--AC_DEFUN([_LT_LINKER_BOILERPLATE],
--[ac_outfile=conftest.$ac_objext
--printf "$lt_simple_link_test_code" >conftest.$ac_ext
--eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
--_lt_linker_boilerplate=`cat conftest.err`
--$rm conftest*
--])# _LT_LINKER_BOILERPLATE
--
--
--# _LT_AC_SYS_LIBPATH_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.
--AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
--[AC_LINK_IFELSE(AC_LANG_PROGRAM,[
--aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
--}'`
--# 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 '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
--}'`; fi],[])
--if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
--])# _LT_AC_SYS_LIBPATH_AIX
--
--
--# _LT_AC_SHELL_INIT(ARG)
--# ----------------------
--AC_DEFUN([_LT_AC_SHELL_INIT],
--[ifdef([AC_DIVERSION_NOTICE],
--	     [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
--	 [AC_DIVERT_PUSH(NOTICE)])
--$1
--AC_DIVERT_POP
--])# _LT_AC_SHELL_INIT
--
--
--# _LT_AC_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.
--AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
--[_LT_AC_SHELL_INIT([
--# Check that we are running under the correct shell.
--SHELL=${CONFIG_SHELL-/bin/sh}
--
--case X$ECHO in
--X*--fallback-echo)
--  # Remove one level of quotation (which was required for Make).
--  ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
--  ;;
--esac
--
--echo=${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 <<EOF
--[$]*
--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 "$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 &&
--       echo_test_string=`eval $cmd` &&
--       (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.
--ECHO=$echo
--if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
--   ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
--fi
--
--AC_SUBST(ECHO)
--])])# _LT_AC_PROG_ECHO_BACKSLASH
--
--
--# _LT_AC_LOCK
--# -----------
--AC_DEFUN([_LT_AC_LOCK],
--[AC_ARG_ENABLE([libtool-lock],
--    [AC_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-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|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-*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-*linux*)
--          LD="${LD-ld} -m elf_x86_64"
--          ;;
--        ppc*-*linux*|powerpc*-*linux*)
--          LD="${LD-ld} -m elf64ppc"
--          ;;
--        s390*-*linux*)
--          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_TRY_LINK([],[],[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" ;;
--      *)    LD="${LD-ld} -64" ;;
--      esac
--      ;;
--    esac
--  fi
--  rm -rf conftest*
--  ;;
--
--AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
--[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
--  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
--  AC_CHECK_TOOL(AS, as, false)
--  AC_CHECK_TOOL(OBJDUMP, objdump, false)
--  ;;
--  ])
--esac
--
--need_locks="$enable_libtool_lock"
--
--])# _LT_AC_LOCK
--
--
--# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
--#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
--# ----------------------------------------------------------------
--# Check whether the given compiler option works
--AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],
--[AC_REQUIRE([LT_AC_PROG_SED])
--AC_CACHE_CHECK([$1], [$2],
--  [$2=no
--  ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
--   printf "$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
--    ifelse([$5], , :, [$5])
--else
--    ifelse([$6], , :, [$6])
--fi
--])# AC_LIBTOOL_COMPILER_OPTION
--
--
--# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
--#                          [ACTION-SUCCESS], [ACTION-FAILURE])
--# ------------------------------------------------------------
--# Check whether the given compiler option works
--AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
--[AC_CACHE_CHECK([$1], [$2],
--  [$2=no
--   save_LDFLAGS="$LDFLAGS"
--   LDFLAGS="$LDFLAGS $3"
--   printf "$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 conftest*
--   LDFLAGS="$save_LDFLAGS"
--])
--
--if test x"[$]$2" = xyes; then
--    ifelse([$4], , :, [$4])
--else
--    ifelse([$5], , :, [$5])
--fi
--])# AC_LIBTOOL_LINKER_OPTION
--
--
--# AC_LIBTOOL_SYS_MAX_CMD_LEN
--# --------------------------
--AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN],
--[# 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*)
--    # 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
--    ;;
--  *)
--    # 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.
--    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
--    while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
--	       = "XX$teststring") >/dev/null 2>&1 &&
--	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
--	    lt_cv_sys_max_cmd_len=$new_result &&
--	    test $i != 17 # 1/2 MB should be enough
--    do
--      i=`expr $i + 1`
--      teststring=$teststring$teststring
--    done
--    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`
--    ;;
--  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
--])# AC_LIBTOOL_SYS_MAX_CMD_LEN
--
--
--# _LT_AC_CHECK_DLFCN
--# ------------------
--AC_DEFUN([_LT_AC_CHECK_DLFCN],
--[AC_CHECK_HEADERS(dlfcn.h)dnl
--])# _LT_AC_CHECK_DLFCN
--
--
--# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
--#                           ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
--# ---------------------------------------------------------------------
--AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
--[AC_REQUIRE([_LT_AC_CHECK_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 <<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
--
--#ifdef __cplusplus
--extern "C" void exit (int);
--#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 ());
--
--    exit (status);
--}]
--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_AC_TRY_DLOPEN_SELF
--
--
--# AC_LIBTOOL_DLOPEN_SELF
--# ----------------------
--AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
--[AC_REQUIRE([_LT_AC_CHECK_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*)
--    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="-dld"],
--	[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="-dld"])
--	      ])
--	    ])
--	  ])
--	])
--      ])
--    ;;
--  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_AC_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_AC_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
--])# AC_LIBTOOL_DLOPEN_SELF
--
--
--# AC_LIBTOOL_PROG_CC_C_O([TAGNAME])
--# ---------------------------------
--# Check to see if options -c and -o are simultaneously supported by compiler
--AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
--[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
--AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
--  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
--  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
--   $rm -r conftest 2>/dev/null
--   mkdir conftest
--   cd conftest
--   mkdir out
--   printf "$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_AC_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 ..
--   rmdir conftest
--   $rm conftest*
--])
--])# AC_LIBTOOL_PROG_CC_C_O
--
--
--# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME])
--# -----------------------------------------
--# Check to see if we can do hard links to lock some files if needed
--AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS],
--[AC_REQUIRE([_LT_AC_LOCK])dnl
--
--hard_links="nottested"
--if test "$_LT_AC_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
--])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS
--
--
--# AC_LIBTOOL_OBJDIR
--# -----------------
--AC_DEFUN([AC_LIBTOOL_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
--])# AC_LIBTOOL_OBJDIR
--
--
--# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME])
--# ----------------------------------------------
--# Check hardcoding attributes.
--AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH],
--[AC_MSG_CHECKING([how to hardcode library paths into programs])
--_LT_AC_TAGVAR(hardcode_action, $1)=
--if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
--   test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
--   test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
--
--  # We can hardcode non-existant directories.
--  if test "$_LT_AC_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_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
--     test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then
--    # Linking always hardcodes the temporary library directory.
--    _LT_AC_TAGVAR(hardcode_action, $1)=relink
--  else
--    # We can link without hardcoding, and we can hardcode nonexisting dirs.
--    _LT_AC_TAGVAR(hardcode_action, $1)=immediate
--  fi
--else
--  # We cannot hardcode anything, or else we can only hardcode existing
--  # directories.
--  _LT_AC_TAGVAR(hardcode_action, $1)=unsupported
--fi
--AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)])
--
--if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; 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
--])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH
--
--
--# AC_LIBTOOL_SYS_LIB_STRIP
--# ------------------------
--AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP],
--[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"
--         AC_MSG_RESULT([yes])
--       else
--  AC_MSG_RESULT([no])
--fi
--       ;;
--   *)
--  AC_MSG_RESULT([no])
--    ;;
--  esac
--fi
--])# AC_LIBTOOL_SYS_LIB_STRIP
--
--
--# AC_LIBTOOL_SYS_DYNAMIC_LINKER
--# -----------------------------
--# PORTME Fill in your ld.so characteristics
--AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
--[AC_MSG_CHECKING([dynamic linker characteristics])
--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"
--if test "$GCC" = yes; then
--  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 ';' >/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.
--    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
--else
--  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
--fi
--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'
--  ;;
--
--aix4* | aix5*)
--  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*)
--  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'
--  ;;
--
--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*)
--  version_type=windows
--  shrext_cmds=".dll"
--  need_version=no
--  need_lib_prefix=no
--
--  case $GCC,$host_os in
--  yes,cygwin* | yes,mingw* | yes,pw32*)
--    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'
--    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*)
--      # 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}${versuffix}$shared_ext ${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`'
--  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
--  if test "$GCC" = yes; then
--    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
--  else
--    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
--  fi
--  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
--  ;;
--
--kfreebsd*-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='GNU ld.so'
--  ;;
--
--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
--    ;;
--  freebsd*) # from 4.6 on
--    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'
--  ;;
--
--interix3*)
--  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*)
--  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
--  # 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
--
--  # find out which ABI we are using
--  libsuff=
--  case "$host_cpu" in
--  x86_64*|s390x*|powerpc64*)
--    echo '[#]line __oline__ "configure"' > conftest.$ac_ext
--    if AC_TRY_EVAL(ac_compile); then
--      case `/usr/bin/file conftest.$ac_objext` in
--      *64-bit*)
--        libsuff=64
--        sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
--        ;;
--      esac
--    fi
--    rm -rf conftest*
--    ;;
--  esac
--
--  # 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/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
--    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $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'
--  ;;
--
--knetbsd*-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='GNU ld.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=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
--  ;;
--
--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"
--  ;;
--
--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
--      export_dynamic_flag_spec='${wl}-Blargedynsym'
--      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
--  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'
--    shlibpath_overrides_runpath=no
--  else
--    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
--    shlibpath_overrides_runpath=yes
--    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'
--  ;;
--
--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
--])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
--
--
--# _LT_AC_TAGCONFIG
--# ----------------
--AC_DEFUN([_LT_AC_TAGCONFIG],
--[AC_ARG_WITH([tags],
--    [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
--        [include additional configurations @<:@automatic@:>@])],
--    [tagnames="$withval"])
--
--if test -f "$ltmain" && test -n "$tagnames"; then
--  if test ! -f "${ofile}"; then
--    AC_MSG_WARN([output file `$ofile' does not exist])
--  fi
--
--  if test -z "$LTCC"; then
--    eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
--    if test -z "$LTCC"; then
--      AC_MSG_WARN([output file `$ofile' does not look like a libtool script])
--    else
--      AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
--    fi
--  fi
--  if test -z "$LTCFLAGS"; then
--    eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
--  fi
--
--  # Extract list of available tagged configurations in $ofile.
--  # Note that this assumes the entire list is on one line.
--  available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
--
--  lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
--  for tagname in $tagnames; do
--    IFS="$lt_save_ifs"
--    # Check whether tagname contains only valid characters
--    case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in
--    "") ;;
--    *)  AC_MSG_ERROR([invalid tag name: $tagname])
--	;;
--    esac
--
--    if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
--    then
--      AC_MSG_ERROR([tag name \"$tagname\" already exists])
--    fi
--
--    # Update the list of available tags.
--    if test -n "$tagname"; then
--      echo appending configuration tag \"$tagname\" to $ofile
--
--      case $tagname in
--      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_LIBTOOL_LANG_CXX_CONFIG
--	else
--	  tagname=""
--	fi
--	;;
--
--      F77)
--	if test -n "$F77" && test "X$F77" != "Xno"; then
--	  AC_LIBTOOL_LANG_F77_CONFIG
--	else
--	  tagname=""
--	fi
--	;;
--
--      GCJ)
--	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
--	  AC_LIBTOOL_LANG_GCJ_CONFIG
--	else
--	  tagname=""
--	fi
--	;;
--
--      RC)
--	AC_LIBTOOL_LANG_RC_CONFIG
--	;;
--
--      *)
--	AC_MSG_ERROR([Unsupported tag name: $tagname])
--	;;
--      esac
--
--      # Append the new tag name to the list of available tags.
--      if test -n "$tagname" ; then
--      available_tags="$available_tags $tagname"
--    fi
--    fi
--  done
--  IFS="$lt_save_ifs"
--
--  # Now substitute the updated list of available tags.
--  if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
--    mv "${ofile}T" "$ofile"
--    chmod +x "$ofile"
--  else
--    rm -f "${ofile}T"
--    AC_MSG_ERROR([unable to update list of available tagged configurations.])
--  fi
--fi
--])# _LT_AC_TAGCONFIG
--
--
--# AC_LIBTOOL_DLOPEN
--# -----------------
--# enable checks for dlopen support
--AC_DEFUN([AC_LIBTOOL_DLOPEN],
-- [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])
--])# AC_LIBTOOL_DLOPEN
--
--
--# AC_LIBTOOL_WIN32_DLL
--# --------------------
--# declare package support for building win32 DLLs
--AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
--[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
--])# AC_LIBTOOL_WIN32_DLL
--
--
--# AC_ENABLE_SHARED([DEFAULT])
--# ---------------------------
--# implement the --enable-shared flag
--# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
--AC_DEFUN([AC_ENABLE_SHARED],
--[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
--AC_ARG_ENABLE([shared],
--    [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
--	[build shared libraries @<:@default=]AC_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=]AC_ENABLE_SHARED_DEFAULT)
--])# AC_ENABLE_SHARED
--
--
--# AC_DISABLE_SHARED
--# -----------------
--# set the default shared flag to --disable-shared
--AC_DEFUN([AC_DISABLE_SHARED],
--[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
--AC_ENABLE_SHARED(no)
--])# AC_DISABLE_SHARED
--
--
--# AC_ENABLE_STATIC([DEFAULT])
--# ---------------------------
--# implement the --enable-static flag
--# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
--AC_DEFUN([AC_ENABLE_STATIC],
--[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
--AC_ARG_ENABLE([static],
--    [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@],
--	[build static libraries @<:@default=]AC_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=]AC_ENABLE_STATIC_DEFAULT)
--])# AC_ENABLE_STATIC
--
--
--# AC_DISABLE_STATIC
--# -----------------
--# set the default static flag to --disable-static
--AC_DEFUN([AC_DISABLE_STATIC],
--[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
--AC_ENABLE_STATIC(no)
--])# AC_DISABLE_STATIC
--
--
--# AC_ENABLE_FAST_INSTALL([DEFAULT])
--# ---------------------------------
--# implement the --enable-fast-install flag
--# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
--AC_DEFUN([AC_ENABLE_FAST_INSTALL],
--[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
--AC_ARG_ENABLE([fast-install],
--    [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
--    [optimize for fast installation @<:@default=]AC_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=]AC_ENABLE_FAST_INSTALL_DEFAULT)
--])# AC_ENABLE_FAST_INSTALL
--
--
--# AC_DISABLE_FAST_INSTALL
--# -----------------------
--# set the default to --disable-fast-install
--AC_DEFUN([AC_DISABLE_FAST_INSTALL],
--[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
--AC_ENABLE_FAST_INSTALL(no)
--])# AC_DISABLE_FAST_INSTALL
--
--
--# AC_LIBTOOL_PICMODE([MODE])
--# --------------------------
--# implement the --with-pic flag
--# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
--AC_DEFUN([AC_LIBTOOL_PICMODE],
--[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
--pic_mode=ifelse($#,1,$1,default)
--])# AC_LIBTOOL_PICMODE
--
--
--# AC_PROG_EGREP
--# -------------
--# This is predefined starting with Autoconf 2.54, so this conditional
--# definition can be removed once we require Autoconf 2.54 or later.
--m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP],
--[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep],
--   [if echo a | (grep -E '(a|b)') >/dev/null 2>&1
--    then ac_cv_prog_egrep='grep -E'
--    else ac_cv_prog_egrep='egrep'
--    fi])
-- EGREP=$ac_cv_prog_egrep
-- AC_SUBST([EGREP])
--])])
--
--
--# AC_PATH_TOOL_PREFIX
--# -------------------
--# find a file program which can recognise shared library
--AC_DEFUN([AC_PATH_TOOL_PREFIX],
--[AC_REQUIRE([AC_PROG_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="ifelse([$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 <<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
--
--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
--])# AC_PATH_TOOL_PREFIX
--
--
--# AC_PATH_MAGIC
--# -------------
--# find a file program which can recognise a shared library
--AC_DEFUN([AC_PATH_MAGIC],
--[AC_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
--    AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
--  else
--    MAGIC_CMD=:
--  fi
--fi
--])# AC_PATH_MAGIC
--
--
--# AC_PROG_LD
--# ----------
--# find the pathname to the GNU or non-GNU linker
--AC_DEFUN([AC_PROG_LD],
--[AC_ARG_WITH([gnu-ld],
--    [AC_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])
--AC_REQUIRE([LT_AC_PROG_SED])dnl
--AC_REQUIRE([AC_PROG_CC])dnl
--AC_REQUIRE([AC_CANONICAL_HOST])dnl
--AC_REQUIRE([AC_CANONICAL_BUILD])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])
--AC_PROG_LD_GNU
--])# AC_PROG_LD
--
--
--# AC_PROG_LD_GNU
--# --------------
--AC_DEFUN([AC_PROG_LD_GNU],
--[AC_REQUIRE([AC_PROG_EGREP])dnl
--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
--])# AC_PROG_LD_GNU
--
--
--# AC_PROG_LD_RELOAD_FLAG
--# ----------------------
--# find reload flag for linker
--#   -- PORTME Some linkers may need a different reload flag.
--AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
--[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
--])# AC_PROG_LD_RELOAD_FLAG
--
--
--# AC_DEPLIBS_CHECK_METHOD
--# -----------------------
--# how to check for library dependencies
--#  -- PORTME fill in with the dynamic library characteristics
--AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
--[AC_CACHE_CHECK([how to recognise 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
--aix4* | aix5*)
--  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'.
--  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
--  lt_cv_file_magic_cmd='$OBJDUMP -f'
--  ;;
--
--darwin* | rhapsody*)
--  lt_cv_deplibs_check_method=pass_all
--  ;;
--
--freebsd* | kfreebsd*-gnu | 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
--  ;;
--
--interix3*)
--  # 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*)
--  lt_cv_deplibs_check_method=pass_all
--  ;;
--
--netbsd*)
--  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=unknown
--  ;;
--
--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
--  ;;
--
--solaris*)
--  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
--  ;;
--
--sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
--  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
--])# AC_DEPLIBS_CHECK_METHOD
--
--
--# AC_PROG_NM
--# ----------
--# find the pathname to a BSD-compatible name lister
--AC_DEFUN([AC_PROG_NM],
--[AC_CACHE_CHECK([for BSD-compatible 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
--  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
--fi])
--NM="$lt_cv_path_NM"
--])# AC_PROG_NM
--
--
--# AC_CHECK_LIBM
--# -------------
--# check for math library
--AC_DEFUN([AC_CHECK_LIBM],
--[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_CHECK_LIBM
--
--
--# AC_LIBLTDL_CONVENIENCE([DIRECTORY])
--# -----------------------------------
--# sets LIBLTDL to the link flags for the libltdl convenience library and
--# LTDLINCL to the include flags for the libltdl header and adds
--# --enable-ltdl-convenience to the configure arguments.  Note that
--# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
--# it is assumed to be `libltdl'.  LIBLTDL will be prefixed with
--# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/'
--# (note the single quotes!).  If your package is not flat and you're not
--# using automake, define top_builddir and top_srcdir appropriately in
--# the Makefiles.
--AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
--[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
--  case $enable_ltdl_convenience in
--  no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
--  "") enable_ltdl_convenience=yes
--      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
--  esac
--  LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
--  LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
--  # For backwards non-gettext consistent compatibility...
--  INCLTDL="$LTDLINCL"
--])# AC_LIBLTDL_CONVENIENCE
--
--
--# AC_LIBLTDL_INSTALLABLE([DIRECTORY])
--# -----------------------------------
--# sets LIBLTDL to the link flags for the libltdl installable library and
--# LTDLINCL to the include flags for the libltdl header and adds
--# --enable-ltdl-install to the configure arguments.  Note that
--# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
--# and an installed libltdl is not found, it is assumed to be `libltdl'.
--# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with
--# '${top_srcdir}/' (note the single quotes!).  If your package is not
--# flat and you're not using automake, define top_builddir and top_srcdir
--# appropriately in the Makefiles.
--# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
--AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
--[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
--  AC_CHECK_LIB(ltdl, lt_dlinit,
--  [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
--  [if test x"$enable_ltdl_install" = xno; then
--     AC_MSG_WARN([libltdl not installed, but installation disabled])
--   else
--     enable_ltdl_install=yes
--   fi
--  ])
--  if test x"$enable_ltdl_install" = x"yes"; then
--    ac_configure_args="$ac_configure_args --enable-ltdl-install"
--    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
--    LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
--  else
--    ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
--    LIBLTDL="-lltdl"
--    LTDLINCL=
--  fi
--  # For backwards non-gettext consistent compatibility...
--  INCLTDL="$LTDLINCL"
--])# AC_LIBLTDL_INSTALLABLE
--
--
--# AC_LIBTOOL_CXX
--# --------------
--# enable support for C++ libraries
--AC_DEFUN([AC_LIBTOOL_CXX],
--[AC_REQUIRE([_LT_AC_LANG_CXX])
--])# AC_LIBTOOL_CXX
--
--
--# _LT_AC_LANG_CXX
--# ---------------
--AC_DEFUN([_LT_AC_LANG_CXX],
--[AC_REQUIRE([AC_PROG_CXX])
--AC_REQUIRE([_LT_AC_PROG_CXXCPP])
--_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
--])# _LT_AC_LANG_CXX
--
--# _LT_AC_PROG_CXXCPP
--# ------------------
--AC_DEFUN([_LT_AC_PROG_CXXCPP],
--[
--AC_REQUIRE([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
--fi
--])# _LT_AC_PROG_CXXCPP
--
--# AC_LIBTOOL_F77
--# --------------
--# enable support for Fortran 77 libraries
--AC_DEFUN([AC_LIBTOOL_F77],
--[AC_REQUIRE([_LT_AC_LANG_F77])
--])# AC_LIBTOOL_F77
--
--
--# _LT_AC_LANG_F77
--# ---------------
--AC_DEFUN([_LT_AC_LANG_F77],
--[AC_REQUIRE([AC_PROG_F77])
--_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77])
--])# _LT_AC_LANG_F77
--
--
--# AC_LIBTOOL_GCJ
--# --------------
--# enable support for GCJ libraries
--AC_DEFUN([AC_LIBTOOL_GCJ],
--[AC_REQUIRE([_LT_AC_LANG_GCJ])
--])# AC_LIBTOOL_GCJ
--
--
--# _LT_AC_LANG_GCJ
--# ---------------
--AC_DEFUN([_LT_AC_LANG_GCJ],
--[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
--  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
--    [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
--      [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
--	 [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
--	   [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
--_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ])
--])# _LT_AC_LANG_GCJ
--
--
--# AC_LIBTOOL_RC
--# -------------
--# enable support for Windows resource files
--AC_DEFUN([AC_LIBTOOL_RC],
--[AC_REQUIRE([LT_AC_PROG_RC])
--_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC])
--])# AC_LIBTOOL_RC
--
--
--# AC_LIBTOOL_LANG_C_CONFIG
--# ------------------------
--# Ensure that the configuration vars for the C compiler are
--# suitably defined.  Those variables are subsequently used by
--# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
--AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG])
--AC_DEFUN([_LT_AC_LANG_C_CONFIG],
--[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_AC_TAGVAR(objext, $1)=$objext
--
--# Code to be used in simple compile tests
--lt_simple_compile_test_code="int some_variable = 0;\n"
--
--# Code to be used in simple link tests
--lt_simple_link_test_code='int main(){return(0);}\n'
--
--_LT_AC_SYS_COMPILER
--
--# save warnings/boilerplate of simple test code
--_LT_COMPILER_BOILERPLATE
--_LT_LINKER_BOILERPLATE
--
--AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
--AC_LIBTOOL_PROG_COMPILER_PIC($1)
--AC_LIBTOOL_PROG_CC_C_O($1)
--AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
--AC_LIBTOOL_PROG_LD_SHLIBS($1)
--AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
--AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
--AC_LIBTOOL_SYS_LIB_STRIP
--AC_LIBTOOL_DLOPEN_SELF
--
--# 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
--  ;;
--
--aix4* | aix5*)
--  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])
--
--AC_LIBTOOL_CONFIG($1)
--
--AC_LANG_POP
--CC="$lt_save_CC"
--])# AC_LIBTOOL_LANG_C_CONFIG
--
--
--# AC_LIBTOOL_LANG_CXX_CONFIG
--# --------------------------
--# Ensure that the configuration vars for the C compiler are
--# suitably defined.  Those variables are subsequently used by
--# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
--AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)])
--AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
--[AC_LANG_PUSH(C++)
--AC_REQUIRE([AC_PROG_CXX])
--AC_REQUIRE([_LT_AC_PROG_CXXCPP])
--
--_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
--_LT_AC_TAGVAR(allow_undefined_flag, $1)=
--_LT_AC_TAGVAR(always_export_symbols, $1)=no
--_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
--_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
--_LT_AC_TAGVAR(hardcode_direct, $1)=no
--_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
--_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
--_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
--_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
--_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
--_LT_AC_TAGVAR(hardcode_automatic, $1)=no
--_LT_AC_TAGVAR(module_cmds, $1)=
--_LT_AC_TAGVAR(module_expsym_cmds, $1)=
--_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
--_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
--_LT_AC_TAGVAR(no_undefined_flag, $1)=
--_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
--_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
--
--# Dependencies to place before and after the object being linked:
--_LT_AC_TAGVAR(predep_objects, $1)=
--_LT_AC_TAGVAR(postdep_objects, $1)=
--_LT_AC_TAGVAR(predeps, $1)=
--_LT_AC_TAGVAR(postdeps, $1)=
--_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
--
--# Source file extension for C++ test sources.
--ac_ext=cpp
--
--# Object file extension for compiled C++ test sources.
--objext=o
--_LT_AC_TAGVAR(objext, $1)=$objext
--
--# Code to be used in simple compile tests
--lt_simple_compile_test_code="int some_variable = 0;\n"
--
--# Code to be used in simple link tests
--lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n'
--
--# ltmain only uses $CC for tagged configurations so make sure $CC is set.
--_LT_AC_SYS_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_AC_TAGVAR(compiler, $1)=$CC
--_LT_CC_BASENAME([$compiler])
--
--# We don't want -fno-exception wen compiling C++ code, so set the
--# no_builtin_flag separately
--if test "$GXX" = yes; then
--  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
--else
--  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
--fi
--
--if test "$GXX" = yes; then
--  # Set up default GNU C++ configuration
--
--  AC_PROG_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_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
--    _LT_AC_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_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
--    _LT_AC_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_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
--    else
--      _LT_AC_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_AC_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_AC_TAGVAR(ld_shlibs, $1)=yes
--case $host_os in
--  aix3*)
--    # FIXME: insert proper C++ library support
--    _LT_AC_TAGVAR(ld_shlibs, $1)=no
--    ;;
--  aix4* | aix5*)
--    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]].*|aix5*)
--	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_AC_TAGVAR(archive_cmds, $1)=''
--    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
--    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
--    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
--
--    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
--	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
--	else
--	  # We have old collect2
--	  _LT_AC_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_AC_TAGVAR(hardcode_minus_L, $1)=yes
--	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
--	  _LT_AC_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
--
--    # It seems that -bexpall does not export symbols beginning with
--    # underscore (_), so it is better to generate a list of symbols to export.
--    _LT_AC_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_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
--      # Determine the default libpath from the value encoded in an empty executable.
--      _LT_AC_SYS_LIBPATH_AIX
--      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
--
--      _LT_AC_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 "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
--     else
--      if test "$host_cpu" = ia64; then
--	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
--	_LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
--	_LT_AC_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_AC_SYS_LIBPATH_AIX
--	_LT_AC_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_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
--	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
--	# Exported symbols can be pulled into shared objects from archives
--	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
--	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
--	# This is similar to how AIX traditionally builds its shared libraries.
--	_LT_AC_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_AC_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_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--    else
--      _LT_AC_TAGVAR(ld_shlibs, $1)=no
--    fi
--    ;;
--
--  chorus*)
--    case $cc_basename in
--      *)
--	# FIXME: insert proper C++ library support
--	_LT_AC_TAGVAR(ld_shlibs, $1)=no
--	;;
--    esac
--    ;;
--
--  cygwin* | mingw* | pw32*)
--    # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
--    # as there is no search path for DLLs.
--    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
--    _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
--    _LT_AC_TAGVAR(always_export_symbols, $1)=no
--    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
--
--    if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
--      _LT_AC_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_AC_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_AC_TAGVAR(ld_shlibs, $1)=no
--    fi
--  ;;
--      darwin* | rhapsody*)
--        case $host_os in
--        rhapsody* | darwin1.[[012]])
--         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
--         ;;
--       *) # Darwin 1.3 on
--         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
--           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
--         else
--           case ${MACOSX_DEPLOYMENT_TARGET} in
--             10.[[012]])
--               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
--               ;;
--             10.*)
--               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
--               ;;
--           esac
--         fi
--         ;;
--        esac
--      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
--      _LT_AC_TAGVAR(hardcode_direct, $1)=no
--      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
--      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
--      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
--      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
--
--    if test "$GXX" = yes ; then
--      lt_int_apple_cc_single_mod=no
--      output_verbose_link_cmd='echo'
--      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
--       lt_int_apple_cc_single_mod=yes
--      fi
--      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--      else
--          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--        fi
--        _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
--        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
--          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--          else
--            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--          fi
--            _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--      else
--      case $cc_basename in
--        xlc*)
--         output_verbose_link_cmd='echo'
--          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
--          _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
--          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
--          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--          ;;
--       *)
--         _LT_AC_TAGVAR(ld_shlibs, $1)=no
--          ;;
--      esac
--      fi
--        ;;
--
--  dgux*)
--    case $cc_basename in
--      ec++*)
--	# FIXME: insert proper C++ library support
--	_LT_AC_TAGVAR(ld_shlibs, $1)=no
--	;;
--      ghcx*)
--	# Green Hills C++ Compiler
--	# FIXME: insert proper C++ library support
--	_LT_AC_TAGVAR(ld_shlibs, $1)=no
--	;;
--      *)
--	# FIXME: insert proper C++ library support
--	_LT_AC_TAGVAR(ld_shlibs, $1)=no
--	;;
--    esac
--    ;;
--  freebsd[[12]]*)
--    # C++ shared libraries reported to be fairly broken before switch to ELF
--    _LT_AC_TAGVAR(ld_shlibs, $1)=no
--    ;;
--  freebsd-elf*)
--    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
--    ;;
--  freebsd* | kfreebsd*-gnu | dragonfly*)
--    # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
--    # conventions
--    _LT_AC_TAGVAR(ld_shlibs, $1)=yes
--    ;;
--  gnu*)
--    ;;
--  hpux9*)
--    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
--    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
--    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
--    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
--    _LT_AC_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_AC_TAGVAR(ld_shlibs, $1)=no
--      ;;
--    aCC*)
--      _LT_AC_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) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
--      ;;
--    *)
--      if test "$GXX" = yes; then
--        _LT_AC_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_AC_TAGVAR(ld_shlibs, $1)=no
--      fi
--      ;;
--    esac
--    ;;
--  hpux10*|hpux11*)
--    if test $with_gnu_ld = no; then
--      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
--      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
--
--      case $host_cpu in
--      hppa*64*|ia64*)
--	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
--        ;;
--      *)
--	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
--        ;;
--      esac
--    fi
--    case $host_cpu in
--    hppa*64*|ia64*)
--      _LT_AC_TAGVAR(hardcode_direct, $1)=no
--      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
--      ;;
--    *)
--      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
--      _LT_AC_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_AC_TAGVAR(ld_shlibs, $1)=no
--	;;
--      aCC*)
--	case $host_cpu in
--	hppa*64*)
--	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
--	  ;;
--	ia64*)
--	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
--	  ;;
--	*)
--	  _LT_AC_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 $list'
--	;;
--      *)
--	if test "$GXX" = yes; then
--	  if test $with_gnu_ld = no; then
--	    case $host_cpu in
--	    hppa*64*)
--	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
--	      ;;
--	    ia64*)
--	      _LT_AC_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_AC_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_AC_TAGVAR(ld_shlibs, $1)=no
--	fi
--	;;
--    esac
--    ;;
--  interix3*)
--    _LT_AC_TAGVAR(hardcode_direct, $1)=no
--    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
--    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
--    _LT_AC_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_AC_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_AC_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_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
--
--	# Archives containing C++ object files must be created using
--	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
--	# necessary to make sure instantiated templates are included
--	# in the archive.
--	_LT_AC_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_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
--	  else
--	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
--	  fi
--	fi
--	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
--	;;
--    esac
--    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
--    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
--    ;;
--  linux*)
--    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_AC_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_AC_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 $list'
--
--	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir'
--	_LT_AC_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_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
--	;;
--      icpc*)
--	# 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_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
--  	  _LT_AC_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_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--	  _LT_AC_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_AC_TAGVAR(archive_cmds_need_lc, $1)=no
--	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
--	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
--	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
--	;;
--      pgCC*)
--        # Portland Group C++ compiler
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
--  	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
--
--	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
--	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
--	_LT_AC_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_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
--	_LT_AC_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_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
--	_LT_AC_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 $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
--	;;
--    esac
--    ;;
--  lynxos*)
--    # FIXME: insert proper C++ library support
--    _LT_AC_TAGVAR(ld_shlibs, $1)=no
--    ;;
--  m88k*)
--    # FIXME: insert proper C++ library support
--    _LT_AC_TAGVAR(ld_shlibs, $1)=no
--    ;;
--  mvs*)
--    case $cc_basename in
--      cxx*)
--	# FIXME: insert proper C++ library support
--	_LT_AC_TAGVAR(ld_shlibs, $1)=no
--	;;
--      *)
--	# FIXME: insert proper C++ library support
--	_LT_AC_TAGVAR(ld_shlibs, $1)=no
--	;;
--    esac
--    ;;
--  netbsd*)
--    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
--      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
--      wlarc=
--      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
--      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
--      _LT_AC_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::"'
--    ;;
--  openbsd2*)
--    # C++ shared libraries are fairly broken
--    _LT_AC_TAGVAR(ld_shlibs, $1)=no
--    ;;
--  openbsd*)
--    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
--    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
--    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
--    _LT_AC_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_AC_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_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
--      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
--    fi
--    output_verbose_link_cmd='echo'
--    ;;
--  osf3*)
--    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_AC_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_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
--	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
--
--	# Archives containing C++ object files must be created using
--	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
--	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
--
--	;;
--      RCC*)
--	# Rational C++ 2.4.1
--	# FIXME: insert proper C++ library support
--	_LT_AC_TAGVAR(ld_shlibs, $1)=no
--	;;
--      cxx*)
--	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
--
--	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
--	_LT_AC_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 $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
--	;;
--      *)
--	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
--	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
--	  _LT_AC_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 ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
--
--	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
--	  _LT_AC_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_AC_TAGVAR(ld_shlibs, $1)=no
--	fi
--	;;
--    esac
--    ;;
--  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_AC_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_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
--	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
--
--	# Archives containing C++ object files must be created using
--	# the KAI C++ compiler.
--	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
--	;;
--      RCC*)
--	# Rational C++ 2.4.1
--	# FIXME: insert proper C++ library support
--	_LT_AC_TAGVAR(ld_shlibs, $1)=no
--	;;
--      cxx*)
--	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
--	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
--	  echo "-hidden">> $lib.exp~
--	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry ${output_objdir}/so_locations -o $lib~
--	  $rm $lib.exp'
--
--	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
--	_LT_AC_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 $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
--	;;
--      *)
--	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
--	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
--	 _LT_AC_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` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
--
--	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
--	  _LT_AC_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_AC_TAGVAR(ld_shlibs, $1)=no
--	fi
--	;;
--    esac
--    ;;
--  psos*)
--    # FIXME: insert proper C++ library support
--    _LT_AC_TAGVAR(ld_shlibs, $1)=no
--    ;;
--  sunos4*)
--    case $cc_basename in
--      CC*)
--	# Sun C++ 4.x
--	# FIXME: insert proper C++ library support
--	_LT_AC_TAGVAR(ld_shlibs, $1)=no
--	;;
--      lcc*)
--	# Lucid
--	# FIXME: insert proper C++ library support
--	_LT_AC_TAGVAR(ld_shlibs, $1)=no
--	;;
--      *)
--	# FIXME: insert proper C++ library support
--	_LT_AC_TAGVAR(ld_shlibs, $1)=no
--	;;
--    esac
--    ;;
--  solaris*)
--    case $cc_basename in
--      CC*)
--	# Sun C++ 4.2, 5.x and Centerline C++
--        _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes
--	_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
--	_LT_AC_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_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
--	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
--	case $host_os in
--	  solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
--	  *)
--	    # The C++ compiler is used as linker so we must use $wl
--	    # flag to pass the commands to the underlying system
--	    # linker. We must also pass each convience library through
--	    # to the system linker between allextract/defaultextract.
--	    # The C++ compiler will combine linker options so we
--	    # cannot just pass the convience library names through
--	    # without $wl.
--	    # Supported since Solaris 2.6 (maybe 2.5.1?)
--	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
--	    ;;
--	esac
--	_LT_AC_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_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
--	;;
--      gcx*)
--	# Green Hills C++ Compiler
--	_LT_AC_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_AC_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_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
--	  if $CC --version | grep -v '^2\.7' > /dev/null; then
--	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
--	    _LT_AC_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_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
--	    _LT_AC_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_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
--	fi
--	;;
--    esac
--    ;;
--  sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
--    _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
--    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
--    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
--    runpath_var='LD_RUN_PATH'
--
--    case $cc_basename in
--      CC*)
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
--	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
--	;;
--      *)
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
--	_LT_AC_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.
--    # 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.
--    # So that behaviour is only enabled if SCOABSPATH is set to a
--    # non-empty value in the environment.  Most likely only useful for
--    # creating official distributions of packages.
--    # This is a hack until libtool officially supports absolute path
--    # names for shared libraries.
--    _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
--    _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
--    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
--    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
--    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
--    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
--    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
--    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
--    runpath_var='LD_RUN_PATH'
--
--    case $cc_basename in
--      CC*)
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
--	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
--	;;
--      *)
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
--	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$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_AC_TAGVAR(ld_shlibs, $1)=no
--	;;
--      *)
--	# FIXME: insert proper C++ library support
--	_LT_AC_TAGVAR(ld_shlibs, $1)=no
--	;;
--    esac
--    ;;
--  vxworks*)
--    # FIXME: insert proper C++ library support
--    _LT_AC_TAGVAR(ld_shlibs, $1)=no
--    ;;
--  *)
--    # FIXME: insert proper C++ library support
--    _LT_AC_TAGVAR(ld_shlibs, $1)=no
--    ;;
--esac
--AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
--test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
--
--_LT_AC_TAGVAR(GCC, $1)="$GXX"
--_LT_AC_TAGVAR(LD, $1)="$LD"
--
--AC_LIBTOOL_POSTDEP_PREDEP($1)
--AC_LIBTOOL_PROG_COMPILER_PIC($1)
--AC_LIBTOOL_PROG_CC_C_O($1)
--AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
--AC_LIBTOOL_PROG_LD_SHLIBS($1)
--AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
--AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
--
--AC_LIBTOOL_CONFIG($1)
--
--AC_LANG_POP
--CC=$lt_save_CC
--LDCXX=$LD
--LD=$lt_save_LD
--GCC=$lt_save_GCC
--with_gnu_ldcxx=$with_gnu_ld
--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
--])# AC_LIBTOOL_LANG_CXX_CONFIG
--
--# AC_LIBTOOL_POSTDEP_PREDEP([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.
--AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[
--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...
--ifelse([$1],[],[cat > conftest.$ac_ext <<EOF
--int a;
--void foo (void) { a = 0; }
--EOF
--],[$1],[CXX],[cat > conftest.$ac_ext <<EOF
--class Foo
--{
--public:
--  Foo (void) { a = 0; }
--private:
--  int a;
--};
--EOF
--],[$1],[F77],[cat > conftest.$ac_ext <<EOF
--      subroutine foo
--      implicit none
--      integer*4 a
--      a=0
--      return
--      end
--EOF
--],[$1],[GCJ],[cat > conftest.$ac_ext <<EOF
--public class foo {
--  private int a;
--  public void bar (void) {
--    a = 0;
--  }
--};
--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
--
--  # The `*' in the case matches for architectures that use `case' in
--  # $output_verbose_cmd can trigger glob expansion during the loop
--  # eval without this substitution.
--  output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
--
--  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_AC_TAGVAR(compiler_lib_search_path, $1)"; then
--	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
--	   else
--	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${_LT_AC_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_AC_TAGVAR(postdeps, $1)"; then
--	   _LT_AC_TAGVAR(postdeps, $1)="${prev}${p}"
--	 else
--	   _LT_AC_TAGVAR(postdeps, $1)="${_LT_AC_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_AC_TAGVAR(predep_objects, $1)"; then
--	   _LT_AC_TAGVAR(predep_objects, $1)="$p"
--	 else
--	   _LT_AC_TAGVAR(predep_objects, $1)="$_LT_AC_TAGVAR(predep_objects, $1) $p"
--	 fi
--       else
--	 if test -z "$_LT_AC_TAGVAR(postdep_objects, $1)"; then
--	   _LT_AC_TAGVAR(postdep_objects, $1)="$p"
--	 else
--	   _LT_AC_TAGVAR(postdep_objects, $1)="$_LT_AC_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
--ifelse([$1],[CXX],
--[case $host_os in
--interix3*)
--  # 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_AC_TAGVAR(predep_objects,$1)=
--  _LT_AC_TAGVAR(postdep_objects,$1)=
--  _LT_AC_TAGVAR(postdeps,$1)=
--  ;;
--
--solaris*)
--  case $cc_basename in
--  CC*)
--    # 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.
--    _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun'
--    ;;
--  esac
--  ;;
--esac
--])
--
--case " $_LT_AC_TAGVAR(postdeps, $1) " in
--*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
--esac
--])# AC_LIBTOOL_POSTDEP_PREDEP
--
--# AC_LIBTOOL_LANG_F77_CONFIG
--# --------------------------
--# Ensure that the configuration vars for the C compiler are
--# suitably defined.  Those variables are subsequently used by
--# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
--AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)])
--AC_DEFUN([_LT_AC_LANG_F77_CONFIG],
--[AC_REQUIRE([AC_PROG_F77])
--AC_LANG_PUSH(Fortran 77)
--
--_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
--_LT_AC_TAGVAR(allow_undefined_flag, $1)=
--_LT_AC_TAGVAR(always_export_symbols, $1)=no
--_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
--_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
--_LT_AC_TAGVAR(hardcode_direct, $1)=no
--_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
--_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
--_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
--_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
--_LT_AC_TAGVAR(hardcode_automatic, $1)=no
--_LT_AC_TAGVAR(module_cmds, $1)=
--_LT_AC_TAGVAR(module_expsym_cmds, $1)=
--_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
--_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
--_LT_AC_TAGVAR(no_undefined_flag, $1)=
--_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
--_LT_AC_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_AC_TAGVAR(objext, $1)=$objext
--
--# Code to be used in simple compile tests
--lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
--
--# Code to be used in simple link tests
--lt_simple_link_test_code="      program t\n      end\n"
--
--# ltmain only uses $CC for tagged configurations so make sure $CC is set.
--_LT_AC_SYS_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"
--CC=${F77-"f77"}
--compiler=$CC
--_LT_AC_TAGVAR(compiler, $1)=$CC
--_LT_CC_BASENAME([$compiler])
--
--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
--  ;;
--aix4* | aix5*)
--  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_AC_TAGVAR(GCC, $1)="$G77"
--_LT_AC_TAGVAR(LD, $1)="$LD"
--
--AC_LIBTOOL_PROG_COMPILER_PIC($1)
--AC_LIBTOOL_PROG_CC_C_O($1)
--AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
--AC_LIBTOOL_PROG_LD_SHLIBS($1)
--AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
--AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
--
--AC_LIBTOOL_CONFIG($1)
--
--AC_LANG_POP
--CC="$lt_save_CC"
--])# AC_LIBTOOL_LANG_F77_CONFIG
--
--
--# AC_LIBTOOL_LANG_GCJ_CONFIG
--# --------------------------
--# Ensure that the configuration vars for the C compiler are
--# suitably defined.  Those variables are subsequently used by
--# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
--AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)])
--AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG],
--[AC_LANG_SAVE
--
--# Source file extension for Java test sources.
--ac_ext=java
--
--# Object file extension for compiled Java test sources.
--objext=o
--_LT_AC_TAGVAR(objext, $1)=$objext
--
--# Code to be used in simple compile tests
--lt_simple_compile_test_code="class foo {}\n"
--
--# Code to be used in simple link tests
--lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n'
--
--# ltmain only uses $CC for tagged configurations so make sure $CC is set.
--_LT_AC_SYS_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"
--CC=${GCJ-"gcj"}
--compiler=$CC
--_LT_AC_TAGVAR(compiler, $1)=$CC
--_LT_CC_BASENAME([$compiler])
--
--# GCJ did not exist at the time GCC didn't implicitly link libc in.
--_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
--
--_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
--
--AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
--AC_LIBTOOL_PROG_COMPILER_PIC($1)
--AC_LIBTOOL_PROG_CC_C_O($1)
--AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
--AC_LIBTOOL_PROG_LD_SHLIBS($1)
--AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
--AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
--
--AC_LIBTOOL_CONFIG($1)
--
--AC_LANG_RESTORE
--CC="$lt_save_CC"
--])# AC_LIBTOOL_LANG_GCJ_CONFIG
--
--
--# AC_LIBTOOL_LANG_RC_CONFIG
--# -------------------------
--# Ensure that the configuration vars for the Windows resource compiler are
--# suitably defined.  Those variables are subsequently used by
--# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
--AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)])
--AC_DEFUN([_LT_AC_LANG_RC_CONFIG],
--[AC_LANG_SAVE
--
--# Source file extension for RC test sources.
--ac_ext=rc
--
--# Object file extension for compiled RC test sources.
--objext=o
--_LT_AC_TAGVAR(objext, $1)=$objext
--
--# Code to be used in simple compile tests
--lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
--
--# 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_AC_SYS_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"
--CC=${RC-"windres"}
--compiler=$CC
--_LT_AC_TAGVAR(compiler, $1)=$CC
--_LT_CC_BASENAME([$compiler])
--_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
--
--AC_LIBTOOL_CONFIG($1)
--
--AC_LANG_RESTORE
--CC="$lt_save_CC"
--])# AC_LIBTOOL_LANG_RC_CONFIG
--
--
--# AC_LIBTOOL_CONFIG([TAGNAME])
--# ----------------------------
--# If TAGNAME is not passed, then 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
--# TAGNAME from the matching tagged config vars.
--AC_DEFUN([AC_LIBTOOL_CONFIG],
--[# The else clause should only fire when bootstrapping the
--# libtool distribution, otherwise you forgot to ship ltmain.sh
--# with your package, and you will get complaints that there are
--# no rules to generate ltmain.sh.
--if test -f "$ltmain"; then
--  # 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
--  # Now quote all the things that may contain metacharacters while being
--  # careful not to overquote the AC_SUBSTed values.  We take copies of the
--  # variables and quote the copies for generation of the libtool script.
--  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
--    SED SHELL STRIP \
--    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
--    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
--    deplibs_check_method reload_flag reload_cmds need_locks \
--    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
--    lt_cv_sys_global_symbol_to_c_name_address \
--    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
--    old_postinstall_cmds old_postuninstall_cmds \
--    _LT_AC_TAGVAR(compiler, $1) \
--    _LT_AC_TAGVAR(CC, $1) \
--    _LT_AC_TAGVAR(LD, $1) \
--    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1) \
--    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1) \
--    _LT_AC_TAGVAR(lt_prog_compiler_static, $1) \
--    _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) \
--    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1) \
--    _LT_AC_TAGVAR(thread_safe_flag_spec, $1) \
--    _LT_AC_TAGVAR(whole_archive_flag_spec, $1) \
--    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) \
--    _LT_AC_TAGVAR(old_archive_cmds, $1) \
--    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) \
--    _LT_AC_TAGVAR(predep_objects, $1) \
--    _LT_AC_TAGVAR(postdep_objects, $1) \
--    _LT_AC_TAGVAR(predeps, $1) \
--    _LT_AC_TAGVAR(postdeps, $1) \
--    _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
--    _LT_AC_TAGVAR(archive_cmds, $1) \
--    _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
--    _LT_AC_TAGVAR(postinstall_cmds, $1) \
--    _LT_AC_TAGVAR(postuninstall_cmds, $1) \
--    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) \
--    _LT_AC_TAGVAR(allow_undefined_flag, $1) \
--    _LT_AC_TAGVAR(no_undefined_flag, $1) \
--    _LT_AC_TAGVAR(export_symbols_cmds, $1) \
--    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) \
--    _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) \
--    _LT_AC_TAGVAR(hardcode_libdir_separator, $1) \
--    _LT_AC_TAGVAR(hardcode_automatic, $1) \
--    _LT_AC_TAGVAR(module_cmds, $1) \
--    _LT_AC_TAGVAR(module_expsym_cmds, $1) \
--    _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
--    _LT_AC_TAGVAR(exclude_expsyms, $1) \
--    _LT_AC_TAGVAR(include_expsyms, $1); do
--
--    case $var in
--    _LT_AC_TAGVAR(old_archive_cmds, $1) | \
--    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \
--    _LT_AC_TAGVAR(archive_cmds, $1) | \
--    _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
--    _LT_AC_TAGVAR(module_cmds, $1) | \
--    _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
--    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
--    _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
--    extract_expsyms_cmds | reload_cmds | finish_cmds | \
--    postinstall_cmds | postuninstall_cmds | \
--    old_postinstall_cmds | old_postuninstall_cmds | \
--    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
--      # Double-quote double-evaled strings.
--      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
--      ;;
--    *)
--      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
--      ;;
--    esac
--  done
--
--  case $lt_echo in
--  *'\[$]0 --fallback-echo"')
--    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'`
--    ;;
--  esac
--
--ifelse([$1], [],
--  [cfgfile="${ofile}T"
--  trap "$rm \"$cfgfile\"; exit 1" 1 2 15
--  $rm -f "$cfgfile"
--  AC_MSG_NOTICE([creating $ofile])],
--  [cfgfile="$ofile"])
--
--  cat <<__EOF__ >> "$cfgfile"
--ifelse([$1], [],
--[#! $SHELL
--
--# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
--# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
--# NOTE: Changes made to this file will be lost: look at ltmain.sh.
--#
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
--# Free Software Foundation, Inc.
--#
--# This file is part of GNU Libtool:
--# Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
--#
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2 of the License, or
--# (at your option) any later version.
--#
--# This program is distributed in the hope that it will be useful, but
--# WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
--# General Public License for more details.
--#
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
--#
--# As a special exception to the GNU General Public License, if you
--# distribute this file as part of a program that contains a
--# configuration script generated by Autoconf, you may include it under
--# the same distribution terms that you use for the rest of that program.
--
--# A sed program that does not truncate output.
--SED=$lt_SED
--
--# Sed that helps us avoid accidentally triggering echo(1) options like -n.
--Xsed="$SED -e 1s/^X//"
--
--# 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
--
--# The names of the tagged configurations supported by this script.
--available_tags=
--
--# ### BEGIN LIBTOOL CONFIG],
--[# ### BEGIN LIBTOOL TAG CONFIG: $tagname])
--
--# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
--
--# Shell to use when invoking shell scripts.
--SHELL=$lt_SHELL
--
--# Whether or not to build shared libraries.
--build_libtool_libs=$enable_shared
--
--# Whether or not to build static libraries.
--build_old_libs=$enable_static
--
--# Whether or not to add -lc for building shared libraries.
--build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)
--
--# Whether or not to disallow shared libs when runtime libs are static
--allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)
--
--# Whether or not to optimize for fast installation.
--fast_install=$enable_fast_install
--
--# The host system.
--host_alias=$host_alias
--host=$host
--host_os=$host_os
--
--# The build system.
--build_alias=$build_alias
--build=$build
--build_os=$build_os
--
--# An echo program that does not interpret backslashes.
--echo=$lt_echo
--
--# The archiver.
--AR=$lt_AR
--AR_FLAGS=$lt_AR_FLAGS
--
--# A C compiler.
--LTCC=$lt_LTCC
--
--# LTCC compiler flags.
--LTCFLAGS=$lt_LTCFLAGS
--
--# A language-specific compiler.
--CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
--
--# Is the compiler the GNU C compiler?
--with_gcc=$_LT_AC_TAGVAR(GCC, $1)
--
--gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
--gcc_ver=\`gcc -dumpversion\`
--
--# An ERE matcher.
--EGREP=$lt_EGREP
--
--# The linker used to build libraries.
--LD=$lt_[]_LT_AC_TAGVAR(LD, $1)
--
--# Whether we need hard or soft links.
--LN_S=$lt_LN_S
--
--# A BSD-compatible nm program.
--NM=$lt_NM
--
--# A symbol stripping program
--STRIP=$lt_STRIP
--
--# Used to examine libraries when file_magic_cmd begins "file"
--MAGIC_CMD=$MAGIC_CMD
--
--# Used on cygwin: DLL creation program.
--DLLTOOL="$DLLTOOL"
--
--# Used on cygwin: object dumper.
--OBJDUMP="$OBJDUMP"
--
--# Used on cygwin: assembler.
--AS="$AS"
--
--# The name of the directory that contains temporary libtool files.
--objdir=$objdir
--
--# How to create reloadable object files.
--reload_flag=$lt_reload_flag
--reload_cmds=$lt_reload_cmds
--
--# How to pass a linker flag through the compiler.
--wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
--
--# Object file suffix (normally "o").
--objext="$ac_objext"
--
--# Old archive suffix (normally "a").
--libext="$libext"
--
--# Shared library suffix (normally ".so").
--shrext_cmds='$shrext_cmds'
--
--# Executable file suffix (normally "").
--exeext="$exeext"
--
--# Additional compiler flags for building library objects.
--pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
--pic_mode=$pic_mode
--
--# What is the maximum length of a command?
--max_cmd_len=$lt_cv_sys_max_cmd_len
--
--# Does compiler simultaneously support -c and -o options?
--compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
--
--# Must we lock files when doing compilation?
--need_locks=$lt_need_locks
--
--# Do we need the lib prefix for modules?
--need_lib_prefix=$need_lib_prefix
--
--# Do we need a version for libraries?
--need_version=$need_version
--
--# Whether dlopen is supported.
--dlopen_support=$enable_dlopen
--
--# Whether dlopen of programs is supported.
--dlopen_self=$enable_dlopen_self
--
--# Whether dlopen of statically linked programs is supported.
--dlopen_self_static=$enable_dlopen_self_static
--
--# Compiler flag to prevent dynamic linking.
--link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1)
--
--# Compiler flag to turn off builtin functions.
--no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)
--
--# Compiler flag to allow reflexive dlopens.
--export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)
--
--# Compiler flag to generate shared objects directly from archives.
--whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1)
--
--# Compiler flag to generate thread-safe objects.
--thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1)
--
--# Library versioning type.
--version_type=$version_type
--
--# Format of library name prefix.
--libname_spec=$lt_libname_spec
--
--# 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.
--library_names_spec=$lt_library_names_spec
--
--# The coded name of the library, if different from the real name.
--soname_spec=$lt_soname_spec
--
--# Commands used to build and install an old-style archive.
--RANLIB=$lt_RANLIB
--old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1)
--old_postinstall_cmds=$lt_old_postinstall_cmds
--old_postuninstall_cmds=$lt_old_postuninstall_cmds
--
--# Create an old-style archive from a shared archive.
--old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1)
--
--# Create a temporary old-style archive to link instead of a shared archive.
--old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)
--
--# Commands used to build and install a shared archive.
--archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1)
--archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1)
--postinstall_cmds=$lt_postinstall_cmds
--postuninstall_cmds=$lt_postuninstall_cmds
--
--# Commands used to build a loadable module (assumed same as above if empty)
--module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1)
--module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1)
--
--# Commands to strip libraries.
--old_striplib=$lt_old_striplib
--striplib=$lt_striplib
--
--# Dependencies to place before the objects being linked to create a
--# shared library.
--predep_objects=\`echo $lt_[]_LT_AC_TAGVAR(predep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
--
--# Dependencies to place after the objects being linked to create a
--# shared library.
--postdep_objects=\`echo $lt_[]_LT_AC_TAGVAR(postdep_objects, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
--
--# Dependencies to place before the objects being linked to create a
--# shared library.
--predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
--
--# Dependencies to place after the objects being linked to create a
--# shared library.
--postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
--
--# The library search path used internally by the compiler when linking
--# a shared library.
--compiler_lib_search_path=\`echo $lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
--
--# Method to check whether dependent libraries are shared objects.
--deplibs_check_method=$lt_deplibs_check_method
--
--# Command to use when deplibs_check_method == file_magic.
--file_magic_cmd=$lt_file_magic_cmd
--
--# Flag that allows shared libraries with undefined symbols to be built.
--allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1)
--
--# Flag that forces no undefined symbols.
--no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1)
--
--# Commands used to finish a libtool library installation in a directory.
--finish_cmds=$lt_finish_cmds
--
--# Same as above, but a single script fragment to be evaled but not shown.
--finish_eval=$lt_finish_eval
--
--# Take the output of nm and produce a listing of raw symbols and C names.
--global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
--
--# Transform the output of nm in a proper C declaration
--global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
--
--# Transform the output of nm in a C name address pair
--global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
--
--# This is the shared library runtime path variable.
--runpath_var=$runpath_var
--
--# This is the shared library path variable.
--shlibpath_var=$shlibpath_var
--
--# Is shlibpath searched before the hard-coded library search path?
--shlibpath_overrides_runpath=$shlibpath_overrides_runpath
--
--# How to hardcode a shared library path into an executable.
--hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1)
--
--# Whether we should hardcode library paths into libraries.
--hardcode_into_libs=$hardcode_into_libs
--
--# Flag to hardcode \$libdir into a binary during linking.
--# This must work even if \$libdir does not exist.
--hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $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.
--hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)
--
--# Whether we need a single -rpath flag with a separated argument.
--hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1)
--
--# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
--# resulting binary.
--hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1)
--
--# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
--# resulting binary.
--hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1)
--
--# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
--# the resulting binary.
--hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)
--
--# Set to yes if building a shared library automatically hardcodes DIR into the library
--# and all subsequent libraries and executables linked against it.
--hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1)
--
--# Variables whose values should be saved in libtool wrapper scripts and
--# restored at relink time.
--variables_saved_for_relink="$variables_saved_for_relink"
--
--# Whether libtool must link a program against all its dependency libraries.
--link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
--
--# Compile-time system search path for libraries
--sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
--
--# Run-time system search path for libraries
--sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
--
--# Fix the shell variable \$srcfile for the compiler.
--fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)"
--
--# Set to yes if exported symbols are required.
--always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
--
--# The commands to list exported symbols.
--export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1)
--
--# The commands to extract the exported symbol list from a shared archive.
--extract_expsyms_cmds=$lt_extract_expsyms_cmds
--
--# Symbols that should not be listed in the preloaded symbols.
--exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1)
--
--# Symbols that must always be exported.
--include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1)
--
--ifelse([$1],[],
--[# ### END LIBTOOL CONFIG],
--[# ### END LIBTOOL TAG CONFIG: $tagname])
--
--__EOF__
--
--ifelse([$1],[], [
--  case $host_os in
--  aix3*)
--    cat <<\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
--EOF
--    ;;
--  esac
--
--  # We use sed instead of cat because bash on DJGPP gets confused if
--  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
--  # text mode, it properly converts lines to CR/LF.  This bash problem
--  # is reportedly fixed, but why not run on old versions too?
--  sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1)
--
--  mv -f "$cfgfile" "$ofile" || \
--    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
--  chmod +x "$ofile"
--])
--else
--  # If there is no Makefile yet, we rely on a make rule to execute
--  # `config.status --recheck' to rerun these tests and create the
--  # libtool script then.
--  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
--  if test -f "$ltmain_in"; then
--    test -f Makefile && make "$ltmain"
--  fi
--fi
--])# AC_LIBTOOL_CONFIG
--
--
--# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME])
--# -------------------------------------------
--AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI],
--[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
--
--_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
--
--if test "$GCC" = yes; then
--  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
--
--  AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
--    lt_cv_prog_compiler_rtti_exceptions,
--    [-fno-rtti -fno-exceptions], [],
--    [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
--fi
--])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI
--
--
--# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
--# ---------------------------------
--AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
--[AC_REQUIRE([AC_CANONICAL_HOST])
--AC_REQUIRE([AC_PROG_NM])
--AC_REQUIRE([AC_OBJEXT])
--# 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]]*\)'
--
--# Transform an extracted symbol line into a proper C declaration
--lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \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\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
--
--# Define system-specific variables.
--case $host_os in
--aix*)
--  symcode='[[BCDT]]'
--  ;;
--cygwin* | mingw* | pw32*)
--  symcode='[[ABCDGISTW]]'
--  ;;
--hpux*) # Its linker distinguishes data from code symbols
--  if test "$host_cpu" = ia64; then
--    symcode='[[ABCDEGRST]]'
--  fi
--  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
--  lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
--  ;;
--linux*)
--  if test "$host_cpu" = ia64; then
--    symcode='[[ABCDGIRSTW]]'
--    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
--    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
--  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
--
--# 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
--
--# If we're using GNU nm, then use its standard symbol codes.
--case `$NM -V 2>&1` in
--*GNU* | *'with BFD'*)
--  symcode='[[ABCDGIRSTW]]' ;;
--esac
--
--# Try without a prefix undercore, 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.
--  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]\($symcode$symcode*\)[[ 	]][[ 	]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
--
--  # Check to see that the pipe works correctly.
--  pipe_works=no
--
--  rm -f conftest*
--  cat > conftest.$ac_ext <<EOF
--#ifdef __cplusplus
--extern "C" {
--#endif
--char nm_test_var;
--void nm_test_func(){}
--#ifdef __cplusplus
--}
--#endif
--int main(){nm_test_var='a';nm_test_func();return(0);}
--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 <<EOF > conftest.$ac_ext
--#ifdef __cplusplus
--extern "C" {
--#endif
--
--EOF
--	  # Now generate the symbol file.
--	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
--
--	  cat <<EOF >> conftest.$ac_ext
--#if defined (__STDC__) && __STDC__
--# define lt_ptr_t void *
--#else
--# define lt_ptr_t char *
--# define const
--#endif
--
--/* The mapping between symbol names and symbols. */
--const struct {
--  const char *name;
--  lt_ptr_t address;
--}
--lt_preloaded_symbols[[]] =
--{
--EOF
--	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext
--	  cat <<\EOF >> conftest.$ac_ext
--  {0, (lt_ptr_t) 0}
--};
--
--#ifdef __cplusplus
--}
--#endif
--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_AC_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 -f 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
--]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
--
--
--# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME])
--# ---------------------------------------
--AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC],
--[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=
--_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
--_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=
--
--AC_MSG_CHECKING([for $compiler option to produce PIC])
-- ifelse([$1],[CXX],[
--  # C++ specific cases for pic, static, wl, etc.
--  if test "$GXX" = yes; then
--    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
--    _LT_AC_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_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
--      fi
--      ;;
--    amigaos*)
--      # 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_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
--      ;;
--    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
--      # PIC is the default for these OSes.
--      ;;
--    mingw* | os2* | pw32*)
--      # This hack is so that the source file can tell whether it is being
--      # built for inclusion in a dll (and should export symbols for example).
--      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
--      ;;
--    darwin* | rhapsody*)
--      # PIC is the default on this platform
--      # Common symbols not allowed in MH_DYLIB files
--      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
--      ;;
--    *djgpp*)
--      # DJGPP does not support shared libraries at all
--      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
--      ;;
--    interix3*)
--      # 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_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
--      fi
--      ;;
--    hpux*)
--      # 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*)
--	;;
--      *)
--	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
--	;;
--      esac
--      ;;
--    *)
--      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
--      ;;
--    esac
--  else
--    case $host_os in
--      aix4* | aix5*)
--	# All AIX code is PIC.
--	if test "$host_cpu" = ia64; then
--	  # AIX 5 now supports IA64 processor
--	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
--	else
--	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
--	fi
--	;;
--      chorus*)
--	case $cc_basename in
--	cxch68*)
--	  # Green Hills C++ Compiler
--	  # _LT_AC_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
--	;;
--       darwin*)
--         # PIC is the default on this platform
--         # Common symbols not allowed in MH_DYLIB files
--         case $cc_basename in
--           xlc*)
--           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
--           _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
--           ;;
--         esac
--       ;;
--      dgux*)
--	case $cc_basename in
--	  ec++*)
--	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
--	    ;;
--	  ghcx*)
--	    # Green Hills C++ Compiler
--	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
--	    ;;
--	  *)
--	    ;;
--	esac
--	;;
--      freebsd* | kfreebsd*-gnu | dragonfly*)
--	# FreeBSD uses GNU C++
--	;;
--      hpux9* | hpux10* | hpux11*)
--	case $cc_basename in
--	  CC*)
--	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
--	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
--	    if test "$host_cpu" != ia64; then
--	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
--	    fi
--	    ;;
--	  aCC*)
--	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
--	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
--	    case $host_cpu in
--	    hppa*64*|ia64*)
--	      # +Z the default
--	      ;;
--	    *)
--	      _LT_AC_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_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
--	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
--	    # CC pic flag -KPIC is the default.
--	    ;;
--	  *)
--	    ;;
--	esac
--	;;
--      linux*)
--	case $cc_basename in
--	  KCC*)
--	    # KAI C++ Compiler
--	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
--	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
--	    ;;
--	  icpc* | ecpc*)
--	    # Intel C++
--	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
--	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
--	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
--	    ;;
--	  pgCC*)
--	    # Portland Group C++ compiler.
--	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
--	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
--	    _LT_AC_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_AC_TAGVAR(lt_prog_compiler_pic, $1)=
--	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
--	    ;;
--	  *)
--	    ;;
--	esac
--	;;
--      lynxos*)
--	;;
--      m88k*)
--	;;
--      mvs*)
--	case $cc_basename in
--	  cxx*)
--	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
--	    ;;
--	  *)
--	    ;;
--	esac
--	;;
--      netbsd*)
--	;;
--      osf3* | osf4* | osf5*)
--	case $cc_basename in
--	  KCC*)
--	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
--	    ;;
--	  RCC*)
--	    # Rational C++ 2.4.1
--	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
--	    ;;
--	  cxx*)
--	    # Digital/Compaq C++
--	    _LT_AC_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_AC_TAGVAR(lt_prog_compiler_pic, $1)=
--	    _LT_AC_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_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
--	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
--	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
--	    ;;
--	  gcx*)
--	    # Green Hills C++ Compiler
--	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
--	    ;;
--	  *)
--	    ;;
--	esac
--	;;
--      sunos4*)
--	case $cc_basename in
--	  CC*)
--	    # Sun C++ 4.x
--	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
--	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
--	    ;;
--	  lcc*)
--	    # Lucid
--	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
--	    ;;
--	  *)
--	    ;;
--	esac
--	;;
--      tandem*)
--	case $cc_basename in
--	  NCC*)
--	    # NonStop-UX NCC 3.20
--	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
--	    ;;
--	  *)
--	    ;;
--	esac
--	;;
--      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
--	case $cc_basename in
--	  CC*)
--	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
--	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
--	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
--	    ;;
--	esac
--	;;
--      vxworks*)
--	;;
--      *)
--	_LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
--	;;
--    esac
--  fi
--],
--[
--  if test "$GCC" = yes; then
--    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
--    _LT_AC_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_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
--      fi
--      ;;
--
--    amigaos*)
--      # 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_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
--      ;;
--
--    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
--      # PIC is the default for these OSes.
--      ;;
--
--    mingw* | pw32* | os2*)
--      # This hack is so that the source file can tell whether it is being
--      # built for inclusion in a dll (and should export symbols for example).
--      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
--      ;;
--
--    darwin* | rhapsody*)
--      # PIC is the default on this platform
--      # Common symbols not allowed in MH_DYLIB files
--      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
--      ;;
--
--    interix3*)
--      # 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_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
--      enable_shared=no
--      ;;
--
--    sysv4*MP*)
--      if test -d /usr/nec; then
--	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
--      fi
--      ;;
--
--    hpux*)
--      # 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_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
--	;;
--      esac
--      ;;
--
--    *)
--      _LT_AC_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_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
--      if test "$host_cpu" = ia64; then
--	# AIX 5 now supports IA64 processor
--	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
--      else
--	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
--      fi
--      ;;
--      darwin*)
--        # PIC is the default on this platform
--        # Common symbols not allowed in MH_DYLIB files
--       case $cc_basename in
--         xlc*)
--         _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
--         _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
--         ;;
--       esac
--       ;;
--
--    mingw* | pw32* | os2*)
--      # This hack is so that the source file can tell whether it is being
--      # built for inclusion in a dll (and should export symbols for example).
--      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
--      ;;
--
--    hpux9* | hpux10* | hpux11*)
--      _LT_AC_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_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
--	;;
--      esac
--      # Is there a better lt_prog_compiler_static that works with the bundled CC?
--      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
--      ;;
--
--    irix5* | irix6* | nonstopux*)
--      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
--      # PIC (with -KPIC) is the default.
--      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
--      ;;
--
--    newsos6)
--      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
--      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
--      ;;
--
--    linux*)
--      case $cc_basename in
--      icc* | ecc*)
--	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
--	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
--	_LT_AC_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_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
--	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
--	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
--        ;;
--      ccc*)
--        _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
--        # All Alpha code is PIC.
--        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
--        ;;
--      esac
--      ;;
--
--    osf3* | osf4* | osf5*)
--      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
--      # All OSF/1 code is PIC.
--      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
--      ;;
--
--    solaris*)
--      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
--      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
--      case $cc_basename in
--      f77* | f90* | f95*)
--	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
--      *)
--	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
--      esac
--      ;;
--
--    sunos4*)
--      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
--      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
--      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
--      ;;
--
--    sysv4 | sysv4.2uw2* | sysv4.3*)
--      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
--      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
--      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
--      ;;
--
--    sysv4*MP*)
--      if test -d /usr/nec ;then
--	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
--	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
--      fi
--      ;;
--
--    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
--      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
--      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
--      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
--      ;;
--
--    unicos*)
--      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
--      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
--      ;;
--
--    uts4*)
--      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
--      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
--      ;;
--
--    *)
--      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
--      ;;
--    esac
--  fi
--])
--AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)])
--
--#
--# Check to make sure the PIC flag actually works.
--#
--if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
--  AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
--    _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1),
--    [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
--    [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
--     "" | " "*) ;;
--     *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;;
--     esac],
--    [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
--     _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
--fi
--case $host_os in
--  # For platforms which do not support PIC, -DPIC is meaningless:
--  *djgpp*)
--    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
--    ;;
--  *)
--    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
--    ;;
--esac
--
--#
--# Check to make sure the static flag actually works.
--#
--wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
--AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
--  _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
--  $lt_tmp_static_flag,
--  [],
--  [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
--])
--
--
--# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME])
--# ------------------------------------
--# See if the linker supports building shared libraries.
--AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
--[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
--ifelse([$1],[CXX],[
--  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
--  case $host_os in
--  aix4* | aix5*)
--    # 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_AC_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_AC_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_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
--  ;;
--  cygwin* | mingw*)
--    _LT_AC_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'
--  ;;
--  *)
--    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
--  ;;
--  esac
--],[
--  runpath_var=
--  _LT_AC_TAGVAR(allow_undefined_flag, $1)=
--  _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
--  _LT_AC_TAGVAR(archive_cmds, $1)=
--  _LT_AC_TAGVAR(archive_expsym_cmds, $1)=
--  _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)=
--  _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)=
--  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
--  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
--  _LT_AC_TAGVAR(thread_safe_flag_spec, $1)=
--  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
--  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
--  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
--  _LT_AC_TAGVAR(hardcode_direct, $1)=no
--  _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
--  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
--  _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
--  _LT_AC_TAGVAR(hardcode_automatic, $1)=no
--  _LT_AC_TAGVAR(module_cmds, $1)=
--  _LT_AC_TAGVAR(module_expsym_cmds, $1)=
--  _LT_AC_TAGVAR(always_export_symbols, $1)=no
--  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
--  # include_expsyms should be a list of space-separated symbols to be *always*
--  # included in the symbol list
--  _LT_AC_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_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_"
--  # 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.
--  extract_expsyms_cmds=
--  # Just being paranoid about ensuring that cc_basename is set.
--  _LT_CC_BASENAME([$compiler])
--  case $host_os in
--  cygwin* | mingw* | pw32*)
--    # 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
--    ;;
--  esac
--
--  _LT_AC_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_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
--    _LT_AC_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_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
--      else
--  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
--    fi
--    supports_anon_versioning=no
--    case `$LD -v 2>/dev/null` in
--      *\ [[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
--    aix3* | aix4* | aix5*)
--      # On AIX/PPC, the GNU linker is very broken
--      if test "$host_cpu" != ia64; then
--	_LT_AC_TAGVAR(ld_shlibs, $1)=no
--	cat <<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.
--
--EOF
--      fi
--      ;;
--
--    amigaos*)
--      _LT_AC_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_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
--      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
--
--      # Samuel A. Falvo II <kc5tja at dolphin.openprojects.net> reports
--      # that the semantics of dynamic libraries on AmigaOS, at least up
--      # to version 4, is to share data among multiple programs linked
--      # with the same dynamic library.  Since this doesn't match the
--      # behavior of shared libraries on other platforms, we can't use
--      # them.
--      _LT_AC_TAGVAR(ld_shlibs, $1)=no
--      ;;
--
--    beos*)
--      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
--	_LT_AC_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_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--      else
--	_LT_AC_TAGVAR(ld_shlibs, $1)=no
--      fi
--      ;;
--
--    cygwin* | mingw* | pw32*)
--      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
--      # as there is no search path for DLLs.
--      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
--      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
--      _LT_AC_TAGVAR(always_export_symbols, $1)=no
--      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
--      _LT_AC_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_AC_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_AC_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_AC_TAGVAR(ld_shlibs, $1)=no
--      fi
--      ;;
--
--    interix3*)
--      _LT_AC_TAGVAR(hardcode_direct, $1)=no
--      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
--      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
--      _LT_AC_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_AC_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_AC_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'
--      ;;
--
--    linux*)
--      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
--	tmp_addflag=
--	case $cc_basename,$host_cpu in
--	pgcc*)				# Portland Group C compiler
--	  _LT_AC_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_AC_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' ;;
--	esac
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--
--	if test $supports_anon_versioning = yes; then
--	  _LT_AC_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 -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
--	fi
--      else
--	_LT_AC_TAGVAR(ld_shlibs, $1)=no
--      fi
--      ;;
--
--    netbsd*)
--      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
--	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
--	wlarc=
--      else
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--	_LT_AC_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_AC_TAGVAR(ld_shlibs, $1)=no
--	cat <<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.
--
--EOF
--      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--	_LT_AC_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_AC_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_AC_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
--	;;
--	*)
--	  if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
--	    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
--	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
--	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
--	  else
--	    _LT_AC_TAGVAR(ld_shlibs, $1)=no
--	  fi
--	;;
--      esac
--      ;;
--
--    sunos4*)
--      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
--      wlarc=
--      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
--      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
--      ;;
--
--    *)
--      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--	_LT_AC_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_AC_TAGVAR(ld_shlibs, $1)=no
--      fi
--      ;;
--    esac
--
--    if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then
--      runpath_var=
--      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
--      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
--      _LT_AC_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_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
--      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
--      _LT_AC_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_AC_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_AC_TAGVAR(hardcode_direct, $1)=unsupported
--      fi
--      ;;
--
--    aix4* | aix5*)
--      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_AC_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_AC_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]].*|aix5*)
--	  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_AC_TAGVAR(archive_cmds, $1)=''
--      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
--      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
--      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
--
--      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
--  	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
--	  else
--  	  # We have old collect2
--  	  _LT_AC_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_AC_TAGVAR(hardcode_minus_L, $1)=yes
--  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
--  	  _LT_AC_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
--
--      # It seems that -bexpall does not export symbols beginning with
--      # underscore (_), so it is better to generate a list of symbols to export.
--      _LT_AC_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_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
--       # Determine the default libpath from the value encoded in an empty executable.
--       _LT_AC_SYS_LIBPATH_AIX
--       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
--	_LT_AC_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 "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
--       else
--	if test "$host_cpu" = ia64; then
--	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
--	  _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
--	  _LT_AC_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_AC_SYS_LIBPATH_AIX
--	 _LT_AC_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_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
--	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
--	  # Exported symbols can be pulled into shared objects from archives
--	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
--	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
--	  # This is similar to how AIX traditionally builds its shared libraries.
--	  _LT_AC_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*)
--      _LT_AC_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_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
--      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
--      # see comment about different semantics on the GNU ld section
--      _LT_AC_TAGVAR(ld_shlibs, $1)=no
--      ;;
--
--    bsdi[[45]]*)
--      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
--      ;;
--
--    cygwin* | mingw* | pw32*)
--      # 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_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
--      _LT_AC_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_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
--      # The linker will automatically build a .lib file if we build a DLL.
--      _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
--      # FIXME: Should let the user specify the lib program.
--      _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
--      _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
--      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
--      ;;
--
--    darwin* | rhapsody*)
--      case $host_os in
--        rhapsody* | darwin1.[[012]])
--         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
--         ;;
--       *) # Darwin 1.3 on
--         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
--           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
--         else
--           case ${MACOSX_DEPLOYMENT_TARGET} in
--             10.[[012]])
--               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
--               ;;
--             10.*)
--               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
--               ;;
--           esac
--         fi
--         ;;
--      esac
--      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
--      _LT_AC_TAGVAR(hardcode_direct, $1)=no
--      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
--      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
--      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
--      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
--    if test "$GCC" = yes ; then
--    	output_verbose_link_cmd='echo'
--        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--      _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
--      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
--      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--      _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--    else
--      case $cc_basename in
--        xlc*)
--         output_verbose_link_cmd='echo'
--         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
--         _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
--          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
--         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--          ;;
--       *)
--         _LT_AC_TAGVAR(ld_shlibs, $1)=no
--          ;;
--      esac
--    fi
--      ;;
--
--    dgux*)
--      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
--      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
--      ;;
--
--    freebsd1*)
--      _LT_AC_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_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
--      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
--      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
--      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
--      ;;
--
--    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
--    freebsd2*)
--      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
--      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
--      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
--      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
--      ;;
--
--    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--    freebsd* | kfreebsd*-gnu | dragonfly*)
--      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
--      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
--      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
--      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
--      ;;
--
--    hpux9*)
--      if test "$GCC" = yes; then
--	_LT_AC_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_AC_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_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
--      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
--      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
--
--      # hardcode_minus_L: Not really in the search PATH,
--      # but as the default location of the library.
--      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
--      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
--      ;;
--
--    hpux10*)
--      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
--      else
--	_LT_AC_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_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
--	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
--
--	_LT_AC_TAGVAR(hardcode_direct, $1)=yes
--	_LT_AC_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_AC_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_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
--	  ;;
--	ia64*)
--	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
--	  ;;
--	*)
--	  _LT_AC_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_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
--	  ;;
--	ia64*)
--	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
--	  ;;
--	*)
--	  _LT_AC_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_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
--	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
--
--	case $host_cpu in
--	hppa*64*|ia64*)
--	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
--	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
--	  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
--	  ;;
--	*)
--	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
--	  _LT_AC_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_AC_TAGVAR(hardcode_minus_L, $1)=yes
--	  ;;
--	esac
--      fi
--      ;;
--
--    irix5* | irix6* | nonstopux*)
--      if test "$GCC" = yes; then
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
--      else
--	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
--	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
--      fi
--      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
--      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
--      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
--      ;;
--
--    netbsd*)
--      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
--	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
--      else
--	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
--      fi
--      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
--      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
--      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
--      ;;
--
--    newsos6)
--      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
--      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
--      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
--      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
--      ;;
--
--    openbsd*)
--      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
--      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
--      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
--	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
--	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
--	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
--      else
--       case $host_os in
--	 openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
--	   _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
--	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
--	   ;;
--	 *)
--	   _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
--	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
--	   ;;
--       esac
--      fi
--      ;;
--
--    os2*)
--      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
--      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
--      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
--      _LT_AC_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_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
--      ;;
--
--    osf3*)
--      if test "$GCC" = yes; then
--	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
--      else
--	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
--	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
--      fi
--      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
--      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
--      ;;
--
--    osf4* | osf5*)	# as osf3* with the addition of -msym flag
--      if test "$GCC" = yes; then
--	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
--	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
--      else
--	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
--	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
--	_LT_AC_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~
--	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
--
--	# Both c and cxx compiler support -rpath directly
--	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
--      fi
--      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
--      ;;
--
--    solaris*)
--      _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
--      if test "$GCC" = yes; then
--	wlarc='${wl}'
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
--	_LT_AC_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}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
--      else
--	wlarc=''
--	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
--	_LT_AC_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'
--      fi
--      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
--      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
--      case $host_os in
--      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
--      *)
-- 	# The compiler driver will combine linker options so we
-- 	# cannot just pass the convience library names through
-- 	# without $wl, iff we do not link with $LD.
-- 	# Luckily, gcc supports the same syntax we need for Sun Studio.
-- 	# Supported since Solaris 2.6 (maybe 2.5.1?)
-- 	case $wlarc in
-- 	'')
-- 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
-- 	*)
-- 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
-- 	esac ;;
--      esac
--      _LT_AC_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_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
--      else
--	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
--      fi
--      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
--      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
--      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
--      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
--      ;;
--
--    sysv4)
--      case $host_vendor in
--	sni)
--	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true???
--	;;
--	siemens)
--	  ## LD is ld it makes a PLAMLIB
--	  ## CC just makes a GrossModule.
--	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
--	  _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
--	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
--        ;;
--	motorola)
--	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--	  _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
--	;;
--      esac
--      runpath_var='LD_RUN_PATH'
--      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
--      ;;
--
--    sysv4.3*)
--      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
--      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
--      ;;
--
--    sysv4*MP*)
--      if test -d /usr/nec; then
--	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
--	runpath_var=LD_RUN_PATH
--	hardcode_runpath_var=yes
--	_LT_AC_TAGVAR(ld_shlibs, $1)=yes
--      fi
--      ;;
--
--    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*)
--      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
--      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
--      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
--      runpath_var='LD_RUN_PATH'
--
--      if test "$GCC" = yes; then
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
--	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
--      else
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
--	_LT_AC_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_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
--      _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
--      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
--      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
--      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
--      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
--      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
--      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
--      runpath_var='LD_RUN_PATH'
--
--      if test "$GCC" = yes; then
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
--	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
--      else
--	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
--	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
--      fi
--      ;;
--
--    uts4*)
--      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
--      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
--      ;;
--
--    *)
--      _LT_AC_TAGVAR(ld_shlibs, $1)=no
--      ;;
--    esac
--  fi
--])
--AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
--test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
--
--#
--# Do we need to explicitly link libc?
--#
--case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in
--x|xyes)
--  # Assume -lc should be added
--  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
--
--  if test "$enable_shared" = yes && test "$GCC" = yes; then
--    case $_LT_AC_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*
--      printf "$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_AC_TAGVAR(lt_prog_compiler_wl, $1)
--	pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
--        compiler_flags=-v
--        linker_flags=-v
--        verstring=
--        output_objdir=.
--        libname=conftest
--        lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1)
--        _LT_AC_TAGVAR(allow_undefined_flag, $1)=
--        if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1)
--        then
--	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
--        else
--	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
--        fi
--        _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
--      else
--        cat conftest.err 1>&5
--      fi
--      $rm conftest*
--      AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)])
--      ;;
--    esac
--  fi
--  ;;
--esac
--])# AC_LIBTOOL_PROG_LD_SHLIBS
--
--
--# _LT_AC_FILE_LTDLL_C
--# -------------------
--# Be careful that the start marker always follows a newline.
--AC_DEFUN([_LT_AC_FILE_LTDLL_C], [
--# /* ltdll.c starts here */
--# #define WIN32_LEAN_AND_MEAN
--# #include <windows.h>
--# #undef WIN32_LEAN_AND_MEAN
--# #include <stdio.h>
--#
--# #ifndef __CYGWIN__
--# #  ifdef __CYGWIN32__
--# #    define __CYGWIN__ __CYGWIN32__
--# #  endif
--# #endif
--#
--# #ifdef __cplusplus
--# extern "C" {
--# #endif
--# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
--# #ifdef __cplusplus
--# }
--# #endif
--#
--# #ifdef __CYGWIN__
--# #include <cygwin/cygwin_dll.h>
--# DECLARE_CYGWIN_DLL( DllMain );
--# #endif
--# HINSTANCE __hDllInstance_base;
--#
--# BOOL APIENTRY
--# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
--# {
--#   __hDllInstance_base = hInst;
--#   return TRUE;
--# }
--# /* ltdll.c ends here */
--])# _LT_AC_FILE_LTDLL_C
--
--
--# _LT_AC_TAGVAR(VARNAME, [TAGNAME])
--# ---------------------------------
--AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])])
--
--
--# old names
--AC_DEFUN([AM_PROG_LIBTOOL],   [AC_PROG_LIBTOOL])
--AC_DEFUN([AM_ENABLE_SHARED],  [AC_ENABLE_SHARED($@)])
--AC_DEFUN([AM_ENABLE_STATIC],  [AC_ENABLE_STATIC($@)])
--AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
--AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
--AC_DEFUN([AM_PROG_LD],        [AC_PROG_LD])
--AC_DEFUN([AM_PROG_NM],        [AC_PROG_NM])
--
--# This is just to silence aclocal about the macro not being used
--ifelse([AC_DISABLE_FAST_INSTALL])
--
--AC_DEFUN([LT_AC_PROG_GCJ],
--[AC_CHECK_TOOL(GCJ, gcj, no)
--  test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
--  AC_SUBST(GCJFLAGS)
--])
--
--AC_DEFUN([LT_AC_PROG_RC],
--[AC_CHECK_TOOL(RC, windres, no)
--])
--
--# 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.                               #
--# LT_AC_PROG_SED
--# --------------
--# Check for a fully-functional sed program, that truncates
--# as few characters as possible.  Prefer GNU sed if found.
--AC_DEFUN([LT_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])
--])
--
--# Copyright (C) 2002, 2003, 2005  Free Software Foundation, Inc.
-+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
-@@ -6420,14 +29,31 @@
- # ----------------------------
- # Automake X.Y traces this macro to ensure aclocal.m4 has been
+ 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'.])])
+@@ -31,10 +31,10 @@
  # generated from the m4 files accompanying Automake X.Y.
--AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
-+# (This private macro should not be called outside this file.)
-+AC_DEFUN([AM_AUTOMAKE_VERSION],
+ # (This private macro should not be called outside this file.)
+ AC_DEFUN([AM_AUTOMAKE_VERSION],
+-[am__api_version='1.10'
 +[am__api_version='1.11'
-+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
-+dnl require some minimum version.  Point them to the right macro.
+ dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+ dnl require some minimum version.  Point them to the right macro.
+-m4_if([$1], [1.10.2], [],
 +m4_if([$1], [1.11], [],
-+      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
-+])
-+
-+# _AM_AUTOCONF_VERSION(VERSION)
-+# -----------------------------
-+# aclocal traces this macro to find the Autoconf version.
-+# This is a private macro too.  Using m4_define simplifies
-+# the logic in aclocal, which can simply ignore this definition.
-+m4_define([_AM_AUTOCONF_VERSION], [])
+       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+ ])
  
- # AM_SET_CURRENT_AUTOMAKE_VERSION
- # -------------------------------
--# Call AM_AUTOMAKE_VERSION so it can be traced.
--# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
-+# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
+@@ -50,7 +50,7 @@
+ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+ # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
  AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
--	 [AM_AUTOMAKE_VERSION([1.9.6])])
+-[AM_AUTOMAKE_VERSION([1.10.2])dnl
 +[AM_AUTOMAKE_VERSION([1.11])dnl
-+m4_ifndef([AC_AUTOCONF_VERSION],
-+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-+_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
+ m4_ifndef([AC_AUTOCONF_VERSION],
+   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
+@@ -110,14 +110,14 @@
  
- # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
- 
-@@ -6484,14 +110,14 @@
- 
  # AM_CONDITIONAL                                            -*- Autoconf -*-
  
--# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
+-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
 +# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
  # Free Software Foundation, Inc.
  #
@@ -6475,31 +57,24 @@
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
  
--# serial 7
+-# serial 8
 +# serial 9
  
  # AM_CONDITIONAL(NAME, SHELL-CONDITION)
  # -------------------------------------
-@@ -6500,8 +126,11 @@
- [AC_PREREQ(2.52)dnl
-  ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
- 	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
--AC_SUBST([$1_TRUE])
--AC_SUBST([$1_FALSE])
-+AC_SUBST([$1_TRUE])dnl
-+AC_SUBST([$1_FALSE])dnl
-+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
-+_AM_SUBST_NOTMAKE([$1_FALSE])dnl
+@@ -130,6 +130,7 @@
+ AC_SUBST([$1_FALSE])dnl
+ _AM_SUBST_NOTMAKE([$1_TRUE])dnl
+ _AM_SUBST_NOTMAKE([$1_FALSE])dnl
 +m4_define([_AM_COND_VALUE_$1], [$2])dnl
  if $2; then
    $1_TRUE=
    $1_FALSE='#'
-@@ -6515,15 +144,14 @@
+@@ -143,14 +144,14 @@
  Usually this means the macro was only invoked conditionally.]])
  fi])])
  
--
--# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
 +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
  # Free Software Foundation, Inc.
  #
@@ -6507,20 +82,12 @@
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
  
--# serial 8
+-# serial 9
 +# serial 10
  
  # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
  # written in clear, in which case automake, when reading aclocal.m4,
-@@ -6551,6 +179,7 @@
- ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
-        [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
-        [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-+       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
-        [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
-                    [depcc="$$1"   am_compiler_list=])
- 
-@@ -6579,6 +208,16 @@
+@@ -207,6 +208,16 @@
    if test "$am_compiler_list" = ""; then
       am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
    fi
@@ -6537,7 +104,7 @@
    for depmode in $am_compiler_list; do
      # Setup a source with many dependencies, because some compilers
      # like to wrap large dependency lists on column 80 (with \), and
-@@ -6596,7 +235,17 @@
+@@ -224,7 +235,17 @@
      done
      echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
  
@@ -6555,7 +122,7 @@
      nosideeffect)
        # after this tag, mechanisms are not by side-effect, so they'll
        # only be used when explicitly requested
-@@ -6606,18 +255,23 @@
+@@ -234,19 +255,23 @@
  	break
        fi
        ;;
@@ -6578,183 +145,39 @@
 -       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
 +       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
           >/dev/null 2>conftest.err &&
-+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+        grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
         grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
 -       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
 +       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
         ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
        # icc doesn't choke on unknown options, it will just issue warnings
        # or remarks (even with -Werror).  So we grep stderr for any message
-@@ -6668,61 +322,74 @@
-   AMDEPBACKSLASH='\'
- fi
- AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
--AC_SUBST([AMDEPBACKSLASH])
-+AC_SUBST([AMDEPBACKSLASH])dnl
-+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
- ])
- 
- # Generate code to set up dependency tracking.              -*- Autoconf -*-
- 
--# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
-+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
- # Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
- 
--#serial 3
-+#serial 5
- 
- # _AM_OUTPUT_DEPENDENCY_COMMANDS
- # ------------------------------
- AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
--[for mf in $CONFIG_FILES; do
--  # Strip MF so we end up with the name of the file.
--  mf=`echo "$mf" | sed -e 's/:.*$//'`
--  # Check whether this is an Automake generated Makefile or not.
--  # We used to match only the files named `Makefile.in', but
--  # some people rename them; so instead we look at the file content.
--  # Grep'ing the first line is not enough: some people post-process
--  # each Makefile.in and add a new line on top of each file to say so.
--  # So let's grep whole file.
--  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
--    dirpart=`AS_DIRNAME("$mf")`
--  else
--    continue
--  fi
--  # Extract the definition of DEPDIR, am__include, and am__quote
--  # from the Makefile without running `make'.
--  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
--  test -z "$DEPDIR" && continue
--  am__include=`sed -n 's/^am__include = //p' < "$mf"`
--  test -z "am__include" && continue
--  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
--  # When using ansi2knr, U may be empty or an underscore; expand it
--  U=`sed -n 's/^U = //p' < "$mf"`
--  # Find all dependency output files, they are included files with
--  # $(DEPDIR) in their names.  We invoke sed twice because it is the
--  # simplest approach to changing $(DEPDIR) to its actual value in the
--  # expansion.
--  for file in `sed -n "
--    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
--       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
--    # Make sure the directory exists.
--    test -f "$dirpart/$file" && continue
--    fdir=`AS_DIRNAME(["$file"])`
--    AS_MKDIR_P([$dirpart/$fdir])
--    # echo "creating $dirpart/$file"
--    echo '# dummy' > "$dirpart/$file"
-+[{
-+  # Autoconf 2.62 quotes --file arguments for eval, but not when files
-+  # are listed without --file.  Let's play safe and only enable the eval
-+  # if we detect the quoting.
-+  case $CONFIG_FILES in
-+  *\'*) eval set x "$CONFIG_FILES" ;;
-+  *)   set x $CONFIG_FILES ;;
-+  esac
-+  shift
-+  for mf
-+  do
-+    # Strip MF so we end up with the name of the file.
-+    mf=`echo "$mf" | sed -e 's/:.*$//'`
-+    # Check whether this is an Automake generated Makefile or not.
-+    # We used to match only the files named `Makefile.in', but
-+    # some people rename them; so instead we look at the file content.
-+    # Grep'ing the first line is not enough: some people post-process
-+    # each Makefile.in and add a new line on top of each file to say so.
-+    # Grep'ing the whole file is not good either: AIX grep has a line
-+    # limit of 2048, but all sed's we know have understand at least 4000.
-+    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-+      dirpart=`AS_DIRNAME("$mf")`
-+    else
-+      continue
-+    fi
-+    # Extract the definition of DEPDIR, am__include, and am__quote
-+    # from the Makefile without running `make'.
-+    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-+    test -z "$DEPDIR" && continue
-+    am__include=`sed -n 's/^am__include = //p' < "$mf"`
-+    test -z "am__include" && continue
-+    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-+    # When using ansi2knr, U may be empty or an underscore; expand it
-+    U=`sed -n 's/^U = //p' < "$mf"`
-+    # Find all dependency output files, they are included files with
-+    # $(DEPDIR) in their names.  We invoke sed twice because it is the
-+    # simplest approach to changing $(DEPDIR) to its actual value in the
-+    # expansion.
-+    for file in `sed -n "
-+      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-+      # Make sure the directory exists.
-+      test -f "$dirpart/$file" && continue
-+      fdir=`AS_DIRNAME(["$file"])`
-+      AS_MKDIR_P([$dirpart/$fdir])
-+      # echo "creating $dirpart/$file"
-+      echo '# dummy' > "$dirpart/$file"
-+    done
-   done
--done
-+}
- ])# _AM_OUTPUT_DEPENDENCY_COMMANDS
- 
- 
-@@ -6753,14 +420,14 @@
- 
+@@ -396,13 +421,13 @@
  # Do all the work for Automake.                             -*- Autoconf -*-
  
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
--# Free Software Foundation, Inc.
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+-# 2005, 2006, 2008 Free Software Foundation, Inc.
 +# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
  #
  # This file is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
  
--# serial 12
+-# serial 13
 +# serial 16
  
  # This macro actually does too much.  Some checks are only needed if
  # your package does certain things.  But this isn't really a big deal.
-@@ -6777,16 +444,20 @@
+@@ -419,7 +444,7 @@
  # arguments mandatory, and then we can depend on a new Autoconf
  # release and drop the old call support.
  AC_DEFUN([AM_INIT_AUTOMAKE],
--[AC_PREREQ([2.58])dnl
+-[AC_PREREQ([2.60])dnl
 +[AC_PREREQ([2.62])dnl
  dnl Autoconf wants to disallow AM_ names.  We explicitly allow
  dnl the ones we care about.
  m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
- AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
- AC_REQUIRE([AC_PROG_INSTALL])dnl
--# test to see if srcdir already configured
--if test "`cd $srcdir && pwd`" != "`pwd`" &&
--   test -f $srcdir/config.status; then
--  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-+if test "`cd $srcdir && pwd`" != "`pwd`"; then
-+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-+  # is not polluted with repeated "-I."
-+  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
-+  # test to see if srcdir already configured
-+  if test -f $srcdir/config.status; then
-+    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-+  fi
- fi
- 
- # test whether we have cygpath
-@@ -6806,6 +477,9 @@
-  AC_SUBST([PACKAGE], [$1])dnl
-  AC_SUBST([VERSION], [$2])],
- [_AM_SET_OPTIONS([$1])dnl
-+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-+m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
-+  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
-  AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
-  AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
- 
-@@ -6821,8 +495,8 @@
+@@ -470,8 +495,8 @@
  AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
  AM_MISSING_PROG(AUTOHEADER, autoheader)
  AM_MISSING_PROG(MAKEINFO, makeinfo)
@@ -6765,7 +188,7 @@
  AC_REQUIRE([AM_PROG_MKDIR_P])dnl
  # We need awk for the "check" target.  The system "awk" is bad on
  # some platforms.
-@@ -6830,19 +504,36 @@
+@@ -479,23 +504,36 @@
  AC_REQUIRE([AC_PROG_MAKE_SET])dnl
  AC_REQUIRE([AM_SET_LEADING_DOT])dnl
  _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
@@ -6785,12 +208,15 @@
 -                  [_AM_DEPENDENCIES(CXX)],
 -                  [define([AC_PROG_CXX],
 -                          defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
--])
--])
 +		  [_AM_DEPENDENCIES(CXX)],
 +		  [define([AC_PROG_CXX],
 +			  defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-+AC_PROVIDE_IFELSE([AC_PROG_OBJC],
+ AC_PROVIDE_IFELSE([AC_PROG_OBJC],
+-                  [_AM_DEPENDENCIES(OBJC)],
+-                  [define([AC_PROG_OBJC],
+-                          defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
+-])
+-])
 +		  [_AM_DEPENDENCIES(OBJC)],
 +		  [define([AC_PROG_OBJC],
 +			  defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
@@ -6812,34 +238,20 @@
  
  
  # When config.status generates a header, we must update the stamp-h file.
-@@ -6854,18 +545,19 @@
- # our stamp files there.
- AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
- [# Compute $1's index in $config_headers.
-+_am_arg=$1
- _am_stamp_count=1
- for _am_header in $config_headers :; do
-   case $_am_header in
--    $1 | $1:* )
-+    $_am_arg | $_am_arg:* )
-       break ;;
-     * )
-       _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-   esac
+@@ -519,7 +557,7 @@
  done
--echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
-+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
+ echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
  
 -# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
 +# Copyright (C) 2001, 2003, 2005, 2008  Free Software Foundation, Inc.
  #
  # This file is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
-@@ -6876,7 +568,14 @@
+@@ -530,7 +568,14 @@
  # Define $install_sh.
  AC_DEFUN([AM_PROG_INSTALL_SH],
  [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
--install_sh=${install_sh-"$am_aux_dir/install-sh"}
+-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
 +if test x"${install_sh}" != xset; then
 +  case $am_aux_dir in
 +  *\ * | *\	*)
@@ -6851,7 +263,7 @@
  AC_SUBST(install_sh)])
  
  # Copyright (C) 2003, 2005  Free Software Foundation, Inc.
-@@ -6902,13 +601,13 @@
+@@ -556,13 +601,13 @@
  
  # Check to see how 'make' treats includes.	            -*- Autoconf -*-
  
@@ -6867,7 +279,7 @@
  
  # AM_MAKE_INCLUDE()
  # -----------------
-@@ -6917,7 +616,7 @@
+@@ -571,7 +616,7 @@
  [am_make=${MAKE-make}
  cat > confinc << 'END'
  am__doit:
@@ -6876,7 +288,7 @@
  .PHONY: am__doit
  END
  # If we don't find an include directive, just comment out the code.
-@@ -6927,24 +626,24 @@
+@@ -581,24 +626,24 @@
  _am_result=none
  # First try GNU make style include.
  echo "include confinc" > confmf
@@ -6916,11 +328,11 @@
  fi
  AC_SUBST([am__include])
  AC_SUBST([am__quote])
-@@ -6954,14 +653,14 @@
+@@ -608,14 +653,14 @@
  
  # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
  
--# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
+-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
 +# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
  # Free Software Foundation, Inc.
  #
@@ -6928,17 +340,16 @@
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
  
--# serial 4
+-# serial 5
 +# serial 6
  
  # AM_MISSING_PROG(NAME, PROGRAM)
  # ------------------------------
-@@ -6977,7 +676,15 @@
- # If it does, set am_missing_run to use it, otherwise, to nothing.
+@@ -632,7 +677,14 @@
  AC_DEFUN([AM_MISSING_HAS_RUN],
  [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+ AC_REQUIRE_AUX_FILE([missing])dnl
 -test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
-+AC_REQUIRE_AUX_FILE([missing])dnl
 +if test x"${MISSING+set}" != xset; then
 +  case $am_aux_dir in
 +  *\ * | *\	*)
@@ -6950,115 +361,8 @@
  # Use eval to expand $SHELL
  if eval "$MISSING --run true"; then
    am_missing_run="$MISSING --run "
-@@ -6987,7 +694,7 @@
- fi
- ])
+@@ -703,14 +755,14 @@
  
--# Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
-+# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
-@@ -6995,70 +702,33 @@
- 
- # AM_PROG_MKDIR_P
- # ---------------
--# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
--#
--# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
--# created by `make install' are always world readable, even if the
--# installer happens to have an overly restrictive umask (e.g. 077).
--# This was a mistake.  There are at least two reasons why we must not
--# use `-m 0755':
--#   - it causes special bits like SGID to be ignored,
--#   - it may be too restrictive (some setups expect 775 directories).
--#
--# Do not use -m 0755 and let people choose whatever they expect by
--# setting umask.
--#
--# We cannot accept any implementation of `mkdir' that recognizes `-p'.
--# Some implementations (such as Solaris 8's) are not thread-safe: if a
--# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
--# concurrently, both version can detect that a/ is missing, but only
--# one can create it and the other will error out.  Consequently we
--# restrict ourselves to GNU make (using the --version option ensures
--# this.)
-+# Check for `mkdir -p'.
- AC_DEFUN([AM_PROG_MKDIR_P],
--[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
--  # We used to keeping the `.' as first argument, in order to
--  # allow $(mkdir_p) to be used without argument.  As in
--  #   $(mkdir_p) $(somedir)
--  # where $(somedir) is conditionally defined.  However this is wrong
--  # for two reasons:
--  #  1. if the package is installed by a user who cannot write `.'
--  #     make install will fail,
--  #  2. the above comment should most certainly read
--  #     $(mkdir_p) $(DESTDIR)$(somedir)
--  #     so it does not work when $(somedir) is undefined and
--  #     $(DESTDIR) is not.
--  #  To support the latter case, we have to write
--  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
--  #  so the `.' trick is pointless.
--  mkdir_p='mkdir -p --'
--else
--  # On NextStep and OpenStep, the `mkdir' command does not
--  # recognize any option.  It will interpret all options as
--  # directories to create, and then abort because `.' already
--  # exists.
--  for d in ./-p ./--version;
--  do
--    test -d $d && rmdir $d
--  done
--  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
--  if test -f "$ac_aux_dir/mkinstalldirs"; then
--    mkdir_p='$(mkinstalldirs)'
--  else
--    mkdir_p='$(install_sh) -d'
--  fi
--fi
--AC_SUBST([mkdir_p])])
-+[AC_PREREQ([2.60])dnl
-+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-+dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
-+dnl while keeping a definition of mkdir_p for backward compatibility.
-+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
-+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
-+dnl Makefile.ins that do not define MKDIR_P, so we do our own
-+dnl adjustment using top_builddir (which is defined more often than
-+dnl MKDIR_P).
-+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
-+case $mkdir_p in
-+  [[\\/$]]* | ?:[[\\/]]*) ;;
-+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-+esac
-+])
- 
- # Helper functions for option handling.                     -*- Autoconf -*-
- 
--# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
-+# Copyright (C) 2001, 2002, 2003, 2005, 2008  Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
- 
--# serial 3
-+# serial 4
- 
- # _AM_MANGLE_OPTION(NAME)
- # -----------------------
-@@ -7075,7 +745,7 @@
- # ----------------------------------
- # OPTIONS is a space-separated list of Automake options.
- AC_DEFUN([_AM_SET_OPTIONS],
--[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-+[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
- 
- # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
- # -------------------------------------------
-@@ -7085,14 +755,14 @@
- 
  # Check to make sure that the build environment is sane.    -*- Autoconf -*-
  
 -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
@@ -7074,7 +378,7 @@
  
  # AM_SANITY_CHECK
  # ---------------
-@@ -7101,16 +771,29 @@
+@@ -719,16 +771,29 @@
  # Just in case
  sleep 1
  echo timestamp > conftest.file
@@ -7106,28 +410,25 @@
     fi
     rm -f conftest.file
     if test "$[*]" != "X $srcdir/configure conftest.file" \
-@@ -7160,9 +843,28 @@
- if test "$cross_compiling" != no; then
-   AC_CHECK_TOOL([STRIP], [strip], :)
- fi
--INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
-+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+@@ -781,18 +846,25 @@
+ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
  AC_SUBST([INSTALL_STRIP_PROGRAM])])
  
+-# Copyright (C) 2006  Free Software Foundation, Inc.
 +# Copyright (C) 2006, 2008  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+ 
 +# serial 2
 +
-+# _AM_SUBST_NOTMAKE(VARIABLE)
-+# ---------------------------
-+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
-+# This macro is traced by Automake.
-+AC_DEFUN([_AM_SUBST_NOTMAKE])
-+
+ # _AM_SUBST_NOTMAKE(VARIABLE)
+ # ---------------------------
+ # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
+ # This macro is traced by Automake.
+ AC_DEFUN([_AM_SUBST_NOTMAKE])
+ 
 +# AM_SUBST_NOTMAKE(VARIABLE)
 +# ---------------------------
 +# Public sister of _AM_SUBST_NOTMAKE.
@@ -7136,61 +437,24 @@
  # Check how to create a tarball.                            -*- Autoconf -*-
  
  # Copyright (C) 2004, 2005  Free Software Foundation, Inc.
-@@ -7260,3 +962,8 @@
- ]) # _AM_PROG_TAR
- 
- m4_include([m4/ac_check_curl.m4])
-+m4_include([m4/libtool.m4])
-+m4_include([m4/ltoptions.m4])
-+m4_include([m4/ltsugar.m4])
-+m4_include([m4/ltversion.m4])
-+m4_include([m4/lt~obsolete.m4])
-Index: libkml-1.0.1/config/config.guess
+Index: libkml-1.1.0/config/config.guess
 ===================================================================
---- libkml-1.0.1.orig/config/config.guess	2009-07-03 01:23:36.000000000 +0200
-+++ libkml-1.0.1/config/config.guess	2009-12-10 10:19:44.000000000 +0100
-@@ -1,9 +1,10 @@
+--- libkml-1.1.0.orig/config/config.guess	2009-12-10 13:05:40.000000000 +0100
++++ libkml-1.1.0/config/config.guess	2009-12-10 17:29:34.000000000 +0100
+@@ -1,10 +1,10 @@
  #! /bin/sh
  # Attempt to guess a canonical system name.
  #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
 +#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-+#   Free Software Foundation, Inc.
+ #   Free Software Foundation, Inc.
  
--timestamp='2005-07-08'
+-timestamp='2008-01-23'
 +timestamp='2009-06-10'
  
  # This file is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License as published by
-@@ -55,8 +56,8 @@
- GNU config.guess ($timestamp)
- 
- Originally written by Per Bothner.
--Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
--Free Software Foundation, Inc.
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-+2002, 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."
-@@ -106,7 +107,7 @@
- trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
- trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
- : ${TMPDIR=/tmp} ;
-- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
-+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
-  { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
-  { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
-  { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-@@ -160,6 +161,7 @@
- 	    arm*) machine=arm-unknown ;;
- 	    sh3el) machine=shl-unknown ;;
- 	    sh3eb) machine=sh-unknown ;;
-+	    sh5el) machine=sh5le-unknown ;;
- 	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
- 	esac
- 	# The Operating System including object format, if it has switched
-@@ -168,7 +170,7 @@
+@@ -170,7 +170,7 @@
  	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
  		eval $set_cc_for_build
  		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
@@ -7199,20 +463,7 @@
  		then
  		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
  		    # Return netbsd for either.  FIX?
-@@ -206,8 +208,11 @@
-     *:ekkoBSD:*:*)
- 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
- 	exit ;;
-+    *:SolidBSD:*:*)
-+	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
-+	exit ;;
-     macppc:MirBSD:*:*)
--	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
-+	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
- 	exit ;;
-     *:MirBSD:*:*)
- 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-@@ -319,14 +324,30 @@
+@@ -324,6 +324,9 @@
  	case `/usr/bin/uname -p` in
  	    sparc) echo sparc-icl-nx7; exit ;;
  	esac ;;
@@ -7222,12 +473,11 @@
      sun4H:SunOS:5.*:*)
  	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
  	exit ;;
-     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+@@ -331,7 +334,20 @@
  	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
  	exit ;;
--    i86pc:SunOS:5.*:*)
+     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
 -	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
 +	eval $set_cc_for_build
 +	SUN_ARCH="i386"
 +	# If there is a compiler, see if it is configured for 64-bit objects.
@@ -7245,16 +495,7 @@
  	exit ;;
      sun4*:SunOS:6*:*)
  	# According to config.sub, this is the proper way to canonicalize
-@@ -527,7 +548,7 @@
- 		echo rs6000-ibm-aix3.2
- 	fi
- 	exit ;;
--    *:AIX:*:[45])
-+    *:AIX:*:[456])
- 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
- 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
- 		IBM_ARCH=rs6000
-@@ -635,7 +656,7 @@
+@@ -640,7 +656,7 @@
  	    # => hppa64-hp-hpux11.23
  
  	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
@@ -7263,47 +504,16 @@
  	    then
  		HP_ARCH="hppa2.0w"
  	    else
-@@ -764,12 +785,19 @@
- 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
- 	exit ;;
-     *:FreeBSD:*:*)
--	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-+	case ${UNAME_MACHINE} in
-+	    pc98)
-+		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-+	    amd64)
-+		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-+	    *)
-+		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-+	esac
- 	exit ;;
-     i*:CYGWIN*:*)
- 	echo ${UNAME_MACHINE}-pc-cygwin
- 	exit ;;
--    i*:MINGW*:*)
-+    *:MINGW*:*)
- 	echo ${UNAME_MACHINE}-pc-mingw32
- 	exit ;;
-     i*:windows32*:*)
-@@ -779,12 +807,24 @@
-     i*:PW*:*)
- 	echo ${UNAME_MACHINE}-pc-pw32
- 	exit ;;
--    x86:Interix*:[34]*)
--	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
--	exit ;;
-+    *:Interix*:[3456]*)
-+    	case ${UNAME_MACHINE} in
-+	    x86)
-+		echo i586-pc-interix${UNAME_RELEASE}
-+		exit ;;
+@@ -796,7 +812,7 @@
+ 	    x86)
+ 		echo i586-pc-interix${UNAME_RELEASE}
+ 		exit ;;
+-	    EM64T | authenticamd)
 +	    EM64T | authenticamd | genuineintel)
-+		echo x86_64-unknown-interix${UNAME_RELEASE}
-+		exit ;;
-+	    IA64)
-+		echo ia64-unknown-interix${UNAME_RELEASE}
-+		exit ;;
-+	esac ;;
+ 		echo x86_64-unknown-interix${UNAME_RELEASE}
+ 		exit ;;
+ 	    IA64)
+@@ -806,6 +822,9 @@
      [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
  	echo i${UNAME_MACHINE}-pc-mks
  	exit ;;
@@ -7313,33 +523,7 @@
      i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
  	# How do we know it's Interix rather than the generic POSIX subsystem?
  	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-@@ -794,7 +834,7 @@
-     i*:UWIN*:*)
- 	echo ${UNAME_MACHINE}-pc-uwin
- 	exit ;;
--    amd64:CYGWIN*:*:*)
-+    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
- 	echo x86_64-unknown-cygwin
- 	exit ;;
-     p*:CYGWIN*:*)
-@@ -815,6 +855,16 @@
- 	echo ${UNAME_MACHINE}-pc-minix
- 	exit ;;
-     arm*:Linux:*:*)
-+	eval $set_cc_for_build
-+	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
-+	    | grep -q __ARM_EABI__
-+	then
-+	    echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	else
-+	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
-+	fi
-+	exit ;;
-+    avr32*:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
- 	exit ;;
-     cris:Linux:*:*)
-@@ -835,44 +885,32 @@
+@@ -866,40 +885,17 @@
      m68*:Linux:*:*)
  	echo ${UNAME_MACHINE}-unknown-linux-gnu
  	exit ;;
@@ -7358,13 +542,16 @@
  	#else
  	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
 -	CPU=mips
-+	CPU=${UNAME_MACHINE}
- 	#else
- 	CPU=
- 	#endif
- 	#endif
- EOF
--	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+-	#else
+-	CPU=
+-	#endif
+-	#endif
+-EOF
+-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+-	    /^CPU/{
+-		s: ::g
+-		p
+-	    }'`"
 -	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 -	;;
 -    mips64:Linux:*:*)
@@ -7378,26 +565,11 @@
 -	#else
 -	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
 -	CPU=mips64
--	#else
--	CPU=
--	#endif
--	#endif
--EOF
--	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-+	    /^CPU/{
-+		s: ::g
-+		p
-+	    }'`"
- 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
- 	;;
-+    or32:Linux:*:*)
-+	echo or32-unknown-linux-gnu
-+	exit ;;
-     ppc:Linux:*:*)
- 	echo powerpc-unknown-linux-gnu
- 	exit ;;
-@@ -889,10 +927,13 @@
++	CPU=${UNAME_MACHINE}
+ 	#else
+ 	CPU=
+ 	#endif
+@@ -931,10 +927,13 @@
  	  EV67)  UNAME_MACHINE=alphaev67 ;;
  	  EV68*) UNAME_MACHINE=alphaev68 ;;
          esac
@@ -7412,23 +584,7 @@
      parisc:Linux:*:* | hppa:Linux:*:*)
  	# Look for CPU level
  	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-@@ -916,9 +957,15 @@
-     sparc:Linux:*:* | sparc64:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
- 	exit ;;
-+    vax:Linux:*:*)
-+	echo ${UNAME_MACHINE}-dec-linux-gnu
-+	exit ;;
-     x86_64:Linux:*:*)
- 	echo x86_64-unknown-linux-gnu
- 	exit ;;
-+    xtensa*:Linux:*:*)
-+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit ;;
-     i*86:Linux:*:*)
- 	# The BFD linker knows what the default object file format is, so
- 	# first see if it will tell us. cd to the root directory to prevent
-@@ -934,17 +981,6 @@
+@@ -982,17 +981,6 @@
  	  elf32-i386)
  		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
  		;;
@@ -7446,29 +602,7 @@
  	esac
  	# Determine whether the default compiler is a.out or elf
  	eval $set_cc_for_build
-@@ -961,7 +997,7 @@
- 	LIBC=gnulibc1
- 	# endif
- 	#else
--	#ifdef __INTEL_COMPILER
-+	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
- 	LIBC=gnu
- 	#else
- 	LIBC=gnuaout
-@@ -971,7 +1007,11 @@
- 	LIBC=dietlibc
- 	#endif
- EOF
--	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-+	    /^LIBC/{
-+		s: ::g
-+		p
-+	    }'`"
- 	test x"${LIBC}" != x && {
- 		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
- 		exit
-@@ -1006,7 +1046,7 @@
+@@ -1058,7 +1046,7 @@
      i*86:syllable:*:*)
  	echo ${UNAME_MACHINE}-pc-syllable
  	exit ;;
@@ -7477,7 +611,7 @@
  	echo i386-unknown-lynxos${UNAME_RELEASE}
  	exit ;;
      i*86:*DOS:*:*)
-@@ -1050,8 +1090,11 @@
+@@ -1102,8 +1090,11 @@
      pc:*:*:*)
  	# Left here for compatibility:
          # uname -m prints for DJGPP always 'pc', but it prints nothing about
@@ -7491,7 +625,7 @@
          exit ;;
      Intel:Mach:3*:*)
  	echo i386-pc-mach3
-@@ -1089,6 +1132,16 @@
+@@ -1141,6 +1132,16 @@
      3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
          /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
            && { echo i486-ncr-sysv4; exit; } ;;
@@ -7508,7 +642,7 @@
      m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
  	echo m68k-unknown-lynxos${UNAME_RELEASE}
  	exit ;;
-@@ -1101,7 +1154,7 @@
+@@ -1153,7 +1154,7 @@
      rs6000:LynxOS:2.*:*)
  	echo rs6000-unknown-lynxos${UNAME_RELEASE}
  	exit ;;
@@ -7517,7 +651,7 @@
  	echo powerpc-unknown-lynxos${UNAME_RELEASE}
  	exit ;;
      SM[BE]S:UNIX_SV:*:*)
-@@ -1164,6 +1217,9 @@
+@@ -1216,6 +1217,9 @@
      BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
  	echo i586-pc-beos
  	exit ;;
@@ -7527,97 +661,42 @@
      SX-4:SUPER-UX:*:*)
  	echo sx4-nec-superux${UNAME_RELEASE}
  	exit ;;
-@@ -1173,6 +1229,15 @@
-     SX-6:SUPER-UX:*:*)
- 	echo sx6-nec-superux${UNAME_RELEASE}
+@@ -1324,6 +1328,9 @@
+     i*86:rdos:*:*)
+ 	echo ${UNAME_MACHINE}-pc-rdos
  	exit ;;
-+    SX-7:SUPER-UX:*:*)
-+	echo sx7-nec-superux${UNAME_RELEASE}
-+	exit ;;
-+    SX-8:SUPER-UX:*:*)
-+	echo sx8-nec-superux${UNAME_RELEASE}
-+	exit ;;
-+    SX-8R:SUPER-UX:*:*)
-+	echo sx8r-nec-superux${UNAME_RELEASE}
-+	exit ;;
-     Power*:Rhapsody:*:*)
- 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
- 	exit ;;
-@@ -1182,7 +1247,6 @@
-     *:Darwin:*:*)
- 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
- 	case $UNAME_PROCESSOR in
--	    *86) UNAME_PROCESSOR=i686 ;;
- 	    unknown) UNAME_PROCESSOR=powerpc ;;
- 	esac
- 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-@@ -1261,6 +1325,12 @@
-     i*86:skyos:*:*)
- 	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
- 	exit ;;
-+    i*86:rdos:*:*)
-+	echo ${UNAME_MACHINE}-pc-rdos
-+	exit ;;
 +    i*86:AROS:*:*)
 +	echo ${UNAME_MACHINE}-pc-aros
 +	exit ;;
  esac
  
  #echo '(No uname command or uname output not recognized.)' 1>&2
-@@ -1421,9 +1491,9 @@
- the operating system you are using. It is advised that you
- download the most up to date version of the config scripts from
- 
--  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
-+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
- and
--  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
-+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
- 
- If the version you run ($0) is already up to date, please
- send the following data and any information you think might be
-Index: libkml-1.0.1/config/config.sub
+Index: libkml-1.1.0/config/config.sub
 ===================================================================
---- libkml-1.0.1.orig/config/config.sub	2009-07-03 01:23:36.000000000 +0200
-+++ libkml-1.0.1/config/config.sub	2009-12-10 10:19:44.000000000 +0100
-@@ -1,9 +1,10 @@
+--- libkml-1.1.0.orig/config/config.sub	2009-12-10 13:05:40.000000000 +0100
++++ libkml-1.1.0/config/config.sub	2009-12-10 17:29:34.000000000 +0100
+@@ -1,10 +1,10 @@
  #! /bin/sh
  # Configuration validation subroutine script.
  #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
 +#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-+#   Free Software Foundation, Inc.
+ #   Free Software Foundation, Inc.
  
--timestamp='2005-07-08'
+-timestamp='2008-01-16'
 +timestamp='2009-06-11'
  
  # This file is (in principle) common to ALL GNU software.
  # The presence of a machine in this file suggests that SOME GNU software
-@@ -71,8 +72,8 @@
- version="\
- GNU config.sub ($timestamp)
- 
--Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
--Free Software Foundation, Inc.
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-+2002, 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."
-@@ -119,8 +120,10 @@
- # Here we must recognize all the valid KERNEL-OS combinations.
- maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+@@ -122,6 +122,7 @@
  case $maybe_os in
--  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
--  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
-+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-+  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+   nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
+   uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
 +  kopensolaris*-gnu* | \
-+  storm-chaos* | os2-emx* | rtmk-nova*)
+   storm-chaos* | os2-emx* | rtmk-nova*)
      os=-$maybe_os
      basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-     ;;
-@@ -150,6 +153,9 @@
+@@ -152,6 +153,9 @@
  		os=
  		basic_machine=$1
  		;;
@@ -7627,45 +706,13 @@
  	-sim | -cisco | -oki | -wec | -winbond)
  		os=
  		basic_machine=$1
-@@ -171,6 +177,10 @@
- 	-hiux*)
- 		os=-hiuxwe2
- 		;;
-+	-sco6)
-+		os=-sco5v6
-+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+		;;
- 	-sco5)
- 		os=-sco3.2v5
- 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-@@ -187,6 +197,10 @@
- 		# Don't forget version if it is 3.2v4 or newer.
- 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- 		;;
-+	-sco5v6*)
-+		# Don't forget version if it is 3.2v4 or newer.
-+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+		;;
- 	-sco*)
- 		os=-sco3.2v2
- 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-@@ -231,20 +245,24 @@
- 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
- 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
- 	| am33_2.0 \
--	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
-+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
- 	| bfin \
- 	| c4x | clipper \
- 	| d10v | d30v | dlx | dsp16xx \
--	| fr30 | frv \
-+	| fido | fr30 | frv \
+@@ -249,13 +253,16 @@
  	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
  	| i370 | i860 | i960 | ia64 \
  	| ip2k | iq2000 \
--	| m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
 +	| lm32 \
-+	| m32c | m32r | m32rle | m68000 | m68k | m88k \
+ 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
+-	| maxq | mb | microblaze | mcore | mep \
 +	| maxq | mb | microblaze | mcore | mep | metag \
  	| mips | mipsbe | mipseb | mipsel | mipsle \
  	| mips16 \
@@ -7678,73 +725,38 @@
  	| mips64vr4100 | mips64vr4100el \
  	| mips64vr4300 | mips64vr4300el \
  	| mips64vr5000 | mips64vr5000el \
-@@ -257,26 +275,26 @@
+@@ -268,6 +275,7 @@
  	| mipsisa64sr71k | mipsisa64sr71kel \
  	| mipstx39 | mipstx39el \
  	| mn10200 | mn10300 \
--	| ms1 \
 +	| moxie \
-+	| mt \
+ 	| mt \
  	| msp430 \
-+	| nios | nios2 \
- 	| ns16k | ns32k \
- 	| or32 \
- 	| pdp10 | pdp11 | pj | pjl \
+ 	| nios | nios2 \
+@@ -277,7 +285,7 @@
  	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
  	| pyramid \
--	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
-+	| score \
+ 	| score \
+-	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 +	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
  	| sh64 | sh64le \
--	| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
--	| sparcv8 | sparcv9 | sparcv9b \
--	| strongarm \
-+	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
-+	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-+	| spu | strongarm \
- 	| tahoe | thumb | tic4x | tic80 | tron \
+ 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+ 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+@@ -286,7 +294,7 @@
  	| v850 | v850e \
  	| we32k \
--	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
+ 	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
 -	| z8k)
--		basic_machine=$basic_machine-unknown
--		;;
--	m32c)
-+	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
 +	| z8k | z80)
  		basic_machine=$basic_machine-unknown
  		;;
  	m6811 | m68hc11 | m6812 | m68hc12)
-@@ -286,6 +304,9 @@
- 		;;
- 	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
- 		;;
-+	ms1)
-+		basic_machine=mt-unknown
-+		;;
- 
- 	# We use `pc' rather than `unknown'
- 	# because (1) that's what they normally are, and
-@@ -305,25 +326,28 @@
- 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
- 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
- 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
--	| avr-* \
-+	| avr-* | avr32-* \
- 	| bfin-* | bs2000-* \
- 	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
- 	| clipper-* | craynv-* | cydra-* \
- 	| d10v-* | d30v-* | dlx-* \
- 	| elxsi-* \
--	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
-+	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
- 	| h8300-* | h8500-* \
+@@ -329,14 +337,17 @@
  	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
  	| i*86-* | i860-* | i960-* | ia64-* \
  	| ip2k-* | iq2000-* \
--	| m32r-* | m32rle-* \
 +	| lm32-* \
-+	| m32c-* | m32r-* | m32rle-* \
+ 	| m32c-* | m32r-* | m32rle-* \
  	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
 -	| m88110-* | m88k-* | maxq-* | mcore-* \
 +	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
@@ -7759,50 +771,31 @@
  	| mips64vr4100-* | mips64vr4100el-* \
  	| mips64vr4300-* | mips64vr4300el-* \
  	| mips64vr5000-* | mips64vr5000el-* \
-@@ -336,30 +360,33 @@
- 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
- 	| mipstx39-* | mipstx39el-* \
- 	| mmix-* \
--	| ms1-* \
-+	| mt-* \
- 	| msp430-* \
-+	| nios-* | nios2-* \
- 	| none-* | np1-* | ns16k-* | ns32k-* \
- 	| orion-* \
- 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+@@ -358,20 +369,20 @@
  	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
  	| pyramid-* \
  	| romp-* | rs6000-* \
--	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+-	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 +	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
  	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
--	| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
-+	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+ 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
  	| sparclite-* \
--	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
-+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
+ 	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
  	| tahoe-* | thumb-* \
 -	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
 +	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
  	| tron-* \
  	| v850-* | v850e-* | vax-* \
  	| we32k-* \
--	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
--	| xstormy16-* | xtensa-* \
-+	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
-+	| xstormy16-* | xtensa*-* \
+ 	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+ 	| xstormy16-* | xtensa*-* \
  	| ymp-* \
 -	| z8k-*)
 +	| z8k-* | z80-*)
  		;;
--	m32c-*)
-+	# Recognize the basic CPU types without company name, with glob match.
-+	xtensa*)
-+		basic_machine=$basic_machine-unknown
- 		;;
- 	# Recognize the various machine names and aliases which stand
- 	# for a CPU type and a company and sometimes even an OS.
-@@ -423,6 +450,10 @@
+ 	# Recognize the basic CPU types without company name, with glob match.
+ 	xtensa*)
+@@ -439,6 +450,10 @@
  		basic_machine=m68k-apollo
  		os=-bsd
  		;;
@@ -7813,18 +806,10 @@
  	aux)
  		basic_machine=m68k-apple
  		os=-aux
-@@ -431,10 +462,26 @@
- 		basic_machine=ns32k-sequent
- 		os=-dynix
+@@ -455,10 +470,18 @@
+ 		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+ 		os=-linux
  		;;
-+	blackfin)
-+		basic_machine=bfin-unknown
-+		os=-linux
-+		;;
-+	blackfin-*)
-+		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		os=-linux
-+		;;
 +	bluegene*)
 +		basic_machine=powerpc-ibm
 +		os=-cnk
@@ -7840,18 +825,7 @@
  	convex-c1)
  		basic_machine=c1-convex
  		os=-bsd
-@@ -463,8 +510,8 @@
- 		basic_machine=craynv-cray
- 		os=-unicosmp
- 		;;
--	cr16c)
--		basic_machine=cr16c-unknown
-+	cr16)
-+		basic_machine=cr16-unknown
- 		os=-elf
- 		;;
- 	crds | unos)
-@@ -502,6 +549,10 @@
+@@ -526,6 +549,10 @@
  		basic_machine=m88k-motorola
  		os=-sysv3
  		;;
@@ -7862,114 +836,7 @@
  	djgpp)
  		basic_machine=i586-pc
  		os=-msdosdjgpp
-@@ -656,6 +707,14 @@
- 		basic_machine=m68k-isi
- 		os=-sysv
- 		;;
-+	m68knommu)
-+		basic_machine=m68k-unknown
-+		os=-linux
-+		;;
-+	m68knommu-*)
-+		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		os=-linux
-+		;;
- 	m88k-omron*)
- 		basic_machine=m88k-omron
- 		;;
-@@ -671,6 +730,10 @@
- 		basic_machine=i386-pc
- 		os=-mingw32
- 		;;
-+	mingw32ce)
-+		basic_machine=arm-unknown
-+		os=-mingw32ce
-+		;;
- 	miniframe)
- 		basic_machine=m68000-convergent
- 		;;
-@@ -696,6 +759,9 @@
- 		basic_machine=i386-pc
- 		os=-msdos
- 		;;
-+	ms1-*)
-+		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
-+		;;
- 	mvs)
- 		basic_machine=i370-ibm
- 		os=-mvs
-@@ -794,6 +860,14 @@
- 		basic_machine=i860-intel
- 		os=-osf
- 		;;
-+	parisc)
-+		basic_machine=hppa-unknown
-+		os=-linux
-+		;;
-+	parisc-*)
-+		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		os=-linux
-+		;;
- 	pbd)
- 		basic_machine=sparc-tti
- 		;;
-@@ -803,6 +877,12 @@
- 	pc532 | pc532-*)
- 		basic_machine=ns32k-pc532
- 		;;
-+	pc98)
-+		basic_machine=i386-pc
-+		;;
-+	pc98-*)
-+		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
- 	pentium | p5 | k5 | k6 | nexgen | viac3)
- 		basic_machine=i586-pc
- 		;;
-@@ -859,6 +939,10 @@
- 		basic_machine=i586-unknown
- 		os=-pw32
- 		;;
-+	rdos)
-+		basic_machine=i386-pc
-+		os=-rdos
-+		;;
- 	rom68k)
- 		basic_machine=m68k-rom68k
- 		os=-coff
-@@ -885,6 +969,10 @@
- 	sb1el)
- 		basic_machine=mipsisa64sb1el-unknown
- 		;;
-+	sde)
-+		basic_machine=mipsisa32-sde
-+		os=-elf
-+		;;
- 	sei)
- 		basic_machine=mips-sei
- 		os=-seiux
-@@ -896,6 +984,9 @@
- 		basic_machine=sh-hitachi
- 		os=-hms
- 		;;
-+	sh5el)
-+		basic_machine=sh5le-unknown
-+		;;
- 	sh64)
- 		basic_machine=sh64-unknown
- 		;;
-@@ -985,6 +1076,10 @@
- 		basic_machine=tic6x-unknown
- 		os=-coff
- 		;;
-+	tile*)
-+		basic_machine=tile-unknown
-+		os=-linux-gnu
-+		;;
- 	tx39)
- 		basic_machine=mipstx39-unknown
- 		;;
-@@ -1060,6 +1155,10 @@
+@@ -1128,6 +1155,10 @@
  		basic_machine=z8k-unknown
  		os=-sim
  		;;
@@ -7980,7 +847,7 @@
  	none)
  		basic_machine=none-none
  		os=-none
-@@ -1098,10 +1197,10 @@
+@@ -1166,7 +1197,7 @@
  	we32k)
  		basic_machine=we32k-att
  		;;
@@ -7988,12 +855,8 @@
 +	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
  		basic_machine=sh-unknown
  		;;
--	sparc | sparcv8 | sparcv9 | sparcv9b)
-+	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
- 		basic_machine=sparc-sun
- 		;;
- 	cydra)
-@@ -1168,27 +1267,30 @@
+ 	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
+@@ -1236,10 +1267,11 @@
  	# Each alternative MUST END IN A *, to match a version number.
  	# -sysv* is not here because it comes later, after sysvr4.
  	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
@@ -8006,31 +869,17 @@
 +	      | -aos* | -aros* \
  	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
  	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
--	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
-+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-+	      | -openbsd* | -solidbsd* \
- 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+ 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+@@ -1248,7 +1280,7 @@
  	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
  	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
  	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 -	      | -chorusos* | -chorusrdb* \
 +	      | -chorusos* | -chorusrdb* | -cegcc* \
  	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
--	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
-+	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
-+	      | -uxpv* | -beos* | -mpeix* | -udk* \
- 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
- 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
- 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
- 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
- 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
- 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
--	      | -skyos* | -haiku*)
-+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
- 	# Remember, each alternative MUST END IN *, to match a version number.
- 		;;
- 	-qnx*)
-@@ -1318,6 +1420,9 @@
+ 	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+ 	      | -uxpv* | -beos* | -mpeix* | -udk* \
+@@ -1388,6 +1420,9 @@
  	-zvmoe)
  		os=-zvmoe
  		;;
@@ -8040,43 +889,7 @@
  	-none)
  		;;
  	*)
-@@ -1340,6 +1445,12 @@
- # system, and we'll never get to this point.
- 
- case $basic_machine in
-+        score-*)
-+		os=-elf
-+		;;
-+        spu-*)
-+		os=-elf
-+		;;
- 	*-acorn)
- 		os=-riscix1.2
- 		;;
-@@ -1349,9 +1460,9 @@
- 	arm*-semi)
- 		os=-aout
- 		;;
--    c4x-* | tic4x-*)
--        os=-coff
--        ;;
-+        c4x-* | tic4x-*)
-+        	os=-coff
-+		;;
- 	# This must come before the *-dec entry.
- 	pdp10-*)
- 		os=-tops20
-@@ -1377,6 +1488,9 @@
- 	m68*-cisco)
- 		os=-aout
- 		;;
-+        mep-*)
-+		os=-elf
-+		;;
- 	mips*-cisco)
- 		os=-elf
- 		;;
-@@ -1506,7 +1620,7 @@
+@@ -1585,7 +1620,7 @@
  			-sunos*)
  				vendor=sun
  				;;
@@ -8085,24 +898,25 @@
  				vendor=ibm
  				;;
  			-beos*)
-Index: libkml-1.0.1/config/depcomp
+Index: libkml-1.1.0/config/depcomp
 ===================================================================
---- libkml-1.0.1.orig/config/depcomp	2009-07-03 01:23:36.000000000 +0200
-+++ libkml-1.0.1/config/depcomp	2009-12-10 10:19:49.000000000 +0100
-@@ -1,9 +1,10 @@
+--- libkml-1.1.0.orig/config/depcomp	2009-12-10 13:05:40.000000000 +0100
++++ libkml-1.1.0/config/depcomp	2009-12-10 17:29:39.000000000 +0100
+@@ -1,10 +1,10 @@
  #! /bin/sh
  # depcomp - compile a program generating dependencies as side-effects
  
--scriptversion=2005-07-09.11
+-scriptversion=2007-03-29.01
 +scriptversion=2009-04-28.21; # UTC
  
--# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
+-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 Free Software
+-# Foundation, Inc.
 +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free
 +# Software Foundation, Inc.
  
  # This program is free software; you can redistribute it and/or modify
  # it under the terms of the GNU General Public License as published by
-@@ -16,9 +17,7 @@
+@@ -17,9 +17,7 @@
  # GNU General Public License for more details.
  
  # You should have received a copy of the GNU General Public License
@@ -8113,7 +927,7 @@
  
  # As a special exception to the GNU General Public License, if you
  # distribute this file as part of a program that contains a
-@@ -86,12 +85,34 @@
+@@ -87,6 +85,15 @@
     depmode=dashmstdout
  fi
  
@@ -8129,27 +943,7 @@
  case "$depmode" in
  gcc3)
  ## gcc 3 implements dependency tracking that does exactly what
- ## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
- ## it if -MD -MP comes after the -MF stuff.  Hmm.
--  "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
-+## Unfortunately, FreeBSD c89 acceptance of flags depends upon
-+## the command line argument order; so add the flags where they
-+## appear in depend2.am.  Note that the slowdown incurred here
-+## affects only configure: in makefiles, %FASTDEP% shortcuts this.
-+  for arg
-+  do
-+    case $arg in
-+    -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
-+    *)  set fnord "$@" "$arg" ;;
-+    esac
-+    shift # fnord
-+    shift # $arg
-+  done
-+  "$@"
-   stat=$?
-   if test $stat -eq 0; then :
-   else
-@@ -178,14 +199,14 @@
+@@ -192,14 +199,14 @@
  ' < "$tmpdepfile" \
      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
      tr '
@@ -8167,128 +961,22 @@
    else
      # The sourcefile does not contain any dependencies, so just
      # store a dummy comment line, to avoid errors with the Makefile
-@@ -201,34 +222,39 @@
-   # current directory.  Also, the AIX compiler puts `$object:' at the
-   # start of each line; $object doesn't have directory information.
-   # Version 6 uses the directory in both cases.
--  stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
--  tmpdepfile="$stripped.u"
-+  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-+  test "x$dir" = "x$object" && dir=
-+  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-   if test "$libtool" = yes; then
-+    tmpdepfile1=$dir$base.u
-+    tmpdepfile2=$base.u
-+    tmpdepfile3=$dir.libs/$base.u
-     "$@" -Wc,-M
-   else
-+    tmpdepfile1=$dir$base.u
-+    tmpdepfile2=$dir$base.u
-+    tmpdepfile3=$dir$base.u
-     "$@" -M
-   fi
-   stat=$?
- 
--  if test -f "$tmpdepfile"; then :
--  else
--    stripped=`echo "$stripped" | sed 's,^.*/,,'`
--    tmpdepfile="$stripped.u"
--  fi
--
-   if test $stat -eq 0; then :
-   else
--    rm -f "$tmpdepfile"
-+    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
-     exit $stat
-   fi
- 
-+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
-+  do
-+    test -f "$tmpdepfile" && break
-+  done
+@@ -328,7 +335,12 @@
    if test -f "$tmpdepfile"; then
--    outname="$stripped.o"
-     # Each line is of the form `foo.o: dependent.h'.
-     # Do two passes, one to just change these to
-     # `$object: dependent.h' and one to simply `dependent.h:'.
--    sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
--    sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
-+    sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-+    # That's a tab and a space in the [].
-+    sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-   else
-     # The sourcefile does not contain any dependencies, so just
-     # store a dummy comment line, to avoid errors with the Makefile
-@@ -276,6 +302,51 @@
-   rm -f "$tmpdepfile"
-   ;;
- 
-+hp2)
-+  # The "hp" stanza above does not work with aCC (C++) and HP's ia64
-+  # compilers, which have integrated preprocessors.  The correct option
-+  # to use with these is +Maked; it writes dependencies to a file named
-+  # 'foo.d', which lands next to the object file, wherever that
-+  # happens to be.
-+  # Much of this is similar to the tru64 case; see comments there.
-+  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-+  test "x$dir" = "x$object" && dir=
-+  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-+  if test "$libtool" = yes; then
-+    tmpdepfile1=$dir$base.d
-+    tmpdepfile2=$dir.libs/$base.d
-+    "$@" -Wc,+Maked
-+  else
-+    tmpdepfile1=$dir$base.d
-+    tmpdepfile2=$dir$base.d
-+    "$@" +Maked
-+  fi
-+  stat=$?
-+  if test $stat -eq 0; then :
-+  else
-+     rm -f "$tmpdepfile1" "$tmpdepfile2"
-+     exit $stat
-+  fi
-+
-+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
-+  do
-+    test -f "$tmpdepfile" && break
-+  done
-+  if test -f "$tmpdepfile"; then
-+    sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
-+    # Add `dependent.h:' lines.
+     sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
+     # Add `dependent.h:' lines.
+-    sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile"
 +    sed -ne '2,${
 +	       s/^ *//
 +	       s/ \\*$//
 +	       s/$/:/
 +	       p
 +	     }' "$tmpdepfile" >> "$depfile"
-+  else
-+    echo "#dummy" > "$depfile"
-+  fi
-+  rm -f "$tmpdepfile" "$tmpdepfile2"
-+  ;;
-+
- tru64)
-    # The Tru64 compiler uses -MD to generate dependencies as a side
-    # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
-@@ -288,13 +359,13 @@
+   else
+     echo "#dummy" > "$depfile"
+   fi
+@@ -404,7 +416,7 @@
  
-    if test "$libtool" = yes; then
-       # With Tru64 cc, shared objects can also be used to make a
--      # static library.  This mecanism is used in libtool 1.4 series to
-+      # static library.  This mechanism is used in libtool 1.4 series to
-       # handle both shared and static libraries in a single compilation.
-       # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
-       #
-       # With libtool 1.5 this exception was removed, and libtool now
-       # generates 2 separate objects for the 2 libraries.  These two
--      # compilations output dependencies in in $dir.libs/$base.o.d and
-+      # compilations output dependencies in $dir.libs/$base.o.d and
-       # in $dir$base.o.d.  We have to check for both files, because
-       # one of the two compilations can be disabled.  We should prefer
-       # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
-@@ -345,7 +416,7 @@
- 
    # Remove the call to Libtool.
    if test "$libtool" = yes; then
 -    while test $1 != '--mode=compile'; do
@@ -8296,7 +984,7 @@
        shift
      done
      shift
-@@ -396,32 +467,39 @@
+@@ -455,32 +467,39 @@
    "$@" || exit $?
    # Remove any Libtool call
    if test "$libtool" = yes; then
@@ -8340,7 +1028,7 @@
    touch "$tmpdepfile"
    ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
    rm -f "$depfile"
-@@ -441,7 +519,7 @@
+@@ -500,7 +519,7 @@
  
    # Remove the call to Libtool.
    if test "$libtool" = yes; then
@@ -8349,7 +1037,7 @@
        shift
      done
      shift
-@@ -479,13 +557,27 @@
+@@ -538,13 +557,27 @@
  
  msvisualcpp)
    # Important note: in order to support this mode, a compiler *must*
@@ -8379,7 +1067,7 @@
      "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
  	set fnord "$@"
  	shift
-@@ -498,16 +590,23 @@
+@@ -557,16 +590,23 @@
  	;;
      esac
    done
@@ -8407,7 +1095,7 @@
  none)
    exec "$@"
    ;;
-@@ -526,5 +625,6 @@
+@@ -585,5 +625,6 @@
  # eval: (add-hook 'write-file-hooks 'time-stamp)
  # time-stamp-start: "scriptversion="
  # time-stamp-format: "%:y-%02m-%02d.%02H"
@@ -8415,654 +1103,20 @@
 +# time-stamp-time-zone: "UTC"
 +# time-stamp-end: "; # UTC"
  # End:
-Index: libkml-1.0.1/config/install-sh
+Index: libkml-1.1.0/config/install-sh
 ===================================================================
---- libkml-1.0.1.orig/config/install-sh	2009-07-03 01:23:28.000000000 +0200
-+++ libkml-1.0.1/config/install-sh	2009-12-10 10:19:44.000000000 +0100
+--- libkml-1.1.0.orig/config/install-sh	2009-12-10 13:05:40.000000000 +0100
++++ libkml-1.1.0/config/install-sh	2009-12-10 17:29:34.000000000 +0100
 @@ -1,7 +1,7 @@
  #!/bin/sh
  # install - install a program, script, or datafile
  
--scriptversion=2005-05-14.22
+-scriptversion=2006-12-25.00
 +scriptversion=2009-04-28.21; # UTC
  
  # This originates from X11R5 (mit/util/scripts/install.sh), which was
  # later released in X11R6 (xc/config/util/install.sh) with the
-@@ -39,38 +39,68 @@
- # when there is no Makefile.
- #
- # This script is compatible with the BSD install script, but was written
--# from scratch.  It can only install one file at a time, a restriction
--# shared with many OS's install programs.
-+# from scratch.
-+
-+nl='
-+'
-+IFS=" ""	$nl"
- 
- # set DOITPROG to echo to test this script
- 
- # Don't use :- since 4.3BSD and earlier shells don't like it.
--doit="${DOITPROG-}"
-+doit=${DOITPROG-}
-+if test -z "$doit"; then
-+  doit_exec=exec
-+else
-+  doit_exec=$doit
-+fi
- 
--# put in absolute paths if you don't have them in your path; or use env. vars.
-+# Put in absolute file names if you don't have them in your path;
-+# or use environment vars.
- 
--mvprog="${MVPROG-mv}"
--cpprog="${CPPROG-cp}"
--chmodprog="${CHMODPROG-chmod}"
--chownprog="${CHOWNPROG-chown}"
--chgrpprog="${CHGRPPROG-chgrp}"
--stripprog="${STRIPPROG-strip}"
--rmprog="${RMPROG-rm}"
--mkdirprog="${MKDIRPROG-mkdir}"
-+chgrpprog=${CHGRPPROG-chgrp}
-+chmodprog=${CHMODPROG-chmod}
-+chownprog=${CHOWNPROG-chown}
-+cmpprog=${CMPPROG-cmp}
-+cpprog=${CPPROG-cp}
-+mkdirprog=${MKDIRPROG-mkdir}
-+mvprog=${MVPROG-mv}
-+rmprog=${RMPROG-rm}
-+stripprog=${STRIPPROG-strip}
-+
-+posix_glob='?'
-+initialize_posix_glob='
-+  test "$posix_glob" != "?" || {
-+    if (set -f) 2>/dev/null; then
-+      posix_glob=
-+    else
-+      posix_glob=:
-+    fi
-+  }
-+'
-+
-+posix_mkdir=
-+
-+# Desired mode of installed file.
-+mode=0755
- 
--chmodcmd="$chmodprog 0755"
--chowncmd=
- chgrpcmd=
--stripcmd=
-+chmodcmd=$chmodprog
-+chowncmd=
-+mvcmd=$mvprog
- rmcmd="$rmprog -f"
--mvcmd="$mvprog"
-+stripcmd=
-+
- src=
- dst=
- dir_arg=
--dstarg=
-+dst_arg=
-+
-+copy_on_change=false
- no_target_directory=
- 
--usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
-+usage="\
-+Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
-    or: $0 [OPTION]... SRCFILES... DIRECTORY
-    or: $0 [OPTION]... -t DIRECTORY SRCFILES...
-    or: $0 [OPTION]... -d DIRECTORIES...
-@@ -80,81 +110,86 @@
- In the 4th, create DIRECTORIES.
- 
- Options:
---c         (ignored)
---d         create directories instead of installing files.
---g GROUP   $chgrpprog installed files to GROUP.
---m MODE    $chmodprog installed files to MODE.
---o USER    $chownprog installed files to USER.
---s         $stripprog installed files.
---t DIRECTORY  install into DIRECTORY.
---T         report an error if DSTFILE is a directory.
----help     display this help and exit.
----version  display version info and exit.
-+     --help     display this help and exit.
-+     --version  display version info and exit.
-+
-+  -c            (ignored)
-+  -C            install only if different (preserve the last data modification time)
-+  -d            create directories instead of installing files.
-+  -g GROUP      $chgrpprog installed files to GROUP.
-+  -m MODE       $chmodprog installed files to MODE.
-+  -o USER       $chownprog installed files to USER.
-+  -s            $stripprog installed files.
-+  -t DIRECTORY  install into DIRECTORY.
-+  -T            report an error if DSTFILE is a directory.
- 
- Environment variables override the default commands:
--  CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
-+  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
-+  RMPROG STRIPPROG
- "
- 
--while test -n "$1"; do
-+while test $# -ne 0; do
-   case $1 in
--    -c) shift
--        continue;;
-+    -c) ;;
- 
--    -d) dir_arg=true
--        shift
--        continue;;
-+    -C) copy_on_change=true;;
-+
-+    -d) dir_arg=true;;
- 
-     -g) chgrpcmd="$chgrpprog $2"
--        shift
--        shift
--        continue;;
-+	shift;;
- 
-     --help) echo "$usage"; exit $?;;
- 
--    -m) chmodcmd="$chmodprog $2"
--        shift
--        shift
--        continue;;
-+    -m) mode=$2
-+	case $mode in
-+	  *' '* | *'	'* | *'
-+'*	  | *'*'* | *'?'* | *'['*)
-+	    echo "$0: invalid mode: $mode" >&2
-+	    exit 1;;
-+	esac
-+	shift;;
- 
-     -o) chowncmd="$chownprog $2"
--        shift
--        shift
--        continue;;
--
--    -s) stripcmd=$stripprog
--        shift
--        continue;;
--
--    -t) dstarg=$2
--	shift
--	shift
--	continue;;
--
--    -T) no_target_directory=true
--	shift
--	continue;;
-+	shift;;
-+
-+    -s) stripcmd=$stripprog;;
-+
-+    -t) dst_arg=$2
-+	shift;;
-+
-+    -T) no_target_directory=true;;
- 
-     --version) echo "$0 $scriptversion"; exit $?;;
- 
--    *)  # When -d is used, all remaining arguments are directories to create.
--	# When -t is used, the destination is already specified.
--	test -n "$dir_arg$dstarg" && break
--        # Otherwise, the last argument is the destination.  Remove it from $@.
--	for arg
--	do
--          if test -n "$dstarg"; then
--	    # $@ is not empty: it contains at least $arg.
--	    set fnord "$@" "$dstarg"
--	    shift # fnord
--	  fi
--	  shift # arg
--	  dstarg=$arg
--	done
-+    --)	shift
- 	break;;
-+
-+    -*)	echo "$0: invalid option: $1" >&2
-+	exit 1;;
-+
-+    *)  break;;
-   esac
-+  shift
- done
- 
--if test -z "$1"; then
-+if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
-+  # When -d is used, all remaining arguments are directories to create.
-+  # When -t is used, the destination is already specified.
-+  # Otherwise, the last argument is the destination.  Remove it from $@.
-+  for arg
-+  do
-+    if test -n "$dst_arg"; then
-+      # $@ is not empty: it contains at least $arg.
-+      set fnord "$@" "$dst_arg"
-+      shift # fnord
-+    fi
-+    shift # arg
-+    dst_arg=$arg
-+  done
-+fi
-+
-+if test $# -eq 0; then
-   if test -z "$dir_arg"; then
-     echo "$0: no input file specified." >&2
-     exit 1
-@@ -164,24 +199,47 @@
-   exit 0
- fi
- 
-+if test -z "$dir_arg"; then
-+  trap '(exit $?); exit' 1 2 13 15
-+
-+  # Set umask so as not to create temps with too-generous modes.
-+  # However, 'strip' requires both read and write access to temps.
-+  case $mode in
-+    # Optimize common cases.
-+    *644) cp_umask=133;;
-+    *755) cp_umask=22;;
-+
-+    *[0-7])
-+      if test -z "$stripcmd"; then
-+	u_plus_rw=
-+      else
-+	u_plus_rw='% 200'
-+      fi
-+      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
-+    *)
-+      if test -z "$stripcmd"; then
-+	u_plus_rw=
-+      else
-+	u_plus_rw=,u+rw
-+      fi
-+      cp_umask=$mode$u_plus_rw;;
-+  esac
-+fi
-+
- for src
- do
-   # Protect names starting with `-'.
-   case $src in
--    -*) src=./$src ;;
-+    -*) src=./$src;;
-   esac
- 
-   if test -n "$dir_arg"; then
-     dst=$src
--    src=
--
--    if test -d "$dst"; then
--      mkdircmd=:
--      chmodcmd=
--    else
--      mkdircmd=$mkdirprog
--    fi
-+    dstdir=$dst
-+    test -d "$dstdir"
-+    dstdir_status=$?
-   else
-+
-     # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
-     # might cause directories to be created, which would be especially bad
-     # if $src (and thus $dsttmp) contains '*'.
-@@ -190,71 +248,199 @@
-       exit 1
-     fi
- 
--    if test -z "$dstarg"; then
-+    if test -z "$dst_arg"; then
-       echo "$0: no destination specified." >&2
-       exit 1
-     fi
- 
--    dst=$dstarg
-+    dst=$dst_arg
-     # Protect names starting with `-'.
-     case $dst in
--      -*) dst=./$dst ;;
-+      -*) dst=./$dst;;
-     esac
- 
-     # If destination is a directory, append the input filename; won't work
-     # if double slashes aren't ignored.
-     if test -d "$dst"; then
-       if test -n "$no_target_directory"; then
--	echo "$0: $dstarg: Is a directory" >&2
-+	echo "$0: $dst_arg: Is a directory" >&2
- 	exit 1
-       fi
--      dst=$dst/`basename "$src"`
-+      dstdir=$dst
-+      dst=$dstdir/`basename "$src"`
-+      dstdir_status=0
-+    else
-+      # Prefer dirname, but fall back on a substitute if dirname fails.
-+      dstdir=`
-+	(dirname "$dst") 2>/dev/null ||
-+	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+	     X"$dst" : 'X\(//\)[^/]' \| \
-+	     X"$dst" : 'X\(//\)$' \| \
-+	     X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
-+	echo X"$dst" |
-+	    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+		   s//\1/
-+		   q
-+		 }
-+		 /^X\(\/\/\)[^/].*/{
-+		   s//\1/
-+		   q
-+		 }
-+		 /^X\(\/\/\)$/{
-+		   s//\1/
-+		   q
-+		 }
-+		 /^X\(\/\).*/{
-+		   s//\1/
-+		   q
-+		 }
-+		 s/.*/./; q'
-+      `
-+
-+      test -d "$dstdir"
-+      dstdir_status=$?
-     fi
-   fi
- 
--  # This sed command emulates the dirname command.
--  dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
--
--  # Make sure that the destination directory exists.
-+  obsolete_mkdir_used=false
- 
--  # Skip lots of stat calls in the usual case.
--  if test ! -d "$dstdir"; then
--    defaultIFS='
--	 '
--    IFS="${IFS-$defaultIFS}"
--
--    oIFS=$IFS
--    # Some sh's can't handle IFS=/ for some reason.
--    IFS='%'
--    set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
--    shift
--    IFS=$oIFS
-+  if test $dstdir_status != 0; then
-+    case $posix_mkdir in
-+      '')
-+	# Create intermediate dirs using mode 755 as modified by the umask.
-+	# This is like FreeBSD 'install' as of 1997-10-28.
-+	umask=`umask`
-+	case $stripcmd.$umask in
-+	  # Optimize common cases.
-+	  *[2367][2367]) mkdir_umask=$umask;;
-+	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
-+
-+	  *[0-7])
-+	    mkdir_umask=`expr $umask + 22 \
-+	      - $umask % 100 % 40 + $umask % 20 \
-+	      - $umask % 10 % 4 + $umask % 2
-+	    `;;
-+	  *) mkdir_umask=$umask,go-w;;
-+	esac
-+
-+	# With -d, create the new directory with the user-specified mode.
-+	# Otherwise, rely on $mkdir_umask.
-+	if test -n "$dir_arg"; then
-+	  mkdir_mode=-m$mode
-+	else
-+	  mkdir_mode=
-+	fi
-+
-+	posix_mkdir=false
-+	case $umask in
-+	  *[123567][0-7][0-7])
-+	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
-+	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
-+	    ;;
-+	  *)
-+	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
-+	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
-+
-+	    if (umask $mkdir_umask &&
-+		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
-+	    then
-+	      if test -z "$dir_arg" || {
-+		   # Check for POSIX incompatibilities with -m.
-+		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-+		   # other-writeable bit of parent directory when it shouldn't.
-+		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
-+		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
-+		   case $ls_ld_tmpdir in
-+		     d????-?r-*) different_mode=700;;
-+		     d????-?--*) different_mode=755;;
-+		     *) false;;
-+		   esac &&
-+		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
-+		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
-+		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
-+		   }
-+		 }
-+	      then posix_mkdir=:
-+	      fi
-+	      rmdir "$tmpdir/d" "$tmpdir"
-+	    else
-+	      # Remove any dirs left behind by ancient mkdir implementations.
-+	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
-+	    fi
-+	    trap '' 0;;
-+	esac;;
-+    esac
- 
--    pathcomp=
-+    if
-+      $posix_mkdir && (
-+	umask $mkdir_umask &&
-+	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
-+      )
-+    then :
-+    else
- 
--    while test $# -ne 0 ; do
--      pathcomp=$pathcomp$1
-+      # The umask is ridiculous, or mkdir does not conform to POSIX,
-+      # or it failed possibly due to a race condition.  Create the
-+      # directory the slow way, step by step, checking for races as we go.
-+
-+      case $dstdir in
-+	/*) prefix='/';;
-+	-*) prefix='./';;
-+	*)  prefix='';;
-+      esac
-+
-+      eval "$initialize_posix_glob"
-+
-+      oIFS=$IFS
-+      IFS=/
-+      $posix_glob set -f
-+      set fnord $dstdir
-       shift
--      if test ! -d "$pathcomp"; then
--        $mkdirprog "$pathcomp"
--	# mkdir can fail with a `File exist' error in case several
--	# install-sh are creating the directory concurrently.  This
--	# is OK.
--	test -d "$pathcomp" || exit
-+      $posix_glob set +f
-+      IFS=$oIFS
-+
-+      prefixes=
-+
-+      for d
-+      do
-+	test -z "$d" && continue
-+
-+	prefix=$prefix$d
-+	if test -d "$prefix"; then
-+	  prefixes=
-+	else
-+	  if $posix_mkdir; then
-+	    (umask=$mkdir_umask &&
-+	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
-+	    # Don't fail if two instances are running concurrently.
-+	    test -d "$prefix" || exit 1
-+	  else
-+	    case $prefix in
-+	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
-+	      *) qprefix=$prefix;;
-+	    esac
-+	    prefixes="$prefixes '$qprefix'"
-+	  fi
-+	fi
-+	prefix=$prefix/
-+      done
-+
-+      if test -n "$prefixes"; then
-+	# Don't fail if two instances are running concurrently.
-+	(umask $mkdir_umask &&
-+	 eval "\$doit_exec \$mkdirprog $prefixes") ||
-+	  test -d "$dstdir" || exit 1
-+	obsolete_mkdir_used=true
-       fi
--      pathcomp=$pathcomp/
--    done
-+    fi
-   fi
- 
-   if test -n "$dir_arg"; then
--    $doit $mkdircmd "$dst" \
--      && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
--      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
--      && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
--      && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
--
-+    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
-+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
-+    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
-+      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
-   else
--    dstfile=`basename "$dst"`
- 
-     # Make a couple of temp file names in the proper directory.
-     dsttmp=$dstdir/_inst.$$_
-@@ -262,10 +448,9 @@
- 
-     # Trap to clean up those temp files at exit.
-     trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
--    trap '(exit $?); exit' 1 2 13 15
- 
-     # Copy the file name to the temp name.
--    $doit $cpprog "$src" "$dsttmp" &&
-+    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
- 
-     # and set any options; do chmod last to preserve setuid bits.
-     #
-@@ -273,51 +458,63 @@
-     # ignore errors from any of these, just make sure not to ignore
-     # errors from the above "$doit $cpprog $src $dsttmp" command.
-     #
--    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
--      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
--      && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
--      && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
--
--    # Now rename the file to the real destination.
--    { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
--      || {
--	   # The rename failed, perhaps because mv can't rename something else
--	   # to itself, or perhaps because mv is so ancient that it does not
--	   # support -f.
--
--	   # Now remove or move aside any old file at destination location.
--	   # We try this two ways since rm can't unlink itself on some
--	   # systems and the destination file might be busy for other
--	   # reasons.  In this case, the final cleanup might fail but the new
--	   # file should still install successfully.
--	   {
--	     if test -f "$dstdir/$dstfile"; then
--	       $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
--	       || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
--	       || {
--		 echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
--		 (exit 1); exit 1
--	       }
--	     else
--	       :
--	     fi
--	   } &&
--
--	   # Now rename the file to the real destination.
--	   $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
--	 }
--    }
--  fi || { (exit 1); exit 1; }
--done
-+    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
-+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
-+    { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
-+    { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
-+
-+    # If -C, don't bother to copy if it wouldn't change the file.
-+    if $copy_on_change &&
-+       old=`LC_ALL=C ls -dlL "$dst"	2>/dev/null` &&
-+       new=`LC_ALL=C ls -dlL "$dsttmp"	2>/dev/null` &&
-+
-+       eval "$initialize_posix_glob" &&
-+       $posix_glob set -f &&
-+       set X $old && old=:$2:$4:$5:$6 &&
-+       set X $new && new=:$2:$4:$5:$6 &&
-+       $posix_glob set +f &&
-+
-+       test "$old" = "$new" &&
-+       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
-+    then
-+      rm -f "$dsttmp"
-+    else
-+      # Rename the file to the real destination.
-+      $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
- 
--# The final little trick to "correctly" pass the exit status to the exit trap.
--{
--  (exit 0); exit 0
--}
-+      # The rename failed, perhaps because mv can't rename something else
-+      # to itself, or perhaps because mv is so ancient that it does not
-+      # support -f.
-+      {
-+	# Now remove or move aside any old file at destination location.
-+	# We try this two ways since rm can't unlink itself on some
-+	# systems and the destination file might be busy for other
-+	# reasons.  In this case, the final cleanup might fail but the new
-+	# file should still install successfully.
-+	{
-+	  test ! -f "$dst" ||
-+	  $doit $rmcmd -f "$dst" 2>/dev/null ||
-+	  { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
-+	    { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
-+	  } ||
-+	  { echo "$0: cannot unlink or rename $dst" >&2
-+	    (exit 1); exit 1
-+	  }
-+	} &&
-+
-+	# Now rename the file to the real destination.
-+	$doit $mvcmd "$dsttmp" "$dst"
-+      }
-+    fi || exit 1
-+
-+    trap '' 0
-+  fi
-+done
- 
- # Local variables:
+@@ -515,5 +515,6 @@
  # eval: (add-hook 'write-file-hooks 'time-stamp)
  # time-stamp-start: "scriptversion="
  # time-stamp-format: "%:y-%02m-%02d.%02H"
@@ -9070,9967 +1124,43 @@
 +# time-stamp-time-zone: "UTC"
 +# time-stamp-end: "; # UTC"
  # End:
-Index: libkml-1.0.1/config/ltmain.sh
+Index: libkml-1.1.0/config/ltmain.sh
 ===================================================================
---- libkml-1.0.1.orig/config/ltmain.sh	2007-01-07 09:02:33.000000000 +0100
-+++ libkml-1.0.1/config/ltmain.sh	2009-12-10 10:19:37.000000000 +0100
-@@ -1,52 +1,83 @@
--# ltmain.sh - Provide generalized library-building support services.
--# NOTE: Changing this file will not affect anything until you rerun configure.
--#
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
--# Free Software Foundation, Inc.
--# Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
--#
--# This program is free software; you can redistribute it and/or modify
-+# Generated from ltmain.m4sh.
-+
+--- libkml-1.1.0.orig/config/ltmain.sh	2009-12-10 13:05:40.000000000 +0100
++++ libkml-1.1.0/config/ltmain.sh	2009-12-10 17:29:25.000000000 +0100
+@@ -1,6 +1,6 @@
+ # Generated from ltmain.m4sh.
+ 
+-# ltmain.sh (GNU libtool) 2.2.6
 +# ltmain.sh (GNU libtool) 2.2.6b
-+# Written by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
-+
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
-+# This is free software; see the source for copying conditions.  There is NO
-+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-+
-+# GNU Libtool is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
- # the Free Software Foundation; either version 2 of the License, or
- # (at your option) any later version.
- #
--# This program is distributed in the hope that it will be useful, but
-+# As a special exception to the GNU General Public License,
-+# if you distribute this file as part of a program or library that
-+# is built using GNU Libtool, you may include this file under the
-+# same distribution terms that you use for the rest of that program.
-+#
-+# GNU Libtool is distributed in the hope that it will be useful, but
- # WITHOUT ANY WARRANTY; without even the implied warranty of
- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- # General Public License for more details.
- #
- # You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
--#
--# As a special exception to the GNU General Public License, if you
--# distribute this file as part of a program that contains a
--# configuration script generated by Autoconf, you may include it under
--# the same distribution terms that you use for the rest of that program.
--
--basename="s,^.*/,,g"
--
--# 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:
--progname=`echo "$progpath" | $SED $basename`
--modename="$progname"
-+# 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.
+ # Written by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
  
--# Global variables:
--EXIT_SUCCESS=0
--EXIT_FAILURE=1
-+# Usage: $progname [OPTION]... [MODE-ARG]...
-+#
-+# Provide generalized library-building support services.
-+#
-+#     --config             show all configuration variables
-+#     --debug              enable verbose shell tracing
-+# -n, --dry-run            display commands without modifying any files
-+#     --features           display basic configuration information and exit
-+#     --mode=MODE          use operation mode MODE
-+#     --preserve-dup-deps  don't remove duplicate dependency libraries
-+#     --quiet, --silent    don't print informational messages
-+#     --tag=TAG            use configuration variables from tag TAG
-+# -v, --verbose            print informational messages (default)
-+#     --version            print version information
-+# -h, --help               print short or long help message
-+#
-+# MODE must be one of the following:
-+#
-+#       clean              remove files from the build directory
-+#       compile            compile a source file into a libtool object
-+#       execute            automatically set library path, then run a program
-+#       finish             complete the installation of libtool libraries
-+#       install            install libraries or executables
-+#       link               create a library or an executable
-+#       uninstall          remove libraries from an installed directory
-+#
-+# MODE-ARGS vary depending on the MODE.
-+# Try `$progname --help --mode=MODE' for a more detailed description of MODE.
-+#
-+# When reporting a bug, please describe a test case to reproduce it and
-+# include the following information:
-+#
-+#       host-triplet:	$host
-+#       shell:		$SHELL
-+#       compiler:		$LTCC
-+#       compiler flags:		$LTCFLAGS
-+#       linker:		$LD (gnu? $with_gnu_ld)
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
+@@ -65,7 +65,7 @@
+ #       compiler:		$LTCC
+ #       compiler flags:		$LTCFLAGS
+ #       linker:		$LD (gnu? $with_gnu_ld)
+-#       $progname:		(GNU libtool) 2.2.6 Debian-2.2.6a-1ubuntu1
 +#       $progname:		(GNU libtool) 2.2.6b Debian-2.2.6b-2
-+#       automake:		$automake_version
-+#       autoconf:		$autoconf_version
-+#
-+# Report bugs to <bug-libtool at gnu.org>.
+ #       automake:		$automake_version
+ #       autoconf:		$autoconf_version
+ #
+@@ -73,9 +73,9 @@
  
  PROGRAM=ltmain.sh
  PACKAGE=libtool
--VERSION=1.5.22
--TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
+-VERSION="2.2.6 Debian-2.2.6a-1ubuntu1"
 +VERSION="2.2.6b Debian-2.2.6b-2"
-+TIMESTAMP=""
+ TIMESTAMP=""
+-package_revision=1.3012
 +package_revision=1.3017
  
--# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
-+# Be Bourne compatible
+ # Be Bourne compatible
  if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-   emulate sh
-   NULLCMD=:
-@@ -57,99 +88,264 @@
- 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
- 
--# 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
--
--default_mode=
--help="Try \`$progname --help' for more information."
--magic="%%%MAGIC variable%%%"
--mkdir="mkdir"
--mv="mv -f"
--rm="rm -f"
--
--# 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'
--# 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
--  SP2NL='tr \040 \012'
--  NL2SP='tr \015\012 \040\040'
--  ;;
-- *) # EBCDIC based system
--  SP2NL='tr \100 \n'
--  NL2SP='tr \r\n \100\100'
--  ;;
--esac
--
--# NLS nuisances.
-+# 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).
--# We save the old values to restore during execute mode.
--for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-+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
--       fi"
-+          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
- 
-+$lt_unset CDPATH
-+
-+
-+
-+
-+
-+: ${CP="cp -f"}
-+: ${ECHO="echo"}
-+: ${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"
- 
--if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
--  $echo "$modename: not configured to build any kind of library" 1>&2
--  $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
--  exit $EXIT_FAILURE
--fi
-+dirname="s,/[^/]*$,,"
-+basename="s,^.*/,,"
- 
--# Global variables.
--mode=$default_mode
--nonopt=
--prev=
--prevopt=
--run=
--show="$echo"
--show_help=
--execute_dlfiles=
--duplicate_deps=no
--preserve_args=
--lo2o="s/\\.lo\$/.${objext}/"
--o2lo="s/\\.${objext}\$/.lo/"
--extracted_archives=
--extracted_serial=0
-+# 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 "X${1}" | $Xsed -e "$dirname"`
-+  if test "X$func_dirname_result" = "X${1}"; then
-+    func_dirname_result="${3}"
-+  else
-+    func_dirname_result="$func_dirname_result${2}"
-+  fi
-+  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
-+}
-+
-+# Generated shell functions inserted here.
-+
-+# 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
-+  [\\/]*|[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_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 "X$my_directory_path" | $Xsed -e "$dirname"`
-+      done
-+      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
-+	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
-+}
- 
--#####################################
--# Shell function definitions:
--# This seems to be the best place for them
- 
- # func_mktempdir [string]
- # Make a temporary directory that won't clash with other running
-@@ -159,7 +355,7 @@
- {
-     my_template="${TMPDIR-/tmp}/${1-$progname}"
- 
--    if test "$run" = ":"; then
-+    if test "$opt_dry_run" = ":"; then
-       # Return a directory name, but don't create it in dry-run mode
-       my_tmpdir="${my_template}-$$"
-     else
-@@ -168,522 +364,790 @@
-       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}$$"
-+        # 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
-+        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" || {
--        $echo "cannot create temporary directory \`$my_tmpdir'" 1>&2
--	exit $EXIT_FAILURE
--      }
-+      test -d "$my_tmpdir" || \
-+        func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
-     fi
- 
--    $echo "X$my_tmpdir" | $Xsed
-+    $ECHO "X$my_tmpdir" | $Xsed
- }
- 
- 
--# 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.
--func_win32_libid ()
-+# 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 ()
- {
--  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
--    if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
--      $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
--      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"
--      ;;
-+    case $1 in
-+      *[\\\`\"\$]*)
-+	func_quote_for_eval_unquoted_result=`$ECHO "X$1" | $Xsed -e "$sed_quote_subst"` ;;
-+      *)
-+        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
--    ;;
--  esac
--  $echo $win32_libid_type
- }
- 
- 
--# 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 ()
-+# 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 ()
- {
--    if test -n "$available_tags" && test -z "$tagname"; then
--      CC_quoted=
--      for arg in $CC; do
--	case $arg in
--	  *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
--	  arg="\"$arg\""
--	  ;;
--	esac
--	CC_quoted="$CC_quoted $arg"
--      done
--      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 "* | " `$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.
-+    case $1 in
-+      *[\\\`\"]*)
-+	my_arg=`$ECHO "X$1" | $Xsed \
-+	    -e "$double_quote_subst" -e "$sed_double_backslash"` ;;
-       *)
--	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.
--	    case $arg in
--	      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
--	      arg="\"$arg\""
--	      ;;
--	    esac
--	    CC_quoted="$CC_quoted $arg"
--	  done
--	    case "$@ " in
--	      " $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.
--	      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
--	  $echo "$modename: unable to infer tagged configuration"
--	  $echo "$modename: specify a tag with \`--tag'" 1>&2
--	  exit $EXIT_FAILURE
--#        else
--#          $echo "$modename: using $tagname tagged configuration"
--	fi
--	;;
--      esac
--    fi
-+        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_extract_an_archive dir oldlib
--func_extract_an_archive ()
-+# 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 ()
- {
--    f_ex_an_ar_dir="$1"; shift
--    f_ex_an_ar_oldlib="$1"
-+    my_cmd="$1"
-+    my_fail_exp="${2-:}"
- 
--    $show "(cd $f_ex_an_ar_dir && $AR x $f_ex_an_ar_oldlib)"
--    $run 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
--      $echo "$modename: ERROR: object name conflicts: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" 1>&2
--      exit $EXIT_FAILURE
-+    ${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_extract_archives gentop oldlib ...
--func_extract_archives ()
-+
-+# 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_gentop="$1"; shift
--    my_oldlibs=${1+"$@"}
--    my_oldobjs=""
--    my_xlib=""
--    my_xabs=""
--    my_xdir=""
--    my_status=""
-+    my_cmd="$1"
-+    my_fail_exp="${2-:}"
-+
-+    ${opt_silent-false} || {
-+      func_quote_for_expand "$my_cmd"
-+      eval "func_echo $func_quote_for_expand_result"
-+    }
- 
--    $show "${rm}r $my_gentop"
--    $run ${rm}r "$my_gentop"
--    $show "$mkdir $my_gentop"
--    $run $mkdir "$my_gentop"
--    my_status=$?
--    if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then
--      exit $my_status
-+    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
-+}
- 
--    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
--      my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
--      my_xlib_u=$my_xlib
--      while :; do
--        case " $extracted_archives " in
--       *" $my_xlib_u "*)
--         extracted_serial=`expr $extracted_serial + 1`
--         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"
- 
--      $show "${rm}r $my_xdir"
--      $run ${rm}r "$my_xdir"
--      $show "$mkdir $my_xdir"
--      $run $mkdir "$my_xdir"
--      exit_status=$?
--      if test "$exit_status" -ne 0 && test ! -d "$my_xdir"; then
--	exit $exit_status
--      fi
--      case $host in
--      *-darwin*)
--	$show "Extracting $my_xabs"
--	# Do not bother doing anything if just a dry run
--	if test -z "$run"; then
--	  darwin_orig_dir=`pwd`
--	  cd $my_xdir || exit $?
--	  darwin_archive=$my_xabs
--	  darwin_curdir=`pwd`
--	  darwin_base_archive=`$echo "X$darwin_archive" | $Xsed -e 's%^.*/%%'`
--	  darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null`
--	  if test -n "$darwin_arches"; then 
--	    darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'`
--	    darwin_arch=
--	    $show "$darwin_base_archive has multiple architectures $darwin_arches"
--	    for darwin_arch in  $darwin_arches ; do
--	      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 have a bunch of thin objects, gotta fatten them up :)
--	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print| xargs basename | sort -u | $NL2SP`
--	    darwin_file=
--	    darwin_files=
--	    for darwin_file in $darwin_filelist; do
--	      darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
--	      lipo -create -output "$darwin_file" $darwin_files
--	    done # $darwin_filelist
--	    ${rm}r unfat-$$
--	    cd "$darwin_orig_dir"
--	  else
--	    cd "$darwin_orig_dir"
-- 	    func_extract_an_archive "$my_xdir" "$my_xabs"
--	  fi # $darwin_arches
--	fi # $run
--	;;
--      *)
--        func_extract_an_archive "$my_xdir" "$my_xabs"
--        ;;
--      esac
--      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
--    done
--    func_extract_archives_result="$my_oldobjs"
-+
-+
-+
-+# func_version
-+# Echo version message to standard output and exit.
-+func_version ()
-+{
-+    $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / {
-+        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:/,/# -h/ {
-+        s/^# //
-+	s/^# *$//
-+	s/\$progname/'$progname'/
-+	p
-+    }' < "$progpath"
-+    $ECHO
-+    $ECHO "run \`$progname --help | more' for full usage"
-+    exit $?
-+}
-+
-+# func_help
-+# Echo long help message to standard output and exit.
-+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"
-+    exit $?
- }
--# End of Shell function definitions
--#####################################
- 
--# Darwin sucks
--eval std_shrext=\"$shrext_cmds\"
-+# 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"
-+    exit_cmd=exit
-+}
- 
--disable_libs=no
-+exit_cmd=:
- 
--# Parse our command line options once, thoroughly.
--while test "$#" -gt 0
--do
--  arg="$1"
-+
-+
-+
-+
-+# 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
- 
--  case $arg in
--  -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;;
--  *) optarg= ;;
--  esac
-+magic="%%%MAGIC variable%%%"
-+magic_exe="%%%MAGIC EXE variable%%%"
- 
--  # If the previous option needs an argument, assign it.
--  if test -n "$prev"; then
--    case $prev in
--    execute_dlfiles)
--      execute_dlfiles="$execute_dlfiles $arg"
--      ;;
--    tag)
--      tagname="$arg"
--      preserve_args="${preserve_args}=$arg"
--
--      # Check whether tagname contains only valid characters
--      case $tagname in
--      *[!-_A-Za-z0-9,/]*)
--	$echo "$progname: invalid tag name: $tagname" 1>&2
--	exit $EXIT_FAILURE
--	;;
--      esac
-+# Global variables.
-+# $mode is unset
-+nonopt=
-+execute_dlfiles=
-+preserve_args=
-+lo2o="s/\\.lo\$/.${objext}/"
-+o2lo="s/\\.${objext}\$/.lo/"
-+extracted_archives=
-+extracted_serial=0
- 
--      case $tagname in
--      CC)
--	# Don't test for the "default" C tag, as we know, it's there, but
--	# not specially marked.
--	;;
--      *)
--	if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$progpath" > /dev/null; then
--	  taglist="$taglist $tagname"
--	  # Evaluate the configuration.
--	  eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`"
--	else
--	  $echo "$progname: ignoring unknown tag $tagname" 1>&2
--	fi
--	;;
--      esac
--      ;;
--    *)
--      eval "$prev=\$arg"
--      ;;
--    esac
-+opt_dry_run=false
-+opt_duplicate_deps=false
-+opt_silent=false
-+opt_debug=:
- 
--    prev=
--    prevopt=
--    continue
--  fi
-+# 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=
- 
--  # Have we seen a non-optional argument yet?
--  case $arg in
--  --help)
--    show_help=yes
--    ;;
-+# 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."
-+}
- 
--  --version)
--    $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
--    $echo
--    $echo "Copyright (C) 2005  Free Software Foundation, Inc."
--    $echo "This is free software; see the source for copying conditions.  There is NO"
--    $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
--    exit $?
--    ;;
- 
--  --config)
--    ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $progpath
-+# 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 -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath"
-+      $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$progpath"
-     done
--    exit $?
--    ;;
--
--  --debug)
--    $echo "$progname: enabling shell trace mode"
--    set -x
--    preserve_args="$preserve_args $arg"
--    ;;
- 
--  --dry-run | -n)
--    run=:
--    ;;
-+    exit $?
-+}
- 
--  --features)
--    $echo "host: $host"
-+# func_features
-+# Display the features supported by this script.
-+func_features ()
-+{
-+    $ECHO "host: $host"
-     if test "$build_libtool_libs" = yes; then
--      $echo "enable shared libraries"
-+      $ECHO "enable shared libraries"
-     else
--      $echo "disable shared libraries"
-+      $ECHO "disable shared libraries"
-     fi
-     if test "$build_old_libs" = yes; then
--      $echo "enable static libraries"
-+      $ECHO "enable static libraries"
-     else
--      $echo "disable static libraries"
-+      $ECHO "disable static libraries"
-     fi
-+
-     exit $?
--    ;;
-+}
-+
-+# 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"
- 
--  --finish) mode="finish" ;;
-+  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
- 
--  --mode) prevopt="--mode" prev=mode ;;
--  --mode=*) mode="$optarg" ;;
-+  # 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"
- 
--  --preserve-dup-deps) duplicate_deps="yes" ;;
-+	# 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
-+}
- 
--  --quiet | --silent)
--    show=:
--    preserve_args="$preserve_args $arg"
--    ;;
-+# Parse options once, thoroughly.  This comes as soon as possible in
-+# the script to make things like `libtool --version' happen quickly.
-+{
- 
--  --tag)
--    prevopt="--tag"
--    prev=tag
--    preserve_args="$preserve_args --tag"
-+  # Shorthand for --mode=foo, only valid as the first argument
-+  case $1 in
-+  clean|clea|cle|cl)
-+    shift; set dummy --mode clean ${1+"$@"}; shift
-     ;;
--  --tag=*)
--    set tag "$optarg" ${1+"$@"}
--    shift
--    prev=tag
--    preserve_args="$preserve_args --tag"
-+  compile|compil|compi|comp|com|co|c)
-+    shift; set dummy --mode compile ${1+"$@"}; shift
-     ;;
--
--  -dlopen)
--    prevopt="-dlopen"
--    prev=execute_dlfiles
-+  execute|execut|execu|exec|exe|ex|e)
-+    shift; set dummy --mode execute ${1+"$@"}; shift
-     ;;
--
--  -*)
--    $echo "$modename: unrecognized option \`$arg'" 1>&2
--    $echo "$help" 1>&2
--    exit $EXIT_FAILURE
-+  finish|finis|fini|fin|fi|f)
-+    shift; set dummy --mode finish ${1+"$@"}; shift
-     ;;
--
--  *)
--    nonopt="$arg"
--    break
-+  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
--done
- 
--if test -n "$prevopt"; then
--  $echo "$modename: option \`$prevopt' requires an argument" 1>&2
--  $echo "$help" 1>&2
--  exit $EXIT_FAILURE
--fi
-+  # Parse non-mode specific arguments:
-+  while test "$#" -gt 0; do
-+    opt="$1"
-+    shift
- 
--case $disable_libs in
--no) 
--  ;;
--shared)
--  build_libtool_libs=no
--  build_old_libs=yes
--  ;;
--static)
--  build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
--  ;;
--esac
-+    case $opt in
-+      --config)		func_config					;;
- 
--# 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=
-+      --debug)		preserve_args="$preserve_args $opt"
-+			func_echo "enabling shell trace mode"
-+			opt_debug='set -x'
-+			$opt_debug
-+			;;
- 
--if test -z "$show_help"; then
-+      -dlopen)		test "$#" -eq 0 && func_missing_arg "$opt" && break
-+			execute_dlfiles="$execute_dlfiles $1"
-+			shift
-+			;;
- 
--  # Infer the operation mode.
--  if test -z "$mode"; then
--    $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2
--    $echo "*** Future versions of Libtool will require --mode=MODE be specified." 1>&2
--    case $nonopt in
--    *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
--      mode=link
--      for arg
--      do
--	case $arg in
--	-c)
--	   mode=compile
--	   break
--	   ;;
--	esac
--      done
--      ;;
--    *db | *dbx | *strace | *truss)
--      mode=execute
--      ;;
--    *install*|cp|mv)
--      mode=install
--      ;;
--    *rm)
--      mode=uninstall
-+      --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=:
-+			;;
-+
-+      --verbose| -v)	preserve_args="$preserve_args $opt"
-+			opt_silent=false
-+			;;
-+
-+      --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=:					;;
-+      --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=:
-       ;;
-     *)
--      # If we have no mode, but dlfiles were specified, then do execute mode.
--      test -n "$execute_dlfiles" && mode=execute
-+      opt_duplicate_compiler_generated_deps=$opt_duplicate_deps
-+      ;;
-+  esac
- 
--      # Just use the default operation mode.
--      if test -z "$mode"; then
--	if test -n "$nonopt"; then
--	  $echo "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2
--	else
--	  $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2
--	fi
-+  # 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
--      ;;
--    esac
-+    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
--    $echo "$modename: unrecognized option \`-dlopen'" 1>&2
--    $echo "$help" 1>&2
-+    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 \`$modename --help --mode=$mode' for more information."
-+  help="Try \`$progname --help --mode=$mode' for more information."
-+}
- 
--  # These modes are in order of execution frequency so that they run quickly.
--  case $mode in
--  # libtool compile mode
--  compile)
--    modename="$modename: compile"
--    # 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=
- 
--    for arg
--    do
--      case $arg_mode in
--      arg  )
--	# do not "continue".  Instead, add this to base_compile
--	lastarg="$arg"
--	arg_mode=normal
--	;;
-+# 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
-+}
- 
--      target )
--	libobj="$arg"
--	arg_mode=normal
--	continue
--	;;
-+# 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
-+}
- 
--      normal )
--	# Accept any command-line options.
--	case $arg in
--	-o)
--	  if test -n "$libobj" ; then
--	    $echo "$modename: you cannot specify \`-o' more than once" 1>&2
--	    exit $EXIT_FAILURE
--	  fi
--	  arg_mode=target
--	  continue
--	  ;;
-+# 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"
-+}
- 
--	-static | -prefer-pic | -prefer-non-pic)
--	  later="$later $arg"
--	  continue
--	  ;;
-+# 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
-+}
- 
--	-no-suppress)
--	  suppress_opt=no
-+# 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
-+      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 "* | " `$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.
-+      *)
-+	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
-+	    case "$@ " in
-+	      " $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.
-+	      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
- 	  ;;
- 
-@@ -693,31 +1157,25 @@
- 	  ;;            #  replaced later.  I would guess that would be a bug.
- 
- 	-Wc,*)
--	  args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
-+	  func_stripname '-Wc,' '' "$arg"
-+	  args=$func_stripname_result
- 	  lastarg=
- 	  save_ifs="$IFS"; IFS=','
-- 	  for arg in $args; do
-+	  for arg in $args; do
- 	    IFS="$save_ifs"
--
--	    # Double-quote args containing other shell metacharacters.
--	    # Many Bourne shells cannot handle close brackets correctly
--	    # in scan sets, so we specify it separately.
--	    case $arg in
--	      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
--	      arg="\"$arg\""
--	      ;;
--	    esac
--	    lastarg="$lastarg $arg"
-+	    func_quote_for_eval "$arg"
-+	    lastarg="$lastarg $func_quote_for_eval_result"
- 	  done
- 	  IFS="$save_ifs"
--	  lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"`
-+	  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.
- 	  #
-@@ -729,65 +1187,42 @@
-       esac    #  case $arg_mode
- 
-       # Aesthetically quote the previous argument.
--      lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"`
--
--      case $lastarg in
--      # Double-quote args containing other shell metacharacters.
--      # Many Bourne shells cannot handle close brackets correctly
--      # in scan sets, and some SunOS ksh mistreat backslash-escaping
--      # in scan sets (worked around with variable expansion),
--      # and furthermore cannot handle '|' '&' '(' ')' in scan sets 
--      # at all, so we specify them separately.
--      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
--	lastarg="\"$lastarg\""
--	;;
--      esac
--
--      base_compile="$base_compile $lastarg"
-+      func_quote_for_eval "$lastarg"
-+      base_compile="$base_compile $func_quote_for_eval_result"
-     done # for arg
- 
-     case $arg_mode in
-     arg)
--      $echo "$modename: you must specify an argument for -Xcompile"
--      exit $EXIT_FAILURE
-+      func_fatal_error "you must specify an argument for -Xcompile"
-       ;;
-     target)
--      $echo "$modename: you must specify a target with \`-o'" 1>&2
--      exit $EXIT_FAILURE
-+      func_fatal_error "you must specify a target with \`-o'"
-       ;;
-     *)
-       # Get the name of the library object.
--      [ -z "$libobj" ] && libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'`
-+      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
--    xform='[cCFSifmso]'
-     case $libobj in
--    *.ada) xform=ada ;;
--    *.adb) xform=adb ;;
--    *.ads) xform=ads ;;
--    *.asm) xform=asm ;;
--    *.c++) xform=c++ ;;
--    *.cc) xform=cc ;;
--    *.ii) xform=ii ;;
--    *.class) xform=class ;;
--    *.cpp) xform=cpp ;;
--    *.cxx) xform=cxx ;;
--    *.f90) xform=f90 ;;
--    *.for) xform=for ;;
--    *.java) xform=java ;;
--    *.obj) xform=obj ;;
-+    *.[cCFSifmso] | \
-+    *.ada | *.adb | *.ads | *.asm | \
-+    *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
-+    *.[fF][09]? | *.for | *.java | *.obj | *.sx)
-+      func_xform "$libobj"
-+      libobj=$func_xform_result
-+      ;;
-     esac
- 
--    libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
--
-     case $libobj in
--    *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
-+    *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;;
-     *)
--      $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
--      exit $EXIT_FAILURE
-+      func_fatal_error "cannot determine name of library object from \`$libobj'"
-       ;;
-     esac
- 
-@@ -795,7 +1230,15 @@
- 
-     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
- 	;;
-@@ -812,28 +1255,17 @@
-       esac
-     done
- 
--    qlibobj=`$echo "X$libobj" | $Xsed -e "$sed_quote_subst"`
--    case $qlibobj in
--      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
--	qlibobj="\"$qlibobj\"" ;;
--    esac
--    test "X$libobj" != "X$qlibobj" \
--	&& $echo "X$libobj" | grep '[]~#^*{};<>?"'"'"' 	&()|`$[]' \
--	&& $echo "$modename: libobj name \`$libobj' may not contain shell special characters."
--    objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
--    xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
--    if test "X$xdir" = "X$obj"; then
--      xdir=
--    else
--      xdir=$xdir/
--    fi
-+    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
- 
--    if test -z "$base_compile"; then
--      $echo "$modename: you must specify a compilation command" 1>&2
--      $echo "$help" 1>&2
--      exit $EXIT_FAILURE
--    fi
-+    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
-@@ -842,12 +1274,9 @@
-       removelist="$lobj $libobj ${libobj}T"
-     fi
- 
--    $run $rm $removelist
--    trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
--
-     # On Cygwin there's no "real" PIC flag so we must build both object types
-     case $host_os in
--    cygwin* | mingw* | pw32* | os2*)
-+    cygwin* | mingw* | pw32* | os2* | cegcc*)
-       pic_mode=default
-       ;;
-     esac
-@@ -859,10 +1288,8 @@
-     # 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 "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
-+      output_obj=`$ECHO "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
-       lockfile="$output_obj.lock"
--      removelist="$removelist $output_obj $lockfile"
--      trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
-     else
-       output_obj=
-       need_locks=no
-@@ -872,13 +1299,13 @@
-     # 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 $run ln "$progpath" "$lockfile" 2>/dev/null; do
--	$show "Waiting for $lockfile to be removed"
-+      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 "\
-+	$ECHO "\
- *** ERROR, $lockfile exists and contains:
- `cat $lockfile 2>/dev/null`
- 
-@@ -889,34 +1316,22 @@
- avoid parallel builds (make -j) in this platform, or get a better
- compiler."
- 
--	$run $rm $removelist
-+	$opt_dry_run || $RM $removelist
- 	exit $EXIT_FAILURE
-       fi
--      $echo "$srcfile" > "$lockfile"
-+      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
--    qsrcfile=`$echo "X$srcfile" | $Xsed -e "$sed_quote_subst"`
--    case $qsrcfile in
--      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
--      qsrcfile="\"$qsrcfile\"" ;;
--    esac
--
--    $run $rm "$libobj" "${libobj}T"
--
--    # Create a libtool object file (analogous to a ".la" file),
--    # but don't create it if we're doing a dry run.
--    test -z "$run" && cat > ${libobj}T <<EOF
--# $libobj - a libtool object file
--# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
--#
--# Please DO NOT delete this file!
--# It is necessary for linking the library.
--
--# Name of the PIC object.
--EOF
-+    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
-@@ -930,32 +1345,19 @@
- 	command="$base_compile $qsrcfile"
-       fi
- 
--      if test ! -d "${xdir}$objdir"; then
--	$show "$mkdir ${xdir}$objdir"
--	$run $mkdir ${xdir}$objdir
--	exit_status=$?
--	if test "$exit_status" -ne 0 && test ! -d "${xdir}$objdir"; then
--	  exit $exit_status
--	fi
--      fi
-+      func_mkdir_p "$xdir$objdir"
- 
-       if test -z "$output_obj"; then
- 	# Place PIC objects in $objdir
- 	command="$command -o $lobj"
-       fi
- 
--      $run $rm "$lobj" "$output_obj"
--
--      $show "$command"
--      if $run eval "$command"; then :
--      else
--	test -n "$output_obj" && $run $rm $removelist
--	exit $EXIT_FAILURE
--      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 "\
-+	$ECHO "\
- *** ERROR, $lockfile contains:
- `cat $lockfile 2>/dev/null`
- 
-@@ -969,45 +1371,27 @@
- avoid parallel builds (make -j) in this platform, or get a better
- compiler."
- 
--	$run $rm $removelist
-+	$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
--	$show "$mv $output_obj $lobj"
--	if $run $mv $output_obj $lobj; then :
--	else
--	  error=$?
--	  $run $rm $removelist
--	  exit $error
--	fi
-+	func_show_eval '$MV "$output_obj" "$lobj"' \
-+	  'error=$?; $opt_dry_run || $RM $removelist; exit $error'
-       fi
- 
--      # Append the name of the PIC object to the libtool object file.
--      test -z "$run" && cat >> ${libobj}T <<EOF
--pic_object='$objdir/$objname'
--
--EOF
--
-       # Allow error messages only from the first compilation.
-       if test "$suppress_opt" = yes; then
--        suppress_output=' >/dev/null 2>&1'
-+	suppress_output=' >/dev/null 2>&1'
-       fi
--    else
--      # No PIC object so indicate it doesn't exist in the libtool
--      # object file.
--      test -z "$run" && cat >> ${libobj}T <<EOF
--pic_object=none
--
--EOF
-     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"
-+	command="$base_compile $qsrcfile$pie_flag"
-       else
- 	command="$base_compile $qsrcfile $pic_flag"
-       fi
-@@ -1017,17 +1401,12 @@
- 
-       # Suppress compiler output if we already did a PIC compilation.
-       command="$command$suppress_output"
--      $run $rm "$obj" "$output_obj"
--      $show "$command"
--      if $run eval "$command"; then :
--      else
--	$run $rm $removelist
--	exit $EXIT_FAILURE
--      fi
-+      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 "\
-+	$ECHO "\
- *** ERROR, $lockfile contains:
- `cat $lockfile 2>/dev/null`
- 
-@@ -1041,5448 +1420,6784 @@
- avoid parallel builds (make -j) in this platform, or get a better
- compiler."
- 
--	$run $rm $removelist
-+	$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
--	$show "$mv $output_obj $obj"
--	if $run $mv $output_obj $obj; then :
--	else
--	  error=$?
--	  $run $rm $removelist
--	  exit $error
--	fi
-+	func_show_eval '$MV "$output_obj" "$obj"' \
-+	  'error=$?; $opt_dry_run || $RM $removelist; exit $error'
-       fi
--
--      # Append the name of the non-PIC object the libtool object file.
--      # Only append if the libtool object file exists.
--      test -z "$run" && cat >> ${libobj}T <<EOF
--# Name of the non-PIC object.
--non_pic_object='$objname'
--
--EOF
--    else
--      # Append the name of the non-PIC object the libtool object file.
--      # Only append if the libtool object file exists.
--      test -z "$run" && cat >> ${libobj}T <<EOF
--# Name of the non-PIC object.
--non_pic_object=none
--
--EOF
-     fi
- 
--    $run $mv "${libobj}T" "${libobj}"
-+    $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
--      $run $rm "$lockfile"
--    fi
-+      # Unlock the critical section if it was locked
-+      if test "$need_locks" != no; then
-+	removelist=$lockfile
-+        $RM "$lockfile"
-+      fi
-+    }
- 
-     exit $EXIT_SUCCESS
--    ;;
--
--  # libtool link mode
--  link | relink)
--    modename="$modename: link"
--    case $host in
--    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
--      # 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"
-+$opt_help || {
-+test "$mode" = compile && func_mode_compile ${1+"$@"}
-+}
- 
--    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=
-+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
-+        ;;
- 
--    avoid_version=no
--    dlfiles=
--    dlprefiles=
--    dlself=no
--    export_dynamic=no
--    export_symbols=
--    export_symbols_regex=
--    generated=
--    libobjs=
--    ltlibs=
--    module=no
--    no_install=no
--    objs=
--    non_pic_objects=
--    notinst_path= # paths that contain not-installed libtool libraries
--    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
-+      clean)
-+        $ECHO \
-+"Usage: $progname [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
- 
--    func_infer_tag $base_compile
-+Remove files from the build directory.
- 
--    # We need to know -static, to get the right output filenames.
--    for arg
--    do
--      case $arg in
--      -all-static | -static | -static-libtool-libs)
--    case $arg in
--    -all-static)
--	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
--	    $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
--	  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
-+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.
- 
--    # See if our shared archives depend on static archives.
--    test -n "$old_archive_from_new_cmds" && build_old_libs=yes
-+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."
-+        ;;
- 
--    # Go through the arguments, transforming them on the way.
--    while test "$#" -gt 0; do
--      arg="$1"
--      shift
--      case $arg in
--      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
--	qarg=\"`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`\" ### testsuite: skip nested quoting test
--	;;
--      *) qarg=$arg ;;
--      esac
--      libtool_args="$libtool_args $qarg"
-+      compile)
-+      $ECHO \
-+"Usage: $progname [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
- 
--      # If the previous option needs an argument, assign it.
--      if test -n "$prev"; then
--	case $prev in
--	output)
--	  compile_command="$compile_command @OUTPUT@"
--	  finalize_command="$finalize_command @OUTPUT@"
--	  ;;
--	esac
-+Compile a source file into a libtool library object.
- 
--	case $prev in
--	dlfiles|dlprefiles)
--	  if test "$preload" = no; then
--	    # Add the symbol object into the linking commands.
--	    compile_command="$compile_command @SYMFILE@"
--	    finalize_command="$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"
--	  if test ! -f "$arg"; then
--	    $echo "$modename: symbol file \`$arg' does not exist"
--	    exit $EXIT_FAILURE
--	  fi
--	  prev=
--	  continue
--	  ;;
--	expsyms_regex)
--	  export_symbols_regex="$arg"
--	  prev=
--	  continue
--	  ;;
--	inst_prefix)
--	  inst_prefix_dir="$arg"
--	  prev=
--	  continue
--	  ;;
--	precious_regex)
--	  precious_files_regex="$arg"
--	  prev=
--	  continue
--	  ;;
--	release)
--	  release="-$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.
-+This mode accepts the following additional options:
- 
--	      # Check to see that this really is a libtool object.
--	      if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
--		pic_object=
--		non_pic_object=
-+  -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 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
- 
--		# Read the .lo file
--		# If there is no directory component, then add one.
--		case $arg in
--		*/* | *\\*) . $arg ;;
--		*) . ./$arg ;;
--		esac
-+COMPILE-COMMAND is a command to be used in creating a \`standard' object file
-+from the given SOURCEFILE.
- 
--		if test -z "$pic_object" || \
--		   test -z "$non_pic_object" ||
--		   test "$pic_object" = none && \
--		   test "$non_pic_object" = none; then
--		  $echo "$modename: cannot find name of object for \`$arg'" 1>&2
--		  exit $EXIT_FAILURE
--		fi
-+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'."
-+        ;;
- 
--		# Extract subdirectory from the argument.
--		xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
--		if test "X$xdir" = "X$arg"; then
--		  xdir=
--		else
--		  xdir="$xdir/"
--		fi
-+      execute)
-+        $ECHO \
-+"Usage: $progname [OPTION]... --mode=execute COMMAND [ARGS]...
- 
--		if test "$pic_object" != none; then
--		  # Prepend the subdirectory the object is found in.
--		  pic_object="$xdir$pic_object"
-+Automatically set library path, then run a program.
- 
--		  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
-+This mode accepts the following additional options:
- 
--		  # CHECK ME:  I think I busted this.  -Ossama
--		  if test "$prev" = dlprefiles; then
--		    # Preload the old-style object.
--		    dlprefiles="$dlprefiles $pic_object"
--		    prev=
--		  fi
-+  -dlopen FILE      add the directory containing FILE to the library path
- 
--		  # A PIC object.
--		  libobjs="$libobjs $pic_object"
--		  arg="$pic_object"
--		fi
-+This mode sets the library path environment variable according to \`-dlopen'
-+flags.
- 
--		# 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"
-+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.
- 
--		  # A standard non-PIC object
--		  non_pic_objects="$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"
--		  non_pic_objects="$non_pic_objects $non_pic_object"
--		fi
--	      else
--		# Only an error if not doing a dry-run.
--		if test -z "$run"; then
--		  $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
--		  exit $EXIT_FAILURE
--		else
--		  # Dry-run case.
-+Then, COMMAND is executed, with ARGS as arguments."
-+        ;;
- 
--		  # Extract subdirectory from the argument.
--		  xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
--		  if test "X$xdir" = "X$arg"; then
--		    xdir=
--		  else
--		    xdir="$xdir/"
--		  fi
-+      finish)
-+        $ECHO \
-+"Usage: $progname [OPTION]... --mode=finish [LIBDIR]...
- 
--		  pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
--		  non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
--		  libobjs="$libobjs $pic_object"
--		  non_pic_objects="$non_pic_objects $non_pic_object"
--		fi
--	      fi
--	    done
--	  else
--	    $echo "$modename: link input file \`$save_arg' does not exist"
--	    exit $EXIT_FAILURE
--	  fi
--	  arg=$save_arg
--	  prev=
--	  continue
--	  ;;
--	rpath | xrpath)
--	  # We need an absolute path.
--	  case $arg in
--	  [\\/]* | [A-Za-z]:[\\/]*) ;;
--	  *)
--	    $echo "$modename: only absolute run-paths are allowed" 1>&2
--	    exit $EXIT_FAILURE
--	    ;;
--	  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
--	  ;;
--	xcompiler)
--	  compiler_flags="$compiler_flags $qarg"
--	  prev=
--	  compile_command="$compile_command $qarg"
--	  finalize_command="$finalize_command $qarg"
--	  continue
--	  ;;
--	xlinker)
--	  linker_flags="$linker_flags $qarg"
--	  compiler_flags="$compiler_flags $wl$qarg"
--	  prev=
--	  compile_command="$compile_command $wl$qarg"
--	  finalize_command="$finalize_command $wl$qarg"
--	  continue
--	  ;;
--	xcclinker)
--	  linker_flags="$linker_flags $qarg"
--	  compiler_flags="$compiler_flags $qarg"
--	  prev=
--	  compile_command="$compile_command $qarg"
--	  finalize_command="$finalize_command $qarg"
--	  continue
--	  ;;
--	shrext)
--  	  shrext_cmds="$arg"
--	  prev=
--	  continue
--	  ;;
--	darwin_framework|darwin_framework_skip)
--	  test "$prev" = "darwin_framework" && compiler_flags="$compiler_flags $arg"
--	  compile_command="$compile_command $arg"
--	  finalize_command="$finalize_command $arg"
--	  prev=
--	  continue
--	  ;;
--	*)
--	  eval "$prev=\"\$arg\""
--	  prev=
--	  continue
--	  ;;
--	esac
--      fi # test -n "$prev"
-+Complete the installation of libtool libraries.
- 
--      prevarg="$arg"
-+Each LIBDIR is a directory that contains libtool libraries.
- 
--      case $arg in
--      -all-static)
--	if test -n "$link_static_flag"; then
--	  compile_command="$compile_command $link_static_flag"
--	  finalize_command="$finalize_command $link_static_flag"
--	fi
--	continue
--	;;
-+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."
-+        ;;
- 
--      -allow-undefined)
--	# FIXME: remove this flag sometime in the future.
--	$echo "$modename: \`-allow-undefined' is deprecated because it is the default" 1>&2
--	continue
--	;;
-+      install)
-+        $ECHO \
-+"Usage: $progname [OPTION]... --mode=install INSTALL-COMMAND...
- 
--      -avoid-version)
--	avoid_version=yes
--	continue
--	;;
-+Install executables or libraries.
- 
--      -dlopen)
--	prev=dlfiles
--	continue
--	;;
-+INSTALL-COMMAND is the installation command.  The first component should be
-+either the \`install' or \`cp' program.
- 
--      -dlpreopen)
--	prev=dlprefiles
--	continue
--	;;
-+The following components of INSTALL-COMMAND are treated specially:
- 
--      -export-dynamic)
--	export_dynamic=yes
--	continue
--	;;
-+  -inst-prefix PREFIX-DIR  Use PREFIX-DIR as a staging area for installation
- 
--      -export-symbols | -export-symbols-regex)
--	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
--	  $echo "$modename: more than one -exported-symbols argument is not allowed"
--	  exit $EXIT_FAILURE
--	fi
--	if test "X$arg" = "X-export-symbols"; then
--	  prev=expsyms
--	else
--	  prev=expsyms_regex
--	fi
--	continue
--	;;
-+The rest of the components are interpreted as arguments to that command (only
-+BSD-compatible install options are recognized)."
-+        ;;
- 
--      -framework|-arch|-isysroot)
--	case " $CC " in
--	  *" ${arg} ${1} "* | *" ${arg}	${1} "*) 
--		prev=darwin_framework_skip ;;
--	  *) compiler_flags="$compiler_flags $arg"
--	     prev=darwin_framework ;;
--	esac
--	compile_command="$compile_command $arg"
--	finalize_command="$finalize_command $arg"
--	continue
--	;;
-+      link)
-+        $ECHO \
-+"Usage: $progname [OPTION]... --mode=link LINK-COMMAND...
- 
--      -inst-prefix-dir)
--	prev=inst_prefix
--	continue
--	;;
-+Link object files or libraries together to form another library, or to
-+create an executable program.
- 
--      # 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*)
--	  compile_command="$compile_command $arg"
--	  finalize_command="$finalize_command $arg"
--	  ;;
--	esac
--	continue
--	;;
-+LINK-COMMAND is a command using the C compiler that you would use to create
-+a program from several object files.
- 
--      -L*)
--	dir=`$echo "X$arg" | $Xsed -e 's/^-L//'`
--	# We need an absolute path.
--	case $dir in
--	[\\/]* | [A-Za-z]:[\\/]*) ;;
--	*)
--	  absdir=`cd "$dir" && pwd`
--	  if test -z "$absdir"; then
--	    $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
--	    absdir="$dir"
--	    notinst_path="$notinst_path $dir"
--	  fi
--	  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*)
--	  testbindir=`$echo "X$dir" | $Xsed -e 's*/lib$*/bin*'`
--	  case :$dllsearchpath: in
--	  *":$dir:"*) ;;
--	  *) dllsearchpath="$dllsearchpath:$dir";;
--	  esac
--	  case :$dllsearchpath: in
--	  *":$testbindir:"*) ;;
--	  *) dllsearchpath="$dllsearchpath:$testbindir";;
--	  esac
--	  ;;
--	esac
--	continue
--	;;
-+The following components of LINK-COMMAND are treated specially:
- 
--      -l*)
--	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
--	  case $host in
--	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*)
--	    # 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 -framework System"
--	    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
--	;;
-+  -all-static       do not do any dynamic linking at all
-+  -avoid-version    do not add a version suffix if possible
-+  -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
- 
--      # Tru64 UNIX uses -model [arg] to determine the layout of C++
--      # classes, name mangling, and exception handling.
--      -model)
--	compile_command="$compile_command $arg"
--	compiler_flags="$compiler_flags $arg"
--	finalize_command="$finalize_command $arg"
--	prev=xcompiler
--	continue
--	;;
-+All other options (arguments beginning with \`-') are ignored.
- 
--     -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
--	compiler_flags="$compiler_flags $arg"
--	compile_command="$compile_command $arg"
--	finalize_command="$finalize_command $arg"
--	continue
--	;;
-+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.
- 
--      -module)
--	module=yes
--	continue
--	;;
-+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.
- 
--      # -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* pass through architecture-specific compiler args for GCC
--      # -m*, -t[45]*, -txscale* pass through architecture-specific
--      # compiler args for GCC
--      # -pg 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*|-pg| \
--      -t[45]*|-txscale*|@*)
-+If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
-+using \`ar' and \`ranlib', or on Windows using \`lib'.
- 
--	# Unknown arguments in both finalize_command and compile_command need
--	# to be aesthetically quoted because they are evaled later.
--	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
--	case $arg in
--	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
--	  arg="\"$arg\""
--	  ;;
--	esac
--        compile_command="$compile_command $arg"
--        finalize_command="$finalize_command $arg"
--        compiler_flags="$compiler_flags $arg"
--        continue
-+If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
-+is created, otherwise an executable program is created."
-         ;;
- 
--      -shrext)
--	prev=shrext
--	continue
--	;;
-+      uninstall)
-+        $ECHO \
-+"Usage: $progname [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
- 
--      -no-fast-install)
--	fast_install=no
--	continue
--	;;
-+Remove libraries from an installation directory.
- 
--      -no-install)
--	case $host in
--	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
--	  # The PATH hackery in wrapper scripts is required on Windows
--	  # in order for the loader to find any dlls it needs.
--	  $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
--	  $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
--	  fast_install=no
--	  ;;
--	*) no_install=yes ;;
--	esac
--	continue
--	;;
-+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.
- 
--      -no-undefined)
--	allow_undefined=no
--	continue
--	;;
-+If FILE is a libtool library, all the files associated with it are deleted.
-+Otherwise, only FILE itself is deleted using RM."
-+        ;;
- 
--      -objectlist)
--	prev=objectlist
--	continue
--	;;
-+      *)
-+        func_fatal_help "invalid operation mode \`$mode'"
-+        ;;
-+    esac
- 
--      -o) prev=output ;;
-+    $ECHO
-+    $ECHO "Try \`$progname --help' for more information about other modes."
- 
--      -precious-files-regex)
--	prev=precious_regex
--	continue
--	;;
-+    exit $?
-+}
- 
--      -release)
--	prev=release
--	continue
--	;;
-+  # Now that we've collected a possible --mode arg, show help if necessary
-+  $opt_help && func_mode_help
- 
--      -rpath)
--	prev=rpath
--	continue
--	;;
- 
--      -R)
--	prev=xrpath
--	continue
--	;;
-+# 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"
- 
--      -R*)
--	dir=`$echo "X$arg" | $Xsed -e 's/^-R//'`
--	# We need an absolute path.
--	case $dir in
--	[\\/]* | [A-Za-z]:[\\/]*) ;;
--	*)
--	  $echo "$modename: only absolute run-paths are allowed" 1>&2
--	  exit $EXIT_FAILURE
--	  ;;
--	esac
--	case "$xrpath " in
--	*" $dir "*) ;;
--	*) xrpath="$xrpath $dir" ;;
--	esac
--	continue
--	;;
-+    # Handle -dlopen flags immediately.
-+    for file in $execute_dlfiles; do
-+      test -f "$file" \
-+	|| func_fatal_help "\`$file' is not a file"
- 
--      -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
--	;;
-+      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"
- 
--      -thread-safe)
--	thread_safe=yes
--	continue
--	;;
-+	# Read the libtool library.
-+	dlname=
-+	library_names=
-+	func_source "$file"
- 
--      -version-info)
--	prev=vinfo
--	continue
--	;;
--      -version-number)
--	prev=vinfo
--	vinfo_number=yes
--	continue
--	;;
-+	# 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
- 
--      -Wc,*)
--	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'`
--	arg=
--	save_ifs="$IFS"; IFS=','
--	for flag in $args; do
--	  IFS="$save_ifs"
--	  case $flag in
--	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
--	    flag="\"$flag\""
--	    ;;
--	  esac
--	  arg="$arg $wl$flag"
--	  compiler_flags="$compiler_flags $flag"
--	done
--	IFS="$save_ifs"
--	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
--	;;
-+	func_dirname "$file" "" "."
-+	dir="$func_dirname_result"
- 
--      -Wl,*)
--	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
--	arg=
--	save_ifs="$IFS"; IFS=','
--	for flag in $args; do
--	  IFS="$save_ifs"
--	  case $flag in
--	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
--	    flag="\"$flag\""
--	    ;;
--	  esac
--	  arg="$arg $wl$flag"
--	  compiler_flags="$compiler_flags $wl$flag"
--	  linker_flags="$linker_flags $flag"
--	done
--	IFS="$save_ifs"
--	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
-+	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
- 	;;
- 
--      -Xcompiler)
--	prev=xcompiler
--	continue
-+      *.lo)
-+	# Just add the directory containing the .lo file.
-+	func_dirname "$file" "" "."
-+	dir="$func_dirname_result"
- 	;;
- 
--      -Xlinker)
--	prev=xlinker
-+      *)
-+	func_warning "\`-dlopen' is ignored for non-libtool libraries and objects"
- 	continue
- 	;;
-+      esac
- 
--      -XCClinker)
--	prev=xcclinker
--	continue
--	;;
-+      # Get the absolute pathname.
-+      absdir=`cd "$dir" && pwd`
-+      test -n "$absdir" && dir="$absdir"
- 
--      # Some other compiler flag.
--      -* | +*)
--	# Unknown arguments in both finalize_command and compile_command need
--	# to be aesthetically quoted because they are evaled later.
--	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
--	case $arg in
--	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
--	  arg="\"$arg\""
--	  ;;
--	esac
--	;;
-+      # 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
- 
--      *.$objext)
--	# A standard object.
--	objs="$objs $arg"
--	;;
-+    # This variable tells wrapper scripts just to set shlibpath_var
-+    # rather than running their programs.
-+    libtool_execute_magic="$magic"
- 
--      *.lo)
--	# A libtool-controlled object.
-+    # Check if any of the arguments is a wrapper script.
-+    args=
-+    for file
-+    do
-+      case $file in
-+      -*) ;;
-+      *)
-+	# 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
- 
--	# Check to see that this really is a libtool object.
--	if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
--	  pic_object=
--	  non_pic_object=
-+    if test "X$opt_dry_run" = Xfalse; then
-+      if test -n "$shlibpath_var"; then
-+	# Export the shlibpath_var.
-+	eval "export $shlibpath_var"
-+      fi
- 
--	  # Read the .lo file
--	  # If there is no directory component, then add one.
--	  case $arg in
--	  */* | *\\*) . $arg ;;
--	  *) . ./$arg ;;
--	  esac
-+      # 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
- 
--	  if test -z "$pic_object" || \
--	     test -z "$non_pic_object" ||
--	     test "$pic_object" = none && \
--	     test "$non_pic_object" = none; then
--	    $echo "$modename: cannot find name of object for \`$arg'" 1>&2
--	    exit $EXIT_FAILURE
--	  fi
-+      # Now prepare to actually exec the command.
-+      exec_cmd="\$cmd$args"
-+    else
-+      # Display what would be done.
-+      if test -n "$shlibpath_var"; then
-+	eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
-+	$ECHO "export $shlibpath_var"
-+      fi
-+      $ECHO "$cmd$args"
-+      exit $EXIT_SUCCESS
-+    fi
-+}
- 
--	  # Extract subdirectory from the argument.
--	  xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
--	  if test "X$xdir" = "X$arg"; then
--	    xdir=
-- 	  else
--	    xdir="$xdir/"
--	  fi
-+test "$mode" = execute && func_mode_execute ${1+"$@"}
- 
--	  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
-+# func_mode_finish arg...
-+func_mode_finish ()
-+{
-+    $opt_debug
-+    libdirs="$nonopt"
-+    admincmds=
- 
--	    # CHECK ME:  I think I busted this.  -Ossama
--	    if test "$prev" = dlprefiles; then
--	      # Preload the old-style object.
--	      dlprefiles="$dlprefiles $pic_object"
--	      prev=
--	    fi
-+    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
-+      for dir
-+      do
-+	libdirs="$libdirs $dir"
-+      done
- 
--	    # A PIC object.
--	    libobjs="$libobjs $pic_object"
--	    arg="$pic_object"
--	  fi
-+      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
- 
--	  # 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"
-+    # Exit here if they wanted silent mode.
-+    $opt_silent && exit $EXIT_SUCCESS
- 
--	    # A standard non-PIC object
--	    non_pic_objects="$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"
--	    non_pic_objects="$non_pic_objects $non_pic_object"
--	  fi
--	else
--	  # Only an error if not doing a dry-run.
--	  if test -z "$run"; then
--	    $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
--	    exit $EXIT_FAILURE
--	  else
--	    # Dry-run case.
-+    $ECHO "X----------------------------------------------------------------------" | $Xsed
-+    $ECHO "Libraries have been installed in:"
-+    for libdir in $libdirs; do
-+      $ECHO "   $libdir"
-+    done
-+    $ECHO
-+    $ECHO "If you ever happen to want to link against installed libraries"
-+    $ECHO "in a given directory, LIBDIR, you must either use libtool, and"
-+    $ECHO "specify the full pathname of the library, or use the \`-LLIBDIR'"
-+    $ECHO "flag during linking and do at least one of the following:"
-+    if test -n "$shlibpath_var"; then
-+      $ECHO "   - add LIBDIR to the \`$shlibpath_var' environment variable"
-+      $ECHO "     during execution"
-+    fi
-+    if test -n "$runpath_var"; then
-+      $ECHO "   - add LIBDIR to the \`$runpath_var' environment variable"
-+      $ECHO "     during linking"
-+    fi
-+    if test -n "$hardcode_libdir_flag_spec"; then
-+      libdir=LIBDIR
-+      eval flag=\"$hardcode_libdir_flag_spec\"
- 
--	    # Extract subdirectory from the argument.
--	    xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
--	    if test "X$xdir" = "X$arg"; then
--	      xdir=
--	    else
--	      xdir="$xdir/"
--	    fi
-+      $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'"
-+    fi
-+    $ECHO
- 
--	    pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
--	    non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
--	    libobjs="$libobjs $pic_object"
--	    non_pic_objects="$non_pic_objects $non_pic_object"
--	  fi
--	fi
-+    $ECHO "See any operating system documentation about shared libraries for"
-+    case $host in
-+      solaris2.[6789]|solaris2.1[0-9])
-+        $ECHO "more information, such as the ld(1), crle(1) and ld.so(8) manual"
-+	$ECHO "pages."
- 	;;
-+      *)
-+        $ECHO "more information, such as the ld(1) and ld.so(8) manual pages."
-+        ;;
-+    esac
-+    $ECHO "X----------------------------------------------------------------------" | $Xsed
-+    exit $EXIT_SUCCESS
-+}
- 
--      *.$libext)
--	# An archive.
--	deplibs="$deplibs $arg"
--	old_deplibs="$old_deplibs $arg"
--	continue
--	;;
-+test "$mode" = finish && func_mode_finish ${1+"$@"}
- 
--      *.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"
-+# 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.
-+       $ECHO "X$nonopt" | $GREP shtool >/dev/null; then
-+      # 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"
-+
-+    # We need to accept at least all the BSD install flags.
-+    dest=
-+    files=
-+    opts=
-+    prev=
-+    install_type=
-+    isdir=no
-+    stripme=
-+    for arg
-+    do
-+      if test -n "$dest"; then
-+	files="$files $dest"
-+	dest=$arg
-+	continue
-+      fi
-+
-+      case $arg in
-+      -d) isdir=yes ;;
-+      -f)
-+	case " $install_prog " in
-+	*[\\\ /]cp\ *) ;;
-+	*) prev=$arg ;;
-+	esac
-+	;;
-+      -g | -m | -o)
-+	prev=$arg
-+	;;
-+      -s)
-+	stripme=" -s"
-+	continue
-+	;;
-+      -*)
-+	;;
-+      *)
-+	# If the previous option needed an argument, then skip it.
-+	if test -n "$prev"; then
- 	  prev=
- 	else
--	  deplibs="$deplibs $arg"
-+	  dest=$arg
-+	  continue
- 	fi
--	continue
- 	;;
-+      esac
- 
--      # Some other compiler argument.
--      *)
--	# Unknown arguments in both finalize_command and compile_command need
--	# to be aesthetically quoted because they are evaled later.
--	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
--	case $arg in
--	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
--	  arg="\"$arg\""
--	  ;;
--	esac
--	;;
--      esac # arg
-+      # Aesthetically quote the argument.
-+      func_quote_for_eval "$arg"
-+      install_prog="$install_prog $func_quote_for_eval_result"
-+    done
- 
--      # Now actually substitute the argument into the commands.
--      if test -n "$arg"; then
--	compile_command="$compile_command $arg"
--	finalize_command="$finalize_command $arg"
--      fi
--    done # argument parsing loop
-+    test -z "$install_prog" && \
-+      func_fatal_help "you must specify an install program"
- 
--    if test -n "$prev"; then
--      $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
--      $echo "$help" 1>&2
--      exit $EXIT_FAILURE
--    fi
-+    test -n "$prev" && \
-+      func_fatal_help "the \`$prev' option requires an argument"
- 
--    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
--      eval arg=\"$export_dynamic_flag_spec\"
--      compile_command="$compile_command $arg"
--      finalize_command="$finalize_command $arg"
-+    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
- 
--    oldlibs=
--    # calculate the name of the file, without its directory
--    outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'`
--    libobjs_save="$libobjs"
-+    # Strip any trailing slash from the destination.
-+    func_stripname '' '/' "$dest"
-+    dest=$func_stripname_result
- 
--    if test -n "$shlibpath_var"; then
--      # get the directories listed in $shlibpath_var
--      eval shlib_search_path=\`\$echo \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
-+    # Check to see that the destination is a directory.
-+    test -d "$dest" && isdir=yes
-+    if test "$isdir" = yes; then
-+      destdir="$dest"
-+      destname=
-     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_and_basename "$dest" "" "."
-+      destdir="$func_dirname_result"
-+      destname="$func_basename_result"
- 
--    output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'`
--    if test "X$output_objdir" = "X$output"; then
--      output_objdir="$objdir"
--    else
--      output_objdir="$output_objdir/$objdir"
--    fi
--    # Create the object directory.
--    if test ! -d "$output_objdir"; then
--      $show "$mkdir $output_objdir"
--      $run $mkdir $output_objdir
--      exit_status=$?
--      if test "$exit_status" -ne 0 && test ! -d "$output_objdir"; then
--	exit $exit_status
--      fi
-+      # 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
--
--    # Determine the type of output
--    case $output in
--    "")
--      $echo "$modename: you must specify an output file" 1>&2
--      $echo "$help" 1>&2
--      exit $EXIT_FAILURE
--      ;;
--    *.$libext) linkmode=oldlib ;;
--    *.lo | *.$objext) linkmode=obj ;;
--    *.la) linkmode=lib ;;
--    *) linkmode=prog ;; # Anything else should be a program.
--    esac
--
--    case $host in
--    *cygwin* | *mingw* | *pw32*)
--      # don't eliminate duplications in $postdeps and $predeps
--      duplicate_compiler_generated_deps=yes
--      ;;
-+    case $destdir in
-+    [\\/]* | [A-Za-z]:[\\/]*) ;;
-     *)
--      duplicate_compiler_generated_deps=$duplicate_deps
-+      for file in $files; do
-+	case $file in
-+	*.lo) ;;
-+	*)
-+	  func_fatal_help "\`$destdir' must be an absolute directory name"
-+	  ;;
-+	esac
-+      done
-       ;;
-     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 test "X$duplicate_deps" = "Xyes" ; then
--	case "$libs " in
--	*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
--	esac
--      fi
--      libs="$libs $deplib"
--    done
-+    # This variable tells wrapper scripts just to set variables rather
-+    # than running their programs.
-+    libtool_install_magic="$magic"
- 
--    if test "$linkmode" = lib; then
--      libs="$predeps $libs $compiler_lib_search_path $postdeps"
-+    staticlibs=
-+    future_libdirs=
-+    current_libdirs=
-+    for file in $files; do
- 
--      # 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 test "X$duplicate_compiler_generated_deps" = "Xyes" ; then
--	for pre_post_dep in $predeps $postdeps; do
--	  case "$pre_post_deps " in
--	  *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
-+      # 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
--	  pre_post_deps="$pre_post_deps $pre_post_dep"
--	done
--      fi
--      pre_post_deps=
--    fi
-+	else
-+	  # Note the libdir as a future libdir.
-+	  case "$future_libdirs " in
-+	  *" $libdir "*) ;;
-+	  *) future_libdirs="$future_libdirs $libdir" ;;
-+	  esac
-+	fi
- 
--    deplibs=
--    newdependency_libs=
--    newlib_search_path=
--    need_relink=no # whether we're linking any uninstalled libtool libraries
--    notinst_deplibs= # not-installed libtool libraries
--    case $linkmode in
--    lib)
--	passes="conv link"
--	for file in $dlfiles $dlprefiles; do
--	  case $file in
--	  *.la) ;;
--	  *)
--	    $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
--	    exit $EXIT_FAILURE
-+	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 "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
-+	  # 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 "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
-+	  else
-+	    relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%%"`
-+	  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_prog $dir/$srcname $destdir/$realname" \
-+	      'exit $?'
-+	  tstripme="$stripme"
-+	  case $host_os in
-+	  cygwin* | mingw* | pw32* | cegcc*)
-+	    case $realname in
-+	    *.dll.a)
-+	      tstripme=""
-+	      ;;
-+	    esac
- 	    ;;
- 	  esac
--	done
--	;;
--    prog)
--	compile_deplibs=
--	finalize_deplibs=
--	alldeplibs=no
--	newdlfiles=
--	newdlprefiles=
--	passes="conv scan dlopen dlpreopen link"
--	;;
--    *)  passes="conv"
-+	  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"
- 	;;
--    esac
--    for pass in $passes; do
--      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" ;;
--	esac
--      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)
--	  if test "$linkmode,$pass" = "prog,link"; then
--	    compile_deplibs="$deplib $compile_deplibs"
--	    finalize_deplibs="$deplib $finalize_deplibs"
--	  else
--	    compiler_flags="$compiler_flags $deplib"
--	  fi
--	  continue
--	  ;;
--	-l*)
--	  if test "$linkmode" != lib && test "$linkmode" != prog; then
--	    $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2
--	    continue
--	  fi
--	  name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
--	  for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; 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 (${SED} -e '2q' $lib |
--                    grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
--		  library_names=
--		  old_library=
--		  case $lib in
--		  */* | *\\*) . $lib ;;
--		  *) . ./$lib ;;
--		  esac
--		  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
--		    ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
--		    test "X$ladir" = "X$lib" && ladir="."
--		    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
--	-L*)
--	  case $linkmode in
--	  lib)
--	    deplibs="$deplib $deplibs"
--	    test "$pass" = conv && continue
--	    newdependency_libs="$deplib $newdependency_libs"
--	    newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
--	    ;;
--	  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
--	    newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
--	    ;;
--	  *)
--	    $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2
--	    ;;
--	  esac # linkmode
--	  continue
--	  ;; # -L
--	-R*)
--	  if test "$pass" = link; then
--	    dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
--	    # Make sure the xrpath contains only unique directories.
--	    case "$xrpath " in
--	    *" $dir "*) ;;
--	    *) xrpath="$xrpath $dir" ;;
--	    esac
--	  fi
--	  deplibs="$deplib $deplibs"
--	  continue
-+
-+      *.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
- 	  ;;
--	*.la) lib="$deplib" ;;
--	*.$libext)
--	  if test "$pass" = conv; then
--	    deplibs="$deplib $deplibs"
--	    continue
--	  fi
--	  case $linkmode in
--	  lib)
--	    valid_a_lib=no
--	    case $deplibs_check_method in
--	      match_pattern*)
--		set dummy $deplibs_check_method
--	        match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
--		if eval $echo \"$deplib\" 2>/dev/null \
--		    | $SED 10q \
--		    | $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 "*** 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 used here."
--	    else
--	      $echo
--	      $echo "*** Warning: Linking the shared library $output against the"
--	      $echo "*** static library $deplib is not portable!"
--	      deplibs="$deplib $deplibs"
--	    fi
--	    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
-+	*.$objext)
-+	  staticdest="$destfile"
-+	  destfile=
- 	  ;;
--	%DEPLIBS%)
--	  alldeplibs=yes
--	  continue
-+	*)
-+	  func_fatal_help "cannot copy a libtool object to \`$destfile'"
- 	  ;;
--	esac # case $deplib
--	if test "$found" = yes || test -f "$lib"; then :
--	else
--	  $echo "$modename: cannot find the library \`$lib' or unhandled argument \`$deplib'" 1>&2
--	  exit $EXIT_FAILURE
-+	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
-+	;;
- 
--	# Check to see that this really is a libtool archive.
--	if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-+      *)
-+	# Figure out destination file name, if it wasn't already specified.
-+	if test -n "$destname"; then
-+	  destfile="$destdir/$destname"
- 	else
--	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
--	  exit $EXIT_FAILURE
-+	  func_basename "$file"
-+	  destfile="$func_basename_result"
-+	  destfile="$destdir/$destfile"
- 	fi
- 
--	ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
--	test "X$ladir" = "X$lib" && ladir="."
--
--	dlname=
--	dlopen=
--	dlpreopen=
--	libdir=
--	library_names=
--	old_library=
--	# If the library was installed with an old release of libtool,
--	# it will not redefine variables installed, or shouldnotlink
--	installed=yes
--	shouldnotlink=no
--	avoidtemprpath=
--
-+	# 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
- 
--	# Read the .la file
--	case $lib in
--	*/* | *\\*) . $lib ;;
--	*) . ./$lib ;;
-+	# 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=
- 
--	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
-+	  func_source "$wrapper"
- 
--	if test "$pass" = conv; then
--	  # Only check for convenience libraries
--	  deplibs="$lib $deplibs"
--	  if test -z "$libdir"; then
--	    if test -z "$old_library"; then
--	      $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
--	      exit $EXIT_FAILURE
-+	  # 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
--	    # 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 test "X$duplicate_deps" = "Xyes" ; 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
--	    $echo "$modename: \`$lib' is not a convenience library" 1>&2
--	    exit $EXIT_FAILURE
--	  fi
--	  continue
--	fi # $pass = conv
--
-+	    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
-+	    fi
-+	  done
- 
--	# 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
--	  $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
--	  exit $EXIT_FAILURE
--	fi
-+	  relink_command=
-+	  func_source "$wrapper"
- 
--	# This library was specified with -dlopen.
--	if test "$pass" = dlopen; then
--	  if test -z "$libdir"; then
--	    $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
--	    exit $EXIT_FAILURE
--	  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"
-+	  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 "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
-+
-+	        $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
--	    newdlfiles="$newdlfiles $lib"
-+	    # Install the binary that we compiled earlier.
-+	    file=`$ECHO "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
- 	  fi
--	  continue
--	fi # $pass = dlopen
-+	fi
- 
--	# 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
--	    $echo "$modename: warning: cannot determine absolute directory name of \`$ladir'" 1>&2
--	    $echo "$modename: passing it literally to the linker, although it might fail" 1>&2
--	    abs_ladir="$ladir"
--	  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
--	laname=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
-+	func_show_eval "$install_prog\$stripme \$file \$destfile" 'exit $?'
-+	$opt_dry_run || if test -n "$outputname"; then
-+	  ${RM}r "$tmpdir"
-+	fi
-+	;;
-+      esac
-+    done
- 
--	# 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
--	    $echo "$modename: warning: library \`$lib' was moved." 1>&2
--	    dir="$ladir"
--	    absdir="$abs_ladir"
--	    libdir="$abs_ladir"
--	  else
--	    dir="$libdir"
--	    absdir="$libdir"
-+    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
-+
-+/* 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 "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'"
-+	  done
-+
-+	  if test -n "$exclude_expsyms"; then
-+	    $opt_dry_run || {
-+	      eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
-+	      eval '$MV "$nlist"T "$nlist"'
-+	    }
- 	  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"
-+
-+	  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
--	    dir="$ladir/$objdir"
--	    absdir="$abs_ladir/$objdir"
--	    # Remove this search path later
--	    notinst_path="$notinst_path $abs_ladir"
-+	    $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* )
-+	          eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
-+	          eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
-+	          ;;
-+	      esac
-+	    }
- 	  fi
--	fi # $installed = yes
--	name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
-+	fi
- 
--	# This library was specified with -dlpreopen.
--	if test "$pass" = dlpreopen; then
--	  if test -z "$libdir"; then
--	    $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
--	    exit $EXIT_FAILURE
-+	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
--	  # 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"
--	  # Otherwise, use the dlname, so that lt_dlopen finds it.
--	  elif test -n "$dlname"; then
--	    newdlprefiles="$newdlprefiles $dir/$dlname"
-+
-+	  # 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
--	    newdlprefiles="$newdlprefiles $dir/$linklib"
-+	    $GREP -v "^: " < "$nlist" > "$nlist"S
- 	  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"
-+	  if test -f "$nlist"S; then
-+	    eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'
- 	  else
--	    deplibs="$lib $deplibs" # used for prog,scan pass
-+	    $ECHO '/* NONE */' >> "$output_objdir/$my_dlsyms"
- 	  fi
--	  continue
--	fi
- 
-+	  $ECHO >> "$output_objdir/$my_dlsyms" "\
- 
--	if test "$linkmode" = prog && test "$pass" != link; then
--	  newlib_search_path="$newlib_search_path $ladir"
--	  deplibs="$lib $deplibs"
-+/* 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" "\
-+/* 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
- 
--	  linkalldeplibs=no
--	  if test "$link_all_deplibs" != no || test -z "$library_names" ||
--	     test "$build_libtool_libs" = no; then
--	    linkalldeplibs=yes
--	  fi
-+	  $ECHO >> "$output_objdir/$my_dlsyms" "\
-+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 },"
- 
--	  tmp_libs=
--	  for deplib in $dependency_libs; do
--	    case $deplib in
--	    -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test
--	    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 test "X$duplicate_deps" = "Xyes" ; then
--	      case "$tmp_libs " in
--	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
--	      esac
--	    fi
--	    tmp_libs="$tmp_libs $deplib"
--	  done # for deplib
--	  continue
--	fi # $linkmode = prog...
-+	  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" "\
-+  {0, (void *) 0}
-+};
- 
--	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
--	      *" $dir "*) ;;
--	      *" $absdir "*) ;;
--	      *) temp_rpath="$temp_rpath $absdir" ;;
--	      esac
--	    fi
-+/* 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
- 
--	    # 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...
-+#ifdef __cplusplus
-+}
-+#endif\
-+"
-+	} # !$opt_dry_run
- 
--	  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
-+	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
- 
--	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
--	  if test "$installed" = no; then
--	    notinst_deplibs="$notinst_deplibs $lib"
--	    need_relink=yes
--	  fi
--	  # This is a shared library
-+	# 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 $?'
- 
--	  # Warn about portability, can't link against -module's on
--	  # some systems (darwin)
--	  if test "$shouldnotlink" = yes && test "$pass" = link ; then
--	    $echo
--	    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
-+	# 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 "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
-+	    finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
-+	  else
-+	    compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
-+	    finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
- 	  fi
-+	  ;;
-+	*)
-+	  compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
-+	  finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
-+	  ;;
-+	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 "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
-+      finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
-+    fi
-+}
- 
--	  if test -n "$old_archive_from_expsyms_cmds"; then
--	    # figure out the soname
--	    set dummy $library_names
--	    realname="$2"
--	    shift; 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*)
--		major=`expr $current - $age`
--		versuffix="-$major"
--		;;
--	      esac
--	      eval soname=\"$soname_spec\"
--	    else
--	      soname="$realname"
--	    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.
-+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
-+    if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
-+       $EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
-+      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"
-+}
- 
--	    # Make a new name for the extract_expsyms_cmds to use
--	    soroot="$soname"
--	    soname=`$echo $soroot | ${SED} -e 's/^.*\///'`
--	    newlib="libimp-`$echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a"
- 
--	    # If the library has no export list, then create one now
--	    if test -f "$output_objdir/$soname-def"; then :
--	    else
--	      $show "extracting exported symbol list from \`$soname'"
--	      save_ifs="$IFS"; IFS='~'
--	      cmds=$extract_expsyms_cmds
--	      for cmd in $cmds; do
--		IFS="$save_ifs"
--		eval cmd=\"$cmd\"
--		$show "$cmd"
--		$run eval "$cmd" || exit $?
--	      done
--	      IFS="$save_ifs"
--	    fi
- 
--	    # Create $newlib
--	    if test -f "$output_objdir/$newlib"; then :; else
--	      $show "generating import library for \`$soname'"
--	      save_ifs="$IFS"; IFS='~'
--	      cmds=$old_archive_from_expsyms_cmds
--	      for cmd in $cmds; do
--		IFS="$save_ifs"
--		eval cmd=\"$cmd\"
--		$show "$cmd"
--		$run eval "$cmd" || exit $?
--	      done
--	      IFS="$save_ifs"
--	    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"
-+# 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"
-+    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
-+      func_fatal_error "object name conflicts in archive: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib"
-+    fi
-+}
- 
--	  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 module then we can not link against
--		    # it, someone is ignoring the new warnings I added
--		    if /usr/bin/file -L $add 2> /dev/null |
--                      $EGREP ": [^:]* bundle" >/dev/null ; 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"
--		      else
--		        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; 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
--	      $echo "$modename: configuration error: unsupported hardcode properties"
--	      exit $EXIT_FAILURE
--	    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=""
- 
--	    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
-+    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"
- 
--	  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; 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
-+      func_mkdir_p "$my_xdir"
- 
--	    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"
-+      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 | $NL2SP`
-+	      $LIPO -create -output "$darwin_file" $darwin_files
-+	    done # $darwin_filelist
-+	    $RM -rf unfat-$$
-+	    cd "$darwin_orig_dir"
- 	  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.
-+	    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 | $NL2SP`
-+    done
- 
--	    # Just print a warning and add the library to dependency_libs so
--	    # that the program can be linked against the static library.
--	    $echo
--	    $echo "*** Warning: This system can not link to static lib archive $lib."
--	    $echo "*** I have the capability to make that library automatically link in when"
--	    $echo "*** you link to this library.  But I can only do this if you have a"
--	    $echo "*** shared version of the library, which you do not appear to have."
--	    if test "$module" = yes; then
--	      $echo "*** But as you try to build a module library, libtool will still create "
--	      $echo "*** a static module, that should work as long as the dlopening application"
--	      $echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
--	      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."
--	      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?
-+    func_extract_archives_result="$my_oldobjs"
-+}
- 
--	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*) temp_xrpath=`$echo "X$libdir" | $Xsed -e 's/^-R//'`
--		   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 test "X$duplicate_deps" = "Xyes" ; 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
--	      case $deplib in
--	      -L*) path="$deplib" ;;
--	      *.la)
--		dir=`$echo "X$deplib" | $Xsed -e 's%/[^/]*$%%'`
--		test "X$dir" = "X$deplib" && dir="."
--		# We need an absolute path.
--		case $dir in
--		[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
--		*)
--		  absdir=`cd "$dir" && pwd`
--		  if test -z "$absdir"; then
--		    $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2
--		    absdir="$dir"
--		  fi
--		  ;;
--		esac
--		if grep "^installed=no" $deplib > /dev/null; then
--		  path="$absdir/$objdir"
--		else
--		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
--		  if test -z "$libdir"; then
--		    $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
--		    exit $EXIT_FAILURE
--		  fi
--		  if test "$absdir" != "$libdir"; then
--		    $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
--		  fi
--		  path="$absdir"
--		fi
--		depdepl=
--		case $host in
--		*-*-darwin*)
--		  # we do not want to link against static libs,
--		  # but need to link against shared
--		  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 "$path/$depdepl" ; then
--		      depdepl="$path/$depdepl"
--		    fi
--		    # do not add paths which are already there
--		    case " $newlib_search_path " in
--		    *" $path "*) ;;
--		    *) newlib_search_path="$newlib_search_path $path";;
--		    esac
--		  fi
--		  path=""
--		  ;;
--		*)
--		  path="-L$path"
--		  ;;
--		esac
--		;;
--	      -l*)
--		case $host in
--		*-*-darwin*)
--		  # Again, we only want to link against shared libraries
--		  eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
--		  for tmp in $newlib_search_path ; do
--		    if test -f "$tmp/lib$tmp_libs.dylib" ; then
--		      eval depdepl="$tmp/lib$tmp_libs.dylib"
--		      break
--		    fi
--		  done
--		  path=""
--		  ;;
--		*) continue ;;
--		esac
--		;;
--	      *) continue ;;
--	      esac
--	      case " $deplibs " in
--	      *" $path "*) ;;
--	      *) deplibs="$path $deplibs" ;;
--	      esac
--	      case " $deplibs " in
--	      *" $depdepl "*) ;;
--	      *) deplibs="$depdepl $deplibs" ;;
--	      esac
--	    done
--	  fi # link_all_deplibs != no
--	fi # linkmode = lib
--      done # for deplib in $libs
--      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=
-+# func_emit_wrapper_part1 [arg=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
- 
--	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"
--      dlprefiles="$newdlprefiles"
--    fi
-+	$ECHO "\
-+#! $SHELL
- 
--    case $linkmode in
--    oldlib)
--      if test -n "$deplibs"; then
--	$echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
--      fi
-+# $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.
- 
--      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
--	$echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
--      fi
-+# 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'
- 
--      if test -n "$rpath"; then
--	$echo "$modename: warning: \`-rpath' is ignored for archives" 1>&2
--      fi
-+# 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
- 
--      if test -n "$xrpath"; then
--	$echo "$modename: warning: \`-R' is ignored for archives" 1>&2
--      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 -n "$vinfo"; then
--	$echo "$modename: warning: \`-version-info/-version-number' is ignored for archives" 1>&2
--      fi
-+relink_command=\"$relink_command\"
- 
--      if test -n "$release"; then
--	$echo "$modename: warning: \`-release' is ignored for archives" 1>&2
--      fi
-+# 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
-+    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\
-+"
-+	$ECHO "\
- 
--      if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
--	$echo "$modename: warning: \`-export-symbols' is ignored for archives" 1>&2
--      fi
-+  # Find the directory that this script lives in.
-+  thisdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
-+  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
- 
--      # Now set the variables for building old libraries.
--      build_libtool_libs=no
--      oldlibs="$output"
--      objs="$objs$old_deplibs"
--      ;;
-+  # Follow symbolic links until we get to the real thisdir.
-+  file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
-+  while test -n \"\$file\"; do
-+    destdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
- 
--    lib)
--      # Make sure we only generate libraries of the form `libNAME.la'.
--      case $outputname in
--      lib*)
--	name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
--	eval shared_ext=\"$shrext_cmds\"
--	eval libname=\"$libname_spec\"
--	;;
--      *)
--	if test "$module" = no; then
--	  $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2
--	  $echo "$help" 1>&2
--	  exit $EXIT_FAILURE
--	fi
--	if test "$need_lib_prefix" != no; then
--	  # Add the "lib" prefix for modules if required
--	  name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
--	  eval shared_ext=\"$shrext_cmds\"
--	  eval libname=\"$libname_spec\"
--	else
--	  libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
--	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
- 
--      if test -n "$objs"; then
--	if test "$deplibs_check_method" != pass_all; then
--	  $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1
--	  exit $EXIT_FAILURE
--	else
--	  $echo
--	  $echo "*** Warning: Linking the shared library $output against the non-libtool"
--	  $echo "*** objects $objs is not portable!"
--	  libobjs="$libobjs $objs"
--	fi
--      fi
-+    file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
-+    file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
-+  done
-+"
-+}
-+# end: func_emit_wrapper_part1
- 
--      if test "$dlself" != no; then
--	$echo "$modename: warning: \`-dlopen self' is ignored for libtool libraries" 1>&2
--      fi
-+# func_emit_wrapper_part2 [arg=no]
-+#
-+# Emit the second part of a libtool wrapper script on stdout.
-+# For more information, see the description associated with
-+# func_emit_wrapper(), below.
-+func_emit_wrapper_part2 ()
-+{
-+	func_emit_wrapper_part2_arg1=no
-+	if test -n "$1" ; then
-+	  func_emit_wrapper_part2_arg1=$1
-+	fi
-+
-+	$ECHO "\
-+
-+  # Usually 'no', except on cygwin/mingw when embedded into
-+  # the cwrapper.
-+  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_part2_arg1
-+  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 \"X\$thisdir\" | \$Xsed -e 's%[\\\\/][^\\\\/]*$%%'\` ;;
-+    $objdir )   thisdir=. ;;
-+    esac
-+  fi
- 
--      set dummy $rpath
--      if test "$#" -gt 2; then
--	$echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2
-+  # 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
--      install_libdir="$2"
-+    fi
- 
--      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
-+    $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
- 
--	if test -n "$vinfo"; then
--	  $echo "$modename: warning: \`-version-info/-version-number' is ignored for convenience libraries" 1>&2
--	fi
-+	$ECHO "\
- 
--	if test -n "$release"; then
--	  $echo "$modename: warning: \`-release' is ignored for convenience libraries" 1>&2
--	fi
--      else
-+  if test -f \"\$progdir/\$program\"; then"
- 
--	# Parse the version information argument.
--	save_ifs="$IFS"; IFS=':'
--	set dummy $vinfo 0 0 0
--	IFS="$save_ifs"
-+	# 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\"
- 
--	if test -n "$8"; then
--	  $echo "$modename: too many parameters to \`-version-info'" 1>&2
--	  $echo "$help" 1>&2
--	  exit $EXIT_FAILURE
--	fi
-+    # 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 \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
- 
--	# convert absolute version numbers to libtool ages
--	# this retains compatibility with .la files and attempts
--	# to make the code below a bit more comprehensible
-+    export $shlibpath_var
-+"
-+	fi
- 
--	case $vinfo_number in
--	yes)
--	  number_major="$2"
--	  number_minor="$3"
--	  number_revision="$4"
--	  #
--	  # 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)
--	    current=`expr $number_major + $number_minor`
--	    age="$number_minor"
--	    revision="$number_revision"
--	    ;;
--	  freebsd-aout|freebsd-elf|sunos)
--	    current="$number_major"
--	    revision="$number_minor"
--	    age="0"
--	    ;;
--	  irix|nonstopux)
--	    current=`expr $number_major + $number_minor - 1`
--	    age="$number_minor"
--	    revision="$number_minor"
--	    ;;
--	  esac
--	  ;;
--	no)
--	  current="$2"
--	  revision="$3"
--	  age="$4"
--	  ;;
--	esac
-+	# 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
- 
--	# 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]) ;;
--	*)
--	  $echo "$modename: CURRENT \`$current' must be a nonnegative integer" 1>&2
--	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
--	  exit $EXIT_FAILURE
-+	$ECHO "\
-+    if test \"\$libtool_execute_magic\" != \"$magic\"; then
-+      # Run the actual program with our arguments.
-+"
-+	case $host in
-+	# Backslashes separate directories on plain windows
-+	*-*-mingw | *-*-os2* | *-cegcc*)
-+	  $ECHO "\
-+      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
-+"
- 	  ;;
--	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]) ;;
- 	*)
--	  $echo "$modename: REVISION \`$revision' must be a nonnegative integer" 1>&2
--	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
--	  exit $EXIT_FAILURE
-+	  $ECHO "\
-+      exec \"\$progdir/\$program\" \${1+\"\$@\"}
-+"
- 	  ;;
- 	esac
-+	$ECHO "\
-+      \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
-+      exit 1
-+    fi
-+  else
-+    # The program doesn't exist.
-+    \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
-+    \$ECHO \"This script is just a wrapper for \$program.\" 1>&2
-+    $ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
-+    exit 1
-+  fi
-+fi\
-+"
-+}
-+# end: func_emit_wrapper_part2
- 
--	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]) ;;
--	*)
--	  $echo "$modename: AGE \`$age' must be a nonnegative integer" 1>&2
--	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
--	  exit $EXIT_FAILURE
--	  ;;
--	esac
- 
--	if test "$age" -gt "$current"; then
--	  $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
--	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
--	  exit $EXIT_FAILURE
-+# 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
- 
--	# 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
--	  major=.`expr $current - $age`
--	  versuffix="$major.$age.$revision"
--	  # Darwin ld doesn't like 0 for these options...
--	  minor_current=`expr $current + 1`
--	  verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
--	  ;;
-+	# 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}"
-+}
- 
--	freebsd-aout)
--	  major=".$current"
--	  versuffix=".$current.$revision";
--	  ;;
- 
--	freebsd-elf)
--	  major=".$current"
--	  versuffix=".$current";
--	  ;;
-+# 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
-+    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
-+            lt_sed_strip_trailing_spaces="s/[ ]*\$//"
-+            func_to_host_path_tmp1=`( cmd //c echo "$1" |\
-+              $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
-+            func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
-+              $SED -e "$lt_sed_naive_backslashify"`
-+            ;;
-+          *cygwin* )
-+            func_to_host_path_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
-+            # 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" |\
-+                $SED -e "$lt_sed_naive_backslashify"`
-+            else
-+              # Allow warning below.
-+              func_to_host_path_result=""
-+            fi
-+            ;;
-+        esac
-+        if test -z "$func_to_host_path_result" ; then
-+          func_error "Could not determine host path corresponding to"
-+          func_error "  '$1'"
-+          func_error "Continuing, but uninstalled executables may not work."
-+          # Fallback:
-+          func_to_host_path_result="$1"
-+        fi
-+        ;;
-+    esac
-+  fi
-+}
-+# end: func_to_host_path
- 
--	irix | nonstopux)
--	  major=`expr $current - $age + 1`
-+# 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
-+    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_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.
-+            lt_sed_strip_trailing_spaces="s/[ ]*\$//"
-+            func_to_host_pathlist_tmp2=`( cmd //c echo "$func_to_host_pathlist_tmp1" |\
-+              $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
-+            func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
-+              $SED -e "$lt_sed_naive_backslashify"`
-+            ;;
-+          *cygwin* )
-+            func_to_host_pathlist_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"`
-+            ;;
-+          * )
-+            # 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_to_host_pathlist_result="$func_to_host_pathlist_result;$func_to_host_path_result"
-+                  fi
-+                fi
-+              fi
-+              IFS=:
-+            done
-+            IFS=$func_to_host_pathlist_oldIFS
-+            ;;
-+        esac
-+        if test -z "$func_to_host_pathlist_result" ; then
-+          func_error "Could not determine the host path(s) corresponding to"
-+          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
-+          # 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_to_host_pathlist_result="$func_to_host_pathlist_result;"
-+            ;;
-+        esac
-+        ;;
-+    esac
-+  fi
-+}
-+# end: func_to_host_pathlist
- 
--	  case $version_type in
--	    nonstopux) verstring_prefix=nonstopux ;;
--	    *)         verstring_prefix=sgi ;;
--	  esac
--	  verstring="$verstring_prefix$major.$revision"
-+# 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
- 
--	  # Add in all the interfaces that we are compatible with.
--	  loop=$revision
--	  while test "$loop" -ne 0; do
--	    iface=`expr $revision - $loop`
--	    loop=`expr $loop - 1`
--	    verstring="$verstring_prefix$major.$iface:$verstring"
--	  done
-+/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
-+   Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
- 
--	  # Before this point, $major must not contain `.'.
--	  major=.$major
--	  versuffix="$major.$revision"
--	  ;;
-+   The $output program cannot be directly executed until all the libtool
-+   libraries that it depends on are installed.
- 
--	linux)
--	  major=.`expr $current - $age`
--	  versuffix="$major.$age.$revision"
--	  ;;
-+   This wrapper executable should never be moved out of the build directory.
-+   If it is, it will not operate correctly.
- 
--	osf)
--	  major=.`expr $current - $age`
--	  versuffix=".$current.$age.$revision"
--	  verstring="$current.$age.$revision"
-+   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"
-+#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>
-+#include <stdarg.h>
-+#include <assert.h>
-+#include <string.h>
-+#include <ctype.h>
-+#include <errno.h>
-+#include <fcntl.h>
-+#include <sys/stat.h>
- 
--	  # Add in all the interfaces that we are compatible with.
--	  loop=$age
--	  while test "$loop" -ne 0; do
--	    iface=`expr $current - $loop`
--	    loop=`expr $loop - 1`
--	    verstring="$verstring:${iface}.0"
--	  done
-+#if defined(PATH_MAX)
-+# define LT_PATHMAX PATH_MAX
-+#elif defined(MAXPATHLEN)
-+# define LT_PATHMAX MAXPATHLEN
-+#else
-+# define LT_PATHMAX 1024
-+#endif
- 
--	  # Make executables depend on our current version.
--	  verstring="$verstring:${current}.0"
--	  ;;
-+#ifndef S_IXOTH
-+# define S_IXOTH 0
-+#endif
-+#ifndef S_IXGRP
-+# define S_IXGRP 0
-+#endif
- 
--	sunos)
--	  major=".$current"
--	  versuffix=".$current.$revision"
--	  ;;
-+#ifdef _MSC_VER
-+# define S_IXUSR _S_IEXEC
-+# define stat _stat
-+# ifndef _INTPTR_T_DEFINED
-+#  define intptr_t int
-+# endif
-+#endif
- 
--	windows)
--	  # Use '-' rather than '.', since we only want one
--	  # extension on DOS 8.3 filesystems.
--	  major=`expr $current - $age`
--	  versuffix="-$major"
--	  ;;
-+#ifndef DIR_SEPARATOR
-+# define DIR_SEPARATOR '/'
-+# define PATH_SEPARATOR ':'
-+#endif
- 
--	*)
--	  $echo "$modename: unknown library version type \`$version_type'" 1>&2
--	  $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
--	  exit $EXIT_FAILURE
--	  ;;
--	esac
-+#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
- 
--	# 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
-+#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 */
- 
--	# Remove version info from name if versioning should be avoided
--	if test "$avoid_version" = yes && test "$need_version" = no; then
--	  major=
--	  versuffix=
--	  verstring=""
--	fi
-+#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 */
- 
--	# Check to see if the archive will have undefined symbols.
--	if test "$allow_undefined" = yes; then
--	  if test "$allow_undefined_flag" = unsupported; then
--	    $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2
--	    build_libtool_libs=no
--	    build_old_libs=yes
--	  fi
--	else
--	  # Don't allow undefined symbols.
--	  allow_undefined_flag="$no_undefined_flag"
--	fi
--      fi
-+#ifdef __CYGWIN__
-+# define FOPEN_WB "wb"
-+#endif
- 
--      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)
--	       ;;
--	    $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
--	if test -n "$removelist"; then
--	  $show "${rm}r $removelist"
--	  $run ${rm}r $removelist
--	fi
--      fi
-+#ifndef FOPEN_WB
-+# define FOPEN_WB "w"
-+#endif
-+#ifndef _O_BINARY
-+# define _O_BINARY 0
-+#endif
- 
--      # 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"
-+#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
-+#define XFREE(stale) do { \
-+  if (stale) { free ((void *) stale); stale = 0; } \
-+} while (0)
- 
--	# Transform .lo files to .o files.
--	oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
--      fi
-+#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
-+# define LTWRAPPER_DEBUGPRINTF(args)
-+#endif
- 
--      # Eliminate all temporary directories.
--#      for path in $notinst_path; do
--#	lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
--#	deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
--#	dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
--#      done
-+const char *program_name = NULL;
- 
--      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
-+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_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);
- 
--      # 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
-+static const char *script_text_part1 =
-+EOF
- 
--      # 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
-+	    func_emit_wrapper_part1 yes |
-+	        $SED -e 's/\([\\"]\)/\\\1/g' \
-+	             -e 's/^/  "/' -e 's/$/\\n"/'
-+	    echo ";"
-+	    cat <<EOF
- 
--      if test "$build_libtool_libs" = yes; then
--	if test -n "$rpath"; then
--	  case $host in
--	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
--	    # these systems don't actually have a c library (as such)!
--	    ;;
--	  *-*-rhapsody* | *-*-darwin1.[012])
--	    # Rhapsody C library is in the System framework
--	    deplibs="$deplibs -framework System"
--	    ;;
--	  *-*-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
-+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";
-+const char * LIB_PATH_VARNAME = "$shlibpath_var";
-+EOF
- 
--	# 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.
--	  $rm conftest.c
--	  cat > conftest.c <<EOF
--	  int main() { return 0; }
-+	    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
--	  $rm conftest
--      if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
--	    ldd_output=`ldd conftest`
--	    for i in $deplibs; do
--	      name=`expr $i : '-l\(.*\)'`
--	      # If $name is empty we are operating on a -L argument.
--              if test "$name" != "" && test "$name" != "0"; then
--		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
--		  deplib_match=$2
--		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
--		    newdeplibs="$newdeplibs $i"
--		  else
--		    droppeddeps=yes
--		    $echo
--		    $echo "*** Warning: dynamic linker does not accept needed library $i."
--		    $echo "*** I have the capability to make that library automatically link in when"
--		    $echo "*** you link to this library.  But I can only do this if you have a"
--		    $echo "*** shared version of the library, which I believe you do not have"
--		    $echo "*** because a test_compile did reveal that the linker did not use it for"
--		    $echo "*** its dynamic dependency list that programs get resolved with at runtime."
--		  fi
--		fi
--	      else
--		newdeplibs="$newdeplibs $i"
--	      fi
--	    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
--	      name=`expr $i : '-l\(.*\)'`
--	      # If $name is empty we are operating on a -L argument.
--              if test "$name" != "" && test "$name" != "0"; then
--		$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
--		    deplib_match=$2
--		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
--		      newdeplibs="$newdeplibs $i"
--		    else
--		      droppeddeps=yes
--		      $echo
--		      $echo "*** Warning: dynamic linker does not accept needed library $i."
--		      $echo "*** I have the capability to make that library automatically link in when"
--		      $echo "*** you link to this library.  But I can only do this if you have a"
--		      $echo "*** shared version of the library, which you do not appear to have"
--		      $echo "*** because a test_compile did reveal that the linker did not use this one"
--		      $echo "*** as a dynamic dependency that programs can get resolved with at runtime."
--		    fi
--		  fi
--		else
--		  droppeddeps=yes
--		  $echo
--		  $echo "*** Warning!  Library $i is needed by this library but I was not able to"
--		  $echo "*** make it link in!  You will probably need to install it or some"
--		  $echo "*** library that it depends on before this library will be fully"
--		  $echo "*** functional.  Installing it before continuing would be even better."
--		fi
--	      else
--		newdeplibs="$newdeplibs $i"
--	      fi
--	    done
--	  fi
--	  ;;
--	file_magic*)
--	  set dummy $deplibs_check_method
--	  file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
--	  for a_deplib in $deplibs; do
--	    name=`expr $a_deplib : '-l\(.*\)'`
--	    # If $name is empty we are operating on a -L argument.
--            if test "$name" != "" && test  "$name" != "0"; then
--	      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 "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
--			esac
--		      done
--		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \
--			 | ${SED} 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 "*** 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"
--		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
- 	    else
--	      # Add a -L argument.
--	      newdeplibs="$newdeplibs $a_deplib"
-+	      cat <<"EOF"
-+const char * LIB_PATH_VALUE   = "";
-+EOF
- 	    fi
--	  done # Gone through all deplibs.
--	  ;;
--	match_pattern*)
--	  set dummy $deplibs_check_method
--	  match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
--	  for a_deplib in $deplibs; do
--	    name=`expr $a_deplib : '-l\(.*\)'`
--	    # If $name is empty we are operating on a -L argument.
--	    if test -n "$name" && test "$name" != "0"; then
--	      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 \
--		        | $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 "*** 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"
--		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
-+
-+	    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
--	      # Add a -L argument.
--	      newdeplibs="$newdeplibs $a_deplib"
-+	      cat <<"EOF"
-+const char * EXE_PATH_VARNAME = "";
-+const char * EXE_PATH_VALUE   = "";
-+EOF
- 	    fi
--	  done # Gone through all deplibs.
--	  ;;
--	none | unknown | *)
--	  newdeplibs=""
--	  tmp_deplibs=`$echo "X $deplibs" | $Xsed -e 's/ -lc$//' \
--	    -e 's/ -[LR][^ ]*//g'`
--	  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
--	    for i in $predeps $postdeps ; do
--	      # can't use Xsed below, because $i might contain '/'
--	      tmp_deplibs=`$echo "X $tmp_deplibs" | ${SED} -e "1s,^X,," -e "s,$i,,"`
--	    done
--	  fi
--	  if $echo "X $tmp_deplibs" | $Xsed -e 's/[ 	]//g' \
--	    | grep . >/dev/null; then
--	    $echo
--	    if test "X$deplibs_check_method" = "Xnone"; then
--	      $echo "*** Warning: inter-library dependencies are not supported in this platform."
-+
-+	    if test "$fast_install" = yes; then
-+	      cat <<EOF
-+const char * TARGET_PROGRAM_NAME = "lt-$outputname"; /* hopefully, no .exe */
-+EOF
- 	    else
--	      $echo "*** Warning: inter-library dependencies are not known to be supported."
-+	      cat <<EOF
-+const char * TARGET_PROGRAM_NAME = "$outputname"; /* hopefully, no .exe */
-+EOF
- 	    fi
--	    $echo "*** All declared inter-library dependencies are being dropped."
--	    droppeddeps=yes
--	  fi
--	  ;;
--	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 is the System framework
--	  newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'`
--	  ;;
--	esac
- 
--	if test "$droppeddeps" = yes; then
--	  if test "$module" = yes; then
--	    $echo
--	    $echo "*** Warning: libtool could not satisfy all declared inter-library"
--	    $echo "*** dependencies of module $libname.  Therefore, libtool will create"
--	    $echo "*** a static module, that should work as long as the dlopening"
--	    $echo "*** application is linked with the -dlopen flag."
--	    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."
--	    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."
-+	    cat <<"EOF"
- 
--	    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."
--	      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
-+#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;
- 
--      # 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"
-+static const char *dumpscript_opt       = LTWRAPPER_OPTION_PREFIX "dump-script";
- 
-+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 */
- 
--      # 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
-+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} */
- 
--	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
-+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 */
- 
--	# Get the real and link names of the library.
--	eval shared_ext=\"$shrext_cmds\"
--	eval library_names=\"$library_names_spec\"
--	set dummy $library_names
--	realname="$2"
--	shift; shift
-+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;
- 
--	if test -n "$soname_spec"; then
--	  eval soname=\"$soname_spec\"
--	else
--	  soname="$realname"
--	fi
--	if test -z "$dlname"; then
--	  dlname=$soname
--	fi
-+  int i;
- 
--	lib="$output_objdir/$realname"
--	linknames=
--	for link
--	do
--	  linknames="$linknames $link"
--	done
-+  program_name = (char *) xstrdup (base_name (argv[0]));
-+  LTWRAPPER_DEBUGPRINTF (("(main) argv[0]      : %s\n", argv[0]));
-+  LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name));
- 
--	# Use standard objects if they are pic
--	test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-+  /* very simple arg parsing; don't want to rely on getopt */
-+  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
- 
--	# Prepare the list of exported symbols
--	if test -z "$export_symbols"; then
--	  if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
--	    $show "generating symbol list for \`$libname.la'"
--	    export_symbols="$output_objdir/$libname.exp"
--	    $run $rm $export_symbols
--	    cmds=$export_symbols_cmds
--	    save_ifs="$IFS"; IFS='~'
--	    for cmd in $cmds; do
--	      IFS="$save_ifs"
--	      eval cmd=\"$cmd\"
--	      if len=`expr "X$cmd" : ".*"` &&
--	       test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
--	        $show "$cmd"
--	        $run eval "$cmd" || exit $?
--	        skipped_export=false
--	      else
--	        # The command line is too long to execute in one step.
--	        $show "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"; then
--	      $show "$EGREP -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\""
--	      $run eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
--	      $show "$mv \"${export_symbols}T\" \"$export_symbols\""
--	      $run eval '$mv "${export_symbols}T" "$export_symbols"'
--	    fi
--	  fi
--	fi
-+	    cat <<"EOF"
-+	  printf ("%s", script_text_part1);
-+	  printf ("%s", script_text_part2);
-+	  return 0;
-+	}
-+    }
- 
--	if test -n "$export_symbols" && test -n "$include_expsyms"; then
--	  $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"'
--	fi
-+  newargz = XMALLOC (char *, argc + 1);
-+  tmp_pathspec = find_executable (argv[0]);
-+  if (tmp_pathspec == NULL)
-+    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);
-+  LTWRAPPER_DEBUGPRINTF (("(main) found exe (after symlink chase) at : %s\n",
-+			  actual_cwrapper_path));
-+  XFREE (tmp_pathspec);
-+
-+  actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path));
-+  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;
- 
--	tmp_deplibs=
--	for test_deplib in $deplibs; do
--		case " $convenience " in
--		*" $test_deplib "*) ;;
--		*)
--			tmp_deplibs="$tmp_deplibs $test_deplib"
--			;;
--		esac
--	done
--	deplibs="$tmp_deplibs"
-+  LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n",
-+			  target_name));
-+EOF
- 
--	if test -n "$convenience"; then
--	  if test -n "$whole_archive_flag_spec"; then
--	    save_libobjs=$libobjs
--	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
--	  else
--	    gentop="$output_objdir/${outputname}x"
--	    generated="$generated $gentop"
-+	    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
- 
--	    func_extract_archives $gentop $convenience
--	    libobjs="$libobjs $func_extract_archives_result"
--	  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
-+	    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
- 
--	# Make a backup of the uninstalled library when relinking
--	if test "$mode" = relink; then
--	  $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $?
--	fi
-+	    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
- 
--	# 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
-+	    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);
- 
--	if test "X$skipped_export" != "X:" &&
--	   len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
--	   test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
--	  :
--	else
--	  # The command line is too long to link in one step, link piecewise.
--	  $echo "creating reloadable object files..."
-+  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;
- 
--	  # 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
--	  output_la=`$echo "X$output" | $Xsed -e "$basename"`
-+  LTWRAPPER_DEBUGPRINTF     (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>")));
-+  for (i = 0; i < newargc; i++)
-+    {
-+      LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d]   : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>")));
-+    }
- 
--	  # Clear the reloadable object creation command queue and
--	  # initialize k to one.
--	  test_cmds=
--	  concat_cmds=
--	  objlist=
--	  delfiles=
--	  last_robj=
--	  k=1
--	  output=$output_objdir/$output_la-${k}.$objext
--	  # Loop over the list of objects to be linked.
--	  for obj in $save_libobjs
--	  do
--	    eval test_cmds=\"$reload_cmds $objlist $last_robj\"
--	    if test "X$objlist" = X ||
--	       { len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
--		 test "$len" -le "$max_cmd_len"; }; then
--	      objlist="$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.
--		eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
--	      else
--		# All subsequent reloadable object files will link in
--		# the last one created.
--		eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
--	      fi
--	      last_robj=$output_objdir/$output_la-${k}.$objext
--	      k=`expr $k + 1`
--	      output=$output_objdir/$output_la-${k}.$objext
--	      objlist=$obj
--	      len=1
--	    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~
--	  eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
-+EOF
- 
--	  if ${skipped_export-false}; then
--	    $show "generating symbol list for \`$libname.la'"
--	    export_symbols="$output_objdir/$libname.exp"
--	    $run $rm $export_symbols
--	    libobjs=$output
--	    # Append the command to create the export file.
--	    eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
--          fi
--
--	  # Set up a command to remove the reloadable object files
--	  # after they are used.
--	  i=0
--	  while test "$i" -lt "$k"
--	  do
--	    i=`expr $i + 1`
--	    delfiles="$delfiles $output_objdir/$output_la-${i}.$objext"
--	  done
-+	    case $host_os in
-+	      mingw*)
-+		cat <<"EOF"
-+  /* execv doesn't actually work on mingw as expected on unix */
-+  rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
-+  if (rval == -1)
-+    {
-+      /* failed to start process */
-+      LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno));
-+      return 127;
-+    }
-+  return rval;
-+EOF
-+		;;
-+	      *)
-+		cat <<"EOF"
-+  execv (lt_argv_zero, newargz);
-+  return rval; /* =127, but avoids unused variable warning */
-+EOF
-+		;;
-+	    esac
- 
--	  $echo "creating a temporary reloadable object file: $output"
-+	    cat <<"EOF"
-+}
- 
--	  # Loop through the commands generated above and execute them.
--	  save_ifs="$IFS"; IFS='~'
--	  for cmd in $concat_cmds; do
--	    IFS="$save_ifs"
--	    $show "$cmd"
--	    $run eval "$cmd" || exit $?
--	  done
--	  IFS="$save_ifs"
-+void *
-+xmalloc (size_t num)
-+{
-+  void *p = (void *) malloc (num);
-+  if (!p)
-+    lt_fatal ("Memory exhausted");
- 
--	  libobjs=$output
--	  # Restore the value of output.
--	  output=$save_output
-+  return p;
-+}
- 
--	  if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
--	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
--	  fi
--	  # Expand the library linking commands again to reset the
--	  # value of $libobjs for piecewise linking.
-+char *
-+xstrdup (const char *string)
-+{
-+  return string ? strcpy ((char *) xmalloc (strlen (string) + 1),
-+			  string) : NULL;
-+}
- 
--	  # 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
--
--	  # Append the command to remove the reloadable object files
--	  # to the just-reset $cmds.
--	  eval cmds=\"\$cmds~\$rm $delfiles\"
--	fi
--	save_ifs="$IFS"; IFS='~'
--	for cmd in $cmds; do
--	  IFS="$save_ifs"
--	  eval cmd=\"$cmd\"
--	  $show "$cmd"
--	  $run eval "$cmd" || {
--	    lt_exit=$?
-+const char *
-+base_name (const char *name)
-+{
-+  const char *base;
- 
--	    # Restore the uninstalled library and exit
--	    if test "$mode" = relink; then
--	      $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
--	    fi
-+#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
- 
--	    exit $lt_exit
--	  }
--	done
--	IFS="$save_ifs"
-+  for (base = name; *name; name++)
-+    if (IS_DIR_SEPARATOR (*name))
-+      base = name + 1;
-+  return base;
-+}
- 
--	# Restore the uninstalled library and exit
--	if test "$mode" = relink; then
--	  $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?
-+int
-+check_executable (const char *path)
-+{
-+  struct stat st;
- 
--	  if test -n "$convenience"; then
--	    if test -z "$whole_archive_flag_spec"; then
--	      $show "${rm}r $gentop"
--	      $run ${rm}r "$gentop"
--	    fi
--	  fi
-+  LTWRAPPER_DEBUGPRINTF (("(check_executable)  : %s\n",
-+			  path ? (*path ? path : "EMPTY!") : "NULL!"));
-+  if ((!path) || (!*path))
-+    return 0;
- 
--	  exit $EXIT_SUCCESS
--	fi
-+  if ((stat (path, &st) >= 0)
-+      && (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)))
-+    return 1;
-+  else
-+    return 0;
-+}
- 
--	# Create links to the real library.
--	for linkname in $linknames; do
--	  if test "$realname" != "$linkname"; then
--	    $show "(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)"
--	    $run eval '(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)' || exit $?
--	  fi
--	done
-+int
-+make_executable (const char *path)
-+{
-+  int rval = 0;
-+  struct stat st;
- 
--	# 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
--      ;;
-+  LTWRAPPER_DEBUGPRINTF (("(make_executable)   : %s\n",
-+			  path ? (*path ? path : "EMPTY!") : "NULL!"));
-+  if ((!path) || (!*path))
-+    return 0;
- 
--    obj)
--      if test -n "$deplibs"; then
--	$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
--      fi
-+  if (stat (path, &st) >= 0)
-+    {
-+      rval = chmod (path, st.st_mode | S_IXOTH | S_IXGRP | S_IXUSR);
-+    }
-+  return rval;
-+}
- 
--      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
--	$echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
--      fi
-+/* 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;
- 
--      if test -n "$rpath"; then
--	$echo "$modename: warning: \`-rpath' is ignored for objects" 1>&2
--      fi
-+  LTWRAPPER_DEBUGPRINTF (("(find_executable)   : %s\n",
-+			  wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"));
- 
--      if test -n "$xrpath"; then
--	$echo "$modename: warning: \`-R' is ignored for objects" 1>&2
--      fi
-+  if ((wrapper == NULL) || (*wrapper == '\0'))
-+    return NULL;
- 
--      if test -n "$vinfo"; then
--	$echo "$modename: warning: \`-version-info' is ignored for objects" 1>&2
--      fi
-+  /* 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
- 
--      if test -n "$release"; then
--	$echo "$modename: warning: \`-release' is ignored for objects" 1>&2
--      fi
-+  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 ("getcwd failed");
-+		  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 ("getcwd failed");
-+  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);
- 
--      case $output in
--      *.lo)
--	if test -n "$objs$old_deplibs"; then
--	  $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
--	  exit $EXIT_FAILURE
--	fi
--	libobj="$output"
--	obj=`$echo "X$output" | $Xsed -e "$lo2o"`
--	;;
--      *)
--	libobj=
--	obj="$output"
--	;;
--      esac
-+  if (check_executable (concat_name))
-+    return concat_name;
-+  XFREE (concat_name);
-+  return NULL;
-+}
- 
--      # Delete the old objects.
--      $run $rm $obj $libobj
-+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)
-+    {
-+      LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n",
-+			      tmp_pathspec));
-+      if (lstat (tmp_pathspec, &s) == 0)
-+	{
-+	  if (S_ISLNK (s.st_mode) != 0)
-+	    {
-+	      has_symlinks = 1;
-+	      break;
-+	    }
- 
--      # 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=
-+	  /* 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
-+	{
-+	  char *errstr = strerror (errno);
-+	  lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr);
-+	}
-+    }
-+  XFREE (tmp_pathspec);
- 
--      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 "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
--	else
--	  gentop="$output_objdir/${obj}x"
--	  generated="$generated $gentop"
-+  if (!has_symlinks)
-+    {
-+      return xstrdup (pathspec);
-+    }
- 
--	  func_extract_archives $gentop $convenience
--	  reload_conv_objs="$reload_objs $func_extract_archives_result"
--	fi
--      fi
-+  tmp_pathspec = realpath (pathspec, buf);
-+  if (tmp_pathspec == 0)
-+    {
-+      lt_fatal ("Could not follow symlinks for %s", pathspec);
-+    }
-+  return xstrdup (tmp_pathspec);
-+#endif
-+}
- 
--      # Create the old-style object.
--      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
-+char *
-+strendzap (char *str, const char *pat)
-+{
-+  size_t len, patlen;
- 
--      output="$obj"
--      cmds=$reload_cmds
--      save_ifs="$IFS"; IFS='~'
--      for cmd in $cmds; do
--	IFS="$save_ifs"
--	eval cmd=\"$cmd\"
--	$show "$cmd"
--	$run eval "$cmd" || exit $?
--      done
--      IFS="$save_ifs"
-+  assert (str != NULL);
-+  assert (pat != NULL);
- 
--      # Exit if we aren't doing a library object file.
--      if test -z "$libobj"; then
--	if test -n "$gentop"; then
--	  $show "${rm}r $gentop"
--	  $run ${rm}r $gentop
--	fi
-+  len = strlen (str);
-+  patlen = strlen (pat);
- 
--	exit $EXIT_SUCCESS
--      fi
-+  if (patlen <= len)
-+    {
-+      str += len - patlen;
-+      if (strcmp (str, pat) == 0)
-+	*str = '\0';
-+    }
-+  return str;
-+}
- 
--      if test "$build_libtool_libs" != yes; then
--	if test -n "$gentop"; then
--	  $show "${rm}r $gentop"
--	  $run ${rm}r $gentop
--	fi
-+static void
-+lt_error_core (int exit_status, const char *mode,
-+	       const char *message, va_list ap)
-+{
-+  fprintf (stderr, "%s: %s: ", program_name, mode);
-+  vfprintf (stderr, message, ap);
-+  fprintf (stderr, ".\n");
- 
--	# Create an invalid libtool object if no PIC, so that we don't
--	# accidentally link it into a program.
--	# $show "echo timestamp > $libobj"
--	# $run eval "echo timestamp > $libobj" || exit $?
--	exit $EXIT_SUCCESS
--      fi
-+  if (exit_status >= 0)
-+    exit (exit_status);
-+}
- 
--      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"
--	cmds=$reload_cmds
--	save_ifs="$IFS"; IFS='~'
--	for cmd in $cmds; do
--	  IFS="$save_ifs"
--	  eval cmd=\"$cmd\"
--	  $show "$cmd"
--	  $run eval "$cmd" || exit $?
--	done
--	IFS="$save_ifs"
--      fi
-+void
-+lt_fatal (const char *message, ...)
-+{
-+  va_list ap;
-+  va_start (ap, message);
-+  lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
-+  va_end (ap);
-+}
- 
--      if test -n "$gentop"; then
--	$show "${rm}r $gentop"
--	$run ${rm}r $gentop
--      fi
-+void
-+lt_setenv (const char *name, const char *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 */
-+    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
-+  }
-+}
- 
--      exit $EXIT_SUCCESS
--      ;;
-+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;
-+}
- 
--    prog)
--      case $host in
--	*cygwin*) output=`$echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;;
--      esac
--      if test -n "$vinfo"; then
--	$echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2
--      fi
-+int
-+lt_split_name_value (const char *arg, char** name, char** value)
-+{
-+  const char *p;
-+  int len;
-+  if (!arg || !*arg)
-+    return 1;
- 
--      if test -n "$release"; then
--	$echo "$modename: warning: \`-release' is ignored for programs" 1>&2
--      fi
-+  p = strchr (arg, (int)'=');
- 
--      if test "$preload" = yes; then
--	if test "$dlopen_support" = unknown && test "$dlopen_self" = unknown &&
--	   test "$dlopen_self_static" = unknown; then
--	  $echo "$modename: warning: \`AC_LIBTOOL_DLOPEN' not used. Assuming no dlopen support."
--	fi
--      fi
--
--      case $host in
--      *-*-rhapsody* | *-*-darwin1.[012])
--	# On Rhapsody replace the C library is the System framework
--	compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
--	finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
--	;;
--      esac
--
--      case $host in
--      *darwin*)
--        # Don't allow lazy linking, it breaks C++ global constructors
--        if test "$tagname" = CXX ; then
--        compile_command="$compile_command ${wl}-bind_at_load"
--        finalize_command="$finalize_command ${wl}-bind_at_load"
--        fi
--        ;;
--      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*)
--	  testbindir=`$echo "X$libdir" | $Xsed -e 's*/lib$*/bin*'`
--	  case :$dllsearchpath: in
--	  *":$libdir:"*) ;;
--	  *) dllsearchpath="$dllsearchpath:$libdir";;
--	  esac
--	  case :$dllsearchpath: in
--	  *":$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 "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
--	finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
--      fi
--
--      dlsyms=
--      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
--	if test -n "$NM" && test -n "$global_symbol_pipe"; then
--	  dlsyms="${outputname}S.c"
--	else
--	  $echo "$modename: not configured to extract global symbols from dlpreopened files" 1>&2
--	fi
--      fi
--
--      if test -n "$dlsyms"; then
--	case $dlsyms in
--	"") ;;
--	*.c)
--	  # Discover the nlist of each of the dlfiles.
--	  nlist="$output_objdir/${outputname}.nm"
--
--	  $show "$rm $nlist ${nlist}S ${nlist}T"
--	  $run $rm "$nlist" "${nlist}S" "${nlist}T"
--
--	  # Parse the name list into a source file.
--	  $show "creating $output_objdir/$dlsyms"
--
--	  test -z "$run" && $echo > "$output_objdir/$dlsyms" "\
--/* $dlsyms - symbol resolution table for \`$outputname' dlsym emulation. */
--/* Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP */
--
--#ifdef __cplusplus
--extern \"C\" {
--#endif
--
--/* Prevent the only kind of declaration conflicts we can make. */
--#define lt_preloaded_symbols some_other_symbol
-+  if (!p)
-+    return 1;
- 
--/* External symbol declarations for the compiler. */\
--"
-+  *value = xstrdup (++p);
- 
--	  if test "$dlself" = yes; then
--	    $show "generating symbol list for \`$output'"
-+  len = strlen (arg) - strlen (*value);
-+  *name = XMALLOC (char, len);
-+  strncpy (*name, arg, len-1);
-+  (*name)[len - 1] = '\0';
- 
--	    test -z "$run" && $echo ': @PROGRAM@ ' > "$nlist"
-+  return 0;
-+}
- 
--	    # Add our own program objects to the symbol list.
--	    progfiles=`$echo "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
--	    for arg in $progfiles; do
--	      $show "extracting global C symbols from \`$arg'"
--	      $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
--	    done
-+void
-+lt_opt_process_env_set (const char *arg)
-+{
-+  char *name = NULL;
-+  char *value = NULL;
- 
--	    if test -n "$exclude_expsyms"; then
--	      $run eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
--	      $run eval '$mv "$nlist"T "$nlist"'
--	    fi
--
--	    if test -n "$export_symbols_regex"; then
--	      $run eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
--	      $run eval '$mv "$nlist"T "$nlist"'
--	    fi
--
--	    # Prepare the list of exported symbols
--	    if test -z "$export_symbols"; then
--	      export_symbols="$output_objdir/$outputname.exp"
--	      $run $rm $export_symbols
--	      $run eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
--              case $host in
--              *cygwin* | *mingw* )
--	        $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
--		$run eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
--                ;;
--              esac
--	    else
--	      $run eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
--	      $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
--	      $run eval 'mv "$nlist"T "$nlist"'
--              case $host in
--              *cygwin* | *mingw* )
--	        $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
--		$run eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
--                ;;
--              esac
--	    fi
--	  fi
-+  if (lt_split_name_value (arg, &name, &value) != 0)
-+    {
-+      XFREE (name);
-+      XFREE (value);
-+      lt_fatal ("bad argument for %s: '%s'", env_set_opt, arg);
-+    }
- 
--	  for arg in $dlprefiles; do
--	    $show "extracting global C symbols from \`$arg'"
--	    name=`$echo "$arg" | ${SED} -e 's%^.*/%%'`
--	    $run eval '$echo ": $name " >> "$nlist"'
--	    $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
--	  done
-+  lt_setenv (name, value);
-+  XFREE (name);
-+  XFREE (value);
-+}
- 
--	  if test -z "$run"; then
--	    # 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
-+void
-+lt_opt_process_env_prepend (const char *arg)
-+{
-+  char *name = NULL;
-+  char *value = NULL;
-+  char *new_value = NULL;
- 
--	    # 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 (lt_split_name_value (arg, &name, &value) != 0)
-+    {
-+      XFREE (name);
-+      XFREE (value);
-+      lt_fatal ("bad argument for %s: '%s'", env_prepend_opt, arg);
-+    }
- 
--	    if test -f "$nlist"S; then
--	      eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$dlsyms"'
--	    else
--	      $echo '/* NONE */' >> "$output_objdir/$dlsyms"
--	    fi
-+  new_value = lt_extend_str (getenv (name), value, 0);
-+  lt_setenv (name, new_value);
-+  XFREE (new_value);
-+  XFREE (name);
-+  XFREE (value);
-+}
- 
--	    $echo >> "$output_objdir/$dlsyms" "\
-+void
-+lt_opt_process_env_append (const char *arg)
-+{
-+  char *name = NULL;
-+  char *value = NULL;
-+  char *new_value = NULL;
- 
--#undef lt_preloaded_symbols
-+  if (lt_split_name_value (arg, &name, &value) != 0)
-+    {
-+      XFREE (name);
-+      XFREE (value);
-+      lt_fatal ("bad argument for %s: '%s'", env_append_opt, arg);
-+    }
- 
--#if defined (__STDC__) && __STDC__
--# define lt_ptr void *
--#else
--# define lt_ptr char *
--# define const
--#endif
-+  new_value = lt_extend_str (getenv (name), value, 1);
-+  lt_setenv (name, new_value);
-+  XFREE (new_value);
-+  XFREE (name);
-+  XFREE (value);
-+}
- 
--/* The mapping between symbol names and symbols. */
--"
-+void
-+lt_update_exe_path (const char *name, const char *value)
-+{
-+  LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
-+                          (name ? name : "<NULL>"),
-+                          (value ? value : "<NULL>")));
- 
--	    case $host in
--	    *cygwin* | *mingw* )
--	  $echo >> "$output_objdir/$dlsyms" "\
--/* DATA imports from DLLs on WIN32 can't be const, because
--   runtime relocations are performed -- see ld's documentation
--   on pseudo-relocs */
--struct {
--"
--	      ;;
--	    * )
--	  $echo >> "$output_objdir/$dlsyms" "\
--const struct {
--"
--	      ;;
--	    esac
-+  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)
-+{
-+  LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
-+                          (name ? name : "<NULL>"),
-+                          (value ? value : "<NULL>")));
- 
--	  $echo >> "$output_objdir/$dlsyms" "\
--  const char *name;
--  lt_ptr address;
-+  if (name && *name && value && *value)
-+    {
-+      char *new_value = lt_extend_str (getenv (name), value, 0);
-+      lt_setenv (name, new_value);
-+      XFREE (new_value);
-+    }
- }
--lt_preloaded_symbols[] =
--{\
--"
--
--	    eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$dlsyms"
- 
--	    $echo >> "$output_objdir/$dlsyms" "\
--  {0, (lt_ptr) 0}
--};
- 
--/* This works around a problem in FreeBSD linker */
--#ifdef FREEBSD_WORKAROUND
--static const void *lt_preloaded_setup() {
--  return lt_preloaded_symbols;
-+EOF
- }
--#endif
-+# end: func_emit_cwrapperexe_src
- 
--#ifdef __cplusplus
--}
--#endif\
--"
--	  fi
-+# 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
- 
--	  pic_flag_for_symtable=
--	  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*)
--	    case "$compile_command " in
--	    *" -static "*) ;;
--	    *) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND";;
--	    esac;;
--	  *-*-hpux*)
--	    case "$compile_command " in
--	    *" -static "*) ;;
--	    *) pic_flag_for_symtable=" $pic_flag";;
--	    esac
--	  esac
-+      # 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
- 
--	  # Now compile the dynamic symbol file.
--	  $show "(cd $output_objdir && $LTCC  $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
--	  $run eval '(cd $output_objdir && $LTCC  $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
--
--	  # Clean up the generated files.
--	  $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T"
--	  $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T"
--
--	  # Transform the symbol file into the correct name.
--          case $host in
--          *cygwin* | *mingw* )
--            if test -f "$output_objdir/${outputname}.def" ; then
--              compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
--              finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
--            else
--              compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
--              finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
--             fi
--            ;;
--          * )
--            compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
--            finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
--            ;;
--          esac
-+    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
-+    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
- 	  ;;
--	*)
--	  $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
--	  exit $EXIT_FAILURE
-+	-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
--      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 "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
--	finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
--      fi
--
--      if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
--	# Replace the output file specification.
--	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP`
--	link_command="$compile_command$compile_rpath"
-+	build_libtool_libs=no
-+	build_old_libs=yes
-+	break
-+	;;
-+      esac
-+    done
- 
--	# We have no uninstalled library dependencies, so finalize right now.
--	$show "$link_command"
--	$run eval "$link_command"
--	exit_status=$?
-+    # See if our shared archives depend on static archives.
-+    test -n "$old_archive_from_new_cmds" && build_old_libs=yes
- 
--	# Delete the generated files.
--	if test -n "$dlsyms"; then
--	  $show "$rm $output_objdir/${outputname}S.${objext}"
--	  $run $rm "$output_objdir/${outputname}S.${objext}"
--	fi
-+    # 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"
- 
--	exit $exit_status
--      fi
-+      # 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
- 
--      if test -n "$shlibpath_var"; then
--	# We should set the shlibpath_var
--	rpath=
--	for dir in $temp_rpath; do
--	  case $dir in
--	  [\\/]* | [A-Za-z]:[\\/]*)
--	    # Absolute path.
--	    rpath="$rpath$dir:"
-+	case $prev in
-+	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
- 	    ;;
- 	  *)
--	    # Relative path: add a thisdir entry.
--	    rpath="$rpath\$thisdir/$dir:"
-+	    if test "$prev" = dlfiles; then
-+	      dlfiles="$dlfiles $arg"
-+	    else
-+	      dlprefiles="$dlprefiles $arg"
-+	    fi
-+	    prev=
-+	    continue
- 	    ;;
- 	  esac
--	done
--	temp_rpath="$rpath"
--      fi
-+	  ;;
-+	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.
- 
--      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
-+	      # Check to see that this really is a libtool object.
-+	      if func_lalib_unsafe_p "$arg"; then
-+		pic_object=
-+		non_pic_object=
- 
--      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
-+		# Read the .lo file
-+		func_source "$arg"
- 
--      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 "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
--	# Delete the old output file.
--	$run $rm $output
--	# Link the executable and exit
--	$show "$link_command"
--	$run eval "$link_command" || exit $?
--	exit $EXIT_SUCCESS
--      fi
-+		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
- 
--      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"
-+		# Extract subdirectory from the argument.
-+		func_dirname "$arg" "/" ""
-+		xdir="$func_dirname_result"
- 
--	$echo "$modename: warning: this platform does not like uninstalled shared libraries" 1>&2
--	$echo "$modename: \`$output' will be relinked during installation" 1>&2
--      else
--	if test "$fast_install" != no; then
--	  link_command="$finalize_var$compile_command$finalize_rpath"
--	  if test "$fast_install" = yes; then
--	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP`
--	  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
-+		if test "$pic_object" != none; then
-+		  # Prepend the subdirectory the object is found in.
-+		  pic_object="$xdir$pic_object"
- 
--      # Replace the output file specification.
--      link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
-+		  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
- 
--      # Delete the old output files.
--      $run $rm $output $output_objdir/$outputname $output_objdir/lt-$outputname
-+		  # CHECK ME:  I think I busted this.  -Ossama
-+		  if test "$prev" = dlprefiles; then
-+		    # Preload the old-style object.
-+		    dlprefiles="$dlprefiles $pic_object"
-+		    prev=
-+		  fi
- 
--      $show "$link_command"
--      $run eval "$link_command" || exit $?
-+		  # A PIC object.
-+		  func_append libobjs " $pic_object"
-+		  arg="$pic_object"
-+		fi
- 
--      # Now create the wrapper script.
--      $show "creating $output"
-+		# 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"
- 
--      # 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}\" || unset $var || { $var=; export $var; }; }; $relink_command"
--	  elif eval var_value=\$$var; test -z "$var_value"; then
--	    relink_command="$var=; export $var; $relink_command"
-+		  # 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
--	    var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
--	    relink_command="$var=\"$var_value\"; export $var; $relink_command"
-+	    func_fatal_error "link input file \`$arg' does not exist"
- 	  fi
--	done
--	relink_command="(cd `pwd`; $relink_command)"
--	relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
--      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 our run command is non-null.
--      if test -z "$run"; then
--	# win32 will think the script is a binary if it has
--	# a .exe suffix, so we strip it off here.
--	case $output in
--	  *.exe) output=`$echo $output|${SED} 's,.exe$,,'` ;;
--	esac
--	# test for cygwin because mv fails w/o .exe extensions
--	case $host in
--	  *cygwin*)
--	    exeext=.exe
--	    outputname=`$echo $outputname|${SED} 's,.exe$,,'` ;;
--	  *) exeext= ;;
-+	  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
--	case $host in
--	  *cygwin* | *mingw* )
--            output_name=`basename $output`
--            output_path=`dirname $output`
--            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
--
--	    cat > $cwrappersource <<EOF
--
--/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
--   Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-+      fi # test -n "$prev"
- 
--   The $output program cannot be directly executed until all the libtool
--   libraries that it depends on are installed.
-+      prevarg="$arg"
- 
--   This wrapper executable should never be moved out of the build directory.
--   If it is, it will not operate correctly.
-+      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
-+	;;
- 
--   Currently, it simply execs the wrapper *script* "/bin/sh $output",
--   but could eventually absorb all of the scripts functionality and
--   exec $objdir/$outputname directly.
--*/
--EOF
--	    cat >> $cwrappersource<<"EOF"
--#include <stdio.h>
--#include <stdlib.h>
--#include <unistd.h>
--#include <malloc.h>
--#include <stdarg.h>
--#include <assert.h>
--#include <string.h>
--#include <ctype.h>
--#include <sys/stat.h>
-+      -allow-undefined)
-+	# FIXME: remove this flag sometime in the future.
-+	func_fatal_error "\`-allow-undefined' must not be used because it is the default"
-+	;;
- 
--#if defined(PATH_MAX)
--# define LT_PATHMAX PATH_MAX
--#elif defined(MAXPATHLEN)
--# define LT_PATHMAX MAXPATHLEN
--#else
--# define LT_PATHMAX 1024
--#endif
-+      -avoid-version)
-+	avoid_version=yes
-+	continue
-+	;;
- 
--#ifndef DIR_SEPARATOR
--# define DIR_SEPARATOR '/'
--# define PATH_SEPARATOR ':'
--#endif
-+      -dlopen)
-+	prev=dlfiles
-+	continue
-+	;;
- 
--#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
--  defined (__OS2__)
--# define HAVE_DOS_BASED_FILE_SYSTEM
--# ifndef DIR_SEPARATOR_2
--#  define DIR_SEPARATOR_2 '\\'
--# endif
--# ifndef PATH_SEPARATOR_2
--#  define PATH_SEPARATOR_2 ';'
--# endif
--#endif
-+      -dlpreopen)
-+	prev=dlprefiles
-+	continue
-+	;;
- 
--#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 */
-+      -export-dynamic)
-+	export_dynamic=yes
-+	continue
-+	;;
- 
--#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 */
-+      -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
-+	;;
- 
--#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
--#define XFREE(stale) do { \
--  if (stale) { free ((void *) stale); stale = 0; } \
--} while (0)
-+      -framework)
-+	prev=framework
-+	continue
-+	;;
- 
--/* -DDEBUG is fairly common in CFLAGS.  */
--#undef DEBUG
--#if defined DEBUGWRAPPER
--# define DEBUG(format, ...) fprintf(stderr, format, __VA_ARGS__)
--#else
--# define DEBUG(format, ...)
--#endif
-+      -inst-prefix-dir)
-+	prev=inst_prefix
-+	continue
-+	;;
- 
--const char *program_name = NULL;
-+      # 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
-+	;;
- 
--void * xmalloc (size_t num);
--char * xstrdup (const char *string);
--const char * base_name (const char *name);
--char * find_executable(const char *wrapper);
--int    check_executable(const char *path);
--char * strendzap(char *str, const char *pat);
--void lt_fatal (const char *message, ...);
-+      -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 "X$dir" | $Xsed -e 's*/lib$*/bin*'`
-+	  case :$dllsearchpath: in
-+	  *":$dir:"*) ;;
-+	  ::) dllsearchpath=$dir;;
-+	  *) dllsearchpath="$dllsearchpath:$dir";;
-+	  esac
-+	  case :$dllsearchpath: in
-+	  *":$testbindir:"*) ;;
-+	  ::) dllsearchpath=$testbindir;;
-+	  *) dllsearchpath="$dllsearchpath:$testbindir";;
-+	  esac
-+	  ;;
-+	esac
-+	continue
-+	;;
- 
--int
--main (int argc, char *argv[])
--{
--  char **newargz;
--  int i;
-+      -l*)
-+	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
-+	  case $host in
-+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*)
-+	    # 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
-+	;;
- 
--  program_name = (char *) xstrdup (base_name (argv[0]));
--  DEBUG("(main) argv[0]      : %s\n",argv[0]);
--  DEBUG("(main) program_name : %s\n",program_name);
--  newargz = XMALLOC(char *, argc+2);
--EOF
-+      -module)
-+	module=yes
-+	continue
-+	;;
- 
--            cat >> $cwrappersource <<EOF
--  newargz[0] = (char *) xstrdup("$SHELL");
--EOF
-+      # 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
-+	;;
- 
--            cat >> $cwrappersource <<"EOF"
--  newargz[1] = find_executable(argv[0]);
--  if (newargz[1] == NULL)
--    lt_fatal("Couldn't find %s", argv[0]);
--  DEBUG("(main) found exe at : %s\n",newargz[1]);
--  /* we know the script has the same name, without the .exe */
--  /* so make sure newargz[1] doesn't end in .exe */
--  strendzap(newargz[1],".exe");
--  for (i = 1; i < argc; i++)
--    newargz[i+1] = xstrdup(argv[i]);
--  newargz[argc+1] = NULL;
-+      -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
-+	;;
- 
--  for (i=0; i<argc+1; i++)
--  {
--    DEBUG("(main) newargz[%d]   : %s\n",i,newargz[i]);
--    ;
--  }
-+      -multi_module)
-+	single_module="${wl}-multi_module"
-+	continue
-+	;;
- 
--EOF
-+      -no-fast-install)
-+	fast_install=no
-+	continue
-+	;;
- 
--            case $host_os in
--              mingw*)
--                cat >> $cwrappersource <<EOF
--  execv("$SHELL",(char const **)newargz);
--EOF
--              ;;
--              *)
--                cat >> $cwrappersource <<EOF
--  execv("$SHELL",newargz);
--EOF
--              ;;
--            esac
-+      -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
-+	;;
- 
--            cat >> $cwrappersource <<"EOF"
--  return 127;
--}
-+      -no-undefined)
-+	allow_undefined=no
-+	continue
-+	;;
- 
--void *
--xmalloc (size_t num)
--{
--  void * p = (void *) malloc (num);
--  if (!p)
--    lt_fatal ("Memory exhausted");
-+      -objectlist)
-+	prev=objectlist
-+	continue
-+	;;
- 
--  return p;
--}
-+      -o) prev=output ;;
- 
--char *
--xstrdup (const char *string)
--{
--  return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL
--;
--}
-+      -precious-files-regex)
-+	prev=precious_regex
-+	continue
-+	;;
- 
--const char *
--base_name (const char *name)
--{
--  const char *base;
-+      -release)
-+	prev=release
-+	continue
-+	;;
- 
--#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
-+      -rpath)
-+	prev=rpath
-+	continue
-+	;;
- 
--  for (base = name; *name; name++)
--    if (IS_DIR_SEPARATOR (*name))
--      base = name + 1;
--  return base;
--}
-+      -R)
-+	prev=xrpath
-+	continue
-+	;;
- 
--int
--check_executable(const char * path)
--{
--  struct stat st;
-+      -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
-+	;;
- 
--  DEBUG("(check_executable)  : %s\n", path ? (*path ? path : "EMPTY!") : "NULL!");
--  if ((!path) || (!*path))
--    return 0;
-+      -shared)
-+	# The effects of -shared are defined in a previous loop.
-+	continue
-+	;;
- 
--  if ((stat (path, &st) >= 0) &&
--      (
--        /* MinGW & native WIN32 do not support S_IXOTH or S_IXGRP */
--#if defined (S_IXOTH)
--       ((st.st_mode & S_IXOTH) == S_IXOTH) ||
--#endif
--#if defined (S_IXGRP)
--       ((st.st_mode & S_IXGRP) == S_IXGRP) ||
--#endif
--       ((st.st_mode & S_IXUSR) == S_IXUSR))
--      )
--    return 1;
--  else
--    return 0;
--}
-+      -shrext)
-+	prev=shrext
-+	continue
-+	;;
- 
--/* Searches for the full path of the wrapper.  Returns
--   newly allocated full path name if found, NULL otherwise */
--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;
-+      -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
-+	;;
- 
--  DEBUG("(find_executable)  : %s\n", wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!");
-+      -thread-safe)
-+	thread_safe=yes
-+	continue
-+	;;
- 
--  if ((wrapper == NULL) || (*wrapper == '\0'))
--    return NULL;
-+      -version-info)
-+	prev=vinfo
-+	continue
-+	;;
- 
--  /* 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
-+      -version-number)
-+	prev=vinfo
-+	vinfo_number=yes
-+	continue
-+	;;
- 
--  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 ("getcwd failed");
--          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 ("getcwd failed");
--  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);
-+      -weak)
-+        prev=weak
-+	continue
-+	;;
- 
--  if (check_executable(concat_name))
--    return concat_name;
--  XFREE(concat_name);
--  return NULL;
--}
-+      -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 $wl$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
-+	;;
- 
--char *
--strendzap(char *str, const char *pat)
--{
--  size_t len, patlen;
-+      -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
-+	;;
- 
--  assert(str != NULL);
--  assert(pat != NULL);
-+      -Xcompiler)
-+	prev=xcompiler
-+	continue
-+	;;
- 
--  len = strlen(str);
--  patlen = strlen(pat);
-+      -Xlinker)
-+	prev=xlinker
-+	continue
-+	;;
- 
--  if (patlen <= len)
--  {
--    str += len - patlen;
--    if (strcmp(str, pat) == 0)
--      *str = '\0';
--  }
--  return str;
--}
-+      -XCClinker)
-+	prev=xcclinker
-+	continue
-+	;;
- 
--static void
--lt_error_core (int exit_status, const char * mode,
--          const char * message, va_list ap)
--{
--  fprintf (stderr, "%s: %s: ", program_name, mode);
--  vfprintf (stderr, message, ap);
--  fprintf (stderr, ".\n");
-+      # -msg_* for osf cc
-+      -msg_*)
-+	func_quote_for_eval "$arg"
-+	arg="$func_quote_for_eval_result"
-+	;;
- 
--  if (exit_status >= 0)
--    exit (exit_status);
--}
-+      # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
-+      # -r[0-9][0-9]* specifies the processor on the SGI compiler
-+      # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
-+      # +DA*, +DD* enable 64-bit mode on the HP compiler
-+      # -q* pass through compiler args for the IBM compiler
-+      # -m*, -t[45]*, -txscale* pass through architecture-specific
-+      # compiler args for GCC
-+      # -F/path gives path to uninstalled frameworks, gcc on darwin
-+      # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
-+      # @file GCC response files
-+      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
-+        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
-+        ;;
- 
--void
--lt_fatal (const char *message, ...)
--{
--  va_list ap;
--  va_start (ap, message);
--  lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
--  va_end (ap);
--}
--EOF
--          # we should really use a build-platform specific compiler
--          # here, but OTOH, the wrappers (shell script and this C one)
--          # are only useful if you want to execute the "real" binary.
--          # Since the "real" binary is built for $host, then this
--          # wrapper might as well be built for $host, too.
--          $run $LTCC $LTCFLAGS -s -o $cwrapper $cwrappersource
--          ;;
--        esac
--        $rm $output
--        trap "$rm $output; exit $EXIT_FAILURE" 1 2 15
-+      # Some other compiler flag.
-+      -* | +*)
-+        func_quote_for_eval "$arg"
-+	arg="$func_quote_for_eval_result"
-+	;;
- 
--	$echo > $output "\
--#! $SHELL
-+      *.$objext)
-+	# A standard object.
-+	objs="$objs $arg"
-+	;;
- 
--# $output - temporary wrapper script for $objdir/$outputname
--# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
--#
--# 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.
-+      *.lo)
-+	# A libtool-controlled object.
- 
--# 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'
-+	# Check to see that this really is a libtool object.
-+	if func_lalib_unsafe_p "$arg"; then
-+	  pic_object=
-+	  non_pic_object=
- 
--# Be Bourne compatible (taken from Autoconf:_AS_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
-+	  # Read the .lo file
-+	  func_source "$arg"
- 
--# 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 "$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
- 
--relink_command=\"$relink_command\"
-+	  # Extract subdirectory from the argument.
-+	  func_dirname "$arg" "/" ""
-+	  xdir="$func_dirname_result"
- 
--# This environment variable determines our operation mode.
--if test \"\$libtool_install_magic\" = \"$magic\"; then
--  # install mode needs the following variable:
--  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
--    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\
--"
--	$echo >> $output "\
-+	  if test "$pic_object" != none; then
-+	    # Prepend the subdirectory the object is found in.
-+	    pic_object="$xdir$pic_object"
- 
--  # Find the directory that this script lives in.
--  thisdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
--  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
-+	    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
- 
--  # Follow symbolic links until we get to the real thisdir.
--  file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
--  while test -n \"\$file\"; do
--    destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
-+	    # CHECK ME:  I think I busted this.  -Ossama
-+	    if test "$prev" = dlprefiles; then
-+	      # Preload the old-style object.
-+	      dlprefiles="$dlprefiles $pic_object"
-+	      prev=
-+	    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
-+	    # A PIC object.
-+	    func_append libobjs " $pic_object"
-+	    arg="$pic_object"
-+	  fi
- 
--    file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
--    file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
--  done
-+	  # 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"
- 
--  # Try to get the absolute directory name.
--  absdir=\`cd \"\$thisdir\" && pwd\`
--  test -n \"\$absdir\" && thisdir=\"\$absdir\"
--"
-+	    # 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"
- 
--	if test "$fast_install" = yes; then
--	  $echo >> $output "\
--  program=lt-'$outputname'$exeext
--  progdir=\"\$thisdir/$objdir\"
-+	    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
-+	;;
- 
--  if test ! -f \"\$progdir/\$program\" || \\
--     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
--       test \"X\$file\" != \"X\$progdir/\$program\"; }; then
-+      *.$libext)
-+	# An archive.
-+	deplibs="$deplibs $arg"
-+	old_deplibs="$old_deplibs $arg"
-+	continue
-+	;;
- 
--    file=\"\$\$-\$program\"
-+      *.la)
-+	# A libtool-controlled library.
- 
--    if test ! -d \"\$progdir\"; then
--      $mkdir \"\$progdir\"
--    else
--      $rm \"\$progdir/\$file\"
--    fi"
-+	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
-+	;;
- 
--	  $echo >> $output "\
-+      # 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
- 
--    # 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 $EXIT_FAILURE
-+      # 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
- 
--    $mv \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
--    { $rm \"\$progdir/\$program\";
--      $mv \"\$progdir/\$file\" \"\$progdir/\$program\"; }
--    $rm \"\$progdir/\$file\"
--  fi"
--	else
--	  $echo >> $output "\
--  program='$outputname'
--  progdir=\"\$thisdir/$objdir\"
--"
--	fi
-+    oldlibs=
-+    # calculate the name of the file, without its directory
-+    func_basename "$output"
-+    outputname="$func_basename_result"
-+    libobjs_save="$libobjs"
- 
--	$echo >> $output "\
-+    if test -n "$shlibpath_var"; then
-+      # get the directories listed in $shlibpath_var
-+      eval shlib_search_path=\`\$ECHO \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
-+    else
-+      shlib_search_path=
-+    fi
-+    eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
-+    eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
- 
--  if test -f \"\$progdir/\$program\"; then"
-+    func_dirname "$output" "/" ""
-+    output_objdir="$func_dirname_result$objdir"
-+    # Create the object directory.
-+    func_mkdir_p "$output_objdir"
- 
--	# Export our shlibpath_var if we have one.
--	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
--	  $echo >> $output "\
--    # Add our own library path to $shlibpath_var
--    $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
-+    # 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
- 
--    # 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 \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
-+    specialdeplibs=
- 
--    export $shlibpath_var
--"
--	fi
-+    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
- 
--	# fixup the dll searchpath if we need to.
--	if test -n "$dllsearchpath"; then
--	  $echo >> $output "\
--    # Add the dll search path components to the executable PATH
--    PATH=$dllsearchpath:\$PATH
--"
-+    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%"
-+	  test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
-+	  ;;
-+	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
-+            deplib_base=`$ECHO "X$deplib" | $Xsed -e "$basename"`
-+	    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 \"X$deplib\"" 2>/dev/null | $Xsed -e 10q \
-+		    | $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 "*** 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."
-+	      else
-+		$ECHO
-+		$ECHO "*** Warning: Linking the shared library $output against the"
-+		$ECHO "*** static library $deplib is not portable!"
-+		deplibs="$deplib $deplibs"
-+	      fi
-+	      ;;
-+	    esac
-+	    continue
-+	    ;;
-+	  prog)
-+	    if test "$pass" != link; then
-+	      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 "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 "*) ;;
-+	      *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";;
-+	    esac
-+	  done
-+	fi
-+	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
-+	  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"
+@@ -5347,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"
@@ -19041,4215 +1171,42 @@
 +	      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
-+	  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
-+	    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"
-+			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 "*** 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."
-+	    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."
-+	      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."
-+	      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 "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
-+	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 "*** 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|sunos)
-+	    current="$number_major"
-+	    revision="$number_minor"
-+	    age="0"
-+	    ;;
-+	  irix|nonstopux)
-+	    func_arith $number_major + $number_minor
-+	    current=$func_arith_result
-+	    age="$number_minor"
-+	    revision="$number_minor"
-+	    lt_irix_increment=no
-+	    ;;
-+	  *)
-+	    func_fatal_configuration "$modename: unknown library version type \`$version_type'"
-+	    ;;
-+	  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 "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
-+      fi
-+
-+      # Eliminate all temporary directories.
-+      #for path in $notinst_path; do
-+      #	lib_search_path=`$ECHO "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
-+	# 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*)
-+	    # 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 "*** 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."
-+		  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 "*** 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."
-+		    fi
-+		  fi
-+		else
-+		  droppeddeps=yes
-+		  $ECHO
-+		  $ECHO "*** Warning!  Library $i is needed by this library but I was not able to"
-+		  $ECHO "*** make it link in!  You will probably need to install it or some"
-+		  $ECHO "*** library that it depends on before this library will be fully"
-+		  $ECHO "*** functional.  Installing it before continuing would be even better."
-+		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 "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
-+			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 "*** 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"
-+		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 \"X$potent_lib\"" 2>/dev/null | $Xsed -e 10q | \
-+		       $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 "*** 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"
-+		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 "X $deplibs" | $Xsed \
-+	      -e 's/ -lc$//' -e 's/ -[LR][^ ]*//g'`
-+	  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-+	    for i in $predeps $postdeps ; do
-+	      # can't use Xsed below, because $i might contain '/'
-+	      tmp_deplibs=`$ECHO "X $tmp_deplibs" | $Xsed -e "s,$i,,"`
-+	    done
-+	  fi
-+	  if $ECHO "X $tmp_deplibs" | $Xsed -e 's/[	 ]//g' |
-+	     $GREP . >/dev/null; then
-+	    $ECHO
-+	    if test "X$deplibs_check_method" = "Xnone"; then
-+	      $ECHO "*** Warning: inter-library dependencies are not supported in this platform."
-+	    else
-+	      $ECHO "*** Warning: inter-library dependencies are not known to be supported."
-+	    fi
-+	    $ECHO "*** All declared inter-library dependencies are being dropped."
-+	    droppeddeps=yes
-+	  fi
-+	  ;;
-+	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 "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
-+	  ;;
-+	esac
-+
-+	if test "$droppeddeps" = yes; then
-+	  if test "$module" = yes; then
-+	    $ECHO
-+	    $ECHO "*** Warning: libtool could not satisfy all declared inter-library"
-+	    $ECHO "*** 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."
-+	    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."
-+	    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."
-+
-+	    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."
-+	      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
--
--	$echo >> $output "\
--    if test \"\$libtool_execute_magic\" != \"$magic\"; then
--      # Run the actual program with our arguments.
--"
--	case $host in
--	# Backslashes separate directories on plain windows
--	*-*-mingw | *-*-os2*)
--	  $echo >> $output "\
--      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
--"
-+	# Done checking deplibs!
-+	deplibs=$newdeplibs
-+      fi
-+      # Time to change all our "foo.ltframework" stuff back to "-framework foo"
-+      case $host in
-+	*-*-darwin*)
-+	  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
- 
-+      # 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 "*) ;;
- 	*)
--	  $echo >> $output "\
--      exec \"\$progdir/\$program\" \${1+\"\$@\"}
--"
-+	  case " $deplibs " in
-+	  *" -L$path/$objdir "*)
-+	    new_libs="$new_libs -L$path/$objdir" ;;
-+	  esac
- 	  ;;
- 	esac
--	$echo >> $output "\
--      \$echo \"\$0: cannot exec \$program \$*\"
--      exit $EXIT_FAILURE
--    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
--    exit $EXIT_FAILURE
--  fi
--fi\
--"
--	chmod +x $output
--      fi
--      exit $EXIT_SUCCESS
--      ;;
--    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"
- 
--    # See if we need to build an old-fashioned archive.
--    for oldlib in $oldlibs; do
-+      # All the library-specific variables (install_libdir is set above).
-+      library_names=
-+      old_library=
-+      dlname=
- 
--      if test "$build_libtool_libs" = convenience; then
--	oldobjs="$libobjs_save"
--	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"
-+      # 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
--	addlibs="$old_convenience"
--      fi
- 
--      if test -n "$addlibs"; then
--	gentop="$output_objdir/${outputname}x"
--	generated="$generated $gentop"
-+	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
- 
--	func_extract_archives $gentop $addlibs
--	oldobjs="$oldobjs $func_extract_archives_result"
--      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
- 
--      # 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
--	# 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
--	      $echo "X$obj" | $Xsed -e 's%^.*/%%'
--	    done | sort | sort -uc >/dev/null 2>&1); then
--	  :
-+	if test -n "$soname_spec"; then
-+	  eval soname=\"$soname_spec\"
- 	else
--	  $echo "copying selected object files to avoid basename conflicts..."
-+	  soname="$realname"
-+	fi
-+	if test -z "$dlname"; then
-+	  dlname=$soname
-+	fi
- 
--	  if test -z "$gentop"; then
--	    gentop="$output_objdir/${outputname}x"
--	    generated="$generated $gentop"
-+	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 "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-+	test "X$libobjs" = "X " && libobjs=
- 
--	    $show "${rm}r $gentop"
--	    $run ${rm}r "$gentop"
--	    $show "$mkdir $gentop"
--	    $run $mkdir "$gentop"
--	    exit_status=$?
--	    if test "$exit_status" -ne 0 && test ! -d "$gentop"; then
--	      exit $exit_status
-+	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
+ 	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
+ 	    func_fatal_error "\`$lib' is not a convenience library"
  	  fi
-+	  ;;
-+	esac
- 
--	  save_oldobjs=$oldobjs
--	  oldobjs=
--	  counter=1
--	  for obj in $save_oldobjs
--	  do
--	    objbase=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
--	    case " $oldobjs " in
--	    " ") oldobjs=$obj ;;
--	    *[\ /]"$objbase "*)
--	      while :; do
--		# Make sure we don't pick an alternate name that also
--		# overlaps.
--		newobj=lt$counter-$objbase
--		counter=`expr $counter + 1`
--		case " $oldobjs " in
--		*[\ /]"$newobj "*) ;;
--		*) if test ! -f "$gentop/$newobj"; then break; fi ;;
--		esac
--	      done
--	      $show "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
--	      $run ln "$obj" "$gentop/$newobj" ||
--	      $run cp "$obj" "$gentop/$newobj"
--	      oldobjs="$oldobjs $gentop/$newobj"
--	      ;;
--	    *) oldobjs="$oldobjs $obj" ;;
--	    esac
--	  done
-+	# 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
- 
--	eval cmds=\"$old_archive_cmds\"
-+	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 "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
-+	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
- 
--	if len=`expr "X$cmds" : ".*"` &&
--	     test "$len" -le "$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
--	  $echo "using piecewise archive linking..."
--	  save_RANLIB=$RANLIB
--	  RANLIB=:
--	  objlist=
--	  concat_cmds=
--	  save_oldobjs=$oldobjs
-+	tmp_deplibs=
-+	for test_deplib in $deplibs; do
-+	  case " $convenience " in
-+	  *" $test_deplib "*) ;;
-+	  *)
-+	    tmp_deplibs="$tmp_deplibs $test_deplib"
-+	    ;;
-+	  esac
-+	done
-+	deplibs="$tmp_deplibs"
- 
--	  # Is there a better way of finding the last object in the list?
--	  for obj in $save_oldobjs
--	  do
--	    last_oldobj=$obj
--	  done
--	  for obj in $save_oldobjs
--	  do
--	    oldobjs="$objlist $obj"
--	    objlist="$objlist $obj"
--	    eval test_cmds=\"$old_archive_cmds\"
--	    if len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
--	       test "$len" -le "$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=
--	    fi
--	  done
--	  RANLIB=$save_RANLIB
--	  oldobjs=$objlist
--	  if test "X$oldobjs" = "X" ; then
--	    eval cmds=\"\$concat_cmds\"
-+	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
--	    eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
-+	    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
--      fi
--      save_ifs="$IFS"; IFS='~'
--      for cmd in $cmds; do
--        eval cmd=\"$cmd\"
--	IFS="$save_ifs"
--	$show "$cmd"
--	$run eval "$cmd" || exit $?
--      done
--      IFS="$save_ifs"
--    done
- 
--    if test -n "$generated"; then
--      $show "${rm}r$generated"
--      $run ${rm}r$generated
--    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
- 
--    # Now create the libtool archive.
--    case $output in
--    *.la)
--      old_library=
--      test "$build_old_libs" = yes && old_library="$libname.$libext"
--      $show "creating $output"
-+	# 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
- 
--      # 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}\" || unset $var || { $var=; export $var; }; }; $relink_command"
--	elif eval var_value=\$$var; test -z "$var_value"; then
--	  relink_command="$var=; export $var; $relink_command"
-+	# 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
--	  var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
--	  relink_command="$var=\"$var_value\"; export $var; $relink_command"
-+	  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
--      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 "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
--      if test "$hardcode_automatic" = yes ; then
--	relink_command=
--      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.
- 
--      # Only create the output if not a dry run.
--      if test -z "$run"; then
--	for installed in no yes; do
--	  if test "$installed" = yes; then
--	    if test -z "$install_libdir"; then
--	      break
-+	  # 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
-+	  output_la=`$ECHO "X$output" | $Xsed -e "$basename"`
-+
-+	  # 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
-+	    for obj in $save_libobjs
-+	    do
-+	      $ECHO "$obj" >> $output
-+	    done
-+	    $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
-+	    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
--	    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)
--		name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
--		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
--		if test -z "$libdir"; then
--		  $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
--		  exit $EXIT_FAILURE
--		fi
--		newdependency_libs="$newdependency_libs $libdir/$name"
--		;;
--	      *) newdependency_libs="$newdependency_libs $deplib" ;;
+-	  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
-+	    for obj
-+	    do
-+	      $ECHO "$obj" >> $output
- 	    done
--	    dependency_libs="$newdependency_libs"
--	    newdlfiles=
--	    for lib in $dlfiles; do
--	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
--	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
--	      if test -z "$libdir"; then
--		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
--		exit $EXIT_FAILURE
-+	    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.
-+		    eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
-+		  else
-+		    # All subsequent reloadable object files will link in
-+		    # the last one created.
-+		    eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj~\$RM $last_robj\"
-+		  fi
-+		  last_robj=$output_objdir/$output_la-${k}.$objext
-+		  func_arith $k + 1
-+		  k=$func_arith_result
-+		  output=$output_objdir/$output_la-${k}.$objext
-+		  objlist=$obj
-+		  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~
-+	      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
--	      newdlfiles="$newdlfiles $libdir/$name"
--	    done
--	    dlfiles="$newdlfiles"
--	    newdlprefiles=
--	    for lib in $dlprefiles; do
--	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
--	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
--	      if test -z "$libdir"; then
--		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
--		exit $EXIT_FAILURE
-+	      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
--	      newdlprefiles="$newdlprefiles $libdir/$name"
--	    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"
-+	    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
--	    dlprefiles="$newdlprefiles"
-+	    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
--	  $rm $output
--	  # place dlname in correct position for cygwin
--	  tdlname=$dlname
--	  case $host,$output,$installed,$module,$dlname in
--	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
--	  esac
--	  $echo > $output "\
--# $outputname - a libtool library file
--# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
--#
--# Please DO NOT delete this file!
--# It is necessary for linking the library.
- 
--# The name that we can dlopen(3).
--dlname='$tdlname'
-+          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 "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
-+	    fi
-+
-+	    if test -n "$orig_export_symbols"; then
-+	      # The given exports_symbols file has to be filtered, so filter it.
-+	      func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
-+	      # 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
- 
--# Names of this library.
--library_names='$library_names'
-+	  libobjs=$output
-+	  # Restore the value of output.
-+	  output=$save_output
- 
--# The name of the static archive.
--old_library='$old_library'
-+	  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.
- 
--# Libraries that this one depends upon.
--dependency_libs='$dependency_libs'
-+	  # 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
- 
--# Version information for $libname.
--current=$current
--age=$age
--revision=$revision
-+	if test -n "$delfiles"; then
-+	  # Append the command to remove temporary files to $cmds.
-+	  eval cmds=\"\$cmds~\$RM $delfiles\"
-+	fi
- 
--# Is this an already installed library?
--installed=$installed
-+	# Add any objects from preloaded convenience libraries
-+	if test -n "$dlprefiles"; then
-+	  gentop="$output_objdir/${outputname}x"
-+	  generated="$generated $gentop"
- 
--# Should we warn about portability when linking against -modules?
--shouldnotlink=$module
-+	  func_extract_archives $gentop $dlprefiles
-+	  libobjs="$libobjs $func_extract_archives_result"
-+	  test "X$libobjs" = "X " && libobjs=
-+	fi
- 
--# Files to dlopen/dlpreopen
--dlopen='$dlfiles'
--dlpreopen='$dlprefiles'
-+	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=$?
- 
--# 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
-+	    # 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
--      fi
-+	IFS="$save_ifs"
- 
--      # Do a symbolic link so that the libtool archive can be found in
--      # LD_LIBRARY_PATH before the program is installed.
--      $show "(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)"
--      $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
--      ;;
--    esac
--    exit $EXIT_SUCCESS
--    ;;
-+	# 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
- 
--  # libtool install mode
--  install)
--    modename="$modename: install"
-+	  exit $EXIT_SUCCESS
-+	fi
- 
--    # 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.
--       $echo "X$nonopt" | grep shtool > /dev/null; then
--      # Aesthetically quote it.
--      arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
--      case $arg in
--      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
--	arg="\"$arg\""
--	;;
--      esac
--      install_prog="$arg "
--      arg="$1"
--      shift
--    else
--      install_prog=
--      arg=$nonopt
--    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
- 
--    # The real first argument should be the name of the installation program.
--    # Aesthetically quote it.
--    arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
--    case $arg in
--    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
--      arg="\"$arg\""
-+	# 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
-       ;;
--    esac
--    install_prog="$install_prog$arg"
- 
--    # We need to accept at least all the BSD install flags.
--    dest=
--    files=
--    opts=
--    prev=
--    install_type=
--    isdir=no
--    stripme=
--    for arg
--    do
--      if test -n "$dest"; then
--	files="$files $dest"
--	dest=$arg
--	continue
-+    obj)
-+      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-+	func_warning "\`-dlopen' is ignored for objects"
-       fi
- 
--      case $arg in
--      -d) isdir=yes ;;
--      -f) 
--      	case " $install_prog " in
--	*[\\\ /]cp\ *) ;;
--	*) prev=$arg ;;
--	esac
--	;;
--      -g | -m | -o) prev=$arg ;;
--      -s)
--	stripme=" -s"
--	continue
--	;;
--      -*)
-+      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
- 	;;
-       *)
--	# If the previous option needed an argument, then skip it.
--	if test -n "$prev"; then
--	  prev=
--	else
--	  dest=$arg
--	  continue
--	fi
-+	libobj=
-+	obj="$output"
- 	;;
-       esac
- 
--      # Aesthetically quote the argument.
--      arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
--      case $arg in
--      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
--	arg="\"$arg\""
--	;;
--      esac
--      install_prog="$install_prog $arg"
--    done
-+      # Delete the old objects.
-+      $opt_dry_run || $RM $obj $libobj
- 
--    if test -z "$install_prog"; then
--      $echo "$modename: you must specify an install program" 1>&2
--      $echo "$help" 1>&2
--      exit $EXIT_FAILURE
--    fi
-+      # 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 "$prev"; then
--      $echo "$modename: the \`$prev' option requires an argument" 1>&2
--      $echo "$help" 1>&2
--      exit $EXIT_FAILURE
--    fi
-+      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 "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
-+	else
-+	  gentop="$output_objdir/${obj}x"
-+	  generated="$generated $gentop"
- 
--    if test -z "$files"; then
--      if test -z "$dest"; then
--	$echo "$modename: no file or destination specified" 1>&2
--      else
--	$echo "$modename: you must specify a destination" 1>&2
-+	  func_extract_archives $gentop $convenience
-+	  reload_conv_objs="$reload_objs $func_extract_archives_result"
-+	fi
-       fi
--      $echo "$help" 1>&2
--      exit $EXIT_FAILURE
--    fi
- 
--    # Strip any trailing slash from the destination.
--    dest=`$echo "X$dest" | $Xsed -e 's%/$%%'`
-+      # Create the old-style object.
-+      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
- 
--    # Check to see that the destination is a directory.
--    test -d "$dest" && isdir=yes
--    if test "$isdir" = yes; then
--      destdir="$dest"
--      destname=
--    else
--      destdir=`$echo "X$dest" | $Xsed -e 's%/[^/]*$%%'`
--      test "X$destdir" = "X$dest" && destdir=.
--      destname=`$echo "X$dest" | $Xsed -e 's%^.*/%%'`
-+      output="$obj"
-+      func_execute_cmds "$reload_cmds" 'exit $?'
- 
--      # Not a directory, so check to see that there is only one file specified.
--      set dummy $files
--      if test "$#" -gt 2; then
--	$echo "$modename: \`$dest' is not a directory" 1>&2
--	$echo "$help" 1>&2
--	exit $EXIT_FAILURE
-+      # 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
--    fi
--    case $destdir in
--    [\\/]* | [A-Za-z]:[\\/]*) ;;
--    *)
--      for file in $files; do
--	case $file in
--	*.lo) ;;
--	*)
--	  $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
--	  $echo "$help" 1>&2
--	  exit $EXIT_FAILURE
--	  ;;
--	esac
--      done
-+
-+      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
-       ;;
--    esac
- 
--    # This variable tells wrapper scripts just to set variables rather
--    # than running their programs.
--    libtool_install_magic="$magic"
-+    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"
- 
--    staticlibs=
--    future_libdirs=
--    current_libdirs=
--    for file in $files; do
-+      test -n "$release" && \
-+	func_warning "\`-release' is ignored for programs"
- 
--      # Do each installation.
--      case $file in
--      *.$libext)
--	# Do the static libraries later.
--	staticlibs="$staticlibs $file"
-+      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 "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
-+	finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
- 	;;
-+      esac
- 
--      *.la)
--	# Check to see that this really is a libtool archive.
--	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
--	else
--	  $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
--	  $echo "$help" 1>&2
--	  exit $EXIT_FAILURE
-+      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 "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
-+	finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
-+	;;
-+      esac
- 
--	library_names=
--	old_library=
--	relink_command=
--	# If there is no directory component, then add one.
--	case $file in
--	*/* | *\\*) . $file ;;
--	*) . ./$file ;;
--	esac
- 
--	# 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" ;;
-+      # 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
--	else
--	  # Note the libdir as a future libdir.
--	  case "$future_libdirs " in
--	  *" $libdir "*) ;;
--	  *) future_libdirs="$future_libdirs $libdir" ;;
-+	  ;;
-+	esac
-+      done
-+      for deplib in $compile_deplibs; do
-+	case $deplib in
-+	-L*)
-+	  case " $new_libs " in
-+	  *" $deplib "*) ;;
-+	  *) new_libs="$new_libs $deplib" ;;
- 	  esac
--	fi
-+	  ;;
-+	*) new_libs="$new_libs $deplib" ;;
-+	esac
-+      done
-+      compile_deplibs="$new_libs"
- 
--	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`/
--	test "X$dir" = "X$file/" && dir=
--	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 "s%$libdir\$%%"`
-+      compile_command="$compile_command $compile_deplibs"
-+      finalize_command="$finalize_command $finalize_deplibs"
- 
--	  # 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.
--	  if test "$inst_prefix_dir" = "$destdir"; then
--	    $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
--	    exit $EXIT_FAILURE
--	  fi
-+      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
- 
--	  if test -n "$inst_prefix_dir"; then
--	    # Stick the inst_prefix_dir data into the link command.
--	    relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP`
-+      # 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
--	    relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP`
-+	    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"
- 
--	  $echo "$modename: warning: relinking \`$file'" 1>&2
--	  $show "$relink_command"
--	  if $run eval "$relink_command"; then :
-+      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
--	    $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
--	    exit $EXIT_FAILURE
-+	    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"
- 
--	# See the names of the shared library.
--	set dummy $library_names
--	if test -n "$2"; then
--	  realname="$2"
--	  shift
--	  shift
-+      if test -n "$libobjs" && test "$build_old_libs" = yes; then
-+	# Transform all the library objects into standard objects.
-+	compile_command=`$ECHO "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-+	finalize_command=`$ECHO "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-+      fi
- 
--	  srcname="$realname"
--	  test -n "$relink_command" && srcname="$realname"T
-+      func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
- 
--	  # Install the shared library and build the symlinks.
--	  $show "$install_prog $dir/$srcname $destdir/$realname"
--	  $run eval "$install_prog $dir/$srcname $destdir/$realname" || exit $?
--	  if test -n "$stripme" && test -n "$striplib"; then
--	    $show "$striplib $destdir/$realname"
--	    $run eval "$striplib $destdir/$realname" || exit $?
--	  fi
-+      # template prelinking step
-+      if test -n "$prelink_cmds"; then
-+	func_execute_cmds "$prelink_cmds" '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
--	      if test "$linkname" != "$realname"; then
--                $show "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
--                $run eval "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
--	      fi
--	    done
--	  fi
-+      wrappers_required=yes
-+      case $host in
-+      *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
-+        fi
-+        ;;
-+      esac
-+      if test "$wrappers_required" = no; then
-+	# Replace the output file specification.
-+	compile_command=`$ECHO "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
-+	link_command="$compile_command$compile_rpath"
- 
--	  # Do each command in the postinstall commands.
--	  lib="$destdir/$realname"
--	  cmds=$postinstall_cmds
--	  save_ifs="$IFS"; IFS='~'
--	  for cmd in $cmds; do
--	    IFS="$save_ifs"
--	    eval cmd=\"$cmd\"
--	    $show "$cmd"
--	    $run eval "$cmd" || {
--	      lt_exit=$?
--
--	      # Restore the uninstalled library and exit
--	      if test "$mode" = relink; then
--		$run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
--	      fi
-+	# We have no uninstalled library dependencies, so finalize right now.
-+	exit_status=0
-+	func_show_eval "$link_command" 'exit_status=$?'
- 
--	      exit $lt_exit
--	    }
--	  done
--	  IFS="$save_ifs"
-+	# Delete the generated files.
-+	if test -f "$output_objdir/${outputname}S.${objext}"; then
-+	  func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
- 	fi
- 
--	# Install the pseudo-library for information purposes.
--	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
--	instname="$dir/$name"i
--	$show "$install_prog $instname $destdir/$name"
--	$run eval "$install_prog $instname $destdir/$name" || exit $?
--
--	# Maybe install the static library, too.
--	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
--	;;
-+	exit $exit_status
-+      fi
- 
--      *.lo)
--	# Install (i.e. copy) a libtool object.
-+      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
- 
--	# Figure out destination file name, if it wasn't already specified.
--	if test -n "$destname"; then
--	  destfile="$destdir/$destname"
--	else
--	  destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
--	  destfile="$destdir/$destfile"
-+      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
--
--	# Deduce the name of the destination old-style object file.
--	case $destfile in
--	*.lo)
--	  staticdest=`$echo "X$destfile" | $Xsed -e "$lo2o"`
--	  ;;
--	*.$objext)
--	  staticdest="$destfile"
--	  destfile=
--	  ;;
--	*)
--	  $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
--	  $echo "$help" 1>&2
--	  exit $EXIT_FAILURE
--	  ;;
--	esac
--
--	# Install the libtool object if requested.
--	if test -n "$destfile"; then
--	  $show "$install_prog $file $destfile"
--	  $run eval "$install_prog $file $destfile" || exit $?
-+	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
- 
--	# Install the old object if enabled.
--	if test "$build_old_libs" = yes; then
--	  # Deduce the name of the old-style object file.
--	  staticobj=`$echo "X$file" | $Xsed -e "$lo2o"`
--
--	  $show "$install_prog $staticobj $staticdest"
--	  $run eval "$install_prog \$staticobj \$staticdest" || exit $?
--	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 "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
-+	# 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
- 
--      *)
--	# Figure out destination file name, if it wasn't already specified.
--	if test -n "$destname"; then
--	  destfile="$destdir/$destname"
-+      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 "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
-+	  else
-+	    # fast_install is set to needless
-+	    relink_command=
-+	  fi
- 	else
--	  destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
--	  destfile="$destdir/$destfile"
-+	  link_command="$compile_var$compile_command$compile_rpath"
-+	  relink_command="$finalize_var$finalize_command$finalize_rpath"
- 	fi
-+      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
--	      file=`$echo $file|${SED} 's,.exe$,,'`
--	      stripped_ext=".exe"
 -	    fi
--	    ;;
--	esac
--
--	# Do a test to see if this is really a libtool program.
--	case $host in
--	*cygwin*|*mingw*)
--	    wrapper=`$echo $file | ${SED} -e 's,.exe$,,'`
--	    ;;
--	*)
--	    wrapper=$file
--	    ;;
--	esac
--	if (${SED} -e '4q' $wrapper | grep "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then
--	  notinst_deplibs=
--	  relink_command=
--
--	  # Note that it is not necessary on cygwin/mingw to append a dot to
--	  # foo even if both foo 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.
--	  #
--	  # If there is no directory component, then add one.
--	  case $wrapper in
--	  */* | *\\*) . ${wrapper} ;;
--	  *) . ./${wrapper} ;;
--	  esac
--
--	  # Check the variables that should have been set.
--	  if test -z "$notinst_deplibs"; then
--	    $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2
--	    exit $EXIT_FAILURE
--	  fi
-+      # Replace the output file specification.
-+      link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
- 
--	  finalize=yes
--	  for lib in $notinst_deplibs; do
--	    # Check to see that each library is installed.
--	    libdir=
--	    if test -f "$lib"; then
--	      # If there is no directory component, then add one.
--	      case $lib in
--	      */* | *\\*) . $lib ;;
--	      *) . ./$lib ;;
--	      esac
--	    fi
--	    libfile="$libdir/"`$echo "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
--	    if test -n "$libdir" && test ! -f "$libfile"; then
--	      $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2
--	      finalize=no
--	    fi
+-	    tmp_libs="$tmp_libs $deplib"
 -	  done
-+      # Delete the old output files.
-+      $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
+ 	  continue
+ 	fi # $pass = conv
  
--	  relink_command=
--	  # Note that it is not necessary on cygwin/mingw to append a dot to
--	  # foo even if both foo 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.
--	  #
--	  # If there is no directory component, then add one.
--	  case $wrapper in
--	  */* | *\\*) . ${wrapper} ;;
--	  *) . ./${wrapper} ;;
--	  esac
-+      func_show_eval "$link_command" 'exit $?'
- 
--	  outputname=
--	  if test "$fast_install" = no && test -n "$relink_command"; then
--	    if test "$finalize" = yes && test -z "$run"; then
--	      tmpdir=`func_mktempdir`
--	      file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
--	      outputname="$tmpdir/$file"
--	      # Replace the output file specification.
--	      relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP`
-+      # Now create the wrapper script.
-+      func_verbose "creating $output"
- 
--	      $show "$relink_command"
--	      if $run eval "$relink_command"; then :
--	      else
--		$echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
--		${rm}r "$tmpdir"
--		continue
--	      fi
--	      file="$outputname"
--	    else
--	      $echo "$modename: warning: cannot relink \`$file'" 1>&2
--	    fi
-+      # 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
--	    # Install the binary that we compiled earlier.
--	    file=`$echo "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
-+	    func_quote_for_eval "$var_value"
-+	    relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
- 	  fi
--	fi
-+	done
-+	relink_command="(cd `pwd`; $relink_command)"
-+	relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
-+      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)
--	    destfile=`$echo $destfile | ${SED} -e 's,.exe$,,'`
--	    ;;
--	  esac
--	  ;;
-+      # 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.
-+      $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
--	$show "$install_prog$stripme $file $destfile"
--	$run eval "$install_prog\$stripme \$file \$destfile" || exit $?
--	test -n "$outputname" && ${rm}r "$tmpdir"
--	;;
--      esac
--    done
-+	# 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
-+	    }
- 
--    for file in $staticlibs; do
--      name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-+	    # 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
- 
--      # Set up the ranlib parameters.
--      oldlib="$destdir/$name"
-+	    func_emit_wrapper no > $output
-+	    chmod +x $output
-+	  ;;
-+	esac
-+      }
-+      exit $EXIT_SUCCESS
-+      ;;
-+    esac
- 
--      $show "$install_prog $file $oldlib"
--      $run eval "$install_prog \$file \$oldlib" || exit $?
-+    # See if we need to build an old-fashioned archive.
-+    for oldlib in $oldlibs; do
- 
--      if test -n "$stripme" && test -n "$old_striplib"; then
--	$show "$old_striplib $oldlib"
--	$run eval "$old_striplib $oldlib" || exit $?
-+      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
- 
--      # Do each command in the postinstall commands.
--      cmds=$old_postinstall_cmds
--      save_ifs="$IFS"; IFS='~'
--      for cmd in $cmds; do
--	IFS="$save_ifs"
--	eval cmd=\"$cmd\"
--	$show "$cmd"
--	$run eval "$cmd" || exit $?
--      done
--      IFS="$save_ifs"
--    done
-+      if test -n "$addlibs"; then
-+	gentop="$output_objdir/${outputname}x"
-+	generated="$generated $gentop"
- 
--    if test -n "$future_libdirs"; then
--      $echo "$modename: warning: remember to run \`$progname --finish$future_libdirs'" 1>&2
--    fi
-+	func_extract_archives $gentop $addlibs
-+	oldobjs="$oldobjs $func_extract_archives_result"
-+      fi
- 
--    if test -n "$current_libdirs"; then
--      # Maybe just do a dry run.
--      test -n "$run" && current_libdirs=" -n$current_libdirs"
--      exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
--    else
--      exit $EXIT_SUCCESS
--    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
- 
--  # libtool finish mode
--  finish)
--    modename="$modename: finish"
--    libdirs="$nonopt"
--    admincmds=
-+	# Add any objects from preloaded convenience libraries
-+	if test -n "$dlprefiles"; then
-+	  gentop="$output_objdir/${outputname}x"
-+	  generated="$generated $gentop"
- 
--    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
--      for dir
--      do
--	libdirs="$libdirs $dir"
--      done
-+	  func_extract_archives $gentop $dlprefiles
-+	  oldobjs="$oldobjs $func_extract_archives_result"
-+	fi
- 
--      for libdir in $libdirs; do
--	if test -n "$finish_cmds"; then
--	  # Do each command in the finish commands.
--	  cmds=$finish_cmds
--	  save_ifs="$IFS"; IFS='~'
--	  for cmd in $cmds; do
--	    IFS="$save_ifs"
--	    eval cmd=\"$cmd\"
--	    $show "$cmd"
--	    $run eval "$cmd" || admincmds="$admincmds
--       $cmd"
-+	# 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..."
-+	  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
--	  IFS="$save_ifs"
--	fi
--	if test -n "$finish_eval"; then
--	  # Do the single finish_eval.
--	  eval cmds=\"$finish_eval\"
--	  $run eval "$cmds" || admincmds="$admincmds
--       $cmds"
- 	fi
--      done
--    fi
--
--    # Exit here if they wanted silent mode.
--    test "$show" = : && exit $EXIT_SUCCESS
-+	eval cmds=\"$old_archive_cmds\"
- 
--    $echo "X----------------------------------------------------------------------" | $Xsed
--    $echo "Libraries have been installed in:"
--    for libdir in $libdirs; do
--      $echo "   $libdir"
-+	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
--    $echo
--    $echo "If you ever happen to want to link against installed libraries"
--    $echo "in a given directory, LIBDIR, you must either use libtool, and"
--    $echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
--    $echo "flag during linking and do at least one of the following:"
--    if test -n "$shlibpath_var"; then
--      $echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
--      $echo "     during execution"
--    fi
--    if test -n "$runpath_var"; then
--      $echo "   - add LIBDIR to the \`$runpath_var' environment variable"
--      $echo "     during linking"
--    fi
--    if test -n "$hardcode_libdir_flag_spec"; then
--      libdir=LIBDIR
--      eval flag=\"$hardcode_libdir_flag_spec\"
--
--      $echo "   - use the \`$flag' linker flag"
--    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'"
--    fi
--    $echo
--    $echo "See any operating system documentation about shared libraries for"
--    $echo "more information, such as the ld(1) and ld.so(8) manual pages."
--    $echo "X----------------------------------------------------------------------" | $Xsed
--    exit $EXIT_SUCCESS
--    ;;
--
--  # libtool execute mode
--  execute)
--    modename="$modename: execute"
- 
--    # The first argument is the command name.
--    cmd="$nonopt"
--    if test -z "$cmd"; then
--      $echo "$modename: you must specify a COMMAND" 1>&2
--      $echo "$help"
--      exit $EXIT_FAILURE
--    fi
-+    test -n "$generated" && \
-+      func_show_eval "${RM}r$generated"
- 
--    # Handle -dlopen flags immediately.
--    for file in $execute_dlfiles; do
--      if test ! -f "$file"; then
--	$echo "$modename: \`$file' is not a file" 1>&2
--	$echo "$help" 1>&2
--	exit $EXIT_FAILURE
--      fi
-+    # Now create the libtool archive.
-+    case $output in
-+    *.la)
-+      old_library=
-+      test "$build_old_libs" = yes && old_library="$libname.$libext"
-+      func_verbose "creating $output"
- 
--      dir=
--      case $file in
--      *.la)
--	# Check to see that this really is a libtool archive.
--	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; 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
--	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
--	  $echo "$help" 1>&2
--	  exit $EXIT_FAILURE
-+	  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 "X$relink_command" | $Xsed -e "$sed_quote_subst"`
-+      if test "$hardcode_automatic" = yes ; then
-+	relink_command=
-+      fi
- 
--	# Read the libtool library.
--	dlname=
--	library_names=
-+      # 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=
- 
--	# If there is no directory component, then add one.
--	case $file in
--	*/* | *\\*) . $file ;;
--	*) . ./$file ;;
--	esac
-+	    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
-+	  tdlname=$dlname
-+	  case $host,$output,$installed,$module,$dlname in
-+	    *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
-+# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
-+#
-+# Please DO NOT delete this file!
-+# It is necessary for linking the library.
- 
--	# Skip this library if it cannot be dlopened.
--	if test -z "$dlname"; then
--	  # Warn if it was a shared library.
--	  test -n "$library_names" && $echo "$modename: warning: \`$file' was not linked with \`-export-dynamic'"
--	  continue
--	fi
-+# The name that we can dlopen(3).
-+dlname='$tdlname'
- 
--	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
--	test "X$dir" = "X$file" && dir=.
-+# Names of this library.
-+library_names='$library_names'
- 
--	if test -f "$dir/$objdir/$dlname"; then
--	  dir="$dir/$objdir"
--	else
--	  $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
--	  exit $EXIT_FAILURE
--	fi
--	;;
-+# The name of the static archive.
-+old_library='$old_library'
- 
--      *.lo)
--	# Just add the directory containing the .lo file.
--	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
--	test "X$dir" = "X$file" && dir=.
--	;;
-+# Linker flags that can not go in dependency_libs.
-+inherited_linker_flags='$new_inherited_linker_flags'
- 
--      *)
--	$echo "$modename: warning \`-dlopen' is ignored for non-libtool libraries and objects" 1>&2
--	continue
--	;;
--      esac
-+# Libraries that this one depends upon.
-+dependency_libs='$dependency_libs'
- 
--      # Get the absolute pathname.
--      absdir=`cd "$dir" && pwd`
--      test -n "$absdir" && dir="$absdir"
-+# Names of additional weak libraries provided by this library
-+weak_library_names='$weak_libs'
- 
--      # 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
-+# Version information for $libname.
-+current=$current
-+age=$age
-+revision=$revision
- 
--    # This variable tells wrapper scripts just to set shlibpath_var
--    # rather than running their programs.
--    libtool_execute_magic="$magic"
-+# Is this an already installed library?
-+installed=$installed
- 
--    # Check if any of the arguments is a wrapper script.
--    args=
--    for file
--    do
--      case $file in
--      -*) ;;
--      *)
--	# Do a test to see if this is really a libtool program.
--	if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
--	  # If there is no directory component, then add one.
--	  case $file in
--	  */* | *\\*) . $file ;;
--	  *) . ./$file ;;
--	  esac
-+# Should we warn about portability when linking against -modules?
-+shouldnotlink=$module
- 
--	  # Transform arg to wrapped name.
--	  file="$progdir/$program"
--	fi
--	;;
--      esac
--      # Quote arguments (to preserve shell metacharacters).
--      file=`$echo "X$file" | $Xsed -e "$sed_quote_subst"`
--      args="$args \"$file\""
--    done
-+# Files to dlopen/dlpreopen
-+dlopen='$dlfiles'
-+dlpreopen='$dlprefiles'
- 
--    if test -z "$run"; then
--      if test -n "$shlibpath_var"; then
--	# Export the shlibpath_var.
--	eval "export $shlibpath_var"
--      fi
-+# 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
-+      }
- 
--      # Restore saved environment variables
--      for lt_var in LANG 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
-+      # 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+"$@"}
- 
--      # Now prepare to actually exec the command.
--      exec_cmd="\$cmd$args"
--    else
--      # Display what would be done.
--      if test -n "$shlibpath_var"; then
--	eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\""
--	$echo "export $shlibpath_var"
--      fi
--      $echo "$cmd$args"
--      exit $EXIT_SUCCESS
--    fi
--    ;;
- 
--  # libtool clean and uninstall mode
--  clean | uninstall)
--    modename="$modename: $mode"
--    rm="$nonopt"
-+# func_mode_uninstall arg...
-+func_mode_uninstall ()
-+{
-+    $opt_debug
-+    RM="$nonopt"
-     files=
-     rmforce=
-     exit_status=0
-@@ -6494,30 +8209,28 @@
-     for arg
-     do
-       case $arg in
--      -f) rm="$rm $arg"; rmforce=yes ;;
--      -*) rm="$rm $arg" ;;
-+      -f) RM="$RM $arg"; rmforce=yes ;;
-+      -*) RM="$RM $arg" ;;
-       *) files="$files $arg" ;;
-       esac
-     done
- 
--    if test -z "$rm"; then
--      $echo "$modename: you must specify an RM program" 1>&2
--      $echo "$help" 1>&2
--      exit $EXIT_FAILURE
--    fi
-+    test -z "$RM" && \
-+      func_fatal_help "you must specify an RM program"
- 
-     rmdirs=
- 
-     origobjdir="$objdir"
-     for file in $files; do
--      dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
--      if test "X$dir" = "X$file"; then
--	dir=.
-+      func_dirname "$file" "" "."
-+      dir="$func_dirname_result"
-+      if test "X$dir" = X.; then
- 	objdir="$origobjdir"
-       else
- 	objdir="$dir/$origobjdir"
-       fi
--      name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-+      func_basename "$file"
-+      name="$func_basename_result"
-       test "$mode" = uninstall && objdir="$dir"
- 
-       # Remember objdir for removal later, being careful to avoid duplicates
-@@ -6529,9 +8242,9 @@
-       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
-+      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
-@@ -6545,8 +8258,8 @@
-       case $name in
-       *.la)
- 	# Possibly a libtool archive, so verify it.
--	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
--	  . $dir/$name
-+	if func_lalib_p "$file"; then
-+	  func_source $dir/$name
- 
- 	  # Delete the libtool libraries and symlinks.
- 	  for n in $library_names; do
-@@ -6561,39 +8274,17 @@
- 	    *" $dlname "*) ;;
- 	    *) rmfiles="$rmfiles $objdir/$dlname" ;;
- 	    esac
--	     test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
-+	    test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
- 	    ;;
- 	  uninstall)
- 	    if test -n "$library_names"; then
- 	      # Do each command in the postuninstall commands.
--	      cmds=$postuninstall_cmds
--	      save_ifs="$IFS"; IFS='~'
--	      for cmd in $cmds; do
--		IFS="$save_ifs"
--		eval cmd=\"$cmd\"
--		$show "$cmd"
--		$run eval "$cmd"
--		if test "$?" -ne 0 && test "$rmforce" != yes; then
--		  exit_status=1
--		fi
--	      done
--	      IFS="$save_ifs"
-+	      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.
--	      cmds=$old_postuninstall_cmds
--	      save_ifs="$IFS"; IFS='~'
--	      for cmd in $cmds; do
--		IFS="$save_ifs"
--		eval cmd=\"$cmd\"
--		$show "$cmd"
--		$run eval "$cmd"
--		if test "$?" -ne 0 && test "$rmforce" != yes; then
--		  exit_status=1
--		fi
--	      done
--	      IFS="$save_ifs"
-+	      func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
- 	    fi
- 	    # FIXME: should reinstall the best remaining shared library.
- 	    ;;
-@@ -6603,20 +8294,20 @@
- 
-       *.lo)
- 	# Possibly a libtool object, so verify it.
--	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-+	if func_lalib_p "$file"; then
- 
- 	  # Read the .lo file
--	  . $dir/$name
-+	  func_source $dir/$name
- 
- 	  # Add PIC object to the list of files to remove.
--	  if test -n "$pic_object" \
--	     && test "$pic_object" != none; then
-+	  if test -n "$pic_object" &&
-+	     test "$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
-+	  if test -n "$non_pic_object" &&
-+	     test "$non_pic_object" != none; then
- 	    rmfiles="$rmfiles $dir/$non_pic_object"
- 	  fi
- 	fi
-@@ -6627,17 +8318,26 @@
- 	  noexename=$name
- 	  case $file in
- 	  *.exe)
--	    file=`$echo $file|${SED} 's,.exe$,,'`
--	    noexename=`$echo $name|${SED} 's,.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 (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
--	    relink_command=
--	    . $dir/$noexename
-+	  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
-@@ -6652,239 +8352,38 @@
- 	fi
- 	;;
-       esac
--      $show "$rm $rmfiles"
--      $run $rm $rmfiles || exit_status=1
-+      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
--	$show "rmdir $dir"
--	$run rmdir $dir >/dev/null 2>&1
-+	func_show_eval "rmdir $dir >/dev/null 2>&1"
-       fi
-     done
- 
-     exit $exit_status
--    ;;
-+}
- 
--  "")
--    $echo "$modename: you must specify a MODE" 1>&2
--    $echo "$generic_help" 1>&2
--    exit $EXIT_FAILURE
--    ;;
--  esac
-+{ test "$mode" = uninstall || test "$mode" = clean; } &&
-+    func_mode_uninstall ${1+"$@"}
- 
--  if test -z "$exec_cmd"; then
--    $echo "$modename: invalid operation mode \`$mode'" 1>&2
--    $echo "$generic_help" 1>&2
--    exit $EXIT_FAILURE
--  fi
--fi # test -z "$show_help"
-+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
-+  eval exec "$exec_cmd"
-   exit $EXIT_FAILURE
- fi
- 
--# We need to display help for each of the modes.
--case $mode in
--"") $echo \
--"Usage: $modename [OPTION]... [MODE-ARG]...
--
--Provide generalized library-building support services.
--
--    --config          show all configuration variables
--    --debug           enable verbose shell tracing
---n, --dry-run         display commands without modifying any files
--    --features        display basic configuration information and exit
--    --finish          same as \`--mode=finish'
--    --help            display this help message and exit
--    --mode=MODE       use operation mode MODE [default=inferred from MODE-ARGS]
--    --quiet           same as \`--silent'
--    --silent          don't print informational messages
--    --tag=TAG         use configuration variables from tag TAG
--    --version         print version information
--
--MODE must be one of the following:
--
--      clean           remove files from the build directory
--      compile         compile a source file into a libtool object
--      execute         automatically set library path, then run a program
--      finish          complete the installation of libtool libraries
--      install         install libraries or executables
--      link            create a library or an executable
--      uninstall       remove libraries from an installed directory
--
--MODE-ARGS vary depending on the MODE.  Try \`$modename --help --mode=MODE' for
--a more detailed description of MODE.
--
--Report bugs to <bug-libtool at gnu.org>."
--  exit $EXIT_SUCCESS
--  ;;
--
--clean)
--  $echo \
--"Usage: $modename [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: $modename [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
--  -prefer-pic       try to building PIC objects only
--  -prefer-non-pic   try to building non-PIC objects only
--  -static           always build a \`.o' file suitable for static linking
--
--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: $modename [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: $modename [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: $modename [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 rest of the components are interpreted as arguments to that command (only
--BSD-compatible install options are recognized)."
--  ;;
--
--link)
--  $echo \
--"Usage: $modename [OPTION]... --mode=link LINK-COMMAND...
--
--Link object files or libraries together to form another library, or to
--create an executable program.
-+exit $exit_status
- 
--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
--  -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
--  -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]
--
--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: $modename [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."
--  ;;
--
--*)
--  $echo "$modename: invalid operation mode \`$mode'" 1>&2
--  $echo "$help" 1>&2
--  exit $EXIT_FAILURE
--  ;;
--esac
--
--$echo
--$echo "Try \`$modename --help' for more information about other modes."
--
--exit $?
- 
- # The TAGs below are defined such that we never get into a situation
- # in which we disable both kinds of libraries.  Given conflicting
-@@ -6898,14 +8397,17 @@
- # configuration.  But we'll never go from static-only to shared-only.
- 
- # ### BEGIN LIBTOOL TAG CONFIG: disable-shared
--disable_libs=shared
-+build_libtool_libs=no
-+build_old_libs=yes
- # ### END LIBTOOL TAG CONFIG: disable-shared
- 
- # ### BEGIN LIBTOOL TAG CONFIG: disable-static
--disable_libs=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
-+
-Index: libkml-1.0.1/config/missing
+@@ -5896,6 +5896,7 @@
+ 	  if test "$link_all_deplibs" != no; then
+ 	    # Add the search paths of all dependency libraries
+ 	    for deplib in $dependency_libs; do
++	      path=
+ 	      case $deplib in
+ 	      -L*) path="$deplib" ;;
+ 	      *.la)
+Index: libkml-1.1.0/config/missing
 ===================================================================
---- libkml-1.0.1.orig/config/missing	2009-07-03 01:23:28.000000000 +0200
-+++ libkml-1.0.1/config/missing	2009-12-10 10:19:44.000000000 +0100
+--- libkml-1.1.0.orig/config/missing	2009-12-10 13:05:40.000000000 +0100
++++ libkml-1.1.0/config/missing	2009-12-10 17:29:34.000000000 +0100
 @@ -1,10 +1,10 @@
  #! /bin/sh
  # Common stub for a few missing GNU programs while installing.
  
--scriptversion=2005-06-08.21
+-scriptversion=2006-05-10.23
 +scriptversion=2009-04-28.21; # UTC
  
--# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
 -#   Free Software Foundation, Inc.
 +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
 +# 2008, 2009 Free Software Foundation, Inc.
@@ -23267,33 +1224,7 @@
  
  # As a special exception to the GNU General Public License, if you
  # distribute this file as part of a program that contains a
-@@ -33,6 +31,8 @@
- fi
- 
- run=:
-+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
-+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
- 
- # In the cases where this matters, `missing' is being run in the
- # srcdir already.
-@@ -44,7 +44,7 @@
- 
- msg="missing on your system"
- 
--case "$1" in
-+case $1 in
- --run)
-   # Try to run requested program, and just exit if it succeeds.
-   run=
-@@ -77,6 +77,7 @@
-   aclocal      touch file \`aclocal.m4'
-   autoconf     touch file \`configure'
-   autoheader   touch file \`config.h.in'
-+  autom4te     touch the output file, or create a stub one
-   automake     touch all \`Makefile.in' files
-   bison        create \`y.tab.[ch]', if possible, from existing .[ch]
-   flex         create \`lex.yy.c', if possible, from existing .c
-@@ -86,6 +87,9 @@
+@@ -89,6 +87,9 @@
    tar          try tar, gnutar, gtar, then tar without non-portable flags
    yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
  
@@ -23303,7 +1234,7 @@
  Send bug reports to <bug-automake at gnu.org>."
      exit $?
      ;;
-@@ -103,15 +107,22 @@
+@@ -106,15 +107,22 @@
  
  esac
  
@@ -23316,11 +1247,10 @@
  # Now exit if we have it, but it failed.  Also exit now if we
  # don't have it and --version was passed (most likely to detect
 -# the program).
--case "$1" in
--  lex|yacc)
 +# the program).  This is about non-GNU programs, so use $1 not
 +# $program.
-+case $1 in
+ case $1 in
+-  lex|yacc)
 +  lex*|yacc*)
      # Not GNU programs, they don't have --version.
      ;;
@@ -23330,16 +1260,16 @@
      if test -n "$run"; then
         echo 1>&2 "ERROR: \`tar' requires --run"
         exit 1
-@@ -135,7 +146,7 @@
+@@ -138,7 +146,7 @@
  
  # If it does not exist, or fails to run (possibly an outdated version),
  # try to emulate it.
--case "$1" in
+-case $1 in
 +case $program in
    aclocal*)
      echo 1>&2 "\
  WARNING: \`$1' is $msg.  You should only need it if
-@@ -145,7 +156,7 @@
+@@ -148,7 +156,7 @@
      touch aclocal.m4
      ;;
  
@@ -23348,7 +1278,7 @@
      echo 1>&2 "\
  WARNING: \`$1' is $msg.  You should only need it if
           you modified \`${configure_ac}'.  You might want to install the
-@@ -154,7 +165,7 @@
+@@ -157,7 +165,7 @@
      touch configure
      ;;
  
@@ -23357,16 +1287,7 @@
      echo 1>&2 "\
  WARNING: \`$1' is $msg.  You should only need it if
           you modified \`acconfig.h' or \`${configure_ac}'.  You might want
-@@ -164,7 +175,7 @@
-     test -z "$files" && files="config.h"
-     touch_files=
-     for f in $files; do
--      case "$f" in
-+      case $f in
-       *:*) touch_files="$touch_files "`echo "$f" |
- 				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
-       *) touch_files="$touch_files $f.in";;
-@@ -184,7 +195,7 @@
+@@ -187,7 +195,7 @@
  	   while read f; do touch "$f"; done
      ;;
  
@@ -23375,18 +1296,7 @@
      echo 1>&2 "\
  WARNING: \`$1' is needed, but is $msg.
           You might have modified some files without having the
-@@ -192,8 +203,8 @@
-          You can get \`$1' as part of \`Autoconf' from any GNU
-          archive site."
- 
--    file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
--    test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
-+    file=`echo "$*" | sed -n "$sed_output"`
-+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-     if test -f "$file"; then
- 	touch $file
-     else
-@@ -207,80 +218,78 @@
+@@ -210,7 +218,7 @@
      fi
      ;;
  
@@ -23395,36 +1305,8 @@
      echo 1>&2 "\
  WARNING: \`$1' $msg.  You should only need it if
           you modified a \`.y' file.  You may need the \`Bison' package
-          in order for those modifications to take effect.  You can get
-          \`Bison' from any GNU archive site."
-     rm -f y.tab.c y.tab.h
--    if [ $# -ne 1 ]; then
-+    if test $# -ne 1; then
-         eval LASTARG="\${$#}"
--	case "$LASTARG" in
-+	case $LASTARG in
- 	*.y)
- 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
--	    if [ -f "$SRCFILE" ]; then
-+	    if test -f "$SRCFILE"; then
- 	         cp "$SRCFILE" y.tab.c
- 	    fi
- 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
--	    if [ -f "$SRCFILE" ]; then
-+	    if test -f "$SRCFILE"; then
- 	         cp "$SRCFILE" y.tab.h
- 	    fi
- 	  ;;
- 	esac
+@@ -240,7 +248,7 @@
      fi
--    if [ ! -f y.tab.h ]; then
-+    if test ! -f y.tab.h; then
- 	echo >y.tab.h
-     fi
--    if [ ! -f y.tab.c ]; then
-+    if test ! -f y.tab.c; then
- 	echo 'main() { return 0; }' >y.tab.c
-     fi
      ;;
  
 -  lex|flex)
@@ -23432,27 +1314,8 @@
      echo 1>&2 "\
  WARNING: \`$1' is $msg.  You should only need it if
           you modified a \`.l' file.  You may need the \`Flex' package
-          in order for those modifications to take effect.  You can get
-          \`Flex' from any GNU archive site."
-     rm -f lex.yy.c
--    if [ $# -ne 1 ]; then
-+    if test $# -ne 1; then
-         eval LASTARG="\${$#}"
--	case "$LASTARG" in
-+	case $LASTARG in
- 	*.l)
- 	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
--	    if [ -f "$SRCFILE" ]; then
-+	    if test -f "$SRCFILE"; then
- 	         cp "$SRCFILE" lex.yy.c
- 	    fi
- 	  ;;
- 	esac
+@@ -263,7 +271,7 @@
      fi
--    if [ ! -f lex.yy.c ]; then
-+    if test ! -f lex.yy.c; then
- 	echo 'main() { return 0; }' >lex.yy.c
-     fi
      ;;
  
 -  help2man)
@@ -23460,18 +1323,7 @@
      echo 1>&2 "\
  WARNING: \`$1' is $msg.  You should only need it if
  	 you modified a dependency of a manual page.  You may need the
- 	 \`Help2man' package in order for those modifications to take
- 	 effect.  You can get \`Help2man' from any GNU archive site."
- 
--    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
--    if test -z "$file"; then
--	file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
--    fi
--    if [ -f "$file" ]; then
-+    file=`echo "$*" | sed -n "$sed_output"`
-+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-+    if test -f "$file"; then
- 	touch $file
+@@ -277,11 +285,11 @@
      else
  	test -z "$file" || exec >$file
  	echo ".ab help2man is required to generate this page"
@@ -23485,27 +1337,7 @@
      echo 1>&2 "\
  WARNING: \`$1' is $msg.  You should only need it if
           you modified a \`.texi' or \`.texinfo' file, or any other file
-@@ -289,11 +298,17 @@
-          DU, IRIX).  You might want to install the \`Texinfo' package or
-          the \`GNU make' package.  Grab either from any GNU archive site."
-     # The file to touch is that specified with -o ...
--    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-+    file=`echo "$*" | sed -n "$sed_output"`
-+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-     if test -z "$file"; then
-       # ... or it is the one specified with @setfilename ...
-       infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
--      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
-+      file=`sed -n '
-+	/^@setfilename/{
-+	  s/.* \([^ ]*\) *$/\1/
-+	  p
-+	  q
-+	}' $infile`
-       # ... or it is derived from the source name (dir/f.texi becomes f.info)
-       test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
-     fi
-@@ -303,7 +318,7 @@
+@@ -310,7 +318,7 @@
      touch $file
      ;;
  
@@ -23514,23 +1346,7 @@
      shift
  
      # We have already tried tar in the generic part.
-@@ -317,13 +332,13 @@
-     fi
-     firstarg="$1"
-     if shift; then
--	case "$firstarg" in
-+	case $firstarg in
- 	*o*)
- 	    firstarg=`echo "$firstarg" | sed s/o//`
- 	    tar "$firstarg" "$@" && exit 0
- 	    ;;
- 	esac
--	case "$firstarg" in
-+	case $firstarg in
- 	*h*)
- 	    firstarg=`echo "$firstarg" | sed s/h//`
- 	    tar "$firstarg" "$@" && exit 0
-@@ -356,5 +371,6 @@
+@@ -363,5 +371,6 @@
  # eval: (add-hook 'write-file-hooks 'time-stamp)
  # time-stamp-start: "scriptversion="
  # time-stamp-format: "%:y-%02m-%02d.%02H"
@@ -23538,22 +1354,11 @@
 +# time-stamp-time-zone: "UTC"
 +# time-stamp-end: "; # UTC"
  # End:
-Index: libkml-1.0.1/config.h.in
+Index: libkml-1.1.0/config.h.in
 ===================================================================
---- libkml-1.0.1.orig/config.h.in	2009-07-03 01:24:35.000000000 +0200
-+++ libkml-1.0.1/config.h.in	2009-12-10 10:19:43.000000000 +0100
-@@ -61,6 +61,10 @@
- /* Define to 1 if the system has the type `_Bool'. */
- #undef HAVE__BOOL
- 
-+/* Define to the sub-directory in which libtool stores uninstalled libraries.
-+   */
-+#undef LT_OBJDIR
-+
- /* Name of package */
- #undef PACKAGE
- 
-@@ -76,6 +80,9 @@
+--- libkml-1.1.0.orig/config.h.in	2009-12-10 13:05:40.000000000 +0100
++++ libkml-1.1.0/config.h.in	2009-12-10 17:29:33.000000000 +0100
+@@ -80,6 +80,9 @@
  /* Define to the one symbol short name of this package. */
  #undef PACKAGE_TARNAME
  
@@ -23563,28 +1368,21 @@
  /* Define to the version of this package. */
  #undef PACKAGE_VERSION
  
-@@ -97,5 +104,5 @@
- /* Define to rpl_malloc if the replacement function should be used. */
- #undef malloc
- 
--/* Define to `unsigned' if <sys/types.h> does not define. */
-+/* Define to `unsigned int' if <sys/types.h> does not define. */
- #undef size_t
-Index: libkml-1.0.1/configure
+Index: libkml-1.1.0/configure
 ===================================================================
---- libkml-1.0.1.orig/configure	2009-07-03 01:23:24.000000000 +0200
-+++ libkml-1.0.1/configure	2009-12-10 10:19:42.000000000 +0100
-@@ -1,83 +1,418 @@
+--- libkml-1.1.0.orig/configure	2009-12-10 13:05:40.000000000 +0100
++++ libkml-1.1.0/configure	2009-12-10 17:29:31.000000000 +0100
+@@ -1,20 +1,24 @@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.59 for libkml 1.0.1.
-+# Generated by GNU Autoconf 2.65 for libkml 1.0.1.
+-# Generated by GNU Autoconf 2.63 for libkml 1.1.0.
++# Generated by GNU Autoconf 2.65 for libkml 1.1.0.
  #
  # Report bugs to <http://code.google.com/p/libkml/issues>.
  #
--# Copyright (C) 2003 Free Software Foundation, Inc.
 +#
-+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+-# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
 +# Inc.
 +#
@@ -23598,43 +1396,47 @@
 +## M4sh Initialization. ##
 +## -------------------- ##
  
--# Be Bourne compatible
+ # Be more Bourne compatible
+ DUALCASE=1; export DUALCASE # for MKS sh
 -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-+# Be more Bourne compatible
-+DUALCASE=1; export DUALCASE # for MKS sh
 +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
    emulate sh
    NULLCMD=:
--  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-   # is contrary to our usage.  Disable this feature.
+   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+@@ -22,23 +26,15 @@
    alias -g '${1+"$@"}'='"$@"'
--elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
--  set -o posix
-+  setopt NO_GLOB_SUBST
-+else
+   setopt NO_GLOB_SUBST
+ else
+-  case `(set -o) 2>/dev/null` in
+-  *posix*) set -o posix ;;
 +  case `(set -o) 2>/dev/null` in #(
 +  *posix*) :
 +    set -o posix ;; #(
 +  *) :
 +     ;;
-+esac
+ esac
+-
  fi
--DUALCASE=1; export DUALCASE # for MKS sh
  
--# Support unset when possible.
--if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
--  as_unset=unset
--else
--  as_unset=false
-+
-+as_nl='
-+'
-+export as_nl
-+# Printing a long string crashes Solaris 7 /usr/bin/printf.
-+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+ 
+-
+-
+-# PATH needs CR
+-# Avoid depending upon Character Ranges.
+-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+-as_cr_digits='0123456789'
+-as_cr_alnum=$as_cr_Letters$as_cr_digits
+-
+ as_nl='
+ '
+ export as_nl
+@@ -46,7 +42,13 @@
+ as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+ as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
 +# Prefer a ksh shell builtin over an external printf program on Solaris,
 +# but without wasting forks for bash or zsh.
 +if test -z "$BASH_VERSION$ZSH_VERSION" \
@@ -23642,73 +1444,62 @@
 +  as_echo='print -r --'
 +  as_echo_n='print -rn --'
 +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-+  as_echo='printf %s\n'
-+  as_echo_n='printf %s'
-+else
-+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-+    as_echo_n='/usr/ucb/echo -n'
-+  else
-+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-+    as_echo_n_body='eval
-+      arg=$1;
+   as_echo='printf %s\n'
+   as_echo_n='printf %s'
+ else
+@@ -57,7 +59,7 @@
+     as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+     as_echo_n_body='eval
+       arg=$1;
+-      case $arg in
 +      case $arg in #(
-+      *"$as_nl"*)
-+	expr "X$arg" : "X\\(.*\\)$as_nl";
-+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-+      esac;
-+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-+    '
-+    export as_echo_n_body
-+    as_echo_n='sh -c $as_echo_n_body as_echo'
-+  fi
-+  export as_echo_body
-+  as_echo='sh -c $as_echo_body as_echo'
+       *"$as_nl"*)
+ 	expr "X$arg" : "X\\(.*\\)$as_nl";
+ 	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+@@ -80,13 +82,6 @@
+   }
  fi
  
-+# The user is always right.
-+if test "${PATH_SEPARATOR+set}" != set; then
-+  PATH_SEPARATOR=:
-+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-+      PATH_SEPARATOR=';'
-+  }
-+fi
-+
-+
-+# IFS
-+# We need space, tab and new line, in precisely that order.  Quoting is
-+# there to prevent editors from complaining about space-tab.
-+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-+# splitting by setting IFS to empty value.)
-+IFS=" ""	$as_nl"
-+
-+# Find who we are.  Look in the path if we contain no directory separator.
+-# Support unset when possible.
+-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+-  as_unset=unset
+-else
+-  as_unset=false
+-fi
+-
+ 
+ # IFS
+ # We need space, tab and new line, in precisely that order.  Quoting is
+@@ -96,15 +91,15 @@
+ IFS=" ""	$as_nl"
+ 
+ # Find who we are.  Look in the path if we contain no directory separator.
+-case $0 in
 +case $0 in #((
-+  *[\\/]* ) as_myself=$0 ;;
-+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
+   *[\\/]* ) as_myself=$0 ;;
+   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+-done
 +    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
 +  done
-+IFS=$as_save_IFS
+ IFS=$as_save_IFS
  
--# Work around bugs in pre-3.0 UWIN ksh.
--$as_unset ENV MAIL MAILPATH
-+     ;;
-+esac
-+# We did not find ourselves, most probably we were run as `sh COMMAND'
-+# in which case we are not to be found in the path.
-+if test "x$as_myself" = x; then
-+  as_myself=$0
-+fi
-+if test ! -f "$as_myself"; then
-+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+      ;;
+@@ -116,12 +111,16 @@
+ fi
+ if test ! -f "$as_myself"; then
+   $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+-  { (exit 1); exit 1; }
 +  exit 1
-+fi
-+
+ fi
+ 
+-# Work around bugs in pre-3.0 UWIN ksh.
+-for as_var in ENV MAIL MAILPATH
+-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
 +# Unset variables that we do not need and which cause bugs (e.g. in
 +# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
 +# suppresses any "Segmentation fault" message there.  '((' could
@@ -23716,21 +1507,14 @@
 +for as_var in BASH_ENV ENV MAIL MAILPATH
 +do eval test x\${$as_var+set} = xset \
 +  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-+done
+ done
  PS1='$ '
  PS2='> '
- PS4='+ '
+@@ -133,7 +132,249 @@
+ LANGUAGE=C
+ export LANGUAGE
  
- # NLS nuisances.
--for as_var in \
--  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
--  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
--  LC_TELEPHONE LC_TIME
-+LC_ALL=C
-+export LC_ALL
-+LANGUAGE=C
-+export LANGUAGE
-+
+-# Required to use basename.
 +# CDPATH.
 +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 +
@@ -23784,12 +1568,7 @@
 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +as_found=false
 +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
- do
--  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
--    eval $as_var=C; export $as_var
--  else
--    $as_unset $as_var
--  fi
++do
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +  as_found=:
@@ -23808,7 +1587,7 @@
 +	   done;;
 +       esac
 +  as_found=false
- done
++done
 +$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
 +	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
 +  CONFIG_SHELL=$SHELL as_have_required=yes
@@ -23978,20 +1757,11 @@
 +  $as_echo "$as_me: error: $1" >&2
 +  as_fn_exit $as_status
 +} # as_fn_error
- 
--# Required to use basename.
--if expr a : '\(a\)' >/dev/null 2>&1; then
-+if expr a : '\(a\)' >/dev/null 2>&1 &&
-+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
++
+ if expr a : '\(a\)' >/dev/null 2>&1 &&
+    test "X`expr 00001 : '.*\(...\)'`" = X001; then
    as_expr=expr
- else
-   as_expr=false
- fi
- 
--if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-   as_basename=basename
- else
+@@ -147,8 +388,12 @@
    as_basename=false
  fi
  
@@ -24002,121 +1772,29 @@
 +fi
  
 -# Name of the executable.
--as_me=`$as_basename "$0" ||
-+as_me=`$as_basename -- "$0" ||
+ as_me=`$as_basename -- "$0" ||
  $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
  	 X"$0" : 'X\(//\)$' \| \
--	 X"$0" : 'X\(/\)$' \| \
--	 .     : '\(.\)' 2>/dev/null ||
--echo X/"$0" |
--    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
--  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
--  	  /^X\/\(\/\).*/{ s//\1/; q; }
--  	  s/.*/./; q'`
-+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-+$as_echo X/"$0" |
-+    sed '/^.*\/\([^/][^/]*\)\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\/\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\/\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
+@@ -168,409 +413,120 @@
+ 	  }
+ 	  s/.*/./; q'`
  
--
--# PATH needs CR, and LINENO needs CR and PATH.
- # Avoid depending upon Character Ranges.
- as_cr_letters='abcdefghijklmnopqrstuvwxyz'
- as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-@@ -85,146 +420,107 @@
- as_cr_digits='0123456789'
- as_cr_alnum=$as_cr_Letters$as_cr_digits
+-# CDPATH.
+-$as_unset CDPATH
++# Avoid depending upon Character Ranges.
++as_cr_letters='abcdefghijklmnopqrstuvwxyz'
++as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
++as_cr_Letters=$as_cr_letters$as_cr_LETTERS
++as_cr_digits='0123456789'
++as_cr_alnum=$as_cr_Letters$as_cr_digits
  
--# The user is always right.
--if test "${PATH_SEPARATOR+set}" != set; then
--  echo "#! /bin/sh" >conf$$.sh
--  echo  "exit 0"   >>conf$$.sh
--  chmod +x conf$$.sh
--  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
--    PATH_SEPARATOR=';'
--  else
--    PATH_SEPARATOR=:
--  fi
--  rm -f conf$$.sh
--fi
--
--
--  as_lineno_1=$LINENO
--  as_lineno_2=$LINENO
--  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
--  test "x$as_lineno_1" != "x$as_lineno_2" &&
--  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
--  # Find who we are.  Look in the path if we contain no path at all
--  # relative or not.
--  case $0 in
--    *[\\/]* ) as_myself=$0 ;;
--    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
--done
--
--       ;;
--  esac
--  # We did not find ourselves, most probably we were run as `sh COMMAND'
--  # in which case we are not to be found in the path.
--  if test "x$as_myself" = x; then
--    as_myself=$0
--  fi
--  if test ! -f "$as_myself"; then
--    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
--   { (exit 1); exit 1; }; }
--  fi
--  case $CONFIG_SHELL in
--  '')
--    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  for as_base in sh bash ksh sh5; do
--	 case $as_dir in
--	 /*)
--	   if ("$as_dir/$as_base" -c '
--  as_lineno_1=$LINENO
--  as_lineno_2=$LINENO
--  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
--  test "x$as_lineno_1" != "x$as_lineno_2" &&
--  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
--	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
--	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
--	     CONFIG_SHELL=$as_dir/$as_base
--	     export CONFIG_SHELL
--	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
--	   fi;;
--	 esac
--       done
--done
--;;
--  esac
  
--  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
--  # uniformly replaced by the line number.  The first 'sed' inserts a
--  # line-number line before each line; the second 'sed' does the real
--  # work.  The second script uses 'N' to pair each line-number line
--  # with the numbered line, and appends trailing '-' during
--  # substitution so that $LINENO is not a special case at line end.
--  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
--  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
--  sed '=' <$as_myself |
+-if test "x$CONFIG_SHELL" = x; then
+-  if (eval ":") 2>/dev/null; then
+-  as_have_required=yes
+-else
+-  as_have_required=no
+-fi
 +  as_lineno_1=$LINENO as_lineno_1a=$LINENO
 +  as_lineno_2=$LINENO as_lineno_2a=$LINENO
 +  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
@@ -24126,44 +1804,50 @@
 +    p
 +    /[$]LINENO/=
 +  ' <$as_myself |
-     sed '
++    sed '
 +      s/[$]LINENO.*/&-/
 +      t lineno
 +      b
 +      :lineno
-       N
--      s,$,-,
--      : loop
--      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
++      N
 +      :loop
 +      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-       t loop
--      s,-$,,
--      s,^['$as_cr_digits']*\n,,
++      t loop
 +      s/-\n.*//
-     ' >$as_me.lineno &&
--  chmod +x $as_me.lineno ||
--    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
--   { (exit 1); exit 1; }; }
++    ' >$as_me.lineno &&
 +  chmod +x "$as_me.lineno" ||
 +    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
  
-   # Don't try to exec as it changes $[0], causing all sort of problems
-   # (the dirname of $[0] is not the place where we might find the
--  # original and so on.  Autoconf is especially sensible to this).
--  . ./$as_me.lineno
+-  if test $as_have_required = yes &&	 (eval ":
+-(as_func_return () {
+-  (exit \$1)
+-}
+-as_func_success () {
+-  as_func_return 0
+-}
+-as_func_failure () {
+-  as_func_return 1
+-}
+-as_func_ret_success () {
+-  return 0
+-}
+-as_func_ret_failure () {
+-  return 1
++  # Don't try to exec as it changes $[0], causing all sort of problems
++  # (the dirname of $[0] is not the place where we might find the
 +  # original and so on.  Autoconf is especially sensitive to this).
 +  . "./$as_me.lineno"
-   # Exit status is that of the last command.
-   exit
++  # Exit status is that of the last command.
++  exit
  }
  
--
--case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
--  *c*,-n*) ECHO_N= ECHO_C='
--' ECHO_T='	' ;;
--  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
--  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
+-exitcode=0
+-if as_func_success; then
+-  :
+-else
+-  exitcode=1
+-  echo as_func_success failed.
+-fi
 +ECHO_C= ECHO_N= ECHO_T=
 +case `echo -n x` in #(((((
 +-n*)
@@ -24175,31 +1859,24 @@
 +  esac;;
 +*)
 +  ECHO_N='-n';;
- esac
++esac
  
--if expr a : '\(a\)' >/dev/null 2>&1; then
--  as_expr=expr
+-if as_func_failure; then
+-  exitcode=1
+-  echo as_func_failure succeeded.
 +rm -f conf$$ conf$$.exe conf$$.file
 +if test -d conf$$.dir; then
 +  rm -f conf$$.dir/conf$$.file
- else
--  as_expr=false
++else
 +  rm -f conf$$.dir
 +  mkdir conf$$.dir 2>/dev/null
  fi
 -
--rm -f conf$$ conf$$.exe conf$$.file
--echo >conf$$.file
--if ln -s conf$$.file conf$$ 2>/dev/null; then
--  # We could just check for DJGPP; but this test a) works b) is more generic
--  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
--  if test -f conf$$.exe; then
--    # Don't use ln at all; we don't have any links
--    as_ln_s='cp -p'
--  else
+-if as_func_ret_success; then
+-  :
 +if (echo >conf$$.file) 2>/dev/null; then
 +  if ln -s conf$$.file conf$$ 2>/dev/null; then
-     as_ln_s='ln -s'
++    as_ln_s='ln -s'
 +    # ... but there are two gotchas:
 +    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
 +    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
@@ -24210,28 +1887,32 @@
 +    as_ln_s=ln
 +  else
 +    as_ln_s='cp -p'
-   fi
--elif ln conf$$.file conf$$ 2>/dev/null; then
--  as_ln_s=ln
++  fi
  else
-   as_ln_s='cp -p'
+-  exitcode=1
+-  echo as_func_ret_success failed.
++  as_ln_s='cp -p'
  fi
--rm -f conf$$ conf$$.exe conf$$.file
 +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 +rmdir conf$$.dir 2>/dev/null
  
- if mkdir -p . 2>/dev/null; then
--  as_mkdir_p=:
+-if as_func_ret_failure; then
+-  exitcode=1
+-  echo as_func_ret_failure succeeded.
++if mkdir -p . 2>/dev/null; then
 +  as_mkdir_p='mkdir -p "$as_dir"'
- else
-   test -d ./-p && rmdir ./-p
-   as_mkdir_p=false
++else
++  test -d ./-p && rmdir ./-p
++  as_mkdir_p=false
  fi
  
--as_executable_p="test -f"
+-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
+-  :
 +if test -x / >/dev/null 2>&1; then
 +  as_test_x='test -x'
-+else
+ else
+-  exitcode=1
+-  echo positional parameters were not saved.
 +  if ls -dL / >/dev/null 2>&1; then
 +    as_ls_L_option=L
 +  else
@@ -24249,789 +1930,449 @@
 +	???[sx]*):;;*)false;;esac;fi
 +    '\'' sh
 +  '
-+fi
+ fi
 +as_executable_p=$as_test_x
  
- # Sed expression to map a string onto a valid CPP name.
- as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -233,36 +529,26 @@
- as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
- 
- 
--# IFS
--# We need space, tab and new line, in precisely that order.
--as_nl='
--'
--IFS=" 	$as_nl"
+-test \$exitcode = 0) || { (exit 1); exit 1; }
 -
--# CDPATH.
--$as_unset CDPATH
+-(
+-  as_lineno_1=\$LINENO
+-  as_lineno_2=\$LINENO
+-  test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
+-  test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
+-") 2> /dev/null; then
+-  :
+-else
+-  as_candidate_shells=
+-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  case $as_dir in
+-	 /*)
+-	   for as_base in sh bash ksh sh5; do
+-	     as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
+-	   done;;
+-       esac
+-done
+-IFS=$as_save_IFS
 -
 -
- 
- # Check that we are running under the correct shell.
- SHELL=${CONFIG_SHELL-/bin/sh}
- 
--case X$ECHO in
-+case X$lt_ECHO in
- X*--fallback-echo)
-   # Remove one level of quotation (which was required for Make).
--  ECHO=`echo "$ECHO" | sed 's,\\\\\$\\$0,'$0','`
-+  ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','`
-   ;;
- esac
- 
--echo=${ECHO-echo}
-+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!
-+elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
-+  # Yippee, $ECHO works!
-   :
- else
-   # Restart under the correct shell.
-@@ -272,9 +558,9 @@
- if test "X$1" = X--fallback-echo; then
-   # used as fallback echo
-   shift
--  cat <<EOF
-+  cat <<_LT_EOF
- $*
--EOF
-+_LT_EOF
-   exit 0
- fi
- 
-@@ -282,143 +568,135 @@
- # if CDPATH is set.
- (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
- 
--if test -z "$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 &&
--       echo_test_string=`eval $cmd` &&
--       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
--    then
--      break
--    fi
--  done
+-      for as_shell in $as_candidate_shells $SHELL; do
+-	 # Try only shells that exist, to save several forks.
+-	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+-		{ ("$as_shell") 2> /dev/null <<\_ASEOF
+-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+-  emulate sh
+-  NULLCMD=:
+-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+-  # is contrary to our usage.  Disable this feature.
+-  alias -g '${1+"$@"}'='"$@"'
+-  setopt NO_GLOB_SUBST
+-else
+-  case `(set -o) 2>/dev/null` in
+-  *posix*) set -o posix ;;
+-esac
+-
 -fi
-+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
+-
+-
+-:
+-_ASEOF
+-}; then
+-  CONFIG_SHELL=$as_shell
+-	       as_have_required=yes
+-	       if { "$as_shell" 2> /dev/null <<\_ASEOF
+-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+-  emulate sh
+-  NULLCMD=:
+-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+-  # is contrary to our usage.  Disable this feature.
+-  alias -g '${1+"$@"}'='"$@"'
+-  setopt NO_GLOB_SUBST
+-else
+-  case `(set -o) 2>/dev/null` in
+-  *posix*) set -o posix ;;
+-esac
+-
+-fi
+-
+-
+-:
+-(as_func_return () {
+-  (exit $1)
+-}
+-as_func_success () {
+-  as_func_return 0
+-}
+-as_func_failure () {
+-  as_func_return 1
+-}
+-as_func_ret_success () {
+-  return 0
+-}
+-as_func_ret_failure () {
+-  return 1
+-}
+-
+-exitcode=0
+-if as_func_success; 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.
-+  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
-+    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 -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
+-  exitcode=1
+-  echo as_func_success failed.
+-fi
+-
+-if as_func_failure; then
+-  exitcode=1
+-  echo as_func_failure succeeded.
+-fi
+-
+-if as_func_ret_success; then
+-  :
+-else
+-  exitcode=1
+-  echo as_func_ret_success failed.
+-fi
+-
+-if as_func_ret_failure; then
+-  exitcode=1
+-  echo as_func_ret_failure succeeded.
+-fi
+-
+-if ( set x; as_func_ret_success y && test x = "$1" ); then
+-  :
+-else
+-  exitcode=1
+-  echo positional parameters were not saved.
+-fi
+-
+-test $exitcode = 0) || { (exit 1); exit 1; }
+-
+-(
+-  as_lineno_1=$LINENO
+-  as_lineno_2=$LINENO
+-  test "x$as_lineno_1" != "x$as_lineno_2" &&
+-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
+-
+-_ASEOF
+-}; then
+-  break
+-fi
+-
+-fi
+-
+-      done
+-
+-      if test "x$CONFIG_SHELL" != x; then
+-  for as_var in BASH_ENV ENV
+-	do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+-	done
 -	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` &&
-+    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
--	echo="$CONFIG_SHELL $0 --fallback-echo"
+-	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+-fi
+-
+-
+-    if test $as_have_required = no; then
+-  echo This script requires a shell more modern than all the
+-      echo shells that I found on your system.  Please install a
+-      echo modern shell, or manually run the script under such a
+-      echo shell if you do have one.
+-      { (exit 1); exit 1; }
+-fi
+-
+-
+-fi
+-
+-fi
+-
+-
+-
+-(eval "as_func_return () {
+-  (exit \$1)
+-}
+-as_func_success () {
+-  as_func_return 0
+-}
+-as_func_failure () {
+-  as_func_return 1
+-}
+-as_func_ret_success () {
+-  return 0
+-}
+-as_func_ret_failure () {
+-  return 1
+-}
+-
+-exitcode=0
+-if as_func_success; then
+-  :
+-else
+-  exitcode=1
+-  echo as_func_success failed.
+-fi
+-
+-if as_func_failure; then
+-  exitcode=1
+-  echo as_func_failure succeeded.
+-fi
+-
+-if as_func_ret_success; then
+-  :
+-else
+-  exitcode=1
+-  echo as_func_ret_success failed.
+-fi
+-
+-if as_func_ret_failure; then
+-  exitcode=1
+-  echo as_func_ret_failure succeeded.
+-fi
+-
+-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
+-  :
+-else
+-  exitcode=1
+-  echo positional parameters were not saved.
+-fi
+-
+-test \$exitcode = 0") || {
+-  echo No shell found that supports shell functions.
+-  echo Please tell bug-autoconf at gnu.org about your system,
+-  echo including any error possibly output before this message.
+-  echo This can help us improve future autoconf versions.
+-  echo Configuration will now proceed without shell functions.
+-}
+-
+-
+-
+-  as_lineno_1=$LINENO
+-  as_lineno_2=$LINENO
+-  test "x$as_lineno_1" != "x$as_lineno_2" &&
+-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
+-
+-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+-  # uniformly replaced by the line number.  The first 'sed' inserts a
+-  # line-number line after each line using $LINENO; the second 'sed'
+-  # does the real work.  The second script uses 'N' to pair each
+-  # line-number line with the line containing $LINENO, and appends
+-  # trailing '-' during substitution so that $LINENO is not a special
+-  # case at line end.
+-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+-  # scripts with optimization help from Paolo Bonzini.  Blame Lee
+-  # E. McMahon (1931-1989) for sed's syntax.  :-)
+-  sed -n '
+-    p
+-    /[$]LINENO/=
+-  ' <$as_myself |
+-    sed '
+-      s/[$]LINENO.*/&-/
+-      t lineno
+-      b
+-      :lineno
+-      N
+-      :loop
+-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+-      t loop
+-      s/-\n.*//
+-    ' >$as_me.lineno &&
+-  chmod +x "$as_me.lineno" ||
+-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+-   { (exit 1); exit 1; }; }
+-
+-  # Don't try to exec as it changes $[0], causing all sort of problems
+-  # (the dirname of $[0] is not the place where we might find the
+-  # original and so on.  Autoconf is especially sensitive to this).
+-  . "./$as_me.lineno"
+-  # Exit status is that of the last command.
+-  exit
+-}
+-
+-
+-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+-  as_dirname=dirname
+-else
+-  as_dirname=false
+-fi
+-
+-ECHO_C= ECHO_N= ECHO_T=
+-case `echo -n x` in
+--n*)
+-  case `echo 'x\c'` in
+-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+-  *)   ECHO_C='\c';;
+-  esac;;
+-*)
+-  ECHO_N='-n';;
+-esac
+-if expr a : '\(a\)' >/dev/null 2>&1 &&
+-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+-  as_expr=expr
+-else
+-  as_expr=false
+-fi
+-
+-rm -f conf$$ conf$$.exe conf$$.file
+-if test -d conf$$.dir; then
+-  rm -f conf$$.dir/conf$$.file
+-else
+-  rm -f conf$$.dir
+-  mkdir conf$$.dir 2>/dev/null
+-fi
+-if (echo >conf$$.file) 2>/dev/null; then
+-  if ln -s conf$$.file conf$$ 2>/dev/null; then
+-    as_ln_s='ln -s'
+-    # ... but there are two gotchas:
+-    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+-    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+-    # In both cases, we have to default to `cp -p'.
+-    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+-      as_ln_s='cp -p'
+-  elif ln conf$$.file conf$$ 2>/dev/null; then
+-    as_ln_s=ln
+-  else
+-    as_ln_s='cp -p'
+-  fi
+-else
+-  as_ln_s='cp -p'
+-fi
+-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+-rmdir conf$$.dir 2>/dev/null
+-
+-if mkdir -p . 2>/dev/null; then
+-  as_mkdir_p=:
+-else
+-  test -d ./-p && rmdir ./-p
+-  as_mkdir_p=false
+-fi
+-
+-if test -x / >/dev/null 2>&1; then
+-  as_test_x='test -x'
+-else
+-  if ls -dL / >/dev/null 2>&1; then
+-    as_ls_L_option=L
+-  else
+-    as_ls_L_option=
+-  fi
+-  as_test_x='
+-    eval sh -c '\''
+-      if test -d "$1"; then
+-	test -d "$1/.";
 -      else
--	# maybe with a smaller string...
--	prev=:
-+	  # 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=:
+-	case $1 in
+-	-*)set "./$1";;
+-	esac;
+-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+-	???[sx]*):;;*)false;;esac;fi
+-    '\'' sh
+-  '
+-fi
+-as_executable_p=$as_test_x
+-
+-# Sed expression to map a string onto a valid CPP name.
+-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+-
+-# Sed expression to map a string onto a valid variable name.
+-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
++# Sed expression to map a string onto a valid CPP name.
++as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
  
--	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
-+	  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
++# Sed expression to map a string onto a valid variable name.
++as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
  
--	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
-+	  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
--fi
  
- # Copy echo and quote the copy suitably for passing to libtool from
- # the Makefile, instead of quoting the original, which is used later.
--ECHO=$echo
--if test "X$ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
--   ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
-+lt_ECHO=$ECHO
-+if test "X$lt_ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
-+   lt_ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
- fi
  
+@@ -722,7 +678,8 @@
  
  
  
--tagnames=${tagnames+${tagnames},}CXX
--
--tagnames=${tagnames+${tagnames},}F77
+-exec 7<&0 </dev/null 6>&1
 +test -n "$DJDIR" || exec 7<&0 </dev/null
 +exec 6>&1
  
  # Name of the host.
  # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
- # so uname gets run too.
- ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
- 
--exec 6>&1
--
- #
- # Initializations.
- #
- ac_default_prefix=/usr/local
-+ac_clean_files=
- ac_config_libobj_dir=.
-+LIBOBJS=
- cross_compiling=no
+@@ -740,7 +697,6 @@
  subdirs=
  MFLAGS=
  MAKEFLAGS=
 -SHELL=${CONFIG_SHELL-/bin/sh}
--
--# Maximum number of lines to put in a shell here document.
--# This variable seems obsolete.  It should probably be removed, and
--# only ac_max_sed_lines should be used.
--: ${ac_max_here_lines=38}
  
  # Identity of this package.
  PACKAGE_NAME='libkml'
-@@ -426,51 +704,228 @@
- PACKAGE_VERSION='1.0.1'
- PACKAGE_STRING='libkml 1.0.1'
+@@ -748,6 +704,7 @@
+ PACKAGE_VERSION='1.1.0'
+ PACKAGE_STRING='libkml 1.1.0'
  PACKAGE_BUGREPORT='http://code.google.com/p/libkml/issues'
 +PACKAGE_URL=''
  
  ac_unique_file="README"
  # Factoring default headers for most tests.
- ac_includes_default="\
- #include <stdio.h>
--#if HAVE_SYS_TYPES_H
-+#ifdef HAVE_SYS_TYPES_H
- # include <sys/types.h>
- #endif
--#if HAVE_SYS_STAT_H
-+#ifdef HAVE_SYS_STAT_H
- # include <sys/stat.h>
- #endif
--#if STDC_HEADERS
-+#ifdef STDC_HEADERS
- # include <stdlib.h>
- # include <stddef.h>
- #else
--# if HAVE_STDLIB_H
-+# ifdef HAVE_STDLIB_H
- #  include <stdlib.h>
- # endif
- #endif
--#if HAVE_STRING_H
--# if !STDC_HEADERS && HAVE_MEMORY_H
-+#ifdef HAVE_STRING_H
-+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
- #  include <memory.h>
- # endif
- # include <string.h>
- #endif
--#if HAVE_STRINGS_H
-+#ifdef HAVE_STRINGS_H
- # include <strings.h>
- #endif
--#if HAVE_INTTYPES_H
-+#ifdef HAVE_INTTYPES_H
- # include <inttypes.h>
--#else
--# if HAVE_STDINT_H
--#  include <stdint.h>
--# endif
- #endif
--#if HAVE_UNISTD_H
-+#ifdef HAVE_STDINT_H
-+# include <stdint.h>
-+#endif
-+#ifdef HAVE_UNISTD_H
+@@ -786,7 +743,9 @@
  # include <unistd.h>
  #endif"
  
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS POW_LIB GCC_TRUE GCC_FALSE PLATFORM SHLIBSUFFIX JAVA_INCLUDE_DIR JAVA_LIB_DIR PYTHON_INCLUDE_DIR PYTHON_LIB_DIR SWIG WITH_SWIG_TRUE WITH_SWIG_FALSE JAVA JAVAC JAR WITH_JAVA_TRUE WITH_JAVA_FALSE PYTHON PYTHON_SITE_PACKAGES_DIR WITH_PYTHON_TRUE WITH_PYTHON_FALSE CURL_CONFIG CURL_CFLAGS CURL_LIBS HAVE_CURL_TRUE HAVE_CURL_FALSE LTLIBOBJS'
+-ac_subst_vars='LTLIBOBJS
 +ac_subst_vars='am__EXEEXT_FALSE
 +am__EXEEXT_TRUE
 +LTLIBOBJS
-+HAVE_CURL_FALSE
-+HAVE_CURL_TRUE
-+CURL_LIBS
-+CURL_CFLAGS
-+CURL_CONFIG
-+WITH_PYTHON_FALSE
-+WITH_PYTHON_TRUE
-+PYTHON_SITE_PACKAGES_DIR
-+PYTHON
-+WITH_JAVA_FALSE
-+WITH_JAVA_TRUE
-+JAR
-+JAVAC
-+JAVA
-+WITH_SWIG_FALSE
-+WITH_SWIG_TRUE
-+SWIG
-+PYTHON_LIB_DIR
-+PYTHON_INCLUDE_DIR
-+JAVA_LIB_DIR
-+JAVA_INCLUDE_DIR
-+SHLIBSUFFIX
-+PLATFORM
-+GCC_FALSE
-+GCC_TRUE
-+POW_LIB
-+LIBOBJS
-+CXXCPP
-+OTOOL64
-+OTOOL
-+LIPO
-+NMEDIT
-+DSYMUTIL
-+lt_ECHO
-+RANLIB
-+AR
-+OBJDUMP
-+LN_S
-+NM
-+ac_ct_DUMPBIN
-+DUMPBIN
-+LD
-+FGREP
-+EGREP
-+GREP
-+SED
-+host_os
-+host_vendor
-+host_cpu
-+host
-+build_os
-+build_vendor
-+build_cpu
-+build
-+LIBTOOL
-+am__fastdepCXX_FALSE
-+am__fastdepCXX_TRUE
-+CXXDEPMODE
-+ac_ct_CXX
-+CXXFLAGS
-+CXX
-+CPP
-+am__fastdepCC_FALSE
-+am__fastdepCC_TRUE
-+CCDEPMODE
-+AMDEPBACKSLASH
-+AMDEP_FALSE
-+AMDEP_TRUE
-+am__quote
-+am__include
-+DEPDIR
-+OBJEXT
-+EXEEXT
-+ac_ct_CC
-+CPPFLAGS
-+LDFLAGS
-+CFLAGS
-+CC
-+am__untar
-+am__tar
-+AMTAR
-+am__leading_dot
-+SET_MAKE
-+AWK
-+mkdir_p
-+MKDIR_P
-+INSTALL_STRIP_PROGRAM
-+STRIP
-+install_sh
-+MAKEINFO
-+AUTOHEADER
-+AUTOMAKE
-+AUTOCONF
-+ACLOCAL
-+VERSION
-+PACKAGE
-+CYGPATH_W
-+am__isrc
-+INSTALL_DATA
-+INSTALL_SCRIPT
-+INSTALL_PROGRAM
-+target_alias
-+host_alias
-+build_alias
-+LIBS
-+ECHO_T
-+ECHO_N
-+ECHO_C
-+DEFS
-+mandir
-+localedir
-+libdir
-+psdir
-+pdfdir
-+dvidir
-+htmldir
-+infodir
-+docdir
-+oldincludedir
-+includedir
-+localstatedir
-+sharedstatedir
-+sysconfdir
-+datadir
-+datarootdir
-+libexecdir
-+sbindir
-+bindir
-+program_transform_name
-+prefix
-+exec_prefix
+ HAVE_CURL_FALSE
+ HAVE_CURL_TRUE
+ CURL_LIBS
+@@ -918,6 +877,7 @@
+ program_transform_name
+ prefix
+ exec_prefix
 +PACKAGE_URL
-+PACKAGE_BUGREPORT
-+PACKAGE_STRING
-+PACKAGE_VERSION
-+PACKAGE_TARNAME
-+PACKAGE_NAME
-+PATH_SEPARATOR
-+SHELL'
- ac_subst_files=''
-+ac_user_opts='
-+enable_option_checking
-+enable_dependency_tracking
-+enable_shared
-+enable_static
-+with_pic
-+enable_fast_install
-+with_gnu_ld
-+enable_libtool_lock
-+with_expat_include_dir
-+with_expat_lib_dir
-+with_java_include_dir
-+with_java_lib_dir
-+with_python_include_dir
-+with_python_lib_dir
-+enable_swig
-+enable_systempython
-+enable_java
-+enable_python
-+'
-+      ac_precious_vars='build_alias
-+host_alias
-+target_alias
-+CC
-+CFLAGS
-+LDFLAGS
-+LIBS
-+CPPFLAGS
-+CPP
-+CXX
-+CXXFLAGS
-+CCC
-+CXXCPP'
-+
- 
- # Initialize some variables set by options.
- ac_init_help=
- ac_init_version=false
-+ac_unrecognized_opts=
-+ac_unrecognized_sep=
- # The variables have the same names as the options, with
- # dashes changed to underlines.
- cache_file=/dev/null
-@@ -493,34 +948,48 @@
- # and all the variables that are supposed to be based on exec_prefix
- # by default will actually change.
- # Use braces instead of parens because sh, perl, etc. also accept them.
-+# (The list follows the same order as the GNU Coding Standards.)
- bindir='${exec_prefix}/bin'
- sbindir='${exec_prefix}/sbin'
- libexecdir='${exec_prefix}/libexec'
--datadir='${prefix}/share'
-+datarootdir='${prefix}/share'
-+datadir='${datarootdir}'
- sysconfdir='${prefix}/etc'
- sharedstatedir='${prefix}/com'
- localstatedir='${prefix}/var'
--libdir='${exec_prefix}/lib'
- includedir='${prefix}/include'
- oldincludedir='/usr/include'
--infodir='${prefix}/info'
--mandir='${prefix}/man'
-+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
-+infodir='${datarootdir}/info'
-+htmldir='${docdir}'
-+dvidir='${docdir}'
-+pdfdir='${docdir}'
-+psdir='${docdir}'
-+libdir='${exec_prefix}/lib'
-+localedir='${datarootdir}/locale'
-+mandir='${datarootdir}/man'
- 
- ac_prev=
-+ac_dashdash=
- for ac_option
- do
-   # If the previous option needs an argument, assign it.
-   if test -n "$ac_prev"; then
--    eval "$ac_prev=\$ac_option"
-+    eval $ac_prev=\$ac_option
-     ac_prev=
-     continue
-   fi
- 
--  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
-+  case $ac_option in
-+  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-+  *)	ac_optarg=yes ;;
-+  esac
- 
-   # Accept the important Cygnus configure options, so we can diagnose typos.
- 
--  case $ac_option in
-+  case $ac_dashdash$ac_option in
-+  --)
-+    ac_dashdash=yes ;;
- 
-   -bindir | --bindir | --bindi | --bind | --bin | --bi)
-     ac_prev=bindir ;;
-@@ -542,33 +1011,59 @@
-   --config-cache | -C)
-     cache_file=config.cache ;;
- 
--  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-+  -datadir | --datadir | --datadi | --datad)
-     ac_prev=datadir ;;
--  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
--  | --da=*)
-+  -datadir=* | --datadir=* | --datadi=* | --datad=*)
-     datadir=$ac_optarg ;;
- 
-+  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
-+  | --dataroo | --dataro | --datar)
-+    ac_prev=datarootdir ;;
-+  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
-+  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
-+    datarootdir=$ac_optarg ;;
-+
-   -disable-* | --disable-*)
--    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-+    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+ PACKAGE_BUGREPORT
+ PACKAGE_STRING
+ PACKAGE_VERSION
+@@ -1067,8 +1027,7 @@
+     ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
      # Reject names that are not valid shell variable names.
--    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
--      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+-      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
 -   { (exit 1); exit 1; }; }
--    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
--    eval "enable_$ac_feature=no" ;;
-+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
 +      as_fn_error "invalid feature name: $ac_useropt"
-+    ac_useropt_orig=$ac_useropt
-+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-+    case $ac_user_opts in
-+      *"
-+"enable_$ac_useropt"
-+"*) ;;
-+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
-+	 ac_unrecognized_sep=', ';;
-+    esac
-+    eval enable_$ac_useropt=no ;;
-+
-+  -docdir | --docdir | --docdi | --doc | --do)
-+    ac_prev=docdir ;;
-+  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
-+    docdir=$ac_optarg ;;
-+
-+  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
-+    ac_prev=dvidir ;;
-+  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
-+    dvidir=$ac_optarg ;;
- 
-   -enable-* | --enable-*)
--    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-+    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+     ac_useropt_orig=$ac_useropt
+     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+     case $ac_user_opts in
+@@ -1094,8 +1053,7 @@
+     ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
      # Reject names that are not valid shell variable names.
--    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
--      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+-      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
 -   { (exit 1); exit 1; }; }
--    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
--    case $ac_option in
--      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
--      *) ac_optarg=yes ;;
-+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
 +      as_fn_error "invalid feature name: $ac_useropt"
-+    ac_useropt_orig=$ac_useropt
-+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-+    case $ac_user_opts in
-+      *"
-+"enable_$ac_useropt"
-+"*) ;;
-+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
-+	 ac_unrecognized_sep=', ';;
-     esac
--    eval "enable_$ac_feature='$ac_optarg'" ;;
-+    eval enable_$ac_useropt=\$ac_optarg ;;
- 
-   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-@@ -595,6 +1090,12 @@
-   -host=* | --host=* | --hos=* | --ho=*)
-     host_alias=$ac_optarg ;;
- 
-+  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
-+    ac_prev=htmldir ;;
-+  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
-+  | --ht=*)
-+    htmldir=$ac_optarg ;;
-+
-   -includedir | --includedir | --includedi | --included | --include \
-   | --includ | --inclu | --incl | --inc)
-     ac_prev=includedir ;;
-@@ -619,13 +1120,16 @@
-   | --libexe=* | --libex=* | --libe=*)
-     libexecdir=$ac_optarg ;;
- 
-+  -localedir | --localedir | --localedi | --localed | --locale)
-+    ac_prev=localedir ;;
-+  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
-+    localedir=$ac_optarg ;;
-+
-   -localstatedir | --localstatedir | --localstatedi | --localstated \
--  | --localstate | --localstat | --localsta | --localst \
--  | --locals | --local | --loca | --loc | --lo)
-+  | --localstate | --localstat | --localsta | --localst | --locals)
-     ac_prev=localstatedir ;;
-   -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
--  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
--  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-+  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
-     localstatedir=$ac_optarg ;;
- 
-   -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-@@ -690,6 +1194,16 @@
-   | --progr-tra=* | --program-tr=* | --program-t=*)
-     program_transform_name=$ac_optarg ;;
- 
-+  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
-+    ac_prev=pdfdir ;;
-+  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
-+    pdfdir=$ac_optarg ;;
-+
-+  -psdir | --psdir | --psdi | --psd | --ps)
-+    ac_prev=psdir ;;
-+  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
-+    psdir=$ac_optarg ;;
-+
-   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-   | -silent | --silent | --silen | --sile | --sil)
-     silent=yes ;;
-@@ -740,26 +1254,36 @@
-     ac_init_version=: ;;
- 
-   -with-* | --with-*)
--    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-+    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+     ac_useropt_orig=$ac_useropt
+     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+     case $ac_user_opts in
+@@ -1299,8 +1257,7 @@
+     ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
      # Reject names that are not valid shell variable names.
--    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
--      { echo "$as_me: error: invalid package name: $ac_package" >&2
+     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+-      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
 -   { (exit 1); exit 1; }; }
--    ac_package=`echo $ac_package| sed 's/-/_/g'`
--    case $ac_option in
--      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
--      *) ac_optarg=yes ;;
-+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
 +      as_fn_error "invalid package name: $ac_useropt"
-+    ac_useropt_orig=$ac_useropt
-+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-+    case $ac_user_opts in
-+      *"
-+"with_$ac_useropt"
-+"*) ;;
-+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
-+	 ac_unrecognized_sep=', ';;
-     esac
--    eval "with_$ac_package='$ac_optarg'" ;;
-+    eval with_$ac_useropt=\$ac_optarg ;;
- 
-   -without-* | --without-*)
--    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-+    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+     ac_useropt_orig=$ac_useropt
+     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+     case $ac_user_opts in
+@@ -1316,8 +1273,7 @@
+     ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
      # Reject names that are not valid shell variable names.
--    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
--      { echo "$as_me: error: invalid package name: $ac_package" >&2
+     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+-      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
 -   { (exit 1); exit 1; }; }
--    ac_package=`echo $ac_package | sed 's/-/_/g'`
--    eval "with_$ac_package=no" ;;
-+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
 +      as_fn_error "invalid package name: $ac_useropt"
-+    ac_useropt_orig=$ac_useropt
-+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-+    case $ac_user_opts in
-+      *"
-+"with_$ac_useropt"
-+"*) ;;
-+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
-+	 ac_unrecognized_sep=', ';;
-+    esac
-+    eval with_$ac_useropt=no ;;
- 
-   --x)
-     # Obsolete; use --with-x.
-@@ -779,26 +1303,25 @@
+     ac_useropt_orig=$ac_useropt
+     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+     case $ac_user_opts in
+@@ -1347,17 +1303,17 @@
    | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
      x_libraries=$ac_optarg ;;
  
--  -*) { echo "$as_me: error: unrecognized option: $ac_option
+-  -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
 -Try \`$0 --help' for more information." >&2
 -   { (exit 1); exit 1; }; }
 +  -*) as_fn_error "unrecognized option: \`$ac_option'
@@ -25042,504 +2383,103 @@
      ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
      # Reject names that are not valid shell variable names.
 -    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
--      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+-      { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
 -   { (exit 1); exit 1; }; }
--    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
--    eval "$ac_envvar='$ac_optarg'"
 +    case $ac_envvar in #(
 +      '' | [0-9]* | *[!_$as_cr_alnum]* )
 +      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
 +    esac
-+    eval $ac_envvar=\$ac_optarg
+     eval $ac_envvar=\$ac_optarg
      export $ac_envvar ;;
  
-   *)
-     # FIXME: should be removed in autoconf 3.0.
--    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-+    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
--      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-+      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-     : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-     ;;
+@@ -1374,15 +1330,13 @@
  
-@@ -807,31 +1330,36 @@
- 
  if test -n "$ac_prev"; then
    ac_option=--`echo $ac_prev | sed 's/_/-/g'`
--  { echo "$as_me: error: missing argument to $ac_option" >&2
+-  { $as_echo "$as_me: error: missing argument to $ac_option" >&2
 -   { (exit 1); exit 1; }; }
 +  as_fn_error "missing argument to $ac_option"
  fi
  
--# Be sure to have absolute paths.
--for ac_var in exec_prefix prefix
--do
--  eval ac_val=$`echo $ac_var`
--  case $ac_val in
--    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
--    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
--   { (exit 1); exit 1; }; };;
-+if test -n "$ac_unrecognized_opts"; then
-+  case $enable_option_checking in
-+    no) ;;
+ if test -n "$ac_unrecognized_opts"; then
+   case $enable_option_checking in
+     no) ;;
+-    fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
+-   { (exit 1); exit 1; }; } ;;
 +    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
-+    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+     *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
    esac
--done
-+fi
- 
--# Be sure to have absolute paths.
--for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
--	      localstatedir libdir includedir oldincludedir infodir mandir
-+# Check all directory arguments for consistency.
-+for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
-+		datadir sysconfdir sharedstatedir localstatedir includedir \
-+		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-+		libdir localedir mandir
- do
--  eval ac_val=$`echo $ac_var`
-+  eval ac_val=\$$ac_var
-+  # Remove trailing slashes.
-+  case $ac_val in
-+    */ )
-+      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
-+      eval $ac_var=\$ac_val;;
-+  esac
-+  # Be sure to have absolute directory names.
-   case $ac_val in
--    [\\/$]* | ?:[\\/]* ) ;;
--    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
--   { (exit 1); exit 1; }; };;
-+    [\\/$]* | ?:[\\/]* )  continue;;
-+    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
+ fi
+@@ -1405,8 +1359,7 @@
+     [\\/$]* | ?:[\\/]* )  continue;;
+     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
    esac
+-  { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+-   { (exit 1); exit 1; }; }
 +  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
  done
  
  # There might be people who depend on the old broken behavior: `$host'
-@@ -845,7 +1373,7 @@
- if test "x$host_alias" != x; then
-   if test "x$build_alias" = x; then
-     cross_compiling=maybe
--    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-+    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-     If a cross compiler is detected then cross compile mode will be used." >&2
-   elif test "x$build_alias" != "x$host_alias"; then
-     cross_compiling=yes
-@@ -858,94 +1386,72 @@
- test "$silent" = yes && exec 6>/dev/null
- 
- 
-+ac_pwd=`pwd` && test -n "$ac_pwd" &&
-+ac_ls_di=`ls -di .` &&
-+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
+@@ -1436,11 +1389,9 @@
+ ac_pwd=`pwd` && test -n "$ac_pwd" &&
+ ac_ls_di=`ls -di .` &&
+ ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
+-  { $as_echo "$as_me: error: working directory cannot be determined" >&2
+-   { (exit 1); exit 1; }; }
 +  as_fn_error "working directory cannot be determined"
-+test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
+ test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
+-  { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
+-   { (exit 1); exit 1; }; }
 +  as_fn_error "pwd does not report name of working directory"
-+
-+
+ 
+ 
  # Find the source files, if location was not specified.
- if test -z "$srcdir"; then
-   ac_srcdir_defaulted=yes
--  # Try the directory containing this script, then its parent.
--  ac_confdir=`(dirname "$0") 2>/dev/null ||
--$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
--	 X"$0" : 'X\(//\)[^/]' \| \
--	 X"$0" : 'X\(//\)$' \| \
--	 X"$0" : 'X\(/\)' \| \
--	 .     : '\(.\)' 2>/dev/null ||
--echo X"$0" |
--    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
--  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
--  	  /^X\(\/\/\)$/{ s//\1/; q; }
--  	  /^X\(\/\).*/{ s//\1/; q; }
--  	  s/.*/./; q'`
-+  # Try the directory containing this script, then the parent directory.
-+  ac_confdir=`$as_dirname -- "$as_myself" ||
-+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+	 X"$as_myself" : 'X\(//\)[^/]' \| \
-+	 X"$as_myself" : 'X\(//\)$' \| \
-+	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
-+$as_echo X"$as_myself" |
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)[^/].*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
-   srcdir=$ac_confdir
--  if test ! -r $srcdir/$ac_unique_file; then
-+  if test ! -r "$srcdir/$ac_unique_file"; then
-     srcdir=..
-   fi
- else
-   ac_srcdir_defaulted=no
+@@ -1479,13 +1430,11 @@
  fi
--if test ! -r $srcdir/$ac_unique_file; then
--  if test "$ac_srcdir_defaulted" = yes; then
--    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
+ if test ! -r "$srcdir/$ac_unique_file"; then
+   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
+-  { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
 -   { (exit 1); exit 1; }; }
--  else
--    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
--   { (exit 1); exit 1; }; }
--  fi
--fi
--(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
--  { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
--   { (exit 1); exit 1; }; }
--srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
--ac_env_build_alias_set=${build_alias+set}
--ac_env_build_alias_value=$build_alias
--ac_cv_env_build_alias_set=${build_alias+set}
--ac_cv_env_build_alias_value=$build_alias
--ac_env_host_alias_set=${host_alias+set}
--ac_env_host_alias_value=$host_alias
--ac_cv_env_host_alias_set=${host_alias+set}
--ac_cv_env_host_alias_value=$host_alias
--ac_env_target_alias_set=${target_alias+set}
--ac_env_target_alias_value=$target_alias
--ac_cv_env_target_alias_set=${target_alias+set}
--ac_cv_env_target_alias_value=$target_alias
--ac_env_CC_set=${CC+set}
--ac_env_CC_value=$CC
--ac_cv_env_CC_set=${CC+set}
--ac_cv_env_CC_value=$CC
--ac_env_CFLAGS_set=${CFLAGS+set}
--ac_env_CFLAGS_value=$CFLAGS
--ac_cv_env_CFLAGS_set=${CFLAGS+set}
--ac_cv_env_CFLAGS_value=$CFLAGS
--ac_env_LDFLAGS_set=${LDFLAGS+set}
--ac_env_LDFLAGS_value=$LDFLAGS
--ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
--ac_cv_env_LDFLAGS_value=$LDFLAGS
--ac_env_CPPFLAGS_set=${CPPFLAGS+set}
--ac_env_CPPFLAGS_value=$CPPFLAGS
--ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
--ac_cv_env_CPPFLAGS_value=$CPPFLAGS
--ac_env_CPP_set=${CPP+set}
--ac_env_CPP_value=$CPP
--ac_cv_env_CPP_set=${CPP+set}
--ac_cv_env_CPP_value=$CPP
--ac_env_CXX_set=${CXX+set}
--ac_env_CXX_value=$CXX
--ac_cv_env_CXX_set=${CXX+set}
--ac_cv_env_CXX_value=$CXX
--ac_env_CXXFLAGS_set=${CXXFLAGS+set}
--ac_env_CXXFLAGS_value=$CXXFLAGS
--ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set}
--ac_cv_env_CXXFLAGS_value=$CXXFLAGS
--ac_env_CXXCPP_set=${CXXCPP+set}
--ac_env_CXXCPP_value=$CXXCPP
--ac_cv_env_CXXCPP_set=${CXXCPP+set}
--ac_cv_env_CXXCPP_value=$CXXCPP
--ac_env_F77_set=${F77+set}
--ac_env_F77_value=$F77
--ac_cv_env_F77_set=${F77+set}
--ac_cv_env_F77_value=$F77
--ac_env_FFLAGS_set=${FFLAGS+set}
--ac_env_FFLAGS_value=$FFLAGS
--ac_cv_env_FFLAGS_set=${FFLAGS+set}
--ac_cv_env_FFLAGS_value=$FFLAGS
-+if test ! -r "$srcdir/$ac_unique_file"; then
-+  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
 +  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
-+fi
-+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
-+ac_abs_confdir=`(
+ fi
+ ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
+ ac_abs_confdir=`(
+-	cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
+-   { (exit 1); exit 1; }; }
 +	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
-+	pwd)`
-+# When building in place, set srcdir=.
-+if test "$ac_abs_confdir" = "$ac_pwd"; then
-+  srcdir=.
-+fi
-+# Remove unnecessary trailing slashes from srcdir.
-+# Double slashes in file names in object file debugging info
-+# mess up M-x gdb in Emacs.
-+case $srcdir in
-+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
-+esac
-+for ac_var in $ac_precious_vars; do
-+  eval ac_env_${ac_var}_set=\${${ac_var}+set}
-+  eval ac_env_${ac_var}_value=\$${ac_var}
-+  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
-+  eval ac_cv_env_${ac_var}_value=\$${ac_var}
-+done
- 
- #
- # Report the --help message.
-@@ -974,14 +1480,11 @@
-   -n, --no-create         do not create output files
-       --srcdir=DIR        find the sources in DIR [configure dir or \`..']
- 
--_ACEOF
--
--  cat <<_ACEOF
- Installation directories:
-   --prefix=PREFIX         install architecture-independent files in PREFIX
--			  [$ac_default_prefix]
-+                          [$ac_default_prefix]
-   --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
--			  [PREFIX]
-+                          [PREFIX]
- 
- By default, \`make install' will install all the files in
- \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-@@ -991,18 +1494,25 @@
- For better control, use the options below.
- 
- Fine tuning of the installation directories:
--  --bindir=DIR           user executables [EPREFIX/bin]
--  --sbindir=DIR          system admin executables [EPREFIX/sbin]
--  --libexecdir=DIR       program executables [EPREFIX/libexec]
--  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
--  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
--  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
--  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
--  --libdir=DIR           object code libraries [EPREFIX/lib]
--  --includedir=DIR       C header files [PREFIX/include]
--  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
--  --infodir=DIR          info documentation [PREFIX/info]
--  --mandir=DIR           man documentation [PREFIX/man]
-+  --bindir=DIR            user executables [EPREFIX/bin]
-+  --sbindir=DIR           system admin executables [EPREFIX/sbin]
-+  --libexecdir=DIR        program executables [EPREFIX/libexec]
-+  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
-+  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
-+  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
-+  --libdir=DIR            object code libraries [EPREFIX/lib]
-+  --includedir=DIR        C header files [PREFIX/include]
-+  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
-+  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
-+  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
-+  --infodir=DIR           info documentation [DATAROOTDIR/info]
-+  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
-+  --mandir=DIR            man documentation [DATAROOTDIR/man]
-+  --docdir=DIR            documentation root [DATAROOTDIR/doc/libkml]
-+  --htmldir=DIR           html documentation [DOCDIR]
-+  --dvidir=DIR            dvi documentation [DOCDIR]
-+  --pdfdir=DIR            pdf documentation [DOCDIR]
-+  --psdir=DIR             ps documentation [DOCDIR]
- _ACEOF
- 
-   cat <<\_ACEOF
-@@ -1025,14 +1535,13 @@
-   cat <<\_ACEOF
- 
- Optional Features:
-+  --disable-option-checking  ignore unrecognized --enable/--with options
-   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-   --disable-dependency-tracking  speeds up one-time build
-   --enable-dependency-tracking   do not reject slow dependency extractors
--  --enable-shared[=PKGS]
--                          build shared libraries [default=yes]
--  --enable-static[=PKGS]
--                          build static libraries [default=yes]
-+  --enable-shared[=PKGS]  build shared libraries [default=yes]
-+  --enable-static[=PKGS]  build static libraries [default=yes]
-   --enable-fast-install[=PKGS]
-                           optimize for fast installation [default=yes]
-   --disable-libtool-lock  avoid locking (might break parallel builds)
-@@ -1045,11 +1554,9 @@
- Optional Packages:
-   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
--  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
-   --with-pic              try to use only PIC/non-PIC objects [default=use
-                           both]
--  --with-tags[=TAGS]
--                          include additional configurations [automatic]
-+  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
- --with-expat-include-dir=DIR look in DIR for expat headers
- --with-expat-lib-dir=DIR look in DIR for expat libraries
- --with-java-include-dir=DIR look in DIR for Java headers
-@@ -1062,134 +1569,633 @@
-   CFLAGS      C compiler flags
+ 	pwd)`
+ # When building in place, set srcdir=.
+ if test "$ac_abs_confdir" = "$ac_pwd"; then
+@@ -1621,7 +1570,7 @@
    LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
                nonstandard directory <lib dir>
--  CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
--              headers in a nonstandard directory <include dir>
-+  LIBS        libraries to pass to the linker, e.g. -l<library>
+   LIBS        libraries to pass to the linker, e.g. -l<library>
+-  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
 +  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
-+              you have headers in a nonstandard directory <include dir>
+               you have headers in a nonstandard directory <include dir>
    CPP         C preprocessor
    CXX         C++ compiler command
-   CXXFLAGS    C++ compiler flags
-   CXXCPP      C++ preprocessor
--  F77         Fortran 77 compiler command
--  FFLAGS      Fortran 77 compiler flags
- 
- Use these variables to override the choices made by `configure' or to help
- it to find libraries and programs with nonstandard names/locations.
- 
- Report bugs to <http://code.google.com/p/libkml/issues>.
- _ACEOF
-+ac_status=$?
- fi
- 
- if test "$ac_init_help" = "recursive"; then
-   # If there are subdirs, report their specific --help.
--  ac_popdir=`pwd`
-   for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
--    test -d $ac_dir || continue
-+    test -d "$ac_dir" ||
-+      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
-+      continue
-     ac_builddir=.
- 
--if test "$ac_dir" != .; then
--  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
--  # A "../" for each directory in $ac_dir_suffix.
--  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
--else
--  ac_dir_suffix= ac_top_builddir=
--fi
-+case "$ac_dir" in
-+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-+*)
-+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-+  # A ".." for each directory in $ac_dir_suffix.
-+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-+  case $ac_top_builddir_sub in
-+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-+  esac ;;
-+esac
-+ac_abs_top_builddir=$ac_pwd
-+ac_abs_builddir=$ac_pwd$ac_dir_suffix
-+# for backward compatibility:
-+ac_top_builddir=$ac_top_build_prefix
- 
- case $srcdir in
--  .)  # No --srcdir option.  We are building in place.
-+  .)  # We are building in place.
-     ac_srcdir=.
--    if test -z "$ac_top_builddir"; then
--       ac_top_srcdir=.
--    else
--       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
--    fi ;;
--  [\\/]* | ?:[\\/]* )  # Absolute path.
-+    ac_top_srcdir=$ac_top_builddir_sub
-+    ac_abs_top_srcdir=$ac_pwd ;;
-+  [\\/]* | ?:[\\/]* )  # Absolute name.
-     ac_srcdir=$srcdir$ac_dir_suffix;
--    ac_top_srcdir=$srcdir ;;
--  *) # Relative path.
--    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
--    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-+    ac_top_srcdir=$srcdir
-+    ac_abs_top_srcdir=$srcdir ;;
-+  *) # Relative name.
-+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-+    ac_top_srcdir=$ac_top_build_prefix$srcdir
-+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
- esac
-+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
- 
--# Do not use `cd foo && pwd` to compute absolute paths, because
--# the directories may not exist.
--case `pwd` in
--.) ac_abs_builddir="$ac_dir";;
--*)
--  case "$ac_dir" in
--  .) ac_abs_builddir=`pwd`;;
--  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
--  *) ac_abs_builddir=`pwd`/"$ac_dir";;
--  esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_top_builddir=${ac_top_builddir}.;;
--*)
--  case ${ac_top_builddir}. in
--  .) ac_abs_top_builddir=$ac_abs_builddir;;
--  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
--  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
--  esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_srcdir=$ac_srcdir;;
--*)
--  case $ac_srcdir in
--  .) ac_abs_srcdir=$ac_abs_builddir;;
--  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
--  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
--  esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_top_srcdir=$ac_top_srcdir;;
--*)
--  case $ac_top_srcdir in
--  .) ac_abs_top_srcdir=$ac_abs_builddir;;
--  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
--  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
--  esac;;
--esac
-+    cd "$ac_dir" || { ac_status=$?; continue; }
-+    # Check for guested configure.
-+    if test -f "$ac_srcdir/configure.gnu"; then
-+      echo &&
-+      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
-+    elif test -f "$ac_srcdir/configure"; then
-+      echo &&
-+      $SHELL "$ac_srcdir/configure" --help=recursive
-+    else
-+      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-+    fi || ac_status=$?
-+    cd "$ac_pwd" || { ac_status=$?; break; }
-+  done
-+fi
- 
--    cd $ac_dir
--    # Check for guested configure; otherwise get Cygnus style configure.
--    if test -f $ac_srcdir/configure.gnu; then
--      echo
--      $SHELL $ac_srcdir/configure.gnu  --help=recursive
--    elif test -f $ac_srcdir/configure; then
--      echo
--      $SHELL $ac_srcdir/configure  --help=recursive
--    elif test -f $ac_srcdir/configure.ac ||
--	   test -f $ac_srcdir/configure.in; then
--      echo
--      $ac_configure --help
--    else
--      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
--    fi
--    cd $ac_popdir
--  done
--fi
--
--test -n "$ac_init_help" && exit 0
-+test -n "$ac_init_help" && exit $ac_status
+@@ -1695,48 +1644,580 @@
  if $ac_init_version; then
    cat <<\_ACEOF
- libkml configure 1.0.1
--generated by GNU Autoconf 2.59
+ libkml configure 1.1.0
+-generated by GNU Autoconf 2.63
 +generated by GNU Autoconf 2.65
  
--Copyright (C) 2003 Free Software Foundation, Inc.
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 +Copyright (C) 2009 Free Software Foundation, Inc.
  This configure script is free software; the Free Software Foundation
  gives unlimited permission to copy, distribute and modify it.
  _ACEOF
--  exit 0
-+  exit
+   exit
  fi
--exec 5>config.log
--cat >&5 <<_ACEOF
-+
+-cat >config.log <<_ACEOF
+-This file contains any messages produced by compilers while
+-running configure, to aid debugging if configure makes a mistake.
+ 
+-It was created by libkml $as_me 1.1.0, which was
+-generated by GNU Autoconf 2.63.  Invocation command line was
 +## ------------------------ ##
 +## Autoconf initialization. ##
 +## ------------------------ ##
@@ -25574,14 +2514,27 @@
 +else
 +  $as_echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
-+
+ 
+-  $ $0 $@
 +	ac_retval=1
 +fi
 +  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
 +  as_fn_set_status $ac_retval
-+
+ 
+-_ACEOF
+-exec 5>>config.log
+-{
+-cat <<_ASUNAME
+-## --------- ##
+-## Platform. ##
+-## --------- ##
 +} # ac_fn_c_try_compile
-+
+ 
+-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
+-uname -m = `(uname -m) 2>/dev/null || echo unknown`
+-uname -r = `(uname -r) 2>/dev/null || echo unknown`
+-uname -s = `(uname -s) 2>/dev/null || echo unknown`
+-uname -v = `(uname -v) 2>/dev/null || echo unknown`
 +# ac_fn_c_try_cpp LINENO
 +# ----------------------
 +# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
@@ -25611,12 +2564,21 @@
 +else
 +  $as_echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
-+
+ 
+-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
+-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
 +    ac_retval=1
 +fi
 +  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
 +  as_fn_set_status $ac_retval
-+
+ 
+-/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
+-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
+-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
+-/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
+-/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
+-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
+-/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
 +} # ac_fn_c_try_cpp
 +
 +# ac_fn_cxx_try_compile LINENO
@@ -26073,57 +3035,54 @@
 +
 +} # ac_fn_c_check_type
 +cat >config.log <<_ACEOF
- This file contains any messages produced by compilers while
- running configure, to aid debugging if configure makes a mistake.
- 
- It was created by libkml $as_me 1.0.1, which was
--generated by GNU Autoconf 2.59.  Invocation command line was
++This file contains any messages produced by compilers while
++running configure, to aid debugging if configure makes a mistake.
++
++It was created by libkml $as_me 1.1.0, which was
 +generated by GNU Autoconf 2.65.  Invocation command line was
- 
-   $ $0 $@
- 
- _ACEOF
++
++  $ $0 $@
++
++_ACEOF
 +exec 5>>config.log
- {
- cat <<_ASUNAME
- ## --------- ##
-@@ -1208,7 +2214,7 @@
- /bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
- /usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
- /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
--hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
++{
++cat <<_ASUNAME
++## --------- ##
++## Platform. ##
++## --------- ##
++
++hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
++uname -m = `(uname -m) 2>/dev/null || echo unknown`
++uname -r = `(uname -r) 2>/dev/null || echo unknown`
++uname -s = `(uname -s) 2>/dev/null || echo unknown`
++uname -v = `(uname -v) 2>/dev/null || echo unknown`
++
++/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
++/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
++
++/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
++/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
++/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
 +/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
- /bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
- /usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
- /bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-@@ -1220,8 +2226,9 @@
++/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
++/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
++/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
+ 
+ _ASUNAME
+ 
+@@ -1745,8 +2226,8 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
--  echo "PATH: $as_dir"
+-  $as_echo "PATH: $as_dir"
 -done
 +    $as_echo "PATH: $as_dir"
 +  done
-+IFS=$as_save_IFS
+ IFS=$as_save_IFS
  
  } >&5
- 
-@@ -1243,7 +2250,6 @@
- ac_configure_args=
- ac_configure_args0=
- ac_configure_args1=
--ac_sep=
- ac_must_keep_next=false
- for ac_pass in 1 2
- do
-@@ -1254,13 +2260,13 @@
-     -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-     | -silent | --silent | --silen | --sile | --sil)
-       continue ;;
--    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
--      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-+    *\'*)
-+      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+@@ -1783,9 +2264,9 @@
+       ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
      esac
      case $ac_pass in
 -    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
@@ -26134,13 +3093,11 @@
        if test $ac_must_keep_next = true; then
  	ac_must_keep_next=false # Got value, back to normal.
        else
-@@ -1276,21 +2282,19 @@
+@@ -1801,13 +2282,13 @@
  	  -* ) ac_must_keep_next=true ;;
  	esac
        fi
--      ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
--      # Get rid of the leading space.
--      ac_sep=" "
+-      ac_configure_args="$ac_configure_args '$ac_arg'"
 +      as_fn_append ac_configure_args " '$ac_arg'"
        ;;
      esac
@@ -26153,117 +3110,25 @@
  
  # When interrupted or exit'd, cleanup temporary files, and complete
  # config.log.  We remove comments because anyway the quotes in there
- # would cause problems or look ugly.
--# WARNING: Be sure not to use single quotes in there, as some shells,
--# such as our DU 5.0 friend, will then `close' the trap.
-+# WARNING: Use '\'' to represent an apostrophe within the trap.
-+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
- trap 'exit_status=$?
-   # Save into config.log some information that might help in debugging.
-   {
-@@ -1303,20 +2307,35 @@
- _ASBOX
-     echo
-     # The following way of writing the cache mishandles newlines in values,
--{
-+(
-+  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
-+    eval ac_val=\$$ac_var
-+    case $ac_val in #(
-+    *${as_nl}*)
-+      case $ac_var in #(
+@@ -1832,13 +2313,13 @@
+     case $ac_val in #(
+     *${as_nl}*)
+       case $ac_var in #(
+-      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
 +      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-+      esac
-+      case $ac_var in #(
-+      _ | IFS | as_nl) ;; #(
-+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+       esac
+       case $ac_var in #(
+       _ | IFS | as_nl) ;; #(
+       BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+-      *) $as_unset $ac_var ;;
 +      *) { eval $ac_var=; unset $ac_var;} ;;
-+      esac ;;
-+    esac
-+  done
-   (set) 2>&1 |
--    case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
--    *ac_space=\ *)
-+    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
-+    *${as_nl}ac_space=\ *)
-       sed -n \
--	"s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
--	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
--      ;;
-+	"s/'\''/'\''\\\\'\'''\''/g;
-+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
-+      ;; #(
-     *)
--      sed -n \
--	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-       ;;
--    esac;
--}
-+    esac |
-+    sort
-+)
-     echo
- 
-     cat <<\_ASBOX
-@@ -1327,22 +2346,28 @@
-     echo
-     for ac_var in $ac_subst_vars
-     do
--      eval ac_val=$`echo $ac_var`
--      echo "$ac_var='"'"'$ac_val'"'"'"
-+      eval ac_val=\$$ac_var
-+      case $ac_val in
-+      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-+      esac
-+      $as_echo "$ac_var='\''$ac_val'\''"
-     done | sort
-     echo
- 
-     if test -n "$ac_subst_files"; then
-       cat <<\_ASBOX
--## ------------- ##
--## Output files. ##
--## ------------- ##
-+## ------------------- ##
-+## File substitutions. ##
-+## ------------------- ##
- _ASBOX
-       echo
-       for ac_var in $ac_subst_files
-       do
--	eval ac_val=$`echo $ac_var`
--	echo "$ac_var='"'"'$ac_val'"'"'"
-+	eval ac_val=\$$ac_var
-+	case $ac_val in
-+	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-+	esac
-+	$as_echo "$ac_var='\''$ac_val'\''"
-       done | sort
-       echo
-     fi
-@@ -1354,26 +2379,26 @@
- ## ----------- ##
- _ASBOX
-       echo
--      sed "/^$/d" confdefs.h | sort
-+      cat confdefs.h
-       echo
-     fi
-     test "$ac_signal" != 0 &&
--      echo "$as_me: caught signal $ac_signal"
--    echo "$as_me: exit $exit_status"
-+      $as_echo "$as_me: caught signal $ac_signal"
-+    $as_echo "$as_me: exit $exit_status"
-   } >&5
--  rm -f core *.core &&
--  rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
-+  rm -f core *.core core.conftest.* &&
-+    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
+       esac ;;
+     esac
+   done
+@@ -1910,39 +2391,41 @@
      exit $exit_status
--     ' 0
-+' 0
+ ' 0
  for ac_signal in 1 2 13 15; do
 -  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
 +  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
@@ -26271,16 +3136,13 @@
  ac_signal=0
  
  # confdefs.h avoids OS command line length limits that DEFS can exceed.
--rm -rf conftest* confdefs.h
--# AIX cpp loses on an empty file, so make sure it contains at least a newline.
--echo >confdefs.h
-+rm -f -r conftest* confdefs.h
-+
-+$as_echo "/* confdefs.h */" > confdefs.h
+ rm -f -r conftest* confdefs.h
  
++$as_echo "/* confdefs.h */" > confdefs.h
++
  # Predefined preprocessor variables.
  
-@@ -1381,112 +2406,128 @@
+ cat >>confdefs.h <<_ACEOF
  #define PACKAGE_NAME "$PACKAGE_NAME"
  _ACEOF
  
@@ -26310,126 +3172,79 @@
 +
  
  # Let the site file select an alternate cache file if it wants to.
--# Prefer explicitly selected file to automatically selected ones.
--if test -z "$CONFIG_SITE"; then
--  if test "x$prefix" != xNONE; then
--    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
--  else
--    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
--  fi
-+# Prefer an explicitly selected file to automatically selected ones.
-+ac_site_file1=NONE
-+ac_site_file2=NONE
-+if test -n "$CONFIG_SITE"; then
-+  ac_site_file1=$CONFIG_SITE
-+elif test "x$prefix" != xNONE; then
-+  ac_site_file1=$prefix/share/config.site
-+  ac_site_file2=$prefix/etc/config.site
-+else
-+  ac_site_file1=$ac_default_prefix/share/config.site
-+  ac_site_file2=$ac_default_prefix/etc/config.site
- fi
--for ac_site_file in $CONFIG_SITE; do
+ # Prefer an explicitly selected file to automatically selected ones.
+@@ -1960,8 +2443,8 @@
+ for ac_site_file in "$ac_site_file1" "$ac_site_file2"
+ do
+   test "x$ac_site_file" = xNONE && continue
 -  if test -r "$ac_site_file"; then
--    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
--echo "$as_me: loading site script $ac_site_file" >&6;}
-+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
-+do
-+  test "x$ac_site_file" = xNONE && continue
+-    { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
 +  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
-+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
+ $as_echo "$as_me: loading site script $ac_site_file" >&6;}
      sed 's/^/| /' "$ac_site_file" >&5
      . "$ac_site_file"
-   fi
+@@ -1969,10 +2452,10 @@
  done
  
  if test -r "$cache_file"; then
 -  # Some versions of bash will fail to source /dev/null (special
 -  # files actually), so we avoid doing that.
 -  if test -f "$cache_file"; then
--    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
--echo "$as_me: loading cache $cache_file" >&6;}
+-    { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
 +  # Some versions of bash will fail to source /dev/null (special files
 +  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
 +  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
-+$as_echo "$as_me: loading cache $cache_file" >&6;}
+ $as_echo "$as_me: loading cache $cache_file" >&6;}
      case $cache_file in
--      [\\/]* | ?:[\\/]* ) . $cache_file;;
--      *)                      . ./$cache_file;;
-+      [\\/]* | ?:[\\/]* ) . "$cache_file";;
-+      *)                      . "./$cache_file";;
+       [\\/]* | ?:[\\/]* ) . "$cache_file";;
+@@ -1980,7 +2463,7 @@
      esac
    fi
  else
--  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
--echo "$as_me: creating cache $cache_file" >&6;}
+-  { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
-+$as_echo "$as_me: creating cache $cache_file" >&6;}
+ $as_echo "$as_me: creating cache $cache_file" >&6;}
    >$cache_file
  fi
- 
- # Check that the precious variables saved in the cache have kept the same
- # value.
- ac_cache_corrupted=false
--for ac_var in `(set) 2>&1 |
--	       sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
-+for ac_var in $ac_precious_vars; do
-   eval ac_old_set=\$ac_cv_env_${ac_var}_set
-   eval ac_new_set=\$ac_env_${ac_var}_set
--  eval ac_old_val="\$ac_cv_env_${ac_var}_value"
--  eval ac_new_val="\$ac_env_${ac_var}_value"
-+  eval ac_old_val=\$ac_cv_env_${ac_var}_value
-+  eval ac_new_val=\$ac_env_${ac_var}_value
+@@ -1995,11 +2478,11 @@
+   eval ac_new_val=\$ac_env_${ac_var}_value
    case $ac_old_set,$ac_new_set in
      set,)
--      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
--echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+-      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
 +      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+ $as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
        ac_cache_corrupted=: ;;
      ,set)
--      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
--echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+-      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
 +      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
-+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+ $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
        ac_cache_corrupted=: ;;
      ,);;
-     *)
-       if test "x$ac_old_val" != "x$ac_new_val"; then
--	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
--echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
--	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
--echo "$as_me:   former value:  $ac_old_val" >&2;}
--	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
--echo "$as_me:   current value: $ac_new_val" >&2;}
--	ac_cache_corrupted=:
-+	# differences in whitespace do not lead to failure.
-+	ac_old_val_w=`echo x $ac_old_val`
-+	ac_new_val_w=`echo x $ac_new_val`
-+	if test "$ac_old_val_w" != "$ac_new_val_w"; then
+@@ -2009,17 +2492,17 @@
+ 	ac_old_val_w=`echo x $ac_old_val`
+ 	ac_new_val_w=`echo x $ac_new_val`
+ 	if test "$ac_old_val_w" != "$ac_new_val_w"; then
+-	  { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
 +	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
-+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-+	  ac_cache_corrupted=:
-+	else
+ $as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+ 	  ac_cache_corrupted=:
+ 	else
+-	  { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
 +	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
-+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
-+	  eval $ac_var=\$ac_old_val
-+	fi
+ $as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+ 	  eval $ac_var=\$ac_old_val
+ 	fi
+-	{ $as_echo "$as_me:$LINENO:   former value:  \`$ac_old_val'" >&5
 +	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
-+$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
+ $as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
+-	{ $as_echo "$as_me:$LINENO:   current value: \`$ac_new_val'" >&5
 +	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
-+$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
+ $as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
        fi;;
    esac
-   # Pass precious variables to config.status.
-   if test "$ac_new_set" = set; then
-     case $ac_new_val in
--    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
--      ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-+    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-     *) ac_arg=$ac_var=$ac_new_val ;;
+@@ -2031,72 +2514,41 @@
      esac
      case " $ac_configure_args " in
        *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
@@ -26439,28 +3254,21 @@
    fi
  done
  if $ac_cache_corrupted; then
--  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
--echo "$as_me: error: changes in the environment can compromise the build" >&2;}
--  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
--echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
--   { (exit 1); exit 1; }; }
--fi
+-  { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-  { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
-+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+ $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+-  { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+-$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+-   { (exit 1); exit 1; }; }
 +  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
-+fi
+ fi
 +## -------------------- ##
 +## Main body of script. ##
 +## -------------------- ##
  
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -1496,57 +2537,31 @@
- 
- 
- 
 -
 -
 -
@@ -26485,23 +3293,34 @@
 -
 -
 -
--
+-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
++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
+ 
+ 
+ 
  ac_aux_dir=
--for ac_dir in config $srcdir/config; do
--  if test -f $ac_dir/install-sh; then
+ for ac_dir in config "$srcdir"/config; do
+-  if test -f "$ac_dir/install-sh"; then
 -    ac_aux_dir=$ac_dir
 -    ac_install_sh="$ac_aux_dir/install-sh -c"
 -    break
--  elif test -f $ac_dir/install.sh; then
+-  elif test -f "$ac_dir/install.sh"; then
 -    ac_aux_dir=$ac_dir
 -    ac_install_sh="$ac_aux_dir/install.sh -c"
 -    break
--  elif test -f $ac_dir/shtool; then
+-  elif test -f "$ac_dir/shtool"; then
 -    ac_aux_dir=$ac_dir
 -    ac_install_sh="$ac_aux_dir/shtool install -c"
 -    break
 -  fi
-+for ac_dir in config "$srcdir"/config; do
 +  for ac_t in install-sh install.sh shtool; do
 +    if test -f "$ac_dir/$ac_t"; then
 +      ac_aux_dir=$ac_dir
@@ -26511,48 +3330,36 @@
 +  done
  done
  if test -z "$ac_aux_dir"; then
--  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in config $srcdir/config" >&5
--echo "$as_me: error: cannot find install-sh or install.sh in config $srcdir/config" >&2;}
+-  { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in config \"$srcdir\"/config" >&5
+-$as_echo "$as_me: error: cannot find install-sh or install.sh in config \"$srcdir\"/config" >&2;}
 -   { (exit 1); exit 1; }; }
--fi
--ac_config_guess="$SHELL $ac_aux_dir/config.guess"
--ac_config_sub="$SHELL $ac_aux_dir/config.sub"
--ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
 +  as_fn_error "cannot find install-sh, install.sh, or shtool in config \"$srcdir\"/config" "$LINENO" 5
-+fi
-+
-+# These three variables are undocumented and unsupported,
-+# and are intended to be withdrawn in a future Autoconf release.
-+# They can cause serious problems if a builder's source tree is in a directory
-+# whose full name contains unusual characters.
-+ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
-+ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
-+ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
-+
-+
+ fi
+ 
+ # These three variables are undocumented and unsupported,
+@@ -2108,7 +2560,7 @@
+ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
+ 
+ 
+-am__api_version='1.10'
 +am__api_version='1.11'
  
--am__api_version="1.9"
  # Find a good install program.  We prefer a C program (faster),
  # so one script is as good as another.  But avoid the broken or
- # incompatible versions:
-@@ -1560,22 +2575,23 @@
- # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+@@ -2124,10 +2576,10 @@
  # OS/2's system install, which has a completely different semantic
  # ./install, which can be erroneously created by make from ./install.sh.
--echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
--echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
-+# Reject install programs that cannot install multiple files.
+ # Reject install programs that cannot install multiple files.
+-{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
-+$as_echo_n "checking for a BSD-compatible install... " >&6; }
+ $as_echo_n "checking for a BSD-compatible install... " >&6; }
  if test -z "$INSTALL"; then
 -if test "${ac_cv_path_install+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
 +if test "${ac_cv_path_install+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
+   $as_echo_n "(cached) " >&6
  else
    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- for as_dir in $PATH
+@@ -2135,11 +2587,11 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -26568,75 +3375,31 @@
    /usr/ucb/* ) ;;
    *)
      # OSF1 and SCO ODT 3.0 have their own names for install.
-@@ -1583,7 +2599,7 @@
-     # by default.
-     for ac_prog in ginstall scoinst install; do
-       for ac_exec_ext in '' $ac_executable_extensions; do
--	if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
-+	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
- 	  if test $ac_prog = install &&
- 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
- 	    # AIX install.  It has an incompatible calling convention.
-@@ -1593,30 +2609,43 @@
- 	    # program-specific install script used by HP pwplus--don't use.
- 	    :
- 	  else
--	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
--	    break 3
-+	    rm -rf conftest.one conftest.two conftest.dir
-+	    echo one > conftest.one
-+	    echo two > conftest.two
-+	    mkdir conftest.dir
-+	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
-+	      test -s conftest.one && test -s conftest.two &&
-+	      test -s conftest.dir/conftest.one &&
-+	      test -s conftest.dir/conftest.two
-+	    then
-+	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-+	      break 3
-+	    fi
- 	  fi
- 	fi
-       done
-     done
+@@ -2176,7 +2628,7 @@
      ;;
  esac
--done
  
+-done
 +  done
-+IFS=$as_save_IFS
-+
-+rm -rf conftest.one conftest.two conftest.dir
+ IFS=$as_save_IFS
  
- fi
-   if test "${ac_cv_path_install+set}" = set; then
-     INSTALL=$ac_cv_path_install
-   else
--    # As a last resort, use the slow shell script.  We don't cache a
--    # path for INSTALL within a source directory, because that will
-+    # As a last resort, use the slow shell script.  Don't cache a
-+    # value for INSTALL within a source directory, because that will
-     # break other packages using the cache if that directory is
--    # removed, or if the path is relative.
-+    # removed, or if the value is a relative name.
+ rm -rf conftest.one conftest.two conftest.dir
+@@ -2192,7 +2644,7 @@
      INSTALL=$ac_install_sh
    fi
  fi
--echo "$as_me:$LINENO: result: $INSTALL" >&5
--echo "${ECHO_T}$INSTALL" >&6
+-{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
-+$as_echo "$INSTALL" >&6; }
+ $as_echo "$INSTALL" >&6; }
  
  # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
- # It thinks the first close brace ends the variable substitution.
-@@ -1626,21 +2655,34 @@
+@@ -2203,21 +2655,34 @@
  
  test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
  
--echo "$as_me:$LINENO: checking whether build environment is sane" >&5
--echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
+-{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
-+$as_echo_n "checking whether build environment is sane... " >&6; }
+ $as_echo_n "checking whether build environment is sane... " >&6; }
  # Just in case
  sleep 1
  echo timestamp > conftest.file
@@ -26668,13 +3431,13 @@
     fi
     rm -f conftest.file
     if test "$*" != "X $srcdir/configure conftest.file" \
-@@ -1650,11 +2692,8 @@
+@@ -2227,11 +2692,8 @@
        # if, for instance, CONFIG_SHELL is bash and it inherits a
        # broken ls alias from the environment.  This has actually
        # happened.  Such a system could not be considered "sane".
--      { { echo "$as_me:$LINENO: error: ls -t appears to fail.  Make sure there is not a broken
+-      { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail.  Make sure there is not a broken
 -alias in your environment" >&5
--echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
+-$as_echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
 -alias in your environment" >&2;}
 -   { (exit 1); exit 1; }; }
 +      as_fn_error "ls -t appears to fail.  Make sure there is not a broken
@@ -26682,40 +3445,24 @@
     fi
  
     test "$2" = conftest.file
-@@ -1663,81 +2702,206 @@
+@@ -2240,13 +2702,10 @@
     # Ok.
     :
  else
--   { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!
+-   { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files!
 -Check your system clock" >&5
--echo "$as_me: error: newly created file is older than distributed files!
+-$as_echo "$as_me: error: newly created file is older than distributed files!
 -Check your system clock" >&2;}
 -   { (exit 1); exit 1; }; }
 +   as_fn_error "newly created file is older than distributed files!
 +Check your system clock" "$LINENO" 5
  fi
--echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
+-{ $as_echo "$as_me:$LINENO: result: yes" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
+ $as_echo "yes" >&6; }
  test "$program_prefix" != NONE &&
--  program_transform_name="s,^,$program_prefix,;$program_transform_name"
-+  program_transform_name="s&^&$program_prefix&;$program_transform_name"
- # Use a double $ so make ignores it.
- test "$program_suffix" != NONE &&
--  program_transform_name="s,\$,$program_suffix,;$program_transform_name"
--# Double any \ or $.  echo might interpret backslashes.
-+  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
-+# Double any \ or $.
- # By default was `s,x,x', remove it if useless.
--cat <<\_ACEOF >conftest.sed
--s/[\\$]/&&/g;s/;s,x,x,$//
--_ACEOF
--program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
--rm conftest.sed
-+ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
-+program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
- 
+   program_transform_name="s&^&$program_prefix&;$program_transform_name"
+@@ -2261,20 +2720,136 @@
  # expand $ac_aux_dir to an absolute path
  am_aux_dir=`cd $ac_aux_dir && pwd`
  
@@ -26733,40 +3480,12 @@
    am_missing_run="$MISSING --run "
  else
    am_missing_run=
--  { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
--echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+-  { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
-+$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+ $as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
  fi
  
--if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
--  # We used to keeping the `.' as first argument, in order to
--  # allow $(mkdir_p) to be used without argument.  As in
--  #   $(mkdir_p) $(somedir)
--  # where $(somedir) is conditionally defined.  However this is wrong
--  # for two reasons:
--  #  1. if the package is installed by a user who cannot write `.'
--  #     make install will fail,
--  #  2. the above comment should most certainly read
--  #     $(mkdir_p) $(DESTDIR)$(somedir)
--  #     so it does not work when $(somedir) is undefined and
--  #     $(DESTDIR) is not.
--  #  To support the latter case, we have to write
--  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
--  #  so the `.' trick is pointless.
--  mkdir_p='mkdir -p --'
--else
--  # On NextStep and OpenStep, the `mkdir' command does not
--  # recognize any option.  It will interpret all options as
--  # directories to create, and then abort because `.' already
--  # exists.
--  for d in ./-p ./--version;
--  do
--    test -d $d && rmdir $d
--  done
--  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
--  if test -f "$ac_aux_dir/mkinstalldirs"; then
--    mkdir_p='$(mkinstalldirs)'
+-{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
 +if test x"${install_sh}" != xset; then
 +  case $am_aux_dir in
 +  *\ * | *\	*)
@@ -26877,180 +3596,135 @@
 +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 +
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
-+$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
-+if test -z "$MKDIR_P"; then
+ $as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
+ if test -z "$MKDIR_P"; then
+-  if test "${ac_cv_path_mkdir+set}" = set; then
 +  if test "${ac_cv_path_mkdir+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
+   $as_echo_n "(cached) " >&6
+ else
+   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+@@ -2282,7 +2857,7 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_prog in mkdir gmkdir; do
 +    for ac_prog in mkdir gmkdir; do
-+	 for ac_exec_ext in '' $ac_executable_extensions; do
-+	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
-+	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
-+	     'mkdir (GNU coreutils) '* | \
-+	     'mkdir (coreutils) '* | \
-+	     'mkdir (fileutils) '4.1*)
-+	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
-+	       break 3;;
-+	   esac
-+	 done
-+       done
+ 	 for ac_exec_ext in '' $ac_executable_extensions; do
+ 	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+ 	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
+@@ -2294,11 +2869,12 @@
+ 	   esac
+ 	 done
+        done
+-done
 +  done
-+IFS=$as_save_IFS
-+
-+fi
-+
+ IFS=$as_save_IFS
+ 
+ fi
+ 
 +  test -d ./--version && rmdir ./--version
-+  if test "${ac_cv_path_mkdir+set}" = set; then
-+    MKDIR_P="$ac_cv_path_mkdir -p"
+   if test "${ac_cv_path_mkdir+set}" = set; then
+     MKDIR_P="$ac_cv_path_mkdir -p"
    else
--    mkdir_p='$(install_sh) -d'
-+    # As a last resort, use the slow shell script.  Don't cache a
-+    # value for MKDIR_P within a source directory, because that will
-+    # break other packages using the cache if that directory is
-+    # removed, or if the value is a relative name.
-+    MKDIR_P="$ac_install_sh -d"
+@@ -2306,11 +2882,10 @@
+     # value for MKDIR_P within a source directory, because that will
+     # break other packages using the cache if that directory is
+     # removed, or if the value is a relative name.
+-    test -d ./--version && rmdir ./--version
+     MKDIR_P="$ac_install_sh -d"
    fi
  fi
+-{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
-+$as_echo "$MKDIR_P" >&6; }
-+
-+mkdir_p="$MKDIR_P"
-+case $mkdir_p in
-+  [\\/$]* | ?:[\\/]*) ;;
-+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-+esac
+ $as_echo "$MKDIR_P" >&6; }
  
- for ac_prog in gawk mawk nawk awk
+ mkdir_p="$MKDIR_P"
+@@ -2323,9 +2898,9 @@
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_prog_AWK+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_AWK+set}" = set; then
 +if test "${ac_cv_prog_AWK+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
+   $as_echo_n "(cached) " >&6
  else
    if test -n "$AWK"; then
-   ac_cv_prog_AWK="$AWK" # Let the user override the test.
-@@ -1747,55 +2911,59 @@
+@@ -2336,24 +2911,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
 -  for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 +    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
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_AWK="$ac_prog"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
 -done
 +  done
-+IFS=$as_save_IFS
+ IFS=$as_save_IFS
  
  fi
  fi
  AWK=$ac_cv_prog_AWK
  if test -n "$AWK"; then
--  echo "$as_me:$LINENO: result: $AWK" >&5
--echo "${ECHO_T}$AWK" >&6
+-  { $as_echo "$as_me:$LINENO: result: $AWK" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
-+$as_echo "$AWK" >&6; }
+ $as_echo "$AWK" >&6; }
  else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
+ $as_echo "no" >&6; }
  fi
  
-+
+@@ -2361,11 +2936,11 @@
    test -n "$AWK" && break
  done
  
--echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
--echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
--set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
--if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
+-{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
-+set x ${MAKE-make}
-+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+ $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+ set x ${MAKE-make}
+ ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
 +if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
-+  $as_echo_n "(cached) " >&6
+   $as_echo_n "(cached) " >&6
  else
    cat >conftest.make <<\_ACEOF
-+SHELL = /bin/sh
- all:
--	@echo 'ac_maketemp="$(MAKE)"'
-+	@echo '@@@%%%=$(MAKE)=@@@%%%'
- _ACEOF
- # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
--eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
--if test -n "$ac_maketemp"; then
--  eval ac_cv_prog_make_${ac_make}_set=yes
--else
--  eval ac_cv_prog_make_${ac_make}_set=no
--fi
-+case `${MAKE-make} -f conftest.make 2>/dev/null` in
-+  *@@@%%%=?*=@@@%%%*)
-+    eval ac_cv_prog_make_${ac_make}_set=yes;;
-+  *)
-+    eval ac_cv_prog_make_${ac_make}_set=no;;
-+esac
+@@ -2383,11 +2958,11 @@
  rm -f conftest.make
  fi
--if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
+ if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
+-  { $as_echo "$as_me:$LINENO: result: yes" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
+ $as_echo "yes" >&6; }
    SET_MAKE=
  else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
+ $as_echo "no" >&6; }
    SET_MAKE="MAKE=${MAKE-make}"
  fi
- 
-@@ -1808,12 +2976,14 @@
- fi
- rmdir .tst 2>/dev/null
- 
--# test to see if srcdir already configured
--if test "`cd $srcdir && pwd`" != "`pwd`" &&
--   test -f $srcdir/config.status; then
--  { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
--echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
+@@ -2407,9 +2982,7 @@
+   am__isrc=' -I$(srcdir)'
+   # test to see if srcdir already configured
+   if test -f $srcdir/config.status; then
+-    { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
+-$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
 -   { (exit 1); exit 1; }; }
-+if test "`cd $srcdir && pwd`" != "`pwd`"; then
-+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-+  # is not polluted with repeated "-I."
-+  am__isrc=' -I$(srcdir)'
-+  # test to see if srcdir already configured
-+  if test -f $srcdir/config.status; then
 +    as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
-+  fi
+   fi
  fi
  
- # test whether we have cygpath
-@@ -1856,96 +3026,6 @@
+@@ -2453,108 +3026,6 @@
  
  MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
  
--install_sh=${install_sh-"$am_aux_dir/install-sh"}
+-install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
 -
 -# Installed binaries are usually stripped using `strip' when the user
 -# run `make install-strip'.  However `strip' might not be the right
@@ -27060,10 +3734,10 @@
 -  if test -n "$ac_tool_prefix"; then
 -  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 -set dummy ${ac_tool_prefix}strip; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
 -if test "${ac_cv_prog_STRIP+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
+-  $as_echo_n "(cached) " >&6
 -else
 -  if test -n "$STRIP"; then
 -  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
@@ -27074,34 +3748,36 @@
 -  IFS=$as_save_IFS
 -  test -z "$as_dir" && as_dir=.
 -  for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 -    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 -    break 2
 -  fi
 -done
 -done
+-IFS=$as_save_IFS
 -
 -fi
 -fi
 -STRIP=$ac_cv_prog_STRIP
 -if test -n "$STRIP"; then
--  echo "$as_me:$LINENO: result: $STRIP" >&5
--echo "${ECHO_T}$STRIP" >&6
+-  { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
+-$as_echo "$STRIP" >&6; }
 -else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
 -fi
 -
+-
 -fi
 -if test -z "$ac_cv_prog_STRIP"; then
 -  ac_ct_STRIP=$STRIP
 -  # Extract the first word of "strip", so it can be a program name with args.
 -set dummy strip; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
 -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
+-  $as_echo_n "(cached) " >&6
 -else
 -  if test -n "$ac_ct_STRIP"; then
 -  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
@@ -27112,45 +3788,48 @@
 -  IFS=$as_save_IFS
 -  test -z "$as_dir" && as_dir=.
 -  for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 -    ac_cv_prog_ac_ct_STRIP="strip"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 -    break 2
 -  fi
 -done
 -done
+-IFS=$as_save_IFS
 -
--  test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
 -fi
 -fi
 -ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 -if test -n "$ac_ct_STRIP"; then
--  echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
--echo "${ECHO_T}$ac_ct_STRIP" >&6
+-  { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+-$as_echo "$ac_ct_STRIP" >&6; }
 -else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
 -fi
 -
--  STRIP=$ac_ct_STRIP
+-  if test "x$ac_ct_STRIP" = x; then
+-    STRIP=":"
+-  else
+-    case $cross_compiling:$ac_tool_warned in
+-yes:)
+-{ $as_echo "$as_me:$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
+-    STRIP=$ac_ct_STRIP
+-  fi
 -else
 -  STRIP="$ac_cv_prog_STRIP"
 -fi
 -
 -fi
--INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 -
  # We need awk for the "check" target.  The system "awk" is bad on
  # some platforms.
  # Always define AMTAR for backward compatibility.
-@@ -1961,60 +3041,58 @@
- 
- DEPDIR="${am__leading_dot}deps"
- 
--          ac_config_commands="$ac_config_commands depfiles"
-+ac_config_commands="$ac_config_commands depfiles"
- 
- 
+@@ -2576,44 +3047,44 @@
  am_make=${MAKE-make}
  cat > confinc << 'END'
  am__doit:
@@ -27159,10 +3838,9 @@
  .PHONY: am__doit
  END
  # If we don't find an include directive, just comment out the code.
--echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
--echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6
+-{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
-+$as_echo_n "checking for style of include used by $am_make... " >&6; }
+ $as_echo_n "checking for style of include used by $am_make... " >&6; }
  am__include="#"
  am__quote=
  _am_result=none
@@ -27204,472 +3882,351 @@
  fi
  
  
--echo "$as_me:$LINENO: result: $_am_result" >&5
--echo "${ECHO_T}$_am_result" >&6
+-{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
-+$as_echo "$_am_result" >&6; }
+ $as_echo "$_am_result" >&6; }
  rm -f confinc confmf
  
--# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given.
+ # Check whether --enable-dependency-tracking was given.
 -if test "${enable_dependency_tracking+set}" = set; then
--  enableval="$enable_dependency_tracking"
-+# Check whether --enable-dependency-tracking was given.
 +if test "${enable_dependency_tracking+set}" = set; then :
-+  enableval=$enable_dependency_tracking;
-+fi
- 
--fi;
- if test "x$enable_dependency_tracking" != xno; then
-   am_depcomp="$ac_aux_dir/depcomp"
-   AMDEPBACKSLASH='\'
+   enableval=$enable_dependency_tracking;
  fi
--
--
--if test "x$enable_dependency_tracking" != xno; then
-+ if test "x$enable_dependency_tracking" != xno; then
-   AMDEP_TRUE=
-   AMDEP_FALSE='#'
- else
-@@ -2023,7 +3101,6 @@
- fi
  
- 
--
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -2032,10 +3109,10 @@
+@@ -2638,9 +3109,9 @@
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
  set dummy ${ac_tool_prefix}gcc; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_prog_CC+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then
 +if test "${ac_cv_prog_CC+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
+   $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-   ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -2045,35 +3122,37 @@
+@@ -2651,24 +3122,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
 -  for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 +    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
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_CC="${ac_tool_prefix}gcc"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
 -done
 +  done
-+IFS=$as_save_IFS
+ IFS=$as_save_IFS
  
  fi
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
--  echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6
+-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-+$as_echo "$CC" >&6; }
+ $as_echo "$CC" >&6; }
  else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
+ $as_echo "no" >&6; }
  fi
  
-+
- fi
- if test -z "$ac_cv_prog_CC"; then
+@@ -2678,9 +3149,9 @@
    ac_ct_CC=$CC
    # Extract the first word of "gcc", so it can be a program name with args.
  set dummy gcc; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
 +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
+   $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_CC"; then
-   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-@@ -2083,39 +3162,50 @@
+@@ -2691,24 +3162,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
 -  for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 +    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
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_ac_ct_CC="gcc"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
 -done
 +  done
-+IFS=$as_save_IFS
+ IFS=$as_save_IFS
  
  fi
  fi
  ac_ct_CC=$ac_cv_prog_ac_ct_CC
  if test -n "$ac_ct_CC"; then
--  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
--echo "${ECHO_T}$ac_ct_CC" >&6
+-  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-+$as_echo "$ac_ct_CC" >&6; }
+ $as_echo "$ac_ct_CC" >&6; }
  else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
+ $as_echo "no" >&6; }
  fi
  
--  CC=$ac_ct_CC
-+  if test "x$ac_ct_CC" = x; then
-+    CC=""
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
+@@ -2717,7 +3188,7 @@
+   else
+     case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
 +{ $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
-+    CC=$ac_ct_CC
-+  fi
- else
-   CC="$ac_cv_prog_CC"
- fi
- 
- if test -z "$CC"; then
--  if test -n "$ac_tool_prefix"; then
--  # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-+          if test -n "$ac_tool_prefix"; then
-+    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ ac_tool_warned=yes ;;
+ esac
+@@ -2731,9 +3202,9 @@
+           if test -n "$ac_tool_prefix"; then
+     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
  set dummy ${ac_tool_prefix}cc; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_prog_CC+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then
 +if test "${ac_cv_prog_CC+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
+   $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-   ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -2125,77 +3215,37 @@
+@@ -2744,24 +3215,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
 -  for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 +    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
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_CC="${ac_tool_prefix}cc"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
 -done
 +  done
-+IFS=$as_save_IFS
+ IFS=$as_save_IFS
  
  fi
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
--  echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6
--else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--fi
--
--fi
--if test -z "$ac_cv_prog_CC"; then
--  ac_ct_CC=$CC
--  # Extract the first word of "cc", so it can be a program name with args.
--set dummy cc; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  if test -n "$ac_ct_CC"; then
--  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
--else
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--    ac_cv_prog_ac_ct_CC="cc"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--done
--
--fi
--fi
--ac_ct_CC=$ac_cv_prog_ac_ct_CC
--if test -n "$ac_ct_CC"; then
--  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
--echo "${ECHO_T}$ac_ct_CC" >&6
+-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-+$as_echo "$CC" >&6; }
+ $as_echo "$CC" >&6; }
  else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
+ $as_echo "no" >&6; }
  fi
  
--  CC=$ac_ct_CC
--else
--  CC="$ac_cv_prog_CC"
--fi
- 
-+  fi
- fi
+@@ -2771,9 +3242,9 @@
  if test -z "$CC"; then
    # Extract the first word of "cc", so it can be a program name with args.
  set dummy cc; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_prog_CC+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then
 +if test "${ac_cv_prog_CC+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
+   $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-   ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -2206,18 +3256,19 @@
+@@ -2785,18 +3256,18 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
 -  for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 +    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
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
         ac_prog_rejected=yes
         continue
       fi
      ac_cv_prog_CC="cc"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
 -done
 +  done
-+IFS=$as_save_IFS
+ IFS=$as_save_IFS
  
  if test $ac_prog_rejected = yes; then
-   # We found a bogon in the path, so make sure we never use it.
-@@ -2235,24 +3286,25 @@
+@@ -2815,10 +3286,10 @@
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
--  echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6
+-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-+$as_echo "$CC" >&6; }
+ $as_echo "$CC" >&6; }
  else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
+ $as_echo "no" >&6; }
  fi
  
-+
- fi
- if test -z "$CC"; then
-   if test -n "$ac_tool_prefix"; then
--  for ac_prog in cl
-+  for ac_prog in cl.exe
+@@ -2830,9 +3301,9 @@
    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
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_prog_CC+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then
 +if test "${ac_cv_prog_CC+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
+   $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-   ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -2262,39 +3314,41 @@
+@@ -2843,24 +3314,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
 -  for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 +    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
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
 -done
 +  done
-+IFS=$as_save_IFS
+ IFS=$as_save_IFS
  
  fi
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
--  echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6
+-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-+$as_echo "$CC" >&6; }
+ $as_echo "$CC" >&6; }
  else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
+ $as_echo "no" >&6; }
  fi
  
-+
-     test -n "$CC" && break
-   done
- fi
- if test -z "$CC"; then
-   ac_ct_CC=$CC
--  for ac_prog in cl
-+  for ac_prog in cl.exe
+@@ -2874,9 +3345,9 @@
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
 +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
+   $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_CC"; then
-   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-@@ -2304,66 +3358,78 @@
+@@ -2887,24 +3358,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
 -  for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 +    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
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_ac_ct_CC="$ac_prog"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
 -done
 +  done
-+IFS=$as_save_IFS
+ IFS=$as_save_IFS
  
  fi
  fi
  ac_ct_CC=$ac_cv_prog_ac_ct_CC
  if test -n "$ac_ct_CC"; then
--  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
--echo "${ECHO_T}$ac_ct_CC" >&6
+-  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-+$as_echo "$ac_ct_CC" >&6; }
+ $as_echo "$ac_ct_CC" >&6; }
  else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
+ $as_echo "no" >&6; }
  fi
  
-+
-   test -n "$ac_ct_CC" && break
- done
- 
--  CC=$ac_ct_CC
-+  if test "x$ac_ct_CC" = x; then
-+    CC=""
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
+@@ -2917,7 +3388,7 @@
+   else
+     case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
 +{ $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
-+    CC=$ac_ct_CC
-+  fi
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ ac_tool_warned=yes ;;
+ esac
+@@ -2928,57 +3399,37 @@
  fi
  
- fi
  
- 
--test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++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_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
 -See \`config.log' for more details." >&5
--echo "$as_me: error: no acceptable C compiler found in \$PATH
+-$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
 -See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-   { (exit 1); exit 1; }; }; }
 +as_fn_error "no acceptable C compiler found in \$PATH
 +See \`config.log' for more details." "$LINENO" 5; }
  
  # Provide some information about the compiler.
--echo "$as_me:$LINENO:" \
--     "checking for C compiler version" >&5
--ac_compiler=`set X $ac_compile; echo $2`
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
--  (eval $ac_compiler --version </dev/null >&5) 2>&5
+-$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
++$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+ set X $ac_compile
+ ac_compiler=$2
+-{ (ac_try="$ac_compiler --version >&5"
++for ac_option in --version -v -V -qversion; do
++  { { ac_try="$ac_compiler $ac_option >&5"
+ case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compiler --version >&5") 2>&5
 -  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
--  (eval $ac_compiler -v </dev/null >&5) 2>&5
+-{ (ac_try="$ac_compiler -v >&5"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compiler -v >&5") 2>&5
 -  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
--  (eval $ac_compiler -V </dev/null >&5) 2>&5
-+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-+set X $ac_compile
-+ac_compiler=$2
-+for ac_option in --version -v -V -qversion; do
-+  { { ac_try="$ac_compiler $ac_option >&5"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
+-{ (ac_try="$ac_compiler -V >&5"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compiler -V >&5") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }
 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
 +$as_echo "$ac_try_echo"; } >&5
 +  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }
++  ac_status=$?
 +  if test -s conftest.err; then
 +    sed '10a\
 +... rest of stderr output deleted ...
@@ -27690,240 +4247,181 @@
  /* end confdefs.h.  */
  
  int
-@@ -2375,112 +3441,109 @@
- }
- _ACEOF
- ac_clean_files_save=$ac_clean_files
--ac_clean_files="$ac_clean_files a.out a.exe b.out"
-+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
+@@ -2994,8 +3445,8 @@
  # Try to create an executable without -o first, disregard a.out.
  # It will help us diagnose broken compilers, and finding out an intuition
  # of exeext.
--echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
--echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
--ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
--if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
--  (eval $ac_link_default) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
--  # Find the output, starting from the most likely.  This scheme is
--# not robust to junk in `.', hence go to wildcards (a.*) only as a last
--# resort.
--
--# Be careful to initialize this variable, since it used to be cached.
--# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
--ac_cv_exeext=
--# b.out is created by i960 compilers.
--for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
+-{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+-$as_echo_n "checking for C compiler default output file name... " >&6; }
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
 +$as_echo_n "checking whether the C compiler works... " >&6; }
-+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-+
-+# The possible output files:
-+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
-+
-+ac_rmfiles=
-+for ac_file in $ac_files
-+do
-+  case $ac_file in
-+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-+    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
-+  esac
-+done
-+rm -f $ac_rmfiles
-+
+ ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+ 
+ # The possible output files:
+@@ -3011,17 +3462,17 @@
+ done
+ rm -f $ac_rmfiles
+ 
+-if { (ac_try="$ac_link_default"
 +if { { ac_try="$ac_link_default"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
+ case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
 +$as_echo "$ac_try_echo"; } >&5
-+  (eval "$ac_link_default") 2>&5
-+  ac_status=$?
+   (eval "$ac_link_default") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 +  test $ac_status = 0; }; then :
-+  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
-+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
-+# in a Makefile.  We should not override ac_cv_exeext if it was cached,
-+# so that the user can short-circuit this test for compilers unknown to
-+# Autoconf.
-+for ac_file in $ac_files ''
- do
-   test -f "$ac_file" || continue
-   case $ac_file in
--    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
--	;;
--    conftest.$ac_ext )
--	# This is the source file.
-+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
- 	;;
-     [ab].out )
- 	# We found the default executable, but exeext='' is most
+   # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
+ # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
+ # in a Makefile.  We should not override ac_cv_exeext if it was cached,
+@@ -3038,7 +3489,7 @@
  	# certainly right.
  	break;;
      *.* )
--	ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
--	# FIXME: I believe we export ac_cv_exeext for Libtool,
--	# but it would be cool to find out if it's true.  Does anybody
--	# maintain Libtool? --akim.
--	export ac_cv_exeext
+-        if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
 +	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
-+	then :; else
-+	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-+	fi
-+	# We set ac_cv_exeext here because the later test for it is not
-+	# safe: cross compilers may not add the suffix if given an `-o'
-+	# argument, so we may need to know it at that point already.
-+	# Even if this section looks crufty: it has the advantage of
-+	# actually working.
- 	break;;
-     * )
- 	break;;
-   esac
- done
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+test "$ac_cv_exeext" = no && ac_cv_exeext=
- 
--{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
--See \`config.log' for more details." >&5
--echo "$as_me: error: C compiler cannot create executables
--See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }
-+else
-+  ac_file=''
+ 	then :; else
+ 	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+ 	fi
+@@ -3057,84 +3508,42 @@
+ else
+   ac_file=''
  fi
+-
+-{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
+-$as_echo "$ac_file" >&6; }
+-if test -z "$ac_file"; then
+-  $as_echo "$as_me: failed program was:" >&5
 +if test -z "$ac_file"; then :
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
 +$as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
  
+-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
 +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: C compiler cannot create executables
+-See \`config.log' for more details." >&2;}
+-   { (exit 77); exit 77; }; }; }
 +{ as_fn_set_status 77
 +as_fn_error "C compiler cannot create executables
 +See \`config.log' for more details." "$LINENO" 5; }; }
 +else
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 +$as_echo "yes" >&6; }
-+fi
+ fi
+-
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
 +$as_echo_n "checking for C compiler default output file name... " >&6; }
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
 +$as_echo "$ac_file" >&6; }
  ac_exeext=$ac_cv_exeext
--echo "$as_me:$LINENO: result: $ac_file" >&5
--echo "${ECHO_T}$ac_file" >&6
--
--# Check the compiler produces executables we can run.  If not, either
+ 
+-# Check that the compiler produces executables we can run.  If not, either
 -# the compiler is broken, or we cross compile.
--echo "$as_me:$LINENO: checking whether the C compiler works" >&5
--echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
+-{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
+-$as_echo_n "checking whether the C compiler works... " >&6; }
 -# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
 -# If not cross compiling, check that we can run a simple program.
 -if test "$cross_compiling" != yes; then
 -  if { ac_try='./$ac_file'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_try") 2>&5
 -  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 -    cross_compiling=no
 -  else
 -    if test "$cross_compiling" = maybe; then
 -	cross_compiling=yes
 -    else
--	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
+-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
 -If you meant to cross compile, use \`--host'.
 -See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run C compiled programs.
+-$as_echo "$as_me: error: cannot run C compiled programs.
 -If you meant to cross compile, use \`--host'.
 -See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
+-   { (exit 1); exit 1; }; }; }
 -    fi
 -  fi
 -fi
--echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
- 
--rm -f a.out a.exe conftest$ac_cv_exeext b.out
-+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
+-{ $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
+-
+ rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
  ac_clean_files=$ac_clean_files_save
--# Check the compiler produces executables we can run.  If not, either
+-# Check that the compiler produces executables we can run.  If not, either
 -# the compiler is broken, or we cross compile.
--echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
--echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
--echo "$as_me:$LINENO: result: $cross_compiling" >&5
--echo "${ECHO_T}$cross_compiling" >&6
+-{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+-$as_echo_n "checking whether we are cross compiling... " >&6; }
+-{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
+-$as_echo "$cross_compiling" >&6; }
 -
--echo "$as_me:$LINENO: checking for suffix of executables" >&5
--echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
+-{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
-+$as_echo_n "checking for suffix of executables... " >&6; }
+ $as_echo_n "checking for suffix of executables... " >&6; }
+-if { (ac_try="$ac_link"
 +if { { ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
+ case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
 +$as_echo "$ac_try_echo"; } >&5
-+  (eval "$ac_link") 2>&5
+   (eval "$ac_link") 2>&5
    ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; then
 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 +  test $ac_status = 0; }; then :
    # If both `conftest.exe' and `conftest' are `present' (well, observable)
  # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
  # work properly (i.e., refer to `conftest.exe'), while it won't with
-@@ -2488,38 +3551,90 @@
- for ac_file in conftest.exe conftest conftest.*; do
-   test -f "$ac_file" || continue
-   case $ac_file in
--    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
-+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
--	  export ac_cv_exeext
- 	  break;;
-     * ) break;;
+@@ -3149,32 +3558,83 @@
    esac
  done
  else
--  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
 -See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
+-$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
 -See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
--fi
--
--rm -f conftest$ac_cv_exeext
--echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
--echo "${ECHO_T}$ac_cv_exeext" >&6
-+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-   { (exit 1); exit 1; }; }; }
 +as_fn_error "cannot compute suffix of executables: cannot compile and link
 +See \`config.log' for more details." "$LINENO" 5; }
-+fi
+ fi
+-
+-rm -f conftest$ac_cv_exeext
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
 +rm -f conftest conftest$ac_cv_exeext
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-+$as_echo "$ac_cv_exeext" >&6; }
+ $as_echo "$ac_cv_exeext" >&6; }
  
  rm -f conftest.$ac_ext
  EXEEXT=$ac_cv_exeext
  ac_exeext=$EXEEXT
--echo "$as_me:$LINENO: checking for suffix of object files" >&5
--echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
--if test "${ac_cv_objext+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
+-{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +#include <stdio.h>
@@ -27936,9 +4434,7 @@
 +  ;
 +  return 0;
 +}
- _ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
++_ACEOF
 +ac_clean_files="$ac_clean_files conftest.out"
 +# Check that the compiler produces executables we can run.  If not, either
 +# the compiler is broken, or we cross compile.
@@ -27986,76 +4482,72 @@
 +rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
 +ac_clean_files=$ac_clean_files_save
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
-+$as_echo_n "checking for suffix of object files... " >&6; }
+ $as_echo_n "checking for suffix of object files... " >&6; }
+-if test "${ac_cv_objext+set}" = set; then
 +if test "${ac_cv_objext+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
+   $as_echo_n "(cached) " >&6
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  int
-@@ -2531,45 +3646,46 @@
+@@ -3186,17 +3646,17 @@
  }
  _ACEOF
  rm -f conftest.o conftest.obj
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
--  for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
+-if { (ac_try="$ac_compile"
 +if { { ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
+ case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
 +$as_echo "$ac_try_echo"; } >&5
-+  (eval "$ac_compile") 2>&5
-+  ac_status=$?
+   (eval "$ac_compile") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 +  test $ac_status = 0; }; then :
-+  for ac_file in conftest.o conftest.obj conftest.*; do
-+  test -f "$ac_file" || continue;
+   for ac_file in conftest.o conftest.obj conftest.*; do
+   test -f "$ac_file" || continue;
    case $ac_file in
--    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
-+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
-     *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
-        break;;
-   esac
- done
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
+@@ -3209,31 +3669,23 @@
+   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
--{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
+-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
 -See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute suffix of object files: cannot compile
+-$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
 -See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-   { (exit 1); exit 1; }; }; }
 +as_fn_error "cannot compute suffix of object files: cannot compile
 +See \`config.log' for more details." "$LINENO" 5; }
  fi
 -
  rm -f conftest.$ac_cv_objext conftest.$ac_ext
  fi
--echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
--echo "${ECHO_T}$ac_cv_objext" >&6
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
-+$as_echo "$ac_cv_objext" >&6; }
+ $as_echo "$ac_cv_objext" >&6; }
  OBJEXT=$ac_cv_objext
  ac_objext=$OBJEXT
--echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
--echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
--if test "${ac_cv_c_compiler_gnu+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
+-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
-+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+ $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+-if test "${ac_cv_c_compiler_gnu+set}" = set; then
 +if test "${ac_cv_c_compiler_gnu+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
+   $as_echo_n "(cached) " >&6
  else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
@@ -28066,175 +4558,208 @@
  /* end confdefs.h.  */
  
  int
-@@ -2583,55 +3699,34 @@
+@@ -3247,37 +3699,16 @@
    return 0;
  }
  _ACEOF
 -rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
 +if ac_fn_c_try_compile "$LINENO"; then :
    ac_compiler_gnu=yes
  else
--  echo "$as_me: failed program was:" >&5
+-  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
--ac_compiler_gnu=no
+-	ac_compiler_gnu=no
 +  ac_compiler_gnu=no
  fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  ac_cv_c_compiler_gnu=$ac_compiler_gnu
  
  fi
--echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
--echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
--GCC=`test $ac_compiler_gnu = yes && echo yes`
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
-+if test $ac_compiler_gnu = yes; then
-+  GCC=yes
-+else
-+  GCC=
-+fi
+ $as_echo "$ac_cv_c_compiler_gnu" >&6; }
+ if test $ac_compiler_gnu = yes; then
+   GCC=yes
+@@ -3286,20 +3717,16 @@
+ fi
  ac_test_CFLAGS=${CFLAGS+set}
  ac_save_CFLAGS=$CFLAGS
--CFLAGS="-g"
--echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
--echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
+-{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+ $as_echo_n "checking whether $CC accepts -g... " >&6; }
 -if test "${ac_cv_prog_cc_g+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
++if test "${ac_cv_prog_cc_g+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_save_c_werror_flag=$ac_c_werror_flag
+    ac_c_werror_flag=yes
+    ac_cv_prog_cc_g=no
+    CFLAGS="-g"
+-   cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
-+$as_echo_n "checking whether $CC accepts -g... " >&6; }
-+if test "${ac_cv_prog_cc_g+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_save_c_werror_flag=$ac_c_werror_flag
-+   ac_c_werror_flag=yes
-+   ac_cv_prog_cc_g=no
-+   CFLAGS="-g"
 +   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  int
-@@ -2642,39 +3737,49 @@
+@@ -3310,35 +3737,11 @@
    return 0;
  }
  _ACEOF
 -rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
 +if ac_fn_c_try_compile "$LINENO"; then :
    ac_cv_prog_cc_g=yes
  else
--  echo "$as_me: failed program was:" >&5
+-  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	CFLAGS=""
+-      cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
 +  CFLAGS=""
 +      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ int
+@@ -3349,36 +3752,12 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
+-  :
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
 +if ac_fn_c_try_compile "$LINENO"; then :
-+
+ 
+-	ac_c_werror_flag=$ac_save_c_werror_flag
 +else
 +  ac_c_werror_flag=$ac_save_c_werror_flag
-+	 CFLAGS="-g"
+ 	 CFLAGS="-g"
+-	 cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
 +	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
+ /* end confdefs.h.  */
  
--ac_cv_prog_cc_g=no
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ int
+@@ -3389,42 +3768,17 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
 +if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_prog_cc_g=yes
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_cv_prog_cc_g=yes
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
  fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
--echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
--echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+   ac_c_werror_flag=$ac_save_c_werror_flag
-+fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    ac_c_werror_flag=$ac_save_c_werror_flag
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-+$as_echo "$ac_cv_prog_cc_g" >&6; }
+ $as_echo "$ac_cv_prog_cc_g" >&6; }
  if test "$ac_test_CFLAGS" = set; then
    CFLAGS=$ac_save_CFLAGS
- elif test $ac_cv_prog_cc_g = yes; then
-@@ -2690,18 +3795,14 @@
+@@ -3441,18 +3795,14 @@
      CFLAGS=
    fi
  fi
--echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
--echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
--if test "${ac_cv_prog_cc_stdc+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
+-{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
-+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+ $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+-if test "${ac_cv_prog_cc_c89+set}" = set; then
 +if test "${ac_cv_prog_cc_c89+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
+   $as_echo_n "(cached) " >&6
  else
--  ac_cv_prog_cc_stdc=no
-+  ac_cv_prog_cc_c89=no
+   ac_cv_prog_cc_c89=no
  ac_save_CC=$CC
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
@@ -28245,267 +4770,76 @@
  /* end confdefs.h.  */
  #include <stdarg.h>
  #include <stdio.h>
-@@ -2729,12 +3830,17 @@
- /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-    function prototypes and stuff, but not '\xHH' hex character constants.
-    These don't provoke an error unfortunately, instead are silently treated
--   as 'x'.  The following induces an error, until -std1 is added to get
-+   as 'x'.  The following induces an error, until -std is added to get
-    proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-    array size at least.  It's necessary to write '\x00'==0 to get something
--   that's true only with -std1.  */
-+   that's true only with -std.  */
- int osf4_cc_array ['\x00' == 0 ? 1 : -1];
- 
-+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-+   inside strings and character constants.  */
-+#define FOO(x) 'x'
-+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-+
- int test (int i, double x);
- struct s1 {int (*f) (int a);};
- struct s2 {int (*f) (double a);};
-@@ -2749,205 +3855,37 @@
-   return 0;
- }
- _ACEOF
--# Don't try gcc -ansi; that turns off useful extensions and
--# breaks some systems' header files.
--# AIX			-qlanglvl=ansi
--# Ultrix and OSF/1	-std1
--# HP-UX 10.20 and later	-Ae
--# HP-UX older versions	-Aa -D_HPUX_SOURCE
--# SVR4			-Xc -D__EXTENSIONS__
--for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-+	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+@@ -3509,32 +3859,9 @@
+ 	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
  do
    CC="$ac_save_CC $ac_arg"
 -  rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_prog_cc_stdc=$ac_arg
--break
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
++  if ac_fn_c_try_compile "$LINENO"; then :
+   ac_cv_prog_cc_c89=$ac_arg
 -else
--  echo "$as_me: failed program was:" >&5
+-  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
-+  if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_prog_cc_c89=$ac_arg
+-
  fi
--rm -f conftest.err conftest.$ac_objext
-+rm -f core conftest.err conftest.$ac_objext
-+  test "x$ac_cv_prog_cc_c89" != "xno" && break
- done
--rm -f conftest.$ac_ext conftest.$ac_objext
-+rm -f conftest.$ac_ext
- CC=$ac_save_CC
- 
- fi
 -
--case "x$ac_cv_prog_cc_stdc" in
--  x|xno)
--    echo "$as_me:$LINENO: result: none needed" >&5
--echo "${ECHO_T}none needed" >&6 ;;
-+# AC_CACHE_VAL
-+case "x$ac_cv_prog_cc_c89" in
-+  x)
+ rm -f core conftest.err conftest.$ac_objext
+   test "x$ac_cv_prog_cc_c89" != "xno" && break
+ done
+@@ -3545,17 +3872,19 @@
+ # AC_CACHE_VAL
+ case "x$ac_cv_prog_cc_c89" in
+   x)
+-    { $as_echo "$as_me:$LINENO: result: none needed" >&5
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-+$as_echo "none needed" >&6; } ;;
-+  xno)
+ $as_echo "none needed" >&6; } ;;
+   xno)
+-    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-+$as_echo "unsupported" >&6; } ;;
+ $as_echo "unsupported" >&6; } ;;
    *)
--    echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
--echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
--    CC="$CC $ac_cv_prog_cc_stdc" ;;
-+    CC="$CC $ac_cv_prog_cc_c89"
+     CC="$CC $ac_cv_prog_cc_c89"
+-    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
+ $as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
  esac
 +if test "x$ac_cv_prog_cc_c89" != xno; then :
  
--# Some people use a C++ compiler to compile C.  Since we use `exit',
--# in C++ we need to declare it.  In case someone uses the same compiler
--# for both compiling C and C++ we need to have the C++ compiler decide
--# the declaration of exit, since it's the most demanding environment.
--cat >conftest.$ac_ext <<_ACEOF
--#ifndef __cplusplus
--  choke me
--#endif
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  for ac_declaration in \
--   '' \
--   'extern "C" void std::exit (int) throw (); using std::exit;' \
--   'extern "C" void std::exit (int); using std::exit;' \
--   'extern "C" void exit (int) throw ();' \
--   'extern "C" void exit (int);' \
--   'void exit (int);'
--do
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--$ac_declaration
--#include <stdlib.h>
--int
--main ()
--{
--exit (42);
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  :
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--continue
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--$ac_declaration
--int
--main ()
--{
--exit (42);
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  break
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--done
--rm -f conftest*
--if test -n "$ac_declaration"; then
--  echo '#ifdef __cplusplus' >>confdefs.h
--  echo $ac_declaration      >>confdefs.h
--  echo '#endif'             >>confdefs.h
- fi
++fi
  
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -2956,10 +3894,10 @@
+@@ -3565,9 +3894,9 @@
  
  depcc="$CC"   am_compiler_list=
  
--echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
--echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
--if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
+-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
-+$as_echo_n "checking dependency style of $depcc... " >&6; }
+ $as_echo_n "checking dependency style of $depcc... " >&6; }
+-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
 +if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
+   $as_echo_n "(cached) " >&6
  else
    if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-   # We make a subdir and do the tests there.  Otherwise we can end up
-@@ -2984,6 +3922,11 @@
+@@ -3593,6 +3922,11 @@
    if test "$am_compiler_list" = ""; then
       am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
    fi
@@ -28517,7 +4851,7 @@
    for depmode in $am_compiler_list; do
      # Setup a source with many dependencies, because some compilers
      # like to wrap large dependency lists on column 80 (with \), and
-@@ -3001,7 +3944,17 @@
+@@ -3610,7 +3944,17 @@
      done
      echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
  
@@ -28535,7 +4869,7 @@
      nosideeffect)
        # after this tag, mechanisms are not by side-effect, so they'll
        # only be used when explicitly requested
-@@ -3011,18 +3964,23 @@
+@@ -3620,19 +3964,23 @@
  	break
        fi
        ;;
@@ -28558,51 +4892,40 @@
 -       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
 +       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
           >/dev/null 2>conftest.err &&
-+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+        grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
         grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
 -       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
 +       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
         ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
        # icc doesn't choke on unknown options, it will just issue warnings
        # or remarks (even with -Werror).  So we grep stderr for any message
-@@ -3046,13 +4004,11 @@
+@@ -3656,7 +4004,7 @@
  fi
  
  fi
--echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
--echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
+-{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
-+$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
+ $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
  CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
  
--
--
--if
-+ if
-   test "x$enable_dependency_tracking" != xno \
-   && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-   am__fastdepCC_TRUE=
-@@ -3068,15 +4024,15 @@
+@@ -3676,14 +4024,14 @@
  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
--echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
--echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
+-{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
-+$as_echo_n "checking how to run the C preprocessor... " >&6; }
+ $as_echo_n "checking how to run the C preprocessor... " >&6; }
  # On Suns, sometimes $CPP names a directory.
  if test -n "$CPP" && test -d "$CPP"; then
    CPP=
  fi
  if test -z "$CPP"; then
 -  if test "${ac_cv_prog_CPP+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
 +  if test "${ac_cv_prog_CPP+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
+   $as_echo_n "(cached) " >&6
  else
        # Double quotes because CPP needs to be expanded
-     for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-@@ -3090,11 +4046,7 @@
+@@ -3698,11 +4046,7 @@
    # <limits.h> exists even on freestanding compilers.
    # On the NeXT, cc -E runs the code through the compiler's parser,
    # not just through cpp. "Syntax error" is here to catch this case.
@@ -28615,31 +4938,30 @@
  /* end confdefs.h.  */
  #ifdef __STDC__
  # include <limits.h>
-@@ -3103,68 +4055,24 @@
+@@ -3711,78 +4055,34 @@
  #endif
  		     Syntax error
  _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+-if { (ac_try="$ac_cpp conftest.$ac_ext"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } >/dev/null; then
--  if test -s conftest.err; then
--    ac_cpp_err=$ac_c_preproc_warn_flag
--    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
--  else
--    ac_cpp_err=
--  fi
--else
--  ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null && {
+-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       }; then
 -  :
 -else
--  echo "$as_me: failed program was:" >&5
+-  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 +if ac_fn_c_try_cpp "$LINENO"; then :
  
@@ -28647,10 +4969,10 @@
    # Broken: fails on valid input.
  continue
  fi
+-
  rm -f conftest.err conftest.$ac_ext
  
--  # OK, works on sane cases.  Now check whether non-existent headers
-+  # OK, works on sane cases.  Now check whether nonexistent headers
+   # OK, works on sane cases.  Now check whether nonexistent headers
    # can be detected and how.
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
@@ -28661,35 +4983,37 @@
  /* end confdefs.h.  */
  #include <ac_nonexistent.h>
  _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+-if { (ac_try="$ac_cpp conftest.$ac_ext"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } >/dev/null; then
--  if test -s conftest.err; then
--    ac_cpp_err=$ac_c_preproc_warn_flag
--    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
--  else
--    ac_cpp_err=
--  fi
--else
--  ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null && {
+-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       }; then
 +if ac_fn_c_try_cpp "$LINENO"; then :
    # Broken: success on invalid input.
  continue
  else
--  echo "$as_me: failed program was:" >&5
+-  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
    # Passes both tests.
  ac_preproc_ok=:
  break
-@@ -3174,7 +4082,7 @@
+ 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
@@ -28698,18 +5022,16 @@
    break
  fi
  
-@@ -3186,8 +4094,8 @@
+@@ -3794,7 +4094,7 @@
  else
    ac_cv_prog_CPP=$CPP
  fi
--echo "$as_me:$LINENO: result: $CPP" >&5
--echo "${ECHO_T}$CPP" >&6
+-{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
-+$as_echo "$CPP" >&6; }
+ $as_echo "$CPP" >&6; }
  ac_preproc_ok=false
  for ac_c_preproc_warn_flag in '' yes
- do
-@@ -3197,11 +4105,7 @@
+@@ -3805,11 +4105,7 @@
    # <limits.h> exists even on freestanding compilers.
    # On the NeXT, cc -E runs the code through the compiler's parser,
    # not just through cpp. "Syntax error" is here to catch this case.
@@ -28722,31 +5044,30 @@
  /* end confdefs.h.  */
  #ifdef __STDC__
  # include <limits.h>
-@@ -3210,68 +4114,24 @@
+@@ -3818,87 +4114,40 @@
  #endif
  		     Syntax error
  _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+-if { (ac_try="$ac_cpp conftest.$ac_ext"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } >/dev/null; then
--  if test -s conftest.err; then
--    ac_cpp_err=$ac_c_preproc_warn_flag
--    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
--  else
--    ac_cpp_err=
--  fi
--else
--  ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null && {
+-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       }; then
 -  :
 -else
--  echo "$as_me: failed program was:" >&5
+-  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 +if ac_fn_c_try_cpp "$LINENO"; then :
  
@@ -28754,10 +5075,10 @@
    # Broken: fails on valid input.
  continue
  fi
+-
  rm -f conftest.err conftest.$ac_ext
  
--  # OK, works on sane cases.  Now check whether non-existent headers
-+  # OK, works on sane cases.  Now check whether nonexistent headers
+   # OK, works on sane cases.  Now check whether nonexistent headers
    # can be detected and how.
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
@@ -28768,35 +5089,37 @@
  /* end confdefs.h.  */
  #include <ac_nonexistent.h>
  _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+-if { (ac_try="$ac_cpp conftest.$ac_ext"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } >/dev/null; then
--  if test -s conftest.err; then
--    ac_cpp_err=$ac_c_preproc_warn_flag
--    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
--  else
--    ac_cpp_err=
--  fi
--else
--  ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null && {
+-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       }; then
 +if ac_fn_c_try_cpp "$LINENO"; then :
    # Broken: success on invalid input.
  continue
  else
--  echo "$as_me: failed program was:" >&5
+-  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
    # Passes both tests.
  ac_preproc_ok=:
  break
-@@ -3281,14 +4141,13 @@
+ 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
@@ -28805,196 +5128,159 @@
 +if $ac_preproc_ok; then :
 +
  else
--  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
 -See \`config.log' for more details." >&5
--echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+-$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
 -See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
-+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-   { (exit 1); exit 1; }; }; }
 +as_fn_error "C preprocessor \"$CPP\" fails sanity check
 +See \`config.log' for more details." "$LINENO" 5; }
  fi
  
  ac_ext=c
-@@ -3297,20 +4156,24 @@
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
--ac_ext=cc
-+ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
--if test -n "$ac_tool_prefix"; then
--  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
-+if test -z "$CXX"; then
-+  if test -n "$CCC"; then
-+    CXX=$CCC
-+  else
-+    if test -n "$ac_tool_prefix"; then
-+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+@@ -3921,9 +4170,9 @@
    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
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_prog_CXX+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CXX+set}" = set; then
 +if test "${ac_cv_prog_CXX+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
+   $as_echo_n "(cached) " >&6
  else
    if test -n "$CXX"; then
-   ac_cv_prog_CXX="$CXX" # Let the user override the test.
-@@ -3320,39 +4183,41 @@
+@@ -3934,24 +4183,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
 -  for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 +    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
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
 -done
 +  done
-+IFS=$as_save_IFS
+ IFS=$as_save_IFS
  
  fi
  fi
  CXX=$ac_cv_prog_CXX
  if test -n "$CXX"; then
--  echo "$as_me:$LINENO: result: $CXX" >&5
--echo "${ECHO_T}$CXX" >&6
+-  { $as_echo "$as_me:$LINENO: result: $CXX" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
-+$as_echo "$CXX" >&6; }
+ $as_echo "$CXX" >&6; }
  else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
+ $as_echo "no" >&6; }
  fi
  
-+
-     test -n "$CXX" && break
-   done
- fi
- if test -z "$CXX"; then
-   ac_ct_CXX=$CXX
--  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
-+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+@@ -3965,9 +4214,9 @@
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
 +if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
+   $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.
-@@ -3362,64 +4227,77 @@
+@@ -3978,24 +4227,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
 -  for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 +    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
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_ac_ct_CXX="$ac_prog"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
 -done
 +  done
-+IFS=$as_save_IFS
+ IFS=$as_save_IFS
  
  fi
  fi
  ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
  if test -n "$ac_ct_CXX"; then
--  echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
--echo "${ECHO_T}$ac_ct_CXX" >&6
+-  { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
-+$as_echo "$ac_ct_CXX" >&6; }
+ $as_echo "$ac_ct_CXX" >&6; }
  else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
+ $as_echo "no" >&6; }
  fi
  
-+
-   test -n "$ac_ct_CXX" && break
- done
--test -n "$ac_ct_CXX" || ac_ct_CXX="g++"
- 
--  CXX=$ac_ct_CXX
-+  if test "x$ac_ct_CXX" = x; then
-+    CXX="g++"
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
+@@ -4008,7 +4257,7 @@
+   else
+     case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
 +{ $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
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ ac_tool_warned=yes ;;
+ esac
+@@ -4019,53 +4268,36 @@
+   fi
  fi
- 
--
-+  fi
-+fi
  # Provide some information about the compiler.
--echo "$as_me:$LINENO:" \
--     "checking for C++ compiler version" >&5
--ac_compiler=`set X $ac_compile; echo $2`
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
--  (eval $ac_compiler --version </dev/null >&5) 2>&5
+-$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5
++$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
+ set X $ac_compile
+ ac_compiler=$2
+-{ (ac_try="$ac_compiler --version >&5"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compiler --version >&5") 2>&5
 -  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
--  (eval $ac_compiler -v </dev/null >&5) 2>&5
+-{ (ac_try="$ac_compiler -v >&5"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compiler -v >&5") 2>&5
 -  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
--  (eval $ac_compiler -V </dev/null >&5) 2>&5
-+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
-+set X $ac_compile
-+ac_compiler=$2
+-{ (ac_try="$ac_compiler -V >&5"
 +for ac_option in --version -v -V -qversion; do
 +  { { ac_try="$ac_compiler $ac_option >&5"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
+ case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compiler -V >&5") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }
 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
 +$as_echo "$ac_try_echo"; } >&5
 +  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }
--
--echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
--echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6
--if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
++  ac_status=$?
 +  if test -s conftest.err; then
 +    sed '10a\
 +... rest of stderr output deleted ...
@@ -29005,11 +5291,13 @@
 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 +  test $ac_status = 0; }
 +done
-+
+ 
+-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
-+$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
+ $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
+-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
 +if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
+   $as_echo_n "(cached) " >&6
  else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
@@ -29020,144 +5308,101 @@
  /* end confdefs.h.  */
  
  int
-@@ -3433,55 +4311,34 @@
+@@ -4079,37 +4311,16 @@
    return 0;
  }
  _ACEOF
 -rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_cxx_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
 +if ac_fn_cxx_try_compile "$LINENO"; then :
    ac_compiler_gnu=yes
  else
--  echo "$as_me: failed program was:" >&5
+-  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
--ac_compiler_gnu=no
+-	ac_compiler_gnu=no
 +  ac_compiler_gnu=no
  fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
  
  fi
--echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
--echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6
--GXX=`test $ac_compiler_gnu = yes && echo yes`
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
-+$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
-+if test $ac_compiler_gnu = yes; then
-+  GXX=yes
-+else
-+  GXX=
-+fi
+ $as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
+ if test $ac_compiler_gnu = yes; then
+   GXX=yes
+@@ -4118,20 +4329,16 @@
+ fi
  ac_test_CXXFLAGS=${CXXFLAGS+set}
  ac_save_CXXFLAGS=$CXXFLAGS
--CXXFLAGS="-g"
--echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
--echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6
+-{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
+ $as_echo_n "checking whether $CXX accepts -g... " >&6; }
 -if test "${ac_cv_prog_cxx_g+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
++if test "${ac_cv_prog_cxx_g+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_save_cxx_werror_flag=$ac_cxx_werror_flag
+    ac_cxx_werror_flag=yes
+    ac_cv_prog_cxx_g=no
+    CXXFLAGS="-g"
+-   cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
-+$as_echo_n "checking whether $CXX accepts -g... " >&6; }
-+if test "${ac_cv_prog_cxx_g+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
-+   ac_cxx_werror_flag=yes
-+   ac_cv_prog_cxx_g=no
-+   CXXFLAGS="-g"
 +   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  int
-@@ -3492,160 +4349,64 @@
+@@ -4142,35 +4349,11 @@
    return 0;
  }
  _ACEOF
 -rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_cxx_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
 +if ac_fn_cxx_try_compile "$LINENO"; then :
    ac_cv_prog_cxx_g=yes
  else
--  echo "$as_me: failed program was:" >&5
+-  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
--ac_cv_prog_cxx_g=no
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
--echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
--if test "$ac_test_CXXFLAGS" = set; then
--  CXXFLAGS=$ac_save_CXXFLAGS
--elif test $ac_cv_prog_cxx_g = yes; then
--  if test "$GXX" = yes; then
--    CXXFLAGS="-g -O2"
--  else
--    CXXFLAGS="-g"
--  fi
--else
--  if test "$GXX" = yes; then
--    CXXFLAGS="-O2"
--  else
--    CXXFLAGS=
--  fi
--fi
--for ac_declaration in \
--   '' \
--   'extern "C" void std::exit (int) throw (); using std::exit;' \
--   'extern "C" void std::exit (int); using std::exit;' \
--   'extern "C" void exit (int) throw ();' \
--   'extern "C" void exit (int);' \
--   'void exit (int);'
--do
--  cat >conftest.$ac_ext <<_ACEOF
+-	CXXFLAGS=""
+-      cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
@@ -29165,151 +5410,107 @@
 +  CXXFLAGS=""
 +      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
--$ac_declaration
--#include <stdlib.h>
-+
+ 
  int
- main ()
- {
--exit (42);
-+
-   ;
+@@ -4181,36 +4364,12 @@
    return 0;
  }
  _ACEOF
 -rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_cxx_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
 -  :
 -else
--  echo "$as_me: failed program was:" >&5
+-  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 +if ac_fn_cxx_try_compile "$LINENO"; then :
  
--continue
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--  cat >conftest.$ac_ext <<_ACEOF
+-	ac_cxx_werror_flag=$ac_save_cxx_werror_flag
++else
++  ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+ 	 CXXFLAGS="-g"
+-	 cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+else
-+  ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-+	 CXXFLAGS="-g"
 +	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
--$ac_declaration
-+
+ 
  int
- main ()
- {
--exit (42);
-+
-   ;
+@@ -4221,42 +4380,17 @@
    return 0;
  }
  _ACEOF
 -rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  break
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_cxx_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
++if ac_fn_cxx_try_compile "$LINENO"; then :
+   ac_cv_prog_cxx_g=yes
 -else
--  echo "$as_me: failed program was:" >&5
+-  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  ac_cv_prog_cxx_g=yes
+-
  fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--done
--rm -f conftest*
--if test -n "$ac_declaration"; then
--  echo '#ifdef __cplusplus' >>confdefs.h
--  echo $ac_declaration      >>confdefs.h
--  echo '#endif'             >>confdefs.h
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
-+$as_echo "$ac_cv_prog_cxx_g" >&6; }
-+if test "$ac_test_CXXFLAGS" = set; then
-+  CXXFLAGS=$ac_save_CXXFLAGS
-+elif test $ac_cv_prog_cxx_g = yes; then
-+  if test "$GXX" = yes; then
-+    CXXFLAGS="-g -O2"
-+  else
-+    CXXFLAGS="-g"
-+  fi
-+else
-+  if test "$GXX" = yes; then
-+    CXXFLAGS="-O2"
-+  else
-+    CXXFLAGS=
-+  fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -3654,10 +4415,10 @@
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
+ $as_echo "$ac_cv_prog_cxx_g" >&6; }
+ if test "$ac_test_CXXFLAGS" = set; then
+   CXXFLAGS=$ac_save_CXXFLAGS
+@@ -4281,9 +4415,9 @@
  
  depcc="$CXX"  am_compiler_list=
  
--echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
--echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
--if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
+-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
-+$as_echo_n "checking dependency style of $depcc... " >&6; }
+ $as_echo_n "checking dependency style of $depcc... " >&6; }
+-if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
 +if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
+   $as_echo_n "(cached) " >&6
  else
    if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-   # We make a subdir and do the tests there.  Otherwise we can end up
-@@ -3682,6 +4443,11 @@
+@@ -4309,6 +4443,11 @@
    if test "$am_compiler_list" = ""; then
       am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
    fi
@@ -29321,7 +5522,7 @@
    for depmode in $am_compiler_list; do
      # Setup a source with many dependencies, because some compilers
      # like to wrap large dependency lists on column 80 (with \), and
-@@ -3699,7 +4465,17 @@
+@@ -4326,7 +4465,17 @@
      done
      echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
  
@@ -29339,7 +5540,7 @@
      nosideeffect)
        # after this tag, mechanisms are not by side-effect, so they'll
        # only be used when explicitly requested
-@@ -3709,18 +4485,23 @@
+@@ -4336,19 +4485,23 @@
  	break
        fi
        ;;
@@ -29362,31 +5563,23 @@
 -       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
 +       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
           >/dev/null 2>conftest.err &&
-+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+        grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
         grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
 -       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
 +       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
         ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
        # icc doesn't choke on unknown options, it will just issue warnings
        # or remarks (even with -Werror).  So we grep stderr for any message
-@@ -3744,13 +4525,11 @@
+@@ -4372,7 +4525,7 @@
  fi
  
  fi
--echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
--echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6
+-{ $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5
-+$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
+ $as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
  CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
  
--
--
--if
-+ if
-   test "x$enable_dependency_tracking" != xno \
-   && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
-   am__fastdepCXX_TRUE=
-@@ -3761,301 +4540,417 @@
+@@ -4387,109 +4540,17 @@
  fi
  
  
@@ -29403,11 +5596,12 @@
 -# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 -# OS/2's system install, which has a completely different semantic
 -# ./install, which can be erroneously created by make from ./install.sh.
--echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
--echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
+-# Reject install programs that cannot install multiple files.
+-{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+-$as_echo_n "checking for a BSD-compatible install... " >&6; }
 -if test -z "$INSTALL"; then
 -if test "${ac_cv_path_install+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
+-  $as_echo_n "(cached) " >&6
 -else
 -  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 -for as_dir in $PATH
@@ -29426,7 +5620,7 @@
 -    # by default.
 -    for ac_prog in ginstall scoinst install; do
 -      for ac_exec_ext in '' $ac_executable_extensions; do
--	if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
+-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
 -	  if test $ac_prog = install &&
 -	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
 -	    # AIX install.  It has an incompatible calling convention.
@@ -29436,3174 +5630,1084 @@
 -	    # program-specific install script used by HP pwplus--don't use.
 -	    :
 -	  else
--	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
--	    break 3
+-	    rm -rf conftest.one conftest.two conftest.dir
+-	    echo one > conftest.one
+-	    echo two > conftest.two
+-	    mkdir conftest.dir
+-	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+-	      test -s conftest.one && test -s conftest.two &&
+-	      test -s conftest.dir/conftest.one &&
+-	      test -s conftest.dir/conftest.two
+-	    then
+-	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+-	      break 3
+-	    fi
 -	  fi
 -	fi
 -      done
 -    done
 -    ;;
-+
-+case `pwd` in
-+  *\ * | *\	*)
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
-+$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
- esac
+-esac
+-
 -done
- 
- 
+-IFS=$as_save_IFS
+-
+-rm -rf conftest.one conftest.two conftest.dir
+-
 -fi
 -  if test "${ac_cv_path_install+set}" = set; then
 -    INSTALL=$ac_cv_path_install
 -  else
--    # As a last resort, use the slow shell script.  We don't cache a
--    # path for INSTALL within a source directory, because that will
+-    # As a last resort, use the slow shell script.  Don't cache a
+-    # value for INSTALL within a source directory, because that will
 -    # break other packages using the cache if that directory is
--    # removed, or if the path is relative.
+-    # removed, or if the value is a relative name.
 -    INSTALL=$ac_install_sh
 -  fi
 -fi
--echo "$as_me:$LINENO: result: $INSTALL" >&5
--echo "${ECHO_T}$INSTALL" >&6
- 
+-{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
+-$as_echo "$INSTALL" >&6; }
+-
 -# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
 -# It thinks the first close brace ends the variable substitution.
 -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-+macro_version='2.2.6b'
-+macro_revision='1.3017'
-+
-+
-+
-+
- 
+-
 -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
- 
+-
 -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
  
--# Check whether --enable-shared or --disable-shared was given.
--if test "${enable_shared+set}" = set; then
--  enableval="$enable_shared"
--  p=${PACKAGE-default}
--    case $enableval in
--    yes) enable_shared=yes ;;
--    no) enable_shared=no ;;
--    *)
--      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
--else
--  enable_shared=yes
--fi;
+ case `pwd` in
+   *\ * | *\	*)
+-    { $as_echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
++    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
+ $as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
+ esac
  
--# Check whether --enable-static or --disable-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=yes
--fi;
  
--# Check whether --enable-fast-install or --disable-fast-install was given.
--if test "${enable_fast_install+set}" = set; then
--  enableval="$enable_fast_install"
--  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
--else
--  enable_fast_install=yes
--fi;
-+
-+
-+
-+
-+ltmain="$ac_aux_dir/ltmain.sh"
  
+-macro_version='2.2.6'
+-macro_revision='1.3012'
++macro_version='2.2.6b'
++macro_revision='1.3017'
+ 
+ 
+ 
+@@ -4507,35 +4568,27 @@
+ 
  # Make sure we can run config.sub.
--$ac_config_sub sun4 >/dev/null 2>&1 ||
--  { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
--echo "$as_me: error: cannot run $ac_config_sub" >&2;}
+ $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+-  { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
+-$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
 -   { (exit 1); exit 1; }; }
--
--echo "$as_me:$LINENO: checking build system type" >&5
--echo $ECHO_N "checking build system type... $ECHO_C" >&6
--if test "${ac_cv_build+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  ac_cv_build_alias=$build_alias
--test -z "$ac_cv_build_alias" &&
--  ac_cv_build_alias=`$ac_config_guess`
--test -z "$ac_cv_build_alias" &&
--  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
--echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
--   { (exit 1); exit 1; }; }
--ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
--  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
--echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
--   { (exit 1); exit 1; }; }
-+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
 +  as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
  
--fi
--echo "$as_me:$LINENO: result: $ac_cv_build" >&5
--echo "${ECHO_T}$ac_cv_build" >&6
+-{ $as_echo "$as_me:$LINENO: checking build system type" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
-+$as_echo_n "checking build system type... " >&6; }
+ $as_echo_n "checking build system type... " >&6; }
+-if test "${ac_cv_build+set}" = set; then
 +if test "${ac_cv_build+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_build_alias=$build_alias
-+test "x$ac_build_alias" = x &&
-+  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
-+test "x$ac_build_alias" = x &&
+   $as_echo_n "(cached) " >&6
+ else
+   ac_build_alias=$build_alias
+ test "x$ac_build_alias" = x &&
+   ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+ test "x$ac_build_alias" = x &&
+-  { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
+-$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+-   { (exit 1); exit 1; }; }
 +  as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
-+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+ ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+-  { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
+-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
+-   { (exit 1); exit 1; }; }
 +  as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
-+
-+fi
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
-+$as_echo "$ac_cv_build" >&6; }
-+case $ac_cv_build in
-+*-*-*) ;;
+ $as_echo "$ac_cv_build" >&6; }
+ case $ac_cv_build in
+ *-*-*) ;;
+-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
+-$as_echo "$as_me: error: invalid value of canonical build" >&2;}
+-   { (exit 1); exit 1; }; };;
 +*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
-+esac
+ esac
  build=$ac_cv_build
--build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
--build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
--build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
--
--
--echo "$as_me:$LINENO: checking host system type" >&5
--echo $ECHO_N "checking host system type... $ECHO_C" >&6
--if test "${ac_cv_host+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  ac_cv_host_alias=$host_alias
--test -z "$ac_cv_host_alias" &&
--  ac_cv_host_alias=$ac_cv_build_alias
--ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
--  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
--echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
--   { (exit 1); exit 1; }; }
-+ac_save_IFS=$IFS; IFS='-'
-+set x $ac_cv_build
-+shift
-+build_cpu=$1
-+build_vendor=$2
-+shift; shift
-+# Remember, the first character of IFS is used to create $*,
-+# except with old shells:
-+build_os=$*
-+IFS=$ac_save_IFS
-+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-+
-+
+ ac_save_IFS=$IFS; IFS='-'
+@@ -4551,28 +4604,24 @@
+ case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking host system type" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
-+$as_echo_n "checking host system type... " >&6; }
+ $as_echo_n "checking host system type... " >&6; }
+-if test "${ac_cv_host+set}" = set; then
 +if test "${ac_cv_host+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test "x$host_alias" = x; then
-+  ac_cv_host=$ac_cv_build
-+else
-+  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+   $as_echo_n "(cached) " >&6
+ else
+   if test "x$host_alias" = x; then
+   ac_cv_host=$ac_cv_build
+ else
+   ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+-    { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
+-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
+-   { (exit 1); exit 1; }; }
 +    as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
-+fi
+ fi
  
  fi
--echo "$as_me:$LINENO: result: $ac_cv_host" >&5
--echo "${ECHO_T}$ac_cv_host" >&6
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
-+$as_echo "$ac_cv_host" >&6; }
-+case $ac_cv_host in
-+*-*-*) ;;
+ $as_echo "$ac_cv_host" >&6; }
+ case $ac_cv_host in
+ *-*-*) ;;
+-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
+-$as_echo "$as_me: error: invalid value of canonical host" >&2;}
+-   { (exit 1); exit 1; }; };;
 +*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
-+esac
+ esac
  host=$ac_cv_host
--host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
--host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
--host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
--
--
--echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
--echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6
--if test "${lt_cv_path_SED+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  # 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
-+ac_save_IFS=$IFS; IFS='-'
-+set x $ac_cv_host
-+shift
-+host_cpu=$1
-+host_vendor=$2
-+shift; shift
-+# Remember, the first character of IFS is used to create $*,
-+# except with old shells:
-+host_os=$*
-+IFS=$ac_save_IFS
-+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-+
-+
+ ac_save_IFS=$IFS; IFS='-'
+@@ -4588,9 +4637,9 @@
+ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
 +{ $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; }
+ $as_echo_n "checking for a sed that does not truncate output... " >&6; }
+-if test "${ac_cv_path_SED+set}" = set; then
 +if test "${ac_cv_path_SED+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+            ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-+     for ac_i in 1 2 3 4 5 6 7; do
-+       ac_script="$ac_script$as_nl$ac_script"
-+     done
-+     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
+   $as_echo_n "(cached) " >&6
+ else
+             ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+@@ -4598,7 +4647,7 @@
+        ac_script="$ac_script$as_nl$ac_script"
+      done
+      echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
+-     $as_unset ac_script || ac_script=
 +     { ac_script=; unset ac_script;}
-+     if test -z "$SED"; then
-+  ac_path_SED_found=false
-+  # Loop through the user's path and test for each of PROGNAME-LIST
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- for as_dir in $PATH
+      if test -z "$SED"; then
+   ac_path_SED_found=false
+   # Loop through the user's path and test for each of PROGNAME-LIST
+@@ -4607,7 +4656,7 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
--  for lt_ac_prog in sed gsed; do
+-  for ac_prog in sed gsed; do
 +    for 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
-+      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
-+      { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
-+# Check for GNU ac_path_SED and select it if it is found.
-+  # Check for GNU $ac_path_SED
-+case `"$ac_path_SED" --version 2>&1` in
-+*GNU*)
-+  ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
-+*)
-+  ac_count=0
-+  $as_echo_n 0123456789 >"conftest.in"
-+  while :
-+  do
-+    cat "conftest.in" "conftest.in" >"conftest.tmp"
-+    mv "conftest.tmp" "conftest.in"
-+    cp "conftest.in" "conftest.nl"
-+    $as_echo '' >> "conftest.nl"
-+    "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
-+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+       ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
+       { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
+@@ -4627,7 +4676,7 @@
+     $as_echo '' >> "conftest.nl"
+     "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
+     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+-    ac_count=`expr $ac_count + 1`
 +    as_fn_arith $ac_count + 1 && ac_count=$as_val
-+    if test $ac_count -gt ${ac_path_SED_max-0}; then
-+      # Best one so far, save it but keep looking for a better one
-+      ac_cv_path_SED="$ac_path_SED"
-+      ac_path_SED_max=$ac_count
-+    fi
-+    # 10*(2^10) chars as input seems more than enough
-+    test $ac_count -gt 10 && break
-+  done
-+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-+esac
-+
-+      $ac_path_SED_found && break 3
+     if test $ac_count -gt ${ac_path_SED_max-0}; then
+       # Best one so far, save it but keep looking for a better one
+       ac_cv_path_SED="$ac_path_SED"
+@@ -4642,19 +4691,17 @@
+       $ac_path_SED_found && break 3
      done
    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
-+  if test -z "$ac_cv_path_SED"; then
+   if test -z "$ac_cv_path_SED"; then
+-    { { $as_echo "$as_me:$LINENO: error: no acceptable sed could be found in \$PATH" >&5
+-$as_echo "$as_me: error: no acceptable sed could be found in \$PATH" >&2;}
+-   { (exit 1); exit 1; }; }
 +    as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5
    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
-+else
-+  ac_cv_path_SED=$SED
-+fi
+ else
+   ac_cv_path_SED=$SED
+ fi
  
  fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
-+$as_echo "$ac_cv_path_SED" >&6; }
-+ SED="$ac_cv_path_SED"
-+  rm -f conftest.sed
-+
-+test -z "$SED" && SED=sed
-+Xsed="$SED -e 1s/^X//"
+ $as_echo "$ac_cv_path_SED" >&6; }
+  SED="$ac_cv_path_SED"
+   rm -f conftest.sed
+@@ -4672,9 +4719,9 @@
  
--SED=$lt_cv_path_SED
  
--echo "$as_me:$LINENO: result: $SED" >&5
--echo "${ECHO_T}$SED" >&6
  
--echo "$as_me:$LINENO: checking for egrep" >&5
--echo $ECHO_N "checking for egrep... $ECHO_C" >&6
--if test "${ac_cv_prog_egrep+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  if echo a | (grep -E '(a|b)') >/dev/null 2>&1
--    then ac_cv_prog_egrep='grep -E'
--    else ac_cv_prog_egrep='egrep'
-+
-+
-+
-+
-+
-+
-+
-+
+-{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
-+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
+ $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
+-if test "${ac_cv_path_GREP+set}" = set; then
 +if test "${ac_cv_path_GREP+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -z "$GREP"; then
-+  ac_path_GREP_found=false
-+  # Loop through the user's path and test for each of PROGNAME-LIST
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
+   $as_echo_n "(cached) " >&6
+ else
+   if test -z "$GREP"; then
+@@ -4685,7 +4732,7 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_prog in grep ggrep; do
 +    for ac_prog in grep ggrep; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-+      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-+# Check for GNU ac_path_GREP and select it if it is found.
-+  # Check for GNU $ac_path_GREP
-+case `"$ac_path_GREP" --version 2>&1` in
-+*GNU*)
-+  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
-+*)
-+  ac_count=0
-+  $as_echo_n 0123456789 >"conftest.in"
-+  while :
-+  do
-+    cat "conftest.in" "conftest.in" >"conftest.tmp"
-+    mv "conftest.tmp" "conftest.in"
-+    cp "conftest.in" "conftest.nl"
-+    $as_echo 'GREP' >> "conftest.nl"
-+    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+     for ac_exec_ext in '' $ac_executable_extensions; do
+       ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+       { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+@@ -4705,7 +4752,7 @@
+     $as_echo 'GREP' >> "conftest.nl"
+     "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+-    ac_count=`expr $ac_count + 1`
 +    as_fn_arith $ac_count + 1 && ac_count=$as_val
-+    if test $ac_count -gt ${ac_path_GREP_max-0}; then
-+      # Best one so far, save it but keep looking for a better one
-+      ac_cv_path_GREP="$ac_path_GREP"
-+      ac_path_GREP_max=$ac_count
-     fi
-+    # 10*(2^10) chars as input seems more than enough
-+    test $ac_count -gt 10 && break
+     if test $ac_count -gt ${ac_path_GREP_max-0}; then
+       # Best one so far, save it but keep looking for a better one
+       ac_cv_path_GREP="$ac_path_GREP"
+@@ -4720,26 +4767,24 @@
+       $ac_path_GREP_found && break 3
+     done
+   done
+-done
 +  done
-+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-+esac
-+
-+      $ac_path_GREP_found && break 3
-+    done
-+  done
-+  done
-+IFS=$as_save_IFS
-+  if test -z "$ac_cv_path_GREP"; then
+ IFS=$as_save_IFS
+   if test -z "$ac_cv_path_GREP"; then
+-    { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+-$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+-   { (exit 1); exit 1; }; }
 +    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-+  fi
-+else
-+  ac_cv_path_GREP=$GREP
+   fi
+ else
+   ac_cv_path_GREP=$GREP
  fi
--echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
--echo "${ECHO_T}$ac_cv_prog_egrep" >&6
-- EGREP=$ac_cv_prog_egrep
  
-+fi
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
-+$as_echo "$ac_cv_path_GREP" >&6; }
-+ GREP="$ac_cv_path_GREP"
+ $as_echo "$ac_cv_path_GREP" >&6; }
+  GREP="$ac_cv_path_GREP"
  
  
--# Check whether --with-gnu-ld or --without-gnu-ld was given.
--if test "${with_gnu_ld+set}" = set; then
--  withval="$with_gnu_ld"
--  test "$withval" = no || with_gnu_ld=yes
+-{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
-+$as_echo_n "checking for egrep... " >&6; }
+ $as_echo_n "checking for egrep... " >&6; }
+-if test "${ac_cv_path_EGREP+set}" = set; then
 +if test "${ac_cv_path_EGREP+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
+   $as_echo_n "(cached) " >&6
  else
--  with_gnu_ld=no
--fi;
--ac_prog=ld
--if test "$GCC" = yes; then
--  # Check if gcc -print-prog-name=ld gives a path.
--  echo "$as_me:$LINENO: checking for ld used by $CC" >&5
--echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6
--  case $host in
--  *-*-mingw*)
--    # gcc leaves a trailing carriage return which upsets mingw
-+  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-+   then ac_cv_path_EGREP="$GREP -E"
-+   else
-+     if test -z "$EGREP"; then
-+  ac_path_EGREP_found=false
-+  # Loop through the user's path and test for each of PROGNAME-LIST
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
+   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+@@ -4753,7 +4798,7 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_prog in egrep; do
 +    for ac_prog in egrep; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-+      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-+# Check for GNU ac_path_EGREP and select it if it is found.
-+  # Check for GNU $ac_path_EGREP
-+case `"$ac_path_EGREP" --version 2>&1` in
-+*GNU*)
-+  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
-+*)
-+  ac_count=0
-+  $as_echo_n 0123456789 >"conftest.in"
-+  while :
-+  do
-+    cat "conftest.in" "conftest.in" >"conftest.tmp"
-+    mv "conftest.tmp" "conftest.in"
-+    cp "conftest.in" "conftest.nl"
-+    $as_echo 'EGREP' >> "conftest.nl"
-+    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+     for ac_exec_ext in '' $ac_executable_extensions; do
+       ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+       { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+@@ -4773,7 +4818,7 @@
+     $as_echo 'EGREP' >> "conftest.nl"
+     "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+-    ac_count=`expr $ac_count + 1`
 +    as_fn_arith $ac_count + 1 && ac_count=$as_val
-+    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
-+      # Best one so far, save it but keep looking for a better one
-+      ac_cv_path_EGREP="$ac_path_EGREP"
-+      ac_path_EGREP_max=$ac_count
-+    fi
-+    # 10*(2^10) chars as input seems more than enough
-+    test $ac_count -gt 10 && break
+     if test $ac_count -gt ${ac_path_EGREP_max-0}; then
+       # Best one so far, save it but keep looking for a better one
+       ac_cv_path_EGREP="$ac_path_EGREP"
+@@ -4788,12 +4833,10 @@
+       $ac_path_EGREP_found && break 3
+     done
+   done
+-done
 +  done
-+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-+esac
-+
-+      $ac_path_EGREP_found && break 3
-+    done
-+  done
-+  done
-+IFS=$as_save_IFS
-+  if test -z "$ac_cv_path_EGREP"; then
+ IFS=$as_save_IFS
+   if test -z "$ac_cv_path_EGREP"; then
+-    { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+-$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+-   { (exit 1); exit 1; }; }
 +    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-+  fi
-+else
-+  ac_cv_path_EGREP=$EGREP
-+fi
-+
-+   fi
-+fi
+   fi
+ else
+   ac_cv_path_EGREP=$EGREP
+@@ -4801,14 +4844,14 @@
+ 
+    fi
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
-+$as_echo "$ac_cv_path_EGREP" >&6; }
-+ EGREP="$ac_cv_path_EGREP"
-+
-+
+ $as_echo "$ac_cv_path_EGREP" >&6; }
+  EGREP="$ac_cv_path_EGREP"
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking for fgrep" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
-+$as_echo_n "checking for fgrep... " >&6; }
+ $as_echo_n "checking for fgrep... " >&6; }
+-if test "${ac_cv_path_FGREP+set}" = set; then
 +if test "${ac_cv_path_FGREP+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
-+   then ac_cv_path_FGREP="$GREP -F"
-+   else
-+     if test -z "$FGREP"; then
-+  ac_path_FGREP_found=false
-+  # Loop through the user's path and test for each of PROGNAME-LIST
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
+   $as_echo_n "(cached) " >&6
+ else
+   if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
+@@ -4822,7 +4865,7 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_prog in fgrep; do
 +    for ac_prog in fgrep; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+      ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
-+      { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
-+# Check for GNU ac_path_FGREP and select it if it is found.
-+  # Check for GNU $ac_path_FGREP
-+case `"$ac_path_FGREP" --version 2>&1` in
-+*GNU*)
-+  ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;;
-+*)
-+  ac_count=0
-+  $as_echo_n 0123456789 >"conftest.in"
-+  while :
-+  do
-+    cat "conftest.in" "conftest.in" >"conftest.tmp"
-+    mv "conftest.tmp" "conftest.in"
-+    cp "conftest.in" "conftest.nl"
-+    $as_echo 'FGREP' >> "conftest.nl"
-+    "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
-+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+     for ac_exec_ext in '' $ac_executable_extensions; do
+       ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
+       { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
+@@ -4842,7 +4885,7 @@
+     $as_echo 'FGREP' >> "conftest.nl"
+     "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
+     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+-    ac_count=`expr $ac_count + 1`
 +    as_fn_arith $ac_count + 1 && ac_count=$as_val
-+    if test $ac_count -gt ${ac_path_FGREP_max-0}; then
-+      # Best one so far, save it but keep looking for a better one
-+      ac_cv_path_FGREP="$ac_path_FGREP"
-+      ac_path_FGREP_max=$ac_count
-+    fi
-+    # 10*(2^10) chars as input seems more than enough
-+    test $ac_count -gt 10 && break
+     if test $ac_count -gt ${ac_path_FGREP_max-0}; then
+       # Best one so far, save it but keep looking for a better one
+       ac_cv_path_FGREP="$ac_path_FGREP"
+@@ -4857,12 +4900,10 @@
+       $ac_path_FGREP_found && break 3
+     done
+   done
+-done
 +  done
-+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-+esac
-+
-+      $ac_path_FGREP_found && break 3
-+    done
-+  done
-+  done
-+IFS=$as_save_IFS
-+  if test -z "$ac_cv_path_FGREP"; then
+ IFS=$as_save_IFS
+   if test -z "$ac_cv_path_FGREP"; then
+-    { { $as_echo "$as_me:$LINENO: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+-$as_echo "$as_me: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+-   { (exit 1); exit 1; }; }
 +    as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-+  fi
-+else
-+  ac_cv_path_FGREP=$FGREP
-+fi
-+
-+   fi
-+fi
+   fi
+ else
+   ac_cv_path_FGREP=$FGREP
+@@ -4870,7 +4911,7 @@
+ 
+    fi
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_FGREP" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
-+$as_echo "$ac_cv_path_FGREP" >&6; }
-+ FGREP="$ac_cv_path_FGREP"
-+
-+
-+test -z "$GREP" && GREP=grep
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+# Check whether --with-gnu-ld was given.
+ $as_echo "$ac_cv_path_FGREP" >&6; }
+  FGREP="$ac_cv_path_FGREP"
+ 
+@@ -4896,7 +4937,7 @@
+ 
+ 
+ # Check whether --with-gnu-ld was given.
+-if test "${with_gnu_ld+set}" = set; then
 +if test "${with_gnu_ld+set}" = set; then :
-+  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
-+else
-+  with_gnu_ld=no
-+fi
-+
-+ac_prog=ld
-+if test "$GCC" = yes; then
-+  # Check if gcc -print-prog-name=ld gives a path.
+   withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
+ else
+   with_gnu_ld=no
+@@ -4905,7 +4946,7 @@
+ ac_prog=ld
+ if test "$GCC" = yes; then
+   # Check if gcc -print-prog-name=ld gives a path.
+-  { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
-+$as_echo_n "checking for ld used by $CC... " >&6; }
-+  case $host in
-+  *-*-mingw*)
-+    # gcc leaves a trailing carriage return which upsets mingw
-     ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-   *)
-     ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-@@ -4065,9 +4960,9 @@
-     [\\/]* | ?:[\\/]*)
-       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%/%"`
-+      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"
-       ;;
-@@ -4081,14 +4976,14 @@
+ $as_echo_n "checking for ld used by $CC... " >&6; }
+   case $host in
+   *-*-mingw*)
+@@ -4935,13 +4976,13 @@
      ;;
    esac
  elif test "$with_gnu_ld" = yes; then
--  echo "$as_me:$LINENO: checking for GNU ld" >&5
--echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
+-  { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
-+$as_echo_n "checking for GNU ld... " >&6; }
+ $as_echo_n "checking for GNU ld... " >&6; }
  else
--  echo "$as_me:$LINENO: checking for non-GNU ld" >&5
--echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
+-  { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
-+$as_echo_n "checking for non-GNU ld... " >&6; }
+ $as_echo_n "checking for non-GNU ld... " >&6; }
  fi
 -if test "${lt_cv_path_LD+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
 +if test "${lt_cv_path_LD+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
+   $as_echo_n "(cached) " >&6
  else
    if test -z "$LD"; then
-   lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-@@ -4118,19 +5013,17 @@
+@@ -4972,18 +5013,16 @@
  
  LD="$lt_cv_path_LD"
  if test -n "$LD"; then
--  echo "$as_me:$LINENO: result: $LD" >&5
--echo "${ECHO_T}$LD" >&6
+-  { $as_echo "$as_me:$LINENO: result: $LD" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
-+$as_echo "$LD" >&6; }
+ $as_echo "$LD" >&6; }
  else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
+ $as_echo "no" >&6; }
  fi
--test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
--echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+-test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
+-$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
 -   { (exit 1); exit 1; }; }
--echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
--echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
--if test "${lt_cv_prog_gnu_ld+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
+-{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
 +test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
-+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+ $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+-if test "${lt_cv_prog_gnu_ld+set}" = set; then
 +if test "${lt_cv_prog_gnu_ld+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
+   $as_echo_n "(cached) " >&6
  else
    # I'd rather use --version here, but apparently some GNU lds only accept -v.
- case `$LD -v 2>&1 </dev/null` in
-@@ -4142,40 +5035,22 @@
+@@ -4996,7 +5035,7 @@
    ;;
  esac
  fi
--echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
--echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
-+$as_echo "$lt_cv_prog_gnu_ld" >&6; }
+ $as_echo "$lt_cv_prog_gnu_ld" >&6; }
  with_gnu_ld=$lt_cv_prog_gnu_ld
  
+@@ -5008,9 +5047,9 @@
  
--echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
--echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6
--if test "${lt_cv_ld_reload_flag+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  lt_cv_ld_reload_flag='-r'
--fi
--echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
--echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6
--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
  
--echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
--echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
--if test "${lt_cv_path_NM+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+
-+
-+
-+
-+
-+
+ 
+-{ $as_echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
-+$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
+ $as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
+-if test "${lt_cv_path_NM+set}" = set; then
 +if test "${lt_cv_path_NM+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
+   $as_echo_n "(cached) " >&6
  else
    if test -n "$NM"; then
-   # Let the user override the test.
-@@ -4218,601 +5093,480 @@
-     done
-     IFS="$lt_save_ifs"
-   done
--  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
-+  : ${lt_cv_path_NM=no}
+@@ -5057,7 +5096,7 @@
+   : ${lt_cv_path_NM=no}
  fi
  fi
--echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
--echo "${ECHO_T}$lt_cv_path_NM" >&6
--NM="$lt_cv_path_NM"
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
-+$as_echo "$lt_cv_path_NM" >&6; }
-+if test "$lt_cv_path_NM" != "no"; then
-+  NM="$lt_cv_path_NM"
-+else
-+  # Didn't find any BSD compatible name lister, look for dumpbin.
-+  if test -n "$ac_tool_prefix"; then
-+  for ac_prog in "dumpbin -symbols" "link -dump -symbols"
-+  do
-+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+ $as_echo "$lt_cv_path_NM" >&6; }
+ if test "$lt_cv_path_NM" != "no"; then
+   NM="$lt_cv_path_NM"
+@@ -5068,9 +5107,9 @@
+   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:$LINENO: checking for $ac_word" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_DUMPBIN+set}" = set; then
 +if test "${ac_cv_prog_DUMPBIN+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$DUMPBIN"; then
-+  ac_cv_prog_DUMPBIN="$DUMPBIN" # 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=.
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$DUMPBIN"; then
+@@ -5081,24 +5120,24 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
 +    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_DUMPBIN="$ac_tool_prefix$ac_prog"
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
+     break 2
+   fi
+ done
+-done
 +  done
-+IFS=$as_save_IFS
+ IFS=$as_save_IFS
  
--echo "$as_me:$LINENO: checking whether ln -s works" >&5
--echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
--LN_S=$as_ln_s
--if test "$LN_S" = "ln -s"; then
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+fi
-+fi
-+DUMPBIN=$ac_cv_prog_DUMPBIN
-+if test -n "$DUMPBIN"; then
+ fi
+ fi
+ DUMPBIN=$ac_cv_prog_DUMPBIN
+ if test -n "$DUMPBIN"; then
+-  { $as_echo "$as_me:$LINENO: result: $DUMPBIN" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
-+$as_echo "$DUMPBIN" >&6; }
+ $as_echo "$DUMPBIN" >&6; }
  else
--  echo "$as_me:$LINENO: result: no, using $LN_S" >&5
--echo "${ECHO_T}no, using $LN_S" >&6
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
+ $as_echo "no" >&6; }
  fi
  
--echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5
--echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6
--if test "${lt_cv_deplibs_check_method+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  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
--aix4* | aix5*)
--  lt_cv_deplibs_check_method=pass_all
--  ;;
-+    test -n "$DUMPBIN" && break
-+  done
-+fi
-+if test -z "$DUMPBIN"; then
-+  ac_ct_DUMPBIN=$DUMPBIN
-+  for ac_prog in "dumpbin -symbols" "link -dump -symbols"
-+do
-+  # Extract the first word of "$ac_prog", so it can be a program name with args.
-+set dummy $ac_prog; ac_word=$2
+@@ -5112,9 +5151,9 @@
+ 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:$LINENO: checking for $ac_word" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then
 +if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$ac_ct_DUMPBIN"; then
-+  ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # 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=.
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_DUMPBIN"; then
+@@ -5125,24 +5164,24 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
 +    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_DUMPBIN="$ac_prog"
+   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_DUMPBIN="$ac_prog"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
+     break 2
+   fi
+ done
+-done
 +  done
-+IFS=$as_save_IFS
+ IFS=$as_save_IFS
  
--beos*)
--  lt_cv_deplibs_check_method=pass_all
--  ;;
-+fi
-+fi
-+ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
-+if test -n "$ac_ct_DUMPBIN"; then
+ fi
+ fi
+ ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
+ if test -n "$ac_ct_DUMPBIN"; then
+-  { $as_echo "$as_me:$LINENO: result: $ac_ct_DUMPBIN" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
-+$as_echo "$ac_ct_DUMPBIN" >&6; }
-+else
+ $as_echo "$ac_ct_DUMPBIN" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
+ $as_echo "no" >&6; }
+ fi
  
--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'
--  ;;
-+  test -n "$ac_ct_DUMPBIN" && break
-+done
- 
--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'.
--  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
--  lt_cv_file_magic_cmd='$OBJDUMP -f'
--  ;;
-+  if test "x$ac_ct_DUMPBIN" = x; then
-+    DUMPBIN=":"
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
+@@ -5155,7 +5194,7 @@
+   else
+     case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
 +{ $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
-+    DUMPBIN=$ac_ct_DUMPBIN
-+  fi
-+fi
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ ac_tool_warned=yes ;;
+ esac
+@@ -5175,44 +5214,44 @@
  
--darwin* | rhapsody*)
--  lt_cv_deplibs_check_method=pass_all
--  ;;
  
--freebsd* | kfreebsd*-gnu | 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
-+  if test "$DUMPBIN" != ":"; then
-+    NM="$DUMPBIN"
-   fi
--  ;;
-+fi
-+test -z "$NM" && NM=nm
  
--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
--  ;;
- 
--interix3*)
--  # 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*)
--  lt_cv_deplibs_check_method=pass_all
--  ;;
- 
--netbsd*)
--  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)$'
+-{ $as_echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
-+$as_echo_n "checking the name lister ($NM) interface... " >&6; }
+ $as_echo_n "checking the name lister ($NM) interface... " >&6; }
+-if test "${lt_cv_nm_interface+set}" = set; then
 +if test "${lt_cv_nm_interface+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  lt_cv_nm_interface="BSD nm"
-+  echo "int some_variable = 0;" > conftest.$ac_ext
+   $as_echo_n "(cached) " >&6
+ else
+   lt_cv_nm_interface="BSD nm"
+   echo "int some_variable = 0;" > conftest.$ac_ext
+-  (eval echo "\"\$as_me:5185: $ac_compile\"" >&5)
 +  (eval echo "\"\$as_me:5224: $ac_compile\"" >&5)
-+  (eval "$ac_compile" 2>conftest.err)
-+  cat conftest.err >&5
+   (eval "$ac_compile" 2>conftest.err)
+   cat conftest.err >&5
+-  (eval echo "\"\$as_me:5188: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
 +  (eval echo "\"\$as_me:5227: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
-+  cat conftest.err >&5
+   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+   cat conftest.err >&5
+-  (eval echo "\"\$as_me:5191: output\"" >&5)
 +  (eval echo "\"\$as_me:5230: output\"" >&5)
-+  cat conftest.out >&5
-+  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
-+    lt_cv_nm_interface="MS dumpbin"
+   cat conftest.out >&5
+   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+     lt_cv_nm_interface="MS dumpbin"
    fi
--  ;;
-+  rm -f conftest*
-+fi
+   rm -f conftest*
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
-+$as_echo "$lt_cv_nm_interface" >&6; }
+ $as_echo "$lt_cv_nm_interface" >&6; }
  
--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
--  ;;
+-{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
-+$as_echo_n "checking whether ln -s works... " >&6; }
-+LN_S=$as_ln_s
-+if test "$LN_S" = "ln -s"; then
+ $as_echo_n "checking whether ln -s works... " >&6; }
+ LN_S=$as_ln_s
+ if test "$LN_S" = "ln -s"; then
+-  { $as_echo "$as_me:$LINENO: result: yes" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+else
+ $as_echo "yes" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
-+$as_echo "no, using $LN_S" >&6; }
-+fi
+ $as_echo "no, using $LN_S" >&6; }
+ fi
  
--nto-qnx*)
--  lt_cv_deplibs_check_method=unknown
--  ;;
-+# find the maximum length of command line arguments
+ # find the maximum length of command line arguments
+-{ $as_echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
-+$as_echo_n "checking the maximum length of command line arguments... " >&6; }
+ $as_echo_n "checking the maximum length of command line arguments... " >&6; }
+-if test "${lt_cv_sys_max_cmd_len+set}" = set; then
 +if test "${lt_cv_sys_max_cmd_len+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+    i=0
-+  teststring="ABCD"
+   $as_echo_n "(cached) " >&6
+ else
+     i=0
+@@ -5330,10 +5369,10 @@
+ fi
  
--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
--  ;;
-+  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
-+    ;;
- 
--osf3* | osf4* | osf5*)
--  lt_cv_deplibs_check_method=pass_all
--  ;;
-+  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;
-+    ;;
- 
--solaris*)
--  lt_cv_deplibs_check_method=pass_all
--  ;;
-+  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;
-+    ;;
- 
--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*`
-+  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;
-     ;;
--  ncr)
--    lt_cv_deplibs_check_method=pass_all
-+
-+  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`
-     ;;
--  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 )'
-+
-+  interix*)
-+    # We know the value 262144 and hardcode it with a safety zone (like BSD)
-+    lt_cv_sys_max_cmd_len=196608
-     ;;
--  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
-+
-+  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
-     ;;
--  siemens)
--    lt_cv_deplibs_check_method=pass_all
-+  sco3.2v5*)
-+    lt_cv_sys_max_cmd_len=102400
-     ;;
--  pc)
--    lt_cv_deplibs_check_method=pass_all
-+  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
--  ;;
- 
--sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
--  lt_cv_deplibs_check_method=pass_all
--  ;;
--esac
-+fi
- 
-+if test -n $lt_cv_sys_max_cmd_len ; then
+ if test -n $lt_cv_sys_max_cmd_len ; then
+-  { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
-+$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
-+else
+ $as_echo "$lt_cv_sys_max_cmd_len" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: none" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
-+$as_echo "none" >&6; }
+ $as_echo "none" >&6; }
  fi
--echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
--echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6
--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
-+max_cmd_len=$lt_cv_sys_max_cmd_len
+ max_cmd_len=$lt_cv_sys_max_cmd_len
+@@ -5347,7 +5386,7 @@
+ : ${MV="mv -f"}
+ : ${RM="rm -f"}
  
- 
- 
- 
--# 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
-+: ${CP="cp -f"}
-+: ${MV="mv -f"}
-+: ${RM="rm -f"}
-+
+-{ $as_echo "$as_me:$LINENO: checking whether the shell understands some XSI constructs" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5
-+$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
-+# Try some XSI features
-+xsi_shell=no
-+( _lt_dummy="a/b/c"
-+  test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
-+      = c,a/b,, \
-+    && eval 'test $(( 1 + 1 )) -eq 2 \
-+    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
-+  && xsi_shell=yes
+ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
+ # Try some XSI features
+ xsi_shell=no
+@@ -5357,17 +5396,17 @@
+     && eval 'test $(( 1 + 1 )) -eq 2 \
+     && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
+   && xsi_shell=yes
+-{ $as_echo "$as_me:$LINENO: result: $xsi_shell" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5
-+$as_echo "$xsi_shell" >&6; }
-+
-+
+ $as_echo "$xsi_shell" >&6; }
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking whether the shell understands \"+=\"" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5
-+$as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
-+lt_shell_append=no
-+( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
-+    >/dev/null 2>&1 \
-+  && lt_shell_append=yes
+ $as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
+ lt_shell_append=no
+ ( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
+     >/dev/null 2>&1 \
+   && lt_shell_append=yes
+-{ $as_echo "$as_me:$LINENO: result: $lt_shell_append" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5
-+$as_echo "$lt_shell_append" >&6; }
-+
-+
-+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-+  lt_unset=unset
-+else
-+  lt_unset=false
-+fi
+ $as_echo "$lt_shell_append" >&6; }
  
  
--# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
--if test "${enable_libtool_lock+set}" = set; then
--  enableval="$enable_libtool_lock"
+@@ -5402,14 +5441,14 @@
  
--fi;
--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 { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; 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*
-+
-+# 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'
-   ;;
--*-*-irix6*)
--  # Find out which ABI we are using.
--  echo '#line 4465 "configure"' > conftest.$ac_ext
--  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; 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*
-+ *) # EBCDIC based system
-+  lt_SP2NL='tr \100 \n'
-+  lt_NL2SP='tr \r\n \100\100'
-   ;;
-+esac
  
--x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
--  # Find out which ABI we are using.
--  echo 'int i;' > conftest.$ac_ext
--  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
--    case `/usr/bin/file conftest.o` in
--    *32-bit*)
--      case $host in
--        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-*linux*)
--          LD="${LD-ld} -m elf_x86_64"
--          ;;
--        ppc*-*linux*|powerpc*-*linux*)
--          LD="${LD-ld} -m elf64ppc"
--          ;;
--        s390*-*linux*)
--          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"
--  echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
--echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6
--if test "${lt_cv_cc_needs_belf+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  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
- 
--     cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
- 
--int
--main ()
--{
- 
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  lt_cv_cc_needs_belf=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
- 
--lt_cv_cc_needs_belf=no
--fi
--rm -f conftest.err conftest.$ac_objext \
--      conftest$ac_exeext conftest.$ac_ext
--     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
--echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
--echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6
--  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 { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
--    case `/usr/bin/file conftest.o` in
--    *64-bit*)
--      case $lt_cv_prog_gnu_ld in
--      yes*) LD="${LD-ld} -m elf64_sparc" ;;
--      *)    LD="${LD-ld} -64" ;;
--      esac
--      ;;
--    esac
--  fi
--  rm -rf conftest*
--  ;;
- 
- 
+-{ $as_echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
-+$as_echo_n "checking for $LD option to reload object files... " >&6; }
+ $as_echo_n "checking for $LD option to reload object files... " >&6; }
+-if test "${lt_cv_ld_reload_flag+set}" = set; then
 +if test "${lt_cv_ld_reload_flag+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  lt_cv_ld_reload_flag='-r'
-+fi
+   $as_echo_n "(cached) " >&6
+ else
+   lt_cv_ld_reload_flag='-r'
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
-+$as_echo "$lt_cv_ld_reload_flag" >&6; }
-+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
- 
--need_locks="$enable_libtool_lock"
- 
- 
- 
--echo "$as_me:$LINENO: checking for ANSI C header files" >&5
--echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
--if test "${ac_cv_header_stdc+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include <stdlib.h>
--#include <stdarg.h>
--#include <string.h>
--#include <float.h>
- 
--int
--main ()
--{
- 
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_header_stdc=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_header_stdc=no
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- 
--if test $ac_cv_header_stdc = yes; then
--  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include <string.h>
- 
--_ACEOF
--if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
--  $EGREP "memchr" >/dev/null 2>&1; then
--  :
-+if test -n "$ac_tool_prefix"; then
-+  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}objdump; ac_word=$2
+ $as_echo "$lt_cv_ld_reload_flag" >&6; }
+ reload_flag=$lt_cv_ld_reload_flag
+ case $reload_flag in
+@@ -5438,9 +5477,9 @@
+ if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}objdump; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_OBJDUMP+set}" = set; then
 +if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
+   $as_echo_n "(cached) " >&6
  else
--  ac_cv_header_stdc=no
--fi
--rm -f conftest*
-+  if test -n "$OBJDUMP"; then
-+  ac_cv_prog_OBJDUMP="$OBJDUMP" # 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=.
+   if test -n "$OBJDUMP"; then
+@@ -5451,24 +5490,24 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
 +    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_OBJDUMP="${ac_tool_prefix}objdump"
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
+     break 2
+   fi
+ done
+-done
 +  done
-+IFS=$as_save_IFS
+ IFS=$as_save_IFS
  
  fi
--
--if test $ac_cv_header_stdc = yes; then
--  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include <stdlib.h>
--
--_ACEOF
--if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
--  $EGREP "free" >/dev/null 2>&1; then
--  :
-+fi
-+OBJDUMP=$ac_cv_prog_OBJDUMP
-+if test -n "$OBJDUMP"; then
+ fi
+ OBJDUMP=$ac_cv_prog_OBJDUMP
+ if test -n "$OBJDUMP"; then
+-  { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
-+$as_echo "$OBJDUMP" >&6; }
+ $as_echo "$OBJDUMP" >&6; }
  else
--  ac_cv_header_stdc=no
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
+ $as_echo "no" >&6; }
  fi
--rm -f conftest*
  
--fi
- 
--if test $ac_cv_header_stdc = yes; then
--  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
--  if test "$cross_compiling" = yes; then
--  :
-+fi
-+if test -z "$ac_cv_prog_OBJDUMP"; then
-+  ac_ct_OBJDUMP=$OBJDUMP
-+  # Extract the first word of "objdump", so it can be a program name with args.
-+set dummy objdump; ac_word=$2
+@@ -5478,9 +5517,9 @@
+   ac_ct_OBJDUMP=$OBJDUMP
+   # Extract the first word of "objdump", so it can be a program name with args.
+ set dummy objdump; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then
 +if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
+   $as_echo_n "(cached) " >&6
  else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include <ctype.h>
--#if ((' ' & 0x0FF) == 0x020)
--# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
--# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
--#else
--# define ISLOWER(c) \
--		   (('a' <= (c) && (c) <= 'i') \
--		     || ('j' <= (c) && (c) <= 'r') \
--		     || ('s' <= (c) && (c) <= 'z'))
--# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
--#endif
--
--#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
--int
--main ()
--{
--  int i;
--  for (i = 0; i < 256; i++)
--    if (XOR (islower (i), ISLOWER (i))
--	|| toupper (i) != TOUPPER (i))
--      exit(2);
--  exit (0);
--}
--_ACEOF
--rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  :
-+  if test -n "$ac_ct_OBJDUMP"; then
-+  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
- else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
+   if test -n "$ac_ct_OBJDUMP"; then
+@@ -5491,24 +5530,24 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
 +    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_OBJDUMP="objdump"
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_OBJDUMP="objdump"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
+     break 2
+   fi
+ done
+-done
 +  done
-+IFS=$as_save_IFS
+ IFS=$as_save_IFS
  
--( exit $ac_status )
--ac_cv_header_stdc=no
--fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
--fi
  fi
  fi
--echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
--echo "${ECHO_T}$ac_cv_header_stdc" >&6
--if test $ac_cv_header_stdc = yes; then
--
--cat >>confdefs.h <<\_ACEOF
--#define STDC_HEADERS 1
--_ACEOF
--
-+ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
-+if test -n "$ac_ct_OBJDUMP"; then
+ ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
+ if test -n "$ac_ct_OBJDUMP"; then
+-  { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
-+$as_echo "$ac_ct_OBJDUMP" >&6; }
-+else
+ $as_echo "$ac_ct_OBJDUMP" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+  if test "x$ac_ct_OBJDUMP" = x; then
-+    OBJDUMP="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
-+    OBJDUMP=$ac_ct_OBJDUMP
-+  fi
-+else
-+  OBJDUMP="$ac_cv_prog_OBJDUMP"
+ $as_echo "no" >&6; }
  fi
  
--# On IRIX 5.3, sys/types and inttypes.h are conflicting.
--
-+test -z "$OBJDUMP" && OBJDUMP=objdump
+@@ -5517,7 +5556,7 @@
+   else
+     case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++{ $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
+@@ -5537,9 +5576,9 @@
  
  
  
-@@ -4821,858 +5575,610 @@
- 
- 
- 
--for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
--		  inttypes.h stdint.h unistd.h
--do
--as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--$ac_includes_default
- 
--#include <$ac_header>
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  eval "$as_ac_Header=yes"
+-{ $as_echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
-+$as_echo_n "checking how to recognize dependent libraries... " >&6; }
+ $as_echo_n "checking how to recognize dependent libraries... " >&6; }
+-if test "${lt_cv_deplibs_check_method+set}" = set; then
 +if test "${lt_cv_deplibs_check_method+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
+   $as_echo_n "(cached) " >&6
  else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+  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.
+   lt_cv_file_magic_cmd='$MAGIC_CMD'
+@@ -5654,7 +5693,7 @@
+   ;;
  
--eval "$as_ac_Header=no"
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
--if test `eval echo '${'$as_ac_Header'}'` = yes; then
--  cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
--_ACEOF
-+case $host_os in
-+aix[4-9]*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
- 
--fi
-+beos*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
- 
--done
-+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
-+  ;;
- 
--for ac_header in dlfcn.h
--do
--as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
--  echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
--else
--  # Is the header compilable?
--echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--$ac_includes_default
--#include <$ac_header>
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_header_compiler=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+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'
-+  ;;
- 
--ac_header_compiler=no
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+darwin* | rhapsody*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
- 
--# Is the header present?
--echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include <$ac_header>
--_ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } >/dev/null; then
--  if test -s conftest.err; then
--    ac_cpp_err=$ac_c_preproc_warn_flag
--    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+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
--    ac_cpp_err=
-+    lt_cv_deplibs_check_method=pass_all
-   fi
--else
--  ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
--  ac_header_preproc=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+  ;;
- 
--  ac_header_preproc=no
--fi
--rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+gnu*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
- 
--# So?  What about this header?
--case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
--  yes:no: )
--    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
--echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
--    ac_header_preproc=yes
-+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
-     ;;
--  no:yes:* )
--    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
--echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
--echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
--echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
--echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
--    (
--      cat <<\_ASBOX
--## ----------------------------------------------------- ##
--## Report this to http://code.google.com/p/libkml/issues ##
--## ----------------------------------------------------- ##
--_ASBOX
--    ) |
--      sed "s/^/$as_me: WARNING:     /" >&2
-+  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
-     ;;
--esac
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  eval "$as_ac_Header=\$ac_header_preproc"
--fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
--
--fi
--if test `eval echo '${'$as_ac_Header'}'` = yes; then
--  cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
--_ACEOF
--
--fi
--
--done
-+  *)
-+    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
-+  ;;
- 
--if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
--    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
--    (test "X$CXX" != "Xg++"))) ; then
--  ac_ext=cc
--ac_cpp='$CXXCPP $CPPFLAGS'
--ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
--echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
--echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
--if test -z "$CXXCPP"; then
--  if test "${ac_cv_prog_CXXCPP+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--      # Double quotes because CXXCPP needs to be expanded
--    for CXXCPP in "$CXX -E" "/lib/cpp"
--    do
--      ac_preproc_ok=false
--for ac_cxx_preproc_warn_flag in '' yes
--do
--  # Use a header file that comes with gcc, so configuring glibc
--  # with a fresh cross-compiler works.
--  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
--  # <limits.h> exists even on freestanding compilers.
--  # On the NeXT, cc -E runs the code through the compiler's parser,
--  # not just through cpp. "Syntax error" is here to catch this case.
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--		     Syntax error
--_ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } >/dev/null; then
--  if test -s conftest.err; then
--    ac_cpp_err=$ac_cxx_preproc_warn_flag
--    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-+# This must be Linux ELF.
+ # This must be Linux ELF.
+-linux* | k*bsd*-gnu)
 +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
--    ac_cpp_err=
-+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
-   fi
--else
--  ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
--  :
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+  ;;
+   lt_cv_deplibs_check_method=pass_all
+   ;;
  
--  # Broken: fails on valid input.
--continue
--fi
--rm -f conftest.err conftest.$ac_ext
-+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
-+  ;;
+@@ -5733,7 +5772,7 @@
+ esac
  
--  # OK, works on sane cases.  Now check whether non-existent headers
--  # can be detected and how.
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include <ac_nonexistent.h>
--_ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } >/dev/null; then
--  if test -s conftest.err; then
--    ac_cpp_err=$ac_cxx_preproc_warn_flag
--    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-+*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
--    ac_cpp_err=
-+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
-   fi
--else
--  ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
--  # Broken: success on invalid input.
--continue
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+  ;;
- 
--  # Passes both tests.
--ac_preproc_ok=:
--break
--fi
--rm -f conftest.err conftest.$ac_ext
-+osf3* | osf4* | osf5*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
- 
--done
--# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
--rm -f conftest.err conftest.$ac_ext
--if $ac_preproc_ok; then
--  break
--fi
-+rdos*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
- 
--    done
--    ac_cv_prog_CXXCPP=$CXXCPP
-+solaris*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
- 
--fi
--  CXXCPP=$ac_cv_prog_CXXCPP
--else
--  ac_cv_prog_CXXCPP=$CXXCPP
--fi
--echo "$as_me:$LINENO: result: $CXXCPP" >&5
--echo "${ECHO_T}$CXXCPP" >&6
--ac_preproc_ok=false
--for ac_cxx_preproc_warn_flag in '' yes
--do
--  # Use a header file that comes with gcc, so configuring glibc
--  # with a fresh cross-compiler works.
--  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
--  # <limits.h> exists even on freestanding compilers.
--  # On the NeXT, cc -E runs the code through the compiler's parser,
--  # not just through cpp. "Syntax error" is here to catch this case.
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--		     Syntax error
--_ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } >/dev/null; then
--  if test -s conftest.err; then
--    ac_cpp_err=$ac_cxx_preproc_warn_flag
--    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
--  else
--    ac_cpp_err=
--  fi
--else
--  ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
--  :
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
- 
--  # Broken: fails on valid input.
--continue
--fi
--rm -f conftest.err conftest.$ac_ext
-+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
-+  ;;
- 
--  # OK, works on sane cases.  Now check whether non-existent headers
--  # can be detected and how.
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include <ac_nonexistent.h>
--_ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } >/dev/null; then
--  if test -s conftest.err; then
--    ac_cpp_err=$ac_cxx_preproc_warn_flag
--    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
--  else
--    ac_cpp_err=
--  fi
--else
--  ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
--  # Broken: success on invalid input.
--continue
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+tpf*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+esac
- 
--  # Passes both tests.
--ac_preproc_ok=:
--break
  fi
--rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
-+$as_echo "$lt_cv_deplibs_check_method" >&6; }
-+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
-+
-+
-+
-+
-+
-+
-+
- 
--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
--  { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
--See \`config.log' for more details." >&5
--echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
--fi
- 
--ac_ext=cc
--ac_cpp='$CXXCPP $CPPFLAGS'
--ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
- 
--fi
- 
- 
--ac_ext=f
--ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
--ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_f77_compiler_gnu
+ $as_echo "$lt_cv_deplibs_check_method" >&6; }
+ file_magic_cmd=$lt_cv_file_magic_cmd
+ deplibs_check_method=$lt_cv_deplibs_check_method
+@@ -5753,9 +5792,9 @@
  if test -n "$ac_tool_prefix"; then
--  for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
--  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
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_prog_F77+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}ar; ac_word=$2
+   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}ar; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_AR+set}" = set; then
 +if test "${ac_cv_prog_AR+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
+   $as_echo_n "(cached) " >&6
  else
--  if test -n "$F77"; then
--  ac_cv_prog_F77="$F77" # Let the user override the test.
-+  if test -n "$AR"; then
-+  ac_cv_prog_AR="$AR" # Let the user override the test.
- else
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- for as_dir in $PATH
+   if test -n "$AR"; then
+@@ -5766,24 +5805,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
 -  for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--    ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    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_AR="${ac_tool_prefix}ar"
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_AR="${ac_tool_prefix}ar"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
 -done
 +  done
-+IFS=$as_save_IFS
+ IFS=$as_save_IFS
  
  fi
  fi
--F77=$ac_cv_prog_F77
--if test -n "$F77"; then
--  echo "$as_me:$LINENO: result: $F77" >&5
--echo "${ECHO_T}$F77" >&6
-+AR=$ac_cv_prog_AR
-+if test -n "$AR"; then
+ AR=$ac_cv_prog_AR
+ if test -n "$AR"; then
+-  { $as_echo "$as_me:$LINENO: result: $AR" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
-+$as_echo "$AR" >&6; }
+ $as_echo "$AR" >&6; }
  else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
+ $as_echo "no" >&6; }
  fi
  
--    test -n "$F77" && break
--  done
-+
- fi
--if test -z "$F77"; then
--  ac_ct_F77=$F77
--  for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
--do
--  # Extract the first word of "$ac_prog", so it can be a program name with args.
--set dummy $ac_prog; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_prog_ac_ct_F77+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+if test -z "$ac_cv_prog_AR"; then
-+  ac_ct_AR=$AR
-+  # Extract the first word of "ar", so it can be a program name with args.
-+set dummy ar; ac_word=$2
+@@ -5793,9 +5832,9 @@
+   ac_ct_AR=$AR
+   # Extract the first word of "ar", so it can be a program name with args.
+ set dummy ar; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
 +if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
+   $as_echo_n "(cached) " >&6
  else
--  if test -n "$ac_ct_F77"; then
--  ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test.
-+  if test -n "$ac_ct_AR"; then
-+  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
- else
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- for as_dir in $PATH
+   if test -n "$ac_ct_AR"; then
+@@ -5806,24 +5845,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
 -  for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--    ac_cv_prog_ac_ct_F77="$ac_prog"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    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_AR="ar"
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_AR="ar"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
 -done
 +  done
-+IFS=$as_save_IFS
+ IFS=$as_save_IFS
  
  fi
  fi
--ac_ct_F77=$ac_cv_prog_ac_ct_F77
--if test -n "$ac_ct_F77"; then
--  echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
--echo "${ECHO_T}$ac_ct_F77" >&6
-+ac_ct_AR=$ac_cv_prog_ac_ct_AR
-+if test -n "$ac_ct_AR"; then
+ ac_ct_AR=$ac_cv_prog_ac_ct_AR
+ if test -n "$ac_ct_AR"; then
+-  { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
-+$as_echo "$ac_ct_AR" >&6; }
+ $as_echo "$ac_ct_AR" >&6; }
  else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
+ $as_echo "no" >&6; }
  fi
  
--  test -n "$ac_ct_F77" && break
--done
--
--  F77=$ac_ct_F77
-+  if test "x$ac_ct_AR" = x; then
-+    AR="false"
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
+@@ -5832,7 +5871,7 @@
+   else
+     case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
 +{ $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
-+    AR=$ac_ct_AR
-+  fi
-+else
-+  AR="$ac_cv_prog_AR"
- fi
- 
-+test -z "$AR" && AR=ar
-+test -z "$AR_FLAGS" && AR_FLAGS=cru
- 
--# Provide some information about the compiler.
--echo "$as_me:5366:" \
--     "checking for Fortran 77 compiler version" >&5
--ac_compiler=`set X $ac_compile; echo $2`
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
--  (eval $ac_compiler --version </dev/null >&5) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
--  (eval $ac_compiler -v </dev/null >&5) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
--  (eval $ac_compiler -V </dev/null >&5) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }
--rm -f a.out
--
--# If we don't use `.F' as extension, the preprocessor is not run on the
--# input file.  (Note that this only needs to work for GNU compilers.)
--ac_save_ext=$ac_ext
--ac_ext=F
--echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
--echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6
--if test "${ac_cv_f77_compiler_gnu+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--      program main
--#ifndef __GNUC__
--       choke me
--#endif
- 
--      end
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_f77_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_compiler_gnu=yes
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+if test -n "$ac_tool_prefix"; then
-+  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}strip; ac_word=$2
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ ac_tool_warned=yes ;;
+ esac
+@@ -5858,9 +5897,9 @@
+ if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}strip; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_STRIP+set}" = set; then
 +if test "${ac_cv_prog_STRIP+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
+   $as_echo_n "(cached) " >&6
  else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+  if test -n "$STRIP"; then
-+  ac_cv_prog_STRIP="$STRIP" # 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=.
+   if test -n "$STRIP"; then
+@@ -5871,24 +5910,24 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
 +    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_STRIP="${ac_tool_prefix}strip"
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
+     break 2
+   fi
+ done
+-done
 +  done
-+IFS=$as_save_IFS
+ IFS=$as_save_IFS
  
--ac_compiler_gnu=no
  fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--ac_cv_f77_compiler_gnu=$ac_compiler_gnu
--
  fi
--echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
--echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6
--ac_ext=$ac_save_ext
--ac_test_FFLAGS=${FFLAGS+set}
--ac_save_FFLAGS=$FFLAGS
--FFLAGS=
--echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
--echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6
--if test "${ac_cv_prog_f77_g+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  FFLAGS=-g
--cat >conftest.$ac_ext <<_ACEOF
--      program main
--
--      end
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_f77_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_prog_f77_g=yes
-+STRIP=$ac_cv_prog_STRIP
-+if test -n "$STRIP"; then
+ STRIP=$ac_cv_prog_STRIP
+ if test -n "$STRIP"; then
+-  { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-+$as_echo "$STRIP" >&6; }
+ $as_echo "$STRIP" >&6; }
  else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_cv_prog_f77_g=no
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
+ $as_echo "no" >&6; }
  fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
  
- fi
--echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
--echo "${ECHO_T}$ac_cv_prog_f77_g" >&6
--if test "$ac_test_FFLAGS" = set; then
--  FFLAGS=$ac_save_FFLAGS
--elif test $ac_cv_prog_f77_g = yes; then
--  if test "x$ac_cv_f77_compiler_gnu" = xyes; then
--    FFLAGS="-g -O2"
--  else
--    FFLAGS="-g"
-+if test -z "$ac_cv_prog_STRIP"; then
-+  ac_ct_STRIP=$STRIP
-+  # Extract the first word of "strip", so it can be a program name with args.
-+set dummy strip; ac_word=$2
+@@ -5898,9 +5937,9 @@
+   ac_ct_STRIP=$STRIP
+   # Extract the first word of "strip", so it can be a program name with args.
+ set dummy strip; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
 +if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$ac_ct_STRIP"; then
-+  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # 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=.
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_STRIP"; then
+@@ -5911,24 +5950,24 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
 +    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_STRIP="strip"
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_STRIP="strip"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
+     break 2
    fi
-+done
+ done
+-done
 +  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-+if test -n "$ac_ct_STRIP"; then
+ IFS=$as_save_IFS
+ 
+ fi
+ fi
+ ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+ if test -n "$ac_ct_STRIP"; then
+-  { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-+$as_echo "$ac_ct_STRIP" >&6; }
+ $as_echo "$ac_ct_STRIP" >&6; }
  else
--  if test "x$ac_cv_f77_compiler_gnu" = xyes; then
--    FFLAGS="-O2"
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+  if test "x$ac_ct_STRIP" = x; then
-+    STRIP=":"
-   else
--    FFLAGS=
-+    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
-+    STRIP=$ac_ct_STRIP
-   fi
-+else
-+  STRIP="$ac_cv_prog_STRIP"
+ $as_echo "no" >&6; }
  fi
  
--G77=`test $ac_compiler_gnu = yes && echo yes`
--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
-+test -z "$STRIP" && STRIP=:
- 
- 
- 
--# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
- 
--# find the maximum length of command line arguments
--echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
--echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6
--if test "${lt_cv_sys_max_cmd_len+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+
-+
-+if test -n "$ac_tool_prefix"; then
-+  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+@@ -5937,7 +5976,7 @@
+   else
+     case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++{ $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
+@@ -5957,9 +5996,9 @@
+ if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_RANLIB+set}" = set; then
 +if test "${ac_cv_prog_RANLIB+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
+   $as_echo_n "(cached) " >&6
  else
--    i=0
--  teststring="ABCD"
-+  if test -n "$RANLIB"; then
-+  ac_cv_prog_RANLIB="$RANLIB" # 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=.
+   if test -n "$RANLIB"; then
+@@ -5970,24 +6009,24 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
 +    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_RANLIB="${ac_tool_prefix}ranlib"
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
+     break 2
+   fi
+ done
+-done
 +  done
-+IFS=$as_save_IFS
+ IFS=$as_save_IFS
  
--  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
--    ;;
-+fi
-+fi
-+RANLIB=$ac_cv_prog_RANLIB
-+if test -n "$RANLIB"; then
+ fi
+ fi
+ RANLIB=$ac_cv_prog_RANLIB
+ if test -n "$RANLIB"; then
+-  { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
-+$as_echo "$RANLIB" >&6; }
-+else
+ $as_echo "$RANLIB" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
+ $as_echo "no" >&6; }
+ fi
  
--  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*)
--    # 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;
--    ;;
-+fi
-+if test -z "$ac_cv_prog_RANLIB"; then
-+  ac_ct_RANLIB=$RANLIB
-+  # Extract the first word of "ranlib", so it can be a program name with args.
-+set dummy ranlib; ac_word=$2
+@@ -5997,9 +6036,9 @@
+   ac_ct_RANLIB=$RANLIB
+   # Extract the first word of "ranlib", so it can be a program name with args.
+ set dummy ranlib; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
 +if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$ac_ct_RANLIB"; then
-+  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # 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=.
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_RANLIB"; then
+@@ -6010,24 +6049,24 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
 +    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_RANLIB="ranlib"
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_RANLIB="ranlib"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
+     break 2
+   fi
+ done
+-done
 +  done
-+IFS=$as_save_IFS
+ IFS=$as_save_IFS
  
--  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;
--    ;;
-+fi
-+fi
-+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-+if test -n "$ac_ct_RANLIB"; then
+ fi
+ fi
+ ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+ if test -n "$ac_ct_RANLIB"; then
+-  { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
-+$as_echo "$ac_ct_RANLIB" >&6; }
-+else
+ $as_echo "$ac_ct_RANLIB" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
+ $as_echo "no" >&6; }
+ fi
  
--  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`
--    ;;
-+  if test "x$ac_ct_RANLIB" = x; then
-+    RANLIB=":"
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
+@@ -6036,7 +6075,7 @@
+   else
+     case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
 +{ $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
-+    RANLIB=$ac_ct_RANLIB
-+  fi
-+else
-+  RANLIB="$ac_cv_prog_RANLIB"
-+fi
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ ac_tool_warned=yes ;;
+ esac
+@@ -6114,9 +6153,9 @@
  
--  interix*)
--    # We know the value 262144 and hardcode it with a safety zone (like BSD)
--    lt_cv_sys_max_cmd_len=196608
--    ;;
-+test -z "$RANLIB" && RANLIB=:
  
--  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
-+
-+
-+
-+
-+
-+# 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"
-     ;;
-   *)
--    # 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.
--    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
--    while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
--	       = "XX$teststring") >/dev/null 2>&1 &&
--	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
--	    lt_cv_sys_max_cmd_len=$new_result &&
--	    test $i != 17 # 1/2 MB should be enough
--    do
--      i=`expr $i + 1`
--      teststring=$teststring$teststring
--    done
--    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`
-+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
-     ;;
-   esac
--
-+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
- fi
- 
--if test -n $lt_cv_sys_max_cmd_len ; then
--  echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
--echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6
--else
--  echo "$as_me:$LINENO: result: none" >&5
--echo "${ECHO_T}none" >&6
--fi
- 
- 
- 
- 
--# Check for command to grab the raw symbol name followed by C symbol from nm.
--echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
--echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6
--if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
- 
--# 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]*\)'
- 
--# Transform an extracted symbol line into a proper C declaration
--lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \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\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
- 
--# Define system-specific variables.
--case $host_os in
--aix*)
--  symcode='[BCDT]'
--  ;;
--cygwin* | mingw* | pw32*)
--  symcode='[ABCDGISTW]'
--  ;;
--hpux*) # Its linker distinguishes data from code symbols
--  if test "$host_cpu" = ia64; then
--    symcode='[ABCDEGRST]'
--  fi
--  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
--  lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+# 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
-+
-+
-+# Check for command to grab the raw symbol name followed by C symbol from nm.
+ # Check for command to grab the raw symbol name followed by C symbol from nm.
+-{ $as_echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
-+$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
+ $as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
+-if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
 +if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+# 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]'
-   ;;
--linux*)
-+cygwin* | mingw* | pw32* | cegcc*)
-+  symcode='[ABCDGISTW]'
-+  ;;
-+hpux*)
-   if test "$host_cpu" = ia64; then
--    symcode='[ABCDGIRSTW]'
--    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
--    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-+    symcode='[ABCDEGRST]'
-   fi
-   ;;
- irix* | nonstopux*)
-@@ -5698,57 +6204,85 @@
-   ;;
- esac
+   $as_echo_n "(cached) " >&6
+ else
  
-+# 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
-+  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
-   ;;
- 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
--
--# Try without a prefix undercore, then with it.
-+# 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.
--  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ 	]\($symcode$symcode*\)[ 	][ 	]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
-+  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 <<EOF
-+  cat > conftest.$ac_ext <<_LT_EOF
- #ifdef __cplusplus
- extern "C" {
- #endif
- char nm_test_var;
--void nm_test_func(){}
-+void nm_test_func(void);
-+void nm_test_func(void){}
- #ifdef __cplusplus
- }
- #endif
+@@ -6232,18 +6271,18 @@
  int main(){nm_test_var='a';nm_test_func();return(0);}
--EOF
-+_LT_EOF
+ _LT_EOF
  
 -  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 +  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; then
 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 +  test $ac_status = 0; }; then
@@ -32613,78 +6717,14 @@
 +    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5
    (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
    ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } && test -s "$nlist"; then
 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 +  test $ac_status = 0; } && test -s "$nlist"; then
        # Try sorting and uniquifying the output.
        if sort "$nlist" | uniq > "$nlist"T; then
  	mv -f "$nlist"T "$nlist"
-@@ -5757,53 +6291,55 @@
-       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 <<EOF > conftest.$ac_ext
-+      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
- 
--EOF
-+_LT_EOF
- 	  # Now generate the symbol file.
--	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
-+	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
- 
--	  cat <<EOF >> conftest.$ac_ext
--#if defined (__STDC__) && __STDC__
--# define lt_ptr_t void *
--#else
--# define lt_ptr_t char *
--# define const
--#endif
-+	  cat <<_LT_EOF >> conftest.$ac_ext
- 
--/* The mapping between symbol names and symbols. */
-+/* The mapping between symbol names and symbols.  */
- const struct {
-   const char *name;
--  lt_ptr_t address;
-+  void       *address;
- }
--lt_preloaded_symbols[] =
-+lt__PROGRAM__LTX_preloaded_symbols[] =
- {
--EOF
--	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext
--	  cat <<\EOF >> conftest.$ac_ext
--  {0, (lt_ptr_t) 0}
-+  { "@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
--EOF
-+_LT_EOF
- 	  # Now try linking the two files.
- 	  mv conftest.$ac_objext conftstm.$ac_objext
- 	  lt_save_LIBS="$LIBS"
+@@ -6296,11 +6335,11 @@
  	  lt_save_CFLAGS="$CFLAGS"
  	  LIBS="conftstm.$ac_objext"
  	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
@@ -32692,1867 +6732,1175 @@
 +	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
    (eval $ac_link) 2>&5
    ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } && test -s conftest${ac_exeext}; then
 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 +  test $ac_status = 0; } && test -s conftest${ac_exeext}; then
  	    pipe_works=yes
  	  fi
  	  LIBS="$lt_save_LIBS"
-@@ -5821,7 +6357,7 @@
-     echo "$progname: failed program was:" >&5
-     cat conftest.$ac_ext >&5
-   fi
--  rm -f conftest* conftst*
-+  rm -rf conftest* conftst*
- 
-   # Do not use the global_symbol_pipe unless it works.
-   if test "$pipe_works" = yes; then
-@@ -5837,4500 +6373,2992 @@
+@@ -6334,10 +6373,10 @@
    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
--  echo "$as_me:$LINENO: result: failed" >&5
--echo "${ECHO_T}failed" >&6
+-  { $as_echo "$as_me:$LINENO: result: failed" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-+$as_echo "failed" >&6; }
+ $as_echo "failed" >&6; }
  else
--  echo "$as_me:$LINENO: result: ok" >&5
--echo "${ECHO_T}ok" >&6
+-  { $as_echo "$as_me:$LINENO: result: ok" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-+$as_echo "ok" >&6; }
+ $as_echo "ok" >&6; }
  fi
  
--echo "$as_me:$LINENO: checking for objdir" >&5
--echo $ECHO_N "checking for objdir... $ECHO_C" >&6
--if test "${lt_cv_objdir+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  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
--fi
--echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
--echo "${ECHO_T}$lt_cv_objdir" >&6
--objdir=$lt_cv_objdir
+@@ -6364,7 +6403,7 @@
  
  
- 
- 
- 
--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.
--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'
- 
--# 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 avoid accidental globbing in evaled expressions
--no_glob_subst='s/\*/\\\*/g'
- 
--# Constants:
--rm="rm -f"
- 
--# Global variables:
--default_ofile=libtool
--can_build_shared=yes
- 
--# All known linkers require a `.a' archive for static linking (except MSVC,
--# which needs '.lib').
--libext=a
--ltmain="$ac_aux_dir/ltmain.sh"
--ofile="$default_ofile"
--with_gnu_ld="$lt_cv_prog_gnu_ld"
- 
--if test -n "$ac_tool_prefix"; then
--  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
--set dummy ${ac_tool_prefix}ar; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_prog_AR+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  if test -n "$AR"; then
--  ac_cv_prog_AR="$AR" # Let the user override the test.
--else
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--    ac_cv_prog_AR="${ac_tool_prefix}ar"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--done
- 
--fi
--fi
--AR=$ac_cv_prog_AR
--if test -n "$AR"; then
--  echo "$as_me:$LINENO: result: $AR" >&5
--echo "${ECHO_T}$AR" >&6
--else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--fi
- 
--fi
--if test -z "$ac_cv_prog_AR"; then
--  ac_ct_AR=$AR
--  # Extract the first word of "ar", so it can be a program name with args.
--set dummy ar; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  if test -n "$ac_ct_AR"; then
--  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
--else
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--    ac_cv_prog_ac_ct_AR="ar"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--done
- 
--  test -z "$ac_cv_prog_ac_ct_AR" && ac_cv_prog_ac_ct_AR="false"
--fi
--fi
--ac_ct_AR=$ac_cv_prog_ac_ct_AR
--if test -n "$ac_ct_AR"; then
--  echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
--echo "${ECHO_T}$ac_ct_AR" >&6
--else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--fi
- 
--  AR=$ac_ct_AR
--else
--  AR="$ac_cv_prog_AR"
--fi
- 
--if test -n "$ac_tool_prefix"; then
--  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
--set dummy ${ac_tool_prefix}ranlib; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_prog_RANLIB+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  if test -n "$RANLIB"; then
--  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
--else
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--done
- 
--fi
--fi
--RANLIB=$ac_cv_prog_RANLIB
--if test -n "$RANLIB"; then
--  echo "$as_me:$LINENO: result: $RANLIB" >&5
--echo "${ECHO_T}$RANLIB" >&6
--else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--fi
- 
--fi
--if test -z "$ac_cv_prog_RANLIB"; then
--  ac_ct_RANLIB=$RANLIB
--  # Extract the first word of "ranlib", so it can be a program name with args.
--set dummy ranlib; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  if test -n "$ac_ct_RANLIB"; then
--  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
--else
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--    ac_cv_prog_ac_ct_RANLIB="ranlib"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--done
- 
--  test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
--fi
--fi
--ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
--if test -n "$ac_ct_RANLIB"; then
--  echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
--echo "${ECHO_T}$ac_ct_RANLIB" >&6
--else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--fi
- 
--  RANLIB=$ac_ct_RANLIB
--else
--  RANLIB="$ac_cv_prog_RANLIB"
-+# Check whether --enable-libtool-lock was given.
+ # Check whether --enable-libtool-lock was given.
+-if test "${enable_libtool_lock+set}" = set; then
 +if test "${enable_libtool_lock+set}" = set; then :
-+  enableval=$enable_libtool_lock;
+   enableval=$enable_libtool_lock;
  fi
  
--if test -n "$ac_tool_prefix"; then
--  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
--set dummy ${ac_tool_prefix}strip; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_prog_STRIP+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  if test -n "$STRIP"; then
--  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
--else
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--done
--
--fi
--fi
--STRIP=$ac_cv_prog_STRIP
--if test -n "$STRIP"; then
--  echo "$as_me:$LINENO: result: $STRIP" >&5
--echo "${ECHO_T}$STRIP" >&6
--else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--fi
-+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
- 
--fi
--if test -z "$ac_cv_prog_STRIP"; then
--  ac_ct_STRIP=$STRIP
--  # Extract the first word of "strip", so it can be a program name with args.
--set dummy strip; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  if test -n "$ac_ct_STRIP"; then
--  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
--else
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-+# 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
+@@ -6376,11 +6415,11 @@
+ ia64-*-hpux*)
+   # Find out which ABI we are using.
+   echo 'int i;' > conftest.$ac_ext
+-  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 +  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 +  test $ac_status = 0; }; 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.
+     case `/usr/bin/file conftest.$ac_objext` in
+       *ELF-32*)
+ 	HPUX_IA64_MODE="32"
+@@ -6394,12 +6433,12 @@
+   ;;
+ *-*-irix6*)
+   # Find out which ABI we are using.
+-  echo '#line 6397 "configure"' > conftest.$ac_ext
+-  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 +  echo '#line 6436 "configure"' > conftest.$ac_ext
 +  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 +  test $ac_status = 0; }; 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 test "$lt_cv_prog_gnu_ld" = yes; then
+       case `/usr/bin/file conftest.$ac_objext` in
+ 	*32-bit*)
+@@ -6433,11 +6472,11 @@
+ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+   # Find out which ABI we are using.
+   echo 'int i;' > conftest.$ac_ext
+-  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 +  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 +  test $ac_status = 0; }; 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"
+     case `/usr/bin/file conftest.o` in
+       *32-bit*)
+ 	case $host in
+@@ -6486,9 +6525,9 @@
+   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+   SAVE_CFLAGS="$CFLAGS"
+   CFLAGS="$CFLAGS -belf"
+-  { $as_echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
-+$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
+ $as_echo_n "checking whether the C compiler needs -belf... " >&6; }
+-if test "${lt_cv_cc_needs_belf+set}" = set; then
 +if test "${lt_cv_cc_needs_belf+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
+   $as_echo_n "(cached) " >&6
+ else
+   ac_ext=c
+@@ -6497,11 +6536,7 @@
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+-     cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
 +     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ int
+@@ -6512,38 +6547,13 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
 +if ac_fn_c_try_link "$LINENO"; then :
-+  lt_cv_cc_needs_belf=yes
-+else
+   lt_cv_cc_needs_belf=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	lt_cv_cc_needs_belf=no
 +  lt_cv_cc_needs_belf=no
-+fi
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext conftest.$ac_ext
-+     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'
+@@ -6551,7 +6561,7 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
-+$as_echo "$lt_cv_cc_needs_belf" >&6; }
-+  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-+    # 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
+ $as_echo "$lt_cv_cc_needs_belf" >&6; }
+   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
+@@ -6561,11 +6571,11 @@
+ sparc*-*solaris*)
+   # Find out which ABI we are using.
+   echo 'int i;' > conftest.$ac_ext
+-  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 +  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 +  test $ac_status = 0; }; 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"
-+
-+
-+  case $host_os in
-+    rhapsody* | darwin*)
-+    if test -n "$ac_tool_prefix"; then
-+  # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
+     case `/usr/bin/file conftest.o` in
+     *64-bit*)
+       case $lt_cv_prog_gnu_ld in
+@@ -6591,9 +6601,9 @@
+     if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_DSYMUTIL+set}" = set; then
 +if test "${ac_cv_prog_DSYMUTIL+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$DSYMUTIL"; then
-+  ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$DSYMUTIL"; then
+@@ -6604,24 +6614,24 @@
+ do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
 -  for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--    ac_cv_prog_ac_ct_STRIP="strip"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
  done
 -done
 +  done
-+IFS=$as_save_IFS
+ IFS=$as_save_IFS
  
--  test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
  fi
  fi
--ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
--if test -n "$ac_ct_STRIP"; then
--  echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
--echo "${ECHO_T}$ac_ct_STRIP" >&6
-+DSYMUTIL=$ac_cv_prog_DSYMUTIL
-+if test -n "$DSYMUTIL"; then
+ DSYMUTIL=$ac_cv_prog_DSYMUTIL
+ if test -n "$DSYMUTIL"; then
+-  { $as_echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
-+$as_echo "$DSYMUTIL" >&6; }
+ $as_echo "$DSYMUTIL" >&6; }
  else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
+ $as_echo "no" >&6; }
  fi
  
--  STRIP=$ac_ct_STRIP
-+
-+fi
-+if test -z "$ac_cv_prog_DSYMUTIL"; then
-+  ac_ct_DSYMUTIL=$DSYMUTIL
-+  # Extract the first word of "dsymutil", so it can be a program name with args.
-+set dummy dsymutil; ac_word=$2
+@@ -6631,9 +6641,9 @@
+   ac_ct_DSYMUTIL=$DSYMUTIL
+   # Extract the first word of "dsymutil", so it can be a program name with args.
+ set dummy dsymutil; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then
 +if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
+   $as_echo_n "(cached) " >&6
  else
--  STRIP="$ac_cv_prog_STRIP"
-+  if test -n "$ac_ct_DSYMUTIL"; then
-+  ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
+   if test -n "$ac_ct_DSYMUTIL"; then
+@@ -6644,24 +6654,24 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
 +    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
+     break 2
+   fi
+ done
+-done
 +  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
-+if test -n "$ac_ct_DSYMUTIL"; then
+ IFS=$as_save_IFS
+ 
+ fi
+ fi
+ ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
+ if test -n "$ac_ct_DSYMUTIL"; then
+-  { $as_echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
-+$as_echo "$ac_ct_DSYMUTIL" >&6; }
-+else
+ $as_echo "$ac_ct_DSYMUTIL" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+  if test "x$ac_ct_DSYMUTIL" = x; then
-+    DSYMUTIL=":"
-+  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
-+    DSYMUTIL=$ac_ct_DSYMUTIL
-+  fi
-+else
-+  DSYMUTIL="$ac_cv_prog_DSYMUTIL"
+ $as_echo "no" >&6; }
  fi
  
-+    if test -n "$ac_tool_prefix"; then
-+  # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}nmedit; ac_word=$2
+@@ -6670,7 +6680,7 @@
+   else
+     case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++{ $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
+@@ -6683,9 +6693,9 @@
+     if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}nmedit; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_NMEDIT+set}" = set; then
 +if test "${ac_cv_prog_NMEDIT+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$NMEDIT"; then
-+  ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$NMEDIT"; then
+@@ -6696,24 +6706,24 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
 +    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
+     break 2
+   fi
+ done
+-done
 +  done
-+IFS=$as_save_IFS
+ IFS=$as_save_IFS
  
--old_CC="$CC"
--old_CFLAGS="$CFLAGS"
-+fi
-+fi
-+NMEDIT=$ac_cv_prog_NMEDIT
-+if test -n "$NMEDIT"; then
+ fi
+ fi
+ NMEDIT=$ac_cv_prog_NMEDIT
+ if test -n "$NMEDIT"; then
+-  { $as_echo "$as_me:$LINENO: result: $NMEDIT" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
-+$as_echo "$NMEDIT" >&6; }
-+else
+ $as_echo "$NMEDIT" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
+ $as_echo "no" >&6; }
+ fi
  
--# Set sane defaults for various variables
--test -z "$AR" && AR=ar
--test -z "$AR_FLAGS" && AR_FLAGS=cru
--test -z "$AS" && AS=as
--test -z "$CC" && CC=cc
--test -z "$LTCC" && LTCC=$CC
--test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
--test -z "$DLLTOOL" && DLLTOOL=dlltool
--test -z "$LD" && LD=ld
--test -z "$LN_S" && LN_S="ln -s"
--test -z "$MAGIC_CMD" && MAGIC_CMD=file
--test -z "$NM" && NM=nm
--test -z "$SED" && SED=sed
--test -z "$OBJDUMP" && OBJDUMP=objdump
--test -z "$RANLIB" && RANLIB=:
--test -z "$STRIP" && STRIP=:
--test -z "$ac_objext" && ac_objext=o
- 
--# Determine commands to create old-style static archives.
--old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
--old_postinstall_cmds='chmod 644 $oldlib'
--old_postuninstall_cmds=
-+fi
-+if test -z "$ac_cv_prog_NMEDIT"; then
-+  ac_ct_NMEDIT=$NMEDIT
-+  # Extract the first word of "nmedit", so it can be a program name with args.
-+set dummy nmedit; ac_word=$2
+@@ -6723,9 +6733,9 @@
+   ac_ct_NMEDIT=$NMEDIT
+   # Extract the first word of "nmedit", so it can be a program name with args.
+ set dummy nmedit; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then
 +if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$ac_ct_NMEDIT"; then
-+  ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_NMEDIT"; then
+@@ -6736,24 +6746,24 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
 +    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_ac_ct_NMEDIT="nmedit"
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_NMEDIT="nmedit"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
+     break 2
+   fi
+ done
+-done
 +  done
-+IFS=$as_save_IFS
+ IFS=$as_save_IFS
  
--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
-+fi
-+ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
-+if test -n "$ac_ct_NMEDIT"; then
+ fi
+ fi
+ ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
+ if test -n "$ac_ct_NMEDIT"; then
+-  { $as_echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
-+$as_echo "$ac_ct_NMEDIT" >&6; }
-+else
+ $as_echo "$ac_ct_NMEDIT" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+  if test "x$ac_ct_NMEDIT" = x; then
-+    NMEDIT=":"
-+  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
-+    NMEDIT=$ac_ct_NMEDIT
-+  fi
-+else
-+  NMEDIT="$ac_cv_prog_NMEDIT"
+ $as_echo "no" >&6; }
  fi
  
--for cc_temp in $compiler""; do
--  case $cc_temp in
--    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
--    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
--    \-*) ;;
--    *) break;;
--  esac
-+    if test -n "$ac_tool_prefix"; then
-+  # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}lipo; ac_word=$2
+@@ -6762,7 +6772,7 @@
+   else
+     case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++{ $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
+@@ -6775,9 +6785,9 @@
+     if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}lipo; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_LIPO+set}" = set; then
 +if test "${ac_cv_prog_LIPO+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$LIPO"; then
-+  ac_cv_prog_LIPO="$LIPO" # 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=.
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$LIPO"; then
+@@ -6788,24 +6798,24 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
 +    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_LIPO="${ac_tool_prefix}lipo"
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
+     break 2
+   fi
  done
--cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+-done
 +  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+LIPO=$ac_cv_prog_LIPO
-+if test -n "$LIPO"; then
+ IFS=$as_save_IFS
+ 
+ fi
+ fi
+ LIPO=$ac_cv_prog_LIPO
+ if test -n "$LIPO"; then
+-  { $as_echo "$as_me:$LINENO: result: $LIPO" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
-+$as_echo "$LIPO" >&6; }
-+else
+ $as_echo "$LIPO" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
+ $as_echo "no" >&6; }
+ fi
  
- 
--# Only perform the check for file, if the check method requires it
--case $deplibs_check_method in
--file_magic*)
--  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
--    echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
--echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6
--if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+if test -z "$ac_cv_prog_LIPO"; then
-+  ac_ct_LIPO=$LIPO
-+  # Extract the first word of "lipo", so it can be a program name with args.
-+set dummy lipo; ac_word=$2
+@@ -6815,9 +6825,9 @@
+   ac_ct_LIPO=$LIPO
+   # Extract the first word of "lipo", so it can be a program name with args.
+ set dummy lipo; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then
 +if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
+   $as_echo_n "(cached) " >&6
  else
--  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
--  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
--  for ac_dir in $ac_dummy; do
--    IFS="$lt_save_ifs"
--    test -z "$ac_dir" && ac_dir=.
--    if test -f $ac_dir/${ac_tool_prefix}file; then
--      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
--      if test -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 <<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
--
--EOF
--	  fi ;;
--	esac
--      fi
--      break
--    fi
-+  if test -n "$ac_ct_LIPO"; then
-+  ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # 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=.
+   if test -n "$ac_ct_LIPO"; then
+@@ -6828,24 +6838,24 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
 +    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_LIPO="lipo"
+   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_LIPO="lipo"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-   done
--  IFS="$lt_save_ifs"
--  MAGIC_CMD="$lt_save_MAGIC_CMD"
--  ;;
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
-+if test -n "$ac_ct_LIPO"; then
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+ fi
+ fi
+ ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
+ if test -n "$ac_ct_LIPO"; then
+-  { $as_echo "$as_me:$LINENO: result: $ac_ct_LIPO" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
-+$as_echo "$ac_ct_LIPO" >&6; }
-+else
+ $as_echo "$ac_ct_LIPO" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+  if test "x$ac_ct_LIPO" = x; then
-+    LIPO=":"
-+  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
-+    LIPO=$ac_ct_LIPO
-+  fi
-+else
-+  LIPO="$ac_cv_prog_LIPO"
+ $as_echo "no" >&6; }
  fi
  
--MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
--if test -n "$MAGIC_CMD"; then
--  echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
--echo "${ECHO_T}$MAGIC_CMD" >&6
-+    if test -n "$ac_tool_prefix"; then
-+  # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}otool; ac_word=$2
+@@ -6854,7 +6864,7 @@
+   else
+     case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++{ $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
+@@ -6867,9 +6877,9 @@
+     if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}otool; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_OTOOL+set}" = set; then
 +if test "${ac_cv_prog_OTOOL+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
+   $as_echo_n "(cached) " >&6
  else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--fi
-+  if test -n "$OTOOL"; then
-+  ac_cv_prog_OTOOL="$OTOOL" # 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=.
+   if test -n "$OTOOL"; then
+@@ -6880,24 +6890,24 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
 +    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_OTOOL="${ac_tool_prefix}otool"
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
+     break 2
+   fi
+ done
+-done
 +  done
-+IFS=$as_save_IFS
+ IFS=$as_save_IFS
  
--if test -z "$lt_cv_path_MAGIC_CMD"; then
--  if test -n "$ac_tool_prefix"; then
--    echo "$as_me:$LINENO: checking for file" >&5
--echo $ECHO_N "checking for file... $ECHO_C" >&6
--if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+fi
-+OTOOL=$ac_cv_prog_OTOOL
-+if test -n "$OTOOL"; then
+ fi
+ fi
+ OTOOL=$ac_cv_prog_OTOOL
+ if test -n "$OTOOL"; then
+-  { $as_echo "$as_me:$LINENO: result: $OTOOL" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
-+$as_echo "$OTOOL" >&6; }
+ $as_echo "$OTOOL" >&6; }
  else
--  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
--  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
--  for ac_dir in $ac_dummy; do
--    IFS="$lt_save_ifs"
--    test -z "$ac_dir" && ac_dir=.
--    if test -f $ac_dir/file; then
--      lt_cv_path_MAGIC_CMD="$ac_dir/file"
--      if test -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 <<EOF 1>&2
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
- 
--*** 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
- 
--EOF
--	  fi ;;
--	esac
--      fi
--      break
--    fi
--  done
--  IFS="$lt_save_ifs"
--  MAGIC_CMD="$lt_save_MAGIC_CMD"
--  ;;
--esac
+ $as_echo "no" >&6; }
  fi
-+if test -z "$ac_cv_prog_OTOOL"; then
-+  ac_ct_OTOOL=$OTOOL
-+  # Extract the first word of "otool", so it can be a program name with args.
-+set dummy otool; ac_word=$2
+ 
+@@ -6907,9 +6917,9 @@
+   ac_ct_OTOOL=$OTOOL
+   # Extract the first word of "otool", so it can be a program name with args.
+ set dummy otool; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then
 +if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$ac_ct_OTOOL"; then
-+  ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # 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=.
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_OTOOL"; then
+@@ -6920,24 +6930,24 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
 +    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_OTOOL="otool"
+   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_OTOOL="otool"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
+     break 2
+   fi
+ done
+-done
 +  done
-+IFS=$as_save_IFS
+ IFS=$as_save_IFS
  
--MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
--if test -n "$MAGIC_CMD"; then
--  echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
--echo "${ECHO_T}$MAGIC_CMD" >&6
-+fi
-+fi
-+ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
-+if test -n "$ac_ct_OTOOL"; then
+ fi
+ fi
+ ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
+ if test -n "$ac_ct_OTOOL"; then
+-  { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
-+$as_echo "$ac_ct_OTOOL" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+  if test "x$ac_ct_OTOOL" = x; then
-+    OTOOL=":"
-+  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
-+    OTOOL=$ac_ct_OTOOL
-+  fi
+ $as_echo "$ac_ct_OTOOL" >&6; }
  else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  OTOOL="$ac_cv_prog_OTOOL"
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
  fi
  
--  else
--    MAGIC_CMD=:
-+    if test -n "$ac_tool_prefix"; then
-+  # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}otool64; ac_word=$2
+@@ -6946,7 +6956,7 @@
+   else
+     case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++{ $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
+@@ -6959,9 +6969,9 @@
+     if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}otool64; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_OTOOL64+set}" = set; then
 +if test "${ac_cv_prog_OTOOL64+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$OTOOL64"; then
-+  ac_cv_prog_OTOOL64="$OTOOL64" # 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=.
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$OTOOL64"; then
+@@ -6972,24 +6982,24 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
 +    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_OTOOL64="${ac_tool_prefix}otool64"
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
+     break 2
    fi
-+done
+ done
+-done
 +  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+OTOOL64=$ac_cv_prog_OTOOL64
-+if test -n "$OTOOL64"; then
+ IFS=$as_save_IFS
+ 
+ fi
+ fi
+ OTOOL64=$ac_cv_prog_OTOOL64
+ if test -n "$OTOOL64"; then
+-  { $as_echo "$as_me:$LINENO: result: $OTOOL64" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
-+$as_echo "$OTOOL64" >&6; }
-+else
+ $as_echo "$OTOOL64" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
+ $as_echo "no" >&6; }
  fi
  
-+
-+fi
-+if test -z "$ac_cv_prog_OTOOL64"; then
-+  ac_ct_OTOOL64=$OTOOL64
-+  # Extract the first word of "otool64", so it can be a program name with args.
-+set dummy otool64; ac_word=$2
+@@ -6999,9 +7009,9 @@
+   ac_ct_OTOOL64=$OTOOL64
+   # Extract the first word of "otool64", so it can be a program name with args.
+ set dummy otool64; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then
 +if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$ac_ct_OTOOL64"; then
-+  ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # 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=.
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_OTOOL64"; then
+@@ -7012,24 +7022,24 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
 +    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_OTOOL64="otool64"
+   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_OTOOL64="otool64"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
+     break 2
    fi
--  ;;
-+done
+ done
+-done
 +  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
-+if test -n "$ac_ct_OTOOL64"; then
+ IFS=$as_save_IFS
+ 
+ fi
+ fi
+ ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
+ if test -n "$ac_ct_OTOOL64"; then
+-  { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL64" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
-+$as_echo "$ac_ct_OTOOL64" >&6; }
-+else
+ $as_echo "$ac_ct_OTOOL64" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+  if test "x$ac_ct_OTOOL64" = x; then
-+    OTOOL64=":"
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -7038,7 +7048,7 @@
+   else
+     case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
 +{ $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 ;;
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ ac_tool_warned=yes ;;
  esac
-+    OTOOL64=$ac_ct_OTOOL64
-+  fi
-+else
-+  OTOOL64="$ac_cv_prog_OTOOL64"
-+fi
+@@ -7074,9 +7084,9 @@
  
--enable_dlopen=no
--enable_win32_dll=no
  
--# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
--if test "${enable_libtool_lock+set}" = set; then
--  enableval="$enable_libtool_lock"
  
--fi;
--test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
- 
- 
--# Check whether --with-pic or --without-pic was given.
--if test "${with_pic+set}" = set; then
--  withval="$with_pic"
--  pic_mode="$withval"
--else
--  pic_mode=default
--fi;
--test -z "$pic_mode" && pic_mode=default
- 
--# Use C for the default configuration in the libtool script
--tagname=
--lt_save_CC="$CC"
--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
- 
- 
--# Source file extension for C test sources.
--ac_ext=c
- 
--# Object file extension for compiled C test sources.
--objext=o
--objext=$objext
- 
--# Code to be used in simple compile tests
--lt_simple_compile_test_code="int some_variable = 0;\n"
- 
--# Code to be used in simple link tests
--lt_simple_link_test_code='int main(){return(0);}\n'
- 
- 
--# 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
- 
- 
--# save warnings/boilerplate of simple test code
--ac_outfile=conftest.$ac_objext
--printf "$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*
- 
--ac_outfile=conftest.$ac_objext
--printf "$lt_simple_link_test_code" >conftest.$ac_ext
--eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
--_lt_linker_boilerplate=`cat conftest.err`
--$rm conftest*
- 
- 
- 
--lt_prog_compiler_no_builtin_flag=
- 
--if test "$GCC" = yes; then
--  lt_prog_compiler_no_builtin_flag=' -fno-builtin'
- 
- 
--echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
--echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6
--if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  lt_cv_prog_compiler_rtti_exceptions=no
--  ac_outfile=conftest.$ac_objext
--   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
--   lt_compiler_flag="-fno-rtti -fno-exceptions"
--   # Insert the option either (1) after the last *FLAGS variable, or
--   # (2) before a word containing "conftest.", or (3) at the end.
--   # 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:6429: $lt_compile\"" >&5)
--   (eval "$lt_compile" 2>conftest.err)
--   ac_status=$?
--   cat conftest.err >&5
--   echo "$as_me:6433: \$? = $ac_status" >&5
--   if (exit $ac_status) && test -s "$ac_outfile"; then
--     # The compiler can only warn and ignore the option if not recognized
--     # So say no if there are warnings other than the usual output.
--     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
--     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
--     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
--       lt_cv_prog_compiler_rtti_exceptions=yes
--     fi
--   fi
--   $rm conftest*
- 
--fi
--echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
--echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6
- 
--if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
--    lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
-+
+-    { $as_echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
-+$as_echo_n "checking for -single_module linker flag... " >&6; }
+ $as_echo_n "checking for -single_module linker flag... " >&6; }
+-if test "${lt_cv_apple_cc_single_mod+set}" = set; then
 +if test "${lt_cv_apple_cc_single_mod+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
+   $as_echo_n "(cached) " >&6
  else
--    :
-+  lt_cv_apple_cc_single_mod=no
-+      if test -z "${LT_MULTI_MODULE}"; then
-+	# By default we will add the -single_module flag. You can override
-+	# by either setting the environment variable LT_MULTI_MODULE
-+	# non-empty at configure time, or by adding -multi_module to the
-+	# link flags.
-+	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" >&5
-+	$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 >&5
-+	fi
-+	rm -rf libconftest.dylib*
-+	rm -f conftest.*
-+      fi
+   lt_cv_apple_cc_single_mod=no
+@@ -7101,22 +7111,18 @@
+ 	rm -f conftest.*
+       fi
  fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
-+$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
+ $as_echo "$lt_cv_apple_cc_single_mod" >&6; }
+-    { $as_echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
-+$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
+ $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
+-if test "${lt_cv_ld_exported_symbols_list+set}" = set; then
 +if test "${lt_cv_ld_exported_symbols_list+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  lt_cv_ld_exported_symbols_list=no
-+      save_LDFLAGS=$LDFLAGS
-+      echo "_main" > conftest.sym
-+      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+   $as_echo_n "(cached) " >&6
+ else
+   lt_cv_ld_exported_symbols_list=no
+       save_LDFLAGS=$LDFLAGS
+       echo "_main" > conftest.sym
+       LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+-      cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
 +      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
+ /* end confdefs.h.  */
  
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ int
+@@ -7127,42 +7133,17 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
 +if ac_fn_c_try_link "$LINENO"; then :
-+  lt_cv_ld_exported_symbols_list=yes
-+else
+   lt_cv_ld_exported_symbols_list=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	lt_cv_ld_exported_symbols_list=no
 +  lt_cv_ld_exported_symbols_list=no
  fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext conftest.$ac_ext
-+	LDFLAGS="$save_LDFLAGS"
+ 	LDFLAGS="$save_LDFLAGS"
  
--lt_prog_compiler_wl=
--lt_prog_compiler_pic=
--lt_prog_compiler_static=
-+fi
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
-+$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
-+    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
+ $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
+     case $host_os in
+     rhapsody* | darwin1.[012])
+@@ -7200,16 +7181,12 @@
+   esac
  
--echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
--echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
  
--  if test "$GCC" = yes; then
--    lt_prog_compiler_wl='-Wl,'
--    lt_prog_compiler_static='-static'
--
--    case $host_os in
--      aix*)
--      # All AIX code is PIC.
--      if test "$host_cpu" = ia64; then
--	# AIX 5 now supports IA64 processor
--	lt_prog_compiler_static='-Bstatic'
--      fi
--      ;;
+-{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
-+$as_echo_n "checking for ANSI C header files... " >&6; }
+ $as_echo_n "checking for ANSI C header files... " >&6; }
+-if test "${ac_cv_header_stdc+set}" = set; then
 +if test "${ac_cv_header_stdc+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
+   $as_echo_n "(cached) " >&6
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <stdlib.h>
-+#include <stdarg.h>
-+#include <string.h>
-+#include <float.h>
- 
--    amigaos*)
--      # 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_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
--      ;;
-+int
-+main ()
-+{
- 
--    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
--      # PIC is the default for these OSes.
--      ;;
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ #include <stdlib.h>
+ #include <stdarg.h>
+@@ -7224,48 +7201,23 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
 +if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_header_stdc=yes
-+else
+   ac_cv_header_stdc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_header_stdc=no
 +  ac_cv_header_stdc=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
--    mingw* | pw32* | os2*)
--      # This hack is so that the source file can tell whether it is being
--      # built for inclusion in a dll (and should export symbols for example).
--      lt_prog_compiler_pic='-DDLL_EXPORT'
--      ;;
-+if test $ac_cv_header_stdc = yes; then
-+  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+ if test $ac_cv_header_stdc = yes; then
+   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <string.h>
+ /* end confdefs.h.  */
+ #include <string.h>
  
--    darwin* | rhapsody*)
--      # PIC is the default on this platform
--      # Common symbols not allowed in MH_DYLIB files
--      lt_prog_compiler_pic='-fno-common'
--      ;;
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ _ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  $EGREP "memchr" >/dev/null 2>&1; then
+-  :
 +  $EGREP "memchr" >/dev/null 2>&1; then :
++
+ else
+   ac_cv_header_stdc=no
+ fi
+@@ -7275,18 +7227,14 @@
  
--    interix3*)
--      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
--      # Instead, we relocate shared libraries at runtime.
--      ;;
-+else
-+  ac_cv_header_stdc=no
-+fi
-+rm -f conftest*
- 
--    msdosdjgpp*)
--      # Just because we use GCC doesn't mean we suddenly get shared libraries
--      # on systems that don't support them.
--      lt_prog_compiler_can_build_shared=no
--      enable_shared=no
--      ;;
-+fi
- 
--    sysv4*MP*)
--      if test -d /usr/nec; then
--	lt_prog_compiler_pic=-Kconform_pic
--      fi
--      ;;
-+if test $ac_cv_header_stdc = yes; then
-+  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+ if test $ac_cv_header_stdc = yes; then
+   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <stdlib.h>
+ /* end confdefs.h.  */
+ #include <stdlib.h>
  
--    hpux*)
--      # 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_prog_compiler_pic='-fPIC'
--	;;
--      esac
--      ;;
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ _ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  $EGREP "free" >/dev/null 2>&1; then
+-  :
 +  $EGREP "free" >/dev/null 2>&1; then :
++
+ else
+   ac_cv_header_stdc=no
+ fi
+@@ -7296,14 +7244,10 @@
  
--    *)
--      lt_prog_compiler_pic='-fPIC'
--      ;;
--    esac
--  else
--    # PORTME Check for flag to pass linker flags through the system compiler.
--    case $host_os in
--    aix*)
--      lt_prog_compiler_wl='-Wl,'
--      if test "$host_cpu" = ia64; then
--	# AIX 5 now supports IA64 processor
--	lt_prog_compiler_static='-Bstatic'
--      else
--	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
--      fi
--      ;;
--      darwin*)
--        # PIC is the default on this platform
--        # Common symbols not allowed in MH_DYLIB files
--       case $cc_basename in
--         xlc*)
--         lt_prog_compiler_pic='-qnocommon'
--         lt_prog_compiler_wl='-Wl,'
--         ;;
--       esac
--       ;;
-+else
-+  ac_cv_header_stdc=no
-+fi
-+rm -f conftest*
- 
--    mingw* | pw32* | os2*)
--      # This hack is so that the source file can tell whether it is being
--      # built for inclusion in a dll (and should export symbols for example).
--      lt_prog_compiler_pic='-DDLL_EXPORT'
--      ;;
-+fi
- 
--    hpux9* | hpux10* | hpux11*)
--      lt_prog_compiler_wl='-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_prog_compiler_pic='+Z'
--	;;
--      esac
--      # Is there a better lt_prog_compiler_static that works with the bundled CC?
--      lt_prog_compiler_static='${wl}-a ${wl}archive'
--      ;;
-+if test $ac_cv_header_stdc = yes; then
-+  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+ if test $ac_cv_header_stdc = yes; then
+   # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+-  if test "$cross_compiling" = yes; then
 +  if test "$cross_compiling" = yes; then :
-+  :
-+else
+   :
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <ctype.h>
-+#include <stdlib.h>
-+#if ((' ' & 0x0FF) == 0x020)
-+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-+#else
-+# define ISLOWER(c) \
-+		   (('a' <= (c) && (c) <= 'i') \
-+		     || ('j' <= (c) && (c) <= 'r') \
-+		     || ('s' <= (c) && (c) <= 'z'))
-+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-+#endif
- 
--    irix5* | irix6* | nonstopux*)
--      lt_prog_compiler_wl='-Wl,'
--      # PIC (with -KPIC) is the default.
--      lt_prog_compiler_static='-non_shared'
--      ;;
-+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-+int
-+main ()
-+{
-+  int i;
-+  for (i = 0; i < 256; i++)
-+    if (XOR (islower (i), ISLOWER (i))
-+	|| toupper (i) != TOUPPER (i))
-+      return 2;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ #include <ctype.h>
+ #include <stdlib.h>
+@@ -7330,118 +7274,34 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  :
+-else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
 +if ac_fn_c_try_run "$LINENO"; then :
  
--    newsos6)
--      lt_prog_compiler_pic='-KPIC'
--      lt_prog_compiler_static='-Bstatic'
--      ;;
+-( exit $ac_status )
+-ac_cv_header_stdc=no
 +else
 +  ac_cv_header_stdc=no
-+fi
+ fi
+-rm -rf conftest.dSYM
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
 +  conftest.$ac_objext conftest.beam conftest.$ac_ext
-+fi
+ fi
  
--    linux*)
--      case $cc_basename in
--      icc* | ecc*)
--	lt_prog_compiler_wl='-Wl,'
--	lt_prog_compiler_pic='-KPIC'
--	lt_prog_compiler_static='-static'
--        ;;
--      pgcc* | pgf77* | pgf90* | pgf95*)
--        # Portland Group compilers (*not* the Pentium gcc compiler,
--	# which looks to be a dead project)
--	lt_prog_compiler_wl='-Wl,'
--	lt_prog_compiler_pic='-fpic'
--	lt_prog_compiler_static='-Bstatic'
--        ;;
--      ccc*)
--        lt_prog_compiler_wl='-Wl,'
--        # All Alpha code is PIC.
--        lt_prog_compiler_static='-non_shared'
--        ;;
--      esac
--      ;;
-+fi
-+fi
+-
+ fi
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
-+$as_echo "$ac_cv_header_stdc" >&6; }
-+if test $ac_cv_header_stdc = yes; then
+ $as_echo "$ac_cv_header_stdc" >&6; }
+ if test $ac_cv_header_stdc = yes; then
  
--    osf3* | osf4* | osf5*)
--      lt_prog_compiler_wl='-Wl,'
--      # All OSF/1 code is PIC.
--      lt_prog_compiler_static='-non_shared'
--      ;;
+-cat >>confdefs.h <<\_ACEOF
+-#define STDC_HEADERS 1
+-_ACEOF
 +$as_echo "#define STDC_HEADERS 1" >>confdefs.h
  
--    solaris*)
--      lt_prog_compiler_pic='-KPIC'
--      lt_prog_compiler_static='-Bstatic'
--      case $cc_basename in
--      f77* | f90* | f95*)
--	lt_prog_compiler_wl='-Qoption ld ';;
--      *)
--	lt_prog_compiler_wl='-Wl,';;
--      esac
--      ;;
-+fi
+ fi
  
--    sunos4*)
--      lt_prog_compiler_wl='-Qoption ld '
--      lt_prog_compiler_pic='-PIC'
--      lt_prog_compiler_static='-Bstatic'
--      ;;
-+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-+		  inttypes.h stdint.h unistd.h
+ # On IRIX 5.3, sys/types and inttypes.h are conflicting.
+-
+-
+-
+-
+-
+-
+-
+-
+-
+ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+ 		  inttypes.h stdint.h unistd.h
+-do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-
+-#include <$ac_header>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
+-  eval "$as_ac_Header=yes"
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	eval "$as_ac_Header=no"
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
 +do :
 +  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 +ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
 +"
 +eval as_val=\$$as_ac_Header
 +   if test "x$as_val" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
+   cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+@@ -7451,62 +7311,13 @@
+ done
  
--    sysv4 | sysv4.2uw2* | sysv4.3*)
--      lt_prog_compiler_wl='-Wl,'
--      lt_prog_compiler_pic='-KPIC'
--      lt_prog_compiler_static='-Bstatic'
--      ;;
-+fi
  
--    sysv4*MP*)
--      if test -d /usr/nec ;then
--	lt_prog_compiler_pic='-Kconform_pic'
--	lt_prog_compiler_static='-Bstatic'
--      fi
--      ;;
-+done
- 
--    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
--      lt_prog_compiler_wl='-Wl,'
--      lt_prog_compiler_pic='-KPIC'
--      lt_prog_compiler_static='-Bstatic'
--      ;;
- 
--    unicos*)
--      lt_prog_compiler_wl='-Wl,'
--      lt_prog_compiler_can_build_shared=no
--      ;;
-+for ac_header in dlfcn.h
+-
+ for ac_header in dlfcn.h
+-do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-
+-#include <$ac_header>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
+-  eval "$as_ac_Header=yes"
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	eval "$as_ac_Header=no"
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
 +do :
 +  ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
 +"
 +if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 +#define HAVE_DLFCN_H 1
-+_ACEOF
+ _ACEOF
  
--    uts4*)
--      lt_prog_compiler_pic='-pic'
--      lt_prog_compiler_static='-Bstatic'
--      ;;
-+fi
- 
--    *)
--      lt_prog_compiler_can_build_shared=no
--      ;;
--    esac
--  fi
-+done
- 
--echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
--echo "${ECHO_T}$lt_prog_compiler_pic" >&6
- 
--#
--# Check to make sure the PIC flag actually works.
--#
--if test -n "$lt_prog_compiler_pic"; then
- 
--echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
--echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6
--if test "${lt_prog_compiler_pic_works+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+if test -z "$CXX"; then
-+  if test -n "$CCC"; then
-+    CXX=$CCC
-+  else
-+    if test -n "$ac_tool_prefix"; then
-+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
-+  do
-+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+ fi
+@@ -7529,9 +7340,9 @@
+   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:$LINENO: checking for $ac_word" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CXX+set}" = set; then
 +if test "${ac_cv_prog_CXX+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
+   $as_echo_n "(cached) " >&6
  else
--  lt_prog_compiler_pic_works=no
--  ac_outfile=conftest.$ac_objext
--   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
--   lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
--   # Insert the option either (1) after the last *FLAGS variable, or
--   # (2) before a word containing "conftest.", or (3) at the end.
--   # 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:6697: $lt_compile\"" >&5)
--   (eval "$lt_compile" 2>conftest.err)
--   ac_status=$?
--   cat conftest.err >&5
--   echo "$as_me:6701: \$? = $ac_status" >&5
--   if (exit $ac_status) && test -s "$ac_outfile"; then
--     # The compiler can only warn and ignore the option if not recognized
--     # So say no if there are warnings other than the usual output.
--     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
--     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
--     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
--       lt_prog_compiler_pic_works=yes
--     fi
--   fi
--   $rm conftest*
-+  if test -n "$CXX"; then
-+  ac_cv_prog_CXX="$CXX" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
+   if test -n "$CXX"; then
+@@ -7542,24 +7353,24 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
 +    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"
+   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:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
+     break 2
+   fi
+ done
+-done
 +  done
-+IFS=$as_save_IFS
+ IFS=$as_save_IFS
  
  fi
--echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
--echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6
--
--if test x"$lt_prog_compiler_pic_works" = xyes; then
--    case $lt_prog_compiler_pic in
--     "" | " "*) ;;
--     *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
--     esac
-+fi
-+CXX=$ac_cv_prog_CXX
-+if test -n "$CXX"; then
+ fi
+ CXX=$ac_cv_prog_CXX
+ if test -n "$CXX"; then
+-  { $as_echo "$as_me:$LINENO: result: $CXX" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
-+$as_echo "$CXX" >&6; }
+ $as_echo "$CXX" >&6; }
  else
--    lt_prog_compiler_pic=
--     lt_prog_compiler_can_build_shared=no
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
+ $as_echo "no" >&6; }
  fi
  
-+
-+    test -n "$CXX" && break
-+  done
- fi
--case $host_os in
--  # For platforms which do not support PIC, -DPIC is meaningless:
--  *djgpp*)
--    lt_prog_compiler_pic=
--    ;;
--  *)
--    lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
--    ;;
-+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
+@@ -7573,9 +7384,9 @@
+ 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:$LINENO: checking for $ac_word" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
 +if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$ac_ct_CXX"; then
-+  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_CXX"; then
+@@ -7586,24 +7397,24 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
 +    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"
+   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:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
+     break 2
+   fi
+ done
+-done
 +  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
-+if test -n "$ac_ct_CXX"; then
+ 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:$LINENO: result: $ac_ct_CXX" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
-+$as_echo "$ac_ct_CXX" >&6; }
-+else
+ $as_echo "$ac_ct_CXX" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
 +  { $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:)
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -7616,7 +7427,7 @@
+   else
+     case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
 +{ $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 ;;
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ ac_tool_warned=yes ;;
  esac
-+    CXX=$ac_ct_CXX
-+  fi
-+fi
- 
--#
--# Check to make sure the static flag actually works.
--#
--wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
--echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
--echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
--if test "${lt_prog_compiler_static_works+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  fi
-+fi
-+# Provide some information about the compiler.
+@@ -7627,53 +7438,36 @@
+   fi
+ fi
+ # Provide some information about the compiler.
+-$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5
 +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
-+set X $ac_compile
-+ac_compiler=$2
+ set X $ac_compile
+ ac_compiler=$2
+-{ (ac_try="$ac_compiler --version >&5"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compiler --version >&5") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }
+-{ (ac_try="$ac_compiler -v >&5"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compiler -v >&5") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }
+-{ (ac_try="$ac_compiler -V >&5"
 +for ac_option in --version -v -V -qversion; do
 +  { { ac_try="$ac_compiler $ac_option >&5"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
+ case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compiler -V >&5") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }
 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
 +$as_echo "$ac_try_echo"; } >&5
 +  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
@@ -34567,17789 +7915,2597 @@
 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 +  test $ac_status = 0; }
 +done
-+
+ 
+-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
-+$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
+ $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
+-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
 +if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
+   $as_echo_n "(cached) " >&6
  else
--  lt_prog_compiler_static_works=no
--   save_LDFLAGS="$LDFLAGS"
--   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
--   printf "$lt_simple_link_test_code" > conftest.$ac_ext
--   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
--     # The linker can only warn and ignore the option if not recognized
--     # So say no if there are warnings
--     if test -s conftest.err; then
--       # Append any errors to the config.log.
--       cat conftest.err 1>&5
--       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
--       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
--       if diff conftest.exp conftest.er2 >/dev/null; then
--         lt_prog_compiler_static_works=yes
--       fi
--     else
--       lt_prog_compiler_static_works=yes
--     fi
--   fi
--   $rm conftest*
--   LDFLAGS="$save_LDFLAGS"
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+#ifndef __GNUC__
-+       choke me
-+#endif
+ /* end confdefs.h.  */
  
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ int
+@@ -7687,37 +7481,16 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_cxx_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
 +if ac_fn_cxx_try_compile "$LINENO"; then :
-+  ac_compiler_gnu=yes
-+else
+   ac_compiler_gnu=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_compiler_gnu=no
 +  ac_compiler_gnu=no
  fi
--echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
--echo "${ECHO_T}$lt_prog_compiler_static_works" >&6
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
  
--if test x"$lt_prog_compiler_static_works" = xyes; then
--    :
-+fi
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
-+$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
-+if test $ac_compiler_gnu = yes; then
-+  GXX=yes
- else
--    lt_prog_compiler_static=
-+  GXX=
+ $as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
+ if test $ac_compiler_gnu = yes; then
+   GXX=yes
+@@ -7726,20 +7499,16 @@
  fi
-+ac_test_CXXFLAGS=${CXXFLAGS+set}
-+ac_save_CXXFLAGS=$CXXFLAGS
+ ac_test_CXXFLAGS=${CXXFLAGS+set}
+ ac_save_CXXFLAGS=$CXXFLAGS
+-{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
-+$as_echo_n "checking whether $CXX accepts -g... " >&6; }
+ $as_echo_n "checking whether $CXX accepts -g... " >&6; }
+-if test "${ac_cv_prog_cxx_g+set}" = set; then
 +if test "${ac_cv_prog_cxx_g+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
-+   ac_cxx_werror_flag=yes
-+   ac_cv_prog_cxx_g=no
-+   CXXFLAGS="-g"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_save_cxx_werror_flag=$ac_cxx_werror_flag
+    ac_cxx_werror_flag=yes
+    ac_cv_prog_cxx_g=no
+    CXXFLAGS="-g"
+-   cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
 +   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
+ /* end confdefs.h.  */
  
-+int
-+main ()
-+{
- 
--echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
--echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
--if test "${lt_cv_prog_compiler_c_o+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ int
+@@ -7750,35 +7519,11 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_cxx_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
 +if ac_fn_cxx_try_compile "$LINENO"; then :
-+  ac_cv_prog_cxx_g=yes
+   ac_cv_prog_cxx_g=yes
  else
--  lt_cv_prog_compiler_c_o=no
--   $rm -r conftest 2>/dev/null
--   mkdir conftest
--   cd conftest
--   mkdir out
--   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	CXXFLAGS=""
+-      cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
 +  CXXFLAGS=""
 +      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
+ /* end confdefs.h.  */
  
--   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:6801: $lt_compile\"" >&5)
--   (eval "$lt_compile" 2>out/conftest.err)
--   ac_status=$?
--   cat out/conftest.err >&5
--   echo "$as_me:6805: \$? = $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
--     # 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_cv_prog_compiler_c_o=yes
--     fi
--   fi
--   chmod u+w . 2>&5
--   $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 ..
--   rmdir conftest
--   $rm conftest*
-+int
-+main ()
-+{
- 
--fi
--echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
--echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ int
+@@ -7789,36 +7534,12 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_cxx_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
+-  :
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
 +if ac_fn_cxx_try_compile "$LINENO"; then :
  
+-	ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 +else
 +  ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-+	 CXXFLAGS="-g"
+ 	 CXXFLAGS="-g"
+-	 cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
 +	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
+ /* end confdefs.h.  */
  
--hard_links="nottested"
--if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
--  # do not overwrite the value of need_locks provided by the user
--  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
--echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
--  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
--  echo "$as_me:$LINENO: result: $hard_links" >&5
--echo "${ECHO_T}$hard_links" >&6
--  if test "$hard_links" = no; then
--    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
--echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
--    need_locks=warn
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ int
+@@ -7829,42 +7550,17 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_cxx_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
 +if ac_fn_cxx_try_compile "$LINENO"; then :
-+  ac_cv_prog_cxx_g=yes
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
-+$as_echo "$ac_cv_prog_cxx_g" >&6; }
-+if test "$ac_test_CXXFLAGS" = set; then
-+  CXXFLAGS=$ac_save_CXXFLAGS
-+elif test $ac_cv_prog_cxx_g = yes; then
-+  if test "$GXX" = yes; then
-+    CXXFLAGS="-g -O2"
-+  else
-+    CXXFLAGS="-g"
-   fi
- else
--  need_locks=no
-+  if test "$GXX" = yes; then
-+    CXXFLAGS="-O2"
-+  else
-+    CXXFLAGS=
-+  fi
- fi
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
--echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
--echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
-+depcc="$CXX"  am_compiler_list=
- 
--  runpath_var=
--  allow_undefined_flag=
--  enable_shared_with_static_runtimes=no
--  archive_cmds=
--  archive_expsym_cmds=
--  old_archive_From_new_cmds=
--  old_archive_from_expsyms_cmds=
--  export_dynamic_flag_spec=
--  whole_archive_flag_spec=
--  thread_safe_flag_spec=
--  hardcode_libdir_flag_spec=
--  hardcode_libdir_flag_spec_ld=
--  hardcode_libdir_separator=
--  hardcode_direct=no
--  hardcode_minus_L=no
--  hardcode_shlibpath_var=unsupported
--  link_all_deplibs=unknown
--  hardcode_automatic=no
--  module_cmds=
--  module_expsym_cmds=
--  always_export_symbols=no
--  export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
--  # include_expsyms should be a list of space-separated symbols to be *always*
--  # included in the symbol list
--  include_expsyms=
--  # exclude_expsyms can be an extended regexp of symbols to exclude
--  # it will be wrapped by ` (' and `)$', so one must not match beginning or
--  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
--  # as well as any symbol that contains `d'.
--  exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
--  # 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.
--  extract_expsyms_cmds=
--  # Just being paranoid about ensuring that cc_basename is set.
--  for cc_temp in $compiler""; 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-%%"`
+   ac_cv_prog_cxx_g=yes
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
 -
--  case $host_os in
--  cygwin* | mingw* | pw32*)
--    # 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
--    ;;
--  esac
 -
--  ld_shlibs=yes
--  if test "$with_gnu_ld" = yes; then
--    # If archive_cmds runs LD, not CC, wlarc should be empty
--    wlarc='${wl}'
+ fi
 -
--    # Set some defaults for GNU ld with shared library support. These
--    # are reset later if shared libraries are not supported. Putting them
--    # here allows them to be overridden if necessary.
--    runpath_var=LD_RUN_PATH
--    hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
--    export_dynamic_flag_spec='${wl}--export-dynamic'
--    # ancient GNU ld didn't support --whole-archive et. al.
--    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
--	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
--      else
--  	whole_archive_flag_spec=
--    fi
--    supports_anon_versioning=no
--    case `$LD -v 2>/dev/null` in
--      *\ [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
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
 -
--    # See if GNU ld supports shared libraries.
--    case $host_os in
--    aix3* | aix4* | aix5*)
--      # On AIX/PPC, the GNU linker is very broken
--      if test "$host_cpu" != ia64; then
--	ld_shlibs=no
--	cat <<EOF 1>&2
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
 -
--*** 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.
--
--EOF
--      fi
--      ;;
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
+ $as_echo "$ac_cv_prog_cxx_g" >&6; }
+ if test "$ac_test_CXXFLAGS" = set; then
+   CXXFLAGS=$ac_save_CXXFLAGS
+@@ -7889,9 +7585,9 @@
+ 
+ depcc="$CXX"  am_compiler_list=
+ 
+-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
-+$as_echo_n "checking dependency style of $depcc... " >&6; }
+ $as_echo_n "checking dependency style of $depcc... " >&6; }
+-if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
 +if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-+  # We make a subdir and do the tests there.  Otherwise we can end up
-+  # making bogus files that we don't know about and never remove.  For
-+  # instance it was reported that on HP-UX the gcc test will end up
-+  # making a dummy file named `D' -- because `-MD' means `put the output
-+  # in D'.
-+  mkdir conftest.dir
-+  # Copy depcomp to subdir because otherwise we won't find it if we're
-+  # using a relative directory.
-+  cp "$am_depcomp" conftest.dir
-+  cd conftest.dir
-+  # We will build objects and dependencies in a subdirectory because
-+  # it helps to detect inapplicable dependency modes.  For instance
-+  # both Tru64's cc and ICC support -MD to output dependencies as a
-+  # side effect of compilation, but ICC will put the dependencies in
-+  # the current directory while Tru64 will put them in the object
-+  # directory.
-+  mkdir sub
- 
--    amigaos*)
--      archive_cmds='$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)'
--      hardcode_libdir_flag_spec='-L$libdir'
--      hardcode_minus_L=yes
-+  am_cv_CXX_dependencies_compiler_type=none
-+  if test "$am_compiler_list" = ""; then
-+     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-+  fi
+   $as_echo_n "(cached) " >&6
+ else
+   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+@@ -7917,6 +7613,11 @@
+   if test "$am_compiler_list" = ""; then
+      am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+   fi
 +  am__universal=false
 +  case " $depcc " in #(
 +     *\ -arch\ *\ -arch\ *) am__universal=true ;;
 +     esac
++
+   for depmode in $am_compiler_list; do
+     # Setup a source with many dependencies, because some compilers
+     # like to wrap large dependency lists on column 80 (with \), and
+@@ -7934,7 +7635,17 @@
+     done
+     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
  
--      # Samuel A. Falvo II <kc5tja at dolphin.openprojects.net> reports
--      # that the semantics of dynamic libraries on AmigaOS, at least up
--      # to version 4, is to share data among multiple programs linked
--      # with the same dynamic library.  Since this doesn't match the
--      # behavior of shared libraries on other platforms, we can't use
--      # them.
--      ld_shlibs=no
--      ;;
-+  for depmode in $am_compiler_list; do
-+    # Setup a source with many dependencies, because some compilers
-+    # like to wrap large dependency lists on column 80 (with \), and
-+    # we should not choose a depcomp mode which is confused by this.
-+    #
-+    # We need to recreate these files for each test, as the compiler may
-+    # overwrite some of them when testing with obscure command lines.
-+    # This happens at least with the AIX C compiler.
-+    : > sub/conftest.c
-+    for i in 1 2 3 4 5 6; do
-+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-+      # Solaris 8's {/usr,}/bin/sh.
-+      touch sub/conftst$i.h
-+    done
-+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
- 
--    beos*)
--      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
--	allow_undefined_flag=unsupported
--	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
--	# support --undefined.  This deserves some investigation.  FIXME
--	archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--      else
--	ld_shlibs=no
--      fi
 +    # We check with `-c' and `-o' for the sake of the "dashmstdout"
 +    # mode.  It turns out that the SunPro C++ compiler does not properly
 +    # handle `-M -o', and we need to detect this.  Also, some Intel
 +    # versions had trouble with output in subdirs
 +    am__obj=sub/conftest.${OBJEXT-o}
 +    am__minus_obj="-o $am__obj"
-+    case $depmode in
+     case $depmode in
 +    gcc)
 +      # This depmode causes a compiler race in universal mode.
 +      test "$am__universal" = false || continue
-       ;;
--
--    cygwin* | mingw* | pw32*)
--      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
--      # as there is no search path for DLLs.
--      hardcode_libdir_flag_spec='-L$libdir'
--      allow_undefined_flag=unsupported
--      always_export_symbols=no
--      enable_shared_with_static_runtimes=yes
--      export_symbols_cmds='$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
--        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
--	# If the export-symbols file already is a .def file (1st line
--	# is EXPORTS), use it as is; otherwise, prepend...
--	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
--	  cp $export_symbols $output_objdir/$soname.def;
--	else
--	  echo EXPORTS > $output_objdir/$soname.def;
--	  cat $export_symbols >> $output_objdir/$soname.def;
--	fi~
--	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-+    nosideeffect)
-+      # after this tag, mechanisms are not by side-effect, so they'll
-+      # only be used when explicitly requested
-+      if test "x$enable_dependency_tracking" = xyes; then
-+	continue
-       else
--	ld_shlibs=no
-+	break
++      ;;
+     nosideeffect)
+       # after this tag, mechanisms are not by side-effect, so they'll
+       # only be used when explicitly requested
+@@ -7944,19 +7655,23 @@
+ 	break
        fi
        ;;
--
--    interix3*)
--      hardcode_direct=no
--      hardcode_shlibpath_var=no
--      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
--      export_dynamic_flag_spec='${wl}-E'
--      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
--      # Instead, shared libraries are loaded at an image base (0x10000000 by
--      # default) and relocated if they conflict, which is a slow very memory
--      # consuming and fragmenting process.  To avoid this, we pick a random,
--      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
--      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
--      archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
--      archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
--      ;;
--
--    linux*)
--      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
--	tmp_addflag=
--	case $cc_basename,$host_cpu in
--	pgcc*)				# Portland Group C compiler
--	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
--	  tmp_addflag=' $pic_flag'
--	  ;;
--	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
--	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
--	  tmp_addflag=' $pic_flag -Mnomain' ;;
--	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
--	  tmp_addflag=' -i_dynamic' ;;
--	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
--	  tmp_addflag=' -i_dynamic -nofor_main' ;;
--	ifc* | ifort*)			# Intel Fortran compiler
--	  tmp_addflag=' -nofor_main' ;;
--	esac
--	archive_cmds='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--
--	if test $supports_anon_versioning = yes; then
--	  archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
--  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
--  $echo "local: *; };" >> $output_objdir/$libname.ver~
--	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
--	fi
--      else
--	ld_shlibs=no
--      fi
 +    msvisualcpp | msvcmsys)
 +      # This compiler won't grok `-c -o', but also, the minuso test has
 +      # not run yet.  These depmodes are late enough in the game, and
 +      # so weak that their functioning should not be impacted.
 +      am__obj=conftest.${OBJEXT-o}
 +      am__minus_obj=
-       ;;
--
--    netbsd*)
--      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
--	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
--	wlarc=
--      else
--	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+    none) break ;;
-+    esac
-+    if depmode=$depmode \
++      ;;
+     none) break ;;
+     esac
+-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+-    # mode.  It turns out that the SunPro C++ compiler does not properly
+-    # handle `-M -o', and we need to detect this.
+     if depmode=$depmode \
+-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
 +       source=sub/conftest.c object=$am__obj \
-+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
 +       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
-+         >/dev/null 2>conftest.err &&
-+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+          >/dev/null 2>conftest.err &&
+        grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
 +       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
-+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-+      # icc doesn't choke on unknown options, it will just issue warnings
-+      # or remarks (even with -Werror).  So we grep stderr for any message
-+      # that says an option was ignored or not supported.
-+      # When given -MP, icc 7.0 and 7.1 complain thusly:
-+      #   icc: Command line warning: ignoring option '-M'; no argument required
-+      # The diagnosis changed in icc 8.0:
-+      #   icc: Command line remark: option '-MP' not supported
-+      if (grep 'ignoring option' conftest.err ||
-+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-+        am_cv_CXX_dependencies_compiler_type=$depmode
-+        break
-       fi
--      ;;
-+    fi
-+  done
+        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+       # icc doesn't choke on unknown options, it will just issue warnings
+       # or remarks (even with -Werror).  So we grep stderr for any message
+@@ -7980,7 +7695,7 @@
+ fi
  
--    solaris*)
--      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
--	ld_shlibs=no
--	cat <<EOF 1>&2
-+  cd ..
-+  rm -rf conftest.dir
-+else
-+  am_cv_CXX_dependencies_compiler_type=none
-+fi
- 
--*** 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.
-+fi
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5
-+$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
-+CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
+ $as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
+ CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
  
--EOF
--      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
--	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
--      else
--	ld_shlibs=no
--      fi
--      ;;
-+ if
-+  test "x$enable_dependency_tracking" != xno \
-+  && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
-+  am__fastdepCXX_TRUE=
-+  am__fastdepCXX_FALSE='#'
-+else
-+  am__fastdepCXX_TRUE='#'
-+  am__fastdepCXX_FALSE=
-+fi
- 
--    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
--      case `$LD -v 2>&1` in
--        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
--	ld_shlibs=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.
-+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-+    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-+    (test "X$CXX" != "Xg++"))) ; then
-+  ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+@@ -8003,10 +7718,10 @@
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+-{ $as_echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
-+$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
-+if test -z "$CXXCPP"; then
+ $as_echo_n "checking how to run the C++ preprocessor... " >&6; }
+ if test -z "$CXXCPP"; then
+-  if test "${ac_cv_prog_CXXCPP+set}" = set; then
 +  if test "${ac_cv_prog_CXXCPP+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+      # Double quotes because CXXCPP needs to be expanded
-+    for CXXCPP in "$CXX -E" "/lib/cpp"
-+    do
-+      ac_preproc_ok=false
-+for ac_cxx_preproc_warn_flag in '' yes
-+do
-+  # Use a header file that comes with gcc, so configuring glibc
-+  # with a fresh cross-compiler works.
-+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+  # <limits.h> exists even on freestanding compilers.
-+  # On the NeXT, cc -E runs the code through the compiler's parser,
-+  # not just through cpp. "Syntax error" is here to catch this case.
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+		     Syntax error
-+_ACEOF
-+if ac_fn_cxx_try_cpp "$LINENO"; then :
- 
--_LT_EOF
--	;;
--	*)
--	  if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
--	    hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
--	    archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
--	    archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
--	  else
--	    ld_shlibs=no
--	  fi
--	;;
--      esac
--      ;;
-+else
-+  # Broken: fails on valid input.
-+continue
-+fi
-+rm -f conftest.err conftest.$ac_ext
- 
--    sunos4*)
--      archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
--      wlarc=
--      hardcode_direct=yes
--      hardcode_shlibpath_var=no
--      ;;
-+  # OK, works on sane cases.  Now check whether nonexistent headers
-+  # can be detected and how.
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <ac_nonexistent.h>
-+_ACEOF
-+if ac_fn_cxx_try_cpp "$LINENO"; then :
-+  # Broken: success on invalid input.
-+continue
-+else
-+  # Passes both tests.
-+ac_preproc_ok=:
-+break
-+fi
-+rm -f conftest.err conftest.$ac_ext
- 
--    *)
--      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
--	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
--      else
--	ld_shlibs=no
--      fi
--      ;;
--    esac
-+done
-+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-+rm -f conftest.err conftest.$ac_ext
-+if $ac_preproc_ok; then :
-+  break
-+fi
- 
--    if test "$ld_shlibs" = no; then
--      runpath_var=
--      hardcode_libdir_flag_spec=
--      export_dynamic_flag_spec=
--      whole_archive_flag_spec=
--    fi
--  else
--    # PORTME fill in a description of your system's linker (not GNU ld)
--    case $host_os in
--    aix3*)
--      allow_undefined_flag=unsupported
--      always_export_symbols=yes
--      archive_expsym_cmds='$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.
--      hardcode_minus_L=yes
--      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
--	# Neither direct hardcoding nor static linking is supported with a
--	# broken collect2.
--	hardcode_direct=unsupported
--      fi
--      ;;
-+    done
-+    ac_cv_prog_CXXCPP=$CXXCPP
- 
--    aix4* | aix5*)
--      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
--	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
--	else
--	  export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
--	fi
--	aix_use_runtimelinking=no
-+fi
-+  CXXCPP=$ac_cv_prog_CXXCPP
-+else
-+  ac_cv_prog_CXXCPP=$CXXCPP
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
-+$as_echo "$CXXCPP" >&6; }
-+ac_preproc_ok=false
-+for ac_cxx_preproc_warn_flag in '' yes
-+do
-+  # Use a header file that comes with gcc, so configuring glibc
-+  # with a fresh cross-compiler works.
-+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+  # <limits.h> exists even on freestanding compilers.
-+  # On the NeXT, cc -E runs the code through the compiler's parser,
-+  # not just through cpp. "Syntax error" is here to catch this case.
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+		     Syntax error
-+_ACEOF
-+if ac_fn_cxx_try_cpp "$LINENO"; then :
- 
--	# Test if we are trying to use run time linking or normal
--	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
--	# need to do runtime linking.
--	case $host_os in aix4.[23]|aix4.[23].*|aix5*)
--	  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
-+else
-+  # Broken: fails on valid input.
-+continue
-+fi
-+rm -f conftest.err conftest.$ac_ext
- 
--	exp_sym_flag='-bexport'
--	no_entry_flag='-bnoentry'
--      fi
-+  # OK, works on sane cases.  Now check whether nonexistent headers
-+  # can be detected and how.
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <ac_nonexistent.h>
-+_ACEOF
-+if ac_fn_cxx_try_cpp "$LINENO"; then :
-+  # Broken: success on invalid input.
-+continue
-+else
-+  # Passes both tests.
-+ac_preproc_ok=:
-+break
-+fi
-+rm -f conftest.err conftest.$ac_ext
- 
--      # 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.
-+done
-+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-+rm -f conftest.err conftest.$ac_ext
-+if $ac_preproc_ok; then :
- 
--      archive_cmds=''
--      hardcode_direct=yes
--      hardcode_libdir_separator=':'
--      link_all_deplibs=yes
-+else
-+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+_lt_caught_CXX_error=yes; }
-+fi
- 
--      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
--  	  hardcode_direct=yes
--	  else
--  	  # We have old collect2
--  	  hardcode_direct=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
--  	  hardcode_minus_L=yes
--  	  hardcode_libdir_flag_spec='-L$libdir'
--  	  hardcode_libdir_separator=
--	  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
-+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
- 
--      # It seems that -bexpall does not export symbols beginning with
--      # underscore (_), so it is better to generate a list of symbols to export.
--      always_export_symbols=yes
--      if test "$aix_use_runtimelinking" = yes; then
--	# Warning - without using the other runtime loading flags (-brtl),
--	# -berok will link without error, but may produce a broken library.
--	allow_undefined_flag='-berok'
--       # Determine the default libpath from the value encoded in an empty executable.
--       cat >conftest.$ac_ext <<_ACEOF
+   $as_echo_n "(cached) " >&6
+ else
+       # Double quotes because CXXCPP needs to be expanded
+@@ -8021,11 +7736,7 @@
+   # <limits.h> exists even on freestanding compilers.
+   # On the NeXT, cc -E runs the code through the compiler's parser,
+   # not just through cpp. "Syntax error" is here to catch this case.
+-  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
-+else
-+  _lt_caught_CXX_error=yes
-+fi
- 
--int
--main ()
--{
- 
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #ifdef __STDC__
+ # include <limits.h>
+@@ -8034,78 +7745,34 @@
+ #endif
+ 		     Syntax error
+ _ACEOF
+-if { (ac_try="$ac_cpp conftest.$ac_ext"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
- 
--aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
--}'`
--# 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 '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
--}'`; fi
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null && {
+-	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+-	 test ! -s conftest.err
+-       }; then
+-  :
 -else
--  echo "$as_me: failed program was:" >&5
+-  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
++if ac_fn_cxx_try_cpp "$LINENO"; then :
  
--fi
--rm -f conftest.err conftest.$ac_objext \
--      conftest$ac_exeext conftest.$ac_ext
--if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
++else
+   # Broken: fails on valid input.
+ continue
+ fi
+-
+ rm -f conftest.err conftest.$ac_ext
  
--       hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
--	archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
--       else
--	if test "$host_cpu" = ia64; then
--	  hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
--	  allow_undefined_flag="-z nodefs"
--	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
--	else
--	 # Determine the default libpath from the value encoded in an empty executable.
--	 cat >conftest.$ac_ext <<_ACEOF
+   # OK, works on sane cases.  Now check whether nonexistent headers
+   # can be detected and how.
+-  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
-+# Set options
- 
--int
--main ()
--{
- 
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include <ac_nonexistent.h>
+ _ACEOF
+-if { (ac_try="$ac_cpp conftest.$ac_ext"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
- 
--aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
--}'`
--# 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 '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
--}'`; fi
--else
--  echo "$as_me: failed program was:" >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null && {
+-	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+-	 test ! -s conftest.err
+-       }; then
++if ac_fn_cxx_try_cpp "$LINENO"; then :
+   # Broken: success on invalid input.
+ continue
+ else
+-  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+        enable_dlopen=no
- 
--fi
--rm -f conftest.err conftest.$ac_objext \
--      conftest$ac_exeext conftest.$ac_ext
--if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- 
--	 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
--	  # Warning - without using the other run time loading flags,
--	  # -berok will link without error, but may produce a broken library.
--	  no_undefined_flag=' ${wl}-bernotok'
--	  allow_undefined_flag=' ${wl}-berok'
--	  # Exported symbols can be pulled into shared objects from archives
--	  whole_archive_flag_spec='$convenience'
--	  archive_cmds_need_lc=yes
--	  # This is similar to how AIX traditionally builds its shared libraries.
--	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-+  enable_win32_dll=no
-+
-+
-+            # Check whether --enable-shared was given.
-+if test "${enable_shared+set}" = set; then :
-+  enableval=$enable_shared; p=${PACKAGE-default}
-+    case $enableval in
-+    yes) enable_shared=yes ;;
-+    no) enable_shared=no ;;
-+    *)
-+      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
--      fi
-+      done
-+      IFS="$lt_save_ifs"
-       ;;
-+    esac
-+else
-+  enable_shared=yes
-+fi
- 
--    amigaos*)
--      archive_cmds='$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)'
--      hardcode_libdir_flag_spec='-L$libdir'
--      hardcode_minus_L=yes
--      # see comment about different semantics on the GNU ld section
--      ld_shlibs=no
--      ;;
- 
--    bsdi[45]*)
--      export_dynamic_flag_spec=-rdynamic
--      ;;
- 
--    cygwin* | mingw* | pw32*)
--      # 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.
--      hardcode_libdir_flag_spec=' '
--      allow_undefined_flag=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.
--      archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
--      # The linker will automatically build a .lib file if we build a DLL.
--      old_archive_From_new_cmds='true'
--      # FIXME: Should let the user specify the lib program.
--      old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs'
--      fix_srcfile_path='`cygpath -w "$srcfile"`'
--      enable_shared_with_static_runtimes=yes
--      ;;
- 
--    darwin* | rhapsody*)
--      case $host_os in
--        rhapsody* | darwin1.[012])
--         allow_undefined_flag='${wl}-undefined ${wl}suppress'
--         ;;
--       *) # Darwin 1.3 on
--         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
--           allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
--         else
--           case ${MACOSX_DEPLOYMENT_TARGET} in
--             10.[012])
--               allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
--               ;;
--             10.*)
--               allow_undefined_flag='${wl}-undefined ${wl}dynamic_lookup'
--               ;;
--           esac
--         fi
--         ;;
--      esac
--      archive_cmds_need_lc=no
--      hardcode_direct=no
--      hardcode_automatic=yes
--      hardcode_shlibpath_var=unsupported
--      whole_archive_flag_spec=''
--      link_all_deplibs=yes
--    if test "$GCC" = yes ; then
--    	output_verbose_link_cmd='echo'
--        archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--      module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
--      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
--      archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--      module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--    else
--      case $cc_basename in
--        xlc*)
--         output_verbose_link_cmd='echo'
--         archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
--         module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
--          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
--         archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--          module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--          ;;
--       *)
--         ld_shlibs=no
--          ;;
--      esac
--    fi
--      ;;
- 
--    dgux*)
--      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--      hardcode_libdir_flag_spec='-L$libdir'
--      hardcode_shlibpath_var=no
--      ;;
- 
--    freebsd1*)
--      ld_shlibs=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*)
--      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
--      hardcode_libdir_flag_spec='-R$libdir'
--      hardcode_direct=yes
--      hardcode_shlibpath_var=no
--      ;;
- 
--    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
--    freebsd2*)
--      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
--      hardcode_direct=yes
--      hardcode_minus_L=yes
--      hardcode_shlibpath_var=no
--      ;;
- 
--    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--    freebsd* | kfreebsd*-gnu | dragonfly*)
--      archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
--      hardcode_libdir_flag_spec='-R$libdir'
--      hardcode_direct=yes
--      hardcode_shlibpath_var=no
-+  # 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=yes
-+fi
- 
--    hpux9*)
--      if test "$GCC" = yes; then
--	archive_cmds='$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
--	archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
--      fi
--      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
--      hardcode_libdir_separator=:
--      hardcode_direct=yes
- 
--      # hardcode_minus_L: Not really in the search PATH,
--      # but as the default location of the library.
--      hardcode_minus_L=yes
--      export_dynamic_flag_spec='${wl}-E'
--      ;;
- 
--    hpux10*)
--      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
--	archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
--      else
--	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
--      fi
--      if test "$with_gnu_ld" = no; then
--	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
--	hardcode_libdir_separator=:
- 
--	hardcode_direct=yes
--	export_dynamic_flag_spec='${wl}-E'
- 
--	# hardcode_minus_L: Not really in the search PATH,
--	# but as the default location of the library.
--	hardcode_minus_L=yes
--      fi
--      ;;
- 
--    hpux11*)
--      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
--	case $host_cpu in
--	hppa*64*)
--	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
--	  ;;
--	ia64*)
--	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
--	  ;;
--	*)
--	  archive_cmds='$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*)
--	  archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
--	  ;;
--	ia64*)
--	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
--	  ;;
--	*)
--	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
--	  ;;
--	esac
--      fi
--      if test "$with_gnu_ld" = no; then
--	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
--	hardcode_libdir_separator=:
- 
--	case $host_cpu in
--	hppa*64*|ia64*)
--	  hardcode_libdir_flag_spec_ld='+b $libdir'
--	  hardcode_direct=no
--	  hardcode_shlibpath_var=no
--	  ;;
--	*)
--	  hardcode_direct=yes
--	  export_dynamic_flag_spec='${wl}-E'
- 
--	  # hardcode_minus_L: Not really in the search PATH,
--	  # but as the default location of the library.
--	  hardcode_minus_L=yes
--	  ;;
--	esac
--      fi
--      ;;
- 
--    irix5* | irix6* | nonstopux*)
--      if test "$GCC" = yes; then
--	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
--      else
--	archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
--	hardcode_libdir_flag_spec_ld='-rpath $libdir'
--      fi
--      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
--      hardcode_libdir_separator=:
--      link_all_deplibs=yes
--      ;;
- 
--    netbsd*)
--      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
--	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
--      else
--	archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
--      fi
--      hardcode_libdir_flag_spec='-R$libdir'
--      hardcode_direct=yes
--      hardcode_shlibpath_var=no
--      ;;
-+# Check whether --with-pic was given.
-+if test "${with_pic+set}" = set; then :
-+  withval=$with_pic; pic_mode="$withval"
-+else
-+  pic_mode=default
-+fi
- 
--    newsos6)
--      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--      hardcode_direct=yes
--      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
--      hardcode_libdir_separator=:
--      hardcode_shlibpath_var=no
--      ;;
- 
--    openbsd*)
--      hardcode_direct=yes
--      hardcode_shlibpath_var=no
--      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
--	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
--	archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
--	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
--	export_dynamic_flag_spec='${wl}-E'
--      else
--       case $host_os in
--	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
--	   archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
--	   hardcode_libdir_flag_spec='-R$libdir'
--	   ;;
--	 *)
--	   archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
--	   hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
--	   ;;
--       esac
--      fi
--      ;;
-+test -z "$pic_mode" && pic_mode=default
- 
--    os2*)
--      hardcode_libdir_flag_spec='-L$libdir'
--      hardcode_minus_L=yes
--      allow_undefined_flag=unsupported
--      archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
--      old_archive_From_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
--      ;;
- 
--    osf3*)
--      if test "$GCC" = yes; then
--	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
--	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
--      else
--	allow_undefined_flag=' -expect_unresolved \*'
--	archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
--      fi
--      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
--      hardcode_libdir_separator=:
--      ;;
- 
--    osf4* | osf5*)	# as osf3* with the addition of -msym flag
--      if test "$GCC" = yes; then
--	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
--	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
--	hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
--      else
--	allow_undefined_flag=' -expect_unresolved \*'
--	archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
--	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
--	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
- 
--	# Both c and cxx compiler support -rpath directly
--	hardcode_libdir_flag_spec='-rpath $libdir'
--      fi
--      hardcode_libdir_separator=:
--      ;;
- 
--    solaris*)
--      no_undefined_flag=' -z text'
--      if test "$GCC" = yes; then
--	wlarc='${wl}'
--	archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
--	archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
--	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
--      else
--	wlarc=''
--	archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
--	archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
--  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
--      fi
--      hardcode_libdir_flag_spec='-R$libdir'
--      hardcode_shlibpath_var=no
--      case $host_os in
--      solaris2.[0-5] | solaris2.[0-5].*) ;;
--      *)
-- 	# The compiler driver will combine linker options so we
-- 	# cannot just pass the convience library names through
-- 	# without $wl, iff we do not link with $LD.
-- 	# Luckily, gcc supports the same syntax we need for Sun Studio.
-- 	# Supported since Solaris 2.6 (maybe 2.5.1?)
-- 	case $wlarc in
-- 	'')
-- 	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
-- 	*)
-- 	  whole_archive_flag_spec='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
-- 	esac ;;
--      esac
--      link_all_deplibs=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.
--	archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
--      else
--	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
--      fi
--      hardcode_libdir_flag_spec='-L$libdir'
--      hardcode_direct=yes
--      hardcode_minus_L=yes
--      hardcode_shlibpath_var=no
--      ;;
- 
--    sysv4)
--      case $host_vendor in
--	sni)
--	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--	  hardcode_direct=yes # is this really true???
--	;;
--	siemens)
--	  ## LD is ld it makes a PLAMLIB
--	  ## CC just makes a GrossModule.
--	  archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
--	  reload_cmds='$CC -r -o $output$reload_objs'
--	  hardcode_direct=no
--        ;;
--	motorola)
--	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--	  hardcode_direct=no #Motorola manual says yes, but my tests say they lie
--	;;
--      esac
--      runpath_var='LD_RUN_PATH'
--      hardcode_shlibpath_var=no
-+  # Check whether --enable-fast-install was given.
-+if test "${enable_fast_install+set}" = set; then :
-+  enableval=$enable_fast_install; 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
-+else
-+  enable_fast_install=yes
-+fi
- 
--    sysv4.3*)
--      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--      hardcode_shlibpath_var=no
--      export_dynamic_flag_spec='-Bexport'
--      ;;
- 
--    sysv4*MP*)
--      if test -d /usr/nec; then
--	archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--	hardcode_shlibpath_var=no
--	runpath_var=LD_RUN_PATH
--	hardcode_runpath_var=yes
--	ld_shlibs=yes
--      fi
--      ;;
- 
--    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
--      no_undefined_flag='${wl}-z,text'
--      archive_cmds_need_lc=no
--      hardcode_shlibpath_var=no
--      runpath_var='LD_RUN_PATH'
- 
--      if test "$GCC" = yes; then
--	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
--	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
--      else
--	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
--	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
--      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.
--      no_undefined_flag='${wl}-z,text'
--      allow_undefined_flag='${wl}-z,nodefs'
--      archive_cmds_need_lc=no
--      hardcode_shlibpath_var=no
--      hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
--      hardcode_libdir_separator=':'
--      link_all_deplibs=yes
--      export_dynamic_flag_spec='${wl}-Bexport'
--      runpath_var='LD_RUN_PATH'
- 
--      if test "$GCC" = yes; then
--	archive_cmds='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
--	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
--      else
--	archive_cmds='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
--	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
--      fi
--      ;;
- 
--    uts4*)
--      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--      hardcode_libdir_flag_spec='-L$libdir'
--      hardcode_shlibpath_var=no
--      ;;
- 
--    *)
--      ld_shlibs=no
--      ;;
--    esac
--  fi
- 
--echo "$as_me:$LINENO: result: $ld_shlibs" >&5
--echo "${ECHO_T}$ld_shlibs" >&6
--test "$ld_shlibs" = no && can_build_shared=no
- 
--#
--# Do we need to explicitly link libc?
--#
--case "x$archive_cmds_need_lc" in
--x|xyes)
--  # Assume -lc should be added
--  archive_cmds_need_lc=yes
- 
--  if test "$enable_shared" = yes && test "$GCC" = yes; then
--    case $archive_cmds 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.
--      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
--echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
--      $rm conftest*
--      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+# This can be used to rebuild libtool when needed
-+LIBTOOL_DEPS="$ltmain"
- 
--      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } 2>conftest.err; then
--        soname=conftest
--        lib=conftest
--        libobjs=conftest.$ac_objext
--        deplibs=
--        wl=$lt_prog_compiler_wl
--	pic_flag=$lt_prog_compiler_pic
--        compiler_flags=-v
--        linker_flags=-v
--        verstring=
--        output_objdir=.
--        libname=conftest
--        lt_save_allow_undefined_flag=$allow_undefined_flag
--        allow_undefined_flag=
--        if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
--  (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }
--        then
--	  archive_cmds_need_lc=no
--        else
--	  archive_cmds_need_lc=yes
--        fi
--        allow_undefined_flag=$lt_save_allow_undefined_flag
--      else
--        cat conftest.err 1>&5
--      fi
--      $rm conftest*
--      echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
--echo "${ECHO_T}$archive_cmds_need_lc" >&6
--      ;;
--    esac
--  fi
--  ;;
--esac
-+# Always use our own libtool.
-+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
- 
--echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
--echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
--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"
--if test "$GCC" = yes; then
--  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 ';' >/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.
--    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
--else
--  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
--fi
--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'
--  ;;
- 
--aix4* | aix5*)
--  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*)
--  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'
--  ;;
- 
--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*)
--  version_type=windows
--  shrext_cmds=".dll"
--  need_version=no
--  need_lib_prefix=no
- 
--  case $GCC,$host_os in
--  yes,cygwin* | yes,mingw* | yes,pw32*)
--    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'
--    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*)
--      # 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}${versuffix}$shared_ext ${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`'
--  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
--  if test "$GCC" = yes; then
--    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
--  else
--    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
--  fi
--  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
--  ;;
- 
--kfreebsd*-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='GNU ld.so'
--  ;;
- 
--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
--    ;;
--  freebsd*) # from 4.6 on
--    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'
--  ;;
- 
--interix3*)
--  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*)
--  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
--  # 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
- 
--  # find out which ABI we are using
--  libsuff=
--  case "$host_cpu" in
--  x86_64*|s390x*|powerpc64*)
--    echo '#line 8270 "configure"' > conftest.$ac_ext
--    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
--      case `/usr/bin/file conftest.$ac_objext` in
--      *64-bit*)
--        libsuff=64
--        sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
--        ;;
--      esac
--    fi
--    rm -rf conftest*
--    ;;
--  esac
- 
--  # 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/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
--    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
--  fi
-+test -z "$LN_S" && LN_S="ln -s"
- 
--  # 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'
--  ;;
- 
--knetbsd*-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='GNU ld.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
--  ;;
+   # Passes both tests.
+ ac_preproc_ok=:
+ break
+ fi
 -
--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
--  ;;
+ rm -f conftest.err conftest.$ac_ext
  
--nto-qnx*)
--  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
--  ;;
- 
--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"
--  ;;
- 
--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
--      export_dynamic_flag_spec='${wl}-Blargedynsym'
--      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
--  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'
--    shlibpath_overrides_runpath=no
--  else
--    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
--    shlibpath_overrides_runpath=yes
--    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'
--  ;;
- 
--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
--echo "$as_me:$LINENO: result: $dynamic_linker" >&5
--echo "${ECHO_T}$dynamic_linker" >&6
--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"
-+if test -n "${ZSH_VERSION+set}" ; then
-+   setopt NO_GLOB_SUBST
+ done
+ # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+ rm -f conftest.err conftest.$ac_ext
+-if $ac_preproc_ok; then
++if $ac_preproc_ok; then :
+   break
  fi
  
--echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
--echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
--hardcode_action=
--if test -n "$hardcode_libdir_flag_spec" || \
--   test -n "$runpath_var" || \
--   test "X$hardcode_automatic" = "Xyes" ; then
--
--  # We can hardcode non-existant directories.
--  if test "$hardcode_direct" != 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_AC_TAGVAR(hardcode_shlibpath_var, )" != no &&
--     test "$hardcode_minus_L" != no; then
--    # Linking always hardcodes the temporary library directory.
--    hardcode_action=relink
--  else
--    # We can link without hardcoding, and we can hardcode nonexisting dirs.
--    hardcode_action=immediate
--  fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
-+$as_echo_n "checking for objdir... " >&6; }
-+if test "${lt_cv_objdir+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
+@@ -8117,7 +7784,7 @@
  else
--  # We cannot hardcode anything, or else we can only hardcode existing
--  # directories.
--  hardcode_action=unsupported
--fi
--echo "$as_me:$LINENO: result: $hardcode_action" >&5
--echo "${ECHO_T}$hardcode_action" >&6
--
--if test "$hardcode_action" = relink; 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
--
--striplib=
--old_striplib=
--echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
--echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
--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"
--  echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+  rm -f .libs 2>/dev/null
-+mkdir .libs 2>/dev/null
-+if test -d .libs; then
-+  lt_cv_objdir=.libs
- 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"
--         echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
--       else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+  # MS-DOS does not allow filenames that begin with a dot.
-+  lt_cv_objdir=_libs
+   ac_cv_prog_CXXCPP=$CXXCPP
  fi
--       ;;
--   *)
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--    ;;
--  esac
-+rmdir .libs 2>/dev/null
- fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
-+$as_echo "$lt_cv_objdir" >&6; }
-+objdir=$lt_cv_objdir
- 
--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*)
--    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
--    echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
--echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
--if test "${ac_cv_lib_dl_dlopen+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldl  $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
-+cat >>confdefs.h <<_ACEOF
-+#define LT_OBJDIR "$lt_cv_objdir/"
- _ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
--char dlopen ();
--int
--main ()
--{
--dlopen ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_lib_dl_dlopen=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_lib_dl_dlopen=no
--fi
--rm -f conftest.err conftest.$ac_objext \
--      conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
--echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
--if test $ac_cv_lib_dl_dlopen = yes; then
--  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
--else
--
--    lt_cv_dlopen="dyld"
--    lt_cv_dlopen_libs=
--    lt_cv_dlopen_self=yes
--
--fi
- 
--   ;;
--
--  *)
--    echo "$as_me:$LINENO: checking for shl_load" >&5
--echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
--if test "${ac_cv_func_shl_load+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
+-{ $as_echo "$as_me:$LINENO: result: $CXXCPP" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
+ $as_echo "$CXXCPP" >&6; }
+ ac_preproc_ok=false
+ for ac_cxx_preproc_warn_flag in '' yes
+@@ -8128,11 +7795,7 @@
+   # <limits.h> exists even on freestanding compilers.
+   # On the NeXT, cc -E runs the code through the compiler's parser,
+   # not just through cpp. "Syntax error" is here to catch this case.
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
--   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
--#define shl_load innocuous_shl_load
--
--/* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char shl_load (); below.
--    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
--    <limits.h> exists even on freestanding compilers.  */
- 
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
- 
--#undef shl_load
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
--#ifdef __cplusplus
--extern "C"
--{
--#endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
--char shl_load ();
--/* The GNU C library defines this for functions which it implements
--    to always fail with ENOSYS.  Some functions are actually named
--    something starting with __ and the normal name is an alias.  */
--#if defined (__stub_shl_load) || defined (__stub___shl_load)
--choke me
--#else
--char (*f) () = shl_load;
--#endif
--#ifdef __cplusplus
--}
--#endif
- 
--int
--main ()
--{
--return f != shl_load;
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #ifdef __STDC__
+ # include <limits.h>
+@@ -8141,81 +7804,37 @@
+ #endif
+ 		     Syntax error
+ _ACEOF
+-if { (ac_try="$ac_cpp conftest.$ac_ext"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_func_shl_load=yes
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null && {
+-	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+-	 test ! -s conftest.err
+-       }; then
+-  :
 -else
--  echo "$as_me: failed program was:" >&5
+-  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
++if ac_fn_cxx_try_cpp "$LINENO"; then :
  
--ac_cv_func_shl_load=no
--fi
--rm -f conftest.err conftest.$ac_objext \
--      conftest$ac_exeext conftest.$ac_ext
--fi
--echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
--echo "${ECHO_T}$ac_cv_func_shl_load" >&6
--if test $ac_cv_func_shl_load = yes; then
--  lt_cv_dlopen="shl_load"
--else
--  echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
--echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
--if test "${ac_cv_lib_dld_shl_load+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldld  $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
++else
+   # Broken: fails on valid input.
+ continue
+ fi
+-
+ rm -f conftest.err conftest.$ac_ext
  
--/* Override any gcc2 internal prototype to avoid an error.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
--char shl_load ();
--int
--main ()
--{
--shl_load ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_lib_dld_shl_load=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_lib_dld_shl_load=no
--fi
--rm -f conftest.err conftest.$ac_objext \
--      conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
--echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
--if test $ac_cv_lib_dld_shl_load = yes; then
--  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
--else
--  echo "$as_me:$LINENO: checking for dlopen" >&5
--echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
--if test "${ac_cv_func_dlopen+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
+   # OK, works on sane cases.  Now check whether nonexistent headers
+   # can be detected and how.
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
--   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
--#define dlopen innocuous_dlopen
- 
--/* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char dlopen (); below.
--    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
--    <limits.h> exists even on freestanding compilers.  */
- 
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
- 
--#undef dlopen
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
--#ifdef __cplusplus
--extern "C"
--{
--#endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
--char dlopen ();
--/* The GNU C library defines this for functions which it implements
--    to always fail with ENOSYS.  Some functions are actually named
--    something starting with __ and the normal name is an alias.  */
--#if defined (__stub_dlopen) || defined (__stub___dlopen)
--choke me
--#else
--char (*f) () = dlopen;
--#endif
--#ifdef __cplusplus
--}
--#endif
- 
--int
--main ()
--{
--return f != dlopen;
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include <ac_nonexistent.h>
+ _ACEOF
+-if { (ac_try="$ac_cpp conftest.$ac_ext"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_func_dlopen=yes
--else
--  echo "$as_me: failed program was:" >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null && {
+-	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+-	 test ! -s conftest.err
+-       }; then
++if ac_fn_cxx_try_cpp "$LINENO"; then :
+   # Broken: success on invalid input.
+ continue
+ else
+-  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
+-
+   # Passes both tests.
+ ac_preproc_ok=:
+ break
+ fi
+-
+ rm -f conftest.err conftest.$ac_ext
  
--ac_cv_func_dlopen=no
--fi
--rm -f conftest.err conftest.$ac_objext \
--      conftest$ac_exeext conftest.$ac_ext
--fi
--echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
--echo "${ECHO_T}$ac_cv_func_dlopen" >&6
--if test $ac_cv_func_dlopen = yes; then
--  lt_cv_dlopen="dlopen"
--else
--  echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
--echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
--if test "${ac_cv_lib_dl_dlopen+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldl  $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
+ done
+ # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+ rm -f conftest.err conftest.$ac_ext
+-if $ac_preproc_ok; then
+-  :
++if $ac_preproc_ok; then :
++
+ else
+-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ _lt_caught_CXX_error=yes; }
+ fi
+@@ -8245,7 +7864,7 @@
  
--/* Override any gcc2 internal prototype to avoid an error.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
--char dlopen ();
--int
--main ()
--{
--dlopen ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_lib_dl_dlopen=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+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
  
--ac_cv_lib_dl_dlopen=no
--fi
--rm -f conftest.err conftest.$ac_objext \
--      conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
--echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
--if test $ac_cv_lib_dl_dlopen = yes; then
--  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
--else
--  echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
--echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
--if test "${ac_cv_lib_svld_dlopen+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-lsvld  $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
-+# 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'
+             # Check whether --enable-shared was given.
+-if test "${enable_shared+set}" = set; then
++if test "${enable_shared+set}" = set; then :
+   enableval=$enable_shared; p=${PACKAGE-default}
+     case $enableval in
+     yes) enable_shared=yes ;;
+@@ -8276,7 +7895,7 @@
  
--/* Override any gcc2 internal prototype to avoid an error.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
--char dlopen ();
--int
--main ()
--{
--dlopen ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_lib_svld_dlopen=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+# Same as above, but do not quote variable references.
-+double_quote_subst='s/\(["`\\]\)/\\\1/g'
  
--ac_cv_lib_svld_dlopen=no
--fi
--rm -f conftest.err conftest.$ac_objext \
--      conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
--echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
--if test $ac_cv_lib_svld_dlopen = yes; then
--  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
--else
--  echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
--echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
--if test "${ac_cv_lib_dld_dld_link+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldld  $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
-+# Sed substitution to delay expansion of an escaped shell variable in a
-+# double_quote_subst'ed string.
-+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+   # Check whether --enable-static was given.
+-if test "${enable_static+set}" = set; then
++if test "${enable_static+set}" = set; then :
+   enableval=$enable_static; p=${PACKAGE-default}
+     case $enableval in
+     yes) enable_static=yes ;;
+@@ -8308,7 +7927,7 @@
  
--/* Override any gcc2 internal prototype to avoid an error.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
--char dld_link ();
--int
--main ()
--{
--dld_link ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_lib_dld_dld_link=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+# Sed substitution to delay expansion of an escaped single quote.
-+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
  
--ac_cv_lib_dld_dld_link=no
--fi
--rm -f conftest.err conftest.$ac_objext \
--      conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
--echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
--if test $ac_cv_lib_dld_dld_link = yes; then
--  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
--fi
-+# Sed substitution to avoid accidental globbing in evaled expressions
-+no_glob_subst='s/\*/\\\*/g'
+ # Check whether --with-pic was given.
+-if test "${with_pic+set}" = set; then
++if test "${with_pic+set}" = set; then :
+   withval=$with_pic; pic_mode="$withval"
+ else
+   pic_mode=default
+@@ -8324,7 +7943,7 @@
  
-+# Global variables:
-+ofile=libtool
-+can_build_shared=yes
  
--fi
-+# All known linkers require a `.a' archive for static linking (except MSVC,
-+# which needs '.lib').
-+libext=a
+   # Check whether --enable-fast-install was given.
+-if test "${enable_fast_install+set}" = set; then
++if test "${enable_fast_install+set}" = set; then :
+   enableval=$enable_fast_install; p=${PACKAGE-default}
+     case $enableval in
+     yes) enable_fast_install=yes ;;
+@@ -8405,9 +8024,9 @@
+    setopt NO_GLOB_SUBST
+ fi
  
-+with_gnu_ld="$lt_cv_prog_gnu_ld"
+-{ $as_echo "$as_me:$LINENO: checking for objdir" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
+ $as_echo_n "checking for objdir... " >&6; }
+-if test "${lt_cv_objdir+set}" = set; then
++if test "${lt_cv_objdir+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   rm -f .libs 2>/dev/null
+@@ -8420,7 +8039,7 @@
+ fi
+ rmdir .libs 2>/dev/null
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
+ $as_echo "$lt_cv_objdir" >&6; }
+ objdir=$lt_cv_objdir
  
--fi
-+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
- 
--fi
-+for cc_temp in $compiler""; 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-%%"`
- 
- 
--fi
-+# 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
+@@ -8513,9 +8132,9 @@
+ case $deplibs_check_method in
+ file_magic*)
+   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+-    { $as_echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
-+$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
+ $as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
+-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
 +if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  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
-+  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
-+  for ac_dir in $ac_dummy; do
-+    IFS="$lt_save_ifs"
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/${ac_tool_prefix}file; then
-+      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
-+      if test -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
+   $as_echo_n "(cached) " >&6
+ else
+   case $MAGIC_CMD in
+@@ -8566,10 +8185,10 @@
  
-+*** 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
- fi
- 
--    ;;
--  esac
-+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-+if test -n "$MAGIC_CMD"; then
+ MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ if test -n "$MAGIC_CMD"; then
+-  { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
-+$as_echo "$MAGIC_CMD" >&6; }
-+else
+ $as_echo "$MAGIC_CMD" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
+ $as_echo "no" >&6; }
+ fi
  
--  if test "x$lt_cv_dlopen" != xno; then
--    enable_dlopen=yes
--  else
--    enable_dlopen=no
--  fi
+@@ -8579,9 +8198,9 @@
  
--  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"
- 
--    echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
--echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
--if test "${lt_cv_dlopen_self+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  	  if test "$cross_compiling" = yes; then :
--  lt_cv_dlopen_self=cross
-+if test -z "$lt_cv_path_MAGIC_CMD"; then
-+  if test -n "$ac_tool_prefix"; then
+ if test -z "$lt_cv_path_MAGIC_CMD"; then
+   if test -n "$ac_tool_prefix"; then
+-    { $as_echo "$as_me:$LINENO: checking for file" >&5
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
-+$as_echo_n "checking for file... " >&6; }
+ $as_echo_n "checking for file... " >&6; }
+-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
 +if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
+   $as_echo_n "(cached) " >&6
  else
--  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
--  lt_status=$lt_dlunknown
--  cat > conftest.$ac_ext <<EOF
--#line 9167 "configure"
--#include "confdefs.h"
--
--#if HAVE_DLFCN_H
--#include <dlfcn.h>
--#endif
--
--#include <stdio.h>
-+  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
-+  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
-+  for ac_dir in $ac_dummy; do
-+    IFS="$lt_save_ifs"
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/file; then
-+      lt_cv_path_MAGIC_CMD="$ac_dir/file"
-+      if test -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
+   case $MAGIC_CMD in
+@@ -8632,10 +8251,10 @@
  
--#ifdef RTLD_GLOBAL
--#  define LT_DLGLOBAL		RTLD_GLOBAL
--#else
--#  ifdef DL_GLOBAL
--#    define LT_DLGLOBAL		DL_GLOBAL
--#  else
--#    define LT_DLGLOBAL		0
--#  endif
--#endif
-+*** 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
- 
--/* 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
-+_LT_EOF
-+	  fi ;;
-+	esac
-+      fi
-+      break
-+    fi
-+  done
-+  IFS="$lt_save_ifs"
-+  MAGIC_CMD="$lt_save_MAGIC_CMD"
-+  ;;
-+esac
-+fi
- 
--#ifdef __cplusplus
--extern "C" void exit (int);
--#endif
-+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-+if test -n "$MAGIC_CMD"; then
+ MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ if test -n "$MAGIC_CMD"; then
+-  { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
-+$as_echo "$MAGIC_CMD" >&6; }
-+else
+ $as_echo "$MAGIC_CMD" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
- 
--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 ());
--
--    exit (status);
--}
--EOF
--  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
--    (./conftest; exit; ) >&5 2>/dev/null
--    lt_status=$?
--    case x$lt_status in
--      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
--      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
--      x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;;
--    esac
--  else :
--    # compilation failed
--    lt_cv_dlopen_self=no
-+    MAGIC_CMD=:
-   fi
+ $as_echo "no" >&6; }
  fi
--rm -fr conftest*
  
-+  fi
-+  ;;
-+esac
+@@ -8716,9 +8335,9 @@
+ if test "$GCC" = yes; then
+   lt_prog_compiler_no_builtin_flag=' -fno-builtin'
  
--fi
--echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
--echo "${ECHO_T}$lt_cv_dlopen_self" >&6
-+# Use C for the default configuration in the libtool script
- 
--    if test "x$lt_cv_dlopen_self" = xyes; then
--      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
--      echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
--echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
--if test "${lt_cv_dlopen_self_static+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  	  if test "$cross_compiling" = yes; then :
--  lt_cv_dlopen_self_static=cross
--else
--  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
--  lt_status=$lt_dlunknown
--  cat > conftest.$ac_ext <<EOF
--#line 9267 "configure"
--#include "confdefs.h"
-+lt_save_CC="$CC"
-+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
- 
--#if HAVE_DLFCN_H
--#include <dlfcn.h>
--#endif
- 
--#include <stdio.h>
-+# Source file extension for C test sources.
-+ac_ext=c
- 
--#ifdef RTLD_GLOBAL
--#  define LT_DLGLOBAL		RTLD_GLOBAL
--#else
--#  ifdef DL_GLOBAL
--#    define LT_DLGLOBAL		DL_GLOBAL
--#  else
--#    define LT_DLGLOBAL		0
--#  endif
--#endif
-+# Object file extension for compiled C test sources.
-+objext=o
-+objext=$objext
- 
--/* 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
-+# Code to be used in simple compile tests
-+lt_simple_compile_test_code="int some_variable = 0;"
- 
--#ifdef __cplusplus
--extern "C" void exit (int);
--#endif
-+# Code to be used in simple link tests
-+lt_simple_link_test_code='int main(){return(0);}'
- 
--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 ());
--
--    exit (status);
--}
--EOF
--  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
--    (./conftest; exit; ) >&5 2>/dev/null
--    lt_status=$?
--    case x$lt_status in
--      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
--      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
--      x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;;
--    esac
--  else :
--    # compilation failed
--    lt_cv_dlopen_self_static=no
--  fi
--fi
--rm -fr conftest*
--
--
--fi
--echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
--echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
--    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
- 
- 
--# Report which library types will actually be built
--echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
--echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
--echo "$as_me:$LINENO: result: $can_build_shared" >&5
--echo "${ECHO_T}$can_build_shared" >&6
--
--echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
--echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
--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
--  ;;
- 
--aix4* | aix5*)
--  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
--    test "$enable_shared" = yes && enable_static=no
--  fi
--    ;;
--esac
--echo "$as_me:$LINENO: result: $enable_shared" >&5
--echo "${ECHO_T}$enable_shared" >&6
-+# If no C compiler was specified, use CC.
-+LTCC=${LTCC-"$CC"}
- 
--echo "$as_me:$LINENO: checking whether to build static libraries" >&5
--echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6
--# Make sure either enable_shared or enable_static is yes.
--test "$enable_shared" = yes || enable_static=yes
--echo "$as_me:$LINENO: result: $enable_static" >&5
--echo "${ECHO_T}$enable_static" >&6
--
--# The else clause should only fire when bootstrapping the
--# libtool distribution, otherwise you forgot to ship ltmain.sh
--# with your package, and you will get complaints that there are
--# no rules to generate ltmain.sh.
--if test -f "$ltmain"; then
--  # 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
--  # Now quote all the things that may contain metacharacters while being
--  # careful not to overquote the AC_SUBSTed values.  We take copies of the
--  # variables and quote the copies for generation of the libtool script.
--  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
--    SED SHELL STRIP \
--    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
--    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
--    deplibs_check_method reload_flag reload_cmds need_locks \
--    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
--    lt_cv_sys_global_symbol_to_c_name_address \
--    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
--    old_postinstall_cmds old_postuninstall_cmds \
--    compiler \
--    CC \
--    LD \
--    lt_prog_compiler_wl \
--    lt_prog_compiler_pic \
--    lt_prog_compiler_static \
--    lt_prog_compiler_no_builtin_flag \
--    export_dynamic_flag_spec \
--    thread_safe_flag_spec \
--    whole_archive_flag_spec \
--    enable_shared_with_static_runtimes \
--    old_archive_cmds \
--    old_archive_from_new_cmds \
--    predep_objects \
--    postdep_objects \
--    predeps \
--    postdeps \
--    compiler_lib_search_path \
--    archive_cmds \
--    archive_expsym_cmds \
--    postinstall_cmds \
--    postuninstall_cmds \
--    old_archive_from_expsyms_cmds \
--    allow_undefined_flag \
--    no_undefined_flag \
--    export_symbols_cmds \
--    hardcode_libdir_flag_spec \
--    hardcode_libdir_flag_spec_ld \
--    hardcode_libdir_separator \
--    hardcode_automatic \
--    module_cmds \
--    module_expsym_cmds \
--    lt_cv_prog_compiler_c_o \
--    exclude_expsyms \
--    include_expsyms; do
--
--    case $var in
--    old_archive_cmds | \
--    old_archive_from_new_cmds | \
--    archive_cmds | \
--    archive_expsym_cmds | \
--    module_cmds | \
--    module_expsym_cmds | \
--    old_archive_from_expsyms_cmds | \
--    export_symbols_cmds | \
--    extract_expsyms_cmds | reload_cmds | finish_cmds | \
--    postinstall_cmds | postuninstall_cmds | \
--    old_postinstall_cmds | old_postuninstall_cmds | \
--    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
--      # Double-quote double-evaled strings.
--      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
--      ;;
--    *)
--      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
--      ;;
--    esac
--  done
-+# If no C compiler flags were specified, use CFLAGS.
-+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
- 
--  case $lt_echo in
--  *'\$0 --fallback-echo"')
--    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
--    ;;
--  esac
-+# Allow CC to be a program name with arguments.
-+compiler=$CC
- 
--cfgfile="${ofile}T"
--  trap "$rm \"$cfgfile\"; exit 1" 1 2 15
--  $rm -f "$cfgfile"
--  { echo "$as_me:$LINENO: creating $ofile" >&5
--echo "$as_me: creating $ofile" >&6;}
-+# 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
- 
--  cat <<__EOF__ >> "$cfgfile"
--#! $SHELL
-+# save warnings/boilerplate of simple test code
-+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*
- 
--# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
--# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
--# NOTE: Changes made to this file will be lost: look at ltmain.sh.
--#
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
--# Free Software Foundation, Inc.
--#
--# This file is part of GNU Libtool:
--# Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
--#
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2 of the License, or
--# (at your option) any later version.
--#
--# This program is distributed in the hope that it will be useful, but
--# WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
--# General Public License for more details.
--#
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
--#
--# As a special exception to the GNU General Public License, if you
--# distribute this file as part of a program that contains a
--# configuration script generated by Autoconf, you may include it under
--# the same distribution terms that you use for the rest of that program.
-+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*
- 
--# A sed program that does not truncate output.
--SED=$lt_SED
- 
--# Sed that helps us avoid accidentally triggering echo(1) options like -n.
--Xsed="$SED -e 1s/^X//"
-+## 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
- 
--# 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
-+lt_prog_compiler_no_builtin_flag=
- 
--# The names of the tagged configurations supported by this script.
--available_tags=
-+if test "$GCC" = yes; then
-+  lt_prog_compiler_no_builtin_flag=' -fno-builtin'
- 
--# ### BEGIN LIBTOOL CONFIG
+-  { $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
 +  { $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; }
+ $as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
+-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
 +if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  lt_cv_prog_compiler_rtti_exceptions=no
-+   ac_outfile=conftest.$ac_objext
-+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-+   lt_compiler_flag="-fno-rtti -fno-exceptions"
-+   # 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:'`
+   $as_echo_n "(cached) " >&6
+ else
+   lt_cv_prog_compiler_rtti_exceptions=no
+@@ -8734,11 +8353,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:8737: $lt_compile\"" >&5)
 +   (eval echo "\"\$as_me:8356: $lt_compile\"" >&5)
-+   (eval "$lt_compile" 2>conftest.err)
-+   ac_status=$?
-+   cat conftest.err >&5
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:8741: \$? = $ac_status" >&5
 +   echo "$as_me:8360: \$? = $ac_status" >&5
-+   if (exit $ac_status) && test -s "$ac_outfile"; then
-+     # The compiler can only warn and ignore the option if not recognized
-+     # So say no if there are warnings other than the usual output.
-+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-+       lt_cv_prog_compiler_rtti_exceptions=yes
-+     fi
-+   fi
-+   $RM conftest*
+    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.
+@@ -8751,7 +8370,7 @@
+    $RM conftest*
  
--# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-+fi
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-+$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
+ $as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
  
--# Shell to use when invoking shell scripts.
--SHELL=$lt_SHELL
-+if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
-+    lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
-+else
-+    :
-+fi
+ if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
+@@ -8771,7 +8390,7 @@
+ lt_prog_compiler_pic=
+ lt_prog_compiler_static=
  
--# Whether or not to build shared libraries.
--build_libtool_libs=$enable_shared
-+fi
- 
--# Whether or not to build static libraries.
--build_old_libs=$enable_static
- 
--# Whether or not to add -lc for building shared libraries.
--build_libtool_need_lc=$archive_cmds_need_lc
- 
--# Whether or not to disallow shared libs when runtime libs are static
--allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
- 
--# Whether or not to optimize for fast installation.
--fast_install=$enable_fast_install
- 
--# The host system.
--host_alias=$host_alias
--host=$host
--host_os=$host_os
- 
--# The build system.
--build_alias=$build_alias
--build=$build
--build_os=$build_os
-+  lt_prog_compiler_wl=
-+lt_prog_compiler_pic=
-+lt_prog_compiler_static=
- 
--# An echo program that does not interpret backslashes.
--echo=$lt_echo
+-{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
-+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  
--# The archiver.
--AR=$lt_AR
--AR_FLAGS=$lt_AR_FLAGS
-+  if test "$GCC" = yes; then
-+    lt_prog_compiler_wl='-Wl,'
-+    lt_prog_compiler_static='-static'
+   if test "$GCC" = yes; then
+@@ -8903,7 +8522,7 @@
+       lt_prog_compiler_static='-non_shared'
+       ;;
  
--# A C compiler.
--LTCC=$lt_LTCC
-+    case $host_os in
-+      aix*)
-+      # All AIX code is PIC.
-+      if test "$host_cpu" = ia64; then
-+	# AIX 5 now supports IA64 processor
-+	lt_prog_compiler_static='-Bstatic'
-+      fi
-+      ;;
- 
--# LTCC compiler flags.
--LTCFLAGS=$lt_LTCFLAGS
-+    amigaos*)
-+      case $host_cpu in
-+      powerpc)
-+            # see comment about AmigaOS4 .so support
-+            lt_prog_compiler_pic='-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_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
-+        ;;
-+      esac
-+      ;;
- 
--# A language-specific compiler.
--CC=$lt_compiler
-+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-+      # PIC is the default for these OSes.
-+      ;;
- 
--# Is the compiler the GNU C compiler?
--with_gcc=$GCC
-+    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
-+      lt_prog_compiler_pic='-DDLL_EXPORT'
-+      ;;
- 
--gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
--gcc_ver=\`gcc -dumpversion\`
-+    darwin* | rhapsody*)
-+      # PIC is the default on this platform
-+      # Common symbols not allowed in MH_DYLIB files
-+      lt_prog_compiler_pic='-fno-common'
-+      ;;
- 
--# An ERE matcher.
--EGREP=$lt_EGREP
-+    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_prog_compiler_pic='-fPIC'
-+	;;
-+      esac
-+      ;;
- 
--# The linker used to build libraries.
--LD=$lt_LD
-+    interix[3-9]*)
-+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-+      # Instead, we relocate shared libraries at runtime.
-+      ;;
- 
--# Whether we need hard or soft links.
--LN_S=$lt_LN_S
-+    msdosdjgpp*)
-+      # Just because we use GCC doesn't mean we suddenly get shared libraries
-+      # on systems that don't support them.
-+      lt_prog_compiler_can_build_shared=no
-+      enable_shared=no
-+      ;;
- 
--# A BSD-compatible nm program.
--NM=$lt_NM
-+    *nto* | *qnx*)
-+      # QNX uses GNU C++, but need to define -shared option too, otherwise
-+      # it will coredump.
-+      lt_prog_compiler_pic='-fPIC -shared'
-+      ;;
- 
--# A symbol stripping program
--STRIP=$lt_STRIP
-+    sysv4*MP*)
-+      if test -d /usr/nec; then
-+	lt_prog_compiler_pic=-Kconform_pic
-+      fi
-+      ;;
- 
--# Used to examine libraries when file_magic_cmd begins "file"
--MAGIC_CMD=$MAGIC_CMD
-+    *)
-+      lt_prog_compiler_pic='-fPIC'
-+      ;;
-+    esac
-+  else
-+    # PORTME Check for flag to pass linker flags through the system compiler.
-+    case $host_os in
-+    aix*)
-+      lt_prog_compiler_wl='-Wl,'
-+      if test "$host_cpu" = ia64; then
-+	# AIX 5 now supports IA64 processor
-+	lt_prog_compiler_static='-Bstatic'
-+      else
-+	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
-+      fi
-+      ;;
- 
--# Used on cygwin: DLL creation program.
--DLLTOOL="$DLLTOOL"
-+    mingw* | cygwin* | pw32* | os2* | cegcc*)
-+      # This hack is so that the source file can tell whether it is being
-+      # built for inclusion in a dll (and should export symbols for example).
-+      lt_prog_compiler_pic='-DDLL_EXPORT'
-+      ;;
- 
--# Used on cygwin: object dumper.
--OBJDUMP="$OBJDUMP"
-+    hpux9* | hpux10* | hpux11*)
-+      lt_prog_compiler_wl='-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_prog_compiler_pic='+Z'
-+	;;
-+      esac
-+      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-+      lt_prog_compiler_static='${wl}-a ${wl}archive'
-+      ;;
- 
--# Used on cygwin: assembler.
--AS="$AS"
-+    irix5* | irix6* | nonstopux*)
-+      lt_prog_compiler_wl='-Wl,'
-+      # PIC (with -KPIC) is the default.
-+      lt_prog_compiler_static='-non_shared'
-+      ;;
- 
--# The name of the directory that contains temporary libtool files.
--objdir=$objdir
+-    linux* | k*bsd*-gnu)
 +    linux* | k*bsd*-gnu | kopensolaris*-gnu)
-+      case $cc_basename in
-+      # old Intel for x86_64 which still supported -KPIC.
-+      ecc*)
-+	lt_prog_compiler_wl='-Wl,'
-+	lt_prog_compiler_pic='-KPIC'
-+	lt_prog_compiler_static='-static'
-+        ;;
-+      # icc used to be incompatible with GCC.
-+      # ICC 10 doesn't accept -KPIC any more.
-+      icc* | ifort*)
-+	lt_prog_compiler_wl='-Wl,'
-+	lt_prog_compiler_pic='-fPIC'
-+	lt_prog_compiler_static='-static'
-+        ;;
-+      # Lahey Fortran 8.1.
-+      lf95*)
-+	lt_prog_compiler_wl='-Wl,'
-+	lt_prog_compiler_pic='--shared'
-+	lt_prog_compiler_static='--static'
-+	;;
-+      pgcc* | pgf77* | pgf90* | pgf95*)
-+        # Portland Group compilers (*not* the Pentium gcc compiler,
-+	# which looks to be a dead project)
-+	lt_prog_compiler_wl='-Wl,'
-+	lt_prog_compiler_pic='-fpic'
-+	lt_prog_compiler_static='-Bstatic'
-+        ;;
-+      ccc*)
-+        lt_prog_compiler_wl='-Wl,'
-+        # All Alpha code is PIC.
-+        lt_prog_compiler_static='-non_shared'
-+        ;;
-+      xl*)
-+	# IBM XL C 8.0/Fortran 10.1 on PPC
-+	lt_prog_compiler_wl='-Wl,'
-+	lt_prog_compiler_pic='-qpic'
-+	lt_prog_compiler_static='-qstaticlink'
-+	;;
-+      *)
-+	case `$CC -V 2>&1 | sed 5q` in
-+	*Sun\ C*)
-+	  # Sun C 5.9
-+	  lt_prog_compiler_pic='-KPIC'
-+	  lt_prog_compiler_static='-Bstatic'
-+	  lt_prog_compiler_wl='-Wl,'
-+	  ;;
-+	*Sun\ F*)
-+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
-+	  lt_prog_compiler_pic='-KPIC'
-+	  lt_prog_compiler_static='-Bstatic'
-+	  lt_prog_compiler_wl=''
-+	  ;;
-+	esac
-+	;;
-+      esac
-+      ;;
- 
--# How to create reloadable object files.
--reload_flag=$lt_reload_flag
--reload_cmds=$lt_reload_cmds
-+    newsos6)
-+      lt_prog_compiler_pic='-KPIC'
-+      lt_prog_compiler_static='-Bstatic'
-+      ;;
- 
--# How to pass a linker flag through the compiler.
--wl=$lt_lt_prog_compiler_wl
-+    *nto* | *qnx*)
-+      # QNX uses GNU C++, but need to define -shared option too, otherwise
-+      # it will coredump.
-+      lt_prog_compiler_pic='-fPIC -shared'
-+      ;;
- 
--# Object file suffix (normally "o").
--objext="$ac_objext"
-+    osf3* | osf4* | osf5*)
-+      lt_prog_compiler_wl='-Wl,'
-+      # All OSF/1 code is PIC.
-+      lt_prog_compiler_static='-non_shared'
-+      ;;
- 
--# Old archive suffix (normally "a").
--libext="$libext"
-+    rdos*)
-+      lt_prog_compiler_static='-non_shared'
-+      ;;
- 
--# Shared library suffix (normally ".so").
--shrext_cmds='$shrext_cmds'
-+    solaris*)
-+      lt_prog_compiler_pic='-KPIC'
-+      lt_prog_compiler_static='-Bstatic'
-+      case $cc_basename in
-+      f77* | f90* | f95*)
-+	lt_prog_compiler_wl='-Qoption ld ';;
-+      *)
-+	lt_prog_compiler_wl='-Wl,';;
-+      esac
-+      ;;
- 
--# Executable file suffix (normally "").
--exeext="$exeext"
-+    sunos4*)
-+      lt_prog_compiler_wl='-Qoption ld '
-+      lt_prog_compiler_pic='-PIC'
-+      lt_prog_compiler_static='-Bstatic'
-+      ;;
- 
--# Additional compiler flags for building library objects.
--pic_flag=$lt_lt_prog_compiler_pic
--pic_mode=$pic_mode
-+    sysv4 | sysv4.2uw2* | sysv4.3*)
-+      lt_prog_compiler_wl='-Wl,'
-+      lt_prog_compiler_pic='-KPIC'
-+      lt_prog_compiler_static='-Bstatic'
-+      ;;
- 
--# What is the maximum length of a command?
--max_cmd_len=$lt_cv_sys_max_cmd_len
-+    sysv4*MP*)
-+      if test -d /usr/nec ;then
-+	lt_prog_compiler_pic='-Kconform_pic'
-+	lt_prog_compiler_static='-Bstatic'
-+      fi
-+      ;;
- 
--# Does compiler simultaneously support -c and -o options?
--compiler_c_o=$lt_lt_cv_prog_compiler_c_o
-+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-+      lt_prog_compiler_wl='-Wl,'
-+      lt_prog_compiler_pic='-KPIC'
-+      lt_prog_compiler_static='-Bstatic'
-+      ;;
- 
--# Must we lock files when doing compilation?
--need_locks=$lt_need_locks
-+    unicos*)
-+      lt_prog_compiler_wl='-Wl,'
-+      lt_prog_compiler_can_build_shared=no
-+      ;;
- 
--# Do we need the lib prefix for modules?
--need_lib_prefix=$need_lib_prefix
-+    uts4*)
-+      lt_prog_compiler_pic='-pic'
-+      lt_prog_compiler_static='-Bstatic'
-+      ;;
- 
--# Do we need a version for libraries?
--need_version=$need_version
-+    *)
-+      lt_prog_compiler_can_build_shared=no
-+      ;;
-+    esac
-+  fi
- 
--# Whether dlopen is supported.
--dlopen_support=$enable_dlopen
-+case $host_os in
-+  # For platforms which do not support PIC, -DPIC is meaningless:
-+  *djgpp*)
-+    lt_prog_compiler_pic=
-+    ;;
-+  *)
-+    lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
-+    ;;
-+esac
+       case $cc_basename in
+       # old Intel for x86_64 which still supported -KPIC.
+       ecc*)
+@@ -9043,7 +8662,7 @@
+     lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
-+$as_echo "$lt_prog_compiler_pic" >&6; }
+ $as_echo "$lt_prog_compiler_pic" >&6; }
  
--# Whether dlopen of programs is supported.
--dlopen_self=$enable_dlopen_self
  
--# Whether dlopen of statically linked programs is supported.
--dlopen_self_static=$enable_dlopen_self_static
- 
--# Compiler flag to prevent dynamic linking.
--link_static_flag=$lt_lt_prog_compiler_static
- 
--# Compiler flag to turn off builtin functions.
--no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
- 
--# Compiler flag to allow reflexive dlopens.
--export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
- 
--# Compiler flag to generate shared objects directly from archives.
--whole_archive_flag_spec=$lt_whole_archive_flag_spec
-+#
-+# Check to make sure the PIC flag actually works.
-+#
-+if test -n "$lt_prog_compiler_pic"; then
+@@ -9055,9 +8674,9 @@
+ # Check to make sure the PIC flag actually works.
+ #
+ if test -n "$lt_prog_compiler_pic"; then
+-  { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
-+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
+ $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
+-if test "${lt_cv_prog_compiler_pic_works+set}" = set; then
 +if test "${lt_cv_prog_compiler_pic_works+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  lt_cv_prog_compiler_pic_works=no
-+   ac_outfile=conftest.$ac_objext
-+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-+   lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
-+   # 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:'`
+   $as_echo_n "(cached) " >&6
+ else
+   lt_cv_prog_compiler_pic_works=no
+@@ -9073,11 +8692,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:9076: $lt_compile\"" >&5)
 +   (eval echo "\"\$as_me:8695: $lt_compile\"" >&5)
-+   (eval "$lt_compile" 2>conftest.err)
-+   ac_status=$?
-+   cat conftest.err >&5
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:9080: \$? = $ac_status" >&5
 +   echo "$as_me:8699: \$? = $ac_status" >&5
-+   if (exit $ac_status) && test -s "$ac_outfile"; then
-+     # The compiler can only warn and ignore the option if not recognized
-+     # So say no if there are warnings other than the usual output.
-+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-+       lt_cv_prog_compiler_pic_works=yes
-+     fi
-+   fi
-+   $RM conftest*
+    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.
+@@ -9090,7 +8709,7 @@
+    $RM conftest*
  
--# Compiler flag to generate thread-safe objects.
--thread_safe_flag_spec=$lt_thread_safe_flag_spec
-+fi
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
-+$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
+ $as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
  
--# Library versioning type.
--version_type=$version_type
-+if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
-+    case $lt_prog_compiler_pic in
-+     "" | " "*) ;;
-+     *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
-+     esac
-+else
-+    lt_prog_compiler_pic=
-+     lt_prog_compiler_can_build_shared=no
-+fi
- 
--# Format of library name prefix.
--libname_spec=$lt_libname_spec
-+fi
- 
--# 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.
--library_names_spec=$lt_library_names_spec
- 
--# The coded name of the library, if different from the real name.
--soname_spec=$lt_soname_spec
- 
--# Commands used to build and install an old-style archive.
--RANLIB=$lt_RANLIB
--old_archive_cmds=$lt_old_archive_cmds
--old_postinstall_cmds=$lt_old_postinstall_cmds
--old_postuninstall_cmds=$lt_old_postuninstall_cmds
- 
--# Create an old-style archive from a shared archive.
--old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
- 
--# Create a temporary old-style archive to link instead of a shared archive.
--old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
- 
--# Commands used to build and install a shared archive.
--archive_cmds=$lt_archive_cmds
--archive_expsym_cmds=$lt_archive_expsym_cmds
--postinstall_cmds=$lt_postinstall_cmds
--postuninstall_cmds=$lt_postuninstall_cmds
-+#
-+# Check to make sure the static flag actually works.
-+#
-+wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
+ if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
+@@ -9114,9 +8733,9 @@
+ # Check to make sure the static flag actually works.
+ #
+ wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
+-{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+ $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+-if test "${lt_cv_prog_compiler_static_works+set}" = set; then
 +if test "${lt_cv_prog_compiler_static_works+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  lt_cv_prog_compiler_static_works=no
-+   save_LDFLAGS="$LDFLAGS"
-+   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-+     # The linker can only warn and ignore the option if not recognized
-+     # So say no if there are warnings
-+     if test -s conftest.err; then
-+       # Append any errors to the config.log.
-+       cat conftest.err 1>&5
-+       $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
-+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-+       if diff conftest.exp conftest.er2 >/dev/null; then
-+         lt_cv_prog_compiler_static_works=yes
-+       fi
-+     else
-+       lt_cv_prog_compiler_static_works=yes
-+     fi
-+   fi
-+   $RM -r conftest*
-+   LDFLAGS="$save_LDFLAGS"
+   $as_echo_n "(cached) " >&6
+ else
+   lt_cv_prog_compiler_static_works=no
+@@ -9142,7 +8761,7 @@
+    LDFLAGS="$save_LDFLAGS"
  
--# Commands used to build a loadable module (assumed same as above if empty)
--module_cmds=$lt_module_cmds
--module_expsym_cmds=$lt_module_expsym_cmds
-+fi
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
-+$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
+ $as_echo "$lt_cv_prog_compiler_static_works" >&6; }
  
--# Commands to strip libraries.
--old_striplib=$lt_old_striplib
--striplib=$lt_striplib
-+if test x"$lt_cv_prog_compiler_static_works" = xyes; then
-+    :
-+else
-+    lt_prog_compiler_static=
-+fi
+ if test x"$lt_cv_prog_compiler_static_works" = xyes; then
+@@ -9157,9 +8776,9 @@
  
--# Dependencies to place before the objects being linked to create a
--# shared library.
--predep_objects=\`echo $lt_predep_objects | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
--
--# Dependencies to place after the objects being linked to create a
--# shared library.
--postdep_objects=\`echo $lt_postdep_objects | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
  
--# Dependencies to place before the objects being linked to create a
--# shared library.
--predeps=$lt_predeps
  
--# Dependencies to place after the objects being linked to create a
--# shared library.
--postdeps=$lt_postdeps
- 
--# The library search path used internally by the compiler when linking
--# a shared library.
--compiler_lib_search_path=\`echo $lt_compiler_lib_search_path | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
- 
--# Method to check whether dependent libraries are shared objects.
--deplibs_check_method=$lt_deplibs_check_method
- 
--# Command to use when deplibs_check_method == file_magic.
--file_magic_cmd=$lt_file_magic_cmd
- 
--# Flag that allows shared libraries with undefined symbols to be built.
--allow_undefined_flag=$lt_allow_undefined_flag
+-  { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
-+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+ $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+-if test "${lt_cv_prog_compiler_c_o+set}" = set; then
 +if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  lt_cv_prog_compiler_c_o=no
-+   $RM -r conftest 2>/dev/null
-+   mkdir conftest
-+   cd conftest
-+   mkdir out
-+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- 
--# Flag that forces no undefined symbols.
--no_undefined_flag=$lt_no_undefined_flag
-+   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:'`
+   $as_echo_n "(cached) " >&6
+ else
+   lt_cv_prog_compiler_c_o=no
+@@ -9178,11 +8797,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:9181: $lt_compile\"" >&5)
 +   (eval echo "\"\$as_me:8800: $lt_compile\"" >&5)
-+   (eval "$lt_compile" 2>out/conftest.err)
-+   ac_status=$?
-+   cat out/conftest.err >&5
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:9185: \$? = $ac_status" >&5
 +   echo "$as_me:8804: \$? = $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
-+     # 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_cv_prog_compiler_c_o=yes
-+     fi
-+   fi
-+   chmod u+w . 2>&5
-+   $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*
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -9204,7 +8823,7 @@
+    $RM conftest*
  
--# Commands used to finish a libtool library installation in a directory.
--finish_cmds=$lt_finish_cmds
--
--# Same as above, but a single script fragment to be evaled but not shown.
--finish_eval=$lt_finish_eval
--
--# Take the output of nm and produce a listing of raw symbols and C names.
--global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
--
--# Transform the output of nm in a proper C declaration
--global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
--
--# Transform the output of nm in a C name address pair
--global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
--
--# This is the shared library runtime path variable.
--runpath_var=$runpath_var
--
--# This is the shared library path variable.
--shlibpath_var=$shlibpath_var
--
--# Is shlibpath searched before the hard-coded library search path?
--shlibpath_overrides_runpath=$shlibpath_overrides_runpath
--
--# How to hardcode a shared library path into an executable.
--hardcode_action=$hardcode_action
--
--# Whether we should hardcode library paths into libraries.
--hardcode_into_libs=$hardcode_into_libs
--
--# Flag to hardcode \$libdir into a binary during linking.
--# This must work even if \$libdir does not exist.
--hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
-+fi
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
-+$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
+ $as_echo "$lt_cv_prog_compiler_c_o" >&6; }
  
--# If ld is used when linking, flag to hardcode \$libdir into
--# a binary during linking. This must work even if \$libdir does
--# not exist.
--hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
  
--# Whether we need a single -rpath flag with a separated argument.
--hardcode_libdir_separator=$lt_hardcode_libdir_separator
+@@ -9212,9 +8831,9 @@
  
--# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
--# resulting binary.
--hardcode_direct=$hardcode_direct
  
--# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
--# resulting binary.
--hardcode_minus_L=$hardcode_minus_L
  
--# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
--# the resulting binary.
--hardcode_shlibpath_var=$hardcode_shlibpath_var
- 
--# Set to yes if building a shared library automatically hardcodes DIR into the library
--# and all subsequent libraries and executables linked against it.
--hardcode_automatic=$hardcode_automatic
+-  { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
-+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+ $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+-if test "${lt_cv_prog_compiler_c_o+set}" = set; then
 +if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  lt_cv_prog_compiler_c_o=no
-+   $RM -r conftest 2>/dev/null
-+   mkdir conftest
-+   cd conftest
-+   mkdir out
-+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- 
--# Variables whose values should be saved in libtool wrapper scripts and
--# restored at relink time.
--variables_saved_for_relink="$variables_saved_for_relink"
-+   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:'`
+   $as_echo_n "(cached) " >&6
+ else
+   lt_cv_prog_compiler_c_o=no
+@@ -9233,11 +8852,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:9236: $lt_compile\"" >&5)
 +   (eval echo "\"\$as_me:8855: $lt_compile\"" >&5)
-+   (eval "$lt_compile" 2>out/conftest.err)
-+   ac_status=$?
-+   cat out/conftest.err >&5
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:9240: \$? = $ac_status" >&5
 +   echo "$as_me:8859: \$? = $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
-+     # 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_cv_prog_compiler_c_o=yes
-+     fi
-+   fi
-+   chmod u+w . 2>&5
-+   $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*
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -9259,7 +8878,7 @@
+    $RM conftest*
  
--# Whether libtool must link a program against all its dependency libraries.
--link_all_deplibs=$link_all_deplibs
-+fi
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
-+$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
+ $as_echo "$lt_cv_prog_compiler_c_o" >&6; }
  
--# Compile-time system search path for libraries
--sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
  
--# Run-time system search path for libraries
--sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
- 
--# Fix the shell variable \$srcfile for the compiler.
--fix_srcfile_path="$fix_srcfile_path"
- 
--# Set to yes if exported symbols are required.
--always_export_symbols=$always_export_symbols
-+hard_links="nottested"
-+if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
-+  # do not overwrite the value of need_locks provided by the user
+@@ -9268,7 +8887,7 @@
+ hard_links="nottested"
+ if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
+   # do not overwrite the value of need_locks provided by the user
+-  { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
-+$as_echo_n "checking if we can lock with hard links... " >&6; }
-+  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
+ $as_echo_n "checking if we can lock with hard links... " >&6; }
+   hard_links=yes
+   $RM conftest*
+@@ -9276,10 +8895,10 @@
+   touch conftest.a
+   ln conftest.a conftest.b 2>&5 || hard_links=no
+   ln conftest.a conftest.b 2>/dev/null && hard_links=no
+-  { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
-+$as_echo "$hard_links" >&6; }
-+  if test "$hard_links" = no; then
+ $as_echo "$hard_links" >&6; }
+   if test "$hard_links" = no; then
+-    { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-+$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-+    need_locks=warn
-+  fi
-+else
-+  need_locks=no
-+fi
+ $as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+     need_locks=warn
+   fi
+@@ -9292,7 +8911,7 @@
  
--# The commands to list exported symbols.
--export_symbols_cmds=$lt_export_symbols_cmds
  
--# The commands to extract the exported symbol list from a shared archive.
--extract_expsyms_cmds=$lt_extract_expsyms_cmds
  
--# Symbols that should not be listed in the preloaded symbols.
--exclude_expsyms=$lt_exclude_expsyms
- 
--# Symbols that must always be exported.
--include_expsyms=$lt_include_expsyms
- 
--# ### END LIBTOOL CONFIG
- 
--__EOF__
+-  { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
+ $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
  
-+  runpath_var=
-+  allow_undefined_flag=
-+  always_export_symbols=no
-+  archive_cmds=
-+  archive_expsym_cmds=
-+  compiler_needs_object=no
-+  enable_shared_with_static_runtimes=no
-+  export_dynamic_flag_spec=
-+  export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-+  hardcode_automatic=no
-+  hardcode_direct=no
-+  hardcode_direct_absolute=no
-+  hardcode_libdir_flag_spec=
-+  hardcode_libdir_flag_spec_ld=
-+  hardcode_libdir_separator=
-+  hardcode_minus_L=no
-+  hardcode_shlibpath_var=unsupported
-+  inherit_rpath=no
-+  link_all_deplibs=unknown
-+  module_cmds=
-+  module_expsym_cmds=
-+  old_archive_from_new_cmds=
-+  old_archive_from_expsyms_cmds=
-+  thread_safe_flag_spec=
-+  whole_archive_flag_spec=
-+  # include_expsyms should be a list of space-separated symbols to be *always*
-+  # included in the symbol list
-+  include_expsyms=
-+  # exclude_expsyms can be an extended regexp of symbols to exclude
-+  # it will be wrapped by ` (' and `)$', so one must not match beginning or
-+  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-+  # as well as any symbol that contains `d'.
-+  exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
-+  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-+  # platforms (ab)use it in PIC code, but their linkers get confused if
-+  # the symbol is explicitly referenced.  Since portable code cannot
-+  # rely on this symbol name, it's probably fine to never include it in
-+  # preloaded symbol tables.
-+  # Exclude shared library initialization/finalization symbols.
-+  extract_expsyms_cmds=
- 
-   case $host_os in
--  aix3*)
--    cat <<\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
--EOF
-+  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
-+    ;;
+   runpath_var=
+@@ -9352,6 +8971,9 @@
+   openbsd*)
+     with_gnu_ld=no
+     ;;
 +  linux* | k*bsd*-gnu)
 +    link_all_deplibs=no
-     ;;
++    ;;
    esac
  
--  # We use sed instead of cat because bash on DJGPP gets confused if
--  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
--  # text mode, it properly converts lines to CR/LF.  This bash problem
--  # is reportedly fixed, but why not run on old versions too?
--  sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1)
--
--  mv -f "$cfgfile" "$ofile" || \
--    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
--  chmod +x "$ofile"
--
--else
--  # If there is no Makefile yet, we rely on a make rule to execute
--  # `config.status --recheck' to rerun these tests and create the
--  # libtool script then.
--  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
--  if test -f "$ltmain_in"; then
--    test -f Makefile && make "$ltmain"
--  fi
--fi
--
--
--ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
--
--CC="$lt_save_CC"
--
-+  ld_shlibs=yes
-+  if test "$with_gnu_ld" = yes; then
-+    # If archive_cmds runs LD, not CC, wlarc should be empty
-+    wlarc='${wl}'
- 
--# Check whether --with-tags or --without-tags was given.
--if test "${with_tags+set}" = set; then
--  withval="$with_tags"
--  tagnames="$withval"
--fi;
--
--if test -f "$ltmain" && test -n "$tagnames"; then
--  if test ! -f "${ofile}"; then
--    { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5
--echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;}
--  fi
--
--  if test -z "$LTCC"; then
--    eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
--    if test -z "$LTCC"; then
--      { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5
--echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;}
-+    # Set some defaults for GNU ld with shared library support. These
-+    # are reset later if shared libraries are not supported. Putting them
-+    # here allows them to be overridden if necessary.
-+    runpath_var=LD_RUN_PATH
-+    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+    export_dynamic_flag_spec='${wl}--export-dynamic'
-+    # ancient GNU ld didn't support --whole-archive et. al.
-+    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
-+      whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-     else
--      { echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5
--echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
-+      whole_archive_flag_spec=
+   ld_shlibs=yes
+@@ -9373,6 +8995,7 @@
      fi
--  fi
--  if test -z "$LTCFLAGS"; then
--    eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
--  fi
--
--  # Extract list of available tagged configurations in $ofile.
--  # Note that this assumes the entire list is on one line.
--  available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
--
--  lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
--  for tagname in $tagnames; do
--    IFS="$lt_save_ifs"
--    # Check whether tagname contains only valid characters
--    case `$echo "X$tagname" | $Xsed -e 's:[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]::g'` in
--    "") ;;
--    *)  { { echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5
--echo "$as_me: error: invalid tag name: $tagname" >&2;}
--   { (exit 1); exit 1; }; }
--	;;
-+    supports_anon_versioning=no
-+    case `$LD -v 2>&1` in
+     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
+       *\ [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 ...
+@@ -9464,7 +9087,7 @@
+       archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+       ;;
  
--    if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
--    then
--      { { echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5
--echo "$as_me: error: tag name \"$tagname\" already exists" >&2;}
--   { (exit 1); exit 1; }; }
--    fi
-+    # 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
-+	ld_shlibs=no
-+	cat <<_LT_EOF 1>&2
- 
--    # Update the list of available tags.
--    if test -n "$tagname"; then
--      echo appending configuration tag \"$tagname\" to $ofile
--
--      case $tagname in
--      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_ext=cc
--ac_cpp='$CXXCPP $CPPFLAGS'
--ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+*** 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
-+            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+            archive_expsym_cmds=''
-+        ;;
-+      m68k)
-+            archive_cmds='$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)'
-+            hardcode_libdir_flag_spec='-L$libdir'
-+            hardcode_minus_L=yes
-+        ;;
-+      esac
-+      ;;
- 
-+    beos*)
-+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-+	allow_undefined_flag=unsupported
-+	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
-+	# support --undefined.  This deserves some investigation.  FIXME
-+	archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+      else
-+	ld_shlibs=no
-+      fi
-+      ;;
- 
--archive_cmds_need_lc_CXX=no
--allow_undefined_flag_CXX=
--always_export_symbols_CXX=no
--archive_expsym_cmds_CXX=
--export_dynamic_flag_spec_CXX=
--hardcode_direct_CXX=no
--hardcode_libdir_flag_spec_CXX=
--hardcode_libdir_flag_spec_ld_CXX=
--hardcode_libdir_separator_CXX=
--hardcode_minus_L_CXX=no
--hardcode_shlibpath_var_CXX=unsupported
--hardcode_automatic_CXX=no
--module_cmds_CXX=
--module_expsym_cmds_CXX=
--link_all_deplibs_CXX=unknown
--old_archive_cmds_CXX=$old_archive_cmds
--no_undefined_flag_CXX=
--whole_archive_flag_spec_CXX=
--enable_shared_with_static_runtimes_CXX=no
-+    cygwin* | mingw* | pw32* | cegcc*)
-+      # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
-+      # as there is no search path for DLLs.
-+      hardcode_libdir_flag_spec='-L$libdir'
-+      allow_undefined_flag=unsupported
-+      always_export_symbols=no
-+      enable_shared_with_static_runtimes=yes
-+      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
- 
--# Dependencies to place before and after the object being linked:
--predep_objects_CXX=
--postdep_objects_CXX=
--predeps_CXX=
--postdeps_CXX=
--compiler_lib_search_path_CXX=
--
--# Source file extension for C++ test sources.
--ac_ext=cpp
--
--# Object file extension for compiled C++ test sources.
--objext=o
--objext_CXX=$objext
--
--# Code to be used in simple compile tests
--lt_simple_compile_test_code="int some_variable = 0;\n"
--
--# Code to be used in simple link tests
--lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n'
--
--# ltmain only uses $CC for tagged configurations so make sure $CC is set.
--
--# If no C compiler was specified, use CC.
--LTCC=${LTCC-"$CC"}
--
--# If no C compiler flags were specified, use CFLAGS.
--LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-+      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-+        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-+	# If the export-symbols file already is a .def file (1st line
-+	# is EXPORTS), use it as is; otherwise, prepend...
-+	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-+	  cp $export_symbols $output_objdir/$soname.def;
-+	else
-+	  echo EXPORTS > $output_objdir/$soname.def;
-+	  cat $export_symbols >> $output_objdir/$soname.def;
-+	fi~
-+	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-+      else
-+	ld_shlibs=no
-+      fi
-+      ;;
- 
--# Allow CC to be a program name with arguments.
--compiler=$CC
-+    interix[3-9]*)
-+      hardcode_direct=no
-+      hardcode_shlibpath_var=no
-+      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-+      export_dynamic_flag_spec='${wl}-E'
-+      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-+      # Instead, shared libraries are loaded at an image base (0x10000000 by
-+      # default) and relocated if they conflict, which is a slow very memory
-+      # consuming and fragmenting process.  To avoid this, we pick a random,
-+      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-+      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-+      archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-+      archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-+      ;;
- 
+-    gnu* | linux* | tpf* | k*bsd*-gnu)
 +    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
-+      tmp_diet=no
-+      if test "$host_os" = linux-dietlibc; then
-+	case $cc_basename in
-+	  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
-+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-+	  tmp_addflag=' $pic_flag'
-+	  ;;
-+	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
-+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-+	  tmp_addflag=' $pic_flag -Mnomain' ;;
-+	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
-+	  tmp_addflag=' -i_dynamic' ;;
-+	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
-+	  whole_archive_flag_spec=
-+	  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
-+	  whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-+	  compiler_needs_object=yes
-+	  tmp_sharedflag='-G' ;;
-+	*Sun\ F*)			# Sun Fortran 8.3
-+	  tmp_sharedflag='-G' ;;
-+	esac
-+	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- 
--# save warnings/boilerplate of simple test code
--ac_outfile=conftest.$ac_objext
--printf "$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*
-+        if test "x$supports_anon_versioning" = xyes; then
-+          archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
-+	    cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-+	    echo "local: *; };" >> $output_objdir/$libname.ver~
-+	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+        fi
- 
--ac_outfile=conftest.$ac_objext
--printf "$lt_simple_link_test_code" >conftest.$ac_ext
--eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
--_lt_linker_boilerplate=`cat conftest.err`
--$rm conftest*
-+	case $cc_basename in
-+	xlf*)
-+	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
-+	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
-+	  hardcode_libdir_flag_spec=
-+	  hardcode_libdir_flag_spec_ld='-rpath $libdir'
-+	  archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
-+	  if test "x$supports_anon_versioning" = xyes; then
-+	    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
-+	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-+	      echo "local: *; };" >> $output_objdir/$libname.ver~
-+	      $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
-+	  fi
-+	  ;;
-+	esac
-+      else
-+        ld_shlibs=no
-+      fi
-+      ;;
- 
-+    netbsd* | netbsdelf*-gnu)
-+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-+	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-+	wlarc=
-+      else
-+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+      fi
-+      ;;
- 
--# 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
--compiler_CXX=$CC
--for cc_temp in $compiler""; 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-%%"`
-+    solaris*)
-+      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
-+	ld_shlibs=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.
- 
--# We don't want -fno-exception wen compiling C++ code, so set the
--# no_builtin_flag separately
--if test "$GXX" = yes; then
--  lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin'
--else
--  lt_prog_compiler_no_builtin_flag_CXX=
--fi
-+_LT_EOF
-+      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+      else
-+	ld_shlibs=no
-+      fi
-+      ;;
- 
--if test "$GXX" = yes; then
--  # Set up default GNU C++ configuration
-+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-+      case `$LD -v 2>&1` in
-+        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
-+	ld_shlibs=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.
- 
--# Check whether --with-gnu-ld or --without-gnu-ld was given.
--if test "${with_gnu_ld+set}" = set; then
--  withval="$with_gnu_ld"
--  test "$withval" = no || with_gnu_ld=yes
--else
--  with_gnu_ld=no
--fi;
--ac_prog=ld
--if test "$GCC" = yes; then
--  # Check if gcc -print-prog-name=ld gives a path.
--  echo "$as_me:$LINENO: checking for ld used by $CC" >&5
--echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6
--  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
--  echo "$as_me:$LINENO: checking for GNU ld" >&5
--echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
--else
--  echo "$as_me:$LINENO: checking for non-GNU ld" >&5
--echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
--fi
--if test "${lt_cv_path_LD+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  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
-+_LT_EOF
- 	;;
--      *)
--	test "$with_gnu_ld" != yes && break
-+	*)
-+	  # 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
-+	    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+	    archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	    archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+	  else
-+	    ld_shlibs=no
-+	  fi
- 	;;
-       esac
--    fi
--  done
--  IFS="$lt_save_ifs"
--else
--  lt_cv_path_LD="$LD" # Let the user override the test with a path.
--fi
--fi
--
--LD="$lt_cv_path_LD"
--if test -n "$LD"; then
--  echo "$as_me:$LINENO: result: $LD" >&5
--echo "${ECHO_T}$LD" >&6
--else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--fi
--test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
--echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
--   { (exit 1); exit 1; }; }
--echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
--echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
--if test "${lt_cv_prog_gnu_ld+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  # 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
--fi
--echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
--echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6
--with_gnu_ld=$lt_cv_prog_gnu_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
--    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
--    archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+      ;;
- 
--    hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
--    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-+    sunos4*)
-+      archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+      wlarc=
-+      hardcode_direct=yes
-+      hardcode_shlibpath_var=no
-+      ;;
- 
--    # 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}'
-+    *)
-+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+      else
-+	ld_shlibs=no
-+      fi
-+      ;;
-+    esac
- 
--    # 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
--      whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
--    else
--      whole_archive_flag_spec_CXX=
-+    if test "$ld_shlibs" = no; then
-+      runpath_var=
-+      hardcode_libdir_flag_spec=
-+      export_dynamic_flag_spec=
-+      whole_archive_flag_spec=
-     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.
--    archive_cmds_CXX='$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"'
-+    # PORTME fill in a description of your system's linker (not GNU ld)
-+    case $host_os in
-+    aix3*)
-+      allow_undefined_flag=unsupported
-+      always_export_symbols=yes
-+      archive_expsym_cmds='$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.
-+      hardcode_minus_L=yes
-+      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
-+	# Neither direct hardcoding nor static linking is supported with a
-+	# broken collect2.
-+	hardcode_direct=unsupported
-+      fi
-+      ;;
- 
--else
--  GXX=no
--  with_gnu_ld=no
--  wlarc=
--fi
--
--# PORTME: fill in a description of your system's C++ link characteristics
--echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
--echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
--ld_shlibs_CXX=yes
--case $host_os in
--  aix3*)
--    # FIXME: insert proper C++ library support
--    ld_shlibs_CXX=no
--    ;;
--  aix4* | aix5*)
--    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
-+    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
-+	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-+	else
-+	  export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-+	fi
-+	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].*|aix5*)
--	for ld_flag in $LDFLAGS; do
--	  case $ld_flag in
--	  *-brtl*)
-+	# 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
--	    ;;
--	  esac
--	done
--	;;
--      esac
-+	  fi
-+	  done
-+	  ;;
-+	esac
- 
--      exp_sym_flag='-bexport'
--      no_entry_flag='-bnoentry'
--    fi
-+	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.
--
--    archive_cmds_CXX=''
--    hardcode_direct_CXX=yes
--    hardcode_libdir_separator_CXX=':'
--    link_all_deplibs_CXX=yes
-+      # 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.
- 
--    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
-+      archive_cmds=''
-+      hardcode_direct=yes
-+      hardcode_direct_absolute=yes
-+      hardcode_libdir_separator=':'
-+      link_all_deplibs=yes
-+      file_list_spec='${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
--	  hardcode_direct_CXX=yes
--	else
-+	  :
-+	  else
- 	  # We have old collect2
--	  hardcode_direct_CXX=unsupported
-+	  hardcode_direct=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
--	  hardcode_minus_L_CXX=yes
--	  hardcode_libdir_flag_spec_CXX='-L$libdir'
--	  hardcode_libdir_separator_CXX=
-+	  hardcode_minus_L=yes
-+	  hardcode_libdir_flag_spec='-L$libdir'
-+	  hardcode_libdir_separator=
-+	  fi
-+	  ;;
-+	esac
-+	shared_flag='-shared'
-+	if test "$aix_use_runtimelinking" = yes; then
-+	  shared_flag="$shared_flag "'${wl}-G'
- 	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
-+	link_all_deplibs=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'
-+	  shared_flag='-G'
- 	else
--	  shared_flag='${wl}-bM:SRE'
-+	  if test "$aix_use_runtimelinking" = yes; then
-+	    shared_flag='${wl}-G'
-+	  else
-+	    shared_flag='${wl}-bM:SRE'
-+	  fi
- 	fi
-       fi
--    fi
- 
--    # It seems that -bexpall does not export symbols beginning with
--    # underscore (_), so it is better to generate a list of symbols to export.
--    always_export_symbols_CXX=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.
--      allow_undefined_flag_CXX='-berok'
--      # Determine the default libpath from the value encoded in an empty executable.
--      cat >conftest.$ac_ext <<_ACEOF
+       tmp_diet=no
+       if test "$host_os" = linux-dietlibc; then
+ 	case $cc_basename in
+@@ -9735,11 +9358,7 @@
+ 	allow_undefined_flag='-berok'
+         # Determine the default libpath from the value encoded in an
+         # empty executable.
+-        cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+      export_dynamic_flag_spec='${wl}-bexpall'
-+      # It seems that -bexpall does not export symbols beginning with
-+      # underscore (_), so it is better to generate a list of symbols to export.
-+      always_export_symbols=yes
-+      if test "$aix_use_runtimelinking" = yes; then
-+	# Warning - without using the other runtime loading flags (-brtl),
-+	# -berok will link without error, but may produce a broken library.
-+	allow_undefined_flag='-berok'
-+        # Determine the default libpath from the value encoded in an
-+        # empty executable.
 +        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  int
-@@ -10341,58 +9369,36 @@
+@@ -9750,27 +9369,7 @@
    return 0;
  }
  _ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
 +if ac_fn_c_try_link "$LINENO"; then :
  
--aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
--}'`
-+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 '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
--}'`; fi
+ lt_aix_libpath_sed='
+     /Import File Strings/,/^$/ {
+@@ -9784,16 +9383,9 @@
+ if test -z "$aix_libpath"; then
+   aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ fi
 -else
--  echo "$as_me: failed program was:" >&5
+-  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
-+if test -z "$aix_libpath"; then
-+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-+fi
+-
  fi
--rm -f conftest.err conftest.$ac_objext \
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
--      hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
--
--      archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
--     else
--      if test "$host_cpu" = ia64; then
--	hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
--	allow_undefined_flag_CXX="-z nodefs"
--	archive_expsym_cmds_CXX="\$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"
-+        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-+        archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-       else
--	# Determine the default libpath from the value encoded in an empty executable.
--	cat >conftest.$ac_ext <<_ACEOF
+         hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+@@ -9806,11 +9398,7 @@
+ 	else
+ 	 # Determine the default libpath from the value encoded in an
+ 	 # empty executable.
+-	 cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+	if test "$host_cpu" = ia64; then
-+	  hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
-+	  allow_undefined_flag="-z nodefs"
-+	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-+	else
-+	 # Determine the default libpath from the value encoded in an
-+	 # empty executable.
 +	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  int
-@@ -10403,4071 +9409,792 @@
+@@ -9821,27 +9409,7 @@
    return 0;
  }
  _ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
 +if ac_fn_c_try_link "$LINENO"; then :
  
--aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
--}'`
-+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 '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
--}'`; fi
+ lt_aix_libpath_sed='
+     /Import File Strings/,/^$/ {
+@@ -9855,16 +9423,9 @@
+ if test -z "$aix_libpath"; then
+   aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ fi
 -else
--  echo "$as_me: failed program was:" >&5
+-  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
-+if test -z "$aix_libpath"; then
-+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-+fi
+-
  fi
--rm -f conftest.err conftest.$ac_objext \
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
--	hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
--	# Warning - without using the other run time loading flags,
--	# -berok will link without error, but may produce a broken library.
--	no_undefined_flag_CXX=' ${wl}-bernotok'
--	allow_undefined_flag_CXX=' ${wl}-berok'
--	# Exported symbols can be pulled into shared objects from archives
--	whole_archive_flag_spec_CXX='$convenience'
--	archive_cmds_need_lc_CXX=yes
--	# This is similar to how AIX traditionally builds its shared libraries.
--	archive_expsym_cmds_CXX="\$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'
-+	 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-+	  # Warning - without using the other run time loading flags,
-+	  # -berok will link without error, but may produce a broken library.
-+	  no_undefined_flag=' ${wl}-bernotok'
-+	  allow_undefined_flag=' ${wl}-berok'
-+	  # Exported symbols can be pulled into shared objects from archives
-+	  whole_archive_flag_spec='$convenience'
-+	  archive_cmds_need_lc=yes
-+	  # This is similar to how AIX traditionally builds its shared libraries.
-+	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-+	fi
-       fi
--    fi
--    ;;
-+      ;;
- 
--  beos*)
--    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
--      allow_undefined_flag_CXX=unsupported
--      # Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
--      # support --undefined.  This deserves some investigation.  FIXME
--      archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--    else
--      ld_shlibs_CXX=no
--    fi
--    ;;
-+    amigaos*)
-+      case $host_cpu in
-+      powerpc)
-+            # see comment about AmigaOS4 .so support
-+            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+            archive_expsym_cmds=''
-+        ;;
-+      m68k)
-+            archive_cmds='$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)'
-+            hardcode_libdir_flag_spec='-L$libdir'
-+            hardcode_minus_L=yes
-+        ;;
-+      esac
-+      ;;
- 
--  chorus*)
--    case $cc_basename in
--      *)
--	# FIXME: insert proper C++ library support
--	ld_shlibs_CXX=no
--	;;
--    esac
--    ;;
-+    bsdi[45]*)
-+      export_dynamic_flag_spec=-rdynamic
-+      ;;
- 
--  cygwin* | mingw* | pw32*)
--    # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
--    # as there is no search path for DLLs.
--    hardcode_libdir_flag_spec_CXX='-L$libdir'
--    allow_undefined_flag_CXX=unsupported
--    always_export_symbols_CXX=no
--    enable_shared_with_static_runtimes_CXX=yes
--
--    if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
--      archive_cmds_CXX='$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...
--      archive_expsym_cmds_CXX='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
--      ld_shlibs_CXX=no
--    fi
--  ;;
--      darwin* | rhapsody*)
--        case $host_os in
--        rhapsody* | darwin1.[012])
--         allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress'
--         ;;
--       *) # Darwin 1.3 on
--         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
--           allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
--         else
--           case ${MACOSX_DEPLOYMENT_TARGET} in
--             10.[012])
--               allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
--               ;;
--             10.*)
--               allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup'
--               ;;
--           esac
--         fi
--         ;;
--        esac
--      archive_cmds_need_lc_CXX=no
--      hardcode_direct_CXX=no
--      hardcode_automatic_CXX=yes
--      hardcode_shlibpath_var_CXX=unsupported
--      whole_archive_flag_spec_CXX=''
--      link_all_deplibs_CXX=yes
--
--    if test "$GXX" = yes ; then
--      lt_int_apple_cc_single_mod=no
--      output_verbose_link_cmd='echo'
--      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
--       lt_int_apple_cc_single_mod=yes
--      fi
--      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--       archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--      else
--          archive_cmds_CXX='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--        fi
--        module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
--        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
--          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--            archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--          else
--            archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--          fi
--            module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--      else
--      case $cc_basename in
--        xlc*)
--         output_verbose_link_cmd='echo'
--          archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
--          module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
--          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
--          archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--          module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--          ;;
--       *)
--         ld_shlibs_CXX=no
--          ;;
--      esac
--      fi
--        ;;
-+    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.
-+      hardcode_libdir_flag_spec=' '
-+      allow_undefined_flag=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.
-+      archive_cmds='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
-+      # The linker will automatically build a .lib file if we build a DLL.
-+      old_archive_from_new_cmds='true'
-+      # FIXME: Should let the user specify the lib program.
-+      old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
-+      fix_srcfile_path='`cygpath -w "$srcfile"`'
-+      enable_shared_with_static_runtimes=yes
-+      ;;
-+
-+    darwin* | rhapsody*)
-+
-+
-+  archive_cmds_need_lc=no
-+  hardcode_direct=no
-+  hardcode_automatic=yes
-+  hardcode_shlibpath_var=unsupported
-+  whole_archive_flag_spec=''
-+  link_all_deplibs=yes
-+  allow_undefined_flag="$_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
-+    archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-+    module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-+    archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-+    module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
-+
-+  else
-+  ld_shlibs=no
-+  fi
- 
--  dgux*)
--    case $cc_basename in
--      ec++*)
--	# FIXME: insert proper C++ library support
--	ld_shlibs_CXX=no
--	;;
--      ghcx*)
--	# Green Hills C++ Compiler
--	# FIXME: insert proper C++ library support
--	ld_shlibs_CXX=no
--	;;
--      *)
--	# FIXME: insert proper C++ library support
--	ld_shlibs_CXX=no
--	;;
--    esac
--    ;;
--  freebsd[12]*)
--    # C++ shared libraries reported to be fairly broken before switch to ELF
--    ld_shlibs_CXX=no
--    ;;
--  freebsd-elf*)
--    archive_cmds_need_lc_CXX=no
--    ;;
--  freebsd* | kfreebsd*-gnu | dragonfly*)
--    # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
--    # conventions
--    ld_shlibs_CXX=yes
--    ;;
--  gnu*)
--    ;;
--  hpux9*)
--    hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
--    hardcode_libdir_separator_CXX=:
--    export_dynamic_flag_spec_CXX='${wl}-E'
--    hardcode_direct_CXX=yes
--    hardcode_minus_L_CXX=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
--      ld_shlibs_CXX=no
-       ;;
--    aCC*)
--      archive_cmds_CXX='$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) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-+
-+    dgux*)
-+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+      hardcode_libdir_flag_spec='-L$libdir'
-+      hardcode_shlibpath_var=no
-       ;;
--    *)
--      if test "$GXX" = yes; then
--        archive_cmds_CXX='$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
--        ld_shlibs_CXX=no
--      fi
-+
-+    freebsd1*)
-+      ld_shlibs=no
-       ;;
--    esac
--    ;;
--  hpux10*|hpux11*)
--    if test $with_gnu_ld = no; then
--      hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
--      hardcode_libdir_separator_CXX=:
- 
--      case $host_cpu in
--      hppa*64*|ia64*)
--	hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
--        ;;
--      *)
--	export_dynamic_flag_spec_CXX='${wl}-E'
--        ;;
--      esac
--    fi
--    case $host_cpu in
--    hppa*64*|ia64*)
--      hardcode_direct_CXX=no
--      hardcode_shlibpath_var_CXX=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*)
-+      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-+      hardcode_libdir_flag_spec='-R$libdir'
-+      hardcode_direct=yes
-+      hardcode_shlibpath_var=no
-       ;;
--    *)
--      hardcode_direct_CXX=yes
--      hardcode_minus_L_CXX=yes # Not in the search PATH,
--					      # but as the default
--					      # location of the library.
-+
-+    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-+    freebsd2*)
-+      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+      hardcode_direct=yes
-+      hardcode_minus_L=yes
-+      hardcode_shlibpath_var=no
-       ;;
--    esac
- 
--    case $cc_basename in
--      CC*)
--	# FIXME: insert proper C++ library support
--	ld_shlibs_CXX=no
--	;;
--      aCC*)
--	case $host_cpu in
--	hppa*64*)
--	  archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
--	  ;;
--	ia64*)
--	  archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-+    freebsd* | dragonfly*)
-+      archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-+      hardcode_libdir_flag_spec='-R$libdir'
-+      hardcode_direct=yes
-+      hardcode_shlibpath_var=no
-+      ;;
-+
-+    hpux9*)
-+      if test "$GCC" = yes; then
-+	archive_cmds='$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
-+	archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-+      fi
-+      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-+      hardcode_libdir_separator=:
-+      hardcode_direct=yes
-+
-+      # hardcode_minus_L: Not really in the search PATH,
-+      # but as the default location of the library.
-+      hardcode_minus_L=yes
-+      export_dynamic_flag_spec='${wl}-E'
-+      ;;
-+
-+    hpux10*)
-+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-+	archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-+      else
-+	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-+      fi
-+      if test "$with_gnu_ld" = no; then
-+	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-+	hardcode_libdir_flag_spec_ld='+b $libdir'
-+	hardcode_libdir_separator=:
-+	hardcode_direct=yes
-+	hardcode_direct_absolute=yes
-+	export_dynamic_flag_spec='${wl}-E'
-+	# hardcode_minus_L: Not really in the search PATH,
-+	# but as the default location of the library.
-+	hardcode_minus_L=yes
-+      fi
-+      ;;
-+
-+    hpux11*)
-+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-+	case $host_cpu in
-+	hppa*64*)
-+	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	  ;;
-+	ia64*)
-+	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
- 	  ;;
- 	*)
--	  archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $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 $list'
--	;;
--      *)
--	if test "$GXX" = yes; then
--	  if test $with_gnu_ld = no; then
--	    case $host_cpu in
--	    hppa*64*)
--	      archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
--	      ;;
--	    ia64*)
--	      archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
--	      ;;
--	    *)
--	      archive_cmds_CXX='$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
--	  ld_shlibs_CXX=no
--	fi
--	;;
--    esac
--    ;;
--  interix3*)
--    hardcode_direct_CXX=no
--    hardcode_shlibpath_var_CXX=no
--    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
--    export_dynamic_flag_spec_CXX='${wl}-E'
--    # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
--    # Instead, shared libraries are loaded at an image base (0x10000000 by
--    # default) and relocated if they conflict, which is a slow very memory
--    # consuming and fragmenting process.  To avoid this, we pick a random,
--    # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
--    # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
--    archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
--    archive_expsym_cmds_CXX='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++
--	archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
--
--	# Archives containing C++ object files must be created using
--	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
--	# necessary to make sure instantiated templates are included
--	# in the archive.
--	old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs'
--	;;
--      *)
--	if test "$GXX" = yes; then
--	  if test "$with_gnu_ld" = no; then
--	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
--	  else
--	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
--	  fi
--	fi
--	link_all_deplibs_CXX=yes
--	;;
--    esac
--    hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
--    hardcode_libdir_separator_CXX=:
--    ;;
--  linux*)
--    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.
--	archive_cmds_CXX='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'
--	archive_expsym_cmds_CXX='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 $list'
--
--	hardcode_libdir_flag_spec_CXX='${wl}--rpath,$libdir'
--	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
--
--	# Archives containing C++ object files must be created using
--	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
--	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
--	;;
--      icpc*)
--	# 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."*)
--  	  archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
--  	  archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+      else
-+	case $host_cpu in
-+	hppa*64*)
-+	  archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- 	  ;;
--	*)  # Version 8.0 or newer
--	  tmp_idyn=
--	  case $host_cpu in
--	    ia64*) tmp_idyn=' -i_dynamic';;
--	  esac
--  	  archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--	  archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+	ia64*)
-+	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-+	  ;;
-+	*)
-+	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
- 	  ;;
- 	esac
--	archive_cmds_need_lc_CXX=no
--	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
--	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
--	whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
--	;;
--      pgCC*)
--        # Portland Group C++ compiler
--	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'
--
--	hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
--	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
--	whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
--        ;;
--      cxx*)
--	# Compaq C++
--	archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
--	archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
-+      fi
-+      if test "$with_gnu_ld" = no; then
-+	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-+	hardcode_libdir_separator=:
- 
--	runpath_var=LD_RUN_PATH
--	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
--	hardcode_libdir_separator_CXX=:
-+	case $host_cpu in
-+	hppa*64*|ia64*)
-+	  hardcode_direct=no
-+	  hardcode_shlibpath_var=no
-+	  ;;
-+	*)
-+	  hardcode_direct=yes
-+	  hardcode_direct_absolute=yes
-+	  export_dynamic_flag_spec='${wl}-E'
- 
--	# 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 $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
--	;;
--    esac
--    ;;
--  lynxos*)
--    # FIXME: insert proper C++ library support
--    ld_shlibs_CXX=no
--    ;;
--  m88k*)
--    # FIXME: insert proper C++ library support
--    ld_shlibs_CXX=no
--    ;;
--  mvs*)
--    case $cc_basename in
--      cxx*)
--	# FIXME: insert proper C++ library support
--	ld_shlibs_CXX=no
--	;;
--      *)
--	# FIXME: insert proper C++ library support
--	ld_shlibs_CXX=no
--	;;
--    esac
--    ;;
--  netbsd*)
--    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
--      archive_cmds_CXX='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
--      wlarc=
--      hardcode_libdir_flag_spec_CXX='-R$libdir'
--      hardcode_direct_CXX=yes
--      hardcode_shlibpath_var_CXX=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::"'
--    ;;
--  openbsd2*)
--    # C++ shared libraries are fairly broken
--    ld_shlibs_CXX=no
--    ;;
--  openbsd*)
--    hardcode_direct_CXX=yes
--    hardcode_shlibpath_var_CXX=no
--    archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
--    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
--    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
--      archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
--      export_dynamic_flag_spec_CXX='${wl}-E'
--      whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
--    fi
--    output_verbose_link_cmd='echo'
--    ;;
--  osf3*)
--    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.
--	archive_cmds_CXX='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'
-+	  # hardcode_minus_L: Not really in the search PATH,
-+	  # but as the default location of the library.
-+	  hardcode_minus_L=yes
-+	  ;;
-+	esac
-+      fi
-+      ;;
- 
--	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
--	hardcode_libdir_separator_CXX=:
-+    irix5* | irix6* | nonstopux*)
-+      if test "$GCC" = yes; then
-+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+	# Try to use the -exported_symbol ld option, if it does not
-+	# work, assume that -exports_file does not work either and
-+	# implicitly export all symbols.
-+        save_LDFLAGS="$LDFLAGS"
-+        LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+ 	 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+@@ -10076,42 +9637,16 @@
+ 	# implicitly export all symbols.
+         save_LDFLAGS="$LDFLAGS"
+         LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+-        cat >conftest.$ac_ext <<_ACEOF
 +        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
-+int foo(void) {}
-+_ACEOF
+ int foo(void) {}
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
 +if ac_fn_c_try_link "$LINENO"; then :
-+  archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+   archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
  
--	# Archives containing C++ object files must be created using
--	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
--	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+        LDFLAGS="$save_LDFLAGS"
-+      else
-+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
-+      fi
-+      archive_cmds_need_lc='no'
-+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+      hardcode_libdir_separator=:
-+      inherit_rpath=yes
-+      link_all_deplibs=yes
-+      ;;
- 
--	;;
--      RCC*)
--	# Rational C++ 2.4.1
--	# FIXME: insert proper C++ library support
--	ld_shlibs_CXX=no
--	;;
--      cxx*)
--	allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
--	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
 -
--	hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
--	hardcode_libdir_separator_CXX=:
 -
--	# 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 $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
--	;;
--      *)
--	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
--	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
--	  archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+    netbsd* | netbsdelf*-gnu)
-+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-+	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-+      else
-+	archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-+      fi
-+      hardcode_libdir_flag_spec='-R$libdir'
-+      hardcode_direct=yes
-+      hardcode_shlibpath_var=no
-+      ;;
- 
--	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
--	  hardcode_libdir_separator_CXX=:
-+    newsos6)
-+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+      hardcode_direct=yes
-+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+      hardcode_libdir_separator=:
-+      hardcode_shlibpath_var=no
-+      ;;
- 
--	  # 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"'
-+    *nto* | *qnx*)
-+      ;;
- 
-+    openbsd*)
-+      if test -f /usr/libexec/ld.so; then
-+	hardcode_direct=yes
-+	hardcode_shlibpath_var=no
-+	hardcode_direct_absolute=yes
-+	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+	  archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-+	  hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-+	  export_dynamic_flag_spec='${wl}-E'
- 	else
--	  # FIXME: insert proper C++ library support
--	  ld_shlibs_CXX=no
-+	  case $host_os in
-+	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-+	     archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+	     hardcode_libdir_flag_spec='-R$libdir'
-+	     ;;
-+	   *)
-+	     archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+	     hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-+	     ;;
-+	  esac
- 	fi
--	;;
--    esac
--    ;;
--  osf4* | osf5*)
--    case $cc_basename in
--      KCC*)
--	# Kuck and Associates, Inc. (KAI) C++ Compiler
+ fi
 -
--	# 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.
--	archive_cmds_CXX='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'
-+      else
-+	ld_shlibs=no
-+      fi
-+      ;;
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+         LDFLAGS="$save_LDFLAGS"
+       else
+ 	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+@@ -10367,7 +9902,7 @@
+     fi
+   fi
  
--	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
--	hardcode_libdir_separator_CXX=:
-+    os2*)
-+      hardcode_libdir_flag_spec='-L$libdir'
-+      hardcode_minus_L=yes
-+      allow_undefined_flag=unsupported
-+      archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-+      old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-+      ;;
- 
--	# Archives containing C++ object files must be created using
--	# the KAI C++ compiler.
--	old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
--	;;
--      RCC*)
--	# Rational C++ 2.4.1
--	# FIXME: insert proper C++ library support
--	ld_shlibs_CXX=no
--	;;
--      cxx*)
--	allow_undefined_flag_CXX=' -expect_unresolved \*'
--	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
--	archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
--	  echo "-hidden">> $lib.exp~
--	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry ${output_objdir}/so_locations -o $lib~
--	  $rm $lib.exp'
--
--	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
--	hardcode_libdir_separator_CXX=:
--
--	# 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 $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
--	;;
--      *)
--	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
--	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
--	 archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+    osf3*)
-+      if test "$GCC" = yes; then
-+	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+      else
-+	allow_undefined_flag=' -expect_unresolved \*'
-+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-+      fi
-+      archive_cmds_need_lc='no'
-+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+      hardcode_libdir_separator=:
-+      ;;
- 
--	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
--	  hardcode_libdir_separator_CXX=:
-+    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-+      if test "$GCC" = yes; then
-+	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+	hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+      else
-+	allow_undefined_flag=' -expect_unresolved \*'
-+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-+	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-+	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$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"'
-+	# Both c and cxx compiler support -rpath directly
-+	hardcode_libdir_flag_spec='-rpath $libdir'
-+      fi
-+      archive_cmds_need_lc='no'
-+      hardcode_libdir_separator=:
-+      ;;
- 
-+    solaris*)
-+      no_undefined_flag=' -z defs'
-+      if test "$GCC" = yes; then
-+	wlarc='${wl}'
-+	archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-+	  $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-+      else
-+	case `$CC -V 2>&1` in
-+	*"Compilers 5.0"*)
-+	  wlarc=''
-+	  archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-+	  $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
-+	  ;;
-+	*)
-+	  wlarc='${wl}'
-+	  archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
-+	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-+	  $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-+	  ;;
-+	esac
-+      fi
-+      hardcode_libdir_flag_spec='-R$libdir'
-+      hardcode_shlibpath_var=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
-+	  whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
- 	else
--	  # FIXME: insert proper C++ library support
--	  ld_shlibs_CXX=no
-+	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
- 	fi
- 	;;
--    esac
--    ;;
--  psos*)
--    # FIXME: insert proper C++ library support
--    ld_shlibs_CXX=no
--    ;;
--  sunos4*)
--    case $cc_basename in
--      CC*)
--	# Sun C++ 4.x
--	# FIXME: insert proper C++ library support
--	ld_shlibs_CXX=no
--	;;
--      lcc*)
--	# Lucid
--	# FIXME: insert proper C++ library support
--	ld_shlibs_CXX=no
--	;;
--      *)
--	# FIXME: insert proper C++ library support
--	ld_shlibs_CXX=no
--	;;
--    esac
--    ;;
--  solaris*)
--    case $cc_basename in
--      CC*)
--	# Sun C++ 4.2, 5.x and Centerline C++
--        archive_cmds_need_lc_CXX=yes
--	no_undefined_flag_CXX=' -zdefs'
--	archive_cmds_CXX='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
--	archive_expsym_cmds_CXX='$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'
--
--	hardcode_libdir_flag_spec_CXX='-R$libdir'
--	hardcode_shlibpath_var_CXX=no
--	case $host_os in
--	  solaris2.[0-5] | solaris2.[0-5].*) ;;
--	  *)
--	    # The C++ compiler is used as linker so we must use $wl
--	    # flag to pass the commands to the underlying system
--	    # linker. We must also pass each convience library through
--	    # to the system linker between allextract/defaultextract.
--	    # The C++ compiler will combine linker options so we
--	    # cannot just pass the convience library names through
--	    # without $wl.
--	    # Supported since Solaris 2.6 (maybe 2.5.1?)
--	    whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
--	    ;;
--	esac
--	link_all_deplibs_CXX=yes
-+      esac
-+      link_all_deplibs=yes
-+      ;;
- 
--	output_verbose_link_cmd='echo'
-+    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.
-+	archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-+      else
-+	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-+      fi
-+      hardcode_libdir_flag_spec='-L$libdir'
-+      hardcode_direct=yes
-+      hardcode_minus_L=yes
-+      hardcode_shlibpath_var=no
-+      ;;
- 
--	# 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.
--	old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
--	;;
--      gcx*)
--	# Green Hills C++ Compiler
--	archive_cmds_CXX='$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.
--	old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-+    sysv4)
-+      case $host_vendor in
-+	sni)
-+	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+	  hardcode_direct=yes # is this really true???
- 	;;
--      *)
--	# GNU C++ compiler with Solaris linker
--	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
--	  no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
--	  if $CC --version | grep -v '^2\.7' > /dev/null; then
--	    archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
--	    archive_expsym_cmds_CXX='$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'
-+	siemens)
-+	  ## LD is ld it makes a PLAMLIB
-+	  ## CC just makes a GrossModule.
-+	  archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-+	  reload_cmds='$CC -r -o $output$reload_objs'
-+	  hardcode_direct=no
-+        ;;
-+	motorola)
-+	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+	  hardcode_direct=no #Motorola manual says yes, but my tests say they lie
-+	;;
-+      esac
-+      runpath_var='LD_RUN_PATH'
-+      hardcode_shlibpath_var=no
-+      ;;
- 
--	    # 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.
--	    archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
--	    archive_expsym_cmds_CXX='$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'
-+    sysv4.3*)
-+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+      hardcode_shlibpath_var=no
-+      export_dynamic_flag_spec='-Bexport'
-+      ;;
- 
--	    # 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
-+    sysv4*MP*)
-+      if test -d /usr/nec; then
-+	archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+	hardcode_shlibpath_var=no
-+	runpath_var=LD_RUN_PATH
-+	hardcode_runpath_var=yes
-+	ld_shlibs=yes
-+      fi
-+      ;;
- 
--	  hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
--	fi
--	;;
--    esac
--    ;;
--  sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
--    no_undefined_flag_CXX='${wl}-z,text'
--    archive_cmds_need_lc_CXX=no
--    hardcode_shlibpath_var_CXX=no
--    runpath_var='LD_RUN_PATH'
--
--    case $cc_basename in
--      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'
--	;;
--      *)
--	archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
--	archive_expsym_cmds_CXX='$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.
--    # 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.
--    # So that behaviour is only enabled if SCOABSPATH is set to a
--    # non-empty value in the environment.  Most likely only useful for
--    # creating official distributions of packages.
--    # This is a hack until libtool officially supports absolute path
--    # names for shared libraries.
--    no_undefined_flag_CXX='${wl}-z,text'
--    allow_undefined_flag_CXX='${wl}-z,nodefs'
--    archive_cmds_need_lc_CXX=no
--    hardcode_shlibpath_var_CXX=no
--    hardcode_libdir_flag_spec_CXX='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
--    hardcode_libdir_separator_CXX=':'
--    link_all_deplibs_CXX=yes
--    export_dynamic_flag_spec_CXX='${wl}-Bexport'
--    runpath_var='LD_RUN_PATH'
--
--    case $cc_basename in
--      CC*)
--	archive_cmds_CXX='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
--	archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
--	;;
--      *)
--	archive_cmds_CXX='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
--	archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$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
--	ld_shlibs_CXX=no
--	;;
--      *)
--	# FIXME: insert proper C++ library support
--	ld_shlibs_CXX=no
--	;;
--    esac
--    ;;
--  vxworks*)
--    # FIXME: insert proper C++ library support
--    ld_shlibs_CXX=no
--    ;;
--  *)
--    # FIXME: insert proper C++ library support
--    ld_shlibs_CXX=no
--    ;;
--esac
--echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
--echo "${ECHO_T}$ld_shlibs_CXX" >&6
--test "$ld_shlibs_CXX" = no && can_build_shared=no
-+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
-+      no_undefined_flag='${wl}-z,text'
-+      archive_cmds_need_lc=no
-+      hardcode_shlibpath_var=no
-+      runpath_var='LD_RUN_PATH'
- 
--GCC_CXX="$GXX"
--LD_CXX="$LD"
-+      if test "$GCC" = yes; then
-+	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+      else
-+	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+      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.
-+      no_undefined_flag='${wl}-z,text'
-+      allow_undefined_flag='${wl}-z,nodefs'
-+      archive_cmds_need_lc=no
-+      hardcode_shlibpath_var=no
-+      hardcode_libdir_flag_spec='${wl}-R,$libdir'
-+      hardcode_libdir_separator=':'
-+      link_all_deplibs=yes
-+      export_dynamic_flag_spec='${wl}-Bexport'
-+      runpath_var='LD_RUN_PATH'
- 
--cat > conftest.$ac_ext <<EOF
--class Foo
--{
--public:
--  Foo (void) { a = 0; }
--private:
--  int a;
--};
--EOF
-+      if test "$GCC" = yes; then
-+	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+      else
-+	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+      fi
-+      ;;
- 
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
--  # Parse the compiler output and extract the necessary
--  # objects, libraries and library flags.
-+    uts4*)
-+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+      hardcode_libdir_flag_spec='-L$libdir'
-+      hardcode_shlibpath_var=no
-+      ;;
- 
--  # Sentinel used to keep track of whether or not we are before
--  # the conftest object file.
--  pre_test_object_deps_done=no
-+    *)
-+      ld_shlibs=no
-+      ;;
-+    esac
- 
--  # The `*' in the case matches for architectures that use `case' in
--  # $output_verbose_cmd can trigger glob expansion during the loop
--  # eval without this substitution.
--  output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
-+    if test x$host_vendor = xsni; then
-+      case $host in
-+      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-+	export_dynamic_flag_spec='${wl}-Blargedynsym'
-+	;;
-+      esac
-+    fi
-+  fi
- 
--  for p in `eval $output_verbose_link_cmd`; do
--    case $p in
+-{ $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
-+$as_echo "$ld_shlibs" >&6; }
-+test "$ld_shlibs" = no && can_build_shared=no
+ $as_echo "$ld_shlibs" >&6; }
+ test "$ld_shlibs" = no && can_build_shared=no
  
--    -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
-+with_gnu_ld=$with_gnu_ld
+@@ -10404,16 +9939,16 @@
+       # 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.
+-      { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
++      { $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; }
+       $RM conftest*
+       echo "$lt_simple_compile_test_code" > conftest.$ac_ext
  
--       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 "$compiler_lib_search_path_CXX"; then
--	     compiler_lib_search_path_CXX="${prev}${p}"
--	   else
--	     compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} ${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 "$postdeps_CXX"; then
--	   postdeps_CXX="${prev}${p}"
--	 else
--	   postdeps_CXX="${postdeps_CXX} ${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 "$predep_objects_CXX"; then
--	   predep_objects_CXX="$p"
--	 else
--	   predep_objects_CXX="$predep_objects_CXX $p"
--	 fi
--       else
--	 if test -z "$postdep_objects_CXX"; then
--	   postdep_objects_CXX="$p"
--	 else
--	   postdep_objects_CXX="$postdep_objects_CXX $p"
--	 fi
--       fi
--       ;;
- 
--    *) ;; # Ignore the rest.
- 
--    esac
--  done
- 
--  # Clean up.
--  rm -f a.out a.exe
--else
--  echo "libtool.m4: error: problem compiling CXX test program"
--fi
- 
--$rm -f confest.$objext
- 
--# PORTME: override above test on systems where it is broken
--case $host_os in
--interix3*)
--  # Interix 3.5 installs completely hosed .la files for C++, so rather than
--  # hack all around it, let's just trust "g++" to DTRT.
--  predep_objects_CXX=
--  postdep_objects_CXX=
--  postdeps_CXX=
--  ;;
- 
--solaris*)
--  case $cc_basename in
--  CC*)
--    # 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.
--    postdeps_CXX='-lCstd -lCrun'
--    ;;
--  esac
--  ;;
--esac
- 
- 
--case " $postdeps_CXX " in
--*" -lc "*) archive_cmds_need_lc_CXX=no ;;
--esac
- 
--lt_prog_compiler_wl_CXX=
--lt_prog_compiler_pic_CXX=
--lt_prog_compiler_static_CXX=
- 
--echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
--echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
- 
--  # C++ specific cases for pic, static, wl, etc.
--  if test "$GXX" = yes; then
--    lt_prog_compiler_wl_CXX='-Wl,'
--    lt_prog_compiler_static_CXX='-static'
- 
--    case $host_os in
--    aix*)
--      # All AIX code is PIC.
--      if test "$host_cpu" = ia64; then
--	# AIX 5 now supports IA64 processor
--	lt_prog_compiler_static_CXX='-Bstatic'
--      fi
--      ;;
--    amigaos*)
--      # 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_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
--      ;;
--    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
--      # PIC is the default for these OSes.
--      ;;
--    mingw* | os2* | pw32*)
--      # This hack is so that the source file can tell whether it is being
--      # built for inclusion in a dll (and should export symbols for example).
--      lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
--      ;;
--    darwin* | rhapsody*)
--      # PIC is the default on this platform
--      # Common symbols not allowed in MH_DYLIB files
--      lt_prog_compiler_pic_CXX='-fno-common'
-+#
-+# Do we need to explicitly link libc?
-+#
-+case "x$archive_cmds_need_lc" in
-+x|xyes)
-+  # Assume -lc should be added
-+  archive_cmds_need_lc=yes
-+
-+  if test "$enable_shared" = yes && test "$GCC" = yes; then
-+    case $archive_cmds in
-+    *'~'*)
-+      # FIXME: we may have to deal with multi-command sequences.
-       ;;
--    *djgpp*)
--      # DJGPP does not support shared libraries at all
--      lt_prog_compiler_pic_CXX=
--      ;;
--    interix3*)
--      # 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_prog_compiler_pic_CXX=-Kconform_pic
--      fi
--      ;;
--    hpux*)
--      # 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*)
--	;;
--      *)
--	lt_prog_compiler_pic_CXX='-fPIC'
--	;;
--      esac
--      ;;
--    *)
--      lt_prog_compiler_pic_CXX='-fPIC'
--      ;;
--    esac
--  else
--    case $host_os in
--      aix4* | aix5*)
--	# All AIX code is PIC.
--	if test "$host_cpu" = ia64; then
--	  # AIX 5 now supports IA64 processor
--	  lt_prog_compiler_static_CXX='-Bstatic'
--	else
--	  lt_prog_compiler_static_CXX='-bnso -bI:/lib/syscalls.exp'
--	fi
--	;;
--      chorus*)
--	case $cc_basename in
--	cxch68*)
--	  # Green Hills C++ Compiler
--	  # _LT_AC_TAGVAR(lt_prog_compiler_static, CXX)="--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
--	;;
--       darwin*)
--         # PIC is the default on this platform
--         # Common symbols not allowed in MH_DYLIB files
--         case $cc_basename in
--           xlc*)
--           lt_prog_compiler_pic_CXX='-qnocommon'
--           lt_prog_compiler_wl_CXX='-Wl,'
--           ;;
--         esac
--       ;;
--      dgux*)
--	case $cc_basename in
--	  ec++*)
--	    lt_prog_compiler_pic_CXX='-KPIC'
--	    ;;
--	  ghcx*)
--	    # Green Hills C++ Compiler
--	    lt_prog_compiler_pic_CXX='-pic'
--	    ;;
--	  *)
--	    ;;
--	esac
--	;;
--      freebsd* | kfreebsd*-gnu | dragonfly*)
--	# FreeBSD uses GNU C++
--	;;
--      hpux9* | hpux10* | hpux11*)
--	case $cc_basename in
--	  CC*)
--	    lt_prog_compiler_wl_CXX='-Wl,'
--	    lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
--	    if test "$host_cpu" != ia64; then
--	      lt_prog_compiler_pic_CXX='+Z'
--	    fi
--	    ;;
--	  aCC*)
--	    lt_prog_compiler_wl_CXX='-Wl,'
--	    lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
--	    case $host_cpu in
--	    hppa*64*|ia64*)
--	      # +Z the default
--	      ;;
--	    *)
--	      lt_prog_compiler_pic_CXX='+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_prog_compiler_wl_CXX='-Wl,'
--	    lt_prog_compiler_static_CXX='-non_shared'
--	    # CC pic flag -KPIC is the default.
--	    ;;
--	  *)
--	    ;;
--	esac
--	;;
--      linux*)
--	case $cc_basename in
--	  KCC*)
--	    # KAI C++ Compiler
--	    lt_prog_compiler_wl_CXX='--backend -Wl,'
--	    lt_prog_compiler_pic_CXX='-fPIC'
--	    ;;
--	  icpc* | ecpc*)
--	    # Intel C++
--	    lt_prog_compiler_wl_CXX='-Wl,'
--	    lt_prog_compiler_pic_CXX='-KPIC'
--	    lt_prog_compiler_static_CXX='-static'
--	    ;;
--	  pgCC*)
--	    # Portland Group C++ compiler.
--	    lt_prog_compiler_wl_CXX='-Wl,'
--	    lt_prog_compiler_pic_CXX='-fpic'
--	    lt_prog_compiler_static_CXX='-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_prog_compiler_pic_CXX=
--	    lt_prog_compiler_static_CXX='-non_shared'
--	    ;;
--	  *)
--	    ;;
--	esac
--	;;
--      lynxos*)
--	;;
--      m88k*)
--	;;
--      mvs*)
--	case $cc_basename in
--	  cxx*)
--	    lt_prog_compiler_pic_CXX='-W c,exportall'
--	    ;;
--	  *)
--	    ;;
--	esac
--	;;
--      netbsd*)
--	;;
--      osf3* | osf4* | osf5*)
--	case $cc_basename in
--	  KCC*)
--	    lt_prog_compiler_wl_CXX='--backend -Wl,'
--	    ;;
--	  RCC*)
--	    # Rational C++ 2.4.1
--	    lt_prog_compiler_pic_CXX='-pic'
--	    ;;
--	  cxx*)
--	    # Digital/Compaq C++
--	    lt_prog_compiler_wl_CXX='-Wl,'
--	    # Make sure the PIC flag is empty.  It appears that all Alpha
--	    # Linux and Compaq Tru64 Unix objects are PIC.
--	    lt_prog_compiler_pic_CXX=
--	    lt_prog_compiler_static_CXX='-non_shared'
--	    ;;
--	  *)
--	    ;;
--	esac
--	;;
--      psos*)
--	;;
--      solaris*)
--	case $cc_basename in
--	  CC*)
--	    # Sun C++ 4.2, 5.x and Centerline C++
--	    lt_prog_compiler_pic_CXX='-KPIC'
--	    lt_prog_compiler_static_CXX='-Bstatic'
--	    lt_prog_compiler_wl_CXX='-Qoption ld '
--	    ;;
--	  gcx*)
--	    # Green Hills C++ Compiler
--	    lt_prog_compiler_pic_CXX='-PIC'
--	    ;;
--	  *)
--	    ;;
--	esac
--	;;
--      sunos4*)
--	case $cc_basename in
--	  CC*)
--	    # Sun C++ 4.x
--	    lt_prog_compiler_pic_CXX='-pic'
--	    lt_prog_compiler_static_CXX='-Bstatic'
--	    ;;
--	  lcc*)
--	    # Lucid
--	    lt_prog_compiler_pic_CXX='-pic'
--	    ;;
--	  *)
--	    ;;
--	esac
--	;;
--      tandem*)
--	case $cc_basename in
--	  NCC*)
--	    # NonStop-UX NCC 3.20
--	    lt_prog_compiler_pic_CXX='-KPIC'
--	    ;;
--	  *)
--	    ;;
--	esac
--	;;
--      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
--	case $cc_basename in
--	  CC*)
--	    lt_prog_compiler_wl_CXX='-Wl,'
--	    lt_prog_compiler_pic_CXX='-KPIC'
--	    lt_prog_compiler_static_CXX='-Bstatic'
--	    ;;
--	esac
--	;;
--      vxworks*)
--	;;
--      *)
--	lt_prog_compiler_can_build_shared_CXX=no
--	;;
--    esac
--  fi
--
--echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
--echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6
--
--#
--# Check to make sure the PIC flag actually works.
--#
--if test -n "$lt_prog_compiler_pic_CXX"; then
--
--echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
--echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6
--if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  lt_prog_compiler_pic_works_CXX=no
--  ac_outfile=conftest.$ac_objext
--   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
--   lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
--   # Insert the option either (1) after the last *FLAGS variable, or
--   # (2) before a word containing "conftest.", or (3) at the end.
--   # 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:11610: $lt_compile\"" >&5)
--   (eval "$lt_compile" 2>conftest.err)
--   ac_status=$?
--   cat conftest.err >&5
--   echo "$as_me:11614: \$? = $ac_status" >&5
--   if (exit $ac_status) && test -s "$ac_outfile"; then
--     # The compiler can only warn and ignore the option if not recognized
--     # So say no if there are warnings other than the usual output.
--     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
--     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
--     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
--       lt_prog_compiler_pic_works_CXX=yes
--     fi
--   fi
--   $rm conftest*
--
--fi
--echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
--echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6
--
--if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
--    case $lt_prog_compiler_pic_CXX in
--     "" | " "*) ;;
--     *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
--     esac
--else
--    lt_prog_compiler_pic_CXX=
--     lt_prog_compiler_can_build_shared_CXX=no
--fi
--
--fi
--case $host_os in
--  # For platforms which do not support PIC, -DPIC is meaningless:
--  *djgpp*)
--    lt_prog_compiler_pic_CXX=
--    ;;
--  *)
--    lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
--    ;;
--esac
--
--#
--# Check to make sure the static flag actually works.
--#
--wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
--echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
--echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
--if test "${lt_prog_compiler_static_works_CXX+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  lt_prog_compiler_static_works_CXX=no
--   save_LDFLAGS="$LDFLAGS"
--   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
--   printf "$lt_simple_link_test_code" > conftest.$ac_ext
--   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
--     # The linker can only warn and ignore the option if not recognized
--     # So say no if there are warnings
--     if test -s conftest.err; then
--       # Append any errors to the config.log.
--       cat conftest.err 1>&5
--       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
--       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
--       if diff conftest.exp conftest.er2 >/dev/null; then
--         lt_prog_compiler_static_works_CXX=yes
--       fi
--     else
--       lt_prog_compiler_static_works_CXX=yes
--     fi
--   fi
--   $rm conftest*
--   LDFLAGS="$save_LDFLAGS"
--
--fi
--echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5
--echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6
--
--if test x"$lt_prog_compiler_static_works_CXX" = xyes; then
--    :
--else
--    lt_prog_compiler_static_CXX=
--fi
--
--
--echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
--echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
--if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  lt_cv_prog_compiler_c_o_CXX=no
--   $rm -r conftest 2>/dev/null
--   mkdir conftest
--   cd conftest
--   mkdir out
--   printf "$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:11714: $lt_compile\"" >&5)
--   (eval "$lt_compile" 2>out/conftest.err)
--   ac_status=$?
--   cat out/conftest.err >&5
--   echo "$as_me:11718: \$? = $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
--     # 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_cv_prog_compiler_c_o_CXX=yes
--     fi
--   fi
--   chmod u+w . 2>&5
--   $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 ..
--   rmdir conftest
--   $rm conftest*
--
--fi
--echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
--echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6
--
--
--hard_links="nottested"
--if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
--  # do not overwrite the value of need_locks provided by the user
--  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
--echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
--  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
--  echo "$as_me:$LINENO: result: $hard_links" >&5
--echo "${ECHO_T}$hard_links" >&6
--  if test "$hard_links" = no; then
--    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
--echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
--    need_locks=warn
--  fi
--else
--  need_locks=no
--fi
--
--echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
--echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
--
--  export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
--  case $host_os in
--  aix4* | aix5*)
--    # 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
--      export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
--    else
--      export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
--    fi
--    ;;
--  pw32*)
--    export_symbols_cmds_CXX="$ltdll_cmds"
--  ;;
--  cygwin* | mingw*)
--    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'
--  ;;
--  *)
--    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
--  ;;
--  esac
--
--echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
--echo "${ECHO_T}$ld_shlibs_CXX" >&6
--test "$ld_shlibs_CXX" = no && can_build_shared=no
--
--#
--# Do we need to explicitly link libc?
--#
--case "x$archive_cmds_need_lc_CXX" in
--x|xyes)
--  # Assume -lc should be added
--  archive_cmds_need_lc_CXX=yes
--
--  if test "$enable_shared" = yes && test "$GCC" = yes; then
--    case $archive_cmds_CXX 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.
--      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
--echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
--      $rm conftest*
--      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
--
 -      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } 2>conftest.err; then
--        soname=conftest
--        lib=conftest
--        libobjs=conftest.$ac_objext
--        deplibs=
--        wl=$lt_prog_compiler_wl_CXX
--	pic_flag=$lt_prog_compiler_pic_CXX
--        compiler_flags=-v
--        linker_flags=-v
--        verstring=
--        output_objdir=.
--        libname=conftest
--        lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
--        allow_undefined_flag_CXX=
--        if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
--  (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }
--        then
--	  archive_cmds_need_lc_CXX=no
--        else
--	  archive_cmds_need_lc_CXX=yes
--        fi
--        allow_undefined_flag_CXX=$lt_save_allow_undefined_flag
--      else
--        cat conftest.err 1>&5
--      fi
--      $rm conftest*
--      echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
--echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6
--      ;;
--    esac
--  fi
--  ;;
--esac
--
--echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
--echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
--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"
--if test "$GCC" = yes; then
--  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 ';' >/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.
--    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
--else
--  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
--fi
--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'
--  ;;
--
--aix4* | aix5*)
--  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*)
--  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'
--  ;;
--
--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*)
--  version_type=windows
--  shrext_cmds=".dll"
--  need_version=no
--  need_lib_prefix=no
--
--  case $GCC,$host_os in
--  yes,cygwin* | yes,mingw* | yes,pw32*)
--    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'
--    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*)
--      # 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}${versuffix}$shared_ext ${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`'
--  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
--  if test "$GCC" = yes; then
--    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
--  else
--    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
--  fi
--  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
--  ;;
--
--kfreebsd*-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='GNU ld.so'
--  ;;
--
--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
--    ;;
--  freebsd*) # from 4.6 on
--    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'
--  ;;
--
--interix3*)
--  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*)
--  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
--  # 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
--
--  # find out which ABI we are using
--  libsuff=
--  case "$host_cpu" in
--  x86_64*|s390x*|powerpc64*)
--    echo '#line 12250 "configure"' > conftest.$ac_ext
--    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
--      case `/usr/bin/file conftest.$ac_objext` in
--      *64-bit*)
--        libsuff=64
--        sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
--        ;;
--      esac
--    fi
--    rm -rf conftest*
--    ;;
--  esac
--
--  # 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/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
--    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $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'
--  ;;
--
--knetbsd*-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='GNU ld.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=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
--  ;;
--
--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"
--  ;;
--
--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
--      export_dynamic_flag_spec='${wl}-Blargedynsym'
--      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
--  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'
--    shlibpath_overrides_runpath=no
--  else
--    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
--    shlibpath_overrides_runpath=yes
--    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'
--  ;;
--
--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
--echo "$as_me:$LINENO: result: $dynamic_linker" >&5
--echo "${ECHO_T}$dynamic_linker" >&6
--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
--
--echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
--echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
--hardcode_action_CXX=
--if test -n "$hardcode_libdir_flag_spec_CXX" || \
--   test -n "$runpath_var_CXX" || \
--   test "X$hardcode_automatic_CXX" = "Xyes" ; then
--
--  # We can hardcode non-existant directories.
--  if test "$hardcode_direct_CXX" != 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_AC_TAGVAR(hardcode_shlibpath_var, CXX)" != no &&
--     test "$hardcode_minus_L_CXX" != no; then
--    # Linking always hardcodes the temporary library directory.
--    hardcode_action_CXX=relink
--  else
--    # We can link without hardcoding, and we can hardcode nonexisting dirs.
--    hardcode_action_CXX=immediate
--  fi
--else
--  # We cannot hardcode anything, or else we can only hardcode existing
--  # directories.
--  hardcode_action_CXX=unsupported
--fi
--echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
--echo "${ECHO_T}$hardcode_action_CXX" >&6
--
--if test "$hardcode_action_CXX" = relink; 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
--
--
--# The else clause should only fire when bootstrapping the
--# libtool distribution, otherwise you forgot to ship ltmain.sh
--# with your package, and you will get complaints that there are
--# no rules to generate ltmain.sh.
--if test -f "$ltmain"; then
--  # 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
--  # Now quote all the things that may contain metacharacters while being
--  # careful not to overquote the AC_SUBSTed values.  We take copies of the
--  # variables and quote the copies for generation of the libtool script.
--  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
--    SED SHELL STRIP \
--    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
--    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
--    deplibs_check_method reload_flag reload_cmds need_locks \
--    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
--    lt_cv_sys_global_symbol_to_c_name_address \
--    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
--    old_postinstall_cmds old_postuninstall_cmds \
--    compiler_CXX \
--    CC_CXX \
--    LD_CXX \
--    lt_prog_compiler_wl_CXX \
--    lt_prog_compiler_pic_CXX \
--    lt_prog_compiler_static_CXX \
--    lt_prog_compiler_no_builtin_flag_CXX \
--    export_dynamic_flag_spec_CXX \
--    thread_safe_flag_spec_CXX \
--    whole_archive_flag_spec_CXX \
--    enable_shared_with_static_runtimes_CXX \
--    old_archive_cmds_CXX \
--    old_archive_from_new_cmds_CXX \
--    predep_objects_CXX \
--    postdep_objects_CXX \
--    predeps_CXX \
--    postdeps_CXX \
--    compiler_lib_search_path_CXX \
--    archive_cmds_CXX \
--    archive_expsym_cmds_CXX \
--    postinstall_cmds_CXX \
--    postuninstall_cmds_CXX \
--    old_archive_from_expsyms_cmds_CXX \
--    allow_undefined_flag_CXX \
--    no_undefined_flag_CXX \
--    export_symbols_cmds_CXX \
--    hardcode_libdir_flag_spec_CXX \
--    hardcode_libdir_flag_spec_ld_CXX \
--    hardcode_libdir_separator_CXX \
--    hardcode_automatic_CXX \
--    module_cmds_CXX \
--    module_expsym_cmds_CXX \
--    lt_cv_prog_compiler_c_o_CXX \
--    exclude_expsyms_CXX \
--    include_expsyms_CXX; do
--
--    case $var in
--    old_archive_cmds_CXX | \
--    old_archive_from_new_cmds_CXX | \
--    archive_cmds_CXX | \
--    archive_expsym_cmds_CXX | \
--    module_cmds_CXX | \
--    module_expsym_cmds_CXX | \
--    old_archive_from_expsyms_cmds_CXX | \
--    export_symbols_cmds_CXX | \
--    extract_expsyms_cmds | reload_cmds | finish_cmds | \
--    postinstall_cmds | postuninstall_cmds | \
--    old_postinstall_cmds | old_postuninstall_cmds | \
--    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
--      # Double-quote double-evaled strings.
--      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
--      ;;
--    *)
--      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
--      ;;
--    esac
--  done
--
--  case $lt_echo in
--  *'\$0 --fallback-echo"')
--    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
--    ;;
--  esac
--
--cfgfile="$ofile"
--
--  cat <<__EOF__ >> "$cfgfile"
--# ### BEGIN LIBTOOL TAG CONFIG: $tagname
--
--# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
--
--# Shell to use when invoking shell scripts.
--SHELL=$lt_SHELL
--
--# Whether or not to build shared libraries.
--build_libtool_libs=$enable_shared
--
--# Whether or not to build static libraries.
--build_old_libs=$enable_static
--
--# Whether or not to add -lc for building shared libraries.
--build_libtool_need_lc=$archive_cmds_need_lc_CXX
--
--# Whether or not to disallow shared libs when runtime libs are static
--allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
--
--# Whether or not to optimize for fast installation.
--fast_install=$enable_fast_install
--
--# The host system.
--host_alias=$host_alias
--host=$host
--host_os=$host_os
--
--# The build system.
--build_alias=$build_alias
--build=$build
--build_os=$build_os
--
--# An echo program that does not interpret backslashes.
--echo=$lt_echo
--
--# The archiver.
--AR=$lt_AR
--AR_FLAGS=$lt_AR_FLAGS
--
--# A C compiler.
--LTCC=$lt_LTCC
--
--# LTCC compiler flags.
--LTCFLAGS=$lt_LTCFLAGS
--
--# A language-specific compiler.
--CC=$lt_compiler_CXX
--
--# Is the compiler the GNU C compiler?
--with_gcc=$GCC_CXX
--
--gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
--gcc_ver=\`gcc -dumpversion\`
--
--# An ERE matcher.
--EGREP=$lt_EGREP
--
--# The linker used to build libraries.
--LD=$lt_LD_CXX
--
--# Whether we need hard or soft links.
--LN_S=$lt_LN_S
--
--# A BSD-compatible nm program.
--NM=$lt_NM
--
--# A symbol stripping program
--STRIP=$lt_STRIP
--
--# Used to examine libraries when file_magic_cmd begins "file"
--MAGIC_CMD=$MAGIC_CMD
--
--# Used on cygwin: DLL creation program.
--DLLTOOL="$DLLTOOL"
--
--# Used on cygwin: object dumper.
--OBJDUMP="$OBJDUMP"
--
--# Used on cygwin: assembler.
--AS="$AS"
--
--# The name of the directory that contains temporary libtool files.
--objdir=$objdir
--
--# How to create reloadable object files.
--reload_flag=$lt_reload_flag
--reload_cmds=$lt_reload_cmds
--
--# How to pass a linker flag through the compiler.
--wl=$lt_lt_prog_compiler_wl_CXX
--
--# Object file suffix (normally "o").
--objext="$ac_objext"
--
--# Old archive suffix (normally "a").
--libext="$libext"
--
--# Shared library suffix (normally ".so").
--shrext_cmds='$shrext_cmds'
--
--# Executable file suffix (normally "").
--exeext="$exeext"
--
--# Additional compiler flags for building library objects.
--pic_flag=$lt_lt_prog_compiler_pic_CXX
--pic_mode=$pic_mode
--
--# What is the maximum length of a command?
--max_cmd_len=$lt_cv_sys_max_cmd_len
--
--# Does compiler simultaneously support -c and -o options?
--compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
--
--# Must we lock files when doing compilation?
--need_locks=$lt_need_locks
--
--# Do we need the lib prefix for modules?
--need_lib_prefix=$need_lib_prefix
--
--# Do we need a version for libraries?
--need_version=$need_version
--
--# Whether dlopen is supported.
--dlopen_support=$enable_dlopen
--
--# Whether dlopen of programs is supported.
--dlopen_self=$enable_dlopen_self
--
--# Whether dlopen of statically linked programs is supported.
--dlopen_self_static=$enable_dlopen_self_static
--
--# Compiler flag to prevent dynamic linking.
--link_static_flag=$lt_lt_prog_compiler_static_CXX
--
--# Compiler flag to turn off builtin functions.
--no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
--
--# Compiler flag to allow reflexive dlopens.
--export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
--
--# Compiler flag to generate shared objects directly from archives.
--whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
--
--# Compiler flag to generate thread-safe objects.
--thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
--
--# Library versioning type.
--version_type=$version_type
--
--# Format of library name prefix.
--libname_spec=$lt_libname_spec
--
--# 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.
--library_names_spec=$lt_library_names_spec
--
--# The coded name of the library, if different from the real name.
--soname_spec=$lt_soname_spec
--
--# Commands used to build and install an old-style archive.
--RANLIB=$lt_RANLIB
--old_archive_cmds=$lt_old_archive_cmds_CXX
--old_postinstall_cmds=$lt_old_postinstall_cmds
--old_postuninstall_cmds=$lt_old_postuninstall_cmds
--
--# Create an old-style archive from a shared archive.
--old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
--
--# Create a temporary old-style archive to link instead of a shared archive.
--old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
--
--# Commands used to build and install a shared archive.
--archive_cmds=$lt_archive_cmds_CXX
--archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
--postinstall_cmds=$lt_postinstall_cmds
--postuninstall_cmds=$lt_postuninstall_cmds
--
--# Commands used to build a loadable module (assumed same as above if empty)
--module_cmds=$lt_module_cmds_CXX
--module_expsym_cmds=$lt_module_expsym_cmds_CXX
--
--# Commands to strip libraries.
--old_striplib=$lt_old_striplib
--striplib=$lt_striplib
--
--# Dependencies to place before the objects being linked to create a
--# shared library.
--predep_objects=\`echo $lt_predep_objects_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
--
--# Dependencies to place after the objects being linked to create a
--# shared library.
--postdep_objects=\`echo $lt_postdep_objects_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
--
--# Dependencies to place before the objects being linked to create a
--# shared library.
--predeps=$lt_predeps_CXX
--
--# Dependencies to place after the objects being linked to create a
--# shared library.
--postdeps=$lt_postdeps_CXX
--
--# The library search path used internally by the compiler when linking
--# a shared library.
--compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_CXX | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
--
--# Method to check whether dependent libraries are shared objects.
--deplibs_check_method=$lt_deplibs_check_method
--
--# Command to use when deplibs_check_method == file_magic.
--file_magic_cmd=$lt_file_magic_cmd
--
--# Flag that allows shared libraries with undefined symbols to be built.
--allow_undefined_flag=$lt_allow_undefined_flag_CXX
--
--# Flag that forces no undefined symbols.
--no_undefined_flag=$lt_no_undefined_flag_CXX
--
--# Commands used to finish a libtool library installation in a directory.
--finish_cmds=$lt_finish_cmds
--
--# Same as above, but a single script fragment to be evaled but not shown.
--finish_eval=$lt_finish_eval
--
--# Take the output of nm and produce a listing of raw symbols and C names.
--global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
--
--# Transform the output of nm in a proper C declaration
--global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
--
--# Transform the output of nm in a C name address pair
--global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
--
--# This is the shared library runtime path variable.
--runpath_var=$runpath_var
--
--# This is the shared library path variable.
--shlibpath_var=$shlibpath_var
--
--# Is shlibpath searched before the hard-coded library search path?
--shlibpath_overrides_runpath=$shlibpath_overrides_runpath
--
--# How to hardcode a shared library path into an executable.
--hardcode_action=$hardcode_action_CXX
--
--# Whether we should hardcode library paths into libraries.
--hardcode_into_libs=$hardcode_into_libs
--
--# Flag to hardcode \$libdir into a binary during linking.
--# This must work even if \$libdir does not exist.
--hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
--
--# If ld is used when linking, flag to hardcode \$libdir into
--# a binary during linking. This must work even if \$libdir does
--# not exist.
--hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX
--
--# Whether we need a single -rpath flag with a separated argument.
--hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
--
--# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
--# resulting binary.
--hardcode_direct=$hardcode_direct_CXX
--
--# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
--# resulting binary.
--hardcode_minus_L=$hardcode_minus_L_CXX
--
--# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
--# the resulting binary.
--hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX
--
--# Set to yes if building a shared library automatically hardcodes DIR into the library
--# and all subsequent libraries and executables linked against it.
--hardcode_automatic=$hardcode_automatic_CXX
-+    '$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.
-+      { $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; }
-+      $RM conftest*
-+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-+
 +      if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } 2>conftest.err; then
 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 +  test $ac_status = 0; } 2>conftest.err; then
-+        soname=conftest
-+        lib=conftest
-+        libobjs=conftest.$ac_objext
-+        deplibs=
-+        wl=$lt_prog_compiler_wl
-+	pic_flag=$lt_prog_compiler_pic
-+        compiler_flags=-v
-+        linker_flags=-v
-+        verstring=
-+        output_objdir=.
-+        libname=conftest
-+        lt_save_allow_undefined_flag=$allow_undefined_flag
-+        allow_undefined_flag=
+         soname=conftest
+         lib=conftest
+         libobjs=conftest.$ac_objext
+@@ -10427,11 +9962,11 @@
+         libname=conftest
+         lt_save_allow_undefined_flag=$allow_undefined_flag
+         allow_undefined_flag=
+-        if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5
 +        if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
-+  (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
-+  ac_status=$?
+   (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }
 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 +  test $ac_status = 0; }
-+        then
-+	  archive_cmds_need_lc=no
-+        else
-+	  archive_cmds_need_lc=yes
-+        fi
-+        allow_undefined_flag=$lt_save_allow_undefined_flag
-+      else
-+        cat conftest.err 1>&5
-+      fi
-+      $RM conftest*
+         then
+ 	  archive_cmds_need_lc=no
+         else
+@@ -10442,7 +9977,7 @@
+         cat conftest.err 1>&5
+       fi
+       $RM conftest*
+-      { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
 +      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5
-+$as_echo "$archive_cmds_need_lc" >&6; }
-+      ;;
-+    esac
-+  fi
-+  ;;
-+esac
+ $as_echo "$archive_cmds_need_lc" >&6; }
+       ;;
+     esac
+@@ -10606,7 +10141,7 @@
  
--# Variables whose values should be saved in libtool wrapper scripts and
--# restored at relink time.
--variables_saved_for_relink="$variables_saved_for_relink"
  
--# Whether libtool must link a program against all its dependency libraries.
--link_all_deplibs=$link_all_deplibs_CXX
  
--# Compile-time system search path for libraries
--sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
- 
--# Run-time system search path for libraries
--sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
- 
--# Fix the shell variable \$srcfile for the compiler.
--fix_srcfile_path="$fix_srcfile_path_CXX"
- 
--# Set to yes if exported symbols are required.
--always_export_symbols=$always_export_symbols_CXX
- 
--# The commands to list exported symbols.
--export_symbols_cmds=$lt_export_symbols_cmds_CXX
- 
--# The commands to extract the exported symbol list from a shared archive.
--extract_expsyms_cmds=$lt_extract_expsyms_cmds
- 
--# Symbols that should not be listed in the preloaded symbols.
--exclude_expsyms=$lt_exclude_expsyms_CXX
- 
--# Symbols that must always be exported.
--include_expsyms=$lt_include_expsyms_CXX
- 
--# ### END LIBTOOL TAG CONFIG: $tagname
- 
--__EOF__
- 
- 
--else
--  # If there is no Makefile yet, we rely on a make rule to execute
--  # `config.status --recheck' to rerun these tests and create the
--  # libtool script then.
--  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
--  if test -f "$ltmain_in"; then
--    test -f Makefile && make "$ltmain"
--  fi
--fi
- 
- 
--ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
--CC=$lt_save_CC
--LDCXX=$LD
--LD=$lt_save_LD
--GCC=$lt_save_GCC
--with_gnu_ldcxx=$with_gnu_ld
--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
- 
--	else
--	  tagname=""
--	fi
--	;;
- 
--      F77)
--	if test -n "$F77" && test "X$F77" != "Xno"; then
- 
--ac_ext=f
--ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
--ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_f77_compiler_gnu
--
--
--archive_cmds_need_lc_F77=no
--allow_undefined_flag_F77=
--always_export_symbols_F77=no
--archive_expsym_cmds_F77=
--export_dynamic_flag_spec_F77=
--hardcode_direct_F77=no
--hardcode_libdir_flag_spec_F77=
--hardcode_libdir_flag_spec_ld_F77=
--hardcode_libdir_separator_F77=
--hardcode_minus_L_F77=no
--hardcode_automatic_F77=no
--module_cmds_F77=
--module_expsym_cmds_F77=
--link_all_deplibs_F77=unknown
--old_archive_cmds_F77=$old_archive_cmds
--no_undefined_flag_F77=
--whole_archive_flag_spec_F77=
--enable_shared_with_static_runtimes_F77=no
- 
--# Source file extension for f77 test sources.
--ac_ext=f
- 
--# Object file extension for compiled f77 test sources.
--objext=o
--objext_F77=$objext
- 
--# Code to be used in simple compile tests
--lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
- 
--# Code to be used in simple link tests
--lt_simple_link_test_code="      program t\n      end\n"
- 
--# ltmain only uses $CC for tagged configurations so make sure $CC is set.
- 
--# 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
- 
- 
--# save warnings/boilerplate of simple test code
--ac_outfile=conftest.$ac_objext
--printf "$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*
- 
--ac_outfile=conftest.$ac_objext
--printf "$lt_simple_link_test_code" >conftest.$ac_ext
--eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
--_lt_linker_boilerplate=`cat conftest.err`
--$rm conftest*
- 
- 
--# Allow CC to be a program name with arguments.
--lt_save_CC="$CC"
--CC=${F77-"f77"}
--compiler=$CC
--compiler_F77=$CC
--for cc_temp in $compiler""; 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-%%"`
- 
- 
--echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
--echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
--echo "$as_me:$LINENO: result: $can_build_shared" >&5
--echo "${ECHO_T}$can_build_shared" >&6
- 
--echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
--echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
--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
--  ;;
--aix4* | aix5*)
--  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
--    test "$enable_shared" = yes && enable_static=no
--  fi
--  ;;
--esac
--echo "$as_me:$LINENO: result: $enable_shared" >&5
--echo "${ECHO_T}$enable_shared" >&6
- 
--echo "$as_me:$LINENO: checking whether to build static libraries" >&5
--echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6
--# Make sure either enable_shared or enable_static is yes.
--test "$enable_shared" = yes || enable_static=yes
--echo "$as_me:$LINENO: result: $enable_static" >&5
--echo "${ECHO_T}$enable_static" >&6
--
--GCC_F77="$G77"
--LD_F77="$LD"
--
--lt_prog_compiler_wl_F77=
--lt_prog_compiler_pic_F77=
--lt_prog_compiler_static_F77=
- 
--echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
--echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
- 
--  if test "$GCC" = yes; then
--    lt_prog_compiler_wl_F77='-Wl,'
--    lt_prog_compiler_static_F77='-static'
- 
--    case $host_os in
--      aix*)
--      # All AIX code is PIC.
--      if test "$host_cpu" = ia64; then
--	# AIX 5 now supports IA64 processor
--	lt_prog_compiler_static_F77='-Bstatic'
--      fi
--      ;;
- 
--    amigaos*)
--      # 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_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
--      ;;
- 
--    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
--      # PIC is the default for these OSes.
--      ;;
- 
--    mingw* | pw32* | os2*)
--      # This hack is so that the source file can tell whether it is being
--      # built for inclusion in a dll (and should export symbols for example).
--      lt_prog_compiler_pic_F77='-DDLL_EXPORT'
--      ;;
- 
--    darwin* | rhapsody*)
--      # PIC is the default on this platform
--      # Common symbols not allowed in MH_DYLIB files
--      lt_prog_compiler_pic_F77='-fno-common'
--      ;;
- 
--    interix3*)
--      # 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_prog_compiler_can_build_shared_F77=no
--      enable_shared=no
--      ;;
- 
--    sysv4*MP*)
--      if test -d /usr/nec; then
--	lt_prog_compiler_pic_F77=-Kconform_pic
--      fi
--      ;;
- 
--    hpux*)
--      # 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_prog_compiler_pic_F77='-fPIC'
--	;;
--      esac
--      ;;
- 
--    *)
--      lt_prog_compiler_pic_F77='-fPIC'
--      ;;
--    esac
--  else
--    # PORTME Check for flag to pass linker flags through the system compiler.
--    case $host_os in
--    aix*)
--      lt_prog_compiler_wl_F77='-Wl,'
--      if test "$host_cpu" = ia64; then
--	# AIX 5 now supports IA64 processor
--	lt_prog_compiler_static_F77='-Bstatic'
--      else
--	lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
--      fi
--      ;;
--      darwin*)
--        # PIC is the default on this platform
--        # Common symbols not allowed in MH_DYLIB files
--       case $cc_basename in
--         xlc*)
--         lt_prog_compiler_pic_F77='-qnocommon'
--         lt_prog_compiler_wl_F77='-Wl,'
--         ;;
--       esac
--       ;;
- 
--    mingw* | pw32* | os2*)
--      # This hack is so that the source file can tell whether it is being
--      # built for inclusion in a dll (and should export symbols for example).
--      lt_prog_compiler_pic_F77='-DDLL_EXPORT'
--      ;;
- 
--    hpux9* | hpux10* | hpux11*)
--      lt_prog_compiler_wl_F77='-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_prog_compiler_pic_F77='+Z'
--	;;
--      esac
--      # Is there a better lt_prog_compiler_static that works with the bundled CC?
--      lt_prog_compiler_static_F77='${wl}-a ${wl}archive'
--      ;;
- 
--    irix5* | irix6* | nonstopux*)
--      lt_prog_compiler_wl_F77='-Wl,'
--      # PIC (with -KPIC) is the default.
--      lt_prog_compiler_static_F77='-non_shared'
--      ;;
- 
--    newsos6)
--      lt_prog_compiler_pic_F77='-KPIC'
--      lt_prog_compiler_static_F77='-Bstatic'
--      ;;
- 
--    linux*)
--      case $cc_basename in
--      icc* | ecc*)
--	lt_prog_compiler_wl_F77='-Wl,'
--	lt_prog_compiler_pic_F77='-KPIC'
--	lt_prog_compiler_static_F77='-static'
--        ;;
--      pgcc* | pgf77* | pgf90* | pgf95*)
--        # Portland Group compilers (*not* the Pentium gcc compiler,
--	# which looks to be a dead project)
--	lt_prog_compiler_wl_F77='-Wl,'
--	lt_prog_compiler_pic_F77='-fpic'
--	lt_prog_compiler_static_F77='-Bstatic'
--        ;;
--      ccc*)
--        lt_prog_compiler_wl_F77='-Wl,'
--        # All Alpha code is PIC.
--        lt_prog_compiler_static_F77='-non_shared'
--        ;;
--      esac
--      ;;
- 
--    osf3* | osf4* | osf5*)
--      lt_prog_compiler_wl_F77='-Wl,'
--      # All OSF/1 code is PIC.
--      lt_prog_compiler_static_F77='-non_shared'
--      ;;
- 
--    solaris*)
--      lt_prog_compiler_pic_F77='-KPIC'
--      lt_prog_compiler_static_F77='-Bstatic'
--      case $cc_basename in
--      f77* | f90* | f95*)
--	lt_prog_compiler_wl_F77='-Qoption ld ';;
--      *)
--	lt_prog_compiler_wl_F77='-Wl,';;
--      esac
--      ;;
- 
--    sunos4*)
--      lt_prog_compiler_wl_F77='-Qoption ld '
--      lt_prog_compiler_pic_F77='-PIC'
--      lt_prog_compiler_static_F77='-Bstatic'
--      ;;
- 
--    sysv4 | sysv4.2uw2* | sysv4.3*)
--      lt_prog_compiler_wl_F77='-Wl,'
--      lt_prog_compiler_pic_F77='-KPIC'
--      lt_prog_compiler_static_F77='-Bstatic'
--      ;;
- 
--    sysv4*MP*)
--      if test -d /usr/nec ;then
--	lt_prog_compiler_pic_F77='-Kconform_pic'
--	lt_prog_compiler_static_F77='-Bstatic'
--      fi
--      ;;
- 
--    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
--      lt_prog_compiler_wl_F77='-Wl,'
--      lt_prog_compiler_pic_F77='-KPIC'
--      lt_prog_compiler_static_F77='-Bstatic'
--      ;;
- 
--    unicos*)
--      lt_prog_compiler_wl_F77='-Wl,'
--      lt_prog_compiler_can_build_shared_F77=no
--      ;;
- 
--    uts4*)
--      lt_prog_compiler_pic_F77='-pic'
--      lt_prog_compiler_static_F77='-Bstatic'
--      ;;
- 
--    *)
--      lt_prog_compiler_can_build_shared_F77=no
--      ;;
--    esac
--  fi
- 
--echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
--echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6
- 
--#
--# Check to make sure the PIC flag actually works.
--#
--if test -n "$lt_prog_compiler_pic_F77"; then
- 
--echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
--echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6
--if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  lt_prog_compiler_pic_works_F77=no
--  ac_outfile=conftest.$ac_objext
--   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
--   lt_compiler_flag="$lt_prog_compiler_pic_F77"
--   # Insert the option either (1) after the last *FLAGS variable, or
--   # (2) before a word containing "conftest.", or (3) at the end.
--   # 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:13308: $lt_compile\"" >&5)
--   (eval "$lt_compile" 2>conftest.err)
--   ac_status=$?
--   cat conftest.err >&5
--   echo "$as_me:13312: \$? = $ac_status" >&5
--   if (exit $ac_status) && test -s "$ac_outfile"; then
--     # The compiler can only warn and ignore the option if not recognized
--     # So say no if there are warnings other than the usual output.
--     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
--     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
--     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
--       lt_prog_compiler_pic_works_F77=yes
--     fi
--   fi
--   $rm conftest*
- 
--fi
--echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
--echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6
- 
--if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
--    case $lt_prog_compiler_pic_F77 in
--     "" | " "*) ;;
--     *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;;
--     esac
--else
--    lt_prog_compiler_pic_F77=
--     lt_prog_compiler_can_build_shared_F77=no
--fi
- 
--fi
--case $host_os in
--  # For platforms which do not support PIC, -DPIC is meaningless:
--  *djgpp*)
--    lt_prog_compiler_pic_F77=
--    ;;
--  *)
--    lt_prog_compiler_pic_F77="$lt_prog_compiler_pic_F77"
--    ;;
--esac
- 
--#
--# Check to make sure the static flag actually works.
--#
--wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"
--echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
--echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
--if test "${lt_prog_compiler_static_works_F77+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  lt_prog_compiler_static_works_F77=no
--   save_LDFLAGS="$LDFLAGS"
--   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
--   printf "$lt_simple_link_test_code" > conftest.$ac_ext
--   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
--     # The linker can only warn and ignore the option if not recognized
--     # So say no if there are warnings
--     if test -s conftest.err; then
--       # Append any errors to the config.log.
--       cat conftest.err 1>&5
--       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
--       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
--       if diff conftest.exp conftest.er2 >/dev/null; then
--         lt_prog_compiler_static_works_F77=yes
--       fi
--     else
--       lt_prog_compiler_static_works_F77=yes
--     fi
--   fi
--   $rm conftest*
--   LDFLAGS="$save_LDFLAGS"
- 
--fi
--echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5
--echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6
- 
--if test x"$lt_prog_compiler_static_works_F77" = xyes; then
--    :
--else
--    lt_prog_compiler_static_F77=
--fi
- 
- 
--echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
--echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
--if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  lt_cv_prog_compiler_c_o_F77=no
--   $rm -r conftest 2>/dev/null
--   mkdir conftest
--   cd conftest
--   mkdir out
--   printf "$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:13412: $lt_compile\"" >&5)
--   (eval "$lt_compile" 2>out/conftest.err)
--   ac_status=$?
--   cat out/conftest.err >&5
--   echo "$as_me:13416: \$? = $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
--     # 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_cv_prog_compiler_c_o_F77=yes
--     fi
--   fi
--   chmod u+w . 2>&5
--   $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 ..
--   rmdir conftest
--   $rm conftest*
- 
--fi
--echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
--echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6
- 
- 
--hard_links="nottested"
--if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then
--  # do not overwrite the value of need_locks provided by the user
--  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
--echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
--  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
--  echo "$as_me:$LINENO: result: $hard_links" >&5
--echo "${ECHO_T}$hard_links" >&6
--  if test "$hard_links" = no; then
--    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
--echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
--    need_locks=warn
--  fi
--else
--  need_locks=no
--fi
- 
--echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
--echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
- 
--  runpath_var=
--  allow_undefined_flag_F77=
--  enable_shared_with_static_runtimes_F77=no
--  archive_cmds_F77=
--  archive_expsym_cmds_F77=
--  old_archive_From_new_cmds_F77=
--  old_archive_from_expsyms_cmds_F77=
--  export_dynamic_flag_spec_F77=
--  whole_archive_flag_spec_F77=
--  thread_safe_flag_spec_F77=
--  hardcode_libdir_flag_spec_F77=
--  hardcode_libdir_flag_spec_ld_F77=
--  hardcode_libdir_separator_F77=
--  hardcode_direct_F77=no
--  hardcode_minus_L_F77=no
--  hardcode_shlibpath_var_F77=unsupported
--  link_all_deplibs_F77=unknown
--  hardcode_automatic_F77=no
--  module_cmds_F77=
--  module_expsym_cmds_F77=
--  always_export_symbols_F77=no
--  export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
--  # include_expsyms should be a list of space-separated symbols to be *always*
--  # included in the symbol list
--  include_expsyms_F77=
--  # 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'.
--  exclude_expsyms_F77="_GLOBAL_OFFSET_TABLE_"
--  # 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.
--  extract_expsyms_cmds=
--  # Just being paranoid about ensuring that cc_basename is set.
--  for cc_temp in $compiler""; 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-%%"`
- 
--  case $host_os in
--  cygwin* | mingw* | pw32*)
--    # 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
--    ;;
--  esac
- 
--  ld_shlibs_F77=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
--    hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir'
--    export_dynamic_flag_spec_F77='${wl}--export-dynamic'
--    # ancient GNU ld didn't support --whole-archive et. al.
--    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
--	whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
--      else
--  	whole_archive_flag_spec_F77=
--    fi
--    supports_anon_versioning=no
--    case `$LD -v 2>/dev/null` in
--      *\ [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
--    aix3* | aix4* | aix5*)
--      # On AIX/PPC, the GNU linker is very broken
--      if test "$host_cpu" != ia64; then
--	ld_shlibs_F77=no
--	cat <<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.
- 
--EOF
--      fi
--      ;;
- 
--    amigaos*)
--      archive_cmds_F77='$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)'
--      hardcode_libdir_flag_spec_F77='-L$libdir'
--      hardcode_minus_L_F77=yes
--
--      # Samuel A. Falvo II <kc5tja at dolphin.openprojects.net> reports
--      # that the semantics of dynamic libraries on AmigaOS, at least up
--      # to version 4, is to share data among multiple programs linked
--      # with the same dynamic library.  Since this doesn't match the
--      # behavior of shared libraries on other platforms, we can't use
--      # them.
--      ld_shlibs_F77=no
--      ;;
- 
--    beos*)
--      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
--	allow_undefined_flag_F77=unsupported
--	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
--	# support --undefined.  This deserves some investigation.  FIXME
--	archive_cmds_F77='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--      else
--	ld_shlibs_F77=no
--      fi
--      ;;
- 
--    cygwin* | mingw* | pw32*)
--      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless,
--      # as there is no search path for DLLs.
--      hardcode_libdir_flag_spec_F77='-L$libdir'
--      allow_undefined_flag_F77=unsupported
--      always_export_symbols_F77=no
--      enable_shared_with_static_runtimes_F77=yes
--      export_symbols_cmds_F77='$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
--        archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
--	# If the export-symbols file already is a .def file (1st line
--	# is EXPORTS), use it as is; otherwise, prepend...
--	archive_expsym_cmds_F77='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
--	ld_shlibs_F77=no
--      fi
--      ;;
- 
--    interix3*)
--      hardcode_direct_F77=no
--      hardcode_shlibpath_var_F77=no
--      hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
--      export_dynamic_flag_spec_F77='${wl}-E'
--      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
--      # Instead, shared libraries are loaded at an image base (0x10000000 by
--      # default) and relocated if they conflict, which is a slow very memory
--      # consuming and fragmenting process.  To avoid this, we pick a random,
--      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
--      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
--      archive_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
--      archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
--      ;;
- 
--    linux*)
--      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
--	tmp_addflag=
--	case $cc_basename,$host_cpu in
--	pgcc*)				# Portland Group C compiler
--	  whole_archive_flag_spec_F77='${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
--	  whole_archive_flag_spec_F77='${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' ;;
--	esac
--	archive_cmds_F77='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- 
--	if test $supports_anon_versioning = yes; then
--	  archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
--  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
--  $echo "local: *; };" >> $output_objdir/$libname.ver~
--	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
--	fi
--      else
--	ld_shlibs_F77=no
--      fi
--      ;;
- 
--    netbsd*)
--      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
--	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
--	wlarc=
--      else
--	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--	archive_expsym_cmds_F77='$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
--	ld_shlibs_F77=no
--	cat <<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.
- 
--EOF
--      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
--	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
--      else
--	ld_shlibs_F77=no
--      fi
--      ;;
- 
--    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
--      case `$LD -v 2>&1` in
--        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
--	ld_shlibs_F77=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
--	;;
--	*)
--	  if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
--	    hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
--	    archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
--	    archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
--	  else
--	    ld_shlibs_F77=no
--	  fi
--	;;
--      esac
--      ;;
- 
--    sunos4*)
--      archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
--      wlarc=
--      hardcode_direct_F77=yes
--      hardcode_shlibpath_var_F77=no
--      ;;
- 
--    *)
--      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
--	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
--      else
--	ld_shlibs_F77=no
--      fi
--      ;;
--    esac
- 
--    if test "$ld_shlibs_F77" = no; then
--      runpath_var=
--      hardcode_libdir_flag_spec_F77=
--      export_dynamic_flag_spec_F77=
--      whole_archive_flag_spec_F77=
--    fi
--  else
--    # PORTME fill in a description of your system's linker (not GNU ld)
--    case $host_os in
--    aix3*)
--      allow_undefined_flag_F77=unsupported
--      always_export_symbols_F77=yes
--      archive_expsym_cmds_F77='$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.
--      hardcode_minus_L_F77=yes
--      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
--	# Neither direct hardcoding nor static linking is supported with a
--	# broken collect2.
--	hardcode_direct_F77=unsupported
--      fi
--      ;;
- 
--    aix4* | aix5*)
--      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
--	  export_symbols_cmds_F77='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
--	else
--	  export_symbols_cmds_F77='$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].*|aix5*)
--	  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.
- 
--      archive_cmds_F77=''
--      hardcode_direct_F77=yes
--      hardcode_libdir_separator_F77=':'
--      link_all_deplibs_F77=yes
- 
--      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
--  	  hardcode_direct_F77=yes
--	  else
--  	  # We have old collect2
--  	  hardcode_direct_F77=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
--  	  hardcode_minus_L_F77=yes
--  	  hardcode_libdir_flag_spec_F77='-L$libdir'
--  	  hardcode_libdir_separator_F77=
--	  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
- 
--      # It seems that -bexpall does not export symbols beginning with
--      # underscore (_), so it is better to generate a list of symbols to export.
--      always_export_symbols_F77=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.
--	allow_undefined_flag_F77='-berok'
--       # Determine the default libpath from the value encoded in an empty executable.
--       cat >conftest.$ac_ext <<_ACEOF
--      program main
--
--      end
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_f77_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
- 
--aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
--}'`
--# 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 '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
--}'`; fi
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
- 
--fi
--rm -f conftest.err conftest.$ac_objext \
--      conftest$ac_exeext conftest.$ac_ext
--if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- 
--       hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
--	archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
--       else
--	if test "$host_cpu" = ia64; then
--	  hardcode_libdir_flag_spec_F77='${wl}-R $libdir:/usr/lib:/lib'
--	  allow_undefined_flag_F77="-z nodefs"
--	  archive_expsym_cmds_F77="\$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.
--	 cat >conftest.$ac_ext <<_ACEOF
--      program main
--
--      end
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_f77_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
- 
--aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
--}'`
--# 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 '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
--}'`; fi
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
- 
--fi
--rm -f conftest.err conftest.$ac_objext \
--      conftest$ac_exeext conftest.$ac_ext
--if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- 
--	 hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
--	  # Warning - without using the other run time loading flags,
--	  # -berok will link without error, but may produce a broken library.
--	  no_undefined_flag_F77=' ${wl}-bernotok'
--	  allow_undefined_flag_F77=' ${wl}-berok'
--	  # Exported symbols can be pulled into shared objects from archives
--	  whole_archive_flag_spec_F77='$convenience'
--	  archive_cmds_need_lc_F77=yes
--	  # This is similar to how AIX traditionally builds its shared libraries.
--	  archive_expsym_cmds_F77="\$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*)
--      archive_cmds_F77='$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)'
--      hardcode_libdir_flag_spec_F77='-L$libdir'
--      hardcode_minus_L_F77=yes
--      # see comment about different semantics on the GNU ld section
--      ld_shlibs_F77=no
--      ;;
- 
--    bsdi[45]*)
--      export_dynamic_flag_spec_F77=-rdynamic
--      ;;
- 
--    cygwin* | mingw* | pw32*)
--      # 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.
--      hardcode_libdir_flag_spec_F77=' '
--      allow_undefined_flag_F77=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.
--      archive_cmds_F77='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
--      # The linker will automatically build a .lib file if we build a DLL.
--      old_archive_From_new_cmds_F77='true'
--      # FIXME: Should let the user specify the lib program.
--      old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs'
--      fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
--      enable_shared_with_static_runtimes_F77=yes
--      ;;
- 
--    darwin* | rhapsody*)
--      case $host_os in
--        rhapsody* | darwin1.[012])
--         allow_undefined_flag_F77='${wl}-undefined ${wl}suppress'
--         ;;
--       *) # Darwin 1.3 on
--         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
--           allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
--         else
--           case ${MACOSX_DEPLOYMENT_TARGET} in
--             10.[012])
--               allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
--               ;;
--             10.*)
--               allow_undefined_flag_F77='${wl}-undefined ${wl}dynamic_lookup'
--               ;;
--           esac
--         fi
--         ;;
--      esac
--      archive_cmds_need_lc_F77=no
--      hardcode_direct_F77=no
--      hardcode_automatic_F77=yes
--      hardcode_shlibpath_var_F77=unsupported
--      whole_archive_flag_spec_F77=''
--      link_all_deplibs_F77=yes
--    if test "$GCC" = yes ; then
--    	output_verbose_link_cmd='echo'
--        archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--      module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
--      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
--      archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--      module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--    else
--      case $cc_basename in
--        xlc*)
--         output_verbose_link_cmd='echo'
--         archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
--         module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
--          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
--         archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--          module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--          ;;
--       *)
--         ld_shlibs_F77=no
--          ;;
--      esac
--    fi
--      ;;
- 
--    dgux*)
--      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--      hardcode_libdir_flag_spec_F77='-L$libdir'
--      hardcode_shlibpath_var_F77=no
--      ;;
- 
--    freebsd1*)
--      ld_shlibs_F77=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*)
--      archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
--      hardcode_libdir_flag_spec_F77='-R$libdir'
--      hardcode_direct_F77=yes
--      hardcode_shlibpath_var_F77=no
--      ;;
- 
--    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
--    freebsd2*)
--      archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
--      hardcode_direct_F77=yes
--      hardcode_minus_L_F77=yes
--      hardcode_shlibpath_var_F77=no
--      ;;
- 
--    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--    freebsd* | kfreebsd*-gnu | dragonfly*)
--      archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
--      hardcode_libdir_flag_spec_F77='-R$libdir'
--      hardcode_direct_F77=yes
--      hardcode_shlibpath_var_F77=no
--      ;;
- 
--    hpux9*)
--      if test "$GCC" = yes; then
--	archive_cmds_F77='$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
--	archive_cmds_F77='$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
--      hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
--      hardcode_libdir_separator_F77=:
--      hardcode_direct_F77=yes
- 
--      # hardcode_minus_L: Not really in the search PATH,
--      # but as the default location of the library.
--      hardcode_minus_L_F77=yes
--      export_dynamic_flag_spec_F77='${wl}-E'
--      ;;
- 
--    hpux10*)
--      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
--	archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
--      else
--	archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
--      fi
--      if test "$with_gnu_ld" = no; then
--	hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
--	hardcode_libdir_separator_F77=:
- 
--	hardcode_direct_F77=yes
--	export_dynamic_flag_spec_F77='${wl}-E'
- 
--	# hardcode_minus_L: Not really in the search PATH,
--	# but as the default location of the library.
--	hardcode_minus_L_F77=yes
--      fi
--      ;;
- 
--    hpux11*)
--      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
--	case $host_cpu in
--	hppa*64*)
--	  archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
--	  ;;
--	ia64*)
--	  archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
--	  ;;
--	*)
--	  archive_cmds_F77='$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*)
--	  archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
--	  ;;
--	ia64*)
--	  archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
--	  ;;
--	*)
--	  archive_cmds_F77='$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
--	hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
--	hardcode_libdir_separator_F77=:
- 
--	case $host_cpu in
--	hppa*64*|ia64*)
--	  hardcode_libdir_flag_spec_ld_F77='+b $libdir'
--	  hardcode_direct_F77=no
--	  hardcode_shlibpath_var_F77=no
--	  ;;
--	*)
--	  hardcode_direct_F77=yes
--	  export_dynamic_flag_spec_F77='${wl}-E'
- 
--	  # hardcode_minus_L: Not really in the search PATH,
--	  # but as the default location of the library.
--	  hardcode_minus_L_F77=yes
--	  ;;
--	esac
--      fi
--      ;;
- 
--    irix5* | irix6* | nonstopux*)
--      if test "$GCC" = yes; then
--	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
--      else
--	archive_cmds_F77='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
--	hardcode_libdir_flag_spec_ld_F77='-rpath $libdir'
--      fi
--      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
--      hardcode_libdir_separator_F77=:
--      link_all_deplibs_F77=yes
--      ;;
- 
--    netbsd*)
--      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
--	archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
--      else
--	archive_cmds_F77='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
--      fi
--      hardcode_libdir_flag_spec_F77='-R$libdir'
--      hardcode_direct_F77=yes
--      hardcode_shlibpath_var_F77=no
--      ;;
- 
--    newsos6)
--      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--      hardcode_direct_F77=yes
--      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
--      hardcode_libdir_separator_F77=:
--      hardcode_shlibpath_var_F77=no
--      ;;
- 
--    openbsd*)
--      hardcode_direct_F77=yes
--      hardcode_shlibpath_var_F77=no
--      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
--	archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
--	archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
--	hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
--	export_dynamic_flag_spec_F77='${wl}-E'
--      else
--       case $host_os in
--	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
--	   archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
--	   hardcode_libdir_flag_spec_F77='-R$libdir'
--	   ;;
--	 *)
--	   archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
--	   hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
--	   ;;
--       esac
--      fi
--      ;;
- 
--    os2*)
--      hardcode_libdir_flag_spec_F77='-L$libdir'
--      hardcode_minus_L_F77=yes
--      allow_undefined_flag_F77=unsupported
--      archive_cmds_F77='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
--      old_archive_From_new_cmds_F77='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
--      ;;
- 
--    osf3*)
--      if test "$GCC" = yes; then
--	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
--	archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
--      else
--	allow_undefined_flag_F77=' -expect_unresolved \*'
--	archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
--      fi
--      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
--      hardcode_libdir_separator_F77=:
--      ;;
- 
--    osf4* | osf5*)	# as osf3* with the addition of -msym flag
--      if test "$GCC" = yes; then
--	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
--	archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
--	hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
--      else
--	allow_undefined_flag_F77=' -expect_unresolved \*'
--	archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
--	archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
--	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
- 
--	# Both c and cxx compiler support -rpath directly
--	hardcode_libdir_flag_spec_F77='-rpath $libdir'
--      fi
--      hardcode_libdir_separator_F77=:
--      ;;
- 
--    solaris*)
--      no_undefined_flag_F77=' -z text'
--      if test "$GCC" = yes; then
--	wlarc='${wl}'
--	archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
--	archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
--	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
--      else
--	wlarc=''
--	archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
--	archive_expsym_cmds_F77='$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'
--      fi
--      hardcode_libdir_flag_spec_F77='-R$libdir'
--      hardcode_shlibpath_var_F77=no
--      case $host_os in
--      solaris2.[0-5] | solaris2.[0-5].*) ;;
--      *)
-- 	# The compiler driver will combine linker options so we
-- 	# cannot just pass the convience library names through
-- 	# without $wl, iff we do not link with $LD.
-- 	# Luckily, gcc supports the same syntax we need for Sun Studio.
-- 	# Supported since Solaris 2.6 (maybe 2.5.1?)
-- 	case $wlarc in
-- 	'')
-- 	  whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;;
-- 	*)
-- 	  whole_archive_flag_spec_F77='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
-- 	esac ;;
--      esac
--      link_all_deplibs_F77=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.
--	archive_cmds_F77='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
--      else
--	archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
--      fi
--      hardcode_libdir_flag_spec_F77='-L$libdir'
--      hardcode_direct_F77=yes
--      hardcode_minus_L_F77=yes
--      hardcode_shlibpath_var_F77=no
--      ;;
- 
--    sysv4)
--      case $host_vendor in
--	sni)
--	  archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--	  hardcode_direct_F77=yes # is this really true???
--	;;
--	siemens)
--	  ## LD is ld it makes a PLAMLIB
--	  ## CC just makes a GrossModule.
--	  archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags'
--	  reload_cmds_F77='$CC -r -o $output$reload_objs'
--	  hardcode_direct_F77=no
--        ;;
--	motorola)
--	  archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--	  hardcode_direct_F77=no #Motorola manual says yes, but my tests say they lie
--	;;
--      esac
--      runpath_var='LD_RUN_PATH'
--      hardcode_shlibpath_var_F77=no
--      ;;
- 
--    sysv4.3*)
--      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--      hardcode_shlibpath_var_F77=no
--      export_dynamic_flag_spec_F77='-Bexport'
--      ;;
- 
--    sysv4*MP*)
--      if test -d /usr/nec; then
--	archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--	hardcode_shlibpath_var_F77=no
--	runpath_var=LD_RUN_PATH
--	hardcode_runpath_var=yes
--	ld_shlibs_F77=yes
--      fi
--      ;;
- 
--    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
--      no_undefined_flag_F77='${wl}-z,text'
--      archive_cmds_need_lc_F77=no
--      hardcode_shlibpath_var_F77=no
--      runpath_var='LD_RUN_PATH'
- 
--      if test "$GCC" = yes; then
--	archive_cmds_F77='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
--	archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
--      else
--	archive_cmds_F77='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
--	archive_expsym_cmds_F77='$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.
--      no_undefined_flag_F77='${wl}-z,text'
--      allow_undefined_flag_F77='${wl}-z,nodefs'
--      archive_cmds_need_lc_F77=no
--      hardcode_shlibpath_var_F77=no
--      hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
--      hardcode_libdir_separator_F77=':'
--      link_all_deplibs_F77=yes
--      export_dynamic_flag_spec_F77='${wl}-Bexport'
--      runpath_var='LD_RUN_PATH'
- 
--      if test "$GCC" = yes; then
--	archive_cmds_F77='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
--	archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
--      else
--	archive_cmds_F77='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
--	archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
--      fi
--      ;;
- 
--    uts4*)
--      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--      hardcode_libdir_flag_spec_F77='-L$libdir'
--      hardcode_shlibpath_var_F77=no
--      ;;
- 
--    *)
--      ld_shlibs_F77=no
--      ;;
--    esac
--  fi
- 
--echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
--echo "${ECHO_T}$ld_shlibs_F77" >&6
--test "$ld_shlibs_F77" = no && can_build_shared=no
- 
--#
--# Do we need to explicitly link libc?
--#
--case "x$archive_cmds_need_lc_F77" in
--x|xyes)
--  # Assume -lc should be added
--  archive_cmds_need_lc_F77=yes
- 
--  if test "$enable_shared" = yes && test "$GCC" = yes; then
--    case $archive_cmds_F77 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.
--      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
--echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
--      $rm conftest*
--      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
- 
--      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } 2>conftest.err; then
--        soname=conftest
--        lib=conftest
--        libobjs=conftest.$ac_objext
--        deplibs=
--        wl=$lt_prog_compiler_wl_F77
--	pic_flag=$lt_prog_compiler_pic_F77
--        compiler_flags=-v
--        linker_flags=-v
--        verstring=
--        output_objdir=.
--        libname=conftest
--        lt_save_allow_undefined_flag=$allow_undefined_flag_F77
--        allow_undefined_flag_F77=
--        if { (eval echo "$as_me:$LINENO: \"$archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
--  (eval $archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }
--        then
--	  archive_cmds_need_lc_F77=no
--        else
--	  archive_cmds_need_lc_F77=yes
--        fi
--        allow_undefined_flag_F77=$lt_save_allow_undefined_flag
--      else
--        cat conftest.err 1>&5
--      fi
--      $rm conftest*
--      echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
--echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6
--      ;;
--    esac
--  fi
--  ;;
--esac
+-  { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
-+$as_echo_n "checking dynamic linker characteristics... " >&6; }
+ $as_echo_n "checking dynamic linker characteristics... " >&6; }
  
--echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
--echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
-+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=
-@@ -14481,20 +10208,6 @@
- version_type=none
- dynamic_linker="$host_os ld.so"
- sys_lib_dlsearch_path_spec="/lib /usr/lib"
--if test "$GCC" = yes; then
--  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 ';' >/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.
--    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
--else
--  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
--fi
- need_lib_prefix=unknown
- hardcode_into_libs=no
- 
-@@ -14512,7 +10225,7 @@
-   soname_spec='${libname}${release}${shared_ext}$major'
+ if test "$GCC" = yes; then
+@@ -11014,7 +10549,7 @@
    ;;
  
--aix4* | aix5*)
-+aix[4-9]*)
-   version_type=linux
-   need_lib_prefix=no
-   need_version=no
-@@ -14531,7 +10244,7 @@
-       aix4 | aix4.[01] | aix4.[01].*)
-       if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
- 	   echo ' yes '
--	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
-+	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
- 	:
-       else
- 	can_build_shared=no
-@@ -14557,9 +10270,18 @@
-   ;;
- 
- amigaos*)
--  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'
-+  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*)
-@@ -14582,25 +10304,28 @@
-   # libtool to hard-code these into programs
-   ;;
- 
--cygwin* | mingw* | pw32*)
-+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,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'\''`~
-+      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'
-+      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'
-+       $RM \$dlpath'
-     shlibpath_overrides_runpath=yes
- 
-     case $host_os in
-@@ -14609,20 +10334,20 @@
-       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*)
-+    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
-+      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'`
-+        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"`
-+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-       fi
-       ;;
-     pw32*)
-@@ -14646,17 +10371,13 @@
-   version_type=darwin
-   need_lib_prefix=no
-   need_version=no
--  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-+  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-   soname_spec='${libname}${release}${major}$shared_ext'
-   shlibpath_overrides_runpath=yes
-   shlibpath_var=DYLD_LIBRARY_PATH
-   shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
--  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
--  if test "$GCC" = yes; then
--    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
--  else
--    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
--  fi
-+
-+  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
-   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-   ;;
- 
-@@ -14673,18 +10394,6 @@
-   dynamic_linker=no
-   ;;
- 
--kfreebsd*-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='GNU ld.so'
--  ;;
--
- freebsd* | dragonfly*)
-   # DragonFly does not have aout.  When/if they implement a new
-   # versioning mechanism, adjust this.
-@@ -14722,7 +10431,7 @@
-     shlibpath_overrides_runpath=no
-     hardcode_into_libs=yes
-     ;;
--  freebsd*) # from 4.6 on
-+  *) # from 4.6 on, and DragonFly
-     shlibpath_overrides_runpath=yes
-     hardcode_into_libs=yes
-     ;;
-@@ -14761,18 +10470,18 @@
-     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
--     ;;
--   *)
-+  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
-@@ -14785,7 +10494,7 @@
-   postinstall_cmds='chmod 555 $lib'
-   ;;
- 
--interix3*)
-+interix[3-9]*)
-   version_type=linux
-   need_lib_prefix=no
-   need_version=no
-@@ -14840,7 +10549,7 @@
-   ;;
- 
  # This must be Linux ELF.
--linux*)
+-linux* | k*bsd*-gnu)
 +linux* | k*bsd*-gnu | kopensolaris*-gnu)
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -14849,36 +10558,41 @@
-   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_prog_compiler_wl\"; \
-+       LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
+@@ -11028,11 +10563,7 @@
+   save_libdir=$libdir
+   eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
+        LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ int
+@@ -11043,41 +10574,13 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then
 +if ac_fn_c_try_link "$LINENO"; then :
 +  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
-+  shlibpath_overrides_runpath=yes
-+fi
-+fi
+   shlibpath_overrides_runpath=yes
+ fi
+-
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext conftest.$ac_ext
-+  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
+   LDFLAGS=$save_LDFLAGS
+   libdir=$save_libdir
  
--  # find out which ABI we are using
--  libsuff=
--  case "$host_cpu" in
--  x86_64*|s390x*|powerpc64*)
--    echo '#line 14861 "configure"' > conftest.$ac_ext
--    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
--      case `/usr/bin/file conftest.$ac_objext` in
--      *64-bit*)
--        libsuff=64
--        sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
--        ;;
--      esac
--    fi
--    rm -rf conftest*
--    ;;
--  esac
--
-   # 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/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
--    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
-+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-   fi
- 
-   # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -14890,7 +10604,7 @@
-   dynamic_linker='GNU/Linux ld.so'
-   ;;
- 
--knetbsd*-gnu)
-+netbsdelf*-gnu)
-   version_type=linux
-   need_lib_prefix=no
-   need_version=no
-@@ -14899,14 +10613,14 @@
-   shlibpath_var=LD_LIBRARY_PATH
-   shlibpath_overrides_runpath=no
-   hardcode_into_libs=yes
--  dynamic_linker='GNU ld.so'
-+  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
-+  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'
-@@ -14927,14 +10641,16 @@
-   shlibpath_overrides_runpath=yes
-   ;;
- 
--nto-qnx*)
--  version_type=linux
-+*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=yes
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  dynamic_linker='ldqnx.so'
-   ;;
- 
- openbsd*)
-@@ -14943,13 +10659,13 @@
-   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  ;;
-+    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
-+  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
-@@ -14983,6 +10699,10 @@
-   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-   ;;
- 
-+rdos*)
-+  dynamic_linker=no
-+  ;;
-+
- solaris*)
-   version_type=linux
-   need_lib_prefix=no
-@@ -15017,7 +10737,6 @@
-     sni)
-       shlibpath_overrides_runpath=no
-       need_lib_prefix=no
--      export_dynamic_flag_spec='${wl}-Blargedynsym'
-       runpath_var=LD_RUN_PATH
-       ;;
-     siemens)
-@@ -15048,13 +10767,12 @@
-   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'
--    shlibpath_overrides_runpath=no
-   else
-     sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
--    shlibpath_overrides_runpath=yes
-     case $host_os in
-       sco3.2v5*)
-         sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-@@ -15064,6 +10782,17 @@
-   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}'
-@@ -15075,8 +10804,8 @@
+@@ -11301,7 +10804,7 @@
    dynamic_linker=no
    ;;
  esac
--echo "$as_me:$LINENO: result: $dynamic_linker" >&5
--echo "${ECHO_T}$dynamic_linker" >&6
+-{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
-+$as_echo "$dynamic_linker" >&6; }
+ $as_echo "$dynamic_linker" >&6; }
  test "$dynamic_linker" = no && can_build_shared=no
  
- variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-@@ -15084,35 +10813,129 @@
-   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
- fi
+@@ -11403,7 +10906,7 @@
  
--echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
--echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
--hardcode_action_F77=
--if test -n "$hardcode_libdir_flag_spec_F77" || \
--   test -n "$runpath_var_F77" || \
--   test "X$hardcode_automatic_F77" = "Xyes" ; then
-+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
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
  
--  # We can hardcode non-existant directories.
--  if test "$hardcode_direct_F77" != no &&
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
+ 
+-  { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
 +  { $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=
-+if test -n "$hardcode_libdir_flag_spec" ||
-+   test -n "$runpath_var" ||
-+   test "X$hardcode_automatic" = "Xyes" ; then
-+
-+  # We can hardcode non-existent directories.
-+  if test "$hardcode_direct" != 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_AC_TAGVAR(hardcode_shlibpath_var, F77)" != no &&
--     test "$hardcode_minus_L_F77" != no; then
-+     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no &&
-+     test "$hardcode_minus_L" != no; then
-     # Linking always hardcodes the temporary library directory.
--    hardcode_action_F77=relink
-+    hardcode_action=relink
-   else
-     # We can link without hardcoding, and we can hardcode nonexisting dirs.
--    hardcode_action_F77=immediate
-+    hardcode_action=immediate
-   fi
- else
-   # We cannot hardcode anything, or else we can only hardcode existing
+ $as_echo_n "checking how to hardcode library paths into programs... " >&6; }
+ hardcode_action=
+ if test -n "$hardcode_libdir_flag_spec" ||
+@@ -11428,7 +10931,7 @@
    # directories.
--  hardcode_action_F77=unsupported
-+  hardcode_action=unsupported
+   hardcode_action=unsupported
  fi
--echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
--echo "${ECHO_T}$hardcode_action_F77" >&6
+-{ $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
-+$as_echo "$hardcode_action" >&6; }
+ $as_echo "$hardcode_action" >&6; }
  
--if test "$hardcode_action_F77" = relink; then
-+if test "$hardcode_action" = relink ||
-+   test "$inherit_rpath" = yes; then
-   # Fast installation is not supported
-   enable_fast_install=no
- elif test "$shlibpath_overrides_runpath" = yes ||
-@@ -15122,417 +10945,592 @@
- fi
+ if test "$hardcode_action" = relink ||
+@@ -11473,18 +10976,14 @@
  
- 
--# The else clause should only fire when bootstrapping the
--# libtool distribution, otherwise you forgot to ship ltmain.sh
--# with your package, and you will get complaints that there are
--# no rules to generate ltmain.sh.
--if test -f "$ltmain"; then
--  # 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
--  # Now quote all the things that may contain metacharacters while being
--  # careful not to overquote the AC_SUBSTed values.  We take copies of the
--  # variables and quote the copies for generation of the libtool script.
--  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
--    SED SHELL STRIP \
--    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
--    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
--    deplibs_check_method reload_flag reload_cmds need_locks \
--    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
--    lt_cv_sys_global_symbol_to_c_name_address \
--    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
--    old_postinstall_cmds old_postuninstall_cmds \
--    compiler_F77 \
--    CC_F77 \
--    LD_F77 \
--    lt_prog_compiler_wl_F77 \
--    lt_prog_compiler_pic_F77 \
--    lt_prog_compiler_static_F77 \
--    lt_prog_compiler_no_builtin_flag_F77 \
--    export_dynamic_flag_spec_F77 \
--    thread_safe_flag_spec_F77 \
--    whole_archive_flag_spec_F77 \
--    enable_shared_with_static_runtimes_F77 \
--    old_archive_cmds_F77 \
--    old_archive_from_new_cmds_F77 \
--    predep_objects_F77 \
--    postdep_objects_F77 \
--    predeps_F77 \
--    postdeps_F77 \
--    compiler_lib_search_path_F77 \
--    archive_cmds_F77 \
--    archive_expsym_cmds_F77 \
--    postinstall_cmds_F77 \
--    postuninstall_cmds_F77 \
--    old_archive_from_expsyms_cmds_F77 \
--    allow_undefined_flag_F77 \
--    no_undefined_flag_F77 \
--    export_symbols_cmds_F77 \
--    hardcode_libdir_flag_spec_F77 \
--    hardcode_libdir_flag_spec_ld_F77 \
--    hardcode_libdir_separator_F77 \
--    hardcode_automatic_F77 \
--    module_cmds_F77 \
--    module_expsym_cmds_F77 \
--    lt_cv_prog_compiler_c_o_F77 \
--    exclude_expsyms_F77 \
--    include_expsyms_F77; do
--
--    case $var in
--    old_archive_cmds_F77 | \
--    old_archive_from_new_cmds_F77 | \
--    archive_cmds_F77 | \
--    archive_expsym_cmds_F77 | \
--    module_cmds_F77 | \
--    module_expsym_cmds_F77 | \
--    old_archive_from_expsyms_cmds_F77 | \
--    export_symbols_cmds_F77 | \
--    extract_expsyms_cmds | reload_cmds | finish_cmds | \
--    postinstall_cmds | postuninstall_cmds | \
--    old_postinstall_cmds | old_postuninstall_cmds | \
--    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
--      # Double-quote double-evaled strings.
--      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
--      ;;
--    *)
--      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
--      ;;
--    esac
--  done
- 
--  case $lt_echo in
--  *'\$0 --fallback-echo"')
--    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
--    ;;
--  esac
- 
--cfgfile="$ofile"
- 
--  cat <<__EOF__ >> "$cfgfile"
--# ### BEGIN LIBTOOL TAG CONFIG: $tagname
- 
--# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-+  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=
- 
--# Shell to use when invoking shell scripts.
--SHELL=$lt_SHELL
-+  case $host_os in
-+  beos*)
-+    lt_cv_dlopen="load_add_on"
-+    lt_cv_dlopen_libs=
-+    lt_cv_dlopen_self=yes
-+    ;;
- 
--# Whether or not to build shared libraries.
--build_libtool_libs=$enable_shared
-+  mingw* | pw32* | cegcc*)
-+    lt_cv_dlopen="LoadLibrary"
-+    lt_cv_dlopen_libs=
-+    ;;
- 
--# Whether or not to build static libraries.
--build_old_libs=$enable_static
-+  cygwin*)
-+    lt_cv_dlopen="dlopen"
-+    lt_cv_dlopen_libs=
-+    ;;
- 
--# Whether or not to add -lc for building shared libraries.
--build_libtool_need_lc=$archive_cmds_need_lc_F77
-+  darwin*)
-+  # if libdl is installed we need to link against it
+   darwin*)
+   # if libdl is installed we need to link against it
+-    { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-+$as_echo_n "checking for dlopen in -ldl... " >&6; }
+ $as_echo_n "checking for dlopen in -ldl... " >&6; }
+-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
 +if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ldl  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldl  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
+ /* end confdefs.h.  */
  
--# Whether or not to disallow shared libs when runtime libs are static
--allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_F77
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char dlopen ();
-+int
-+main ()
-+{
-+return dlopen ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* Override any GCC internal prototype to avoid an error.
+@@ -11502,43 +11001,18 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
 +if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_dl_dlopen=yes
-+else
+   ac_cv_lib_dl_dlopen=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_dl_dlopen=no
 +  ac_cv_lib_dl_dlopen=no
-+fi
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+ $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
 +if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
-+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-+else
+   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+ else
  
--# Whether or not to optimize for fast installation.
--fast_install=$enable_fast_install
-+    lt_cv_dlopen="dyld"
-+    lt_cv_dlopen_libs=
-+    lt_cv_dlopen_self=yes
+@@ -11551,106 +11025,18 @@
+     ;;
  
--# The host system.
--host_alias=$host_alias
--host=$host
--host_os=$host_os
-+fi
- 
--# The build system.
--build_alias=$build_alias
--build=$build
--build_os=$build_os
-+    ;;
- 
--# An echo program that does not interpret backslashes.
--echo=$lt_echo
-+  *)
+   *)
+-    { $as_echo "$as_me:$LINENO: checking for shl_load" >&5
+-$as_echo_n "checking for shl_load... " >&6; }
+-if test "${ac_cv_func_shl_load+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define shl_load innocuous_shl_load
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char shl_load (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef shl_load
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char shl_load ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined __stub_shl_load || defined __stub___shl_load
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return shl_load ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  ac_cv_func_shl_load=yes
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_func_shl_load=no
+-fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
+-$as_echo "$ac_cv_func_shl_load" >&6; }
+-if test "x$ac_cv_func_shl_load" = x""yes; then
 +    ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
 +if test "x$ac_cv_func_shl_load" = x""yes; then :
-+  lt_cv_dlopen="shl_load"
-+else
+   lt_cv_dlopen="shl_load"
+ else
+-  { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
-+$as_echo_n "checking for shl_load in -ldld... " >&6; }
+ $as_echo_n "checking for shl_load in -ldld... " >&6; }
+-if test "${ac_cv_lib_dld_shl_load+set}" = set; then
 +if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ldld  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldld  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
+ /* end confdefs.h.  */
  
--# The archiver.
--AR=$lt_AR
--AR_FLAGS=$lt_AR_FLAGS
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char shl_load ();
-+int
-+main ()
-+{
-+return shl_load ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* Override any GCC internal prototype to avoid an error.
+@@ -11668,145 +11054,32 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
 +if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_dld_shl_load=yes
-+else
+   ac_cv_lib_dld_shl_load=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_dld_shl_load=no
 +  ac_cv_lib_dld_shl_load=no
-+fi
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
-+$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
+ $as_echo "$ac_cv_lib_dld_shl_load" >&6; }
+-if test "x$ac_cv_lib_dld_shl_load" = x""yes; then
 +if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
-+  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
-+else
+   lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
+ else
+-  { $as_echo "$as_me:$LINENO: checking for dlopen" >&5
+-$as_echo_n "checking for dlopen... " >&6; }
+-if test "${ac_cv_func_dlopen+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define dlopen innocuous_dlopen
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char dlopen (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef dlopen
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char dlopen ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined __stub_dlopen || defined __stub___dlopen
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return dlopen ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  ac_cv_func_dlopen=yes
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_func_dlopen=no
+-fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
+-$as_echo "$ac_cv_func_dlopen" >&6; }
+-if test "x$ac_cv_func_dlopen" = x""yes; then
 +  ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
 +if test "x$ac_cv_func_dlopen" = x""yes; then :
-+  lt_cv_dlopen="dlopen"
-+else
+   lt_cv_dlopen="dlopen"
+ else
+-  { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-+$as_echo_n "checking for dlopen in -ldl... " >&6; }
+ $as_echo_n "checking for dlopen in -ldl... " >&6; }
+-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
 +if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ldl  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldl  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
+ /* end confdefs.h.  */
  
--# A C compiler.
--LTCC=$lt_LTCC
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char dlopen ();
-+int
-+main ()
-+{
-+return dlopen ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* Override any GCC internal prototype to avoid an error.
+@@ -11824,57 +11097,28 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
 +if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_dl_dlopen=yes
-+else
+   ac_cv_lib_dl_dlopen=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_dl_dlopen=no
 +  ac_cv_lib_dl_dlopen=no
-+fi
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+ $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
 +if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
-+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-+else
+   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+ else
+-  { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
-+$as_echo_n "checking for dlopen in -lsvld... " >&6; }
+ $as_echo_n "checking for dlopen in -lsvld... " >&6; }
+-if test "${ac_cv_lib_svld_dlopen+set}" = set; then
 +if test "${ac_cv_lib_svld_dlopen+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lsvld  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsvld  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
+ /* end confdefs.h.  */
  
--# LTCC compiler flags.
--LTCFLAGS=$lt_LTCFLAGS
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char dlopen ();
-+int
-+main ()
-+{
-+return dlopen ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* Override any GCC internal prototype to avoid an error.
+@@ -11892,57 +11136,28 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
 +if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_svld_dlopen=yes
-+else
+   ac_cv_lib_svld_dlopen=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_svld_dlopen=no
 +  ac_cv_lib_svld_dlopen=no
-+fi
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
-+$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
+ $as_echo "$ac_cv_lib_svld_dlopen" >&6; }
+-if test "x$ac_cv_lib_svld_dlopen" = x""yes; then
 +if test "x$ac_cv_lib_svld_dlopen" = x""yes; then :
-+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
-+else
+   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
+ else
+-  { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
-+$as_echo_n "checking for dld_link in -ldld... " >&6; }
+ $as_echo_n "checking for dld_link in -ldld... " >&6; }
+-if test "${ac_cv_lib_dld_dld_link+set}" = set; then
 +if test "${ac_cv_lib_dld_dld_link+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ldld  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldld  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
+ /* end confdefs.h.  */
  
--# A language-specific compiler.
--CC=$lt_compiler_F77
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char dld_link ();
-+int
-+main ()
-+{
-+return dld_link ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* Override any GCC internal prototype to avoid an error.
+@@ -11960,43 +11175,18 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
 +if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_dld_dld_link=yes
-+else
+   ac_cv_lib_dld_dld_link=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_dld_dld_link=no
 +  ac_cv_lib_dld_dld_link=no
-+fi
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
-+$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
+ $as_echo "$ac_cv_lib_dld_dld_link" >&6; }
+-if test "x$ac_cv_lib_dld_dld_link" = x""yes; then
 +if test "x$ac_cv_lib_dld_dld_link" = x""yes; then :
-+  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
-+fi
+   lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
+ fi
  
--# Is the compiler the GNU C compiler?
--with_gcc=$GCC_F77
+@@ -12035,9 +11225,9 @@
+     save_LIBS="$LIBS"
+     LIBS="$lt_cv_dlopen_libs $LIBS"
  
--gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
--gcc_ver=\`gcc -dumpversion\`
-+fi
- 
--# An ERE matcher.
--EGREP=$lt_EGREP
- 
--# The linker used to build libraries.
--LD=$lt_LD_F77
-+fi
- 
--# Whether we need hard or soft links.
--LN_S=$lt_LN_S
- 
--# A BSD-compatible nm program.
--NM=$lt_NM
-+fi
- 
--# A symbol stripping program
--STRIP=$lt_STRIP
- 
--# Used to examine libraries when file_magic_cmd begins "file"
--MAGIC_CMD=$MAGIC_CMD
-+fi
- 
--# Used on cygwin: DLL creation program.
--DLLTOOL="$DLLTOOL"
- 
--# Used on cygwin: object dumper.
--OBJDUMP="$OBJDUMP"
-+fi
- 
--# Used on cygwin: assembler.
--AS="$AS"
-+    ;;
-+  esac
- 
--# The name of the directory that contains temporary libtool files.
--objdir=$objdir
-+  if test "x$lt_cv_dlopen" != xno; then
-+    enable_dlopen=yes
-+  else
-+    enable_dlopen=no
-+  fi
- 
--# How to create reloadable object files.
--reload_flag=$lt_reload_flag
--reload_cmds=$lt_reload_cmds
-+  case $lt_cv_dlopen in
-+  dlopen)
-+    save_CPPFLAGS="$CPPFLAGS"
-+    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
- 
--# How to pass a linker flag through the compiler.
--wl=$lt_lt_prog_compiler_wl_F77
-+    save_LDFLAGS="$LDFLAGS"
-+    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
- 
--# Object file suffix (normally "o").
--objext="$ac_objext"
-+    save_LIBS="$LIBS"
-+    LIBS="$lt_cv_dlopen_libs $LIBS"
- 
--# Old archive suffix (normally "a").
--libext="$libext"
+-    { $as_echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
-+$as_echo_n "checking whether a program can dlopen itself... " >&6; }
+ $as_echo_n "checking whether a program can dlopen itself... " >&6; }
+-if test "${lt_cv_dlopen_self+set}" = set; then
 +if test "${lt_cv_dlopen_self+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  	  if test "$cross_compiling" = yes; then :
-+  lt_cv_dlopen_self=cross
-+else
-+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-+  lt_status=$lt_dlunknown
-+  cat > conftest.$ac_ext <<_LT_EOF
+   $as_echo_n "(cached) " >&6
+ else
+   	  if test "$cross_compiling" = yes; then :
+@@ -12046,7 +11236,7 @@
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-#line 12049 "configure"
 +#line 11239 "configure"
-+#include "confdefs.h"
+ #include "confdefs.h"
  
--# Shared library suffix (normally ".so").
--shrext_cmds='$shrext_cmds'
-+#if HAVE_DLFCN_H
-+#include <dlfcn.h>
-+#endif
- 
--# Executable file suffix (normally "").
--exeext="$exeext"
-+#include <stdio.h>
- 
--# Additional compiler flags for building library objects.
--pic_flag=$lt_lt_prog_compiler_pic_F77
--pic_mode=$pic_mode
-+#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
- 
--# What is the maximum length of a command?
--max_cmd_len=$lt_cv_sys_max_cmd_len
-+void fnord() { int i=42;}
-+int main ()
-+{
-+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-+  int status = $lt_dlunknown;
- 
--# Does compiler simultaneously support -c and -o options?
--compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
-+  if (self)
-+    {
-+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-+      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-+      /* dlclose (self); */
-+    }
-+  else
-+    puts (dlerror ());
- 
--# Must we lock files when doing compilation?
--need_locks=$lt_need_locks
-+  return status;
-+}
-+_LT_EOF
+ #if HAVE_DLFCN_H
+@@ -12105,11 +11295,11 @@
+   return status;
+ }
+ _LT_EOF
+-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 +  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 +  test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
-+    (./conftest; exit; ) >&5 2>/dev/null
-+    lt_status=$?
-+    case x$lt_status in
-+      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-+      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
-+      x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;;
-+    esac
-+  else :
-+    # compilation failed
-+    lt_cv_dlopen_self=no
-+  fi
-+fi
-+rm -fr conftest*
+     (./conftest; exit; ) >&5 2>/dev/null
+     lt_status=$?
+     case x$lt_status in
+@@ -12126,14 +11316,14 @@
  
--# Do we need the lib prefix for modules?
--need_lib_prefix=$need_lib_prefix
  
--# Do we need a version for libraries?
--need_version=$need_version
-+fi
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
-+$as_echo "$lt_cv_dlopen_self" >&6; }
+ $as_echo "$lt_cv_dlopen_self" >&6; }
  
--# Whether dlopen is supported.
--dlopen_support=$enable_dlopen
-+    if test "x$lt_cv_dlopen_self" = xyes; then
-+      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+     if test "x$lt_cv_dlopen_self" = xyes; then
+       wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+-      { $as_echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
 +      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
-+$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
+ $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
+-if test "${lt_cv_dlopen_self_static+set}" = set; then
 +if test "${lt_cv_dlopen_self_static+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  	  if test "$cross_compiling" = yes; then :
-+  lt_cv_dlopen_self_static=cross
-+else
-+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-+  lt_status=$lt_dlunknown
-+  cat > conftest.$ac_ext <<_LT_EOF
+   $as_echo_n "(cached) " >&6
+ else
+   	  if test "$cross_compiling" = yes; then :
+@@ -12142,7 +11332,7 @@
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-#line 12145 "configure"
 +#line 11335 "configure"
-+#include "confdefs.h"
+ #include "confdefs.h"
  
--# Whether dlopen of programs is supported.
--dlopen_self=$enable_dlopen_self
-+#if HAVE_DLFCN_H
-+#include <dlfcn.h>
-+#endif
- 
--# Whether dlopen of statically linked programs is supported.
--dlopen_self_static=$enable_dlopen_self_static
-+#include <stdio.h>
- 
--# Compiler flag to prevent dynamic linking.
--link_static_flag=$lt_lt_prog_compiler_static_F77
-+#ifdef RTLD_GLOBAL
-+#  define LT_DLGLOBAL		RTLD_GLOBAL
-+#else
-+#  ifdef DL_GLOBAL
-+#    define LT_DLGLOBAL		DL_GLOBAL
-+#  else
-+#    define LT_DLGLOBAL		0
-+#  endif
-+#endif
- 
--# Compiler flag to turn off builtin functions.
--no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_F77
-+/* 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
- 
--# Compiler flag to allow reflexive dlopens.
--export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_F77
-+void fnord() { int i=42;}
-+int main ()
-+{
-+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-+  int status = $lt_dlunknown;
- 
--# Compiler flag to generate shared objects directly from archives.
--whole_archive_flag_spec=$lt_whole_archive_flag_spec_F77
-+  if (self)
-+    {
-+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-+      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-+      /* dlclose (self); */
-+    }
-+  else
-+    puts (dlerror ());
- 
--# Compiler flag to generate thread-safe objects.
--thread_safe_flag_spec=$lt_thread_safe_flag_spec_F77
-+  return status;
-+}
-+_LT_EOF
+ #if HAVE_DLFCN_H
+@@ -12201,11 +11391,11 @@
+   return status;
+ }
+ _LT_EOF
+-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 +  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 +  test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
-+    (./conftest; exit; ) >&5 2>/dev/null
-+    lt_status=$?
-+    case x$lt_status in
-+      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-+      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
-+      x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;;
-+    esac
-+  else :
-+    # compilation failed
-+    lt_cv_dlopen_self_static=no
-+  fi
-+fi
-+rm -fr conftest*
+     (./conftest; exit; ) >&5 2>/dev/null
+     lt_status=$?
+     case x$lt_status in
+@@ -12222,7 +11412,7 @@
  
--# Library versioning type.
--version_type=$version_type
  
--# Format of library name prefix.
--libname_spec=$lt_libname_spec
-+fi
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
-+$as_echo "$lt_cv_dlopen_self_static" >&6; }
-+    fi
+ $as_echo "$lt_cv_dlopen_self_static" >&6; }
+     fi
  
--# 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.
--library_names_spec=$lt_library_names_spec
-+    CPPFLAGS="$save_CPPFLAGS"
-+    LDFLAGS="$save_LDFLAGS"
-+    LIBS="$save_LIBS"
-+    ;;
-+  esac
+@@ -12261,12 +11451,12 @@
  
--# The coded name of the library, if different from the real name.
--soname_spec=$lt_soname_spec
-+  case $lt_cv_dlopen_self in
-+  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-+  *) enable_dlopen_self=unknown ;;
-+  esac
- 
--# Commands used to build and install an old-style archive.
--RANLIB=$lt_RANLIB
--old_archive_cmds=$lt_old_archive_cmds_F77
--old_postinstall_cmds=$lt_old_postinstall_cmds
--old_postuninstall_cmds=$lt_old_postuninstall_cmds
-+  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
- 
--# Create an old-style archive from a shared archive.
--old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_F77
- 
--# Create a temporary old-style archive to link instead of a shared archive.
--old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_F77
- 
--# Commands used to build and install a shared archive.
--archive_cmds=$lt_archive_cmds_F77
--archive_expsym_cmds=$lt_archive_expsym_cmds_F77
--postinstall_cmds=$lt_postinstall_cmds
--postuninstall_cmds=$lt_postuninstall_cmds
- 
--# Commands used to build a loadable module (assumed same as above if empty)
--module_cmds=$lt_module_cmds_F77
--module_expsym_cmds=$lt_module_expsym_cmds_F77
- 
--# Commands to strip libraries.
--old_striplib=$lt_old_striplib
--striplib=$lt_striplib
- 
--# Dependencies to place before the objects being linked to create a
--# shared library.
--predep_objects=\`echo $lt_predep_objects_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
--
--# Dependencies to place after the objects being linked to create a
--# shared library.
--postdep_objects=\`echo $lt_postdep_objects_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
--
--# Dependencies to place before the objects being linked to create a
--# shared library.
--predeps=$lt_predeps_F77
--
--# Dependencies to place after the objects being linked to create a
--# shared library.
--postdeps=$lt_postdeps_F77
- 
--# The library search path used internally by the compiler when linking
--# a shared library.
--compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_F77 | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
- 
--# Method to check whether dependent libraries are shared objects.
--deplibs_check_method=$lt_deplibs_check_method
- 
--# Command to use when deplibs_check_method == file_magic.
--file_magic_cmd=$lt_file_magic_cmd
- 
--# Flag that allows shared libraries with undefined symbols to be built.
--allow_undefined_flag=$lt_allow_undefined_flag_F77
- 
--# Flag that forces no undefined symbols.
--no_undefined_flag=$lt_no_undefined_flag_F77
- 
--# Commands used to finish a libtool library installation in a directory.
--finish_cmds=$lt_finish_cmds
- 
--# Same as above, but a single script fragment to be evaled but not shown.
--finish_eval=$lt_finish_eval
- 
--# Take the output of nm and produce a listing of raw symbols and C names.
--global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
- 
--# Transform the output of nm in a proper C declaration
--global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
- 
--# Transform the output of nm in a C name address pair
--global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
- 
--# This is the shared library runtime path variable.
--runpath_var=$runpath_var
-+striplib=
-+old_striplib=
+ striplib=
+ old_striplib=
+-{ $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
-+$as_echo_n "checking whether stripping libraries is possible... " >&6; }
-+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"
+ $as_echo_n "checking whether stripping libraries is possible... " >&6; }
+ 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"
+-  { $as_echo "$as_me:$LINENO: result: yes" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+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"
+ $as_echo "yes" >&6; }
+ else
+ # FIXME - insert some real tests, host_os isn't really good enough
+@@ -12275,15 +11465,15 @@
+     if test -n "$STRIP" ; then
+       striplib="$STRIP -x"
+       old_striplib="$STRIP -S"
+-      { $as_echo "$as_me:$LINENO: result: yes" >&5
 +      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+    else
+ $as_echo "yes" >&6; }
+     else
+-      { $as_echo "$as_me:$LINENO: result: no" >&5
 +      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+    fi
-+    ;;
-+  *)
+ $as_echo "no" >&6; }
+     fi
+     ;;
+   *)
+-    { $as_echo "$as_me:$LINENO: result: no" >&5
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+    ;;
-+  esac
-+fi
+ $as_echo "no" >&6; }
+     ;;
+   esac
+@@ -12301,12 +11491,12 @@
  
--# This is the shared library path variable.
--shlibpath_var=$shlibpath_var
  
--# Is shlibpath searched before the hard-coded library search path?
--shlibpath_overrides_runpath=$shlibpath_overrides_runpath
- 
--# How to hardcode a shared library path into an executable.
--hardcode_action=$hardcode_action_F77
- 
--# Whether we should hardcode library paths into libraries.
--hardcode_into_libs=$hardcode_into_libs
- 
--# Flag to hardcode \$libdir into a binary during linking.
--# This must work even if \$libdir does not exist.
--hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_F77
- 
--# If ld is used when linking, flag to hardcode \$libdir into
--# a binary during linking. This must work even if \$libdir does
--# not exist.
--hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_F77
--
--# Whether we need a single -rpath flag with a separated argument.
--hardcode_libdir_separator=$lt_hardcode_libdir_separator_F77
--
--# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
--# resulting binary.
--hardcode_direct=$hardcode_direct_F77
--
--# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
--# resulting binary.
--hardcode_minus_L=$hardcode_minus_L_F77
--
--# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
--# the resulting binary.
--hardcode_shlibpath_var=$hardcode_shlibpath_var_F77
--
--# Set to yes if building a shared library automatically hardcodes DIR into the library
--# and all subsequent libraries and executables linked against it.
--hardcode_automatic=$hardcode_automatic_F77
- 
--# Variables whose values should be saved in libtool wrapper scripts and
--# restored at relink time.
--variables_saved_for_relink="$variables_saved_for_relink"
- 
--# Whether libtool must link a program against all its dependency libraries.
--link_all_deplibs=$link_all_deplibs_F77
- 
--# Compile-time system search path for libraries
--sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
- 
--# Run-time system search path for libraries
--sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
- 
--# Fix the shell variable \$srcfile for the compiler.
--fix_srcfile_path="$fix_srcfile_path_F77"
- 
--# Set to yes if exported symbols are required.
--always_export_symbols=$always_export_symbols_F77
-+  # Report which library types will actually be built
+   # Report which library types will actually be built
+-  { $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
-+$as_echo_n "checking if libtool supports shared libraries... " >&6; }
+ $as_echo_n "checking if libtool supports shared libraries... " >&6; }
+-  { $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
-+$as_echo "$can_build_shared" >&6; }
+ $as_echo "$can_build_shared" >&6; }
  
--# The commands to list exported symbols.
--export_symbols_cmds=$lt_export_symbols_cmds_F77
+-  { $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
-+$as_echo_n "checking whether to build shared libraries... " >&6; }
-+  test "$can_build_shared" = "no" && enable_shared=no
+ $as_echo_n "checking whether to build shared libraries... " >&6; }
+   test "$can_build_shared" = "no" && enable_shared=no
  
--# The commands to extract the exported symbol list from a shared archive.
--extract_expsyms_cmds=$lt_extract_expsyms_cmds
-+  # 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
-+    ;;
- 
--# Symbols that should not be listed in the preloaded symbols.
--exclude_expsyms=$lt_exclude_expsyms_F77
-+  aix[4-9]*)
-+    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-+      test "$enable_shared" = yes && enable_static=no
-+    fi
-+    ;;
-+  esac
+@@ -12327,14 +11517,14 @@
+     fi
+     ;;
+   esac
+-  { $as_echo "$as_me:$LINENO: result: $enable_shared" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
-+$as_echo "$enable_shared" >&6; }
+ $as_echo "$enable_shared" >&6; }
  
--# Symbols that must always be exported.
--include_expsyms=$lt_include_expsyms_F77
+-  { $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5
 +  { $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_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:$LINENO: result: $enable_static" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
-+$as_echo "$enable_static" >&6; }
+ $as_echo "$enable_static" >&6; }
  
--# ### END LIBTOOL TAG CONFIG: $tagname
  
--__EOF__
+@@ -12475,7 +11665,7 @@
  
  
--else
--  # If there is no Makefile yet, we rely on a make rule to execute
--  # `config.status --recheck' to rerun these tests and create the
--  # libtool script then.
--  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
--  if test -f "$ltmain_in"; then
--    test -f Makefile && make "$ltmain"
--  fi
- fi
--
--
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -15541,30 +11539,60 @@
- 
- CC="$lt_save_CC"
- 
--	else
--	  tagname=""
--	fi
--	;;
--
--      GCJ)
--	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
- 
-+ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
- 
-+archive_cmds_need_lc_CXX=no
-+allow_undefined_flag_CXX=
-+always_export_symbols_CXX=no
-+archive_expsym_cmds_CXX=
-+compiler_needs_object_CXX=no
-+export_dynamic_flag_spec_CXX=
-+hardcode_direct_CXX=no
-+hardcode_direct_absolute_CXX=no
-+hardcode_libdir_flag_spec_CXX=
-+hardcode_libdir_flag_spec_ld_CXX=
-+hardcode_libdir_separator_CXX=
-+hardcode_minus_L_CXX=no
-+hardcode_shlibpath_var_CXX=unsupported
-+hardcode_automatic_CXX=no
-+inherit_rpath_CXX=no
-+module_cmds_CXX=
-+module_expsym_cmds_CXX=
-+link_all_deplibs_CXX=unknown
-+old_archive_cmds_CXX=$old_archive_cmds
-+no_undefined_flag_CXX=
-+whole_archive_flag_spec_CXX=
-+enable_shared_with_static_runtimes_CXX=no
- 
--# Source file extension for Java test sources.
--ac_ext=java
-+# Source file extension for C++ test sources.
-+ac_ext=cpp
- 
--# Object file extension for compiled Java test sources.
-+# Object file extension for compiled C++ test sources.
- objext=o
--objext_GCJ=$objext
-+objext_CXX=$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.
-+
-+
- 
--# Code to be used in simple compile tests
--lt_simple_compile_test_code="class foo {}\n"
- 
--# Code to be used in simple link tests
--lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
- 
--# ltmain only uses $CC for tagged configurations so make sure $CC is set.
- 
- # If no C compiler was specified, use CC.
- LTCC=${LTCC-"$CC"}
-@@ -15575,27 +11603,43 @@
- # Allow CC to be a program name with arguments.
- compiler=$CC
- 
--
--# save warnings/boilerplate of simple test code
--ac_outfile=conftest.$ac_objext
--printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-+
-+  # save warnings/boilerplate of simple test code
-+  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*
-+$RM conftest*
- 
--ac_outfile=conftest.$ac_objext
--printf "$lt_simple_link_test_code" >conftest.$ac_ext
-+  ac_outfile=conftest.$ac_objext
-+echo "$lt_simple_link_test_code" >conftest.$ac_ext
- eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
- _lt_linker_boilerplate=`cat conftest.err`
--$rm conftest*
-+$RM -r conftest*
- 
- 
--# Allow CC to be a program name with arguments.
--lt_save_CC="$CC"
--CC=${GCJ-"gcj"}
--compiler=$CC
--compiler_GCJ=$CC
--for cc_temp in $compiler""; do
-+  # 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
-+  compiler_CXX=$CC
-+  for cc_temp in $compiler""; do
-   case $cc_temp in
-     compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-     distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-@@ -15603,6849 +11647,6469 @@
-     *) break;;
-   esac
- done
--cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
--
-+cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
- 
--# GCJ did not exist at the time GCC didn't implicitly link libc in.
--archive_cmds_need_lc_GCJ=no
--
--old_archive_cmds_GCJ=$old_archive_cmds
- 
-+  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_prog_compiler_no_builtin_flag_CXX=' -fno-builtin'
-+    else
-+      lt_prog_compiler_no_builtin_flag_CXX=
-+    fi
- 
--lt_prog_compiler_no_builtin_flag_GCJ=
-+    if test "$GXX" = yes; then
-+      # Set up default GNU C++ configuration
- 
--if test "$GCC" = yes; then
--  lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
- 
- 
--echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
--echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6
--if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+# Check whether --with-gnu-ld was given.
+ # Check whether --with-gnu-ld was given.
+-if test "${with_gnu_ld+set}" = set; then
 +if test "${with_gnu_ld+set}" = set; then :
-+  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
+   withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
  else
--  lt_cv_prog_compiler_rtti_exceptions=no
--  ac_outfile=conftest.$ac_objext
--   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
--   lt_compiler_flag="-fno-rtti -fno-exceptions"
--   # Insert the option either (1) after the last *FLAGS variable, or
--   # (2) before a word containing "conftest.", or (3) at the end.
--   # 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:15639: $lt_compile\"" >&5)
--   (eval "$lt_compile" 2>conftest.err)
--   ac_status=$?
--   cat conftest.err >&5
--   echo "$as_me:15643: \$? = $ac_status" >&5
--   if (exit $ac_status) && test -s "$ac_outfile"; then
--     # The compiler can only warn and ignore the option if not recognized
--     # So say no if there are warnings other than the usual output.
--     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
--     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
--     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
--       lt_cv_prog_compiler_rtti_exceptions=yes
--     fi
--   fi
--   $rm conftest*
--
-+  with_gnu_ld=no
- fi
--echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
--echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6
- 
--if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
--    lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions"
-+ac_prog=ld
-+if test "$GCC" = yes; then
-+  # Check if gcc -print-prog-name=ld gives a path.
+   with_gnu_ld=no
+@@ -12484,7 +11674,7 @@
+ ac_prog=ld
+ if test "$GCC" = yes; then
+   # Check if gcc -print-prog-name=ld gives a path.
+-  { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
-+$as_echo_n "checking for ld used by $CC... " >&6; }
-+  case $host in
-+  *-*-mingw*)
-+    # gcc leaves a trailing carriage return which upsets mingw
-+    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
+ $as_echo_n "checking for ld used by $CC... " >&6; }
+   case $host in
+   *-*-mingw*)
+@@ -12514,13 +11704,13 @@
+     ;;
+   esac
+ elif test "$with_gnu_ld" = yes; then
+-  { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
-+$as_echo_n "checking for GNU ld... " >&6; }
+ $as_echo_n "checking for GNU ld... " >&6; }
  else
--    :
+-  { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
-+$as_echo_n "checking for non-GNU ld... " >&6; }
-+fi
-+if test "${lt_cv_path_LD+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  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.
+ $as_echo_n "checking for non-GNU ld... " >&6; }
  fi
--
- fi
+-if test "${lt_cv_path_LD+set}" = set; then
++if test "${lt_cv_path_LD+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -z "$LD"; then
+@@ -12551,18 +11741,16 @@
  
--lt_prog_compiler_wl_GCJ=
--lt_prog_compiler_pic_GCJ=
--lt_prog_compiler_static_GCJ=
--
--echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
--echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
--
--  if test "$GCC" = yes; then
--    lt_prog_compiler_wl_GCJ='-Wl,'
--    lt_prog_compiler_static_GCJ='-static'
--
--    case $host_os in
--      aix*)
--      # All AIX code is PIC.
--      if test "$host_cpu" = ia64; then
--	# AIX 5 now supports IA64 processor
--	lt_prog_compiler_static_GCJ='-Bstatic'
--      fi
--      ;;
--
--    amigaos*)
--      # 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_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'
--      ;;
--
--    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
--      # PIC is the default for these OSes.
--      ;;
-+LD="$lt_cv_path_LD"
-+if test -n "$LD"; then
+ LD="$lt_cv_path_LD"
+ if test -n "$LD"; then
+-  { $as_echo "$as_me:$LINENO: result: $LD" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
-+$as_echo "$LD" >&6; }
-+else
+ $as_echo "$LD" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
+ $as_echo "no" >&6; }
+ fi
+-test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
+-$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+-   { (exit 1); exit 1; }; }
+-{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
 +test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
-+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+ $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+-if test "${lt_cv_prog_gnu_ld+set}" = set; then
 +if test "${lt_cv_prog_gnu_ld+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  # 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
-+fi
+   $as_echo_n "(cached) " >&6
+ else
+   # I'd rather use --version here, but apparently some GNU lds only accept -v.
+@@ -12575,7 +11763,7 @@
+   ;;
+ esac
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
-+$as_echo "$lt_cv_prog_gnu_ld" >&6; }
-+with_gnu_ld=$lt_cv_prog_gnu_ld
+ $as_echo "$lt_cv_prog_gnu_ld" >&6; }
+ with_gnu_ld=$lt_cv_prog_gnu_ld
  
--    mingw* | pw32* | os2*)
--      # This hack is so that the source file can tell whether it is being
--      # built for inclusion in a dll (and should export symbols for example).
--      lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
--      ;;
+@@ -12630,7 +11818,7 @@
+     fi
  
--    darwin* | rhapsody*)
--      # PIC is the default on this platform
--      # Common symbols not allowed in MH_DYLIB files
--      lt_prog_compiler_pic_GCJ='-fno-common'
--      ;;
- 
--    interix3*)
--      # 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_prog_compiler_can_build_shared_GCJ=no
--      enable_shared=no
--      ;;
- 
--    sysv4*MP*)
--      if test -d /usr/nec; then
--	lt_prog_compiler_pic_GCJ=-Kconform_pic
--      fi
--      ;;
- 
--    hpux*)
--      # 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_prog_compiler_pic_GCJ='-fPIC'
--	;;
--      esac
--      ;;
- 
--    *)
--      lt_prog_compiler_pic_GCJ='-fPIC'
--      ;;
--    esac
--  else
--    # PORTME Check for flag to pass linker flags through the system compiler.
--    case $host_os in
--    aix*)
--      lt_prog_compiler_wl_GCJ='-Wl,'
--      if test "$host_cpu" = ia64; then
--	# AIX 5 now supports IA64 processor
--	lt_prog_compiler_static_GCJ='-Bstatic'
-+      # 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
-+        archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+        archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+
-+        hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-+        export_dynamic_flag_spec_CXX='${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
-+          whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+        else
-+          whole_archive_flag_spec_CXX=
-+        fi
-       else
--	lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
--      fi
--      ;;
--      darwin*)
--        # PIC is the default on this platform
--        # Common symbols not allowed in MH_DYLIB files
--       case $cc_basename in
--         xlc*)
--         lt_prog_compiler_pic_GCJ='-qnocommon'
--         lt_prog_compiler_wl_GCJ='-Wl,'
--         ;;
--       esac
--       ;;
--
--    mingw* | pw32* | os2*)
--      # This hack is so that the source file can tell whether it is being
--      # built for inclusion in a dll (and should export symbols for example).
--      lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
--      ;;
-+        with_gnu_ld=no
-+        wlarc=
- 
--    hpux9* | hpux10* | hpux11*)
--      lt_prog_compiler_wl_GCJ='-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_prog_compiler_pic_GCJ='+Z'
--	;;
--      esac
--      # Is there a better lt_prog_compiler_static that works with the bundled CC?
--      lt_prog_compiler_static_GCJ='${wl}-a ${wl}archive'
--      ;;
-+        # 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.
-+        archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-+      fi
- 
--    irix5* | irix6* | nonstopux*)
--      lt_prog_compiler_wl_GCJ='-Wl,'
--      # PIC (with -KPIC) is the default.
--      lt_prog_compiler_static_GCJ='-non_shared'
--      ;;
-+      # 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"'
- 
--    newsos6)
--      lt_prog_compiler_pic_GCJ='-KPIC'
--      lt_prog_compiler_static_GCJ='-Bstatic'
--      ;;
-+    else
-+      GXX=no
-+      with_gnu_ld=no
-+      wlarc=
-+    fi
- 
--    linux*)
--      case $cc_basename in
--      icc* | ecc*)
--	lt_prog_compiler_wl_GCJ='-Wl,'
--	lt_prog_compiler_pic_GCJ='-KPIC'
--	lt_prog_compiler_static_GCJ='-static'
--        ;;
--      pgcc* | pgf77* | pgf90* | pgf95*)
--        # Portland Group compilers (*not* the Pentium gcc compiler,
--	# which looks to be a dead project)
--	lt_prog_compiler_wl_GCJ='-Wl,'
--	lt_prog_compiler_pic_GCJ='-fpic'
--	lt_prog_compiler_static_GCJ='-Bstatic'
--        ;;
--      ccc*)
--        lt_prog_compiler_wl_GCJ='-Wl,'
--        # All Alpha code is PIC.
--        lt_prog_compiler_static_GCJ='-non_shared'
-+    # PORTME: fill in a description of your system's C++ link characteristics
+     # PORTME: fill in a description of your system's C++ link characteristics
+-    { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
-+    ld_shlibs_CXX=yes
-+    case $host_os in
-+      aix3*)
-+        # FIXME: insert proper C++ library support
-+        ld_shlibs_CXX=no
-         ;;
--      esac
--      ;;
--
--    osf3* | osf4* | osf5*)
--      lt_prog_compiler_wl_GCJ='-Wl,'
--      # All OSF/1 code is PIC.
--      lt_prog_compiler_static_GCJ='-non_shared'
--      ;;
--
--    solaris*)
--      lt_prog_compiler_pic_GCJ='-KPIC'
--      lt_prog_compiler_static_GCJ='-Bstatic'
--      case $cc_basename in
--      f77* | f90* | f95*)
--	lt_prog_compiler_wl_GCJ='-Qoption ld ';;
--      *)
--	lt_prog_compiler_wl_GCJ='-Wl,';;
--      esac
--      ;;
-+      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
- 
--    sunos4*)
--      lt_prog_compiler_wl_GCJ='-Qoption ld '
--      lt_prog_compiler_pic_GCJ='-PIC'
--      lt_prog_compiler_static_GCJ='-Bstatic'
--      ;;
-+          # 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
- 
--    sysv4 | sysv4.2uw2* | sysv4.3*)
--      lt_prog_compiler_wl_GCJ='-Wl,'
--      lt_prog_compiler_pic_GCJ='-KPIC'
--      lt_prog_compiler_static_GCJ='-Bstatic'
--      ;;
-+          exp_sym_flag='-bexport'
-+          no_entry_flag='-bnoentry'
-+        fi
- 
--    sysv4*MP*)
--      if test -d /usr/nec ;then
--	lt_prog_compiler_pic_GCJ='-Kconform_pic'
--	lt_prog_compiler_static_GCJ='-Bstatic'
--      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.
-+
-+        archive_cmds_CXX=''
-+        hardcode_direct_CXX=yes
-+        hardcode_direct_absolute_CXX=yes
-+        hardcode_libdir_separator_CXX=':'
-+        link_all_deplibs_CXX=yes
-+        file_list_spec_CXX='${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
-+	    hardcode_direct_CXX=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
-+	    hardcode_minus_L_CXX=yes
-+	    hardcode_libdir_flag_spec_CXX='-L$libdir'
-+	    hardcode_libdir_separator_CXX=
-+	  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
- 
--    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
--      lt_prog_compiler_wl_GCJ='-Wl,'
--      lt_prog_compiler_pic_GCJ='-KPIC'
--      lt_prog_compiler_static_GCJ='-Bstatic'
--      ;;
-+        export_dynamic_flag_spec_CXX='${wl}-bexpall'
-+        # It seems that -bexpall does not export symbols beginning with
-+        # underscore (_), so it is better to generate a list of symbols to
-+	# export.
-+        always_export_symbols_CXX=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.
-+          allow_undefined_flag_CXX='-berok'
-+          # Determine the default libpath from the value encoded in an empty
-+          # executable.
-+          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
- 
--    unicos*)
--      lt_prog_compiler_wl_GCJ='-Wl,'
--      lt_prog_compiler_can_build_shared_GCJ=no
--      ;;
-+int
-+main ()
-+{
- 
--    uts4*)
--      lt_prog_compiler_pic_GCJ='-pic'
--      lt_prog_compiler_static_GCJ='-Bstatic'
--      ;;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_link "$LINENO"; then :
- 
--    *)
--      lt_prog_compiler_can_build_shared_GCJ=no
--      ;;
--    esac
--  fi
-+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
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- 
--echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
--echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6
-+          hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
- 
--#
--# Check to make sure the PIC flag actually works.
--#
--if test -n "$lt_prog_compiler_pic_GCJ"; then
-+          archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-+        else
-+          if test "$host_cpu" = ia64; then
-+	    hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
-+	    allow_undefined_flag_CXX="-z nodefs"
-+	    archive_expsym_cmds_CXX="\$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.
-+	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
- 
--echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
--echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6
--if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  lt_prog_compiler_pic_works_GCJ=no
--  ac_outfile=conftest.$ac_objext
--   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
--   lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
--   # Insert the option either (1) after the last *FLAGS variable, or
--   # (2) before a word containing "conftest.", or (3) at the end.
--   # 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:15907: $lt_compile\"" >&5)
--   (eval "$lt_compile" 2>conftest.err)
--   ac_status=$?
--   cat conftest.err >&5
--   echo "$as_me:15911: \$? = $ac_status" >&5
--   if (exit $ac_status) && test -s "$ac_outfile"; then
--     # The compiler can only warn and ignore the option if not recognized
--     # So say no if there are warnings other than the usual output.
--     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
--     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
--     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
--       lt_prog_compiler_pic_works_GCJ=yes
--     fi
--   fi
--   $rm conftest*
-+int
-+main ()
-+{
- 
--fi
--echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5
--echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_link "$LINENO"; then :
- 
--if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
--    case $lt_prog_compiler_pic_GCJ in
--     "" | " "*) ;;
--     *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;;
--     esac
--else
--    lt_prog_compiler_pic_GCJ=
--     lt_prog_compiler_can_build_shared_GCJ=no
-+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
--
- fi
--case $host_os in
--  # For platforms which do not support PIC, -DPIC is meaningless:
--  *djgpp*)
--    lt_prog_compiler_pic_GCJ=
--    ;;
--  *)
--    lt_prog_compiler_pic_GCJ="$lt_prog_compiler_pic_GCJ"
--    ;;
--esac
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- 
--#
--# Check to make sure the static flag actually works.
--#
--wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
--echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
--echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
--if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  lt_prog_compiler_static_works_GCJ=no
--   save_LDFLAGS="$LDFLAGS"
--   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
--   printf "$lt_simple_link_test_code" > conftest.$ac_ext
--   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
--     # The linker can only warn and ignore the option if not recognized
--     # So say no if there are warnings
--     if test -s conftest.err; then
--       # Append any errors to the config.log.
--       cat conftest.err 1>&5
--       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
--       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
--       if diff conftest.exp conftest.er2 >/dev/null; then
--         lt_prog_compiler_static_works_GCJ=yes
--       fi
--     else
--       lt_prog_compiler_static_works_GCJ=yes
--     fi
--   fi
--   $rm conftest*
--   LDFLAGS="$save_LDFLAGS"
-+	    hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
-+	    # Warning - without using the other run time loading flags,
-+	    # -berok will link without error, but may produce a broken library.
-+	    no_undefined_flag_CXX=' ${wl}-bernotok'
-+	    allow_undefined_flag_CXX=' ${wl}-berok'
-+	    # Exported symbols can be pulled into shared objects from archives
-+	    whole_archive_flag_spec_CXX='$convenience'
-+	    archive_cmds_need_lc_CXX=yes
-+	    # This is similar to how AIX traditionally builds its shared
-+	    # libraries.
-+	    archive_expsym_cmds_CXX="\$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
-+        ;;
- 
--fi
--echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5
--echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6
-+      beos*)
-+	if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-+	  allow_undefined_flag_CXX=unsupported
-+	  # Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
-+	  # support --undefined.  This deserves some investigation.  FIXME
-+	  archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	else
-+	  ld_shlibs_CXX=no
-+	fi
-+	;;
- 
--if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then
--    :
--else
--    lt_prog_compiler_static_GCJ=
--fi
-+      chorus*)
-+        case $cc_basename in
-+          *)
-+	  # FIXME: insert proper C++ library support
-+	  ld_shlibs_CXX=no
-+	  ;;
-+        esac
-+        ;;
- 
-+      cygwin* | mingw* | pw32* | cegcc*)
-+        # _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'
-+        allow_undefined_flag_CXX=unsupported
-+        always_export_symbols_CXX=no
-+        enable_shared_with_static_runtimes_CXX=yes
-+
-+        if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-+          archive_cmds_CXX='$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...
-+          archive_expsym_cmds_CXX='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
-+          ld_shlibs_CXX=no
-+        fi
-+        ;;
-+      darwin* | rhapsody*)
- 
--echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
--echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
--if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  lt_cv_prog_compiler_c_o_GCJ=no
--   $rm -r conftest 2>/dev/null
--   mkdir conftest
--   cd conftest
--   mkdir out
--   printf "$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:16011: $lt_compile\"" >&5)
--   (eval "$lt_compile" 2>out/conftest.err)
--   ac_status=$?
--   cat out/conftest.err >&5
--   echo "$as_me:16015: \$? = $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
--     # 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_cv_prog_compiler_c_o_GCJ=yes
--     fi
--   fi
--   chmod u+w . 2>&5
--   $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 ..
--   rmdir conftest
--   $rm conftest*
-+  archive_cmds_need_lc_CXX=no
-+  hardcode_direct_CXX=no
-+  hardcode_automatic_CXX=yes
-+  hardcode_shlibpath_var_CXX=unsupported
-+  whole_archive_flag_spec_CXX=''
-+  link_all_deplibs_CXX=yes
-+  allow_undefined_flag_CXX="$_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
-+    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}"
-+    module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
-+       if test "$lt_cv_apple_cc_single_mod" != "yes"; then
-+      archive_cmds_CXX="\$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}"
-+      archive_expsym_cmds_CXX="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
- 
--fi
--echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
--echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6
-+  else
-+  ld_shlibs_CXX=no
-+  fi
- 
-+	;;
- 
--hard_links="nottested"
--if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then
--  # do not overwrite the value of need_locks provided by the user
--  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
--echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
--  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
--  echo "$as_me:$LINENO: result: $hard_links" >&5
--echo "${ECHO_T}$hard_links" >&6
--  if test "$hard_links" = no; then
--    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
--echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
--    need_locks=warn
--  fi
--else
--  need_locks=no
--fi
-+      dgux*)
-+        case $cc_basename in
-+          ec++*)
-+	    # FIXME: insert proper C++ library support
-+	    ld_shlibs_CXX=no
-+	    ;;
-+          ghcx*)
-+	    # Green Hills C++ Compiler
-+	    # FIXME: insert proper C++ library support
-+	    ld_shlibs_CXX=no
-+	    ;;
-+          *)
-+	    # FIXME: insert proper C++ library support
-+	    ld_shlibs_CXX=no
-+	    ;;
-+        esac
-+        ;;
- 
--echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
--echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
-+      freebsd[12]*)
-+        # C++ shared libraries reported to be fairly broken before
-+	# switch to ELF
-+        ld_shlibs_CXX=no
-+        ;;
- 
--  runpath_var=
--  allow_undefined_flag_GCJ=
--  enable_shared_with_static_runtimes_GCJ=no
--  archive_cmds_GCJ=
--  archive_expsym_cmds_GCJ=
--  old_archive_From_new_cmds_GCJ=
--  old_archive_from_expsyms_cmds_GCJ=
--  export_dynamic_flag_spec_GCJ=
--  whole_archive_flag_spec_GCJ=
--  thread_safe_flag_spec_GCJ=
--  hardcode_libdir_flag_spec_GCJ=
--  hardcode_libdir_flag_spec_ld_GCJ=
--  hardcode_libdir_separator_GCJ=
--  hardcode_direct_GCJ=no
--  hardcode_minus_L_GCJ=no
--  hardcode_shlibpath_var_GCJ=unsupported
--  link_all_deplibs_GCJ=unknown
--  hardcode_automatic_GCJ=no
--  module_cmds_GCJ=
--  module_expsym_cmds_GCJ=
--  always_export_symbols_GCJ=no
--  export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
--  # include_expsyms should be a list of space-separated symbols to be *always*
--  # included in the symbol list
--  include_expsyms_GCJ=
--  # 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'.
--  exclude_expsyms_GCJ="_GLOBAL_OFFSET_TABLE_"
--  # 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.
--  extract_expsyms_cmds=
--  # Just being paranoid about ensuring that cc_basename is set.
--  for cc_temp in $compiler""; 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-%%"`
-+      freebsd-elf*)
-+        archive_cmds_need_lc_CXX=no
-+        ;;
- 
--  case $host_os in
--  cygwin* | mingw* | pw32*)
--    # 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
--    ;;
--  esac
-+      freebsd* | dragonfly*)
-+        # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-+        # conventions
-+        ld_shlibs_CXX=yes
-+        ;;
- 
--  ld_shlibs_GCJ=yes
--  if test "$with_gnu_ld" = yes; then
--    # If archive_cmds runs LD, not CC, wlarc should be empty
--    wlarc='${wl}'
-+      gnu*)
-+        ;;
- 
--    # Set some defaults for GNU ld with shared library support. These
--    # are reset later if shared libraries are not supported. Putting them
--    # here allows them to be overridden if necessary.
--    runpath_var=LD_RUN_PATH
--    hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir'
--    export_dynamic_flag_spec_GCJ='${wl}--export-dynamic'
--    # ancient GNU ld didn't support --whole-archive et. al.
--    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
--	whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
--      else
--  	whole_archive_flag_spec_GCJ=
--    fi
--    supports_anon_versioning=no
--    case `$LD -v 2>/dev/null` in
--      *\ [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
-+      hpux9*)
-+        hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
-+        hardcode_libdir_separator_CXX=:
-+        export_dynamic_flag_spec_CXX='${wl}-E'
-+        hardcode_direct_CXX=yes
-+        hardcode_minus_L_CXX=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
-+            ld_shlibs_CXX=no
-+            ;;
-+          aCC*)
-+            archive_cmds_CXX='$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
-+              archive_cmds_CXX='$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
-+              ld_shlibs_CXX=no
-+            fi
-+            ;;
-+        esac
-+        ;;
- 
--    # See if GNU ld supports shared libraries.
--    case $host_os in
--    aix3* | aix4* | aix5*)
--      # On AIX/PPC, the GNU linker is very broken
--      if test "$host_cpu" != ia64; then
--	ld_shlibs_GCJ=no
--	cat <<EOF 1>&2
-+      hpux10*|hpux11*)
-+        if test $with_gnu_ld = no; then
-+	  hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
-+	  hardcode_libdir_separator_CXX=:
- 
--*** 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.
-+          case $host_cpu in
-+            hppa*64*|ia64*)
-+              ;;
-+            *)
-+	      export_dynamic_flag_spec_CXX='${wl}-E'
-+              ;;
-+          esac
-+        fi
-+        case $host_cpu in
-+          hppa*64*|ia64*)
-+            hardcode_direct_CXX=no
-+            hardcode_shlibpath_var_CXX=no
-+            ;;
-+          *)
-+            hardcode_direct_CXX=yes
-+            hardcode_direct_absolute_CXX=yes
-+            hardcode_minus_L_CXX=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
-+	    ld_shlibs_CXX=no
-+	    ;;
-+          aCC*)
-+	    case $host_cpu in
-+	      hppa*64*)
-+	        archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+	        ;;
-+	      ia64*)
-+	        archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+	        ;;
-+	      *)
-+	        archive_cmds_CXX='$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*)
-+	            archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+	            ;;
-+	          ia64*)
-+	            archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+	            ;;
-+	          *)
-+	            archive_cmds_CXX='$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
-+	      ld_shlibs_CXX=no
-+	    fi
-+	    ;;
-+        esac
-+        ;;
-+
-+      interix[3-9]*)
-+	hardcode_direct_CXX=no
-+	hardcode_shlibpath_var_CXX=no
-+	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-+	export_dynamic_flag_spec_CXX='${wl}-E'
-+	# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-+	# Instead, shared libraries are loaded at an image base (0x10000000 by
-+	# default) and relocated if they conflict, which is a slow very memory
-+	# consuming and fragmenting process.  To avoid this, we pick a random,
-+	# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-+	# time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-+	archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-+	archive_expsym_cmds_CXX='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++
-+	    archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-+
-+	    # Archives containing C++ object files must be created using
-+	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-+	    # necessary to make sure instantiated templates are included
-+	    # in the archive.
-+	    old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs'
-+	    ;;
-+          *)
-+	    if test "$GXX" = yes; then
-+	      if test "$with_gnu_ld" = no; then
-+	        archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+	      else
-+	        archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib'
-+	      fi
-+	    fi
-+	    link_all_deplibs_CXX=yes
-+	    ;;
-+        esac
-+        hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-+        hardcode_libdir_separator_CXX=:
-+        inherit_rpath_CXX=yes
-+        ;;
- 
--EOF
--      fi
--      ;;
-+      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.
-+	    archive_cmds_CXX='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'
-+	    archive_expsym_cmds_CXX='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'
-+
-+	    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-+	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-+
-+	    # Archives containing C++ object files must be created using
-+	    # "CC -Bstatic", where "CC" is the KAI C++ compiler.
-+	    old_archive_cmds_CXX='$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."*)
-+	        archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+		archive_expsym_cmds_CXX='$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
-+	        archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+		archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+		;;
-+	    esac
-+	    archive_cmds_need_lc_CXX=no
-+	    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-+	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-+	    whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-+	    ;;
-+          pgCC* | pgcpp*)
-+            # Portland Group C++ compiler
-+	    case `$CC -V` in
-+	    *pgCC\ [1-5]* | *pgcpp\ [1-5]*)
-+	      prelink_cmds_CXX='tpldir=Template.dir~
-+		rm -rf $tpldir~
-+		$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
-+		compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
-+	      old_archive_cmds_CXX='tpldir=Template.dir~
-+		rm -rf $tpldir~
-+		$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
-+		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
-+		$RANLIB $oldlib'
-+	      archive_cmds_CXX='tpldir=Template.dir~
-+		rm -rf $tpldir~
-+		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-+	      archive_expsym_cmds_CXX='tpldir=Template.dir~
-+		rm -rf $tpldir~
-+		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-+	      ;;
-+	    *) # Version 6 will use weak symbols
-+	      archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-+	      archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-+	      ;;
-+	    esac
- 
--    amigaos*)
--      archive_cmds_GCJ='$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)'
--      hardcode_libdir_flag_spec_GCJ='-L$libdir'
--      hardcode_minus_L_GCJ=yes
--
--      # Samuel A. Falvo II <kc5tja at dolphin.openprojects.net> reports
--      # that the semantics of dynamic libraries on AmigaOS, at least up
--      # to version 4, is to share data among multiple programs linked
--      # with the same dynamic library.  Since this doesn't match the
--      # behavior of shared libraries on other platforms, we can't use
--      # them.
--      ld_shlibs_GCJ=no
--      ;;
-+	    hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
-+	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-+	    whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-+            ;;
-+	  cxx*)
-+	    # Compaq C++
-+	    archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	    archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
- 
--    beos*)
--      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
--	allow_undefined_flag_GCJ=unsupported
--	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
--	# support --undefined.  This deserves some investigation.  FIXME
--	archive_cmds_GCJ='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--      else
--	ld_shlibs_GCJ=no
--      fi
--      ;;
-+	    runpath_var=LD_RUN_PATH
-+	    hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-+	    hardcode_libdir_separator_CXX=:
- 
--    cygwin* | mingw* | pw32*)
--      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, GCJ) is actually meaningless,
--      # as there is no search path for DLLs.
--      hardcode_libdir_flag_spec_GCJ='-L$libdir'
--      allow_undefined_flag_GCJ=unsupported
--      always_export_symbols_GCJ=no
--      enable_shared_with_static_runtimes_GCJ=yes
--      export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
-+	    # 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
-+	    hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-+	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-+	    archive_cmds_CXX='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	    if test "x$supports_anon_versioning" = xyes; then
-+	      archive_expsym_cmds_CXX='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
-+	      no_undefined_flag_CXX=' -zdefs'
-+	      archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+	      archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
-+	      hardcode_libdir_flag_spec_CXX='-R$libdir'
-+	      whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-+	      compiler_needs_object_CXX=yes
-+
-+	      # Not sure whether something based on
-+	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
-+	      # would be better.
-+	      output_verbose_link_cmd='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.
-+	      old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
-+	      ;;
-+	    esac
-+	    ;;
-+	esac
-+	;;
- 
--      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
--        archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
--	# If the export-symbols file already is a .def file (1st line
--	# is EXPORTS), use it as is; otherwise, prepend...
--	archive_expsym_cmds_GCJ='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
--	ld_shlibs_GCJ=no
--      fi
--      ;;
-+      lynxos*)
-+        # FIXME: insert proper C++ library support
-+	ld_shlibs_CXX=no
-+	;;
- 
--    interix3*)
--      hardcode_direct_GCJ=no
--      hardcode_shlibpath_var_GCJ=no
--      hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
--      export_dynamic_flag_spec_GCJ='${wl}-E'
--      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
--      # Instead, shared libraries are loaded at an image base (0x10000000 by
--      # default) and relocated if they conflict, which is a slow very memory
--      # consuming and fragmenting process.  To avoid this, we pick a random,
--      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
--      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
--      archive_cmds_GCJ='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
--      archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
--      ;;
-+      m88k*)
-+        # FIXME: insert proper C++ library support
-+        ld_shlibs_CXX=no
-+	;;
- 
--    linux*)
--      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
--	tmp_addflag=
--	case $cc_basename,$host_cpu in
--	pgcc*)				# Portland Group C compiler
--	  whole_archive_flag_spec_GCJ='${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
--	  whole_archive_flag_spec_GCJ='${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' ;;
-+      mvs*)
-+        case $cc_basename in
-+          cxx*)
-+	    # FIXME: insert proper C++ library support
-+	    ld_shlibs_CXX=no
-+	    ;;
-+	  *)
-+	    # FIXME: insert proper C++ library support
-+	    ld_shlibs_CXX=no
-+	    ;;
- 	esac
--	archive_cmds_GCJ='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	;;
- 
--	if test $supports_anon_versioning = yes; then
--	  archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
--  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
--  $echo "local: *; };" >> $output_objdir/$libname.ver~
--	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+      netbsd*)
-+        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-+	  archive_cmds_CXX='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
-+	  wlarc=
-+	  hardcode_libdir_flag_spec_CXX='-R$libdir'
-+	  hardcode_direct_CXX=yes
-+	  hardcode_shlibpath_var_CXX=no
- 	fi
--      else
--	ld_shlibs_GCJ=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::"'
-+	;;
- 
--    netbsd*)
--      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
--	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
--	wlarc=
--      else
--	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
--      fi
--      ;;
-+      *nto* | *qnx*)
-+        ld_shlibs_CXX=yes
-+	;;
- 
--    solaris*)
--      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
--	ld_shlibs_GCJ=no
--	cat <<EOF 1>&2
-+      openbsd2*)
-+        # C++ shared libraries are fairly broken
-+	ld_shlibs_CXX=no
-+	;;
- 
--*** 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.
-+      openbsd*)
-+	if test -f /usr/libexec/ld.so; then
-+	  hardcode_direct_CXX=yes
-+	  hardcode_shlibpath_var_CXX=no
-+	  hardcode_direct_absolute_CXX=yes
-+	  archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-+	  hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-+	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+	    archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-+	    export_dynamic_flag_spec_CXX='${wl}-E'
-+	    whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+	  fi
-+	  output_verbose_link_cmd=echo
-+	else
-+	  ld_shlibs_CXX=no
-+	fi
-+	;;
- 
--EOF
--      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
--	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
--      else
--	ld_shlibs_GCJ=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.
-+	    archive_cmds_CXX='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'
-+
-+	    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-+	    hardcode_libdir_separator_CXX=:
-+
-+	    # Archives containing C++ object files must be created using
-+	    # the KAI C++ compiler.
-+	    case $host in
-+	      osf3*) old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' ;;
-+	      *) old_archive_cmds_CXX='$CC -o $oldlib $oldobjs' ;;
-+	    esac
-+	    ;;
-+          RCC*)
-+	    # Rational C++ 2.4.1
-+	    # FIXME: insert proper C++ library support
-+	    ld_shlibs_CXX=no
-+	    ;;
-+          cxx*)
-+	    case $host in
-+	      osf3*)
-+	        allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
-+	        archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-+	        hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-+		;;
-+	      *)
-+	        allow_undefined_flag_CXX=' -expect_unresolved \*'
-+	        archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-+	        archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
-+	          echo "-hidden">> $lib.exp~
-+	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~
-+	          $RM $lib.exp'
-+	        hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-+		;;
-+	    esac
- 
--    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
--      case `$LD -v 2>&1` in
--        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
--	ld_shlibs_GCJ=no
--	cat <<_LT_EOF 1>&2
-+	    hardcode_libdir_separator_CXX=:
- 
--*** 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.
-+	    # 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
-+	      allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
-+	      case $host in
-+	        osf3*)
-+	          archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+		  ;;
-+	        *)
-+	          archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+		  ;;
-+	      esac
-+
-+	      hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-+	      hardcode_libdir_separator_CXX=:
-+
-+	      # 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
-+	      ld_shlibs_CXX=no
-+	    fi
-+	    ;;
-+        esac
-+        ;;
- 
--_LT_EOF
--	;;
--	*)
--	  if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
--	    hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
--	    archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
--	    archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
--	  else
--	    ld_shlibs_GCJ=no
--	  fi
--	;;
--      esac
--      ;;
-+      psos*)
-+        # FIXME: insert proper C++ library support
-+        ld_shlibs_CXX=no
-+        ;;
- 
--    sunos4*)
--      archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
--      wlarc=
--      hardcode_direct_GCJ=yes
--      hardcode_shlibpath_var_GCJ=no
--      ;;
-+      sunos4*)
-+        case $cc_basename in
-+          CC*)
-+	    # Sun C++ 4.x
-+	    # FIXME: insert proper C++ library support
-+	    ld_shlibs_CXX=no
-+	    ;;
-+          lcc*)
-+	    # Lucid
-+	    # FIXME: insert proper C++ library support
-+	    ld_shlibs_CXX=no
-+	    ;;
-+          *)
-+	    # FIXME: insert proper C++ library support
-+	    ld_shlibs_CXX=no
-+	    ;;
-+        esac
-+        ;;
- 
--    *)
--      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
--	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
--      else
--	ld_shlibs_GCJ=no
--      fi
--      ;;
--    esac
-+      solaris*)
-+        case $cc_basename in
-+          CC*)
-+	    # Sun C++ 4.2, 5.x and Centerline C++
-+            archive_cmds_need_lc_CXX=yes
-+	    no_undefined_flag_CXX=' -zdefs'
-+	    archive_cmds_CXX='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+	    archive_expsym_cmds_CXX='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'
-+
-+	    hardcode_libdir_flag_spec_CXX='-R$libdir'
-+	    hardcode_shlibpath_var_CXX=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?)
-+		whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract'
-+	        ;;
-+	    esac
-+	    link_all_deplibs_CXX=yes
- 
--    if test "$ld_shlibs_GCJ" = no; then
--      runpath_var=
--      hardcode_libdir_flag_spec_GCJ=
--      export_dynamic_flag_spec_GCJ=
--      whole_archive_flag_spec_GCJ=
--    fi
--  else
--    # PORTME fill in a description of your system's linker (not GNU ld)
--    case $host_os in
--    aix3*)
--      allow_undefined_flag_GCJ=unsupported
--      always_export_symbols_GCJ=yes
--      archive_expsym_cmds_GCJ='$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.
--      hardcode_minus_L_GCJ=yes
--      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
--	# Neither direct hardcoding nor static linking is supported with a
--	# broken collect2.
--	hardcode_direct_GCJ=unsupported
--      fi
--      ;;
-+	    output_verbose_link_cmd='echo'
- 
--    aix4* | aix5*)
--      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
--	  export_symbols_cmds_GCJ='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
--	else
--	  export_symbols_cmds_GCJ='$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
-+	    # 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.
-+	    old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
-+	    ;;
-+          gcx*)
-+	    # Green Hills C++ Compiler
-+	    archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
- 
--	# Test if we are trying to use run time linking or normal
--	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
--	# need to do runtime linking.
--	case $host_os in aix4.[23]|aix4.[23].*|aix5*)
--	  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
-+	    # The C++ compiler must be used to create the archive.
-+	    old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-+	    ;;
-+          *)
-+	    # GNU C++ compiler with Solaris linker
-+	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-+	      no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
-+	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
-+	        archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-+	        archive_expsym_cmds_CXX='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.
-+	        archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-+	        archive_expsym_cmds_CXX='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
-+
-+	      hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
-+	      case $host_os in
-+		solaris2.[0-5] | solaris2.[0-5].*) ;;
-+		*)
-+		  whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-+		  ;;
-+	      esac
-+	    fi
-+	    ;;
-+        esac
-+        ;;
- 
--	exp_sym_flag='-bexport'
--	no_entry_flag='-bnoentry'
--      fi
-+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
-+      no_undefined_flag_CXX='${wl}-z,text'
-+      archive_cmds_need_lc_CXX=no
-+      hardcode_shlibpath_var_CXX=no
-+      runpath_var='LD_RUN_PATH'
- 
--      # 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.
-+      case $cc_basename in
-+        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'
-+	  ;;
-+	*)
-+	  archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	  archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	  ;;
-+      esac
-+      ;;
- 
--      archive_cmds_GCJ=''
--      hardcode_direct_GCJ=yes
--      hardcode_libdir_separator_GCJ=':'
--      link_all_deplibs_GCJ=yes
-+      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.
-+	no_undefined_flag_CXX='${wl}-z,text'
-+	allow_undefined_flag_CXX='${wl}-z,nodefs'
-+	archive_cmds_need_lc_CXX=no
-+	hardcode_shlibpath_var_CXX=no
-+	hardcode_libdir_flag_spec_CXX='${wl}-R,$libdir'
-+	hardcode_libdir_separator_CXX=':'
-+	link_all_deplibs_CXX=yes
-+	export_dynamic_flag_spec_CXX='${wl}-Bexport'
-+	runpath_var='LD_RUN_PATH'
- 
--      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
--  	  hardcode_direct_GCJ=yes
--	  else
--  	  # We have old collect2
--  	  hardcode_direct_GCJ=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
--  	  hardcode_minus_L_GCJ=yes
--  	  hardcode_libdir_flag_spec_GCJ='-L$libdir'
--  	  hardcode_libdir_separator_GCJ=
--	  fi
--	  ;;
-+	case $cc_basename in
-+          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'
-+	    ;;
-+	  *)
-+	    archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	    archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	    ;;
- 	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
-+      ;;
-+
-+      tandem*)
-+        case $cc_basename in
-+          NCC*)
-+	    # NonStop-UX NCC 3.20
-+	    # FIXME: insert proper C++ library support
-+	    ld_shlibs_CXX=no
-+	    ;;
-+          *)
-+	    # FIXME: insert proper C++ library support
-+	    ld_shlibs_CXX=no
-+	    ;;
-+        esac
-+        ;;
- 
--      # It seems that -bexpall does not export symbols beginning with
--      # underscore (_), so it is better to generate a list of symbols to export.
--      always_export_symbols_GCJ=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.
--	allow_undefined_flag_GCJ='-berok'
--       # Determine the default libpath from the value encoded in an empty executable.
--       cat >conftest.$ac_ext <<_ACEOF
+ $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
+     ld_shlibs_CXX=yes
+     case $host_os in
+@@ -12731,11 +11919,7 @@
+           allow_undefined_flag_CXX='-berok'
+           # Determine the default libpath from the value encoded in an empty
+           # executable.
+-          cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
-+      vxworks*)
-+        # FIXME: insert proper C++ library support
-+        ld_shlibs_CXX=no
-+        ;;
++          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
  
--int
--main ()
-+      *)
-+        # FIXME: insert proper C++ library support
-+        ld_shlibs_CXX=no
-+        ;;
-+    esac
-+
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
-+$as_echo "$ld_shlibs_CXX" >&6; }
-+    test "$ld_shlibs_CXX" = no && can_build_shared=no
-+
-+    GCC_CXX="$GXX"
-+    LD_CXX="$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...
-+    # Dependencies to place before and after the object being linked:
-+predep_objects_CXX=
-+postdep_objects_CXX=
-+predeps_CXX=
-+postdeps_CXX=
-+compiler_lib_search_path_CXX=
-+
-+cat > conftest.$ac_ext <<_LT_EOF
-+class Foo
- {
-+public:
-+  Foo (void) { a = 0; }
-+private:
-+  int a;
-+};
-+_LT_EOF
- 
--  ;
--  return 0;
--}
--_ACEOF
+ int
+@@ -12746,27 +11930,7 @@
+   return 0;
+ }
+ _ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-+  (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-+  # Parse the compiler output and extract the necessary
-+  # objects, libraries and library flags.
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_cxx_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++if ac_fn_cxx_try_link "$LINENO"; then :
  
--aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
--}'`
--# 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 '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
--}'`; fi
+ lt_aix_libpath_sed='
+     /Import File Strings/,/^$/ {
+@@ -12780,16 +11944,9 @@
+ if test -z "$aix_libpath"; then
+   aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ fi
 -else
--  echo "$as_me: failed program was:" >&5
+-  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+  # Sentinel used to keep track of whether or not we are before
-+  # the conftest object file.
-+  pre_test_object_deps_done=no
- 
--fi
--rm -f conftest.err conftest.$ac_objext \
+-
+-
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
--if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-+  for p in `eval "$output_verbose_link_cmd"`; do
-+    case $p in
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
--       hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
--	archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-+    -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
--	if test "$host_cpu" = ia64; then
--	  hardcode_libdir_flag_spec_GCJ='${wl}-R $libdir:/usr/lib:/lib'
--	  allow_undefined_flag_GCJ="-z nodefs"
--	  archive_expsym_cmds_GCJ="\$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.
--	 cat >conftest.$ac_ext <<_ACEOF
+           hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
+@@ -12803,11 +11960,7 @@
+           else
+ 	    # Determine the default libpath from the value encoded in an
+ 	    # empty executable.
+-	    cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
-+	 prev=
-+       fi
++	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
  
--int
--main ()
--{
-+       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 "$compiler_lib_search_path_CXX"; then
-+	     compiler_lib_search_path_CXX="${prev}${p}"
-+	   else
-+	     compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} ${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 "$postdeps_CXX"; then
-+	   postdeps_CXX="${prev}${p}"
-+	 else
-+	   postdeps_CXX="${postdeps_CXX} ${prev}${p}"
-+	 fi
-+       fi
-+       ;;
- 
--  ;
--  return 0;
--}
--_ACEOF
+ int
+@@ -12818,27 +11971,7 @@
+   return 0;
+ }
+ _ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+    *.$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
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_cxx_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++if ac_fn_cxx_try_link "$LINENO"; then :
  
--aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
--}'`
--# 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 '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
--}'`; fi
+ lt_aix_libpath_sed='
+     /Import File Strings/,/^$/ {
+@@ -12852,16 +11985,9 @@
+ if test -z "$aix_libpath"; then
+   aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ fi
 -else
--  echo "$as_me: failed program was:" >&5
+-  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+       if test "$pre_test_object_deps_done" = no; then
-+	 if test -z "$predep_objects_CXX"; then
-+	   predep_objects_CXX="$p"
-+	 else
-+	   predep_objects_CXX="$predep_objects_CXX $p"
-+	 fi
-+       else
-+	 if test -z "$postdep_objects_CXX"; then
-+	   postdep_objects_CXX="$p"
-+	 else
-+	   postdep_objects_CXX="$postdep_objects_CXX $p"
-+	 fi
-+       fi
-+       ;;
-+
-+    *) ;; # Ignore the rest.
-+
-+    esac
-+  done
- 
-+  # Clean up.
-+  rm -f a.out a.exe
-+else
-+  echo "libtool.m4: error: problem compiling CXX test program"
+-
+-
  fi
--rm -f conftest.err conftest.$ac_objext \
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
--if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
--	 hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
--	  # Warning - without using the other run time loading flags,
--	  # -berok will link without error, but may produce a broken library.
--	  no_undefined_flag_GCJ=' ${wl}-bernotok'
--	  allow_undefined_flag_GCJ=' ${wl}-berok'
--	  # Exported symbols can be pulled into shared objects from archives
--	  whole_archive_flag_spec_GCJ='$convenience'
--	  archive_cmds_need_lc_GCJ=yes
--	  # This is similar to how AIX traditionally builds its shared libraries.
--	  archive_expsym_cmds_GCJ="\$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
--      ;;
-+$RM -f confest.$objext
+ 	    hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
+@@ -13146,7 +12272,7 @@
+         inherit_rpath_CXX=yes
+         ;;
  
--    amigaos*)
--      archive_cmds_GCJ='$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)'
--      hardcode_libdir_flag_spec_GCJ='-L$libdir'
--      hardcode_minus_L_GCJ=yes
--      # see comment about different semantics on the GNU ld section
--      ld_shlibs_GCJ=no
--      ;;
-+# PORTME: override above test on systems where it is broken
-+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.
-+  predep_objects_CXX=
-+  postdep_objects_CXX=
-+  postdeps_CXX=
-+  ;;
+-      linux* | k*bsd*-gnu)
++      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+         case $cc_basename in
+           KCC*)
+ 	    # Kuck and Associates, Inc. (KAI) C++ Compiler
+@@ -13605,7 +12731,7 @@
+         ;;
+     esac
  
--    bsdi[45]*)
--      export_dynamic_flag_spec_GCJ=-rdynamic
-+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
+-    { $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
+ $as_echo "$ld_shlibs_CXX" >&6; }
+     test "$ld_shlibs_CXX" = no && can_build_shared=no
  
--    cygwin* | mingw* | pw32*)
--      # 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.
--      hardcode_libdir_flag_spec_GCJ=' '
--      allow_undefined_flag_GCJ=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.
--      archive_cmds_GCJ='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
--      # The linker will automatically build a .lib file if we build a DLL.
--      old_archive_From_new_cmds_GCJ='true'
--      # FIXME: Should let the user specify the lib program.
--      old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs'
--      fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`'
--      enable_shared_with_static_runtimes_GCJ=yes
-+    if test "$solaris_use_stlport4" != yes; then
-+      postdeps_CXX='-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
+@@ -13633,11 +12759,11 @@
+ };
+ _LT_EOF
  
--    darwin* | rhapsody*)
--      case $host_os in
--        rhapsody* | darwin1.[012])
--         allow_undefined_flag_GCJ='${wl}-undefined ${wl}suppress'
--         ;;
--       *) # Darwin 1.3 on
--         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
--           allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
--         else
--           case ${MACOSX_DEPLOYMENT_TARGET} in
--             10.[012])
--               allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
--               ;;
--             10.*)
--               allow_undefined_flag_GCJ='${wl}-undefined ${wl}dynamic_lookup'
--               ;;
--           esac
--         fi
--         ;;
--      esac
--      archive_cmds_need_lc_GCJ=no
--      hardcode_direct_GCJ=no
--      hardcode_automatic_GCJ=yes
--      hardcode_shlibpath_var_GCJ=unsupported
--      whole_archive_flag_spec_GCJ=''
--      link_all_deplibs_GCJ=yes
--    if test "$GCC" = yes ; then
--    	output_verbose_link_cmd='echo'
--        archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--      module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
--      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
--      archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--      module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--    else
--      case $cc_basename in
--        xlc*)
--         output_verbose_link_cmd='echo'
--         archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
--         module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
--          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
--         archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--          module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--          ;;
--       *)
--         ld_shlibs_GCJ=no
--          ;;
--      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
-+      postdeps_CXX='-library=Cstd -library=Crun'
-     fi
--      ;;
-+    ;;
-+  esac
-+  ;;
-+esac
-+
-+
-+case " $postdeps_CXX " in
-+*" -lc "*) archive_cmds_need_lc_CXX=no ;;
-+esac
-+ compiler_lib_search_dirs_CXX=
-+if test -n "${compiler_lib_search_path_CXX}"; then
-+ compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
-+fi
-+
-+
-+
-+
-+
-+
-+
-+
-+
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
+   # Parse the compiler output and extract the necessary
+   # objects, libraries and library flags.
  
--    dgux*)
--      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--      hardcode_libdir_flag_spec_GCJ='-L$libdir'
--      hardcode_shlibpath_var_GCJ=no
--      ;;
+@@ -13818,7 +12944,7 @@
+ lt_prog_compiler_pic_CXX=
+ lt_prog_compiler_static_CXX=
  
--    freebsd1*)
--      ld_shlibs_GCJ=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*)
--      archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
--      hardcode_libdir_flag_spec_GCJ='-R$libdir'
--      hardcode_direct_GCJ=yes
--      hardcode_shlibpath_var_GCJ=no
--      ;;
- 
--    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
--    freebsd2*)
--      archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
--      hardcode_direct_GCJ=yes
--      hardcode_minus_L_GCJ=yes
--      hardcode_shlibpath_var_GCJ=no
--      ;;
- 
--    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--    freebsd* | kfreebsd*-gnu | dragonfly*)
--      archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
--      hardcode_libdir_flag_spec_GCJ='-R$libdir'
--      hardcode_direct_GCJ=yes
--      hardcode_shlibpath_var_GCJ=no
--      ;;
- 
--    hpux9*)
--      if test "$GCC" = yes; then
--	archive_cmds_GCJ='$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
--	archive_cmds_GCJ='$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
--      hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
--      hardcode_libdir_separator_GCJ=:
--      hardcode_direct_GCJ=yes
- 
--      # hardcode_minus_L: Not really in the search PATH,
--      # but as the default location of the library.
--      hardcode_minus_L_GCJ=yes
--      export_dynamic_flag_spec_GCJ='${wl}-E'
--      ;;
- 
--    hpux10*)
--      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
--	archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
--      else
--	archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
--      fi
--      if test "$with_gnu_ld" = no; then
--	hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
--	hardcode_libdir_separator_GCJ=:
- 
--	hardcode_direct_GCJ=yes
--	export_dynamic_flag_spec_GCJ='${wl}-E'
- 
--	# hardcode_minus_L: Not really in the search PATH,
--	# but as the default location of the library.
--	hardcode_minus_L_GCJ=yes
--      fi
--      ;;
- 
--    hpux11*)
--      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
--	case $host_cpu in
--	hppa*64*)
--	  archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
--	  ;;
--	ia64*)
--	  archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
--	  ;;
--	*)
--	  archive_cmds_GCJ='$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*)
--	  archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
--	  ;;
--	ia64*)
--	  archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
--	  ;;
--	*)
--	  archive_cmds_GCJ='$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
--	hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
--	hardcode_libdir_separator_GCJ=:
- 
--	case $host_cpu in
--	hppa*64*|ia64*)
--	  hardcode_libdir_flag_spec_ld_GCJ='+b $libdir'
--	  hardcode_direct_GCJ=no
--	  hardcode_shlibpath_var_GCJ=no
--	  ;;
--	*)
--	  hardcode_direct_GCJ=yes
--	  export_dynamic_flag_spec_GCJ='${wl}-E'
- 
--	  # hardcode_minus_L: Not really in the search PATH,
--	  # but as the default location of the library.
--	  hardcode_minus_L_GCJ=yes
--	  ;;
--	esac
--      fi
--      ;;
- 
--    irix5* | irix6* | nonstopux*)
--      if test "$GCC" = yes; then
--	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
--      else
--	archive_cmds_GCJ='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
--	hardcode_libdir_flag_spec_ld_GCJ='-rpath $libdir'
--      fi
--      hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
--      hardcode_libdir_separator_GCJ=:
--      link_all_deplibs_GCJ=yes
--      ;;
- 
--    netbsd*)
--      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
--	archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
--      else
--	archive_cmds_GCJ='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
--      fi
--      hardcode_libdir_flag_spec_GCJ='-R$libdir'
--      hardcode_direct_GCJ=yes
--      hardcode_shlibpath_var_GCJ=no
--      ;;
- 
--    newsos6)
--      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--      hardcode_direct_GCJ=yes
--      hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
--      hardcode_libdir_separator_GCJ=:
--      hardcode_shlibpath_var_GCJ=no
--      ;;
- 
--    openbsd*)
--      hardcode_direct_GCJ=yes
--      hardcode_shlibpath_var_GCJ=no
--      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
--	archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
--	archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
--	hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
--	export_dynamic_flag_spec_GCJ='${wl}-E'
--      else
--       case $host_os in
--	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
--	   archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
--	   hardcode_libdir_flag_spec_GCJ='-R$libdir'
--	   ;;
--	 *)
--	   archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
--	   hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
--	   ;;
--       esac
--      fi
--      ;;
- 
--    os2*)
--      hardcode_libdir_flag_spec_GCJ='-L$libdir'
--      hardcode_minus_L_GCJ=yes
--      allow_undefined_flag_GCJ=unsupported
--      archive_cmds_GCJ='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
--      old_archive_From_new_cmds_GCJ='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
--      ;;
- 
--    osf3*)
--      if test "$GCC" = yes; then
--	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
--	archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
--      else
--	allow_undefined_flag_GCJ=' -expect_unresolved \*'
--	archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
--      fi
--      hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
--      hardcode_libdir_separator_GCJ=:
--      ;;
- 
--    osf4* | osf5*)	# as osf3* with the addition of -msym flag
--      if test "$GCC" = yes; then
--	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
--	archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
--	hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
--      else
--	allow_undefined_flag_GCJ=' -expect_unresolved \*'
--	archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
--	archive_expsym_cmds_GCJ='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
--	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
- 
--	# Both c and cxx compiler support -rpath directly
--	hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
-+
-+    lt_prog_compiler_wl_CXX=
-+lt_prog_compiler_pic_CXX=
-+lt_prog_compiler_static_CXX=
-+
+-{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
-+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
-+
-+  # C++ specific cases for pic, static, wl, etc.
-+  if test "$GXX" = yes; then
-+    lt_prog_compiler_wl_CXX='-Wl,'
-+    lt_prog_compiler_static_CXX='-static'
-+
-+    case $host_os in
-+    aix*)
-+      # All AIX code is PIC.
-+      if test "$host_cpu" = ia64; then
-+	# AIX 5 now supports IA64 processor
-+	lt_prog_compiler_static_CXX='-Bstatic'
-       fi
--      hardcode_libdir_separator_GCJ=:
-       ;;
+ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  
--    solaris*)
--      no_undefined_flag_GCJ=' -z text'
--      if test "$GCC" = yes; then
--	wlarc='${wl}'
--	archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
--	archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
--	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
--      else
--	wlarc=''
--	archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
--	archive_expsym_cmds_GCJ='$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'
--      fi
--      hardcode_libdir_flag_spec_GCJ='-R$libdir'
--      hardcode_shlibpath_var_GCJ=no
--      case $host_os in
--      solaris2.[0-5] | solaris2.[0-5].*) ;;
--      *)
-- 	# The compiler driver will combine linker options so we
-- 	# cannot just pass the convience library names through
-- 	# without $wl, iff we do not link with $LD.
-- 	# Luckily, gcc supports the same syntax we need for Sun Studio.
-- 	# Supported since Solaris 2.6 (maybe 2.5.1?)
-- 	case $wlarc in
-- 	'')
-- 	  whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;;
-- 	*)
-- 	  whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
-- 	esac ;;
-+    amigaos*)
-+      case $host_cpu in
-+      powerpc)
-+            # see comment about AmigaOS4 .so support
-+            lt_prog_compiler_pic_CXX='-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_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
-+        ;;
-       esac
--      link_all_deplibs_GCJ=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.
--	archive_cmds_GCJ='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
--      else
--	archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-+    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
-+      lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
-+      ;;
-+    darwin* | rhapsody*)
-+      # PIC is the default on this platform
-+      # Common symbols not allowed in MH_DYLIB files
-+      lt_prog_compiler_pic_CXX='-fno-common'
-+      ;;
-+    *djgpp*)
-+      # DJGPP does not support shared libraries at all
-+      lt_prog_compiler_pic_CXX=
-+      ;;
-+    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_prog_compiler_pic_CXX=-Kconform_pic
-       fi
--      hardcode_libdir_flag_spec_GCJ='-L$libdir'
--      hardcode_direct_GCJ=yes
--      hardcode_minus_L_GCJ=yes
--      hardcode_shlibpath_var_GCJ=no
-       ;;
--
--    sysv4)
--      case $host_vendor in
--	sni)
--	  archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--	  hardcode_direct_GCJ=yes # is this really true???
-+    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_prog_compiler_pic_CXX='-fPIC'
-+	;;
-+      esac
-+      ;;
-+    *qnx* | *nto*)
-+      # QNX uses GNU C++, but need to define -shared option too, otherwise
-+      # it will coredump.
-+      lt_prog_compiler_pic_CXX='-fPIC -shared'
-+      ;;
-+    *)
-+      lt_prog_compiler_pic_CXX='-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_prog_compiler_static_CXX='-Bstatic'
-+	else
-+	  lt_prog_compiler_static_CXX='-bnso -bI:/lib/syscalls.exp'
-+	fi
-+	;;
-+      chorus*)
-+	case $cc_basename in
-+	cxch68*)
-+	  # Green Hills C++ Compiler
-+	  # _LT_TAGVAR(lt_prog_compiler_static, CXX)="--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_prog_compiler_pic_CXX='-KPIC'
-+	    ;;
-+	  ghcx*)
-+	    # Green Hills C++ Compiler
-+	    lt_prog_compiler_pic_CXX='-pic'
-+	    ;;
-+	  *)
-+	    ;;
-+	esac
-+	;;
-+      freebsd* | dragonfly*)
-+	# FreeBSD uses GNU C++
-+	;;
-+      hpux9* | hpux10* | hpux11*)
-+	case $cc_basename in
-+	  CC*)
-+	    lt_prog_compiler_wl_CXX='-Wl,'
-+	    lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
-+	    if test "$host_cpu" != ia64; then
-+	      lt_prog_compiler_pic_CXX='+Z'
-+	    fi
-+	    ;;
-+	  aCC*)
-+	    lt_prog_compiler_wl_CXX='-Wl,'
-+	    lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
-+	    case $host_cpu in
-+	    hppa*64*|ia64*)
-+	      # +Z the default
-+	      ;;
-+	    *)
-+	      lt_prog_compiler_pic_CXX='+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_prog_compiler_wl_CXX='-Wl,'
-+	    lt_prog_compiler_static_CXX='-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_prog_compiler_wl_CXX='--backend -Wl,'
-+	    lt_prog_compiler_pic_CXX='-fPIC'
-+	    ;;
-+	  ecpc* )
-+	    # old Intel C++ for x86_64 which still supported -KPIC.
-+	    lt_prog_compiler_wl_CXX='-Wl,'
-+	    lt_prog_compiler_pic_CXX='-KPIC'
-+	    lt_prog_compiler_static_CXX='-static'
-+	    ;;
-+	  icpc* )
-+	    # Intel C++, used to be incompatible with GCC.
-+	    # ICC 10 doesn't accept -KPIC any more.
-+	    lt_prog_compiler_wl_CXX='-Wl,'
-+	    lt_prog_compiler_pic_CXX='-fPIC'
-+	    lt_prog_compiler_static_CXX='-static'
-+	    ;;
-+	  pgCC* | pgcpp*)
-+	    # Portland Group C++ compiler
-+	    lt_prog_compiler_wl_CXX='-Wl,'
-+	    lt_prog_compiler_pic_CXX='-fpic'
-+	    lt_prog_compiler_static_CXX='-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_prog_compiler_pic_CXX=
-+	    lt_prog_compiler_static_CXX='-non_shared'
-+	    ;;
-+	  xlc* | xlC*)
-+	    # IBM XL 8.0 on PPC
-+	    lt_prog_compiler_wl_CXX='-Wl,'
-+	    lt_prog_compiler_pic_CXX='-qpic'
-+	    lt_prog_compiler_static_CXX='-qstaticlink'
-+	    ;;
-+	  *)
-+	    case `$CC -V 2>&1 | sed 5q` in
-+	    *Sun\ C*)
-+	      # Sun C++ 5.9
-+	      lt_prog_compiler_pic_CXX='-KPIC'
-+	      lt_prog_compiler_static_CXX='-Bstatic'
-+	      lt_prog_compiler_wl_CXX='-Qoption ld '
-+	      ;;
-+	    esac
-+	    ;;
-+	esac
-+	;;
-+      lynxos*)
-+	;;
-+      m88k*)
-+	;;
-+      mvs*)
-+	case $cc_basename in
-+	  cxx*)
-+	    lt_prog_compiler_pic_CXX='-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_prog_compiler_pic_CXX='-fPIC -shared'
-+        ;;
-+      osf3* | osf4* | osf5*)
-+	case $cc_basename in
-+	  KCC*)
-+	    lt_prog_compiler_wl_CXX='--backend -Wl,'
-+	    ;;
-+	  RCC*)
-+	    # Rational C++ 2.4.1
-+	    lt_prog_compiler_pic_CXX='-pic'
-+	    ;;
-+	  cxx*)
-+	    # Digital/Compaq C++
-+	    lt_prog_compiler_wl_CXX='-Wl,'
-+	    # Make sure the PIC flag is empty.  It appears that all Alpha
-+	    # Linux and Compaq Tru64 Unix objects are PIC.
-+	    lt_prog_compiler_pic_CXX=
-+	    lt_prog_compiler_static_CXX='-non_shared'
-+	    ;;
-+	  *)
-+	    ;;
-+	esac
-+	;;
-+      psos*)
-+	;;
-+      solaris*)
-+	case $cc_basename in
-+	  CC*)
-+	    # Sun C++ 4.2, 5.x and Centerline C++
-+	    lt_prog_compiler_pic_CXX='-KPIC'
-+	    lt_prog_compiler_static_CXX='-Bstatic'
-+	    lt_prog_compiler_wl_CXX='-Qoption ld '
-+	    ;;
-+	  gcx*)
-+	    # Green Hills C++ Compiler
-+	    lt_prog_compiler_pic_CXX='-PIC'
-+	    ;;
-+	  *)
-+	    ;;
-+	esac
+   # C++ specific cases for pic, static, wl, etc.
+@@ -13974,7 +13100,7 @@
+ 	    ;;
+ 	esac
  	;;
--	siemens)
--	  ## LD is ld it makes a PLAMLIB
--	  ## CC just makes a GrossModule.
--	  archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags'
--	  reload_cmds_GCJ='$CC -r -o $output$reload_objs'
--	  hardcode_direct_GCJ=no
--        ;;
--	motorola)
--	  archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--	  hardcode_direct_GCJ=no #Motorola manual says yes, but my tests say they lie
-+      sunos4*)
-+	case $cc_basename in
-+	  CC*)
-+	    # Sun C++ 4.x
-+	    lt_prog_compiler_pic_CXX='-pic'
-+	    lt_prog_compiler_static_CXX='-Bstatic'
-+	    ;;
-+	  lcc*)
-+	    # Lucid
-+	    lt_prog_compiler_pic_CXX='-pic'
-+	    ;;
-+	  *)
-+	    ;;
-+	esac
-+	;;
-+      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-+	case $cc_basename in
-+	  CC*)
-+	    lt_prog_compiler_wl_CXX='-Wl,'
-+	    lt_prog_compiler_pic_CXX='-KPIC'
-+	    lt_prog_compiler_static_CXX='-Bstatic'
-+	    ;;
-+	esac
-+	;;
-+      tandem*)
-+	case $cc_basename in
-+	  NCC*)
-+	    # NonStop-UX NCC 3.20
-+	    lt_prog_compiler_pic_CXX='-KPIC'
-+	    ;;
-+	  *)
-+	    ;;
-+	esac
-+	;;
-+      vxworks*)
-+	;;
-+      *)
-+	lt_prog_compiler_can_build_shared_CXX=no
- 	;;
--      esac
--      runpath_var='LD_RUN_PATH'
--      hardcode_shlibpath_var_GCJ=no
--      ;;
--
--    sysv4.3*)
--      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--      hardcode_shlibpath_var_GCJ=no
--      export_dynamic_flag_spec_GCJ='-Bexport'
--      ;;
--
--    sysv4*MP*)
--      if test -d /usr/nec; then
--	archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--	hardcode_shlibpath_var_GCJ=no
--	runpath_var=LD_RUN_PATH
--	hardcode_runpath_var=yes
--	ld_shlibs_GCJ=yes
--      fi
--      ;;
--
--    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
--      no_undefined_flag_GCJ='${wl}-z,text'
--      archive_cmds_need_lc_GCJ=no
--      hardcode_shlibpath_var_GCJ=no
--      runpath_var='LD_RUN_PATH'
--
--      if test "$GCC" = yes; then
--	archive_cmds_GCJ='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
--	archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
--      else
--	archive_cmds_GCJ='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
--	archive_expsym_cmds_GCJ='$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.
--      no_undefined_flag_GCJ='${wl}-z,text'
--      allow_undefined_flag_GCJ='${wl}-z,nodefs'
--      archive_cmds_need_lc_GCJ=no
--      hardcode_shlibpath_var_GCJ=no
--      hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
--      hardcode_libdir_separator_GCJ=':'
--      link_all_deplibs_GCJ=yes
--      export_dynamic_flag_spec_GCJ='${wl}-Bexport'
--      runpath_var='LD_RUN_PATH'
--
--      if test "$GCC" = yes; then
--	archive_cmds_GCJ='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
--	archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
--      else
--	archive_cmds_GCJ='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
--	archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
--      fi
--      ;;
--
--    uts4*)
--      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--      hardcode_libdir_flag_spec_GCJ='-L$libdir'
--      hardcode_shlibpath_var_GCJ=no
--      ;;
--
--    *)
--      ld_shlibs_GCJ=no
--      ;;
-     esac
-   fi
- 
--echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
--echo "${ECHO_T}$ld_shlibs_GCJ" >&6
--test "$ld_shlibs_GCJ" = no && can_build_shared=no
-+case $host_os in
-+  # For platforms which do not support PIC, -DPIC is meaningless:
-+  *djgpp*)
-+    lt_prog_compiler_pic_CXX=
-+    ;;
-+  *)
-+    lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
-+    ;;
-+esac
+-      linux* | k*bsd*-gnu)
++      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ 	case $cc_basename in
+ 	  KCC*)
+ 	    # KAI C++ Compiler
+@@ -14135,7 +13261,7 @@
+     lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_CXX" >&5
-+$as_echo "$lt_prog_compiler_pic_CXX" >&6; }
-+
-+
+ $as_echo "$lt_prog_compiler_pic_CXX" >&6; }
  
+ 
+@@ -14144,9 +13270,9 @@
+ # Check to make sure the PIC flag actually works.
  #
--# Do we need to explicitly link libc?
-+# Check to make sure the PIC flag actually works.
- #
--case "x$archive_cmds_need_lc_GCJ" in
--x|xyes)
--  # Assume -lc should be added
--  archive_cmds_need_lc_GCJ=yes
--
--  if test "$enable_shared" = yes && test "$GCC" = yes; then
--    case $archive_cmds_GCJ 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.
--      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
--echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
--      $rm conftest*
--      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+if test -n "$lt_prog_compiler_pic_CXX"; then
+ if test -n "$lt_prog_compiler_pic_CXX"; then
+-  { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
-+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; }
+ $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; }
+-if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then
 +if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  lt_cv_prog_compiler_pic_works_CXX=no
-+   ac_outfile=conftest.$ac_objext
-+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-+   lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
-+   # Insert the option either (1) after the last *FLAGS variable, or
-+   # (2) before a word containing "conftest.", or (3) at the end.
-+   # 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:'`
+   $as_echo_n "(cached) " >&6
+ else
+   lt_cv_prog_compiler_pic_works_CXX=no
+@@ -14162,11 +13288,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:14165: $lt_compile\"" >&5)
 +   (eval echo "\"\$as_me:13291: $lt_compile\"" >&5)
-+   (eval "$lt_compile" 2>conftest.err)
-+   ac_status=$?
-+   cat conftest.err >&5
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:14169: \$? = $ac_status" >&5
 +   echo "$as_me:13295: \$? = $ac_status" >&5
-+   if (exit $ac_status) && test -s "$ac_outfile"; then
-+     # The compiler can only warn and ignore the option if not recognized
-+     # So say no if there are warnings other than the usual output.
-+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-+       lt_cv_prog_compiler_pic_works_CXX=yes
-+     fi
-+   fi
-+   $RM conftest*
+    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.
+@@ -14179,7 +13305,7 @@
+    $RM conftest*
  
--      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } 2>conftest.err; then
--        soname=conftest
--        lib=conftest
--        libobjs=conftest.$ac_objext
--        deplibs=
--        wl=$lt_prog_compiler_wl_GCJ
--	pic_flag=$lt_prog_compiler_pic_GCJ
--        compiler_flags=-v
--        linker_flags=-v
--        verstring=
--        output_objdir=.
--        libname=conftest
--        lt_save_allow_undefined_flag=$allow_undefined_flag_GCJ
--        allow_undefined_flag_GCJ=
--        if { (eval echo "$as_me:$LINENO: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
--  (eval $archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }
--        then
--	  archive_cmds_need_lc_GCJ=no
--        else
--	  archive_cmds_need_lc_GCJ=yes
--        fi
--        allow_undefined_flag_GCJ=$lt_save_allow_undefined_flag
--      else
--        cat conftest.err 1>&5
--      fi
--      $rm conftest*
--      echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
--echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6
--      ;;
--    esac
--  fi
--  ;;
--esac
-+fi
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
-+$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; }
+ $as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; }
  
--echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
--echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
--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"
--if test "$GCC" = yes; then
--  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 ';' >/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.
--    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
-+if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
-+    case $lt_prog_compiler_pic_CXX in
-+     "" | " "*) ;;
-+     *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
-+     esac
- else
--  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-+    lt_prog_compiler_pic_CXX=
-+     lt_prog_compiler_can_build_shared_CXX=no
- fi
--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'
--  ;;
-+fi
- 
--aix4* | aix5*)
--  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*)
--  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'
--  ;;
- 
--beos*)
--  library_names_spec='${libname}${shared_ext}'
--  dynamic_linker="$host_os ld.so"
--  shlibpath_var=LIBRARY_PATH
--  ;;
-+#
-+# Check to make sure the static flag actually works.
-+#
-+wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
+ if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
+@@ -14200,9 +13326,9 @@
+ # Check to make sure the static flag actually works.
+ #
+ wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
+-{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+ $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+-if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then
 +if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  lt_cv_prog_compiler_static_works_CXX=no
-+   save_LDFLAGS="$LDFLAGS"
-+   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-+     # The linker can only warn and ignore the option if not recognized
-+     # So say no if there are warnings
-+     if test -s conftest.err; then
-+       # Append any errors to the config.log.
-+       cat conftest.err 1>&5
-+       $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
-+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-+       if diff conftest.exp conftest.er2 >/dev/null; then
-+         lt_cv_prog_compiler_static_works_CXX=yes
-+       fi
-+     else
-+       lt_cv_prog_compiler_static_works_CXX=yes
-+     fi
-+   fi
-+   $RM -r conftest*
-+   LDFLAGS="$save_LDFLAGS"
+   $as_echo_n "(cached) " >&6
+ else
+   lt_cv_prog_compiler_static_works_CXX=no
+@@ -14228,7 +13354,7 @@
+    LDFLAGS="$save_LDFLAGS"
  
--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
--  ;;
-+fi
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5
-+$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; }
+ $as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; }
  
--cygwin* | mingw* | pw32*)
--  version_type=windows
--  shrext_cmds=".dll"
--  need_version=no
--  need_lib_prefix=no
-+if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
-+    :
-+else
-+    lt_prog_compiler_static_CXX=
-+fi
+ if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
+@@ -14240,9 +13366,9 @@
  
--  case $GCC,$host_os in
--  yes,cygwin* | yes,mingw* | yes,pw32*)
--    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'
--    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*)
--      # 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}${versuffix}$shared_ext ${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`'
--  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
--  if test "$GCC" = yes; then
--    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
--  else
--    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
--  fi
--  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
--  ;;
+-    { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
-+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+ $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+-if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
 +if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  lt_cv_prog_compiler_c_o_CXX=no
-+   $RM -r conftest 2>/dev/null
-+   mkdir conftest
-+   cd conftest
-+   mkdir out
-+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- 
--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
--  ;;
-+   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:'`
+   $as_echo_n "(cached) " >&6
+ else
+   lt_cv_prog_compiler_c_o_CXX=no
+@@ -14261,11 +13387,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:14264: $lt_compile\"" >&5)
 +   (eval echo "\"\$as_me:13390: $lt_compile\"" >&5)
-+   (eval "$lt_compile" 2>out/conftest.err)
-+   ac_status=$?
-+   cat out/conftest.err >&5
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:14268: \$? = $ac_status" >&5
 +   echo "$as_me:13394: \$? = $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
-+     # 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_cv_prog_compiler_c_o_CXX=yes
-+     fi
-+   fi
-+   chmod u+w . 2>&5
-+   $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*
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -14287,14 +13413,14 @@
+    $RM conftest*
  
--freebsd1*)
--  dynamic_linker=no
--  ;;
-+fi
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5
-+$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
+ $as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
  
--kfreebsd*-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='GNU ld.so'
--  ;;
  
--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
--    ;;
--  freebsd*) # from 4.6 on
--    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
--  ;;
+-    { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
-+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+ $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+-if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
 +if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  lt_cv_prog_compiler_c_o_CXX=no
-+   $RM -r conftest 2>/dev/null
-+   mkdir conftest
-+   cd conftest
-+   mkdir out
-+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- 
--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'
--  ;;
-+   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:'`
+   $as_echo_n "(cached) " >&6
+ else
+   lt_cv_prog_compiler_c_o_CXX=no
+@@ -14313,11 +13439,11 @@
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:14316: $lt_compile\"" >&5)
 +   (eval echo "\"\$as_me:13442: $lt_compile\"" >&5)
-+   (eval "$lt_compile" 2>out/conftest.err)
-+   ac_status=$?
-+   cat out/conftest.err >&5
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:14320: \$? = $ac_status" >&5
 +   echo "$as_me:13446: \$? = $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
-+     # 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_cv_prog_compiler_c_o_CXX=yes
-+     fi
-+   fi
-+   chmod u+w . 2>&5
-+   $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*
+    if (exit $ac_status) && test -s out/conftest2.$ac_objext
+    then
+      # The compiler can only warn and ignore the option if not recognized
+@@ -14339,7 +13465,7 @@
+    $RM conftest*
  
--interix3*)
--  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
--  ;;
-+fi
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5
-+$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
+ $as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
  
--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*)
--  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
--  # 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
- 
--  # find out which ABI we are using
--  libsuff=
--  case "$host_cpu" in
--  x86_64*|s390x*|powerpc64*)
--    echo '#line 17480 "configure"' > conftest.$ac_ext
--    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
--      case `/usr/bin/file conftest.$ac_objext` in
--      *64-bit*)
--        libsuff=64
--        sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
--        ;;
--      esac
-+hard_links="nottested"
-+if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
-+  # do not overwrite the value of need_locks provided by the user
+@@ -14348,7 +13474,7 @@
+ hard_links="nottested"
+ if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
+   # do not overwrite the value of need_locks provided by the user
+-  { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
-+$as_echo_n "checking if we can lock with hard links... " >&6; }
-+  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
+ $as_echo_n "checking if we can lock with hard links... " >&6; }
+   hard_links=yes
+   $RM conftest*
+@@ -14356,10 +13482,10 @@
+   touch conftest.a
+   ln conftest.a conftest.b 2>&5 || hard_links=no
+   ln conftest.a conftest.b 2>/dev/null && hard_links=no
+-  { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
-+$as_echo "$hard_links" >&6; }
-+  if test "$hard_links" = no; then
+ $as_echo "$hard_links" >&6; }
+   if test "$hard_links" = no; then
+-    { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-+$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-+    need_locks=warn
-+  fi
-+else
-+  need_locks=no
-+fi
-+
-+
-+
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
-+
-+  export_symbols_cmds_CXX='$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
-+      export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-+    else
-+      export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-     fi
--    rm -rf conftest*
-     ;;
-+  pw32*)
-+    export_symbols_cmds_CXX="$ltdll_cmds"
-+  ;;
-+  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'
-+  ;;
-+  linux* | k*bsd*-gnu)
-+    link_all_deplibs_CXX=no
-+  ;;
-+  *)
-+    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-+  ;;
-   esac
-+  exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
+ $as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+     need_locks=warn
+   fi
+@@ -14369,7 +13495,7 @@
  
--  # 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/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
--    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $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'
--  ;;
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
-+$as_echo "$ld_shlibs_CXX" >&6; }
-+test "$ld_shlibs_CXX" = no && can_build_shared=no
  
--knetbsd*-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='GNU ld.so'
--  ;;
-+with_gnu_ld_CXX=$with_gnu_ld
  
--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
--  ;;
+-    { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+ $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
  
--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
--  ;;
+   export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+@@ -14398,7 +13524,7 @@
+   esac
+   exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
  
--nto-qnx*)
--  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
--  ;;
+-{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
+ $as_echo "$ld_shlibs_CXX" >&6; }
+ test "$ld_shlibs_CXX" = no && can_build_shared=no
  
--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"
--  ;;
-+#
-+# Do we need to explicitly link libc?
-+#
-+case "x$archive_cmds_need_lc_CXX" in
-+x|xyes)
-+  # Assume -lc should be added
-+  archive_cmds_need_lc_CXX=yes
- 
--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'
--  ;;
-+  if test "$enable_shared" = yes && test "$GCC" = yes; then
-+    case $archive_cmds_CXX 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.
+@@ -14426,16 +13552,16 @@
+       # 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.
+-      { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
 +      { $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; }
-+      $RM conftest*
-+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
+       $RM conftest*
+       echo "$lt_simple_compile_test_code" > conftest.$ac_ext
  
--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
+-      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 +      if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } 2>conftest.err; then
 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 +  test $ac_status = 0; } 2>conftest.err; then
-+        soname=conftest
-+        lib=conftest
-+        libobjs=conftest.$ac_objext
-+        deplibs=
-+        wl=$lt_prog_compiler_wl_CXX
-+	pic_flag=$lt_prog_compiler_pic_CXX
-+        compiler_flags=-v
-+        linker_flags=-v
-+        verstring=
-+        output_objdir=.
-+        libname=conftest
-+        lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
-+        allow_undefined_flag_CXX=
+         soname=conftest
+         lib=conftest
+         libobjs=conftest.$ac_objext
+@@ -14449,11 +13575,11 @@
+         libname=conftest
+         lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
+         allow_undefined_flag_CXX=
+-        if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5
 +        if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
-+  (eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
-+  ac_status=$?
+   (eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }
 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 +  test $ac_status = 0; }
-+        then
-+	  archive_cmds_need_lc_CXX=no
-+        else
-+	  archive_cmds_need_lc_CXX=yes
-+        fi
-+        allow_undefined_flag_CXX=$lt_save_allow_undefined_flag
-+      else
-+        cat conftest.err 1>&5
-+      fi
-+      $RM conftest*
+         then
+ 	  archive_cmds_need_lc_CXX=no
+         else
+@@ -14464,7 +13590,7 @@
+         cat conftest.err 1>&5
+       fi
+       $RM conftest*
+-      { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
 +      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc_CXX" >&5
-+$as_echo "$archive_cmds_need_lc_CXX" >&6; }
-+      ;;
-+    esac
-   fi
--  need_version=yes
-   ;;
-+esac
+ $as_echo "$archive_cmds_need_lc_CXX" >&6; }
+       ;;
+     esac
+@@ -14535,7 +13661,7 @@
  
--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
--      export_dynamic_flag_spec='${wl}-Blargedynsym'
--      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
--  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'
--    shlibpath_overrides_runpath=no
--  else
--    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
--    shlibpath_overrides_runpath=yes
--    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'
--  ;;
- 
--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
--echo "$as_me:$LINENO: result: $dynamic_linker" >&5
--echo "${ECHO_T}$dynamic_linker" >&6
--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
- 
--echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
--echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
--hardcode_action_GCJ=
--if test -n "$hardcode_libdir_flag_spec_GCJ" || \
--   test -n "$runpath_var_GCJ" || \
--   test "X$hardcode_automatic_GCJ" = "Xyes" ; then
- 
--  # We can hardcode non-existant directories.
--  if test "$hardcode_direct_GCJ" != 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_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no &&
--     test "$hardcode_minus_L_GCJ" != no; then
--    # Linking always hardcodes the temporary library directory.
--    hardcode_action_GCJ=relink
--  else
--    # We can link without hardcoding, and we can hardcode nonexisting dirs.
--    hardcode_action_GCJ=immediate
--  fi
--else
--  # We cannot hardcode anything, or else we can only hardcode existing
--  # directories.
--  hardcode_action_GCJ=unsupported
--fi
--echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
--echo "${ECHO_T}$hardcode_action_GCJ" >&6
- 
--if test "$hardcode_action_GCJ" = relink; 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
- 
- 
--# The else clause should only fire when bootstrapping the
--# libtool distribution, otherwise you forgot to ship ltmain.sh
--# with your package, and you will get complaints that there are
--# no rules to generate ltmain.sh.
--if test -f "$ltmain"; then
--  # 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
--  # Now quote all the things that may contain metacharacters while being
--  # careful not to overquote the AC_SUBSTed values.  We take copies of the
--  # variables and quote the copies for generation of the libtool script.
--  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
--    SED SHELL STRIP \
--    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
--    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
--    deplibs_check_method reload_flag reload_cmds need_locks \
--    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
--    lt_cv_sys_global_symbol_to_c_name_address \
--    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
--    old_postinstall_cmds old_postuninstall_cmds \
--    compiler_GCJ \
--    CC_GCJ \
--    LD_GCJ \
--    lt_prog_compiler_wl_GCJ \
--    lt_prog_compiler_pic_GCJ \
--    lt_prog_compiler_static_GCJ \
--    lt_prog_compiler_no_builtin_flag_GCJ \
--    export_dynamic_flag_spec_GCJ \
--    thread_safe_flag_spec_GCJ \
--    whole_archive_flag_spec_GCJ \
--    enable_shared_with_static_runtimes_GCJ \
--    old_archive_cmds_GCJ \
--    old_archive_from_new_cmds_GCJ \
--    predep_objects_GCJ \
--    postdep_objects_GCJ \
--    predeps_GCJ \
--    postdeps_GCJ \
--    compiler_lib_search_path_GCJ \
--    archive_cmds_GCJ \
--    archive_expsym_cmds_GCJ \
--    postinstall_cmds_GCJ \
--    postuninstall_cmds_GCJ \
--    old_archive_from_expsyms_cmds_GCJ \
--    allow_undefined_flag_GCJ \
--    no_undefined_flag_GCJ \
--    export_symbols_cmds_GCJ \
--    hardcode_libdir_flag_spec_GCJ \
--    hardcode_libdir_flag_spec_ld_GCJ \
--    hardcode_libdir_separator_GCJ \
--    hardcode_automatic_GCJ \
--    module_cmds_GCJ \
--    module_expsym_cmds_GCJ \
--    lt_cv_prog_compiler_c_o_GCJ \
--    exclude_expsyms_GCJ \
--    include_expsyms_GCJ; do
--
--    case $var in
--    old_archive_cmds_GCJ | \
--    old_archive_from_new_cmds_GCJ | \
--    archive_cmds_GCJ | \
--    archive_expsym_cmds_GCJ | \
--    module_cmds_GCJ | \
--    module_expsym_cmds_GCJ | \
--    old_archive_from_expsyms_cmds_GCJ | \
--    export_symbols_cmds_GCJ | \
--    extract_expsyms_cmds | reload_cmds | finish_cmds | \
--    postinstall_cmds | postuninstall_cmds | \
--    old_postinstall_cmds | old_postuninstall_cmds | \
--    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
--      # Double-quote double-evaled strings.
--      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
--      ;;
--    *)
--      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
--      ;;
--    esac
--  done
- 
--  case $lt_echo in
--  *'\$0 --fallback-echo"')
--    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
--    ;;
--  esac
- 
--cfgfile="$ofile"
- 
--  cat <<__EOF__ >> "$cfgfile"
--# ### BEGIN LIBTOOL TAG CONFIG: $tagname
- 
--# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
- 
--# Shell to use when invoking shell scripts.
--SHELL=$lt_SHELL
- 
--# Whether or not to build shared libraries.
--build_libtool_libs=$enable_shared
- 
--# Whether or not to build static libraries.
--build_old_libs=$enable_static
- 
--# Whether or not to add -lc for building shared libraries.
--build_libtool_need_lc=$archive_cmds_need_lc_GCJ
- 
--# Whether or not to disallow shared libs when runtime libs are static
--allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_GCJ
- 
--# Whether or not to optimize for fast installation.
--fast_install=$enable_fast_install
- 
--# The host system.
--host_alias=$host_alias
--host=$host
--host_os=$host_os
- 
--# The build system.
--build_alias=$build_alias
--build=$build
--build_os=$build_os
- 
--# An echo program that does not interpret backslashes.
--echo=$lt_echo
- 
--# The archiver.
--AR=$lt_AR
--AR_FLAGS=$lt_AR_FLAGS
- 
--# A C compiler.
--LTCC=$lt_LTCC
- 
--# LTCC compiler flags.
--LTCFLAGS=$lt_LTCFLAGS
- 
--# A language-specific compiler.
--CC=$lt_compiler_GCJ
- 
--# Is the compiler the GNU C compiler?
--with_gcc=$GCC_GCJ
- 
--gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
--gcc_ver=\`gcc -dumpversion\`
- 
--# An ERE matcher.
--EGREP=$lt_EGREP
- 
--# The linker used to build libraries.
--LD=$lt_LD_GCJ
- 
--# Whether we need hard or soft links.
--LN_S=$lt_LN_S
- 
--# A BSD-compatible nm program.
--NM=$lt_NM
- 
--# A symbol stripping program
--STRIP=$lt_STRIP
- 
--# Used to examine libraries when file_magic_cmd begins "file"
--MAGIC_CMD=$MAGIC_CMD
- 
--# Used on cygwin: DLL creation program.
--DLLTOOL="$DLLTOOL"
- 
--# Used on cygwin: object dumper.
--OBJDUMP="$OBJDUMP"
- 
--# Used on cygwin: assembler.
--AS="$AS"
- 
--# The name of the directory that contains temporary libtool files.
--objdir=$objdir
- 
--# How to create reloadable object files.
--reload_flag=$lt_reload_flag
--reload_cmds=$lt_reload_cmds
- 
--# How to pass a linker flag through the compiler.
--wl=$lt_lt_prog_compiler_wl_GCJ
- 
--# Object file suffix (normally "o").
--objext="$ac_objext"
- 
--# Old archive suffix (normally "a").
--libext="$libext"
- 
--# Shared library suffix (normally ".so").
--shrext_cmds='$shrext_cmds'
- 
--# Executable file suffix (normally "").
--exeext="$exeext"
- 
--# Additional compiler flags for building library objects.
--pic_flag=$lt_lt_prog_compiler_pic_GCJ
--pic_mode=$pic_mode
- 
--# What is the maximum length of a command?
--max_cmd_len=$lt_cv_sys_max_cmd_len
- 
--# Does compiler simultaneously support -c and -o options?
--compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
- 
--# Must we lock files when doing compilation?
--need_locks=$lt_need_locks
- 
--# Do we need the lib prefix for modules?
--need_lib_prefix=$need_lib_prefix
- 
--# Do we need a version for libraries?
--need_version=$need_version
- 
--# Whether dlopen is supported.
--dlopen_support=$enable_dlopen
- 
--# Whether dlopen of programs is supported.
--dlopen_self=$enable_dlopen_self
- 
--# Whether dlopen of statically linked programs is supported.
--dlopen_self_static=$enable_dlopen_self_static
- 
--# Compiler flag to prevent dynamic linking.
--link_static_flag=$lt_lt_prog_compiler_static_GCJ
- 
--# Compiler flag to turn off builtin functions.
--no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_GCJ
- 
--# Compiler flag to allow reflexive dlopens.
--export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_GCJ
- 
--# Compiler flag to generate shared objects directly from archives.
--whole_archive_flag_spec=$lt_whole_archive_flag_spec_GCJ
- 
--# Compiler flag to generate thread-safe objects.
--thread_safe_flag_spec=$lt_thread_safe_flag_spec_GCJ
- 
--# Library versioning type.
--version_type=$version_type
- 
--# Format of library name prefix.
--libname_spec=$lt_libname_spec
- 
--# 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.
--library_names_spec=$lt_library_names_spec
- 
--# The coded name of the library, if different from the real name.
--soname_spec=$lt_soname_spec
+-    { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
-+$as_echo_n "checking dynamic linker characteristics... " >&6; }
+ $as_echo_n "checking dynamic linker characteristics... " >&6; }
  
--# Commands used to build and install an old-style archive.
--RANLIB=$lt_RANLIB
--old_archive_cmds=$lt_old_archive_cmds_GCJ
--old_postinstall_cmds=$lt_old_postinstall_cmds
--old_postuninstall_cmds=$lt_old_postuninstall_cmds
-+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
+ library_names_spec=
+@@ -14891,7 +14017,7 @@
+   ;;
  
--# Create an old-style archive from a shared archive.
--old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_GCJ
-+# when you set need_version to no, make sure it does not cause -set_version
-+# flags to be left without arguments
-+need_version=unknown
- 
--# Create a temporary old-style archive to link instead of a shared archive.
--old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_GCJ
-+case $host_os in
-+aix3*)
-+  version_type=linux
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-+  shlibpath_var=LIBPATH
- 
--# Commands used to build and install a shared archive.
--archive_cmds=$lt_archive_cmds_GCJ
--archive_expsym_cmds=$lt_archive_expsym_cmds_GCJ
--postinstall_cmds=$lt_postinstall_cmds
--postuninstall_cmds=$lt_postuninstall_cmds
-+  # 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
-+  ;;
- 
--# Commands used to build a loadable module (assumed same as above if empty)
--module_cmds=$lt_module_cmds_GCJ
--module_expsym_cmds=$lt_module_expsym_cmds_GCJ
-+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
-+  ;;
- 
--# Commands to strip libraries.
--old_striplib=$lt_old_striplib
--striplib=$lt_striplib
-+cygwin* | mingw* | pw32* | cegcc*)
-+  version_type=windows
-+  shrext_cmds=".dll"
-+  need_version=no
-+  need_lib_prefix=no
- 
--# Dependencies to place before the objects being linked to create a
--# shared library.
--predep_objects=\`echo $lt_predep_objects_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
--
--# Dependencies to place after the objects being linked to create a
--# shared library.
--postdep_objects=\`echo $lt_postdep_objects_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
--
--# Dependencies to place before the objects being linked to create a
--# shared library.
--predeps=$lt_predeps_GCJ
--
--# Dependencies to place after the objects being linked to create a
--# shared library.
--postdeps=$lt_postdeps_GCJ
-+  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
- 
--# The library search path used internally by the compiler when linking
--# a shared library.
--compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_GCJ | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
-+    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
-+    ;;
- 
--# Method to check whether dependent libraries are shared objects.
--deplibs_check_method=$lt_deplibs_check_method
-+  *)
-+    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
-+  ;;
- 
--# Command to use when deplibs_check_method == file_magic.
--file_magic_cmd=$lt_file_magic_cmd
-+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`'
- 
--# Flag that allows shared libraries with undefined symbols to be built.
--allow_undefined_flag=$lt_allow_undefined_flag_GCJ
-+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-+  ;;
- 
--# Flag that forces no undefined symbols.
--no_undefined_flag=$lt_no_undefined_flag_GCJ
-+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
-+  ;;
- 
--# Commands used to finish a libtool library installation in a directory.
--finish_cmds=$lt_finish_cmds
-+freebsd1*)
-+  dynamic_linker=no
-+  ;;
- 
--# Same as above, but a single script fragment to be evaled but not shown.
--finish_eval=$lt_finish_eval
-+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
-+  ;;
- 
--# Take the output of nm and produce a listing of raw symbols and C names.
--global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-+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
-+  ;;
- 
--# Transform the output of nm in a proper C declaration
--global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-+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'
-+  ;;
- 
--# Transform the output of nm in a C name address pair
--global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-+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
-+  ;;
- 
--# This is the shared library runtime path variable.
--runpath_var=$runpath_var
-+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
-+  ;;
- 
--# This is the shared library path variable.
--shlibpath_var=$shlibpath_var
-+# No shared lib support for Linux oldld, aout, or coff.
-+linux*oldld* | linux*aout* | linux*coff*)
-+  dynamic_linker=no
-+  ;;
- 
--# Is shlibpath searched before the hard-coded library search path?
--shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-+# This must be Linux ELF.
+ # This must be Linux ELF.
+-linux* | k*bsd*-gnu)
 +linux* | k*bsd*-gnu | kopensolaris*-gnu)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  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_prog_compiler_wl_CXX\"; \
-+       LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\""
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -14905,11 +14031,7 @@
+   save_libdir=$libdir
+   eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \
+        LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\""
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
+ /* end confdefs.h.  */
  
--# How to hardcode a shared library path into an executable.
--hardcode_action=$hardcode_action_GCJ
-+int
-+main ()
-+{
- 
--# Whether we should hardcode library paths into libraries.
--hardcode_into_libs=$hardcode_into_libs
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ int
+@@ -14920,41 +14042,13 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_cxx_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then
 +if ac_fn_cxx_try_link "$LINENO"; then :
 +  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
-+  shlibpath_overrides_runpath=yes
-+fi
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+  LDFLAGS=$save_LDFLAGS
-+  libdir=$save_libdir
- 
--# Flag to hardcode \$libdir into a binary during linking.
--# This must work even if \$libdir does not exist.
--hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_GCJ
-+  # 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
- 
--# If ld is used when linking, flag to hardcode \$libdir into
--# a binary during linking. This must work even if \$libdir does
--# not exist.
--hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_GCJ
+   shlibpath_overrides_runpath=yes
+ fi
 -
--# Whether we need a single -rpath flag with a separated argument.
--hardcode_libdir_separator=$lt_hardcode_libdir_separator_GCJ
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
 -
--# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
--# resulting binary.
--hardcode_direct=$hardcode_direct_GCJ
 -
--# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
--# resulting binary.
--hardcode_minus_L=$hardcode_minus_L_GCJ
+ fi
 -
--# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
--# the resulting binary.
--hardcode_shlibpath_var=$hardcode_shlibpath_var_GCJ
--
--# Set to yes if building a shared library automatically hardcodes DIR into the library
--# and all subsequent libraries and executables linked against it.
--hardcode_automatic=$hardcode_automatic_GCJ
-+  # 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
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+   LDFLAGS=$save_LDFLAGS
+   libdir=$save_libdir
  
--# Variables whose values should be saved in libtool wrapper scripts and
--# restored at relink time.
--variables_saved_for_relink="$variables_saved_for_relink"
-+  # 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'
-+  ;;
- 
--# Whether libtool must link a program against all its dependency libraries.
--link_all_deplibs=$link_all_deplibs_GCJ
-+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'
-+  ;;
- 
--# Compile-time system search path for libraries
--sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
-+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
-+  ;;
- 
--# Run-time system search path for libraries
--sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-+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
-+  ;;
- 
--# Fix the shell variable \$srcfile for the compiler.
--fix_srcfile_path="$fix_srcfile_path_GCJ"
-+*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'
-+  ;;
- 
--# Set to yes if exported symbols are required.
--always_export_symbols=$always_export_symbols_GCJ
-+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
-+  ;;
- 
--# The commands to list exported symbols.
--export_symbols_cmds=$lt_export_symbols_cmds_GCJ
-+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
-+  ;;
- 
--# The commands to extract the exported symbol list from a shared archive.
--extract_expsyms_cmds=$lt_extract_expsyms_cmds
-+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"
-+  ;;
- 
--# Symbols that should not be listed in the preloaded symbols.
--exclude_expsyms=$lt_exclude_expsyms_GCJ
-+rdos*)
-+  dynamic_linker=no
-+  ;;
- 
--# Symbols that must always be exported.
--include_expsyms=$lt_include_expsyms_GCJ
-+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'
-+  ;;
- 
--# ### END LIBTOOL TAG CONFIG: $tagname
-+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
-+  ;;
- 
--__EOF__
-+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
-+  ;;
- 
--else
--  # If there is no Makefile yet, we rely on a make rule to execute
--  # `config.status --recheck' to rerun these tests and create the
--  # libtool script then.
--  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
--  if test -f "$ltmain_in"; then
--    test -f Makefile && make "$ltmain"
-+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
--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
-+  ;;
- 
--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
-+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
-+  ;;
- 
--CC="$lt_save_CC"
-+*)
-+  dynamic_linker=no
-+  ;;
-+esac
+@@ -15178,7 +14272,7 @@
+   dynamic_linker=no
+   ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
-+$as_echo "$dynamic_linker" >&6; }
-+test "$dynamic_linker" = no && can_build_shared=no
+ $as_echo "$dynamic_linker" >&6; }
+ test "$dynamic_linker" = no && can_build_shared=no
  
--	else
--	  tagname=""
--	fi
--	;;
-+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
+@@ -15229,7 +14323,7 @@
  
--      RC)
  
  
- 
--# Source file extension for RC test sources.
--ac_ext=rc
- 
--# Object file extension for compiled RC test sources.
--objext=o
--objext_RC=$objext
- 
--# Code to be used in simple compile tests
--lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
- 
--# 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.
- 
--# 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
- 
- 
--# save warnings/boilerplate of simple test code
--ac_outfile=conftest.$ac_objext
--printf "$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*
- 
--ac_outfile=conftest.$ac_objext
--printf "$lt_simple_link_test_code" >conftest.$ac_ext
--eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
--_lt_linker_boilerplate=`cat conftest.err`
--$rm conftest*
- 
- 
--# Allow CC to be a program name with arguments.
--lt_save_CC="$CC"
--CC=${RC-"windres"}
--compiler=$CC
--compiler_RC=$CC
--for cc_temp in $compiler""; 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_cv_prog_compiler_c_o_RC=yes
- 
--# The else clause should only fire when bootstrapping the
--# libtool distribution, otherwise you forgot to ship ltmain.sh
--# with your package, and you will get complaints that there are
--# no rules to generate ltmain.sh.
--if test -f "$ltmain"; then
--  # 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
--  # Now quote all the things that may contain metacharacters while being
--  # careful not to overquote the AC_SUBSTed values.  We take copies of the
--  # variables and quote the copies for generation of the libtool script.
--  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
--    SED SHELL STRIP \
--    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
--    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
--    deplibs_check_method reload_flag reload_cmds need_locks \
--    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
--    lt_cv_sys_global_symbol_to_c_name_address \
--    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
--    old_postinstall_cmds old_postuninstall_cmds \
--    compiler_RC \
--    CC_RC \
--    LD_RC \
--    lt_prog_compiler_wl_RC \
--    lt_prog_compiler_pic_RC \
--    lt_prog_compiler_static_RC \
--    lt_prog_compiler_no_builtin_flag_RC \
--    export_dynamic_flag_spec_RC \
--    thread_safe_flag_spec_RC \
--    whole_archive_flag_spec_RC \
--    enable_shared_with_static_runtimes_RC \
--    old_archive_cmds_RC \
--    old_archive_from_new_cmds_RC \
--    predep_objects_RC \
--    postdep_objects_RC \
--    predeps_RC \
--    postdeps_RC \
--    compiler_lib_search_path_RC \
--    archive_cmds_RC \
--    archive_expsym_cmds_RC \
--    postinstall_cmds_RC \
--    postuninstall_cmds_RC \
--    old_archive_from_expsyms_cmds_RC \
--    allow_undefined_flag_RC \
--    no_undefined_flag_RC \
--    export_symbols_cmds_RC \
--    hardcode_libdir_flag_spec_RC \
--    hardcode_libdir_flag_spec_ld_RC \
--    hardcode_libdir_separator_RC \
--    hardcode_automatic_RC \
--    module_cmds_RC \
--    module_expsym_cmds_RC \
--    lt_cv_prog_compiler_c_o_RC \
--    exclude_expsyms_RC \
--    include_expsyms_RC; do
--
--    case $var in
--    old_archive_cmds_RC | \
--    old_archive_from_new_cmds_RC | \
--    archive_cmds_RC | \
--    archive_expsym_cmds_RC | \
--    module_cmds_RC | \
--    module_expsym_cmds_RC | \
--    old_archive_from_expsyms_cmds_RC | \
--    export_symbols_cmds_RC | \
--    extract_expsyms_cmds | reload_cmds | finish_cmds | \
--    postinstall_cmds | postuninstall_cmds | \
--    old_postinstall_cmds | old_postuninstall_cmds | \
--    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
--      # Double-quote double-evaled strings.
--      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
--      ;;
--    *)
--      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
--      ;;
--    esac
--  done
- 
--  case $lt_echo in
--  *'\$0 --fallback-echo"')
--    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
--    ;;
--  esac
- 
--cfgfile="$ofile"
- 
--  cat <<__EOF__ >> "$cfgfile"
--# ### BEGIN LIBTOOL TAG CONFIG: $tagname
- 
--# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
- 
--# Shell to use when invoking shell scripts.
--SHELL=$lt_SHELL
- 
--# Whether or not to build shared libraries.
--build_libtool_libs=$enable_shared
- 
--# Whether or not to build static libraries.
--build_old_libs=$enable_static
- 
--# Whether or not to add -lc for building shared libraries.
--build_libtool_need_lc=$archive_cmds_need_lc_RC
- 
--# Whether or not to disallow shared libs when runtime libs are static
--allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_RC
- 
--# Whether or not to optimize for fast installation.
--fast_install=$enable_fast_install
- 
--# The host system.
--host_alias=$host_alias
--host=$host
--host_os=$host_os
- 
--# The build system.
--build_alias=$build_alias
--build=$build
--build_os=$build_os
- 
--# An echo program that does not interpret backslashes.
--echo=$lt_echo
- 
--# The archiver.
--AR=$lt_AR
--AR_FLAGS=$lt_AR_FLAGS
- 
--# A C compiler.
--LTCC=$lt_LTCC
- 
--# LTCC compiler flags.
--LTCFLAGS=$lt_LTCFLAGS
- 
--# A language-specific compiler.
--CC=$lt_compiler_RC
- 
--# Is the compiler the GNU C compiler?
--with_gcc=$GCC_RC
+-    { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
 +    { $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=
-+if test -n "$hardcode_libdir_flag_spec_CXX" ||
-+   test -n "$runpath_var_CXX" ||
-+   test "X$hardcode_automatic_CXX" = "Xyes" ; then
- 
--gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
--gcc_ver=\`gcc -dumpversion\`
-+  # We can hardcode non-existent directories.
-+  if test "$hardcode_direct_CXX" != 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, CXX)" != no &&
-+     test "$hardcode_minus_L_CXX" != no; then
-+    # Linking always hardcodes the temporary library directory.
-+    hardcode_action_CXX=relink
-+  else
-+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-+    hardcode_action_CXX=immediate
-+  fi
-+else
-+  # We cannot hardcode anything, or else we can only hardcode existing
-+  # directories.
-+  hardcode_action_CXX=unsupported
-+fi
+ $as_echo_n "checking how to hardcode library paths into programs... " >&6; }
+ hardcode_action_CXX=
+ if test -n "$hardcode_libdir_flag_spec_CXX" ||
+@@ -15254,7 +14348,7 @@
+   # directories.
+   hardcode_action_CXX=unsupported
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX" >&5
-+$as_echo "$hardcode_action_CXX" >&6; }
+ $as_echo "$hardcode_action_CXX" >&6; }
  
--# An ERE matcher.
--EGREP=$lt_EGREP
-+if test "$hardcode_action_CXX" = relink ||
-+   test "$inherit_rpath_CXX" = 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
+ if test "$hardcode_action_CXX" = relink ||
+@@ -15313,16 +14407,12 @@
  
--# The linker used to build libraries.
--LD=$lt_LD_RC
  
--# Whether we need hard or soft links.
--LN_S=$lt_LN_S
  
--# A BSD-compatible nm program.
--NM=$lt_NM
- 
--# A symbol stripping program
--STRIP=$lt_STRIP
- 
--# Used to examine libraries when file_magic_cmd begins "file"
--MAGIC_CMD=$MAGIC_CMD
- 
--# Used on cygwin: DLL creation program.
--DLLTOOL="$DLLTOOL"
- 
--# Used on cygwin: object dumper.
--OBJDUMP="$OBJDUMP"
-+  fi # test -n "$compiler"
- 
--# Used on cygwin: assembler.
--AS="$AS"
-+  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
- 
--# The name of the directory that contains temporary libtool files.
--objdir=$objdir
-+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
- 
--# How to create reloadable object files.
--reload_flag=$lt_reload_flag
--reload_cmds=$lt_reload_cmds
- 
--# How to pass a linker flag through the compiler.
--wl=$lt_lt_prog_compiler_wl_RC
- 
--# Object file suffix (normally "o").
--objext="$ac_objext"
- 
--# Old archive suffix (normally "a").
--libext="$libext"
- 
--# Shared library suffix (normally ".so").
--shrext_cmds='$shrext_cmds'
- 
--# Executable file suffix (normally "").
--exeext="$exeext"
- 
--# Additional compiler flags for building library objects.
--pic_flag=$lt_lt_prog_compiler_pic_RC
--pic_mode=$pic_mode
- 
--# What is the maximum length of a command?
--max_cmd_len=$lt_cv_sys_max_cmd_len
- 
--# Does compiler simultaneously support -c and -o options?
--compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
- 
--# Must we lock files when doing compilation?
--need_locks=$lt_need_locks
- 
--# Do we need the lib prefix for modules?
--need_lib_prefix=$need_lib_prefix
- 
--# Do we need a version for libraries?
--need_version=$need_version
- 
--# Whether dlopen is supported.
--dlopen_support=$enable_dlopen
-+        ac_config_commands="$ac_config_commands libtool"
- 
--# Whether dlopen of programs is supported.
--dlopen_self=$enable_dlopen_self
- 
--# Whether dlopen of statically linked programs is supported.
--dlopen_self_static=$enable_dlopen_self_static
- 
--# Compiler flag to prevent dynamic linking.
--link_static_flag=$lt_lt_prog_compiler_static_RC
- 
--# Compiler flag to turn off builtin functions.
--no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_RC
-+# Only expand once:
- 
--# Compiler flag to allow reflexive dlopens.
--export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_RC
- 
--# Compiler flag to generate shared objects directly from archives.
--whole_archive_flag_spec=$lt_whole_archive_flag_spec_RC
- 
--# Compiler flag to generate thread-safe objects.
--thread_safe_flag_spec=$lt_thread_safe_flag_spec_RC
+-{ $as_echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
-+$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
+ $as_echo_n "checking for an ANSI C-conforming const... " >&6; }
+-if test "${ac_cv_c_const+set}" = set; then
 +if test "${ac_cv_c_const+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
- 
--# Library versioning type.
--version_type=$version_type
-+int
-+main ()
-+{
-+/* FIXME: Include the comments suggested by Paul. */
-+#ifndef __cplusplus
-+  /* Ultrix mips cc rejects this.  */
-+  typedef int charset[2];
-+  const charset cs;
-+  /* SunOS 4.1.1 cc rejects this.  */
-+  char const *const *pcpcc;
-+  char **ppc;
-+  /* NEC SVR4.0.2 mips cc rejects this.  */
-+  struct point {int x, y;};
-+  static struct point const zero = {0,0};
-+  /* AIX XL C 1.02.0.0 rejects this.
-+     It does not let you subtract one const X* pointer from another in
-+     an arm of an if-expression whose if-part is not a constant
-+     expression */
-+  const char *g = "string";
-+  pcpcc = &g + (g ? g-g : 0);
-+  /* HPUX 7.0 cc rejects these. */
-+  ++pcpcc;
-+  ppc = (char**) pcpcc;
-+  pcpcc = (char const *const *) ppc;
-+  { /* SCO 3.2v4 cc rejects this.  */
-+    char *t;
-+    char const *s = 0 ? (char *) 0 : (char const *) 0;
- 
--# Format of library name prefix.
--libname_spec=$lt_libname_spec
-+    *t++ = 0;
-+    if (s) return 0;
-+  }
-+  { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
-+    int x[] = {25, 17};
-+    const int *foo = &x[0];
-+    ++foo;
-+  }
-+  { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
-+    typedef const int *iptr;
-+    iptr p = 0;
-+    ++p;
-+  }
-+  { /* AIX XL C 1.02.0.0 rejects this saying
-+       "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
-+    struct s { int j; const int *ap[3]; };
-+    struct s *b; b->j = 5;
-+  }
-+  { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
-+    const int foo = 10;
-+    if (!foo) return 0;
-+  }
-+  return !cs[0] && !zero.x;
-+#endif
- 
--# 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.
--library_names_spec=$lt_library_names_spec
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_c_const=yes
-+else
-+  ac_cv_c_const=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
-+$as_echo "$ac_cv_c_const" >&6; }
-+if test $ac_cv_c_const = no; then
- 
--# The coded name of the library, if different from the real name.
--soname_spec=$lt_soname_spec
-+$as_echo "#define const /**/" >>confdefs.h
- 
--# Commands used to build and install an old-style archive.
--RANLIB=$lt_RANLIB
--old_archive_cmds=$lt_old_archive_cmds_RC
--old_postinstall_cmds=$lt_old_postinstall_cmds
--old_postuninstall_cmds=$lt_old_postuninstall_cmds
-+fi
- 
--# Create an old-style archive from a shared archive.
--old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_RC
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
-+$as_echo_n "checking for inline... " >&6; }
-+if test "${ac_cv_c_inline+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_cv_c_inline=no
-+for ac_kw in inline __inline__ __inline; do
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#ifndef __cplusplus
-+typedef int foo_t;
-+static $ac_kw foo_t static_foo () {return 0; }
-+$ac_kw foo_t foo () {return 0; }
-+#endif
- 
--# Create a temporary old-style archive to link instead of a shared archive.
--old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_RC
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_c_inline=$ac_kw
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+  test "$ac_cv_c_inline" != no && break
-+done
- 
--# Commands used to build and install a shared archive.
--archive_cmds=$lt_archive_cmds_RC
--archive_expsym_cmds=$lt_archive_expsym_cmds_RC
--postinstall_cmds=$lt_postinstall_cmds
--postuninstall_cmds=$lt_postuninstall_cmds
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
-+$as_echo "$ac_cv_c_inline" >&6; }
-+
-+case $ac_cv_c_inline in
-+  inline | yes) ;;
-+  *)
-+    case $ac_cv_c_inline in
-+      no) ac_val=;;
-+      *) ac_val=$ac_cv_c_inline;;
-+    esac
-+    cat >>confdefs.h <<_ACEOF
-+#ifndef __cplusplus
-+#define inline $ac_val
-+#endif
-+_ACEOF
-+    ;;
-+esac
- 
--# Commands used to build a loadable module (assumed same as above if empty)
--module_cmds=$lt_module_cmds_RC
--module_expsym_cmds=$lt_module_expsym_cmds_RC
-+for ac_header in stdlib.h
-+do :
-+  ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
-+if test "x$ac_cv_header_stdlib_h" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_STDLIB_H 1
-+_ACEOF
- 
--# Commands to strip libraries.
--old_striplib=$lt_old_striplib
--striplib=$lt_striplib
-+fi
- 
--# Dependencies to place before the objects being linked to create a
--# shared library.
--predep_objects=\`echo $lt_predep_objects_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
--
--# Dependencies to place after the objects being linked to create a
--# shared library.
--postdep_objects=\`echo $lt_postdep_objects_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
--
--# Dependencies to place before the objects being linked to create a
--# shared library.
--predeps=$lt_predeps_RC
--
--# Dependencies to place after the objects being linked to create a
--# shared library.
--postdeps=$lt_postdeps_RC
-+done
- 
--# The library search path used internally by the compiler when linking
--# a shared library.
--compiler_lib_search_path=\`echo $lt_compiler_lib_search_path_RC | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible malloc" >&5
-+$as_echo_n "checking for GNU libc compatible malloc... " >&6; }
-+if test "${ac_cv_func_malloc_0_nonnull+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test "$cross_compiling" = yes; then :
-+  ac_cv_func_malloc_0_nonnull=no
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#if defined STDC_HEADERS || defined HAVE_STDLIB_H
-+# include <stdlib.h>
-+#else
-+char *malloc ();
-+#endif
- 
--# Method to check whether dependent libraries are shared objects.
--deplibs_check_method=$lt_deplibs_check_method
-+int
-+main ()
-+{
-+return ! malloc (0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_run "$LINENO"; then :
-+  ac_cv_func_malloc_0_nonnull=yes
-+else
-+  ac_cv_func_malloc_0_nonnull=no
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+  conftest.$ac_objext conftest.beam conftest.$ac_ext
-+fi
- 
--# Command to use when deplibs_check_method == file_magic.
--file_magic_cmd=$lt_file_magic_cmd
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_malloc_0_nonnull" >&5
-+$as_echo "$ac_cv_func_malloc_0_nonnull" >&6; }
-+if test $ac_cv_func_malloc_0_nonnull = yes; then :
-+
-+$as_echo "#define HAVE_MALLOC 1" >>confdefs.h
-+
-+else
-+  $as_echo "#define HAVE_MALLOC 0" >>confdefs.h
-+
-+   case " $LIBOBJS " in
-+  *" malloc.$ac_objext "* ) ;;
-+  *) LIBOBJS="$LIBOBJS malloc.$ac_objext"
-+ ;;
-+esac
-+
-+
-+$as_echo "#define malloc rpl_malloc" >>confdefs.h
-+
-+fi
-+
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working strtod" >&5
-+$as_echo_n "checking for working strtod... " >&6; }
-+if test "${ac_cv_func_strtod+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test "$cross_compiling" = yes; then :
-+  ac_cv_func_strtod=no
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+$ac_includes_default
-+#ifndef strtod
-+double strtod ();
-+#endif
-+int
-+main()
-+{
-+  {
-+    /* Some versions of Linux strtod mis-parse strings with leading '+'.  */
-+    char *string = " +69";
-+    char *term;
-+    double value;
-+    value = strtod (string, &term);
-+    if (value != 69 || term != (string + 4))
-+      return 1;
-+  }
- 
--# Flag that allows shared libraries with undefined symbols to be built.
--allow_undefined_flag=$lt_allow_undefined_flag_RC
-+  {
-+    /* Under Solaris 2.4, strtod returns the wrong value for the
-+       terminating character under some conditions.  */
-+    char *string = "NaN";
-+    char *term;
-+    strtod (string, &term);
-+    if (term != string && *(term - 1) == 0)
-+      return 1;
-+  }
-+  return 0;
-+}
- 
--# Flag that forces no undefined symbols.
--no_undefined_flag=$lt_no_undefined_flag_RC
-+_ACEOF
-+if ac_fn_c_try_run "$LINENO"; then :
-+  ac_cv_func_strtod=yes
-+else
-+  ac_cv_func_strtod=no
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+  conftest.$ac_objext conftest.beam conftest.$ac_ext
-+fi
- 
--# Commands used to finish a libtool library installation in a directory.
--finish_cmds=$lt_finish_cmds
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strtod" >&5
-+$as_echo "$ac_cv_func_strtod" >&6; }
-+if test $ac_cv_func_strtod = no; then
-+  case " $LIBOBJS " in
-+  *" strtod.$ac_objext "* ) ;;
-+  *) LIBOBJS="$LIBOBJS strtod.$ac_objext"
-+ ;;
-+esac
- 
--# Same as above, but a single script fragment to be evaled but not shown.
--finish_eval=$lt_finish_eval
-+ac_fn_c_check_func "$LINENO" "pow" "ac_cv_func_pow"
-+if test "x$ac_cv_func_pow" = x""yes; then :
- 
--# Take the output of nm and produce a listing of raw symbols and C names.
--global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-+fi
- 
--# Transform the output of nm in a proper C declaration
--global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-+if test $ac_cv_func_pow = no; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pow in -lm" >&5
-+$as_echo_n "checking for pow in -lm... " >&6; }
-+if test "${ac_cv_lib_m_pow+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lm  $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
- 
--# Transform the output of nm in a C name address pair
--global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char pow ();
-+int
-+main ()
-+{
-+return pow ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_m_pow=yes
-+else
-+  ac_cv_lib_m_pow=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_pow" >&5
-+$as_echo "$ac_cv_lib_m_pow" >&6; }
-+if test "x$ac_cv_lib_m_pow" = x""yes; then :
-+  POW_LIB=-lm
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot find library containing definition of pow" >&5
-+$as_echo "$as_me: WARNING: cannot find library containing definition of pow" >&2;}
-+fi
- 
--# This is the shared library runtime path variable.
--runpath_var=$runpath_var
-+fi
- 
--# This is the shared library path variable.
--shlibpath_var=$shlibpath_var
-+fi
- 
--# Is shlibpath searched before the hard-coded library search path?
--shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99" >&5
-+$as_echo_n "checking for stdbool.h that conforms to C99... " >&6; }
-+if test "${ac_cv_header_stdbool_h+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
- 
--# How to hardcode a shared library path into an executable.
--hardcode_action=$hardcode_action_RC
-+#include <stdbool.h>
-+#ifndef bool
-+ "error: bool is not defined"
-+#endif
-+#ifndef false
-+ "error: false is not defined"
-+#endif
-+#if false
-+ "error: false is not 0"
-+#endif
-+#ifndef true
-+ "error: true is not defined"
-+#endif
-+#if true != 1
-+ "error: true is not 1"
-+#endif
-+#ifndef __bool_true_false_are_defined
-+ "error: __bool_true_false_are_defined is not defined"
-+#endif
- 
--# Whether we should hardcode library paths into libraries.
--hardcode_into_libs=$hardcode_into_libs
-+	struct s { _Bool s: 1; _Bool t; } s;
- 
--# Flag to hardcode \$libdir into a binary during linking.
--# This must work even if \$libdir does not exist.
--hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_RC
-+	char a[true == 1 ? 1 : -1];
-+	char b[false == 0 ? 1 : -1];
-+	char c[__bool_true_false_are_defined == 1 ? 1 : -1];
-+	char d[(bool) 0.5 == true ? 1 : -1];
-+	bool e = &s;
-+	char f[(_Bool) 0.0 == false ? 1 : -1];
-+	char g[true];
-+	char h[sizeof (_Bool)];
-+	char i[sizeof s.t];
-+	enum { j = false, k = true, l = false * true, m = true * 256 };
-+	/* The following fails for
-+	   HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */
-+	_Bool n[m];
-+	char o[sizeof n == m * sizeof n[0] ? 1 : -1];
-+	char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1];
-+#	if defined __xlc__ || defined __GNUC__
-+	 /* Catch a bug in IBM AIX xlc compiler version 6.0.0.0
-+	    reported by James Lemley on 2005-10-05; see
-+	    http://lists.gnu.org/archive/html/bug-coreutils/2005-10/msg00086.html
-+	    This test is not quite right, since xlc is allowed to
-+	    reject this program, as the initializer for xlcbug is
-+	    not one of the forms that C requires support for.
-+	    However, doing the test right would require a runtime
-+	    test, and that would make cross-compilation harder.
-+	    Let us hope that IBM fixes the xlc bug, and also adds
-+	    support for this kind of constant expression.  In the
-+	    meantime, this test will reject xlc, which is OK, since
-+	    our stdbool.h substitute should suffice.  We also test
-+	    this with GCC, where it should work, to detect more
-+	    quickly whether someone messes up the test in the
-+	    future.  */
-+	 char digs[] = "0123456789";
-+	 int xlcbug = 1 / (&(digs + 5)[-2 + (bool) 1] == &digs[4] ? 1 : -1);
-+#	endif
-+	/* Catch a bug in an HP-UX C compiler.  See
-+	   http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html
-+	   http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html
-+	 */
-+	_Bool q = true;
-+	_Bool *pq = &q;
- 
--# If ld is used when linking, flag to hardcode \$libdir into
--# a binary during linking. This must work even if \$libdir does
--# not exist.
--hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_RC
--
--# Whether we need a single -rpath flag with a separated argument.
--hardcode_libdir_separator=$lt_hardcode_libdir_separator_RC
--
--# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
--# resulting binary.
--hardcode_direct=$hardcode_direct_RC
--
--# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
--# resulting binary.
--hardcode_minus_L=$hardcode_minus_L_RC
--
--# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
--# the resulting binary.
--hardcode_shlibpath_var=$hardcode_shlibpath_var_RC
--
--# Set to yes if building a shared library automatically hardcodes DIR into the library
--# and all subsequent libraries and executables linked against it.
--hardcode_automatic=$hardcode_automatic_RC
-+int
-+main ()
-+{
- 
--# Variables whose values should be saved in libtool wrapper scripts and
--# restored at relink time.
--variables_saved_for_relink="$variables_saved_for_relink"
-+	*pq |= q;
-+	*pq |= ! q;
-+	/* Refer to every declared value, to avoid compiler optimizations.  */
-+	return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l
-+		+ !m + !n + !o + !p + !q + !pq);
- 
--# Whether libtool must link a program against all its dependency libraries.
--link_all_deplibs=$link_all_deplibs_RC
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_header_stdbool_h=yes
-+else
-+  ac_cv_header_stdbool_h=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdbool_h" >&5
-+$as_echo "$ac_cv_header_stdbool_h" >&6; }
-+ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default"
-+if test "x$ac_cv_type__Bool" = x""yes; then :
- 
--# Compile-time system search path for libraries
--sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE__BOOL 1
-+_ACEOF
- 
--# Run-time system search path for libraries
--sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
- 
--# Fix the shell variable \$srcfile for the compiler.
--fix_srcfile_path="$fix_srcfile_path_RC"
-+fi
- 
--# Set to yes if exported symbols are required.
--always_export_symbols=$always_export_symbols_RC
-+if test $ac_cv_header_stdbool_h = yes; then
- 
--# The commands to list exported symbols.
--export_symbols_cmds=$lt_export_symbols_cmds_RC
-+$as_echo "#define HAVE_STDBOOL_H 1" >>confdefs.h
- 
--# The commands to extract the exported symbol list from a shared archive.
--extract_expsyms_cmds=$lt_extract_expsyms_cmds
-+fi
- 
--# Symbols that should not be listed in the preloaded symbols.
--exclude_expsyms=$lt_exclude_expsyms_RC
-+ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
-+if test "x$ac_cv_type_size_t" = x""yes; then :
- 
--# Symbols that must always be exported.
--include_expsyms=$lt_include_expsyms_RC
-+else
- 
--# ### END LIBTOOL TAG CONFIG: $tagname
-+cat >>confdefs.h <<_ACEOF
-+#define size_t unsigned int
-+_ACEOF
- 
--__EOF__
-+fi
- 
- 
-+ if test "$GCC" = yes; then
-+  GCC_TRUE=
-+  GCC_FALSE='#'
+   $as_echo_n "(cached) " >&6
  else
--  # If there is no Makefile yet, we rely on a make rule to execute
--  # `config.status --recheck' to rerun these tests and create the
--  # libtool script then.
--  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
--  if test -f "$ltmain_in"; then
--    test -f Makefile && make "$ltmain"
--  fi
-+  GCC_TRUE='#'
-+  GCC_FALSE=
- 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
-+PLATFORM=
-+SHLIBSUFFIX=
-+case "`uname -s`" in
-+	Linux|GNU/kFreeBSD)	PLATFORM=linux
-+		SHLIBSUFFIX="so"
-+	;;
-+	Darwin)	PLATFORM=darwin
-+		SHLIBSUFFIX="dylib"
-+	;;
-+	*) 	PLATFORM=unknown
-+		SHLIBSUFFIX="so"
-+	;;
-+esac
- 
--CC="$lt_save_CC"
- 
--	;;
- 
--      *)
--	{ { echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5
--echo "$as_me: error: Unsupported tag name: $tagname" >&2;}
--   { (exit 1); exit 1; }; }
--	;;
--      esac
- 
--      # Append the new tag name to the list of available tags.
--      if test -n "$tagname" ; then
--      available_tags="$available_tags $tagname"
--    fi
--    fi
--  done
--  IFS="$lt_save_ifs"
-+# Check whether --with-expat-include-dir was given.
-+if test "${with_expat_include_dir+set}" = set; then :
-+  withval=$with_expat_include_dir; CFLAGS="$CFLAGS -I$withval" CPPFLAGS="$CPPFLAGS -I$withval"
-+fi
- 
--  # Now substitute the updated list of available tags.
--  if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
--    mv "${ofile}T" "$ofile"
--    chmod +x "$ofile"
--  else
--    rm -f "${ofile}T"
--    { { echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5
--echo "$as_me: error: unable to update list of available tagged configurations." >&2;}
--   { (exit 1); exit 1; }; }
--  fi
-+
-+# Check whether --with-expat-lib-dir was given.
-+if test "${with_expat_lib_dir+set}" = set; then :
-+  withval=$with_expat_lib_dir; LDFLAGS="$LDFLAGS -L$withval"
- fi
- 
- 
- 
--# This can be used to rebuild libtool when needed
--LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+# Check whether --with-java-include-dir was given.
-+if test "${with_java_include_dir+set}" = set; then :
-+  withval=$with_java_include_dir; JAVA_INCLUDE_DIR=$withval
-+fi
-+
- 
--# Always use our own libtool.
--LIBTOOL='$(SHELL) $(top_builddir)/libtool'
- 
--# Prevent multiple expansion
-+# Check whether --with-java-lib-dir was given.
-+if test "${with_java_lib_dir+set}" = set; then :
-+  withval=$with_java_lib_dir; JAVA_LIB_DIR=$withval
-+fi
- 
- 
- 
- 
-+# Check whether --with-python-include-dir was given.
-+if test "${with_python_include_dir+set}" = set; then :
-+  withval=$with_python_include_dir; PYTHON_INCLUDE_DIR=$withval
-+fi
- 
- 
- 
-+# Check whether --with-python-lib-dir was given.
-+if test "${with_python_lib_dir+set}" = set; then :
-+  withval=$with_python_lib_dir; PYTHON_LIB_DIR=$withval
-+fi
- 
- 
- 
- 
-+for ac_header in expat.h
-+do :
-+  ac_fn_c_check_header_mongrel "$LINENO" "expat.h" "ac_cv_header_expat_h" "$ac_includes_default"
-+if test "x$ac_cv_header_expat_h" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_EXPAT_H 1
-+_ACEOF
-+ expat_h_found="yes"
-+else
-+  expat_h_found="no"
-+fi
- 
-+done
- 
-+if test $expat_h_found = "no"
-+then
-+	as_fn_error "\"Unable to locate expat.h. Use configure --help to see how to specify the search path\"" "$LINENO" 5
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML_ParserCreate in -lexpat" >&5
-+$as_echo_n "checking for XML_ParserCreate in -lexpat... " >&6; }
-+if test "${ac_cv_lib_expat_XML_ParserCreate+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lexpat  $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
- 
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char XML_ParserCreate ();
-+int
-+main ()
-+{
-+return XML_ParserCreate ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_expat_XML_ParserCreate=yes
-+else
-+  ac_cv_lib_expat_XML_ParserCreate=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_expat_XML_ParserCreate" >&5
-+$as_echo "$ac_cv_lib_expat_XML_ParserCreate" >&6; }
-+if test "x$ac_cv_lib_expat_XML_ParserCreate" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBEXPAT 1
-+_ACEOF
- 
-+  LIBS="-lexpat $LIBS"
- 
-+else
-+  as_fn_error "\"Expat library not found. Use configure --help to see how to specify the search path\"" "$LINENO" 5
-+fi
- 
- 
-+for ac_header in float.h limits.h stdlib.h string.h
-+do :
-+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
- 
-+fi
- 
-+done
- 
--echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
--echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
--if test "${ac_cv_c_const+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
-+for ac_func in floor memset strstr
-+do :
-+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+   if test "x$as_val" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
+-_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
  
--int
--main ()
--{
--/* FIXME: Include the comments suggested by Paul. */
--#ifndef __cplusplus
--  /* Ultrix mips cc rejects this.  */
--  typedef int charset[2];
--  const charset x;
--  /* SunOS 4.1.1 cc rejects this.  */
--  char const *const *ccp;
--  char **p;
--  /* NEC SVR4.0.2 mips cc rejects this.  */
--  struct point {int x, y;};
--  static struct point const zero = {0,0};
--  /* AIX XL C 1.02.0.0 rejects this.
--     It does not let you subtract one const X* pointer from another in
--     an arm of an if-expression whose if-part is not a constant
--     expression */
--  const char *g = "string";
--  ccp = &g + (g ? g-g : 0);
--  /* HPUX 7.0 cc rejects these. */
--  ++ccp;
--  p = (char**) ccp;
--  ccp = (char const *const *) p;
--  { /* SCO 3.2v4 cc rejects this.  */
--    char *t;
--    char const *s = 0 ? (char *) 0 : (char const *) 0;
-+fi
-+done
- 
--    *t++ = 0;
--  }
--  { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
--    int x[] = {25, 17};
--    const int *foo = &x[0];
--    ++foo;
--  }
--  { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
--    typedef const int *iptr;
--    iptr p = 0;
--    ++p;
--  }
--  { /* AIX XL C 1.02.0.0 rejects this saying
--       "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
--    struct s { int j; const int *ap[3]; };
--    struct s *b; b->j = 5;
--  }
--  { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
--    const int foo = 10;
--  }
--#endif
- 
--  ;
--  return 0;
--}
--_ACEOF
+ int
+@@ -15382,56 +14472,29 @@
+   return 0;
+ }
+ _ACEOF
 -rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_c_const=yes
-+# Check whether --enable-swig was given.
-+if test "${enable_swig+set}" = set; then :
-+  enableval=$enable_swig;
-+fi
-+
-+if test "x$enable_swig" != xno; then
-+	# Extract the first word of "swig", so it can be a program name with args.
-+set dummy swig; 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_SWIG+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
++if ac_fn_c_try_compile "$LINENO"; then :
+   ac_cv_c_const=yes
  else
--  echo "$as_me: failed program was:" >&5
+-  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+  if test -n "$SWIG"; then
-+  ac_cv_prog_SWIG="$SWIG" # 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_SWIG="swig"
-+    $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
- 
--ac_cv_c_const=no
+-
+-	ac_cv_c_const=no
++  ac_cv_c_const=no
  fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
--echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
--echo "${ECHO_T}$ac_cv_c_const" >&6
--if test $ac_cv_c_const = no; then
-+SWIG=$ac_cv_prog_SWIG
-+if test -n "$SWIG"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SWIG" >&5
-+$as_echo "$SWIG" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
+ $as_echo "$ac_cv_c_const" >&6; }
+ if test $ac_cv_c_const = no; then
  
 -cat >>confdefs.h <<\_ACEOF
--#define const
+-#define const /**/
 -_ACEOF
++$as_echo "#define const /**/" >>confdefs.h
  
-+	if test "x$SWIG" != x; then
-+		SWIG_VERSION=`swig -version 2>&1|grep Version|cut -d" " -f3`
-+		if test ${SWIG_VERSION:4} -lt 35; then
-+			{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You have SWIG $SWIG_VERSION installed, but libkml requires at least SWIG 1.3.35. The bindings will not be built." >&5
-+$as_echo "$as_me: WARNING: You have SWIG $SWIG_VERSION installed, but libkml requires at least SWIG 1.3.35. The bindings will not be built." >&2;}
-+			SWIG=
-+		fi
-+	fi
  fi
--
--echo "$as_me:$LINENO: checking for inline" >&5
--echo $ECHO_N "checking for inline... $ECHO_C" >&6
+ 
+-{ $as_echo "$as_me:$LINENO: checking for inline" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
+ $as_echo_n "checking for inline... " >&6; }
 -if test "${ac_cv_c_inline+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+ if test "x$SWIG" != x; then
-+  WITH_SWIG_TRUE=
-+  WITH_SWIG_FALSE='#'
++if test "${ac_cv_c_inline+set}" = set; then :
+   $as_echo_n "(cached) " >&6
  else
--  ac_cv_c_inline=no
--for ac_kw in inline __inline__ __inline; do
+   ac_cv_c_inline=no
+ for ac_kw in inline __inline__ __inline; do
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#ifndef __cplusplus
--typedef int foo_t;
--static $ac_kw foo_t static_foo () {return 0; }
--$ac_kw foo_t foo () {return 0; }
--#endif
-+  WITH_SWIG_TRUE='#'
-+  WITH_SWIG_FALSE=
-+fi
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #ifndef __cplusplus
+ typedef int foo_t;
+@@ -15440,41 +14503,17 @@
+ #endif
  
--_ACEOF
+ _ACEOF
 -rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_c_inline=$ac_kw; break
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
++if ac_fn_c_try_compile "$LINENO"; then :
+   ac_cv_c_inline=$ac_kw
 -else
--  echo "$as_me: failed program was:" >&5
+-  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
- 
-+# Check whether --enable-systempython was given.
-+if test "${enable_systempython+set}" = set; then :
-+  enableval=$enable_systempython;
+-
+-
  fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--done
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   test "$ac_cv_c_inline" != no && break
+ done
  
-+USE_DEFAULT_PYTHON_LIBDIR=false
-+if test "x$enable_systempython" = xyes; then
-+	USE_DEFAULT_PYTHON_LIBDIR=true
  fi
--echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
--echo "${ECHO_T}$ac_cv_c_inline" >&6
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
+ $as_echo "$ac_cv_c_inline" >&6; }
  
-+if test "x$SWIG" != x; then
-+	# Check whether --enable-java was given.
-+if test "${enable_java+set}" = set; then :
-+  enableval=$enable_java;
-+fi
+-
+ case $ac_cv_c_inline in
+   inline | yes) ;;
+   *)
+@@ -15490,170 +14529,27 @@
+     ;;
+ esac
  
--case $ac_cv_c_inline in
--  inline | yes) ;;
--  *)
--    case $ac_cv_c_inline in
--      no) ac_val=;;
--      *) ac_val=$ac_cv_c_inline;;
--    esac
--    cat >>confdefs.h <<_ACEOF
--#ifndef __cplusplus
--#define inline $ac_val
--#endif
--_ACEOF
--    ;;
--esac
-+	if test "x$enable_java" != xno; then
-+		# Extract the first word of "java", so it can be a program name with args.
-+set dummy java; 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_JAVA+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$JAVA"; then
-+  ac_cv_prog_JAVA="$JAVA" # 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_JAVA="java"
-+    $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
-+
-+  test -z "$ac_cv_prog_JAVA" && ac_cv_prog_JAVA="nojava"
-+fi
-+fi
-+JAVA=$ac_cv_prog_JAVA
-+if test -n "$JAVA"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JAVA" >&5
-+$as_echo "$JAVA" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
- 
- 
--for ac_header in stdlib.h
-+		if test "$JAVA" = "nojava"; then
-+		  as_fn_error "no java binary in PATH" "$LINENO" 5
-+		fi
-+		# Extract the first word of "javac", so it can be a program name with args.
-+set dummy javac; 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_JAVAC+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$JAVAC"; then
-+  ac_cv_prog_JAVAC="$JAVAC" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
- do
--as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
--  echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  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_JAVAC="javac"
-+    $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
-+
-+  test -z "$ac_cv_prog_JAVAC" && ac_cv_prog_JAVAC="nojavac"
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+fi
-+JAVAC=$ac_cv_prog_JAVAC
-+if test -n "$JAVAC"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JAVAC" >&5
-+$as_echo "$JAVAC" >&6; }
- else
+-
+ for ac_header in stdlib.h
+-do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
+-fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-else
 -  # Is the header compilable?
--echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
@@ -52360,82 +10516,38 @@
 -#include <$ac_header>
 -_ACEOF
 -rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
 -  ac_header_compiler=yes
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+		if test "$JAVAC" = "nojavac"; then
-+		  as_fn_error "no javac binary in PATH, bindings will not be built" "$LINENO" 5
-+		fi
-+		# Extract the first word of "jar", so it can be a program name with args.
-+set dummy jar; 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_JAR+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
- else
--  echo "$as_me: failed program was:" >&5
+-else
+-  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+  if test -n "$JAR"; then
-+  ac_cv_prog_JAR="$JAR" # 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_JAR="jar"
-+    $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
- 
--ac_header_compiler=no
-+  test -z "$ac_cv_prog_JAR" && ac_cv_prog_JAR="nojar"
-+fi
-+fi
-+JAR=$ac_cv_prog_JAR
-+if test -n "$JAR"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JAR" >&5
-+$as_echo "$JAR" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
- 
+-
+-	ac_header_compiler=no
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
+-
 -# Is the header present?
--echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
@@ -52444,714 +10556,268 @@
 -/* end confdefs.h.  */
 -#include <$ac_header>
 -_ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+-if { (ac_try="$ac_cpp conftest.$ac_ext"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } >/dev/null; then
--  if test -s conftest.err; then
--    ac_cpp_err=$ac_c_preproc_warn_flag
--    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
--  else
--    ac_cpp_err=
--  fi
-+
-+		if test "$JAR" = "nojar"; then
-+		  as_fn_error "no jar binary in PATH, bindings will not be built" "$LINENO" 5
-+		fi
-+		if test "x$JAVA" != x; then
-+			current_CPPFLAGS="$CPPFLAGS"
-+			if test "$CPPFLAGS" != ""; then
-+				CPPFLAGS="-I$current_CPPFLAGS -I$JAVA_INCLUDE_DIR -I$JAVA_INCLUDE_DIR/$PLATFORM"
-+			else
-+				CPPFLAGS="-I$JAVA_INCLUDE_DIR -I$JAVA_INCLUDE_DIR/$PLATFORM"
-+			fi
-+			ac_fn_c_check_header_mongrel "$LINENO" "jni.h" "ac_cv_header_jni_h" "$ac_includes_default"
-+if test "x$ac_cv_header_jni_h" = x""yes; then :
-+
- else
--  ac_cpp_err=yes
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: could not find jni.h. The Java bindings will not be built." >&5
-+$as_echo "$as_me: WARNING: could not find jni.h. The Java bindings will not be built." >&2;}
-+			JAVA=
-+
- fi
--if test -z "$ac_cpp_err"; then
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null && {
+-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       }; then
 -  ac_header_preproc=yes
-+
-+
-+			CPPFLAGS="$current_CPPFLAGS"
-+		fi
-+	fi
-+fi
-+ if test "x$JAVA" != x; then
-+  WITH_JAVA_TRUE=
-+  WITH_JAVA_FALSE='#'
- else
--  echo "$as_me: failed program was:" >&5
+-else
+-  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+  WITH_JAVA_TRUE='#'
-+  WITH_JAVA_FALSE=
-+fi
- 
+-
 -  ac_header_preproc=no
-+
-+if test "x$SWIG" != x; then
-+	# Check whether --enable-python was given.
-+if test "${enable_python+set}" = set; then :
-+  enableval=$enable_python;
- fi
+-fi
+-
 -rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
- 
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
+-
 -# So?  What about this header?
 -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
 -  yes:no: )
--    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
--echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
 -    ac_header_preproc=yes
 -    ;;
 -  no:yes:* )
--    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
--echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
--echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
--echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
--echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
--    (
--      cat <<\_ASBOX
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
 -## ----------------------------------------------------- ##
 -## Report this to http://code.google.com/p/libkml/issues ##
 -## ----------------------------------------------------- ##
 -_ASBOX
--    ) |
--      sed "s/^/$as_me: WARNING:     /" >&2
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
 -    ;;
 -esac
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+	if test "x$enable_python" != xno; then
-+		# Extract the first word of "python", so it can be a program name with args.
-+set dummy python; 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_PYTHON+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$PYTHON"; then
-+  ac_cv_prog_PYTHON="$PYTHON" # 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_PYTHON="python"
-+    $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
-+PYTHON=$ac_cv_prog_PYTHON
-+if test -n "$PYTHON"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5
-+$as_echo "$PYTHON" >&6; }
- else
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
+-else
 -  eval "$as_ac_Header=\$ac_header_preproc"
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- 
 -fi
--if test `eval echo '${'$as_ac_Header'}'` = yes; then
--  cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
--_ACEOF
-+
-+		if test "x$PYTHON" != x; then
-+			PYTHON_VERSION=`$PYTHON -c "import sys; print sys.version[:3]"`
-+			if test "$USE_DEFAULT_PYTHON_LIBDIR" = true; then
-+				PYTHON_SITE_PACKAGES_DIR=`$PYTHON -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_lib(1,0)'`
-+			else
-+				PYTHON_SITE_PACKAGES_DIR=`$PYTHON -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_lib(1,0,"${exec_prefix}")'`
-+			fi
-+
-+			if test "$PYTHON_INCLUDE_DIR" = ""; then
-+				PYTHON_INCLUDE_DIR=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_python_inc()"`
-+			fi
-+			if test "$PYTHON_LIB_DIR" = ""; then
-+				PYTHON_LIB_DIR=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('LIBPL')"`
-+			fi
-+			current_CPPFLAGS="$CPPFLAGS"
-+			CPPFLAGS="-I$PYTHON_INCLUDE_DIR"
-+			ac_fn_c_check_header_mongrel "$LINENO" "Python.h" "ac_cv_header_Python_h" "$ac_includes_default"
-+if test "x$ac_cv_header_Python_h" = x""yes; then :
-+
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: could not find Python.h. The Python bindings will not be built." >&5
-+$as_echo "$as_me: WARNING: could not find Python.h. The Python bindings will not be built." >&2;}
-+			PYTHON=
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-
+-fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++do :
++  ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
++if test "x$ac_cv_header_stdlib_h" = x""yes; then :
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define HAVE_STDLIB_H 1
+ _ACEOF
  
  fi
  
--done
+ done
  
--echo "$as_me:$LINENO: checking for GNU libc compatible malloc" >&5
--echo $ECHO_N "checking for GNU libc compatible malloc... $ECHO_C" >&6
+-{ $as_echo "$as_me:$LINENO: checking for GNU libc compatible malloc" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible malloc" >&5
+ $as_echo_n "checking for GNU libc compatible malloc... " >&6; }
 -if test "${ac_cv_func_malloc_0_nonnull+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
++if test "${ac_cv_func_malloc_0_nonnull+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
 -  if test "$cross_compiling" = yes; then
--  ac_cv_func_malloc_0_nonnull=no
-+			PYTHON_LIBNAME="python"
-+			if test "$PLATFORM" = "linux"; then
-+				PYTHON_LIBNAME="python$PYTHON_VERSION"
-+			fi
-+			as_ac_Lib=`$as_echo "ac_cv_lib_$PYTHON_LIBNAME''_Py_Initialize" | $as_tr_sh`
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Py_Initialize in -l$PYTHON_LIBNAME" >&5
-+$as_echo_n "checking for Py_Initialize in -l$PYTHON_LIBNAME... " >&6; }
-+if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
-+  $as_echo_n "(cached) " >&6
++  if test "$cross_compiling" = yes; then :
+   ac_cv_func_malloc_0_nonnull=no
  else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-l$PYTHON_LIBNAME  $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
--#if STDC_HEADERS || HAVE_STDLIB_H
--# include <stdlib.h>
--#else
--char *malloc ();
--#endif
- 
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char Py_Initialize ();
- int
- main ()
- {
--exit (malloc (0) ? 0 : 1);
-+return Py_Initialize ();
-   ;
+ #if defined STDC_HEADERS || defined HAVE_STDLIB_H
+ # include <stdlib.h>
+@@ -15669,55 +14565,24 @@
    return 0;
  }
  _ACEOF
 -rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>&5
 -  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_try") 2>&5
 -  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
--  ac_cv_func_malloc_0_nonnull=yes
-+if ac_fn_c_try_link "$LINENO"; then :
-+  eval "$as_ac_Lib=yes"
++if ac_fn_c_try_run "$LINENO"; then :
+   ac_cv_func_malloc_0_nonnull=yes
  else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+  eval "$as_ac_Lib=no"
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+eval ac_res=\$$as_ac_Lib
-+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
-+eval as_val=\$$as_ac_Lib
-+   if test "x$as_val" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_LIB$PYTHON_LIBNAME" | $as_tr_cpp` 1
-+_ACEOF
-+
-+  LIBS="-l$PYTHON_LIBNAME $LIBS"
-+
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: could not find the Python library. The Python bindings will not be built." >&5
-+$as_echo "$as_me: WARNING: could not find the Python library. The Python bindings will not be built." >&2;}
-+			PYTHON=
- 
+-
 -( exit $ac_status )
 -ac_cv_func_malloc_0_nonnull=no
++  ac_cv_func_malloc_0_nonnull=no
  fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+
-+			LIBS=''  # don't append -lpython here.
-+			CPPFLAGS="$current_CPPFLAGS"
-+		fi
-+	fi
+-rm -rf conftest.dSYM
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++  conftest.$ac_objext conftest.beam conftest.$ac_ext
  fi
-+ if test "x$PYTHON" != x; then
-+  WITH_PYTHON_TRUE=
-+  WITH_PYTHON_FALSE='#'
-+else
-+  WITH_PYTHON_TRUE='#'
-+  WITH_PYTHON_FALSE=
+ 
+-
  fi
--echo "$as_me:$LINENO: result: $ac_cv_func_malloc_0_nonnull" >&5
--echo "${ECHO_T}$ac_cv_func_malloc_0_nonnull" >&6
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_malloc_0_nonnull" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_malloc_0_nonnull" >&5
+ $as_echo "$ac_cv_func_malloc_0_nonnull" >&6; }
 -if test $ac_cv_func_malloc_0_nonnull = yes; then
++if test $ac_cv_func_malloc_0_nonnull = yes; then :
  
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_MALLOC 1
 -_ACEOF
++$as_echo "#define HAVE_MALLOC 1" >>confdefs.h
  
-+
-+  succeeded=no
-+
-+  if test -z "$CURL_CONFIG"; then
-+    # Extract the first word of "curl-config", so it can be a program name with args.
-+set dummy curl-config; 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_path_CURL_CONFIG+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
  else
 -  cat >>confdefs.h <<\_ACEOF
 -#define HAVE_MALLOC 0
 -_ACEOF
-+  case $CURL_CONFIG in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_CURL_CONFIG="$CURL_CONFIG" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  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_path_CURL_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
++  $as_echo "#define HAVE_MALLOC 0" >>confdefs.h
  
--   case $LIBOBJS in
--    "malloc.$ac_objext"   | \
--  *" malloc.$ac_objext"   | \
--    "malloc.$ac_objext "* | \
--  *" malloc.$ac_objext "* ) ;;
--  *) LIBOBJS="$LIBOBJS malloc.$ac_objext" ;;
-+  test -z "$ac_cv_path_CURL_CONFIG" && ac_cv_path_CURL_CONFIG="no"
-+  ;;
+    case " $LIBOBJS " in
+   *" malloc.$ac_objext "* ) ;;
+@@ -15726,27 +14591,20 @@
  esac
-+fi
-+CURL_CONFIG=$ac_cv_path_CURL_CONFIG
-+if test -n "$CURL_CONFIG"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CURL_CONFIG" >&5
-+$as_echo "$CURL_CONFIG" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+  fi
-+
-+  if test "$CURL_CONFIG" = "no" ; then
-+    echo "*** The curl-config script could not be found. Make sure it is"
-+    echo "*** in your path, and that curl is properly installed."
-+    echo "*** Or see http://curl.haxx.se/"
-+  else
-+        CURL_VERSION=`$CURL_CONFIG --version | cut -d" " -f2`
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for curl >= 7.12.3" >&5
-+$as_echo_n "checking for curl >= 7.12.3... " >&6; }
-+        VERSION_CHECK=`expr $CURL_VERSION \>\= 7.12.3`
-+        if test "$VERSION_CHECK" = "1" ; then
-+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+            succeeded=yes
-+
-+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking CURL_CFLAGS" >&5
-+$as_echo_n "checking CURL_CFLAGS... " >&6; }
-+            CURL_CFLAGS=`$CURL_CONFIG --cflags`
-+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CURL_CFLAGS" >&5
-+$as_echo "$CURL_CFLAGS" >&6; }
-+
-+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking CURL_LIBS" >&5
-+$as_echo_n "checking CURL_LIBS... " >&6; }
-+            CURL_LIBS=`$CURL_CONFIG --libs`
-+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CURL_LIBS" >&5
-+$as_echo "$CURL_LIBS" >&6; }
-+        else
-+            CURL_CFLAGS=""
-+            CURL_LIBS=""
-+            ## If we have a custom action on failure, don't print errors, but
-+            ## do set a variable so people can do so.
-+            echo "can't find curl >= 7.12.3"
-+        fi
-+
-+
-+
-+  fi
-+
-+  if test $succeeded = yes; then
-+     :
-+  else
-+     as_fn_error "Library requirements (curl) not met." "$LINENO" 5
-+  fi
-+
-+ if test "$CURL_LIBS"; then
-+  HAVE_CURL_TRUE=
-+  HAVE_CURL_FALSE='#'
-+else
-+  HAVE_CURL_TRUE='#'
-+  HAVE_CURL_FALSE=
-+fi
-+
-+
-+ac_config_headers="$ac_config_headers config.h"
-+
  
-+ac_config_files="$ac_config_files Makefile examples/Makefile examples/domviewer/Makefile examples/engine/Makefile examples/gpx/Makefile examples/gx/Makefile examples/hellonet/Makefile examples/helloworld/Makefile examples/java/Makefile examples/kml/Makefile examples/python/Makefile examples/regionator/Makefile examples/wxregionator/Makefile examples/wxviewer/Makefile examples/xsd/Makefile msvc/Makefile msvc/examples/Makefile msvc/tests/Makefile src/Makefile src/kml/Makefile src/kml/convenience/Makefile src/kml/dom/Makefile src/kml/engine/Makefile src/kml/regionator/Makefile src/kml/base/Makefile src/kml/xsd/Makefile src/swig/Makefile src/swig/java/Makefile src/swig/python/Makefile testdata/Makefile testdata/atom/Makefile testdata/balloon/Makefile testdata/csv/Makefile testdata/deprecated/Makefile testdata/gpx/Makefile testdata/gx/Makefile testdata/kml/Makefile testdata/kmz/Makefile testdata/kmz/files/Makefile testdata/kmz/kmzfiles/Makefile testdata/kmz/rumsey/Makefile testdata/kmz/rumsey/kml/Makefile testdata/kmz/rumsey/imagery/Makefile testdata/links/Makefile testdata/style/Makefile testdata/style/weather/Makefile testdata/update/Makefile testdata/xal/Makefile testdata/xsd/Makefile third_party/Makefile xcode/Makefile xcode/LibKML/Makefile"
-+
-+
-+cat >confcache <<\_ACEOF
-+# This file is a shell script that caches the results of configure
-+# tests run on this system so they can be shared between configure
-+# scripts and configure runs, see configure's option --config-cache.
-+# It is not useful on other systems.  If it contains results you don't
-+# want to keep, you may remove or edit it.
-+#
-+# config.status only pays attention to the cache file if you give it
-+# the --recheck option to rerun configure.
-+#
-+# `ac_cv_env_foo' variables (set or unset) will be overridden when
-+# loading this file, other *unset* `ac_cv_foo' will be assigned the
-+# following values.
  
 -cat >>confdefs.h <<\_ACEOF
 -#define malloc rpl_malloc
- _ACEOF
+-_ACEOF
++$as_echo "#define malloc rpl_malloc" >>confdefs.h
  
-+# The following way of writing the cache mishandles newlines in values,
-+# but we know of no workaround that is simple, portable, and efficient.
-+# So, we kill variables containing newlines.
-+# Ultrix sh set writes to stderr and can't be redirected directly,
-+# and sets the high bit in the cache file unless we assign to the vars.
-+(
-+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-+    eval ac_val=\$$ac_var
-+    case $ac_val in #(
-+    *${as_nl}*)
-+      case $ac_var in #(
-+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-+      esac
-+      case $ac_var in #(
-+      _ | IFS | as_nl) ;; #(
-+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-+      *) { eval $ac_var=; unset $ac_var;} ;;
-+      esac ;;
-+    esac
-+  done
-+
-+  (set) 2>&1 |
-+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-+    *${as_nl}ac_space=\ *)
-+      # `set' does not quote correctly, so add quotes: double-quote
-+      # substitution turns \\\\ into \\, and sed turns \\ into \.
-+      sed -n \
-+	"s/'/'\\\\''/g;
-+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-+      ;; #(
-+    *)
-+      # `set' quotes correctly as required by POSIX, so do not add quotes.
-+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-+      ;;
-+    esac |
-+    sort
-+) |
-+  sed '
-+     /^ac_cv_env_/b end
-+     t clear
-+     :clear
-+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-+     t end
-+     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-+     :end' >>confcache
-+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-+  if test -w "$cache_file"; then
-+    test "x$cache_file" != "x/dev/null" &&
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-+$as_echo "$as_me: updating cache $cache_file" >&6;}
-+    cat confcache >$cache_file
-+  else
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-+  fi
  fi
-+rm -f confcache
-+
-+test "x$prefix" = xNONE && prefix=$ac_default_prefix
-+# Let make expand exec_prefix.
-+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-+
-+DEFS=-DHAVE_CONFIG_H
-+
-+ac_libobjs=
-+ac_ltlibobjs=
-+for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-+  # 1. Remove the extension, and $U if already installed.
-+  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-+  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
-+  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
-+  #    will be set to the directory where LIBOBJS objects are built.
-+  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-+  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
-+done
-+LIBOBJS=$ac_libobjs
  
-+LTLIBOBJS=$ac_ltlibobjs
  
- 
--echo "$as_me:$LINENO: checking for working strtod" >&5
--echo $ECHO_N "checking for working strtod... $ECHO_C" >&6
+-
+-{ $as_echo "$as_me:$LINENO: checking for working strtod" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working strtod" >&5
+ $as_echo_n "checking for working strtod... " >&6; }
 -if test "${ac_cv_func_strtod+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+ if test -n "$EXEEXT"; then
-+  am__EXEEXT_TRUE=
-+  am__EXEEXT_FALSE='#'
++if test "${ac_cv_func_strtod+set}" = set; then :
+   $as_echo_n "(cached) " >&6
  else
 -  if test "$cross_compiling" = yes; then
--  ac_cv_func_strtod=no
--else
++  if test "$cross_compiling" = yes; then :
+   ac_cv_func_strtod=no
+ else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
-+  am__EXEEXT_TRUE='#'
-+  am__EXEEXT_FALSE=
-+fi
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
  
--double strtod ();
--int
--main()
--{
--  {
--    /* Some versions of Linux strtod mis-parse strings with leading '+'.  */
--    char *string = " +69";
--    char *term;
--    double value;
--    value = strtod (string, &term);
--    if (value != 69 || term != (string + 4))
--      exit (1);
--  }
-+if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-+  as_fn_error "conditional \"AMDEP\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
-+fi
-+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-+  as_fn_error "conditional \"am__fastdepCC\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
-+fi
-+if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
-+  as_fn_error "conditional \"am__fastdepCXX\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
-+fi
-+if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
-+  as_fn_error "conditional \"am__fastdepCXX\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
-+fi
-+if test -z "${GCC_TRUE}" && test -z "${GCC_FALSE}"; then
-+  as_fn_error "conditional \"GCC\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
-+fi
-+if test -z "${WITH_SWIG_TRUE}" && test -z "${WITH_SWIG_FALSE}"; then
-+  as_fn_error "conditional \"WITH_SWIG\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
-+fi
-+if test -z "${WITH_JAVA_TRUE}" && test -z "${WITH_JAVA_FALSE}"; then
-+  as_fn_error "conditional \"WITH_JAVA\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
-+fi
-+if test -z "${WITH_PYTHON_TRUE}" && test -z "${WITH_PYTHON_FALSE}"; then
-+  as_fn_error "conditional \"WITH_PYTHON\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
-+fi
-+if test -z "${HAVE_CURL_TRUE}" && test -z "${HAVE_CURL_FALSE}"; then
-+  as_fn_error "conditional \"HAVE_CURL\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
-+fi
+ $ac_includes_default
+@@ -15779,44 +14637,17 @@
+ }
  
--  {
--    /* Under Solaris 2.4, strtod returns the wrong value for the
--       terminating character under some conditions.  */
--    char *string = "NaN";
--    char *term;
--    strtod (string, &term);
--    if (term != string && *(term - 1) == 0)
--      exit (1);
--  }
--  exit (0);
--}
-+: ${CONFIG_STATUS=./config.status}
-+ac_write_fail=0
-+ac_clean_files_save=$ac_clean_files
-+ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
-+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
-+as_write_fail=0
-+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
-+#! $SHELL
-+# Generated by $as_me.
-+# Run this file to recreate the current configuration.
-+# Compiler output produced by configure, useful for debugging
-+# configure, is in config.log if it exists.
- 
--_ACEOF
+ _ACEOF
 -rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>&5
 -  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_try") 2>&5
 -  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
--  ac_cv_func_strtod=yes
-+debug=false
-+ac_cs_recheck=false
-+ac_cs_silent=false
-+
-+SHELL=\${CONFIG_SHELL-$SHELL}
-+export SHELL
-+_ASEOF
-+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
-+## -------------------- ##
-+## M4sh Initialization. ##
-+## -------------------- ##
-+
-+# Be more Bourne compatible
-+DUALCASE=1; export DUALCASE # for MKS sh
-+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
-+  emulate sh
-+  NULLCMD=:
-+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-+  # is contrary to our usage.  Disable this feature.
-+  alias -g '${1+"$@"}'='"$@"'
-+  setopt NO_GLOB_SUBST
++if ac_fn_c_try_run "$LINENO"; then :
+   ac_cv_func_strtod=yes
  else
--  echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -( exit $ac_status )
 -ac_cv_func_strtod=no
-+  case `(set -o) 2>/dev/null` in #(
-+  *posix*) :
-+    set -o posix ;; #(
-+  *) :
-+     ;;
-+esac
++  ac_cv_func_strtod=no
  fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+
-+
-+as_nl='
-+'
-+export as_nl
-+# Printing a long string crashes Solaris 7 /usr/bin/printf.
-+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-+# Prefer a ksh shell builtin over an external printf program on Solaris,
-+# but without wasting forks for bash or zsh.
-+if test -z "$BASH_VERSION$ZSH_VERSION" \
-+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-+  as_echo='print -r --'
-+  as_echo_n='print -rn --'
-+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-+  as_echo='printf %s\n'
-+  as_echo_n='printf %s'
-+else
-+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-+    as_echo_n='/usr/ucb/echo -n'
-+  else
-+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-+    as_echo_n_body='eval
-+      arg=$1;
-+      case $arg in #(
-+      *"$as_nl"*)
-+	expr "X$arg" : "X\\(.*\\)$as_nl";
-+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-+      esac;
-+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-+    '
-+    export as_echo_n_body
-+    as_echo_n='sh -c $as_echo_n_body as_echo'
-+  fi
-+  export as_echo_body
-+  as_echo='sh -c $as_echo_body as_echo'
+-rm -rf conftest.dSYM
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++  conftest.$ac_objext conftest.beam conftest.$ac_ext
  fi
-+
-+# The user is always right.
-+if test "${PATH_SEPARATOR+set}" != set; then
-+  PATH_SEPARATOR=:
-+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-+      PATH_SEPARATOR=';'
-+  }
+ 
+-
  fi
--echo "$as_me:$LINENO: result: $ac_cv_func_strtod" >&5
--echo "${ECHO_T}$ac_cv_func_strtod" >&6
--if test $ac_cv_func_strtod = no; then
--  case $LIBOBJS in
--    "strtod.$ac_objext"   | \
--  *" strtod.$ac_objext"   | \
--    "strtod.$ac_objext "* | \
--  *" strtod.$ac_objext "* ) ;;
--  *) LIBOBJS="$LIBOBJS strtod.$ac_objext" ;;
--esac
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_strtod" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strtod" >&5
+ $as_echo "$ac_cv_func_strtod" >&6; }
+ if test $ac_cv_func_strtod = no; then
+   case " $LIBOBJS " in
+@@ -15825,105 +14656,20 @@
+  ;;
+ esac
  
--echo "$as_me:$LINENO: checking for pow" >&5
--echo $ECHO_N "checking for pow... $ECHO_C" >&6
+-{ $as_echo "$as_me:$LINENO: checking for pow" >&5
+-$as_echo_n "checking for pow... " >&6; }
 -if test "${ac_cv_func_pow+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
+-  $as_echo_n "(cached) " >&6
 -else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
@@ -53162,435 +10828,250 @@
 -/* Define pow to an innocuous variant, in case <limits.h> declares pow.
 -   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 -#define pow innocuous_pow
- 
+-
 -/* System header to define __stub macros and hopefully few prototypes,
 -    which can conflict with char pow (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
-+# IFS
-+# We need space, tab and new line, in precisely that order.  Quoting is
-+# there to prevent editors from complaining about space-tab.
-+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-+# splitting by setting IFS to empty value.)
-+IFS=" ""	$as_nl"
-+
-+# Find who we are.  Look in the path if we contain no directory separator.
-+case $0 in #((
-+  *[\\/]* ) as_myself=$0 ;;
-+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-+  done
-+IFS=$as_save_IFS
- 
+-
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
-+     ;;
-+esac
-+# We did not find ourselves, most probably we were run as `sh COMMAND'
-+# in which case we are not to be found in the path.
-+if test "x$as_myself" = x; then
-+  as_myself=$0
-+fi
-+if test ! -f "$as_myself"; then
-+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-+  exit 1
-+fi
-+
-+# Unset variables that we do not need and which cause bugs (e.g. in
-+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-+# suppresses any "Segmentation fault" message there.  '((' could
-+# trigger a bug in pdksh 5.2.14.
-+for as_var in BASH_ENV ENV MAIL MAILPATH
-+do eval test x\${$as_var+set} = xset \
-+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-+done
-+PS1='$ '
-+PS2='> '
-+PS4='+ '
- 
+-
 -#undef pow
-+# NLS nuisances.
-+LC_ALL=C
-+export LC_ALL
-+LANGUAGE=C
-+export LANGUAGE
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
 -#ifdef __cplusplus
 -extern "C"
--{
 -#endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
 -char pow ();
 -/* The GNU C library defines this for functions which it implements
 -    to always fail with ENOSYS.  Some functions are actually named
 -    something starting with __ and the normal name is an alias.  */
--#if defined (__stub_pow) || defined (__stub___pow)
+-#if defined __stub_pow || defined __stub___pow
 -choke me
--#else
--char (*f) () = pow;
 -#endif
--#ifdef __cplusplus
--}
--#endif
-+# CDPATH.
-+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
- 
+-
 -int
 -main ()
-+
-+# as_fn_error ERROR [LINENO LOG_FD]
-+# ---------------------------------
-+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-+# script with status $?, using 1 if that was 0.
-+as_fn_error ()
- {
--return f != pow;
+-{
+-return pow ();
 -  ;
 -  return 0;
 -}
 -_ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
 -  ac_cv_func_pow=yes
 -else
--  echo "$as_me: failed program was:" >&5
+-  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+  as_status=$?; test $as_status -eq 0 && as_status=1
-+  if test "$3"; then
-+    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
-+  fi
-+  $as_echo "$as_me: error: $1" >&2
-+  as_fn_exit $as_status
-+} # as_fn_error
- 
--ac_cv_func_pow=no
+-
+-	ac_cv_func_pow=no
 -fi
--rm -f conftest.err conftest.$ac_objext \
++ac_fn_c_check_func "$LINENO" "pow" "ac_cv_func_pow"
++if test "x$ac_cv_func_pow" = x""yes; then :
+ 
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
--fi
--echo "$as_me:$LINENO: result: $ac_cv_func_pow" >&5
--echo "${ECHO_T}$ac_cv_func_pow" >&6
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_pow" >&5
+-$as_echo "$ac_cv_func_pow" >&6; }
  
--if test $ac_cv_func_pow = no; then
--  echo "$as_me:$LINENO: checking for pow in -lm" >&5
--echo $ECHO_N "checking for pow in -lm... $ECHO_C" >&6
+ if test $ac_cv_func_pow = no; then
+-  { $as_echo "$as_me:$LINENO: checking for pow in -lm" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pow in -lm" >&5
+ $as_echo_n "checking for pow in -lm... " >&6; }
 -if test "${ac_cv_lib_m_pow+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-lm  $LIBS"
++if test "${ac_cv_lib_m_pow+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lm  $LIBS"
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
-+# as_fn_set_status STATUS
-+# -----------------------
-+# Set $? to STATUS, without forking.
-+as_fn_set_status ()
-+{
-+  return $1
-+} # as_fn_set_status
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
  
--/* Override any gcc2 internal prototype to avoid an error.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
--char pow ();
--int
--main ()
-+# as_fn_exit STATUS
-+# -----------------
-+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-+as_fn_exit ()
- {
--pow ();
--  ;
--  return 0;
-+  set +e
-+  as_fn_set_status $1
-+  exit $1
-+} # as_fn_exit
-+
-+# as_fn_unset VAR
-+# ---------------
-+# Portably unset VAR.
-+as_fn_unset ()
-+{
-+  { eval $1=; unset $1;}
+ /* Override any GCC internal prototype to avoid an error.
+@@ -15941,46 +14687,21 @@
+   return 0;
  }
--_ACEOF
+ _ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_lib_m_pow=yes
-+as_unset=as_fn_unset
-+# as_fn_append VAR VALUE
-+# ----------------------
-+# Append the text in VALUE to the end of the definition contained in VAR. Take
-+# advantage of any shell optimizations that allow amortized linear growth over
-+# repeated appends, instead of the typical quadratic growth present in naive
-+# implementations.
-+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
-+  eval 'as_fn_append ()
-+  {
-+    eval $1+=\$2
-+  }'
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_m_pow=yes
  else
--  echo "$as_me: failed program was:" >&5
+-  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+  as_fn_append ()
-+  {
-+    eval $1=\$$1\$2
-+  }
-+fi # as_fn_append
- 
--ac_cv_lib_m_pow=no
--fi
--rm -f conftest.err conftest.$ac_objext \
+-
+-	ac_cv_lib_m_pow=no
++  ac_cv_lib_m_pow=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_m_pow" >&5
--echo "${ECHO_T}$ac_cv_lib_m_pow" >&6
--if test $ac_cv_lib_m_pow = yes; then
--  POW_LIB=-lm
-+# as_fn_arith ARG...
-+# ------------------
-+# Perform arithmetic evaluation on the ARGs, and store the result in the
-+# global $as_val. Take advantage of shells that can avoid forks. The arguments
-+# must be portable across $(()) and expr.
-+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
-+  eval 'as_fn_arith ()
-+  {
-+    as_val=$(( $* ))
-+  }'
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_m_pow" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_pow" >&5
+ $as_echo "$ac_cv_lib_m_pow" >&6; }
+-if test "x$ac_cv_lib_m_pow" = x""yes; then
++if test "x$ac_cv_lib_m_pow" = x""yes; then :
+   POW_LIB=-lm
  else
--  { echo "$as_me:$LINENO: WARNING: cannot find library containing definition of pow" >&5
--echo "$as_me: WARNING: cannot find library containing definition of pow" >&2;}
--fi
-+  as_fn_arith ()
-+  {
-+    as_val=`expr "$@" || test $? -eq 1`
-+  }
-+fi # as_fn_arith
-+
- 
-+if expr a : '\(a\)' >/dev/null 2>&1 &&
-+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-+  as_expr=expr
-+else
-+  as_expr=false
+-  { $as_echo "$as_me:$LINENO: WARNING: cannot find library containing definition of pow" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot find library containing definition of pow" >&5
+ $as_echo "$as_me: WARNING: cannot find library containing definition of pow" >&2;}
  fi
  
-+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-+  as_basename=basename
-+else
-+  as_basename=false
+@@ -15988,16 +14709,12 @@
+ 
  fi
  
--echo "$as_me:$LINENO: checking for stdbool.h that conforms to C99" >&5
--echo $ECHO_N "checking for stdbool.h that conforms to C99... $ECHO_C" >&6
+-{ $as_echo "$as_me:$LINENO: checking for stdbool.h that conforms to C99" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99" >&5
+ $as_echo_n "checking for stdbool.h that conforms to C99... " >&6; }
 -if test "${ac_cv_header_stdbool_h+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-+  as_dirname=dirname
++if test "${ac_cv_header_stdbool_h+set}" = set; then :
+   $as_echo_n "(cached) " >&6
  else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
-+  as_dirname=false
-+fi
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
  
--#include <stdbool.h>
--#ifndef bool
--# error bool is not defined
--#endif
--#ifndef false
--# error false is not defined
--#endif
--#if false
--# error false is not 0
--#endif
--#ifndef true
--# error true is not defined
--#endif
--#if true != 1
--# error true is not 1
--#endif
--#ifndef __bool_true_false_are_defined
--# error __bool_true_false_are_defined is not defined
--#endif
-+as_me=`$as_basename -- "$0" ||
-+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-+	 X"$0" : 'X\(//\)$' \| \
-+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-+$as_echo X/"$0" |
-+    sed '/^.*\/\([^/][^/]*\)\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\/\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\/\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
- 
--	struct s { _Bool s: 1; _Bool t; } s;
-+# Avoid depending upon Character Ranges.
-+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-+as_cr_digits='0123456789'
-+as_cr_alnum=$as_cr_Letters$as_cr_digits
- 
--	char a[true == 1 ? 1 : -1];
--	char b[false == 0 ? 1 : -1];
--	char c[__bool_true_false_are_defined == 1 ? 1 : -1];
--	char d[(bool) -0.5 == true ? 1 : -1];
--	bool e = &s;
--	char f[(_Bool) -0.0 == false ? 1 : -1];
--	char g[true];
--	char h[sizeof (_Bool)];
--	char i[sizeof s.t];
-+ECHO_C= ECHO_N= ECHO_T=
-+case `echo -n x` in #(((((
-+-n*)
-+  case `echo 'xy\c'` in
-+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-+  xy)  ECHO_C='\c';;
-+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-+       ECHO_T='	';;
-+  esac;;
-+*)
-+  ECHO_N='-n';;
-+esac
- 
+ #include <stdbool.h>
+@@ -16077,131 +14794,17 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
++if ac_fn_c_try_compile "$LINENO"; then :
+   ac_cv_header_stdbool_h=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_header_stdbool_h=no
++  ac_cv_header_stdbool_h=no
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdbool_h" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdbool_h" >&5
+ $as_echo "$ac_cv_header_stdbool_h" >&6; }
+-{ $as_echo "$as_me:$LINENO: checking for _Bool" >&5
+-$as_echo_n "checking for _Bool... " >&6; }
+-if test "${ac_cv_type__Bool+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_cv_type__Bool=no
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
 -int
 -main ()
 -{
-- return !a + !b + !c + !d + !e + !f + !g + !h + !i;
+-if (sizeof (_Bool))
+-       return 0;
 -  ;
 -  return 0;
 -}
 -_ACEOF
 -rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_header_stdbool_h=yes
-+rm -f conf$$ conf$$.exe conf$$.file
-+if test -d conf$$.dir; then
-+  rm -f conf$$.dir/conf$$.file
- else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_cv_header_stdbool_h=no
-+  rm -f conf$$.dir
-+  mkdir conf$$.dir 2>/dev/null
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--echo "$as_me:$LINENO: result: $ac_cv_header_stdbool_h" >&5
--echo "${ECHO_T}$ac_cv_header_stdbool_h" >&6
--echo "$as_me:$LINENO: checking for _Bool" >&5
--echo $ECHO_N "checking for _Bool... $ECHO_C" >&6
--if test "${ac_cv_type__Bool+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+if (echo >conf$$.file) 2>/dev/null; then
-+  if ln -s conf$$.file conf$$ 2>/dev/null; then
-+    as_ln_s='ln -s'
-+    # ... but there are two gotchas:
-+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-+    # In both cases, we have to default to `cp -p'.
-+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-+      as_ln_s='cp -p'
-+  elif ln conf$$.file conf$$ 2>/dev/null; then
-+    as_ln_s=ln
-+  else
-+    as_ln_s='cp -p'
-+  fi
- else
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
@@ -53600,174 +11081,75 @@
 -$ac_includes_default
 -int
 -main ()
-+  as_ln_s='cp -p'
-+fi
-+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-+rmdir conf$$.dir 2>/dev/null
-+
-+
-+# as_fn_mkdir_p
-+# -------------
-+# Create "$as_dir" as a directory, including parents if necessary.
-+as_fn_mkdir_p ()
- {
--if ((_Bool *) 0)
--  return 0;
--if (sizeof (_Bool))
--  return 0;
+-{
+-if (sizeof ((_Bool)))
+-	  return 0;
 -  ;
 -  return 0;
 -}
 -_ACEOF
 -rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_type__Bool=yes
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
+-  :
 -else
--  echo "$as_me: failed program was:" >&5
+-  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_type__Bool=no
-+  case $as_dir in #(
-+  -*) as_dir=./$as_dir;;
-+  esac
-+  test -d "$as_dir" || eval $as_mkdir_p || {
-+    as_dirs=
-+    while :; do
-+      case $as_dir in #(
-+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-+      *) as_qdir=$as_dir;;
-+      esac
-+      as_dirs="'$as_qdir' $as_dirs"
-+      as_dir=`$as_dirname -- "$as_dir" ||
-+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+	 X"$as_dir" : 'X\(//\)[^/]' \| \
-+	 X"$as_dir" : 'X\(//\)$' \| \
-+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-+$as_echo X"$as_dir" |
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)[^/].*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
-+      test -d "$as_dir" && break
-+    done
-+    test -z "$as_dirs" || eval "mkdir $as_dirs"
-+  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
-+
-+
-+} # as_fn_mkdir_p
-+if mkdir -p . 2>/dev/null; then
-+  as_mkdir_p='mkdir -p "$as_dir"'
-+else
-+  test -d ./-p && rmdir ./-p
-+  as_mkdir_p=false
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+if test -x / >/dev/null 2>&1; then
-+  as_test_x='test -x'
-+else
-+  if ls -dL / >/dev/null 2>&1; then
-+    as_ls_L_option=L
-+  else
-+    as_ls_L_option=
-+  fi
-+  as_test_x='
-+    eval sh -c '\''
-+      if test -d "$1"; then
-+	test -d "$1/.";
-+      else
-+	case $1 in #(
-+	-*)set "./$1";;
-+	esac;
-+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-+	???[sx]*):;;*)false;;esac;fi
-+    '\'' sh
-+  '
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type__Bool" >&5
--echo "${ECHO_T}$ac_cv_type__Bool" >&6
--if test $ac_cv_type__Bool = yes; then
-+as_executable_p=$as_test_x
- 
--cat >>confdefs.h <<_ACEOF
--#define HAVE__BOOL 1
--_ACEOF
-+# Sed expression to map a string onto a valid CPP name.
-+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
- 
-+# Sed expression to map a string onto a valid variable name.
-+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
- 
+-
+-	ac_cv_type__Bool=yes
 -fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type__Bool" >&5
+-$as_echo "$ac_cv_type__Bool" >&6; }
+-if test "x$ac_cv_type__Bool" = x""yes; then
++ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default"
++if test "x$ac_cv_type__Bool" = x""yes; then :
  
--if test $ac_cv_header_stdbool_h = yes; then
-+exec 6>&1
-+## ----------------------------------- ##
-+## Main body of $CONFIG_STATUS script. ##
-+## ----------------------------------- ##
-+_ASEOF
-+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE__BOOL 1
+@@ -16212,108 +14815,13 @@
  
+ if test $ac_cv_header_stdbool_h = yes; then
+ 
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_STDBOOL_H 1
 -_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-+# Save the log message, to keep $0 and so on meaningful, and to
-+# report actual input values of CONFIG_FILES etc. instead of their
-+# values after options handling.
-+ac_log="
-+This file was extended by libkml $as_me 1.0.1, which was
-+generated by GNU Autoconf 2.65.  Invocation command line was
++$as_echo "#define HAVE_STDBOOL_H 1" >>confdefs.h
  
--fi
-+  CONFIG_FILES    = $CONFIG_FILES
-+  CONFIG_HEADERS  = $CONFIG_HEADERS
-+  CONFIG_LINKS    = $CONFIG_LINKS
-+  CONFIG_COMMANDS = $CONFIG_COMMANDS
-+  $ $0 $@
-+
-+on `(hostname || uname -n) 2>/dev/null | sed 1q`
-+"
+ fi
  
--echo "$as_me:$LINENO: checking for size_t" >&5
--echo $ECHO_N "checking for size_t... $ECHO_C" >&6
+-{ $as_echo "$as_me:$LINENO: checking for size_t" >&5
+-$as_echo_n "checking for size_t... " >&6; }
 -if test "${ac_cv_type_size_t+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
+-  $as_echo_n "(cached) " >&6
 -else
--  cat >conftest.$ac_ext <<_ACEOF
+-  ac_cv_type_size_t=no
+-cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
@@ -53777,257 +11159,168 @@
 -int
 -main ()
 -{
--if ((size_t *) 0)
--  return 0;
 -if (sizeof (size_t))
--  return 0;
+-       return 0;
 -  ;
 -  return 0;
 -}
- _ACEOF
+-_ACEOF
 -rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-if (sizeof ((size_t)))
+-	  return 0;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
 -  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_type_size_t=yes
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
+-  :
 -else
--  echo "$as_me: failed program was:" >&5
+-  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_type_size_t=yes
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
++if test "x$ac_cv_type_size_t" = x""yes; then :
  
--ac_cv_type_size_t=no
+-
 -fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -fi
--echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
--echo "${ECHO_T}$ac_cv_type_size_t" >&6
--if test $ac_cv_type_size_t = yes; then
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
+-$as_echo "$ac_cv_type_size_t" >&6; }
+-if test "x$ac_cv_type_size_t" = x""yes; then
 -  :
--else
-+case $ac_config_files in *"
-+"*) set x $ac_config_files; shift; ac_config_files=$*;;
-+esac
-+
-+case $ac_config_headers in *"
-+"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
-+esac
+ else
  
--cat >>confdefs.h <<_ACEOF
--#define size_t unsigned
--_ACEOF
+ cat >>confdefs.h <<_ACEOF
+@@ -16335,7 +14843,7 @@
+ PLATFORM=
+ SHLIBSUFFIX=
+ case "`uname -s`" in
+-	Linux)	PLATFORM=linux
++	Linux|GNU/kFreeBSD)	PLATFORM=linux
+ 		SHLIBSUFFIX="so"
+ 	;;
+ 	Darwin)	PLATFORM=darwin
+@@ -16350,474 +14858,75 @@
  
--fi
-+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+# Files that config.status was made for.
-+config_files="$ac_config_files"
-+config_headers="$ac_config_headers"
-+config_commands="$ac_config_commands"
  
-+_ACEOF
+ # Check whether --with-expat-include-dir was given.
+-if test "${with_expat_include_dir+set}" = set; then
++if test "${with_expat_include_dir+set}" = set; then :
+   withval=$with_expat_include_dir; CFLAGS="$CFLAGS -I$withval" CPPFLAGS="$CPPFLAGS -I$withval"
+ fi
  
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-+ac_cs_usage="\
-+\`$as_me' instantiates files and other configuration actions
-+from templates according to the current configuration.  Unless the files
-+and actions are specified as TAGs, all are instantiated by default.
  
-+Usage: $0 [OPTION]... [TAG]...
+ # Check whether --with-expat-lib-dir was given.
+-if test "${with_expat_lib_dir+set}" = set; then
++if test "${with_expat_lib_dir+set}" = set; then :
+   withval=$with_expat_lib_dir; LDFLAGS="$LDFLAGS -L$withval"
+ fi
  
--if test "$GCC" = yes; then
--  GCC_TRUE=
--  GCC_FALSE='#'
--else
--  GCC_TRUE='#'
--  GCC_FALSE=
--fi
-+  -h, --help       print this help, then exit
-+  -V, --version    print version number and configuration settings, then exit
-+      --config     print configuration, then exit
-+  -q, --quiet, --silent
-+                   do not print progress messages
-+  -d, --debug      don't remove temporary files
-+      --recheck    update $as_me by reconfiguring in the same conditions
-+      --file=FILE[:TEMPLATE]
-+                   instantiate the configuration file FILE
-+      --header=FILE[:TEMPLATE]
-+                   instantiate the configuration header FILE
  
-+Configuration files:
-+$config_files
  
--PLATFORM=
--SHLIBSUFFIX=
--case "`uname -s`" in
--	Linux)	PLATFORM=linux
--		SHLIBSUFFIX="so"
--	;;
--	Darwin)	PLATFORM=darwin
--		SHLIBSUFFIX="dylib"
--	;;
--	*) 	PLATFORM=unknown
--		SHLIBSUFFIX="so"
--	;;
--esac
-+Configuration headers:
-+$config_headers
+ # Check whether --with-java-include-dir was given.
+-if test "${with_java_include_dir+set}" = set; then
++if test "${with_java_include_dir+set}" = set; then :
+   withval=$with_java_include_dir; JAVA_INCLUDE_DIR=$withval
+ fi
  
-+Configuration commands:
-+$config_commands
  
-+Report bugs to <http://code.google.com/p/libkml/issues>."
  
-+_ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
-+ac_cs_version="\\
-+libkml config.status 1.0.1
-+configured by $0, generated by GNU Autoconf 2.65,
-+  with options \\"\$ac_cs_config\\"
- 
--# Check whether --with-expat-include-dir or --without-expat-include-dir was given.
--if test "${with_expat_include_dir+set}" = set; then
--  withval="$with_expat_include_dir"
--  CFLAGS="$CFLAGS -I$withval" CPPFLAGS="$CPPFLAGS -I$withval"
--fi;
--
--# Check whether --with-expat-lib-dir or --without-expat-lib-dir was given.
--if test "${with_expat_lib_dir+set}" = set; then
--  withval="$with_expat_lib_dir"
--  LDFLAGS="$LDFLAGS -L$withval"
--fi;
--
--
--# Check whether --with-java-include-dir or --without-java-include-dir was given.
--if test "${with_java_include_dir+set}" = set; then
--  withval="$with_java_include_dir"
--  JAVA_INCLUDE_DIR=$withval
--fi;
--
--
--# Check whether --with-java-lib-dir or --without-java-lib-dir was given.
+ # Check whether --with-java-lib-dir was given.
 -if test "${with_java_lib_dir+set}" = set; then
--  withval="$with_java_lib_dir"
--  JAVA_LIB_DIR=$withval
--fi;
-+Copyright (C) 2009 Free Software Foundation, Inc.
-+This config.status script is free software; the Free Software Foundation
-+gives unlimited permission to copy, distribute and modify it."
++if test "${with_java_lib_dir+set}" = set; then :
+   withval=$with_java_lib_dir; JAVA_LIB_DIR=$withval
+ fi
  
-+ac_pwd='$ac_pwd'
-+srcdir='$srcdir'
-+INSTALL='$INSTALL'
-+MKDIR_P='$MKDIR_P'
-+AWK='$AWK'
-+test -n "\$AWK" || AWK=awk
-+_ACEOF
  
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-+# The default lists apply if the user does not specify any file.
-+ac_need_defaults=:
-+while test $# != 0
-+do
-+  case $1 in
-+  --*=*)
-+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-+    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
-+    ac_shift=:
-+    ;;
-+  *)
-+    ac_option=$1
-+    ac_optarg=$2
-+    ac_shift=shift
-+    ;;
-+  esac
  
--# Check whether --with-python-include-dir or --without-python-include-dir was given.
+-
+-# Check whether --with-python-include-dir was given.
 -if test "${with_python_include_dir+set}" = set; then
--  withval="$with_python_include_dir"
--  PYTHON_INCLUDE_DIR=$withval
--fi;
+-  withval=$with_python_include_dir; PYTHON_INCLUDE_DIR=$withval
+-fi
 -
 -
--# Check whether --with-python-lib-dir or --without-python-lib-dir was given.
+-
+-# Check whether --with-python-lib-dir was given.
 -if test "${with_python_lib_dir+set}" = set; then
--  withval="$with_python_lib_dir"
--  PYTHON_LIB_DIR=$withval
--fi;
-+  case $ac_option in
-+  # Handling of the options.
-+  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-+    ac_cs_recheck=: ;;
-+  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-+    $as_echo "$ac_cs_version"; exit ;;
-+  --config | --confi | --conf | --con | --co | --c )
-+    $as_echo "$ac_cs_config"; exit ;;
-+  --debug | --debu | --deb | --de | --d | -d )
-+    debug=: ;;
-+  --file | --fil | --fi | --f )
-+    $ac_shift
-+    case $ac_optarg in
-+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-+    esac
-+    as_fn_append CONFIG_FILES " '$ac_optarg'"
-+    ac_need_defaults=false;;
-+  --header | --heade | --head | --hea )
-+    $ac_shift
-+    case $ac_optarg in
-+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-+    esac
-+    as_fn_append CONFIG_HEADERS " '$ac_optarg'"
-+    ac_need_defaults=false;;
-+  --he | --h)
-+    # Conflict between --help and --header
-+    as_fn_error "ambiguous option: \`$1'
-+Try \`$0 --help' for more information.";;
-+  --help | --hel | -h )
-+    $as_echo "$ac_cs_usage"; exit ;;
-+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-+  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-+    ac_cs_silent=: ;;
- 
-+  # This is an error.
-+  -*) as_fn_error "unrecognized option: \`$1'
-+Try \`$0 --help' for more information." ;;
- 
-+  *) as_fn_append ac_config_targets " $1"
-+     ac_need_defaults=false ;;
- 
-+  esac
-+  shift
-+done
- 
+-  withval=$with_python_lib_dir; PYTHON_LIB_DIR=$withval
+-fi
+-
+-
+-
+-
+-
 -for ac_header in expat.h
 -do
--as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
--  echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
 -fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
 -else
 -  # Is the header compilable?
--echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
@@ -54038,45 +11331,38 @@
 -#include <$ac_header>
 -_ACEOF
 -rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
 -  ac_header_compiler=yes
 -else
--  echo "$as_me: failed program was:" >&5
+-  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+ac_configure_extra_args=
- 
--ac_header_compiler=no
-+if $ac_cs_silent; then
-+  exec 6>/dev/null
-+  ac_configure_extra_args="$ac_configure_extra_args --silent"
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
- 
+-
+-	ac_header_compiler=no
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
+-
 -# Is the header present?
--echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
@@ -54084,443 +11370,103 @@
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -#include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+-_ACEOF
+-if { (ac_try="$ac_cpp conftest.$ac_ext"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } >/dev/null; then
--  if test -s conftest.err; then
--    ac_cpp_err=$ac_c_preproc_warn_flag
--    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
--  else
--    ac_cpp_err=
--  fi
--else
--  ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null && {
+-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       }; then
 -  ac_header_preproc=yes
 -else
--  echo "$as_me: failed program was:" >&5
+-  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -  ac_header_preproc=no
-+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+if \$ac_cs_recheck; then
-+  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-+  shift
-+  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
-+  CONFIG_SHELL='$SHELL'
-+  export CONFIG_SHELL
-+  exec "\$@"
- fi
+-fi
+-
 -rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
- 
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
+-
 -# So?  What about this header?
 -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
 -  yes:no: )
--    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
--echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
 -    ac_header_preproc=yes
 -    ;;
 -  no:yes:* )
--    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
--echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
--echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
--echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
--echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
--    (
--      cat <<\_ASBOX
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
 -## ----------------------------------------------------- ##
 -## Report this to http://code.google.com/p/libkml/issues ##
 -## ----------------------------------------------------- ##
-+_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-+exec 5>>config.log
-+{
-+  echo
-+  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-+## Running $as_me. ##
- _ASBOX
--    ) |
--      sed "s/^/$as_me: WARNING:     /" >&2
+-_ASBOX
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
 -    ;;
 -esac
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
 -else
 -  eval "$as_ac_Header=\$ac_header_preproc"
 -fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+  $as_echo "$ac_log"
-+} >&5
- 
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-
 -fi
--if test `eval echo '${'$as_ac_Header'}'` = yes; then
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
 -  cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+-_ACEOF
 - expat_h_found="yes"
 -else
 -  expat_h_found="no"
 -fi
-+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+#
-+# INIT-COMMANDS
-+#
-+AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
-+
-+
-+# 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'
-+macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`'
-+macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`'
-+enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`'
-+enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`'
-+pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`'
-+enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`'
-+host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`'
-+host='`$ECHO "X$host" | $Xsed -e "$delay_single_quote_subst"`'
-+host_os='`$ECHO "X$host_os" | $Xsed -e "$delay_single_quote_subst"`'
-+build_alias='`$ECHO "X$build_alias" | $Xsed -e "$delay_single_quote_subst"`'
-+build='`$ECHO "X$build" | $Xsed -e "$delay_single_quote_subst"`'
-+build_os='`$ECHO "X$build_os" | $Xsed -e "$delay_single_quote_subst"`'
-+SED='`$ECHO "X$SED" | $Xsed -e "$delay_single_quote_subst"`'
-+Xsed='`$ECHO "X$Xsed" | $Xsed -e "$delay_single_quote_subst"`'
-+GREP='`$ECHO "X$GREP" | $Xsed -e "$delay_single_quote_subst"`'
-+EGREP='`$ECHO "X$EGREP" | $Xsed -e "$delay_single_quote_subst"`'
-+FGREP='`$ECHO "X$FGREP" | $Xsed -e "$delay_single_quote_subst"`'
-+LD='`$ECHO "X$LD" | $Xsed -e "$delay_single_quote_subst"`'
-+NM='`$ECHO "X$NM" | $Xsed -e "$delay_single_quote_subst"`'
-+LN_S='`$ECHO "X$LN_S" | $Xsed -e "$delay_single_quote_subst"`'
-+max_cmd_len='`$ECHO "X$max_cmd_len" | $Xsed -e "$delay_single_quote_subst"`'
-+ac_objext='`$ECHO "X$ac_objext" | $Xsed -e "$delay_single_quote_subst"`'
-+exeext='`$ECHO "X$exeext" | $Xsed -e "$delay_single_quote_subst"`'
-+lt_unset='`$ECHO "X$lt_unset" | $Xsed -e "$delay_single_quote_subst"`'
-+lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`'
-+lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`'
-+reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`'
-+reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-+OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`'
-+deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`'
-+file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`'
-+AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`'
-+AR_FLAGS='`$ECHO "X$AR_FLAGS" | $Xsed -e "$delay_single_quote_subst"`'
-+STRIP='`$ECHO "X$STRIP" | $Xsed -e "$delay_single_quote_subst"`'
-+RANLIB='`$ECHO "X$RANLIB" | $Xsed -e "$delay_single_quote_subst"`'
-+old_postinstall_cmds='`$ECHO "X$old_postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-+old_postuninstall_cmds='`$ECHO "X$old_postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-+old_archive_cmds='`$ECHO "X$old_archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-+CC='`$ECHO "X$CC" | $Xsed -e "$delay_single_quote_subst"`'
-+CFLAGS='`$ECHO "X$CFLAGS" | $Xsed -e "$delay_single_quote_subst"`'
-+compiler='`$ECHO "X$compiler" | $Xsed -e "$delay_single_quote_subst"`'
-+GCC='`$ECHO "X$GCC" | $Xsed -e "$delay_single_quote_subst"`'
-+lt_cv_sys_global_symbol_pipe='`$ECHO "X$lt_cv_sys_global_symbol_pipe" | $Xsed -e "$delay_single_quote_subst"`'
-+lt_cv_sys_global_symbol_to_cdecl='`$ECHO "X$lt_cv_sys_global_symbol_to_cdecl" | $Xsed -e "$delay_single_quote_subst"`'
-+lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address" | $Xsed -e "$delay_single_quote_subst"`'
-+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
-+objdir='`$ECHO "X$objdir" | $Xsed -e "$delay_single_quote_subst"`'
-+SHELL='`$ECHO "X$SHELL" | $Xsed -e "$delay_single_quote_subst"`'
-+ECHO='`$ECHO "X$ECHO" | $Xsed -e "$delay_single_quote_subst"`'
-+MAGIC_CMD='`$ECHO "X$MAGIC_CMD" | $Xsed -e "$delay_single_quote_subst"`'
-+lt_prog_compiler_no_builtin_flag='`$ECHO "X$lt_prog_compiler_no_builtin_flag" | $Xsed -e "$delay_single_quote_subst"`'
-+lt_prog_compiler_wl='`$ECHO "X$lt_prog_compiler_wl" | $Xsed -e "$delay_single_quote_subst"`'
-+lt_prog_compiler_pic='`$ECHO "X$lt_prog_compiler_pic" | $Xsed -e "$delay_single_quote_subst"`'
-+lt_prog_compiler_static='`$ECHO "X$lt_prog_compiler_static" | $Xsed -e "$delay_single_quote_subst"`'
-+lt_cv_prog_compiler_c_o='`$ECHO "X$lt_cv_prog_compiler_c_o" | $Xsed -e "$delay_single_quote_subst"`'
-+need_locks='`$ECHO "X$need_locks" | $Xsed -e "$delay_single_quote_subst"`'
-+DSYMUTIL='`$ECHO "X$DSYMUTIL" | $Xsed -e "$delay_single_quote_subst"`'
-+NMEDIT='`$ECHO "X$NMEDIT" | $Xsed -e "$delay_single_quote_subst"`'
-+LIPO='`$ECHO "X$LIPO" | $Xsed -e "$delay_single_quote_subst"`'
-+OTOOL='`$ECHO "X$OTOOL" | $Xsed -e "$delay_single_quote_subst"`'
-+OTOOL64='`$ECHO "X$OTOOL64" | $Xsed -e "$delay_single_quote_subst"`'
-+libext='`$ECHO "X$libext" | $Xsed -e "$delay_single_quote_subst"`'
-+shrext_cmds='`$ECHO "X$shrext_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-+extract_expsyms_cmds='`$ECHO "X$extract_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-+archive_cmds_need_lc='`$ECHO "X$archive_cmds_need_lc" | $Xsed -e "$delay_single_quote_subst"`'
-+enable_shared_with_static_runtimes='`$ECHO "X$enable_shared_with_static_runtimes" | $Xsed -e "$delay_single_quote_subst"`'
-+export_dynamic_flag_spec='`$ECHO "X$export_dynamic_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
-+whole_archive_flag_spec='`$ECHO "X$whole_archive_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
-+compiler_needs_object='`$ECHO "X$compiler_needs_object" | $Xsed -e "$delay_single_quote_subst"`'
-+old_archive_from_new_cmds='`$ECHO "X$old_archive_from_new_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-+old_archive_from_expsyms_cmds='`$ECHO "X$old_archive_from_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-+archive_cmds='`$ECHO "X$archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-+archive_expsym_cmds='`$ECHO "X$archive_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-+module_cmds='`$ECHO "X$module_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-+module_expsym_cmds='`$ECHO "X$module_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-+with_gnu_ld='`$ECHO "X$with_gnu_ld" | $Xsed -e "$delay_single_quote_subst"`'
-+allow_undefined_flag='`$ECHO "X$allow_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
-+no_undefined_flag='`$ECHO "X$no_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
-+hardcode_libdir_flag_spec='`$ECHO "X$hardcode_libdir_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
-+hardcode_libdir_flag_spec_ld='`$ECHO "X$hardcode_libdir_flag_spec_ld" | $Xsed -e "$delay_single_quote_subst"`'
-+hardcode_libdir_separator='`$ECHO "X$hardcode_libdir_separator" | $Xsed -e "$delay_single_quote_subst"`'
-+hardcode_direct='`$ECHO "X$hardcode_direct" | $Xsed -e "$delay_single_quote_subst"`'
-+hardcode_direct_absolute='`$ECHO "X$hardcode_direct_absolute" | $Xsed -e "$delay_single_quote_subst"`'
-+hardcode_minus_L='`$ECHO "X$hardcode_minus_L" | $Xsed -e "$delay_single_quote_subst"`'
-+hardcode_shlibpath_var='`$ECHO "X$hardcode_shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
-+hardcode_automatic='`$ECHO "X$hardcode_automatic" | $Xsed -e "$delay_single_quote_subst"`'
-+inherit_rpath='`$ECHO "X$inherit_rpath" | $Xsed -e "$delay_single_quote_subst"`'
-+link_all_deplibs='`$ECHO "X$link_all_deplibs" | $Xsed -e "$delay_single_quote_subst"`'
-+fix_srcfile_path='`$ECHO "X$fix_srcfile_path" | $Xsed -e "$delay_single_quote_subst"`'
-+always_export_symbols='`$ECHO "X$always_export_symbols" | $Xsed -e "$delay_single_quote_subst"`'
-+export_symbols_cmds='`$ECHO "X$export_symbols_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-+exclude_expsyms='`$ECHO "X$exclude_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
-+include_expsyms='`$ECHO "X$include_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
-+prelink_cmds='`$ECHO "X$prelink_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-+file_list_spec='`$ECHO "X$file_list_spec" | $Xsed -e "$delay_single_quote_subst"`'
-+variables_saved_for_relink='`$ECHO "X$variables_saved_for_relink" | $Xsed -e "$delay_single_quote_subst"`'
-+need_lib_prefix='`$ECHO "X$need_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
-+need_version='`$ECHO "X$need_version" | $Xsed -e "$delay_single_quote_subst"`'
-+version_type='`$ECHO "X$version_type" | $Xsed -e "$delay_single_quote_subst"`'
-+runpath_var='`$ECHO "X$runpath_var" | $Xsed -e "$delay_single_quote_subst"`'
-+shlibpath_var='`$ECHO "X$shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
-+shlibpath_overrides_runpath='`$ECHO "X$shlibpath_overrides_runpath" | $Xsed -e "$delay_single_quote_subst"`'
-+libname_spec='`$ECHO "X$libname_spec" | $Xsed -e "$delay_single_quote_subst"`'
-+library_names_spec='`$ECHO "X$library_names_spec" | $Xsed -e "$delay_single_quote_subst"`'
-+soname_spec='`$ECHO "X$soname_spec" | $Xsed -e "$delay_single_quote_subst"`'
-+postinstall_cmds='`$ECHO "X$postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-+postuninstall_cmds='`$ECHO "X$postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-+finish_cmds='`$ECHO "X$finish_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-+finish_eval='`$ECHO "X$finish_eval" | $Xsed -e "$delay_single_quote_subst"`'
-+hardcode_into_libs='`$ECHO "X$hardcode_into_libs" | $Xsed -e "$delay_single_quote_subst"`'
-+sys_lib_search_path_spec='`$ECHO "X$sys_lib_search_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
-+sys_lib_dlsearch_path_spec='`$ECHO "X$sys_lib_dlsearch_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
-+hardcode_action='`$ECHO "X$hardcode_action" | $Xsed -e "$delay_single_quote_subst"`'
-+enable_dlopen='`$ECHO "X$enable_dlopen" | $Xsed -e "$delay_single_quote_subst"`'
-+enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quote_subst"`'
-+enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`'
-+old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`'
-+striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`'
-+compiler_lib_search_dirs='`$ECHO "X$compiler_lib_search_dirs" | $Xsed -e "$delay_single_quote_subst"`'
-+predep_objects='`$ECHO "X$predep_objects" | $Xsed -e "$delay_single_quote_subst"`'
-+postdep_objects='`$ECHO "X$postdep_objects" | $Xsed -e "$delay_single_quote_subst"`'
-+predeps='`$ECHO "X$predeps" | $Xsed -e "$delay_single_quote_subst"`'
-+postdeps='`$ECHO "X$postdeps" | $Xsed -e "$delay_single_quote_subst"`'
-+compiler_lib_search_path='`$ECHO "X$compiler_lib_search_path" | $Xsed -e "$delay_single_quote_subst"`'
-+LD_CXX='`$ECHO "X$LD_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+old_archive_cmds_CXX='`$ECHO "X$old_archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+compiler_CXX='`$ECHO "X$compiler_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+GCC_CXX='`$ECHO "X$GCC_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "X$lt_prog_compiler_no_builtin_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+lt_prog_compiler_wl_CXX='`$ECHO "X$lt_prog_compiler_wl_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+lt_prog_compiler_pic_CXX='`$ECHO "X$lt_prog_compiler_pic_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+lt_prog_compiler_static_CXX='`$ECHO "X$lt_prog_compiler_static_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+lt_cv_prog_compiler_c_o_CXX='`$ECHO "X$lt_cv_prog_compiler_c_o_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+archive_cmds_need_lc_CXX='`$ECHO "X$archive_cmds_need_lc_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+enable_shared_with_static_runtimes_CXX='`$ECHO "X$enable_shared_with_static_runtimes_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+export_dynamic_flag_spec_CXX='`$ECHO "X$export_dynamic_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+whole_archive_flag_spec_CXX='`$ECHO "X$whole_archive_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+compiler_needs_object_CXX='`$ECHO "X$compiler_needs_object_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+old_archive_from_new_cmds_CXX='`$ECHO "X$old_archive_from_new_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+old_archive_from_expsyms_cmds_CXX='`$ECHO "X$old_archive_from_expsyms_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+archive_cmds_CXX='`$ECHO "X$archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+archive_expsym_cmds_CXX='`$ECHO "X$archive_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+module_cmds_CXX='`$ECHO "X$module_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+module_expsym_cmds_CXX='`$ECHO "X$module_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+with_gnu_ld_CXX='`$ECHO "X$with_gnu_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+allow_undefined_flag_CXX='`$ECHO "X$allow_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+no_undefined_flag_CXX='`$ECHO "X$no_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+hardcode_libdir_flag_spec_CXX='`$ECHO "X$hardcode_libdir_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+hardcode_libdir_flag_spec_ld_CXX='`$ECHO "X$hardcode_libdir_flag_spec_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+hardcode_libdir_separator_CXX='`$ECHO "X$hardcode_libdir_separator_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+hardcode_direct_CXX='`$ECHO "X$hardcode_direct_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+hardcode_direct_absolute_CXX='`$ECHO "X$hardcode_direct_absolute_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+hardcode_minus_L_CXX='`$ECHO "X$hardcode_minus_L_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+hardcode_shlibpath_var_CXX='`$ECHO "X$hardcode_shlibpath_var_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+hardcode_automatic_CXX='`$ECHO "X$hardcode_automatic_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+inherit_rpath_CXX='`$ECHO "X$inherit_rpath_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+link_all_deplibs_CXX='`$ECHO "X$link_all_deplibs_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+fix_srcfile_path_CXX='`$ECHO "X$fix_srcfile_path_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+always_export_symbols_CXX='`$ECHO "X$always_export_symbols_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+export_symbols_cmds_CXX='`$ECHO "X$export_symbols_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+exclude_expsyms_CXX='`$ECHO "X$exclude_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+include_expsyms_CXX='`$ECHO "X$include_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+prelink_cmds_CXX='`$ECHO "X$prelink_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+file_list_spec_CXX='`$ECHO "X$file_list_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+hardcode_action_CXX='`$ECHO "X$hardcode_action_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+compiler_lib_search_dirs_CXX='`$ECHO "X$compiler_lib_search_dirs_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+predep_objects_CXX='`$ECHO "X$predep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+postdep_objects_CXX='`$ECHO "X$postdep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+predeps_CXX='`$ECHO "X$predeps_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+postdeps_CXX='`$ECHO "X$postdeps_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+compiler_lib_search_path_CXX='`$ECHO "X$compiler_lib_search_path_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-+
-+LTCC='$LTCC'
-+LTCFLAGS='$LTCFLAGS'
-+compiler='$compiler_DEFAULT'
-+
-+# Quote evaled strings.
-+for var in SED \
-+GREP \
-+EGREP \
-+FGREP \
-+LD \
-+NM \
-+LN_S \
-+lt_SP2NL \
-+lt_NL2SP \
-+reload_flag \
-+OBJDUMP \
-+deplibs_check_method \
-+file_magic_cmd \
-+AR \
-+AR_FLAGS \
-+STRIP \
-+RANLIB \
-+CC \
-+CFLAGS \
-+compiler \
-+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 \
-+SHELL \
-+ECHO \
-+lt_prog_compiler_no_builtin_flag \
-+lt_prog_compiler_wl \
-+lt_prog_compiler_pic \
-+lt_prog_compiler_static \
-+lt_cv_prog_compiler_c_o \
-+need_locks \
-+DSYMUTIL \
-+NMEDIT \
-+LIPO \
-+OTOOL \
-+OTOOL64 \
-+shrext_cmds \
-+export_dynamic_flag_spec \
-+whole_archive_flag_spec \
-+compiler_needs_object \
-+with_gnu_ld \
-+allow_undefined_flag \
-+no_undefined_flag \
-+hardcode_libdir_flag_spec \
-+hardcode_libdir_flag_spec_ld \
-+hardcode_libdir_separator \
-+fix_srcfile_path \
-+exclude_expsyms \
-+include_expsyms \
-+file_list_spec \
-+variables_saved_for_relink \
-+libname_spec \
-+library_names_spec \
-+soname_spec \
-+finish_eval \
-+old_striplib \
-+striplib \
-+compiler_lib_search_dirs \
-+predep_objects \
-+postdep_objects \
-+predeps \
-+postdeps \
-+compiler_lib_search_path \
-+LD_CXX \
-+compiler_CXX \
-+lt_prog_compiler_no_builtin_flag_CXX \
-+lt_prog_compiler_wl_CXX \
-+lt_prog_compiler_pic_CXX \
-+lt_prog_compiler_static_CXX \
-+lt_cv_prog_compiler_c_o_CXX \
-+export_dynamic_flag_spec_CXX \
-+whole_archive_flag_spec_CXX \
-+compiler_needs_object_CXX \
-+with_gnu_ld_CXX \
-+allow_undefined_flag_CXX \
-+no_undefined_flag_CXX \
-+hardcode_libdir_flag_spec_CXX \
-+hardcode_libdir_flag_spec_ld_CXX \
-+hardcode_libdir_separator_CXX \
-+fix_srcfile_path_CXX \
-+exclude_expsyms_CXX \
-+include_expsyms_CXX \
-+file_list_spec_CXX \
-+compiler_lib_search_dirs_CXX \
-+predep_objects_CXX \
-+postdep_objects_CXX \
-+predeps_CXX \
-+postdeps_CXX \
-+compiler_lib_search_path_CXX; do
-+    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
-+    *[\\\\\\\`\\"\\\$]*)
-+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
-+      ;;
-+    *)
-+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-+      ;;
-+    esac
- done
- 
+-
+-done
+-
 -if test $expat_h_found = "no"
 -then
--	{ { echo "$as_me:$LINENO: error: \"Unable to locate expat.h. Use configure --help to see how to specify the search path\"" >&5
--echo "$as_me: error: \"Unable to locate expat.h. Use configure --help to see how to specify the search path\"" >&2;}
+-	{ { $as_echo "$as_me:$LINENO: error: \"Unable to locate expat.h. Use configure --help to see how to specify the search path\"" >&5
+-$as_echo "$as_me: error: \"Unable to locate expat.h. Use configure --help to see how to specify the search path\"" >&2;}
 -   { (exit 1); exit 1; }; }
 -fi
-+# Double-quote double-evaled strings.
-+for var in reload_cmds \
-+old_postinstall_cmds \
-+old_postuninstall_cmds \
-+old_archive_cmds \
-+extract_expsyms_cmds \
-+old_archive_from_new_cmds \
-+old_archive_from_expsyms_cmds \
-+archive_cmds \
-+archive_expsym_cmds \
-+module_cmds \
-+module_expsym_cmds \
-+export_symbols_cmds \
-+prelink_cmds \
-+postinstall_cmds \
-+postuninstall_cmds \
-+finish_cmds \
-+sys_lib_search_path_spec \
-+sys_lib_dlsearch_path_spec \
-+old_archive_cmds_CXX \
-+old_archive_from_new_cmds_CXX \
-+old_archive_from_expsyms_cmds_CXX \
-+archive_cmds_CXX \
-+archive_expsym_cmds_CXX \
-+module_cmds_CXX \
-+module_expsym_cmds_CXX \
-+export_symbols_cmds_CXX \
-+prelink_cmds_CXX; 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
- 
--echo "$as_me:$LINENO: checking for XML_ParserCreate in -lexpat" >&5
--echo $ECHO_N "checking for XML_ParserCreate in -lexpat... $ECHO_C" >&6
+-
+-{ $as_echo "$as_me:$LINENO: checking for XML_ParserCreate in -lexpat" >&5
+-$as_echo_n "checking for XML_ParserCreate in -lexpat... " >&6; }
 -if test "${ac_cv_lib_expat_XML_ParserCreate+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
+-  $as_echo_n "(cached) " >&6
 -else
 -  ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lexpat  $LIBS"
@@ -54530,110 +11476,96 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
-+# Fix-up fallback echo if it was mangled by the above quoting rules.
-+case \$lt_ECHO in
-+*'\\\$0 --fallback-echo"')  lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\`
-+  ;;
-+esac
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
 -#ifdef __cplusplus
 -extern "C"
 -#endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
 -char XML_ParserCreate ();
 -int
 -main ()
 -{
--XML_ParserCreate ();
+-return XML_ParserCreate ();
 -  ;
 -  return 0;
 -}
 -_ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
 -  ac_cv_lib_expat_XML_ParserCreate=yes
 -else
--  echo "$as_me: failed program was:" >&5
+-  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+ac_aux_dir='$ac_aux_dir'
-+xsi_shell='$xsi_shell'
-+lt_shell_append='$lt_shell_append'
- 
--ac_cv_lib_expat_XML_ParserCreate=no
+-
+-	ac_cv_lib_expat_XML_ParserCreate=no
 -fi
--rm -f conftest.err conftest.$ac_objext \
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
 -LIBS=$ac_check_lib_save_LIBS
-+# 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
--echo "$as_me:$LINENO: result: $ac_cv_lib_expat_XML_ParserCreate" >&5
--echo "${ECHO_T}$ac_cv_lib_expat_XML_ParserCreate" >&6
--if test $ac_cv_lib_expat_XML_ParserCreate = yes; then
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_expat_XML_ParserCreate" >&5
+-$as_echo "$ac_cv_lib_expat_XML_ParserCreate" >&6; }
+-if test "x$ac_cv_lib_expat_XML_ParserCreate" = x""yes; then
 -  cat >>confdefs.h <<_ACEOF
 -#define HAVE_LIBEXPAT 1
 -_ACEOF
- 
+-
 -  LIBS="-lexpat $LIBS"
- 
+-
 -else
--  { { echo "$as_me:$LINENO: error: \"Expat library not found. Use configure --help to see how to specify the search path\"" >&5
--echo "$as_me: error: \"Expat library not found. Use configure --help to see how to specify the search path\"" >&2;}
+-  { { $as_echo "$as_me:$LINENO: error: \"Expat library not found. Use configure --help to see how to specify the search path\"" >&5
+-$as_echo "$as_me: error: \"Expat library not found. Use configure --help to see how to specify the search path\"" >&2;}
 -   { (exit 1); exit 1; }; }
 -fi
-+    PACKAGE='$PACKAGE'
-+    VERSION='$VERSION'
-+    TIMESTAMP='$TIMESTAMP'
-+    RM='$RM'
-+    ofile='$ofile'
- 
- 
- 
- 
- 
- 
+-
+-
+-
+-
+-
+-
 -for ac_header in float.h limits.h stdlib.h string.h
 -do
--as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
--  echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
 -fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
 -else
 -  # Is the header compilable?
--echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
- _ACEOF
+-_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
@@ -54641,42 +11573,38 @@
 -#include <$ac_header>
 -_ACEOF
 -rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
 -  ac_header_compiler=yes
 -else
--  echo "$as_me: failed program was:" >&5
+-  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_header_compiler=no
+-
+-	ac_header_compiler=no
 -fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
- 
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
+-
 -# Is the header present?
--echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
@@ -54685,1205 +11613,500 @@
 -/* end confdefs.h.  */
 -#include <$ac_header>
 -_ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+-if { (ac_try="$ac_cpp conftest.$ac_ext"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } >/dev/null; then
--  if test -s conftest.err; then
--    ac_cpp_err=$ac_c_preproc_warn_flag
--    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
--  else
--    ac_cpp_err=
--  fi
--else
--  ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null && {
+-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       }; then
 -  ac_header_preproc=yes
 -else
--  echo "$as_me: failed program was:" >&5
+-  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+# Handling of arguments.
-+for ac_config_target in $ac_config_targets
-+do
-+  case $ac_config_target in
-+    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-+    "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
-+    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-+    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-+    "examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;;
-+    "examples/domviewer/Makefile") CONFIG_FILES="$CONFIG_FILES examples/domviewer/Makefile" ;;
-+    "examples/engine/Makefile") CONFIG_FILES="$CONFIG_FILES examples/engine/Makefile" ;;
-+    "examples/gpx/Makefile") CONFIG_FILES="$CONFIG_FILES examples/gpx/Makefile" ;;
-+    "examples/gx/Makefile") CONFIG_FILES="$CONFIG_FILES examples/gx/Makefile" ;;
-+    "examples/hellonet/Makefile") CONFIG_FILES="$CONFIG_FILES examples/hellonet/Makefile" ;;
-+    "examples/helloworld/Makefile") CONFIG_FILES="$CONFIG_FILES examples/helloworld/Makefile" ;;
-+    "examples/java/Makefile") CONFIG_FILES="$CONFIG_FILES examples/java/Makefile" ;;
-+    "examples/kml/Makefile") CONFIG_FILES="$CONFIG_FILES examples/kml/Makefile" ;;
-+    "examples/python/Makefile") CONFIG_FILES="$CONFIG_FILES examples/python/Makefile" ;;
-+    "examples/regionator/Makefile") CONFIG_FILES="$CONFIG_FILES examples/regionator/Makefile" ;;
-+    "examples/wxregionator/Makefile") CONFIG_FILES="$CONFIG_FILES examples/wxregionator/Makefile" ;;
-+    "examples/wxviewer/Makefile") CONFIG_FILES="$CONFIG_FILES examples/wxviewer/Makefile" ;;
-+    "examples/xsd/Makefile") CONFIG_FILES="$CONFIG_FILES examples/xsd/Makefile" ;;
-+    "msvc/Makefile") CONFIG_FILES="$CONFIG_FILES msvc/Makefile" ;;
-+    "msvc/examples/Makefile") CONFIG_FILES="$CONFIG_FILES msvc/examples/Makefile" ;;
-+    "msvc/tests/Makefile") CONFIG_FILES="$CONFIG_FILES msvc/tests/Makefile" ;;
-+    "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
-+    "src/kml/Makefile") CONFIG_FILES="$CONFIG_FILES src/kml/Makefile" ;;
-+    "src/kml/convenience/Makefile") CONFIG_FILES="$CONFIG_FILES src/kml/convenience/Makefile" ;;
-+    "src/kml/dom/Makefile") CONFIG_FILES="$CONFIG_FILES src/kml/dom/Makefile" ;;
-+    "src/kml/engine/Makefile") CONFIG_FILES="$CONFIG_FILES src/kml/engine/Makefile" ;;
-+    "src/kml/regionator/Makefile") CONFIG_FILES="$CONFIG_FILES src/kml/regionator/Makefile" ;;
-+    "src/kml/base/Makefile") CONFIG_FILES="$CONFIG_FILES src/kml/base/Makefile" ;;
-+    "src/kml/xsd/Makefile") CONFIG_FILES="$CONFIG_FILES src/kml/xsd/Makefile" ;;
-+    "src/swig/Makefile") CONFIG_FILES="$CONFIG_FILES src/swig/Makefile" ;;
-+    "src/swig/java/Makefile") CONFIG_FILES="$CONFIG_FILES src/swig/java/Makefile" ;;
-+    "src/swig/python/Makefile") CONFIG_FILES="$CONFIG_FILES src/swig/python/Makefile" ;;
-+    "testdata/Makefile") CONFIG_FILES="$CONFIG_FILES testdata/Makefile" ;;
-+    "testdata/atom/Makefile") CONFIG_FILES="$CONFIG_FILES testdata/atom/Makefile" ;;
-+    "testdata/balloon/Makefile") CONFIG_FILES="$CONFIG_FILES testdata/balloon/Makefile" ;;
-+    "testdata/csv/Makefile") CONFIG_FILES="$CONFIG_FILES testdata/csv/Makefile" ;;
-+    "testdata/deprecated/Makefile") CONFIG_FILES="$CONFIG_FILES testdata/deprecated/Makefile" ;;
-+    "testdata/gpx/Makefile") CONFIG_FILES="$CONFIG_FILES testdata/gpx/Makefile" ;;
-+    "testdata/gx/Makefile") CONFIG_FILES="$CONFIG_FILES testdata/gx/Makefile" ;;
-+    "testdata/kml/Makefile") CONFIG_FILES="$CONFIG_FILES testdata/kml/Makefile" ;;
-+    "testdata/kmz/Makefile") CONFIG_FILES="$CONFIG_FILES testdata/kmz/Makefile" ;;
-+    "testdata/kmz/files/Makefile") CONFIG_FILES="$CONFIG_FILES testdata/kmz/files/Makefile" ;;
-+    "testdata/kmz/kmzfiles/Makefile") CONFIG_FILES="$CONFIG_FILES testdata/kmz/kmzfiles/Makefile" ;;
-+    "testdata/kmz/rumsey/Makefile") CONFIG_FILES="$CONFIG_FILES testdata/kmz/rumsey/Makefile" ;;
-+    "testdata/kmz/rumsey/kml/Makefile") CONFIG_FILES="$CONFIG_FILES testdata/kmz/rumsey/kml/Makefile" ;;
-+    "testdata/kmz/rumsey/imagery/Makefile") CONFIG_FILES="$CONFIG_FILES testdata/kmz/rumsey/imagery/Makefile" ;;
-+    "testdata/links/Makefile") CONFIG_FILES="$CONFIG_FILES testdata/links/Makefile" ;;
-+    "testdata/style/Makefile") CONFIG_FILES="$CONFIG_FILES testdata/style/Makefile" ;;
-+    "testdata/style/weather/Makefile") CONFIG_FILES="$CONFIG_FILES testdata/style/weather/Makefile" ;;
-+    "testdata/update/Makefile") CONFIG_FILES="$CONFIG_FILES testdata/update/Makefile" ;;
-+    "testdata/xal/Makefile") CONFIG_FILES="$CONFIG_FILES testdata/xal/Makefile" ;;
-+    "testdata/xsd/Makefile") CONFIG_FILES="$CONFIG_FILES testdata/xsd/Makefile" ;;
-+    "third_party/Makefile") CONFIG_FILES="$CONFIG_FILES third_party/Makefile" ;;
-+    "xcode/Makefile") CONFIG_FILES="$CONFIG_FILES xcode/Makefile" ;;
-+    "xcode/LibKML/Makefile") CONFIG_FILES="$CONFIG_FILES xcode/LibKML/Makefile" ;;
- 
+-
 -  ac_header_preproc=no
-+  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
-+  esac
-+done
-+
-+
-+# If the user did not use the arguments to specify the items to instantiate,
-+# then the envvar interface is used.  Set only those that are not.
-+# We use the long form for the default assignment because of an extremely
-+# bizarre bug on SunOS 4.1.3.
-+if $ac_need_defaults; then
-+  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-+  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
-+  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
- fi
+-fi
+-
 -rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
- 
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
+-
 -# So?  What about this header?
 -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
 -  yes:no: )
--    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
--echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
 -    ac_header_preproc=yes
 -    ;;
 -  no:yes:* )
--    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
--echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
--echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
--echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
--echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
--    (
--      cat <<\_ASBOX
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
 -## ----------------------------------------------------- ##
 -## Report this to http://code.google.com/p/libkml/issues ##
 -## ----------------------------------------------------- ##
 -_ASBOX
--    ) |
--      sed "s/^/$as_me: WARNING:     /" >&2
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
 -    ;;
 -esac
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+# Have a temporary directory for convenience.  Make it in the build tree
-+# simply because there is no reason against having it here, and in addition,
-+# creating and moving files from /tmp can sometimes cause problems.
-+# Hook for its removal unless debugging.
-+# Note that there is a small window in which the directory will not be cleaned:
-+# after its creation but before its name has been assigned to `$tmp'.
-+$debug ||
-+{
-+  tmp=
-+  trap 'exit_status=$?
-+  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
-+' 0
-+  trap 'as_fn_exit 1' 1 2 13 15
-+}
-+# Create a (secure) tmp directory for tmp files.
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  eval "$as_ac_Header=\$ac_header_preproc"
+-fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-
 +
-+{
-+  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-+  test -n "$tmp" && test -d "$tmp"
-+}  ||
-+{
-+  tmp=./conf$$-$RANDOM
-+  (umask 077 && mkdir "$tmp")
-+} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
++# Check whether --with-python-include-dir was given.
++if test "${with_python_include_dir+set}" = set; then :
++  withval=$with_python_include_dir; PYTHON_INCLUDE_DIR=$withval
+ fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
+-  cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+-_ACEOF
+ 
 +
-+# Set up the scripts for CONFIG_FILES section.
-+# No need to generate them if there are no CONFIG_FILES.
-+# This happens for instance with `./config.status config.h'.
-+if test -n "$CONFIG_FILES"; then
 +
-+
-+ac_cr=`echo X | tr X '\015'`
-+# On cygwin, bash can eat \r inside `` if the user requested igncr.
-+# But we know of no other shell where ac_cr would be empty at this
-+# point, so we can use a bashism as a fallback.
-+if test "x$ac_cr" = x; then
-+  eval ac_cr=\$\'\\r\'
-+fi
-+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
-+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-+  ac_cs_awk_cr='\r'
- else
--  eval "$as_ac_Header=\$ac_header_preproc"
-+  ac_cs_awk_cr=$ac_cr
++# Check whether --with-python-lib-dir was given.
++if test "${with_python_lib_dir+set}" = set; then :
++  withval=$with_python_lib_dir; PYTHON_LIB_DIR=$withval
  fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
  
--fi
--if test `eval echo '${'$as_ac_Header'}'` = yes; then
--  cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+echo 'BEGIN {' >"$tmp/subs1.awk" &&
- _ACEOF
+-done
  
--fi
  
-+{
-+  echo "cat >conf$$subs.awk <<_ACEOF" &&
-+  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
-+  echo "_ACEOF"
-+} >conf$$subs.sh ||
-+  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
-+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
-+ac_delim='%!_!# '
-+for ac_last_try in false false false false false :; do
-+  . ./conf$$subs.sh ||
-+    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
-+
-+  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
-+  if test $ac_delim_n = $ac_delim_num; then
-+    break
-+  elif $ac_last_try; then
-+    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
-+  else
-+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-+  fi
- done
-+rm -f conf$$subs.sh
  
-+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
++for ac_header in expat.h
++do :
++  ac_fn_c_check_header_mongrel "$LINENO" "expat.h" "ac_cv_header_expat_h" "$ac_includes_default"
++if test "x$ac_cv_header_expat_h" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_EXPAT_H 1
 +_ACEOF
-+sed -n '
-+h
-+s/^/S["/; s/!.*/"]=/
-+p
-+g
-+s/^[^!]*!//
-+:repl
-+t repl
-+s/'"$ac_delim"'$//
-+t delim
-+:nl
-+h
-+s/\(.\{148\}\)..*/\1/
-+t more1
-+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
-+p
-+n
-+b repl
-+:more1
-+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-+p
-+g
-+s/.\{148\}//
-+t nl
-+:delim
-+h
-+s/\(.\{148\}\)..*/\1/
-+t more2
-+s/["\\]/\\&/g; s/^/"/; s/$/"/
-+p
-+b
-+:more2
-+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-+p
-+g
-+s/.\{148\}//
-+t delim
-+' <conf$$subs.awk | sed '
-+/^[^""]/{
-+  N
-+  s/\n//
-+}
-+' >>$CONFIG_STATUS || ac_write_fail=1
-+rm -f conf$$subs.awk
-+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+_ACAWK
-+cat >>"\$tmp/subs1.awk" <<_ACAWK &&
-+  for (key in S) S_is_set[key] = 1
-+  FS = ""
++ expat_h_found="yes"
++else
++  expat_h_found="no"
++fi
++
++done
  
-+}
-+{
-+  line = $ 0
-+  nfields = split(line, field, "@")
-+  substed = 0
-+  len = length(field[1])
-+  for (i = 2; i < nfields; i++) {
-+    key = field[i]
-+    keylen = length(key)
-+    if (S_is_set[key]) {
-+      value = S[key]
-+      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
-+      len += length(value) + length(field[++i])
-+      substed = 1
-+    } else
-+      len += 1 + keylen
-+  }
- 
-+  print line
-+}
- 
 -for ac_func in floor memset strstr
 -do
--as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
++if test $expat_h_found = "no"
++then
++	as_fn_error "\"Unable to locate expat.h. Use configure --help to see how to specify the search path\"" "$LINENO" 5
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML_ParserCreate in -lexpat" >&5
++$as_echo_n "checking for XML_ParserCreate in -lexpat... " >&6; }
++if test "${ac_cv_lib_expat_XML_ParserCreate+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
-+_ACAWK
-+_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
-+  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
-+else
-+  cat
-+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
-+  || as_fn_error "could not setup config files machinery" "$LINENO" 5
- _ACEOF
+-_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lexpat  $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
 -/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
 -   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 -#define $ac_func innocuous_$ac_func
- 
+-
 -/* System header to define __stub macros and hopefully few prototypes,
 -    which can conflict with char $ac_func (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
-+# VPATH may cause trouble with some makes, so we remove $(srcdir),
-+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-+# trailing colons and then remove the whole line if VPATH becomes empty
-+# (actually we leave an empty line to preserve line numbers).
-+if test "x$srcdir" = x.; then
-+  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-+s/:*\$(srcdir):*/:/
-+s/:*\${srcdir}:*/:/
-+s/:*@srcdir@:*/:/
-+s/^\([^=]*=[	 ]*\):*/\1/
-+s/:*$//
-+s/^[^=]*=[	 ]*$//
-+}'
-+fi
- 
+-
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-+fi # test -n "$CONFIG_FILES"
- 
+-
 -#undef $ac_func
-+# Set up the scripts for CONFIG_HEADERS section.
-+# No need to generate them if there are no CONFIG_HEADERS.
-+# This happens for instance with `./config.status Makefile'.
-+if test -n "$CONFIG_HEADERS"; then
-+cat >"$tmp/defines.awk" <<\_ACAWK ||
-+BEGIN {
-+_ACEOF
-+
-+# Transform confdefs.h into an awk script `defines.awk', embedded as
-+# here-document in config.status, that substitutes the proper values into
-+# config.h.in to produce config.h.
-+
-+# Create a delimiter string that does not exist in confdefs.h, to ease
-+# handling of long lines.
-+ac_delim='%!_!# '
-+for ac_last_try in false false :; do
-+  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
-+  if test -z "$ac_t"; then
-+    break
-+  elif $ac_last_try; then
-+    as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
-+  else
-+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-+  fi
-+done
  
--/* Override any gcc2 internal prototype to avoid an error.  */
--#ifdef __cplusplus
--extern "C"
--{
--#endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
+ /* Override any GCC internal prototype to avoid an error.
+    Use char because int might match the return type of a GCC
+@@ -16825,62 +14934,58 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
 -char $ac_func ();
 -/* The GNU C library defines this for functions which it implements
 -    to always fail with ENOSYS.  Some functions are actually named
 -    something starting with __ and the normal name is an alias.  */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+-#if defined __stub_$ac_func || defined __stub___$ac_func
 -choke me
--#else
--char (*f) () = $ac_func;
 -#endif
--#ifdef __cplusplus
-+# For the awk script, D is an array of macro values keyed by name,
-+# likewise P contains macro parameters if any.  Preserve backslash
-+# newline sequences.
-+
-+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-+sed -n '
-+s/.\{148\}/&'"$ac_delim"'/g
-+t rset
-+:rset
-+s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /
-+t def
-+d
-+:def
-+s/\\$//
-+t bsnl
-+s/["\\]/\\&/g
-+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
-+D["\1"]=" \3"/p
-+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2"/p
-+d
-+:bsnl
-+s/["\\]/\\&/g
-+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
-+D["\1"]=" \3\\\\\\n"\\/p
-+t cont
-+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
-+t cont
-+d
-+:cont
-+n
-+s/.\{148\}/&'"$ac_delim"'/g
-+t clear
-+:clear
-+s/\\$//
-+t bsnlc
-+s/["\\]/\\&/g; s/^/"/; s/$/"/p
-+d
-+:bsnlc
-+s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
-+b cont
-+' <confdefs.h | sed '
-+s/'"$ac_delim"'/"\\\
-+"/g' >>$CONFIG_STATUS || ac_write_fail=1
-+
-+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+  for (key in D) D_is_set[key] = 1
-+  FS = ""
+-
++char XML_ParserCreate ();
+ int
+ main ()
+ {
+-return $ac_func ();
++return XML_ParserCreate ();
+   ;
+   return 0;
  }
--#endif
-+/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
-+  line = \$ 0
-+  split(line, arg, " ")
-+  if (arg[1] == "#") {
-+    defundef = arg[2]
-+    mac1 = arg[3]
-+  } else {
-+    defundef = substr(arg[1], 2)
-+    mac1 = arg[2]
-+  }
-+  split(mac1, mac2, "(") #)
-+  macro = mac2[1]
-+  prefix = substr(line, 1, index(line, defundef) - 1)
-+  if (D_is_set[macro]) {
-+    # Preserve the white space surrounding the "#".
-+    print prefix "define", macro P[macro] D[macro]
-+    next
-+  } else {
-+    # Replace #undef with comments.  This is necessary, for example,
-+    # in the case of _POSIX_SOURCE, which is predefined and required
-+    # on some systems where configure will not decide to define it.
-+    if (defundef == "undef") {
-+      print "/*", prefix defundef, macro, "*/"
-+      next
-+    }
-+  }
-+}
-+{ print }
-+_ACAWK
-+_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-+  as_fn_error "could not setup config headers machinery" "$LINENO" 5
-+fi # test -n "$CONFIG_HEADERS"
- 
--int
--main ()
--{
--return f != $ac_func;
--  ;
--  return 0;
-+
-+eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
-+shift
-+for ac_tag
-+do
-+  case $ac_tag in
-+  :[FHLC]) ac_mode=$ac_tag; continue;;
-+  esac
-+  case $ac_mode$ac_tag in
-+  :[FHL]*:*);;
-+  :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
-+  :[FH]-) ac_tag=-:-;;
-+  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-+  esac
-+  ac_save_IFS=$IFS
-+  IFS=:
-+  set x $ac_tag
-+  IFS=$ac_save_IFS
-+  shift
-+  ac_file=$1
-+  shift
-+
-+  case $ac_mode in
-+  :L) ac_source=$1;;
-+  :[FH])
-+    ac_file_inputs=
-+    for ac_f
-+    do
-+      case $ac_f in
-+      -) ac_f="$tmp/stdin";;
-+      *) # Look for the file first in the build tree, then in the source tree
-+	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
-+	 # because $ac_f cannot contain `:'.
-+	 test -f "$ac_f" ||
-+	   case $ac_f in
-+	   [\\/$]*) false;;
-+	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
-+	   esac ||
-+	   as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
-+      esac
-+      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
-+      as_fn_append ac_file_inputs " '$ac_f'"
-+    done
-+
-+    # Let's still pretend it is `configure' which instantiates (i.e., don't
-+    # use $as_me), people would be surprised to read:
-+    #    /* config.h.  Generated by config.status.  */
-+    configure_input='Generated from '`
-+	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
-+	`' by configure.'
-+    if test x"$ac_file" != x-; then
-+      configure_input="$ac_file.  $configure_input"
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
-+$as_echo "$as_me: creating $ac_file" >&6;}
-+    fi
-+    # Neutralize special characters interpreted by sed in replacement strings.
-+    case $configure_input in #(
-+    *\&* | *\|* | *\\* )
-+       ac_sed_conf_input=`$as_echo "$configure_input" |
-+       sed 's/[\\\\&|]/\\\\&/g'`;; #(
-+    *) ac_sed_conf_input=$configure_input;;
-+    esac
-+
-+    case $ac_tag in
-+    *:-:* | *:-) cat >"$tmp/stdin" \
-+      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
-+    esac
-+    ;;
-+  esac
-+
-+  ac_dir=`$as_dirname -- "$ac_file" ||
-+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+	 X"$ac_file" : 'X\(//\)[^/]' \| \
-+	 X"$ac_file" : 'X\(//\)$' \| \
-+	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-+$as_echo X"$ac_file" |
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)[^/].*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
-+  as_dir="$ac_dir"; as_fn_mkdir_p
-+  ac_builddir=.
-+
-+case "$ac_dir" in
-+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-+*)
-+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-+  # A ".." for each directory in $ac_dir_suffix.
-+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-+  case $ac_top_builddir_sub in
-+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-+  esac ;;
-+esac
-+ac_abs_top_builddir=$ac_pwd
-+ac_abs_builddir=$ac_pwd$ac_dir_suffix
-+# for backward compatibility:
-+ac_top_builddir=$ac_top_build_prefix
-+
-+case $srcdir in
-+  .)  # We are building in place.
-+    ac_srcdir=.
-+    ac_top_srcdir=$ac_top_builddir_sub
-+    ac_abs_top_srcdir=$ac_pwd ;;
-+  [\\/]* | ?:[\\/]* )  # Absolute name.
-+    ac_srcdir=$srcdir$ac_dir_suffix;
-+    ac_top_srcdir=$srcdir
-+    ac_abs_top_srcdir=$srcdir ;;
-+  *) # Relative name.
-+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-+    ac_top_srcdir=$ac_top_build_prefix$srcdir
-+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-+esac
-+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-+
-+
-+  case $ac_mode in
-+  :F)
-+  #
-+  # CONFIG_FILE
-+  #
-+
-+  case $INSTALL in
-+  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-+  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
-+  esac
-+  ac_MKDIR_P=$MKDIR_P
-+  case $MKDIR_P in
-+  [\\/$]* | ?:[\\/]* ) ;;
-+  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
-+  esac
-+_ACEOF
-+
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-+# If the template does not know about datarootdir, expand it.
-+# FIXME: This hack should be removed a few years after 2.60.
-+ac_datarootdir_hack=; ac_datarootdir_seen=
-+ac_sed_dataroot='
-+/datarootdir/ {
-+  p
-+  q
- }
-+/@datadir@/p
-+/@docdir@/p
-+/@infodir@/p
-+/@localedir@/p
-+/@mandir@/p'
-+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
-+*datarootdir*) ac_datarootdir_seen=yes;;
-+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
-+_ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+  ac_datarootdir_hack='
-+  s&@datadir@&$datadir&g
-+  s&@docdir@&$docdir&g
-+  s&@infodir@&$infodir&g
-+  s&@localedir@&$localedir&g
-+  s&@mandir@&$mandir&g
-+  s&\\\${datarootdir}&$datarootdir&g' ;;
-+esac
  _ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
 -  eval "$as_ac_var=yes"
--else
--  echo "$as_me: failed program was:" >&5
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_lib_expat_XML_ParserCreate=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
++  ac_cv_lib_expat_XML_ParserCreate=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_expat_XML_ParserCreate" >&5
++$as_echo "$ac_cv_lib_expat_XML_ParserCreate" >&6; }
++if test "x$ac_cv_lib_expat_XML_ParserCreate" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_LIBEXPAT 1
++_ACEOF
++
++  LIBS="-lexpat $LIBS"
  
--eval "$as_ac_var=no"
--fi
--rm -f conftest.err conftest.$ac_objext \
+-	eval "$as_ac_var=no"
++else
++  as_fn_error "\"Expat library not found. Use configure --help to see how to specify the search path\"" "$LINENO" 5
+ fi
+ 
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
--fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
--if test `eval echo '${'$as_ac_var'}'` = yes; then
--  cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+# Neutralize VPATH when `$srcdir' = `.'.
-+# Shell code in configure.ac might set extrasub.
-+# FIXME: do we really want to maintain this feature?
-+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+ac_sed_extra="$ac_vpsub
-+$extrasub
- _ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-+:t
-+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-+s|@configure_input@|$ac_sed_conf_input|;t t
-+s&@top_builddir@&$ac_top_builddir_sub&;t t
-+s&@top_build_prefix@&$ac_top_build_prefix&;t t
-+s&@srcdir@&$ac_srcdir&;t t
-+s&@abs_srcdir@&$ac_abs_srcdir&;t t
-+s&@top_srcdir@&$ac_top_srcdir&;t t
-+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
-+s&@builddir@&$ac_builddir&;t t
-+s&@abs_builddir@&$ac_abs_builddir&;t t
-+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
-+s&@INSTALL@&$ac_INSTALL&;t t
-+s&@MKDIR_P@&$ac_MKDIR_P&;t t
-+$ac_datarootdir_hack
-+"
-+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-+  || as_fn_error "could not create $ac_file" "$LINENO" 5
 +
-+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-+  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-+which seems to be undefined.  Please make sure it is defined." >&5
-+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-+which seems to be undefined.  Please make sure it is defined." >&2;}
++for ac_header in float.h limits.h stdlib.h string.h
++do :
++  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++   if test "x$as_val" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
++
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++
++done
++
++for ac_func in floor memset strstr
++do :
++  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++   if test "x$as_val" = x""yes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+@@ -16890,16 +14995,16 @@
  
--fi
-+  rm -f "$tmp/stdin"
-+  case $ac_file in
-+  -) cat "$tmp/out" && rm -f "$tmp/out";;
-+  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
-+  esac \
-+  || as_fn_error "could not create $ac_file" "$LINENO" 5
-+ ;;
-+  :H)
-+  #
-+  # CONFIG_HEADER
-+  #
-+  if test x"$ac_file" != x-; then
-+    {
-+      $as_echo "/* $configure_input  */" \
-+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
-+    } >"$tmp/config.h" \
-+      || as_fn_error "could not create $ac_file" "$LINENO" 5
-+    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
-+$as_echo "$as_me: $ac_file is unchanged" >&6;}
-+    else
-+      rm -f "$ac_file"
-+      mv "$tmp/config.h" "$ac_file" \
-+	|| as_fn_error "could not create $ac_file" "$LINENO" 5
-+    fi
-+  else
-+    $as_echo "/* $configure_input  */" \
-+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
-+      || as_fn_error "could not create -" "$LINENO" 5
-+  fi
-+# Compute "$ac_file"'s index in $config_headers.
-+_am_arg="$ac_file"
-+_am_stamp_count=1
-+for _am_header in $config_headers :; do
-+  case $_am_header in
-+    $_am_arg | $_am_arg:* )
-+      break ;;
-+    * )
-+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-+  esac
- done
-+echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
-+$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+	 X"$_am_arg" : 'X\(//\)[^/]' \| \
-+	 X"$_am_arg" : 'X\(//\)$' \| \
-+	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
-+$as_echo X"$_am_arg" |
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)[^/].*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`/stamp-h$_am_stamp_count
-+ ;;
  
-+  :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
-+$as_echo "$as_me: executing $ac_file commands" >&6;}
-+ ;;
-+  esac
- 
--# Check whether --enable-swig or --disable-swig was given.
+ # Check whether --enable-swig was given.
 -if test "${enable_swig+set}" = set; then
--  enableval="$enable_swig"
++if test "${enable_swig+set}" = set; then :
+   enableval=$enable_swig;
+ fi
  
--fi;
--if test "x$enable_swig" != xno; then
--	# Extract the first word of "swig", so it can be a program name with args.
--set dummy swig; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "x$enable_swig" != xno; then
+ 	# Extract the first word of "swig", so it can be a program name with args.
+ set dummy swig; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $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_SWIG+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  if test -n "$SWIG"; then
--  ac_cv_prog_SWIG="$SWIG" # 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=.
++if test "${ac_cv_prog_SWIG+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$SWIG"; then
+@@ -16910,24 +15015,24 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
 -  for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--    ac_cv_prog_SWIG="swig"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
++    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_SWIG="swig"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
 -done
--done
-+  case $ac_file$ac_mode in
-+    "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
-+  # Autoconf 2.62 quotes --file arguments for eval, but not when files
-+  # are listed without --file.  Let's play safe and only enable the eval
-+  # if we detect the quoting.
-+  case $CONFIG_FILES in
-+  *\'*) eval set x "$CONFIG_FILES" ;;
-+  *)   set x $CONFIG_FILES ;;
-+  esac
-+  shift
-+  for mf
-+  do
-+    # Strip MF so we end up with the name of the file.
-+    mf=`echo "$mf" | sed -e 's/:.*$//'`
-+    # Check whether this is an Automake generated Makefile or not.
-+    # We used to match only the files named `Makefile.in', but
-+    # some people rename them; so instead we look at the file content.
-+    # Grep'ing the first line is not enough: some people post-process
-+    # each Makefile.in and add a new line on top of each file to say so.
-+    # Grep'ing the whole file is not good either: AIX grep has a line
-+    # limit of 2048, but all sed's we know have understand at least 4000.
-+    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-+      dirpart=`$as_dirname -- "$mf" ||
-+$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+	 X"$mf" : 'X\(//\)[^/]' \| \
-+	 X"$mf" : 'X\(//\)$' \| \
-+	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
-+$as_echo X"$mf" |
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)[^/].*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
-+    else
-+      continue
-+    fi
-+    # Extract the definition of DEPDIR, am__include, and am__quote
-+    # from the Makefile without running `make'.
-+    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-+    test -z "$DEPDIR" && continue
-+    am__include=`sed -n 's/^am__include = //p' < "$mf"`
-+    test -z "am__include" && continue
-+    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-+    # When using ansi2knr, U may be empty or an underscore; expand it
-+    U=`sed -n 's/^U = //p' < "$mf"`
-+    # Find all dependency output files, they are included files with
-+    # $(DEPDIR) in their names.  We invoke sed twice because it is the
-+    # simplest approach to changing $(DEPDIR) to its actual value in the
-+    # expansion.
-+    for file in `sed -n "
-+      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-+      # Make sure the directory exists.
-+      test -f "$dirpart/$file" && continue
-+      fdir=`$as_dirname -- "$file" ||
-+$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+	 X"$file" : 'X\(//\)[^/]' \| \
-+	 X"$file" : 'X\(//\)$' \| \
-+	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
-+$as_echo X"$file" |
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)[^/].*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
-+      as_dir=$dirpart/$fdir; as_fn_mkdir_p
-+      # echo "creating $dirpart/$file"
-+      echo '# dummy' > "$dirpart/$file"
-+    done
 +  done
-+}
-+ ;;
-+    "libtool":C)
+ IFS=$as_save_IFS
  
--fi
--fi
--SWIG=$ac_cv_prog_SWIG
--if test -n "$SWIG"; then
--  echo "$as_me:$LINENO: result: $SWIG" >&5
--echo "${ECHO_T}$SWIG" >&6
--else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--fi
-+    # 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
+ fi
+ fi
+ SWIG=$ac_cv_prog_SWIG
+ if test -n "$SWIG"; then
+-  { $as_echo "$as_me:$LINENO: result: $SWIG" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SWIG" >&5
+ $as_echo "$SWIG" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
  
--	if test "x$SWIG" != x; then
--		SWIG_VERSION=`swig -version 2>&1|grep Version|cut -d" " -f3`
--		if test ${SWIG_VERSION:4} -lt 35; then
--			{ echo "$as_me:$LINENO: WARNING: You have SWIG $SWIG_VERSION installed, but libkml requires at least SWIG 1.3.35. The bindings will not be built." >&5
--echo "$as_me: WARNING: You have SWIG $SWIG_VERSION installed, but libkml requires at least SWIG 1.3.35. The bindings will not be built." >&2;}
--			SWIG=
--		fi
--	fi
--fi
-+    cfgfile="${ofile}T"
-+    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
-+    $RM "$cfgfile"
-+
-+    cat <<_LT_EOF >> "$cfgfile"
-+#! $SHELL
+@@ -16935,7 +15040,7 @@
+ 	if test "x$SWIG" != x; then
+ 		SWIG_VERSION=`swig -version 2>&1|grep Version|cut -d" " -f3`
+ 		if test ${SWIG_VERSION:4} -lt 35; then
+-			{ $as_echo "$as_me:$LINENO: WARNING: You have SWIG $SWIG_VERSION installed, but libkml requires at least SWIG 1.3.35. The bindings will not be built." >&5
++			{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You have SWIG $SWIG_VERSION installed, but libkml requires at least SWIG 1.3.35. The bindings will not be built." >&5
+ $as_echo "$as_me: WARNING: You have SWIG $SWIG_VERSION installed, but libkml requires at least SWIG 1.3.35. The bindings will not be built." >&2;}
+ 			SWIG=
+ 		fi
+@@ -16951,7 +15056,7 @@
  
-+# `$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.
-+#
-+#   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.
  
--if test "x$SWIG" != x; then
--  WITH_SWIG_TRUE=
--  WITH_SWIG_FALSE='#'
--else
--  WITH_SWIG_TRUE='#'
--  WITH_SWIG_FALSE=
--fi
- 
-+# The names of the tagged configurations supported by this script.
-+available_tags="CXX "
- 
--# Check whether --enable-systempython or --disable-systempython was given.
+ # Check whether --enable-systempython was given.
 -if test "${enable_systempython+set}" = set; then
--  enableval="$enable_systempython"
-+# ### BEGIN LIBTOOL CONFIG
++if test "${enable_systempython+set}" = set; then :
+   enableval=$enable_systempython;
+ fi
  
--fi;
--USE_DEFAULT_PYTHON_LIBDIR=false
--if test "x$enable_systempython" = xyes; then
--	USE_DEFAULT_PYTHON_LIBDIR=true
--fi
-+# Which release of libtool.m4 was used?
-+macro_version=$macro_version
-+macro_revision=$macro_revision
+@@ -16962,16 +15067,16 @@
  
--if test "x$SWIG" != x; then
--	# Check whether --enable-java or --disable-java was given.
+ if test "x$SWIG" != x; then
+ 	# Check whether --enable-java was given.
 -if test "${enable_java+set}" = set; then
--  enableval="$enable_java"
-+# Whether or not to build shared libraries.
-+build_libtool_libs=$enable_shared
++if test "${enable_java+set}" = set; then :
+   enableval=$enable_java;
+ fi
  
--fi;
--	if test "x$enable_java" != xno; then
--		# Extract the first word of "java", so it can be a program name with args.
--set dummy java; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ 	if test "x$enable_java" != xno; then
+ 		# Extract the first word of "java", so it can be a program name with args.
+ set dummy java; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $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_JAVA+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  if test -n "$JAVA"; then
--  ac_cv_prog_JAVA="$JAVA" # 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=.
++if test "${ac_cv_prog_JAVA+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$JAVA"; then
+@@ -16982,14 +15087,14 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
 -  for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--    ac_cv_prog_JAVA="java"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
++    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_JAVA="java"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
 -done
--done
-+# Whether or not to build static libraries.
-+build_old_libs=$enable_static
-+
-+# What type of objects to build.
-+pic_mode=$pic_mode
-+
-+# Whether or not to optimize for fast installation.
-+fast_install=$enable_fast_install
-+
-+# The host system.
-+host_alias=$host_alias
-+host=$host
-+host_os=$host_os
-+
-+# The build system.
-+build_alias=$build_alias
-+build=$build
-+build_os=$build_os
-+
-+# A sed program that does not truncate output.
-+SED=$lt_SED
-+
-+# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-+Xsed="\$SED -e 1s/^X//"
++  done
+ IFS=$as_save_IFS
  
--  test -z "$ac_cv_prog_JAVA" && ac_cv_prog_JAVA="nojava"
--fi
--fi
--JAVA=$ac_cv_prog_JAVA
--if test -n "$JAVA"; then
--  echo "$as_me:$LINENO: result: $JAVA" >&5
--echo "${ECHO_T}$JAVA" >&6
--else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--fi
-+# A grep program that handles long lines.
-+GREP=$lt_GREP
+   test -z "$ac_cv_prog_JAVA" && ac_cv_prog_JAVA="nojava"
+@@ -16997,24 +15102,22 @@
+ fi
+ JAVA=$ac_cv_prog_JAVA
+ if test -n "$JAVA"; then
+-  { $as_echo "$as_me:$LINENO: result: $JAVA" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JAVA" >&5
+ $as_echo "$JAVA" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
  
--		if test "$JAVA" = "nojava"; then
--		  { { echo "$as_me:$LINENO: error: no java binary in PATH" >&5
--echo "$as_me: error: no java binary in PATH" >&2;}
+ 
+ 		if test "$JAVA" = "nojava"; then
+-		  { { $as_echo "$as_me:$LINENO: error: no java binary in PATH" >&5
+-$as_echo "$as_me: error: no java binary in PATH" >&2;}
 -   { (exit 1); exit 1; }; }
--		fi
--		# Extract the first word of "javac", so it can be a program name with args.
--set dummy javac; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++		  as_fn_error "no java binary in PATH" "$LINENO" 5
+ 		fi
+ 		# Extract the first word of "javac", so it can be a program name with args.
+ set dummy javac; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $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_JAVAC+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  if test -n "$JAVAC"; then
--  ac_cv_prog_JAVAC="$JAVAC" # 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=.
++if test "${ac_cv_prog_JAVAC+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$JAVAC"; then
+@@ -17025,14 +15128,14 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
 -  for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--    ac_cv_prog_JAVAC="javac"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
++    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_JAVAC="javac"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
 -done
--done
-+# An ERE matcher.
-+EGREP=$lt_EGREP
++  done
+ IFS=$as_save_IFS
  
--  test -z "$ac_cv_prog_JAVAC" && ac_cv_prog_JAVAC="nojavac"
--fi
--fi
--JAVAC=$ac_cv_prog_JAVAC
--if test -n "$JAVAC"; then
--  echo "$as_me:$LINENO: result: $JAVAC" >&5
--echo "${ECHO_T}$JAVAC" >&6
--else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--fi
-+# A literal string matcher.
-+FGREP=$lt_FGREP
+   test -z "$ac_cv_prog_JAVAC" && ac_cv_prog_JAVAC="nojavac"
+@@ -17040,24 +15143,22 @@
+ fi
+ JAVAC=$ac_cv_prog_JAVAC
+ if test -n "$JAVAC"; then
+-  { $as_echo "$as_me:$LINENO: result: $JAVAC" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JAVAC" >&5
+ $as_echo "$JAVAC" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
  
--		if test "$JAVAC" = "nojavac"; then
--		  { { echo "$as_me:$LINENO: error: no javac binary in PATH, bindings will not be built" >&5
--echo "$as_me: error: no javac binary in PATH, bindings will not be built" >&2;}
+ 
+ 		if test "$JAVAC" = "nojavac"; then
+-		  { { $as_echo "$as_me:$LINENO: error: no javac binary in PATH, bindings will not be built" >&5
+-$as_echo "$as_me: error: no javac binary in PATH, bindings will not be built" >&2;}
 -   { (exit 1); exit 1; }; }
--		fi
--		# Extract the first word of "jar", so it can be a program name with args.
--set dummy jar; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++		  as_fn_error "no javac binary in PATH, bindings will not be built" "$LINENO" 5
+ 		fi
+ 		# Extract the first word of "jar", so it can be a program name with args.
+ set dummy jar; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $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_JAR+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  if test -n "$JAR"; then
--  ac_cv_prog_JAR="$JAR" # 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=.
++if test "${ac_cv_prog_JAR+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$JAR"; then
+@@ -17068,14 +15169,14 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
 -  for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--    ac_cv_prog_JAR="jar"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
++    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_JAR="jar"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
 -done
--done
-+# A BSD- or MS-compatible name lister.
-+NM=$lt_NM
++  done
+ IFS=$as_save_IFS
  
--  test -z "$ac_cv_prog_JAR" && ac_cv_prog_JAR="nojar"
--fi
--fi
--JAR=$ac_cv_prog_JAR
--if test -n "$JAR"; then
--  echo "$as_me:$LINENO: result: $JAR" >&5
--echo "${ECHO_T}$JAR" >&6
--else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--fi
-+# Whether we need soft or hard links.
-+LN_S=$lt_LN_S
+   test -z "$ac_cv_prog_JAR" && ac_cv_prog_JAR="nojar"
+@@ -17083,18 +15184,16 @@
+ fi
+ JAR=$ac_cv_prog_JAR
+ if test -n "$JAR"; then
+-  { $as_echo "$as_me:$LINENO: result: $JAR" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JAR" >&5
+ $as_echo "$JAR" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
  
--		if test "$JAR" = "nojar"; then
--		  { { echo "$as_me:$LINENO: error: no jar binary in PATH, bindings will not be built" >&5
--echo "$as_me: error: no jar binary in PATH, bindings will not be built" >&2;}
+ 
+ 		if test "$JAR" = "nojar"; then
+-		  { { $as_echo "$as_me:$LINENO: error: no jar binary in PATH, bindings will not be built" >&5
+-$as_echo "$as_me: error: no jar binary in PATH, bindings will not be built" >&2;}
 -   { (exit 1); exit 1; }; }
--		fi
--		if test "x$JAVA" != x; then
--			current_CPPFLAGS="$CPPFLAGS"
--			if test "$CPPFLAGS" != ""; then
--				CPPFLAGS="-I$current_CPPFLAGS -I$JAVA_INCLUDE_DIR -I$JAVA_INCLUDE_DIR/$PLATFORM"
--			else
--				CPPFLAGS="-I$JAVA_INCLUDE_DIR -I$JAVA_INCLUDE_DIR/$PLATFORM"
--			fi
++		  as_fn_error "no jar binary in PATH, bindings will not be built" "$LINENO" 5
+ 		fi
+ 		if test "x$JAVA" != x; then
+ 			current_CPPFLAGS="$CPPFLAGS"
+@@ -17103,142 +15202,11 @@
+ 			else
+ 				CPPFLAGS="-I$JAVA_INCLUDE_DIR -I$JAVA_INCLUDE_DIR/$PLATFORM"
+ 			fi
 -			if test "${ac_cv_header_jni_h+set}" = set; then
--  echo "$as_me:$LINENO: checking for jni.h" >&5
--echo $ECHO_N "checking for jni.h... $ECHO_C" >&6
+-  { $as_echo "$as_me:$LINENO: checking for jni.h" >&5
+-$as_echo_n "checking for jni.h... " >&6; }
 -if test "${ac_cv_header_jni_h+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
+-  $as_echo_n "(cached) " >&6
 -fi
--echo "$as_me:$LINENO: result: $ac_cv_header_jni_h" >&5
--echo "${ECHO_T}$ac_cv_header_jni_h" >&6
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_jni_h" >&5
+-$as_echo "$ac_cv_header_jni_h" >&6; }
 -else
 -  # Is the header compilable?
--echo "$as_me:$LINENO: checking jni.h usability" >&5
--echo $ECHO_N "checking jni.h usability... $ECHO_C" >&6
+-{ $as_echo "$as_me:$LINENO: checking jni.h usability" >&5
+-$as_echo_n "checking jni.h usability... " >&6; }
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
@@ -55894,45 +12117,38 @@
 -#include <jni.h>
 -_ACEOF
 -rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
 -  ac_header_compiler=yes
 -else
--  echo "$as_me: failed program was:" >&5
+-  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+# What is the maximum length of a command?
-+max_cmd_len=$max_cmd_len
- 
--ac_header_compiler=no
+-
+-	ac_header_compiler=no
 -fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+# Object file suffix (normally "o").
-+objext=$ac_objext
- 
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
+-
 -# Is the header present?
--echo "$as_me:$LINENO: checking jni.h presence" >&5
--echo $ECHO_N "checking jni.h presence... $ECHO_C" >&6
+-{ $as_echo "$as_me:$LINENO: checking jni.h presence" >&5
+-$as_echo_n "checking jni.h presence... " >&6; }
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
@@ -55941,185 +12157,144 @@
 -/* end confdefs.h.  */
 -#include <jni.h>
 -_ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+-if { (ac_try="$ac_cpp conftest.$ac_ext"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } >/dev/null; then
--  if test -s conftest.err; then
--    ac_cpp_err=$ac_c_preproc_warn_flag
--    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
--  else
--    ac_cpp_err=
--  fi
--else
--  ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null && {
+-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       }; then
 -  ac_header_preproc=yes
 -else
--  echo "$as_me: failed program was:" >&5
+-  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+# Executable file suffix (normally "").
-+exeext=$exeext
- 
+-
 -  ac_header_preproc=no
 -fi
+-
 -rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+# whether the shell understands "unset".
-+lt_unset=$lt_unset
- 
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
+-
 -# So?  What about this header?
 -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
 -  yes:no: )
--    { echo "$as_me:$LINENO: WARNING: jni.h: accepted by the compiler, rejected by the preprocessor!" >&5
--echo "$as_me: WARNING: jni.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { echo "$as_me:$LINENO: WARNING: jni.h: proceeding with the compiler's result" >&5
--echo "$as_me: WARNING: jni.h: proceeding with the compiler's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: jni.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: jni.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: jni.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: jni.h: proceeding with the compiler's result" >&2;}
 -    ac_header_preproc=yes
 -    ;;
 -  no:yes:* )
--    { echo "$as_me:$LINENO: WARNING: jni.h: present but cannot be compiled" >&5
--echo "$as_me: WARNING: jni.h: present but cannot be compiled" >&2;}
--    { echo "$as_me:$LINENO: WARNING: jni.h:     check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: jni.h:     check for missing prerequisite headers?" >&2;}
--    { echo "$as_me:$LINENO: WARNING: jni.h: see the Autoconf documentation" >&5
--echo "$as_me: WARNING: jni.h: see the Autoconf documentation" >&2;}
--    { echo "$as_me:$LINENO: WARNING: jni.h:     section \"Present But Cannot Be Compiled\"" >&5
--echo "$as_me: WARNING: jni.h:     section \"Present But Cannot Be Compiled\"" >&2;}
--    { echo "$as_me:$LINENO: WARNING: jni.h: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: jni.h: proceeding with the preprocessor's result" >&2;}
--    { echo "$as_me:$LINENO: WARNING: jni.h: in the future, the compiler will take precedence" >&5
--echo "$as_me: WARNING: jni.h: in the future, the compiler will take precedence" >&2;}
--    (
--      cat <<\_ASBOX
+-    { $as_echo "$as_me:$LINENO: WARNING: jni.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: jni.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: jni.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: jni.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: jni.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: jni.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: jni.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: jni.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: jni.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: jni.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: jni.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: jni.h: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
 -## ----------------------------------------------------- ##
 -## Report this to http://code.google.com/p/libkml/issues ##
 -## ----------------------------------------------------- ##
 -_ASBOX
--    ) |
--      sed "s/^/$as_me: WARNING:     /" >&2
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
 -    ;;
 -esac
--echo "$as_me:$LINENO: checking for jni.h" >&5
--echo $ECHO_N "checking for jni.h... $ECHO_C" >&6
+-{ $as_echo "$as_me:$LINENO: checking for jni.h" >&5
+-$as_echo_n "checking for jni.h... " >&6; }
 -if test "${ac_cv_header_jni_h+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
+-  $as_echo_n "(cached) " >&6
 -else
 -  ac_cv_header_jni_h=$ac_header_preproc
 -fi
--echo "$as_me:$LINENO: result: $ac_cv_header_jni_h" >&5
--echo "${ECHO_T}$ac_cv_header_jni_h" >&6
-+# turn spaces into newlines.
-+SP2NL=$lt_lt_SP2NL
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_jni_h" >&5
+-$as_echo "$ac_cv_header_jni_h" >&6; }
++			ac_fn_c_check_header_mongrel "$LINENO" "jni.h" "ac_cv_header_jni_h" "$ac_includes_default"
++if test "x$ac_cv_header_jni_h" = x""yes; then :
  
 -fi
--if test $ac_cv_header_jni_h = yes; then
+-if test "x$ac_cv_header_jni_h" = x""yes; then
 -  :
--else
--  { echo "$as_me:$LINENO: WARNING: could not find jni.h. The Java bindings will not be built." >&5
--echo "$as_me: WARNING: could not find jni.h. The Java bindings will not be built." >&2;}
--			JAVA=
-+# turn newlines into spaces.
-+NL2SP=$lt_lt_NL2SP
+ else
+-  { $as_echo "$as_me:$LINENO: WARNING: could not find jni.h. The Java bindings will not be built." >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: could not find jni.h. The Java bindings will not be built." >&5
+ $as_echo "$as_me: WARNING: could not find jni.h. The Java bindings will not be built." >&2;}
+ 			JAVA=
  
--fi
-+# How to create reloadable object files.
-+reload_flag=$lt_reload_flag
-+reload_cmds=$lt_reload_cmds
+@@ -17260,16 +15228,16 @@
  
-+# An object symbol dumper.
-+OBJDUMP=$lt_OBJDUMP
- 
--			CPPFLAGS="$current_CPPFLAGS"
--		fi
--	fi
--fi
-+# Method to check whether dependent libraries are shared objects.
-+deplibs_check_method=$lt_deplibs_check_method
- 
-+# Command to use when deplibs_check_method == "file_magic".
-+file_magic_cmd=$lt_file_magic_cmd
- 
--if test "x$JAVA" != x; then
--  WITH_JAVA_TRUE=
--  WITH_JAVA_FALSE='#'
--else
--  WITH_JAVA_TRUE='#'
--  WITH_JAVA_FALSE=
--fi
-+# The archiver.
-+AR=$lt_AR
-+AR_FLAGS=$lt_AR_FLAGS
- 
-+# A symbol stripping program.
-+STRIP=$lt_STRIP
- 
--if test "x$SWIG" != x; then
--	# Check whether --enable-python or --disable-python was given.
+ if test "x$SWIG" != x; then
+ 	# Check whether --enable-python was given.
 -if test "${enable_python+set}" = set; then
--  enableval="$enable_python"
-+# Commands used to install an old-style archive.
-+RANLIB=$lt_RANLIB
-+old_postinstall_cmds=$lt_old_postinstall_cmds
-+old_postuninstall_cmds=$lt_old_postuninstall_cmds
++if test "${enable_python+set}" = set; then :
+   enableval=$enable_python;
+ fi
  
--fi;
--	if test "x$enable_python" != xno; then
--		# Extract the first word of "python", so it can be a program name with args.
--set dummy python; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ 	if test "x$enable_python" != xno; then
+ 		# Extract the first word of "python", so it can be a program name with args.
+ set dummy python; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $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_PYTHON+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  if test -n "$PYTHON"; then
--  ac_cv_prog_PYTHON="$PYTHON" # 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=.
++if test "${ac_cv_prog_PYTHON+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$PYTHON"; then
+@@ -17280,24 +15248,24 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
 -  for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--    ac_cv_prog_PYTHON="python"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
++    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_PYTHON="python"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
 -done
--done
-+# A C compiler.
-+LTCC=$lt_CC
++  done
+ IFS=$as_save_IFS
  
--fi
--fi
--PYTHON=$ac_cv_prog_PYTHON
--if test -n "$PYTHON"; then
--  echo "$as_me:$LINENO: result: $PYTHON" >&5
--echo "${ECHO_T}$PYTHON" >&6
--else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--fi
-+# LTCC compiler flags.
-+LTCFLAGS=$lt_CFLAGS
+ fi
+ fi
+ PYTHON=$ac_cv_prog_PYTHON
+ if test -n "$PYTHON"; then
+-  { $as_echo "$as_me:$LINENO: result: $PYTHON" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5
+ $as_echo "$PYTHON" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
  
--		if test "x$PYTHON" != x; then
--			PYTHON_VERSION=`$PYTHON -c "import sys; print sys.version[:3]"`
--			if test "$USE_DEFAULT_PYTHON_LIBDIR" = true; then
--				PYTHON_SITE_PACKAGES_DIR=`$PYTHON -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_lib(1,0)'`
+@@ -17306,154 +15274,23 @@
+ 			PYTHON_VERSION=`$PYTHON -c "import sys; print sys.version[:3]"`
+ 			if test "$USE_DEFAULT_PYTHON_LIBDIR" = true; then
+ 				PYTHON_SITE_PACKAGES_DIR=`$PYTHON -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_lib(1,0)'`
 -			else
 -				PYTHON_SITE_PACKAGES_DIR=`$PYTHON -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_lib(1,0,"${exec_prefix}")'`
 -			fi
-+# Take the output of nm and produce a listing of raw symbols and C names.
-+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
- 
+-
 -			if test "$PYTHON_INCLUDE_DIR" = ""; then
 -				PYTHON_INCLUDE_DIR=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_python_inc()"`
 -			fi
@@ -56129,17 +12304,17 @@
 -			current_CPPFLAGS="$CPPFLAGS"
 -			CPPFLAGS="-I$PYTHON_INCLUDE_DIR"
 -			if test "${ac_cv_header_Python_h+set}" = set; then
--  echo "$as_me:$LINENO: checking for Python.h" >&5
--echo $ECHO_N "checking for Python.h... $ECHO_C" >&6
+-  { $as_echo "$as_me:$LINENO: checking for Python.h" >&5
+-$as_echo_n "checking for Python.h... " >&6; }
 -if test "${ac_cv_header_Python_h+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
+-  $as_echo_n "(cached) " >&6
 -fi
--echo "$as_me:$LINENO: result: $ac_cv_header_Python_h" >&5
--echo "${ECHO_T}$ac_cv_header_Python_h" >&6
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_Python_h" >&5
+-$as_echo "$ac_cv_header_Python_h" >&6; }
 -else
 -  # Is the header compilable?
--echo "$as_me:$LINENO: checking Python.h usability" >&5
--echo $ECHO_N "checking Python.h usability... $ECHO_C" >&6
+-{ $as_echo "$as_me:$LINENO: checking Python.h usability" >&5
+-$as_echo_n "checking Python.h usability... " >&6; }
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
@@ -56150,45 +12325,38 @@
 -#include <Python.h>
 -_ACEOF
 -rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
 -  ac_header_compiler=yes
 -else
--  echo "$as_me: failed program was:" >&5
+-  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+# Transform the output of nm in a proper C declaration.
-+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
- 
--ac_header_compiler=no
+-
+-	ac_header_compiler=no
 -fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+# Transform the output of nm in a C name address pair.
-+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
- 
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
+-
 -# Is the header present?
--echo "$as_me:$LINENO: checking Python.h presence" >&5
--echo $ECHO_N "checking Python.h presence... $ECHO_C" >&6
+-{ $as_echo "$as_me:$LINENO: checking Python.h presence" >&5
+-$as_echo_n "checking Python.h presence... " >&6; }
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
@@ -56197,2371 +12365,1374 @@
 -/* end confdefs.h.  */
 -#include <Python.h>
 -_ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+-if { (ac_try="$ac_cpp conftest.$ac_ext"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } >/dev/null; then
--  if test -s conftest.err; then
--    ac_cpp_err=$ac_c_preproc_warn_flag
--    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
--  else
--    ac_cpp_err=
--  fi
--else
--  ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null && {
+-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       }; then
 -  ac_header_preproc=yes
 -else
--  echo "$as_me: failed program was:" >&5
+-  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+# Transform the output of nm in a C name address pair when lib prefix is needed.
-+global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
- 
+-
 -  ac_header_preproc=no
 -fi
+-
 -rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+# The name of the directory that contains temporary libtool files.
-+objdir=$objdir
- 
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
+-
 -# So?  What about this header?
 -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
 -  yes:no: )
--    { echo "$as_me:$LINENO: WARNING: Python.h: accepted by the compiler, rejected by the preprocessor!" >&5
--echo "$as_me: WARNING: Python.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { echo "$as_me:$LINENO: WARNING: Python.h: proceeding with the compiler's result" >&5
--echo "$as_me: WARNING: Python.h: proceeding with the compiler's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: Python.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: Python.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: Python.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: Python.h: proceeding with the compiler's result" >&2;}
 -    ac_header_preproc=yes
 -    ;;
 -  no:yes:* )
--    { echo "$as_me:$LINENO: WARNING: Python.h: present but cannot be compiled" >&5
--echo "$as_me: WARNING: Python.h: present but cannot be compiled" >&2;}
--    { echo "$as_me:$LINENO: WARNING: Python.h:     check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: Python.h:     check for missing prerequisite headers?" >&2;}
--    { echo "$as_me:$LINENO: WARNING: Python.h: see the Autoconf documentation" >&5
--echo "$as_me: WARNING: Python.h: see the Autoconf documentation" >&2;}
--    { echo "$as_me:$LINENO: WARNING: Python.h:     section \"Present But Cannot Be Compiled\"" >&5
--echo "$as_me: WARNING: Python.h:     section \"Present But Cannot Be Compiled\"" >&2;}
--    { echo "$as_me:$LINENO: WARNING: Python.h: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: Python.h: proceeding with the preprocessor's result" >&2;}
--    { echo "$as_me:$LINENO: WARNING: Python.h: in the future, the compiler will take precedence" >&5
--echo "$as_me: WARNING: Python.h: in the future, the compiler will take precedence" >&2;}
--    (
--      cat <<\_ASBOX
+-    { $as_echo "$as_me:$LINENO: WARNING: Python.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: Python.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: Python.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: Python.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: Python.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: Python.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: Python.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: Python.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: Python.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: Python.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: Python.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: Python.h: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
 -## ----------------------------------------------------- ##
 -## Report this to http://code.google.com/p/libkml/issues ##
 -## ----------------------------------------------------- ##
 -_ASBOX
--    ) |
--      sed "s/^/$as_me: WARNING:     /" >&2
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
 -    ;;
 -esac
--echo "$as_me:$LINENO: checking for Python.h" >&5
--echo $ECHO_N "checking for Python.h... $ECHO_C" >&6
+-{ $as_echo "$as_me:$LINENO: checking for Python.h" >&5
+-$as_echo_n "checking for Python.h... " >&6; }
 -if test "${ac_cv_header_Python_h+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
+-  $as_echo_n "(cached) " >&6
 -else
 -  ac_cv_header_Python_h=$ac_header_preproc
 -fi
--echo "$as_me:$LINENO: result: $ac_cv_header_Python_h" >&5
--echo "${ECHO_T}$ac_cv_header_Python_h" >&6
-+# Shell to use when invoking shell scripts.
-+SHELL=$lt_SHELL
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_Python_h" >&5
+-$as_echo "$ac_cv_header_Python_h" >&6; }
++			else
++				PYTHON_SITE_PACKAGES_DIR=`$PYTHON -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_lib(1,0,"${exec_prefix}")'`
++			fi
++
++			if test "$PYTHON_INCLUDE_DIR" = ""; then
++				PYTHON_INCLUDE_DIR=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_python_inc()"`
++			fi
++			if test "$PYTHON_LIB_DIR" = ""; then
++				PYTHON_LIB_DIR=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('LIBPL')"`
++			fi
++			current_CPPFLAGS="$CPPFLAGS"
++			CPPFLAGS="-I$PYTHON_INCLUDE_DIR"
++			ac_fn_c_check_header_mongrel "$LINENO" "Python.h" "ac_cv_header_Python_h" "$ac_includes_default"
++if test "x$ac_cv_header_Python_h" = x""yes; then :
  
 -fi
--if test $ac_cv_header_Python_h = yes; then
+-if test "x$ac_cv_header_Python_h" = x""yes; then
 -  :
--else
--  { echo "$as_me:$LINENO: WARNING: could not find Python.h. The Python bindings will not be built." >&5
--echo "$as_me: WARNING: could not find Python.h. The Python bindings will not be built." >&2;}
--			PYTHON=
-+# An echo program that does not interpret backslashes.
-+ECHO=$lt_ECHO
-+
-+# Used to examine libraries when file_magic_cmd begins with "file".
-+MAGIC_CMD=$MAGIC_CMD
-+
-+# Must we lock files when doing compilation?
-+need_locks=$lt_need_locks
-+
-+# Tool to manipulate archived DWARF debug symbol files on Mac OS X.
-+DSYMUTIL=$lt_DSYMUTIL
-+
-+# Tool to change global to local symbols on Mac OS X.
-+NMEDIT=$lt_NMEDIT
-+
-+# Tool to manipulate fat objects and archives on Mac OS X.
-+LIPO=$lt_LIPO
-+
-+# ldd/readelf like tool for Mach-O binaries on Mac OS X.
-+OTOOL=$lt_OTOOL
-+
-+# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4.
-+OTOOL64=$lt_OTOOL64
+ else
+-  { $as_echo "$as_me:$LINENO: WARNING: could not find Python.h. The Python bindings will not be built." >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: could not find Python.h. The Python bindings will not be built." >&5
+ $as_echo "$as_me: WARNING: could not find Python.h. The Python bindings will not be built." >&2;}
+ 			PYTHON=
  
--fi
-+# Old archive suffix (normally "a").
-+libext=$libext
- 
-+# Shared library suffix (normally ".so").
-+shrext_cmds=$lt_shrext_cmds
- 
--			PYTHON_LIBNAME="python"
--			if test "$PLATFORM" = "linux"; then
--				PYTHON_LIBNAME="python$PYTHON_VERSION"
--			fi
-+# The commands to extract the exported symbol list from a shared archive.
-+extract_expsyms_cmds=$lt_extract_expsyms_cmds
- 
--as_ac_Lib=`echo "ac_cv_lib_$PYTHON_LIBNAME''_Py_Initialize" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for Py_Initialize in -l$PYTHON_LIBNAME" >&5
--echo $ECHO_N "checking for Py_Initialize in -l$PYTHON_LIBNAME... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Lib+set}\" = set"; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-l$PYTHON_LIBNAME  $LIBS"
+@@ -17464,20 +15301,15 @@
+ 			if test "$PLATFORM" = "linux"; then
+ 				PYTHON_LIBNAME="python$PYTHON_VERSION"
+ 			fi
+-
+-as_ac_Lib=`$as_echo "ac_cv_lib_$PYTHON_LIBNAME''_Py_Initialize" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for Py_Initialize in -l$PYTHON_LIBNAME" >&5
++			as_ac_Lib=`$as_echo "ac_cv_lib_$PYTHON_LIBNAME''_Py_Initialize" | $as_tr_sh`
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Py_Initialize in -l$PYTHON_LIBNAME" >&5
+ $as_echo_n "checking for Py_Initialize in -l$PYTHON_LIBNAME... " >&6; }
+-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
++if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$PYTHON_LIBNAME  $LIBS"
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
-+# Variables whose values should be saved in libtool wrapper scripts and
-+# restored at link time.
-+variables_saved_for_relink=$lt_variables_saved_for_relink
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
  
--/* Override any gcc2 internal prototype to avoid an error.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
--char Py_Initialize ();
--int
--main ()
--{
--Py_Initialize ();
--  ;
--  return 0;
--}
--_ACEOF
+ /* Override any GCC internal prototype to avoid an error.
+@@ -17495,47 +15327,20 @@
+   return 0;
+ }
+ _ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  eval "$as_ac_Lib=yes"
--else
--  echo "$as_me: failed program was:" >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   eval "$as_ac_Lib=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+# Do we need the "lib" prefix for modules?
-+need_lib_prefix=$need_lib_prefix
- 
--eval "$as_ac_Lib=no"
--fi
--rm -f conftest.err conftest.$ac_objext \
+-
+-	eval "$as_ac_Lib=no"
++  eval "$as_ac_Lib=no"
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
--if test `eval echo '${'$as_ac_Lib'}'` = yes; then
--  cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_LIB$PYTHON_LIBNAME" | $as_tr_cpp` 1
--_ACEOF
-+# Do we need a version for libraries?
-+need_version=$need_version
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Lib'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
++eval ac_res=\$$as_ac_Lib
++	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_Lib'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++eval as_val=\$$as_ac_Lib
++   if test "x$as_val" = x""yes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_LIB$PYTHON_LIBNAME" | $as_tr_cpp` 1
+ _ACEOF
+@@ -17543,7 +15348,7 @@
+   LIBS="-l$PYTHON_LIBNAME $LIBS"
  
--  LIBS="-l$PYTHON_LIBNAME $LIBS"
-+# Library versioning type.
-+version_type=$version_type
+ else
+-  { $as_echo "$as_me:$LINENO: WARNING: could not find the Python library. The Python bindings will not be built." >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: could not find the Python library. The Python bindings will not be built." >&5
+ $as_echo "$as_me: WARNING: could not find the Python library. The Python bindings will not be built." >&2;}
+ 			PYTHON=
  
--else
--  { echo "$as_me:$LINENO: WARNING: could not find the Python library. The Python bindings will not be built." >&5
--echo "$as_me: WARNING: could not find the Python library. The Python bindings will not be built." >&2;}
--			PYTHON=
-+# Shared library runtime path variable.
-+runpath_var=$runpath_var
- 
--fi
-+# Shared library path variable.
-+shlibpath_var=$shlibpath_var
- 
--			LIBS=''  # don't append -lpython here.
--			CPPFLAGS="$current_CPPFLAGS"
--		fi
--	fi
--fi
-+# Is shlibpath searched before the hard-coded library search path?
-+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
- 
-+# Format of library name prefix.
-+libname_spec=$lt_libname_spec
- 
--if test "x$PYTHON" != x; then
--  WITH_PYTHON_TRUE=
--  WITH_PYTHON_FALSE='#'
--else
--  WITH_PYTHON_TRUE='#'
--  WITH_PYTHON_FALSE=
--fi
-+# 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
-+library_names_spec=$lt_library_names_spec
- 
-+# The coded name of the library, if different from the real name.
-+soname_spec=$lt_soname_spec
- 
-+# Command to use after installation of a shared archive.
-+postinstall_cmds=$lt_postinstall_cmds
- 
--  succeeded=no
-+# Command to use after uninstallation of a shared archive.
-+postuninstall_cmds=$lt_postuninstall_cmds
- 
--  if test -z "$CURL_CONFIG"; then
--    # Extract the first word of "curl-config", so it can be a program name with args.
--set dummy curl-config; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+@@ -17569,9 +15374,9 @@
+   if test -z "$CURL_CONFIG"; then
+     # Extract the first word of "curl-config", so it can be a program name with args.
+ set dummy curl-config; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
 -if test "${ac_cv_path_CURL_CONFIG+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  case $CURL_CONFIG in
--  [\\/]* | ?:[\\/]*)
--  ac_cv_path_CURL_CONFIG="$CURL_CONFIG" # Let the user override the test with a path.
--  ;;
--  *)
--  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
++if test "${ac_cv_path_CURL_CONFIG+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $CURL_CONFIG in
+@@ -17584,14 +15389,14 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
 -  for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--    ac_cv_path_CURL_CONFIG="$as_dir/$ac_word$ac_exec_ext"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
++    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_path_CURL_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
 -done
--done
-+# Commands used to finish a libtool library installation in a directory.
-+finish_cmds=$lt_finish_cmds
++  done
+ IFS=$as_save_IFS
  
--  test -z "$ac_cv_path_CURL_CONFIG" && ac_cv_path_CURL_CONFIG="no"
--  ;;
--esac
--fi
--CURL_CONFIG=$ac_cv_path_CURL_CONFIG
-+# As "finish_cmds", except a single script fragment to be evaled but
-+# not shown.
-+finish_eval=$lt_finish_eval
+   test -z "$ac_cv_path_CURL_CONFIG" && ac_cv_path_CURL_CONFIG="no"
+@@ -17600,10 +15405,10 @@
+ fi
+ CURL_CONFIG=$ac_cv_path_CURL_CONFIG
+ if test -n "$CURL_CONFIG"; then
+-  { $as_echo "$as_me:$LINENO: result: $CURL_CONFIG" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CURL_CONFIG" >&5
+ $as_echo "$CURL_CONFIG" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
  
--if test -n "$CURL_CONFIG"; then
--  echo "$as_me:$LINENO: result: $CURL_CONFIG" >&5
--echo "${ECHO_T}$CURL_CONFIG" >&6
--else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--fi
-+# Whether we should hardcode library paths into libraries.
-+hardcode_into_libs=$hardcode_into_libs
+@@ -17616,24 +15421,24 @@
+     echo "*** Or see http://curl.haxx.se/"
+   else
+         CURL_VERSION=`$CURL_CONFIG --version | cut -d" " -f2`
+-    { $as_echo "$as_me:$LINENO: checking for curl >= 7.12.3" >&5
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for curl >= 7.12.3" >&5
+ $as_echo_n "checking for curl >= 7.12.3... " >&6; }
+         VERSION_CHECK=`expr $CURL_VERSION \>\= 7.12.3`
+         if test "$VERSION_CHECK" = "1" ; then
+-            { $as_echo "$as_me:$LINENO: result: yes" >&5
++            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+             succeeded=yes
  
--  fi
-+# Compile-time system search path for libraries.
-+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+-            { $as_echo "$as_me:$LINENO: checking CURL_CFLAGS" >&5
++            { $as_echo "$as_me:${as_lineno-$LINENO}: checking CURL_CFLAGS" >&5
+ $as_echo_n "checking CURL_CFLAGS... " >&6; }
+             CURL_CFLAGS=`$CURL_CONFIG --cflags`
+-            { $as_echo "$as_me:$LINENO: result: $CURL_CFLAGS" >&5
++            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CURL_CFLAGS" >&5
+ $as_echo "$CURL_CFLAGS" >&6; }
  
--  if test "$CURL_CONFIG" = "no" ; then
--    echo "*** The curl-config script could not be found. Make sure it is"
--    echo "*** in your path, and that curl is properly installed."
--    echo "*** Or see http://curl.haxx.se/"
--  else
--        CURL_VERSION=`$CURL_CONFIG --version | cut -d" " -f2`
--    echo "$as_me:$LINENO: checking for curl >= 7.12.3" >&5
--echo $ECHO_N "checking for curl >= 7.12.3... $ECHO_C" >&6
--        VERSION_CHECK=`expr $CURL_VERSION \>\= 7.12.3`
--        if test "$VERSION_CHECK" = "1" ; then
--            echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
--            succeeded=yes
-+# Run-time system search path for libraries.
-+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
- 
--            echo "$as_me:$LINENO: checking CURL_CFLAGS" >&5
--echo $ECHO_N "checking CURL_CFLAGS... $ECHO_C" >&6
--            CURL_CFLAGS=`$CURL_CONFIG --cflags`
--            echo "$as_me:$LINENO: result: $CURL_CFLAGS" >&5
--echo "${ECHO_T}$CURL_CFLAGS" >&6
-+# Whether dlopen is supported.
-+dlopen_support=$enable_dlopen
- 
--            echo "$as_me:$LINENO: checking CURL_LIBS" >&5
--echo $ECHO_N "checking CURL_LIBS... $ECHO_C" >&6
--            CURL_LIBS=`$CURL_CONFIG --libs`
--            echo "$as_me:$LINENO: result: $CURL_LIBS" >&5
--echo "${ECHO_T}$CURL_LIBS" >&6
--        else
--            CURL_CFLAGS=""
--            CURL_LIBS=""
--            ## If we have a custom action on failure, don't print errors, but
--            ## do set a variable so people can do so.
--            echo "can't find curl >= 7.12.3"
--        fi
-+# Whether dlopen of programs is supported.
-+dlopen_self=$enable_dlopen_self
- 
-+# Whether dlopen of statically linked programs is supported.
-+dlopen_self_static=$enable_dlopen_self_static
- 
-+# Commands to strip libraries.
-+old_striplib=$lt_old_striplib
-+striplib=$lt_striplib
- 
--  fi
- 
--  if test $succeeded = yes; then
--     :
--  else
--     { { echo "$as_me:$LINENO: error: Library requirements (curl) not met." >&5
--echo "$as_me: error: Library requirements (curl) not met." >&2;}
+-            { $as_echo "$as_me:$LINENO: checking CURL_LIBS" >&5
++            { $as_echo "$as_me:${as_lineno-$LINENO}: checking CURL_LIBS" >&5
+ $as_echo_n "checking CURL_LIBS... " >&6; }
+             CURL_LIBS=`$CURL_CONFIG --libs`
+-            { $as_echo "$as_me:$LINENO: result: $CURL_LIBS" >&5
++            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CURL_LIBS" >&5
+ $as_echo "$CURL_LIBS" >&6; }
+         else
+             CURL_CFLAGS=""
+@@ -17650,9 +15455,7 @@
+   if test $succeeded = yes; then
+      :
+   else
+-     { { $as_echo "$as_me:$LINENO: error: Library requirements (curl) not met." >&5
+-$as_echo "$as_me: error: Library requirements (curl) not met." >&2;}
 -   { (exit 1); exit 1; }; }
--  fi
-+# The linker used to build libraries.
-+LD=$lt_LD
++     as_fn_error "Library requirements (curl) not met." "$LINENO" 5
+   fi
  
-+# Commands used to build an old-style archive.
-+old_archive_cmds=$lt_old_archive_cmds
- 
-+# A language specific compiler.
-+CC=$lt_compiler
- 
--if test "$CURL_LIBS"; then
--  HAVE_CURL_TRUE=
--  HAVE_CURL_FALSE='#'
--else
--  HAVE_CURL_TRUE='#'
--  HAVE_CURL_FALSE=
--fi
-+# Is the compiler the GNU compiler?
-+with_gcc=$GCC
- 
-+# Compiler flag to turn off builtin functions.
-+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
- 
--          ac_config_headers="$ac_config_headers config.h"
-+# How to pass a linker flag through the compiler.
-+wl=$lt_lt_prog_compiler_wl
- 
-+# Additional compiler flags for building library objects.
-+pic_flag=$lt_lt_prog_compiler_pic
- 
--                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        ac_config_files="$ac_config_files Makefile examples/Makefile examples/domviewer/Makefile examples/engine/Makefile examples/gpx/Makefile examples/gx/Makefile examples/hellonet/Makefile examples/helloworld/Makefile examples/java/Makefile examples/kml/Makefile examples/python/Makefile examples/regionator/Makefile examples/wxregionator/Makefile examples/wxviewer/Makefile examples/xsd/Makefile msvc/Makefile msvc/examples/Makefile msvc/tests/Makefile src/Makefile src/kml/Makefile src/kml/convenience/Makefile src/kml/dom/Makefile src/kml/engine/Makefile src/kml/regionator/Makefile src/kml/base/Makefile src/kml/xsd/Makefile src/swig/Makefile src/swig/java/Makefile src/swig/python/Makefile testdata/Makefile testdata/atom/Makefile testdata/balloon/Makefile testdata/csv/Makefile testdata/deprecated/Makefile testdata/gpx/Makefile testdata/gx/Makefile testdata/kml/Makefile testdata/kmz/Makefile testdata/kmz/files/Makefile testdata/kmz/kmzfiles/Makefile testdata/kmz/rumsey/Makefile testdata/kmz/rumsey/kml/Makefile testdata/kmz/rumsey/imagery/Makefile testdata/links/Makefile testdata/style/Makefile testdata/style/weather/Makefile testdata/update/Makefile testdata/xal/Makefile testdata/xsd/Makefile third_party/Makefile xcode/Makefile xcode/LibKML/Makefile"
-+# Compiler flag to prevent dynamic linking.
-+link_static_flag=$lt_lt_prog_compiler_static
- 
-+# Does compiler simultaneously support -c and -o options?
-+compiler_c_o=$lt_lt_cv_prog_compiler_c_o
- 
--cat >confcache <<\_ACEOF
--# This file is a shell script that caches the results of configure
--# tests run on this system so they can be shared between configure
--# scripts and configure runs, see configure's option --config-cache.
--# It is not useful on other systems.  If it contains results you don't
--# want to keep, you may remove or edit it.
--#
--# config.status only pays attention to the cache file if you give it
--# the --recheck option to rerun configure.
--#
--# `ac_cv_env_foo' variables (set or unset) will be overridden when
--# loading this file, other *unset* `ac_cv_foo' will be assigned the
--# following values.
-+# Whether or not to add -lc for building shared libraries.
-+build_libtool_need_lc=$archive_cmds_need_lc
- 
--_ACEOF
-+# Whether or not to disallow shared libs when runtime libs are static.
-+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
- 
--# The following way of writing the cache mishandles newlines in values,
--# but we know of no workaround that is simple, portable, and efficient.
--# So, don't put newlines in cache variables' values.
--# Ultrix sh set writes to stderr and can't be redirected directly,
--# and sets the high bit in the cache file unless we assign to the vars.
--{
--  (set) 2>&1 |
--    case `(ac_space=' '; set | grep ac_space) 2>&1` in
--    *ac_space=\ *)
+  if test "$CURL_LIBS"; then
+@@ -17697,13 +15500,13 @@
+     case $ac_val in #(
+     *${as_nl}*)
+       case $ac_var in #(
+-      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
++      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+       esac
+       case $ac_var in #(
+       _ | IFS | as_nl) ;; #(
+       BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+-      *) $as_unset $ac_var ;;
++      *) { eval $ac_var=; unset $ac_var;} ;;
+       esac ;;
+     esac
+   done
+@@ -17711,8 +15514,8 @@
+   (set) 2>&1 |
+     case $as_nl`(ac_space=' '; set) 2>&1` in #(
+     *${as_nl}ac_space=\ *)
 -      # `set' does not quote correctly, so add quotes (double-quote
 -      # substitution turns \\\\ into \\, and sed turns \\ into \).
--      sed -n \
--	"s/'/'\\\\''/g;
--	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
--      ;;
--    *)
--      # `set' quotes correctly as required by POSIX, so do not add quotes.
--      sed -n \
--	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
--      ;;
--    esac;
--} |
--  sed '
--     t clear
--     : clear
--     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
--     t end
--     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
--     : end' >>confcache
--if diff $cache_file confcache >/dev/null 2>&1; then :; else
--  if test -w $cache_file; then
--    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
--    cat confcache >$cache_file
--  else
--    echo "not updating unwritable cache $cache_file"
--  fi
--fi
--rm -f confcache
-+# Compiler flag to allow reflexive dlopens.
-+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
++      # `set' does not quote correctly, so add quotes: double-quote
++      # substitution turns \\\\ into \\, and sed turns \\ into \.
+       sed -n \
+ 	"s/'/'\\\\''/g;
+ 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+@@ -17735,11 +15538,11 @@
+ if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
+   if test -w "$cache_file"; then
+     test "x$cache_file" != "x/dev/null" &&
+-      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
++      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+ $as_echo "$as_me: updating cache $cache_file" >&6;}
+     cat confcache >$cache_file
+   else
+-    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
++    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+ $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+   fi
+ fi
+@@ -17759,85 +15562,67 @@
+   ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
+   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
+   #    will be set to the directory where LIBOBJS objects are built.
+-  ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+-  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
++  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
++  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
+ done
+ LIBOBJS=$ac_libobjs
  
--test "x$prefix" = xNONE && prefix=$ac_default_prefix
--# Let make expand exec_prefix.
--test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-+# Compiler flag to generate shared objects directly from archives.
-+whole_archive_flag_spec=$lt_whole_archive_flag_spec
+ LTLIBOBJS=$ac_ltlibobjs
  
--# VPATH may cause trouble with some makes, so we remove $(srcdir),
--# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
--# trailing colons and then remove the whole line if VPATH becomes empty
--# (actually we leave an empty line to preserve line numbers).
--if test "x$srcdir" = x.; then
--  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
--s/:*\$(srcdir):*/:/;
--s/:*\${srcdir}:*/:/;
--s/:*@srcdir@:*/:/;
--s/^\([^=]*=[	 ]*\):*/\1/;
--s/:*$//;
--s/^[^=]*=[	 ]*$//;
--}'
--fi
-+# Whether the compiler copes with passing no objects directly.
-+compiler_needs_object=$lt_compiler_needs_object
  
--DEFS=-DHAVE_CONFIG_H
-+# Create an old-style archive from a shared archive.
-+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
- 
--ac_libobjs=
--ac_ltlibobjs=
--for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
--  # 1. Remove the extension, and $U if already installed.
--  ac_i=`echo "$ac_i" |
--	 sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
--  # 2. Add them.
--  ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
--  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
--done
--LIBOBJS=$ac_libobjs
-+# Create a temporary old-style archive to link instead of a shared archive.
-+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
- 
--LTLIBOBJS=$ac_ltlibobjs
-+# Commands used to build a shared archive.
-+archive_cmds=$lt_archive_cmds
-+archive_expsym_cmds=$lt_archive_expsym_cmds
- 
-+# Commands used to build a loadable module if different from building
-+# a shared archive.
-+module_cmds=$lt_module_cmds
-+module_expsym_cmds=$lt_module_expsym_cmds
- 
--if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
--  { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
++ if test -n "$EXEEXT"; then
++  am__EXEEXT_TRUE=
++  am__EXEEXT_FALSE='#'
++else
++  am__EXEEXT_TRUE='#'
++  am__EXEEXT_FALSE=
++fi
++
+ if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
+-  { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
 -Usually this means the macro was only invoked conditionally." >&5
--echo "$as_me: error: conditional \"AMDEP\" was never defined.
+-$as_echo "$as_me: error: conditional \"AMDEP\" was never defined.
 -Usually this means the macro was only invoked conditionally." >&2;}
 -   { (exit 1); exit 1; }; }
--fi
--if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
--  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
++  as_fn_error "conditional \"AMDEP\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
+-  { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
 -Usually this means the macro was only invoked conditionally." >&5
--echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
+-$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
 -Usually this means the macro was only invoked conditionally." >&2;}
 -   { (exit 1); exit 1; }; }
--fi
--if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
--  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
++  as_fn_error "conditional \"am__fastdepCC\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
+-  { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
 -Usually this means the macro was only invoked conditionally." >&5
--echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
+-$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
 -Usually this means the macro was only invoked conditionally." >&2;}
 -   { (exit 1); exit 1; }; }
--fi
--if test -z "${GCC_TRUE}" && test -z "${GCC_FALSE}"; then
--  { { echo "$as_me:$LINENO: error: conditional \"GCC\" was never defined.
++  as_fn_error "conditional \"am__fastdepCXX\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
+-  { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
 -Usually this means the macro was only invoked conditionally." >&5
--echo "$as_me: error: conditional \"GCC\" was never defined.
+-$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
 -Usually this means the macro was only invoked conditionally." >&2;}
 -   { (exit 1); exit 1; }; }
--fi
--if test -z "${WITH_SWIG_TRUE}" && test -z "${WITH_SWIG_FALSE}"; then
--  { { echo "$as_me:$LINENO: error: conditional \"WITH_SWIG\" was never defined.
++  as_fn_error "conditional \"am__fastdepCXX\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${GCC_TRUE}" && test -z "${GCC_FALSE}"; then
+-  { { $as_echo "$as_me:$LINENO: error: conditional \"GCC\" was never defined.
 -Usually this means the macro was only invoked conditionally." >&5
--echo "$as_me: error: conditional \"WITH_SWIG\" was never defined.
+-$as_echo "$as_me: error: conditional \"GCC\" was never defined.
 -Usually this means the macro was only invoked conditionally." >&2;}
 -   { (exit 1); exit 1; }; }
--fi
--if test -z "${WITH_JAVA_TRUE}" && test -z "${WITH_JAVA_FALSE}"; then
--  { { echo "$as_me:$LINENO: error: conditional \"WITH_JAVA\" was never defined.
++  as_fn_error "conditional \"GCC\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${WITH_SWIG_TRUE}" && test -z "${WITH_SWIG_FALSE}"; then
+-  { { $as_echo "$as_me:$LINENO: error: conditional \"WITH_SWIG\" was never defined.
 -Usually this means the macro was only invoked conditionally." >&5
--echo "$as_me: error: conditional \"WITH_JAVA\" was never defined.
+-$as_echo "$as_me: error: conditional \"WITH_SWIG\" was never defined.
 -Usually this means the macro was only invoked conditionally." >&2;}
 -   { (exit 1); exit 1; }; }
--fi
--if test -z "${WITH_PYTHON_TRUE}" && test -z "${WITH_PYTHON_FALSE}"; then
--  { { echo "$as_me:$LINENO: error: conditional \"WITH_PYTHON\" was never defined.
++  as_fn_error "conditional \"WITH_SWIG\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${WITH_JAVA_TRUE}" && test -z "${WITH_JAVA_FALSE}"; then
+-  { { $as_echo "$as_me:$LINENO: error: conditional \"WITH_JAVA\" was never defined.
 -Usually this means the macro was only invoked conditionally." >&5
--echo "$as_me: error: conditional \"WITH_PYTHON\" was never defined.
+-$as_echo "$as_me: error: conditional \"WITH_JAVA\" was never defined.
 -Usually this means the macro was only invoked conditionally." >&2;}
 -   { (exit 1); exit 1; }; }
--fi
--if test -z "${HAVE_CURL_TRUE}" && test -z "${HAVE_CURL_FALSE}"; then
--  { { echo "$as_me:$LINENO: error: conditional \"HAVE_CURL\" was never defined.
++  as_fn_error "conditional \"WITH_JAVA\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${WITH_PYTHON_TRUE}" && test -z "${WITH_PYTHON_FALSE}"; then
+-  { { $as_echo "$as_me:$LINENO: error: conditional \"WITH_PYTHON\" was never defined.
 -Usually this means the macro was only invoked conditionally." >&5
--echo "$as_me: error: conditional \"HAVE_CURL\" was never defined.
+-$as_echo "$as_me: error: conditional \"WITH_PYTHON\" was never defined.
 -Usually this means the macro was only invoked conditionally." >&2;}
 -   { (exit 1); exit 1; }; }
--fi
-+# Whether we are building with GNU ld or not.
-+with_gnu_ld=$lt_with_gnu_ld
++  as_fn_error "conditional \"WITH_PYTHON\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${HAVE_CURL_TRUE}" && test -z "${HAVE_CURL_FALSE}"; then
+-  { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_CURL\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&5
+-$as_echo "$as_me: error: conditional \"HAVE_CURL\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&2;}
+-   { (exit 1); exit 1; }; }
++  as_fn_error "conditional \"HAVE_CURL\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
  
--: ${CONFIG_STATUS=./config.status}
--ac_clean_files_save=$ac_clean_files
--ac_clean_files="$ac_clean_files $CONFIG_STATUS"
--{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
--echo "$as_me: creating $CONFIG_STATUS" >&6;}
--cat >$CONFIG_STATUS <<_ACEOF
--#! $SHELL
--# Generated by $as_me.
--# Run this file to recreate the current configuration.
--# Compiler output produced by configure, useful for debugging
--# configure, is in config.log if it exists.
-+# Flag that allows shared libraries with undefined symbols to be built.
-+allow_undefined_flag=$lt_allow_undefined_flag
- 
--debug=false
--ac_cs_recheck=false
--ac_cs_silent=false
+ : ${CONFIG_STATUS=./config.status}
+ ac_write_fail=0
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
+ $as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+-cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
++as_write_fail=0
++cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
+ #! $SHELL
+ # Generated by $as_me.
+ # Run this file to recreate the current configuration.
+@@ -17847,17 +15632,18 @@
+ debug=false
+ ac_cs_recheck=false
+ ac_cs_silent=false
 -SHELL=\${CONFIG_SHELL-$SHELL}
 -_ACEOF
-+# Flag that enforces no undefined symbols.
-+no_undefined_flag=$lt_no_undefined_flag
  
--cat >>$CONFIG_STATUS <<\_ACEOF
+-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 -## --------------------- ##
 -## M4sh Initialization.  ##
 -## --------------------- ##
-+# Flag to hardcode \$libdir into a binary during linking.
-+# This must work even if \$libdir does not exist
-+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
++SHELL=\${CONFIG_SHELL-$SHELL}
++export SHELL
++_ASEOF
++cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
++## -------------------- ##
++## M4sh Initialization. ##
++## -------------------- ##
  
--# Be Bourne compatible
+ # Be more Bourne compatible
+ DUALCASE=1; export DUALCASE # for MKS sh
 -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
--  emulate sh
--  NULLCMD=:
--  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
--  # is contrary to our usage.  Disable this feature.
--  alias -g '${1+"$@"}'='"$@"'
--elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
--  set -o posix
--fi
--DUALCASE=1; export DUALCASE # for MKS sh
-+# If ld is used when linking, flag to hardcode \$libdir into a binary
-+# during linking.  This must work even if \$libdir does not exist.
-+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+   emulate sh
+   NULLCMD=:
+   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+@@ -17865,23 +15651,15 @@
+   alias -g '${1+"$@"}'='"$@"'
+   setopt NO_GLOB_SUBST
+ else
+-  case `(set -o) 2>/dev/null` in
+-  *posix*) set -o posix ;;
++  case `(set -o) 2>/dev/null` in #(
++  *posix*) :
++    set -o posix ;; #(
++  *) :
++     ;;
+ esac
+-
+ fi
  
+ 
+-
+-
+-# PATH needs CR
+-# Avoid depending upon Character Ranges.
+-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+-as_cr_digits='0123456789'
+-as_cr_alnum=$as_cr_Letters$as_cr_digits
+-
+ as_nl='
+ '
+ export as_nl
+@@ -17889,7 +15667,13 @@
+ as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+ as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
++# Prefer a ksh shell builtin over an external printf program on Solaris,
++# but without wasting forks for bash or zsh.
++if test -z "$BASH_VERSION$ZSH_VERSION" \
++    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
++  as_echo='print -r --'
++  as_echo_n='print -rn --'
++elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+   as_echo='printf %s\n'
+   as_echo_n='printf %s'
+ else
+@@ -17900,7 +15684,7 @@
+     as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+     as_echo_n_body='eval
+       arg=$1;
+-      case $arg in
++      case $arg in #(
+       *"$as_nl"*)
+ 	expr "X$arg" : "X\\(.*\\)$as_nl";
+ 	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+@@ -17923,13 +15707,6 @@
+   }
+ fi
+ 
 -# Support unset when possible.
 -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
 -  as_unset=unset
 -else
 -  as_unset=false
 -fi
-+# Whether we need a single "-rpath" flag with a separated argument.
-+hardcode_libdir_separator=$lt_hardcode_libdir_separator
+-
  
-+# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
-+# DIR into the resulting binary.
-+hardcode_direct=$hardcode_direct
+ # IFS
+ # We need space, tab and new line, in precisely that order.  Quoting is
+@@ -17939,15 +15716,15 @@
+ IFS=" ""	$as_nl"
  
--# Work around bugs in pre-3.0 UWIN ksh.
--$as_unset ENV MAIL MAILPATH
--PS1='$ '
--PS2='> '
--PS4='+ '
-+# 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.
-+hardcode_direct_absolute=$hardcode_direct_absolute
- 
--# NLS nuisances.
--for as_var in \
--  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
--  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
--  LC_TELEPHONE LC_TIME
--do
--  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
--    eval $as_var=C; export $as_var
--  else
--    $as_unset $as_var
--  fi
+ # Find who we are.  Look in the path if we contain no directory separator.
+-case $0 in
++case $0 in #((
+   *[\\/]* ) as_myself=$0 ;;
+   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
 -done
-+# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
-+# into the resulting binary.
-+hardcode_minus_L=$hardcode_minus_L
++    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
++  done
+ IFS=$as_save_IFS
  
--# Required to use basename.
--if expr a : '\(a\)' >/dev/null 2>&1; then
--  as_expr=expr
--else
--  as_expr=false
--fi
-+# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
-+# into the resulting binary.
-+hardcode_shlibpath_var=$hardcode_shlibpath_var
+      ;;
+@@ -17959,12 +15736,16 @@
+ fi
+ if test ! -f "$as_myself"; then
+   $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+-  { (exit 1); exit 1; }
++  exit 1
+ fi
  
--if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
--  as_basename=basename
--else
--  as_basename=false
--fi
-+# Set to "yes" if building a shared library automatically hardcodes DIR
-+# into the library and all subsequent libraries and executables linked
-+# against it.
-+hardcode_automatic=$hardcode_automatic
+-# Work around bugs in pre-3.0 UWIN ksh.
+-for as_var in ENV MAIL MAILPATH
+-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
++# Unset variables that we do not need and which cause bugs (e.g. in
++# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
++# suppresses any "Segmentation fault" message there.  '((' could
++# trigger a bug in pdksh 5.2.14.
++for as_var in BASH_ENV ENV MAIL MAILPATH
++do eval test x\${$as_var+set} = xset \
++  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+ done
+ PS1='$ '
+ PS2='> '
+@@ -17976,7 +15757,89 @@
+ LANGUAGE=C
+ export LANGUAGE
  
-+# Set to yes if linker adds runtime paths of dependent libraries
-+# to runtime path list.
-+inherit_rpath=$inherit_rpath
+-# Required to use basename.
++# CDPATH.
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
++
++
++# as_fn_error ERROR [LINENO LOG_FD]
++# ---------------------------------
++# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
++# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
++# script with status $?, using 1 if that was 0.
++as_fn_error ()
++{
++  as_status=$?; test $as_status -eq 0 && as_status=1
++  if test "$3"; then
++    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
++  fi
++  $as_echo "$as_me: error: $1" >&2
++  as_fn_exit $as_status
++} # as_fn_error
++
++
++# as_fn_set_status STATUS
++# -----------------------
++# Set $? to STATUS, without forking.
++as_fn_set_status ()
++{
++  return $1
++} # as_fn_set_status
++
++# as_fn_exit STATUS
++# -----------------
++# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
++as_fn_exit ()
++{
++  set +e
++  as_fn_set_status $1
++  exit $1
++} # as_fn_exit
++
++# as_fn_unset VAR
++# ---------------
++# Portably unset VAR.
++as_fn_unset ()
++{
++  { eval $1=; unset $1;}
++}
++as_unset=as_fn_unset
++# as_fn_append VAR VALUE
++# ----------------------
++# Append the text in VALUE to the end of the definition contained in VAR. Take
++# advantage of any shell optimizations that allow amortized linear growth over
++# repeated appends, instead of the typical quadratic growth present in naive
++# implementations.
++if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
++  eval 'as_fn_append ()
++  {
++    eval $1+=\$2
++  }'
++else
++  as_fn_append ()
++  {
++    eval $1=\$$1\$2
++  }
++fi # as_fn_append
++
++# as_fn_arith ARG...
++# ------------------
++# Perform arithmetic evaluation on the ARGs, and store the result in the
++# global $as_val. Take advantage of shells that can avoid forks. The arguments
++# must be portable across $(()) and expr.
++if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
++  eval 'as_fn_arith ()
++  {
++    as_val=$(( $* ))
++  }'
++else
++  as_fn_arith ()
++  {
++    as_val=`expr "$@" || test $? -eq 1`
++  }
++fi # as_fn_arith
++
++
+ if expr a : '\(a\)' >/dev/null 2>&1 &&
+    test "X`expr 00001 : '.*\(...\)'`" = X001; then
+   as_expr=expr
+@@ -17990,8 +15853,12 @@
+   as_basename=false
+ fi
  
++if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
++  as_dirname=dirname
++else
++  as_dirname=false
++fi
+ 
 -# Name of the executable.
--as_me=`$as_basename "$0" ||
--$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
--	 X"$0" : 'X\(//\)$' \| \
--	 X"$0" : 'X\(/\)$' \| \
--	 .     : '\(.\)' 2>/dev/null ||
--echo X/"$0" |
--    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
--  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
--  	  /^X\/\(\/\).*/{ s//\1/; q; }
--  	  s/.*/./; q'`
-+# Whether libtool must link a program against all its dependency libraries.
-+link_all_deplibs=$link_all_deplibs
+ as_me=`$as_basename -- "$0" ||
+ $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+ 	 X"$0" : 'X\(//\)$' \| \
+@@ -18011,76 +15878,25 @@
+ 	  }
+ 	  s/.*/./; q'`
  
-+# Fix the shell variable \$srcfile for the compiler.
-+fix_srcfile_path=$lt_fix_srcfile_path
- 
--# PATH needs CR, and LINENO needs CR and PATH.
--# Avoid depending upon Character Ranges.
--as_cr_letters='abcdefghijklmnopqrstuvwxyz'
--as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
--as_cr_Letters=$as_cr_letters$as_cr_LETTERS
--as_cr_digits='0123456789'
--as_cr_alnum=$as_cr_Letters$as_cr_digits
-+# Set to "yes" if exported symbols are required.
-+always_export_symbols=$always_export_symbols
- 
--# The user is always right.
--if test "${PATH_SEPARATOR+set}" != set; then
--  echo "#! /bin/sh" >conf$$.sh
--  echo  "exit 0"   >>conf$$.sh
--  chmod +x conf$$.sh
--  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
--    PATH_SEPARATOR=';'
--  else
--    PATH_SEPARATOR=:
--  fi
--  rm -f conf$$.sh
--fi
-+# The commands to list exported symbols.
-+export_symbols_cmds=$lt_export_symbols_cmds
- 
-+# Symbols that should not be listed in the preloaded symbols.
-+exclude_expsyms=$lt_exclude_expsyms
- 
+-# CDPATH.
+-$as_unset CDPATH
+-
+-
+-
 -  as_lineno_1=$LINENO
 -  as_lineno_2=$LINENO
--  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
 -  test "x$as_lineno_1" != "x$as_lineno_2" &&
--  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
--  # Find who we are.  Look in the path if we contain no path at all
--  # relative or not.
--  case $0 in
--    *[\\/]* ) as_myself=$0 ;;
--    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
--done
-+# Symbols that must always be exported.
-+include_expsyms=$lt_include_expsyms
- 
--       ;;
--  esac
--  # We did not find ourselves, most probably we were run as `sh COMMAND'
--  # in which case we are not to be found in the path.
--  if test "x$as_myself" = x; then
--    as_myself=$0
--  fi
--  if test ! -f "$as_myself"; then
--    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
--echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
--   { (exit 1); exit 1; }; }
--  fi
--  case $CONFIG_SHELL in
--  '')
--    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  for as_base in sh bash ksh sh5; do
--	 case $as_dir in
--	 /*)
--	   if ("$as_dir/$as_base" -c '
--  as_lineno_1=$LINENO
--  as_lineno_2=$LINENO
--  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
--  test "x$as_lineno_1" != "x$as_lineno_2" &&
--  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
--	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
--	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
--	     CONFIG_SHELL=$as_dir/$as_base
--	     export CONFIG_SHELL
--	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
--	   fi;;
--	 esac
--       done
--done
--;;
--  esac
-+# Commands necessary for linking programs (against libraries) with templates.
-+prelink_cmds=$lt_prelink_cmds
- 
+-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
+-
 -  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
 -  # uniformly replaced by the line number.  The first 'sed' inserts a
--  # line-number line before each line; the second 'sed' does the real
--  # work.  The second script uses 'N' to pair each line-number line
--  # with the numbered line, and appends trailing '-' during
--  # substitution so that $LINENO is not a special case at line end.
+-  # line-number line after each line using $LINENO; the second 'sed'
+-  # does the real work.  The second script uses 'N' to pair each
+-  # line-number line with the line containing $LINENO, and appends
+-  # trailing '-' during substitution so that $LINENO is not a special
+-  # case at line end.
 -  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
--  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
--  sed '=' <$as_myself |
+-  # scripts with optimization help from Paolo Bonzini.  Blame Lee
+-  # E. McMahon (1931-1989) for sed's syntax.  :-)
+-  sed -n '
+-    p
+-    /[$]LINENO/=
+-  ' <$as_myself |
 -    sed '
+-      s/[$]LINENO.*/&-/
+-      t lineno
+-      b
+-      :lineno
 -      N
--      s,$,-,
--      : loop
--      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
+-      :loop
+-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
 -      t loop
--      s,-$,,
--      s,^['$as_cr_digits']*\n,,
+-      s/-\n.*//
 -    ' >$as_me.lineno &&
--  chmod +x $as_me.lineno ||
--    { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
--echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
+-  chmod +x "$as_me.lineno" ||
+-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
 -   { (exit 1); exit 1; }; }
-+# Specify filename containing input files.
-+file_list_spec=$lt_file_list_spec
- 
+-
 -  # Don't try to exec as it changes $[0], causing all sort of problems
 -  # (the dirname of $[0] is not the place where we might find the
--  # original and so on.  Autoconf is especially sensible to this).
--  . ./$as_me.lineno
+-  # original and so on.  Autoconf is especially sensitive to this).
+-  . "./$as_me.lineno"
 -  # Exit status is that of the last command.
 -  exit
 -}
-+# How to hardcode a shared library path into an executable.
-+hardcode_action=$hardcode_action
+-
+-
+-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+-  as_dirname=dirname
+-else
+-  as_dirname=false
+-fi
++# Avoid depending upon Character Ranges.
++as_cr_letters='abcdefghijklmnopqrstuvwxyz'
++as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
++as_cr_Letters=$as_cr_letters$as_cr_LETTERS
++as_cr_digits='0123456789'
++as_cr_alnum=$as_cr_Letters$as_cr_digits
  
-+# The directories searched by this compiler when creating a shared library.
-+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs
- 
--case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
--  *c*,-n*) ECHO_N= ECHO_C='
--' ECHO_T='	' ;;
--  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
--  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
--esac
-+# Dependencies to place before and after the objects being linked to
-+# create a shared library.
-+predep_objects=$lt_predep_objects
-+postdep_objects=$lt_postdep_objects
-+predeps=$lt_predeps
-+postdeps=$lt_postdeps
- 
--if expr a : '\(a\)' >/dev/null 2>&1; then
+ ECHO_C= ECHO_N= ECHO_T=
+-case `echo -n x` in
++case `echo -n x` in #(((((
+ -n*)
+-  case `echo 'x\c'` in
++  case `echo 'xy\c'` in
+   *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+-  *)   ECHO_C='\c';;
++  xy)  ECHO_C='\c';;
++  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
++       ECHO_T='	';;
+   esac;;
+ *)
+   ECHO_N='-n';;
+ esac
+-if expr a : '\(a\)' >/dev/null 2>&1 &&
+-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
 -  as_expr=expr
 -else
 -  as_expr=false
 -fi
-+# The library search path used internally by the compiler when linking
-+# a shared library.
-+compiler_lib_search_path=$lt_compiler_lib_search_path
  
--rm -f conf$$ conf$$.exe conf$$.file
--echo >conf$$.file
--if ln -s conf$$.file conf$$ 2>/dev/null; then
--  # We could just check for DJGPP; but this test a) works b) is more generic
--  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
--  if test -f conf$$.exe; then
--    # Don't use ln at all; we don't have any links
--    as_ln_s='cp -p'
--  else
--    as_ln_s='ln -s'
--  fi
--elif ln conf$$.file conf$$ 2>/dev/null; then
--  as_ln_s=ln
--else
--  as_ln_s='cp -p'
--fi
--rm -f conf$$ conf$$.exe conf$$.file
-+# ### END LIBTOOL CONFIG
+ rm -f conf$$ conf$$.exe conf$$.file
+ if test -d conf$$.dir; then
+@@ -18109,8 +15925,56 @@
+ rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+ rmdir conf$$.dir 2>/dev/null
  
--if mkdir -p . 2>/dev/null; then
--  as_mkdir_p=:
--else
--  test -d ./-p && rmdir ./-p
--  as_mkdir_p=false
-+_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
- 
--as_executable_p="test -f"
- 
--# Sed expression to map a string onto a valid CPP name.
--as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-+ltmain="$ac_aux_dir/ltmain.sh"
- 
--# Sed expression to map a string onto a valid variable name.
--as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
- 
-+  # 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)
- 
--# IFS
--# We need space, tab and new line, in precisely that order.
--as_nl='
--'
--IFS=" 	$as_nl"
-+  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 ()
++# as_fn_mkdir_p
++# -------------
++# Create "$as_dir" as a directory, including parents if necessary.
++as_fn_mkdir_p ()
 +{
-+  case ${1} in
-+    */*) func_dirname_result="${1%/*}${2}" ;;
-+    *  ) func_dirname_result="${3}" ;;
++
++  case $as_dir in #(
++  -*) as_dir=./$as_dir;;
 +  esac
-+}
++  test -d "$as_dir" || eval $as_mkdir_p || {
++    as_dirs=
++    while :; do
++      case $as_dir in #(
++      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
++      *) as_qdir=$as_dir;;
++      esac
++      as_dirs="'$as_qdir' $as_dirs"
++      as_dir=`$as_dirname -- "$as_dir" ||
++$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++	 X"$as_dir" : 'X\(//\)[^/]' \| \
++	 X"$as_dir" : 'X\(//\)$' \| \
++	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
++$as_echo X"$as_dir" |
++    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\/\)[^/].*/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\/\)$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\).*/{
++	    s//\1/
++	    q
++	  }
++	  s/.*/./; q'`
++      test -d "$as_dir" && break
++    done
++    test -z "$as_dirs" || eval "mkdir $as_dirs"
++  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
++
++
++} # as_fn_mkdir_p
+ if mkdir -p . 2>/dev/null; then
+-  as_mkdir_p=:
++  as_mkdir_p='mkdir -p "$as_dir"'
+ else
+   test -d ./-p && rmdir ./-p
+   as_mkdir_p=false
+@@ -18129,10 +15993,10 @@
+       if test -d "$1"; then
+ 	test -d "$1/.";
+       else
+-	case $1 in
++	case $1 in #(
+ 	-*)set "./$1";;
+ 	esac;
+-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
++	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
+ 	???[sx]*):;;*)false;;esac;fi
+     '\'' sh
+   '
+@@ -18147,13 +16011,19 @@
  
--# CDPATH.
--$as_unset CDPATH
-+# func_basename file
-+func_basename ()
-+{
-+  func_basename_result="${1##*/}"
-+}
  
--exec 6>&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##*/}"
-+}
+ exec 6>&1
++## ----------------------------------- ##
++## Main body of $CONFIG_STATUS script. ##
++## ----------------------------------- ##
++_ASEOF
++test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
  
--# Open the log real soon, to keep \$[0] and so on meaningful, and to
--# report actual input values of CONFIG_FILES etc. instead of their
--# values after options handling.  Logging --version etc. is OK.
--exec 5>>config.log
-+# 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 ()
- {
--  echo
--  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
--## Running $as_me. ##
--_ASBOX
--} >&5
--cat >&5 <<_CSEOF
-+  # 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}"}
-+}
+-# Save the log message, to keep $[0] and so on meaningful, and to
++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
++# Save the log message, to keep $0 and so on meaningful, and to
+ # report actual input values of CONFIG_FILES etc. instead of their
+ # values after options handling.
+ ac_log="
+ This file was extended by libkml $as_me 1.1.0, which was
+-generated by GNU Autoconf 2.63.  Invocation command line was
++generated by GNU Autoconf 2.65.  Invocation command line was
  
--This file was extended by libkml $as_me 1.0.1, which was
--generated by GNU Autoconf 2.59.  Invocation command line was
-+# func_opt_split
-+func_opt_split ()
-+{
-+  func_opt_split_opt=${1%%=*}
-+  func_opt_split_arg=${1#*=}
-+}
+   CONFIG_FILES    = $CONFIG_FILES
+   CONFIG_HEADERS  = $CONFIG_HEADERS
+@@ -18185,13 +16055,15 @@
  
--  CONFIG_FILES    = $CONFIG_FILES
--  CONFIG_HEADERS  = $CONFIG_HEADERS
--  CONFIG_LINKS    = $CONFIG_LINKS
--  CONFIG_COMMANDS = $CONFIG_COMMANDS
--  $ $0 $@
-+# func_lo2o object
-+func_lo2o ()
-+{
-+  case ${1} in
-+    *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
-+    *)    func_lo2o_result=${1} ;;
-+  esac
-+}
- 
--_CSEOF
--echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
--echo >&5
--_ACEOF
-+# func_xform libobj-or-source
-+func_xform ()
-+{
-+  func_xform_result=${1%.*}.lo
-+}
- 
--# Files that config.status was made for.
--if test -n "$ac_config_files"; then
--  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
--fi
-+# func_arith arithmetic-term...
-+func_arith ()
-+{
-+  func_arith_result=$(( $* ))
-+}
- 
--if test -n "$ac_config_headers"; then
--  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
--fi
-+# func_len string
-+# STRING may not start with a hyphen.
-+func_len ()
-+{
-+  func_len_result=${#1}
-+}
- 
--if test -n "$ac_config_links"; then
--  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
--fi
-+_LT_EOF
-+    ;;
-+  *) # Bourne compatible functions.
-+    cat << \_LT_EOF >> "$cfgfile"
- 
--if test -n "$ac_config_commands"; then
--  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
--fi
-+# 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
-+}
- 
--cat >>$CONFIG_STATUS <<\_ACEOF
-+# func_basename file
-+func_basename ()
-+{
-+  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
-+}
- 
--ac_cs_usage="\
+ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+ ac_cs_usage="\
 -\`$as_me' instantiates files from templates according to the
 -current configuration.
++\`$as_me' instantiates files and other configuration actions
++from templates according to the current configuration.  Unless the files
++and actions are specified as TAGs, all are instantiated by default.
  
--Usage: $0 [OPTIONS] [FILE]...
-+# 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
-+}
+-Usage: $0 [OPTION]... [FILE]...
++Usage: $0 [OPTION]... [TAG]...
  
--  -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
--      --recheck    update $as_me by reconfiguring in the same conditions
--  --file=FILE[:TEMPLATE]
--		   instantiate the configuration file FILE
--  --header=FILE[:TEMPLATE]
--		   instantiate the configuration header FILE
-+# sed scripts:
-+my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
-+my_sed_long_arg='1s/^-[^=]*=//'
+   -h, --help       print this help, then exit
+   -V, --version    print version number and configuration settings, then exit
++      --config     print configuration, then exit
+   -q, --quiet, --silent
+                    do not print progress messages
+   -d, --debug      don't remove temporary files
+@@ -18210,16 +16082,17 @@
+ Configuration commands:
+ $config_commands
  
--Configuration files:
--$config_files
-+# 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"`
-+}
- 
--Configuration headers:
--$config_headers
-+# func_lo2o object
-+func_lo2o ()
-+{
-+  func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
-+}
- 
--Configuration commands:
--$config_commands
-+# func_xform libobj-or-source
-+func_xform ()
-+{
-+  func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[^.]*$/.lo/'`
-+}
- 
 -Report bugs to <bug-autoconf at gnu.org>."
--_ACEOF
-+# func_arith arithmetic-term...
-+func_arith ()
-+{
-+  func_arith_result=`expr "$@"`
-+}
++Report bugs to <http://code.google.com/p/libkml/issues>."
  
--cat >>$CONFIG_STATUS <<_ACEOF
--ac_cs_version="\\
--libkml config.status 1.0.1
--configured by $0, generated by GNU Autoconf 2.59,
--  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
-+# func_len string
-+# STRING may not start with a hyphen.
-+func_len ()
-+{
-+  func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
-+}
+ _ACEOF
+ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
++ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
+ ac_cs_version="\\
+ libkml config.status 1.1.0
+-configured by $0, generated by GNU Autoconf 2.63,
+-  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
++configured by $0, generated by GNU Autoconf 2.65,
++  with options \\"\$ac_cs_config\\"
  
--Copyright (C) 2003 Free Software Foundation, Inc.
--This config.status script is free software; the Free Software Foundation
--gives unlimited permission to copy, distribute and modify it."
--srcdir=$srcdir
--INSTALL="$INSTALL"
--_ACEOF
-+_LT_EOF
-+esac
+-Copyright (C) 2008 Free Software Foundation, Inc.
++Copyright (C) 2009 Free Software Foundation, Inc.
+ This config.status script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it."
  
--cat >>$CONFIG_STATUS <<\_ACEOF
--# If no file are specified by the user, then we need to provide default
--# value.  By we need to know if files were specified by the user.
--ac_need_defaults=:
--while test $# != 0
--do
--  case $1 in
--  --*=*)
--    ac_option=`expr "x$1" : 'x\([^=]*\)='`
--    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
--    ac_shift=:
-+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
-     ;;
--  -*)
--    ac_option=$1
--    ac_optarg=$2
--    ac_shift=shift
-+  *)
-+    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
-     ;;
--  *) # This is not an option, so the user has probably given explicit
--     # arguments.
--     ac_option=$1
--     ac_need_defaults=false;;
-   esac
- 
--  case $ac_option in
--  # Handling of the options.
--_ACEOF
--cat >>$CONFIG_STATUS <<\_ACEOF
--  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
--    ac_cs_recheck=: ;;
--  --version | --vers* | -V )
--    echo "$ac_cs_version"; exit 0 ;;
--  --he | --h)
--    # Conflict between --help and --header
--    { { echo "$as_me:$LINENO: error: ambiguous option: $1
--Try \`$0 --help' for more information." >&5
--echo "$as_me: error: ambiguous option: $1
--Try \`$0 --help' for more information." >&2;}
+@@ -18255,6 +16128,8 @@
+     ac_cs_recheck=: ;;
+   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+     $as_echo "$ac_cs_version"; exit ;;
++  --config | --confi | --conf | --con | --co | --c )
++    $as_echo "$ac_cs_config"; exit ;;
+   --debug | --debu | --deb | --de | --d | -d )
+     debug=: ;;
+   --file | --fil | --fi | --f )
+@@ -18262,20 +16137,19 @@
+     case $ac_optarg in
+     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+     esac
+-    CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
++    as_fn_append CONFIG_FILES " '$ac_optarg'"
+     ac_need_defaults=false;;
+   --header | --heade | --head | --hea )
+     $ac_shift
+     case $ac_optarg in
+     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+     esac
+-    CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"
++    as_fn_append CONFIG_HEADERS " '$ac_optarg'"
+     ac_need_defaults=false;;
+   --he | --h)
+     # Conflict between --help and --header
+-    { $as_echo "$as_me: error: ambiguous option: $1
+-Try \`$0 --help' for more information." >&2
 -   { (exit 1); exit 1; }; };;
--  --help | --hel | -h )
--    echo "$ac_cs_usage"; exit 0 ;;
--  --debug | --d* | -d )
--    debug=: ;;
--  --file | --fil | --fi | --f )
--    $ac_shift
--    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
--    ac_need_defaults=false;;
--  --header | --heade | --head | --hea )
--    $ac_shift
--    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
--    ac_need_defaults=false;;
--  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
--  | -silent | --silent | --silen | --sile | --sil | --si | --s)
--    ac_cs_silent=: ;;
--
--  # This is an error.
--  -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
--Try \`$0 --help' for more information." >&5
--echo "$as_me: error: unrecognized option: $1
--Try \`$0 --help' for more information." >&2;}
++    as_fn_error "ambiguous option: \`$1'
++Try \`$0 --help' for more information.";;
+   --help | --hel | -h )
+     $as_echo "$ac_cs_usage"; exit ;;
+   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+@@ -18283,11 +16157,10 @@
+     ac_cs_silent=: ;;
+ 
+   # This is an error.
+-  -*) { $as_echo "$as_me: error: unrecognized option: $1
+-Try \`$0 --help' for more information." >&2
 -   { (exit 1); exit 1; }; } ;;
++  -*) as_fn_error "unrecognized option: \`$1'
++Try \`$0 --help' for more information." ;;
  
--  *) ac_config_targets="$ac_config_targets $1" ;;
-+  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
-+    || (rm -f "$cfgfile"; exit 1)
+-  *) ac_config_targets="$ac_config_targets $1"
++  *) as_fn_append ac_config_targets " $1"
+      ac_need_defaults=false ;;
  
--  esac
--  shift
--done
-+  mv -f "$cfgfile" "$ofile" ||
-+    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-+  chmod +x "$ofile"
+   esac
+@@ -18746,9 +16619,7 @@
+     "xcode/Makefile") CONFIG_FILES="$CONFIG_FILES xcode/Makefile" ;;
+     "xcode/LibKML/Makefile") CONFIG_FILES="$CONFIG_FILES xcode/LibKML/Makefile" ;;
  
--ac_configure_extra_args=
- 
--if $ac_cs_silent; then
--  exec 6>/dev/null
--  ac_configure_extra_args="$ac_configure_extra_args --silent"
--fi
-+    cat <<_LT_EOF >> "$ofile"
- 
--_ACEOF
--cat >>$CONFIG_STATUS <<_ACEOF
--if \$ac_cs_recheck; then
--  echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
--  exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
--fi
-+# ### BEGIN LIBTOOL TAG CONFIG: CXX
- 
--_ACEOF
-+# The linker used to build libraries.
-+LD=$lt_LD_CXX
- 
--cat >>$CONFIG_STATUS <<_ACEOF
--#
--# INIT-COMMANDS section.
--#
-+# Commands used to build an old-style archive.
-+old_archive_cmds=$lt_old_archive_cmds_CXX
- 
--AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
-+# A language specific compiler.
-+CC=$lt_compiler_CXX
- 
--_ACEOF
-+# Is the compiler the GNU compiler?
-+with_gcc=$GCC_CXX
- 
-+# Compiler flag to turn off builtin functions.
-+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
- 
-+# How to pass a linker flag through the compiler.
-+wl=$lt_lt_prog_compiler_wl_CXX
- 
--cat >>$CONFIG_STATUS <<\_ACEOF
--for ac_config_target in $ac_config_targets
--do
--  case "$ac_config_target" in
--  # Handling of arguments.
--  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
--  "examples/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;;
--  "examples/domviewer/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/domviewer/Makefile" ;;
--  "examples/engine/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/engine/Makefile" ;;
--  "examples/gpx/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/gpx/Makefile" ;;
--  "examples/gx/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/gx/Makefile" ;;
--  "examples/hellonet/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/hellonet/Makefile" ;;
--  "examples/helloworld/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/helloworld/Makefile" ;;
--  "examples/java/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/java/Makefile" ;;
--  "examples/kml/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/kml/Makefile" ;;
--  "examples/python/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/python/Makefile" ;;
--  "examples/regionator/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/regionator/Makefile" ;;
--  "examples/wxregionator/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/wxregionator/Makefile" ;;
--  "examples/wxviewer/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/wxviewer/Makefile" ;;
--  "examples/xsd/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/xsd/Makefile" ;;
--  "msvc/Makefile" ) CONFIG_FILES="$CONFIG_FILES msvc/Makefile" ;;
--  "msvc/examples/Makefile" ) CONFIG_FILES="$CONFIG_FILES msvc/examples/Makefile" ;;
--  "msvc/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES msvc/tests/Makefile" ;;
--  "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
--  "src/kml/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/kml/Makefile" ;;
--  "src/kml/convenience/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/kml/convenience/Makefile" ;;
--  "src/kml/dom/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/kml/dom/Makefile" ;;
--  "src/kml/engine/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/kml/engine/Makefile" ;;
--  "src/kml/regionator/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/kml/regionator/Makefile" ;;
--  "src/kml/base/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/kml/base/Makefile" ;;
--  "src/kml/xsd/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/kml/xsd/Makefile" ;;
--  "src/swig/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/swig/Makefile" ;;
--  "src/swig/java/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/swig/java/Makefile" ;;
--  "src/swig/python/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/swig/python/Makefile" ;;
--  "testdata/Makefile" ) CONFIG_FILES="$CONFIG_FILES testdata/Makefile" ;;
--  "testdata/atom/Makefile" ) CONFIG_FILES="$CONFIG_FILES testdata/atom/Makefile" ;;
--  "testdata/balloon/Makefile" ) CONFIG_FILES="$CONFIG_FILES testdata/balloon/Makefile" ;;
--  "testdata/csv/Makefile" ) CONFIG_FILES="$CONFIG_FILES testdata/csv/Makefile" ;;
--  "testdata/deprecated/Makefile" ) CONFIG_FILES="$CONFIG_FILES testdata/deprecated/Makefile" ;;
--  "testdata/gpx/Makefile" ) CONFIG_FILES="$CONFIG_FILES testdata/gpx/Makefile" ;;
--  "testdata/gx/Makefile" ) CONFIG_FILES="$CONFIG_FILES testdata/gx/Makefile" ;;
--  "testdata/kml/Makefile" ) CONFIG_FILES="$CONFIG_FILES testdata/kml/Makefile" ;;
--  "testdata/kmz/Makefile" ) CONFIG_FILES="$CONFIG_FILES testdata/kmz/Makefile" ;;
--  "testdata/kmz/files/Makefile" ) CONFIG_FILES="$CONFIG_FILES testdata/kmz/files/Makefile" ;;
--  "testdata/kmz/kmzfiles/Makefile" ) CONFIG_FILES="$CONFIG_FILES testdata/kmz/kmzfiles/Makefile" ;;
--  "testdata/kmz/rumsey/Makefile" ) CONFIG_FILES="$CONFIG_FILES testdata/kmz/rumsey/Makefile" ;;
--  "testdata/kmz/rumsey/kml/Makefile" ) CONFIG_FILES="$CONFIG_FILES testdata/kmz/rumsey/kml/Makefile" ;;
--  "testdata/kmz/rumsey/imagery/Makefile" ) CONFIG_FILES="$CONFIG_FILES testdata/kmz/rumsey/imagery/Makefile" ;;
--  "testdata/links/Makefile" ) CONFIG_FILES="$CONFIG_FILES testdata/links/Makefile" ;;
--  "testdata/style/Makefile" ) CONFIG_FILES="$CONFIG_FILES testdata/style/Makefile" ;;
--  "testdata/style/weather/Makefile" ) CONFIG_FILES="$CONFIG_FILES testdata/style/weather/Makefile" ;;
--  "testdata/update/Makefile" ) CONFIG_FILES="$CONFIG_FILES testdata/update/Makefile" ;;
--  "testdata/xal/Makefile" ) CONFIG_FILES="$CONFIG_FILES testdata/xal/Makefile" ;;
--  "testdata/xsd/Makefile" ) CONFIG_FILES="$CONFIG_FILES testdata/xsd/Makefile" ;;
--  "third_party/Makefile" ) CONFIG_FILES="$CONFIG_FILES third_party/Makefile" ;;
--  "xcode/Makefile" ) CONFIG_FILES="$CONFIG_FILES xcode/Makefile" ;;
--  "xcode/LibKML/Makefile" ) CONFIG_FILES="$CONFIG_FILES xcode/LibKML/Makefile" ;;
--  "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
--  "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
--  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
--echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+-  *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+-$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
 -   { (exit 1); exit 1; }; };;
--  esac
--done
-+# Additional compiler flags for building library objects.
-+pic_flag=$lt_lt_prog_compiler_pic_CXX
++  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+   esac
+ done
  
--# If the user did not use the arguments to specify the items to instantiate,
--# then the envvar interface is used.  Set only those that are not.
--# We use the long form for the default assignment because of an extremely
--# bizarre bug on SunOS 4.1.3.
--if $ac_need_defaults; then
--  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
--  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
--  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
--fi
-+# Compiler flag to prevent dynamic linking.
-+link_static_flag=$lt_lt_prog_compiler_static_CXX
- 
--# Have a temporary directory for convenience.  Make it in the build tree
--# simply because there is no reason to put it here, and in addition,
--# creating and moving files from /tmp can sometimes cause problems.
--# Create a temporary directory, and hook for its removal unless debugging.
--$debug ||
--{
--  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
+@@ -18775,7 +16646,7 @@
+   trap 'exit_status=$?
+   { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
+ ' 0
 -  trap '{ (exit 1); exit 1; }' 1 2 13 15
--}
-+# Does compiler simultaneously support -c and -o options?
-+compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
++  trap 'as_fn_exit 1' 1 2 13 15
+ }
+ # Create a (secure) tmp directory for tmp files.
  
--# Create a (secure) tmp directory for tmp files.
-+# Whether or not to add -lc for building shared libraries.
-+build_libtool_need_lc=$archive_cmds_need_lc_CXX
- 
--{
--  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
--  test -n "$tmp" && test -d "$tmp"
--}  ||
--{
--  tmp=./confstat$$-$RANDOM
--  (umask 077 && mkdir $tmp)
+@@ -18786,11 +16657,7 @@
+ {
+   tmp=./conf$$-$RANDOM
+   (umask 077 && mkdir "$tmp")
 -} ||
 -{
--   echo "$me: cannot create a temporary directory in ." >&2
+-   $as_echo "$as_me: cannot create a temporary directory in ." >&2
 -   { (exit 1); exit 1; }
 -}
-+# Whether or not to disallow shared libs when runtime libs are static.
-+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
++} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
  
--_ACEOF
-+# Compiler flag to allow reflexive dlopens.
-+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
+ # Set up the scripts for CONFIG_FILES section.
+ # No need to generate them if there are no CONFIG_FILES.
+@@ -18798,10 +16665,16 @@
+ if test -n "$CONFIG_FILES"; then
  
--cat >>$CONFIG_STATUS <<_ACEOF
-+# Compiler flag to generate shared objects directly from archives.
-+whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
  
--#
--# CONFIG_FILES section.
--#
-+# Whether the compiler copes with passing no objects directly.
-+compiler_needs_object=$lt_compiler_needs_object_CXX
+-ac_cr='
+'
++ac_cr=`echo X | tr X '\015'`
++# On cygwin, bash can eat \r inside `` if the user requested igncr.
++# But we know of no other shell where ac_cr would be empty at this
++# point, so we can use a bashism as a fallback.
++if test "x$ac_cr" = x; then
++  eval ac_cr=\$\'\\r\'
++fi
+ ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+ if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+-  ac_cs_awk_cr='\\r'
++  ac_cs_awk_cr='\r'
+ else
+   ac_cs_awk_cr=$ac_cr
+ fi
+@@ -18815,24 +16688,18 @@
+   echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+   echo "_ACEOF"
+ } >conf$$subs.sh ||
+-  { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+-   { (exit 1); exit 1; }; }
++  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+ ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
+ ac_delim='%!_!# '
+ for ac_last_try in false false false false false :; do
+   . ./conf$$subs.sh ||
+-    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+-   { (exit 1); exit 1; }; }
++    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
  
--# No need to generate the scripts if there are no CONFIG_FILES.
--# This happens for instance when ./config.status config.h
--if test -n "\$CONFIG_FILES"; then
--  # Protect against being on the right side of a sed subst in config.status.
--  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
--   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
--s, at SHELL@,$SHELL,;t t
--s, at PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
--s, at PACKAGE_NAME@,$PACKAGE_NAME,;t t
--s, at PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
--s, at PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
--s, at PACKAGE_STRING@,$PACKAGE_STRING,;t t
--s, at PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
--s, at exec_prefix@,$exec_prefix,;t t
--s, at prefix@,$prefix,;t t
--s, at program_transform_name@,$program_transform_name,;t t
--s, at bindir@,$bindir,;t t
--s, at sbindir@,$sbindir,;t t
--s, at libexecdir@,$libexecdir,;t t
--s, at datadir@,$datadir,;t t
--s, at sysconfdir@,$sysconfdir,;t t
--s, at sharedstatedir@,$sharedstatedir,;t t
--s, at localstatedir@,$localstatedir,;t t
--s, at libdir@,$libdir,;t t
--s, at includedir@,$includedir,;t t
--s, at oldincludedir@,$oldincludedir,;t t
--s, at infodir@,$infodir,;t t
--s, at mandir@,$mandir,;t t
--s, at build_alias@,$build_alias,;t t
--s, at host_alias@,$host_alias,;t t
--s, at target_alias@,$target_alias,;t t
--s, at DEFS@,$DEFS,;t t
--s, at ECHO_C@,$ECHO_C,;t t
--s, at ECHO_N@,$ECHO_N,;t t
--s, at ECHO_T@,$ECHO_T,;t t
--s, at LIBS@,$LIBS,;t t
--s, at INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
--s, at INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
--s, at INSTALL_DATA@,$INSTALL_DATA,;t t
--s, at CYGPATH_W@,$CYGPATH_W,;t t
--s, at PACKAGE@,$PACKAGE,;t t
--s, at VERSION@,$VERSION,;t t
--s, at ACLOCAL@,$ACLOCAL,;t t
--s, at AUTOCONF@,$AUTOCONF,;t t
--s, at AUTOMAKE@,$AUTOMAKE,;t t
--s, at AUTOHEADER@,$AUTOHEADER,;t t
--s, at MAKEINFO@,$MAKEINFO,;t t
--s, at install_sh@,$install_sh,;t t
--s, at STRIP@,$STRIP,;t t
--s, at ac_ct_STRIP@,$ac_ct_STRIP,;t t
--s, at INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
--s, at mkdir_p@,$mkdir_p,;t t
--s, at AWK@,$AWK,;t t
--s, at SET_MAKE@,$SET_MAKE,;t t
--s, at am__leading_dot@,$am__leading_dot,;t t
--s, at AMTAR@,$AMTAR,;t t
--s, at am__tar@,$am__tar,;t t
--s, at am__untar@,$am__untar,;t t
--s, at CC@,$CC,;t t
--s, at CFLAGS@,$CFLAGS,;t t
--s, at LDFLAGS@,$LDFLAGS,;t t
--s, at CPPFLAGS@,$CPPFLAGS,;t t
--s, at ac_ct_CC@,$ac_ct_CC,;t t
--s, at EXEEXT@,$EXEEXT,;t t
--s, at OBJEXT@,$OBJEXT,;t t
--s, at DEPDIR@,$DEPDIR,;t t
--s, at am__include@,$am__include,;t t
--s, at am__quote@,$am__quote,;t t
--s, at AMDEP_TRUE@,$AMDEP_TRUE,;t t
--s, at AMDEP_FALSE@,$AMDEP_FALSE,;t t
--s, at AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
--s, at CCDEPMODE@,$CCDEPMODE,;t t
--s, at am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
--s, at am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
--s, at CPP@,$CPP,;t t
--s, at CXX@,$CXX,;t t
--s, at CXXFLAGS@,$CXXFLAGS,;t t
--s, at ac_ct_CXX@,$ac_ct_CXX,;t t
--s, at CXXDEPMODE@,$CXXDEPMODE,;t t
--s, at am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t
--s, at am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t
--s, at build@,$build,;t t
--s, at build_cpu@,$build_cpu,;t t
--s, at build_vendor@,$build_vendor,;t t
--s, at build_os@,$build_os,;t t
--s, at host@,$host,;t t
--s, at host_cpu@,$host_cpu,;t t
--s, at host_vendor@,$host_vendor,;t t
--s, at host_os@,$host_os,;t t
--s, at SED@,$SED,;t t
--s, at EGREP@,$EGREP,;t t
--s, at LN_S@,$LN_S,;t t
--s, at ECHO@,$ECHO,;t t
--s, at AR@,$AR,;t t
--s, at ac_ct_AR@,$ac_ct_AR,;t t
--s, at RANLIB@,$RANLIB,;t t
--s, at ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
--s, at CXXCPP@,$CXXCPP,;t t
--s, at F77@,$F77,;t t
--s, at FFLAGS@,$FFLAGS,;t t
--s, at ac_ct_F77@,$ac_ct_F77,;t t
--s, at LIBTOOL@,$LIBTOOL,;t t
--s, at LIBOBJS@,$LIBOBJS,;t t
--s, at POW_LIB@,$POW_LIB,;t t
--s, at GCC_TRUE@,$GCC_TRUE,;t t
--s, at GCC_FALSE@,$GCC_FALSE,;t t
--s, at PLATFORM@,$PLATFORM,;t t
--s, at SHLIBSUFFIX@,$SHLIBSUFFIX,;t t
--s, at JAVA_INCLUDE_DIR@,$JAVA_INCLUDE_DIR,;t t
--s, at JAVA_LIB_DIR@,$JAVA_LIB_DIR,;t t
--s, at PYTHON_INCLUDE_DIR@,$PYTHON_INCLUDE_DIR,;t t
--s, at PYTHON_LIB_DIR@,$PYTHON_LIB_DIR,;t t
--s, at SWIG@,$SWIG,;t t
--s, at WITH_SWIG_TRUE@,$WITH_SWIG_TRUE,;t t
--s, at WITH_SWIG_FALSE@,$WITH_SWIG_FALSE,;t t
--s, at JAVA@,$JAVA,;t t
--s, at JAVAC@,$JAVAC,;t t
--s, at JAR@,$JAR,;t t
--s, at WITH_JAVA_TRUE@,$WITH_JAVA_TRUE,;t t
--s, at WITH_JAVA_FALSE@,$WITH_JAVA_FALSE,;t t
--s, at PYTHON@,$PYTHON,;t t
--s, at PYTHON_SITE_PACKAGES_DIR@,$PYTHON_SITE_PACKAGES_DIR,;t t
--s, at WITH_PYTHON_TRUE@,$WITH_PYTHON_TRUE,;t t
--s, at WITH_PYTHON_FALSE@,$WITH_PYTHON_FALSE,;t t
--s, at CURL_CONFIG@,$CURL_CONFIG,;t t
--s, at CURL_CFLAGS@,$CURL_CFLAGS,;t t
--s, at CURL_LIBS@,$CURL_LIBS,;t t
--s, at HAVE_CURL_TRUE@,$HAVE_CURL_TRUE,;t t
--s, at HAVE_CURL_FALSE@,$HAVE_CURL_FALSE,;t t
--s, at LTLIBOBJS@,$LTLIBOBJS,;t t
--CEOF
--
--_ACEOF
--
--  cat >>$CONFIG_STATUS <<\_ACEOF
--  # Split the substitutions into bite-sized pieces for seds with
--  # small command number limits, like on Digital OSF/1 and HP-UX.
--  ac_max_sed_lines=48
--  ac_sed_frag=1 # Number of current file.
--  ac_beg=1 # First line for current file.
--  ac_end=$ac_max_sed_lines # Line after last line for current file.
--  ac_more_lines=:
--  ac_sed_cmds=
--  while $ac_more_lines; do
--    if test $ac_beg -gt 1; then
--      sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
--    else
--      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
--    fi
--    if test ! -s $tmp/subs.frag; then
--      ac_more_lines=false
--    else
--      # The purpose of the label and of the branching condition is to
--      # speed up the sed processing (if there are no `@' at all, there
--      # is no need to browse any of the substitutions).
--      # These are the two extra sed commands mentioned above.
--      (echo ':t
--  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
--      if test -z "$ac_sed_cmds"; then
--	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
--      else
--	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
--      fi
--      ac_sed_frag=`expr $ac_sed_frag + 1`
--      ac_beg=$ac_end
--      ac_end=`expr $ac_end + $ac_max_sed_lines`
--    fi
--  done
--  if test -z "$ac_sed_cmds"; then
--    ac_sed_cmds=cat
--  fi
--fi # test -n "$CONFIG_FILES"
-+# Create an old-style archive from a shared archive.
-+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
- 
--_ACEOF
--cat >>$CONFIG_STATUS <<\_ACEOF
--for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
--  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
--  case $ac_file in
--  - | *:- | *:-:* ) # input from stdin
--	cat >$tmp/stdin
--	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
--	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
--  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
--	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
--  * )   ac_file_in=$ac_file.in ;;
--  esac
-+# Create a temporary old-style archive to link instead of a shared archive.
-+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
- 
--  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
--  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
--$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
--	 X"$ac_file" : 'X\(//\)[^/]' \| \
--	 X"$ac_file" : 'X\(//\)$' \| \
--	 X"$ac_file" : 'X\(/\)' \| \
--	 .     : '\(.\)' 2>/dev/null ||
--echo X"$ac_file" |
--    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
--  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
--  	  /^X\(\/\/\)$/{ s//\1/; q; }
--  	  /^X\(\/\).*/{ s//\1/; q; }
--  	  s/.*/./; q'`
--  { if $as_mkdir_p; then
--    mkdir -p "$ac_dir"
--  else
--    as_dir="$ac_dir"
--    as_dirs=
--    while test ! -d "$as_dir"; do
--      as_dirs="$as_dir $as_dirs"
--      as_dir=`(dirname "$as_dir") 2>/dev/null ||
--$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
--	 X"$as_dir" : 'X\(//\)[^/]' \| \
--	 X"$as_dir" : 'X\(//\)$' \| \
--	 X"$as_dir" : 'X\(/\)' \| \
--	 .     : '\(.\)' 2>/dev/null ||
--echo X"$as_dir" |
--    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
--  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
--  	  /^X\(\/\/\)$/{ s//\1/; q; }
--  	  /^X\(\/\).*/{ s//\1/; q; }
--  	  s/.*/./; q'`
--    done
--    test ! -n "$as_dirs" || mkdir $as_dirs
--  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
--echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
--   { (exit 1); exit 1; }; }; }
-+# Commands used to build a shared archive.
-+archive_cmds=$lt_archive_cmds_CXX
-+archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
- 
--  ac_builddir=.
-+# Commands used to build a loadable module if different from building
-+# a shared archive.
-+module_cmds=$lt_module_cmds_CXX
-+module_expsym_cmds=$lt_module_expsym_cmds_CXX
- 
--if test "$ac_dir" != .; then
--  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
--  # A "../" for each directory in $ac_dir_suffix.
--  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
--else
--  ac_dir_suffix= ac_top_builddir=
--fi
-+# Whether we are building with GNU ld or not.
-+with_gnu_ld=$lt_with_gnu_ld_CXX
- 
--case $srcdir in
--  .)  # No --srcdir option.  We are building in place.
--    ac_srcdir=.
--    if test -z "$ac_top_builddir"; then
--       ac_top_srcdir=.
--    else
--       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
--    fi ;;
--  [\\/]* | ?:[\\/]* )  # Absolute path.
--    ac_srcdir=$srcdir$ac_dir_suffix;
--    ac_top_srcdir=$srcdir ;;
--  *) # Relative path.
--    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
--    ac_top_srcdir=$ac_top_builddir$srcdir ;;
--esac
-+# Flag that allows shared libraries with undefined symbols to be built.
-+allow_undefined_flag=$lt_allow_undefined_flag_CXX
- 
--# Do not use `cd foo && pwd` to compute absolute paths, because
--# the directories may not exist.
--case `pwd` in
--.) ac_abs_builddir="$ac_dir";;
--*)
--  case "$ac_dir" in
--  .) ac_abs_builddir=`pwd`;;
--  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
--  *) ac_abs_builddir=`pwd`/"$ac_dir";;
--  esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_top_builddir=${ac_top_builddir}.;;
--*)
--  case ${ac_top_builddir}. in
--  .) ac_abs_top_builddir=$ac_abs_builddir;;
--  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
--  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
--  esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_srcdir=$ac_srcdir;;
--*)
--  case $ac_srcdir in
--  .) ac_abs_srcdir=$ac_abs_builddir;;
--  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
--  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
--  esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_top_srcdir=$ac_top_srcdir;;
--*)
--  case $ac_top_srcdir in
--  .) ac_abs_top_srcdir=$ac_abs_builddir;;
--  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
--  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
--  esac;;
--esac
-+# Flag that enforces no undefined symbols.
-+no_undefined_flag=$lt_no_undefined_flag_CXX
- 
-+# Flag to hardcode \$libdir into a binary during linking.
-+# This must work even if \$libdir does not exist
-+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
- 
--  case $INSTALL in
--  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
--  *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
--  esac
-+# If ld is used when linking, flag to hardcode \$libdir into a binary
-+# during linking.  This must work even if \$libdir does not exist.
-+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX
- 
--  if test x"$ac_file" != x-; then
--    { echo "$as_me:$LINENO: creating $ac_file" >&5
--echo "$as_me: creating $ac_file" >&6;}
--    rm -f "$ac_file"
--  fi
--  # Let's still pretend it is `configure' which instantiates (i.e., don't
--  # use $as_me), people would be surprised to read:
--  #    /* config.h.  Generated by config.status.  */
--  if test x"$ac_file" = x-; then
--    configure_input=
--  else
--    configure_input="$ac_file.  "
--  fi
--  configure_input=$configure_input"Generated from `echo $ac_file_in |
--				     sed 's,.*/,,'` by configure."
-+# Whether we need a single "-rpath" flag with a separated argument.
-+hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
- 
--  # First look for the input files in the build tree, otherwise in the
--  # src tree.
--  ac_file_inputs=`IFS=:
--    for f in $ac_file_in; do
--      case $f in
--      -) echo $tmp/stdin ;;
--      [\\/$]*)
--	 # Absolute (can't be DOS-style, as IFS=:)
--	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
--echo "$as_me: error: cannot find input file: $f" >&2;}
+   ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+   if test $ac_delim_n = $ac_delim_num; then
+     break
+   elif $ac_last_try; then
+-    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
 -   { (exit 1); exit 1; }; }
--	 echo "$f";;
--      *) # Relative
--	 if test -f "$f"; then
--	   # Build tree
--	   echo "$f"
--	 elif test -f "$srcdir/$f"; then
--	   # Source tree
--	   echo "$srcdir/$f"
--	 else
--	   # /dev/null tree
--	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
--echo "$as_me: error: cannot find input file: $f" >&2;}
++    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+   else
+     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+   fi
+@@ -18854,7 +16721,7 @@
+ t delim
+ :nl
+ h
+-s/\(.\{148\}\).*/\1/
++s/\(.\{148\}\)..*/\1/
+ t more1
+ s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+ p
+@@ -18868,7 +16735,7 @@
+ t nl
+ :delim
+ h
+-s/\(.\{148\}\).*/\1/
++s/\(.\{148\}\)..*/\1/
+ t more2
+ s/["\\]/\\&/g; s/^/"/; s/$/"/
+ p
+@@ -18921,9 +16788,7 @@
+ else
+   cat
+ fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+-  || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
+-$as_echo "$as_me: error: could not setup config files machinery" >&2;}
 -   { (exit 1); exit 1; }; }
--	 fi;;
--      esac
--    done` || { (exit 1); exit 1; }
--_ACEOF
--cat >>$CONFIG_STATUS <<_ACEOF
--  sed "$ac_vpsub
--$extrasub
--_ACEOF
--cat >>$CONFIG_STATUS <<\_ACEOF
--:t
--/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
--s, at configure_input@,$configure_input,;t t
--s, at srcdir@,$ac_srcdir,;t t
--s, at abs_srcdir@,$ac_abs_srcdir,;t t
--s, at top_srcdir@,$ac_top_srcdir,;t t
--s, at abs_top_srcdir@,$ac_abs_top_srcdir,;t t
--s, at builddir@,$ac_builddir,;t t
--s, at abs_builddir@,$ac_abs_builddir,;t t
--s, at top_builddir@,$ac_top_builddir,;t t
--s, at abs_top_builddir@,$ac_abs_top_builddir,;t t
--s, at INSTALL@,$ac_INSTALL,;t t
--" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
--  rm -f $tmp/stdin
--  if test x"$ac_file" != x-; then
--    mv $tmp/out $ac_file
--  else
--    cat $tmp/out
--    rm -f $tmp/out
--  fi
-+# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
-+# DIR into the resulting binary.
-+hardcode_direct=$hardcode_direct_CXX
++  || as_fn_error "could not setup config files machinery" "$LINENO" 5
+ _ACEOF
  
--done
--_ACEOF
--cat >>$CONFIG_STATUS <<\_ACEOF
-+# 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.
-+hardcode_direct_absolute=$hardcode_direct_absolute_CXX
- 
--#
--# CONFIG_HEADER section.
--#
-+# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
-+# into the resulting binary.
-+hardcode_minus_L=$hardcode_minus_L_CXX
- 
--# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
--# NAME is the cpp macro being defined and VALUE is the value it is being given.
--#
--# ac_d sets the value in "#define NAME VALUE" lines.
--ac_dA='s,^\([	 ]*\)#\([	 ]*define[	 ][	 ]*\)'
--ac_dB='[	 ].*$,\1#\2'
--ac_dC=' '
--ac_dD=',;t'
--# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
--ac_uA='s,^\([	 ]*\)#\([	 ]*\)undef\([	 ][	 ]*\)'
--ac_uB='$,\1#\2define\3'
--ac_uC=' '
--ac_uD=',;t'
-+# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
-+# into the resulting binary.
-+hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX
- 
--for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
--  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
--  case $ac_file in
--  - | *:- | *:-:* ) # input from stdin
--	cat >$tmp/stdin
--	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
--	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
--  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
--	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
--  * )   ac_file_in=$ac_file.in ;;
--  esac
-+# Set to "yes" if building a shared library automatically hardcodes DIR
-+# into the library and all subsequent libraries and executables linked
-+# against it.
-+hardcode_automatic=$hardcode_automatic_CXX
- 
--  test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5
--echo "$as_me: creating $ac_file" >&6;}
-+# Set to yes if linker adds runtime paths of dependent libraries
-+# to runtime path list.
-+inherit_rpath=$inherit_rpath_CXX
- 
--  # First look for the input files in the build tree, otherwise in the
--  # src tree.
--  ac_file_inputs=`IFS=:
--    for f in $ac_file_in; do
--      case $f in
--      -) echo $tmp/stdin ;;
--      [\\/$]*)
--	 # Absolute (can't be DOS-style, as IFS=:)
--	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
--echo "$as_me: error: cannot find input file: $f" >&2;}
+ # VPATH may cause trouble with some makes, so we remove $(srcdir),
+@@ -18964,9 +16829,7 @@
+   if test -z "$ac_t"; then
+     break
+   elif $ac_last_try; then
+-    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5
+-$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}
 -   { (exit 1); exit 1; }; }
--	 # Do quote $f, to prevent DOS paths from being IFS'd.
--	 echo "$f";;
--      *) # Relative
--	 if test -f "$f"; then
--	   # Build tree
--	   echo "$f"
--	 elif test -f "$srcdir/$f"; then
--	   # Source tree
--	   echo "$srcdir/$f"
--	 else
--	   # /dev/null tree
--	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
--echo "$as_me: error: cannot find input file: $f" >&2;}
++    as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
+   else
+     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+   fi
+@@ -19051,9 +16914,7 @@
+ _ACAWK
+ _ACEOF
+ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+-  { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5
+-$as_echo "$as_me: error: could not setup config headers machinery" >&2;}
 -   { (exit 1); exit 1; }; }
--	 fi;;
--      esac
--    done` || { (exit 1); exit 1; }
--  # Remove the trailing spaces.
--  sed 's/[	 ]*$//' $ac_file_inputs >$tmp/in
-+# Whether libtool must link a program against all its dependency libraries.
-+link_all_deplibs=$link_all_deplibs_CXX
++  as_fn_error "could not setup config headers machinery" "$LINENO" 5
+ fi # test -n "$CONFIG_HEADERS"
  
--_ACEOF
-+# Fix the shell variable \$srcfile for the compiler.
-+fix_srcfile_path=$lt_fix_srcfile_path_CXX
  
--# Transform confdefs.h into two sed scripts, `conftest.defines' and
--# `conftest.undefs', that substitutes the proper values into
--# config.h.in to produce config.h.  The first handles `#define'
--# templates, and the second `#undef' templates.
--# And first: Protect against being on the right side of a sed subst in
--# config.status.  Protect against being in an unquoted here document
--# in config.status.
--rm -f conftest.defines conftest.undefs
--# Using a here document instead of a string reduces the quoting nightmare.
--# Putting comments in sed scripts is not portable.
--#
--# `end' is used to avoid that the second main sed command (meant for
--# 0-ary CPP macros) applies to n-ary macro definitions.
--# See the Autoconf documentation for `clear'.
--cat >confdef2sed.sed <<\_ACEOF
--s/[\\&,]/\\&/g
--s,[\\$`],\\&,g
--t clear
--: clear
--s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*\)\(([^)]*)\)[	 ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
--t end
--s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
--: end
--_ACEOF
--# If some macros were called several times there might be several times
--# the same #defines, which is useless.  Nevertheless, we may not want to
--# sort them, since we want the *last* AC-DEFINE to be honored.
--uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines
--sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs
--rm -f confdef2sed.sed
--
--# This sed command replaces #undef with comments.  This is necessary, for
--# example, in the case of _POSIX_SOURCE, which is predefined and required
--# on some systems where configure will not decide to define it.
--cat >>conftest.undefs <<\_ACEOF
--s,^[	 ]*#[	 ]*undef[	 ][	 ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
--_ACEOF
--
--# Break up conftest.defines because some shells have a limit on the size
--# of here documents, and old seds have small limits too (100 cmds).
--echo '  # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
--echo '  if grep "^[	 ]*#[	 ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
--echo '  # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
--echo '  :' >>$CONFIG_STATUS
--rm -f conftest.tail
--while grep . conftest.defines >/dev/null
--do
--  # Write a limited-size here document to $tmp/defines.sed.
--  echo '  cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
--  # Speed up: don't consider the non `#define' lines.
--  echo '/^[	 ]*#[	 ]*define/!b' >>$CONFIG_STATUS
--  # Work around the forget-to-reset-the-flag bug.
--  echo 't clr' >>$CONFIG_STATUS
--  echo ': clr' >>$CONFIG_STATUS
--  sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS
--  echo 'CEOF
--  sed -f $tmp/defines.sed $tmp/in >$tmp/out
--  rm -f $tmp/in
--  mv $tmp/out $tmp/in
--' >>$CONFIG_STATUS
--  sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail
--  rm -f conftest.defines
--  mv conftest.tail conftest.defines
--done
--rm -f conftest.defines
--echo '  fi # grep' >>$CONFIG_STATUS
--echo >>$CONFIG_STATUS
--
--# Break up conftest.undefs because some shells have a limit on the size
--# of here documents, and old seds have small limits too (100 cmds).
--echo '  # Handle all the #undef templates' >>$CONFIG_STATUS
--rm -f conftest.tail
--while grep . conftest.undefs >/dev/null
--do
--  # Write a limited-size here document to $tmp/undefs.sed.
--  echo '  cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
--  # Speed up: don't consider the non `#undef'
--  echo '/^[	 ]*#[	 ]*undef/!b' >>$CONFIG_STATUS
--  # Work around the forget-to-reset-the-flag bug.
--  echo 't clr' >>$CONFIG_STATUS
--  echo ': clr' >>$CONFIG_STATUS
--  sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS
--  echo 'CEOF
--  sed -f $tmp/undefs.sed $tmp/in >$tmp/out
--  rm -f $tmp/in
--  mv $tmp/out $tmp/in
--' >>$CONFIG_STATUS
--  sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail
--  rm -f conftest.undefs
--  mv conftest.tail conftest.undefs
--done
--rm -f conftest.undefs
--
--cat >>$CONFIG_STATUS <<\_ACEOF
--  # Let's still pretend it is `configure' which instantiates (i.e., don't
--  # use $as_me), people would be surprised to read:
--  #    /* config.h.  Generated by config.status.  */
--  if test x"$ac_file" = x-; then
--    echo "/* Generated by configure.  */" >$tmp/config.h
--  else
--    echo "/* $ac_file.  Generated by configure.  */" >$tmp/config.h
--  fi
--  cat $tmp/in >>$tmp/config.h
--  rm -f $tmp/in
--  if test x"$ac_file" != x-; then
--    if diff $ac_file $tmp/config.h >/dev/null 2>&1; then
--      { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
--echo "$as_me: $ac_file is unchanged" >&6;}
--    else
--      ac_dir=`(dirname "$ac_file") 2>/dev/null ||
--$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
--	 X"$ac_file" : 'X\(//\)[^/]' \| \
--	 X"$ac_file" : 'X\(//\)$' \| \
--	 X"$ac_file" : 'X\(/\)' \| \
--	 .     : '\(.\)' 2>/dev/null ||
--echo X"$ac_file" |
--    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
--  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
--  	  /^X\(\/\/\)$/{ s//\1/; q; }
--  	  /^X\(\/\).*/{ s//\1/; q; }
--  	  s/.*/./; q'`
--      { if $as_mkdir_p; then
--    mkdir -p "$ac_dir"
--  else
--    as_dir="$ac_dir"
--    as_dirs=
--    while test ! -d "$as_dir"; do
--      as_dirs="$as_dir $as_dirs"
--      as_dir=`(dirname "$as_dir") 2>/dev/null ||
--$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
--	 X"$as_dir" : 'X\(//\)[^/]' \| \
--	 X"$as_dir" : 'X\(//\)$' \| \
--	 X"$as_dir" : 'X\(/\)' \| \
--	 .     : '\(.\)' 2>/dev/null ||
--echo X"$as_dir" |
--    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
--  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
--  	  /^X\(\/\/\)$/{ s//\1/; q; }
--  	  /^X\(\/\).*/{ s//\1/; q; }
--  	  s/.*/./; q'`
--    done
--    test ! -n "$as_dirs" || mkdir $as_dirs
--  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
--echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
--   { (exit 1); exit 1; }; }; }
-+# Set to "yes" if exported symbols are required.
-+always_export_symbols=$always_export_symbols_CXX
+@@ -19066,9 +16927,7 @@
+   esac
+   case $ac_mode$ac_tag in
+   :[FHL]*:*);;
+-  :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
+-$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
+-   { (exit 1); exit 1; }; };;
++  :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
+   :[FH]-) ac_tag=-:-;;
+   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
+   esac
+@@ -19096,12 +16955,10 @@
+ 	   [\\/$]*) false;;
+ 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
+ 	   esac ||
+-	   { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
+-$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
+-   { (exit 1); exit 1; }; };;
++	   as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+       esac
+       case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+-      ac_file_inputs="$ac_file_inputs '$ac_f'"
++      as_fn_append ac_file_inputs " '$ac_f'"
+     done
  
--      rm -f $ac_file
--      mv $tmp/config.h $ac_file
--    fi
--  else
--    cat $tmp/config.h
--    rm -f $tmp/config.h
--  fi
--# Compute $ac_file's index in $config_headers.
--_am_stamp_count=1
--for _am_header in $config_headers :; do
--  case $_am_header in
--    $ac_file | $ac_file:* )
--      break ;;
--    * )
--      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
--  esac
--done
--echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null ||
--$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
--	 X$ac_file : 'X\(//\)[^/]' \| \
--	 X$ac_file : 'X\(//\)$' \| \
--	 X$ac_file : 'X\(/\)' \| \
--	 .     : '\(.\)' 2>/dev/null ||
--echo X$ac_file |
--    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
--  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
--  	  /^X\(\/\/\)$/{ s//\1/; q; }
--  	  /^X\(\/\).*/{ s//\1/; q; }
--  	  s/.*/./; q'`/stamp-h$_am_stamp_count
--done
--_ACEOF
--cat >>$CONFIG_STATUS <<\_ACEOF
-+# The commands to list exported symbols.
-+export_symbols_cmds=$lt_export_symbols_cmds_CXX
+     # Let's still pretend it is `configure' which instantiates (i.e., don't
+@@ -19112,7 +16969,7 @@
+ 	`' by configure.'
+     if test x"$ac_file" != x-; then
+       configure_input="$ac_file.  $configure_input"
+-      { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
++      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+ $as_echo "$as_me: creating $ac_file" >&6;}
+     fi
+     # Neutralize special characters interpreted by sed in replacement strings.
+@@ -19125,9 +16982,7 @@
  
--#
--# CONFIG_COMMANDS section.
--#
--for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
--  ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
--  ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
--  ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
--$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
--	 X"$ac_dest" : 'X\(//\)[^/]' \| \
--	 X"$ac_dest" : 'X\(//\)$' \| \
--	 X"$ac_dest" : 'X\(/\)' \| \
--	 .     : '\(.\)' 2>/dev/null ||
--echo X"$ac_dest" |
--    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
--  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
--  	  /^X\(\/\/\)$/{ s//\1/; q; }
--  	  /^X\(\/\).*/{ s//\1/; q; }
--  	  s/.*/./; q'`
--  { if $as_mkdir_p; then
--    mkdir -p "$ac_dir"
--  else
--    as_dir="$ac_dir"
+     case $ac_tag in
+     *:-:* | *:-) cat >"$tmp/stdin" \
+-      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+-$as_echo "$as_me: error: could not create $ac_file" >&2;}
+-   { (exit 1); exit 1; }; } ;;
++      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
+     esac
+     ;;
+   esac
+@@ -19155,47 +17010,7 @@
+ 	    q
+ 	  }
+ 	  s/.*/./; q'`
+-  { as_dir="$ac_dir"
+-  case $as_dir in #(
+-  -*) as_dir=./$as_dir;;
+-  esac
+-  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
 -    as_dirs=
--    while test ! -d "$as_dir"; do
--      as_dirs="$as_dir $as_dirs"
--      as_dir=`(dirname "$as_dir") 2>/dev/null ||
+-    while :; do
+-      case $as_dir in #(
+-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+-      *) as_qdir=$as_dir;;
+-      esac
+-      as_dirs="'$as_qdir' $as_dirs"
+-      as_dir=`$as_dirname -- "$as_dir" ||
 -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 -	 X"$as_dir" : 'X\(//\)[^/]' \| \
 -	 X"$as_dir" : 'X\(//\)$' \| \
--	 X"$as_dir" : 'X\(/\)' \| \
--	 .     : '\(.\)' 2>/dev/null ||
--echo X"$as_dir" |
--    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
--  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
--  	  /^X\(\/\/\)$/{ s//\1/; q; }
--  	  /^X\(\/\).*/{ s//\1/; q; }
--  	  s/.*/./; q'`
+-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+-$as_echo X"$as_dir" |
+-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+-	    s//\1/
+-	    q
+-	  }
+-	  /^X\(\/\/\)[^/].*/{
+-	    s//\1/
+-	    q
+-	  }
+-	  /^X\(\/\/\)$/{
+-	    s//\1/
+-	    q
+-	  }
+-	  /^X\(\/\).*/{
+-	    s//\1/
+-	    q
+-	  }
+-	  s/.*/./; q'`
+-      test -d "$as_dir" && break
 -    done
--    test ! -n "$as_dirs" || mkdir $as_dirs
--  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
--echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
+-    test -z "$as_dirs" || eval "mkdir $as_dirs"
+-  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
 -   { (exit 1); exit 1; }; }; }
-+# Symbols that should not be listed in the preloaded symbols.
-+exclude_expsyms=$lt_exclude_expsyms_CXX
++  as_dir="$ac_dir"; as_fn_mkdir_p
+   ac_builddir=.
  
--  ac_builddir=.
-+# Symbols that must always be exported.
-+include_expsyms=$lt_include_expsyms_CXX
+ case "$ac_dir" in
+@@ -19252,7 +17067,6 @@
+ # If the template does not know about datarootdir, expand it.
+ # FIXME: This hack should be removed a few years after 2.60.
+ ac_datarootdir_hack=; ac_datarootdir_seen=
+-
+ ac_sed_dataroot='
+ /datarootdir/ {
+   p
+@@ -19262,12 +17076,11 @@
+ /@docdir@/p
+ /@infodir@/p
+ /@localedir@/p
+-/@mandir@/p
+-'
++/@mandir@/p'
+ case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
+ *datarootdir*) ac_datarootdir_seen=yes;;
+ *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
+-  { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+ $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+ _ACEOF
+ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+@@ -19277,7 +17090,7 @@
+   s&@infodir@&$infodir&g
+   s&@localedir@&$localedir&g
+   s&@mandir@&$mandir&g
+-    s&\\\${datarootdir}&$datarootdir&g' ;;
++  s&\\\${datarootdir}&$datarootdir&g' ;;
+ esac
+ _ACEOF
  
--if test "$ac_dir" != .; then
--  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
--  # A "../" for each directory in $ac_dir_suffix.
--  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
--else
--  ac_dir_suffix= ac_top_builddir=
--fi
-+# Commands necessary for linking programs (against libraries) with templates.
-+prelink_cmds=$lt_prelink_cmds_CXX
+@@ -19306,14 +17119,12 @@
+ $ac_datarootdir_hack
+ "
+ eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
+-  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+-$as_echo "$as_me: error: could not create $ac_file" >&2;}
+-   { (exit 1); exit 1; }; }
++  || as_fn_error "could not create $ac_file" "$LINENO" 5
  
--case $srcdir in
--  .)  # No --srcdir option.  We are building in place.
--    ac_srcdir=.
--    if test -z "$ac_top_builddir"; then
--       ac_top_srcdir=.
--    else
--       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
--    fi ;;
--  [\\/]* | ?:[\\/]* )  # Absolute path.
--    ac_srcdir=$srcdir$ac_dir_suffix;
--    ac_top_srcdir=$srcdir ;;
--  *) # Relative path.
--    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
--    ac_top_srcdir=$ac_top_builddir$srcdir ;;
--esac
-+# Specify filename containing input files.
-+file_list_spec=$lt_file_list_spec_CXX
+ test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
+   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
+-  { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
++  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+ which seems to be undefined.  Please make sure it is defined." >&5
+ $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+ which seems to be undefined.  Please make sure it is defined." >&2;}
+@@ -19323,9 +17134,7 @@
+   -) cat "$tmp/out" && rm -f "$tmp/out";;
+   *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+   esac \
+-  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+-$as_echo "$as_me: error: could not create $ac_file" >&2;}
+-   { (exit 1); exit 1; }; }
++  || as_fn_error "could not create $ac_file" "$LINENO" 5
+  ;;
+   :H)
+   #
+@@ -19336,25 +17145,19 @@
+       $as_echo "/* $configure_input  */" \
+       && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
+     } >"$tmp/config.h" \
+-      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+-$as_echo "$as_me: error: could not create $ac_file" >&2;}
+-   { (exit 1); exit 1; }; }
++      || as_fn_error "could not create $ac_file" "$LINENO" 5
+     if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
+-      { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5
++      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
+ $as_echo "$as_me: $ac_file is unchanged" >&6;}
+     else
+       rm -f "$ac_file"
+       mv "$tmp/config.h" "$ac_file" \
+-	|| { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+-$as_echo "$as_me: error: could not create $ac_file" >&2;}
+-   { (exit 1); exit 1; }; }
++	|| as_fn_error "could not create $ac_file" "$LINENO" 5
+     fi
+   else
+     $as_echo "/* $configure_input  */" \
+       && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
+-      || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
+-$as_echo "$as_me: error: could not create -" >&2;}
+-   { (exit 1); exit 1; }; }
++      || as_fn_error "could not create -" "$LINENO" 5
+   fi
+ # Compute "$ac_file"'s index in $config_headers.
+ _am_arg="$ac_file"
+@@ -19392,7 +17195,7 @@
+ 	  s/.*/./; q'`/stamp-h$_am_stamp_count
+  ;;
  
--# Do not use `cd foo && pwd` to compute absolute paths, because
--# the directories may not exist.
--case `pwd` in
--.) ac_abs_builddir="$ac_dir";;
--*)
--  case "$ac_dir" in
--  .) ac_abs_builddir=`pwd`;;
--  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
--  *) ac_abs_builddir=`pwd`/"$ac_dir";;
--  esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_top_builddir=${ac_top_builddir}.;;
--*)
--  case ${ac_top_builddir}. in
--  .) ac_abs_top_builddir=$ac_abs_builddir;;
--  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
--  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
--  esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_srcdir=$ac_srcdir;;
--*)
--  case $ac_srcdir in
--  .) ac_abs_srcdir=$ac_abs_builddir;;
--  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
--  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
--  esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_top_srcdir=$ac_top_srcdir;;
--*)
--  case $ac_top_srcdir in
--  .) ac_abs_top_srcdir=$ac_abs_builddir;;
--  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
--  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
--  esac;;
--esac
-+# How to hardcode a shared library path into an executable.
-+hardcode_action=$hardcode_action_CXX
- 
-+# The directories searched by this compiler when creating a shared library.
-+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX
- 
--  { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
--echo "$as_me: executing $ac_dest commands" >&6;}
--  case $ac_dest in
--    depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
--  # Strip MF so we end up with the name of the file.
--  mf=`echo "$mf" | sed -e 's/:.*$//'`
--  # Check whether this is an Automake generated Makefile or not.
--  # We used to match only the files named `Makefile.in', but
--  # some people rename them; so instead we look at the file content.
--  # Grep'ing the first line is not enough: some people post-process
--  # each Makefile.in and add a new line on top of each file to say so.
--  # So let's grep whole file.
--  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
--    dirpart=`(dirname "$mf") 2>/dev/null ||
--$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
--	 X"$mf" : 'X\(//\)[^/]' \| \
--	 X"$mf" : 'X\(//\)$' \| \
--	 X"$mf" : 'X\(/\)' \| \
--	 .     : '\(.\)' 2>/dev/null ||
--echo X"$mf" |
--    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
--  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
--  	  /^X\(\/\/\)$/{ s//\1/; q; }
--  	  /^X\(\/\).*/{ s//\1/; q; }
--  	  s/.*/./; q'`
--  else
--    continue
--  fi
--  # Extract the definition of DEPDIR, am__include, and am__quote
--  # from the Makefile without running `make'.
--  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
--  test -z "$DEPDIR" && continue
--  am__include=`sed -n 's/^am__include = //p' < "$mf"`
--  test -z "am__include" && continue
--  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
--  # When using ansi2knr, U may be empty or an underscore; expand it
--  U=`sed -n 's/^U = //p' < "$mf"`
--  # Find all dependency output files, they are included files with
--  # $(DEPDIR) in their names.  We invoke sed twice because it is the
--  # simplest approach to changing $(DEPDIR) to its actual value in the
--  # expansion.
--  for file in `sed -n "
--    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
--       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
--    # Make sure the directory exists.
--    test -f "$dirpart/$file" && continue
--    fdir=`(dirname "$file") 2>/dev/null ||
--$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
--	 X"$file" : 'X\(//\)[^/]' \| \
--	 X"$file" : 'X\(//\)$' \| \
--	 X"$file" : 'X\(/\)' \| \
--	 .     : '\(.\)' 2>/dev/null ||
--echo X"$file" |
--    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
--  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
--  	  /^X\(\/\/\)$/{ s//\1/; q; }
--  	  /^X\(\/\).*/{ s//\1/; q; }
--  	  s/.*/./; q'`
--    { if $as_mkdir_p; then
--    mkdir -p $dirpart/$fdir
--  else
--    as_dir=$dirpart/$fdir
+-  :C)  { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
++  :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
+ $as_echo "$as_me: executing $ac_file commands" >&6;}
+  ;;
+   esac
+@@ -19487,47 +17290,7 @@
+ 	    q
+ 	  }
+ 	  s/.*/./; q'`
+-      { as_dir=$dirpart/$fdir
+-  case $as_dir in #(
+-  -*) as_dir=./$as_dir;;
+-  esac
+-  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
 -    as_dirs=
--    while test ! -d "$as_dir"; do
--      as_dirs="$as_dir $as_dirs"
--      as_dir=`(dirname "$as_dir") 2>/dev/null ||
+-    while :; do
+-      case $as_dir in #(
+-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+-      *) as_qdir=$as_dir;;
+-      esac
+-      as_dirs="'$as_qdir' $as_dirs"
+-      as_dir=`$as_dirname -- "$as_dir" ||
 -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 -	 X"$as_dir" : 'X\(//\)[^/]' \| \
 -	 X"$as_dir" : 'X\(//\)$' \| \
--	 X"$as_dir" : 'X\(/\)' \| \
--	 .     : '\(.\)' 2>/dev/null ||
--echo X"$as_dir" |
--    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
--  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
--  	  /^X\(\/\/\)$/{ s//\1/; q; }
--  	  /^X\(\/\).*/{ s//\1/; q; }
--  	  s/.*/./; q'`
+-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+-$as_echo X"$as_dir" |
+-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+-	    s//\1/
+-	    q
+-	  }
+-	  /^X\(\/\/\)[^/].*/{
+-	    s//\1/
+-	    q
+-	  }
+-	  /^X\(\/\/\)$/{
+-	    s//\1/
+-	    q
+-	  }
+-	  /^X\(\/\).*/{
+-	    s//\1/
+-	    q
+-	  }
+-	  s/.*/./; q'`
+-      test -d "$as_dir" && break
 -    done
--    test ! -n "$as_dirs" || mkdir $as_dirs
--  fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5
--echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;}
+-    test -z "$as_dirs" || eval "mkdir $as_dirs"
+-  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
 -   { (exit 1); exit 1; }; }; }
-+# Dependencies to place before and after the objects being linked to
-+# create a shared library.
-+predep_objects=$lt_predep_objects_CXX
-+postdep_objects=$lt_postdep_objects_CXX
-+predeps=$lt_predeps_CXX
-+postdeps=$lt_postdeps_CXX
-+
-+# The library search path used internally by the compiler when linking
-+# a shared library.
-+compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
-+
-+# ### END LIBTOOL TAG CONFIG: CXX
-+_LT_EOF
++      as_dir=$dirpart/$fdir; as_fn_mkdir_p
+       # echo "creating $dirpart/$file"
+       echo '# dummy' > "$dirpart/$file"
+     done
+@@ -20341,15 +18104,12 @@
+ done # for ac_tag
  
--    # echo "creating $dirpart/$file"
--    echo '# dummy' > "$dirpart/$file"
--  done
--done
-  ;;
-+
-   esac
--done
--_ACEOF
-+done # for ac_tag
  
--cat >>$CONFIG_STATUS <<\_ACEOF
- 
 -{ (exit 0); exit 0; }
 +as_fn_exit 0
  _ACEOF
 -chmod +x $CONFIG_STATUS
  ac_clean_files=$ac_clean_files_save
  
-+test $ac_write_fail = 0 ||
+ test $ac_write_fail = 0 ||
+-  { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
+-$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
+-   { (exit 1); exit 1; }; }
 +  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
-+
  
+ 
  # configure is writing to config.log, and then calls config.status.
- # config.status does its own redirection, appending to config.log.
-@@ -22465,7 +18129,11 @@
+@@ -20370,10 +18130,10 @@
    exec 5>>config.log
    # Use ||, not &&, to avoid exiting from the if with $? = 1, which
    # would make configure fail if this is the last instruction.
 -  $ac_cs_success || { (exit 1); exit 1; }
 +  $ac_cs_success || as_fn_exit $?
-+fi
-+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+ fi
+ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+-  { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+ $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
  fi
  
- 
-Index: libkml-1.0.1/examples/domviewer/Makefile.in
+Index: libkml-1.1.0/examples/domviewer/Makefile.in
 ===================================================================
---- libkml-1.0.1.orig/examples/domviewer/Makefile.in	2009-07-03 01:23:28.000000000 +0200
-+++ libkml-1.0.1/examples/domviewer/Makefile.in	2009-12-10 10:19:44.000000000 +0100
+--- libkml-1.1.0.orig/examples/domviewer/Makefile.in	2009-12-10 13:05:40.000000000 +0100
++++ libkml-1.1.0/examples/domviewer/Makefile.in	2009-12-10 17:29:34.000000000 +0100
 @@ -1,8 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
+-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
-@@ -13,15 +14,12 @@
- # PARTICULAR PURPOSE.
- 
+@@ -15,8 +16,9 @@
  @SET_MAKE@
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
  VPATH = @srcdir@
  pkgdatadir = $(datadir)/@PACKAGE@
 -pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../..
 +pkglibdir = $(libdir)/@PACKAGE@
 +pkglibexecdir = $(libexecdir)/@PACKAGE@
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -39,18 +37,19 @@
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_curl.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)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
+@@ -43,6 +45,7 @@
  mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
@@ -58569,58 +13740,7 @@
  SOURCES =
  DIST_SOURCES =
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -72,18 +71,16 @@
- CYGPATH_W = @CYGPATH_W@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
--ECHO = @ECHO@
-+DSYMUTIL = @DSYMUTIL@
-+DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
--F77 = @F77@
--FFLAGS = @FFLAGS@
--GCC_FALSE = @GCC_FALSE@
--GCC_TRUE = @GCC_TRUE@
--HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
--HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
-+FGREP = @FGREP@
-+GREP = @GREP@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -93,19 +90,28 @@
- JAVAC = @JAVAC@
- JAVA_INCLUDE_DIR = @JAVA_INCLUDE_DIR@
- JAVA_LIB_DIR = @JAVA_LIB_DIR@
-+LD = @LD@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
-+LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
-+NM = @NM@
-+NMEDIT = @NMEDIT@
-+OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
-+OTOOL = @OTOOL@
-+OTOOL64 = @OTOOL64@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -108,6 +111,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -58628,84 +13748,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PLATFORM = @PLATFORM@
-@@ -122,22 +128,13 @@
- STRIP = @STRIP@
- SWIG = @SWIG@
- VERSION = @VERSION@
--WITH_JAVA_FALSE = @WITH_JAVA_FALSE@
--WITH_JAVA_TRUE = @WITH_JAVA_TRUE@
--WITH_PYTHON_FALSE = @WITH_PYTHON_FALSE@
--WITH_PYTHON_TRUE = @WITH_PYTHON_TRUE@
--WITH_SWIG_FALSE = @WITH_SWIG_FALSE@
--WITH_SWIG_TRUE = @WITH_SWIG_TRUE@
--ac_ct_AR = @ac_ct_AR@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
--ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -149,28 +146,41 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- EXTRA_DIST = \
- 	domviewer.py
- 
-@@ -181,14 +191,14 @@
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
--	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
--		&& exit 0; \
-+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-+	        && { if test -f $@; then exit 0; else break; fi; }; \
+@@ -192,9 +196,9 @@
  	      exit 1;; \
  	  esac; \
  	done; \
@@ -58718,7 +13761,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -206,16 +216,13 @@
+@@ -212,6 +216,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -58726,49 +13769,10 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
- 
- clean-libtool:
- 	-rm -rf .libs _libs
--
--distclean-libtool:
--	-rm -f libtool
--uninstall-info-am:
- tags: TAGS
- TAGS:
- 
-@@ -224,29 +231,32 @@
- 
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
--	list='$(DISTFILES)'; for file in $$list; do \
--	  case $$file in \
--	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
--	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
--	  esac; \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
+@@ -241,13 +246,17 @@
  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
--	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
--	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
--	    dir="/$$dir"; \
--	    $(mkdir_p) "$(distdir)$$dir"; \
--	  else \
--	    dir=''; \
--	  fi; \
  	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 +	    if test -d "$(distdir)/$$file"; then \
 +	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 +	    fi; \
@@ -58787,7 +13791,7 @@
  	    || exit 1; \
  	  fi; \
  	done
-@@ -274,6 +284,7 @@
+@@ -275,6 +284,7 @@
  
  distclean-generic:
  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -58795,17 +13799,8 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -284,7 +295,7 @@
+@@ -293,6 +303,8 @@
  
- distclean: distclean-am
- 	-rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool
-+distclean-am: clean-am distclean-generic
- 
- dvi: dvi-am
- 
-@@ -292,18 +303,38 @@
- 
  html: html-am
  
 +html-am:
@@ -58813,17 +13808,16 @@
  info: info-am
  
  info-am:
+@@ -301,18 +313,28 @@
  
- install-data-am:
+ install-dvi: install-dvi-am
  
-+install-dvi: install-dvi-am
-+
 +install-dvi-am:
 +
  install-exec-am:
  
-+install-html: install-html-am
-+
+ install-html: install-html-am
+ 
 +install-html-am:
 +
  install-info: install-info-am
@@ -58832,88 +13826,53 @@
 +
  install-man:
  
-+install-pdf: install-pdf-am
-+
+ install-pdf: install-pdf-am
+ 
 +install-pdf-am:
 +
-+install-ps: install-ps-am
-+
+ install-ps: install-ps-am
+ 
 +install-ps-am:
 +
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
-@@ -322,17 +353,21 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-info-am
-+uninstall-am:
-+
-+.MAKE: install-am install-strip
- 
- .PHONY: all all-am check check-am clean clean-generic clean-libtool \
- 	distclean distclean-generic distclean-libtool distdir dvi \
- 	dvi-am html html-am info info-am install install-am \
--	install-data install-data-am install-exec install-exec-am \
--	install-info install-info-am install-man install-strip \
-+	install-data install-data-am install-dvi install-dvi-am \
-+	install-exec install-exec-am install-html install-html-am \
-+	install-info install-info-am install-man install-pdf \
-+	install-pdf-am install-ps install-ps-am install-strip \
- 	installcheck installcheck-am installdirs maintainer-clean \
+@@ -346,6 +368,7 @@
  	maintainer-clean-generic mostlyclean mostlyclean-generic \
--	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
--	uninstall-info-am
-+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
-+
+ 	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
  
++
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-Index: libkml-1.0.1/examples/engine/Makefile.in
+ .NOEXPORT:
+Index: libkml-1.1.0/examples/engine/Makefile.in
 ===================================================================
---- libkml-1.0.1.orig/examples/engine/Makefile.in	2009-07-03 01:23:29.000000000 +0200
-+++ libkml-1.0.1/examples/engine/Makefile.in	2009-12-10 10:19:44.000000000 +0100
+--- libkml-1.1.0.orig/examples/engine/Makefile.in	2009-12-10 13:05:40.000000000 +0100
++++ libkml-1.1.0/examples/engine/Makefile.in	2009-12-10 17:29:34.000000000 +0100
 @@ -1,8 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
+-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
-@@ -14,15 +15,12 @@
+@@ -16,8 +17,9 @@
  
- @SET_MAKE@
- 
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
  VPATH = @srcdir@
  pkgdatadir = $(datadir)/@PACKAGE@
 -pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../..
 +pkglibdir = $(libdir)/@PACKAGE@
 +pkglibexecdir = $(libexecdir)/@PACKAGE@
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -45,12 +43,15 @@
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_curl.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)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
+@@ -49,6 +51,7 @@
  mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
@@ -58921,87 +13880,15 @@
  PROGRAMS = $(noinst_PROGRAMS)
  am_balloonwalker_OBJECTS = balloonwalker.$(OBJEXT)
  balloonwalker_OBJECTS = $(am_balloonwalker_OBJECTS)
-@@ -136,17 +137,19 @@
- 	$(top_builddir)/src/kml/engine/libkmlengine.la \
- 	$(top_builddir)/src/kml/dom/libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la
--DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+@@ -137,6 +140,7 @@
+ DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
  depcomp = $(SHELL) $(top_srcdir)/config/depcomp
  am__depfiles_maybe = depfiles
 +am__mv = mv -f
  CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
  	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
--	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
--	$(AM_CXXFLAGS) $(CXXFLAGS)
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- CXXLD = $(CXX)
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- SOURCES = $(balloonwalker_SOURCES) $(change_SOURCES) $(clone_SOURCES) \
- 	$(csv2kml_SOURCES) $(import_SOURCES) $(inlinestyles_SOURCES) \
- 	$(kml2kmz_SOURCES) $(kmlfile_SOURCES) $(kmzchecklinks_SOURCES) \
-@@ -162,8 +165,6 @@
- CTAGS = ctags
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -185,18 +186,16 @@
- CYGPATH_W = @CYGPATH_W@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
--ECHO = @ECHO@
-+DSYMUTIL = @DSYMUTIL@
-+DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
--F77 = @F77@
--FFLAGS = @FFLAGS@
--GCC_FALSE = @GCC_FALSE@
--GCC_TRUE = @GCC_TRUE@
--HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
--HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
-+FGREP = @FGREP@
-+GREP = @GREP@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -206,19 +205,28 @@
- JAVAC = @JAVAC@
- JAVA_INCLUDE_DIR = @JAVA_INCLUDE_DIR@
- JAVA_LIB_DIR = @JAVA_LIB_DIR@
-+LD = @LD@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
-+LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
-+NM = @NM@
-+NMEDIT = @NMEDIT@
-+OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
-+OTOOL = @OTOOL@
-+OTOOL64 = @OTOOL64@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+@@ -222,6 +226,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -59009,84 +13896,16 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PLATFORM = @PLATFORM@
-@@ -235,22 +243,13 @@
- STRIP = @STRIP@
- SWIG = @SWIG@
- VERSION = @VERSION@
--WITH_JAVA_FALSE = @WITH_JAVA_FALSE@
--WITH_JAVA_TRUE = @WITH_JAVA_TRUE@
--WITH_PYTHON_FALSE = @WITH_PYTHON_FALSE@
--WITH_PYTHON_TRUE = @WITH_PYTHON_TRUE@
--WITH_SWIG_FALSE = @WITH_SWIG_FALSE@
--WITH_SWIG_TRUE = @WITH_SWIG_TRUE@
--ac_ct_AR = @ac_ct_AR@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
--ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -262,28 +261,41 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
+@@ -294,7 +299,7 @@
  AM_CPPFLAGS = -I$(top_srcdir)/src \
  	      -I$(top_srcdir)/third_party/boost_1_34_1
  
-@@ -384,14 +396,14 @@
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
--	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
--		&& exit 0; \
-+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-+	        && { if test -f $@; then exit 0; else break; fi; }; \
+- at GCC_TRUE@AM_CXXFLAGS = -Wall -Werror -ansi -pedantic -fno-rtti
++ at GCC_TRUE@AM_CXXFLAGS = -Wall -ansi -pedantic -fno-rtti
+ balloonwalker_SOURCES = balloonwalker.cc
+ balloonwalker_LDADD = \
+ 	$(top_builddir)/src/kml/engine/libkmlengine.la \
+@@ -396,9 +401,9 @@
  	      exit 1;; \
  	  esac; \
  	done; \
@@ -59099,7 +13918,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -409,55 +421,58 @@
+@@ -416,13 +421,16 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -59120,112 +13939,34 @@
 +	rm -f $$list
  balloonwalker$(EXEEXT): $(balloonwalker_OBJECTS) $(balloonwalker_DEPENDENCIES) 
  	@rm -f balloonwalker$(EXEEXT)
--	$(CXXLINK) $(balloonwalker_LDFLAGS) $(balloonwalker_OBJECTS) $(balloonwalker_LDADD) $(LIBS)
-+	$(CXXLINK) $(balloonwalker_OBJECTS) $(balloonwalker_LDADD) $(LIBS)
- change$(EXEEXT): $(change_OBJECTS) $(change_DEPENDENCIES) 
- 	@rm -f change$(EXEEXT)
--	$(CXXLINK) $(change_LDFLAGS) $(change_OBJECTS) $(change_LDADD) $(LIBS)
-+	$(CXXLINK) $(change_OBJECTS) $(change_LDADD) $(LIBS)
- clone$(EXEEXT): $(clone_OBJECTS) $(clone_DEPENDENCIES) 
- 	@rm -f clone$(EXEEXT)
--	$(CXXLINK) $(clone_LDFLAGS) $(clone_OBJECTS) $(clone_LDADD) $(LIBS)
-+	$(CXXLINK) $(clone_OBJECTS) $(clone_LDADD) $(LIBS)
- csv2kml$(EXEEXT): $(csv2kml_OBJECTS) $(csv2kml_DEPENDENCIES) 
- 	@rm -f csv2kml$(EXEEXT)
--	$(CXXLINK) $(csv2kml_LDFLAGS) $(csv2kml_OBJECTS) $(csv2kml_LDADD) $(LIBS)
-+	$(CXXLINK) $(csv2kml_OBJECTS) $(csv2kml_LDADD) $(LIBS)
- import$(EXEEXT): $(import_OBJECTS) $(import_DEPENDENCIES) 
- 	@rm -f import$(EXEEXT)
--	$(CXXLINK) $(import_LDFLAGS) $(import_OBJECTS) $(import_LDADD) $(LIBS)
-+	$(CXXLINK) $(import_OBJECTS) $(import_LDADD) $(LIBS)
- inlinestyles$(EXEEXT): $(inlinestyles_OBJECTS) $(inlinestyles_DEPENDENCIES) 
- 	@rm -f inlinestyles$(EXEEXT)
--	$(CXXLINK) $(inlinestyles_LDFLAGS) $(inlinestyles_OBJECTS) $(inlinestyles_LDADD) $(LIBS)
-+	$(CXXLINK) $(inlinestyles_OBJECTS) $(inlinestyles_LDADD) $(LIBS)
- kml2kmz$(EXEEXT): $(kml2kmz_OBJECTS) $(kml2kmz_DEPENDENCIES) 
- 	@rm -f kml2kmz$(EXEEXT)
--	$(CXXLINK) $(kml2kmz_LDFLAGS) $(kml2kmz_OBJECTS) $(kml2kmz_LDADD) $(LIBS)
-+	$(CXXLINK) $(kml2kmz_OBJECTS) $(kml2kmz_LDADD) $(LIBS)
- kmlfile$(EXEEXT): $(kmlfile_OBJECTS) $(kmlfile_DEPENDENCIES) 
- 	@rm -f kmlfile$(EXEEXT)
--	$(CXXLINK) $(kmlfile_LDFLAGS) $(kmlfile_OBJECTS) $(kmlfile_LDADD) $(LIBS)
-+	$(CXXLINK) $(kmlfile_OBJECTS) $(kmlfile_LDADD) $(LIBS)
- kmzchecklinks$(EXEEXT): $(kmzchecklinks_OBJECTS) $(kmzchecklinks_DEPENDENCIES) 
- 	@rm -f kmzchecklinks$(EXEEXT)
--	$(CXXLINK) $(kmzchecklinks_LDFLAGS) $(kmzchecklinks_OBJECTS) $(kmzchecklinks_LDADD) $(LIBS)
-+	$(CXXLINK) $(kmzchecklinks_OBJECTS) $(kmzchecklinks_LDADD) $(LIBS)
- oldschema$(EXEEXT): $(oldschema_OBJECTS) $(oldschema_DEPENDENCIES) 
- 	@rm -f oldschema$(EXEEXT)
--	$(CXXLINK) $(oldschema_LDFLAGS) $(oldschema_OBJECTS) $(oldschema_LDADD) $(LIBS)
-+	$(CXXLINK) $(oldschema_OBJECTS) $(oldschema_LDADD) $(LIBS)
- parsebig$(EXEEXT): $(parsebig_OBJECTS) $(parsebig_DEPENDENCIES) 
- 	@rm -f parsebig$(EXEEXT)
--	$(CXXLINK) $(parsebig_LDFLAGS) $(parsebig_OBJECTS) $(parsebig_LDADD) $(LIBS)
-+	$(CXXLINK) $(parsebig_OBJECTS) $(parsebig_LDADD) $(LIBS)
- printstyle$(EXEEXT): $(printstyle_OBJECTS) $(printstyle_DEPENDENCIES) 
- 	@rm -f printstyle$(EXEEXT)
--	$(CXXLINK) $(printstyle_LDFLAGS) $(printstyle_OBJECTS) $(printstyle_LDADD) $(LIBS)
-+	$(CXXLINK) $(printstyle_OBJECTS) $(printstyle_LDADD) $(LIBS)
- splitstyles$(EXEEXT): $(splitstyles_OBJECTS) $(splitstyles_DEPENDENCIES) 
- 	@rm -f splitstyles$(EXEEXT)
--	$(CXXLINK) $(splitstyles_LDFLAGS) $(splitstyles_OBJECTS) $(splitstyles_LDADD) $(LIBS)
-+	$(CXXLINK) $(splitstyles_OBJECTS) $(splitstyles_LDADD) $(LIBS)
- streamkml$(EXEEXT): $(streamkml_OBJECTS) $(streamkml_DEPENDENCIES) 
- 	@rm -f streamkml$(EXEEXT)
--	$(CXXLINK) $(streamkml_LDFLAGS) $(streamkml_OBJECTS) $(streamkml_LDADD) $(LIBS)
-+	$(CXXLINK) $(streamkml_OBJECTS) $(streamkml_LDADD) $(LIBS)
+ 	$(CXXLINK) $(balloonwalker_OBJECTS) $(balloonwalker_LDADD) $(LIBS)
+@@ -489,21 +497,21 @@
  
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -481,22 +496,22 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/streamkml.Po at am__quote@
- 
  .cc.o:
-- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
  
  .cc.obj:
-- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
  
  .cc.lo:
-- at am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
-@@ -507,82 +522,85 @@
- clean-libtool:
- 	-rm -rf .libs _libs
+@@ -526,7 +534,7 @@
  
--distclean-libtool:
--	-rm -f libtool
--uninstall-info-am:
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- 	unique=`for i in $$list; do \
- 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- 	  done | \
--	  $(AWK) '    { files[$$0] = 1; } \
--	       END { for (i in files) print i; }'`; \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
- 	mkid -fID $$unique
- tags: TAGS
- 
  TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
 -	tags=; \
@@ -59233,13 +13974,11 @@
  	here=`pwd`; \
  	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
- 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+@@ -534,29 +542,34 @@
  	  done | \
--	  $(AWK) '    { files[$$0] = 1; } \
--	       END { for (i in files) print i; }'`; \
+ 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 -	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 +	shift; \
 +	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
  	  test -n "$$unique" || unique=$$empty_fix; \
@@ -59257,16 +13996,13 @@
  CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
 -	tags=; \
--	here=`pwd`; \
  	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  	  done | \
--	  $(AWK) '    { files[$$0] = 1; } \
--	       END { for (i in files) print i; }'`; \
+ 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 -	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 +	test -z "$(CTAGS_ARGS)$$unique" \
  	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 -	     $$tags $$unique
@@ -59281,37 +14017,10 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
--	list='$(DISTFILES)'; for file in $$list; do \
--	  case $$file in \
--	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
--	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
--	  esac; \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
+@@ -577,13 +590,17 @@
  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
--	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
--	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
--	    dir="/$$dir"; \
--	    $(mkdir_p) "$(distdir)$$dir"; \
--	  else \
--	    dir=''; \
--	  fi; \
  	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 +	    if test -d "$(distdir)/$$file"; then \
 +	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 +	    fi; \
@@ -59330,7 +14039,7 @@
  	    || exit 1; \
  	  fi; \
  	done
-@@ -610,6 +628,7 @@
+@@ -611,6 +628,7 @@
  
  distclean-generic:
  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -59338,17 +14047,8 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -623,7 +642,7 @@
- 	-rm -rf ./$(DEPDIR)
- 	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
--	distclean-libtool distclean-tags
-+	distclean-tags
+@@ -632,6 +650,8 @@
  
- dvi: dvi-am
- 
-@@ -631,18 +650,38 @@
- 
  html: html-am
  
 +html-am:
@@ -59356,17 +14056,16 @@
  info: info-am
  
  info-am:
+@@ -640,18 +660,28 @@
  
- install-data-am:
+ install-dvi: install-dvi-am
  
-+install-dvi: install-dvi-am
-+
 +install-dvi-am:
 +
  install-exec-am:
  
-+install-html: install-html-am
-+
+ install-html: install-html-am
+ 
 +install-html-am:
 +
  install-info: install-info-am
@@ -59375,90 +14074,53 @@
 +
  install-man:
  
-+install-pdf: install-pdf-am
-+
+ install-pdf: install-pdf-am
+ 
 +install-pdf-am:
 +
-+install-ps: install-ps-am
-+
+ install-ps: install-ps-am
+ 
 +install-ps-am:
 +
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
-@@ -663,19 +702,23 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-info-am
-+uninstall-am:
-+
-+.MAKE: install-am install-strip
- 
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- 	clean-libtool clean-noinstPROGRAMS ctags distclean \
- 	distclean-compile distclean-generic distclean-libtool \
- 	distclean-tags distdir dvi dvi-am html html-am info info-am \
--	install install-am install-data install-data-am install-exec \
--	install-exec-am install-info install-info-am install-man \
-+	install install-am install-data install-data-am install-dvi \
-+	install-dvi-am install-exec install-exec-am install-html \
-+	install-html-am install-info install-info-am install-man \
-+	install-pdf install-pdf-am install-ps install-ps-am \
- 	install-strip installcheck installcheck-am installdirs \
- 	maintainer-clean maintainer-clean-generic mostlyclean \
+@@ -689,6 +719,7 @@
  	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
--	pdf pdf-am ps ps-am tags uninstall uninstall-am \
--	uninstall-info-am
-+	pdf pdf-am ps ps-am tags uninstall uninstall-am
-+
+ 	pdf pdf-am ps ps-am tags uninstall uninstall-am
  
++
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-Index: libkml-1.0.1/examples/gpx/Makefile.in
+ .NOEXPORT:
+Index: libkml-1.1.0/examples/gpx/Makefile.in
 ===================================================================
---- libkml-1.0.1.orig/examples/gpx/Makefile.in	2009-07-03 01:23:29.000000000 +0200
-+++ libkml-1.0.1/examples/gpx/Makefile.in	2009-12-10 10:19:44.000000000 +0100
+--- libkml-1.1.0.orig/examples/gpx/Makefile.in	2009-12-10 13:05:40.000000000 +0100
++++ libkml-1.1.0/examples/gpx/Makefile.in	2009-12-10 17:29:34.000000000 +0100
 @@ -1,8 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
+-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
-@@ -14,15 +15,12 @@
+@@ -16,8 +17,9 @@
  
- @SET_MAKE@
- 
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
  VPATH = @srcdir@
  pkgdatadir = $(datadir)/@PACKAGE@
 -pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../..
 +pkglibdir = $(libdir)/@PACKAGE@
 +pkglibexecdir = $(libexecdir)/@PACKAGE@
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -41,12 +39,15 @@
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_curl.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)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
+@@ -45,6 +47,7 @@
  mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
@@ -59466,86 +14128,15 @@
  PROGRAMS = $(noinst_PROGRAMS)
  am_gpxtracktokml_OBJECTS = gpxtracktokml.$(OBJEXT)
  gpxtracktokml_OBJECTS = $(am_gpxtracktokml_OBJECTS)
-@@ -55,25 +56,25 @@
- 	$(top_builddir)/src/kml/engine/libkmlengine.la \
- 	$(top_builddir)/src/kml/dom/libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la
--DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+@@ -56,6 +59,7 @@
+ DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
  depcomp = $(SHELL) $(top_srcdir)/config/depcomp
  am__depfiles_maybe = depfiles
 +am__mv = mv -f
  CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
  	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
--	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
--	$(AM_CXXFLAGS) $(CXXFLAGS)
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- CXXLD = $(CXX)
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- SOURCES = $(gpxtracktokml_SOURCES)
- DIST_SOURCES = $(gpxtracktokml_SOURCES)
- ETAGS = etags
- CTAGS = ctags
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -95,18 +96,16 @@
- CYGPATH_W = @CYGPATH_W@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
--ECHO = @ECHO@
-+DSYMUTIL = @DSYMUTIL@
-+DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
--F77 = @F77@
--FFLAGS = @FFLAGS@
--GCC_FALSE = @GCC_FALSE@
--GCC_TRUE = @GCC_TRUE@
--HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
--HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
-+FGREP = @FGREP@
-+GREP = @GREP@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -116,19 +115,28 @@
- JAVAC = @JAVAC@
- JAVA_INCLUDE_DIR = @JAVA_INCLUDE_DIR@
- JAVA_LIB_DIR = @JAVA_LIB_DIR@
-+LD = @LD@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
-+LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
-+NM = @NM@
-+NMEDIT = @NMEDIT@
-+OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
-+OTOOL = @OTOOL@
-+OTOOL64 = @OTOOL64@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+@@ -132,6 +136,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -59553,84 +14144,16 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PLATFORM = @PLATFORM@
-@@ -145,22 +153,13 @@
- STRIP = @STRIP@
- SWIG = @SWIG@
- VERSION = @VERSION@
--WITH_JAVA_FALSE = @WITH_JAVA_FALSE@
--WITH_JAVA_TRUE = @WITH_JAVA_TRUE@
--WITH_PYTHON_FALSE = @WITH_PYTHON_FALSE@
--WITH_PYTHON_TRUE = @WITH_PYTHON_TRUE@
--WITH_SWIG_FALSE = @WITH_SWIG_FALSE@
--WITH_SWIG_TRUE = @WITH_SWIG_TRUE@
--ac_ct_AR = @ac_ct_AR@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
--ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -172,28 +171,41 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
+@@ -204,7 +209,7 @@
  AM_CPPFLAGS = -I$(top_srcdir)/src \
  	      -I$(top_srcdir)/third_party/boost_1_34_1
  
-@@ -213,14 +225,14 @@
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
--	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
--		&& exit 0; \
-+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-+	        && { if test -f $@; then exit 0; else break; fi; }; \
+- at GCC_TRUE@AM_CXXFLAGS = -Wall -Werror -ansi -pedantic -fno-rtti
++ at GCC_TRUE@AM_CXXFLAGS = -Wall -ansi -pedantic -fno-rtti
+ gpxtracktokml_SOURCES = gpxtracktokml.cc
+ gpxtracktokml_LDADD = \
+ 	$(top_builddir)/src/kml/convenience/libkmlconvenience.la \
+@@ -225,9 +230,9 @@
  	      exit 1;; \
  	  esac; \
  	done; \
@@ -59643,7 +14166,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -238,16 +250,19 @@
+@@ -245,13 +250,16 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -59664,60 +14187,34 @@
 +	rm -f $$list
  gpxtracktokml$(EXEEXT): $(gpxtracktokml_OBJECTS) $(gpxtracktokml_DEPENDENCIES) 
  	@rm -f gpxtracktokml$(EXEEXT)
--	$(CXXLINK) $(gpxtracktokml_LDFLAGS) $(gpxtracktokml_OBJECTS) $(gpxtracktokml_LDADD) $(LIBS)
-+	$(CXXLINK) $(gpxtracktokml_OBJECTS) $(gpxtracktokml_LDADD) $(LIBS)
+ 	$(CXXLINK) $(gpxtracktokml_OBJECTS) $(gpxtracktokml_LDADD) $(LIBS)
+@@ -266,21 +274,21 @@
  
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -258,22 +273,22 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gpxtracktokml.Po at am__quote@
- 
  .cc.o:
-- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
  
  .cc.obj:
-- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
  
  .cc.lo:
-- at am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
-@@ -284,82 +299,85 @@
- clean-libtool:
- 	-rm -rf .libs _libs
+@@ -303,7 +311,7 @@
  
--distclean-libtool:
--	-rm -f libtool
--uninstall-info-am:
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- 	unique=`for i in $$list; do \
- 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- 	  done | \
--	  $(AWK) '    { files[$$0] = 1; } \
--	       END { for (i in files) print i; }'`; \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
- 	mkid -fID $$unique
- tags: TAGS
- 
  TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
 -	tags=; \
@@ -59725,13 +14222,11 @@
  	here=`pwd`; \
  	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
- 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+@@ -311,29 +319,34 @@
  	  done | \
--	  $(AWK) '    { files[$$0] = 1; } \
--	       END { for (i in files) print i; }'`; \
+ 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 -	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 +	shift; \
 +	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
  	  test -n "$$unique" || unique=$$empty_fix; \
@@ -59749,16 +14244,13 @@
  CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
 -	tags=; \
--	here=`pwd`; \
  	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  	  done | \
--	  $(AWK) '    { files[$$0] = 1; } \
--	       END { for (i in files) print i; }'`; \
+ 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 -	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 +	test -z "$(CTAGS_ARGS)$$unique" \
  	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 -	     $$tags $$unique
@@ -59773,37 +14265,10 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
--	list='$(DISTFILES)'; for file in $$list; do \
--	  case $$file in \
--	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
--	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
--	  esac; \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
+@@ -354,13 +367,17 @@
  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
--	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
--	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
--	    dir="/$$dir"; \
--	    $(mkdir_p) "$(distdir)$$dir"; \
--	  else \
--	    dir=''; \
--	  fi; \
  	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 +	    if test -d "$(distdir)/$$file"; then \
 +	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 +	    fi; \
@@ -59822,7 +14287,7 @@
  	    || exit 1; \
  	  fi; \
  	done
-@@ -387,6 +405,7 @@
+@@ -388,6 +405,7 @@
  
  distclean-generic:
  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -59830,17 +14295,8 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -400,7 +419,7 @@
- 	-rm -rf ./$(DEPDIR)
- 	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
--	distclean-libtool distclean-tags
-+	distclean-tags
+@@ -409,6 +427,8 @@
  
- dvi: dvi-am
- 
-@@ -408,18 +427,38 @@
- 
  html: html-am
  
 +html-am:
@@ -59848,17 +14304,16 @@
  info: info-am
  
  info-am:
+@@ -417,18 +437,28 @@
  
- install-data-am:
+ install-dvi: install-dvi-am
  
-+install-dvi: install-dvi-am
-+
 +install-dvi-am:
 +
  install-exec-am:
  
-+install-html: install-html-am
-+
+ install-html: install-html-am
+ 
 +install-html-am:
 +
  install-info: install-info-am
@@ -59867,90 +14322,53 @@
 +
  install-man:
  
-+install-pdf: install-pdf-am
-+
+ install-pdf: install-pdf-am
+ 
 +install-pdf-am:
 +
-+install-ps: install-ps-am
-+
+ install-ps: install-ps-am
+ 
 +install-ps-am:
 +
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
-@@ -440,19 +479,23 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-info-am
-+uninstall-am:
-+
-+.MAKE: install-am install-strip
- 
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- 	clean-libtool clean-noinstPROGRAMS ctags distclean \
- 	distclean-compile distclean-generic distclean-libtool \
- 	distclean-tags distdir dvi dvi-am html html-am info info-am \
--	install install-am install-data install-data-am install-exec \
--	install-exec-am install-info install-info-am install-man \
-+	install install-am install-data install-data-am install-dvi \
-+	install-dvi-am install-exec install-exec-am install-html \
-+	install-html-am install-info install-info-am install-man \
-+	install-pdf install-pdf-am install-ps install-ps-am \
- 	install-strip installcheck installcheck-am installdirs \
- 	maintainer-clean maintainer-clean-generic mostlyclean \
+@@ -466,6 +496,7 @@
  	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
--	pdf pdf-am ps ps-am tags uninstall uninstall-am \
--	uninstall-info-am
-+	pdf pdf-am ps ps-am tags uninstall uninstall-am
-+
+ 	pdf pdf-am ps ps-am tags uninstall uninstall-am
  
++
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-Index: libkml-1.0.1/examples/gx/Makefile.in
+ .NOEXPORT:
+Index: libkml-1.1.0/examples/gx/Makefile.in
 ===================================================================
---- libkml-1.0.1.orig/examples/gx/Makefile.in	2009-07-03 01:23:29.000000000 +0200
-+++ libkml-1.0.1/examples/gx/Makefile.in	2009-12-10 10:19:44.000000000 +0100
+--- libkml-1.1.0.orig/examples/gx/Makefile.in	2009-12-10 13:05:40.000000000 +0100
++++ libkml-1.1.0/examples/gx/Makefile.in	2009-12-10 17:29:34.000000000 +0100
 @@ -1,8 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
+-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
-@@ -14,15 +15,12 @@
+@@ -16,8 +17,9 @@
  
- @SET_MAKE@
- 
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
  VPATH = @srcdir@
  pkgdatadir = $(datadir)/@PACKAGE@
 -pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../..
 +pkglibdir = $(libdir)/@PACKAGE@
 +pkglibexecdir = $(libexecdir)/@PACKAGE@
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -41,12 +39,15 @@
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_curl.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)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
+@@ -45,6 +47,7 @@
  mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
@@ -59958,86 +14376,15 @@
  PROGRAMS = $(noinst_PROGRAMS)
  am_featuretour_OBJECTS = featuretour.$(OBJEXT)
  featuretour_OBJECTS = $(am_featuretour_OBJECTS)
-@@ -62,25 +63,25 @@
- 	$(top_builddir)/src/kml/engine/libkmlengine.la \
- 	$(top_builddir)/src/kml/dom/libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la
--DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+@@ -63,6 +66,7 @@
+ DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
  depcomp = $(SHELL) $(top_srcdir)/config/depcomp
  am__depfiles_maybe = depfiles
 +am__mv = mv -f
  CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
  	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
--	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
--	$(AM_CXXFLAGS) $(CXXFLAGS)
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- CXXLD = $(CXX)
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- SOURCES = $(featuretour_SOURCES) $(gpxfly_SOURCES)
- DIST_SOURCES = $(featuretour_SOURCES) $(gpxfly_SOURCES)
- ETAGS = etags
- CTAGS = ctags
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -102,18 +103,16 @@
- CYGPATH_W = @CYGPATH_W@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
--ECHO = @ECHO@
-+DSYMUTIL = @DSYMUTIL@
-+DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
--F77 = @F77@
--FFLAGS = @FFLAGS@
--GCC_FALSE = @GCC_FALSE@
--GCC_TRUE = @GCC_TRUE@
--HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
--HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
-+FGREP = @FGREP@
-+GREP = @GREP@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -123,19 +122,28 @@
- JAVAC = @JAVAC@
- JAVA_INCLUDE_DIR = @JAVA_INCLUDE_DIR@
- JAVA_LIB_DIR = @JAVA_LIB_DIR@
-+LD = @LD@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
-+LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
-+NM = @NM@
-+NMEDIT = @NMEDIT@
-+OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
-+OTOOL = @OTOOL@
-+OTOOL64 = @OTOOL64@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+@@ -139,6 +143,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -60045,84 +14392,16 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PLATFORM = @PLATFORM@
-@@ -152,22 +160,13 @@
- STRIP = @STRIP@
- SWIG = @SWIG@
- VERSION = @VERSION@
--WITH_JAVA_FALSE = @WITH_JAVA_FALSE@
--WITH_JAVA_TRUE = @WITH_JAVA_TRUE@
--WITH_PYTHON_FALSE = @WITH_PYTHON_FALSE@
--WITH_PYTHON_TRUE = @WITH_PYTHON_TRUE@
--WITH_SWIG_FALSE = @WITH_SWIG_FALSE@
--WITH_SWIG_TRUE = @WITH_SWIG_TRUE@
--ac_ct_AR = @ac_ct_AR@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
--ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -179,28 +178,41 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
+@@ -211,7 +216,7 @@
  AM_CPPFLAGS = -I$(top_srcdir)/src \
  	      -I$(top_srcdir)/third_party/boost_1_34_1
  
-@@ -227,14 +239,14 @@
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
--	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
--		&& exit 0; \
-+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-+	        && { if test -f $@; then exit 0; else break; fi; }; \
+- at GCC_TRUE@AM_CXXFLAGS = -Wall -Werror -ansi -pedantic -fno-rtti
++ at GCC_TRUE@AM_CXXFLAGS = -Wall -ansi -pedantic -fno-rtti
+ gpxfly_SOURCES = gpxfly.cc
+ gpxfly_LDADD = \
+ 	$(top_builddir)/src/kml/convenience/libkmlconvenience.la \
+@@ -239,9 +244,9 @@
  	      exit 1;; \
  	  esac; \
  	done; \
@@ -60135,7 +14414,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -252,19 +264,22 @@
+@@ -259,13 +264,16 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -60156,64 +14435,34 @@
 +	rm -f $$list
  featuretour$(EXEEXT): $(featuretour_OBJECTS) $(featuretour_DEPENDENCIES) 
  	@rm -f featuretour$(EXEEXT)
--	$(CXXLINK) $(featuretour_LDFLAGS) $(featuretour_OBJECTS) $(featuretour_LDADD) $(LIBS)
-+	$(CXXLINK) $(featuretour_OBJECTS) $(featuretour_LDADD) $(LIBS)
- gpxfly$(EXEEXT): $(gpxfly_OBJECTS) $(gpxfly_DEPENDENCIES) 
- 	@rm -f gpxfly$(EXEEXT)
--	$(CXXLINK) $(gpxfly_LDFLAGS) $(gpxfly_OBJECTS) $(gpxfly_LDADD) $(LIBS)
-+	$(CXXLINK) $(gpxfly_OBJECTS) $(gpxfly_LDADD) $(LIBS)
+ 	$(CXXLINK) $(featuretour_OBJECTS) $(featuretour_LDADD) $(LIBS)
+@@ -284,21 +292,21 @@
  
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -276,22 +291,22 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gpxfly.Po at am__quote@
- 
  .cc.o:
-- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
  
  .cc.obj:
-- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
  
  .cc.lo:
-- at am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
-@@ -302,82 +317,85 @@
- clean-libtool:
- 	-rm -rf .libs _libs
+@@ -321,7 +329,7 @@
  
--distclean-libtool:
--	-rm -f libtool
--uninstall-info-am:
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- 	unique=`for i in $$list; do \
- 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- 	  done | \
--	  $(AWK) '    { files[$$0] = 1; } \
--	       END { for (i in files) print i; }'`; \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
- 	mkid -fID $$unique
- tags: TAGS
- 
  TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
 -	tags=; \
@@ -60221,13 +14470,11 @@
  	here=`pwd`; \
  	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
- 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+@@ -329,29 +337,34 @@
  	  done | \
--	  $(AWK) '    { files[$$0] = 1; } \
--	       END { for (i in files) print i; }'`; \
+ 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 -	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 +	shift; \
 +	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
  	  test -n "$$unique" || unique=$$empty_fix; \
@@ -60245,16 +14492,13 @@
  CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
 -	tags=; \
--	here=`pwd`; \
  	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  	  done | \
--	  $(AWK) '    { files[$$0] = 1; } \
--	       END { for (i in files) print i; }'`; \
+ 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 -	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 +	test -z "$(CTAGS_ARGS)$$unique" \
  	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 -	     $$tags $$unique
@@ -60269,37 +14513,10 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
--	list='$(DISTFILES)'; for file in $$list; do \
--	  case $$file in \
--	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
--	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
--	  esac; \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
+@@ -372,13 +385,17 @@
  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
--	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
--	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
--	    dir="/$$dir"; \
--	    $(mkdir_p) "$(distdir)$$dir"; \
--	  else \
--	    dir=''; \
--	  fi; \
  	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 +	    if test -d "$(distdir)/$$file"; then \
 +	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 +	    fi; \
@@ -60318,7 +14535,7 @@
  	    || exit 1; \
  	  fi; \
  	done
-@@ -405,6 +423,7 @@
+@@ -406,6 +423,7 @@
  
  distclean-generic:
  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -60326,17 +14543,8 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -418,7 +437,7 @@
- 	-rm -rf ./$(DEPDIR)
- 	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
--	distclean-libtool distclean-tags
-+	distclean-tags
+@@ -427,6 +445,8 @@
  
- dvi: dvi-am
- 
-@@ -426,18 +445,38 @@
- 
  html: html-am
  
 +html-am:
@@ -60344,17 +14552,16 @@
  info: info-am
  
  info-am:
+@@ -435,18 +455,28 @@
  
- install-data-am:
+ install-dvi: install-dvi-am
  
-+install-dvi: install-dvi-am
-+
 +install-dvi-am:
 +
  install-exec-am:
  
-+install-html: install-html-am
-+
+ install-html: install-html-am
+ 
 +install-html-am:
 +
  install-info: install-info-am
@@ -60363,90 +14570,53 @@
 +
  install-man:
  
-+install-pdf: install-pdf-am
-+
+ install-pdf: install-pdf-am
+ 
 +install-pdf-am:
 +
-+install-ps: install-ps-am
-+
+ install-ps: install-ps-am
+ 
 +install-ps-am:
 +
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
-@@ -458,19 +497,23 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-info-am
-+uninstall-am:
-+
-+.MAKE: install-am install-strip
- 
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- 	clean-libtool clean-noinstPROGRAMS ctags distclean \
- 	distclean-compile distclean-generic distclean-libtool \
- 	distclean-tags distdir dvi dvi-am html html-am info info-am \
--	install install-am install-data install-data-am install-exec \
--	install-exec-am install-info install-info-am install-man \
-+	install install-am install-data install-data-am install-dvi \
-+	install-dvi-am install-exec install-exec-am install-html \
-+	install-html-am install-info install-info-am install-man \
-+	install-pdf install-pdf-am install-ps install-ps-am \
- 	install-strip installcheck installcheck-am installdirs \
- 	maintainer-clean maintainer-clean-generic mostlyclean \
+@@ -484,6 +514,7 @@
  	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
--	pdf pdf-am ps ps-am tags uninstall uninstall-am \
--	uninstall-info-am
-+	pdf pdf-am ps ps-am tags uninstall uninstall-am
-+
+ 	pdf pdf-am ps ps-am tags uninstall uninstall-am
  
++
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-Index: libkml-1.0.1/examples/hellonet/Makefile.in
+ .NOEXPORT:
+Index: libkml-1.1.0/examples/hellonet/Makefile.in
 ===================================================================
---- libkml-1.0.1.orig/examples/hellonet/Makefile.in	2009-07-03 01:23:29.000000000 +0200
-+++ libkml-1.0.1/examples/hellonet/Makefile.in	2009-12-10 10:19:45.000000000 +0100
+--- libkml-1.1.0.orig/examples/hellonet/Makefile.in	2009-12-10 13:05:40.000000000 +0100
++++ libkml-1.1.0/examples/hellonet/Makefile.in	2009-12-10 17:29:35.000000000 +0100
 @@ -1,8 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
+-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
-@@ -15,15 +16,12 @@
- @SET_MAKE@
+@@ -17,8 +18,9 @@
  
- 
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
  VPATH = @srcdir@
  pkgdatadir = $(datadir)/@PACKAGE@
 -pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../..
 +pkglibdir = $(libdir)/@PACKAGE@
 +pkglibexecdir = $(libexecdir)/@PACKAGE@
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -44,12 +42,15 @@
- DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_curl.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)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
+@@ -49,6 +51,7 @@
  mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
@@ -60454,87 +14624,15 @@
  LTLIBRARIES = $(noinst_LTLIBRARIES)
  libcurlfetch_la_DEPENDENCIES =
  am__libcurlfetch_la_SOURCES_DIST = curlfetch.cc
-@@ -91,17 +92,19 @@
- @HAVE_CURL_TRUE@	$(top_builddir)/src/kml/xsd/libkmlxsd.la \
- @HAVE_CURL_TRUE@	$(top_builddir)/src/kml/dom/libkmldom.la \
- @HAVE_CURL_TRUE@	$(top_builddir)/src/kml/base/libkmlbase.la
--DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+@@ -124,6 +127,7 @@
+ DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
  depcomp = $(SHELL) $(top_srcdir)/config/depcomp
  am__depfiles_maybe = depfiles
 +am__mv = mv -f
  CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
  	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
--	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
--	$(AM_CXXFLAGS) $(CXXFLAGS)
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- CXXLD = $(CXX)
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- SOURCES = $(libcurlfetch_la_SOURCES) $(kmlwalk_SOURCES) \
- 	$(kmzfetch_SOURCES) $(listfeed_SOURCES) \
- 	$(resolvestyle_SOURCES) $(xsdprint_SOURCES)
-@@ -113,8 +116,6 @@
- CTAGS = ctags
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -136,18 +137,16 @@
- CYGPATH_W = @CYGPATH_W@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
--ECHO = @ECHO@
-+DSYMUTIL = @DSYMUTIL@
-+DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
--F77 = @F77@
--FFLAGS = @FFLAGS@
--GCC_FALSE = @GCC_FALSE@
--GCC_TRUE = @GCC_TRUE@
--HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
--HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
-+FGREP = @FGREP@
-+GREP = @GREP@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -157,19 +156,28 @@
- JAVAC = @JAVAC@
- JAVA_INCLUDE_DIR = @JAVA_INCLUDE_DIR@
- JAVA_LIB_DIR = @JAVA_LIB_DIR@
-+LD = @LD@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
-+LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
-+NM = @NM@
-+NMEDIT = @NMEDIT@
-+OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
-+OTOOL = @OTOOL@
-+OTOOL64 = @OTOOL64@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+@@ -207,6 +211,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -60542,84 +14640,16 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PLATFORM = @PLATFORM@
-@@ -186,22 +194,13 @@
- STRIP = @STRIP@
- SWIG = @SWIG@
- VERSION = @VERSION@
--WITH_JAVA_FALSE = @WITH_JAVA_FALSE@
--WITH_JAVA_TRUE = @WITH_JAVA_TRUE@
--WITH_PYTHON_FALSE = @WITH_PYTHON_FALSE@
--WITH_PYTHON_TRUE = @WITH_PYTHON_TRUE@
--WITH_SWIG_FALSE = @WITH_SWIG_FALSE@
--WITH_SWIG_TRUE = @WITH_SWIG_TRUE@
--ac_ct_AR = @ac_ct_AR@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
--ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -213,28 +212,41 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- @HAVE_CURL_TRUE at AM_CPPFLAGS = -I$(top_srcdir)/src \
+@@ -280,7 +285,7 @@
  @HAVE_CURL_TRUE@	      -I$(top_srcdir)/examples/hellonet \
  @HAVE_CURL_TRUE@	      -I$(top_srcdir)/third_party/boost_1_34_1
-@@ -286,14 +298,14 @@
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
--	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
--		&& exit 0; \
-+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-+	        && { if test -f $@; then exit 0; else break; fi; }; \
+ 
+- at GCC_TRUE@@HAVE_CURL_TRUE at AM_CXXFLAGS = -Wall -Werror -ansi -pedantic -fno-rtti
++ at GCC_TRUE@@HAVE_CURL_TRUE at AM_CXXFLAGS = -Wall -ansi -pedantic -fno-rtti
+ @HAVE_CURL_TRUE at noinst_LTLIBRARIES = libcurlfetch.la
+ @HAVE_CURL_TRUE at libcurlfetch_la_SOURCES = curlfetch.cc
+ @HAVE_CURL_TRUE at libcurlfetch_la_LIBADD = -lcurl
+@@ -363,9 +368,9 @@
  	      exit 1;; \
  	  esac; \
  	done; \
@@ -60632,7 +14662,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -311,6 +323,7 @@
+@@ -383,6 +388,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -60640,12 +14670,8 @@
  
  clean-noinstLTLIBRARIES:
  	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-@@ -321,29 +334,31 @@
- 	  rm -f "$${dir}/so_locations"; \
- 	done
- libcurlfetch.la: $(libcurlfetch_la_OBJECTS) $(libcurlfetch_la_DEPENDENCIES) 
--	$(CXXLINK) $(am_libcurlfetch_la_rpath) $(libcurlfetch_la_LDFLAGS) $(libcurlfetch_la_OBJECTS) $(libcurlfetch_la_LIBADD) $(LIBS)
-+	$(CXXLINK) $(am_libcurlfetch_la_rpath) $(libcurlfetch_la_OBJECTS) $(libcurlfetch_la_LIBADD) $(LIBS)
+@@ -396,11 +402,13 @@
+ 	$(CXXLINK) $(am_libcurlfetch_la_rpath) $(libcurlfetch_la_OBJECTS) $(libcurlfetch_la_LIBADD) $(LIBS)
  
  clean-noinstPROGRAMS:
 -	@list='$(noinst_PROGRAMS)'; for p in $$list; do \
@@ -60660,78 +14686,36 @@
 +	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 +	echo " rm -f" $$list; \
 +	rm -f $$list
- kmlwalk$(EXEEXT): $(kmlwalk_OBJECTS) $(kmlwalk_DEPENDENCIES) 
- 	@rm -f kmlwalk$(EXEEXT)
--	$(CXXLINK) $(kmlwalk_LDFLAGS) $(kmlwalk_OBJECTS) $(kmlwalk_LDADD) $(LIBS)
-+	$(CXXLINK) $(kmlwalk_OBJECTS) $(kmlwalk_LDADD) $(LIBS)
- kmzfetch$(EXEEXT): $(kmzfetch_OBJECTS) $(kmzfetch_DEPENDENCIES) 
- 	@rm -f kmzfetch$(EXEEXT)
--	$(CXXLINK) $(kmzfetch_LDFLAGS) $(kmzfetch_OBJECTS) $(kmzfetch_LDADD) $(LIBS)
-+	$(CXXLINK) $(kmzfetch_OBJECTS) $(kmzfetch_LDADD) $(LIBS)
- listfeed$(EXEEXT): $(listfeed_OBJECTS) $(listfeed_DEPENDENCIES) 
- 	@rm -f listfeed$(EXEEXT)
--	$(CXXLINK) $(listfeed_LDFLAGS) $(listfeed_OBJECTS) $(listfeed_LDADD) $(LIBS)
-+	$(CXXLINK) $(listfeed_OBJECTS) $(listfeed_LDADD) $(LIBS)
- resolvestyle$(EXEEXT): $(resolvestyle_OBJECTS) $(resolvestyle_DEPENDENCIES) 
- 	@rm -f resolvestyle$(EXEEXT)
--	$(CXXLINK) $(resolvestyle_LDFLAGS) $(resolvestyle_OBJECTS) $(resolvestyle_LDADD) $(LIBS)
-+	$(CXXLINK) $(resolvestyle_OBJECTS) $(resolvestyle_LDADD) $(LIBS)
- xsdprint$(EXEEXT): $(xsdprint_OBJECTS) $(xsdprint_DEPENDENCIES) 
- 	@rm -f xsdprint$(EXEEXT)
--	$(CXXLINK) $(xsdprint_LDFLAGS) $(xsdprint_OBJECTS) $(xsdprint_LDADD) $(LIBS)
-+	$(CXXLINK) $(xsdprint_OBJECTS) $(xsdprint_LDADD) $(LIBS)
+ getgmapkml$(EXEEXT): $(getgmapkml_OBJECTS) $(getgmapkml_DEPENDENCIES) 
+ 	@rm -f getgmapkml$(EXEEXT)
+ 	$(CXXLINK) $(getgmapkml_OBJECTS) $(getgmapkml_LDADD) $(LIBS)
+@@ -444,21 +452,21 @@
  
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -359,22 +374,22 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/xsdprint.Po at am__quote@
- 
  .cc.o:
-- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
  
  .cc.obj:
-- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
  
  .cc.lo:
-- at am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
-@@ -385,82 +400,85 @@
- clean-libtool:
- 	-rm -rf .libs _libs
+@@ -481,7 +489,7 @@
  
--distclean-libtool:
--	-rm -f libtool
--uninstall-info-am:
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- 	unique=`for i in $$list; do \
- 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- 	  done | \
--	  $(AWK) '    { files[$$0] = 1; } \
--	       END { for (i in files) print i; }'`; \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
- 	mkid -fID $$unique
- tags: TAGS
- 
  TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
 -	tags=; \
@@ -60739,13 +14723,11 @@
  	here=`pwd`; \
  	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
- 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+@@ -489,29 +497,34 @@
  	  done | \
--	  $(AWK) '    { files[$$0] = 1; } \
--	       END { for (i in files) print i; }'`; \
+ 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 -	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 +	shift; \
 +	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
  	  test -n "$$unique" || unique=$$empty_fix; \
@@ -60763,16 +14745,13 @@
  CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
 -	tags=; \
--	here=`pwd`; \
  	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  	  done | \
--	  $(AWK) '    { files[$$0] = 1; } \
--	       END { for (i in files) print i; }'`; \
+ 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 -	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 +	test -z "$(CTAGS_ARGS)$$unique" \
  	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 -	     $$tags $$unique
@@ -60787,37 +14766,10 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
--	list='$(DISTFILES)'; for file in $$list; do \
--	  case $$file in \
--	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
--	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
--	  esac; \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
+@@ -532,13 +545,17 @@
  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
--	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
--	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
--	    dir="/$$dir"; \
--	    $(mkdir_p) "$(distdir)$$dir"; \
--	  else \
--	    dir=''; \
--	  fi; \
  	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 +	    if test -d "$(distdir)/$$file"; then \
 +	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 +	    fi; \
@@ -60836,7 +14788,7 @@
  	    || exit 1; \
  	  fi; \
  	done
-@@ -488,6 +506,7 @@
+@@ -566,6 +583,7 @@
  
  distclean-generic:
  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -60844,17 +14796,8 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -501,7 +520,7 @@
- 	-rm -rf ./$(DEPDIR)
- 	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
--	distclean-libtool distclean-tags
-+	distclean-tags
+@@ -587,6 +605,8 @@
  
- dvi: dvi-am
- 
-@@ -509,18 +528,38 @@
- 
  html: html-am
  
 +html-am:
@@ -60862,17 +14805,16 @@
  info: info-am
  
  info-am:
+@@ -595,18 +615,28 @@
  
- install-data-am:
+ install-dvi: install-dvi-am
  
-+install-dvi: install-dvi-am
-+
 +install-dvi-am:
 +
  install-exec-am:
  
-+install-html: install-html-am
-+
+ install-html: install-html-am
+ 
 +install-html-am:
 +
  install-info: install-info-am
@@ -60881,90 +14823,53 @@
 +
  install-man:
  
-+install-pdf: install-pdf-am
-+
+ install-pdf: install-pdf-am
+ 
 +install-pdf-am:
 +
-+install-ps: install-ps-am
-+
+ install-ps: install-ps-am
+ 
 +install-ps-am:
 +
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
-@@ -541,19 +580,24 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-info-am
-+uninstall-am:
-+
-+.MAKE: install-am install-strip
- 
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- 	clean-libtool clean-noinstLTLIBRARIES clean-noinstPROGRAMS \
- 	ctags distclean distclean-compile distclean-generic \
- 	distclean-libtool distclean-tags distdir dvi dvi-am html \
- 	html-am info info-am install install-am install-data \
--	install-data-am install-exec install-exec-am install-info \
--	install-info-am install-man install-strip installcheck \
-+	install-data-am install-dvi install-dvi-am install-exec \
-+	install-exec-am install-html install-html-am install-info \
-+	install-info-am install-man install-pdf install-pdf-am \
-+	install-ps install-ps-am install-strip installcheck \
- 	installcheck-am installdirs maintainer-clean \
- 	maintainer-clean-generic mostlyclean mostlyclean-compile \
+@@ -645,6 +675,7 @@
  	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
--	tags uninstall uninstall-am uninstall-info-am
-+	tags uninstall uninstall-am
-+
+ 	tags uninstall uninstall-am
  
++
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-Index: libkml-1.0.1/examples/helloworld/Makefile.in
+ .NOEXPORT:
+Index: libkml-1.1.0/examples/helloworld/Makefile.in
 ===================================================================
---- libkml-1.0.1.orig/examples/helloworld/Makefile.in	2009-07-03 01:23:29.000000000 +0200
-+++ libkml-1.0.1/examples/helloworld/Makefile.in	2009-12-10 10:19:45.000000000 +0100
+--- libkml-1.1.0.orig/examples/helloworld/Makefile.in	2009-12-10 13:05:40.000000000 +0100
++++ libkml-1.1.0/examples/helloworld/Makefile.in	2009-12-10 17:29:35.000000000 +0100
 @@ -1,8 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
+-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
-@@ -15,15 +16,12 @@
- @SET_MAKE@
+@@ -17,8 +18,9 @@
  
- 
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
  VPATH = @srcdir@
  pkgdatadir = $(datadir)/@PACKAGE@
 -pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../..
 +pkglibdir = $(libdir)/@PACKAGE@
 +pkglibexecdir = $(libexecdir)/@PACKAGE@
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -49,12 +47,15 @@
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_curl.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)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
+@@ -53,6 +55,7 @@
  mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
@@ -60972,87 +14877,15 @@
  LTLIBRARIES = $(noinst_LTLIBRARIES)
  libhelloutil_la_DEPENDENCIES =  \
  	$(top_builddir)/third_party/libminizip.la
-@@ -159,17 +160,19 @@
- 	$(top_builddir)/src/kml/dom/libkmldom.la \
- 	$(top_builddir)/src/kml/engine/libkmlengine.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la
--DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+@@ -160,6 +163,7 @@
+ DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
  depcomp = $(SHELL) $(top_srcdir)/config/depcomp
  am__depfiles_maybe = depfiles
 +am__mv = mv -f
  CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
  	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
--	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
--	$(AM_CXXFLAGS) $(CXXFLAGS)
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- CXXLD = $(CXX)
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- SOURCES = $(libhelloutil_la_SOURCES) $(checklinks_SOURCES) \
- 	$(circlegen_SOURCES) $(countkml_SOURCES) $(createkml_SOURCES) \
- 	$(helloattrs_SOURCES) $(helloenum_SOURCES) \
-@@ -194,8 +197,6 @@
- CTAGS = ctags
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -217,18 +218,16 @@
- CYGPATH_W = @CYGPATH_W@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
--ECHO = @ECHO@
-+DSYMUTIL = @DSYMUTIL@
-+DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
--F77 = @F77@
--FFLAGS = @FFLAGS@
--GCC_FALSE = @GCC_FALSE@
--GCC_TRUE = @GCC_TRUE@
--HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
--HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
-+FGREP = @FGREP@
-+GREP = @GREP@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -238,19 +237,28 @@
- JAVAC = @JAVAC@
- JAVA_INCLUDE_DIR = @JAVA_INCLUDE_DIR@
- JAVA_LIB_DIR = @JAVA_LIB_DIR@
-+LD = @LD@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
-+LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
-+NM = @NM@
-+NMEDIT = @NMEDIT@
-+OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
-+OTOOL = @OTOOL@
-+OTOOL64 = @OTOOL64@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+@@ -254,6 +258,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -61060,84 +14893,16 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PLATFORM = @PLATFORM@
-@@ -267,22 +275,13 @@
- STRIP = @STRIP@
- SWIG = @SWIG@
- VERSION = @VERSION@
--WITH_JAVA_FALSE = @WITH_JAVA_FALSE@
--WITH_JAVA_TRUE = @WITH_JAVA_TRUE@
--WITH_PYTHON_FALSE = @WITH_PYTHON_FALSE@
--WITH_PYTHON_TRUE = @WITH_PYTHON_TRUE@
--WITH_SWIG_FALSE = @WITH_SWIG_FALSE@
--WITH_SWIG_TRUE = @WITH_SWIG_TRUE@
--ac_ct_AR = @ac_ct_AR@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
--ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -294,28 +293,41 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- AM_CPPFLAGS = -I$(top_srcdir)/src \
+@@ -327,7 +332,7 @@
  	      -I$(top_srcdir)/examples/helloworld \
  	      -I$(top_srcdir)/third_party/boost_1_34_1
-@@ -450,14 +462,14 @@
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
--	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
--		&& exit 0; \
-+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-+	        && { if test -f $@; then exit 0; else break; fi; }; \
+ 
+- at GCC_TRUE@AM_CXXFLAGS = -Wall -Werror -ansi -pedantic -fno-rtti
++ at GCC_TRUE@AM_CXXFLAGS = -Wall -ansi -pedantic -fno-rtti
+ noinst_LTLIBRARIES = libhelloutil.la
+ libhelloutil_la_SOURCES = print.cc
+ libhelloutil_la_LIBADD = $(top_builddir)/third_party/libminizip.la
+@@ -462,9 +467,9 @@
  	      exit 1;; \
  	  esac; \
  	done; \
@@ -61150,7 +14915,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -475,6 +487,7 @@
+@@ -482,6 +487,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -61158,12 +14923,8 @@
  
  clean-noinstLTLIBRARIES:
  	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-@@ -485,74 +498,76 @@
- 	  rm -f "$${dir}/so_locations"; \
- 	done
- libhelloutil.la: $(libhelloutil_la_OBJECTS) $(libhelloutil_la_DEPENDENCIES) 
--	$(CXXLINK)  $(libhelloutil_la_LDFLAGS) $(libhelloutil_la_OBJECTS) $(libhelloutil_la_LIBADD) $(LIBS)
-+	$(CXXLINK)  $(libhelloutil_la_OBJECTS) $(libhelloutil_la_LIBADD) $(LIBS)
+@@ -495,11 +501,13 @@
+ 	$(CXXLINK)  $(libhelloutil_la_OBJECTS) $(libhelloutil_la_LIBADD) $(LIBS)
  
  clean-noinstPROGRAMS:
 -	@list='$(noinst_PROGRAMS)'; for p in $$list; do \
@@ -61180,136 +14941,34 @@
 +	rm -f $$list
  checklinks$(EXEEXT): $(checklinks_OBJECTS) $(checklinks_DEPENDENCIES) 
  	@rm -f checklinks$(EXEEXT)
--	$(CXXLINK) $(checklinks_LDFLAGS) $(checklinks_OBJECTS) $(checklinks_LDADD) $(LIBS)
-+	$(CXXLINK) $(checklinks_OBJECTS) $(checklinks_LDADD) $(LIBS)
- circlegen$(EXEEXT): $(circlegen_OBJECTS) $(circlegen_DEPENDENCIES) 
- 	@rm -f circlegen$(EXEEXT)
--	$(CXXLINK) $(circlegen_LDFLAGS) $(circlegen_OBJECTS) $(circlegen_LDADD) $(LIBS)
-+	$(CXXLINK) $(circlegen_OBJECTS) $(circlegen_LDADD) $(LIBS)
- countkml$(EXEEXT): $(countkml_OBJECTS) $(countkml_DEPENDENCIES) 
- 	@rm -f countkml$(EXEEXT)
--	$(CXXLINK) $(countkml_LDFLAGS) $(countkml_OBJECTS) $(countkml_LDADD) $(LIBS)
-+	$(CXXLINK) $(countkml_OBJECTS) $(countkml_LDADD) $(LIBS)
- createkml$(EXEEXT): $(createkml_OBJECTS) $(createkml_DEPENDENCIES) 
- 	@rm -f createkml$(EXEEXT)
--	$(CXXLINK) $(createkml_LDFLAGS) $(createkml_OBJECTS) $(createkml_LDADD) $(LIBS)
-+	$(CXXLINK) $(createkml_OBJECTS) $(createkml_LDADD) $(LIBS)
- helloattrs$(EXEEXT): $(helloattrs_OBJECTS) $(helloattrs_DEPENDENCIES) 
- 	@rm -f helloattrs$(EXEEXT)
--	$(CXXLINK) $(helloattrs_LDFLAGS) $(helloattrs_OBJECTS) $(helloattrs_LDADD) $(LIBS)
-+	$(CXXLINK) $(helloattrs_OBJECTS) $(helloattrs_LDADD) $(LIBS)
- helloenum$(EXEEXT): $(helloenum_OBJECTS) $(helloenum_DEPENDENCIES) 
- 	@rm -f helloenum$(EXEEXT)
--	$(CXXLINK) $(helloenum_LDFLAGS) $(helloenum_OBJECTS) $(helloenum_LDADD) $(LIBS)
-+	$(CXXLINK) $(helloenum_OBJECTS) $(helloenum_LDADD) $(LIBS)
- hellofeatures$(EXEEXT): $(hellofeatures_OBJECTS) $(hellofeatures_DEPENDENCIES) 
- 	@rm -f hellofeatures$(EXEEXT)
--	$(CXXLINK) $(hellofeatures_LDFLAGS) $(hellofeatures_OBJECTS) $(hellofeatures_LDADD) $(LIBS)
-+	$(CXXLINK) $(hellofeatures_OBJECTS) $(hellofeatures_LDADD) $(LIBS)
- hellofolder$(EXEEXT): $(hellofolder_OBJECTS) $(hellofolder_DEPENDENCIES) 
- 	@rm -f hellofolder$(EXEEXT)
--	$(CXXLINK) $(hellofolder_LDFLAGS) $(hellofolder_OBJECTS) $(hellofolder_LDADD) $(LIBS)
-+	$(CXXLINK) $(hellofolder_OBJECTS) $(hellofolder_LDADD) $(LIBS)
- hellogeometry$(EXEEXT): $(hellogeometry_OBJECTS) $(hellogeometry_DEPENDENCIES) 
- 	@rm -f hellogeometry$(EXEEXT)
--	$(CXXLINK) $(hellogeometry_LDFLAGS) $(hellogeometry_OBJECTS) $(hellogeometry_LDADD) $(LIBS)
-+	$(CXXLINK) $(hellogeometry_OBJECTS) $(hellogeometry_LDADD) $(LIBS)
- hellohref$(EXEEXT): $(hellohref_OBJECTS) $(hellohref_DEPENDENCIES) 
- 	@rm -f hellohref$(EXEEXT)
--	$(CXXLINK) $(hellohref_LDFLAGS) $(hellohref_OBJECTS) $(hellohref_LDADD) $(LIBS)
-+	$(CXXLINK) $(hellohref_OBJECTS) $(hellohref_LDADD) $(LIBS)
- hellokmz$(EXEEXT): $(hellokmz_OBJECTS) $(hellokmz_DEPENDENCIES) 
- 	@rm -f hellokmz$(EXEEXT)
--	$(CXXLINK) $(hellokmz_LDFLAGS) $(hellokmz_OBJECTS) $(hellokmz_LDADD) $(LIBS)
-+	$(CXXLINK) $(hellokmz_OBJECTS) $(hellokmz_LDADD) $(LIBS)
- helloregion$(EXEEXT): $(helloregion_OBJECTS) $(helloregion_DEPENDENCIES) 
- 	@rm -f helloregion$(EXEEXT)
--	$(CXXLINK) $(helloregion_LDFLAGS) $(helloregion_OBJECTS) $(helloregion_LDADD) $(LIBS)
-+	$(CXXLINK) $(helloregion_OBJECTS) $(helloregion_LDADD) $(LIBS)
- helloworld$(EXEEXT): $(helloworld_OBJECTS) $(helloworld_DEPENDENCIES) 
- 	@rm -f helloworld$(EXEEXT)
--	$(CXXLINK) $(helloworld_LDFLAGS) $(helloworld_OBJECTS) $(helloworld_LDADD) $(LIBS)
-+	$(CXXLINK) $(helloworld_OBJECTS) $(helloworld_LDADD) $(LIBS)
- parsekml$(EXEEXT): $(parsekml_OBJECTS) $(parsekml_DEPENDENCIES) 
- 	@rm -f parsekml$(EXEEXT)
--	$(CXXLINK) $(parsekml_LDFLAGS) $(parsekml_OBJECTS) $(parsekml_LDADD) $(LIBS)
-+	$(CXXLINK) $(parsekml_OBJECTS) $(parsekml_LDADD) $(LIBS)
- parsens$(EXEEXT): $(parsens_OBJECTS) $(parsens_DEPENDENCIES) 
- 	@rm -f parsens$(EXEEXT)
--	$(CXXLINK) $(parsens_LDFLAGS) $(parsens_OBJECTS) $(parsens_LDADD) $(LIBS)
-+	$(CXXLINK) $(parsens_OBJECTS) $(parsens_LDADD) $(LIBS)
- prettykml$(EXEEXT): $(prettykml_OBJECTS) $(prettykml_DEPENDENCIES) 
- 	@rm -f prettykml$(EXEEXT)
--	$(CXXLINK) $(prettykml_LDFLAGS) $(prettykml_OBJECTS) $(prettykml_LDADD) $(LIBS)
-+	$(CXXLINK) $(prettykml_OBJECTS) $(prettykml_LDADD) $(LIBS)
- printgeometry$(EXEEXT): $(printgeometry_OBJECTS) $(printgeometry_DEPENDENCIES) 
- 	@rm -f printgeometry$(EXEEXT)
--	$(CXXLINK) $(printgeometry_LDFLAGS) $(printgeometry_OBJECTS) $(printgeometry_LDADD) $(LIBS)
-+	$(CXXLINK) $(printgeometry_OBJECTS) $(printgeometry_LDADD) $(LIBS)
- sharedstyles$(EXEEXT): $(sharedstyles_OBJECTS) $(sharedstyles_DEPENDENCIES) 
- 	@rm -f sharedstyles$(EXEEXT)
--	$(CXXLINK) $(sharedstyles_LDFLAGS) $(sharedstyles_OBJECTS) $(sharedstyles_LDADD) $(LIBS)
-+	$(CXXLINK) $(sharedstyles_OBJECTS) $(sharedstyles_LDADD) $(LIBS)
- simplifylines$(EXEEXT): $(simplifylines_OBJECTS) $(simplifylines_DEPENDENCIES) 
- 	@rm -f simplifylines$(EXEEXT)
--	$(CXXLINK) $(simplifylines_LDFLAGS) $(simplifylines_OBJECTS) $(simplifylines_LDADD) $(LIBS)
-+	$(CXXLINK) $(simplifylines_OBJECTS) $(simplifylines_LDADD) $(LIBS)
- sortplacemarks$(EXEEXT): $(sortplacemarks_OBJECTS) $(sortplacemarks_DEPENDENCIES) 
- 	@rm -f sortplacemarks$(EXEEXT)
--	$(CXXLINK) $(sortplacemarks_LDFLAGS) $(sortplacemarks_OBJECTS) $(sortplacemarks_LDADD) $(LIBS)
-+	$(CXXLINK) $(sortplacemarks_OBJECTS) $(sortplacemarks_LDADD) $(LIBS)
+ 	$(CXXLINK) $(checklinks_OBJECTS) $(checklinks_LDADD) $(LIBS)
+@@ -591,21 +599,21 @@
  
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -583,22 +598,22 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/sortplacemarks.Po at am__quote@
- 
  .cc.o:
-- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
  
  .cc.obj:
-- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
  
  .cc.lo:
-- at am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
-@@ -609,82 +624,85 @@
- clean-libtool:
- 	-rm -rf .libs _libs
+@@ -628,7 +636,7 @@
  
--distclean-libtool:
--	-rm -f libtool
--uninstall-info-am:
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- 	unique=`for i in $$list; do \
- 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- 	  done | \
--	  $(AWK) '    { files[$$0] = 1; } \
--	       END { for (i in files) print i; }'`; \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
- 	mkid -fID $$unique
- tags: TAGS
- 
  TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
 -	tags=; \
@@ -61317,13 +14976,11 @@
  	here=`pwd`; \
  	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
- 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+@@ -636,29 +644,34 @@
  	  done | \
--	  $(AWK) '    { files[$$0] = 1; } \
--	       END { for (i in files) print i; }'`; \
+ 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 -	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 +	shift; \
 +	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
  	  test -n "$$unique" || unique=$$empty_fix; \
@@ -61341,16 +14998,13 @@
  CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
 -	tags=; \
--	here=`pwd`; \
  	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  	  done | \
--	  $(AWK) '    { files[$$0] = 1; } \
--	       END { for (i in files) print i; }'`; \
+ 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 -	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 +	test -z "$(CTAGS_ARGS)$$unique" \
  	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 -	     $$tags $$unique
@@ -61365,37 +15019,10 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
--	list='$(DISTFILES)'; for file in $$list; do \
--	  case $$file in \
--	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
--	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
--	  esac; \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
+@@ -679,13 +692,17 @@
  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
--	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
--	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
--	    dir="/$$dir"; \
--	    $(mkdir_p) "$(distdir)$$dir"; \
--	  else \
--	    dir=''; \
--	  fi; \
  	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 +	    if test -d "$(distdir)/$$file"; then \
 +	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 +	    fi; \
@@ -61414,7 +15041,7 @@
  	    || exit 1; \
  	  fi; \
  	done
-@@ -712,6 +730,7 @@
+@@ -713,6 +730,7 @@
  
  distclean-generic:
  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -61422,17 +15049,8 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -725,7 +744,7 @@
- 	-rm -rf ./$(DEPDIR)
- 	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
--	distclean-libtool distclean-tags
-+	distclean-tags
+@@ -734,6 +752,8 @@
  
- dvi: dvi-am
- 
-@@ -733,18 +752,38 @@
- 
  html: html-am
  
 +html-am:
@@ -61440,17 +15058,16 @@
  info: info-am
  
  info-am:
+@@ -742,18 +762,28 @@
  
- install-data-am:
+ install-dvi: install-dvi-am
  
-+install-dvi: install-dvi-am
-+
 +install-dvi-am:
 +
  install-exec-am:
  
-+install-html: install-html-am
-+
+ install-html: install-html-am
+ 
 +install-html-am:
 +
  install-info: install-info-am
@@ -61459,90 +15076,53 @@
 +
  install-man:
  
-+install-pdf: install-pdf-am
-+
+ install-pdf: install-pdf-am
+ 
 +install-pdf-am:
 +
-+install-ps: install-ps-am
-+
+ install-ps: install-ps-am
+ 
 +install-ps-am:
 +
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
-@@ -765,19 +804,24 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-info-am
-+uninstall-am:
-+
-+.MAKE: install-am install-strip
- 
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- 	clean-libtool clean-noinstLTLIBRARIES clean-noinstPROGRAMS \
- 	ctags distclean distclean-compile distclean-generic \
- 	distclean-libtool distclean-tags distdir dvi dvi-am html \
- 	html-am info info-am install install-am install-data \
--	install-data-am install-exec install-exec-am install-info \
--	install-info-am install-man install-strip installcheck \
-+	install-data-am install-dvi install-dvi-am install-exec \
-+	install-exec-am install-html install-html-am install-info \
-+	install-info-am install-man install-pdf install-pdf-am \
-+	install-ps install-ps-am install-strip installcheck \
- 	installcheck-am installdirs maintainer-clean \
- 	maintainer-clean-generic mostlyclean mostlyclean-compile \
+@@ -792,6 +822,7 @@
  	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
--	tags uninstall uninstall-am uninstall-info-am
-+	tags uninstall uninstall-am
-+
+ 	tags uninstall uninstall-am
  
++
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-Index: libkml-1.0.1/examples/java/Makefile.in
+ .NOEXPORT:
+Index: libkml-1.1.0/examples/java/Makefile.in
 ===================================================================
---- libkml-1.0.1.orig/examples/java/Makefile.in	2009-07-03 01:23:30.000000000 +0200
-+++ libkml-1.0.1/examples/java/Makefile.in	2009-12-10 10:19:45.000000000 +0100
+--- libkml-1.1.0.orig/examples/java/Makefile.in	2009-12-10 13:05:40.000000000 +0100
++++ libkml-1.1.0/examples/java/Makefile.in	2009-12-10 17:29:35.000000000 +0100
 @@ -1,8 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
+-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
-@@ -13,15 +14,12 @@
- # PARTICULAR PURPOSE.
- 
+@@ -15,8 +16,9 @@
  @SET_MAKE@
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
  VPATH = @srcdir@
  pkgdatadir = $(datadir)/@PACKAGE@
 -pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../..
 +pkglibdir = $(libdir)/@PACKAGE@
 +pkglibexecdir = $(libexecdir)/@PACKAGE@
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -39,18 +37,19 @@
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_curl.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)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
+@@ -43,6 +45,7 @@
  mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
@@ -61550,58 +15130,7 @@
  SOURCES =
  DIST_SOURCES =
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -72,18 +71,16 @@
- CYGPATH_W = @CYGPATH_W@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
--ECHO = @ECHO@
-+DSYMUTIL = @DSYMUTIL@
-+DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
--F77 = @F77@
--FFLAGS = @FFLAGS@
--GCC_FALSE = @GCC_FALSE@
--GCC_TRUE = @GCC_TRUE@
--HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
--HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
-+FGREP = @FGREP@
-+GREP = @GREP@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -93,19 +90,28 @@
- JAVAC = @JAVAC@
- JAVA_INCLUDE_DIR = @JAVA_INCLUDE_DIR@
- JAVA_LIB_DIR = @JAVA_LIB_DIR@
-+LD = @LD@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
-+LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
-+NM = @NM@
-+NMEDIT = @NMEDIT@
-+OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
-+OTOOL = @OTOOL@
-+OTOOL64 = @OTOOL64@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -108,6 +111,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -61609,84 +15138,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PLATFORM = @PLATFORM@
-@@ -122,22 +128,13 @@
- STRIP = @STRIP@
- SWIG = @SWIG@
- VERSION = @VERSION@
--WITH_JAVA_FALSE = @WITH_JAVA_FALSE@
--WITH_JAVA_TRUE = @WITH_JAVA_TRUE@
--WITH_PYTHON_FALSE = @WITH_PYTHON_FALSE@
--WITH_PYTHON_TRUE = @WITH_PYTHON_TRUE@
--WITH_SWIG_FALSE = @WITH_SWIG_FALSE@
--WITH_SWIG_TRUE = @WITH_SWIG_TRUE@
--ac_ct_AR = @ac_ct_AR@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
--ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -149,28 +146,41 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- EXTRA_DIST = \
- 	CreatePlacemark.java \
- 	WalkFeatures.java \
-@@ -183,14 +193,14 @@
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
--	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
--		&& exit 0; \
-+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-+	        && { if test -f $@; then exit 0; else break; fi; }; \
+@@ -194,9 +198,9 @@
  	      exit 1;; \
  	  esac; \
  	done; \
@@ -61699,7 +15151,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -208,16 +218,13 @@
+@@ -214,6 +218,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -61707,49 +15159,10 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
- 
- clean-libtool:
- 	-rm -rf .libs _libs
--
--distclean-libtool:
--	-rm -f libtool
--uninstall-info-am:
- tags: TAGS
- TAGS:
- 
-@@ -226,29 +233,32 @@
- 
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
--	list='$(DISTFILES)'; for file in $$list; do \
--	  case $$file in \
--	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
--	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
--	  esac; \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
+@@ -243,13 +248,17 @@
  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
--	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
--	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
--	    dir="/$$dir"; \
--	    $(mkdir_p) "$(distdir)$$dir"; \
--	  else \
--	    dir=''; \
--	  fi; \
  	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 +	    if test -d "$(distdir)/$$file"; then \
 +	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 +	    fi; \
@@ -61768,7 +15181,7 @@
  	    || exit 1; \
  	  fi; \
  	done
-@@ -276,6 +286,7 @@
+@@ -277,6 +286,7 @@
  
  distclean-generic:
  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -61776,17 +15189,8 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -286,7 +297,7 @@
+@@ -295,6 +305,8 @@
  
- distclean: distclean-am
- 	-rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool
-+distclean-am: clean-am distclean-generic
- 
- dvi: dvi-am
- 
-@@ -294,18 +305,38 @@
- 
  html: html-am
  
 +html-am:
@@ -61794,17 +15198,16 @@
  info: info-am
  
  info-am:
+@@ -303,18 +315,28 @@
  
- install-data-am:
+ install-dvi: install-dvi-am
  
-+install-dvi: install-dvi-am
-+
 +install-dvi-am:
 +
  install-exec-am:
  
-+install-html: install-html-am
-+
+ install-html: install-html-am
+ 
 +install-html-am:
 +
  install-info: install-info-am
@@ -61813,88 +15216,53 @@
 +
  install-man:
  
-+install-pdf: install-pdf-am
-+
+ install-pdf: install-pdf-am
+ 
 +install-pdf-am:
 +
-+install-ps: install-ps-am
-+
+ install-ps: install-ps-am
+ 
 +install-ps-am:
 +
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
-@@ -324,17 +355,21 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-info-am
-+uninstall-am:
-+
-+.MAKE: install-am install-strip
- 
- .PHONY: all all-am check check-am clean clean-generic clean-libtool \
- 	distclean distclean-generic distclean-libtool distdir dvi \
- 	dvi-am html html-am info info-am install install-am \
--	install-data install-data-am install-exec install-exec-am \
--	install-info install-info-am install-man install-strip \
-+	install-data install-data-am install-dvi install-dvi-am \
-+	install-exec install-exec-am install-html install-html-am \
-+	install-info install-info-am install-man install-pdf \
-+	install-pdf-am install-ps install-ps-am install-strip \
- 	installcheck installcheck-am installdirs maintainer-clean \
+@@ -348,6 +370,7 @@
  	maintainer-clean-generic mostlyclean mostlyclean-generic \
--	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
--	uninstall-info-am
-+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
-+
+ 	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
  
++
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-Index: libkml-1.0.1/examples/kml/Makefile.in
+ .NOEXPORT:
+Index: libkml-1.1.0/examples/kml/Makefile.in
 ===================================================================
---- libkml-1.0.1.orig/examples/kml/Makefile.in	2009-07-03 01:23:30.000000000 +0200
-+++ libkml-1.0.1/examples/kml/Makefile.in	2009-12-10 10:19:45.000000000 +0100
+--- libkml-1.1.0.orig/examples/kml/Makefile.in	2009-12-10 13:05:40.000000000 +0100
++++ libkml-1.1.0/examples/kml/Makefile.in	2009-12-10 17:29:35.000000000 +0100
 @@ -1,8 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
+-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
-@@ -13,15 +14,12 @@
- # PARTICULAR PURPOSE.
- 
+@@ -15,8 +16,9 @@
  @SET_MAKE@
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
  VPATH = @srcdir@
  pkgdatadir = $(datadir)/@PACKAGE@
 -pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../..
 +pkglibdir = $(libdir)/@PACKAGE@
 +pkglibexecdir = $(libexecdir)/@PACKAGE@
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -39,18 +37,19 @@
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_curl.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)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
+@@ -43,6 +45,7 @@
  mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
@@ -61902,58 +15270,7 @@
  SOURCES =
  DIST_SOURCES =
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -72,18 +71,16 @@
- CYGPATH_W = @CYGPATH_W@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
--ECHO = @ECHO@
-+DSYMUTIL = @DSYMUTIL@
-+DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
--F77 = @F77@
--FFLAGS = @FFLAGS@
--GCC_FALSE = @GCC_FALSE@
--GCC_TRUE = @GCC_TRUE@
--HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
--HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
-+FGREP = @FGREP@
-+GREP = @GREP@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -93,19 +90,28 @@
- JAVAC = @JAVAC@
- JAVA_INCLUDE_DIR = @JAVA_INCLUDE_DIR@
- JAVA_LIB_DIR = @JAVA_LIB_DIR@
-+LD = @LD@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
-+LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
-+NM = @NM@
-+NMEDIT = @NMEDIT@
-+OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
-+OTOOL = @OTOOL@
-+OTOOL64 = @OTOOL64@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -108,6 +111,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -61961,84 +15278,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PLATFORM = @PLATFORM@
-@@ -122,22 +128,13 @@
- STRIP = @STRIP@
- SWIG = @SWIG@
- VERSION = @VERSION@
--WITH_JAVA_FALSE = @WITH_JAVA_FALSE@
--WITH_JAVA_TRUE = @WITH_JAVA_TRUE@
--WITH_PYTHON_FALSE = @WITH_PYTHON_FALSE@
--WITH_PYTHON_TRUE = @WITH_PYTHON_TRUE@
--WITH_SWIG_FALSE = @WITH_SWIG_FALSE@
--WITH_SWIG_TRUE = @WITH_SWIG_TRUE@
--ac_ct_AR = @ac_ct_AR@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
--ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -149,28 +146,41 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- EXTRA_DIST = \
- 	abstractview.kml \
- 	allstyles.kml \
-@@ -200,14 +210,14 @@
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
--	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
--		&& exit 0; \
-+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-+	        && { if test -f $@; then exit 0; else break; fi; }; \
+@@ -211,9 +215,9 @@
  	      exit 1;; \
  	  esac; \
  	done; \
@@ -62051,7 +15291,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -225,16 +235,13 @@
+@@ -231,6 +235,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -62059,49 +15299,10 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
- 
- clean-libtool:
- 	-rm -rf .libs _libs
--
--distclean-libtool:
--	-rm -f libtool
--uninstall-info-am:
- tags: TAGS
- TAGS:
- 
-@@ -243,29 +250,32 @@
- 
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
--	list='$(DISTFILES)'; for file in $$list; do \
--	  case $$file in \
--	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
--	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
--	  esac; \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
+@@ -260,13 +265,17 @@
  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
--	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
--	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
--	    dir="/$$dir"; \
--	    $(mkdir_p) "$(distdir)$$dir"; \
--	  else \
--	    dir=''; \
--	  fi; \
  	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 +	    if test -d "$(distdir)/$$file"; then \
 +	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 +	    fi; \
@@ -62120,7 +15321,7 @@
  	    || exit 1; \
  	  fi; \
  	done
-@@ -293,6 +303,7 @@
+@@ -294,6 +303,7 @@
  
  distclean-generic:
  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -62128,17 +15329,8 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -303,7 +314,7 @@
+@@ -312,6 +322,8 @@
  
- distclean: distclean-am
- 	-rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool
-+distclean-am: clean-am distclean-generic
- 
- dvi: dvi-am
- 
-@@ -311,18 +322,38 @@
- 
  html: html-am
  
 +html-am:
@@ -62146,17 +15338,16 @@
  info: info-am
  
  info-am:
+@@ -320,18 +332,28 @@
  
- install-data-am:
+ install-dvi: install-dvi-am
  
-+install-dvi: install-dvi-am
-+
 +install-dvi-am:
 +
  install-exec-am:
  
-+install-html: install-html-am
-+
+ install-html: install-html-am
+ 
 +install-html-am:
 +
  install-info: install-info-am
@@ -62165,88 +15356,53 @@
 +
  install-man:
  
-+install-pdf: install-pdf-am
-+
+ install-pdf: install-pdf-am
+ 
 +install-pdf-am:
 +
-+install-ps: install-ps-am
-+
+ install-ps: install-ps-am
+ 
 +install-ps-am:
 +
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
-@@ -341,17 +372,21 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-info-am
-+uninstall-am:
-+
-+.MAKE: install-am install-strip
- 
- .PHONY: all all-am check check-am clean clean-generic clean-libtool \
- 	distclean distclean-generic distclean-libtool distdir dvi \
- 	dvi-am html html-am info info-am install install-am \
--	install-data install-data-am install-exec install-exec-am \
--	install-info install-info-am install-man install-strip \
-+	install-data install-data-am install-dvi install-dvi-am \
-+	install-exec install-exec-am install-html install-html-am \
-+	install-info install-info-am install-man install-pdf \
-+	install-pdf-am install-ps install-ps-am install-strip \
- 	installcheck installcheck-am installdirs maintainer-clean \
+@@ -365,6 +387,7 @@
  	maintainer-clean-generic mostlyclean mostlyclean-generic \
--	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
--	uninstall-info-am
-+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
-+
+ 	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
  
++
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-Index: libkml-1.0.1/examples/Makefile.in
+ .NOEXPORT:
+Index: libkml-1.1.0/examples/Makefile.in
 ===================================================================
---- libkml-1.0.1.orig/examples/Makefile.in	2009-07-03 01:23:28.000000000 +0200
-+++ libkml-1.0.1/examples/Makefile.in	2009-12-10 10:19:44.000000000 +0100
+--- libkml-1.1.0.orig/examples/Makefile.in	2009-12-10 13:05:40.000000000 +0100
++++ libkml-1.1.0/examples/Makefile.in	2009-12-10 17:29:34.000000000 +0100
 @@ -1,8 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
+-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
-@@ -13,15 +14,12 @@
- # PARTICULAR PURPOSE.
- 
+@@ -15,8 +16,9 @@
  @SET_MAKE@
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
  VPATH = @srcdir@
  pkgdatadir = $(datadir)/@PACKAGE@
 -pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ..
 +pkglibdir = $(libdir)/@PACKAGE@
 +pkglibexecdir = $(libexecdir)/@PACKAGE@
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -39,27 +37,59 @@
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_curl.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)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
+@@ -43,6 +45,7 @@
  mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
@@ -62254,18 +15410,10 @@
  SOURCES =
  DIST_SOURCES =
  RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- 	html-recursive info-recursive install-data-recursive \
--	install-exec-recursive install-info-recursive \
--	install-recursive installcheck-recursive installdirs-recursive \
--	pdf-recursive ps-recursive uninstall-info-recursive \
--	uninstall-recursive
-+	install-dvi-recursive install-exec-recursive \
-+	install-html-recursive install-info-recursive \
-+	install-pdf-recursive install-ps-recursive install-recursive \
-+	installcheck-recursive installdirs-recursive pdf-recursive \
-+	ps-recursive uninstall-recursive
-+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-+  distclean-recursive maintainer-clean-recursive
+@@ -54,10 +57,38 @@
+ 	ps-recursive uninstall-recursive
+ RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+   distclean-recursive maintainer-clean-recursive
 +AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
 +	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
 +	distdir
@@ -62299,57 +15447,9 @@
 +  done; \
 +  reldir="$$dir2"
  ACLOCAL = @ACLOCAL@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
  AMTAR = @AMTAR@
  AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -81,18 +111,16 @@
- CYGPATH_W = @CYGPATH_W@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
--ECHO = @ECHO@
-+DSYMUTIL = @DSYMUTIL@
-+DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
--F77 = @F77@
--FFLAGS = @FFLAGS@
--GCC_FALSE = @GCC_FALSE@
--GCC_TRUE = @GCC_TRUE@
--HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
--HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
-+FGREP = @FGREP@
-+GREP = @GREP@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -102,19 +130,28 @@
- JAVAC = @JAVAC@
- JAVA_INCLUDE_DIR = @JAVA_INCLUDE_DIR@
- JAVA_LIB_DIR = @JAVA_LIB_DIR@
-+LD = @LD@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
-+LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
-+NM = @NM@
-+NMEDIT = @NMEDIT@
-+OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
-+OTOOL = @OTOOL@
-+OTOOL64 = @OTOOL64@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -120,6 +151,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -62357,84 +15457,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PLATFORM = @PLATFORM@
-@@ -131,22 +168,13 @@
- STRIP = @STRIP@
- SWIG = @SWIG@
- VERSION = @VERSION@
--WITH_JAVA_FALSE = @WITH_JAVA_FALSE@
--WITH_JAVA_TRUE = @WITH_JAVA_TRUE@
--WITH_PYTHON_FALSE = @WITH_PYTHON_FALSE@
--WITH_PYTHON_TRUE = @WITH_PYTHON_TRUE@
--WITH_SWIG_FALSE = @WITH_SWIG_FALSE@
--WITH_SWIG_TRUE = @WITH_SWIG_TRUE@
--ac_ct_AR = @ac_ct_AR@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
--ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -158,28 +186,41 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- SUBDIRS = \
- 	domviewer \
- 	engine \
-@@ -202,14 +243,14 @@
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
--	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
--		&& exit 0; \
-+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-+	        && { if test -f $@; then exit 0; else break; fi; }; \
+@@ -216,9 +248,9 @@
  	      exit 1;; \
  	  esac; \
  	done; \
@@ -62447,7 +15470,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -227,6 +268,7 @@
+@@ -236,6 +268,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -62455,18 +15478,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -234,10 +276,6 @@
- clean-libtool:
- 	-rm -rf .libs _libs
- 
--distclean-libtool:
--	-rm -f libtool
--uninstall-info-am:
--
- # This directory's subdirectories are mostly independent; you can cd
- # into them and run `make' without going through this Makefile.
- # To change the values of `make' variables: instead of editing Makefiles,
-@@ -262,15 +300,14 @@
+@@ -267,7 +300,7 @@
  	  else \
  	    local_target="$$target"; \
  	  fi; \
@@ -62475,16 +15487,7 @@
  	  || eval $$failcom; \
  	done; \
  	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
- 	fi; test -z "$$fail"
- 
--mostlyclean-recursive clean-recursive distclean-recursive \
--maintainer-clean-recursive:
-+$(RECURSIVE_CLEAN_TARGETS):
- 	@failcom='exit 1'; \
- 	for f in x $$MAKEFLAGS; do \
- 	  case $$f in \
-@@ -297,16 +334,16 @@
+@@ -301,16 +334,16 @@
  	  else \
  	    local_target="$$target"; \
  	  fi; \
@@ -62504,16 +15507,7 @@
  	done
  
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-@@ -314,14 +351,14 @@
- 	unique=`for i in $$list; do \
- 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- 	  done | \
--	  $(AWK) '    { files[$$0] = 1; } \
--	       END { for (i in files) print i; }'`; \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
- 	mkid -fID $$unique
- tags: TAGS
+@@ -325,7 +358,7 @@
  
  TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
@@ -62522,7 +15516,7 @@
  	here=`pwd`; \
  	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
  	  include_option=--etags-include; \
-@@ -333,81 +370,101 @@
+@@ -337,7 +370,7 @@
  	list='$(SUBDIRS)'; for subdir in $$list; do \
  	  if test "$$subdir" = .; then :; else \
  	    test ! -f $$subdir/TAGS || \
@@ -62531,14 +15525,11 @@
  	  fi; \
  	done; \
  	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
- 	unique=`for i in $$list; do \
- 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+@@ -346,29 +379,34 @@
  	  done | \
--	  $(AWK) '    { files[$$0] = 1; } \
--	       END { for (i in files) print i; }'`; \
+ 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 -	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 +	shift; \
 +	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
  	  test -n "$$unique" || unique=$$empty_fix; \
@@ -62556,16 +15547,13 @@
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
 -	tags=; \
--	here=`pwd`; \
  	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  	  done | \
--	  $(AWK) '    { files[$$0] = 1; } \
--	       END { for (i in files) print i; }'`; \
+ 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 -	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 +	test -z "$(CTAGS_ARGS)$$unique" \
  	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 -	     $$tags $$unique
@@ -62580,37 +15568,10 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
--	list='$(DISTFILES)'; for file in $$list; do \
--	  case $$file in \
--	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
--	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
--	  esac; \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
+@@ -389,29 +427,44 @@
  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
--	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
--	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
--	    dir="/$$dir"; \
--	    $(mkdir_p) "$(distdir)$$dir"; \
--	  else \
--	    dir=''; \
--	  fi; \
  	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 +	    if test -d "$(distdir)/$$file"; then \
 +	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 +	    fi; \
@@ -62633,8 +15594,7 @@
 +	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
  	  if test "$$subdir" = .; then :; else \
  	    test -d "$(distdir)/$$subdir" \
--	    || $(mkdir_p) "$(distdir)/$$subdir" \
-+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+ 	    || $(MKDIR_P) "$(distdir)/$$subdir" \
  	    || exit 1; \
 -	    distdir=`$(am__cd) $(distdir) && pwd`; \
 -	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -62657,13 +15617,13 @@
 -	        distdir="$$distdir/$$subdir" \
 +	        top_distdir="$$new_top_distdir" \
 +	        distdir="$$new_distdir" \
-+		am__remove_distdir=: \
-+		am__skip_length_check=: \
+ 		am__remove_distdir=: \
+ 		am__skip_length_check=: \
 +		am__skip_mode_fix=: \
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -437,6 +494,7 @@
+@@ -441,6 +494,7 @@
  
  distclean-generic:
  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -62671,18 +15631,8 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -447,8 +505,7 @@
+@@ -459,6 +513,8 @@
  
- distclean: distclean-recursive
- 	-rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool \
--	distclean-tags
-+distclean-am: clean-am distclean-generic distclean-tags
- 
- dvi: dvi-recursive
- 
-@@ -456,18 +513,38 @@
- 
  html: html-recursive
  
 +html-am:
@@ -62690,17 +15640,16 @@
  info: info-recursive
  
  info-am:
+@@ -467,18 +523,28 @@
  
- install-data-am:
+ install-dvi: install-dvi-recursive
  
-+install-dvi: install-dvi-recursive
-+
 +install-dvi-am:
 +
  install-exec-am:
  
-+install-html: install-html-recursive
-+
+ install-html: install-html-recursive
+ 
 +install-html-am:
 +
  install-info: install-info-recursive
@@ -62709,99 +15658,64 @@
 +
  install-man:
  
-+install-pdf: install-pdf-recursive
-+
+ install-pdf: install-pdf-recursive
+ 
 +install-pdf-am:
 +
-+install-ps: install-ps-recursive
-+
+ install-ps: install-ps-recursive
+ 
 +install-ps-am:
 +
  installcheck-am:
  
  maintainer-clean: maintainer-clean-recursive
-@@ -486,22 +563,25 @@
+@@ -499,8 +565,8 @@
  
- ps-am:
+ uninstall-am:
  
--uninstall-am: uninstall-info-am
-+uninstall-am:
- 
--uninstall-info: uninstall-info-recursive
+-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+-	install-strip
 +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
 +	install-am install-strip tags-recursive
  
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
--	clean clean-generic clean-libtool clean-recursive ctags \
--	ctags-recursive distclean distclean-generic distclean-libtool \
--	distclean-recursive distclean-tags distdir dvi dvi-am html \
-+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-+	all all-am check check-am clean clean-generic clean-libtool \
-+	ctags ctags-recursive distclean distclean-generic \
-+	distclean-libtool distclean-tags distdir dvi dvi-am html \
- 	html-am info info-am install install-am install-data \
--	install-data-am install-exec install-exec-am install-info \
--	install-info-am install-man install-strip installcheck \
-+	install-data-am install-dvi install-dvi-am install-exec \
-+	install-exec-am install-html install-html-am install-info \
-+	install-info-am install-man install-pdf install-pdf-am \
-+	install-ps install-ps-am install-strip installcheck \
- 	installcheck-am installdirs installdirs-am maintainer-clean \
--	maintainer-clean-generic maintainer-clean-recursive \
--	mostlyclean mostlyclean-generic mostlyclean-libtool \
--	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
--	uninstall uninstall-am uninstall-info-am
-+	maintainer-clean-generic mostlyclean mostlyclean-generic \
-+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-+	uninstall uninstall-am
-+
+ .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ 	all all-am check check-am clean clean-generic clean-libtool \
+@@ -516,6 +582,7 @@
+ 	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+ 	uninstall uninstall-am
  
++
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-Index: libkml-1.0.1/examples/python/Makefile.in
+ .NOEXPORT:
+Index: libkml-1.1.0/examples/python/Makefile.in
 ===================================================================
---- libkml-1.0.1.orig/examples/python/Makefile.in	2009-07-03 01:23:30.000000000 +0200
-+++ libkml-1.0.1/examples/python/Makefile.in	2009-12-10 10:19:45.000000000 +0100
+--- libkml-1.1.0.orig/examples/python/Makefile.in	2009-12-10 13:05:40.000000000 +0100
++++ libkml-1.1.0/examples/python/Makefile.in	2009-12-10 17:29:35.000000000 +0100
 @@ -1,8 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
+-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
-@@ -13,15 +14,12 @@
- # PARTICULAR PURPOSE.
- 
+@@ -15,8 +16,9 @@
  @SET_MAKE@
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
  VPATH = @srcdir@
  pkgdatadir = $(datadir)/@PACKAGE@
 -pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../..
 +pkglibdir = $(libdir)/@PACKAGE@
 +pkglibexecdir = $(libexecdir)/@PACKAGE@
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -39,18 +37,19 @@
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_curl.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)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
+@@ -43,6 +45,7 @@
  mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
@@ -62809,58 +15723,7 @@
  SOURCES =
  DIST_SOURCES =
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -72,18 +71,16 @@
- CYGPATH_W = @CYGPATH_W@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
--ECHO = @ECHO@
-+DSYMUTIL = @DSYMUTIL@
-+DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
--F77 = @F77@
--FFLAGS = @FFLAGS@
--GCC_FALSE = @GCC_FALSE@
--GCC_TRUE = @GCC_TRUE@
--HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
--HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
-+FGREP = @FGREP@
-+GREP = @GREP@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -93,19 +90,28 @@
- JAVAC = @JAVAC@
- JAVA_INCLUDE_DIR = @JAVA_INCLUDE_DIR@
- JAVA_LIB_DIR = @JAVA_LIB_DIR@
-+LD = @LD@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
-+LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
-+NM = @NM@
-+NMEDIT = @NMEDIT@
-+OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
-+OTOOL = @OTOOL@
-+OTOOL64 = @OTOOL64@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -108,6 +111,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -62868,84 +15731,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PLATFORM = @PLATFORM@
-@@ -122,22 +128,13 @@
- STRIP = @STRIP@
- SWIG = @SWIG@
- VERSION = @VERSION@
--WITH_JAVA_FALSE = @WITH_JAVA_FALSE@
--WITH_JAVA_TRUE = @WITH_JAVA_TRUE@
--WITH_PYTHON_FALSE = @WITH_PYTHON_FALSE@
--WITH_PYTHON_TRUE = @WITH_PYTHON_TRUE@
--WITH_SWIG_FALSE = @WITH_SWIG_FALSE@
--WITH_SWIG_TRUE = @WITH_SWIG_TRUE@
--ac_ct_AR = @ac_ct_AR@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
--ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -149,28 +146,41 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- EXTRA_DIST = \
- 	helloenum.py \
- 	hellogeometry.py \
-@@ -186,14 +196,14 @@
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
--	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
--		&& exit 0; \
-+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-+	        && { if test -f $@; then exit 0; else break; fi; }; \
+@@ -197,9 +201,9 @@
  	      exit 1;; \
  	  esac; \
  	done; \
@@ -62958,7 +15744,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -211,16 +221,13 @@
+@@ -217,6 +221,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -62966,49 +15752,10 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
- 
- clean-libtool:
- 	-rm -rf .libs _libs
--
--distclean-libtool:
--	-rm -f libtool
--uninstall-info-am:
- tags: TAGS
- TAGS:
- 
-@@ -229,29 +236,32 @@
- 
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
--	list='$(DISTFILES)'; for file in $$list; do \
--	  case $$file in \
--	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
--	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
--	  esac; \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
+@@ -246,13 +251,17 @@
  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
--	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
--	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
--	    dir="/$$dir"; \
--	    $(mkdir_p) "$(distdir)$$dir"; \
--	  else \
--	    dir=''; \
--	  fi; \
  	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 +	    if test -d "$(distdir)/$$file"; then \
 +	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 +	    fi; \
@@ -63027,7 +15774,7 @@
  	    || exit 1; \
  	  fi; \
  	done
-@@ -279,6 +289,7 @@
+@@ -280,6 +289,7 @@
  
  distclean-generic:
  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -63035,17 +15782,8 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -289,7 +300,7 @@
+@@ -298,6 +308,8 @@
  
- distclean: distclean-am
- 	-rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool
-+distclean-am: clean-am distclean-generic
- 
- dvi: dvi-am
- 
-@@ -297,18 +308,38 @@
- 
  html: html-am
  
 +html-am:
@@ -63053,17 +15791,16 @@
  info: info-am
  
  info-am:
+@@ -306,18 +318,28 @@
  
- install-data-am:
+ install-dvi: install-dvi-am
  
-+install-dvi: install-dvi-am
-+
 +install-dvi-am:
 +
  install-exec-am:
  
-+install-html: install-html-am
-+
+ install-html: install-html-am
+ 
 +install-html-am:
 +
  install-info: install-info-am
@@ -63072,88 +15809,53 @@
 +
  install-man:
  
-+install-pdf: install-pdf-am
-+
+ install-pdf: install-pdf-am
+ 
 +install-pdf-am:
 +
-+install-ps: install-ps-am
-+
+ install-ps: install-ps-am
+ 
 +install-ps-am:
 +
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
-@@ -327,17 +358,21 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-info-am
-+uninstall-am:
-+
-+.MAKE: install-am install-strip
- 
- .PHONY: all all-am check check-am clean clean-generic clean-libtool \
- 	distclean distclean-generic distclean-libtool distdir dvi \
- 	dvi-am html html-am info info-am install install-am \
--	install-data install-data-am install-exec install-exec-am \
--	install-info install-info-am install-man install-strip \
-+	install-data install-data-am install-dvi install-dvi-am \
-+	install-exec install-exec-am install-html install-html-am \
-+	install-info install-info-am install-man install-pdf \
-+	install-pdf-am install-ps install-ps-am install-strip \
- 	installcheck installcheck-am installdirs maintainer-clean \
+@@ -351,6 +373,7 @@
  	maintainer-clean-generic mostlyclean mostlyclean-generic \
--	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
--	uninstall-info-am
-+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
-+
+ 	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
  
++
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-Index: libkml-1.0.1/examples/regionator/Makefile.in
+ .NOEXPORT:
+Index: libkml-1.1.0/examples/regionator/Makefile.in
 ===================================================================
---- libkml-1.0.1.orig/examples/regionator/Makefile.in	2009-07-03 01:23:30.000000000 +0200
-+++ libkml-1.0.1/examples/regionator/Makefile.in	2009-12-10 10:19:45.000000000 +0100
+--- libkml-1.1.0.orig/examples/regionator/Makefile.in	2009-12-10 13:05:40.000000000 +0100
++++ libkml-1.1.0/examples/regionator/Makefile.in	2009-12-10 17:29:35.000000000 +0100
 @@ -1,8 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
+-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
-@@ -14,15 +15,12 @@
+@@ -16,8 +17,9 @@
  
- @SET_MAKE@
- 
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
  VPATH = @srcdir@
  pkgdatadir = $(datadir)/@PACKAGE@
 -pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../..
 +pkglibdir = $(libdir)/@PACKAGE@
 +pkglibexecdir = $(libexecdir)/@PACKAGE@
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -41,12 +39,15 @@
- DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_curl.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)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
+@@ -45,6 +47,7 @@
  mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
@@ -63161,86 +15863,15 @@
  PROGRAMS = $(noinst_PROGRAMS)
  am_csvregionator_OBJECTS = csvregionator.$(OBJEXT)
  csvregionator_OBJECTS = $(am_csvregionator_OBJECTS)
-@@ -56,25 +57,25 @@
- 	$(top_builddir)/src/kml/engine/libkmlengine.la \
- 	$(top_builddir)/src/kml/regionator/libkmlregionator.la \
- 	$(top_builddir)/src/kml/convenience/libkmlconvenience.la
--DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+@@ -57,6 +60,7 @@
+ DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
  depcomp = $(SHELL) $(top_srcdir)/config/depcomp
  am__depfiles_maybe = depfiles
 +am__mv = mv -f
  CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
  	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
--	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
--	$(AM_CXXFLAGS) $(CXXFLAGS)
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- CXXLD = $(CXX)
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- SOURCES = $(csvregionator_SOURCES)
- DIST_SOURCES = $(csvregionator_SOURCES)
- ETAGS = etags
- CTAGS = ctags
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -96,18 +97,16 @@
- CYGPATH_W = @CYGPATH_W@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
--ECHO = @ECHO@
-+DSYMUTIL = @DSYMUTIL@
-+DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
--F77 = @F77@
--FFLAGS = @FFLAGS@
--GCC_FALSE = @GCC_FALSE@
--GCC_TRUE = @GCC_TRUE@
--HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
--HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
-+FGREP = @FGREP@
-+GREP = @GREP@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -117,19 +116,28 @@
- JAVAC = @JAVAC@
- JAVA_INCLUDE_DIR = @JAVA_INCLUDE_DIR@
- JAVA_LIB_DIR = @JAVA_LIB_DIR@
-+LD = @LD@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
-+LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
-+NM = @NM@
-+NMEDIT = @NMEDIT@
-+OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
-+OTOOL = @OTOOL@
-+OTOOL64 = @OTOOL64@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+@@ -133,6 +137,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -63248,84 +15879,16 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PLATFORM = @PLATFORM@
-@@ -146,22 +154,13 @@
- STRIP = @STRIP@
- SWIG = @SWIG@
- VERSION = @VERSION@
--WITH_JAVA_FALSE = @WITH_JAVA_FALSE@
--WITH_JAVA_TRUE = @WITH_JAVA_TRUE@
--WITH_PYTHON_FALSE = @WITH_PYTHON_FALSE@
--WITH_PYTHON_TRUE = @WITH_PYTHON_TRUE@
--WITH_SWIG_FALSE = @WITH_SWIG_FALSE@
--WITH_SWIG_TRUE = @WITH_SWIG_TRUE@
--ac_ct_AR = @ac_ct_AR@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
--ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -173,28 +172,41 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- AM_CPPFLAGS = -I$(top_srcdir)/src \
+@@ -206,7 +211,7 @@
                -I$(top_srcdir)/third_party/boost_1_34_1 \
                -I$(top_srcdir)/third_party/zlib-1.2.3/contrib
-@@ -216,14 +228,14 @@
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
--	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
--		&& exit 0; \
-+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-+	        && { if test -f $@; then exit 0; else break; fi; }; \
+ 
+- at GCC_TRUE@AM_CXXFLAGS = -Wall -Werror -ansi -pedantic -fno-rtti
++ at GCC_TRUE@AM_CXXFLAGS = -Wall -ansi -pedantic -fno-rtti
+ csvregionator_SOURCES = csvregionator.cc
+ csvregionator_LDADD = \
+ 	$(top_builddir)/src/kml/base/libkmlbase.la \
+@@ -228,9 +233,9 @@
  	      exit 1;; \
  	  esac; \
  	done; \
@@ -63338,7 +15901,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -241,16 +253,19 @@
+@@ -248,13 +253,16 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -63359,60 +15922,34 @@
 +	rm -f $$list
  csvregionator$(EXEEXT): $(csvregionator_OBJECTS) $(csvregionator_DEPENDENCIES) 
  	@rm -f csvregionator$(EXEEXT)
--	$(CXXLINK) $(csvregionator_LDFLAGS) $(csvregionator_OBJECTS) $(csvregionator_LDADD) $(LIBS)
-+	$(CXXLINK) $(csvregionator_OBJECTS) $(csvregionator_LDADD) $(LIBS)
+ 	$(CXXLINK) $(csvregionator_OBJECTS) $(csvregionator_LDADD) $(LIBS)
+@@ -269,21 +277,21 @@
  
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -261,22 +276,22 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/csvregionator.Po at am__quote@
- 
  .cc.o:
-- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
  
  .cc.obj:
-- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
  
  .cc.lo:
-- at am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
-@@ -287,82 +302,85 @@
- clean-libtool:
- 	-rm -rf .libs _libs
+@@ -306,7 +314,7 @@
  
--distclean-libtool:
--	-rm -f libtool
--uninstall-info-am:
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- 	unique=`for i in $$list; do \
- 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- 	  done | \
--	  $(AWK) '    { files[$$0] = 1; } \
--	       END { for (i in files) print i; }'`; \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
- 	mkid -fID $$unique
- tags: TAGS
- 
  TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
 -	tags=; \
@@ -63420,13 +15957,11 @@
  	here=`pwd`; \
  	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
- 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+@@ -314,29 +322,34 @@
  	  done | \
--	  $(AWK) '    { files[$$0] = 1; } \
--	       END { for (i in files) print i; }'`; \
+ 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 -	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 +	shift; \
 +	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
  	  test -n "$$unique" || unique=$$empty_fix; \
@@ -63444,16 +15979,13 @@
  CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
 -	tags=; \
--	here=`pwd`; \
  	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  	  done | \
--	  $(AWK) '    { files[$$0] = 1; } \
--	       END { for (i in files) print i; }'`; \
+ 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 -	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 +	test -z "$(CTAGS_ARGS)$$unique" \
  	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 -	     $$tags $$unique
@@ -63468,37 +16000,10 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
--	list='$(DISTFILES)'; for file in $$list; do \
--	  case $$file in \
--	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
--	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
--	  esac; \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
+@@ -357,13 +370,17 @@
  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
--	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
--	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
--	    dir="/$$dir"; \
--	    $(mkdir_p) "$(distdir)$$dir"; \
--	  else \
--	    dir=''; \
--	  fi; \
  	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 +	    if test -d "$(distdir)/$$file"; then \
 +	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 +	    fi; \
@@ -63517,7 +16022,7 @@
  	    || exit 1; \
  	  fi; \
  	done
-@@ -390,6 +408,7 @@
+@@ -391,6 +408,7 @@
  
  distclean-generic:
  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -63525,17 +16030,8 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -403,7 +422,7 @@
- 	-rm -rf ./$(DEPDIR)
- 	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
--	distclean-libtool distclean-tags
-+	distclean-tags
+@@ -412,6 +430,8 @@
  
- dvi: dvi-am
- 
-@@ -411,18 +430,38 @@
- 
  html: html-am
  
 +html-am:
@@ -63543,17 +16039,16 @@
  info: info-am
  
  info-am:
+@@ -420,18 +440,28 @@
  
- install-data-am:
+ install-dvi: install-dvi-am
  
-+install-dvi: install-dvi-am
-+
 +install-dvi-am:
 +
  install-exec-am:
  
-+install-html: install-html-am
-+
+ install-html: install-html-am
+ 
 +install-html-am:
 +
  install-info: install-info-am
@@ -63562,90 +16057,53 @@
 +
  install-man:
  
-+install-pdf: install-pdf-am
-+
+ install-pdf: install-pdf-am
+ 
 +install-pdf-am:
 +
-+install-ps: install-ps-am
-+
+ install-ps: install-ps-am
+ 
 +install-ps-am:
 +
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
-@@ -443,19 +482,23 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-info-am
-+uninstall-am:
-+
-+.MAKE: install-am install-strip
- 
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- 	clean-libtool clean-noinstPROGRAMS ctags distclean \
- 	distclean-compile distclean-generic distclean-libtool \
- 	distclean-tags distdir dvi dvi-am html html-am info info-am \
--	install install-am install-data install-data-am install-exec \
--	install-exec-am install-info install-info-am install-man \
-+	install install-am install-data install-data-am install-dvi \
-+	install-dvi-am install-exec install-exec-am install-html \
-+	install-html-am install-info install-info-am install-man \
-+	install-pdf install-pdf-am install-ps install-ps-am \
- 	install-strip installcheck installcheck-am installdirs \
- 	maintainer-clean maintainer-clean-generic mostlyclean \
+@@ -469,6 +499,7 @@
  	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
--	pdf pdf-am ps ps-am tags uninstall uninstall-am \
--	uninstall-info-am
-+	pdf pdf-am ps ps-am tags uninstall uninstall-am
-+
+ 	pdf pdf-am ps ps-am tags uninstall uninstall-am
  
++
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-Index: libkml-1.0.1/examples/wxregionator/Makefile.in
+ .NOEXPORT:
+Index: libkml-1.1.0/examples/wxregionator/Makefile.in
 ===================================================================
---- libkml-1.0.1.orig/examples/wxregionator/Makefile.in	2009-07-03 01:23:30.000000000 +0200
-+++ libkml-1.0.1/examples/wxregionator/Makefile.in	2009-12-10 10:19:45.000000000 +0100
+--- libkml-1.1.0.orig/examples/wxregionator/Makefile.in	2009-12-10 13:05:40.000000000 +0100
++++ libkml-1.1.0/examples/wxregionator/Makefile.in	2009-12-10 17:29:35.000000000 +0100
 @@ -1,8 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
+-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
-@@ -13,15 +14,12 @@
- # PARTICULAR PURPOSE.
- 
+@@ -15,8 +16,9 @@
  @SET_MAKE@
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
  VPATH = @srcdir@
  pkgdatadir = $(datadir)/@PACKAGE@
 -pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../..
 +pkglibdir = $(libdir)/@PACKAGE@
 +pkglibexecdir = $(libexecdir)/@PACKAGE@
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -39,18 +37,19 @@
- DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_curl.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)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
+@@ -43,6 +45,7 @@
  mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
@@ -63653,58 +16111,7 @@
  SOURCES =
  DIST_SOURCES =
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -72,18 +71,16 @@
- CYGPATH_W = @CYGPATH_W@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
--ECHO = @ECHO@
-+DSYMUTIL = @DSYMUTIL@
-+DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
--F77 = @F77@
--FFLAGS = @FFLAGS@
--GCC_FALSE = @GCC_FALSE@
--GCC_TRUE = @GCC_TRUE@
--HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
--HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
-+FGREP = @FGREP@
-+GREP = @GREP@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -93,19 +90,28 @@
- JAVAC = @JAVAC@
- JAVA_INCLUDE_DIR = @JAVA_INCLUDE_DIR@
- JAVA_LIB_DIR = @JAVA_LIB_DIR@
-+LD = @LD@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
-+LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
-+NM = @NM@
-+NMEDIT = @NMEDIT@
-+OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
-+OTOOL = @OTOOL@
-+OTOOL64 = @OTOOL64@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -108,6 +111,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -63712,84 +16119,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PLATFORM = @PLATFORM@
-@@ -122,22 +128,13 @@
- STRIP = @STRIP@
- SWIG = @SWIG@
- VERSION = @VERSION@
--WITH_JAVA_FALSE = @WITH_JAVA_FALSE@
--WITH_JAVA_TRUE = @WITH_JAVA_TRUE@
--WITH_PYTHON_FALSE = @WITH_PYTHON_FALSE@
--WITH_PYTHON_TRUE = @WITH_PYTHON_TRUE@
--WITH_SWIG_FALSE = @WITH_SWIG_FALSE@
--WITH_SWIG_TRUE = @WITH_SWIG_TRUE@
--ac_ct_AR = @ac_ct_AR@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
--ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -149,28 +146,41 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- EXTRA_DIST = \
- 	README \
- 	Regionator-Info.plist \
-@@ -189,14 +199,14 @@
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
--	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
--		&& exit 0; \
-+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-+	        && { if test -f $@; then exit 0; else break; fi; }; \
+@@ -200,9 +204,9 @@
  	      exit 1;; \
  	  esac; \
  	done; \
@@ -63802,7 +16132,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -214,16 +224,13 @@
+@@ -220,6 +224,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -63810,50 +16140,10 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
- 
- clean-libtool:
- 	-rm -rf .libs _libs
--
--distclean-libtool:
--	-rm -f libtool
--uninstall-info-am:
- tags: TAGS
- TAGS:
- 
-@@ -232,30 +239,32 @@
- 
- 
- distdir: $(DISTFILES)
--	$(mkdir_p) $(distdir)/wxregionator.xcodeproj
--	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
--	list='$(DISTFILES)'; for file in $$list; do \
--	  case $$file in \
--	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
--	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
--	  esac; \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
+@@ -249,13 +254,17 @@
  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
--	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
--	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
--	    dir="/$$dir"; \
--	    $(mkdir_p) "$(distdir)$$dir"; \
--	  else \
--	    dir=''; \
--	  fi; \
  	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 +	    if test -d "$(distdir)/$$file"; then \
 +	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 +	    fi; \
@@ -63880,17 +16170,8 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -293,7 +303,7 @@
+@@ -301,6 +311,8 @@
  
- distclean: distclean-am
- 	-rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool
-+distclean-am: clean-am distclean-generic
- 
- dvi: dvi-am
- 
-@@ -301,18 +311,38 @@
- 
  html: html-am
  
 +html-am:
@@ -63898,17 +16179,16 @@
  info: info-am
  
  info-am:
+@@ -309,18 +321,28 @@
  
- install-data-am:
+ install-dvi: install-dvi-am
  
-+install-dvi: install-dvi-am
-+
 +install-dvi-am:
 +
  install-exec-am:
  
-+install-html: install-html-am
-+
+ install-html: install-html-am
+ 
 +install-html-am:
 +
  install-info: install-info-am
@@ -63917,88 +16197,53 @@
 +
  install-man:
  
-+install-pdf: install-pdf-am
-+
+ install-pdf: install-pdf-am
+ 
 +install-pdf-am:
 +
-+install-ps: install-ps-am
-+
+ install-ps: install-ps-am
+ 
 +install-ps-am:
 +
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
-@@ -331,17 +361,21 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-info-am
-+uninstall-am:
-+
-+.MAKE: install-am install-strip
- 
- .PHONY: all all-am check check-am clean clean-generic clean-libtool \
- 	distclean distclean-generic distclean-libtool distdir dvi \
- 	dvi-am html html-am info info-am install install-am \
--	install-data install-data-am install-exec install-exec-am \
--	install-info install-info-am install-man install-strip \
-+	install-data install-data-am install-dvi install-dvi-am \
-+	install-exec install-exec-am install-html install-html-am \
-+	install-info install-info-am install-man install-pdf \
-+	install-pdf-am install-ps install-ps-am install-strip \
- 	installcheck installcheck-am installdirs maintainer-clean \
+@@ -354,6 +376,7 @@
  	maintainer-clean-generic mostlyclean mostlyclean-generic \
--	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
--	uninstall-info-am
-+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
-+
+ 	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
  
++
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-Index: libkml-1.0.1/examples/wxviewer/Makefile.in
+ .NOEXPORT:
+Index: libkml-1.1.0/examples/wxviewer/Makefile.in
 ===================================================================
---- libkml-1.0.1.orig/examples/wxviewer/Makefile.in	2009-07-03 01:23:30.000000000 +0200
-+++ libkml-1.0.1/examples/wxviewer/Makefile.in	2009-12-10 10:19:45.000000000 +0100
+--- libkml-1.1.0.orig/examples/wxviewer/Makefile.in	2009-12-10 13:05:40.000000000 +0100
++++ libkml-1.1.0/examples/wxviewer/Makefile.in	2009-12-10 17:29:35.000000000 +0100
 @@ -1,8 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
+-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
-@@ -13,15 +14,12 @@
- # PARTICULAR PURPOSE.
- 
+@@ -15,8 +16,9 @@
  @SET_MAKE@
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
  VPATH = @srcdir@
  pkgdatadir = $(datadir)/@PACKAGE@
 -pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../..
 +pkglibdir = $(libdir)/@PACKAGE@
 +pkglibexecdir = $(libexecdir)/@PACKAGE@
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -39,18 +37,19 @@
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_curl.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)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
+@@ -43,6 +45,7 @@
  mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
@@ -64006,58 +16251,7 @@
  SOURCES =
  DIST_SOURCES =
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -72,18 +71,16 @@
- CYGPATH_W = @CYGPATH_W@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
--ECHO = @ECHO@
-+DSYMUTIL = @DSYMUTIL@
-+DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
--F77 = @F77@
--FFLAGS = @FFLAGS@
--GCC_FALSE = @GCC_FALSE@
--GCC_TRUE = @GCC_TRUE@
--HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
--HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
-+FGREP = @FGREP@
-+GREP = @GREP@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -93,19 +90,28 @@
- JAVAC = @JAVAC@
- JAVA_INCLUDE_DIR = @JAVA_INCLUDE_DIR@
- JAVA_LIB_DIR = @JAVA_LIB_DIR@
-+LD = @LD@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
-+LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
-+NM = @NM@
-+NMEDIT = @NMEDIT@
-+OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
-+OTOOL = @OTOOL@
-+OTOOL64 = @OTOOL64@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -108,6 +111,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -64065,84 +16259,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PLATFORM = @PLATFORM@
-@@ -122,22 +128,13 @@
- STRIP = @STRIP@
- SWIG = @SWIG@
- VERSION = @VERSION@
--WITH_JAVA_FALSE = @WITH_JAVA_FALSE@
--WITH_JAVA_TRUE = @WITH_JAVA_TRUE@
--WITH_PYTHON_FALSE = @WITH_PYTHON_FALSE@
--WITH_PYTHON_TRUE = @WITH_PYTHON_TRUE@
--WITH_SWIG_FALSE = @WITH_SWIG_FALSE@
--WITH_SWIG_TRUE = @WITH_SWIG_TRUE@
--ac_ct_AR = @ac_ct_AR@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
--ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -149,28 +146,41 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- EXTRA_DIST = \
- 	icon_file.xpm \
- 	icon_folder_closed.xpm \
-@@ -187,14 +197,14 @@
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
--	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
--		&& exit 0; \
-+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-+	        && { if test -f $@; then exit 0; else break; fi; }; \
+@@ -198,9 +202,9 @@
  	      exit 1;; \
  	  esac; \
  	done; \
@@ -64155,7 +16272,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -212,16 +222,13 @@
+@@ -218,6 +222,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -64163,50 +16280,10 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
- 
- clean-libtool:
- 	-rm -rf .libs _libs
--
--distclean-libtool:
--	-rm -f libtool
--uninstall-info-am:
- tags: TAGS
- TAGS:
- 
-@@ -230,30 +237,32 @@
- 
- 
- distdir: $(DISTFILES)
--	$(mkdir_p) $(distdir)/wxviewer.xcodeproj
--	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
--	list='$(DISTFILES)'; for file in $$list; do \
--	  case $$file in \
--	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
--	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
--	  esac; \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
+@@ -247,13 +252,17 @@
  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
--	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
--	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
--	    dir="/$$dir"; \
--	    $(mkdir_p) "$(distdir)$$dir"; \
--	  else \
--	    dir=''; \
--	  fi; \
  	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 +	    if test -d "$(distdir)/$$file"; then \
 +	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 +	    fi; \
@@ -64233,17 +16310,8 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -291,7 +301,7 @@
+@@ -299,6 +309,8 @@
  
- distclean: distclean-am
- 	-rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool
-+distclean-am: clean-am distclean-generic
- 
- dvi: dvi-am
- 
-@@ -299,18 +309,38 @@
- 
  html: html-am
  
 +html-am:
@@ -64251,17 +16319,16 @@
  info: info-am
  
  info-am:
+@@ -307,18 +319,28 @@
  
- install-data-am:
+ install-dvi: install-dvi-am
  
-+install-dvi: install-dvi-am
-+
 +install-dvi-am:
 +
  install-exec-am:
  
-+install-html: install-html-am
-+
+ install-html: install-html-am
+ 
 +install-html-am:
 +
  install-info: install-info-am
@@ -64270,88 +16337,53 @@
 +
  install-man:
  
-+install-pdf: install-pdf-am
-+
+ install-pdf: install-pdf-am
+ 
 +install-pdf-am:
 +
-+install-ps: install-ps-am
-+
+ install-ps: install-ps-am
+ 
 +install-ps-am:
 +
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
-@@ -329,17 +359,21 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-info-am
-+uninstall-am:
-+
-+.MAKE: install-am install-strip
- 
- .PHONY: all all-am check check-am clean clean-generic clean-libtool \
- 	distclean distclean-generic distclean-libtool distdir dvi \
- 	dvi-am html html-am info info-am install install-am \
--	install-data install-data-am install-exec install-exec-am \
--	install-info install-info-am install-man install-strip \
-+	install-data install-data-am install-dvi install-dvi-am \
-+	install-exec install-exec-am install-html install-html-am \
-+	install-info install-info-am install-man install-pdf \
-+	install-pdf-am install-ps install-ps-am install-strip \
- 	installcheck installcheck-am installdirs maintainer-clean \
+@@ -352,6 +374,7 @@
  	maintainer-clean-generic mostlyclean mostlyclean-generic \
--	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
--	uninstall-info-am
-+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
-+
+ 	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
  
++
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-Index: libkml-1.0.1/examples/xsd/Makefile.in
+ .NOEXPORT:
+Index: libkml-1.1.0/examples/xsd/Makefile.in
 ===================================================================
---- libkml-1.0.1.orig/examples/xsd/Makefile.in	2009-07-03 01:23:31.000000000 +0200
-+++ libkml-1.0.1/examples/xsd/Makefile.in	2009-12-10 10:19:45.000000000 +0100
+--- libkml-1.1.0.orig/examples/xsd/Makefile.in	2009-12-10 13:05:40.000000000 +0100
++++ libkml-1.1.0/examples/xsd/Makefile.in	2009-12-10 17:29:35.000000000 +0100
 @@ -1,8 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
+-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
-@@ -14,15 +15,12 @@
+@@ -16,8 +17,9 @@
  
- @SET_MAKE@
- 
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
  VPATH = @srcdir@
  pkgdatadir = $(datadir)/@PACKAGE@
 -pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../..
 +pkglibdir = $(libdir)/@PACKAGE@
 +pkglibexecdir = $(libexecdir)/@PACKAGE@
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -43,12 +41,15 @@
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_curl.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)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
+@@ -47,6 +49,7 @@
  mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
@@ -64359,87 +16391,15 @@
  PROGRAMS = $(noinst_PROGRAMS)
  am_xsdchildren_OBJECTS = xsdchildren.$(OBJEXT)
  xsdchildren_OBJECTS = $(am_xsdchildren_OBJECTS)
-@@ -82,17 +83,19 @@
- xsdtypes_DEPENDENCIES = $(top_builddir)/src/kml/xsd/libkmlxsd.la \
- 	$(top_builddir)/src/kml/dom/libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la
--DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+@@ -83,6 +86,7 @@
+ DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
  depcomp = $(SHELL) $(top_srcdir)/config/depcomp
  am__depfiles_maybe = depfiles
 +am__mv = mv -f
  CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
  	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
--	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
--	$(AM_CXXFLAGS) $(CXXFLAGS)
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- CXXLD = $(CXX)
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- SOURCES = $(xsdchildren_SOURCES) $(xsdcoverage_SOURCES) \
- 	$(xsdelements_SOURCES) $(xsdenums_SOURCES) $(xsdfind_SOURCES) \
- 	$(xsdtypes_SOURCES)
-@@ -103,8 +106,6 @@
- CTAGS = ctags
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -126,18 +127,16 @@
- CYGPATH_W = @CYGPATH_W@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
--ECHO = @ECHO@
-+DSYMUTIL = @DSYMUTIL@
-+DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
--F77 = @F77@
--FFLAGS = @FFLAGS@
--GCC_FALSE = @GCC_FALSE@
--GCC_TRUE = @GCC_TRUE@
--HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
--HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
-+FGREP = @FGREP@
-+GREP = @GREP@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -147,19 +146,28 @@
- JAVAC = @JAVAC@
- JAVA_INCLUDE_DIR = @JAVA_INCLUDE_DIR@
- JAVA_LIB_DIR = @JAVA_LIB_DIR@
-+LD = @LD@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
-+LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
-+NM = @NM@
-+NMEDIT = @NMEDIT@
-+OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
-+OTOOL = @OTOOL@
-+OTOOL64 = @OTOOL64@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+@@ -163,6 +167,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -64447,84 +16407,16 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PLATFORM = @PLATFORM@
-@@ -176,22 +184,13 @@
- STRIP = @STRIP@
- SWIG = @SWIG@
- VERSION = @VERSION@
--WITH_JAVA_FALSE = @WITH_JAVA_FALSE@
--WITH_JAVA_TRUE = @WITH_JAVA_TRUE@
--WITH_PYTHON_FALSE = @WITH_PYTHON_FALSE@
--WITH_PYTHON_TRUE = @WITH_PYTHON_TRUE@
--WITH_SWIG_FALSE = @WITH_SWIG_FALSE@
--WITH_SWIG_TRUE = @WITH_SWIG_TRUE@
--ac_ct_AR = @ac_ct_AR@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
--ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -203,28 +202,41 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- AM_CPPFLAGS = -I$(top_srcdir)/src \
+@@ -236,7 +241,7 @@
  	      -I$(top_srcdir)/examples/xsd \
  	      -I$(top_srcdir)/third_party/boost_1_34_1
-@@ -279,14 +291,14 @@
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
--	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
--		&& exit 0; \
-+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-+	        && { if test -f $@; then exit 0; else break; fi; }; \
+ 
+- at GCC_TRUE@AM_CXXFLAGS = -Wall -Werror -ansi -pedantic -fno-rtti
++ at GCC_TRUE@AM_CXXFLAGS = -Wall -ansi -pedantic -fno-rtti
+ xsdchildren_SOURCES = xsdchildren.cc
+ xsdchildren_LDADD = \
+ 	$(top_builddir)/src/kml/xsd/libkmlxsd.la \
+@@ -291,9 +296,9 @@
  	      exit 1;; \
  	  esac; \
  	done; \
@@ -64537,7 +16429,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -304,31 +316,34 @@
+@@ -311,13 +316,16 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -64558,80 +16450,34 @@
 +	rm -f $$list
  xsdchildren$(EXEEXT): $(xsdchildren_OBJECTS) $(xsdchildren_DEPENDENCIES) 
  	@rm -f xsdchildren$(EXEEXT)
--	$(CXXLINK) $(xsdchildren_LDFLAGS) $(xsdchildren_OBJECTS) $(xsdchildren_LDADD) $(LIBS)
-+	$(CXXLINK) $(xsdchildren_OBJECTS) $(xsdchildren_LDADD) $(LIBS)
- xsdcoverage$(EXEEXT): $(xsdcoverage_OBJECTS) $(xsdcoverage_DEPENDENCIES) 
- 	@rm -f xsdcoverage$(EXEEXT)
--	$(CXXLINK) $(xsdcoverage_LDFLAGS) $(xsdcoverage_OBJECTS) $(xsdcoverage_LDADD) $(LIBS)
-+	$(CXXLINK) $(xsdcoverage_OBJECTS) $(xsdcoverage_LDADD) $(LIBS)
- xsdelements$(EXEEXT): $(xsdelements_OBJECTS) $(xsdelements_DEPENDENCIES) 
- 	@rm -f xsdelements$(EXEEXT)
--	$(CXXLINK) $(xsdelements_LDFLAGS) $(xsdelements_OBJECTS) $(xsdelements_LDADD) $(LIBS)
-+	$(CXXLINK) $(xsdelements_OBJECTS) $(xsdelements_LDADD) $(LIBS)
- xsdenums$(EXEEXT): $(xsdenums_OBJECTS) $(xsdenums_DEPENDENCIES) 
- 	@rm -f xsdenums$(EXEEXT)
--	$(CXXLINK) $(xsdenums_LDFLAGS) $(xsdenums_OBJECTS) $(xsdenums_LDADD) $(LIBS)
-+	$(CXXLINK) $(xsdenums_OBJECTS) $(xsdenums_LDADD) $(LIBS)
- xsdfind$(EXEEXT): $(xsdfind_OBJECTS) $(xsdfind_DEPENDENCIES) 
- 	@rm -f xsdfind$(EXEEXT)
--	$(CXXLINK) $(xsdfind_LDFLAGS) $(xsdfind_OBJECTS) $(xsdfind_LDADD) $(LIBS)
-+	$(CXXLINK) $(xsdfind_OBJECTS) $(xsdfind_LDADD) $(LIBS)
- xsdtypes$(EXEEXT): $(xsdtypes_OBJECTS) $(xsdtypes_DEPENDENCIES) 
- 	@rm -f xsdtypes$(EXEEXT)
--	$(CXXLINK) $(xsdtypes_LDFLAGS) $(xsdtypes_OBJECTS) $(xsdtypes_LDADD) $(LIBS)
-+	$(CXXLINK) $(xsdtypes_OBJECTS) $(xsdtypes_LDADD) $(LIBS)
+ 	$(CXXLINK) $(xsdchildren_OBJECTS) $(xsdchildren_LDADD) $(LIBS)
+@@ -352,21 +360,21 @@
  
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -344,22 +359,22 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/xsdtypes.Po at am__quote@
- 
  .cc.o:
-- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
  
  .cc.obj:
-- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
  
  .cc.lo:
-- at am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
-@@ -370,82 +385,85 @@
- clean-libtool:
- 	-rm -rf .libs _libs
+@@ -389,7 +397,7 @@
  
--distclean-libtool:
--	-rm -f libtool
--uninstall-info-am:
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- 	unique=`for i in $$list; do \
- 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- 	  done | \
--	  $(AWK) '    { files[$$0] = 1; } \
--	       END { for (i in files) print i; }'`; \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
- 	mkid -fID $$unique
- tags: TAGS
- 
  TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
 -	tags=; \
@@ -64639,13 +16485,11 @@
  	here=`pwd`; \
  	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
- 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+@@ -397,29 +405,34 @@
  	  done | \
--	  $(AWK) '    { files[$$0] = 1; } \
--	       END { for (i in files) print i; }'`; \
+ 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 -	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 +	shift; \
 +	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
  	  test -n "$$unique" || unique=$$empty_fix; \
@@ -64663,16 +16507,13 @@
  CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
 -	tags=; \
--	here=`pwd`; \
  	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  	  done | \
--	  $(AWK) '    { files[$$0] = 1; } \
--	       END { for (i in files) print i; }'`; \
+ 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 -	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 +	test -z "$(CTAGS_ARGS)$$unique" \
  	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 -	     $$tags $$unique
@@ -64687,37 +16528,10 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
--	list='$(DISTFILES)'; for file in $$list; do \
--	  case $$file in \
--	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
--	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
--	  esac; \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
+@@ -440,13 +453,17 @@
  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
--	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
--	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
--	    dir="/$$dir"; \
--	    $(mkdir_p) "$(distdir)$$dir"; \
--	  else \
--	    dir=''; \
--	  fi; \
  	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 +	    if test -d "$(distdir)/$$file"; then \
 +	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 +	    fi; \
@@ -64736,7 +16550,7 @@
  	    || exit 1; \
  	  fi; \
  	done
-@@ -473,6 +491,7 @@
+@@ -474,6 +491,7 @@
  
  distclean-generic:
  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -64744,17 +16558,8 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -486,7 +505,7 @@
- 	-rm -rf ./$(DEPDIR)
- 	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
--	distclean-libtool distclean-tags
-+	distclean-tags
+@@ -495,6 +513,8 @@
  
- dvi: dvi-am
- 
-@@ -494,18 +513,38 @@
- 
  html: html-am
  
 +html-am:
@@ -64762,17 +16567,16 @@
  info: info-am
  
  info-am:
+@@ -503,18 +523,28 @@
  
- install-data-am:
+ install-dvi: install-dvi-am
  
-+install-dvi: install-dvi-am
-+
 +install-dvi-am:
 +
  install-exec-am:
  
-+install-html: install-html-am
-+
+ install-html: install-html-am
+ 
 +install-html-am:
 +
  install-info: install-info-am
@@ -64781,67 +16585,45 @@
 +
  install-man:
  
-+install-pdf: install-pdf-am
-+
+ install-pdf: install-pdf-am
+ 
 +install-pdf-am:
 +
-+install-ps: install-ps-am
-+
+ install-ps: install-ps-am
+ 
 +install-ps-am:
 +
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
-@@ -526,19 +565,23 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-info-am
-+uninstall-am:
-+
-+.MAKE: install-am install-strip
- 
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- 	clean-libtool clean-noinstPROGRAMS ctags distclean \
- 	distclean-compile distclean-generic distclean-libtool \
- 	distclean-tags distdir dvi dvi-am html html-am info info-am \
--	install install-am install-data install-data-am install-exec \
--	install-exec-am install-info install-info-am install-man \
-+	install install-am install-data install-data-am install-dvi \
-+	install-dvi-am install-exec install-exec-am install-html \
-+	install-html-am install-info install-info-am install-man \
-+	install-pdf install-pdf-am install-ps install-ps-am \
- 	install-strip installcheck installcheck-am installdirs \
- 	maintainer-clean maintainer-clean-generic mostlyclean \
+@@ -552,6 +582,7 @@
  	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
--	pdf pdf-am ps ps-am tags uninstall uninstall-am \
--	uninstall-info-am
-+	pdf pdf-am ps ps-am tags uninstall uninstall-am
-+
+ 	pdf pdf-am ps ps-am tags uninstall uninstall-am
  
++
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-Index: libkml-1.0.1/INSTALL
+ .NOEXPORT:
+Index: libkml-1.1.0/INSTALL
 ===================================================================
---- libkml-1.0.1.orig/INSTALL	2009-07-03 01:23:36.000000000 +0200
-+++ libkml-1.0.1/INSTALL	2009-12-10 10:19:49.000000000 +0100
-@@ -1,16 +1,19 @@
- Installation Instructions
- *************************
- 
--Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
--Software Foundation, Inc.
+--- libkml-1.1.0.orig/INSTALL	2009-12-10 13:05:41.000000000 +0100
++++ libkml-1.1.0/INSTALL	2009-12-10 17:29:40.000000000 +0100
+@@ -1,5 +1,8 @@
+-Copyright 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software
+-Foundation, Inc.
++Installation Instructions
++*************************
++
 +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
 +2006, 2007, 2008, 2009 Free Software Foundation, Inc.
  
--This file is free documentation; the Free Software Foundation gives
-+   This file is free documentation; the Free Software Foundation gives
+    This file is free documentation; the Free Software Foundation gives
  unlimited permission to copy, distribute and modify it.
- 
+@@ -7,7 +10,10 @@
  Basic Installation
  ==================
  
--These are generic installation instructions.
+-   These are generic installation instructions.
 +   Briefly, the shell commands `./configure; make; make install' should
 +configure, build, and install this package.  The following
 +more-detailed instructions are generic; see the `README' file for
@@ -64849,7 +16631,7 @@
  
     The `configure' shell script attempts to guess correct values for
  various system-dependent variables used during compilation.  It uses
-@@ -23,9 +26,9 @@
+@@ -20,9 +26,9 @@
  
     It can also use an optional file (typically called `config.cache'
  and enabled with `--cache-file=config.cache' or simply `-C') that saves
@@ -64861,7 +16643,7 @@
  
     If you need to do unusual things to compile the package, please try
  to figure out how `configure' could check whether to do them, and mail
-@@ -35,20 +38,17 @@
+@@ -32,20 +38,17 @@
  may remove or edit it.
  
     The file `configure.ac' (or `configure.in') is used to create
@@ -64888,7 +16670,7 @@
  
    2. Type `make' to compile the package.
  
-@@ -67,42 +67,57 @@
+@@ -64,6 +67,9 @@
       all sorts of other programs in order to regenerate files that came
       with the distribution.
  
@@ -64898,14 +16680,7 @@
  Compilers and Options
  =====================
  
--Some systems require unusual options for compilation or linking that the
--`configure' script does not know about.  Run `./configure --help' for
--details on some of the pertinent environment variables.
-+   Some systems require unusual options for compilation or linking that
-+the `configure' script does not know about.  Run `./configure --help'
-+for details on some of the pertinent environment variables.
- 
-    You can give `configure' initial values for configuration parameters
+@@ -75,7 +81,7 @@
  by setting variables in the command line or in the environment.  Here
  is an example:
  
@@ -64914,11 +16689,9 @@
  
     *Note Defining Variables::, for more details.
  
- Compiling For Multiple Architectures
- ====================================
+@@ -84,34 +90,46 @@
  
--You can compile the package for more than one kind of computer at the
-+   You can compile the package for more than one kind of computer at the
+    You can compile the package for more than one kind of computer at the
  same time, by placing the object files for each architecture in their
 -own directory.  To do this, you must use a version of `make' that
 -supports the `VPATH' variable, such as GNU `make'.  `cd' to the
@@ -64954,21 +16727,31 @@
  Installation Names
  ==================
  
--By default, `make install' installs the package's commands under
+-   By default, `make install' will install the package's files in
+-`/usr/local/bin', `/usr/local/man', etc.  You can specify an
+-installation prefix other than `/usr/local' by giving `configure' the
+-option `--prefix=PATH'.
 +   By default, `make install' installs the package's commands under
- `/usr/local/bin', include files under `/usr/local/include', etc.  You
- can specify an installation prefix other than `/usr/local' by giving
- `configure' the option `--prefix=PREFIX'.
-@@ -125,7 +140,7 @@
- Optional Features
- =================
++`/usr/local/bin', include files under `/usr/local/include', etc.  You
++can specify an installation prefix other than `/usr/local' by giving
++`configure' the option `--prefix=PREFIX'.
  
--Some packages pay attention to `--enable-FEATURE' options to
-+   Some packages pay attention to `--enable-FEATURE' options to
- `configure', where FEATURE indicates an optional part of the package.
- They may also pay attention to `--with-PACKAGE' options, where PACKAGE
- is something like `gnu-as' or `x' (for the X Window System).  The
-@@ -137,14 +152,46 @@
+    You can specify separate installation prefixes for
+ architecture-specific files and architecture-independent files.  If you
+-give `configure' the option `--exec-prefix=PATH', the package will use
+-PATH as the prefix for installing programs and libraries.
+-Documentation and other data files will still use the regular prefix.
++pass the option `--exec-prefix=PREFIX' to `configure', the package uses
++PREFIX as the prefix for installing programs and libraries.
++Documentation and other data files still use the regular prefix.
+ 
+    In addition, if you use an unusual directory layout you can give
+-options like `--bindir=PATH' to specify different values for particular
++options like `--bindir=DIR' to specify different values for particular
+ kinds of files.  Run `configure --help' for a list of the directories
+ you can set and what kinds of files go in them.
+ 
+@@ -134,6 +152,38 @@
  you can use the `configure' options `--x-includes=DIR' and
  `--x-libraries=DIR' to specify their locations.
  
@@ -65007,21 +16790,8 @@
  Specifying the System Type
  ==========================
  
--There may be some features `configure' cannot figure out automatically,
--but needs to determine by the type of machine the package will run on.
--Usually, assuming the package is built to be run on the _same_
--architectures, `configure' can figure that out, but if it prints a
--message saying it cannot guess the machine type, give it the
-+   There may be some features `configure' cannot figure out
-+automatically, but needs to determine by the type of machine the package
-+will run on.  Usually, assuming the package is built to be run on the
-+_same_ architectures, `configure' can figure that out, but if it prints
-+a message saying it cannot guess the machine type, give it the
- `--build=TYPE' option.  TYPE can either be a short name for the system
- type, such as `sun4', or a canonical name which has the form:
+@@ -149,14 +199,15 @@
  
-@@ -152,7 +199,8 @@
- 
  where SYSTEM can have one of these forms:
  
 -     OS KERNEL-OS
@@ -65030,49 +16800,31 @@
  
     See the file `config.sub' for the possible values of each field.  If
  `config.sub' isn't included in this package, then this package doesn't
-@@ -170,9 +218,9 @@
- Sharing Defaults
- ================
+ need to know the machine type.
  
--If you want to set default values for `configure' scripts to share, you
--can create a site shell script called `config.site' that gives default
--values for variables like `CC', `cache_file', and `prefix'.
-+   If you want to set default values for `configure' scripts to share,
-+you can create a site shell script called `config.site' that gives
-+default values for variables like `CC', `cache_file', and `prefix'.
- `configure' looks for `PREFIX/share/config.site' if it exists, then
- `PREFIX/etc/config.site' if it exists.  Or, you can set the
- `CONFIG_SITE' environment variable to the location of the site script.
-@@ -181,7 +229,7 @@
- Defining Variables
- ==================
+    If you are _building_ compiler tools for cross-compiling, you should
+-use the `--target=TYPE' option to select the type of system they will
++use the option `--target=TYPE' to select the type of system they will
+ produce code for.
  
--Variables not defined in a site shell script can be set in the
-+   Variables not defined in a site shell script can be set in the
- environment passed to `configure'.  However, some packages may run
- configure again during the build, and the customized values of these
- variables may be lost.  In order to avoid this problem, you should set
-@@ -190,21 +238,29 @@
+    If you want to _use_ a cross compiler, that generates code for a
+@@ -186,9 +237,14 @@
+ 
       ./configure CC=/usr/local2/bin/gcc
  
- causes the specified `gcc' to be used as the C compiler (unless it is
--overridden in the site shell script).  Here is a another example:
-+overridden in the site shell script).
+-will cause the specified gcc to be used as the C compiler (unless it is
++causes the specified `gcc' to be used as the C compiler (unless it is
+ overridden in the site shell script).
  
--     /bin/bash ./configure CONFIG_SHELL=/bin/bash
 +Unfortunately, this technique does not work for `CONFIG_SHELL' due to
 +an Autoconf bug.  Until the bug is fixed you can use this workaround:
- 
--Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
--configuration-related scripts to be executed by `/bin/bash'.
++
 +     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
- 
++
  `configure' Invocation
  ======================
  
--`configure' recognizes the following options to control how it operates.
-+   `configure' recognizes the following options to control how it
-+operates.
+@@ -197,7 +253,14 @@
  
  `--help'
  `-h'
@@ -65088,7 +16840,7 @@
  
  `--version'
  `-V'
-@@ -231,6 +287,16 @@
+@@ -224,6 +287,16 @@
       Look for the package's source code in directory DIR.  Usually
       `configure' can determine that directory automatically.
  
@@ -65105,8070 +16857,135 @@
  `configure' also accepts some other, not widely useful, options.  Run
  `configure --help' for more details.
  
-Index: libkml-1.0.1/m4/libtool.m4
+Index: libkml-1.1.0/m4/libtool.m4
 ===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ libkml-1.0.1/m4/libtool.m4	2009-12-10 10:19:37.000000000 +0100
-@@ -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.
+--- libkml-1.1.0.orig/m4/libtool.m4	2009-12-10 13:05:40.000000000 +0100
++++ libkml-1.1.0/m4/libtool.m4	2009-12-10 17:29:26.000000000 +0100
+@@ -2445,7 +2445,7 @@
+   ;;
+ 
+ # This must be Linux ELF.
+-linux* | k*bsd*-gnu)
 +linux* | k*bsd*-gnu | kopensolaris*-gnu)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  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.
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -3084,7 +3084,7 @@
+   ;;
+ 
+ # This must be Linux ELF.
+-linux* | k*bsd*-gnu)
 +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
-+	;;
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+@@ -3705,7 +3705,7 @@
+ 	    ;;
+ 	esac
+ 	;;
+-      linux* | k*bsd*-gnu)
 +      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'
-+      ;;
-+
+ 	case $cc_basename in
+ 	  KCC*)
+ 	    # KAI C++ Compiler
+@@ -3989,7 +3989,7 @@
+       _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+       ;;
+ 
+-    linux* | k*bsd*-gnu)
 +    linux* | k*bsd*-gnu | kopensolaris*-gnu)
-+      case $cc_basename in
-+      # old Intel for x86_64 which still supported -KPIC.
-+      ecc*)
-+	_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'
-+  ;;
+       case $cc_basename in
+       # old Intel for x86_64 which still supported -KPIC.
+       ecc*)
+@@ -4261,6 +4261,9 @@
+   openbsd*)
+     with_gnu_ld=no
+     ;;
 +  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
+   esac
+ 
+   _LT_TAGVAR(ld_shlibs, $1)=yes
+@@ -4282,6 +4285,7 @@
+     fi
+     supports_anon_versioning=no
+     case `$LD -v 2>&1` in
 +      *GNU\ gold*) supports_anon_versioning=yes ;;
-+      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
-+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-+      *\ 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'
-+      ;;
-+
+       *\ [[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 ...
+@@ -4373,7 +4377,7 @@
+       _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+       ;;
+ 
+-    gnu* | linux* | tpf* | k*bsd*-gnu)
 +    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
-+      tmp_diet=no
-+      if test "$host_os" = linux-dietlibc; then
-+	case $cc_basename in
-+	  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
-+        ;;
-+
+       tmp_diet=no
+       if test "$host_os" = linux-dietlibc; then
+ 	case $cc_basename in
+@@ -5857,7 +5861,7 @@
+         _LT_TAGVAR(inherit_rpath, $1)=yes
+         ;;
+ 
+-      linux* | k*bsd*-gnu)
 +      linux* | k*bsd*-gnu | kopensolaris*-gnu)
-+        case $cc_basename in
-+          KCC*)
-+	    # Kuck and Associates, Inc. (KAI) C++ Compiler
-+
-+	    # 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: libkml-1.0.1/m4/lt~obsolete.m4
+         case $cc_basename in
+           KCC*)
+ 	    # Kuck and Associates, Inc. (KAI) C++ Compiler
+Index: libkml-1.1.0/m4/ltversion.m4
 ===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ libkml-1.0.1/m4/lt~obsolete.m4	2009-12-10 10:19:37.000000000 +0100
-@@ -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: libkml-1.0.1/m4/ltoptions.m4
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ libkml-1.0.1/m4/ltoptions.m4	2009-12-10 10:19:37.000000000 +0100
-@@ -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: libkml-1.0.1/m4/ltsugar.m4
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ libkml-1.0.1/m4/ltsugar.m4	2009-12-10 10:19:37.000000000 +0100
-@@ -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: libkml-1.0.1/m4/ltversion.m4
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ libkml-1.0.1/m4/ltversion.m4	2009-12-10 10:19:37.000000000 +0100
-@@ -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.
-+
+--- libkml-1.1.0.orig/m4/ltversion.m4	2009-12-10 13:05:40.000000000 +0100
++++ libkml-1.1.0/m4/ltversion.m4	2009-12-10 17:29:26.000000000 +0100
+@@ -9,15 +9,15 @@
+ 
+ # Generated from ltversion.in.
+ 
+-# serial 3012 ltversion.m4
 +# serial 3017 ltversion.m4
-+# This file is part of GNU Libtool
-+
+ # This file is part of GNU Libtool
+ 
+-m4_define([LT_PACKAGE_VERSION], [2.2.6])
+-m4_define([LT_PACKAGE_REVISION], [1.3012])
 +m4_define([LT_PACKAGE_VERSION], [2.2.6b])
 +m4_define([LT_PACKAGE_REVISION], [1.3017])
-+
-+AC_DEFUN([LTVERSION_VERSION],
+ 
+ AC_DEFUN([LTVERSION_VERSION],
+-[macro_version='2.2.6'
+-macro_revision='1.3012'
 +[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: libkml-1.0.1/Makefile.in
+ _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
+ _LT_DECL(, macro_revision, 0)
+ ])
+Index: libkml-1.1.0/Makefile.in
 ===================================================================
---- libkml-1.0.1.orig/Makefile.in	2009-07-03 01:23:36.000000000 +0200
-+++ libkml-1.0.1/Makefile.in	2009-12-10 10:19:49.000000000 +0100
+--- libkml-1.1.0.orig/Makefile.in	2009-12-10 13:05:40.000000000 +0100
++++ libkml-1.1.0/Makefile.in	2009-12-10 17:29:40.000000000 +0100
 @@ -1,8 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
+-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
-@@ -13,15 +14,12 @@
- # PARTICULAR PURPOSE.
- 
+@@ -15,8 +16,9 @@
  @SET_MAKE@
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
  VPATH = @srcdir@
  pkgdatadir = $(datadir)/@PACKAGE@
 -pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = .
 +pkglibdir = $(libdir)/@PACKAGE@
 +pkglibexecdir = $(libexecdir)/@PACKAGE@
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -35,30 +33,39 @@
- POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
-+subdir = .
- DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
- 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
- 	$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
- 	config/config.guess config/config.sub config/depcomp \
- 	config/install-sh config/ltmain.sh config/missing
--subdir = .
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_curl.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)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
- am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
-- configure.lineno configure.status.lineno
-+ configure.lineno config.status.lineno
+@@ -49,6 +51,7 @@
  mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = config.h
  CONFIG_CLEAN_FILES =
@@ -73176,25 +16993,17 @@
  SOURCES =
  DIST_SOURCES =
  RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- 	html-recursive info-recursive install-data-recursive \
--	install-exec-recursive install-info-recursive \
--	install-recursive installcheck-recursive installdirs-recursive \
--	pdf-recursive ps-recursive uninstall-info-recursive \
--	uninstall-recursive
-+	install-dvi-recursive install-exec-recursive \
-+	install-html-recursive install-info-recursive \
-+	install-pdf-recursive install-ps-recursive install-recursive \
-+	installcheck-recursive installdirs-recursive pdf-recursive \
-+	ps-recursive uninstall-recursive
-+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-+  distclean-recursive maintainer-clean-recursive
+@@ -60,6 +63,9 @@
+ 	ps-recursive uninstall-recursive
+ RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+   distclean-recursive maintainer-clean-recursive
 +AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
 +	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
 +	distdir dist dist-all distcheck
  ETAGS = etags
  CTAGS = ctags
  DIST_SUBDIRS = $(SUBDIRS)
-@@ -66,16 +73,39 @@
+@@ -67,9 +73,34 @@
  distdir = $(PACKAGE)-$(VERSION)
  top_distdir = $(distdir)
  am__remove_distdir = \
@@ -73232,59 +17041,7 @@
  DIST_ARCHIVES = $(distdir).tar.gz
  GZIP_ENV = --best
  distuninstallcheck_listfiles = find . -type f -print
- distcleancheck_listfiles = find . -type f -print
- ACLOCAL = @ACLOCAL@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -97,18 +127,16 @@
- CYGPATH_W = @CYGPATH_W@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
--ECHO = @ECHO@
-+DSYMUTIL = @DSYMUTIL@
-+DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
--F77 = @F77@
--FFLAGS = @FFLAGS@
--GCC_FALSE = @GCC_FALSE@
--GCC_TRUE = @GCC_TRUE@
--HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
--HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
-+FGREP = @FGREP@
-+GREP = @GREP@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -118,19 +146,28 @@
- JAVAC = @JAVAC@
- JAVA_INCLUDE_DIR = @JAVA_INCLUDE_DIR@
- JAVA_LIB_DIR = @JAVA_LIB_DIR@
-+LD = @LD@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
-+LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
-+NM = @NM@
-+NMEDIT = @NMEDIT@
-+OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
-+OTOOL = @OTOOL@
-+OTOOL64 = @OTOOL64@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -136,6 +167,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -73292,77 +17049,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PLATFORM = @PLATFORM@
-@@ -147,22 +184,13 @@
- STRIP = @STRIP@
- SWIG = @SWIG@
- VERSION = @VERSION@
--WITH_JAVA_FALSE = @WITH_JAVA_FALSE@
--WITH_JAVA_TRUE = @WITH_JAVA_TRUE@
--WITH_PYTHON_FALSE = @WITH_PYTHON_FALSE@
--WITH_PYTHON_TRUE = @WITH_PYTHON_TRUE@
--WITH_SWIG_FALSE = @WITH_SWIG_FALSE@
--WITH_SWIG_TRUE = @WITH_SWIG_TRUE@
--ac_ct_AR = @ac_ct_AR@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
--ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -174,28 +202,41 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- ACLOCAL_AMFLAGS = -I m4
- 
- # Order is important:
-@@ -215,15 +256,15 @@
+@@ -224,15 +256,15 @@
  	@for dep in $?; do \
  	  case '$(am__configure_deps)' in \
  	    *$$dep*) \
@@ -73383,7 +17070,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -239,21 +280,22 @@
+@@ -248,9 +280,10 @@
  	$(SHELL) ./config.status --recheck
  
  $(top_srcdir)/configure:  $(am__configure_deps)
@@ -73396,12 +17083,7 @@
  
  config.h: stamp-h1
  	@if test ! -f $@; then \
- 	  rm -f stamp-h1; \
--	  $(MAKE) stamp-h1; \
-+	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
- 	else :; fi
- 
- stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
+@@ -262,7 +295,7 @@
  	@rm -f stamp-h1
  	cd $(top_builddir) && $(SHELL) ./config.status config.h
  $(srcdir)/config.h.in:  $(am__configure_deps) 
@@ -73410,17 +17092,7 @@
  	rm -f stamp-h1
  	touch $@
  
-@@ -267,8 +309,7 @@
- 	-rm -rf .libs _libs
- 
- distclean-libtool:
--	-rm -f libtool
--uninstall-info-am:
-+	-rm -f libtool config.lt
- 
- # This directory's subdirectories are mostly independent; you can cd
- # into them and run `make' without going through this Makefile.
-@@ -294,15 +335,14 @@
+@@ -302,7 +335,7 @@
  	  else \
  	    local_target="$$target"; \
  	  fi; \
@@ -73429,16 +17101,7 @@
  	  || eval $$failcom; \
  	done; \
  	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
- 	fi; test -z "$$fail"
- 
--mostlyclean-recursive clean-recursive distclean-recursive \
--maintainer-clean-recursive:
-+$(RECURSIVE_CLEAN_TARGETS):
- 	@failcom='exit 1'; \
- 	for f in x $$MAKEFLAGS; do \
- 	  case $$f in \
-@@ -329,16 +369,16 @@
+@@ -336,16 +369,16 @@
  	  else \
  	    local_target="$$target"; \
  	  fi; \
@@ -73458,16 +17121,7 @@
  	done
  
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-@@ -346,14 +386,14 @@
- 	unique=`for i in $$list; do \
- 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- 	  done | \
--	  $(AWK) '    { files[$$0] = 1; } \
--	       END { for (i in files) print i; }'`; \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
- 	mkid -fID $$unique
- tags: TAGS
+@@ -360,7 +393,7 @@
  
  TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
@@ -73476,7 +17130,7 @@
  	here=`pwd`; \
  	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
  	  include_option=--etags-include; \
-@@ -365,93 +405,113 @@
+@@ -372,7 +405,7 @@
  	list='$(SUBDIRS)'; for subdir in $$list; do \
  	  if test "$$subdir" = .; then :; else \
  	    test ! -f $$subdir/TAGS || \
@@ -73485,14 +17139,11 @@
  	  fi; \
  	done; \
  	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
- 	unique=`for i in $$list; do \
- 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+@@ -381,36 +414,41 @@
  	  done | \
--	  $(AWK) '    { files[$$0] = 1; } \
--	       END { for (i in files) print i; }'`; \
+ 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 -	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 +	shift; \
 +	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
  	  test -n "$$unique" || unique=$$empty_fix; \
@@ -73510,16 +17161,13 @@
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
 -	tags=; \
--	here=`pwd`; \
  	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  	  done | \
--	  $(AWK) '    { files[$$0] = 1; } \
--	       END { for (i in files) print i; }'`; \
+ 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 -	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 +	test -z "$(CTAGS_ARGS)$$unique" \
  	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 -	     $$tags $$unique
@@ -73537,38 +17185,15 @@
  
  distdir: $(DISTFILES)
  	$(am__remove_distdir)
--	mkdir $(distdir)
--	$(mkdir_p) $(distdir)/config $(distdir)/m4
--	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
--	list='$(DISTFILES)'; for file in $$list; do \
--	  case $$file in \
--	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
--	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
--	  esac; \
+-	test -d $(distdir) || mkdir $(distdir)
 +	test -d "$(distdir)" || mkdir "$(distdir)"
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
+ 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ 	list='$(DISTFILES)'; \
+@@ -426,38 +464,54 @@
  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
--	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
--	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
--	    dir="/$$dir"; \
--	    $(mkdir_p) "$(distdir)$$dir"; \
--	  else \
--	    dir=''; \
--	  fi; \
  	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 +	    if test -d "$(distdir)/$$file"; then \
 +	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 +	    fi; \
@@ -73591,8 +17216,7 @@
 +	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
  	  if test "$$subdir" = .; then :; else \
  	    test -d "$(distdir)/$$subdir" \
--	    || $(mkdir_p) "$(distdir)/$$subdir" \
-+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+ 	    || $(MKDIR_P) "$(distdir)/$$subdir" \
  	    || exit 1; \
 -	    distdir=`$(am__cd) $(distdir) && pwd`; \
 -	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -73615,8 +17239,8 @@
 -	        distdir="$$distdir/$$subdir" \
 +	        top_distdir="$$new_top_distdir" \
 +	        distdir="$$new_distdir" \
-+		am__remove_distdir=: \
-+		am__skip_length_check=: \
+ 		am__remove_distdir=: \
+ 		am__skip_length_check=: \
 +		am__skip_mode_fix=: \
  	        distdir) \
  	      || exit 1; \
@@ -73627,21 +17251,16 @@
 +	|| find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
  	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
  	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
--	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
+ 	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
 -	|| chmod -R a+r $(distdir)
-+	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
 +	|| chmod -R a+r "$(distdir)"
  dist-gzip: distdir
  	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
  	$(am__remove_distdir)
-@@ -460,6 +520,14 @@
- 	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+@@ -470,6 +524,10 @@
+ 	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
  	$(am__remove_distdir)
  
-+dist-lzma: distdir
-+	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
-+	$(am__remove_distdir)
-+
 +dist-xz: distdir
 +	tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
 +	$(am__remove_distdir)
@@ -73649,18 +17268,16 @@
  dist-tarZ: distdir
  	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
  	$(am__remove_distdir)
-@@ -486,6 +554,10 @@
- 	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
- 	*.tar.bz2*) \
+@@ -498,6 +556,8 @@
  	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
-+	*.tar.lzma*) \
-+	  unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
+ 	*.tar.lzma*) \
+ 	  unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
 +	*.tar.xz*) \
 +	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
  	*.tar.Z*) \
  	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
  	*.shar.gz*) \
-@@ -497,9 +569,11 @@
+@@ -509,9 +569,11 @@
  	mkdir $(distdir)/_build
  	mkdir $(distdir)/_inst
  	chmod a-w $(distdir)
@@ -73673,7 +17290,7 @@
  	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
  	    $(DISTCHECK_CONFIGURE_FLAGS) \
  	  && $(MAKE) $(AM_MAKEFLAGS) \
-@@ -521,13 +595,15 @@
+@@ -533,13 +595,15 @@
  	  && rm -rf "$$dc_destdir" \
  	  && $(MAKE) $(AM_MAKEFLAGS) dist \
  	  && rm -rf $(DIST_ARCHIVES) \
@@ -73684,15 +17301,14 @@
  	$(am__remove_distdir)
  	@(echo "$(distdir) archives ready for distribution: "; \
  	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
--	  sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
-+	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
+ 	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
  distuninstallcheck:
 -	@cd $(distuninstallcheck_dir) \
 +	@$(am__cd) '$(distuninstallcheck_dir)' \
  	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
  	   || { echo "ERROR: files left after uninstall:" ; \
  	        if test -n "$(DESTDIR)"; then \
-@@ -569,6 +645,7 @@
+@@ -581,6 +645,7 @@
  
  distclean-generic:
  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -73700,7 +17316,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -589,18 +666,38 @@
+@@ -601,6 +666,8 @@
  
  html: html-recursive
  
@@ -73709,17 +17325,16 @@
  info: info-recursive
  
  info-am:
+@@ -609,18 +676,28 @@
  
- install-data-am:
+ install-dvi: install-dvi-recursive
  
-+install-dvi: install-dvi-recursive
-+
 +install-dvi-am:
 +
  install-exec-am:
  
-+install-html: install-html-recursive
-+
+ install-html: install-html-recursive
+ 
 +install-html-am:
 +
  install-info: install-info-recursive
@@ -73728,102 +17343,85 @@
 +
  install-man:
  
-+install-pdf: install-pdf-recursive
-+
+ install-pdf: install-pdf-recursive
+ 
 +install-pdf-am:
 +
-+install-ps: install-ps-recursive
-+
+ install-ps: install-ps-recursive
+ 
 +install-ps-am:
 +
  installcheck-am:
  
  maintainer-clean: maintainer-clean-recursive
-@@ -621,24 +718,27 @@
+@@ -643,24 +720,25 @@
  
- ps-am:
+ uninstall-am:
  
--uninstall-am: uninstall-info-am
-+uninstall-am:
- 
--uninstall-info: uninstall-info-recursive
+-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+-	install-strip
 +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
 +	ctags-recursive install-am install-strip tags-recursive
  
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
--	check-am clean clean-generic clean-libtool clean-recursive \
--	ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
--	dist-shar dist-tarZ dist-zip distcheck distclean \
--	distclean-generic distclean-hdr distclean-libtool \
--	distclean-recursive distclean-tags distcleancheck distdir \
-+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-+	all all-am am--refresh check check-am clean clean-generic \
-+	clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
+ .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ 	all all-am am--refresh check check-am clean clean-generic \
+ 	clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
+-	dist-gzip dist-lzma dist-shar dist-tarZ dist-zip distcheck \
+-	distclean distclean-generic distclean-hdr distclean-libtool \
+-	distclean-tags distcleancheck distdir distuninstallcheck dvi \
+-	dvi-am html html-am info info-am install install-am \
+-	install-data install-data-am install-dvi install-dvi-am \
+-	install-exec install-exec-am install-html install-html-am \
+-	install-info install-info-am install-man install-pdf \
+-	install-pdf-am install-ps install-ps-am install-strip \
+-	installcheck installcheck-am installdirs installdirs-am \
+-	maintainer-clean maintainer-clean-generic mostlyclean \
+-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+-	tags tags-recursive uninstall uninstall-am
 +	dist-gzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \
 +	distcheck distclean distclean-generic distclean-hdr \
 +	distclean-libtool distclean-tags distcleancheck distdir \
- 	distuninstallcheck dvi dvi-am html html-am info info-am \
--	install install-am install-data install-data-am install-exec \
--	install-exec-am install-info install-info-am install-man \
++	distuninstallcheck dvi dvi-am html html-am info info-am \
 +	install install-am install-data install-data-am install-dvi \
 +	install-dvi-am install-exec install-exec-am install-html \
 +	install-html-am install-info install-info-am install-man \
 +	install-pdf install-pdf-am install-ps install-ps-am \
- 	install-strip installcheck installcheck-am installdirs \
- 	installdirs-am maintainer-clean maintainer-clean-generic \
--	maintainer-clean-recursive mostlyclean mostlyclean-generic \
--	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
--	tags tags-recursive uninstall uninstall-am uninstall-info-am
++	install-strip installcheck installcheck-am installdirs \
++	installdirs-am maintainer-clean maintainer-clean-generic \
 +	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
 +	ps ps-am tags tags-recursive uninstall uninstall-am
 +
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-Index: libkml-1.0.1/msvc/examples/Makefile.in
+Index: libkml-1.1.0/msvc/examples/Makefile.in
 ===================================================================
---- libkml-1.0.1.orig/msvc/examples/Makefile.in	2009-07-03 01:23:31.000000000 +0200
-+++ libkml-1.0.1/msvc/examples/Makefile.in	2009-12-10 10:19:45.000000000 +0100
+--- libkml-1.1.0.orig/msvc/examples/Makefile.in	2009-12-10 13:05:40.000000000 +0100
++++ libkml-1.1.0/msvc/examples/Makefile.in	2009-12-10 17:29:35.000000000 +0100
 @@ -1,8 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
+-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
-@@ -13,15 +14,12 @@
- # PARTICULAR PURPOSE.
- 
+@@ -15,8 +16,9 @@
  @SET_MAKE@
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
  VPATH = @srcdir@
  pkgdatadir = $(datadir)/@PACKAGE@
 -pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../..
 +pkglibdir = $(libdir)/@PACKAGE@
 +pkglibexecdir = $(libexecdir)/@PACKAGE@
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -39,18 +37,19 @@
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_curl.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)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
+@@ -43,6 +45,7 @@
  mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
@@ -73831,58 +17429,7 @@
  SOURCES =
  DIST_SOURCES =
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -72,18 +71,16 @@
- CYGPATH_W = @CYGPATH_W@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
--ECHO = @ECHO@
-+DSYMUTIL = @DSYMUTIL@
-+DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
--F77 = @F77@
--FFLAGS = @FFLAGS@
--GCC_FALSE = @GCC_FALSE@
--GCC_TRUE = @GCC_TRUE@
--HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
--HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
-+FGREP = @FGREP@
-+GREP = @GREP@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -93,19 +90,28 @@
- JAVAC = @JAVAC@
- JAVA_INCLUDE_DIR = @JAVA_INCLUDE_DIR@
- JAVA_LIB_DIR = @JAVA_LIB_DIR@
-+LD = @LD@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
-+LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
-+NM = @NM@
-+NMEDIT = @NMEDIT@
-+OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
-+OTOOL = @OTOOL@
-+OTOOL64 = @OTOOL64@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -108,6 +111,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -73890,84 +17437,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PLATFORM = @PLATFORM@
-@@ -122,22 +128,13 @@
- STRIP = @STRIP@
- SWIG = @SWIG@
- VERSION = @VERSION@
--WITH_JAVA_FALSE = @WITH_JAVA_FALSE@
--WITH_JAVA_TRUE = @WITH_JAVA_TRUE@
--WITH_PYTHON_FALSE = @WITH_PYTHON_FALSE@
--WITH_PYTHON_TRUE = @WITH_PYTHON_TRUE@
--WITH_SWIG_FALSE = @WITH_SWIG_FALSE@
--WITH_SWIG_TRUE = @WITH_SWIG_TRUE@
--ac_ct_AR = @ac_ct_AR@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
--ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -149,28 +146,41 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- EXTRA_DIST = \
- 	change.vcproj \
- 	createkml.vcproj \
-@@ -188,14 +198,14 @@
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
--	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
--		&& exit 0; \
-+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-+	        && { if test -f $@; then exit 0; else break; fi; }; \
+@@ -199,9 +203,9 @@
  	      exit 1;; \
  	  esac; \
  	done; \
@@ -73980,7 +17450,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -213,16 +223,13 @@
+@@ -219,6 +223,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -73988,49 +17458,10 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
- 
- clean-libtool:
- 	-rm -rf .libs _libs
--
--distclean-libtool:
--	-rm -f libtool
--uninstall-info-am:
- tags: TAGS
- TAGS:
- 
-@@ -231,29 +238,32 @@
- 
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
--	list='$(DISTFILES)'; for file in $$list; do \
--	  case $$file in \
--	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
--	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
--	  esac; \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
+@@ -248,13 +253,17 @@
  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
--	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
--	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
--	    dir="/$$dir"; \
--	    $(mkdir_p) "$(distdir)$$dir"; \
--	  else \
--	    dir=''; \
--	  fi; \
  	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 +	    if test -d "$(distdir)/$$file"; then \
 +	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 +	    fi; \
@@ -74049,7 +17480,7 @@
  	    || exit 1; \
  	  fi; \
  	done
-@@ -281,6 +291,7 @@
+@@ -282,6 +291,7 @@
  
  distclean-generic:
  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -74057,17 +17488,8 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -291,7 +302,7 @@
+@@ -300,6 +310,8 @@
  
- distclean: distclean-am
- 	-rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool
-+distclean-am: clean-am distclean-generic
- 
- dvi: dvi-am
- 
-@@ -299,18 +310,38 @@
- 
  html: html-am
  
 +html-am:
@@ -74075,17 +17497,16 @@
  info: info-am
  
  info-am:
+@@ -308,18 +320,28 @@
  
- install-data-am:
+ install-dvi: install-dvi-am
  
-+install-dvi: install-dvi-am
-+
 +install-dvi-am:
 +
  install-exec-am:
  
-+install-html: install-html-am
-+
+ install-html: install-html-am
+ 
 +install-html-am:
 +
  install-info: install-info-am
@@ -74094,88 +17515,53 @@
 +
  install-man:
  
-+install-pdf: install-pdf-am
-+
+ install-pdf: install-pdf-am
+ 
 +install-pdf-am:
 +
-+install-ps: install-ps-am
-+
+ install-ps: install-ps-am
+ 
 +install-ps-am:
 +
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
-@@ -329,17 +360,21 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-info-am
-+uninstall-am:
-+
-+.MAKE: install-am install-strip
- 
- .PHONY: all all-am check check-am clean clean-generic clean-libtool \
- 	distclean distclean-generic distclean-libtool distdir dvi \
- 	dvi-am html html-am info info-am install install-am \
--	install-data install-data-am install-exec install-exec-am \
--	install-info install-info-am install-man install-strip \
-+	install-data install-data-am install-dvi install-dvi-am \
-+	install-exec install-exec-am install-html install-html-am \
-+	install-info install-info-am install-man install-pdf \
-+	install-pdf-am install-ps install-ps-am install-strip \
- 	installcheck installcheck-am installdirs maintainer-clean \
+@@ -353,6 +375,7 @@
  	maintainer-clean-generic mostlyclean mostlyclean-generic \
--	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
--	uninstall-info-am
-+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
-+
+ 	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
  
++
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-Index: libkml-1.0.1/msvc/Makefile.in
+ .NOEXPORT:
+Index: libkml-1.1.0/msvc/Makefile.in
 ===================================================================
---- libkml-1.0.1.orig/msvc/Makefile.in	2009-07-03 01:23:31.000000000 +0200
-+++ libkml-1.0.1/msvc/Makefile.in	2009-12-10 10:19:45.000000000 +0100
+--- libkml-1.1.0.orig/msvc/Makefile.in	2009-12-10 13:05:40.000000000 +0100
++++ libkml-1.1.0/msvc/Makefile.in	2009-12-10 17:29:35.000000000 +0100
 @@ -1,8 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
+-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
-@@ -13,15 +14,12 @@
- # PARTICULAR PURPOSE.
- 
+@@ -15,8 +16,9 @@
  @SET_MAKE@
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
  VPATH = @srcdir@
  pkgdatadir = $(datadir)/@PACKAGE@
 -pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ..
 +pkglibdir = $(libdir)/@PACKAGE@
 +pkglibexecdir = $(libexecdir)/@PACKAGE@
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -39,27 +37,59 @@
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_curl.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)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
+@@ -43,6 +45,7 @@
  mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
@@ -74183,18 +17569,10 @@
  SOURCES =
  DIST_SOURCES =
  RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- 	html-recursive info-recursive install-data-recursive \
--	install-exec-recursive install-info-recursive \
--	install-recursive installcheck-recursive installdirs-recursive \
--	pdf-recursive ps-recursive uninstall-info-recursive \
--	uninstall-recursive
-+	install-dvi-recursive install-exec-recursive \
-+	install-html-recursive install-info-recursive \
-+	install-pdf-recursive install-ps-recursive install-recursive \
-+	installcheck-recursive installdirs-recursive pdf-recursive \
-+	ps-recursive uninstall-recursive
-+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-+  distclean-recursive maintainer-clean-recursive
+@@ -54,10 +57,38 @@
+ 	ps-recursive uninstall-recursive
+ RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+   distclean-recursive maintainer-clean-recursive
 +AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
 +	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
 +	distdir
@@ -74228,57 +17606,9 @@
 +  done; \
 +  reldir="$$dir2"
  ACLOCAL = @ACLOCAL@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
  AMTAR = @AMTAR@
  AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -81,18 +111,16 @@
- CYGPATH_W = @CYGPATH_W@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
--ECHO = @ECHO@
-+DSYMUTIL = @DSYMUTIL@
-+DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
--F77 = @F77@
--FFLAGS = @FFLAGS@
--GCC_FALSE = @GCC_FALSE@
--GCC_TRUE = @GCC_TRUE@
--HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
--HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
-+FGREP = @FGREP@
-+GREP = @GREP@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -102,19 +130,28 @@
- JAVAC = @JAVAC@
- JAVA_INCLUDE_DIR = @JAVA_INCLUDE_DIR@
- JAVA_LIB_DIR = @JAVA_LIB_DIR@
-+LD = @LD@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
-+LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
-+NM = @NM@
-+NMEDIT = @NMEDIT@
-+OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
-+OTOOL = @OTOOL@
-+OTOOL64 = @OTOOL64@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -120,6 +151,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -74286,84 +17616,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PLATFORM = @PLATFORM@
-@@ -131,22 +168,13 @@
- STRIP = @STRIP@
- SWIG = @SWIG@
- VERSION = @VERSION@
--WITH_JAVA_FALSE = @WITH_JAVA_FALSE@
--WITH_JAVA_TRUE = @WITH_JAVA_TRUE@
--WITH_PYTHON_FALSE = @WITH_PYTHON_FALSE@
--WITH_PYTHON_TRUE = @WITH_PYTHON_TRUE@
--WITH_SWIG_FALSE = @WITH_SWIG_FALSE@
--WITH_SWIG_TRUE = @WITH_SWIG_TRUE@
--ac_ct_AR = @ac_ct_AR@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
--ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -158,28 +186,41 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- SUBDIRS = examples tests
- EXTRA_DIST = \
- 	libkml.sln \
-@@ -197,14 +238,14 @@
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
--	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
--		&& exit 0; \
-+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-+	        && { if test -f $@; then exit 0; else break; fi; }; \
+@@ -211,9 +243,9 @@
  	      exit 1;; \
  	  esac; \
  	done; \
@@ -74376,7 +17629,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -222,6 +263,7 @@
+@@ -231,6 +263,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -74384,18 +17637,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -229,10 +271,6 @@
- clean-libtool:
- 	-rm -rf .libs _libs
- 
--distclean-libtool:
--	-rm -f libtool
--uninstall-info-am:
--
- # This directory's subdirectories are mostly independent; you can cd
- # into them and run `make' without going through this Makefile.
- # To change the values of `make' variables: instead of editing Makefiles,
-@@ -257,15 +295,14 @@
+@@ -262,7 +295,7 @@
  	  else \
  	    local_target="$$target"; \
  	  fi; \
@@ -74404,16 +17646,7 @@
  	  || eval $$failcom; \
  	done; \
  	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
- 	fi; test -z "$$fail"
- 
--mostlyclean-recursive clean-recursive distclean-recursive \
--maintainer-clean-recursive:
-+$(RECURSIVE_CLEAN_TARGETS):
- 	@failcom='exit 1'; \
- 	for f in x $$MAKEFLAGS; do \
- 	  case $$f in \
-@@ -292,16 +329,16 @@
+@@ -296,16 +329,16 @@
  	  else \
  	    local_target="$$target"; \
  	  fi; \
@@ -74433,16 +17666,7 @@
  	done
  
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-@@ -309,14 +346,14 @@
- 	unique=`for i in $$list; do \
- 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- 	  done | \
--	  $(AWK) '    { files[$$0] = 1; } \
--	       END { for (i in files) print i; }'`; \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
- 	mkid -fID $$unique
- tags: TAGS
+@@ -320,7 +353,7 @@
  
  TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
@@ -74451,7 +17675,7 @@
  	here=`pwd`; \
  	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
  	  include_option=--etags-include; \
-@@ -328,81 +365,101 @@
+@@ -332,7 +365,7 @@
  	list='$(SUBDIRS)'; for subdir in $$list; do \
  	  if test "$$subdir" = .; then :; else \
  	    test ! -f $$subdir/TAGS || \
@@ -74460,14 +17684,11 @@
  	  fi; \
  	done; \
  	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
- 	unique=`for i in $$list; do \
- 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+@@ -341,29 +374,34 @@
  	  done | \
--	  $(AWK) '    { files[$$0] = 1; } \
--	       END { for (i in files) print i; }'`; \
+ 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 -	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 +	shift; \
 +	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
  	  test -n "$$unique" || unique=$$empty_fix; \
@@ -74485,16 +17706,13 @@
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
 -	tags=; \
--	here=`pwd`; \
  	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  	  done | \
--	  $(AWK) '    { files[$$0] = 1; } \
--	       END { for (i in files) print i; }'`; \
+ 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 -	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 +	test -z "$(CTAGS_ARGS)$$unique" \
  	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 -	     $$tags $$unique
@@ -74509,37 +17727,10 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
--	list='$(DISTFILES)'; for file in $$list; do \
--	  case $$file in \
--	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
--	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
--	  esac; \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
+@@ -384,29 +422,44 @@
  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
--	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
--	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
--	    dir="/$$dir"; \
--	    $(mkdir_p) "$(distdir)$$dir"; \
--	  else \
--	    dir=''; \
--	  fi; \
  	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 +	    if test -d "$(distdir)/$$file"; then \
 +	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 +	    fi; \
@@ -74562,8 +17753,7 @@
 +	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
  	  if test "$$subdir" = .; then :; else \
  	    test -d "$(distdir)/$$subdir" \
--	    || $(mkdir_p) "$(distdir)/$$subdir" \
-+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+ 	    || $(MKDIR_P) "$(distdir)/$$subdir" \
  	    || exit 1; \
 -	    distdir=`$(am__cd) $(distdir) && pwd`; \
 -	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -74586,13 +17776,13 @@
 -	        distdir="$$distdir/$$subdir" \
 +	        top_distdir="$$new_top_distdir" \
 +	        distdir="$$new_distdir" \
-+		am__remove_distdir=: \
-+		am__skip_length_check=: \
+ 		am__remove_distdir=: \
+ 		am__skip_length_check=: \
 +		am__skip_mode_fix=: \
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -432,6 +489,7 @@
+@@ -436,6 +489,7 @@
  
  distclean-generic:
  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -74600,18 +17790,8 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -442,8 +500,7 @@
+@@ -454,6 +508,8 @@
  
- distclean: distclean-recursive
- 	-rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool \
--	distclean-tags
-+distclean-am: clean-am distclean-generic distclean-tags
- 
- dvi: dvi-recursive
- 
-@@ -451,18 +508,38 @@
- 
  html: html-recursive
  
 +html-am:
@@ -74619,17 +17799,16 @@
  info: info-recursive
  
  info-am:
+@@ -462,18 +518,28 @@
  
- install-data-am:
+ install-dvi: install-dvi-recursive
  
-+install-dvi: install-dvi-recursive
-+
 +install-dvi-am:
 +
  install-exec-am:
  
-+install-html: install-html-recursive
-+
+ install-html: install-html-recursive
+ 
 +install-html-am:
 +
  install-info: install-info-recursive
@@ -74638,99 +17817,64 @@
 +
  install-man:
  
-+install-pdf: install-pdf-recursive
-+
+ install-pdf: install-pdf-recursive
+ 
 +install-pdf-am:
 +
-+install-ps: install-ps-recursive
-+
+ install-ps: install-ps-recursive
+ 
 +install-ps-am:
 +
  installcheck-am:
  
  maintainer-clean: maintainer-clean-recursive
-@@ -481,22 +558,25 @@
+@@ -494,8 +560,8 @@
  
- ps-am:
+ uninstall-am:
  
--uninstall-am: uninstall-info-am
-+uninstall-am:
- 
--uninstall-info: uninstall-info-recursive
+-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+-	install-strip
 +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
 +	install-am install-strip tags-recursive
  
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
--	clean clean-generic clean-libtool clean-recursive ctags \
--	ctags-recursive distclean distclean-generic distclean-libtool \
--	distclean-recursive distclean-tags distdir dvi dvi-am html \
-+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-+	all all-am check check-am clean clean-generic clean-libtool \
-+	ctags ctags-recursive distclean distclean-generic \
-+	distclean-libtool distclean-tags distdir dvi dvi-am html \
- 	html-am info info-am install install-am install-data \
--	install-data-am install-exec install-exec-am install-info \
--	install-info-am install-man install-strip installcheck \
-+	install-data-am install-dvi install-dvi-am install-exec \
-+	install-exec-am install-html install-html-am install-info \
-+	install-info-am install-man install-pdf install-pdf-am \
-+	install-ps install-ps-am install-strip installcheck \
- 	installcheck-am installdirs installdirs-am maintainer-clean \
--	maintainer-clean-generic maintainer-clean-recursive \
--	mostlyclean mostlyclean-generic mostlyclean-libtool \
--	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
--	uninstall uninstall-am uninstall-info-am
-+	maintainer-clean-generic mostlyclean mostlyclean-generic \
-+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-+	uninstall uninstall-am
-+
+ .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ 	all all-am check check-am clean clean-generic clean-libtool \
+@@ -511,6 +577,7 @@
+ 	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+ 	uninstall uninstall-am
  
++
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-Index: libkml-1.0.1/msvc/tests/Makefile.in
+ .NOEXPORT:
+Index: libkml-1.1.0/msvc/tests/Makefile.in
 ===================================================================
---- libkml-1.0.1.orig/msvc/tests/Makefile.in	2009-07-03 01:23:31.000000000 +0200
-+++ libkml-1.0.1/msvc/tests/Makefile.in	2009-12-10 10:19:45.000000000 +0100
+--- libkml-1.1.0.orig/msvc/tests/Makefile.in	2009-12-10 13:05:40.000000000 +0100
++++ libkml-1.1.0/msvc/tests/Makefile.in	2009-12-10 17:29:35.000000000 +0100
 @@ -1,8 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
+-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
-@@ -13,15 +14,12 @@
- # PARTICULAR PURPOSE.
- 
+@@ -15,8 +16,9 @@
  @SET_MAKE@
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
  VPATH = @srcdir@
  pkgdatadir = $(datadir)/@PACKAGE@
 -pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../..
 +pkglibdir = $(libdir)/@PACKAGE@
 +pkglibexecdir = $(libexecdir)/@PACKAGE@
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -39,18 +37,19 @@
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_curl.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)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
+@@ -43,6 +45,7 @@
  mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
@@ -74738,58 +17882,7 @@
  SOURCES =
  DIST_SOURCES =
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -72,18 +71,16 @@
- CYGPATH_W = @CYGPATH_W@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
--ECHO = @ECHO@
-+DSYMUTIL = @DSYMUTIL@
-+DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
--F77 = @F77@
--FFLAGS = @FFLAGS@
--GCC_FALSE = @GCC_FALSE@
--GCC_TRUE = @GCC_TRUE@
--HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
--HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
-+FGREP = @FGREP@
-+GREP = @GREP@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -93,19 +90,28 @@
- JAVAC = @JAVAC@
- JAVA_INCLUDE_DIR = @JAVA_INCLUDE_DIR@
- JAVA_LIB_DIR = @JAVA_LIB_DIR@
-+LD = @LD@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
-+LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
-+NM = @NM@
-+NMEDIT = @NMEDIT@
-+OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
-+OTOOL = @OTOOL@
-+OTOOL64 = @OTOOL64@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -108,6 +111,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -74797,84 +17890,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PLATFORM = @PLATFORM@
-@@ -122,22 +128,13 @@
- STRIP = @STRIP@
- SWIG = @SWIG@
- VERSION = @VERSION@
--WITH_JAVA_FALSE = @WITH_JAVA_FALSE@
--WITH_JAVA_TRUE = @WITH_JAVA_TRUE@
--WITH_PYTHON_FALSE = @WITH_PYTHON_FALSE@
--WITH_PYTHON_TRUE = @WITH_PYTHON_TRUE@
--WITH_SWIG_FALSE = @WITH_SWIG_FALSE@
--WITH_SWIG_TRUE = @WITH_SWIG_TRUE@
--ac_ct_AR = @ac_ct_AR@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
--ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -149,28 +146,41 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- EXTRA_DIST = \
- 	exec_tests.bat \
- 	libkml_tests.sln \
-@@ -253,14 +263,14 @@
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
--	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
--		&& exit 0; \
-+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-+	        && { if test -f $@; then exit 0; else break; fi; }; \
+@@ -264,9 +268,9 @@
  	      exit 1;; \
  	  esac; \
  	done; \
@@ -74887,7 +17903,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -278,16 +288,13 @@
+@@ -284,6 +288,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -74895,49 +17911,10 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
- 
- clean-libtool:
- 	-rm -rf .libs _libs
--
--distclean-libtool:
--	-rm -f libtool
--uninstall-info-am:
- tags: TAGS
- TAGS:
- 
-@@ -296,29 +303,32 @@
- 
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
--	list='$(DISTFILES)'; for file in $$list; do \
--	  case $$file in \
--	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
--	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
--	  esac; \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
+@@ -313,13 +318,17 @@
  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
--	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
--	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
--	    dir="/$$dir"; \
--	    $(mkdir_p) "$(distdir)$$dir"; \
--	  else \
--	    dir=''; \
--	  fi; \
  	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 +	    if test -d "$(distdir)/$$file"; then \
 +	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 +	    fi; \
@@ -74956,7 +17933,7 @@
  	    || exit 1; \
  	  fi; \
  	done
-@@ -346,6 +356,7 @@
+@@ -347,6 +356,7 @@
  
  distclean-generic:
  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -74964,17 +17941,8 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -356,7 +367,7 @@
+@@ -365,6 +375,8 @@
  
- distclean: distclean-am
- 	-rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool
-+distclean-am: clean-am distclean-generic
- 
- dvi: dvi-am
- 
-@@ -364,18 +375,38 @@
- 
  html: html-am
  
 +html-am:
@@ -74982,17 +17950,16 @@
  info: info-am
  
  info-am:
+@@ -373,18 +385,28 @@
  
- install-data-am:
+ install-dvi: install-dvi-am
  
-+install-dvi: install-dvi-am
-+
 +install-dvi-am:
 +
  install-exec-am:
  
-+install-html: install-html-am
-+
+ install-html: install-html-am
+ 
 +install-html-am:
 +
  install-info: install-info-am
@@ -75001,104 +17968,53 @@
 +
  install-man:
  
-+install-pdf: install-pdf-am
-+
+ install-pdf: install-pdf-am
+ 
 +install-pdf-am:
 +
-+install-ps: install-ps-am
-+
+ install-ps: install-ps-am
+ 
 +install-ps-am:
 +
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
-@@ -394,17 +425,21 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-info-am
-+uninstall-am:
-+
-+.MAKE: install-am install-strip
- 
- .PHONY: all all-am check check-am clean clean-generic clean-libtool \
- 	distclean distclean-generic distclean-libtool distdir dvi \
- 	dvi-am html html-am info info-am install install-am \
--	install-data install-data-am install-exec install-exec-am \
--	install-info install-info-am install-man install-strip \
-+	install-data install-data-am install-dvi install-dvi-am \
-+	install-exec install-exec-am install-html install-html-am \
-+	install-info install-info-am install-man install-pdf \
-+	install-pdf-am install-ps install-ps-am install-strip \
- 	installcheck installcheck-am installdirs maintainer-clean \
+@@ -418,6 +440,7 @@
  	maintainer-clean-generic mostlyclean mostlyclean-generic \
--	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
--	uninstall-info-am
-+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
-+
+ 	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
  
++
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-Index: libkml-1.0.1/src/kml/base/Makefile.in
+ .NOEXPORT:
+Index: libkml-1.1.0/src/kml/base/Makefile.in
 ===================================================================
---- libkml-1.0.1.orig/src/kml/base/Makefile.in	2009-07-03 01:23:31.000000000 +0200
-+++ libkml-1.0.1/src/kml/base/Makefile.in	2009-12-10 10:19:46.000000000 +0100
+--- libkml-1.1.0.orig/src/kml/base/Makefile.in	2009-12-10 13:05:40.000000000 +0100
++++ libkml-1.1.0/src/kml/base/Makefile.in	2009-12-10 17:29:36.000000000 +0100
 @@ -1,8 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
+-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
-@@ -15,15 +16,12 @@
- @SET_MAKE@
+@@ -17,8 +18,9 @@
  
- 
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
  VPATH = @srcdir@
  pkgdatadir = $(datadir)/@PACKAGE@
 -pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../../..
 +pkglibdir = $(libdir)/@PACKAGE@
 +pkglibexecdir = $(libexecdir)/@PACKAGE@
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -37,27 +35,54 @@
- POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
-+TESTS = attributes_test$(EXEEXT) color32_test$(EXEEXT) \
-+	date_time_test$(EXEEXT) expat_handler_ns_test$(EXEEXT) \
-+	expat_parser_test$(EXEEXT) file_test$(EXEEXT) \
-+	math_util_test$(EXEEXT) net_cache_test$(EXEEXT) \
-+	referent_test$(EXEEXT) string_util_test$(EXEEXT) \
-+	tempfile_test$(EXEEXT) time_util_test$(EXEEXT) \
-+	uri_parser_test$(EXEEXT) util_test$(EXEEXT) vec3_test$(EXEEXT) \
-+	version_test$(EXEEXT) xml_element_test$(EXEEXT) \
-+	xml_file_test$(EXEEXT) xml_namespaces_test$(EXEEXT) \
-+	xmlns_test$(EXEEXT)
- check_PROGRAMS = $(am__EXEEXT_1)
- subdir = src/kml/base
- DIST_COMMON = $(libkmlbaseinclude_HEADERS) $(srcdir)/Makefile.am \
- 	$(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_curl.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)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
+@@ -57,19 +59,33 @@
  mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
@@ -75130,216 +18046,40 @@
 -libLTLIBRARIES_INSTALL = $(INSTALL)
  LTLIBRARIES = $(lib_LTLIBRARIES)
  libkmlbase_la_DEPENDENCIES =  \
- 	$(top_builddir)/third_party/liburiparser.la
-@@ -66,6 +91,9 @@
- 	math_util.lo referent.lo string_util.lo time_util.lo \
- 	uri_parser.lo version.lo xml_namespaces.lo
- libkmlbase_la_OBJECTS = $(am_libkmlbase_la_OBJECTS)
-+libkmlbase_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-+	$(CXXFLAGS) $(libkmlbase_la_LDFLAGS) $(LDFLAGS) -o $@
- am__EXEEXT_1 = attributes_test$(EXEEXT) color32_test$(EXEEXT) \
- 	date_time_test$(EXEEXT) expat_handler_ns_test$(EXEEXT) \
- 	expat_parser_test$(EXEEXT) file_test$(EXEEXT) \
-@@ -81,109 +109,183 @@
- attributes_test_OBJECTS = $(am_attributes_test_OBJECTS)
- attributes_test_DEPENDENCIES = libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+attributes_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-+	$(attributes_test_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- am_color32_test_OBJECTS = color32_test-color32_test.$(OBJEXT)
- color32_test_OBJECTS = $(am_color32_test_OBJECTS)
- color32_test_DEPENDENCIES = libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+color32_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(color32_test_CXXFLAGS) \
-+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- am_date_time_test_OBJECTS = date_time_test-date_time_test.$(OBJEXT)
- date_time_test_OBJECTS = $(am_date_time_test_OBJECTS)
- date_time_test_DEPENDENCIES = libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+date_time_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-+	$(date_time_test_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- am_expat_handler_ns_test_OBJECTS =  \
- 	expat_handler_ns_test-expat_handler_ns_test.$(OBJEXT)
- expat_handler_ns_test_OBJECTS = $(am_expat_handler_ns_test_OBJECTS)
- expat_handler_ns_test_DEPENDENCIES = libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+expat_handler_ns_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-+	$(expat_handler_ns_test_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- am_expat_parser_test_OBJECTS =  \
- 	expat_parser_test-expat_parser_test.$(OBJEXT)
- expat_parser_test_OBJECTS = $(am_expat_parser_test_OBJECTS)
- expat_parser_test_DEPENDENCIES = libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+expat_parser_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-+	$(expat_parser_test_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- am_file_test_OBJECTS = file_test-file_test.$(OBJEXT)
- file_test_OBJECTS = $(am_file_test_OBJECTS)
- file_test_DEPENDENCIES = libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+file_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(file_test_CXXFLAGS) \
-+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- am_math_util_test_OBJECTS = math_util_test-math_util_test.$(OBJEXT)
- math_util_test_OBJECTS = $(am_math_util_test_OBJECTS)
- math_util_test_DEPENDENCIES = libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+math_util_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-+	$(math_util_test_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
+-	$(top_builddir)/third_party/libminizip.la \
+-	$(top_builddir)/third_party/liburiparser.la
++	$(top_builddir)/third_party/libminizip.la
+ am_libkmlbase_la_OBJECTS = attributes.lo date_time.lo \
+ 	expat_handler_ns.lo expat_parser.lo file.lo file_posix.lo \
+ 	math_util.lo mimetypes.lo referent.lo string_util.lo \
+@@ -149,7 +165,6 @@
  am_net_cache_test_OBJECTS = net_cache_test-net_cache_test.$(OBJEXT)
  net_cache_test_OBJECTS = $(am_net_cache_test_OBJECTS)
  net_cache_test_DEPENDENCIES = libkmlbase.la \
- 	$(top_builddir)/third_party/liburiparser.la \
+-	$(top_builddir)/third_party/liburiparser.la \
  	$(top_builddir)/third_party/libgtest.la
-+net_cache_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-+	$(net_cache_test_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- am_referent_test_OBJECTS = referent_test-referent_test.$(OBJEXT)
- referent_test_OBJECTS = $(am_referent_test_OBJECTS)
- referent_test_DEPENDENCIES = libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+referent_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(referent_test_CXXFLAGS) \
-+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- am_string_util_test_OBJECTS =  \
- 	string_util_test-string_util_test.$(OBJEXT)
- string_util_test_OBJECTS = $(am_string_util_test_OBJECTS)
- string_util_test_DEPENDENCIES = libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+string_util_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-+	$(string_util_test_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- am_tempfile_test_OBJECTS = tempfile_test-tempfile_test.$(OBJEXT)
- tempfile_test_OBJECTS = $(am_tempfile_test_OBJECTS)
- tempfile_test_DEPENDENCIES = libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+tempfile_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(tempfile_test_CXXFLAGS) \
-+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- am_time_util_test_OBJECTS = time_util_test-time_util_test.$(OBJEXT)
- time_util_test_OBJECTS = $(am_time_util_test_OBJECTS)
- time_util_test_DEPENDENCIES = libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+time_util_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-+	$(time_util_test_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- am_uri_parser_test_OBJECTS =  \
+ net_cache_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+ 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
+@@ -190,7 +205,6 @@
  	uri_parser_test-uri_parser_test.$(OBJEXT)
  uri_parser_test_OBJECTS = $(am_uri_parser_test_OBJECTS)
  uri_parser_test_DEPENDENCIES = libkmlbase.la \
- 	$(top_builddir)/third_party/liburiparser.la \
+-	$(top_builddir)/third_party/liburiparser.la \
  	$(top_builddir)/third_party/libgtest.la
-+uri_parser_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-+	$(uri_parser_test_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- am_util_test_OBJECTS = util_test-util_test.$(OBJEXT)
- util_test_OBJECTS = $(am_util_test_OBJECTS)
- util_test_DEPENDENCIES = libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+util_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(util_test_CXXFLAGS) \
-+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- am_vec3_test_OBJECTS = vec3_test-vec3_test.$(OBJEXT)
- vec3_test_OBJECTS = $(am_vec3_test_OBJECTS)
- vec3_test_DEPENDENCIES = libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+vec3_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(vec3_test_CXXFLAGS) \
-+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- am_version_test_OBJECTS = version_test-version_test.$(OBJEXT)
- version_test_OBJECTS = $(am_version_test_OBJECTS)
- version_test_DEPENDENCIES = libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+version_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(version_test_CXXFLAGS) \
-+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- am_xml_element_test_OBJECTS =  \
- 	xml_element_test-xml_element_test.$(OBJEXT)
- xml_element_test_OBJECTS = $(am_xml_element_test_OBJECTS)
- xml_element_test_DEPENDENCIES = libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+xml_element_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-+	$(xml_element_test_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- am_xml_file_test_OBJECTS = xml_file_test-xml_file_test.$(OBJEXT)
- xml_file_test_OBJECTS = $(am_xml_file_test_OBJECTS)
- xml_file_test_DEPENDENCIES = libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+xml_file_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(xml_file_test_CXXFLAGS) \
-+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- am_xml_namespaces_test_OBJECTS =  \
- 	xml_namespaces_test-xml_namespaces_test.$(OBJEXT)
- xml_namespaces_test_OBJECTS = $(am_xml_namespaces_test_OBJECTS)
- xml_namespaces_test_DEPENDENCIES = libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+xml_namespaces_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-+	$(xml_namespaces_test_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- am_xmlns_test_OBJECTS = xmlns_test-xmlns_test.$(OBJEXT)
- xmlns_test_OBJECTS = $(am_xmlns_test_OBJECTS)
- xmlns_test_DEPENDENCIES = libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
--DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+xmlns_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(xmlns_test_CXXFLAGS) \
-+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+ uri_parser_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+ 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
+@@ -260,6 +274,7 @@
+ DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
  depcomp = $(SHELL) $(top_srcdir)/config/depcomp
  am__depfiles_maybe = depfiles
 +am__mv = mv -f
  CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
  	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
--	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
--	$(AM_CXXFLAGS) $(CXXFLAGS)
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- CXXLD = $(CXX)
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
--	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
--	$(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
--	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- SOURCES = $(libkmlbase_la_SOURCES) $(attributes_test_SOURCES) \
- 	$(color32_test_SOURCES) $(date_time_test_SOURCES) \
- 	$(expat_handler_ns_test_SOURCES) $(expat_parser_test_SOURCES) \
-@@ -206,14 +308,13 @@
+ LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+@@ -300,10 +315,11 @@
  	$(version_test_SOURCES) $(xml_element_test_SOURCES) \
  	$(xml_file_test_SOURCES) $(xml_namespaces_test_SOURCES) \
- 	$(xmlns_test_SOURCES)
+ 	$(xmlns_test_SOURCES) $(zip_file_test_SOURCES)
 -libkmlbaseincludeHEADERS_INSTALL = $(INSTALL_HEADER)
  HEADERS = $(libkmlbaseinclude_HEADERS)
  ETAGS = etags
@@ -75348,57 +18088,8 @@
 +red=; grn=; lgn=; blu=; std=
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  ACLOCAL = @ACLOCAL@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
  AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -235,18 +336,16 @@
- CYGPATH_W = @CYGPATH_W@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
--ECHO = @ECHO@
-+DSYMUTIL = @DSYMUTIL@
-+DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
--F77 = @F77@
--FFLAGS = @FFLAGS@
--GCC_FALSE = @GCC_FALSE@
--GCC_TRUE = @GCC_TRUE@
--HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
--HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
-+FGREP = @FGREP@
-+GREP = @GREP@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -256,19 +355,28 @@
- JAVAC = @JAVAC@
- JAVA_INCLUDE_DIR = @JAVA_INCLUDE_DIR@
- JAVA_LIB_DIR = @JAVA_LIB_DIR@
-+LD = @LD@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
-+LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
-+NM = @NM@
-+NMEDIT = @NMEDIT@
-+OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
-+OTOOL = @OTOOL@
-+OTOOL64 = @OTOOL64@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -367,6 +383,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -75406,113 +18097,53 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PLATFORM = @PLATFORM@
-@@ -285,22 +393,13 @@
- STRIP = @STRIP@
- SWIG = @SWIG@
- VERSION = @VERSION@
--WITH_JAVA_FALSE = @WITH_JAVA_FALSE@
--WITH_JAVA_TRUE = @WITH_JAVA_TRUE@
--WITH_PYTHON_FALSE = @WITH_PYTHON_FALSE@
--WITH_PYTHON_TRUE = @WITH_PYTHON_TRUE@
--WITH_SWIG_FALSE = @WITH_SWIG_FALSE@
--WITH_SWIG_TRUE = @WITH_SWIG_TRUE@
--ac_ct_AR = @ac_ct_AR@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
--ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -312,28 +411,41 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
+@@ -439,12 +456,11 @@
  AM_CPPFLAGS = -I$(top_srcdir)/src \
                -I$(top_srcdir)/third_party/boost_1_34_1 \
                -I$(top_srcdir)/third_party/googletest-r108/include \
-@@ -395,28 +507,6 @@
- 	uri_parser.h
+-              -I$(top_srcdir)/third_party/uriparser-0.7.1/include \
+               -I$(top_srcdir)/third_party/zlib-1.2.3/contrib
  
- DATA_DIR = $(top_srcdir)/testdata
--TESTS = \
--	attributes_test \
--	color32_test \
--	date_time_test \
--	expat_handler_ns_test \
--	expat_parser_test \
--	file_test \
--	math_util_test \
--	net_cache_test \
--	referent_test \
--	string_util_test \
--	tempfile_test \
--	time_util_test \
--	uri_parser_test \
--	util_test \
--	vec3_test \
--	version_test \
--	xml_element_test \
--	xml_file_test \
--	xml_namespaces_test \
--	xmlns_test
--
- attributes_test_SOURCES = attributes_test.cc
- attributes_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
- attributes_test_LDADD = libkmlbase.la \
-@@ -528,14 +618,14 @@
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
--	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
--		&& exit 0; \
-+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-+	        && { if test -f $@; then exit 0; else break; fi; }; \
+- at GCC_TRUE@AM_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -Werror -ansi -pedantic -fno-rtti
+- at GCC_TRUE@AM_TEST_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -Werror -ansi -fno-rtti -DGTEST_HAS_RTTI=0
+-libkmlbase_la_LDFLAGS = -lexpat
++ at GCC_TRUE@AM_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -ansi -pedantic -fno-rtti
++ at GCC_TRUE@AM_TEST_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -ansi -fno-rtti -DGTEST_HAS_RTTI=0
++libkmlbase_la_LDFLAGS = -lexpat -luriparser
+ lib_LTLIBRARIES = libkmlbase.la
+ libkmlbase_la_SOURCES = \
+ 	attributes.cc \
+@@ -465,8 +481,7 @@
+ 	zip_file.cc
+ 
+ libkmlbase_la_LIBADD = \
+-	$(top_builddir)/third_party/libminizip.la \
+-	$(top_builddir)/third_party/liburiparser.la
++	$(top_builddir)/third_party/libminizip.la
+ 
+ 
+ # These header files will be installed in $(includedir)/kml/base
+@@ -540,8 +555,7 @@
+ 
+ net_cache_test_SOURCES = net_cache_test.cc
+ net_cache_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
+-net_cache_test_LDADD = libkmlbase.la \
+-        $(top_builddir)/third_party/liburiparser.la \
++net_cache_test_LDADD = libkmlbase.la -luriparser \
+ 	$(top_builddir)/third_party/libgtest.la
+ 
+ referent_test_SOURCES = referent_test.cc
+@@ -566,8 +580,7 @@
+ 
+ uri_parser_test_SOURCES = uri_parser_test.cc
+ uri_parser_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
+-uri_parser_test_LDADD = libkmlbase.la \
+-        $(top_builddir)/third_party/liburiparser.la \
++uri_parser_test_LDADD = libkmlbase.la -luriparser \
+ 	$(top_builddir)/third_party/libgtest.la
+ 
+ util_test_SOURCES = util_test.cc
+@@ -625,9 +638,9 @@
  	      exit 1;; \
  	  esac; \
  	done; \
@@ -75525,22 +18156,21 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -553,23 +643,28 @@
+@@ -645,23 +658,28 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(am__aclocal_m4_deps):
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
--	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ 	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 -	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 +	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
 +	list2=; for p in $$list; do \
  	  if test -f $$p; then \
 -	    f=$(am__strip_dir) \
--	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
--	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+-	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+-	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
 +	    list2="$$list2 $$p"; \
  	  else :; fi; \
 -	done
@@ -75552,10 +18182,10 @@
  
  uninstall-libLTLIBRARIES:
  	@$(NORMAL_UNINSTALL)
--	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 -	  p=$(am__strip_dir) \
--	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
--	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
 +	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
 +	for p in $$list; do \
 +	  $(am__strip_dir) \
@@ -75564,12 +18194,8 @@
  	done
  
  clean-libLTLIBRARIES:
-@@ -581,74 +676,76 @@
- 	  rm -f "$${dir}/so_locations"; \
- 	done
- libkmlbase.la: $(libkmlbase_la_OBJECTS) $(libkmlbase_la_DEPENDENCIES) 
--	$(CXXLINK) -rpath $(libdir) $(libkmlbase_la_LDFLAGS) $(libkmlbase_la_OBJECTS) $(libkmlbase_la_LIBADD) $(LIBS)
-+	$(libkmlbase_la_LINK) -rpath $(libdir) $(libkmlbase_la_OBJECTS) $(libkmlbase_la_LIBADD) $(LIBS)
+@@ -676,11 +694,13 @@
+ 	$(libkmlbase_la_LINK) -rpath $(libdir) $(libkmlbase_la_OBJECTS) $(libkmlbase_la_LIBADD) $(LIBS)
  
  clean-checkPROGRAMS:
 -	@list='$(check_PROGRAMS)'; for p in $$list; do \
@@ -75586,489 +18212,373 @@
 +	rm -f $$list
  attributes_test$(EXEEXT): $(attributes_test_OBJECTS) $(attributes_test_DEPENDENCIES) 
  	@rm -f attributes_test$(EXEEXT)
--	$(CXXLINK) $(attributes_test_LDFLAGS) $(attributes_test_OBJECTS) $(attributes_test_LDADD) $(LIBS)
-+	$(attributes_test_LINK) $(attributes_test_OBJECTS) $(attributes_test_LDADD) $(LIBS)
- color32_test$(EXEEXT): $(color32_test_OBJECTS) $(color32_test_DEPENDENCIES) 
- 	@rm -f color32_test$(EXEEXT)
--	$(CXXLINK) $(color32_test_LDFLAGS) $(color32_test_OBJECTS) $(color32_test_LDADD) $(LIBS)
-+	$(color32_test_LINK) $(color32_test_OBJECTS) $(color32_test_LDADD) $(LIBS)
- date_time_test$(EXEEXT): $(date_time_test_OBJECTS) $(date_time_test_DEPENDENCIES) 
- 	@rm -f date_time_test$(EXEEXT)
--	$(CXXLINK) $(date_time_test_LDFLAGS) $(date_time_test_OBJECTS) $(date_time_test_LDADD) $(LIBS)
-+	$(date_time_test_LINK) $(date_time_test_OBJECTS) $(date_time_test_LDADD) $(LIBS)
- expat_handler_ns_test$(EXEEXT): $(expat_handler_ns_test_OBJECTS) $(expat_handler_ns_test_DEPENDENCIES) 
- 	@rm -f expat_handler_ns_test$(EXEEXT)
--	$(CXXLINK) $(expat_handler_ns_test_LDFLAGS) $(expat_handler_ns_test_OBJECTS) $(expat_handler_ns_test_LDADD) $(LIBS)
-+	$(expat_handler_ns_test_LINK) $(expat_handler_ns_test_OBJECTS) $(expat_handler_ns_test_LDADD) $(LIBS)
- expat_parser_test$(EXEEXT): $(expat_parser_test_OBJECTS) $(expat_parser_test_DEPENDENCIES) 
- 	@rm -f expat_parser_test$(EXEEXT)
--	$(CXXLINK) $(expat_parser_test_LDFLAGS) $(expat_parser_test_OBJECTS) $(expat_parser_test_LDADD) $(LIBS)
-+	$(expat_parser_test_LINK) $(expat_parser_test_OBJECTS) $(expat_parser_test_LDADD) $(LIBS)
- file_test$(EXEEXT): $(file_test_OBJECTS) $(file_test_DEPENDENCIES) 
- 	@rm -f file_test$(EXEEXT)
--	$(CXXLINK) $(file_test_LDFLAGS) $(file_test_OBJECTS) $(file_test_LDADD) $(LIBS)
-+	$(file_test_LINK) $(file_test_OBJECTS) $(file_test_LDADD) $(LIBS)
- math_util_test$(EXEEXT): $(math_util_test_OBJECTS) $(math_util_test_DEPENDENCIES) 
- 	@rm -f math_util_test$(EXEEXT)
--	$(CXXLINK) $(math_util_test_LDFLAGS) $(math_util_test_OBJECTS) $(math_util_test_LDADD) $(LIBS)
-+	$(math_util_test_LINK) $(math_util_test_OBJECTS) $(math_util_test_LDADD) $(LIBS)
- net_cache_test$(EXEEXT): $(net_cache_test_OBJECTS) $(net_cache_test_DEPENDENCIES) 
- 	@rm -f net_cache_test$(EXEEXT)
--	$(CXXLINK) $(net_cache_test_LDFLAGS) $(net_cache_test_OBJECTS) $(net_cache_test_LDADD) $(LIBS)
-+	$(net_cache_test_LINK) $(net_cache_test_OBJECTS) $(net_cache_test_LDADD) $(LIBS)
- referent_test$(EXEEXT): $(referent_test_OBJECTS) $(referent_test_DEPENDENCIES) 
- 	@rm -f referent_test$(EXEEXT)
--	$(CXXLINK) $(referent_test_LDFLAGS) $(referent_test_OBJECTS) $(referent_test_LDADD) $(LIBS)
-+	$(referent_test_LINK) $(referent_test_OBJECTS) $(referent_test_LDADD) $(LIBS)
- string_util_test$(EXEEXT): $(string_util_test_OBJECTS) $(string_util_test_DEPENDENCIES) 
- 	@rm -f string_util_test$(EXEEXT)
--	$(CXXLINK) $(string_util_test_LDFLAGS) $(string_util_test_OBJECTS) $(string_util_test_LDADD) $(LIBS)
-+	$(string_util_test_LINK) $(string_util_test_OBJECTS) $(string_util_test_LDADD) $(LIBS)
- tempfile_test$(EXEEXT): $(tempfile_test_OBJECTS) $(tempfile_test_DEPENDENCIES) 
- 	@rm -f tempfile_test$(EXEEXT)
--	$(CXXLINK) $(tempfile_test_LDFLAGS) $(tempfile_test_OBJECTS) $(tempfile_test_LDADD) $(LIBS)
-+	$(tempfile_test_LINK) $(tempfile_test_OBJECTS) $(tempfile_test_LDADD) $(LIBS)
- time_util_test$(EXEEXT): $(time_util_test_OBJECTS) $(time_util_test_DEPENDENCIES) 
- 	@rm -f time_util_test$(EXEEXT)
--	$(CXXLINK) $(time_util_test_LDFLAGS) $(time_util_test_OBJECTS) $(time_util_test_LDADD) $(LIBS)
-+	$(time_util_test_LINK) $(time_util_test_OBJECTS) $(time_util_test_LDADD) $(LIBS)
- uri_parser_test$(EXEEXT): $(uri_parser_test_OBJECTS) $(uri_parser_test_DEPENDENCIES) 
- 	@rm -f uri_parser_test$(EXEEXT)
--	$(CXXLINK) $(uri_parser_test_LDFLAGS) $(uri_parser_test_OBJECTS) $(uri_parser_test_LDADD) $(LIBS)
-+	$(uri_parser_test_LINK) $(uri_parser_test_OBJECTS) $(uri_parser_test_LDADD) $(LIBS)
- util_test$(EXEEXT): $(util_test_OBJECTS) $(util_test_DEPENDENCIES) 
- 	@rm -f util_test$(EXEEXT)
--	$(CXXLINK) $(util_test_LDFLAGS) $(util_test_OBJECTS) $(util_test_LDADD) $(LIBS)
-+	$(util_test_LINK) $(util_test_OBJECTS) $(util_test_LDADD) $(LIBS)
- vec3_test$(EXEEXT): $(vec3_test_OBJECTS) $(vec3_test_DEPENDENCIES) 
- 	@rm -f vec3_test$(EXEEXT)
--	$(CXXLINK) $(vec3_test_LDFLAGS) $(vec3_test_OBJECTS) $(vec3_test_LDADD) $(LIBS)
-+	$(vec3_test_LINK) $(vec3_test_OBJECTS) $(vec3_test_LDADD) $(LIBS)
- version_test$(EXEEXT): $(version_test_OBJECTS) $(version_test_DEPENDENCIES) 
- 	@rm -f version_test$(EXEEXT)
--	$(CXXLINK) $(version_test_LDFLAGS) $(version_test_OBJECTS) $(version_test_LDADD) $(LIBS)
-+	$(version_test_LINK) $(version_test_OBJECTS) $(version_test_LDADD) $(LIBS)
- xml_element_test$(EXEEXT): $(xml_element_test_OBJECTS) $(xml_element_test_DEPENDENCIES) 
- 	@rm -f xml_element_test$(EXEEXT)
--	$(CXXLINK) $(xml_element_test_LDFLAGS) $(xml_element_test_OBJECTS) $(xml_element_test_LDADD) $(LIBS)
-+	$(xml_element_test_LINK) $(xml_element_test_OBJECTS) $(xml_element_test_LDADD) $(LIBS)
- xml_file_test$(EXEEXT): $(xml_file_test_OBJECTS) $(xml_file_test_DEPENDENCIES) 
- 	@rm -f xml_file_test$(EXEEXT)
--	$(CXXLINK) $(xml_file_test_LDFLAGS) $(xml_file_test_OBJECTS) $(xml_file_test_LDADD) $(LIBS)
-+	$(xml_file_test_LINK) $(xml_file_test_OBJECTS) $(xml_file_test_LDADD) $(LIBS)
- xml_namespaces_test$(EXEEXT): $(xml_namespaces_test_OBJECTS) $(xml_namespaces_test_DEPENDENCIES) 
- 	@rm -f xml_namespaces_test$(EXEEXT)
--	$(CXXLINK) $(xml_namespaces_test_LDFLAGS) $(xml_namespaces_test_OBJECTS) $(xml_namespaces_test_LDADD) $(LIBS)
-+	$(xml_namespaces_test_LINK) $(xml_namespaces_test_OBJECTS) $(xml_namespaces_test_LDADD) $(LIBS)
- xmlns_test$(EXEEXT): $(xmlns_test_OBJECTS) $(xmlns_test_DEPENDENCIES) 
- 	@rm -f xmlns_test$(EXEEXT)
--	$(CXXLINK) $(xmlns_test_LDFLAGS) $(xmlns_test_OBJECTS) $(xmlns_test_LDADD) $(LIBS)
-+	$(xmlns_test_LINK) $(xmlns_test_OBJECTS) $(xmlns_test_LDADD) $(LIBS)
+ 	$(attributes_test_LINK) $(attributes_test_OBJECTS) $(attributes_test_LDADD) $(LIBS)
+@@ -790,315 +810,315 @@
  
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -691,302 +788,302 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/xmlns_test-xmlns_test.Po at am__quote@
- 
  .cc.o:
-- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
  
  .cc.obj:
-- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
  
  .cc.lo:
-- at am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
  
  attributes_test-attributes_test.o: attributes_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(attributes_test_CXXFLAGS) $(CXXFLAGS) -MT attributes_test-attributes_test.o -MD -MP -MF "$(DEPDIR)/attributes_test-attributes_test.Tpo" -c -o attributes_test-attributes_test.o `test -f 'attributes_test.cc' || echo '$(srcdir)/'`attributes_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/attributes_test-attributes_test.Tpo" "$(DEPDIR)/attributes_test-attributes_test.Po"; else rm -f "$(DEPDIR)/attributes_test-attributes_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(attributes_test_CXXFLAGS) $(CXXFLAGS) -MT attributes_test-attributes_test.o -MD -MP -MF $(DEPDIR)/attributes_test-attributes_test.Tpo -c -o attributes_test-attributes_test.o `test -f 'attributes_test.cc' || echo '$(srcdir)/'`attributes_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(attributes_test_CXXFLAGS) $(CXXFLAGS) -MT attributes_test-attributes_test.o -MD -MP -MF $(DEPDIR)/attributes_test-attributes_test.Tpo -c -o attributes_test-attributes_test.o `test -f 'attributes_test.cc' || echo '$(srcdir)/'`attributes_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/attributes_test-attributes_test.Tpo $(DEPDIR)/attributes_test-attributes_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/attributes_test-attributes_test.Tpo $(DEPDIR)/attributes_test-attributes_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='attributes_test.cc' object='attributes_test-attributes_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(attributes_test_CXXFLAGS) $(CXXFLAGS) -c -o attributes_test-attributes_test.o `test -f 'attributes_test.cc' || echo '$(srcdir)/'`attributes_test.cc
  
  attributes_test-attributes_test.obj: attributes_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(attributes_test_CXXFLAGS) $(CXXFLAGS) -MT attributes_test-attributes_test.obj -MD -MP -MF "$(DEPDIR)/attributes_test-attributes_test.Tpo" -c -o attributes_test-attributes_test.obj `if test -f 'attributes_test.cc'; then $(CYGPATH_W) 'attributes_test.cc'; else $(CYGPATH_W) '$(srcdir)/attributes_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/attributes_test-attributes_test.Tpo" "$(DEPDIR)/attributes_test-attributes_test.Po"; else rm -f "$(DEPDIR)/attributes_test-attributes_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(attributes_test_CXXFLAGS) $(CXXFLAGS) -MT attributes_test-attributes_test.obj -MD -MP -MF $(DEPDIR)/attributes_test-attributes_test.Tpo -c -o attributes_test-attributes_test.obj `if test -f 'attributes_test.cc'; then $(CYGPATH_W) 'attributes_test.cc'; else $(CYGPATH_W) '$(srcdir)/attributes_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(attributes_test_CXXFLAGS) $(CXXFLAGS) -MT attributes_test-attributes_test.obj -MD -MP -MF $(DEPDIR)/attributes_test-attributes_test.Tpo -c -o attributes_test-attributes_test.obj `if test -f 'attributes_test.cc'; then $(CYGPATH_W) 'attributes_test.cc'; else $(CYGPATH_W) '$(srcdir)/attributes_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/attributes_test-attributes_test.Tpo $(DEPDIR)/attributes_test-attributes_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/attributes_test-attributes_test.Tpo $(DEPDIR)/attributes_test-attributes_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='attributes_test.cc' object='attributes_test-attributes_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(attributes_test_CXXFLAGS) $(CXXFLAGS) -c -o attributes_test-attributes_test.obj `if test -f 'attributes_test.cc'; then $(CYGPATH_W) 'attributes_test.cc'; else $(CYGPATH_W) '$(srcdir)/attributes_test.cc'; fi`
  
  color32_test-color32_test.o: color32_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(color32_test_CXXFLAGS) $(CXXFLAGS) -MT color32_test-color32_test.o -MD -MP -MF "$(DEPDIR)/color32_test-color32_test.Tpo" -c -o color32_test-color32_test.o `test -f 'color32_test.cc' || echo '$(srcdir)/'`color32_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/color32_test-color32_test.Tpo" "$(DEPDIR)/color32_test-color32_test.Po"; else rm -f "$(DEPDIR)/color32_test-color32_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(color32_test_CXXFLAGS) $(CXXFLAGS) -MT color32_test-color32_test.o -MD -MP -MF $(DEPDIR)/color32_test-color32_test.Tpo -c -o color32_test-color32_test.o `test -f 'color32_test.cc' || echo '$(srcdir)/'`color32_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(color32_test_CXXFLAGS) $(CXXFLAGS) -MT color32_test-color32_test.o -MD -MP -MF $(DEPDIR)/color32_test-color32_test.Tpo -c -o color32_test-color32_test.o `test -f 'color32_test.cc' || echo '$(srcdir)/'`color32_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/color32_test-color32_test.Tpo $(DEPDIR)/color32_test-color32_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/color32_test-color32_test.Tpo $(DEPDIR)/color32_test-color32_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='color32_test.cc' object='color32_test-color32_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(color32_test_CXXFLAGS) $(CXXFLAGS) -c -o color32_test-color32_test.o `test -f 'color32_test.cc' || echo '$(srcdir)/'`color32_test.cc
  
  color32_test-color32_test.obj: color32_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(color32_test_CXXFLAGS) $(CXXFLAGS) -MT color32_test-color32_test.obj -MD -MP -MF "$(DEPDIR)/color32_test-color32_test.Tpo" -c -o color32_test-color32_test.obj `if test -f 'color32_test.cc'; then $(CYGPATH_W) 'color32_test.cc'; else $(CYGPATH_W) '$(srcdir)/color32_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/color32_test-color32_test.Tpo" "$(DEPDIR)/color32_test-color32_test.Po"; else rm -f "$(DEPDIR)/color32_test-color32_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(color32_test_CXXFLAGS) $(CXXFLAGS) -MT color32_test-color32_test.obj -MD -MP -MF $(DEPDIR)/color32_test-color32_test.Tpo -c -o color32_test-color32_test.obj `if test -f 'color32_test.cc'; then $(CYGPATH_W) 'color32_test.cc'; else $(CYGPATH_W) '$(srcdir)/color32_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(color32_test_CXXFLAGS) $(CXXFLAGS) -MT color32_test-color32_test.obj -MD -MP -MF $(DEPDIR)/color32_test-color32_test.Tpo -c -o color32_test-color32_test.obj `if test -f 'color32_test.cc'; then $(CYGPATH_W) 'color32_test.cc'; else $(CYGPATH_W) '$(srcdir)/color32_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/color32_test-color32_test.Tpo $(DEPDIR)/color32_test-color32_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/color32_test-color32_test.Tpo $(DEPDIR)/color32_test-color32_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='color32_test.cc' object='color32_test-color32_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(color32_test_CXXFLAGS) $(CXXFLAGS) -c -o color32_test-color32_test.obj `if test -f 'color32_test.cc'; then $(CYGPATH_W) 'color32_test.cc'; else $(CYGPATH_W) '$(srcdir)/color32_test.cc'; fi`
  
  date_time_test-date_time_test.o: date_time_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(date_time_test_CXXFLAGS) $(CXXFLAGS) -MT date_time_test-date_time_test.o -MD -MP -MF "$(DEPDIR)/date_time_test-date_time_test.Tpo" -c -o date_time_test-date_time_test.o `test -f 'date_time_test.cc' || echo '$(srcdir)/'`date_time_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/date_time_test-date_time_test.Tpo" "$(DEPDIR)/date_time_test-date_time_test.Po"; else rm -f "$(DEPDIR)/date_time_test-date_time_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(date_time_test_CXXFLAGS) $(CXXFLAGS) -MT date_time_test-date_time_test.o -MD -MP -MF $(DEPDIR)/date_time_test-date_time_test.Tpo -c -o date_time_test-date_time_test.o `test -f 'date_time_test.cc' || echo '$(srcdir)/'`date_time_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(date_time_test_CXXFLAGS) $(CXXFLAGS) -MT date_time_test-date_time_test.o -MD -MP -MF $(DEPDIR)/date_time_test-date_time_test.Tpo -c -o date_time_test-date_time_test.o `test -f 'date_time_test.cc' || echo '$(srcdir)/'`date_time_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/date_time_test-date_time_test.Tpo $(DEPDIR)/date_time_test-date_time_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/date_time_test-date_time_test.Tpo $(DEPDIR)/date_time_test-date_time_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='date_time_test.cc' object='date_time_test-date_time_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(date_time_test_CXXFLAGS) $(CXXFLAGS) -c -o date_time_test-date_time_test.o `test -f 'date_time_test.cc' || echo '$(srcdir)/'`date_time_test.cc
  
  date_time_test-date_time_test.obj: date_time_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(date_time_test_CXXFLAGS) $(CXXFLAGS) -MT date_time_test-date_time_test.obj -MD -MP -MF "$(DEPDIR)/date_time_test-date_time_test.Tpo" -c -o date_time_test-date_time_test.obj `if test -f 'date_time_test.cc'; then $(CYGPATH_W) 'date_time_test.cc'; else $(CYGPATH_W) '$(srcdir)/date_time_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/date_time_test-date_time_test.Tpo" "$(DEPDIR)/date_time_test-date_time_test.Po"; else rm -f "$(DEPDIR)/date_time_test-date_time_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(date_time_test_CXXFLAGS) $(CXXFLAGS) -MT date_time_test-date_time_test.obj -MD -MP -MF $(DEPDIR)/date_time_test-date_time_test.Tpo -c -o date_time_test-date_time_test.obj `if test -f 'date_time_test.cc'; then $(CYGPATH_W) 'date_time_test.cc'; else $(CYGPATH_W) '$(srcdir)/date_time_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(date_time_test_CXXFLAGS) $(CXXFLAGS) -MT date_time_test-date_time_test.obj -MD -MP -MF $(DEPDIR)/date_time_test-date_time_test.Tpo -c -o date_time_test-date_time_test.obj `if test -f 'date_time_test.cc'; then $(CYGPATH_W) 'date_time_test.cc'; else $(CYGPATH_W) '$(srcdir)/date_time_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/date_time_test-date_time_test.Tpo $(DEPDIR)/date_time_test-date_time_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/date_time_test-date_time_test.Tpo $(DEPDIR)/date_time_test-date_time_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='date_time_test.cc' object='date_time_test-date_time_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(date_time_test_CXXFLAGS) $(CXXFLAGS) -c -o date_time_test-date_time_test.obj `if test -f 'date_time_test.cc'; then $(CYGPATH_W) 'date_time_test.cc'; else $(CYGPATH_W) '$(srcdir)/date_time_test.cc'; fi`
  
  expat_handler_ns_test-expat_handler_ns_test.o: expat_handler_ns_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(expat_handler_ns_test_CXXFLAGS) $(CXXFLAGS) -MT expat_handler_ns_test-expat_handler_ns_test.o -MD -MP -MF "$(DEPDIR)/expat_handler_ns_test-expat_handler_ns_test.Tpo" -c -o expat_handler_ns_test-expat_handler_ns_test.o `test -f 'expat_handler_ns_test.cc' || echo '$(srcdir)/'`expat_handler_ns_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/expat_handler_ns_test-expat_handler_ns_test.Tpo" "$(DEPDIR)/expat_handler_ns_test-expat_handler_ns_test.Po"; else rm -f "$(DEPDIR)/expat_handler_ns_test-expat_handler_ns_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(expat_handler_ns_test_CXXFLAGS) $(CXXFLAGS) -MT expat_handler_ns_test-expat_handler_ns_test.o -MD -MP -MF $(DEPDIR)/expat_handler_ns_test-expat_handler_ns_test.Tpo -c -o expat_handler_ns_test-expat_handler_ns_test.o `test -f 'expat_handler_ns_test.cc' || echo '$(srcdir)/'`expat_handler_ns_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(expat_handler_ns_test_CXXFLAGS) $(CXXFLAGS) -MT expat_handler_ns_test-expat_handler_ns_test.o -MD -MP -MF $(DEPDIR)/expat_handler_ns_test-expat_handler_ns_test.Tpo -c -o expat_handler_ns_test-expat_handler_ns_test.o `test -f 'expat_handler_ns_test.cc' || echo '$(srcdir)/'`expat_handler_ns_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/expat_handler_ns_test-expat_handler_ns_test.Tpo $(DEPDIR)/expat_handler_ns_test-expat_handler_ns_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/expat_handler_ns_test-expat_handler_ns_test.Tpo $(DEPDIR)/expat_handler_ns_test-expat_handler_ns_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='expat_handler_ns_test.cc' object='expat_handler_ns_test-expat_handler_ns_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(expat_handler_ns_test_CXXFLAGS) $(CXXFLAGS) -c -o expat_handler_ns_test-expat_handler_ns_test.o `test -f 'expat_handler_ns_test.cc' || echo '$(srcdir)/'`expat_handler_ns_test.cc
  
  expat_handler_ns_test-expat_handler_ns_test.obj: expat_handler_ns_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(expat_handler_ns_test_CXXFLAGS) $(CXXFLAGS) -MT expat_handler_ns_test-expat_handler_ns_test.obj -MD -MP -MF "$(DEPDIR)/expat_handler_ns_test-expat_handler_ns_test.Tpo" -c -o expat_handler_ns_test-expat_handler_ns_test.obj `if test -f 'expat_handler_ns_test.cc'; then $(CYGPATH_W) 'expat_handler_ns_test.cc'; else $(CYGPATH_W) '$(srcdir)/expat_handler_ns_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/expat_handler_ns_test-expat_handler_ns_test.Tpo" "$(DEPDIR)/expat_handler_ns_test-expat_handler_ns_test.Po"; else rm -f "$(DEPDIR)/expat_handler_ns_test-expat_handler_ns_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(expat_handler_ns_test_CXXFLAGS) $(CXXFLAGS) -MT expat_handler_ns_test-expat_handler_ns_test.obj -MD -MP -MF $(DEPDIR)/expat_handler_ns_test-expat_handler_ns_test.Tpo -c -o expat_handler_ns_test-expat_handler_ns_test.obj `if test -f 'expat_handler_ns_test.cc'; then $(CYGPATH_W) 'expat_handler_ns_test.cc'; else $(CYGPATH_W) '$(srcdir)/expat_handler_ns_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(expat_handler_ns_test_CXXFLAGS) $(CXXFLAGS) -MT expat_handler_ns_test-expat_handler_ns_test.obj -MD -MP -MF $(DEPDIR)/expat_handler_ns_test-expat_handler_ns_test.Tpo -c -o expat_handler_ns_test-expat_handler_ns_test.obj `if test -f 'expat_handler_ns_test.cc'; then $(CYGPATH_W) 'expat_handler_ns_test.cc'; else $(CYGPATH_W) '$(srcdir)/expat_handler_ns_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/expat_handler_ns_test-expat_handler_ns_test.Tpo $(DEPDIR)/expat_handler_ns_test-expat_handler_ns_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/expat_handler_ns_test-expat_handler_ns_test.Tpo $(DEPDIR)/expat_handler_ns_test-expat_handler_ns_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='expat_handler_ns_test.cc' object='expat_handler_ns_test-expat_handler_ns_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(expat_handler_ns_test_CXXFLAGS) $(CXXFLAGS) -c -o expat_handler_ns_test-expat_handler_ns_test.obj `if test -f 'expat_handler_ns_test.cc'; then $(CYGPATH_W) 'expat_handler_ns_test.cc'; else $(CYGPATH_W) '$(srcdir)/expat_handler_ns_test.cc'; fi`
  
  expat_parser_test-expat_parser_test.o: expat_parser_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(expat_parser_test_CXXFLAGS) $(CXXFLAGS) -MT expat_parser_test-expat_parser_test.o -MD -MP -MF "$(DEPDIR)/expat_parser_test-expat_parser_test.Tpo" -c -o expat_parser_test-expat_parser_test.o `test -f 'expat_parser_test.cc' || echo '$(srcdir)/'`expat_parser_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/expat_parser_test-expat_parser_test.Tpo" "$(DEPDIR)/expat_parser_test-expat_parser_test.Po"; else rm -f "$(DEPDIR)/expat_parser_test-expat_parser_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(expat_parser_test_CXXFLAGS) $(CXXFLAGS) -MT expat_parser_test-expat_parser_test.o -MD -MP -MF $(DEPDIR)/expat_parser_test-expat_parser_test.Tpo -c -o expat_parser_test-expat_parser_test.o `test -f 'expat_parser_test.cc' || echo '$(srcdir)/'`expat_parser_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(expat_parser_test_CXXFLAGS) $(CXXFLAGS) -MT expat_parser_test-expat_parser_test.o -MD -MP -MF $(DEPDIR)/expat_parser_test-expat_parser_test.Tpo -c -o expat_parser_test-expat_parser_test.o `test -f 'expat_parser_test.cc' || echo '$(srcdir)/'`expat_parser_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/expat_parser_test-expat_parser_test.Tpo $(DEPDIR)/expat_parser_test-expat_parser_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/expat_parser_test-expat_parser_test.Tpo $(DEPDIR)/expat_parser_test-expat_parser_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='expat_parser_test.cc' object='expat_parser_test-expat_parser_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(expat_parser_test_CXXFLAGS) $(CXXFLAGS) -c -o expat_parser_test-expat_parser_test.o `test -f 'expat_parser_test.cc' || echo '$(srcdir)/'`expat_parser_test.cc
  
  expat_parser_test-expat_parser_test.obj: expat_parser_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(expat_parser_test_CXXFLAGS) $(CXXFLAGS) -MT expat_parser_test-expat_parser_test.obj -MD -MP -MF "$(DEPDIR)/expat_parser_test-expat_parser_test.Tpo" -c -o expat_parser_test-expat_parser_test.obj `if test -f 'expat_parser_test.cc'; then $(CYGPATH_W) 'expat_parser_test.cc'; else $(CYGPATH_W) '$(srcdir)/expat_parser_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/expat_parser_test-expat_parser_test.Tpo" "$(DEPDIR)/expat_parser_test-expat_parser_test.Po"; else rm -f "$(DEPDIR)/expat_parser_test-expat_parser_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(expat_parser_test_CXXFLAGS) $(CXXFLAGS) -MT expat_parser_test-expat_parser_test.obj -MD -MP -MF $(DEPDIR)/expat_parser_test-expat_parser_test.Tpo -c -o expat_parser_test-expat_parser_test.obj `if test -f 'expat_parser_test.cc'; then $(CYGPATH_W) 'expat_parser_test.cc'; else $(CYGPATH_W) '$(srcdir)/expat_parser_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(expat_parser_test_CXXFLAGS) $(CXXFLAGS) -MT expat_parser_test-expat_parser_test.obj -MD -MP -MF $(DEPDIR)/expat_parser_test-expat_parser_test.Tpo -c -o expat_parser_test-expat_parser_test.obj `if test -f 'expat_parser_test.cc'; then $(CYGPATH_W) 'expat_parser_test.cc'; else $(CYGPATH_W) '$(srcdir)/expat_parser_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/expat_parser_test-expat_parser_test.Tpo $(DEPDIR)/expat_parser_test-expat_parser_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/expat_parser_test-expat_parser_test.Tpo $(DEPDIR)/expat_parser_test-expat_parser_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='expat_parser_test.cc' object='expat_parser_test-expat_parser_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(expat_parser_test_CXXFLAGS) $(CXXFLAGS) -c -o expat_parser_test-expat_parser_test.obj `if test -f 'expat_parser_test.cc'; then $(CYGPATH_W) 'expat_parser_test.cc'; else $(CYGPATH_W) '$(srcdir)/expat_parser_test.cc'; fi`
  
  file_test-file_test.o: file_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(file_test_CXXFLAGS) $(CXXFLAGS) -MT file_test-file_test.o -MD -MP -MF "$(DEPDIR)/file_test-file_test.Tpo" -c -o file_test-file_test.o `test -f 'file_test.cc' || echo '$(srcdir)/'`file_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/file_test-file_test.Tpo" "$(DEPDIR)/file_test-file_test.Po"; else rm -f "$(DEPDIR)/file_test-file_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(file_test_CXXFLAGS) $(CXXFLAGS) -MT file_test-file_test.o -MD -MP -MF $(DEPDIR)/file_test-file_test.Tpo -c -o file_test-file_test.o `test -f 'file_test.cc' || echo '$(srcdir)/'`file_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(file_test_CXXFLAGS) $(CXXFLAGS) -MT file_test-file_test.o -MD -MP -MF $(DEPDIR)/file_test-file_test.Tpo -c -o file_test-file_test.o `test -f 'file_test.cc' || echo '$(srcdir)/'`file_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/file_test-file_test.Tpo $(DEPDIR)/file_test-file_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/file_test-file_test.Tpo $(DEPDIR)/file_test-file_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='file_test.cc' object='file_test-file_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(file_test_CXXFLAGS) $(CXXFLAGS) -c -o file_test-file_test.o `test -f 'file_test.cc' || echo '$(srcdir)/'`file_test.cc
  
  file_test-file_test.obj: file_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(file_test_CXXFLAGS) $(CXXFLAGS) -MT file_test-file_test.obj -MD -MP -MF "$(DEPDIR)/file_test-file_test.Tpo" -c -o file_test-file_test.obj `if test -f 'file_test.cc'; then $(CYGPATH_W) 'file_test.cc'; else $(CYGPATH_W) '$(srcdir)/file_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/file_test-file_test.Tpo" "$(DEPDIR)/file_test-file_test.Po"; else rm -f "$(DEPDIR)/file_test-file_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(file_test_CXXFLAGS) $(CXXFLAGS) -MT file_test-file_test.obj -MD -MP -MF $(DEPDIR)/file_test-file_test.Tpo -c -o file_test-file_test.obj `if test -f 'file_test.cc'; then $(CYGPATH_W) 'file_test.cc'; else $(CYGPATH_W) '$(srcdir)/file_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(file_test_CXXFLAGS) $(CXXFLAGS) -MT file_test-file_test.obj -MD -MP -MF $(DEPDIR)/file_test-file_test.Tpo -c -o file_test-file_test.obj `if test -f 'file_test.cc'; then $(CYGPATH_W) 'file_test.cc'; else $(CYGPATH_W) '$(srcdir)/file_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/file_test-file_test.Tpo $(DEPDIR)/file_test-file_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/file_test-file_test.Tpo $(DEPDIR)/file_test-file_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='file_test.cc' object='file_test-file_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(file_test_CXXFLAGS) $(CXXFLAGS) -c -o file_test-file_test.obj `if test -f 'file_test.cc'; then $(CYGPATH_W) 'file_test.cc'; else $(CYGPATH_W) '$(srcdir)/file_test.cc'; fi`
  
  math_util_test-math_util_test.o: math_util_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(math_util_test_CXXFLAGS) $(CXXFLAGS) -MT math_util_test-math_util_test.o -MD -MP -MF "$(DEPDIR)/math_util_test-math_util_test.Tpo" -c -o math_util_test-math_util_test.o `test -f 'math_util_test.cc' || echo '$(srcdir)/'`math_util_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/math_util_test-math_util_test.Tpo" "$(DEPDIR)/math_util_test-math_util_test.Po"; else rm -f "$(DEPDIR)/math_util_test-math_util_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(math_util_test_CXXFLAGS) $(CXXFLAGS) -MT math_util_test-math_util_test.o -MD -MP -MF $(DEPDIR)/math_util_test-math_util_test.Tpo -c -o math_util_test-math_util_test.o `test -f 'math_util_test.cc' || echo '$(srcdir)/'`math_util_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(math_util_test_CXXFLAGS) $(CXXFLAGS) -MT math_util_test-math_util_test.o -MD -MP -MF $(DEPDIR)/math_util_test-math_util_test.Tpo -c -o math_util_test-math_util_test.o `test -f 'math_util_test.cc' || echo '$(srcdir)/'`math_util_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/math_util_test-math_util_test.Tpo $(DEPDIR)/math_util_test-math_util_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/math_util_test-math_util_test.Tpo $(DEPDIR)/math_util_test-math_util_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='math_util_test.cc' object='math_util_test-math_util_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(math_util_test_CXXFLAGS) $(CXXFLAGS) -c -o math_util_test-math_util_test.o `test -f 'math_util_test.cc' || echo '$(srcdir)/'`math_util_test.cc
  
  math_util_test-math_util_test.obj: math_util_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(math_util_test_CXXFLAGS) $(CXXFLAGS) -MT math_util_test-math_util_test.obj -MD -MP -MF "$(DEPDIR)/math_util_test-math_util_test.Tpo" -c -o math_util_test-math_util_test.obj `if test -f 'math_util_test.cc'; then $(CYGPATH_W) 'math_util_test.cc'; else $(CYGPATH_W) '$(srcdir)/math_util_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/math_util_test-math_util_test.Tpo" "$(DEPDIR)/math_util_test-math_util_test.Po"; else rm -f "$(DEPDIR)/math_util_test-math_util_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(math_util_test_CXXFLAGS) $(CXXFLAGS) -MT math_util_test-math_util_test.obj -MD -MP -MF $(DEPDIR)/math_util_test-math_util_test.Tpo -c -o math_util_test-math_util_test.obj `if test -f 'math_util_test.cc'; then $(CYGPATH_W) 'math_util_test.cc'; else $(CYGPATH_W) '$(srcdir)/math_util_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(math_util_test_CXXFLAGS) $(CXXFLAGS) -MT math_util_test-math_util_test.obj -MD -MP -MF $(DEPDIR)/math_util_test-math_util_test.Tpo -c -o math_util_test-math_util_test.obj `if test -f 'math_util_test.cc'; then $(CYGPATH_W) 'math_util_test.cc'; else $(CYGPATH_W) '$(srcdir)/math_util_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/math_util_test-math_util_test.Tpo $(DEPDIR)/math_util_test-math_util_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/math_util_test-math_util_test.Tpo $(DEPDIR)/math_util_test-math_util_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='math_util_test.cc' object='math_util_test-math_util_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(math_util_test_CXXFLAGS) $(CXXFLAGS) -c -o math_util_test-math_util_test.obj `if test -f 'math_util_test.cc'; then $(CYGPATH_W) 'math_util_test.cc'; else $(CYGPATH_W) '$(srcdir)/math_util_test.cc'; fi`
  
  net_cache_test-net_cache_test.o: net_cache_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(net_cache_test_CXXFLAGS) $(CXXFLAGS) -MT net_cache_test-net_cache_test.o -MD -MP -MF "$(DEPDIR)/net_cache_test-net_cache_test.Tpo" -c -o net_cache_test-net_cache_test.o `test -f 'net_cache_test.cc' || echo '$(srcdir)/'`net_cache_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/net_cache_test-net_cache_test.Tpo" "$(DEPDIR)/net_cache_test-net_cache_test.Po"; else rm -f "$(DEPDIR)/net_cache_test-net_cache_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(net_cache_test_CXXFLAGS) $(CXXFLAGS) -MT net_cache_test-net_cache_test.o -MD -MP -MF $(DEPDIR)/net_cache_test-net_cache_test.Tpo -c -o net_cache_test-net_cache_test.o `test -f 'net_cache_test.cc' || echo '$(srcdir)/'`net_cache_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(net_cache_test_CXXFLAGS) $(CXXFLAGS) -MT net_cache_test-net_cache_test.o -MD -MP -MF $(DEPDIR)/net_cache_test-net_cache_test.Tpo -c -o net_cache_test-net_cache_test.o `test -f 'net_cache_test.cc' || echo '$(srcdir)/'`net_cache_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/net_cache_test-net_cache_test.Tpo $(DEPDIR)/net_cache_test-net_cache_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/net_cache_test-net_cache_test.Tpo $(DEPDIR)/net_cache_test-net_cache_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='net_cache_test.cc' object='net_cache_test-net_cache_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(net_cache_test_CXXFLAGS) $(CXXFLAGS) -c -o net_cache_test-net_cache_test.o `test -f 'net_cache_test.cc' || echo '$(srcdir)/'`net_cache_test.cc
  
  net_cache_test-net_cache_test.obj: net_cache_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(net_cache_test_CXXFLAGS) $(CXXFLAGS) -MT net_cache_test-net_cache_test.obj -MD -MP -MF "$(DEPDIR)/net_cache_test-net_cache_test.Tpo" -c -o net_cache_test-net_cache_test.obj `if test -f 'net_cache_test.cc'; then $(CYGPATH_W) 'net_cache_test.cc'; else $(CYGPATH_W) '$(srcdir)/net_cache_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/net_cache_test-net_cache_test.Tpo" "$(DEPDIR)/net_cache_test-net_cache_test.Po"; else rm -f "$(DEPDIR)/net_cache_test-net_cache_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(net_cache_test_CXXFLAGS) $(CXXFLAGS) -MT net_cache_test-net_cache_test.obj -MD -MP -MF $(DEPDIR)/net_cache_test-net_cache_test.Tpo -c -o net_cache_test-net_cache_test.obj `if test -f 'net_cache_test.cc'; then $(CYGPATH_W) 'net_cache_test.cc'; else $(CYGPATH_W) '$(srcdir)/net_cache_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(net_cache_test_CXXFLAGS) $(CXXFLAGS) -MT net_cache_test-net_cache_test.obj -MD -MP -MF $(DEPDIR)/net_cache_test-net_cache_test.Tpo -c -o net_cache_test-net_cache_test.obj `if test -f 'net_cache_test.cc'; then $(CYGPATH_W) 'net_cache_test.cc'; else $(CYGPATH_W) '$(srcdir)/net_cache_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/net_cache_test-net_cache_test.Tpo $(DEPDIR)/net_cache_test-net_cache_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/net_cache_test-net_cache_test.Tpo $(DEPDIR)/net_cache_test-net_cache_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='net_cache_test.cc' object='net_cache_test-net_cache_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(net_cache_test_CXXFLAGS) $(CXXFLAGS) -c -o net_cache_test-net_cache_test.obj `if test -f 'net_cache_test.cc'; then $(CYGPATH_W) 'net_cache_test.cc'; else $(CYGPATH_W) '$(srcdir)/net_cache_test.cc'; fi`
  
  referent_test-referent_test.o: referent_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(referent_test_CXXFLAGS) $(CXXFLAGS) -MT referent_test-referent_test.o -MD -MP -MF "$(DEPDIR)/referent_test-referent_test.Tpo" -c -o referent_test-referent_test.o `test -f 'referent_test.cc' || echo '$(srcdir)/'`referent_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/referent_test-referent_test.Tpo" "$(DEPDIR)/referent_test-referent_test.Po"; else rm -f "$(DEPDIR)/referent_test-referent_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(referent_test_CXXFLAGS) $(CXXFLAGS) -MT referent_test-referent_test.o -MD -MP -MF $(DEPDIR)/referent_test-referent_test.Tpo -c -o referent_test-referent_test.o `test -f 'referent_test.cc' || echo '$(srcdir)/'`referent_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(referent_test_CXXFLAGS) $(CXXFLAGS) -MT referent_test-referent_test.o -MD -MP -MF $(DEPDIR)/referent_test-referent_test.Tpo -c -o referent_test-referent_test.o `test -f 'referent_test.cc' || echo '$(srcdir)/'`referent_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/referent_test-referent_test.Tpo $(DEPDIR)/referent_test-referent_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/referent_test-referent_test.Tpo $(DEPDIR)/referent_test-referent_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='referent_test.cc' object='referent_test-referent_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(referent_test_CXXFLAGS) $(CXXFLAGS) -c -o referent_test-referent_test.o `test -f 'referent_test.cc' || echo '$(srcdir)/'`referent_test.cc
  
  referent_test-referent_test.obj: referent_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(referent_test_CXXFLAGS) $(CXXFLAGS) -MT referent_test-referent_test.obj -MD -MP -MF "$(DEPDIR)/referent_test-referent_test.Tpo" -c -o referent_test-referent_test.obj `if test -f 'referent_test.cc'; then $(CYGPATH_W) 'referent_test.cc'; else $(CYGPATH_W) '$(srcdir)/referent_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/referent_test-referent_test.Tpo" "$(DEPDIR)/referent_test-referent_test.Po"; else rm -f "$(DEPDIR)/referent_test-referent_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(referent_test_CXXFLAGS) $(CXXFLAGS) -MT referent_test-referent_test.obj -MD -MP -MF $(DEPDIR)/referent_test-referent_test.Tpo -c -o referent_test-referent_test.obj `if test -f 'referent_test.cc'; then $(CYGPATH_W) 'referent_test.cc'; else $(CYGPATH_W) '$(srcdir)/referent_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(referent_test_CXXFLAGS) $(CXXFLAGS) -MT referent_test-referent_test.obj -MD -MP -MF $(DEPDIR)/referent_test-referent_test.Tpo -c -o referent_test-referent_test.obj `if test -f 'referent_test.cc'; then $(CYGPATH_W) 'referent_test.cc'; else $(CYGPATH_W) '$(srcdir)/referent_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/referent_test-referent_test.Tpo $(DEPDIR)/referent_test-referent_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/referent_test-referent_test.Tpo $(DEPDIR)/referent_test-referent_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='referent_test.cc' object='referent_test-referent_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(referent_test_CXXFLAGS) $(CXXFLAGS) -c -o referent_test-referent_test.obj `if test -f 'referent_test.cc'; then $(CYGPATH_W) 'referent_test.cc'; else $(CYGPATH_W) '$(srcdir)/referent_test.cc'; fi`
  
  string_util_test-string_util_test.o: string_util_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(string_util_test_CXXFLAGS) $(CXXFLAGS) -MT string_util_test-string_util_test.o -MD -MP -MF "$(DEPDIR)/string_util_test-string_util_test.Tpo" -c -o string_util_test-string_util_test.o `test -f 'string_util_test.cc' || echo '$(srcdir)/'`string_util_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/string_util_test-string_util_test.Tpo" "$(DEPDIR)/string_util_test-string_util_test.Po"; else rm -f "$(DEPDIR)/string_util_test-string_util_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(string_util_test_CXXFLAGS) $(CXXFLAGS) -MT string_util_test-string_util_test.o -MD -MP -MF $(DEPDIR)/string_util_test-string_util_test.Tpo -c -o string_util_test-string_util_test.o `test -f 'string_util_test.cc' || echo '$(srcdir)/'`string_util_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(string_util_test_CXXFLAGS) $(CXXFLAGS) -MT string_util_test-string_util_test.o -MD -MP -MF $(DEPDIR)/string_util_test-string_util_test.Tpo -c -o string_util_test-string_util_test.o `test -f 'string_util_test.cc' || echo '$(srcdir)/'`string_util_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/string_util_test-string_util_test.Tpo $(DEPDIR)/string_util_test-string_util_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/string_util_test-string_util_test.Tpo $(DEPDIR)/string_util_test-string_util_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='string_util_test.cc' object='string_util_test-string_util_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(string_util_test_CXXFLAGS) $(CXXFLAGS) -c -o string_util_test-string_util_test.o `test -f 'string_util_test.cc' || echo '$(srcdir)/'`string_util_test.cc
  
  string_util_test-string_util_test.obj: string_util_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(string_util_test_CXXFLAGS) $(CXXFLAGS) -MT string_util_test-string_util_test.obj -MD -MP -MF "$(DEPDIR)/string_util_test-string_util_test.Tpo" -c -o string_util_test-string_util_test.obj `if test -f 'string_util_test.cc'; then $(CYGPATH_W) 'string_util_test.cc'; else $(CYGPATH_W) '$(srcdir)/string_util_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/string_util_test-string_util_test.Tpo" "$(DEPDIR)/string_util_test-string_util_test.Po"; else rm -f "$(DEPDIR)/string_util_test-string_util_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(string_util_test_CXXFLAGS) $(CXXFLAGS) -MT string_util_test-string_util_test.obj -MD -MP -MF $(DEPDIR)/string_util_test-string_util_test.Tpo -c -o string_util_test-string_util_test.obj `if test -f 'string_util_test.cc'; then $(CYGPATH_W) 'string_util_test.cc'; else $(CYGPATH_W) '$(srcdir)/string_util_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(string_util_test_CXXFLAGS) $(CXXFLAGS) -MT string_util_test-string_util_test.obj -MD -MP -MF $(DEPDIR)/string_util_test-string_util_test.Tpo -c -o string_util_test-string_util_test.obj `if test -f 'string_util_test.cc'; then $(CYGPATH_W) 'string_util_test.cc'; else $(CYGPATH_W) '$(srcdir)/string_util_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/string_util_test-string_util_test.Tpo $(DEPDIR)/string_util_test-string_util_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/string_util_test-string_util_test.Tpo $(DEPDIR)/string_util_test-string_util_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='string_util_test.cc' object='string_util_test-string_util_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(string_util_test_CXXFLAGS) $(CXXFLAGS) -c -o string_util_test-string_util_test.obj `if test -f 'string_util_test.cc'; then $(CYGPATH_W) 'string_util_test.cc'; else $(CYGPATH_W) '$(srcdir)/string_util_test.cc'; fi`
  
  tempfile_test-tempfile_test.o: tempfile_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tempfile_test_CXXFLAGS) $(CXXFLAGS) -MT tempfile_test-tempfile_test.o -MD -MP -MF "$(DEPDIR)/tempfile_test-tempfile_test.Tpo" -c -o tempfile_test-tempfile_test.o `test -f 'tempfile_test.cc' || echo '$(srcdir)/'`tempfile_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/tempfile_test-tempfile_test.Tpo" "$(DEPDIR)/tempfile_test-tempfile_test.Po"; else rm -f "$(DEPDIR)/tempfile_test-tempfile_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tempfile_test_CXXFLAGS) $(CXXFLAGS) -MT tempfile_test-tempfile_test.o -MD -MP -MF $(DEPDIR)/tempfile_test-tempfile_test.Tpo -c -o tempfile_test-tempfile_test.o `test -f 'tempfile_test.cc' || echo '$(srcdir)/'`tempfile_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tempfile_test_CXXFLAGS) $(CXXFLAGS) -MT tempfile_test-tempfile_test.o -MD -MP -MF $(DEPDIR)/tempfile_test-tempfile_test.Tpo -c -o tempfile_test-tempfile_test.o `test -f 'tempfile_test.cc' || echo '$(srcdir)/'`tempfile_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/tempfile_test-tempfile_test.Tpo $(DEPDIR)/tempfile_test-tempfile_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/tempfile_test-tempfile_test.Tpo $(DEPDIR)/tempfile_test-tempfile_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tempfile_test.cc' object='tempfile_test-tempfile_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tempfile_test_CXXFLAGS) $(CXXFLAGS) -c -o tempfile_test-tempfile_test.o `test -f 'tempfile_test.cc' || echo '$(srcdir)/'`tempfile_test.cc
  
  tempfile_test-tempfile_test.obj: tempfile_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tempfile_test_CXXFLAGS) $(CXXFLAGS) -MT tempfile_test-tempfile_test.obj -MD -MP -MF "$(DEPDIR)/tempfile_test-tempfile_test.Tpo" -c -o tempfile_test-tempfile_test.obj `if test -f 'tempfile_test.cc'; then $(CYGPATH_W) 'tempfile_test.cc'; else $(CYGPATH_W) '$(srcdir)/tempfile_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/tempfile_test-tempfile_test.Tpo" "$(DEPDIR)/tempfile_test-tempfile_test.Po"; else rm -f "$(DEPDIR)/tempfile_test-tempfile_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tempfile_test_CXXFLAGS) $(CXXFLAGS) -MT tempfile_test-tempfile_test.obj -MD -MP -MF $(DEPDIR)/tempfile_test-tempfile_test.Tpo -c -o tempfile_test-tempfile_test.obj `if test -f 'tempfile_test.cc'; then $(CYGPATH_W) 'tempfile_test.cc'; else $(CYGPATH_W) '$(srcdir)/tempfile_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tempfile_test_CXXFLAGS) $(CXXFLAGS) -MT tempfile_test-tempfile_test.obj -MD -MP -MF $(DEPDIR)/tempfile_test-tempfile_test.Tpo -c -o tempfile_test-tempfile_test.obj `if test -f 'tempfile_test.cc'; then $(CYGPATH_W) 'tempfile_test.cc'; else $(CYGPATH_W) '$(srcdir)/tempfile_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/tempfile_test-tempfile_test.Tpo $(DEPDIR)/tempfile_test-tempfile_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/tempfile_test-tempfile_test.Tpo $(DEPDIR)/tempfile_test-tempfile_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='tempfile_test.cc' object='tempfile_test-tempfile_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tempfile_test_CXXFLAGS) $(CXXFLAGS) -c -o tempfile_test-tempfile_test.obj `if test -f 'tempfile_test.cc'; then $(CYGPATH_W) 'tempfile_test.cc'; else $(CYGPATH_W) '$(srcdir)/tempfile_test.cc'; fi`
  
  time_util_test-time_util_test.o: time_util_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(time_util_test_CXXFLAGS) $(CXXFLAGS) -MT time_util_test-time_util_test.o -MD -MP -MF "$(DEPDIR)/time_util_test-time_util_test.Tpo" -c -o time_util_test-time_util_test.o `test -f 'time_util_test.cc' || echo '$(srcdir)/'`time_util_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/time_util_test-time_util_test.Tpo" "$(DEPDIR)/time_util_test-time_util_test.Po"; else rm -f "$(DEPDIR)/time_util_test-time_util_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(time_util_test_CXXFLAGS) $(CXXFLAGS) -MT time_util_test-time_util_test.o -MD -MP -MF $(DEPDIR)/time_util_test-time_util_test.Tpo -c -o time_util_test-time_util_test.o `test -f 'time_util_test.cc' || echo '$(srcdir)/'`time_util_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(time_util_test_CXXFLAGS) $(CXXFLAGS) -MT time_util_test-time_util_test.o -MD -MP -MF $(DEPDIR)/time_util_test-time_util_test.Tpo -c -o time_util_test-time_util_test.o `test -f 'time_util_test.cc' || echo '$(srcdir)/'`time_util_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/time_util_test-time_util_test.Tpo $(DEPDIR)/time_util_test-time_util_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/time_util_test-time_util_test.Tpo $(DEPDIR)/time_util_test-time_util_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='time_util_test.cc' object='time_util_test-time_util_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(time_util_test_CXXFLAGS) $(CXXFLAGS) -c -o time_util_test-time_util_test.o `test -f 'time_util_test.cc' || echo '$(srcdir)/'`time_util_test.cc
  
  time_util_test-time_util_test.obj: time_util_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(time_util_test_CXXFLAGS) $(CXXFLAGS) -MT time_util_test-time_util_test.obj -MD -MP -MF "$(DEPDIR)/time_util_test-time_util_test.Tpo" -c -o time_util_test-time_util_test.obj `if test -f 'time_util_test.cc'; then $(CYGPATH_W) 'time_util_test.cc'; else $(CYGPATH_W) '$(srcdir)/time_util_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/time_util_test-time_util_test.Tpo" "$(DEPDIR)/time_util_test-time_util_test.Po"; else rm -f "$(DEPDIR)/time_util_test-time_util_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(time_util_test_CXXFLAGS) $(CXXFLAGS) -MT time_util_test-time_util_test.obj -MD -MP -MF $(DEPDIR)/time_util_test-time_util_test.Tpo -c -o time_util_test-time_util_test.obj `if test -f 'time_util_test.cc'; then $(CYGPATH_W) 'time_util_test.cc'; else $(CYGPATH_W) '$(srcdir)/time_util_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(time_util_test_CXXFLAGS) $(CXXFLAGS) -MT time_util_test-time_util_test.obj -MD -MP -MF $(DEPDIR)/time_util_test-time_util_test.Tpo -c -o time_util_test-time_util_test.obj `if test -f 'time_util_test.cc'; then $(CYGPATH_W) 'time_util_test.cc'; else $(CYGPATH_W) '$(srcdir)/time_util_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/time_util_test-time_util_test.Tpo $(DEPDIR)/time_util_test-time_util_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/time_util_test-time_util_test.Tpo $(DEPDIR)/time_util_test-time_util_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='time_util_test.cc' object='time_util_test-time_util_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(time_util_test_CXXFLAGS) $(CXXFLAGS) -c -o time_util_test-time_util_test.obj `if test -f 'time_util_test.cc'; then $(CYGPATH_W) 'time_util_test.cc'; else $(CYGPATH_W) '$(srcdir)/time_util_test.cc'; fi`
  
  uri_parser_test-uri_parser_test.o: uri_parser_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(uri_parser_test_CXXFLAGS) $(CXXFLAGS) -MT uri_parser_test-uri_parser_test.o -MD -MP -MF "$(DEPDIR)/uri_parser_test-uri_parser_test.Tpo" -c -o uri_parser_test-uri_parser_test.o `test -f 'uri_parser_test.cc' || echo '$(srcdir)/'`uri_parser_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/uri_parser_test-uri_parser_test.Tpo" "$(DEPDIR)/uri_parser_test-uri_parser_test.Po"; else rm -f "$(DEPDIR)/uri_parser_test-uri_parser_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(uri_parser_test_CXXFLAGS) $(CXXFLAGS) -MT uri_parser_test-uri_parser_test.o -MD -MP -MF $(DEPDIR)/uri_parser_test-uri_parser_test.Tpo -c -o uri_parser_test-uri_parser_test.o `test -f 'uri_parser_test.cc' || echo '$(srcdir)/'`uri_parser_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(uri_parser_test_CXXFLAGS) $(CXXFLAGS) -MT uri_parser_test-uri_parser_test.o -MD -MP -MF $(DEPDIR)/uri_parser_test-uri_parser_test.Tpo -c -o uri_parser_test-uri_parser_test.o `test -f 'uri_parser_test.cc' || echo '$(srcdir)/'`uri_parser_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/uri_parser_test-uri_parser_test.Tpo $(DEPDIR)/uri_parser_test-uri_parser_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/uri_parser_test-uri_parser_test.Tpo $(DEPDIR)/uri_parser_test-uri_parser_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='uri_parser_test.cc' object='uri_parser_test-uri_parser_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(uri_parser_test_CXXFLAGS) $(CXXFLAGS) -c -o uri_parser_test-uri_parser_test.o `test -f 'uri_parser_test.cc' || echo '$(srcdir)/'`uri_parser_test.cc
  
  uri_parser_test-uri_parser_test.obj: uri_parser_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(uri_parser_test_CXXFLAGS) $(CXXFLAGS) -MT uri_parser_test-uri_parser_test.obj -MD -MP -MF "$(DEPDIR)/uri_parser_test-uri_parser_test.Tpo" -c -o uri_parser_test-uri_parser_test.obj `if test -f 'uri_parser_test.cc'; then $(CYGPATH_W) 'uri_parser_test.cc'; else $(CYGPATH_W) '$(srcdir)/uri_parser_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/uri_parser_test-uri_parser_test.Tpo" "$(DEPDIR)/uri_parser_test-uri_parser_test.Po"; else rm -f "$(DEPDIR)/uri_parser_test-uri_parser_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(uri_parser_test_CXXFLAGS) $(CXXFLAGS) -MT uri_parser_test-uri_parser_test.obj -MD -MP -MF $(DEPDIR)/uri_parser_test-uri_parser_test.Tpo -c -o uri_parser_test-uri_parser_test.obj `if test -f 'uri_parser_test.cc'; then $(CYGPATH_W) 'uri_parser_test.cc'; else $(CYGPATH_W) '$(srcdir)/uri_parser_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(uri_parser_test_CXXFLAGS) $(CXXFLAGS) -MT uri_parser_test-uri_parser_test.obj -MD -MP -MF $(DEPDIR)/uri_parser_test-uri_parser_test.Tpo -c -o uri_parser_test-uri_parser_test.obj `if test -f 'uri_parser_test.cc'; then $(CYGPATH_W) 'uri_parser_test.cc'; else $(CYGPATH_W) '$(srcdir)/uri_parser_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/uri_parser_test-uri_parser_test.Tpo $(DEPDIR)/uri_parser_test-uri_parser_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/uri_parser_test-uri_parser_test.Tpo $(DEPDIR)/uri_parser_test-uri_parser_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='uri_parser_test.cc' object='uri_parser_test-uri_parser_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(uri_parser_test_CXXFLAGS) $(CXXFLAGS) -c -o uri_parser_test-uri_parser_test.obj `if test -f 'uri_parser_test.cc'; then $(CYGPATH_W) 'uri_parser_test.cc'; else $(CYGPATH_W) '$(srcdir)/uri_parser_test.cc'; fi`
  
  util_test-util_test.o: util_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(util_test_CXXFLAGS) $(CXXFLAGS) -MT util_test-util_test.o -MD -MP -MF "$(DEPDIR)/util_test-util_test.Tpo" -c -o util_test-util_test.o `test -f 'util_test.cc' || echo '$(srcdir)/'`util_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/util_test-util_test.Tpo" "$(DEPDIR)/util_test-util_test.Po"; else rm -f "$(DEPDIR)/util_test-util_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(util_test_CXXFLAGS) $(CXXFLAGS) -MT util_test-util_test.o -MD -MP -MF $(DEPDIR)/util_test-util_test.Tpo -c -o util_test-util_test.o `test -f 'util_test.cc' || echo '$(srcdir)/'`util_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(util_test_CXXFLAGS) $(CXXFLAGS) -MT util_test-util_test.o -MD -MP -MF $(DEPDIR)/util_test-util_test.Tpo -c -o util_test-util_test.o `test -f 'util_test.cc' || echo '$(srcdir)/'`util_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/util_test-util_test.Tpo $(DEPDIR)/util_test-util_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/util_test-util_test.Tpo $(DEPDIR)/util_test-util_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='util_test.cc' object='util_test-util_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(util_test_CXXFLAGS) $(CXXFLAGS) -c -o util_test-util_test.o `test -f 'util_test.cc' || echo '$(srcdir)/'`util_test.cc
  
  util_test-util_test.obj: util_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(util_test_CXXFLAGS) $(CXXFLAGS) -MT util_test-util_test.obj -MD -MP -MF "$(DEPDIR)/util_test-util_test.Tpo" -c -o util_test-util_test.obj `if test -f 'util_test.cc'; then $(CYGPATH_W) 'util_test.cc'; else $(CYGPATH_W) '$(srcdir)/util_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/util_test-util_test.Tpo" "$(DEPDIR)/util_test-util_test.Po"; else rm -f "$(DEPDIR)/util_test-util_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(util_test_CXXFLAGS) $(CXXFLAGS) -MT util_test-util_test.obj -MD -MP -MF $(DEPDIR)/util_test-util_test.Tpo -c -o util_test-util_test.obj `if test -f 'util_test.cc'; then $(CYGPATH_W) 'util_test.cc'; else $(CYGPATH_W) '$(srcdir)/util_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(util_test_CXXFLAGS) $(CXXFLAGS) -MT util_test-util_test.obj -MD -MP -MF $(DEPDIR)/util_test-util_test.Tpo -c -o util_test-util_test.obj `if test -f 'util_test.cc'; then $(CYGPATH_W) 'util_test.cc'; else $(CYGPATH_W) '$(srcdir)/util_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/util_test-util_test.Tpo $(DEPDIR)/util_test-util_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/util_test-util_test.Tpo $(DEPDIR)/util_test-util_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='util_test.cc' object='util_test-util_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(util_test_CXXFLAGS) $(CXXFLAGS) -c -o util_test-util_test.obj `if test -f 'util_test.cc'; then $(CYGPATH_W) 'util_test.cc'; else $(CYGPATH_W) '$(srcdir)/util_test.cc'; fi`
  
  vec3_test-vec3_test.o: vec3_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vec3_test_CXXFLAGS) $(CXXFLAGS) -MT vec3_test-vec3_test.o -MD -MP -MF "$(DEPDIR)/vec3_test-vec3_test.Tpo" -c -o vec3_test-vec3_test.o `test -f 'vec3_test.cc' || echo '$(srcdir)/'`vec3_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/vec3_test-vec3_test.Tpo" "$(DEPDIR)/vec3_test-vec3_test.Po"; else rm -f "$(DEPDIR)/vec3_test-vec3_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vec3_test_CXXFLAGS) $(CXXFLAGS) -MT vec3_test-vec3_test.o -MD -MP -MF $(DEPDIR)/vec3_test-vec3_test.Tpo -c -o vec3_test-vec3_test.o `test -f 'vec3_test.cc' || echo '$(srcdir)/'`vec3_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vec3_test_CXXFLAGS) $(CXXFLAGS) -MT vec3_test-vec3_test.o -MD -MP -MF $(DEPDIR)/vec3_test-vec3_test.Tpo -c -o vec3_test-vec3_test.o `test -f 'vec3_test.cc' || echo '$(srcdir)/'`vec3_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/vec3_test-vec3_test.Tpo $(DEPDIR)/vec3_test-vec3_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/vec3_test-vec3_test.Tpo $(DEPDIR)/vec3_test-vec3_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='vec3_test.cc' object='vec3_test-vec3_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vec3_test_CXXFLAGS) $(CXXFLAGS) -c -o vec3_test-vec3_test.o `test -f 'vec3_test.cc' || echo '$(srcdir)/'`vec3_test.cc
  
  vec3_test-vec3_test.obj: vec3_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vec3_test_CXXFLAGS) $(CXXFLAGS) -MT vec3_test-vec3_test.obj -MD -MP -MF "$(DEPDIR)/vec3_test-vec3_test.Tpo" -c -o vec3_test-vec3_test.obj `if test -f 'vec3_test.cc'; then $(CYGPATH_W) 'vec3_test.cc'; else $(CYGPATH_W) '$(srcdir)/vec3_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/vec3_test-vec3_test.Tpo" "$(DEPDIR)/vec3_test-vec3_test.Po"; else rm -f "$(DEPDIR)/vec3_test-vec3_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vec3_test_CXXFLAGS) $(CXXFLAGS) -MT vec3_test-vec3_test.obj -MD -MP -MF $(DEPDIR)/vec3_test-vec3_test.Tpo -c -o vec3_test-vec3_test.obj `if test -f 'vec3_test.cc'; then $(CYGPATH_W) 'vec3_test.cc'; else $(CYGPATH_W) '$(srcdir)/vec3_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vec3_test_CXXFLAGS) $(CXXFLAGS) -MT vec3_test-vec3_test.obj -MD -MP -MF $(DEPDIR)/vec3_test-vec3_test.Tpo -c -o vec3_test-vec3_test.obj `if test -f 'vec3_test.cc'; then $(CYGPATH_W) 'vec3_test.cc'; else $(CYGPATH_W) '$(srcdir)/vec3_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/vec3_test-vec3_test.Tpo $(DEPDIR)/vec3_test-vec3_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/vec3_test-vec3_test.Tpo $(DEPDIR)/vec3_test-vec3_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='vec3_test.cc' object='vec3_test-vec3_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vec3_test_CXXFLAGS) $(CXXFLAGS) -c -o vec3_test-vec3_test.obj `if test -f 'vec3_test.cc'; then $(CYGPATH_W) 'vec3_test.cc'; else $(CYGPATH_W) '$(srcdir)/vec3_test.cc'; fi`
  
  version_test-version_test.o: version_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(version_test_CXXFLAGS) $(CXXFLAGS) -MT version_test-version_test.o -MD -MP -MF "$(DEPDIR)/version_test-version_test.Tpo" -c -o version_test-version_test.o `test -f 'version_test.cc' || echo '$(srcdir)/'`version_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/version_test-version_test.Tpo" "$(DEPDIR)/version_test-version_test.Po"; else rm -f "$(DEPDIR)/version_test-version_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(version_test_CXXFLAGS) $(CXXFLAGS) -MT version_test-version_test.o -MD -MP -MF $(DEPDIR)/version_test-version_test.Tpo -c -o version_test-version_test.o `test -f 'version_test.cc' || echo '$(srcdir)/'`version_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(version_test_CXXFLAGS) $(CXXFLAGS) -MT version_test-version_test.o -MD -MP -MF $(DEPDIR)/version_test-version_test.Tpo -c -o version_test-version_test.o `test -f 'version_test.cc' || echo '$(srcdir)/'`version_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/version_test-version_test.Tpo $(DEPDIR)/version_test-version_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/version_test-version_test.Tpo $(DEPDIR)/version_test-version_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='version_test.cc' object='version_test-version_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(version_test_CXXFLAGS) $(CXXFLAGS) -c -o version_test-version_test.o `test -f 'version_test.cc' || echo '$(srcdir)/'`version_test.cc
  
  version_test-version_test.obj: version_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(version_test_CXXFLAGS) $(CXXFLAGS) -MT version_test-version_test.obj -MD -MP -MF "$(DEPDIR)/version_test-version_test.Tpo" -c -o version_test-version_test.obj `if test -f 'version_test.cc'; then $(CYGPATH_W) 'version_test.cc'; else $(CYGPATH_W) '$(srcdir)/version_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/version_test-version_test.Tpo" "$(DEPDIR)/version_test-version_test.Po"; else rm -f "$(DEPDIR)/version_test-version_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(version_test_CXXFLAGS) $(CXXFLAGS) -MT version_test-version_test.obj -MD -MP -MF $(DEPDIR)/version_test-version_test.Tpo -c -o version_test-version_test.obj `if test -f 'version_test.cc'; then $(CYGPATH_W) 'version_test.cc'; else $(CYGPATH_W) '$(srcdir)/version_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(version_test_CXXFLAGS) $(CXXFLAGS) -MT version_test-version_test.obj -MD -MP -MF $(DEPDIR)/version_test-version_test.Tpo -c -o version_test-version_test.obj `if test -f 'version_test.cc'; then $(CYGPATH_W) 'version_test.cc'; else $(CYGPATH_W) '$(srcdir)/version_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/version_test-version_test.Tpo $(DEPDIR)/version_test-version_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/version_test-version_test.Tpo $(DEPDIR)/version_test-version_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='version_test.cc' object='version_test-version_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(version_test_CXXFLAGS) $(CXXFLAGS) -c -o version_test-version_test.obj `if test -f 'version_test.cc'; then $(CYGPATH_W) 'version_test.cc'; else $(CYGPATH_W) '$(srcdir)/version_test.cc'; fi`
  
  xml_element_test-xml_element_test.o: xml_element_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xml_element_test_CXXFLAGS) $(CXXFLAGS) -MT xml_element_test-xml_element_test.o -MD -MP -MF "$(DEPDIR)/xml_element_test-xml_element_test.Tpo" -c -o xml_element_test-xml_element_test.o `test -f 'xml_element_test.cc' || echo '$(srcdir)/'`xml_element_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/xml_element_test-xml_element_test.Tpo" "$(DEPDIR)/xml_element_test-xml_element_test.Po"; else rm -f "$(DEPDIR)/xml_element_test-xml_element_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xml_element_test_CXXFLAGS) $(CXXFLAGS) -MT xml_element_test-xml_element_test.o -MD -MP -MF $(DEPDIR)/xml_element_test-xml_element_test.Tpo -c -o xml_element_test-xml_element_test.o `test -f 'xml_element_test.cc' || echo '$(srcdir)/'`xml_element_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xml_element_test_CXXFLAGS) $(CXXFLAGS) -MT xml_element_test-xml_element_test.o -MD -MP -MF $(DEPDIR)/xml_element_test-xml_element_test.Tpo -c -o xml_element_test-xml_element_test.o `test -f 'xml_element_test.cc' || echo '$(srcdir)/'`xml_element_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/xml_element_test-xml_element_test.Tpo $(DEPDIR)/xml_element_test-xml_element_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/xml_element_test-xml_element_test.Tpo $(DEPDIR)/xml_element_test-xml_element_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='xml_element_test.cc' object='xml_element_test-xml_element_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xml_element_test_CXXFLAGS) $(CXXFLAGS) -c -o xml_element_test-xml_element_test.o `test -f 'xml_element_test.cc' || echo '$(srcdir)/'`xml_element_test.cc
  
  xml_element_test-xml_element_test.obj: xml_element_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xml_element_test_CXXFLAGS) $(CXXFLAGS) -MT xml_element_test-xml_element_test.obj -MD -MP -MF "$(DEPDIR)/xml_element_test-xml_element_test.Tpo" -c -o xml_element_test-xml_element_test.obj `if test -f 'xml_element_test.cc'; then $(CYGPATH_W) 'xml_element_test.cc'; else $(CYGPATH_W) '$(srcdir)/xml_element_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/xml_element_test-xml_element_test.Tpo" "$(DEPDIR)/xml_element_test-xml_element_test.Po"; else rm -f "$(DEPDIR)/xml_element_test-xml_element_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xml_element_test_CXXFLAGS) $(CXXFLAGS) -MT xml_element_test-xml_element_test.obj -MD -MP -MF $(DEPDIR)/xml_element_test-xml_element_test.Tpo -c -o xml_element_test-xml_element_test.obj `if test -f 'xml_element_test.cc'; then $(CYGPATH_W) 'xml_element_test.cc'; else $(CYGPATH_W) '$(srcdir)/xml_element_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xml_element_test_CXXFLAGS) $(CXXFLAGS) -MT xml_element_test-xml_element_test.obj -MD -MP -MF $(DEPDIR)/xml_element_test-xml_element_test.Tpo -c -o xml_element_test-xml_element_test.obj `if test -f 'xml_element_test.cc'; then $(CYGPATH_W) 'xml_element_test.cc'; else $(CYGPATH_W) '$(srcdir)/xml_element_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/xml_element_test-xml_element_test.Tpo $(DEPDIR)/xml_element_test-xml_element_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/xml_element_test-xml_element_test.Tpo $(DEPDIR)/xml_element_test-xml_element_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='xml_element_test.cc' object='xml_element_test-xml_element_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xml_element_test_CXXFLAGS) $(CXXFLAGS) -c -o xml_element_test-xml_element_test.obj `if test -f 'xml_element_test.cc'; then $(CYGPATH_W) 'xml_element_test.cc'; else $(CYGPATH_W) '$(srcdir)/xml_element_test.cc'; fi`
  
  xml_file_test-xml_file_test.o: xml_file_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xml_file_test_CXXFLAGS) $(CXXFLAGS) -MT xml_file_test-xml_file_test.o -MD -MP -MF "$(DEPDIR)/xml_file_test-xml_file_test.Tpo" -c -o xml_file_test-xml_file_test.o `test -f 'xml_file_test.cc' || echo '$(srcdir)/'`xml_file_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/xml_file_test-xml_file_test.Tpo" "$(DEPDIR)/xml_file_test-xml_file_test.Po"; else rm -f "$(DEPDIR)/xml_file_test-xml_file_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xml_file_test_CXXFLAGS) $(CXXFLAGS) -MT xml_file_test-xml_file_test.o -MD -MP -MF $(DEPDIR)/xml_file_test-xml_file_test.Tpo -c -o xml_file_test-xml_file_test.o `test -f 'xml_file_test.cc' || echo '$(srcdir)/'`xml_file_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xml_file_test_CXXFLAGS) $(CXXFLAGS) -MT xml_file_test-xml_file_test.o -MD -MP -MF $(DEPDIR)/xml_file_test-xml_file_test.Tpo -c -o xml_file_test-xml_file_test.o `test -f 'xml_file_test.cc' || echo '$(srcdir)/'`xml_file_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/xml_file_test-xml_file_test.Tpo $(DEPDIR)/xml_file_test-xml_file_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/xml_file_test-xml_file_test.Tpo $(DEPDIR)/xml_file_test-xml_file_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='xml_file_test.cc' object='xml_file_test-xml_file_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xml_file_test_CXXFLAGS) $(CXXFLAGS) -c -o xml_file_test-xml_file_test.o `test -f 'xml_file_test.cc' || echo '$(srcdir)/'`xml_file_test.cc
  
  xml_file_test-xml_file_test.obj: xml_file_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xml_file_test_CXXFLAGS) $(CXXFLAGS) -MT xml_file_test-xml_file_test.obj -MD -MP -MF "$(DEPDIR)/xml_file_test-xml_file_test.Tpo" -c -o xml_file_test-xml_file_test.obj `if test -f 'xml_file_test.cc'; then $(CYGPATH_W) 'xml_file_test.cc'; else $(CYGPATH_W) '$(srcdir)/xml_file_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/xml_file_test-xml_file_test.Tpo" "$(DEPDIR)/xml_file_test-xml_file_test.Po"; else rm -f "$(DEPDIR)/xml_file_test-xml_file_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xml_file_test_CXXFLAGS) $(CXXFLAGS) -MT xml_file_test-xml_file_test.obj -MD -MP -MF $(DEPDIR)/xml_file_test-xml_file_test.Tpo -c -o xml_file_test-xml_file_test.obj `if test -f 'xml_file_test.cc'; then $(CYGPATH_W) 'xml_file_test.cc'; else $(CYGPATH_W) '$(srcdir)/xml_file_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xml_file_test_CXXFLAGS) $(CXXFLAGS) -MT xml_file_test-xml_file_test.obj -MD -MP -MF $(DEPDIR)/xml_file_test-xml_file_test.Tpo -c -o xml_file_test-xml_file_test.obj `if test -f 'xml_file_test.cc'; then $(CYGPATH_W) 'xml_file_test.cc'; else $(CYGPATH_W) '$(srcdir)/xml_file_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/xml_file_test-xml_file_test.Tpo $(DEPDIR)/xml_file_test-xml_file_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/xml_file_test-xml_file_test.Tpo $(DEPDIR)/xml_file_test-xml_file_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='xml_file_test.cc' object='xml_file_test-xml_file_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xml_file_test_CXXFLAGS) $(CXXFLAGS) -c -o xml_file_test-xml_file_test.obj `if test -f 'xml_file_test.cc'; then $(CYGPATH_W) 'xml_file_test.cc'; else $(CYGPATH_W) '$(srcdir)/xml_file_test.cc'; fi`
  
  xml_namespaces_test-xml_namespaces_test.o: xml_namespaces_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xml_namespaces_test_CXXFLAGS) $(CXXFLAGS) -MT xml_namespaces_test-xml_namespaces_test.o -MD -MP -MF "$(DEPDIR)/xml_namespaces_test-xml_namespaces_test.Tpo" -c -o xml_namespaces_test-xml_namespaces_test.o `test -f 'xml_namespaces_test.cc' || echo '$(srcdir)/'`xml_namespaces_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/xml_namespaces_test-xml_namespaces_test.Tpo" "$(DEPDIR)/xml_namespaces_test-xml_namespaces_test.Po"; else rm -f "$(DEPDIR)/xml_namespaces_test-xml_namespaces_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xml_namespaces_test_CXXFLAGS) $(CXXFLAGS) -MT xml_namespaces_test-xml_namespaces_test.o -MD -MP -MF $(DEPDIR)/xml_namespaces_test-xml_namespaces_test.Tpo -c -o xml_namespaces_test-xml_namespaces_test.o `test -f 'xml_namespaces_test.cc' || echo '$(srcdir)/'`xml_namespaces_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xml_namespaces_test_CXXFLAGS) $(CXXFLAGS) -MT xml_namespaces_test-xml_namespaces_test.o -MD -MP -MF $(DEPDIR)/xml_namespaces_test-xml_namespaces_test.Tpo -c -o xml_namespaces_test-xml_namespaces_test.o `test -f 'xml_namespaces_test.cc' || echo '$(srcdir)/'`xml_namespaces_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/xml_namespaces_test-xml_namespaces_test.Tpo $(DEPDIR)/xml_namespaces_test-xml_namespaces_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/xml_namespaces_test-xml_namespaces_test.Tpo $(DEPDIR)/xml_namespaces_test-xml_namespaces_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='xml_namespaces_test.cc' object='xml_namespaces_test-xml_namespaces_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xml_namespaces_test_CXXFLAGS) $(CXXFLAGS) -c -o xml_namespaces_test-xml_namespaces_test.o `test -f 'xml_namespaces_test.cc' || echo '$(srcdir)/'`xml_namespaces_test.cc
  
  xml_namespaces_test-xml_namespaces_test.obj: xml_namespaces_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xml_namespaces_test_CXXFLAGS) $(CXXFLAGS) -MT xml_namespaces_test-xml_namespaces_test.obj -MD -MP -MF "$(DEPDIR)/xml_namespaces_test-xml_namespaces_test.Tpo" -c -o xml_namespaces_test-xml_namespaces_test.obj `if test -f 'xml_namespaces_test.cc'; then $(CYGPATH_W) 'xml_namespaces_test.cc'; else $(CYGPATH_W) '$(srcdir)/xml_namespaces_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/xml_namespaces_test-xml_namespaces_test.Tpo" "$(DEPDIR)/xml_namespaces_test-xml_namespaces_test.Po"; else rm -f "$(DEPDIR)/xml_namespaces_test-xml_namespaces_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xml_namespaces_test_CXXFLAGS) $(CXXFLAGS) -MT xml_namespaces_test-xml_namespaces_test.obj -MD -MP -MF $(DEPDIR)/xml_namespaces_test-xml_namespaces_test.Tpo -c -o xml_namespaces_test-xml_namespaces_test.obj `if test -f 'xml_namespaces_test.cc'; then $(CYGPATH_W) 'xml_namespaces_test.cc'; else $(CYGPATH_W) '$(srcdir)/xml_namespaces_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xml_namespaces_test_CXXFLAGS) $(CXXFLAGS) -MT xml_namespaces_test-xml_namespaces_test.obj -MD -MP -MF $(DEPDIR)/xml_namespaces_test-xml_namespaces_test.Tpo -c -o xml_namespaces_test-xml_namespaces_test.obj `if test -f 'xml_namespaces_test.cc'; then $(CYGPATH_W) 'xml_namespaces_test.cc'; else $(CYGPATH_W) '$(srcdir)/xml_namespaces_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/xml_namespaces_test-xml_namespaces_test.Tpo $(DEPDIR)/xml_namespaces_test-xml_namespaces_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/xml_namespaces_test-xml_namespaces_test.Tpo $(DEPDIR)/xml_namespaces_test-xml_namespaces_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='xml_namespaces_test.cc' object='xml_namespaces_test-xml_namespaces_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xml_namespaces_test_CXXFLAGS) $(CXXFLAGS) -c -o xml_namespaces_test-xml_namespaces_test.obj `if test -f 'xml_namespaces_test.cc'; then $(CYGPATH_W) 'xml_namespaces_test.cc'; else $(CYGPATH_W) '$(srcdir)/xml_namespaces_test.cc'; fi`
  
  xmlns_test-xmlns_test.o: xmlns_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xmlns_test_CXXFLAGS) $(CXXFLAGS) -MT xmlns_test-xmlns_test.o -MD -MP -MF "$(DEPDIR)/xmlns_test-xmlns_test.Tpo" -c -o xmlns_test-xmlns_test.o `test -f 'xmlns_test.cc' || echo '$(srcdir)/'`xmlns_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/xmlns_test-xmlns_test.Tpo" "$(DEPDIR)/xmlns_test-xmlns_test.Po"; else rm -f "$(DEPDIR)/xmlns_test-xmlns_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xmlns_test_CXXFLAGS) $(CXXFLAGS) -MT xmlns_test-xmlns_test.o -MD -MP -MF $(DEPDIR)/xmlns_test-xmlns_test.Tpo -c -o xmlns_test-xmlns_test.o `test -f 'xmlns_test.cc' || echo '$(srcdir)/'`xmlns_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xmlns_test_CXXFLAGS) $(CXXFLAGS) -MT xmlns_test-xmlns_test.o -MD -MP -MF $(DEPDIR)/xmlns_test-xmlns_test.Tpo -c -o xmlns_test-xmlns_test.o `test -f 'xmlns_test.cc' || echo '$(srcdir)/'`xmlns_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/xmlns_test-xmlns_test.Tpo $(DEPDIR)/xmlns_test-xmlns_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/xmlns_test-xmlns_test.Tpo $(DEPDIR)/xmlns_test-xmlns_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='xmlns_test.cc' object='xmlns_test-xmlns_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xmlns_test_CXXFLAGS) $(CXXFLAGS) -c -o xmlns_test-xmlns_test.o `test -f 'xmlns_test.cc' || echo '$(srcdir)/'`xmlns_test.cc
  
  xmlns_test-xmlns_test.obj: xmlns_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xmlns_test_CXXFLAGS) $(CXXFLAGS) -MT xmlns_test-xmlns_test.obj -MD -MP -MF "$(DEPDIR)/xmlns_test-xmlns_test.Tpo" -c -o xmlns_test-xmlns_test.obj `if test -f 'xmlns_test.cc'; then $(CYGPATH_W) 'xmlns_test.cc'; else $(CYGPATH_W) '$(srcdir)/xmlns_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/xmlns_test-xmlns_test.Tpo" "$(DEPDIR)/xmlns_test-xmlns_test.Po"; else rm -f "$(DEPDIR)/xmlns_test-xmlns_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xmlns_test_CXXFLAGS) $(CXXFLAGS) -MT xmlns_test-xmlns_test.obj -MD -MP -MF $(DEPDIR)/xmlns_test-xmlns_test.Tpo -c -o xmlns_test-xmlns_test.obj `if test -f 'xmlns_test.cc'; then $(CYGPATH_W) 'xmlns_test.cc'; else $(CYGPATH_W) '$(srcdir)/xmlns_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xmlns_test_CXXFLAGS) $(CXXFLAGS) -MT xmlns_test-xmlns_test.obj -MD -MP -MF $(DEPDIR)/xmlns_test-xmlns_test.Tpo -c -o xmlns_test-xmlns_test.obj `if test -f 'xmlns_test.cc'; then $(CYGPATH_W) 'xmlns_test.cc'; else $(CYGPATH_W) '$(srcdir)/xmlns_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/xmlns_test-xmlns_test.Tpo $(DEPDIR)/xmlns_test-xmlns_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/xmlns_test-xmlns_test.Tpo $(DEPDIR)/xmlns_test-xmlns_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='xmlns_test.cc' object='xmlns_test-xmlns_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xmlns_test_CXXFLAGS) $(CXXFLAGS) -c -o xmlns_test-xmlns_test.obj `if test -f 'xmlns_test.cc'; then $(CYGPATH_W) 'xmlns_test.cc'; else $(CYGPATH_W) '$(srcdir)/xmlns_test.cc'; fi`
-@@ -996,72 +1093,75 @@
  
- clean-libtool:
- 	-rm -rf .libs _libs
--
--distclean-libtool:
--	-rm -f libtool
--uninstall-info-am:
+ zip_file_test-zip_file_test.o: zip_file_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(zip_file_test_CXXFLAGS) $(CXXFLAGS) -MT zip_file_test-zip_file_test.o -MD -MP -MF $(DEPDIR)/zip_file_test-zip_file_test.Tpo -c -o zip_file_test-zip_file_test.o `test -f 'zip_file_test.cc' || echo '$(srcdir)/'`zip_file_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/zip_file_test-zip_file_test.Tpo $(DEPDIR)/zip_file_test-zip_file_test.Po
++ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/zip_file_test-zip_file_test.Tpo $(DEPDIR)/zip_file_test-zip_file_test.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='zip_file_test.cc' object='zip_file_test-zip_file_test.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(zip_file_test_CXXFLAGS) $(CXXFLAGS) -c -o zip_file_test-zip_file_test.o `test -f 'zip_file_test.cc' || echo '$(srcdir)/'`zip_file_test.cc
+ 
+ zip_file_test-zip_file_test.obj: zip_file_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(zip_file_test_CXXFLAGS) $(CXXFLAGS) -MT zip_file_test-zip_file_test.obj -MD -MP -MF $(DEPDIR)/zip_file_test-zip_file_test.Tpo -c -o zip_file_test-zip_file_test.obj `if test -f 'zip_file_test.cc'; then $(CYGPATH_W) 'zip_file_test.cc'; else $(CYGPATH_W) '$(srcdir)/zip_file_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/zip_file_test-zip_file_test.Tpo $(DEPDIR)/zip_file_test-zip_file_test.Po
++ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/zip_file_test-zip_file_test.Tpo $(DEPDIR)/zip_file_test-zip_file_test.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='zip_file_test.cc' object='zip_file_test-zip_file_test.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(zip_file_test_CXXFLAGS) $(CXXFLAGS) -c -o zip_file_test-zip_file_test.obj `if test -f 'zip_file_test.cc'; then $(CYGPATH_W) 'zip_file_test.cc'; else $(CYGPATH_W) '$(srcdir)/zip_file_test.cc'; fi`
+@@ -1111,20 +1131,23 @@
  install-libkmlbaseincludeHEADERS: $(libkmlbaseinclude_HEADERS)
  	@$(NORMAL_INSTALL)
--	test -z "$(libkmlbaseincludedir)" || $(mkdir_p) "$(DESTDIR)$(libkmlbaseincludedir)"
+ 	test -z "$(libkmlbaseincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libkmlbaseincludedir)"
 -	@list='$(libkmlbaseinclude_HEADERS)'; for p in $$list; do \
-+	test -z "$(libkmlbaseincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libkmlbaseincludedir)"
 +	@list='$(libkmlbaseinclude_HEADERS)'; test -n "$(libkmlbaseincludedir)" || list=; \
 +	for p in $$list; do \
  	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
@@ -76097,15 +18607,7 @@
  
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- 	unique=`for i in $$list; do \
- 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- 	  done | \
--	  $(AWK) '    { files[$$0] = 1; } \
--	       END { for (i in files) print i; }'`; \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
- 	mkid -fID $$unique
- tags: TAGS
+@@ -1138,7 +1161,7 @@
  
  TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
@@ -76114,13 +18616,11 @@
  	here=`pwd`; \
  	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
- 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+@@ -1146,29 +1169,34 @@
  	  done | \
--	  $(AWK) '    { files[$$0] = 1; } \
--	       END { for (i in files) print i; }'`; \
+ 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 -	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 +	shift; \
 +	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
  	  test -n "$$unique" || unique=$$empty_fix; \
@@ -76138,16 +18638,13 @@
  CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
 -	tags=; \
--	here=`pwd`; \
  	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  	  done | \
--	  $(AWK) '    { files[$$0] = 1; } \
--	       END { for (i in files) print i; }'`; \
+ 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 -	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 +	test -z "$(CTAGS_ARGS)$$unique" \
  	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 -	     $$tags $$unique
@@ -76162,22 +18659,16 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-@@ -1069,7 +1169,8 @@
- check-TESTS: $(TESTS)
+@@ -1177,6 +1205,7 @@
  	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
  	srcdir=$(srcdir); export srcdir; \
--	list='$(TESTS)'; \
-+	list=' $(TESTS) '; \
+ 	list=' $(TESTS) '; \
 +	$(am__tty_colors); \
  	if test -n "$$list"; then \
  	  for tst in $$list; do \
  	    if test -f ./$$tst; then dir=./; \
-@@ -1078,49 +1179,63 @@
- 	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *" $$tst "*) \
-+	      *[\ \	]$$tst[\ \	]*) \
+@@ -1188,10 +1217,10 @@
+ 	      *[\ \	]$$tst[\ \	]*) \
  		xpass=`expr $$xpass + 1`; \
  		failed=`expr $$failed + 1`; \
 -		echo "XPASS: $$tst"; \
@@ -76189,10 +18680,9 @@
  	      ;; \
  	      esac; \
  	    elif test $$? -ne 77; then \
- 	      all=`expr $$all + 1`; \
+@@ -1199,17 +1228,18 @@
  	      case " $(XFAIL_TESTS) " in \
--	      *" $$tst "*) \
-+	      *[\ \	]$$tst[\ \	]*) \
+ 	      *[\ \	]$$tst[\ \	]*) \
  		xfail=`expr $$xfail + 1`; \
 -		echo "XFAIL: $$tst"; \
 +		col=$$lgn; res=XFAIL; \
@@ -76210,45 +18700,9 @@
  	    fi; \
 +	    echo "$${col}$$res$${std}: $$tst"; \
  	  done; \
-+	  if test "$$all" -eq 1; then \
-+	    tests="test"; \
-+	    All=""; \
-+	  else \
-+	    tests="tests"; \
-+	    All="All "; \
-+	  fi; \
- 	  if test "$$failed" -eq 0; then \
- 	    if test "$$xfail" -eq 0; then \
--	      banner="All $$all tests passed"; \
-+	      banner="$$All$$all $$tests passed"; \
- 	    else \
--	      banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
-+	      if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
-+	      banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
- 	    fi; \
- 	  else \
- 	    if test "$$xpass" -eq 0; then \
--	      banner="$$failed of $$all tests failed"; \
-+	      banner="$$failed of $$all $$tests failed"; \
- 	    else \
--	      banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
-+	      if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
-+	      banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
- 	    fi; \
- 	  fi; \
- 	  dashes="$$banner"; \
- 	  skipped=""; \
- 	  if test "$$skip" -ne 0; then \
--	    skipped="($$skip tests were not run)"; \
-+	    if test "$$skip" -eq 1; then \
-+	      skipped="($$skip test was not run)"; \
-+	    else \
-+	      skipped="($$skip tests were not run)"; \
-+	    fi; \
- 	    test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
- 	      dashes="$$skipped"; \
- 	  fi; \
-@@ -1131,38 +1246,45 @@
+ 	  if test "$$all" -eq 1; then \
+ 	    tests="test"; \
+@@ -1251,11 +1281,15 @@
  	      dashes="$$report"; \
  	  fi; \
  	  dashes=`echo "$$dashes" | sed s/./=/g`; \
@@ -76266,36 +18720,10 @@
  	  test "$$failed" -eq 0; \
  	else :; fi
  
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
--	list='$(DISTFILES)'; for file in $$list; do \
--	  case $$file in \
--	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
--	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
--	  esac; \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
+@@ -1275,13 +1309,17 @@
  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
--	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
--	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
--	    dir="/$$dir"; \
--	    $(mkdir_p) "$(distdir)$$dir"; \
--	  else \
--	    dir=''; \
--	  fi; \
  	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 +	    if test -d "$(distdir)/$$file"; then \
 +	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 +	    fi; \
@@ -76314,16 +18742,7 @@
  	    || exit 1; \
  	  fi; \
  	done
-@@ -1173,7 +1295,7 @@
- all-am: Makefile $(LTLIBRARIES) $(HEADERS)
- installdirs:
- 	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libkmlbaseincludedir)"; do \
--	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- 	done
- install: install-am
- install-exec: install-exec-am
-@@ -1196,6 +1318,7 @@
+@@ -1315,6 +1353,7 @@
  
  distclean-generic:
  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -76331,17 +18750,8 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -1209,7 +1332,7 @@
- 	-rm -rf ./$(DEPDIR)
- 	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
--	distclean-libtool distclean-tags
-+	distclean-tags
+@@ -1336,6 +1375,8 @@
  
- dvi: dvi-am
- 
-@@ -1217,18 +1340,38 @@
- 
  html: html-am
  
 +html-am:
@@ -76349,17 +18759,16 @@
  info: info-am
  
  info-am:
+@@ -1344,18 +1385,28 @@
  
- install-data-am: install-libkmlbaseincludeHEADERS
+ install-dvi: install-dvi-am
  
-+install-dvi: install-dvi-am
-+
 +install-dvi-am:
 +
  install-exec-am: install-libLTLIBRARIES
  
-+install-html: install-html-am
-+
+ install-html: install-html-am
+ 
 +install-html-am:
 +
  install-info: install-info-am
@@ -76368,104 +18777,62 @@
 +
  install-man:
  
-+install-pdf: install-pdf-am
-+
+ install-pdf: install-pdf-am
+ 
 +install-pdf-am:
 +
-+install-ps: install-ps-am
-+
+ install-ps: install-ps-am
+ 
 +install-ps-am:
 +
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
-@@ -1249,22 +1392,27 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
-+uninstall-am: uninstall-libLTLIBRARIES \
+@@ -1379,7 +1430,7 @@
+ uninstall-am: uninstall-libLTLIBRARIES \
  	uninstall-libkmlbaseincludeHEADERS
  
+-.MAKE: install-am install-strip
 +.MAKE: check-am install-am install-strip
-+
+ 
  .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
  	clean-checkPROGRAMS clean-generic clean-libLTLIBRARIES \
- 	clean-libtool ctags distclean distclean-compile \
- 	distclean-generic distclean-libtool distclean-tags distdir dvi \
- 	dvi-am html html-am info info-am install install-am \
--	install-data install-data-am install-exec install-exec-am \
-+	install-data install-data-am install-dvi install-dvi-am \
-+	install-exec install-exec-am install-html install-html-am \
- 	install-info install-info-am install-libLTLIBRARIES \
--	install-libkmlbaseincludeHEADERS install-man install-strip \
-+	install-libkmlbaseincludeHEADERS install-man install-pdf \
-+	install-pdf-am install-ps install-ps-am install-strip \
- 	installcheck installcheck-am installdirs maintainer-clean \
- 	maintainer-clean-generic mostlyclean mostlyclean-compile \
- 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
--	tags uninstall uninstall-am uninstall-info-am \
--	uninstall-libLTLIBRARIES uninstall-libkmlbaseincludeHEADERS
-+	tags uninstall uninstall-am uninstall-libLTLIBRARIES \
-+	uninstall-libkmlbaseincludeHEADERS
-+
+@@ -1397,6 +1448,7 @@
+ 	tags uninstall uninstall-am uninstall-libLTLIBRARIES \
+ 	uninstall-libkmlbaseincludeHEADERS
  
++
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-Index: libkml-1.0.1/src/kml/convenience/Makefile.in
+ .NOEXPORT:
+Index: libkml-1.1.0/src/kml/convenience/Makefile.in
 ===================================================================
---- libkml-1.0.1.orig/src/kml/convenience/Makefile.in	2009-07-03 01:23:32.000000000 +0200
-+++ libkml-1.0.1/src/kml/convenience/Makefile.in	2009-12-10 10:19:46.000000000 +0100
+--- libkml-1.1.0.orig/src/kml/convenience/Makefile.in	2009-12-10 13:05:40.000000000 +0100
++++ libkml-1.1.0/src/kml/convenience/Makefile.in	2009-12-10 17:29:36.000000000 +0100
 @@ -1,8 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
+-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
-@@ -15,15 +16,12 @@
- @SET_MAKE@
+@@ -17,8 +18,9 @@
  
- 
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
  VPATH = @srcdir@
  pkgdatadir = $(datadir)/@PACKAGE@
 -pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../../..
 +pkglibdir = $(libdir)/@PACKAGE@
 +pkglibexecdir = $(libexecdir)/@PACKAGE@
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -37,27 +35,48 @@
- POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
-+TESTS = atom_util_test$(EXEEXT) csv_file_test$(EXEEXT) \
-+	convenience_test$(EXEEXT) element_counter_test$(EXEEXT) \
-+	kmz_check_links_test$(EXEEXT) feature_list_test$(EXEEXT) \
-+	gpx_trk_pt_handler_test$(EXEEXT)
- check_PROGRAMS = $(am__EXEEXT_1)
- subdir = src/kml/convenience
- DIST_COMMON = $(libkmlconvenienceinclude_HEADERS) \
- 	$(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_curl.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)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
+@@ -53,15 +55,30 @@
  mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
@@ -76498,104 +18865,17 @@
  LTLIBRARIES = $(lib_LTLIBRARIES)
  libkmlconvenience_la_LIBADD =
  am_libkmlconvenience_la_OBJECTS = atom_util.lo convenience.lo \
-@@ -74,6 +93,10 @@
- 	$(top_builddir)/src/kml/dom/libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+atom_util_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-+	$(atom_util_test_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- am_convenience_test_OBJECTS =  \
- 	convenience_test-convenience_test.$(OBJEXT)
- convenience_test_OBJECTS = $(am_convenience_test_OBJECTS)
-@@ -82,6 +105,10 @@
- 	$(top_builddir)/src/kml/dom/libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+convenience_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-+	$(convenience_test_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- am_csv_file_test_OBJECTS = csv_file_test-csv_file_test.$(OBJEXT)
- csv_file_test_OBJECTS = $(am_csv_file_test_OBJECTS)
- csv_file_test_DEPENDENCIES = libkmlconvenience.la \
-@@ -89,6 +116,9 @@
- 	$(top_builddir)/src/kml/dom/libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+csv_file_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(csv_file_test_CXXFLAGS) \
-+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- am_element_counter_test_OBJECTS =  \
- 	element_counter_test-element_counter_test.$(OBJEXT)
- element_counter_test_OBJECTS = $(am_element_counter_test_OBJECTS)
-@@ -97,6 +127,10 @@
- 	$(top_builddir)/src/kml/dom/libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+element_counter_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-+	$(element_counter_test_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- am_feature_list_test_OBJECTS =  \
- 	feature_list_test-feature_list_test.$(OBJEXT)
- feature_list_test_OBJECTS = $(am_feature_list_test_OBJECTS)
-@@ -105,6 +139,10 @@
- 	$(top_builddir)/src/kml/dom/libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+feature_list_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-+	$(feature_list_test_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- am_gpx_trk_pt_handler_test_OBJECTS =  \
- 	gpx_trk_pt_handler_test-gpx_trk_pt_handler_test.$(OBJEXT)
- gpx_trk_pt_handler_test_OBJECTS =  \
-@@ -114,6 +152,10 @@
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/src/kml/dom/libkmldom.la \
- 	$(top_builddir)/third_party/libgtest.la
-+gpx_trk_pt_handler_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-+	$(gpx_trk_pt_handler_test_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- am_kmz_check_links_test_OBJECTS =  \
- 	kmz_check_links_test-kmz_check_links_test.$(OBJEXT)
- kmz_check_links_test_OBJECTS = $(am_kmz_check_links_test_OBJECTS)
-@@ -122,17 +164,23 @@
- 	$(top_builddir)/src/kml/dom/libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
--DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+kmz_check_links_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-+	$(kmz_check_links_test_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
-+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+@@ -194,6 +211,7 @@
+ DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
  depcomp = $(SHELL) $(top_srcdir)/config/depcomp
  am__depfiles_maybe = depfiles
 +am__mv = mv -f
  CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
  	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
--	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
--	$(AM_CXXFLAGS) $(CXXFLAGS)
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- CXXLD = $(CXX)
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- SOURCES = $(libkmlconvenience_la_SOURCES) $(atom_util_test_SOURCES) \
- 	$(convenience_test_SOURCES) $(csv_file_test_SOURCES) \
- 	$(element_counter_test_SOURCES) $(feature_list_test_SOURCES) \
-@@ -144,14 +192,13 @@
- 	$(feature_list_test_SOURCES) \
- 	$(gpx_trk_pt_handler_test_SOURCES) \
+ LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+@@ -217,10 +235,11 @@
+ 	$(google_spreadsheets_test_SOURCES) \
+ 	$(gpx_trk_pt_handler_test_SOURCES) $(http_client_test_SOURCES) \
  	$(kmz_check_links_test_SOURCES)
 -libkmlconvenienceincludeHEADERS_INSTALL = $(INSTALL_HEADER)
  HEADERS = $(libkmlconvenienceinclude_HEADERS)
@@ -76605,57 +18885,8 @@
 +red=; grn=; lgn=; blu=; std=
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  ACLOCAL = @ACLOCAL@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
  AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -173,18 +220,16 @@
- CYGPATH_W = @CYGPATH_W@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
--ECHO = @ECHO@
-+DSYMUTIL = @DSYMUTIL@
-+DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
--F77 = @F77@
--FFLAGS = @FFLAGS@
--GCC_FALSE = @GCC_FALSE@
--GCC_TRUE = @GCC_TRUE@
--HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
--HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
-+FGREP = @FGREP@
-+GREP = @GREP@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -194,19 +239,28 @@
- JAVAC = @JAVAC@
- JAVA_INCLUDE_DIR = @JAVA_INCLUDE_DIR@
- JAVA_LIB_DIR = @JAVA_LIB_DIR@
-+LD = @LD@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
-+LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
-+NM = @NM@
-+NMEDIT = @NMEDIT@
-+OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
-+OTOOL = @OTOOL@
-+OTOOL64 = @OTOOL64@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -284,6 +303,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -76663,99 +18894,18 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PLATFORM = @PLATFORM@
-@@ -223,22 +277,13 @@
- STRIP = @STRIP@
- SWIG = @SWIG@
- VERSION = @VERSION@
--WITH_JAVA_FALSE = @WITH_JAVA_FALSE@
--WITH_JAVA_TRUE = @WITH_JAVA_TRUE@
--WITH_PYTHON_FALSE = @WITH_PYTHON_FALSE@
--WITH_PYTHON_TRUE = @WITH_PYTHON_TRUE@
--WITH_SWIG_FALSE = @WITH_SWIG_FALSE@
--WITH_SWIG_TRUE = @WITH_SWIG_TRUE@
--ac_ct_AR = @ac_ct_AR@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
--ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -250,28 +295,41 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- AM_CPPFLAGS = -I$(top_srcdir)/src \
+@@ -357,8 +377,8 @@
  	      -I$(top_srcdir)/third_party/boost_1_34_1 \
                -I$(top_srcdir)/third_party/googletest-r108/include
-@@ -299,14 +357,6 @@
- 	kmz_check_links.h
  
- DATA_DIR = $(top_srcdir)/testdata
--TESTS = atom_util_test \
--        csv_file_test \
--	convenience_test \
--	element_counter_test \
--	kmz_check_links_test \
--	feature_list_test \
--	gpx_trk_pt_handler_test
--
- atom_util_test_SOURCES = atom_util_test.cc
- atom_util_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
- atom_util_test_LDADD = libkmlconvenience.la \
-@@ -372,14 +422,14 @@
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
--	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
--		&& exit 0; \
-+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-+	        && { if test -f $@; then exit 0; else break; fi; }; \
+- at GCC_TRUE@AM_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -Werror -ansi -pedantic -fno-rtti
+- at GCC_TRUE@AM_TEST_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -Werror -ansi -fno-rtti -DGTEST_HAS_RTTI=0
++ at GCC_TRUE@AM_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -ansi -pedantic -fno-rtti
++ at GCC_TRUE@AM_TEST_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -ansi -fno-rtti -DGTEST_HAS_RTTI=0
+ EXTRA_DIST = \
+ 	http_client_test_util.h
+ 
+@@ -481,9 +501,9 @@
  	      exit 1;; \
  	  esac; \
  	done; \
@@ -76768,22 +18918,21 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -397,23 +447,28 @@
+@@ -501,23 +521,28 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(am__aclocal_m4_deps):
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
--	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ 	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 -	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 +	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
 +	list2=; for p in $$list; do \
  	  if test -f $$p; then \
 -	    f=$(am__strip_dir) \
--	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
--	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+-	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+-	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
 +	    list2="$$list2 $$p"; \
  	  else :; fi; \
 -	done
@@ -76795,10 +18944,10 @@
  
  uninstall-libLTLIBRARIES:
  	@$(NORMAL_UNINSTALL)
--	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 -	  p=$(am__strip_dir) \
--	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
--	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
 +	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
 +	for p in $$list; do \
 +	  $(am__strip_dir) \
@@ -76807,12 +18956,8 @@
  	done
  
  clean-libLTLIBRARIES:
-@@ -425,35 +480,37 @@
- 	  rm -f "$${dir}/so_locations"; \
- 	done
- libkmlconvenience.la: $(libkmlconvenience_la_OBJECTS) $(libkmlconvenience_la_DEPENDENCIES) 
--	$(CXXLINK) -rpath $(libdir) $(libkmlconvenience_la_LDFLAGS) $(libkmlconvenience_la_OBJECTS) $(libkmlconvenience_la_LIBADD) $(LIBS)
-+	$(CXXLINK) -rpath $(libdir) $(libkmlconvenience_la_OBJECTS) $(libkmlconvenience_la_LIBADD) $(LIBS)
+@@ -532,11 +557,13 @@
+ 	$(CXXLINK) -rpath $(libdir) $(libkmlconvenience_la_OBJECTS) $(libkmlconvenience_la_LIBADD) $(LIBS)
  
  clean-checkPROGRAMS:
 -	@list='$(check_PROGRAMS)'; for p in $$list; do \
@@ -76829,203 +18974,197 @@
 +	rm -f $$list
  atom_util_test$(EXEEXT): $(atom_util_test_OBJECTS) $(atom_util_test_DEPENDENCIES) 
  	@rm -f atom_util_test$(EXEEXT)
--	$(CXXLINK) $(atom_util_test_LDFLAGS) $(atom_util_test_OBJECTS) $(atom_util_test_LDADD) $(LIBS)
-+	$(atom_util_test_LINK) $(atom_util_test_OBJECTS) $(atom_util_test_LDADD) $(LIBS)
- convenience_test$(EXEEXT): $(convenience_test_OBJECTS) $(convenience_test_DEPENDENCIES) 
- 	@rm -f convenience_test$(EXEEXT)
--	$(CXXLINK) $(convenience_test_LDFLAGS) $(convenience_test_OBJECTS) $(convenience_test_LDADD) $(LIBS)
-+	$(convenience_test_LINK) $(convenience_test_OBJECTS) $(convenience_test_LDADD) $(LIBS)
- csv_file_test$(EXEEXT): $(csv_file_test_OBJECTS) $(csv_file_test_DEPENDENCIES) 
- 	@rm -f csv_file_test$(EXEEXT)
--	$(CXXLINK) $(csv_file_test_LDFLAGS) $(csv_file_test_OBJECTS) $(csv_file_test_LDADD) $(LIBS)
-+	$(csv_file_test_LINK) $(csv_file_test_OBJECTS) $(csv_file_test_LDADD) $(LIBS)
- element_counter_test$(EXEEXT): $(element_counter_test_OBJECTS) $(element_counter_test_DEPENDENCIES) 
- 	@rm -f element_counter_test$(EXEEXT)
--	$(CXXLINK) $(element_counter_test_LDFLAGS) $(element_counter_test_OBJECTS) $(element_counter_test_LDADD) $(LIBS)
-+	$(element_counter_test_LINK) $(element_counter_test_OBJECTS) $(element_counter_test_LDADD) $(LIBS)
- feature_list_test$(EXEEXT): $(feature_list_test_OBJECTS) $(feature_list_test_DEPENDENCIES) 
- 	@rm -f feature_list_test$(EXEEXT)
--	$(CXXLINK) $(feature_list_test_LDFLAGS) $(feature_list_test_OBJECTS) $(feature_list_test_LDADD) $(LIBS)
-+	$(feature_list_test_LINK) $(feature_list_test_OBJECTS) $(feature_list_test_LDADD) $(LIBS)
- gpx_trk_pt_handler_test$(EXEEXT): $(gpx_trk_pt_handler_test_OBJECTS) $(gpx_trk_pt_handler_test_DEPENDENCIES) 
- 	@rm -f gpx_trk_pt_handler_test$(EXEEXT)
--	$(CXXLINK) $(gpx_trk_pt_handler_test_LDFLAGS) $(gpx_trk_pt_handler_test_OBJECTS) $(gpx_trk_pt_handler_test_LDADD) $(LIBS)
-+	$(gpx_trk_pt_handler_test_LINK) $(gpx_trk_pt_handler_test_OBJECTS) $(gpx_trk_pt_handler_test_LDADD) $(LIBS)
- kmz_check_links_test$(EXEEXT): $(kmz_check_links_test_OBJECTS) $(kmz_check_links_test_DEPENDENCIES) 
- 	@rm -f kmz_check_links_test$(EXEEXT)
--	$(CXXLINK) $(kmz_check_links_test_LDFLAGS) $(kmz_check_links_test_OBJECTS) $(kmz_check_links_test_LDADD) $(LIBS)
-+	$(kmz_check_links_test_LINK) $(kmz_check_links_test_OBJECTS) $(kmz_check_links_test_LDADD) $(LIBS)
+ 	$(atom_util_test_LINK) $(atom_util_test_OBJECTS) $(atom_util_test_LDADD) $(LIBS)
+@@ -595,161 +622,161 @@
  
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -475,120 +532,120 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/kmz_check_links_test-kmz_check_links_test.Po at am__quote@
- 
  .cc.o:
-- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
  
  .cc.obj:
-- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
  
  .cc.lo:
-- at am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
  
  atom_util_test-atom_util_test.o: atom_util_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(atom_util_test_CXXFLAGS) $(CXXFLAGS) -MT atom_util_test-atom_util_test.o -MD -MP -MF "$(DEPDIR)/atom_util_test-atom_util_test.Tpo" -c -o atom_util_test-atom_util_test.o `test -f 'atom_util_test.cc' || echo '$(srcdir)/'`atom_util_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/atom_util_test-atom_util_test.Tpo" "$(DEPDIR)/atom_util_test-atom_util_test.Po"; else rm -f "$(DEPDIR)/atom_util_test-atom_util_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(atom_util_test_CXXFLAGS) $(CXXFLAGS) -MT atom_util_test-atom_util_test.o -MD -MP -MF $(DEPDIR)/atom_util_test-atom_util_test.Tpo -c -o atom_util_test-atom_util_test.o `test -f 'atom_util_test.cc' || echo '$(srcdir)/'`atom_util_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(atom_util_test_CXXFLAGS) $(CXXFLAGS) -MT atom_util_test-atom_util_test.o -MD -MP -MF $(DEPDIR)/atom_util_test-atom_util_test.Tpo -c -o atom_util_test-atom_util_test.o `test -f 'atom_util_test.cc' || echo '$(srcdir)/'`atom_util_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/atom_util_test-atom_util_test.Tpo $(DEPDIR)/atom_util_test-atom_util_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/atom_util_test-atom_util_test.Tpo $(DEPDIR)/atom_util_test-atom_util_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='atom_util_test.cc' object='atom_util_test-atom_util_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(atom_util_test_CXXFLAGS) $(CXXFLAGS) -c -o atom_util_test-atom_util_test.o `test -f 'atom_util_test.cc' || echo '$(srcdir)/'`atom_util_test.cc
  
  atom_util_test-atom_util_test.obj: atom_util_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(atom_util_test_CXXFLAGS) $(CXXFLAGS) -MT atom_util_test-atom_util_test.obj -MD -MP -MF "$(DEPDIR)/atom_util_test-atom_util_test.Tpo" -c -o atom_util_test-atom_util_test.obj `if test -f 'atom_util_test.cc'; then $(CYGPATH_W) 'atom_util_test.cc'; else $(CYGPATH_W) '$(srcdir)/atom_util_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/atom_util_test-atom_util_test.Tpo" "$(DEPDIR)/atom_util_test-atom_util_test.Po"; else rm -f "$(DEPDIR)/atom_util_test-atom_util_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(atom_util_test_CXXFLAGS) $(CXXFLAGS) -MT atom_util_test-atom_util_test.obj -MD -MP -MF $(DEPDIR)/atom_util_test-atom_util_test.Tpo -c -o atom_util_test-atom_util_test.obj `if test -f 'atom_util_test.cc'; then $(CYGPATH_W) 'atom_util_test.cc'; else $(CYGPATH_W) '$(srcdir)/atom_util_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(atom_util_test_CXXFLAGS) $(CXXFLAGS) -MT atom_util_test-atom_util_test.obj -MD -MP -MF $(DEPDIR)/atom_util_test-atom_util_test.Tpo -c -o atom_util_test-atom_util_test.obj `if test -f 'atom_util_test.cc'; then $(CYGPATH_W) 'atom_util_test.cc'; else $(CYGPATH_W) '$(srcdir)/atom_util_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/atom_util_test-atom_util_test.Tpo $(DEPDIR)/atom_util_test-atom_util_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/atom_util_test-atom_util_test.Tpo $(DEPDIR)/atom_util_test-atom_util_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='atom_util_test.cc' object='atom_util_test-atom_util_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(atom_util_test_CXXFLAGS) $(CXXFLAGS) -c -o atom_util_test-atom_util_test.obj `if test -f 'atom_util_test.cc'; then $(CYGPATH_W) 'atom_util_test.cc'; else $(CYGPATH_W) '$(srcdir)/atom_util_test.cc'; fi`
  
  convenience_test-convenience_test.o: convenience_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(convenience_test_CXXFLAGS) $(CXXFLAGS) -MT convenience_test-convenience_test.o -MD -MP -MF "$(DEPDIR)/convenience_test-convenience_test.Tpo" -c -o convenience_test-convenience_test.o `test -f 'convenience_test.cc' || echo '$(srcdir)/'`convenience_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/convenience_test-convenience_test.Tpo" "$(DEPDIR)/convenience_test-convenience_test.Po"; else rm -f "$(DEPDIR)/convenience_test-convenience_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(convenience_test_CXXFLAGS) $(CXXFLAGS) -MT convenience_test-convenience_test.o -MD -MP -MF $(DEPDIR)/convenience_test-convenience_test.Tpo -c -o convenience_test-convenience_test.o `test -f 'convenience_test.cc' || echo '$(srcdir)/'`convenience_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(convenience_test_CXXFLAGS) $(CXXFLAGS) -MT convenience_test-convenience_test.o -MD -MP -MF $(DEPDIR)/convenience_test-convenience_test.Tpo -c -o convenience_test-convenience_test.o `test -f 'convenience_test.cc' || echo '$(srcdir)/'`convenience_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/convenience_test-convenience_test.Tpo $(DEPDIR)/convenience_test-convenience_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/convenience_test-convenience_test.Tpo $(DEPDIR)/convenience_test-convenience_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='convenience_test.cc' object='convenience_test-convenience_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(convenience_test_CXXFLAGS) $(CXXFLAGS) -c -o convenience_test-convenience_test.o `test -f 'convenience_test.cc' || echo '$(srcdir)/'`convenience_test.cc
  
  convenience_test-convenience_test.obj: convenience_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(convenience_test_CXXFLAGS) $(CXXFLAGS) -MT convenience_test-convenience_test.obj -MD -MP -MF "$(DEPDIR)/convenience_test-convenience_test.Tpo" -c -o convenience_test-convenience_test.obj `if test -f 'convenience_test.cc'; then $(CYGPATH_W) 'convenience_test.cc'; else $(CYGPATH_W) '$(srcdir)/convenience_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/convenience_test-convenience_test.Tpo" "$(DEPDIR)/convenience_test-convenience_test.Po"; else rm -f "$(DEPDIR)/convenience_test-convenience_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(convenience_test_CXXFLAGS) $(CXXFLAGS) -MT convenience_test-convenience_test.obj -MD -MP -MF $(DEPDIR)/convenience_test-convenience_test.Tpo -c -o convenience_test-convenience_test.obj `if test -f 'convenience_test.cc'; then $(CYGPATH_W) 'convenience_test.cc'; else $(CYGPATH_W) '$(srcdir)/convenience_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(convenience_test_CXXFLAGS) $(CXXFLAGS) -MT convenience_test-convenience_test.obj -MD -MP -MF $(DEPDIR)/convenience_test-convenience_test.Tpo -c -o convenience_test-convenience_test.obj `if test -f 'convenience_test.cc'; then $(CYGPATH_W) 'convenience_test.cc'; else $(CYGPATH_W) '$(srcdir)/convenience_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/convenience_test-convenience_test.Tpo $(DEPDIR)/convenience_test-convenience_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/convenience_test-convenience_test.Tpo $(DEPDIR)/convenience_test-convenience_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='convenience_test.cc' object='convenience_test-convenience_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(convenience_test_CXXFLAGS) $(CXXFLAGS) -c -o convenience_test-convenience_test.obj `if test -f 'convenience_test.cc'; then $(CYGPATH_W) 'convenience_test.cc'; else $(CYGPATH_W) '$(srcdir)/convenience_test.cc'; fi`
  
  csv_file_test-csv_file_test.o: csv_file_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(csv_file_test_CXXFLAGS) $(CXXFLAGS) -MT csv_file_test-csv_file_test.o -MD -MP -MF "$(DEPDIR)/csv_file_test-csv_file_test.Tpo" -c -o csv_file_test-csv_file_test.o `test -f 'csv_file_test.cc' || echo '$(srcdir)/'`csv_file_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/csv_file_test-csv_file_test.Tpo" "$(DEPDIR)/csv_file_test-csv_file_test.Po"; else rm -f "$(DEPDIR)/csv_file_test-csv_file_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(csv_file_test_CXXFLAGS) $(CXXFLAGS) -MT csv_file_test-csv_file_test.o -MD -MP -MF $(DEPDIR)/csv_file_test-csv_file_test.Tpo -c -o csv_file_test-csv_file_test.o `test -f 'csv_file_test.cc' || echo '$(srcdir)/'`csv_file_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(csv_file_test_CXXFLAGS) $(CXXFLAGS) -MT csv_file_test-csv_file_test.o -MD -MP -MF $(DEPDIR)/csv_file_test-csv_file_test.Tpo -c -o csv_file_test-csv_file_test.o `test -f 'csv_file_test.cc' || echo '$(srcdir)/'`csv_file_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/csv_file_test-csv_file_test.Tpo $(DEPDIR)/csv_file_test-csv_file_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/csv_file_test-csv_file_test.Tpo $(DEPDIR)/csv_file_test-csv_file_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='csv_file_test.cc' object='csv_file_test-csv_file_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(csv_file_test_CXXFLAGS) $(CXXFLAGS) -c -o csv_file_test-csv_file_test.o `test -f 'csv_file_test.cc' || echo '$(srcdir)/'`csv_file_test.cc
  
  csv_file_test-csv_file_test.obj: csv_file_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(csv_file_test_CXXFLAGS) $(CXXFLAGS) -MT csv_file_test-csv_file_test.obj -MD -MP -MF "$(DEPDIR)/csv_file_test-csv_file_test.Tpo" -c -o csv_file_test-csv_file_test.obj `if test -f 'csv_file_test.cc'; then $(CYGPATH_W) 'csv_file_test.cc'; else $(CYGPATH_W) '$(srcdir)/csv_file_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/csv_file_test-csv_file_test.Tpo" "$(DEPDIR)/csv_file_test-csv_file_test.Po"; else rm -f "$(DEPDIR)/csv_file_test-csv_file_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(csv_file_test_CXXFLAGS) $(CXXFLAGS) -MT csv_file_test-csv_file_test.obj -MD -MP -MF $(DEPDIR)/csv_file_test-csv_file_test.Tpo -c -o csv_file_test-csv_file_test.obj `if test -f 'csv_file_test.cc'; then $(CYGPATH_W) 'csv_file_test.cc'; else $(CYGPATH_W) '$(srcdir)/csv_file_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(csv_file_test_CXXFLAGS) $(CXXFLAGS) -MT csv_file_test-csv_file_test.obj -MD -MP -MF $(DEPDIR)/csv_file_test-csv_file_test.Tpo -c -o csv_file_test-csv_file_test.obj `if test -f 'csv_file_test.cc'; then $(CYGPATH_W) 'csv_file_test.cc'; else $(CYGPATH_W) '$(srcdir)/csv_file_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/csv_file_test-csv_file_test.Tpo $(DEPDIR)/csv_file_test-csv_file_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/csv_file_test-csv_file_test.Tpo $(DEPDIR)/csv_file_test-csv_file_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='csv_file_test.cc' object='csv_file_test-csv_file_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(csv_file_test_CXXFLAGS) $(CXXFLAGS) -c -o csv_file_test-csv_file_test.obj `if test -f 'csv_file_test.cc'; then $(CYGPATH_W) 'csv_file_test.cc'; else $(CYGPATH_W) '$(srcdir)/csv_file_test.cc'; fi`
  
  element_counter_test-element_counter_test.o: element_counter_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(element_counter_test_CXXFLAGS) $(CXXFLAGS) -MT element_counter_test-element_counter_test.o -MD -MP -MF "$(DEPDIR)/element_counter_test-element_counter_test.Tpo" -c -o element_counter_test-element_counter_test.o `test -f 'element_counter_test.cc' || echo '$(srcdir)/'`element_counter_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/element_counter_test-element_counter_test.Tpo" "$(DEPDIR)/element_counter_test-element_counter_test.Po"; else rm -f "$(DEPDIR)/element_counter_test-element_counter_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(element_counter_test_CXXFLAGS) $(CXXFLAGS) -MT element_counter_test-element_counter_test.o -MD -MP -MF $(DEPDIR)/element_counter_test-element_counter_test.Tpo -c -o element_counter_test-element_counter_test.o `test -f 'element_counter_test.cc' || echo '$(srcdir)/'`element_counter_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(element_counter_test_CXXFLAGS) $(CXXFLAGS) -MT element_counter_test-element_counter_test.o -MD -MP -MF $(DEPDIR)/element_counter_test-element_counter_test.Tpo -c -o element_counter_test-element_counter_test.o `test -f 'element_counter_test.cc' || echo '$(srcdir)/'`element_counter_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/element_counter_test-element_counter_test.Tpo $(DEPDIR)/element_counter_test-element_counter_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/element_counter_test-element_counter_test.Tpo $(DEPDIR)/element_counter_test-element_counter_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='element_counter_test.cc' object='element_counter_test-element_counter_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(element_counter_test_CXXFLAGS) $(CXXFLAGS) -c -o element_counter_test-element_counter_test.o `test -f 'element_counter_test.cc' || echo '$(srcdir)/'`element_counter_test.cc
  
  element_counter_test-element_counter_test.obj: element_counter_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(element_counter_test_CXXFLAGS) $(CXXFLAGS) -MT element_counter_test-element_counter_test.obj -MD -MP -MF "$(DEPDIR)/element_counter_test-element_counter_test.Tpo" -c -o element_counter_test-element_counter_test.obj `if test -f 'element_counter_test.cc'; then $(CYGPATH_W) 'element_counter_test.cc'; else $(CYGPATH_W) '$(srcdir)/element_counter_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/element_counter_test-element_counter_test.Tpo" "$(DEPDIR)/element_counter_test-element_counter_test.Po"; else rm -f "$(DEPDIR)/element_counter_test-element_counter_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(element_counter_test_CXXFLAGS) $(CXXFLAGS) -MT element_counter_test-element_counter_test.obj -MD -MP -MF $(DEPDIR)/element_counter_test-element_counter_test.Tpo -c -o element_counter_test-element_counter_test.obj `if test -f 'element_counter_test.cc'; then $(CYGPATH_W) 'element_counter_test.cc'; else $(CYGPATH_W) '$(srcdir)/element_counter_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(element_counter_test_CXXFLAGS) $(CXXFLAGS) -MT element_counter_test-element_counter_test.obj -MD -MP -MF $(DEPDIR)/element_counter_test-element_counter_test.Tpo -c -o element_counter_test-element_counter_test.obj `if test -f 'element_counter_test.cc'; then $(CYGPATH_W) 'element_counter_test.cc'; else $(CYGPATH_W) '$(srcdir)/element_counter_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/element_counter_test-element_counter_test.Tpo $(DEPDIR)/element_counter_test-element_counter_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/element_counter_test-element_counter_test.Tpo $(DEPDIR)/element_counter_test-element_counter_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='element_counter_test.cc' object='element_counter_test-element_counter_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(element_counter_test_CXXFLAGS) $(CXXFLAGS) -c -o element_counter_test-element_counter_test.obj `if test -f 'element_counter_test.cc'; then $(CYGPATH_W) 'element_counter_test.cc'; else $(CYGPATH_W) '$(srcdir)/element_counter_test.cc'; fi`
  
  feature_list_test-feature_list_test.o: feature_list_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(feature_list_test_CXXFLAGS) $(CXXFLAGS) -MT feature_list_test-feature_list_test.o -MD -MP -MF "$(DEPDIR)/feature_list_test-feature_list_test.Tpo" -c -o feature_list_test-feature_list_test.o `test -f 'feature_list_test.cc' || echo '$(srcdir)/'`feature_list_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/feature_list_test-feature_list_test.Tpo" "$(DEPDIR)/feature_list_test-feature_list_test.Po"; else rm -f "$(DEPDIR)/feature_list_test-feature_list_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(feature_list_test_CXXFLAGS) $(CXXFLAGS) -MT feature_list_test-feature_list_test.o -MD -MP -MF $(DEPDIR)/feature_list_test-feature_list_test.Tpo -c -o feature_list_test-feature_list_test.o `test -f 'feature_list_test.cc' || echo '$(srcdir)/'`feature_list_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(feature_list_test_CXXFLAGS) $(CXXFLAGS) -MT feature_list_test-feature_list_test.o -MD -MP -MF $(DEPDIR)/feature_list_test-feature_list_test.Tpo -c -o feature_list_test-feature_list_test.o `test -f 'feature_list_test.cc' || echo '$(srcdir)/'`feature_list_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/feature_list_test-feature_list_test.Tpo $(DEPDIR)/feature_list_test-feature_list_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/feature_list_test-feature_list_test.Tpo $(DEPDIR)/feature_list_test-feature_list_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='feature_list_test.cc' object='feature_list_test-feature_list_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(feature_list_test_CXXFLAGS) $(CXXFLAGS) -c -o feature_list_test-feature_list_test.o `test -f 'feature_list_test.cc' || echo '$(srcdir)/'`feature_list_test.cc
  
  feature_list_test-feature_list_test.obj: feature_list_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(feature_list_test_CXXFLAGS) $(CXXFLAGS) -MT feature_list_test-feature_list_test.obj -MD -MP -MF "$(DEPDIR)/feature_list_test-feature_list_test.Tpo" -c -o feature_list_test-feature_list_test.obj `if test -f 'feature_list_test.cc'; then $(CYGPATH_W) 'feature_list_test.cc'; else $(CYGPATH_W) '$(srcdir)/feature_list_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/feature_list_test-feature_list_test.Tpo" "$(DEPDIR)/feature_list_test-feature_list_test.Po"; else rm -f "$(DEPDIR)/feature_list_test-feature_list_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(feature_list_test_CXXFLAGS) $(CXXFLAGS) -MT feature_list_test-feature_list_test.obj -MD -MP -MF $(DEPDIR)/feature_list_test-feature_list_test.Tpo -c -o feature_list_test-feature_list_test.obj `if test -f 'feature_list_test.cc'; then $(CYGPATH_W) 'feature_list_test.cc'; else $(CYGPATH_W) '$(srcdir)/feature_list_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(feature_list_test_CXXFLAGS) $(CXXFLAGS) -MT feature_list_test-feature_list_test.obj -MD -MP -MF $(DEPDIR)/feature_list_test-feature_list_test.Tpo -c -o feature_list_test-feature_list_test.obj `if test -f 'feature_list_test.cc'; then $(CYGPATH_W) 'feature_list_test.cc'; else $(CYGPATH_W) '$(srcdir)/feature_list_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/feature_list_test-feature_list_test.Tpo $(DEPDIR)/feature_list_test-feature_list_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/feature_list_test-feature_list_test.Tpo $(DEPDIR)/feature_list_test-feature_list_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='feature_list_test.cc' object='feature_list_test-feature_list_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(feature_list_test_CXXFLAGS) $(CXXFLAGS) -c -o feature_list_test-feature_list_test.obj `if test -f 'feature_list_test.cc'; then $(CYGPATH_W) 'feature_list_test.cc'; else $(CYGPATH_W) '$(srcdir)/feature_list_test.cc'; fi`
  
+ google_maps_data_test-google_maps_data_test.o: google_maps_data_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(google_maps_data_test_CXXFLAGS) $(CXXFLAGS) -MT google_maps_data_test-google_maps_data_test.o -MD -MP -MF $(DEPDIR)/google_maps_data_test-google_maps_data_test.Tpo -c -o google_maps_data_test-google_maps_data_test.o `test -f 'google_maps_data_test.cc' || echo '$(srcdir)/'`google_maps_data_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/google_maps_data_test-google_maps_data_test.Tpo $(DEPDIR)/google_maps_data_test-google_maps_data_test.Po
++ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/google_maps_data_test-google_maps_data_test.Tpo $(DEPDIR)/google_maps_data_test-google_maps_data_test.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='google_maps_data_test.cc' object='google_maps_data_test-google_maps_data_test.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(google_maps_data_test_CXXFLAGS) $(CXXFLAGS) -c -o google_maps_data_test-google_maps_data_test.o `test -f 'google_maps_data_test.cc' || echo '$(srcdir)/'`google_maps_data_test.cc
+ 
+ google_maps_data_test-google_maps_data_test.obj: google_maps_data_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(google_maps_data_test_CXXFLAGS) $(CXXFLAGS) -MT google_maps_data_test-google_maps_data_test.obj -MD -MP -MF $(DEPDIR)/google_maps_data_test-google_maps_data_test.Tpo -c -o google_maps_data_test-google_maps_data_test.obj `if test -f 'google_maps_data_test.cc'; then $(CYGPATH_W) 'google_maps_data_test.cc'; else $(CYGPATH_W) '$(srcdir)/google_maps_data_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/google_maps_data_test-google_maps_data_test.Tpo $(DEPDIR)/google_maps_data_test-google_maps_data_test.Po
++ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/google_maps_data_test-google_maps_data_test.Tpo $(DEPDIR)/google_maps_data_test-google_maps_data_test.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='google_maps_data_test.cc' object='google_maps_data_test-google_maps_data_test.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(google_maps_data_test_CXXFLAGS) $(CXXFLAGS) -c -o google_maps_data_test-google_maps_data_test.obj `if test -f 'google_maps_data_test.cc'; then $(CYGPATH_W) 'google_maps_data_test.cc'; else $(CYGPATH_W) '$(srcdir)/google_maps_data_test.cc'; fi`
+ 
+ google_spreadsheets_test-google_spreadsheets_test.o: google_spreadsheets_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(google_spreadsheets_test_CXXFLAGS) $(CXXFLAGS) -MT google_spreadsheets_test-google_spreadsheets_test.o -MD -MP -MF $(DEPDIR)/google_spreadsheets_test-google_spreadsheets_test.Tpo -c -o google_spreadsheets_test-google_spreadsheets_test.o `test -f 'google_spreadsheets_test.cc' || echo '$(srcdir)/'`google_spreadsheets_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/google_spreadsheets_test-google_spreadsheets_test.Tpo $(DEPDIR)/google_spreadsheets_test-google_spreadsheets_test.Po
++ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/google_spreadsheets_test-google_spreadsheets_test.Tpo $(DEPDIR)/google_spreadsheets_test-google_spreadsheets_test.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='google_spreadsheets_test.cc' object='google_spreadsheets_test-google_spreadsheets_test.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(google_spreadsheets_test_CXXFLAGS) $(CXXFLAGS) -c -o google_spreadsheets_test-google_spreadsheets_test.o `test -f 'google_spreadsheets_test.cc' || echo '$(srcdir)/'`google_spreadsheets_test.cc
+ 
+ google_spreadsheets_test-google_spreadsheets_test.obj: google_spreadsheets_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(google_spreadsheets_test_CXXFLAGS) $(CXXFLAGS) -MT google_spreadsheets_test-google_spreadsheets_test.obj -MD -MP -MF $(DEPDIR)/google_spreadsheets_test-google_spreadsheets_test.Tpo -c -o google_spreadsheets_test-google_spreadsheets_test.obj `if test -f 'google_spreadsheets_test.cc'; then $(CYGPATH_W) 'google_spreadsheets_test.cc'; else $(CYGPATH_W) '$(srcdir)/google_spreadsheets_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/google_spreadsheets_test-google_spreadsheets_test.Tpo $(DEPDIR)/google_spreadsheets_test-google_spreadsheets_test.Po
++ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/google_spreadsheets_test-google_spreadsheets_test.Tpo $(DEPDIR)/google_spreadsheets_test-google_spreadsheets_test.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='google_spreadsheets_test.cc' object='google_spreadsheets_test-google_spreadsheets_test.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(google_spreadsheets_test_CXXFLAGS) $(CXXFLAGS) -c -o google_spreadsheets_test-google_spreadsheets_test.obj `if test -f 'google_spreadsheets_test.cc'; then $(CYGPATH_W) 'google_spreadsheets_test.cc'; else $(CYGPATH_W) '$(srcdir)/google_spreadsheets_test.cc'; fi`
+ 
  gpx_trk_pt_handler_test-gpx_trk_pt_handler_test.o: gpx_trk_pt_handler_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpx_trk_pt_handler_test_CXXFLAGS) $(CXXFLAGS) -MT gpx_trk_pt_handler_test-gpx_trk_pt_handler_test.o -MD -MP -MF "$(DEPDIR)/gpx_trk_pt_handler_test-gpx_trk_pt_handler_test.Tpo" -c -o gpx_trk_pt_handler_test-gpx_trk_pt_handler_test.o `test -f 'gpx_trk_pt_handler_test.cc' || echo '$(srcdir)/'`gpx_trk_pt_handler_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/gpx_trk_pt_handler_test-gpx_trk_pt_handler_test.Tpo" "$(DEPDIR)/gpx_trk_pt_handler_test-gpx_trk_pt_handler_test.Po"; else rm -f "$(DEPDIR)/gpx_trk_pt_handler_test-gpx_trk_pt_handler_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpx_trk_pt_handler_test_CXXFLAGS) $(CXXFLAGS) -MT gpx_trk_pt_handler_test-gpx_trk_pt_handler_test.o -MD -MP -MF $(DEPDIR)/gpx_trk_pt_handler_test-gpx_trk_pt_handler_test.Tpo -c -o gpx_trk_pt_handler_test-gpx_trk_pt_handler_test.o `test -f 'gpx_trk_pt_handler_test.cc' || echo '$(srcdir)/'`gpx_trk_pt_handler_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpx_trk_pt_handler_test_CXXFLAGS) $(CXXFLAGS) -MT gpx_trk_pt_handler_test-gpx_trk_pt_handler_test.o -MD -MP -MF $(DEPDIR)/gpx_trk_pt_handler_test-gpx_trk_pt_handler_test.Tpo -c -o gpx_trk_pt_handler_test-gpx_trk_pt_handler_test.o `test -f 'gpx_trk_pt_handler_test.cc' || echo '$(srcdir)/'`gpx_trk_pt_handler_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/gpx_trk_pt_handler_test-gpx_trk_pt_handler_test.Tpo $(DEPDIR)/gpx_trk_pt_handler_test-gpx_trk_pt_handler_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/gpx_trk_pt_handler_test-gpx_trk_pt_handler_test.Tpo $(DEPDIR)/gpx_trk_pt_handler_test-gpx_trk_pt_handler_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gpx_trk_pt_handler_test.cc' object='gpx_trk_pt_handler_test-gpx_trk_pt_handler_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpx_trk_pt_handler_test_CXXFLAGS) $(CXXFLAGS) -c -o gpx_trk_pt_handler_test-gpx_trk_pt_handler_test.o `test -f 'gpx_trk_pt_handler_test.cc' || echo '$(srcdir)/'`gpx_trk_pt_handler_test.cc
  
  gpx_trk_pt_handler_test-gpx_trk_pt_handler_test.obj: gpx_trk_pt_handler_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpx_trk_pt_handler_test_CXXFLAGS) $(CXXFLAGS) -MT gpx_trk_pt_handler_test-gpx_trk_pt_handler_test.obj -MD -MP -MF "$(DEPDIR)/gpx_trk_pt_handler_test-gpx_trk_pt_handler_test.Tpo" -c -o gpx_trk_pt_handler_test-gpx_trk_pt_handler_test.obj `if test -f 'gpx_trk_pt_handler_test.cc'; then $(CYGPATH_W) 'gpx_trk_pt_handler_test.cc'; else $(CYGPATH_W) '$(srcdir)/gpx_trk_pt_handler_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/gpx_trk_pt_handler_test-gpx_trk_pt_handler_test.Tpo" "$(DEPDIR)/gpx_trk_pt_handler_test-gpx_trk_pt_handler_test.Po"; else rm -f "$(DEPDIR)/gpx_trk_pt_handler_test-gpx_trk_pt_handler_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpx_trk_pt_handler_test_CXXFLAGS) $(CXXFLAGS) -MT gpx_trk_pt_handler_test-gpx_trk_pt_handler_test.obj -MD -MP -MF $(DEPDIR)/gpx_trk_pt_handler_test-gpx_trk_pt_handler_test.Tpo -c -o gpx_trk_pt_handler_test-gpx_trk_pt_handler_test.obj `if test -f 'gpx_trk_pt_handler_test.cc'; then $(CYGPATH_W) 'gpx_trk_pt_handler_test.cc'; else $(CYGPATH_W) '$(srcdir)/gpx_trk_pt_handler_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpx_trk_pt_handler_test_CXXFLAGS) $(CXXFLAGS) -MT gpx_trk_pt_handler_test-gpx_trk_pt_handler_test.obj -MD -MP -MF $(DEPDIR)/gpx_trk_pt_handler_test-gpx_trk_pt_handler_test.Tpo -c -o gpx_trk_pt_handler_test-gpx_trk_pt_handler_test.obj `if test -f 'gpx_trk_pt_handler_test.cc'; then $(CYGPATH_W) 'gpx_trk_pt_handler_test.cc'; else $(CYGPATH_W) '$(srcdir)/gpx_trk_pt_handler_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/gpx_trk_pt_handler_test-gpx_trk_pt_handler_test.Tpo $(DEPDIR)/gpx_trk_pt_handler_test-gpx_trk_pt_handler_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/gpx_trk_pt_handler_test-gpx_trk_pt_handler_test.Tpo $(DEPDIR)/gpx_trk_pt_handler_test-gpx_trk_pt_handler_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gpx_trk_pt_handler_test.cc' object='gpx_trk_pt_handler_test-gpx_trk_pt_handler_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gpx_trk_pt_handler_test_CXXFLAGS) $(CXXFLAGS) -c -o gpx_trk_pt_handler_test-gpx_trk_pt_handler_test.obj `if test -f 'gpx_trk_pt_handler_test.cc'; then $(CYGPATH_W) 'gpx_trk_pt_handler_test.cc'; else $(CYGPATH_W) '$(srcdir)/gpx_trk_pt_handler_test.cc'; fi`
  
+ http_client_test-http_client_test.o: http_client_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(http_client_test_CXXFLAGS) $(CXXFLAGS) -MT http_client_test-http_client_test.o -MD -MP -MF $(DEPDIR)/http_client_test-http_client_test.Tpo -c -o http_client_test-http_client_test.o `test -f 'http_client_test.cc' || echo '$(srcdir)/'`http_client_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/http_client_test-http_client_test.Tpo $(DEPDIR)/http_client_test-http_client_test.Po
++ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/http_client_test-http_client_test.Tpo $(DEPDIR)/http_client_test-http_client_test.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='http_client_test.cc' object='http_client_test-http_client_test.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(http_client_test_CXXFLAGS) $(CXXFLAGS) -c -o http_client_test-http_client_test.o `test -f 'http_client_test.cc' || echo '$(srcdir)/'`http_client_test.cc
+ 
+ http_client_test-http_client_test.obj: http_client_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(http_client_test_CXXFLAGS) $(CXXFLAGS) -MT http_client_test-http_client_test.obj -MD -MP -MF $(DEPDIR)/http_client_test-http_client_test.Tpo -c -o http_client_test-http_client_test.obj `if test -f 'http_client_test.cc'; then $(CYGPATH_W) 'http_client_test.cc'; else $(CYGPATH_W) '$(srcdir)/http_client_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/http_client_test-http_client_test.Tpo $(DEPDIR)/http_client_test-http_client_test.Po
++ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/http_client_test-http_client_test.Tpo $(DEPDIR)/http_client_test-http_client_test.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='http_client_test.cc' object='http_client_test-http_client_test.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(http_client_test_CXXFLAGS) $(CXXFLAGS) -c -o http_client_test-http_client_test.obj `if test -f 'http_client_test.cc'; then $(CYGPATH_W) 'http_client_test.cc'; else $(CYGPATH_W) '$(srcdir)/http_client_test.cc'; fi`
+ 
  kmz_check_links_test-kmz_check_links_test.o: kmz_check_links_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kmz_check_links_test_CXXFLAGS) $(CXXFLAGS) -MT kmz_check_links_test-kmz_check_links_test.o -MD -MP -MF "$(DEPDIR)/kmz_check_links_test-kmz_check_links_test.Tpo" -c -o kmz_check_links_test-kmz_check_links_test.o `test -f 'kmz_check_links_test.cc' || echo '$(srcdir)/'`kmz_check_links_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/kmz_check_links_test-kmz_check_links_test.Tpo" "$(DEPDIR)/kmz_check_links_test-kmz_check_links_test.Po"; else rm -f "$(DEPDIR)/kmz_check_links_test-kmz_check_links_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kmz_check_links_test_CXXFLAGS) $(CXXFLAGS) -MT kmz_check_links_test-kmz_check_links_test.o -MD -MP -MF $(DEPDIR)/kmz_check_links_test-kmz_check_links_test.Tpo -c -o kmz_check_links_test-kmz_check_links_test.o `test -f 'kmz_check_links_test.cc' || echo '$(srcdir)/'`kmz_check_links_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kmz_check_links_test_CXXFLAGS) $(CXXFLAGS) -MT kmz_check_links_test-kmz_check_links_test.o -MD -MP -MF $(DEPDIR)/kmz_check_links_test-kmz_check_links_test.Tpo -c -o kmz_check_links_test-kmz_check_links_test.o `test -f 'kmz_check_links_test.cc' || echo '$(srcdir)/'`kmz_check_links_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/kmz_check_links_test-kmz_check_links_test.Tpo $(DEPDIR)/kmz_check_links_test-kmz_check_links_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/kmz_check_links_test-kmz_check_links_test.Tpo $(DEPDIR)/kmz_check_links_test-kmz_check_links_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='kmz_check_links_test.cc' object='kmz_check_links_test-kmz_check_links_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kmz_check_links_test_CXXFLAGS) $(CXXFLAGS) -c -o kmz_check_links_test-kmz_check_links_test.o `test -f 'kmz_check_links_test.cc' || echo '$(srcdir)/'`kmz_check_links_test.cc
  
  kmz_check_links_test-kmz_check_links_test.obj: kmz_check_links_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kmz_check_links_test_CXXFLAGS) $(CXXFLAGS) -MT kmz_check_links_test-kmz_check_links_test.obj -MD -MP -MF "$(DEPDIR)/kmz_check_links_test-kmz_check_links_test.Tpo" -c -o kmz_check_links_test-kmz_check_links_test.obj `if test -f 'kmz_check_links_test.cc'; then $(CYGPATH_W) 'kmz_check_links_test.cc'; else $(CYGPATH_W) '$(srcdir)/kmz_check_links_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/kmz_check_links_test-kmz_check_links_test.Tpo" "$(DEPDIR)/kmz_check_links_test-kmz_check_links_test.Po"; else rm -f "$(DEPDIR)/kmz_check_links_test-kmz_check_links_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kmz_check_links_test_CXXFLAGS) $(CXXFLAGS) -MT kmz_check_links_test-kmz_check_links_test.obj -MD -MP -MF $(DEPDIR)/kmz_check_links_test-kmz_check_links_test.Tpo -c -o kmz_check_links_test-kmz_check_links_test.obj `if test -f 'kmz_check_links_test.cc'; then $(CYGPATH_W) 'kmz_check_links_test.cc'; else $(CYGPATH_W) '$(srcdir)/kmz_check_links_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kmz_check_links_test_CXXFLAGS) $(CXXFLAGS) -MT kmz_check_links_test-kmz_check_links_test.obj -MD -MP -MF $(DEPDIR)/kmz_check_links_test-kmz_check_links_test.Tpo -c -o kmz_check_links_test-kmz_check_links_test.obj `if test -f 'kmz_check_links_test.cc'; then $(CYGPATH_W) 'kmz_check_links_test.cc'; else $(CYGPATH_W) '$(srcdir)/kmz_check_links_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/kmz_check_links_test-kmz_check_links_test.Tpo $(DEPDIR)/kmz_check_links_test-kmz_check_links_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/kmz_check_links_test-kmz_check_links_test.Tpo $(DEPDIR)/kmz_check_links_test-kmz_check_links_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='kmz_check_links_test.cc' object='kmz_check_links_test-kmz_check_links_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kmz_check_links_test_CXXFLAGS) $(CXXFLAGS) -c -o kmz_check_links_test-kmz_check_links_test.obj `if test -f 'kmz_check_links_test.cc'; then $(CYGPATH_W) 'kmz_check_links_test.cc'; else $(CYGPATH_W) '$(srcdir)/kmz_check_links_test.cc'; fi`
-@@ -598,72 +655,75 @@
- 
- clean-libtool:
- 	-rm -rf .libs _libs
--
--distclean-libtool:
--	-rm -f libtool
--uninstall-info-am:
+@@ -762,20 +789,23 @@
  install-libkmlconvenienceincludeHEADERS: $(libkmlconvenienceinclude_HEADERS)
  	@$(NORMAL_INSTALL)
--	test -z "$(libkmlconvenienceincludedir)" || $(mkdir_p) "$(DESTDIR)$(libkmlconvenienceincludedir)"
+ 	test -z "$(libkmlconvenienceincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libkmlconvenienceincludedir)"
 -	@list='$(libkmlconvenienceinclude_HEADERS)'; for p in $$list; do \
-+	test -z "$(libkmlconvenienceincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libkmlconvenienceincludedir)"
 +	@list='$(libkmlconvenienceinclude_HEADERS)'; test -n "$(libkmlconvenienceincludedir)" || list=; \
 +	for p in $$list; do \
  	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
@@ -77054,15 +19193,7 @@
  
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- 	unique=`for i in $$list; do \
- 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- 	  done | \
--	  $(AWK) '    { files[$$0] = 1; } \
--	       END { for (i in files) print i; }'`; \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
- 	mkid -fID $$unique
- tags: TAGS
+@@ -789,7 +819,7 @@
  
  TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
@@ -77071,13 +19202,11 @@
  	here=`pwd`; \
  	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
- 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+@@ -797,29 +827,34 @@
  	  done | \
--	  $(AWK) '    { files[$$0] = 1; } \
--	       END { for (i in files) print i; }'`; \
+ 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 -	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 +	shift; \
 +	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
  	  test -n "$$unique" || unique=$$empty_fix; \
@@ -77095,16 +19224,13 @@
  CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
 -	tags=; \
--	here=`pwd`; \
  	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  	  done | \
--	  $(AWK) '    { files[$$0] = 1; } \
--	       END { for (i in files) print i; }'`; \
+ 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 -	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 +	test -z "$(CTAGS_ARGS)$$unique" \
  	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 -	     $$tags $$unique
@@ -77119,22 +19245,16 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-@@ -671,7 +731,8 @@
- check-TESTS: $(TESTS)
+@@ -828,6 +863,7 @@
  	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
  	srcdir=$(srcdir); export srcdir; \
--	list='$(TESTS)'; \
-+	list=' $(TESTS) '; \
+ 	list=' $(TESTS) '; \
 +	$(am__tty_colors); \
  	if test -n "$$list"; then \
  	  for tst in $$list; do \
  	    if test -f ./$$tst; then dir=./; \
-@@ -680,49 +741,63 @@
- 	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *" $$tst "*) \
-+	      *[\ \	]$$tst[\ \	]*) \
+@@ -839,10 +875,10 @@
+ 	      *[\ \	]$$tst[\ \	]*) \
  		xpass=`expr $$xpass + 1`; \
  		failed=`expr $$failed + 1`; \
 -		echo "XPASS: $$tst"; \
@@ -77146,10 +19266,9 @@
  	      ;; \
  	      esac; \
  	    elif test $$? -ne 77; then \
- 	      all=`expr $$all + 1`; \
+@@ -850,17 +886,18 @@
  	      case " $(XFAIL_TESTS) " in \
--	      *" $$tst "*) \
-+	      *[\ \	]$$tst[\ \	]*) \
+ 	      *[\ \	]$$tst[\ \	]*) \
  		xfail=`expr $$xfail + 1`; \
 -		echo "XFAIL: $$tst"; \
 +		col=$$lgn; res=XFAIL; \
@@ -77167,45 +19286,9 @@
  	    fi; \
 +	    echo "$${col}$$res$${std}: $$tst"; \
  	  done; \
-+	  if test "$$all" -eq 1; then \
-+	    tests="test"; \
-+	    All=""; \
-+	  else \
-+	    tests="tests"; \
-+	    All="All "; \
-+	  fi; \
- 	  if test "$$failed" -eq 0; then \
- 	    if test "$$xfail" -eq 0; then \
--	      banner="All $$all tests passed"; \
-+	      banner="$$All$$all $$tests passed"; \
- 	    else \
--	      banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
-+	      if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
-+	      banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
- 	    fi; \
- 	  else \
- 	    if test "$$xpass" -eq 0; then \
--	      banner="$$failed of $$all tests failed"; \
-+	      banner="$$failed of $$all $$tests failed"; \
- 	    else \
--	      banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
-+	      if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
-+	      banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
- 	    fi; \
- 	  fi; \
- 	  dashes="$$banner"; \
- 	  skipped=""; \
- 	  if test "$$skip" -ne 0; then \
--	    skipped="($$skip tests were not run)"; \
-+	    if test "$$skip" -eq 1; then \
-+	      skipped="($$skip test was not run)"; \
-+	    else \
-+	      skipped="($$skip tests were not run)"; \
-+	    fi; \
- 	    test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
- 	      dashes="$$skipped"; \
- 	  fi; \
-@@ -733,38 +808,45 @@
+ 	  if test "$$all" -eq 1; then \
+ 	    tests="test"; \
+@@ -902,11 +939,15 @@
  	      dashes="$$report"; \
  	  fi; \
  	  dashes=`echo "$$dashes" | sed s/./=/g`; \
@@ -77223,36 +19306,10 @@
  	  test "$$failed" -eq 0; \
  	else :; fi
  
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
--	list='$(DISTFILES)'; for file in $$list; do \
--	  case $$file in \
--	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
--	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
--	  esac; \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
+@@ -926,13 +967,17 @@
  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
--	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
--	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
--	    dir="/$$dir"; \
--	    $(mkdir_p) "$(distdir)$$dir"; \
--	  else \
--	    dir=''; \
--	  fi; \
  	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 +	    if test -d "$(distdir)/$$file"; then \
 +	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 +	    fi; \
@@ -77271,16 +19328,7 @@
  	    || exit 1; \
  	  fi; \
  	done
-@@ -775,7 +857,7 @@
- all-am: Makefile $(LTLIBRARIES) $(HEADERS)
- installdirs:
- 	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libkmlconvenienceincludedir)"; do \
--	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- 	done
- install: install-am
- install-exec: install-exec-am
-@@ -798,6 +880,7 @@
+@@ -966,6 +1011,7 @@
  
  distclean-generic:
  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -77288,17 +19336,8 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -811,7 +894,7 @@
- 	-rm -rf ./$(DEPDIR)
- 	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
--	distclean-libtool distclean-tags
-+	distclean-tags
+@@ -987,6 +1033,8 @@
  
- dvi: dvi-am
- 
-@@ -819,18 +902,38 @@
- 
  html: html-am
  
 +html-am:
@@ -77306,17 +19345,16 @@
  info: info-am
  
  info-am:
+@@ -995,18 +1043,28 @@
  
- install-data-am: install-libkmlconvenienceincludeHEADERS
+ install-dvi: install-dvi-am
  
-+install-dvi: install-dvi-am
-+
 +install-dvi-am:
 +
  install-exec-am: install-libLTLIBRARIES
  
-+install-html: install-html-am
-+
+ install-html: install-html-am
+ 
 +install-html-am:
 +
  install-info: install-info-am
@@ -77325,124 +19363,62 @@
 +
  install-man:
  
-+install-pdf: install-pdf-am
-+
+ install-pdf: install-pdf-am
+ 
 +install-pdf-am:
 +
-+install-ps: install-ps-am
-+
+ install-ps: install-ps-am
+ 
 +install-ps-am:
 +
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
-@@ -851,24 +954,29 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
-+uninstall-am: uninstall-libLTLIBRARIES \
+@@ -1030,7 +1088,7 @@
+ uninstall-am: uninstall-libLTLIBRARIES \
  	uninstall-libkmlconvenienceincludeHEADERS
  
+-.MAKE: install-am install-strip
 +.MAKE: check-am install-am install-strip
-+
+ 
  .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
  	clean-checkPROGRAMS clean-generic clean-libLTLIBRARIES \
- 	clean-libtool ctags distclean distclean-compile \
- 	distclean-generic distclean-libtool distclean-tags distdir dvi \
- 	dvi-am html html-am info info-am install install-am \
--	install-data install-data-am install-exec install-exec-am \
-+	install-data install-data-am install-dvi install-dvi-am \
-+	install-exec install-exec-am install-html install-html-am \
- 	install-info install-info-am install-libLTLIBRARIES \
- 	install-libkmlconvenienceincludeHEADERS install-man \
-+	install-pdf install-pdf-am install-ps install-ps-am \
- 	install-strip installcheck installcheck-am installdirs \
- 	maintainer-clean maintainer-clean-generic mostlyclean \
- 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
- 	pdf pdf-am ps ps-am tags uninstall uninstall-am \
--	uninstall-info-am uninstall-libLTLIBRARIES \
-+	uninstall-libLTLIBRARIES \
+@@ -1049,6 +1107,7 @@
+ 	uninstall-libLTLIBRARIES \
  	uninstall-libkmlconvenienceincludeHEADERS
  
 +
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
-Index: libkml-1.0.1/src/kml/dom/Makefile.in
+Index: libkml-1.1.0/src/kml/dom/Makefile.in
 ===================================================================
---- libkml-1.0.1.orig/src/kml/dom/Makefile.in	2009-07-03 01:23:32.000000000 +0200
-+++ libkml-1.0.1/src/kml/dom/Makefile.in	2009-12-10 10:19:46.000000000 +0100
+--- libkml-1.1.0.orig/src/kml/dom/Makefile.in	2009-12-10 13:05:40.000000000 +0100
++++ libkml-1.1.0/src/kml/dom/Makefile.in	2009-12-10 17:29:37.000000000 +0100
 @@ -1,8 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
+-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
-@@ -15,15 +16,12 @@
- @SET_MAKE@
+@@ -17,8 +18,9 @@
  
- 
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
  VPATH = @srcdir@
  pkgdatadir = $(datadir)/@PACKAGE@
 -pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../../..
 +pkglibdir = $(libdir)/@PACKAGE@
 +pkglibexecdir = $(libexecdir)/@PACKAGE@
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -37,27 +35,68 @@
- POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
-+TESTS = abstractlatlonbox_test$(EXEEXT) abstractview_test$(EXEEXT) \
-+	atom_test$(EXEEXT) balloonstyle_test$(EXEEXT) \
-+	colorstyle_test$(EXEEXT) container_test$(EXEEXT) \
-+	document_test$(EXEEXT) element_test$(EXEEXT) \
-+	extendeddata_test$(EXEEXT) feature_test$(EXEEXT) \
-+	folder_test$(EXEEXT) geometry_test$(EXEEXT) \
-+	hotspot_test$(EXEEXT) iconstyle_test$(EXEEXT) \
-+	kml_cast_test$(EXEEXT) kml_test$(EXEEXT) \
-+	kml_factory_test$(EXEEXT) kml22_test$(EXEEXT) \
-+	labelstyle_test$(EXEEXT) linestyle_test$(EXEEXT) \
-+	link_test$(EXEEXT) liststyle_test$(EXEEXT) model_test$(EXEEXT) \
-+	networklink_test$(EXEEXT) networklinkcontrol_test$(EXEEXT) \
-+	object_test$(EXEEXT) overlay_test$(EXEEXT) \
-+	placemark_test$(EXEEXT) polystyle_test$(EXEEXT) \
-+	region_test$(EXEEXT) round_trip_test$(EXEEXT) \
-+	schema_test$(EXEEXT) snippet_test$(EXEEXT) style_test$(EXEEXT) \
-+	stylemap_test$(EXEEXT) styleselector_test$(EXEEXT) \
-+	substyle_test$(EXEEXT) timeprimitive_test$(EXEEXT) \
-+	vec2_test$(EXEEXT) unknown_test$(EXEEXT) \
-+	kml_handler_test$(EXEEXT) kml_handler_ns_test$(EXEEXT) \
-+	parser_test$(EXEEXT) serializer_test$(EXEEXT) \
-+	gx_timeprimitive_test$(EXEEXT) gx_tour_test$(EXEEXT) \
-+	xal_test$(EXEEXT) xml_serializer_test$(EXEEXT) \
-+	xsd_test$(EXEEXT)
- check_PROGRAMS = $(am__EXEEXT_1)
- subdir = src/kml/dom
- DIST_COMMON = $(libkmldominclude_HEADERS) $(srcdir)/Makefile.am \
- 	$(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_curl.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)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
+@@ -71,15 +73,30 @@
  mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
@@ -77475,460 +19451,15 @@
  LTLIBRARIES = $(lib_LTLIBRARIES)
  libkmldom_la_LIBADD =
  am_libkmldom_la_OBJECTS = abstractlatlonbox.lo abstractview.lo atom.lo \
-@@ -103,151 +142,250 @@
- abstractlatlonbox_test_DEPENDENCIES = libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+abstractlatlonbox_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-+	$(abstractlatlonbox_test_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- am_abstractview_test_OBJECTS =  \
- 	abstractview_test-abstractview_test.$(OBJEXT)
- abstractview_test_OBJECTS = $(am_abstractview_test_OBJECTS)
- abstractview_test_DEPENDENCIES = libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+abstractview_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-+	$(abstractview_test_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- am_atom_test_OBJECTS = atom_test-atom_test.$(OBJEXT)
- atom_test_OBJECTS = $(am_atom_test_OBJECTS)
- atom_test_DEPENDENCIES = libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+atom_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(atom_test_CXXFLAGS) \
-+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- am_balloonstyle_test_OBJECTS =  \
- 	balloonstyle_test-balloonstyle_test.$(OBJEXT)
- balloonstyle_test_OBJECTS = $(am_balloonstyle_test_OBJECTS)
- balloonstyle_test_DEPENDENCIES = libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+balloonstyle_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-+	$(balloonstyle_test_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- am_colorstyle_test_OBJECTS =  \
- 	colorstyle_test-colorstyle_test.$(OBJEXT)
- colorstyle_test_OBJECTS = $(am_colorstyle_test_OBJECTS)
- colorstyle_test_DEPENDENCIES = libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+colorstyle_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-+	$(colorstyle_test_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- am_container_test_OBJECTS = container_test-container_test.$(OBJEXT)
- container_test_OBJECTS = $(am_container_test_OBJECTS)
- container_test_DEPENDENCIES = libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+container_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-+	$(container_test_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- am_document_test_OBJECTS = document_test-document_test.$(OBJEXT)
- document_test_OBJECTS = $(am_document_test_OBJECTS)
- document_test_DEPENDENCIES = libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+document_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(document_test_CXXFLAGS) \
-+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- am_element_test_OBJECTS = element_test-element_test.$(OBJEXT)
- element_test_OBJECTS = $(am_element_test_OBJECTS)
- element_test_DEPENDENCIES = libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+element_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(element_test_CXXFLAGS) \
-+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- am_extendeddata_test_OBJECTS =  \
- 	extendeddata_test-extendeddata_test.$(OBJEXT)
- extendeddata_test_OBJECTS = $(am_extendeddata_test_OBJECTS)
- extendeddata_test_DEPENDENCIES = libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+extendeddata_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-+	$(extendeddata_test_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- am_feature_test_OBJECTS = feature_test-feature_test.$(OBJEXT)
- feature_test_OBJECTS = $(am_feature_test_OBJECTS)
- feature_test_DEPENDENCIES = libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+feature_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(feature_test_CXXFLAGS) \
-+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- am_folder_test_OBJECTS = folder_test-folder_test.$(OBJEXT)
- folder_test_OBJECTS = $(am_folder_test_OBJECTS)
- folder_test_DEPENDENCIES = libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+folder_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(folder_test_CXXFLAGS) \
-+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- am_geometry_test_OBJECTS = geometry_test-geometry_test.$(OBJEXT)
- geometry_test_OBJECTS = $(am_geometry_test_OBJECTS)
- geometry_test_DEPENDENCIES = libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+geometry_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(geometry_test_CXXFLAGS) \
-+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- am_gx_timeprimitive_test_OBJECTS =  \
- 	gx_timeprimitive_test-gx_timeprimitive_test.$(OBJEXT)
- gx_timeprimitive_test_OBJECTS = $(am_gx_timeprimitive_test_OBJECTS)
- gx_timeprimitive_test_DEPENDENCIES = libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+gx_timeprimitive_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-+	$(gx_timeprimitive_test_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- am_gx_tour_test_OBJECTS = gx_tour_test-gx_tour_test.$(OBJEXT)
- gx_tour_test_OBJECTS = $(am_gx_tour_test_OBJECTS)
- gx_tour_test_DEPENDENCIES = libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+gx_tour_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(gx_tour_test_CXXFLAGS) \
-+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- am_hotspot_test_OBJECTS = hotspot_test-hotspot_test.$(OBJEXT)
- hotspot_test_OBJECTS = $(am_hotspot_test_OBJECTS)
- hotspot_test_DEPENDENCIES = libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+hotspot_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(hotspot_test_CXXFLAGS) \
-+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- am_iconstyle_test_OBJECTS = iconstyle_test-iconstyle_test.$(OBJEXT)
- iconstyle_test_OBJECTS = $(am_iconstyle_test_OBJECTS)
- iconstyle_test_DEPENDENCIES = libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+iconstyle_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-+	$(iconstyle_test_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- am_kml22_test_OBJECTS = kml22_test-kml22_test.$(OBJEXT)
- kml22_test_OBJECTS = $(am_kml22_test_OBJECTS)
- kml22_test_DEPENDENCIES = libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+kml22_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(kml22_test_CXXFLAGS) \
-+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- am_kml_cast_test_OBJECTS = kml_cast_test-kml_cast_test.$(OBJEXT)
- kml_cast_test_OBJECTS = $(am_kml_cast_test_OBJECTS)
- kml_cast_test_DEPENDENCIES = libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+kml_cast_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(kml_cast_test_CXXFLAGS) \
-+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- am_kml_factory_test_OBJECTS =  \
- 	kml_factory_test-kml_factory_test.$(OBJEXT)
- kml_factory_test_OBJECTS = $(am_kml_factory_test_OBJECTS)
- kml_factory_test_DEPENDENCIES = libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+kml_factory_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-+	$(kml_factory_test_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- am_kml_handler_ns_test_OBJECTS =  \
- 	kml_handler_ns_test-kml_handler_ns_test.$(OBJEXT)
- kml_handler_ns_test_OBJECTS = $(am_kml_handler_ns_test_OBJECTS)
- kml_handler_ns_test_DEPENDENCIES = libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+kml_handler_ns_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-+	$(kml_handler_ns_test_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- am_kml_handler_test_OBJECTS =  \
- 	kml_handler_test-kml_handler_test.$(OBJEXT)
- kml_handler_test_OBJECTS = $(am_kml_handler_test_OBJECTS)
- kml_handler_test_DEPENDENCIES = libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+kml_handler_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-+	$(kml_handler_test_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- am_kml_test_OBJECTS = kml_test-kml_test.$(OBJEXT)
- kml_test_OBJECTS = $(am_kml_test_OBJECTS)
- kml_test_DEPENDENCIES = libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+kml_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(kml_test_CXXFLAGS) \
-+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- am_labelstyle_test_OBJECTS =  \
- 	labelstyle_test-labelstyle_test.$(OBJEXT)
- labelstyle_test_OBJECTS = $(am_labelstyle_test_OBJECTS)
- labelstyle_test_DEPENDENCIES = libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+labelstyle_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-+	$(labelstyle_test_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- am_linestyle_test_OBJECTS = linestyle_test-linestyle_test.$(OBJEXT)
- linestyle_test_OBJECTS = $(am_linestyle_test_OBJECTS)
- linestyle_test_DEPENDENCIES = libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+linestyle_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-+	$(linestyle_test_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- am_link_test_OBJECTS = link_test-link_test.$(OBJEXT)
- link_test_OBJECTS = $(am_link_test_OBJECTS)
- link_test_DEPENDENCIES = libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+link_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(link_test_CXXFLAGS) \
-+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- am_liststyle_test_OBJECTS = liststyle_test-liststyle_test.$(OBJEXT)
- liststyle_test_OBJECTS = $(am_liststyle_test_OBJECTS)
- liststyle_test_DEPENDENCIES = libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+liststyle_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-+	$(liststyle_test_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- am_model_test_OBJECTS = model_test-model_test.$(OBJEXT)
- model_test_OBJECTS = $(am_model_test_OBJECTS)
- model_test_DEPENDENCIES = libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+model_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(model_test_CXXFLAGS) \
-+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- am_networklink_test_OBJECTS =  \
- 	networklink_test-networklink_test.$(OBJEXT)
- networklink_test_OBJECTS = $(am_networklink_test_OBJECTS)
- networklink_test_DEPENDENCIES = libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+networklink_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-+	$(networklink_test_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- am_networklinkcontrol_test_OBJECTS =  \
- 	networklinkcontrol_test-networklinkcontrol_test.$(OBJEXT)
- networklinkcontrol_test_OBJECTS =  \
-@@ -255,122 +393,195 @@
- networklinkcontrol_test_DEPENDENCIES = libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+networklinkcontrol_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-+	$(networklinkcontrol_test_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- am_object_test_OBJECTS = object_test-object_test.$(OBJEXT)
- object_test_OBJECTS = $(am_object_test_OBJECTS)
- object_test_DEPENDENCIES = libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+object_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(object_test_CXXFLAGS) \
-+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- am_overlay_test_OBJECTS = overlay_test-overlay_test.$(OBJEXT)
- overlay_test_OBJECTS = $(am_overlay_test_OBJECTS)
- overlay_test_DEPENDENCIES = libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+overlay_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(overlay_test_CXXFLAGS) \
-+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- am_parser_test_OBJECTS = parser_test-parser_test.$(OBJEXT)
- parser_test_OBJECTS = $(am_parser_test_OBJECTS)
- parser_test_DEPENDENCIES = libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+parser_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(parser_test_CXXFLAGS) \
-+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- am_placemark_test_OBJECTS = placemark_test-placemark_test.$(OBJEXT)
- placemark_test_OBJECTS = $(am_placemark_test_OBJECTS)
- placemark_test_DEPENDENCIES = libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+placemark_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-+	$(placemark_test_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- am_polystyle_test_OBJECTS = polystyle_test-polystyle_test.$(OBJEXT)
- polystyle_test_OBJECTS = $(am_polystyle_test_OBJECTS)
- polystyle_test_DEPENDENCIES = libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+polystyle_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-+	$(polystyle_test_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- am_region_test_OBJECTS = region_test-region_test.$(OBJEXT)
- region_test_OBJECTS = $(am_region_test_OBJECTS)
- region_test_DEPENDENCIES = libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+region_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(region_test_CXXFLAGS) \
-+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- am_round_trip_test_OBJECTS =  \
- 	round_trip_test-round_trip_test.$(OBJEXT)
- round_trip_test_OBJECTS = $(am_round_trip_test_OBJECTS)
- round_trip_test_DEPENDENCIES = libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+round_trip_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-+	$(round_trip_test_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- am_schema_test_OBJECTS = schema_test-schema_test.$(OBJEXT)
- schema_test_OBJECTS = $(am_schema_test_OBJECTS)
- schema_test_DEPENDENCIES = libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+schema_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(schema_test_CXXFLAGS) \
-+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- am_serializer_test_OBJECTS =  \
- 	serializer_test-serializer_test.$(OBJEXT)
- serializer_test_OBJECTS = $(am_serializer_test_OBJECTS)
- serializer_test_DEPENDENCIES = libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+serializer_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-+	$(serializer_test_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- am_snippet_test_OBJECTS = snippet_test-snippet_test.$(OBJEXT)
- snippet_test_OBJECTS = $(am_snippet_test_OBJECTS)
- snippet_test_DEPENDENCIES = libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+snippet_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(snippet_test_CXXFLAGS) \
-+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- am_style_test_OBJECTS = style_test-style_test.$(OBJEXT)
- style_test_OBJECTS = $(am_style_test_OBJECTS)
- style_test_DEPENDENCIES = libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+style_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(style_test_CXXFLAGS) \
-+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- am_stylemap_test_OBJECTS = stylemap_test-stylemap_test.$(OBJEXT)
- stylemap_test_OBJECTS = $(am_stylemap_test_OBJECTS)
- stylemap_test_DEPENDENCIES = libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+stylemap_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(stylemap_test_CXXFLAGS) \
-+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- am_styleselector_test_OBJECTS =  \
- 	styleselector_test-styleselector_test.$(OBJEXT)
- styleselector_test_OBJECTS = $(am_styleselector_test_OBJECTS)
- styleselector_test_DEPENDENCIES = libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+styleselector_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-+	$(styleselector_test_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- am_substyle_test_OBJECTS = substyle_test-substyle_test.$(OBJEXT)
- substyle_test_OBJECTS = $(am_substyle_test_OBJECTS)
- substyle_test_DEPENDENCIES = libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+substyle_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(substyle_test_CXXFLAGS) \
-+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- am_timeprimitive_test_OBJECTS =  \
- 	timeprimitive_test-timeprimitive_test.$(OBJEXT)
- timeprimitive_test_OBJECTS = $(am_timeprimitive_test_OBJECTS)
- timeprimitive_test_DEPENDENCIES = libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+timeprimitive_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-+	$(timeprimitive_test_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- am_unknown_test_OBJECTS = unknown_test-unknown_test.$(OBJEXT)
- unknown_test_OBJECTS = $(am_unknown_test_OBJECTS)
- unknown_test_DEPENDENCIES = libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+unknown_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(unknown_test_CXXFLAGS) \
-+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- am_vec2_test_OBJECTS = vec2_test-vec2_test.$(OBJEXT)
- vec2_test_OBJECTS = $(am_vec2_test_OBJECTS)
- vec2_test_DEPENDENCIES = libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+vec2_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(vec2_test_CXXFLAGS) \
-+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- am_xal_test_OBJECTS = xal_test-xal_test.$(OBJEXT)
- xal_test_OBJECTS = $(am_xal_test_OBJECTS)
- xal_test_DEPENDENCIES = libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+xal_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(xal_test_CXXFLAGS) \
-+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- am_xml_serializer_test_OBJECTS =  \
- 	xml_serializer_test-xml_serializer_test.$(OBJEXT)
- xml_serializer_test_OBJECTS = $(am_xml_serializer_test_OBJECTS)
- xml_serializer_test_DEPENDENCIES = libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+xml_serializer_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-+	$(xml_serializer_test_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- am_xsd_test_OBJECTS = xsd_test-xsd_test.$(OBJEXT)
- xsd_test_OBJECTS = $(am_xsd_test_OBJECTS)
- xsd_test_DEPENDENCIES = libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
--DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+xsd_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(xsd_test_CXXFLAGS) \
-+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+@@ -555,6 +572,7 @@
+ DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
  depcomp = $(SHELL) $(top_srcdir)/config/depcomp
  am__depfiles_maybe = depfiles
 +am__mv = mv -f
  CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
  	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
--	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
--	$(AM_CXXFLAGS) $(CXXFLAGS)
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- CXXLD = $(CXX)
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- SOURCES = $(libkmldom_la_SOURCES) $(abstractlatlonbox_test_SOURCES) \
- 	$(abstractview_test_SOURCES) $(atom_test_SOURCES) \
- 	$(balloonstyle_test_SOURCES) $(colorstyle_test_SOURCES) \
-@@ -422,14 +633,13 @@
+ LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+@@ -615,10 +633,11 @@
  	$(unknown_test_SOURCES) $(vec2_test_SOURCES) \
  	$(xal_test_SOURCES) $(xml_serializer_test_SOURCES) \
  	$(xsd_test_SOURCES)
@@ -77940,57 +19471,8 @@
 +red=; grn=; lgn=; blu=; std=
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  ACLOCAL = @ACLOCAL@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
  AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -451,18 +661,16 @@
- CYGPATH_W = @CYGPATH_W@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
--ECHO = @ECHO@
-+DSYMUTIL = @DSYMUTIL@
-+DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
--F77 = @F77@
--FFLAGS = @FFLAGS@
--GCC_FALSE = @GCC_FALSE@
--GCC_TRUE = @GCC_TRUE@
--HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
--HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
-+FGREP = @FGREP@
-+GREP = @GREP@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -472,19 +680,28 @@
- JAVAC = @JAVAC@
- JAVA_INCLUDE_DIR = @JAVA_INCLUDE_DIR@
- JAVA_LIB_DIR = @JAVA_LIB_DIR@
-+LD = @LD@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
-+LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
-+NM = @NM@
-+NMEDIT = @NMEDIT@
-+OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
-+OTOOL = @OTOOL@
-+OTOOL64 = @OTOOL64@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -682,6 +701,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -77998,141 +19480,18 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PLATFORM = @PLATFORM@
-@@ -501,22 +718,13 @@
- STRIP = @STRIP@
- SWIG = @SWIG@
- VERSION = @VERSION@
--WITH_JAVA_FALSE = @WITH_JAVA_FALSE@
--WITH_JAVA_TRUE = @WITH_JAVA_TRUE@
--WITH_PYTHON_FALSE = @WITH_PYTHON_FALSE@
--WITH_PYTHON_TRUE = @WITH_PYTHON_TRUE@
--WITH_SWIG_FALSE = @WITH_SWIG_FALSE@
--WITH_SWIG_TRUE = @WITH_SWIG_TRUE@
--ac_ct_AR = @ac_ct_AR@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
--ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -528,28 +736,41 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- AM_CPPFLAGS = -I$(top_srcdir)/src \
+@@ -755,8 +775,8 @@
  	     -I$(top_srcdir)/third_party/boost_1_34_1 \
  	     -I$(top_srcdir)/third_party/googletest-r108/include
-@@ -663,56 +884,6 @@
- 	kml22.cc
  
- DATA_DIR = $(top_srcdir)/testdata
--TESTS = abstractlatlonbox_test \
--	abstractview_test \
--	atom_test \
--	balloonstyle_test \
--	colorstyle_test \
--	container_test \
--	document_test \
--	element_test \
--	extendeddata_test \
--	feature_test \
--	folder_test \
--	geometry_test \
--	hotspot_test \
--	iconstyle_test \
--	kml_cast_test \
--	kml_test \
--	kml_factory_test \
--	kml22_test \
--	labelstyle_test \
--	linestyle_test \
--	link_test \
--	liststyle_test \
--	model_test \
--	networklink_test \
--	networklinkcontrol_test \
--	object_test \
--	overlay_test \
--	placemark_test \
--	polystyle_test \
--	region_test \
--	round_trip_test \
--	schema_test \
--	snippet_test \
--	style_test \
--	stylemap_test \
--	styleselector_test \
--	substyle_test \
--	timeprimitive_test \
--	vec2_test \
--	unknown_test \
--	kml_handler_test \
--	kml_handler_ns_test \
--	parser_test \
--	serializer_test \
--	gx_timeprimitive_test \
--	gx_tour_test \
--	xal_test \
--	xml_serializer_test \
--	xsd_test
--
- 
- # Unit tests for KMLDOM classes.
- abstractlatlonbox_test_SOURCES = abstractlatlonbox_test.cc
-@@ -1018,14 +1189,14 @@
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
--	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
--		&& exit 0; \
-+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-+	        && { if test -f $@; then exit 0; else break; fi; }; \
+- at GCC_TRUE@AM_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -Werror -ansi -pedantic -fno-rtti
+- at GCC_TRUE@AM_TEST_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -Werror -ansi -fno-rtti -DGTEST_HAS_RTTI=0
++ at GCC_TRUE@AM_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -ansi -pedantic -fno-rtti
++ at GCC_TRUE@AM_TEST_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -ansi -fno-rtti -DGTEST_HAS_RTTI=0
+ lib_LTLIBRARIES = libkmldom.la
+ libkmldom_la_SOURCES = \
+ 	abstractlatlonbox.cc \
+@@ -1174,9 +1194,9 @@
  	      exit 1;; \
  	  esac; \
  	done; \
@@ -78145,22 +19504,21 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -1043,23 +1214,28 @@
+@@ -1194,23 +1214,28 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(am__aclocal_m4_deps):
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
--	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ 	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 -	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 +	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
 +	list2=; for p in $$list; do \
  	  if test -f $$p; then \
 -	    f=$(am__strip_dir) \
--	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
--	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+-	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+-	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
 +	    list2="$$list2 $$p"; \
  	  else :; fi; \
 -	done
@@ -78172,10 +19530,10 @@
  
  uninstall-libLTLIBRARIES:
  	@$(NORMAL_UNINSTALL)
--	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 -	  p=$(am__strip_dir) \
--	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
--	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
 +	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
 +	for p in $$list; do \
 +	  $(am__strip_dir) \
@@ -78184,12 +19542,8 @@
  	done
  
  clean-libLTLIBRARIES:
-@@ -1071,161 +1247,163 @@
- 	  rm -f "$${dir}/so_locations"; \
- 	done
- libkmldom.la: $(libkmldom_la_OBJECTS) $(libkmldom_la_DEPENDENCIES) 
--	$(CXXLINK) -rpath $(libdir) $(libkmldom_la_LDFLAGS) $(libkmldom_la_OBJECTS) $(libkmldom_la_LIBADD) $(LIBS)
-+	$(CXXLINK) -rpath $(libdir) $(libkmldom_la_OBJECTS) $(libkmldom_la_LIBADD) $(LIBS)
+@@ -1225,11 +1250,13 @@
+ 	$(CXXLINK) -rpath $(libdir) $(libkmldom_la_OBJECTS) $(libkmldom_la_LIBADD) $(LIBS)
  
  clean-checkPROGRAMS:
 -	@list='$(check_PROGRAMS)'; for p in $$list; do \
@@ -78206,1127 +19560,821 @@
 +	rm -f $$list
  abstractlatlonbox_test$(EXEEXT): $(abstractlatlonbox_test_OBJECTS) $(abstractlatlonbox_test_DEPENDENCIES) 
  	@rm -f abstractlatlonbox_test$(EXEEXT)
--	$(CXXLINK) $(abstractlatlonbox_test_LDFLAGS) $(abstractlatlonbox_test_OBJECTS) $(abstractlatlonbox_test_LDADD) $(LIBS)
-+	$(abstractlatlonbox_test_LINK) $(abstractlatlonbox_test_OBJECTS) $(abstractlatlonbox_test_LDADD) $(LIBS)
- abstractview_test$(EXEEXT): $(abstractview_test_OBJECTS) $(abstractview_test_DEPENDENCIES) 
- 	@rm -f abstractview_test$(EXEEXT)
--	$(CXXLINK) $(abstractview_test_LDFLAGS) $(abstractview_test_OBJECTS) $(abstractview_test_LDADD) $(LIBS)
-+	$(abstractview_test_LINK) $(abstractview_test_OBJECTS) $(abstractview_test_LDADD) $(LIBS)
- atom_test$(EXEEXT): $(atom_test_OBJECTS) $(atom_test_DEPENDENCIES) 
- 	@rm -f atom_test$(EXEEXT)
--	$(CXXLINK) $(atom_test_LDFLAGS) $(atom_test_OBJECTS) $(atom_test_LDADD) $(LIBS)
-+	$(atom_test_LINK) $(atom_test_OBJECTS) $(atom_test_LDADD) $(LIBS)
- balloonstyle_test$(EXEEXT): $(balloonstyle_test_OBJECTS) $(balloonstyle_test_DEPENDENCIES) 
- 	@rm -f balloonstyle_test$(EXEEXT)
--	$(CXXLINK) $(balloonstyle_test_LDFLAGS) $(balloonstyle_test_OBJECTS) $(balloonstyle_test_LDADD) $(LIBS)
-+	$(balloonstyle_test_LINK) $(balloonstyle_test_OBJECTS) $(balloonstyle_test_LDADD) $(LIBS)
- colorstyle_test$(EXEEXT): $(colorstyle_test_OBJECTS) $(colorstyle_test_DEPENDENCIES) 
- 	@rm -f colorstyle_test$(EXEEXT)
--	$(CXXLINK) $(colorstyle_test_LDFLAGS) $(colorstyle_test_OBJECTS) $(colorstyle_test_LDADD) $(LIBS)
-+	$(colorstyle_test_LINK) $(colorstyle_test_OBJECTS) $(colorstyle_test_LDADD) $(LIBS)
- container_test$(EXEEXT): $(container_test_OBJECTS) $(container_test_DEPENDENCIES) 
- 	@rm -f container_test$(EXEEXT)
--	$(CXXLINK) $(container_test_LDFLAGS) $(container_test_OBJECTS) $(container_test_LDADD) $(LIBS)
-+	$(container_test_LINK) $(container_test_OBJECTS) $(container_test_LDADD) $(LIBS)
- document_test$(EXEEXT): $(document_test_OBJECTS) $(document_test_DEPENDENCIES) 
- 	@rm -f document_test$(EXEEXT)
--	$(CXXLINK) $(document_test_LDFLAGS) $(document_test_OBJECTS) $(document_test_LDADD) $(LIBS)
-+	$(document_test_LINK) $(document_test_OBJECTS) $(document_test_LDADD) $(LIBS)
- element_test$(EXEEXT): $(element_test_OBJECTS) $(element_test_DEPENDENCIES) 
- 	@rm -f element_test$(EXEEXT)
--	$(CXXLINK) $(element_test_LDFLAGS) $(element_test_OBJECTS) $(element_test_LDADD) $(LIBS)
-+	$(element_test_LINK) $(element_test_OBJECTS) $(element_test_LDADD) $(LIBS)
- extendeddata_test$(EXEEXT): $(extendeddata_test_OBJECTS) $(extendeddata_test_DEPENDENCIES) 
- 	@rm -f extendeddata_test$(EXEEXT)
--	$(CXXLINK) $(extendeddata_test_LDFLAGS) $(extendeddata_test_OBJECTS) $(extendeddata_test_LDADD) $(LIBS)
-+	$(extendeddata_test_LINK) $(extendeddata_test_OBJECTS) $(extendeddata_test_LDADD) $(LIBS)
- feature_test$(EXEEXT): $(feature_test_OBJECTS) $(feature_test_DEPENDENCIES) 
- 	@rm -f feature_test$(EXEEXT)
--	$(CXXLINK) $(feature_test_LDFLAGS) $(feature_test_OBJECTS) $(feature_test_LDADD) $(LIBS)
-+	$(feature_test_LINK) $(feature_test_OBJECTS) $(feature_test_LDADD) $(LIBS)
- folder_test$(EXEEXT): $(folder_test_OBJECTS) $(folder_test_DEPENDENCIES) 
- 	@rm -f folder_test$(EXEEXT)
--	$(CXXLINK) $(folder_test_LDFLAGS) $(folder_test_OBJECTS) $(folder_test_LDADD) $(LIBS)
-+	$(folder_test_LINK) $(folder_test_OBJECTS) $(folder_test_LDADD) $(LIBS)
- geometry_test$(EXEEXT): $(geometry_test_OBJECTS) $(geometry_test_DEPENDENCIES) 
- 	@rm -f geometry_test$(EXEEXT)
--	$(CXXLINK) $(geometry_test_LDFLAGS) $(geometry_test_OBJECTS) $(geometry_test_LDADD) $(LIBS)
-+	$(geometry_test_LINK) $(geometry_test_OBJECTS) $(geometry_test_LDADD) $(LIBS)
- gx_timeprimitive_test$(EXEEXT): $(gx_timeprimitive_test_OBJECTS) $(gx_timeprimitive_test_DEPENDENCIES) 
- 	@rm -f gx_timeprimitive_test$(EXEEXT)
--	$(CXXLINK) $(gx_timeprimitive_test_LDFLAGS) $(gx_timeprimitive_test_OBJECTS) $(gx_timeprimitive_test_LDADD) $(LIBS)
-+	$(gx_timeprimitive_test_LINK) $(gx_timeprimitive_test_OBJECTS) $(gx_timeprimitive_test_LDADD) $(LIBS)
- gx_tour_test$(EXEEXT): $(gx_tour_test_OBJECTS) $(gx_tour_test_DEPENDENCIES) 
- 	@rm -f gx_tour_test$(EXEEXT)
--	$(CXXLINK) $(gx_tour_test_LDFLAGS) $(gx_tour_test_OBJECTS) $(gx_tour_test_LDADD) $(LIBS)
-+	$(gx_tour_test_LINK) $(gx_tour_test_OBJECTS) $(gx_tour_test_LDADD) $(LIBS)
- hotspot_test$(EXEEXT): $(hotspot_test_OBJECTS) $(hotspot_test_DEPENDENCIES) 
- 	@rm -f hotspot_test$(EXEEXT)
--	$(CXXLINK) $(hotspot_test_LDFLAGS) $(hotspot_test_OBJECTS) $(hotspot_test_LDADD) $(LIBS)
-+	$(hotspot_test_LINK) $(hotspot_test_OBJECTS) $(hotspot_test_LDADD) $(LIBS)
- iconstyle_test$(EXEEXT): $(iconstyle_test_OBJECTS) $(iconstyle_test_DEPENDENCIES) 
- 	@rm -f iconstyle_test$(EXEEXT)
--	$(CXXLINK) $(iconstyle_test_LDFLAGS) $(iconstyle_test_OBJECTS) $(iconstyle_test_LDADD) $(LIBS)
-+	$(iconstyle_test_LINK) $(iconstyle_test_OBJECTS) $(iconstyle_test_LDADD) $(LIBS)
- kml22_test$(EXEEXT): $(kml22_test_OBJECTS) $(kml22_test_DEPENDENCIES) 
- 	@rm -f kml22_test$(EXEEXT)
--	$(CXXLINK) $(kml22_test_LDFLAGS) $(kml22_test_OBJECTS) $(kml22_test_LDADD) $(LIBS)
-+	$(kml22_test_LINK) $(kml22_test_OBJECTS) $(kml22_test_LDADD) $(LIBS)
- kml_cast_test$(EXEEXT): $(kml_cast_test_OBJECTS) $(kml_cast_test_DEPENDENCIES) 
- 	@rm -f kml_cast_test$(EXEEXT)
--	$(CXXLINK) $(kml_cast_test_LDFLAGS) $(kml_cast_test_OBJECTS) $(kml_cast_test_LDADD) $(LIBS)
-+	$(kml_cast_test_LINK) $(kml_cast_test_OBJECTS) $(kml_cast_test_LDADD) $(LIBS)
- kml_factory_test$(EXEEXT): $(kml_factory_test_OBJECTS) $(kml_factory_test_DEPENDENCIES) 
- 	@rm -f kml_factory_test$(EXEEXT)
--	$(CXXLINK) $(kml_factory_test_LDFLAGS) $(kml_factory_test_OBJECTS) $(kml_factory_test_LDADD) $(LIBS)
-+	$(kml_factory_test_LINK) $(kml_factory_test_OBJECTS) $(kml_factory_test_LDADD) $(LIBS)
- kml_handler_ns_test$(EXEEXT): $(kml_handler_ns_test_OBJECTS) $(kml_handler_ns_test_DEPENDENCIES) 
- 	@rm -f kml_handler_ns_test$(EXEEXT)
--	$(CXXLINK) $(kml_handler_ns_test_LDFLAGS) $(kml_handler_ns_test_OBJECTS) $(kml_handler_ns_test_LDADD) $(LIBS)
-+	$(kml_handler_ns_test_LINK) $(kml_handler_ns_test_OBJECTS) $(kml_handler_ns_test_LDADD) $(LIBS)
- kml_handler_test$(EXEEXT): $(kml_handler_test_OBJECTS) $(kml_handler_test_DEPENDENCIES) 
- 	@rm -f kml_handler_test$(EXEEXT)
--	$(CXXLINK) $(kml_handler_test_LDFLAGS) $(kml_handler_test_OBJECTS) $(kml_handler_test_LDADD) $(LIBS)
-+	$(kml_handler_test_LINK) $(kml_handler_test_OBJECTS) $(kml_handler_test_LDADD) $(LIBS)
- kml_test$(EXEEXT): $(kml_test_OBJECTS) $(kml_test_DEPENDENCIES) 
- 	@rm -f kml_test$(EXEEXT)
--	$(CXXLINK) $(kml_test_LDFLAGS) $(kml_test_OBJECTS) $(kml_test_LDADD) $(LIBS)
-+	$(kml_test_LINK) $(kml_test_OBJECTS) $(kml_test_LDADD) $(LIBS)
- labelstyle_test$(EXEEXT): $(labelstyle_test_OBJECTS) $(labelstyle_test_DEPENDENCIES) 
- 	@rm -f labelstyle_test$(EXEEXT)
--	$(CXXLINK) $(labelstyle_test_LDFLAGS) $(labelstyle_test_OBJECTS) $(labelstyle_test_LDADD) $(LIBS)
-+	$(labelstyle_test_LINK) $(labelstyle_test_OBJECTS) $(labelstyle_test_LDADD) $(LIBS)
- linestyle_test$(EXEEXT): $(linestyle_test_OBJECTS) $(linestyle_test_DEPENDENCIES) 
- 	@rm -f linestyle_test$(EXEEXT)
--	$(CXXLINK) $(linestyle_test_LDFLAGS) $(linestyle_test_OBJECTS) $(linestyle_test_LDADD) $(LIBS)
-+	$(linestyle_test_LINK) $(linestyle_test_OBJECTS) $(linestyle_test_LDADD) $(LIBS)
- link_test$(EXEEXT): $(link_test_OBJECTS) $(link_test_DEPENDENCIES) 
- 	@rm -f link_test$(EXEEXT)
--	$(CXXLINK) $(link_test_LDFLAGS) $(link_test_OBJECTS) $(link_test_LDADD) $(LIBS)
-+	$(link_test_LINK) $(link_test_OBJECTS) $(link_test_LDADD) $(LIBS)
- liststyle_test$(EXEEXT): $(liststyle_test_OBJECTS) $(liststyle_test_DEPENDENCIES) 
- 	@rm -f liststyle_test$(EXEEXT)
--	$(CXXLINK) $(liststyle_test_LDFLAGS) $(liststyle_test_OBJECTS) $(liststyle_test_LDADD) $(LIBS)
-+	$(liststyle_test_LINK) $(liststyle_test_OBJECTS) $(liststyle_test_LDADD) $(LIBS)
- model_test$(EXEEXT): $(model_test_OBJECTS) $(model_test_DEPENDENCIES) 
- 	@rm -f model_test$(EXEEXT)
--	$(CXXLINK) $(model_test_LDFLAGS) $(model_test_OBJECTS) $(model_test_LDADD) $(LIBS)
-+	$(model_test_LINK) $(model_test_OBJECTS) $(model_test_LDADD) $(LIBS)
- networklink_test$(EXEEXT): $(networklink_test_OBJECTS) $(networklink_test_DEPENDENCIES) 
- 	@rm -f networklink_test$(EXEEXT)
--	$(CXXLINK) $(networklink_test_LDFLAGS) $(networklink_test_OBJECTS) $(networklink_test_LDADD) $(LIBS)
-+	$(networklink_test_LINK) $(networklink_test_OBJECTS) $(networklink_test_LDADD) $(LIBS)
- networklinkcontrol_test$(EXEEXT): $(networklinkcontrol_test_OBJECTS) $(networklinkcontrol_test_DEPENDENCIES) 
- 	@rm -f networklinkcontrol_test$(EXEEXT)
--	$(CXXLINK) $(networklinkcontrol_test_LDFLAGS) $(networklinkcontrol_test_OBJECTS) $(networklinkcontrol_test_LDADD) $(LIBS)
-+	$(networklinkcontrol_test_LINK) $(networklinkcontrol_test_OBJECTS) $(networklinkcontrol_test_LDADD) $(LIBS)
- object_test$(EXEEXT): $(object_test_OBJECTS) $(object_test_DEPENDENCIES) 
- 	@rm -f object_test$(EXEEXT)
--	$(CXXLINK) $(object_test_LDFLAGS) $(object_test_OBJECTS) $(object_test_LDADD) $(LIBS)
-+	$(object_test_LINK) $(object_test_OBJECTS) $(object_test_LDADD) $(LIBS)
- overlay_test$(EXEEXT): $(overlay_test_OBJECTS) $(overlay_test_DEPENDENCIES) 
- 	@rm -f overlay_test$(EXEEXT)
--	$(CXXLINK) $(overlay_test_LDFLAGS) $(overlay_test_OBJECTS) $(overlay_test_LDADD) $(LIBS)
-+	$(overlay_test_LINK) $(overlay_test_OBJECTS) $(overlay_test_LDADD) $(LIBS)
- parser_test$(EXEEXT): $(parser_test_OBJECTS) $(parser_test_DEPENDENCIES) 
- 	@rm -f parser_test$(EXEEXT)
--	$(CXXLINK) $(parser_test_LDFLAGS) $(parser_test_OBJECTS) $(parser_test_LDADD) $(LIBS)
-+	$(parser_test_LINK) $(parser_test_OBJECTS) $(parser_test_LDADD) $(LIBS)
- placemark_test$(EXEEXT): $(placemark_test_OBJECTS) $(placemark_test_DEPENDENCIES) 
- 	@rm -f placemark_test$(EXEEXT)
--	$(CXXLINK) $(placemark_test_LDFLAGS) $(placemark_test_OBJECTS) $(placemark_test_LDADD) $(LIBS)
-+	$(placemark_test_LINK) $(placemark_test_OBJECTS) $(placemark_test_LDADD) $(LIBS)
- polystyle_test$(EXEEXT): $(polystyle_test_OBJECTS) $(polystyle_test_DEPENDENCIES) 
- 	@rm -f polystyle_test$(EXEEXT)
--	$(CXXLINK) $(polystyle_test_LDFLAGS) $(polystyle_test_OBJECTS) $(polystyle_test_LDADD) $(LIBS)
-+	$(polystyle_test_LINK) $(polystyle_test_OBJECTS) $(polystyle_test_LDADD) $(LIBS)
- region_test$(EXEEXT): $(region_test_OBJECTS) $(region_test_DEPENDENCIES) 
- 	@rm -f region_test$(EXEEXT)
--	$(CXXLINK) $(region_test_LDFLAGS) $(region_test_OBJECTS) $(region_test_LDADD) $(LIBS)
-+	$(region_test_LINK) $(region_test_OBJECTS) $(region_test_LDADD) $(LIBS)
- round_trip_test$(EXEEXT): $(round_trip_test_OBJECTS) $(round_trip_test_DEPENDENCIES) 
- 	@rm -f round_trip_test$(EXEEXT)
--	$(CXXLINK) $(round_trip_test_LDFLAGS) $(round_trip_test_OBJECTS) $(round_trip_test_LDADD) $(LIBS)
-+	$(round_trip_test_LINK) $(round_trip_test_OBJECTS) $(round_trip_test_LDADD) $(LIBS)
- schema_test$(EXEEXT): $(schema_test_OBJECTS) $(schema_test_DEPENDENCIES) 
- 	@rm -f schema_test$(EXEEXT)
--	$(CXXLINK) $(schema_test_LDFLAGS) $(schema_test_OBJECTS) $(schema_test_LDADD) $(LIBS)
-+	$(schema_test_LINK) $(schema_test_OBJECTS) $(schema_test_LDADD) $(LIBS)
- serializer_test$(EXEEXT): $(serializer_test_OBJECTS) $(serializer_test_DEPENDENCIES) 
- 	@rm -f serializer_test$(EXEEXT)
--	$(CXXLINK) $(serializer_test_LDFLAGS) $(serializer_test_OBJECTS) $(serializer_test_LDADD) $(LIBS)
-+	$(serializer_test_LINK) $(serializer_test_OBJECTS) $(serializer_test_LDADD) $(LIBS)
- snippet_test$(EXEEXT): $(snippet_test_OBJECTS) $(snippet_test_DEPENDENCIES) 
- 	@rm -f snippet_test$(EXEEXT)
--	$(CXXLINK) $(snippet_test_LDFLAGS) $(snippet_test_OBJECTS) $(snippet_test_LDADD) $(LIBS)
-+	$(snippet_test_LINK) $(snippet_test_OBJECTS) $(snippet_test_LDADD) $(LIBS)
- style_test$(EXEEXT): $(style_test_OBJECTS) $(style_test_DEPENDENCIES) 
- 	@rm -f style_test$(EXEEXT)
--	$(CXXLINK) $(style_test_LDFLAGS) $(style_test_OBJECTS) $(style_test_LDADD) $(LIBS)
-+	$(style_test_LINK) $(style_test_OBJECTS) $(style_test_LDADD) $(LIBS)
- stylemap_test$(EXEEXT): $(stylemap_test_OBJECTS) $(stylemap_test_DEPENDENCIES) 
- 	@rm -f stylemap_test$(EXEEXT)
--	$(CXXLINK) $(stylemap_test_LDFLAGS) $(stylemap_test_OBJECTS) $(stylemap_test_LDADD) $(LIBS)
-+	$(stylemap_test_LINK) $(stylemap_test_OBJECTS) $(stylemap_test_LDADD) $(LIBS)
- styleselector_test$(EXEEXT): $(styleselector_test_OBJECTS) $(styleselector_test_DEPENDENCIES) 
- 	@rm -f styleselector_test$(EXEEXT)
--	$(CXXLINK) $(styleselector_test_LDFLAGS) $(styleselector_test_OBJECTS) $(styleselector_test_LDADD) $(LIBS)
-+	$(styleselector_test_LINK) $(styleselector_test_OBJECTS) $(styleselector_test_LDADD) $(LIBS)
- substyle_test$(EXEEXT): $(substyle_test_OBJECTS) $(substyle_test_DEPENDENCIES) 
- 	@rm -f substyle_test$(EXEEXT)
--	$(CXXLINK) $(substyle_test_LDFLAGS) $(substyle_test_OBJECTS) $(substyle_test_LDADD) $(LIBS)
-+	$(substyle_test_LINK) $(substyle_test_OBJECTS) $(substyle_test_LDADD) $(LIBS)
- timeprimitive_test$(EXEEXT): $(timeprimitive_test_OBJECTS) $(timeprimitive_test_DEPENDENCIES) 
- 	@rm -f timeprimitive_test$(EXEEXT)
--	$(CXXLINK) $(timeprimitive_test_LDFLAGS) $(timeprimitive_test_OBJECTS) $(timeprimitive_test_LDADD) $(LIBS)
-+	$(timeprimitive_test_LINK) $(timeprimitive_test_OBJECTS) $(timeprimitive_test_LDADD) $(LIBS)
- unknown_test$(EXEEXT): $(unknown_test_OBJECTS) $(unknown_test_DEPENDENCIES) 
- 	@rm -f unknown_test$(EXEEXT)
--	$(CXXLINK) $(unknown_test_LDFLAGS) $(unknown_test_OBJECTS) $(unknown_test_LDADD) $(LIBS)
-+	$(unknown_test_LINK) $(unknown_test_OBJECTS) $(unknown_test_LDADD) $(LIBS)
- vec2_test$(EXEEXT): $(vec2_test_OBJECTS) $(vec2_test_DEPENDENCIES) 
- 	@rm -f vec2_test$(EXEEXT)
--	$(CXXLINK) $(vec2_test_LDFLAGS) $(vec2_test_OBJECTS) $(vec2_test_LDADD) $(LIBS)
-+	$(vec2_test_LINK) $(vec2_test_OBJECTS) $(vec2_test_LDADD) $(LIBS)
- xal_test$(EXEEXT): $(xal_test_OBJECTS) $(xal_test_DEPENDENCIES) 
- 	@rm -f xal_test$(EXEEXT)
--	$(CXXLINK) $(xal_test_LDFLAGS) $(xal_test_OBJECTS) $(xal_test_LDADD) $(LIBS)
-+	$(xal_test_LINK) $(xal_test_OBJECTS) $(xal_test_LDADD) $(LIBS)
- xml_serializer_test$(EXEEXT): $(xml_serializer_test_OBJECTS) $(xml_serializer_test_DEPENDENCIES) 
- 	@rm -f xml_serializer_test$(EXEEXT)
--	$(CXXLINK) $(xml_serializer_test_LDFLAGS) $(xml_serializer_test_OBJECTS) $(xml_serializer_test_LDADD) $(LIBS)
-+	$(xml_serializer_test_LINK) $(xml_serializer_test_OBJECTS) $(xml_serializer_test_LDADD) $(LIBS)
- xsd_test$(EXEEXT): $(xsd_test_OBJECTS) $(xsd_test_DEPENDENCIES) 
- 	@rm -f xsd_test$(EXEEXT)
--	$(CXXLINK) $(xsd_test_LDFLAGS) $(xsd_test_OBJECTS) $(xsd_test_LDADD) $(LIBS)
-+	$(xsd_test_LINK) $(xsd_test_OBJECTS) $(xsd_test_LDADD) $(LIBS)
+ 	$(abstractlatlonbox_test_LINK) $(abstractlatlonbox_test_OBJECTS) $(abstractlatlonbox_test_LDADD) $(LIBS)
+@@ -1481,707 +1508,707 @@
  
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -1329,708 +1507,708 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/xsd_test-xsd_test.Po at am__quote@
- 
  .cc.o:
-- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
  
  .cc.obj:
-- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
  
  .cc.lo:
-- at am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
  
  abstractlatlonbox_test-abstractlatlonbox_test.o: abstractlatlonbox_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(abstractlatlonbox_test_CXXFLAGS) $(CXXFLAGS) -MT abstractlatlonbox_test-abstractlatlonbox_test.o -MD -MP -MF "$(DEPDIR)/abstractlatlonbox_test-abstractlatlonbox_test.Tpo" -c -o abstractlatlonbox_test-abstractlatlonbox_test.o `test -f 'abstractlatlonbox_test.cc' || echo '$(srcdir)/'`abstractlatlonbox_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/abstractlatlonbox_test-abstractlatlonbox_test.Tpo" "$(DEPDIR)/abstractlatlonbox_test-abstractlatlonbox_test.Po"; else rm -f "$(DEPDIR)/abstractlatlonbox_test-abstractlatlonbox_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(abstractlatlonbox_test_CXXFLAGS) $(CXXFLAGS) -MT abstractlatlonbox_test-abstractlatlonbox_test.o -MD -MP -MF $(DEPDIR)/abstractlatlonbox_test-abstractlatlonbox_test.Tpo -c -o abstractlatlonbox_test-abstractlatlonbox_test.o `test -f 'abstractlatlonbox_test.cc' || echo '$(srcdir)/'`abstractlatlonbox_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(abstractlatlonbox_test_CXXFLAGS) $(CXXFLAGS) -MT abstractlatlonbox_test-abstractlatlonbox_test.o -MD -MP -MF $(DEPDIR)/abstractlatlonbox_test-abstractlatlonbox_test.Tpo -c -o abstractlatlonbox_test-abstractlatlonbox_test.o `test -f 'abstractlatlonbox_test.cc' || echo '$(srcdir)/'`abstractlatlonbox_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/abstractlatlonbox_test-abstractlatlonbox_test.Tpo $(DEPDIR)/abstractlatlonbox_test-abstractlatlonbox_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/abstractlatlonbox_test-abstractlatlonbox_test.Tpo $(DEPDIR)/abstractlatlonbox_test-abstractlatlonbox_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='abstractlatlonbox_test.cc' object='abstractlatlonbox_test-abstractlatlonbox_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(abstractlatlonbox_test_CXXFLAGS) $(CXXFLAGS) -c -o abstractlatlonbox_test-abstractlatlonbox_test.o `test -f 'abstractlatlonbox_test.cc' || echo '$(srcdir)/'`abstractlatlonbox_test.cc
  
  abstractlatlonbox_test-abstractlatlonbox_test.obj: abstractlatlonbox_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(abstractlatlonbox_test_CXXFLAGS) $(CXXFLAGS) -MT abstractlatlonbox_test-abstractlatlonbox_test.obj -MD -MP -MF "$(DEPDIR)/abstractlatlonbox_test-abstractlatlonbox_test.Tpo" -c -o abstractlatlonbox_test-abstractlatlonbox_test.obj `if test -f 'abstractlatlonbox_test.cc'; then $(CYGPATH_W) 'abstractlatlonbox_test.cc'; else $(CYGPATH_W) '$(srcdir)/abstractlatlonbox_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/abstractlatlonbox_test-abstractlatlonbox_test.Tpo" "$(DEPDIR)/abstractlatlonbox_test-abstractlatlonbox_test.Po"; else rm -f "$(DEPDIR)/abstractlatlonbox_test-abstractlatlonbox_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(abstractlatlonbox_test_CXXFLAGS) $(CXXFLAGS) -MT abstractlatlonbox_test-abstractlatlonbox_test.obj -MD -MP -MF $(DEPDIR)/abstractlatlonbox_test-abstractlatlonbox_test.Tpo -c -o abstractlatlonbox_test-abstractlatlonbox_test.obj `if test -f 'abstractlatlonbox_test.cc'; then $(CYGPATH_W) 'abstractlatlonbox_test.cc'; else $(CYGPATH_W) '$(srcdir)/abstractlatlonbox_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(abstractlatlonbox_test_CXXFLAGS) $(CXXFLAGS) -MT abstractlatlonbox_test-abstractlatlonbox_test.obj -MD -MP -MF $(DEPDIR)/abstractlatlonbox_test-abstractlatlonbox_test.Tpo -c -o abstractlatlonbox_test-abstractlatlonbox_test.obj `if test -f 'abstractlatlonbox_test.cc'; then $(CYGPATH_W) 'abstractlatlonbox_test.cc'; else $(CYGPATH_W) '$(srcdir)/abstractlatlonbox_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/abstractlatlonbox_test-abstractlatlonbox_test.Tpo $(DEPDIR)/abstractlatlonbox_test-abstractlatlonbox_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/abstractlatlonbox_test-abstractlatlonbox_test.Tpo $(DEPDIR)/abstractlatlonbox_test-abstractlatlonbox_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='abstractlatlonbox_test.cc' object='abstractlatlonbox_test-abstractlatlonbox_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(abstractlatlonbox_test_CXXFLAGS) $(CXXFLAGS) -c -o abstractlatlonbox_test-abstractlatlonbox_test.obj `if test -f 'abstractlatlonbox_test.cc'; then $(CYGPATH_W) 'abstractlatlonbox_test.cc'; else $(CYGPATH_W) '$(srcdir)/abstractlatlonbox_test.cc'; fi`
  
  abstractview_test-abstractview_test.o: abstractview_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(abstractview_test_CXXFLAGS) $(CXXFLAGS) -MT abstractview_test-abstractview_test.o -MD -MP -MF "$(DEPDIR)/abstractview_test-abstractview_test.Tpo" -c -o abstractview_test-abstractview_test.o `test -f 'abstractview_test.cc' || echo '$(srcdir)/'`abstractview_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/abstractview_test-abstractview_test.Tpo" "$(DEPDIR)/abstractview_test-abstractview_test.Po"; else rm -f "$(DEPDIR)/abstractview_test-abstractview_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(abstractview_test_CXXFLAGS) $(CXXFLAGS) -MT abstractview_test-abstractview_test.o -MD -MP -MF $(DEPDIR)/abstractview_test-abstractview_test.Tpo -c -o abstractview_test-abstractview_test.o `test -f 'abstractview_test.cc' || echo '$(srcdir)/'`abstractview_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(abstractview_test_CXXFLAGS) $(CXXFLAGS) -MT abstractview_test-abstractview_test.o -MD -MP -MF $(DEPDIR)/abstractview_test-abstractview_test.Tpo -c -o abstractview_test-abstractview_test.o `test -f 'abstractview_test.cc' || echo '$(srcdir)/'`abstractview_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/abstractview_test-abstractview_test.Tpo $(DEPDIR)/abstractview_test-abstractview_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/abstractview_test-abstractview_test.Tpo $(DEPDIR)/abstractview_test-abstractview_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='abstractview_test.cc' object='abstractview_test-abstractview_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(abstractview_test_CXXFLAGS) $(CXXFLAGS) -c -o abstractview_test-abstractview_test.o `test -f 'abstractview_test.cc' || echo '$(srcdir)/'`abstractview_test.cc
  
  abstractview_test-abstractview_test.obj: abstractview_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(abstractview_test_CXXFLAGS) $(CXXFLAGS) -MT abstractview_test-abstractview_test.obj -MD -MP -MF "$(DEPDIR)/abstractview_test-abstractview_test.Tpo" -c -o abstractview_test-abstractview_test.obj `if test -f 'abstractview_test.cc'; then $(CYGPATH_W) 'abstractview_test.cc'; else $(CYGPATH_W) '$(srcdir)/abstractview_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/abstractview_test-abstractview_test.Tpo" "$(DEPDIR)/abstractview_test-abstractview_test.Po"; else rm -f "$(DEPDIR)/abstractview_test-abstractview_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(abstractview_test_CXXFLAGS) $(CXXFLAGS) -MT abstractview_test-abstractview_test.obj -MD -MP -MF $(DEPDIR)/abstractview_test-abstractview_test.Tpo -c -o abstractview_test-abstractview_test.obj `if test -f 'abstractview_test.cc'; then $(CYGPATH_W) 'abstractview_test.cc'; else $(CYGPATH_W) '$(srcdir)/abstractview_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(abstractview_test_CXXFLAGS) $(CXXFLAGS) -MT abstractview_test-abstractview_test.obj -MD -MP -MF $(DEPDIR)/abstractview_test-abstractview_test.Tpo -c -o abstractview_test-abstractview_test.obj `if test -f 'abstractview_test.cc'; then $(CYGPATH_W) 'abstractview_test.cc'; else $(CYGPATH_W) '$(srcdir)/abstractview_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/abstractview_test-abstractview_test.Tpo $(DEPDIR)/abstractview_test-abstractview_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/abstractview_test-abstractview_test.Tpo $(DEPDIR)/abstractview_test-abstractview_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='abstractview_test.cc' object='abstractview_test-abstractview_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(abstractview_test_CXXFLAGS) $(CXXFLAGS) -c -o abstractview_test-abstractview_test.obj `if test -f 'abstractview_test.cc'; then $(CYGPATH_W) 'abstractview_test.cc'; else $(CYGPATH_W) '$(srcdir)/abstractview_test.cc'; fi`
  
  atom_test-atom_test.o: atom_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(atom_test_CXXFLAGS) $(CXXFLAGS) -MT atom_test-atom_test.o -MD -MP -MF "$(DEPDIR)/atom_test-atom_test.Tpo" -c -o atom_test-atom_test.o `test -f 'atom_test.cc' || echo '$(srcdir)/'`atom_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/atom_test-atom_test.Tpo" "$(DEPDIR)/atom_test-atom_test.Po"; else rm -f "$(DEPDIR)/atom_test-atom_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(atom_test_CXXFLAGS) $(CXXFLAGS) -MT atom_test-atom_test.o -MD -MP -MF $(DEPDIR)/atom_test-atom_test.Tpo -c -o atom_test-atom_test.o `test -f 'atom_test.cc' || echo '$(srcdir)/'`atom_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(atom_test_CXXFLAGS) $(CXXFLAGS) -MT atom_test-atom_test.o -MD -MP -MF $(DEPDIR)/atom_test-atom_test.Tpo -c -o atom_test-atom_test.o `test -f 'atom_test.cc' || echo '$(srcdir)/'`atom_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/atom_test-atom_test.Tpo $(DEPDIR)/atom_test-atom_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/atom_test-atom_test.Tpo $(DEPDIR)/atom_test-atom_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='atom_test.cc' object='atom_test-atom_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(atom_test_CXXFLAGS) $(CXXFLAGS) -c -o atom_test-atom_test.o `test -f 'atom_test.cc' || echo '$(srcdir)/'`atom_test.cc
  
  atom_test-atom_test.obj: atom_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(atom_test_CXXFLAGS) $(CXXFLAGS) -MT atom_test-atom_test.obj -MD -MP -MF "$(DEPDIR)/atom_test-atom_test.Tpo" -c -o atom_test-atom_test.obj `if test -f 'atom_test.cc'; then $(CYGPATH_W) 'atom_test.cc'; else $(CYGPATH_W) '$(srcdir)/atom_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/atom_test-atom_test.Tpo" "$(DEPDIR)/atom_test-atom_test.Po"; else rm -f "$(DEPDIR)/atom_test-atom_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(atom_test_CXXFLAGS) $(CXXFLAGS) -MT atom_test-atom_test.obj -MD -MP -MF $(DEPDIR)/atom_test-atom_test.Tpo -c -o atom_test-atom_test.obj `if test -f 'atom_test.cc'; then $(CYGPATH_W) 'atom_test.cc'; else $(CYGPATH_W) '$(srcdir)/atom_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(atom_test_CXXFLAGS) $(CXXFLAGS) -MT atom_test-atom_test.obj -MD -MP -MF $(DEPDIR)/atom_test-atom_test.Tpo -c -o atom_test-atom_test.obj `if test -f 'atom_test.cc'; then $(CYGPATH_W) 'atom_test.cc'; else $(CYGPATH_W) '$(srcdir)/atom_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/atom_test-atom_test.Tpo $(DEPDIR)/atom_test-atom_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/atom_test-atom_test.Tpo $(DEPDIR)/atom_test-atom_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='atom_test.cc' object='atom_test-atom_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(atom_test_CXXFLAGS) $(CXXFLAGS) -c -o atom_test-atom_test.obj `if test -f 'atom_test.cc'; then $(CYGPATH_W) 'atom_test.cc'; else $(CYGPATH_W) '$(srcdir)/atom_test.cc'; fi`
  
  balloonstyle_test-balloonstyle_test.o: balloonstyle_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(balloonstyle_test_CXXFLAGS) $(CXXFLAGS) -MT balloonstyle_test-balloonstyle_test.o -MD -MP -MF "$(DEPDIR)/balloonstyle_test-balloonstyle_test.Tpo" -c -o balloonstyle_test-balloonstyle_test.o `test -f 'balloonstyle_test.cc' || echo '$(srcdir)/'`balloonstyle_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/balloonstyle_test-balloonstyle_test.Tpo" "$(DEPDIR)/balloonstyle_test-balloonstyle_test.Po"; else rm -f "$(DEPDIR)/balloonstyle_test-balloonstyle_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(balloonstyle_test_CXXFLAGS) $(CXXFLAGS) -MT balloonstyle_test-balloonstyle_test.o -MD -MP -MF $(DEPDIR)/balloonstyle_test-balloonstyle_test.Tpo -c -o balloonstyle_test-balloonstyle_test.o `test -f 'balloonstyle_test.cc' || echo '$(srcdir)/'`balloonstyle_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(balloonstyle_test_CXXFLAGS) $(CXXFLAGS) -MT balloonstyle_test-balloonstyle_test.o -MD -MP -MF $(DEPDIR)/balloonstyle_test-balloonstyle_test.Tpo -c -o balloonstyle_test-balloonstyle_test.o `test -f 'balloonstyle_test.cc' || echo '$(srcdir)/'`balloonstyle_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/balloonstyle_test-balloonstyle_test.Tpo $(DEPDIR)/balloonstyle_test-balloonstyle_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/balloonstyle_test-balloonstyle_test.Tpo $(DEPDIR)/balloonstyle_test-balloonstyle_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='balloonstyle_test.cc' object='balloonstyle_test-balloonstyle_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(balloonstyle_test_CXXFLAGS) $(CXXFLAGS) -c -o balloonstyle_test-balloonstyle_test.o `test -f 'balloonstyle_test.cc' || echo '$(srcdir)/'`balloonstyle_test.cc
  
  balloonstyle_test-balloonstyle_test.obj: balloonstyle_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(balloonstyle_test_CXXFLAGS) $(CXXFLAGS) -MT balloonstyle_test-balloonstyle_test.obj -MD -MP -MF "$(DEPDIR)/balloonstyle_test-balloonstyle_test.Tpo" -c -o balloonstyle_test-balloonstyle_test.obj `if test -f 'balloonstyle_test.cc'; then $(CYGPATH_W) 'balloonstyle_test.cc'; else $(CYGPATH_W) '$(srcdir)/balloonstyle_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/balloonstyle_test-balloonstyle_test.Tpo" "$(DEPDIR)/balloonstyle_test-balloonstyle_test.Po"; else rm -f "$(DEPDIR)/balloonstyle_test-balloonstyle_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(balloonstyle_test_CXXFLAGS) $(CXXFLAGS) -MT balloonstyle_test-balloonstyle_test.obj -MD -MP -MF $(DEPDIR)/balloonstyle_test-balloonstyle_test.Tpo -c -o balloonstyle_test-balloonstyle_test.obj `if test -f 'balloonstyle_test.cc'; then $(CYGPATH_W) 'balloonstyle_test.cc'; else $(CYGPATH_W) '$(srcdir)/balloonstyle_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(balloonstyle_test_CXXFLAGS) $(CXXFLAGS) -MT balloonstyle_test-balloonstyle_test.obj -MD -MP -MF $(DEPDIR)/balloonstyle_test-balloonstyle_test.Tpo -c -o balloonstyle_test-balloonstyle_test.obj `if test -f 'balloonstyle_test.cc'; then $(CYGPATH_W) 'balloonstyle_test.cc'; else $(CYGPATH_W) '$(srcdir)/balloonstyle_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/balloonstyle_test-balloonstyle_test.Tpo $(DEPDIR)/balloonstyle_test-balloonstyle_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/balloonstyle_test-balloonstyle_test.Tpo $(DEPDIR)/balloonstyle_test-balloonstyle_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='balloonstyle_test.cc' object='balloonstyle_test-balloonstyle_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(balloonstyle_test_CXXFLAGS) $(CXXFLAGS) -c -o balloonstyle_test-balloonstyle_test.obj `if test -f 'balloonstyle_test.cc'; then $(CYGPATH_W) 'balloonstyle_test.cc'; else $(CYGPATH_W) '$(srcdir)/balloonstyle_test.cc'; fi`
  
  colorstyle_test-colorstyle_test.o: colorstyle_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(colorstyle_test_CXXFLAGS) $(CXXFLAGS) -MT colorstyle_test-colorstyle_test.o -MD -MP -MF "$(DEPDIR)/colorstyle_test-colorstyle_test.Tpo" -c -o colorstyle_test-colorstyle_test.o `test -f 'colorstyle_test.cc' || echo '$(srcdir)/'`colorstyle_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/colorstyle_test-colorstyle_test.Tpo" "$(DEPDIR)/colorstyle_test-colorstyle_test.Po"; else rm -f "$(DEPDIR)/colorstyle_test-colorstyle_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(colorstyle_test_CXXFLAGS) $(CXXFLAGS) -MT colorstyle_test-colorstyle_test.o -MD -MP -MF $(DEPDIR)/colorstyle_test-colorstyle_test.Tpo -c -o colorstyle_test-colorstyle_test.o `test -f 'colorstyle_test.cc' || echo '$(srcdir)/'`colorstyle_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(colorstyle_test_CXXFLAGS) $(CXXFLAGS) -MT colorstyle_test-colorstyle_test.o -MD -MP -MF $(DEPDIR)/colorstyle_test-colorstyle_test.Tpo -c -o colorstyle_test-colorstyle_test.o `test -f 'colorstyle_test.cc' || echo '$(srcdir)/'`colorstyle_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/colorstyle_test-colorstyle_test.Tpo $(DEPDIR)/colorstyle_test-colorstyle_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/colorstyle_test-colorstyle_test.Tpo $(DEPDIR)/colorstyle_test-colorstyle_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='colorstyle_test.cc' object='colorstyle_test-colorstyle_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(colorstyle_test_CXXFLAGS) $(CXXFLAGS) -c -o colorstyle_test-colorstyle_test.o `test -f 'colorstyle_test.cc' || echo '$(srcdir)/'`colorstyle_test.cc
  
  colorstyle_test-colorstyle_test.obj: colorstyle_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(colorstyle_test_CXXFLAGS) $(CXXFLAGS) -MT colorstyle_test-colorstyle_test.obj -MD -MP -MF "$(DEPDIR)/colorstyle_test-colorstyle_test.Tpo" -c -o colorstyle_test-colorstyle_test.obj `if test -f 'colorstyle_test.cc'; then $(CYGPATH_W) 'colorstyle_test.cc'; else $(CYGPATH_W) '$(srcdir)/colorstyle_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/colorstyle_test-colorstyle_test.Tpo" "$(DEPDIR)/colorstyle_test-colorstyle_test.Po"; else rm -f "$(DEPDIR)/colorstyle_test-colorstyle_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(colorstyle_test_CXXFLAGS) $(CXXFLAGS) -MT colorstyle_test-colorstyle_test.obj -MD -MP -MF $(DEPDIR)/colorstyle_test-colorstyle_test.Tpo -c -o colorstyle_test-colorstyle_test.obj `if test -f 'colorstyle_test.cc'; then $(CYGPATH_W) 'colorstyle_test.cc'; else $(CYGPATH_W) '$(srcdir)/colorstyle_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(colorstyle_test_CXXFLAGS) $(CXXFLAGS) -MT colorstyle_test-colorstyle_test.obj -MD -MP -MF $(DEPDIR)/colorstyle_test-colorstyle_test.Tpo -c -o colorstyle_test-colorstyle_test.obj `if test -f 'colorstyle_test.cc'; then $(CYGPATH_W) 'colorstyle_test.cc'; else $(CYGPATH_W) '$(srcdir)/colorstyle_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/colorstyle_test-colorstyle_test.Tpo $(DEPDIR)/colorstyle_test-colorstyle_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/colorstyle_test-colorstyle_test.Tpo $(DEPDIR)/colorstyle_test-colorstyle_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='colorstyle_test.cc' object='colorstyle_test-colorstyle_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(colorstyle_test_CXXFLAGS) $(CXXFLAGS) -c -o colorstyle_test-colorstyle_test.obj `if test -f 'colorstyle_test.cc'; then $(CYGPATH_W) 'colorstyle_test.cc'; else $(CYGPATH_W) '$(srcdir)/colorstyle_test.cc'; fi`
  
  container_test-container_test.o: container_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(container_test_CXXFLAGS) $(CXXFLAGS) -MT container_test-container_test.o -MD -MP -MF "$(DEPDIR)/container_test-container_test.Tpo" -c -o container_test-container_test.o `test -f 'container_test.cc' || echo '$(srcdir)/'`container_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/container_test-container_test.Tpo" "$(DEPDIR)/container_test-container_test.Po"; else rm -f "$(DEPDIR)/container_test-container_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(container_test_CXXFLAGS) $(CXXFLAGS) -MT container_test-container_test.o -MD -MP -MF $(DEPDIR)/container_test-container_test.Tpo -c -o container_test-container_test.o `test -f 'container_test.cc' || echo '$(srcdir)/'`container_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(container_test_CXXFLAGS) $(CXXFLAGS) -MT container_test-container_test.o -MD -MP -MF $(DEPDIR)/container_test-container_test.Tpo -c -o container_test-container_test.o `test -f 'container_test.cc' || echo '$(srcdir)/'`container_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/container_test-container_test.Tpo $(DEPDIR)/container_test-container_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/container_test-container_test.Tpo $(DEPDIR)/container_test-container_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='container_test.cc' object='container_test-container_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(container_test_CXXFLAGS) $(CXXFLAGS) -c -o container_test-container_test.o `test -f 'container_test.cc' || echo '$(srcdir)/'`container_test.cc
  
  container_test-container_test.obj: container_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(container_test_CXXFLAGS) $(CXXFLAGS) -MT container_test-container_test.obj -MD -MP -MF "$(DEPDIR)/container_test-container_test.Tpo" -c -o container_test-container_test.obj `if test -f 'container_test.cc'; then $(CYGPATH_W) 'container_test.cc'; else $(CYGPATH_W) '$(srcdir)/container_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/container_test-container_test.Tpo" "$(DEPDIR)/container_test-container_test.Po"; else rm -f "$(DEPDIR)/container_test-container_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(container_test_CXXFLAGS) $(CXXFLAGS) -MT container_test-container_test.obj -MD -MP -MF $(DEPDIR)/container_test-container_test.Tpo -c -o container_test-container_test.obj `if test -f 'container_test.cc'; then $(CYGPATH_W) 'container_test.cc'; else $(CYGPATH_W) '$(srcdir)/container_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(container_test_CXXFLAGS) $(CXXFLAGS) -MT container_test-container_test.obj -MD -MP -MF $(DEPDIR)/container_test-container_test.Tpo -c -o container_test-container_test.obj `if test -f 'container_test.cc'; then $(CYGPATH_W) 'container_test.cc'; else $(CYGPATH_W) '$(srcdir)/container_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/container_test-container_test.Tpo $(DEPDIR)/container_test-container_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/container_test-container_test.Tpo $(DEPDIR)/container_test-container_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='container_test.cc' object='container_test-container_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(container_test_CXXFLAGS) $(CXXFLAGS) -c -o container_test-container_test.obj `if test -f 'container_test.cc'; then $(CYGPATH_W) 'container_test.cc'; else $(CYGPATH_W) '$(srcdir)/container_test.cc'; fi`
  
  document_test-document_test.o: document_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(document_test_CXXFLAGS) $(CXXFLAGS) -MT document_test-document_test.o -MD -MP -MF "$(DEPDIR)/document_test-document_test.Tpo" -c -o document_test-document_test.o `test -f 'document_test.cc' || echo '$(srcdir)/'`document_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/document_test-document_test.Tpo" "$(DEPDIR)/document_test-document_test.Po"; else rm -f "$(DEPDIR)/document_test-document_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(document_test_CXXFLAGS) $(CXXFLAGS) -MT document_test-document_test.o -MD -MP -MF $(DEPDIR)/document_test-document_test.Tpo -c -o document_test-document_test.o `test -f 'document_test.cc' || echo '$(srcdir)/'`document_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(document_test_CXXFLAGS) $(CXXFLAGS) -MT document_test-document_test.o -MD -MP -MF $(DEPDIR)/document_test-document_test.Tpo -c -o document_test-document_test.o `test -f 'document_test.cc' || echo '$(srcdir)/'`document_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/document_test-document_test.Tpo $(DEPDIR)/document_test-document_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/document_test-document_test.Tpo $(DEPDIR)/document_test-document_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='document_test.cc' object='document_test-document_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(document_test_CXXFLAGS) $(CXXFLAGS) -c -o document_test-document_test.o `test -f 'document_test.cc' || echo '$(srcdir)/'`document_test.cc
  
  document_test-document_test.obj: document_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(document_test_CXXFLAGS) $(CXXFLAGS) -MT document_test-document_test.obj -MD -MP -MF "$(DEPDIR)/document_test-document_test.Tpo" -c -o document_test-document_test.obj `if test -f 'document_test.cc'; then $(CYGPATH_W) 'document_test.cc'; else $(CYGPATH_W) '$(srcdir)/document_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/document_test-document_test.Tpo" "$(DEPDIR)/document_test-document_test.Po"; else rm -f "$(DEPDIR)/document_test-document_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(document_test_CXXFLAGS) $(CXXFLAGS) -MT document_test-document_test.obj -MD -MP -MF $(DEPDIR)/document_test-document_test.Tpo -c -o document_test-document_test.obj `if test -f 'document_test.cc'; then $(CYGPATH_W) 'document_test.cc'; else $(CYGPATH_W) '$(srcdir)/document_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(document_test_CXXFLAGS) $(CXXFLAGS) -MT document_test-document_test.obj -MD -MP -MF $(DEPDIR)/document_test-document_test.Tpo -c -o document_test-document_test.obj `if test -f 'document_test.cc'; then $(CYGPATH_W) 'document_test.cc'; else $(CYGPATH_W) '$(srcdir)/document_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/document_test-document_test.Tpo $(DEPDIR)/document_test-document_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/document_test-document_test.Tpo $(DEPDIR)/document_test-document_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='document_test.cc' object='document_test-document_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(document_test_CXXFLAGS) $(CXXFLAGS) -c -o document_test-document_test.obj `if test -f 'document_test.cc'; then $(CYGPATH_W) 'document_test.cc'; else $(CYGPATH_W) '$(srcdir)/document_test.cc'; fi`
  
  element_test-element_test.o: element_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(element_test_CXXFLAGS) $(CXXFLAGS) -MT element_test-element_test.o -MD -MP -MF "$(DEPDIR)/element_test-element_test.Tpo" -c -o element_test-element_test.o `test -f 'element_test.cc' || echo '$(srcdir)/'`element_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/element_test-element_test.Tpo" "$(DEPDIR)/element_test-element_test.Po"; else rm -f "$(DEPDIR)/element_test-element_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(element_test_CXXFLAGS) $(CXXFLAGS) -MT element_test-element_test.o -MD -MP -MF $(DEPDIR)/element_test-element_test.Tpo -c -o element_test-element_test.o `test -f 'element_test.cc' || echo '$(srcdir)/'`element_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(element_test_CXXFLAGS) $(CXXFLAGS) -MT element_test-element_test.o -MD -MP -MF $(DEPDIR)/element_test-element_test.Tpo -c -o element_test-element_test.o `test -f 'element_test.cc' || echo '$(srcdir)/'`element_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/element_test-element_test.Tpo $(DEPDIR)/element_test-element_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/element_test-element_test.Tpo $(DEPDIR)/element_test-element_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='element_test.cc' object='element_test-element_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(element_test_CXXFLAGS) $(CXXFLAGS) -c -o element_test-element_test.o `test -f 'element_test.cc' || echo '$(srcdir)/'`element_test.cc
  
  element_test-element_test.obj: element_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(element_test_CXXFLAGS) $(CXXFLAGS) -MT element_test-element_test.obj -MD -MP -MF "$(DEPDIR)/element_test-element_test.Tpo" -c -o element_test-element_test.obj `if test -f 'element_test.cc'; then $(CYGPATH_W) 'element_test.cc'; else $(CYGPATH_W) '$(srcdir)/element_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/element_test-element_test.Tpo" "$(DEPDIR)/element_test-element_test.Po"; else rm -f "$(DEPDIR)/element_test-element_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(element_test_CXXFLAGS) $(CXXFLAGS) -MT element_test-element_test.obj -MD -MP -MF $(DEPDIR)/element_test-element_test.Tpo -c -o element_test-element_test.obj `if test -f 'element_test.cc'; then $(CYGPATH_W) 'element_test.cc'; else $(CYGPATH_W) '$(srcdir)/element_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(element_test_CXXFLAGS) $(CXXFLAGS) -MT element_test-element_test.obj -MD -MP -MF $(DEPDIR)/element_test-element_test.Tpo -c -o element_test-element_test.obj `if test -f 'element_test.cc'; then $(CYGPATH_W) 'element_test.cc'; else $(CYGPATH_W) '$(srcdir)/element_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/element_test-element_test.Tpo $(DEPDIR)/element_test-element_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/element_test-element_test.Tpo $(DEPDIR)/element_test-element_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='element_test.cc' object='element_test-element_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(element_test_CXXFLAGS) $(CXXFLAGS) -c -o element_test-element_test.obj `if test -f 'element_test.cc'; then $(CYGPATH_W) 'element_test.cc'; else $(CYGPATH_W) '$(srcdir)/element_test.cc'; fi`
  
  extendeddata_test-extendeddata_test.o: extendeddata_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(extendeddata_test_CXXFLAGS) $(CXXFLAGS) -MT extendeddata_test-extendeddata_test.o -MD -MP -MF "$(DEPDIR)/extendeddata_test-extendeddata_test.Tpo" -c -o extendeddata_test-extendeddata_test.o `test -f 'extendeddata_test.cc' || echo '$(srcdir)/'`extendeddata_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/extendeddata_test-extendeddata_test.Tpo" "$(DEPDIR)/extendeddata_test-extendeddata_test.Po"; else rm -f "$(DEPDIR)/extendeddata_test-extendeddata_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(extendeddata_test_CXXFLAGS) $(CXXFLAGS) -MT extendeddata_test-extendeddata_test.o -MD -MP -MF $(DEPDIR)/extendeddata_test-extendeddata_test.Tpo -c -o extendeddata_test-extendeddata_test.o `test -f 'extendeddata_test.cc' || echo '$(srcdir)/'`extendeddata_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(extendeddata_test_CXXFLAGS) $(CXXFLAGS) -MT extendeddata_test-extendeddata_test.o -MD -MP -MF $(DEPDIR)/extendeddata_test-extendeddata_test.Tpo -c -o extendeddata_test-extendeddata_test.o `test -f 'extendeddata_test.cc' || echo '$(srcdir)/'`extendeddata_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/extendeddata_test-extendeddata_test.Tpo $(DEPDIR)/extendeddata_test-extendeddata_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/extendeddata_test-extendeddata_test.Tpo $(DEPDIR)/extendeddata_test-extendeddata_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='extendeddata_test.cc' object='extendeddata_test-extendeddata_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(extendeddata_test_CXXFLAGS) $(CXXFLAGS) -c -o extendeddata_test-extendeddata_test.o `test -f 'extendeddata_test.cc' || echo '$(srcdir)/'`extendeddata_test.cc
  
  extendeddata_test-extendeddata_test.obj: extendeddata_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(extendeddata_test_CXXFLAGS) $(CXXFLAGS) -MT extendeddata_test-extendeddata_test.obj -MD -MP -MF "$(DEPDIR)/extendeddata_test-extendeddata_test.Tpo" -c -o extendeddata_test-extendeddata_test.obj `if test -f 'extendeddata_test.cc'; then $(CYGPATH_W) 'extendeddata_test.cc'; else $(CYGPATH_W) '$(srcdir)/extendeddata_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/extendeddata_test-extendeddata_test.Tpo" "$(DEPDIR)/extendeddata_test-extendeddata_test.Po"; else rm -f "$(DEPDIR)/extendeddata_test-extendeddata_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(extendeddata_test_CXXFLAGS) $(CXXFLAGS) -MT extendeddata_test-extendeddata_test.obj -MD -MP -MF $(DEPDIR)/extendeddata_test-extendeddata_test.Tpo -c -o extendeddata_test-extendeddata_test.obj `if test -f 'extendeddata_test.cc'; then $(CYGPATH_W) 'extendeddata_test.cc'; else $(CYGPATH_W) '$(srcdir)/extendeddata_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(extendeddata_test_CXXFLAGS) $(CXXFLAGS) -MT extendeddata_test-extendeddata_test.obj -MD -MP -MF $(DEPDIR)/extendeddata_test-extendeddata_test.Tpo -c -o extendeddata_test-extendeddata_test.obj `if test -f 'extendeddata_test.cc'; then $(CYGPATH_W) 'extendeddata_test.cc'; else $(CYGPATH_W) '$(srcdir)/extendeddata_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/extendeddata_test-extendeddata_test.Tpo $(DEPDIR)/extendeddata_test-extendeddata_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/extendeddata_test-extendeddata_test.Tpo $(DEPDIR)/extendeddata_test-extendeddata_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='extendeddata_test.cc' object='extendeddata_test-extendeddata_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(extendeddata_test_CXXFLAGS) $(CXXFLAGS) -c -o extendeddata_test-extendeddata_test.obj `if test -f 'extendeddata_test.cc'; then $(CYGPATH_W) 'extendeddata_test.cc'; else $(CYGPATH_W) '$(srcdir)/extendeddata_test.cc'; fi`
  
  feature_test-feature_test.o: feature_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(feature_test_CXXFLAGS) $(CXXFLAGS) -MT feature_test-feature_test.o -MD -MP -MF "$(DEPDIR)/feature_test-feature_test.Tpo" -c -o feature_test-feature_test.o `test -f 'feature_test.cc' || echo '$(srcdir)/'`feature_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/feature_test-feature_test.Tpo" "$(DEPDIR)/feature_test-feature_test.Po"; else rm -f "$(DEPDIR)/feature_test-feature_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(feature_test_CXXFLAGS) $(CXXFLAGS) -MT feature_test-feature_test.o -MD -MP -MF $(DEPDIR)/feature_test-feature_test.Tpo -c -o feature_test-feature_test.o `test -f 'feature_test.cc' || echo '$(srcdir)/'`feature_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(feature_test_CXXFLAGS) $(CXXFLAGS) -MT feature_test-feature_test.o -MD -MP -MF $(DEPDIR)/feature_test-feature_test.Tpo -c -o feature_test-feature_test.o `test -f 'feature_test.cc' || echo '$(srcdir)/'`feature_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/feature_test-feature_test.Tpo $(DEPDIR)/feature_test-feature_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/feature_test-feature_test.Tpo $(DEPDIR)/feature_test-feature_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='feature_test.cc' object='feature_test-feature_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(feature_test_CXXFLAGS) $(CXXFLAGS) -c -o feature_test-feature_test.o `test -f 'feature_test.cc' || echo '$(srcdir)/'`feature_test.cc
  
  feature_test-feature_test.obj: feature_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(feature_test_CXXFLAGS) $(CXXFLAGS) -MT feature_test-feature_test.obj -MD -MP -MF "$(DEPDIR)/feature_test-feature_test.Tpo" -c -o feature_test-feature_test.obj `if test -f 'feature_test.cc'; then $(CYGPATH_W) 'feature_test.cc'; else $(CYGPATH_W) '$(srcdir)/feature_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/feature_test-feature_test.Tpo" "$(DEPDIR)/feature_test-feature_test.Po"; else rm -f "$(DEPDIR)/feature_test-feature_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(feature_test_CXXFLAGS) $(CXXFLAGS) -MT feature_test-feature_test.obj -MD -MP -MF $(DEPDIR)/feature_test-feature_test.Tpo -c -o feature_test-feature_test.obj `if test -f 'feature_test.cc'; then $(CYGPATH_W) 'feature_test.cc'; else $(CYGPATH_W) '$(srcdir)/feature_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(feature_test_CXXFLAGS) $(CXXFLAGS) -MT feature_test-feature_test.obj -MD -MP -MF $(DEPDIR)/feature_test-feature_test.Tpo -c -o feature_test-feature_test.obj `if test -f 'feature_test.cc'; then $(CYGPATH_W) 'feature_test.cc'; else $(CYGPATH_W) '$(srcdir)/feature_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/feature_test-feature_test.Tpo $(DEPDIR)/feature_test-feature_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/feature_test-feature_test.Tpo $(DEPDIR)/feature_test-feature_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='feature_test.cc' object='feature_test-feature_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(feature_test_CXXFLAGS) $(CXXFLAGS) -c -o feature_test-feature_test.obj `if test -f 'feature_test.cc'; then $(CYGPATH_W) 'feature_test.cc'; else $(CYGPATH_W) '$(srcdir)/feature_test.cc'; fi`
  
  folder_test-folder_test.o: folder_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(folder_test_CXXFLAGS) $(CXXFLAGS) -MT folder_test-folder_test.o -MD -MP -MF "$(DEPDIR)/folder_test-folder_test.Tpo" -c -o folder_test-folder_test.o `test -f 'folder_test.cc' || echo '$(srcdir)/'`folder_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/folder_test-folder_test.Tpo" "$(DEPDIR)/folder_test-folder_test.Po"; else rm -f "$(DEPDIR)/folder_test-folder_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(folder_test_CXXFLAGS) $(CXXFLAGS) -MT folder_test-folder_test.o -MD -MP -MF $(DEPDIR)/folder_test-folder_test.Tpo -c -o folder_test-folder_test.o `test -f 'folder_test.cc' || echo '$(srcdir)/'`folder_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(folder_test_CXXFLAGS) $(CXXFLAGS) -MT folder_test-folder_test.o -MD -MP -MF $(DEPDIR)/folder_test-folder_test.Tpo -c -o folder_test-folder_test.o `test -f 'folder_test.cc' || echo '$(srcdir)/'`folder_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/folder_test-folder_test.Tpo $(DEPDIR)/folder_test-folder_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/folder_test-folder_test.Tpo $(DEPDIR)/folder_test-folder_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='folder_test.cc' object='folder_test-folder_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(folder_test_CXXFLAGS) $(CXXFLAGS) -c -o folder_test-folder_test.o `test -f 'folder_test.cc' || echo '$(srcdir)/'`folder_test.cc
  
  folder_test-folder_test.obj: folder_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(folder_test_CXXFLAGS) $(CXXFLAGS) -MT folder_test-folder_test.obj -MD -MP -MF "$(DEPDIR)/folder_test-folder_test.Tpo" -c -o folder_test-folder_test.obj `if test -f 'folder_test.cc'; then $(CYGPATH_W) 'folder_test.cc'; else $(CYGPATH_W) '$(srcdir)/folder_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/folder_test-folder_test.Tpo" "$(DEPDIR)/folder_test-folder_test.Po"; else rm -f "$(DEPDIR)/folder_test-folder_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(folder_test_CXXFLAGS) $(CXXFLAGS) -MT folder_test-folder_test.obj -MD -MP -MF $(DEPDIR)/folder_test-folder_test.Tpo -c -o folder_test-folder_test.obj `if test -f 'folder_test.cc'; then $(CYGPATH_W) 'folder_test.cc'; else $(CYGPATH_W) '$(srcdir)/folder_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(folder_test_CXXFLAGS) $(CXXFLAGS) -MT folder_test-folder_test.obj -MD -MP -MF $(DEPDIR)/folder_test-folder_test.Tpo -c -o folder_test-folder_test.obj `if test -f 'folder_test.cc'; then $(CYGPATH_W) 'folder_test.cc'; else $(CYGPATH_W) '$(srcdir)/folder_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/folder_test-folder_test.Tpo $(DEPDIR)/folder_test-folder_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/folder_test-folder_test.Tpo $(DEPDIR)/folder_test-folder_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='folder_test.cc' object='folder_test-folder_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(folder_test_CXXFLAGS) $(CXXFLAGS) -c -o folder_test-folder_test.obj `if test -f 'folder_test.cc'; then $(CYGPATH_W) 'folder_test.cc'; else $(CYGPATH_W) '$(srcdir)/folder_test.cc'; fi`
  
  geometry_test-geometry_test.o: geometry_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(geometry_test_CXXFLAGS) $(CXXFLAGS) -MT geometry_test-geometry_test.o -MD -MP -MF "$(DEPDIR)/geometry_test-geometry_test.Tpo" -c -o geometry_test-geometry_test.o `test -f 'geometry_test.cc' || echo '$(srcdir)/'`geometry_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/geometry_test-geometry_test.Tpo" "$(DEPDIR)/geometry_test-geometry_test.Po"; else rm -f "$(DEPDIR)/geometry_test-geometry_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(geometry_test_CXXFLAGS) $(CXXFLAGS) -MT geometry_test-geometry_test.o -MD -MP -MF $(DEPDIR)/geometry_test-geometry_test.Tpo -c -o geometry_test-geometry_test.o `test -f 'geometry_test.cc' || echo '$(srcdir)/'`geometry_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(geometry_test_CXXFLAGS) $(CXXFLAGS) -MT geometry_test-geometry_test.o -MD -MP -MF $(DEPDIR)/geometry_test-geometry_test.Tpo -c -o geometry_test-geometry_test.o `test -f 'geometry_test.cc' || echo '$(srcdir)/'`geometry_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/geometry_test-geometry_test.Tpo $(DEPDIR)/geometry_test-geometry_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/geometry_test-geometry_test.Tpo $(DEPDIR)/geometry_test-geometry_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='geometry_test.cc' object='geometry_test-geometry_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(geometry_test_CXXFLAGS) $(CXXFLAGS) -c -o geometry_test-geometry_test.o `test -f 'geometry_test.cc' || echo '$(srcdir)/'`geometry_test.cc
  
  geometry_test-geometry_test.obj: geometry_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(geometry_test_CXXFLAGS) $(CXXFLAGS) -MT geometry_test-geometry_test.obj -MD -MP -MF "$(DEPDIR)/geometry_test-geometry_test.Tpo" -c -o geometry_test-geometry_test.obj `if test -f 'geometry_test.cc'; then $(CYGPATH_W) 'geometry_test.cc'; else $(CYGPATH_W) '$(srcdir)/geometry_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/geometry_test-geometry_test.Tpo" "$(DEPDIR)/geometry_test-geometry_test.Po"; else rm -f "$(DEPDIR)/geometry_test-geometry_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(geometry_test_CXXFLAGS) $(CXXFLAGS) -MT geometry_test-geometry_test.obj -MD -MP -MF $(DEPDIR)/geometry_test-geometry_test.Tpo -c -o geometry_test-geometry_test.obj `if test -f 'geometry_test.cc'; then $(CYGPATH_W) 'geometry_test.cc'; else $(CYGPATH_W) '$(srcdir)/geometry_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(geometry_test_CXXFLAGS) $(CXXFLAGS) -MT geometry_test-geometry_test.obj -MD -MP -MF $(DEPDIR)/geometry_test-geometry_test.Tpo -c -o geometry_test-geometry_test.obj `if test -f 'geometry_test.cc'; then $(CYGPATH_W) 'geometry_test.cc'; else $(CYGPATH_W) '$(srcdir)/geometry_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/geometry_test-geometry_test.Tpo $(DEPDIR)/geometry_test-geometry_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/geometry_test-geometry_test.Tpo $(DEPDIR)/geometry_test-geometry_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='geometry_test.cc' object='geometry_test-geometry_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(geometry_test_CXXFLAGS) $(CXXFLAGS) -c -o geometry_test-geometry_test.obj `if test -f 'geometry_test.cc'; then $(CYGPATH_W) 'geometry_test.cc'; else $(CYGPATH_W) '$(srcdir)/geometry_test.cc'; fi`
  
  gx_timeprimitive_test-gx_timeprimitive_test.o: gx_timeprimitive_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gx_timeprimitive_test_CXXFLAGS) $(CXXFLAGS) -MT gx_timeprimitive_test-gx_timeprimitive_test.o -MD -MP -MF "$(DEPDIR)/gx_timeprimitive_test-gx_timeprimitive_test.Tpo" -c -o gx_timeprimitive_test-gx_timeprimitive_test.o `test -f 'gx_timeprimitive_test.cc' || echo '$(srcdir)/'`gx_timeprimitive_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/gx_timeprimitive_test-gx_timeprimitive_test.Tpo" "$(DEPDIR)/gx_timeprimitive_test-gx_timeprimitive_test.Po"; else rm -f "$(DEPDIR)/gx_timeprimitive_test-gx_timeprimitive_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gx_timeprimitive_test_CXXFLAGS) $(CXXFLAGS) -MT gx_timeprimitive_test-gx_timeprimitive_test.o -MD -MP -MF $(DEPDIR)/gx_timeprimitive_test-gx_timeprimitive_test.Tpo -c -o gx_timeprimitive_test-gx_timeprimitive_test.o `test -f 'gx_timeprimitive_test.cc' || echo '$(srcdir)/'`gx_timeprimitive_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gx_timeprimitive_test_CXXFLAGS) $(CXXFLAGS) -MT gx_timeprimitive_test-gx_timeprimitive_test.o -MD -MP -MF $(DEPDIR)/gx_timeprimitive_test-gx_timeprimitive_test.Tpo -c -o gx_timeprimitive_test-gx_timeprimitive_test.o `test -f 'gx_timeprimitive_test.cc' || echo '$(srcdir)/'`gx_timeprimitive_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/gx_timeprimitive_test-gx_timeprimitive_test.Tpo $(DEPDIR)/gx_timeprimitive_test-gx_timeprimitive_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/gx_timeprimitive_test-gx_timeprimitive_test.Tpo $(DEPDIR)/gx_timeprimitive_test-gx_timeprimitive_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gx_timeprimitive_test.cc' object='gx_timeprimitive_test-gx_timeprimitive_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gx_timeprimitive_test_CXXFLAGS) $(CXXFLAGS) -c -o gx_timeprimitive_test-gx_timeprimitive_test.o `test -f 'gx_timeprimitive_test.cc' || echo '$(srcdir)/'`gx_timeprimitive_test.cc
  
  gx_timeprimitive_test-gx_timeprimitive_test.obj: gx_timeprimitive_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gx_timeprimitive_test_CXXFLAGS) $(CXXFLAGS) -MT gx_timeprimitive_test-gx_timeprimitive_test.obj -MD -MP -MF "$(DEPDIR)/gx_timeprimitive_test-gx_timeprimitive_test.Tpo" -c -o gx_timeprimitive_test-gx_timeprimitive_test.obj `if test -f 'gx_timeprimitive_test.cc'; then $(CYGPATH_W) 'gx_timeprimitive_test.cc'; else $(CYGPATH_W) '$(srcdir)/gx_timeprimitive_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/gx_timeprimitive_test-gx_timeprimitive_test.Tpo" "$(DEPDIR)/gx_timeprimitive_test-gx_timeprimitive_test.Po"; else rm -f "$(DEPDIR)/gx_timeprimitive_test-gx_timeprimitive_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gx_timeprimitive_test_CXXFLAGS) $(CXXFLAGS) -MT gx_timeprimitive_test-gx_timeprimitive_test.obj -MD -MP -MF $(DEPDIR)/gx_timeprimitive_test-gx_timeprimitive_test.Tpo -c -o gx_timeprimitive_test-gx_timeprimitive_test.obj `if test -f 'gx_timeprimitive_test.cc'; then $(CYGPATH_W) 'gx_timeprimitive_test.cc'; else $(CYGPATH_W) '$(srcdir)/gx_timeprimitive_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gx_timeprimitive_test_CXXFLAGS) $(CXXFLAGS) -MT gx_timeprimitive_test-gx_timeprimitive_test.obj -MD -MP -MF $(DEPDIR)/gx_timeprimitive_test-gx_timeprimitive_test.Tpo -c -o gx_timeprimitive_test-gx_timeprimitive_test.obj `if test -f 'gx_timeprimitive_test.cc'; then $(CYGPATH_W) 'gx_timeprimitive_test.cc'; else $(CYGPATH_W) '$(srcdir)/gx_timeprimitive_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/gx_timeprimitive_test-gx_timeprimitive_test.Tpo $(DEPDIR)/gx_timeprimitive_test-gx_timeprimitive_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/gx_timeprimitive_test-gx_timeprimitive_test.Tpo $(DEPDIR)/gx_timeprimitive_test-gx_timeprimitive_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gx_timeprimitive_test.cc' object='gx_timeprimitive_test-gx_timeprimitive_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gx_timeprimitive_test_CXXFLAGS) $(CXXFLAGS) -c -o gx_timeprimitive_test-gx_timeprimitive_test.obj `if test -f 'gx_timeprimitive_test.cc'; then $(CYGPATH_W) 'gx_timeprimitive_test.cc'; else $(CYGPATH_W) '$(srcdir)/gx_timeprimitive_test.cc'; fi`
  
  gx_tour_test-gx_tour_test.o: gx_tour_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gx_tour_test_CXXFLAGS) $(CXXFLAGS) -MT gx_tour_test-gx_tour_test.o -MD -MP -MF "$(DEPDIR)/gx_tour_test-gx_tour_test.Tpo" -c -o gx_tour_test-gx_tour_test.o `test -f 'gx_tour_test.cc' || echo '$(srcdir)/'`gx_tour_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/gx_tour_test-gx_tour_test.Tpo" "$(DEPDIR)/gx_tour_test-gx_tour_test.Po"; else rm -f "$(DEPDIR)/gx_tour_test-gx_tour_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gx_tour_test_CXXFLAGS) $(CXXFLAGS) -MT gx_tour_test-gx_tour_test.o -MD -MP -MF $(DEPDIR)/gx_tour_test-gx_tour_test.Tpo -c -o gx_tour_test-gx_tour_test.o `test -f 'gx_tour_test.cc' || echo '$(srcdir)/'`gx_tour_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gx_tour_test_CXXFLAGS) $(CXXFLAGS) -MT gx_tour_test-gx_tour_test.o -MD -MP -MF $(DEPDIR)/gx_tour_test-gx_tour_test.Tpo -c -o gx_tour_test-gx_tour_test.o `test -f 'gx_tour_test.cc' || echo '$(srcdir)/'`gx_tour_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/gx_tour_test-gx_tour_test.Tpo $(DEPDIR)/gx_tour_test-gx_tour_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/gx_tour_test-gx_tour_test.Tpo $(DEPDIR)/gx_tour_test-gx_tour_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gx_tour_test.cc' object='gx_tour_test-gx_tour_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gx_tour_test_CXXFLAGS) $(CXXFLAGS) -c -o gx_tour_test-gx_tour_test.o `test -f 'gx_tour_test.cc' || echo '$(srcdir)/'`gx_tour_test.cc
  
  gx_tour_test-gx_tour_test.obj: gx_tour_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gx_tour_test_CXXFLAGS) $(CXXFLAGS) -MT gx_tour_test-gx_tour_test.obj -MD -MP -MF "$(DEPDIR)/gx_tour_test-gx_tour_test.Tpo" -c -o gx_tour_test-gx_tour_test.obj `if test -f 'gx_tour_test.cc'; then $(CYGPATH_W) 'gx_tour_test.cc'; else $(CYGPATH_W) '$(srcdir)/gx_tour_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/gx_tour_test-gx_tour_test.Tpo" "$(DEPDIR)/gx_tour_test-gx_tour_test.Po"; else rm -f "$(DEPDIR)/gx_tour_test-gx_tour_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gx_tour_test_CXXFLAGS) $(CXXFLAGS) -MT gx_tour_test-gx_tour_test.obj -MD -MP -MF $(DEPDIR)/gx_tour_test-gx_tour_test.Tpo -c -o gx_tour_test-gx_tour_test.obj `if test -f 'gx_tour_test.cc'; then $(CYGPATH_W) 'gx_tour_test.cc'; else $(CYGPATH_W) '$(srcdir)/gx_tour_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gx_tour_test_CXXFLAGS) $(CXXFLAGS) -MT gx_tour_test-gx_tour_test.obj -MD -MP -MF $(DEPDIR)/gx_tour_test-gx_tour_test.Tpo -c -o gx_tour_test-gx_tour_test.obj `if test -f 'gx_tour_test.cc'; then $(CYGPATH_W) 'gx_tour_test.cc'; else $(CYGPATH_W) '$(srcdir)/gx_tour_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/gx_tour_test-gx_tour_test.Tpo $(DEPDIR)/gx_tour_test-gx_tour_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/gx_tour_test-gx_tour_test.Tpo $(DEPDIR)/gx_tour_test-gx_tour_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='gx_tour_test.cc' object='gx_tour_test-gx_tour_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gx_tour_test_CXXFLAGS) $(CXXFLAGS) -c -o gx_tour_test-gx_tour_test.obj `if test -f 'gx_tour_test.cc'; then $(CYGPATH_W) 'gx_tour_test.cc'; else $(CYGPATH_W) '$(srcdir)/gx_tour_test.cc'; fi`
  
  hotspot_test-hotspot_test.o: hotspot_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hotspot_test_CXXFLAGS) $(CXXFLAGS) -MT hotspot_test-hotspot_test.o -MD -MP -MF "$(DEPDIR)/hotspot_test-hotspot_test.Tpo" -c -o hotspot_test-hotspot_test.o `test -f 'hotspot_test.cc' || echo '$(srcdir)/'`hotspot_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/hotspot_test-hotspot_test.Tpo" "$(DEPDIR)/hotspot_test-hotspot_test.Po"; else rm -f "$(DEPDIR)/hotspot_test-hotspot_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hotspot_test_CXXFLAGS) $(CXXFLAGS) -MT hotspot_test-hotspot_test.o -MD -MP -MF $(DEPDIR)/hotspot_test-hotspot_test.Tpo -c -o hotspot_test-hotspot_test.o `test -f 'hotspot_test.cc' || echo '$(srcdir)/'`hotspot_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hotspot_test_CXXFLAGS) $(CXXFLAGS) -MT hotspot_test-hotspot_test.o -MD -MP -MF $(DEPDIR)/hotspot_test-hotspot_test.Tpo -c -o hotspot_test-hotspot_test.o `test -f 'hotspot_test.cc' || echo '$(srcdir)/'`hotspot_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/hotspot_test-hotspot_test.Tpo $(DEPDIR)/hotspot_test-hotspot_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/hotspot_test-hotspot_test.Tpo $(DEPDIR)/hotspot_test-hotspot_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='hotspot_test.cc' object='hotspot_test-hotspot_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hotspot_test_CXXFLAGS) $(CXXFLAGS) -c -o hotspot_test-hotspot_test.o `test -f 'hotspot_test.cc' || echo '$(srcdir)/'`hotspot_test.cc
  
  hotspot_test-hotspot_test.obj: hotspot_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hotspot_test_CXXFLAGS) $(CXXFLAGS) -MT hotspot_test-hotspot_test.obj -MD -MP -MF "$(DEPDIR)/hotspot_test-hotspot_test.Tpo" -c -o hotspot_test-hotspot_test.obj `if test -f 'hotspot_test.cc'; then $(CYGPATH_W) 'hotspot_test.cc'; else $(CYGPATH_W) '$(srcdir)/hotspot_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/hotspot_test-hotspot_test.Tpo" "$(DEPDIR)/hotspot_test-hotspot_test.Po"; else rm -f "$(DEPDIR)/hotspot_test-hotspot_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hotspot_test_CXXFLAGS) $(CXXFLAGS) -MT hotspot_test-hotspot_test.obj -MD -MP -MF $(DEPDIR)/hotspot_test-hotspot_test.Tpo -c -o hotspot_test-hotspot_test.obj `if test -f 'hotspot_test.cc'; then $(CYGPATH_W) 'hotspot_test.cc'; else $(CYGPATH_W) '$(srcdir)/hotspot_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hotspot_test_CXXFLAGS) $(CXXFLAGS) -MT hotspot_test-hotspot_test.obj -MD -MP -MF $(DEPDIR)/hotspot_test-hotspot_test.Tpo -c -o hotspot_test-hotspot_test.obj `if test -f 'hotspot_test.cc'; then $(CYGPATH_W) 'hotspot_test.cc'; else $(CYGPATH_W) '$(srcdir)/hotspot_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/hotspot_test-hotspot_test.Tpo $(DEPDIR)/hotspot_test-hotspot_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/hotspot_test-hotspot_test.Tpo $(DEPDIR)/hotspot_test-hotspot_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='hotspot_test.cc' object='hotspot_test-hotspot_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hotspot_test_CXXFLAGS) $(CXXFLAGS) -c -o hotspot_test-hotspot_test.obj `if test -f 'hotspot_test.cc'; then $(CYGPATH_W) 'hotspot_test.cc'; else $(CYGPATH_W) '$(srcdir)/hotspot_test.cc'; fi`
  
  iconstyle_test-iconstyle_test.o: iconstyle_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(iconstyle_test_CXXFLAGS) $(CXXFLAGS) -MT iconstyle_test-iconstyle_test.o -MD -MP -MF "$(DEPDIR)/iconstyle_test-iconstyle_test.Tpo" -c -o iconstyle_test-iconstyle_test.o `test -f 'iconstyle_test.cc' || echo '$(srcdir)/'`iconstyle_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/iconstyle_test-iconstyle_test.Tpo" "$(DEPDIR)/iconstyle_test-iconstyle_test.Po"; else rm -f "$(DEPDIR)/iconstyle_test-iconstyle_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(iconstyle_test_CXXFLAGS) $(CXXFLAGS) -MT iconstyle_test-iconstyle_test.o -MD -MP -MF $(DEPDIR)/iconstyle_test-iconstyle_test.Tpo -c -o iconstyle_test-iconstyle_test.o `test -f 'iconstyle_test.cc' || echo '$(srcdir)/'`iconstyle_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(iconstyle_test_CXXFLAGS) $(CXXFLAGS) -MT iconstyle_test-iconstyle_test.o -MD -MP -MF $(DEPDIR)/iconstyle_test-iconstyle_test.Tpo -c -o iconstyle_test-iconstyle_test.o `test -f 'iconstyle_test.cc' || echo '$(srcdir)/'`iconstyle_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/iconstyle_test-iconstyle_test.Tpo $(DEPDIR)/iconstyle_test-iconstyle_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/iconstyle_test-iconstyle_test.Tpo $(DEPDIR)/iconstyle_test-iconstyle_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='iconstyle_test.cc' object='iconstyle_test-iconstyle_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(iconstyle_test_CXXFLAGS) $(CXXFLAGS) -c -o iconstyle_test-iconstyle_test.o `test -f 'iconstyle_test.cc' || echo '$(srcdir)/'`iconstyle_test.cc
  
  iconstyle_test-iconstyle_test.obj: iconstyle_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(iconstyle_test_CXXFLAGS) $(CXXFLAGS) -MT iconstyle_test-iconstyle_test.obj -MD -MP -MF "$(DEPDIR)/iconstyle_test-iconstyle_test.Tpo" -c -o iconstyle_test-iconstyle_test.obj `if test -f 'iconstyle_test.cc'; then $(CYGPATH_W) 'iconstyle_test.cc'; else $(CYGPATH_W) '$(srcdir)/iconstyle_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/iconstyle_test-iconstyle_test.Tpo" "$(DEPDIR)/iconstyle_test-iconstyle_test.Po"; else rm -f "$(DEPDIR)/iconstyle_test-iconstyle_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(iconstyle_test_CXXFLAGS) $(CXXFLAGS) -MT iconstyle_test-iconstyle_test.obj -MD -MP -MF $(DEPDIR)/iconstyle_test-iconstyle_test.Tpo -c -o iconstyle_test-iconstyle_test.obj `if test -f 'iconstyle_test.cc'; then $(CYGPATH_W) 'iconstyle_test.cc'; else $(CYGPATH_W) '$(srcdir)/iconstyle_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(iconstyle_test_CXXFLAGS) $(CXXFLAGS) -MT iconstyle_test-iconstyle_test.obj -MD -MP -MF $(DEPDIR)/iconstyle_test-iconstyle_test.Tpo -c -o iconstyle_test-iconstyle_test.obj `if test -f 'iconstyle_test.cc'; then $(CYGPATH_W) 'iconstyle_test.cc'; else $(CYGPATH_W) '$(srcdir)/iconstyle_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/iconstyle_test-iconstyle_test.Tpo $(DEPDIR)/iconstyle_test-iconstyle_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/iconstyle_test-iconstyle_test.Tpo $(DEPDIR)/iconstyle_test-iconstyle_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='iconstyle_test.cc' object='iconstyle_test-iconstyle_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(iconstyle_test_CXXFLAGS) $(CXXFLAGS) -c -o iconstyle_test-iconstyle_test.obj `if test -f 'iconstyle_test.cc'; then $(CYGPATH_W) 'iconstyle_test.cc'; else $(CYGPATH_W) '$(srcdir)/iconstyle_test.cc'; fi`
  
  kml22_test-kml22_test.o: kml22_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kml22_test_CXXFLAGS) $(CXXFLAGS) -MT kml22_test-kml22_test.o -MD -MP -MF "$(DEPDIR)/kml22_test-kml22_test.Tpo" -c -o kml22_test-kml22_test.o `test -f 'kml22_test.cc' || echo '$(srcdir)/'`kml22_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/kml22_test-kml22_test.Tpo" "$(DEPDIR)/kml22_test-kml22_test.Po"; else rm -f "$(DEPDIR)/kml22_test-kml22_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kml22_test_CXXFLAGS) $(CXXFLAGS) -MT kml22_test-kml22_test.o -MD -MP -MF $(DEPDIR)/kml22_test-kml22_test.Tpo -c -o kml22_test-kml22_test.o `test -f 'kml22_test.cc' || echo '$(srcdir)/'`kml22_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kml22_test_CXXFLAGS) $(CXXFLAGS) -MT kml22_test-kml22_test.o -MD -MP -MF $(DEPDIR)/kml22_test-kml22_test.Tpo -c -o kml22_test-kml22_test.o `test -f 'kml22_test.cc' || echo '$(srcdir)/'`kml22_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/kml22_test-kml22_test.Tpo $(DEPDIR)/kml22_test-kml22_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/kml22_test-kml22_test.Tpo $(DEPDIR)/kml22_test-kml22_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='kml22_test.cc' object='kml22_test-kml22_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kml22_test_CXXFLAGS) $(CXXFLAGS) -c -o kml22_test-kml22_test.o `test -f 'kml22_test.cc' || echo '$(srcdir)/'`kml22_test.cc
  
  kml22_test-kml22_test.obj: kml22_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kml22_test_CXXFLAGS) $(CXXFLAGS) -MT kml22_test-kml22_test.obj -MD -MP -MF "$(DEPDIR)/kml22_test-kml22_test.Tpo" -c -o kml22_test-kml22_test.obj `if test -f 'kml22_test.cc'; then $(CYGPATH_W) 'kml22_test.cc'; else $(CYGPATH_W) '$(srcdir)/kml22_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/kml22_test-kml22_test.Tpo" "$(DEPDIR)/kml22_test-kml22_test.Po"; else rm -f "$(DEPDIR)/kml22_test-kml22_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kml22_test_CXXFLAGS) $(CXXFLAGS) -MT kml22_test-kml22_test.obj -MD -MP -MF $(DEPDIR)/kml22_test-kml22_test.Tpo -c -o kml22_test-kml22_test.obj `if test -f 'kml22_test.cc'; then $(CYGPATH_W) 'kml22_test.cc'; else $(CYGPATH_W) '$(srcdir)/kml22_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kml22_test_CXXFLAGS) $(CXXFLAGS) -MT kml22_test-kml22_test.obj -MD -MP -MF $(DEPDIR)/kml22_test-kml22_test.Tpo -c -o kml22_test-kml22_test.obj `if test -f 'kml22_test.cc'; then $(CYGPATH_W) 'kml22_test.cc'; else $(CYGPATH_W) '$(srcdir)/kml22_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/kml22_test-kml22_test.Tpo $(DEPDIR)/kml22_test-kml22_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/kml22_test-kml22_test.Tpo $(DEPDIR)/kml22_test-kml22_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='kml22_test.cc' object='kml22_test-kml22_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kml22_test_CXXFLAGS) $(CXXFLAGS) -c -o kml22_test-kml22_test.obj `if test -f 'kml22_test.cc'; then $(CYGPATH_W) 'kml22_test.cc'; else $(CYGPATH_W) '$(srcdir)/kml22_test.cc'; fi`
  
  kml_cast_test-kml_cast_test.o: kml_cast_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kml_cast_test_CXXFLAGS) $(CXXFLAGS) -MT kml_cast_test-kml_cast_test.o -MD -MP -MF "$(DEPDIR)/kml_cast_test-kml_cast_test.Tpo" -c -o kml_cast_test-kml_cast_test.o `test -f 'kml_cast_test.cc' || echo '$(srcdir)/'`kml_cast_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/kml_cast_test-kml_cast_test.Tpo" "$(DEPDIR)/kml_cast_test-kml_cast_test.Po"; else rm -f "$(DEPDIR)/kml_cast_test-kml_cast_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kml_cast_test_CXXFLAGS) $(CXXFLAGS) -MT kml_cast_test-kml_cast_test.o -MD -MP -MF $(DEPDIR)/kml_cast_test-kml_cast_test.Tpo -c -o kml_cast_test-kml_cast_test.o `test -f 'kml_cast_test.cc' || echo '$(srcdir)/'`kml_cast_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kml_cast_test_CXXFLAGS) $(CXXFLAGS) -MT kml_cast_test-kml_cast_test.o -MD -MP -MF $(DEPDIR)/kml_cast_test-kml_cast_test.Tpo -c -o kml_cast_test-kml_cast_test.o `test -f 'kml_cast_test.cc' || echo '$(srcdir)/'`kml_cast_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/kml_cast_test-kml_cast_test.Tpo $(DEPDIR)/kml_cast_test-kml_cast_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/kml_cast_test-kml_cast_test.Tpo $(DEPDIR)/kml_cast_test-kml_cast_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='kml_cast_test.cc' object='kml_cast_test-kml_cast_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kml_cast_test_CXXFLAGS) $(CXXFLAGS) -c -o kml_cast_test-kml_cast_test.o `test -f 'kml_cast_test.cc' || echo '$(srcdir)/'`kml_cast_test.cc
  
  kml_cast_test-kml_cast_test.obj: kml_cast_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kml_cast_test_CXXFLAGS) $(CXXFLAGS) -MT kml_cast_test-kml_cast_test.obj -MD -MP -MF "$(DEPDIR)/kml_cast_test-kml_cast_test.Tpo" -c -o kml_cast_test-kml_cast_test.obj `if test -f 'kml_cast_test.cc'; then $(CYGPATH_W) 'kml_cast_test.cc'; else $(CYGPATH_W) '$(srcdir)/kml_cast_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/kml_cast_test-kml_cast_test.Tpo" "$(DEPDIR)/kml_cast_test-kml_cast_test.Po"; else rm -f "$(DEPDIR)/kml_cast_test-kml_cast_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kml_cast_test_CXXFLAGS) $(CXXFLAGS) -MT kml_cast_test-kml_cast_test.obj -MD -MP -MF $(DEPDIR)/kml_cast_test-kml_cast_test.Tpo -c -o kml_cast_test-kml_cast_test.obj `if test -f 'kml_cast_test.cc'; then $(CYGPATH_W) 'kml_cast_test.cc'; else $(CYGPATH_W) '$(srcdir)/kml_cast_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kml_cast_test_CXXFLAGS) $(CXXFLAGS) -MT kml_cast_test-kml_cast_test.obj -MD -MP -MF $(DEPDIR)/kml_cast_test-kml_cast_test.Tpo -c -o kml_cast_test-kml_cast_test.obj `if test -f 'kml_cast_test.cc'; then $(CYGPATH_W) 'kml_cast_test.cc'; else $(CYGPATH_W) '$(srcdir)/kml_cast_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/kml_cast_test-kml_cast_test.Tpo $(DEPDIR)/kml_cast_test-kml_cast_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/kml_cast_test-kml_cast_test.Tpo $(DEPDIR)/kml_cast_test-kml_cast_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='kml_cast_test.cc' object='kml_cast_test-kml_cast_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kml_cast_test_CXXFLAGS) $(CXXFLAGS) -c -o kml_cast_test-kml_cast_test.obj `if test -f 'kml_cast_test.cc'; then $(CYGPATH_W) 'kml_cast_test.cc'; else $(CYGPATH_W) '$(srcdir)/kml_cast_test.cc'; fi`
  
  kml_factory_test-kml_factory_test.o: kml_factory_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kml_factory_test_CXXFLAGS) $(CXXFLAGS) -MT kml_factory_test-kml_factory_test.o -MD -MP -MF "$(DEPDIR)/kml_factory_test-kml_factory_test.Tpo" -c -o kml_factory_test-kml_factory_test.o `test -f 'kml_factory_test.cc' || echo '$(srcdir)/'`kml_factory_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/kml_factory_test-kml_factory_test.Tpo" "$(DEPDIR)/kml_factory_test-kml_factory_test.Po"; else rm -f "$(DEPDIR)/kml_factory_test-kml_factory_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kml_factory_test_CXXFLAGS) $(CXXFLAGS) -MT kml_factory_test-kml_factory_test.o -MD -MP -MF $(DEPDIR)/kml_factory_test-kml_factory_test.Tpo -c -o kml_factory_test-kml_factory_test.o `test -f 'kml_factory_test.cc' || echo '$(srcdir)/'`kml_factory_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kml_factory_test_CXXFLAGS) $(CXXFLAGS) -MT kml_factory_test-kml_factory_test.o -MD -MP -MF $(DEPDIR)/kml_factory_test-kml_factory_test.Tpo -c -o kml_factory_test-kml_factory_test.o `test -f 'kml_factory_test.cc' || echo '$(srcdir)/'`kml_factory_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/kml_factory_test-kml_factory_test.Tpo $(DEPDIR)/kml_factory_test-kml_factory_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/kml_factory_test-kml_factory_test.Tpo $(DEPDIR)/kml_factory_test-kml_factory_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='kml_factory_test.cc' object='kml_factory_test-kml_factory_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kml_factory_test_CXXFLAGS) $(CXXFLAGS) -c -o kml_factory_test-kml_factory_test.o `test -f 'kml_factory_test.cc' || echo '$(srcdir)/'`kml_factory_test.cc
  
  kml_factory_test-kml_factory_test.obj: kml_factory_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kml_factory_test_CXXFLAGS) $(CXXFLAGS) -MT kml_factory_test-kml_factory_test.obj -MD -MP -MF "$(DEPDIR)/kml_factory_test-kml_factory_test.Tpo" -c -o kml_factory_test-kml_factory_test.obj `if test -f 'kml_factory_test.cc'; then $(CYGPATH_W) 'kml_factory_test.cc'; else $(CYGPATH_W) '$(srcdir)/kml_factory_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/kml_factory_test-kml_factory_test.Tpo" "$(DEPDIR)/kml_factory_test-kml_factory_test.Po"; else rm -f "$(DEPDIR)/kml_factory_test-kml_factory_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kml_factory_test_CXXFLAGS) $(CXXFLAGS) -MT kml_factory_test-kml_factory_test.obj -MD -MP -MF $(DEPDIR)/kml_factory_test-kml_factory_test.Tpo -c -o kml_factory_test-kml_factory_test.obj `if test -f 'kml_factory_test.cc'; then $(CYGPATH_W) 'kml_factory_test.cc'; else $(CYGPATH_W) '$(srcdir)/kml_factory_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kml_factory_test_CXXFLAGS) $(CXXFLAGS) -MT kml_factory_test-kml_factory_test.obj -MD -MP -MF $(DEPDIR)/kml_factory_test-kml_factory_test.Tpo -c -o kml_factory_test-kml_factory_test.obj `if test -f 'kml_factory_test.cc'; then $(CYGPATH_W) 'kml_factory_test.cc'; else $(CYGPATH_W) '$(srcdir)/kml_factory_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/kml_factory_test-kml_factory_test.Tpo $(DEPDIR)/kml_factory_test-kml_factory_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/kml_factory_test-kml_factory_test.Tpo $(DEPDIR)/kml_factory_test-kml_factory_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='kml_factory_test.cc' object='kml_factory_test-kml_factory_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kml_factory_test_CXXFLAGS) $(CXXFLAGS) -c -o kml_factory_test-kml_factory_test.obj `if test -f 'kml_factory_test.cc'; then $(CYGPATH_W) 'kml_factory_test.cc'; else $(CYGPATH_W) '$(srcdir)/kml_factory_test.cc'; fi`
  
  kml_handler_ns_test-kml_handler_ns_test.o: kml_handler_ns_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kml_handler_ns_test_CXXFLAGS) $(CXXFLAGS) -MT kml_handler_ns_test-kml_handler_ns_test.o -MD -MP -MF "$(DEPDIR)/kml_handler_ns_test-kml_handler_ns_test.Tpo" -c -o kml_handler_ns_test-kml_handler_ns_test.o `test -f 'kml_handler_ns_test.cc' || echo '$(srcdir)/'`kml_handler_ns_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/kml_handler_ns_test-kml_handler_ns_test.Tpo" "$(DEPDIR)/kml_handler_ns_test-kml_handler_ns_test.Po"; else rm -f "$(DEPDIR)/kml_handler_ns_test-kml_handler_ns_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kml_handler_ns_test_CXXFLAGS) $(CXXFLAGS) -MT kml_handler_ns_test-kml_handler_ns_test.o -MD -MP -MF $(DEPDIR)/kml_handler_ns_test-kml_handler_ns_test.Tpo -c -o kml_handler_ns_test-kml_handler_ns_test.o `test -f 'kml_handler_ns_test.cc' || echo '$(srcdir)/'`kml_handler_ns_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kml_handler_ns_test_CXXFLAGS) $(CXXFLAGS) -MT kml_handler_ns_test-kml_handler_ns_test.o -MD -MP -MF $(DEPDIR)/kml_handler_ns_test-kml_handler_ns_test.Tpo -c -o kml_handler_ns_test-kml_handler_ns_test.o `test -f 'kml_handler_ns_test.cc' || echo '$(srcdir)/'`kml_handler_ns_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/kml_handler_ns_test-kml_handler_ns_test.Tpo $(DEPDIR)/kml_handler_ns_test-kml_handler_ns_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/kml_handler_ns_test-kml_handler_ns_test.Tpo $(DEPDIR)/kml_handler_ns_test-kml_handler_ns_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='kml_handler_ns_test.cc' object='kml_handler_ns_test-kml_handler_ns_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kml_handler_ns_test_CXXFLAGS) $(CXXFLAGS) -c -o kml_handler_ns_test-kml_handler_ns_test.o `test -f 'kml_handler_ns_test.cc' || echo '$(srcdir)/'`kml_handler_ns_test.cc
  
  kml_handler_ns_test-kml_handler_ns_test.obj: kml_handler_ns_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kml_handler_ns_test_CXXFLAGS) $(CXXFLAGS) -MT kml_handler_ns_test-kml_handler_ns_test.obj -MD -MP -MF "$(DEPDIR)/kml_handler_ns_test-kml_handler_ns_test.Tpo" -c -o kml_handler_ns_test-kml_handler_ns_test.obj `if test -f 'kml_handler_ns_test.cc'; then $(CYGPATH_W) 'kml_handler_ns_test.cc'; else $(CYGPATH_W) '$(srcdir)/kml_handler_ns_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/kml_handler_ns_test-kml_handler_ns_test.Tpo" "$(DEPDIR)/kml_handler_ns_test-kml_handler_ns_test.Po"; else rm -f "$(DEPDIR)/kml_handler_ns_test-kml_handler_ns_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kml_handler_ns_test_CXXFLAGS) $(CXXFLAGS) -MT kml_handler_ns_test-kml_handler_ns_test.obj -MD -MP -MF $(DEPDIR)/kml_handler_ns_test-kml_handler_ns_test.Tpo -c -o kml_handler_ns_test-kml_handler_ns_test.obj `if test -f 'kml_handler_ns_test.cc'; then $(CYGPATH_W) 'kml_handler_ns_test.cc'; else $(CYGPATH_W) '$(srcdir)/kml_handler_ns_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kml_handler_ns_test_CXXFLAGS) $(CXXFLAGS) -MT kml_handler_ns_test-kml_handler_ns_test.obj -MD -MP -MF $(DEPDIR)/kml_handler_ns_test-kml_handler_ns_test.Tpo -c -o kml_handler_ns_test-kml_handler_ns_test.obj `if test -f 'kml_handler_ns_test.cc'; then $(CYGPATH_W) 'kml_handler_ns_test.cc'; else $(CYGPATH_W) '$(srcdir)/kml_handler_ns_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/kml_handler_ns_test-kml_handler_ns_test.Tpo $(DEPDIR)/kml_handler_ns_test-kml_handler_ns_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/kml_handler_ns_test-kml_handler_ns_test.Tpo $(DEPDIR)/kml_handler_ns_test-kml_handler_ns_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='kml_handler_ns_test.cc' object='kml_handler_ns_test-kml_handler_ns_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kml_handler_ns_test_CXXFLAGS) $(CXXFLAGS) -c -o kml_handler_ns_test-kml_handler_ns_test.obj `if test -f 'kml_handler_ns_test.cc'; then $(CYGPATH_W) 'kml_handler_ns_test.cc'; else $(CYGPATH_W) '$(srcdir)/kml_handler_ns_test.cc'; fi`
  
  kml_handler_test-kml_handler_test.o: kml_handler_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kml_handler_test_CXXFLAGS) $(CXXFLAGS) -MT kml_handler_test-kml_handler_test.o -MD -MP -MF "$(DEPDIR)/kml_handler_test-kml_handler_test.Tpo" -c -o kml_handler_test-kml_handler_test.o `test -f 'kml_handler_test.cc' || echo '$(srcdir)/'`kml_handler_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/kml_handler_test-kml_handler_test.Tpo" "$(DEPDIR)/kml_handler_test-kml_handler_test.Po"; else rm -f "$(DEPDIR)/kml_handler_test-kml_handler_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kml_handler_test_CXXFLAGS) $(CXXFLAGS) -MT kml_handler_test-kml_handler_test.o -MD -MP -MF $(DEPDIR)/kml_handler_test-kml_handler_test.Tpo -c -o kml_handler_test-kml_handler_test.o `test -f 'kml_handler_test.cc' || echo '$(srcdir)/'`kml_handler_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kml_handler_test_CXXFLAGS) $(CXXFLAGS) -MT kml_handler_test-kml_handler_test.o -MD -MP -MF $(DEPDIR)/kml_handler_test-kml_handler_test.Tpo -c -o kml_handler_test-kml_handler_test.o `test -f 'kml_handler_test.cc' || echo '$(srcdir)/'`kml_handler_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/kml_handler_test-kml_handler_test.Tpo $(DEPDIR)/kml_handler_test-kml_handler_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/kml_handler_test-kml_handler_test.Tpo $(DEPDIR)/kml_handler_test-kml_handler_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='kml_handler_test.cc' object='kml_handler_test-kml_handler_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kml_handler_test_CXXFLAGS) $(CXXFLAGS) -c -o kml_handler_test-kml_handler_test.o `test -f 'kml_handler_test.cc' || echo '$(srcdir)/'`kml_handler_test.cc
  
  kml_handler_test-kml_handler_test.obj: kml_handler_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kml_handler_test_CXXFLAGS) $(CXXFLAGS) -MT kml_handler_test-kml_handler_test.obj -MD -MP -MF "$(DEPDIR)/kml_handler_test-kml_handler_test.Tpo" -c -o kml_handler_test-kml_handler_test.obj `if test -f 'kml_handler_test.cc'; then $(CYGPATH_W) 'kml_handler_test.cc'; else $(CYGPATH_W) '$(srcdir)/kml_handler_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/kml_handler_test-kml_handler_test.Tpo" "$(DEPDIR)/kml_handler_test-kml_handler_test.Po"; else rm -f "$(DEPDIR)/kml_handler_test-kml_handler_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kml_handler_test_CXXFLAGS) $(CXXFLAGS) -MT kml_handler_test-kml_handler_test.obj -MD -MP -MF $(DEPDIR)/kml_handler_test-kml_handler_test.Tpo -c -o kml_handler_test-kml_handler_test.obj `if test -f 'kml_handler_test.cc'; then $(CYGPATH_W) 'kml_handler_test.cc'; else $(CYGPATH_W) '$(srcdir)/kml_handler_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kml_handler_test_CXXFLAGS) $(CXXFLAGS) -MT kml_handler_test-kml_handler_test.obj -MD -MP -MF $(DEPDIR)/kml_handler_test-kml_handler_test.Tpo -c -o kml_handler_test-kml_handler_test.obj `if test -f 'kml_handler_test.cc'; then $(CYGPATH_W) 'kml_handler_test.cc'; else $(CYGPATH_W) '$(srcdir)/kml_handler_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/kml_handler_test-kml_handler_test.Tpo $(DEPDIR)/kml_handler_test-kml_handler_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/kml_handler_test-kml_handler_test.Tpo $(DEPDIR)/kml_handler_test-kml_handler_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='kml_handler_test.cc' object='kml_handler_test-kml_handler_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kml_handler_test_CXXFLAGS) $(CXXFLAGS) -c -o kml_handler_test-kml_handler_test.obj `if test -f 'kml_handler_test.cc'; then $(CYGPATH_W) 'kml_handler_test.cc'; else $(CYGPATH_W) '$(srcdir)/kml_handler_test.cc'; fi`
  
  kml_test-kml_test.o: kml_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kml_test_CXXFLAGS) $(CXXFLAGS) -MT kml_test-kml_test.o -MD -MP -MF "$(DEPDIR)/kml_test-kml_test.Tpo" -c -o kml_test-kml_test.o `test -f 'kml_test.cc' || echo '$(srcdir)/'`kml_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/kml_test-kml_test.Tpo" "$(DEPDIR)/kml_test-kml_test.Po"; else rm -f "$(DEPDIR)/kml_test-kml_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kml_test_CXXFLAGS) $(CXXFLAGS) -MT kml_test-kml_test.o -MD -MP -MF $(DEPDIR)/kml_test-kml_test.Tpo -c -o kml_test-kml_test.o `test -f 'kml_test.cc' || echo '$(srcdir)/'`kml_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kml_test_CXXFLAGS) $(CXXFLAGS) -MT kml_test-kml_test.o -MD -MP -MF $(DEPDIR)/kml_test-kml_test.Tpo -c -o kml_test-kml_test.o `test -f 'kml_test.cc' || echo '$(srcdir)/'`kml_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/kml_test-kml_test.Tpo $(DEPDIR)/kml_test-kml_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/kml_test-kml_test.Tpo $(DEPDIR)/kml_test-kml_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='kml_test.cc' object='kml_test-kml_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kml_test_CXXFLAGS) $(CXXFLAGS) -c -o kml_test-kml_test.o `test -f 'kml_test.cc' || echo '$(srcdir)/'`kml_test.cc
  
  kml_test-kml_test.obj: kml_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kml_test_CXXFLAGS) $(CXXFLAGS) -MT kml_test-kml_test.obj -MD -MP -MF "$(DEPDIR)/kml_test-kml_test.Tpo" -c -o kml_test-kml_test.obj `if test -f 'kml_test.cc'; then $(CYGPATH_W) 'kml_test.cc'; else $(CYGPATH_W) '$(srcdir)/kml_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/kml_test-kml_test.Tpo" "$(DEPDIR)/kml_test-kml_test.Po"; else rm -f "$(DEPDIR)/kml_test-kml_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kml_test_CXXFLAGS) $(CXXFLAGS) -MT kml_test-kml_test.obj -MD -MP -MF $(DEPDIR)/kml_test-kml_test.Tpo -c -o kml_test-kml_test.obj `if test -f 'kml_test.cc'; then $(CYGPATH_W) 'kml_test.cc'; else $(CYGPATH_W) '$(srcdir)/kml_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kml_test_CXXFLAGS) $(CXXFLAGS) -MT kml_test-kml_test.obj -MD -MP -MF $(DEPDIR)/kml_test-kml_test.Tpo -c -o kml_test-kml_test.obj `if test -f 'kml_test.cc'; then $(CYGPATH_W) 'kml_test.cc'; else $(CYGPATH_W) '$(srcdir)/kml_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/kml_test-kml_test.Tpo $(DEPDIR)/kml_test-kml_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/kml_test-kml_test.Tpo $(DEPDIR)/kml_test-kml_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='kml_test.cc' object='kml_test-kml_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kml_test_CXXFLAGS) $(CXXFLAGS) -c -o kml_test-kml_test.obj `if test -f 'kml_test.cc'; then $(CYGPATH_W) 'kml_test.cc'; else $(CYGPATH_W) '$(srcdir)/kml_test.cc'; fi`
  
  labelstyle_test-labelstyle_test.o: labelstyle_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(labelstyle_test_CXXFLAGS) $(CXXFLAGS) -MT labelstyle_test-labelstyle_test.o -MD -MP -MF "$(DEPDIR)/labelstyle_test-labelstyle_test.Tpo" -c -o labelstyle_test-labelstyle_test.o `test -f 'labelstyle_test.cc' || echo '$(srcdir)/'`labelstyle_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/labelstyle_test-labelstyle_test.Tpo" "$(DEPDIR)/labelstyle_test-labelstyle_test.Po"; else rm -f "$(DEPDIR)/labelstyle_test-labelstyle_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(labelstyle_test_CXXFLAGS) $(CXXFLAGS) -MT labelstyle_test-labelstyle_test.o -MD -MP -MF $(DEPDIR)/labelstyle_test-labelstyle_test.Tpo -c -o labelstyle_test-labelstyle_test.o `test -f 'labelstyle_test.cc' || echo '$(srcdir)/'`labelstyle_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(labelstyle_test_CXXFLAGS) $(CXXFLAGS) -MT labelstyle_test-labelstyle_test.o -MD -MP -MF $(DEPDIR)/labelstyle_test-labelstyle_test.Tpo -c -o labelstyle_test-labelstyle_test.o `test -f 'labelstyle_test.cc' || echo '$(srcdir)/'`labelstyle_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/labelstyle_test-labelstyle_test.Tpo $(DEPDIR)/labelstyle_test-labelstyle_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/labelstyle_test-labelstyle_test.Tpo $(DEPDIR)/labelstyle_test-labelstyle_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='labelstyle_test.cc' object='labelstyle_test-labelstyle_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(labelstyle_test_CXXFLAGS) $(CXXFLAGS) -c -o labelstyle_test-labelstyle_test.o `test -f 'labelstyle_test.cc' || echo '$(srcdir)/'`labelstyle_test.cc
  
  labelstyle_test-labelstyle_test.obj: labelstyle_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(labelstyle_test_CXXFLAGS) $(CXXFLAGS) -MT labelstyle_test-labelstyle_test.obj -MD -MP -MF "$(DEPDIR)/labelstyle_test-labelstyle_test.Tpo" -c -o labelstyle_test-labelstyle_test.obj `if test -f 'labelstyle_test.cc'; then $(CYGPATH_W) 'labelstyle_test.cc'; else $(CYGPATH_W) '$(srcdir)/labelstyle_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/labelstyle_test-labelstyle_test.Tpo" "$(DEPDIR)/labelstyle_test-labelstyle_test.Po"; else rm -f "$(DEPDIR)/labelstyle_test-labelstyle_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(labelstyle_test_CXXFLAGS) $(CXXFLAGS) -MT labelstyle_test-labelstyle_test.obj -MD -MP -MF $(DEPDIR)/labelstyle_test-labelstyle_test.Tpo -c -o labelstyle_test-labelstyle_test.obj `if test -f 'labelstyle_test.cc'; then $(CYGPATH_W) 'labelstyle_test.cc'; else $(CYGPATH_W) '$(srcdir)/labelstyle_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(labelstyle_test_CXXFLAGS) $(CXXFLAGS) -MT labelstyle_test-labelstyle_test.obj -MD -MP -MF $(DEPDIR)/labelstyle_test-labelstyle_test.Tpo -c -o labelstyle_test-labelstyle_test.obj `if test -f 'labelstyle_test.cc'; then $(CYGPATH_W) 'labelstyle_test.cc'; else $(CYGPATH_W) '$(srcdir)/labelstyle_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/labelstyle_test-labelstyle_test.Tpo $(DEPDIR)/labelstyle_test-labelstyle_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/labelstyle_test-labelstyle_test.Tpo $(DEPDIR)/labelstyle_test-labelstyle_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='labelstyle_test.cc' object='labelstyle_test-labelstyle_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(labelstyle_test_CXXFLAGS) $(CXXFLAGS) -c -o labelstyle_test-labelstyle_test.obj `if test -f 'labelstyle_test.cc'; then $(CYGPATH_W) 'labelstyle_test.cc'; else $(CYGPATH_W) '$(srcdir)/labelstyle_test.cc'; fi`
  
  linestyle_test-linestyle_test.o: linestyle_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(linestyle_test_CXXFLAGS) $(CXXFLAGS) -MT linestyle_test-linestyle_test.o -MD -MP -MF "$(DEPDIR)/linestyle_test-linestyle_test.Tpo" -c -o linestyle_test-linestyle_test.o `test -f 'linestyle_test.cc' || echo '$(srcdir)/'`linestyle_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/linestyle_test-linestyle_test.Tpo" "$(DEPDIR)/linestyle_test-linestyle_test.Po"; else rm -f "$(DEPDIR)/linestyle_test-linestyle_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(linestyle_test_CXXFLAGS) $(CXXFLAGS) -MT linestyle_test-linestyle_test.o -MD -MP -MF $(DEPDIR)/linestyle_test-linestyle_test.Tpo -c -o linestyle_test-linestyle_test.o `test -f 'linestyle_test.cc' || echo '$(srcdir)/'`linestyle_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(linestyle_test_CXXFLAGS) $(CXXFLAGS) -MT linestyle_test-linestyle_test.o -MD -MP -MF $(DEPDIR)/linestyle_test-linestyle_test.Tpo -c -o linestyle_test-linestyle_test.o `test -f 'linestyle_test.cc' || echo '$(srcdir)/'`linestyle_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/linestyle_test-linestyle_test.Tpo $(DEPDIR)/linestyle_test-linestyle_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/linestyle_test-linestyle_test.Tpo $(DEPDIR)/linestyle_test-linestyle_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='linestyle_test.cc' object='linestyle_test-linestyle_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(linestyle_test_CXXFLAGS) $(CXXFLAGS) -c -o linestyle_test-linestyle_test.o `test -f 'linestyle_test.cc' || echo '$(srcdir)/'`linestyle_test.cc
  
  linestyle_test-linestyle_test.obj: linestyle_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(linestyle_test_CXXFLAGS) $(CXXFLAGS) -MT linestyle_test-linestyle_test.obj -MD -MP -MF "$(DEPDIR)/linestyle_test-linestyle_test.Tpo" -c -o linestyle_test-linestyle_test.obj `if test -f 'linestyle_test.cc'; then $(CYGPATH_W) 'linestyle_test.cc'; else $(CYGPATH_W) '$(srcdir)/linestyle_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/linestyle_test-linestyle_test.Tpo" "$(DEPDIR)/linestyle_test-linestyle_test.Po"; else rm -f "$(DEPDIR)/linestyle_test-linestyle_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(linestyle_test_CXXFLAGS) $(CXXFLAGS) -MT linestyle_test-linestyle_test.obj -MD -MP -MF $(DEPDIR)/linestyle_test-linestyle_test.Tpo -c -o linestyle_test-linestyle_test.obj `if test -f 'linestyle_test.cc'; then $(CYGPATH_W) 'linestyle_test.cc'; else $(CYGPATH_W) '$(srcdir)/linestyle_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(linestyle_test_CXXFLAGS) $(CXXFLAGS) -MT linestyle_test-linestyle_test.obj -MD -MP -MF $(DEPDIR)/linestyle_test-linestyle_test.Tpo -c -o linestyle_test-linestyle_test.obj `if test -f 'linestyle_test.cc'; then $(CYGPATH_W) 'linestyle_test.cc'; else $(CYGPATH_W) '$(srcdir)/linestyle_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/linestyle_test-linestyle_test.Tpo $(DEPDIR)/linestyle_test-linestyle_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/linestyle_test-linestyle_test.Tpo $(DEPDIR)/linestyle_test-linestyle_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='linestyle_test.cc' object='linestyle_test-linestyle_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(linestyle_test_CXXFLAGS) $(CXXFLAGS) -c -o linestyle_test-linestyle_test.obj `if test -f 'linestyle_test.cc'; then $(CYGPATH_W) 'linestyle_test.cc'; else $(CYGPATH_W) '$(srcdir)/linestyle_test.cc'; fi`
  
  link_test-link_test.o: link_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(link_test_CXXFLAGS) $(CXXFLAGS) -MT link_test-link_test.o -MD -MP -MF "$(DEPDIR)/link_test-link_test.Tpo" -c -o link_test-link_test.o `test -f 'link_test.cc' || echo '$(srcdir)/'`link_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/link_test-link_test.Tpo" "$(DEPDIR)/link_test-link_test.Po"; else rm -f "$(DEPDIR)/link_test-link_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(link_test_CXXFLAGS) $(CXXFLAGS) -MT link_test-link_test.o -MD -MP -MF $(DEPDIR)/link_test-link_test.Tpo -c -o link_test-link_test.o `test -f 'link_test.cc' || echo '$(srcdir)/'`link_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(link_test_CXXFLAGS) $(CXXFLAGS) -MT link_test-link_test.o -MD -MP -MF $(DEPDIR)/link_test-link_test.Tpo -c -o link_test-link_test.o `test -f 'link_test.cc' || echo '$(srcdir)/'`link_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/link_test-link_test.Tpo $(DEPDIR)/link_test-link_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/link_test-link_test.Tpo $(DEPDIR)/link_test-link_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='link_test.cc' object='link_test-link_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(link_test_CXXFLAGS) $(CXXFLAGS) -c -o link_test-link_test.o `test -f 'link_test.cc' || echo '$(srcdir)/'`link_test.cc
  
  link_test-link_test.obj: link_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(link_test_CXXFLAGS) $(CXXFLAGS) -MT link_test-link_test.obj -MD -MP -MF "$(DEPDIR)/link_test-link_test.Tpo" -c -o link_test-link_test.obj `if test -f 'link_test.cc'; then $(CYGPATH_W) 'link_test.cc'; else $(CYGPATH_W) '$(srcdir)/link_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/link_test-link_test.Tpo" "$(DEPDIR)/link_test-link_test.Po"; else rm -f "$(DEPDIR)/link_test-link_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(link_test_CXXFLAGS) $(CXXFLAGS) -MT link_test-link_test.obj -MD -MP -MF $(DEPDIR)/link_test-link_test.Tpo -c -o link_test-link_test.obj `if test -f 'link_test.cc'; then $(CYGPATH_W) 'link_test.cc'; else $(CYGPATH_W) '$(srcdir)/link_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(link_test_CXXFLAGS) $(CXXFLAGS) -MT link_test-link_test.obj -MD -MP -MF $(DEPDIR)/link_test-link_test.Tpo -c -o link_test-link_test.obj `if test -f 'link_test.cc'; then $(CYGPATH_W) 'link_test.cc'; else $(CYGPATH_W) '$(srcdir)/link_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/link_test-link_test.Tpo $(DEPDIR)/link_test-link_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/link_test-link_test.Tpo $(DEPDIR)/link_test-link_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='link_test.cc' object='link_test-link_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(link_test_CXXFLAGS) $(CXXFLAGS) -c -o link_test-link_test.obj `if test -f 'link_test.cc'; then $(CYGPATH_W) 'link_test.cc'; else $(CYGPATH_W) '$(srcdir)/link_test.cc'; fi`
  
  liststyle_test-liststyle_test.o: liststyle_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liststyle_test_CXXFLAGS) $(CXXFLAGS) -MT liststyle_test-liststyle_test.o -MD -MP -MF "$(DEPDIR)/liststyle_test-liststyle_test.Tpo" -c -o liststyle_test-liststyle_test.o `test -f 'liststyle_test.cc' || echo '$(srcdir)/'`liststyle_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/liststyle_test-liststyle_test.Tpo" "$(DEPDIR)/liststyle_test-liststyle_test.Po"; else rm -f "$(DEPDIR)/liststyle_test-liststyle_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liststyle_test_CXXFLAGS) $(CXXFLAGS) -MT liststyle_test-liststyle_test.o -MD -MP -MF $(DEPDIR)/liststyle_test-liststyle_test.Tpo -c -o liststyle_test-liststyle_test.o `test -f 'liststyle_test.cc' || echo '$(srcdir)/'`liststyle_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liststyle_test_CXXFLAGS) $(CXXFLAGS) -MT liststyle_test-liststyle_test.o -MD -MP -MF $(DEPDIR)/liststyle_test-liststyle_test.Tpo -c -o liststyle_test-liststyle_test.o `test -f 'liststyle_test.cc' || echo '$(srcdir)/'`liststyle_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/liststyle_test-liststyle_test.Tpo $(DEPDIR)/liststyle_test-liststyle_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/liststyle_test-liststyle_test.Tpo $(DEPDIR)/liststyle_test-liststyle_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='liststyle_test.cc' object='liststyle_test-liststyle_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liststyle_test_CXXFLAGS) $(CXXFLAGS) -c -o liststyle_test-liststyle_test.o `test -f 'liststyle_test.cc' || echo '$(srcdir)/'`liststyle_test.cc
  
  liststyle_test-liststyle_test.obj: liststyle_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liststyle_test_CXXFLAGS) $(CXXFLAGS) -MT liststyle_test-liststyle_test.obj -MD -MP -MF "$(DEPDIR)/liststyle_test-liststyle_test.Tpo" -c -o liststyle_test-liststyle_test.obj `if test -f 'liststyle_test.cc'; then $(CYGPATH_W) 'liststyle_test.cc'; else $(CYGPATH_W) '$(srcdir)/liststyle_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/liststyle_test-liststyle_test.Tpo" "$(DEPDIR)/liststyle_test-liststyle_test.Po"; else rm -f "$(DEPDIR)/liststyle_test-liststyle_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liststyle_test_CXXFLAGS) $(CXXFLAGS) -MT liststyle_test-liststyle_test.obj -MD -MP -MF $(DEPDIR)/liststyle_test-liststyle_test.Tpo -c -o liststyle_test-liststyle_test.obj `if test -f 'liststyle_test.cc'; then $(CYGPATH_W) 'liststyle_test.cc'; else $(CYGPATH_W) '$(srcdir)/liststyle_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liststyle_test_CXXFLAGS) $(CXXFLAGS) -MT liststyle_test-liststyle_test.obj -MD -MP -MF $(DEPDIR)/liststyle_test-liststyle_test.Tpo -c -o liststyle_test-liststyle_test.obj `if test -f 'liststyle_test.cc'; then $(CYGPATH_W) 'liststyle_test.cc'; else $(CYGPATH_W) '$(srcdir)/liststyle_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/liststyle_test-liststyle_test.Tpo $(DEPDIR)/liststyle_test-liststyle_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/liststyle_test-liststyle_test.Tpo $(DEPDIR)/liststyle_test-liststyle_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='liststyle_test.cc' object='liststyle_test-liststyle_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liststyle_test_CXXFLAGS) $(CXXFLAGS) -c -o liststyle_test-liststyle_test.obj `if test -f 'liststyle_test.cc'; then $(CYGPATH_W) 'liststyle_test.cc'; else $(CYGPATH_W) '$(srcdir)/liststyle_test.cc'; fi`
  
  model_test-model_test.o: model_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(model_test_CXXFLAGS) $(CXXFLAGS) -MT model_test-model_test.o -MD -MP -MF "$(DEPDIR)/model_test-model_test.Tpo" -c -o model_test-model_test.o `test -f 'model_test.cc' || echo '$(srcdir)/'`model_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/model_test-model_test.Tpo" "$(DEPDIR)/model_test-model_test.Po"; else rm -f "$(DEPDIR)/model_test-model_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(model_test_CXXFLAGS) $(CXXFLAGS) -MT model_test-model_test.o -MD -MP -MF $(DEPDIR)/model_test-model_test.Tpo -c -o model_test-model_test.o `test -f 'model_test.cc' || echo '$(srcdir)/'`model_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(model_test_CXXFLAGS) $(CXXFLAGS) -MT model_test-model_test.o -MD -MP -MF $(DEPDIR)/model_test-model_test.Tpo -c -o model_test-model_test.o `test -f 'model_test.cc' || echo '$(srcdir)/'`model_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/model_test-model_test.Tpo $(DEPDIR)/model_test-model_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/model_test-model_test.Tpo $(DEPDIR)/model_test-model_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='model_test.cc' object='model_test-model_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(model_test_CXXFLAGS) $(CXXFLAGS) -c -o model_test-model_test.o `test -f 'model_test.cc' || echo '$(srcdir)/'`model_test.cc
  
  model_test-model_test.obj: model_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(model_test_CXXFLAGS) $(CXXFLAGS) -MT model_test-model_test.obj -MD -MP -MF "$(DEPDIR)/model_test-model_test.Tpo" -c -o model_test-model_test.obj `if test -f 'model_test.cc'; then $(CYGPATH_W) 'model_test.cc'; else $(CYGPATH_W) '$(srcdir)/model_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/model_test-model_test.Tpo" "$(DEPDIR)/model_test-model_test.Po"; else rm -f "$(DEPDIR)/model_test-model_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(model_test_CXXFLAGS) $(CXXFLAGS) -MT model_test-model_test.obj -MD -MP -MF $(DEPDIR)/model_test-model_test.Tpo -c -o model_test-model_test.obj `if test -f 'model_test.cc'; then $(CYGPATH_W) 'model_test.cc'; else $(CYGPATH_W) '$(srcdir)/model_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(model_test_CXXFLAGS) $(CXXFLAGS) -MT model_test-model_test.obj -MD -MP -MF $(DEPDIR)/model_test-model_test.Tpo -c -o model_test-model_test.obj `if test -f 'model_test.cc'; then $(CYGPATH_W) 'model_test.cc'; else $(CYGPATH_W) '$(srcdir)/model_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/model_test-model_test.Tpo $(DEPDIR)/model_test-model_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/model_test-model_test.Tpo $(DEPDIR)/model_test-model_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='model_test.cc' object='model_test-model_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(model_test_CXXFLAGS) $(CXXFLAGS) -c -o model_test-model_test.obj `if test -f 'model_test.cc'; then $(CYGPATH_W) 'model_test.cc'; else $(CYGPATH_W) '$(srcdir)/model_test.cc'; fi`
  
  networklink_test-networklink_test.o: networklink_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(networklink_test_CXXFLAGS) $(CXXFLAGS) -MT networklink_test-networklink_test.o -MD -MP -MF "$(DEPDIR)/networklink_test-networklink_test.Tpo" -c -o networklink_test-networklink_test.o `test -f 'networklink_test.cc' || echo '$(srcdir)/'`networklink_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/networklink_test-networklink_test.Tpo" "$(DEPDIR)/networklink_test-networklink_test.Po"; else rm -f "$(DEPDIR)/networklink_test-networklink_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(networklink_test_CXXFLAGS) $(CXXFLAGS) -MT networklink_test-networklink_test.o -MD -MP -MF $(DEPDIR)/networklink_test-networklink_test.Tpo -c -o networklink_test-networklink_test.o `test -f 'networklink_test.cc' || echo '$(srcdir)/'`networklink_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(networklink_test_CXXFLAGS) $(CXXFLAGS) -MT networklink_test-networklink_test.o -MD -MP -MF $(DEPDIR)/networklink_test-networklink_test.Tpo -c -o networklink_test-networklink_test.o `test -f 'networklink_test.cc' || echo '$(srcdir)/'`networklink_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/networklink_test-networklink_test.Tpo $(DEPDIR)/networklink_test-networklink_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/networklink_test-networklink_test.Tpo $(DEPDIR)/networklink_test-networklink_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='networklink_test.cc' object='networklink_test-networklink_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(networklink_test_CXXFLAGS) $(CXXFLAGS) -c -o networklink_test-networklink_test.o `test -f 'networklink_test.cc' || echo '$(srcdir)/'`networklink_test.cc
  
  networklink_test-networklink_test.obj: networklink_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(networklink_test_CXXFLAGS) $(CXXFLAGS) -MT networklink_test-networklink_test.obj -MD -MP -MF "$(DEPDIR)/networklink_test-networklink_test.Tpo" -c -o networklink_test-networklink_test.obj `if test -f 'networklink_test.cc'; then $(CYGPATH_W) 'networklink_test.cc'; else $(CYGPATH_W) '$(srcdir)/networklink_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/networklink_test-networklink_test.Tpo" "$(DEPDIR)/networklink_test-networklink_test.Po"; else rm -f "$(DEPDIR)/networklink_test-networklink_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(networklink_test_CXXFLAGS) $(CXXFLAGS) -MT networklink_test-networklink_test.obj -MD -MP -MF $(DEPDIR)/networklink_test-networklink_test.Tpo -c -o networklink_test-networklink_test.obj `if test -f 'networklink_test.cc'; then $(CYGPATH_W) 'networklink_test.cc'; else $(CYGPATH_W) '$(srcdir)/networklink_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(networklink_test_CXXFLAGS) $(CXXFLAGS) -MT networklink_test-networklink_test.obj -MD -MP -MF $(DEPDIR)/networklink_test-networklink_test.Tpo -c -o networklink_test-networklink_test.obj `if test -f 'networklink_test.cc'; then $(CYGPATH_W) 'networklink_test.cc'; else $(CYGPATH_W) '$(srcdir)/networklink_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/networklink_test-networklink_test.Tpo $(DEPDIR)/networklink_test-networklink_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/networklink_test-networklink_test.Tpo $(DEPDIR)/networklink_test-networklink_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='networklink_test.cc' object='networklink_test-networklink_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(networklink_test_CXXFLAGS) $(CXXFLAGS) -c -o networklink_test-networklink_test.obj `if test -f 'networklink_test.cc'; then $(CYGPATH_W) 'networklink_test.cc'; else $(CYGPATH_W) '$(srcdir)/networklink_test.cc'; fi`
  
  networklinkcontrol_test-networklinkcontrol_test.o: networklinkcontrol_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(networklinkcontrol_test_CXXFLAGS) $(CXXFLAGS) -MT networklinkcontrol_test-networklinkcontrol_test.o -MD -MP -MF "$(DEPDIR)/networklinkcontrol_test-networklinkcontrol_test.Tpo" -c -o networklinkcontrol_test-networklinkcontrol_test.o `test -f 'networklinkcontrol_test.cc' || echo '$(srcdir)/'`networklinkcontrol_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/networklinkcontrol_test-networklinkcontrol_test.Tpo" "$(DEPDIR)/networklinkcontrol_test-networklinkcontrol_test.Po"; else rm -f "$(DEPDIR)/networklinkcontrol_test-networklinkcontrol_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(networklinkcontrol_test_CXXFLAGS) $(CXXFLAGS) -MT networklinkcontrol_test-networklinkcontrol_test.o -MD -MP -MF $(DEPDIR)/networklinkcontrol_test-networklinkcontrol_test.Tpo -c -o networklinkcontrol_test-networklinkcontrol_test.o `test -f 'networklinkcontrol_test.cc' || echo '$(srcdir)/'`networklinkcontrol_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(networklinkcontrol_test_CXXFLAGS) $(CXXFLAGS) -MT networklinkcontrol_test-networklinkcontrol_test.o -MD -MP -MF $(DEPDIR)/networklinkcontrol_test-networklinkcontrol_test.Tpo -c -o networklinkcontrol_test-networklinkcontrol_test.o `test -f 'networklinkcontrol_test.cc' || echo '$(srcdir)/'`networklinkcontrol_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/networklinkcontrol_test-networklinkcontrol_test.Tpo $(DEPDIR)/networklinkcontrol_test-networklinkcontrol_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/networklinkcontrol_test-networklinkcontrol_test.Tpo $(DEPDIR)/networklinkcontrol_test-networklinkcontrol_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='networklinkcontrol_test.cc' object='networklinkcontrol_test-networklinkcontrol_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(networklinkcontrol_test_CXXFLAGS) $(CXXFLAGS) -c -o networklinkcontrol_test-networklinkcontrol_test.o `test -f 'networklinkcontrol_test.cc' || echo '$(srcdir)/'`networklinkcontrol_test.cc
  
  networklinkcontrol_test-networklinkcontrol_test.obj: networklinkcontrol_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(networklinkcontrol_test_CXXFLAGS) $(CXXFLAGS) -MT networklinkcontrol_test-networklinkcontrol_test.obj -MD -MP -MF "$(DEPDIR)/networklinkcontrol_test-networklinkcontrol_test.Tpo" -c -o networklinkcontrol_test-networklinkcontrol_test.obj `if test -f 'networklinkcontrol_test.cc'; then $(CYGPATH_W) 'networklinkcontrol_test.cc'; else $(CYGPATH_W) '$(srcdir)/networklinkcontrol_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/networklinkcontrol_test-networklinkcontrol_test.Tpo" "$(DEPDIR)/networklinkcontrol_test-networklinkcontrol_test.Po"; else rm -f "$(DEPDIR)/networklinkcontrol_test-networklinkcontrol_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(networklinkcontrol_test_CXXFLAGS) $(CXXFLAGS) -MT networklinkcontrol_test-networklinkcontrol_test.obj -MD -MP -MF $(DEPDIR)/networklinkcontrol_test-networklinkcontrol_test.Tpo -c -o networklinkcontrol_test-networklinkcontrol_test.obj `if test -f 'networklinkcontrol_test.cc'; then $(CYGPATH_W) 'networklinkcontrol_test.cc'; else $(CYGPATH_W) '$(srcdir)/networklinkcontrol_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(networklinkcontrol_test_CXXFLAGS) $(CXXFLAGS) -MT networklinkcontrol_test-networklinkcontrol_test.obj -MD -MP -MF $(DEPDIR)/networklinkcontrol_test-networklinkcontrol_test.Tpo -c -o networklinkcontrol_test-networklinkcontrol_test.obj `if test -f 'networklinkcontrol_test.cc'; then $(CYGPATH_W) 'networklinkcontrol_test.cc'; else $(CYGPATH_W) '$(srcdir)/networklinkcontrol_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/networklinkcontrol_test-networklinkcontrol_test.Tpo $(DEPDIR)/networklinkcontrol_test-networklinkcontrol_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/networklinkcontrol_test-networklinkcontrol_test.Tpo $(DEPDIR)/networklinkcontrol_test-networklinkcontrol_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='networklinkcontrol_test.cc' object='networklinkcontrol_test-networklinkcontrol_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(networklinkcontrol_test_CXXFLAGS) $(CXXFLAGS) -c -o networklinkcontrol_test-networklinkcontrol_test.obj `if test -f 'networklinkcontrol_test.cc'; then $(CYGPATH_W) 'networklinkcontrol_test.cc'; else $(CYGPATH_W) '$(srcdir)/networklinkcontrol_test.cc'; fi`
  
  object_test-object_test.o: object_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(object_test_CXXFLAGS) $(CXXFLAGS) -MT object_test-object_test.o -MD -MP -MF "$(DEPDIR)/object_test-object_test.Tpo" -c -o object_test-object_test.o `test -f 'object_test.cc' || echo '$(srcdir)/'`object_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/object_test-object_test.Tpo" "$(DEPDIR)/object_test-object_test.Po"; else rm -f "$(DEPDIR)/object_test-object_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(object_test_CXXFLAGS) $(CXXFLAGS) -MT object_test-object_test.o -MD -MP -MF $(DEPDIR)/object_test-object_test.Tpo -c -o object_test-object_test.o `test -f 'object_test.cc' || echo '$(srcdir)/'`object_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(object_test_CXXFLAGS) $(CXXFLAGS) -MT object_test-object_test.o -MD -MP -MF $(DEPDIR)/object_test-object_test.Tpo -c -o object_test-object_test.o `test -f 'object_test.cc' || echo '$(srcdir)/'`object_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/object_test-object_test.Tpo $(DEPDIR)/object_test-object_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/object_test-object_test.Tpo $(DEPDIR)/object_test-object_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='object_test.cc' object='object_test-object_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(object_test_CXXFLAGS) $(CXXFLAGS) -c -o object_test-object_test.o `test -f 'object_test.cc' || echo '$(srcdir)/'`object_test.cc
  
  object_test-object_test.obj: object_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(object_test_CXXFLAGS) $(CXXFLAGS) -MT object_test-object_test.obj -MD -MP -MF "$(DEPDIR)/object_test-object_test.Tpo" -c -o object_test-object_test.obj `if test -f 'object_test.cc'; then $(CYGPATH_W) 'object_test.cc'; else $(CYGPATH_W) '$(srcdir)/object_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/object_test-object_test.Tpo" "$(DEPDIR)/object_test-object_test.Po"; else rm -f "$(DEPDIR)/object_test-object_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(object_test_CXXFLAGS) $(CXXFLAGS) -MT object_test-object_test.obj -MD -MP -MF $(DEPDIR)/object_test-object_test.Tpo -c -o object_test-object_test.obj `if test -f 'object_test.cc'; then $(CYGPATH_W) 'object_test.cc'; else $(CYGPATH_W) '$(srcdir)/object_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(object_test_CXXFLAGS) $(CXXFLAGS) -MT object_test-object_test.obj -MD -MP -MF $(DEPDIR)/object_test-object_test.Tpo -c -o object_test-object_test.obj `if test -f 'object_test.cc'; then $(CYGPATH_W) 'object_test.cc'; else $(CYGPATH_W) '$(srcdir)/object_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/object_test-object_test.Tpo $(DEPDIR)/object_test-object_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/object_test-object_test.Tpo $(DEPDIR)/object_test-object_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='object_test.cc' object='object_test-object_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(object_test_CXXFLAGS) $(CXXFLAGS) -c -o object_test-object_test.obj `if test -f 'object_test.cc'; then $(CYGPATH_W) 'object_test.cc'; else $(CYGPATH_W) '$(srcdir)/object_test.cc'; fi`
  
  overlay_test-overlay_test.o: overlay_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(overlay_test_CXXFLAGS) $(CXXFLAGS) -MT overlay_test-overlay_test.o -MD -MP -MF "$(DEPDIR)/overlay_test-overlay_test.Tpo" -c -o overlay_test-overlay_test.o `test -f 'overlay_test.cc' || echo '$(srcdir)/'`overlay_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/overlay_test-overlay_test.Tpo" "$(DEPDIR)/overlay_test-overlay_test.Po"; else rm -f "$(DEPDIR)/overlay_test-overlay_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(overlay_test_CXXFLAGS) $(CXXFLAGS) -MT overlay_test-overlay_test.o -MD -MP -MF $(DEPDIR)/overlay_test-overlay_test.Tpo -c -o overlay_test-overlay_test.o `test -f 'overlay_test.cc' || echo '$(srcdir)/'`overlay_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(overlay_test_CXXFLAGS) $(CXXFLAGS) -MT overlay_test-overlay_test.o -MD -MP -MF $(DEPDIR)/overlay_test-overlay_test.Tpo -c -o overlay_test-overlay_test.o `test -f 'overlay_test.cc' || echo '$(srcdir)/'`overlay_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/overlay_test-overlay_test.Tpo $(DEPDIR)/overlay_test-overlay_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/overlay_test-overlay_test.Tpo $(DEPDIR)/overlay_test-overlay_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='overlay_test.cc' object='overlay_test-overlay_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(overlay_test_CXXFLAGS) $(CXXFLAGS) -c -o overlay_test-overlay_test.o `test -f 'overlay_test.cc' || echo '$(srcdir)/'`overlay_test.cc
  
  overlay_test-overlay_test.obj: overlay_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(overlay_test_CXXFLAGS) $(CXXFLAGS) -MT overlay_test-overlay_test.obj -MD -MP -MF "$(DEPDIR)/overlay_test-overlay_test.Tpo" -c -o overlay_test-overlay_test.obj `if test -f 'overlay_test.cc'; then $(CYGPATH_W) 'overlay_test.cc'; else $(CYGPATH_W) '$(srcdir)/overlay_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/overlay_test-overlay_test.Tpo" "$(DEPDIR)/overlay_test-overlay_test.Po"; else rm -f "$(DEPDIR)/overlay_test-overlay_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(overlay_test_CXXFLAGS) $(CXXFLAGS) -MT overlay_test-overlay_test.obj -MD -MP -MF $(DEPDIR)/overlay_test-overlay_test.Tpo -c -o overlay_test-overlay_test.obj `if test -f 'overlay_test.cc'; then $(CYGPATH_W) 'overlay_test.cc'; else $(CYGPATH_W) '$(srcdir)/overlay_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(overlay_test_CXXFLAGS) $(CXXFLAGS) -MT overlay_test-overlay_test.obj -MD -MP -MF $(DEPDIR)/overlay_test-overlay_test.Tpo -c -o overlay_test-overlay_test.obj `if test -f 'overlay_test.cc'; then $(CYGPATH_W) 'overlay_test.cc'; else $(CYGPATH_W) '$(srcdir)/overlay_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/overlay_test-overlay_test.Tpo $(DEPDIR)/overlay_test-overlay_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/overlay_test-overlay_test.Tpo $(DEPDIR)/overlay_test-overlay_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='overlay_test.cc' object='overlay_test-overlay_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(overlay_test_CXXFLAGS) $(CXXFLAGS) -c -o overlay_test-overlay_test.obj `if test -f 'overlay_test.cc'; then $(CYGPATH_W) 'overlay_test.cc'; else $(CYGPATH_W) '$(srcdir)/overlay_test.cc'; fi`
  
  parser_test-parser_test.o: parser_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(parser_test_CXXFLAGS) $(CXXFLAGS) -MT parser_test-parser_test.o -MD -MP -MF "$(DEPDIR)/parser_test-parser_test.Tpo" -c -o parser_test-parser_test.o `test -f 'parser_test.cc' || echo '$(srcdir)/'`parser_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/parser_test-parser_test.Tpo" "$(DEPDIR)/parser_test-parser_test.Po"; else rm -f "$(DEPDIR)/parser_test-parser_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(parser_test_CXXFLAGS) $(CXXFLAGS) -MT parser_test-parser_test.o -MD -MP -MF $(DEPDIR)/parser_test-parser_test.Tpo -c -o parser_test-parser_test.o `test -f 'parser_test.cc' || echo '$(srcdir)/'`parser_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(parser_test_CXXFLAGS) $(CXXFLAGS) -MT parser_test-parser_test.o -MD -MP -MF $(DEPDIR)/parser_test-parser_test.Tpo -c -o parser_test-parser_test.o `test -f 'parser_test.cc' || echo '$(srcdir)/'`parser_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/parser_test-parser_test.Tpo $(DEPDIR)/parser_test-parser_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/parser_test-parser_test.Tpo $(DEPDIR)/parser_test-parser_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='parser_test.cc' object='parser_test-parser_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(parser_test_CXXFLAGS) $(CXXFLAGS) -c -o parser_test-parser_test.o `test -f 'parser_test.cc' || echo '$(srcdir)/'`parser_test.cc
  
  parser_test-parser_test.obj: parser_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(parser_test_CXXFLAGS) $(CXXFLAGS) -MT parser_test-parser_test.obj -MD -MP -MF "$(DEPDIR)/parser_test-parser_test.Tpo" -c -o parser_test-parser_test.obj `if test -f 'parser_test.cc'; then $(CYGPATH_W) 'parser_test.cc'; else $(CYGPATH_W) '$(srcdir)/parser_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/parser_test-parser_test.Tpo" "$(DEPDIR)/parser_test-parser_test.Po"; else rm -f "$(DEPDIR)/parser_test-parser_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(parser_test_CXXFLAGS) $(CXXFLAGS) -MT parser_test-parser_test.obj -MD -MP -MF $(DEPDIR)/parser_test-parser_test.Tpo -c -o parser_test-parser_test.obj `if test -f 'parser_test.cc'; then $(CYGPATH_W) 'parser_test.cc'; else $(CYGPATH_W) '$(srcdir)/parser_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(parser_test_CXXFLAGS) $(CXXFLAGS) -MT parser_test-parser_test.obj -MD -MP -MF $(DEPDIR)/parser_test-parser_test.Tpo -c -o parser_test-parser_test.obj `if test -f 'parser_test.cc'; then $(CYGPATH_W) 'parser_test.cc'; else $(CYGPATH_W) '$(srcdir)/parser_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/parser_test-parser_test.Tpo $(DEPDIR)/parser_test-parser_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/parser_test-parser_test.Tpo $(DEPDIR)/parser_test-parser_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='parser_test.cc' object='parser_test-parser_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(parser_test_CXXFLAGS) $(CXXFLAGS) -c -o parser_test-parser_test.obj `if test -f 'parser_test.cc'; then $(CYGPATH_W) 'parser_test.cc'; else $(CYGPATH_W) '$(srcdir)/parser_test.cc'; fi`
  
  placemark_test-placemark_test.o: placemark_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(placemark_test_CXXFLAGS) $(CXXFLAGS) -MT placemark_test-placemark_test.o -MD -MP -MF "$(DEPDIR)/placemark_test-placemark_test.Tpo" -c -o placemark_test-placemark_test.o `test -f 'placemark_test.cc' || echo '$(srcdir)/'`placemark_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/placemark_test-placemark_test.Tpo" "$(DEPDIR)/placemark_test-placemark_test.Po"; else rm -f "$(DEPDIR)/placemark_test-placemark_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(placemark_test_CXXFLAGS) $(CXXFLAGS) -MT placemark_test-placemark_test.o -MD -MP -MF $(DEPDIR)/placemark_test-placemark_test.Tpo -c -o placemark_test-placemark_test.o `test -f 'placemark_test.cc' || echo '$(srcdir)/'`placemark_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(placemark_test_CXXFLAGS) $(CXXFLAGS) -MT placemark_test-placemark_test.o -MD -MP -MF $(DEPDIR)/placemark_test-placemark_test.Tpo -c -o placemark_test-placemark_test.o `test -f 'placemark_test.cc' || echo '$(srcdir)/'`placemark_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/placemark_test-placemark_test.Tpo $(DEPDIR)/placemark_test-placemark_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/placemark_test-placemark_test.Tpo $(DEPDIR)/placemark_test-placemark_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='placemark_test.cc' object='placemark_test-placemark_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(placemark_test_CXXFLAGS) $(CXXFLAGS) -c -o placemark_test-placemark_test.o `test -f 'placemark_test.cc' || echo '$(srcdir)/'`placemark_test.cc
  
  placemark_test-placemark_test.obj: placemark_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(placemark_test_CXXFLAGS) $(CXXFLAGS) -MT placemark_test-placemark_test.obj -MD -MP -MF "$(DEPDIR)/placemark_test-placemark_test.Tpo" -c -o placemark_test-placemark_test.obj `if test -f 'placemark_test.cc'; then $(CYGPATH_W) 'placemark_test.cc'; else $(CYGPATH_W) '$(srcdir)/placemark_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/placemark_test-placemark_test.Tpo" "$(DEPDIR)/placemark_test-placemark_test.Po"; else rm -f "$(DEPDIR)/placemark_test-placemark_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(placemark_test_CXXFLAGS) $(CXXFLAGS) -MT placemark_test-placemark_test.obj -MD -MP -MF $(DEPDIR)/placemark_test-placemark_test.Tpo -c -o placemark_test-placemark_test.obj `if test -f 'placemark_test.cc'; then $(CYGPATH_W) 'placemark_test.cc'; else $(CYGPATH_W) '$(srcdir)/placemark_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(placemark_test_CXXFLAGS) $(CXXFLAGS) -MT placemark_test-placemark_test.obj -MD -MP -MF $(DEPDIR)/placemark_test-placemark_test.Tpo -c -o placemark_test-placemark_test.obj `if test -f 'placemark_test.cc'; then $(CYGPATH_W) 'placemark_test.cc'; else $(CYGPATH_W) '$(srcdir)/placemark_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/placemark_test-placemark_test.Tpo $(DEPDIR)/placemark_test-placemark_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/placemark_test-placemark_test.Tpo $(DEPDIR)/placemark_test-placemark_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='placemark_test.cc' object='placemark_test-placemark_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(placemark_test_CXXFLAGS) $(CXXFLAGS) -c -o placemark_test-placemark_test.obj `if test -f 'placemark_test.cc'; then $(CYGPATH_W) 'placemark_test.cc'; else $(CYGPATH_W) '$(srcdir)/placemark_test.cc'; fi`
  
  polystyle_test-polystyle_test.o: polystyle_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(polystyle_test_CXXFLAGS) $(CXXFLAGS) -MT polystyle_test-polystyle_test.o -MD -MP -MF "$(DEPDIR)/polystyle_test-polystyle_test.Tpo" -c -o polystyle_test-polystyle_test.o `test -f 'polystyle_test.cc' || echo '$(srcdir)/'`polystyle_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/polystyle_test-polystyle_test.Tpo" "$(DEPDIR)/polystyle_test-polystyle_test.Po"; else rm -f "$(DEPDIR)/polystyle_test-polystyle_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(polystyle_test_CXXFLAGS) $(CXXFLAGS) -MT polystyle_test-polystyle_test.o -MD -MP -MF $(DEPDIR)/polystyle_test-polystyle_test.Tpo -c -o polystyle_test-polystyle_test.o `test -f 'polystyle_test.cc' || echo '$(srcdir)/'`polystyle_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(polystyle_test_CXXFLAGS) $(CXXFLAGS) -MT polystyle_test-polystyle_test.o -MD -MP -MF $(DEPDIR)/polystyle_test-polystyle_test.Tpo -c -o polystyle_test-polystyle_test.o `test -f 'polystyle_test.cc' || echo '$(srcdir)/'`polystyle_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/polystyle_test-polystyle_test.Tpo $(DEPDIR)/polystyle_test-polystyle_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/polystyle_test-polystyle_test.Tpo $(DEPDIR)/polystyle_test-polystyle_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='polystyle_test.cc' object='polystyle_test-polystyle_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(polystyle_test_CXXFLAGS) $(CXXFLAGS) -c -o polystyle_test-polystyle_test.o `test -f 'polystyle_test.cc' || echo '$(srcdir)/'`polystyle_test.cc
  
  polystyle_test-polystyle_test.obj: polystyle_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(polystyle_test_CXXFLAGS) $(CXXFLAGS) -MT polystyle_test-polystyle_test.obj -MD -MP -MF "$(DEPDIR)/polystyle_test-polystyle_test.Tpo" -c -o polystyle_test-polystyle_test.obj `if test -f 'polystyle_test.cc'; then $(CYGPATH_W) 'polystyle_test.cc'; else $(CYGPATH_W) '$(srcdir)/polystyle_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/polystyle_test-polystyle_test.Tpo" "$(DEPDIR)/polystyle_test-polystyle_test.Po"; else rm -f "$(DEPDIR)/polystyle_test-polystyle_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(polystyle_test_CXXFLAGS) $(CXXFLAGS) -MT polystyle_test-polystyle_test.obj -MD -MP -MF $(DEPDIR)/polystyle_test-polystyle_test.Tpo -c -o polystyle_test-polystyle_test.obj `if test -f 'polystyle_test.cc'; then $(CYGPATH_W) 'polystyle_test.cc'; else $(CYGPATH_W) '$(srcdir)/polystyle_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(polystyle_test_CXXFLAGS) $(CXXFLAGS) -MT polystyle_test-polystyle_test.obj -MD -MP -MF $(DEPDIR)/polystyle_test-polystyle_test.Tpo -c -o polystyle_test-polystyle_test.obj `if test -f 'polystyle_test.cc'; then $(CYGPATH_W) 'polystyle_test.cc'; else $(CYGPATH_W) '$(srcdir)/polystyle_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/polystyle_test-polystyle_test.Tpo $(DEPDIR)/polystyle_test-polystyle_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/polystyle_test-polystyle_test.Tpo $(DEPDIR)/polystyle_test-polystyle_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='polystyle_test.cc' object='polystyle_test-polystyle_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(polystyle_test_CXXFLAGS) $(CXXFLAGS) -c -o polystyle_test-polystyle_test.obj `if test -f 'polystyle_test.cc'; then $(CYGPATH_W) 'polystyle_test.cc'; else $(CYGPATH_W) '$(srcdir)/polystyle_test.cc'; fi`
  
  region_test-region_test.o: region_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(region_test_CXXFLAGS) $(CXXFLAGS) -MT region_test-region_test.o -MD -MP -MF "$(DEPDIR)/region_test-region_test.Tpo" -c -o region_test-region_test.o `test -f 'region_test.cc' || echo '$(srcdir)/'`region_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/region_test-region_test.Tpo" "$(DEPDIR)/region_test-region_test.Po"; else rm -f "$(DEPDIR)/region_test-region_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(region_test_CXXFLAGS) $(CXXFLAGS) -MT region_test-region_test.o -MD -MP -MF $(DEPDIR)/region_test-region_test.Tpo -c -o region_test-region_test.o `test -f 'region_test.cc' || echo '$(srcdir)/'`region_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(region_test_CXXFLAGS) $(CXXFLAGS) -MT region_test-region_test.o -MD -MP -MF $(DEPDIR)/region_test-region_test.Tpo -c -o region_test-region_test.o `test -f 'region_test.cc' || echo '$(srcdir)/'`region_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/region_test-region_test.Tpo $(DEPDIR)/region_test-region_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/region_test-region_test.Tpo $(DEPDIR)/region_test-region_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='region_test.cc' object='region_test-region_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(region_test_CXXFLAGS) $(CXXFLAGS) -c -o region_test-region_test.o `test -f 'region_test.cc' || echo '$(srcdir)/'`region_test.cc
  
  region_test-region_test.obj: region_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(region_test_CXXFLAGS) $(CXXFLAGS) -MT region_test-region_test.obj -MD -MP -MF "$(DEPDIR)/region_test-region_test.Tpo" -c -o region_test-region_test.obj `if test -f 'region_test.cc'; then $(CYGPATH_W) 'region_test.cc'; else $(CYGPATH_W) '$(srcdir)/region_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/region_test-region_test.Tpo" "$(DEPDIR)/region_test-region_test.Po"; else rm -f "$(DEPDIR)/region_test-region_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(region_test_CXXFLAGS) $(CXXFLAGS) -MT region_test-region_test.obj -MD -MP -MF $(DEPDIR)/region_test-region_test.Tpo -c -o region_test-region_test.obj `if test -f 'region_test.cc'; then $(CYGPATH_W) 'region_test.cc'; else $(CYGPATH_W) '$(srcdir)/region_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(region_test_CXXFLAGS) $(CXXFLAGS) -MT region_test-region_test.obj -MD -MP -MF $(DEPDIR)/region_test-region_test.Tpo -c -o region_test-region_test.obj `if test -f 'region_test.cc'; then $(CYGPATH_W) 'region_test.cc'; else $(CYGPATH_W) '$(srcdir)/region_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/region_test-region_test.Tpo $(DEPDIR)/region_test-region_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/region_test-region_test.Tpo $(DEPDIR)/region_test-region_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='region_test.cc' object='region_test-region_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(region_test_CXXFLAGS) $(CXXFLAGS) -c -o region_test-region_test.obj `if test -f 'region_test.cc'; then $(CYGPATH_W) 'region_test.cc'; else $(CYGPATH_W) '$(srcdir)/region_test.cc'; fi`
  
  round_trip_test-round_trip_test.o: round_trip_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(round_trip_test_CXXFLAGS) $(CXXFLAGS) -MT round_trip_test-round_trip_test.o -MD -MP -MF "$(DEPDIR)/round_trip_test-round_trip_test.Tpo" -c -o round_trip_test-round_trip_test.o `test -f 'round_trip_test.cc' || echo '$(srcdir)/'`round_trip_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/round_trip_test-round_trip_test.Tpo" "$(DEPDIR)/round_trip_test-round_trip_test.Po"; else rm -f "$(DEPDIR)/round_trip_test-round_trip_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(round_trip_test_CXXFLAGS) $(CXXFLAGS) -MT round_trip_test-round_trip_test.o -MD -MP -MF $(DEPDIR)/round_trip_test-round_trip_test.Tpo -c -o round_trip_test-round_trip_test.o `test -f 'round_trip_test.cc' || echo '$(srcdir)/'`round_trip_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(round_trip_test_CXXFLAGS) $(CXXFLAGS) -MT round_trip_test-round_trip_test.o -MD -MP -MF $(DEPDIR)/round_trip_test-round_trip_test.Tpo -c -o round_trip_test-round_trip_test.o `test -f 'round_trip_test.cc' || echo '$(srcdir)/'`round_trip_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/round_trip_test-round_trip_test.Tpo $(DEPDIR)/round_trip_test-round_trip_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/round_trip_test-round_trip_test.Tpo $(DEPDIR)/round_trip_test-round_trip_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='round_trip_test.cc' object='round_trip_test-round_trip_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(round_trip_test_CXXFLAGS) $(CXXFLAGS) -c -o round_trip_test-round_trip_test.o `test -f 'round_trip_test.cc' || echo '$(srcdir)/'`round_trip_test.cc
  
  round_trip_test-round_trip_test.obj: round_trip_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(round_trip_test_CXXFLAGS) $(CXXFLAGS) -MT round_trip_test-round_trip_test.obj -MD -MP -MF "$(DEPDIR)/round_trip_test-round_trip_test.Tpo" -c -o round_trip_test-round_trip_test.obj `if test -f 'round_trip_test.cc'; then $(CYGPATH_W) 'round_trip_test.cc'; else $(CYGPATH_W) '$(srcdir)/round_trip_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/round_trip_test-round_trip_test.Tpo" "$(DEPDIR)/round_trip_test-round_trip_test.Po"; else rm -f "$(DEPDIR)/round_trip_test-round_trip_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(round_trip_test_CXXFLAGS) $(CXXFLAGS) -MT round_trip_test-round_trip_test.obj -MD -MP -MF $(DEPDIR)/round_trip_test-round_trip_test.Tpo -c -o round_trip_test-round_trip_test.obj `if test -f 'round_trip_test.cc'; then $(CYGPATH_W) 'round_trip_test.cc'; else $(CYGPATH_W) '$(srcdir)/round_trip_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(round_trip_test_CXXFLAGS) $(CXXFLAGS) -MT round_trip_test-round_trip_test.obj -MD -MP -MF $(DEPDIR)/round_trip_test-round_trip_test.Tpo -c -o round_trip_test-round_trip_test.obj `if test -f 'round_trip_test.cc'; then $(CYGPATH_W) 'round_trip_test.cc'; else $(CYGPATH_W) '$(srcdir)/round_trip_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/round_trip_test-round_trip_test.Tpo $(DEPDIR)/round_trip_test-round_trip_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/round_trip_test-round_trip_test.Tpo $(DEPDIR)/round_trip_test-round_trip_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='round_trip_test.cc' object='round_trip_test-round_trip_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(round_trip_test_CXXFLAGS) $(CXXFLAGS) -c -o round_trip_test-round_trip_test.obj `if test -f 'round_trip_test.cc'; then $(CYGPATH_W) 'round_trip_test.cc'; else $(CYGPATH_W) '$(srcdir)/round_trip_test.cc'; fi`
  
  schema_test-schema_test.o: schema_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(schema_test_CXXFLAGS) $(CXXFLAGS) -MT schema_test-schema_test.o -MD -MP -MF "$(DEPDIR)/schema_test-schema_test.Tpo" -c -o schema_test-schema_test.o `test -f 'schema_test.cc' || echo '$(srcdir)/'`schema_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/schema_test-schema_test.Tpo" "$(DEPDIR)/schema_test-schema_test.Po"; else rm -f "$(DEPDIR)/schema_test-schema_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(schema_test_CXXFLAGS) $(CXXFLAGS) -MT schema_test-schema_test.o -MD -MP -MF $(DEPDIR)/schema_test-schema_test.Tpo -c -o schema_test-schema_test.o `test -f 'schema_test.cc' || echo '$(srcdir)/'`schema_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(schema_test_CXXFLAGS) $(CXXFLAGS) -MT schema_test-schema_test.o -MD -MP -MF $(DEPDIR)/schema_test-schema_test.Tpo -c -o schema_test-schema_test.o `test -f 'schema_test.cc' || echo '$(srcdir)/'`schema_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/schema_test-schema_test.Tpo $(DEPDIR)/schema_test-schema_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/schema_test-schema_test.Tpo $(DEPDIR)/schema_test-schema_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='schema_test.cc' object='schema_test-schema_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(schema_test_CXXFLAGS) $(CXXFLAGS) -c -o schema_test-schema_test.o `test -f 'schema_test.cc' || echo '$(srcdir)/'`schema_test.cc
  
  schema_test-schema_test.obj: schema_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(schema_test_CXXFLAGS) $(CXXFLAGS) -MT schema_test-schema_test.obj -MD -MP -MF "$(DEPDIR)/schema_test-schema_test.Tpo" -c -o schema_test-schema_test.obj `if test -f 'schema_test.cc'; then $(CYGPATH_W) 'schema_test.cc'; else $(CYGPATH_W) '$(srcdir)/schema_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/schema_test-schema_test.Tpo" "$(DEPDIR)/schema_test-schema_test.Po"; else rm -f "$(DEPDIR)/schema_test-schema_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(schema_test_CXXFLAGS) $(CXXFLAGS) -MT schema_test-schema_test.obj -MD -MP -MF $(DEPDIR)/schema_test-schema_test.Tpo -c -o schema_test-schema_test.obj `if test -f 'schema_test.cc'; then $(CYGPATH_W) 'schema_test.cc'; else $(CYGPATH_W) '$(srcdir)/schema_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(schema_test_CXXFLAGS) $(CXXFLAGS) -MT schema_test-schema_test.obj -MD -MP -MF $(DEPDIR)/schema_test-schema_test.Tpo -c -o schema_test-schema_test.obj `if test -f 'schema_test.cc'; then $(CYGPATH_W) 'schema_test.cc'; else $(CYGPATH_W) '$(srcdir)/schema_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/schema_test-schema_test.Tpo $(DEPDIR)/schema_test-schema_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/schema_test-schema_test.Tpo $(DEPDIR)/schema_test-schema_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='schema_test.cc' object='schema_test-schema_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(schema_test_CXXFLAGS) $(CXXFLAGS) -c -o schema_test-schema_test.obj `if test -f 'schema_test.cc'; then $(CYGPATH_W) 'schema_test.cc'; else $(CYGPATH_W) '$(srcdir)/schema_test.cc'; fi`
  
  serializer_test-serializer_test.o: serializer_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(serializer_test_CXXFLAGS) $(CXXFLAGS) -MT serializer_test-serializer_test.o -MD -MP -MF "$(DEPDIR)/serializer_test-serializer_test.Tpo" -c -o serializer_test-serializer_test.o `test -f 'serializer_test.cc' || echo '$(srcdir)/'`serializer_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/serializer_test-serializer_test.Tpo" "$(DEPDIR)/serializer_test-serializer_test.Po"; else rm -f "$(DEPDIR)/serializer_test-serializer_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(serializer_test_CXXFLAGS) $(CXXFLAGS) -MT serializer_test-serializer_test.o -MD -MP -MF $(DEPDIR)/serializer_test-serializer_test.Tpo -c -o serializer_test-serializer_test.o `test -f 'serializer_test.cc' || echo '$(srcdir)/'`serializer_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(serializer_test_CXXFLAGS) $(CXXFLAGS) -MT serializer_test-serializer_test.o -MD -MP -MF $(DEPDIR)/serializer_test-serializer_test.Tpo -c -o serializer_test-serializer_test.o `test -f 'serializer_test.cc' || echo '$(srcdir)/'`serializer_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/serializer_test-serializer_test.Tpo $(DEPDIR)/serializer_test-serializer_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/serializer_test-serializer_test.Tpo $(DEPDIR)/serializer_test-serializer_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='serializer_test.cc' object='serializer_test-serializer_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(serializer_test_CXXFLAGS) $(CXXFLAGS) -c -o serializer_test-serializer_test.o `test -f 'serializer_test.cc' || echo '$(srcdir)/'`serializer_test.cc
  
  serializer_test-serializer_test.obj: serializer_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(serializer_test_CXXFLAGS) $(CXXFLAGS) -MT serializer_test-serializer_test.obj -MD -MP -MF "$(DEPDIR)/serializer_test-serializer_test.Tpo" -c -o serializer_test-serializer_test.obj `if test -f 'serializer_test.cc'; then $(CYGPATH_W) 'serializer_test.cc'; else $(CYGPATH_W) '$(srcdir)/serializer_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/serializer_test-serializer_test.Tpo" "$(DEPDIR)/serializer_test-serializer_test.Po"; else rm -f "$(DEPDIR)/serializer_test-serializer_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(serializer_test_CXXFLAGS) $(CXXFLAGS) -MT serializer_test-serializer_test.obj -MD -MP -MF $(DEPDIR)/serializer_test-serializer_test.Tpo -c -o serializer_test-serializer_test.obj `if test -f 'serializer_test.cc'; then $(CYGPATH_W) 'serializer_test.cc'; else $(CYGPATH_W) '$(srcdir)/serializer_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(serializer_test_CXXFLAGS) $(CXXFLAGS) -MT serializer_test-serializer_test.obj -MD -MP -MF $(DEPDIR)/serializer_test-serializer_test.Tpo -c -o serializer_test-serializer_test.obj `if test -f 'serializer_test.cc'; then $(CYGPATH_W) 'serializer_test.cc'; else $(CYGPATH_W) '$(srcdir)/serializer_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/serializer_test-serializer_test.Tpo $(DEPDIR)/serializer_test-serializer_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/serializer_test-serializer_test.Tpo $(DEPDIR)/serializer_test-serializer_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='serializer_test.cc' object='serializer_test-serializer_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(serializer_test_CXXFLAGS) $(CXXFLAGS) -c -o serializer_test-serializer_test.obj `if test -f 'serializer_test.cc'; then $(CYGPATH_W) 'serializer_test.cc'; else $(CYGPATH_W) '$(srcdir)/serializer_test.cc'; fi`
  
  snippet_test-snippet_test.o: snippet_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(snippet_test_CXXFLAGS) $(CXXFLAGS) -MT snippet_test-snippet_test.o -MD -MP -MF "$(DEPDIR)/snippet_test-snippet_test.Tpo" -c -o snippet_test-snippet_test.o `test -f 'snippet_test.cc' || echo '$(srcdir)/'`snippet_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/snippet_test-snippet_test.Tpo" "$(DEPDIR)/snippet_test-snippet_test.Po"; else rm -f "$(DEPDIR)/snippet_test-snippet_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(snippet_test_CXXFLAGS) $(CXXFLAGS) -MT snippet_test-snippet_test.o -MD -MP -MF $(DEPDIR)/snippet_test-snippet_test.Tpo -c -o snippet_test-snippet_test.o `test -f 'snippet_test.cc' || echo '$(srcdir)/'`snippet_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(snippet_test_CXXFLAGS) $(CXXFLAGS) -MT snippet_test-snippet_test.o -MD -MP -MF $(DEPDIR)/snippet_test-snippet_test.Tpo -c -o snippet_test-snippet_test.o `test -f 'snippet_test.cc' || echo '$(srcdir)/'`snippet_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/snippet_test-snippet_test.Tpo $(DEPDIR)/snippet_test-snippet_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/snippet_test-snippet_test.Tpo $(DEPDIR)/snippet_test-snippet_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='snippet_test.cc' object='snippet_test-snippet_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(snippet_test_CXXFLAGS) $(CXXFLAGS) -c -o snippet_test-snippet_test.o `test -f 'snippet_test.cc' || echo '$(srcdir)/'`snippet_test.cc
  
  snippet_test-snippet_test.obj: snippet_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(snippet_test_CXXFLAGS) $(CXXFLAGS) -MT snippet_test-snippet_test.obj -MD -MP -MF "$(DEPDIR)/snippet_test-snippet_test.Tpo" -c -o snippet_test-snippet_test.obj `if test -f 'snippet_test.cc'; then $(CYGPATH_W) 'snippet_test.cc'; else $(CYGPATH_W) '$(srcdir)/snippet_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/snippet_test-snippet_test.Tpo" "$(DEPDIR)/snippet_test-snippet_test.Po"; else rm -f "$(DEPDIR)/snippet_test-snippet_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(snippet_test_CXXFLAGS) $(CXXFLAGS) -MT snippet_test-snippet_test.obj -MD -MP -MF $(DEPDIR)/snippet_test-snippet_test.Tpo -c -o snippet_test-snippet_test.obj `if test -f 'snippet_test.cc'; then $(CYGPATH_W) 'snippet_test.cc'; else $(CYGPATH_W) '$(srcdir)/snippet_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(snippet_test_CXXFLAGS) $(CXXFLAGS) -MT snippet_test-snippet_test.obj -MD -MP -MF $(DEPDIR)/snippet_test-snippet_test.Tpo -c -o snippet_test-snippet_test.obj `if test -f 'snippet_test.cc'; then $(CYGPATH_W) 'snippet_test.cc'; else $(CYGPATH_W) '$(srcdir)/snippet_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/snippet_test-snippet_test.Tpo $(DEPDIR)/snippet_test-snippet_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/snippet_test-snippet_test.Tpo $(DEPDIR)/snippet_test-snippet_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='snippet_test.cc' object='snippet_test-snippet_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(snippet_test_CXXFLAGS) $(CXXFLAGS) -c -o snippet_test-snippet_test.obj `if test -f 'snippet_test.cc'; then $(CYGPATH_W) 'snippet_test.cc'; else $(CYGPATH_W) '$(srcdir)/snippet_test.cc'; fi`
  
  style_test-style_test.o: style_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(style_test_CXXFLAGS) $(CXXFLAGS) -MT style_test-style_test.o -MD -MP -MF "$(DEPDIR)/style_test-style_test.Tpo" -c -o style_test-style_test.o `test -f 'style_test.cc' || echo '$(srcdir)/'`style_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/style_test-style_test.Tpo" "$(DEPDIR)/style_test-style_test.Po"; else rm -f "$(DEPDIR)/style_test-style_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(style_test_CXXFLAGS) $(CXXFLAGS) -MT style_test-style_test.o -MD -MP -MF $(DEPDIR)/style_test-style_test.Tpo -c -o style_test-style_test.o `test -f 'style_test.cc' || echo '$(srcdir)/'`style_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(style_test_CXXFLAGS) $(CXXFLAGS) -MT style_test-style_test.o -MD -MP -MF $(DEPDIR)/style_test-style_test.Tpo -c -o style_test-style_test.o `test -f 'style_test.cc' || echo '$(srcdir)/'`style_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/style_test-style_test.Tpo $(DEPDIR)/style_test-style_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/style_test-style_test.Tpo $(DEPDIR)/style_test-style_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='style_test.cc' object='style_test-style_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(style_test_CXXFLAGS) $(CXXFLAGS) -c -o style_test-style_test.o `test -f 'style_test.cc' || echo '$(srcdir)/'`style_test.cc
  
  style_test-style_test.obj: style_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(style_test_CXXFLAGS) $(CXXFLAGS) -MT style_test-style_test.obj -MD -MP -MF "$(DEPDIR)/style_test-style_test.Tpo" -c -o style_test-style_test.obj `if test -f 'style_test.cc'; then $(CYGPATH_W) 'style_test.cc'; else $(CYGPATH_W) '$(srcdir)/style_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/style_test-style_test.Tpo" "$(DEPDIR)/style_test-style_test.Po"; else rm -f "$(DEPDIR)/style_test-style_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(style_test_CXXFLAGS) $(CXXFLAGS) -MT style_test-style_test.obj -MD -MP -MF $(DEPDIR)/style_test-style_test.Tpo -c -o style_test-style_test.obj `if test -f 'style_test.cc'; then $(CYGPATH_W) 'style_test.cc'; else $(CYGPATH_W) '$(srcdir)/style_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(style_test_CXXFLAGS) $(CXXFLAGS) -MT style_test-style_test.obj -MD -MP -MF $(DEPDIR)/style_test-style_test.Tpo -c -o style_test-style_test.obj `if test -f 'style_test.cc'; then $(CYGPATH_W) 'style_test.cc'; else $(CYGPATH_W) '$(srcdir)/style_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/style_test-style_test.Tpo $(DEPDIR)/style_test-style_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/style_test-style_test.Tpo $(DEPDIR)/style_test-style_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='style_test.cc' object='style_test-style_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(style_test_CXXFLAGS) $(CXXFLAGS) -c -o style_test-style_test.obj `if test -f 'style_test.cc'; then $(CYGPATH_W) 'style_test.cc'; else $(CYGPATH_W) '$(srcdir)/style_test.cc'; fi`
  
  stylemap_test-stylemap_test.o: stylemap_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(stylemap_test_CXXFLAGS) $(CXXFLAGS) -MT stylemap_test-stylemap_test.o -MD -MP -MF "$(DEPDIR)/stylemap_test-stylemap_test.Tpo" -c -o stylemap_test-stylemap_test.o `test -f 'stylemap_test.cc' || echo '$(srcdir)/'`stylemap_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/stylemap_test-stylemap_test.Tpo" "$(DEPDIR)/stylemap_test-stylemap_test.Po"; else rm -f "$(DEPDIR)/stylemap_test-stylemap_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(stylemap_test_CXXFLAGS) $(CXXFLAGS) -MT stylemap_test-stylemap_test.o -MD -MP -MF $(DEPDIR)/stylemap_test-stylemap_test.Tpo -c -o stylemap_test-stylemap_test.o `test -f 'stylemap_test.cc' || echo '$(srcdir)/'`stylemap_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(stylemap_test_CXXFLAGS) $(CXXFLAGS) -MT stylemap_test-stylemap_test.o -MD -MP -MF $(DEPDIR)/stylemap_test-stylemap_test.Tpo -c -o stylemap_test-stylemap_test.o `test -f 'stylemap_test.cc' || echo '$(srcdir)/'`stylemap_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/stylemap_test-stylemap_test.Tpo $(DEPDIR)/stylemap_test-stylemap_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/stylemap_test-stylemap_test.Tpo $(DEPDIR)/stylemap_test-stylemap_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='stylemap_test.cc' object='stylemap_test-stylemap_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(stylemap_test_CXXFLAGS) $(CXXFLAGS) -c -o stylemap_test-stylemap_test.o `test -f 'stylemap_test.cc' || echo '$(srcdir)/'`stylemap_test.cc
  
  stylemap_test-stylemap_test.obj: stylemap_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(stylemap_test_CXXFLAGS) $(CXXFLAGS) -MT stylemap_test-stylemap_test.obj -MD -MP -MF "$(DEPDIR)/stylemap_test-stylemap_test.Tpo" -c -o stylemap_test-stylemap_test.obj `if test -f 'stylemap_test.cc'; then $(CYGPATH_W) 'stylemap_test.cc'; else $(CYGPATH_W) '$(srcdir)/stylemap_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/stylemap_test-stylemap_test.Tpo" "$(DEPDIR)/stylemap_test-stylemap_test.Po"; else rm -f "$(DEPDIR)/stylemap_test-stylemap_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(stylemap_test_CXXFLAGS) $(CXXFLAGS) -MT stylemap_test-stylemap_test.obj -MD -MP -MF $(DEPDIR)/stylemap_test-stylemap_test.Tpo -c -o stylemap_test-stylemap_test.obj `if test -f 'stylemap_test.cc'; then $(CYGPATH_W) 'stylemap_test.cc'; else $(CYGPATH_W) '$(srcdir)/stylemap_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(stylemap_test_CXXFLAGS) $(CXXFLAGS) -MT stylemap_test-stylemap_test.obj -MD -MP -MF $(DEPDIR)/stylemap_test-stylemap_test.Tpo -c -o stylemap_test-stylemap_test.obj `if test -f 'stylemap_test.cc'; then $(CYGPATH_W) 'stylemap_test.cc'; else $(CYGPATH_W) '$(srcdir)/stylemap_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/stylemap_test-stylemap_test.Tpo $(DEPDIR)/stylemap_test-stylemap_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/stylemap_test-stylemap_test.Tpo $(DEPDIR)/stylemap_test-stylemap_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='stylemap_test.cc' object='stylemap_test-stylemap_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(stylemap_test_CXXFLAGS) $(CXXFLAGS) -c -o stylemap_test-stylemap_test.obj `if test -f 'stylemap_test.cc'; then $(CYGPATH_W) 'stylemap_test.cc'; else $(CYGPATH_W) '$(srcdir)/stylemap_test.cc'; fi`
  
  styleselector_test-styleselector_test.o: styleselector_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(styleselector_test_CXXFLAGS) $(CXXFLAGS) -MT styleselector_test-styleselector_test.o -MD -MP -MF "$(DEPDIR)/styleselector_test-styleselector_test.Tpo" -c -o styleselector_test-styleselector_test.o `test -f 'styleselector_test.cc' || echo '$(srcdir)/'`styleselector_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/styleselector_test-styleselector_test.Tpo" "$(DEPDIR)/styleselector_test-styleselector_test.Po"; else rm -f "$(DEPDIR)/styleselector_test-styleselector_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(styleselector_test_CXXFLAGS) $(CXXFLAGS) -MT styleselector_test-styleselector_test.o -MD -MP -MF $(DEPDIR)/styleselector_test-styleselector_test.Tpo -c -o styleselector_test-styleselector_test.o `test -f 'styleselector_test.cc' || echo '$(srcdir)/'`styleselector_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(styleselector_test_CXXFLAGS) $(CXXFLAGS) -MT styleselector_test-styleselector_test.o -MD -MP -MF $(DEPDIR)/styleselector_test-styleselector_test.Tpo -c -o styleselector_test-styleselector_test.o `test -f 'styleselector_test.cc' || echo '$(srcdir)/'`styleselector_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/styleselector_test-styleselector_test.Tpo $(DEPDIR)/styleselector_test-styleselector_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/styleselector_test-styleselector_test.Tpo $(DEPDIR)/styleselector_test-styleselector_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='styleselector_test.cc' object='styleselector_test-styleselector_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(styleselector_test_CXXFLAGS) $(CXXFLAGS) -c -o styleselector_test-styleselector_test.o `test -f 'styleselector_test.cc' || echo '$(srcdir)/'`styleselector_test.cc
  
  styleselector_test-styleselector_test.obj: styleselector_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(styleselector_test_CXXFLAGS) $(CXXFLAGS) -MT styleselector_test-styleselector_test.obj -MD -MP -MF "$(DEPDIR)/styleselector_test-styleselector_test.Tpo" -c -o styleselector_test-styleselector_test.obj `if test -f 'styleselector_test.cc'; then $(CYGPATH_W) 'styleselector_test.cc'; else $(CYGPATH_W) '$(srcdir)/styleselector_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/styleselector_test-styleselector_test.Tpo" "$(DEPDIR)/styleselector_test-styleselector_test.Po"; else rm -f "$(DEPDIR)/styleselector_test-styleselector_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(styleselector_test_CXXFLAGS) $(CXXFLAGS) -MT styleselector_test-styleselector_test.obj -MD -MP -MF $(DEPDIR)/styleselector_test-styleselector_test.Tpo -c -o styleselector_test-styleselector_test.obj `if test -f 'styleselector_test.cc'; then $(CYGPATH_W) 'styleselector_test.cc'; else $(CYGPATH_W) '$(srcdir)/styleselector_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(styleselector_test_CXXFLAGS) $(CXXFLAGS) -MT styleselector_test-styleselector_test.obj -MD -MP -MF $(DEPDIR)/styleselector_test-styleselector_test.Tpo -c -o styleselector_test-styleselector_test.obj `if test -f 'styleselector_test.cc'; then $(CYGPATH_W) 'styleselector_test.cc'; else $(CYGPATH_W) '$(srcdir)/styleselector_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/styleselector_test-styleselector_test.Tpo $(DEPDIR)/styleselector_test-styleselector_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/styleselector_test-styleselector_test.Tpo $(DEPDIR)/styleselector_test-styleselector_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='styleselector_test.cc' object='styleselector_test-styleselector_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(styleselector_test_CXXFLAGS) $(CXXFLAGS) -c -o styleselector_test-styleselector_test.obj `if test -f 'styleselector_test.cc'; then $(CYGPATH_W) 'styleselector_test.cc'; else $(CYGPATH_W) '$(srcdir)/styleselector_test.cc'; fi`
  
  substyle_test-substyle_test.o: substyle_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(substyle_test_CXXFLAGS) $(CXXFLAGS) -MT substyle_test-substyle_test.o -MD -MP -MF "$(DEPDIR)/substyle_test-substyle_test.Tpo" -c -o substyle_test-substyle_test.o `test -f 'substyle_test.cc' || echo '$(srcdir)/'`substyle_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/substyle_test-substyle_test.Tpo" "$(DEPDIR)/substyle_test-substyle_test.Po"; else rm -f "$(DEPDIR)/substyle_test-substyle_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(substyle_test_CXXFLAGS) $(CXXFLAGS) -MT substyle_test-substyle_test.o -MD -MP -MF $(DEPDIR)/substyle_test-substyle_test.Tpo -c -o substyle_test-substyle_test.o `test -f 'substyle_test.cc' || echo '$(srcdir)/'`substyle_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(substyle_test_CXXFLAGS) $(CXXFLAGS) -MT substyle_test-substyle_test.o -MD -MP -MF $(DEPDIR)/substyle_test-substyle_test.Tpo -c -o substyle_test-substyle_test.o `test -f 'substyle_test.cc' || echo '$(srcdir)/'`substyle_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/substyle_test-substyle_test.Tpo $(DEPDIR)/substyle_test-substyle_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/substyle_test-substyle_test.Tpo $(DEPDIR)/substyle_test-substyle_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='substyle_test.cc' object='substyle_test-substyle_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(substyle_test_CXXFLAGS) $(CXXFLAGS) -c -o substyle_test-substyle_test.o `test -f 'substyle_test.cc' || echo '$(srcdir)/'`substyle_test.cc
  
  substyle_test-substyle_test.obj: substyle_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(substyle_test_CXXFLAGS) $(CXXFLAGS) -MT substyle_test-substyle_test.obj -MD -MP -MF "$(DEPDIR)/substyle_test-substyle_test.Tpo" -c -o substyle_test-substyle_test.obj `if test -f 'substyle_test.cc'; then $(CYGPATH_W) 'substyle_test.cc'; else $(CYGPATH_W) '$(srcdir)/substyle_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/substyle_test-substyle_test.Tpo" "$(DEPDIR)/substyle_test-substyle_test.Po"; else rm -f "$(DEPDIR)/substyle_test-substyle_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(substyle_test_CXXFLAGS) $(CXXFLAGS) -MT substyle_test-substyle_test.obj -MD -MP -MF $(DEPDIR)/substyle_test-substyle_test.Tpo -c -o substyle_test-substyle_test.obj `if test -f 'substyle_test.cc'; then $(CYGPATH_W) 'substyle_test.cc'; else $(CYGPATH_W) '$(srcdir)/substyle_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(substyle_test_CXXFLAGS) $(CXXFLAGS) -MT substyle_test-substyle_test.obj -MD -MP -MF $(DEPDIR)/substyle_test-substyle_test.Tpo -c -o substyle_test-substyle_test.obj `if test -f 'substyle_test.cc'; then $(CYGPATH_W) 'substyle_test.cc'; else $(CYGPATH_W) '$(srcdir)/substyle_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/substyle_test-substyle_test.Tpo $(DEPDIR)/substyle_test-substyle_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/substyle_test-substyle_test.Tpo $(DEPDIR)/substyle_test-substyle_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='substyle_test.cc' object='substyle_test-substyle_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(substyle_test_CXXFLAGS) $(CXXFLAGS) -c -o substyle_test-substyle_test.obj `if test -f 'substyle_test.cc'; then $(CYGPATH_W) 'substyle_test.cc'; else $(CYGPATH_W) '$(srcdir)/substyle_test.cc'; fi`
  
  timeprimitive_test-timeprimitive_test.o: timeprimitive_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(timeprimitive_test_CXXFLAGS) $(CXXFLAGS) -MT timeprimitive_test-timeprimitive_test.o -MD -MP -MF "$(DEPDIR)/timeprimitive_test-timeprimitive_test.Tpo" -c -o timeprimitive_test-timeprimitive_test.o `test -f 'timeprimitive_test.cc' || echo '$(srcdir)/'`timeprimitive_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/timeprimitive_test-timeprimitive_test.Tpo" "$(DEPDIR)/timeprimitive_test-timeprimitive_test.Po"; else rm -f "$(DEPDIR)/timeprimitive_test-timeprimitive_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(timeprimitive_test_CXXFLAGS) $(CXXFLAGS) -MT timeprimitive_test-timeprimitive_test.o -MD -MP -MF $(DEPDIR)/timeprimitive_test-timeprimitive_test.Tpo -c -o timeprimitive_test-timeprimitive_test.o `test -f 'timeprimitive_test.cc' || echo '$(srcdir)/'`timeprimitive_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(timeprimitive_test_CXXFLAGS) $(CXXFLAGS) -MT timeprimitive_test-timeprimitive_test.o -MD -MP -MF $(DEPDIR)/timeprimitive_test-timeprimitive_test.Tpo -c -o timeprimitive_test-timeprimitive_test.o `test -f 'timeprimitive_test.cc' || echo '$(srcdir)/'`timeprimitive_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/timeprimitive_test-timeprimitive_test.Tpo $(DEPDIR)/timeprimitive_test-timeprimitive_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/timeprimitive_test-timeprimitive_test.Tpo $(DEPDIR)/timeprimitive_test-timeprimitive_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='timeprimitive_test.cc' object='timeprimitive_test-timeprimitive_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(timeprimitive_test_CXXFLAGS) $(CXXFLAGS) -c -o timeprimitive_test-timeprimitive_test.o `test -f 'timeprimitive_test.cc' || echo '$(srcdir)/'`timeprimitive_test.cc
  
  timeprimitive_test-timeprimitive_test.obj: timeprimitive_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(timeprimitive_test_CXXFLAGS) $(CXXFLAGS) -MT timeprimitive_test-timeprimitive_test.obj -MD -MP -MF "$(DEPDIR)/timeprimitive_test-timeprimitive_test.Tpo" -c -o timeprimitive_test-timeprimitive_test.obj `if test -f 'timeprimitive_test.cc'; then $(CYGPATH_W) 'timeprimitive_test.cc'; else $(CYGPATH_W) '$(srcdir)/timeprimitive_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/timeprimitive_test-timeprimitive_test.Tpo" "$(DEPDIR)/timeprimitive_test-timeprimitive_test.Po"; else rm -f "$(DEPDIR)/timeprimitive_test-timeprimitive_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(timeprimitive_test_CXXFLAGS) $(CXXFLAGS) -MT timeprimitive_test-timeprimitive_test.obj -MD -MP -MF $(DEPDIR)/timeprimitive_test-timeprimitive_test.Tpo -c -o timeprimitive_test-timeprimitive_test.obj `if test -f 'timeprimitive_test.cc'; then $(CYGPATH_W) 'timeprimitive_test.cc'; else $(CYGPATH_W) '$(srcdir)/timeprimitive_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(timeprimitive_test_CXXFLAGS) $(CXXFLAGS) -MT timeprimitive_test-timeprimitive_test.obj -MD -MP -MF $(DEPDIR)/timeprimitive_test-timeprimitive_test.Tpo -c -o timeprimitive_test-timeprimitive_test.obj `if test -f 'timeprimitive_test.cc'; then $(CYGPATH_W) 'timeprimitive_test.cc'; else $(CYGPATH_W) '$(srcdir)/timeprimitive_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/timeprimitive_test-timeprimitive_test.Tpo $(DEPDIR)/timeprimitive_test-timeprimitive_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/timeprimitive_test-timeprimitive_test.Tpo $(DEPDIR)/timeprimitive_test-timeprimitive_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='timeprimitive_test.cc' object='timeprimitive_test-timeprimitive_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(timeprimitive_test_CXXFLAGS) $(CXXFLAGS) -c -o timeprimitive_test-timeprimitive_test.obj `if test -f 'timeprimitive_test.cc'; then $(CYGPATH_W) 'timeprimitive_test.cc'; else $(CYGPATH_W) '$(srcdir)/timeprimitive_test.cc'; fi`
  
  unknown_test-unknown_test.o: unknown_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unknown_test_CXXFLAGS) $(CXXFLAGS) -MT unknown_test-unknown_test.o -MD -MP -MF "$(DEPDIR)/unknown_test-unknown_test.Tpo" -c -o unknown_test-unknown_test.o `test -f 'unknown_test.cc' || echo '$(srcdir)/'`unknown_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/unknown_test-unknown_test.Tpo" "$(DEPDIR)/unknown_test-unknown_test.Po"; else rm -f "$(DEPDIR)/unknown_test-unknown_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unknown_test_CXXFLAGS) $(CXXFLAGS) -MT unknown_test-unknown_test.o -MD -MP -MF $(DEPDIR)/unknown_test-unknown_test.Tpo -c -o unknown_test-unknown_test.o `test -f 'unknown_test.cc' || echo '$(srcdir)/'`unknown_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unknown_test_CXXFLAGS) $(CXXFLAGS) -MT unknown_test-unknown_test.o -MD -MP -MF $(DEPDIR)/unknown_test-unknown_test.Tpo -c -o unknown_test-unknown_test.o `test -f 'unknown_test.cc' || echo '$(srcdir)/'`unknown_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/unknown_test-unknown_test.Tpo $(DEPDIR)/unknown_test-unknown_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/unknown_test-unknown_test.Tpo $(DEPDIR)/unknown_test-unknown_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='unknown_test.cc' object='unknown_test-unknown_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unknown_test_CXXFLAGS) $(CXXFLAGS) -c -o unknown_test-unknown_test.o `test -f 'unknown_test.cc' || echo '$(srcdir)/'`unknown_test.cc
  
  unknown_test-unknown_test.obj: unknown_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unknown_test_CXXFLAGS) $(CXXFLAGS) -MT unknown_test-unknown_test.obj -MD -MP -MF "$(DEPDIR)/unknown_test-unknown_test.Tpo" -c -o unknown_test-unknown_test.obj `if test -f 'unknown_test.cc'; then $(CYGPATH_W) 'unknown_test.cc'; else $(CYGPATH_W) '$(srcdir)/unknown_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/unknown_test-unknown_test.Tpo" "$(DEPDIR)/unknown_test-unknown_test.Po"; else rm -f "$(DEPDIR)/unknown_test-unknown_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unknown_test_CXXFLAGS) $(CXXFLAGS) -MT unknown_test-unknown_test.obj -MD -MP -MF $(DEPDIR)/unknown_test-unknown_test.Tpo -c -o unknown_test-unknown_test.obj `if test -f 'unknown_test.cc'; then $(CYGPATH_W) 'unknown_test.cc'; else $(CYGPATH_W) '$(srcdir)/unknown_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unknown_test_CXXFLAGS) $(CXXFLAGS) -MT unknown_test-unknown_test.obj -MD -MP -MF $(DEPDIR)/unknown_test-unknown_test.Tpo -c -o unknown_test-unknown_test.obj `if test -f 'unknown_test.cc'; then $(CYGPATH_W) 'unknown_test.cc'; else $(CYGPATH_W) '$(srcdir)/unknown_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/unknown_test-unknown_test.Tpo $(DEPDIR)/unknown_test-unknown_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/unknown_test-unknown_test.Tpo $(DEPDIR)/unknown_test-unknown_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='unknown_test.cc' object='unknown_test-unknown_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(unknown_test_CXXFLAGS) $(CXXFLAGS) -c -o unknown_test-unknown_test.obj `if test -f 'unknown_test.cc'; then $(CYGPATH_W) 'unknown_test.cc'; else $(CYGPATH_W) '$(srcdir)/unknown_test.cc'; fi`
  
  vec2_test-vec2_test.o: vec2_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vec2_test_CXXFLAGS) $(CXXFLAGS) -MT vec2_test-vec2_test.o -MD -MP -MF "$(DEPDIR)/vec2_test-vec2_test.Tpo" -c -o vec2_test-vec2_test.o `test -f 'vec2_test.cc' || echo '$(srcdir)/'`vec2_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/vec2_test-vec2_test.Tpo" "$(DEPDIR)/vec2_test-vec2_test.Po"; else rm -f "$(DEPDIR)/vec2_test-vec2_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vec2_test_CXXFLAGS) $(CXXFLAGS) -MT vec2_test-vec2_test.o -MD -MP -MF $(DEPDIR)/vec2_test-vec2_test.Tpo -c -o vec2_test-vec2_test.o `test -f 'vec2_test.cc' || echo '$(srcdir)/'`vec2_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vec2_test_CXXFLAGS) $(CXXFLAGS) -MT vec2_test-vec2_test.o -MD -MP -MF $(DEPDIR)/vec2_test-vec2_test.Tpo -c -o vec2_test-vec2_test.o `test -f 'vec2_test.cc' || echo '$(srcdir)/'`vec2_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/vec2_test-vec2_test.Tpo $(DEPDIR)/vec2_test-vec2_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/vec2_test-vec2_test.Tpo $(DEPDIR)/vec2_test-vec2_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='vec2_test.cc' object='vec2_test-vec2_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vec2_test_CXXFLAGS) $(CXXFLAGS) -c -o vec2_test-vec2_test.o `test -f 'vec2_test.cc' || echo '$(srcdir)/'`vec2_test.cc
  
  vec2_test-vec2_test.obj: vec2_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vec2_test_CXXFLAGS) $(CXXFLAGS) -MT vec2_test-vec2_test.obj -MD -MP -MF "$(DEPDIR)/vec2_test-vec2_test.Tpo" -c -o vec2_test-vec2_test.obj `if test -f 'vec2_test.cc'; then $(CYGPATH_W) 'vec2_test.cc'; else $(CYGPATH_W) '$(srcdir)/vec2_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/vec2_test-vec2_test.Tpo" "$(DEPDIR)/vec2_test-vec2_test.Po"; else rm -f "$(DEPDIR)/vec2_test-vec2_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vec2_test_CXXFLAGS) $(CXXFLAGS) -MT vec2_test-vec2_test.obj -MD -MP -MF $(DEPDIR)/vec2_test-vec2_test.Tpo -c -o vec2_test-vec2_test.obj `if test -f 'vec2_test.cc'; then $(CYGPATH_W) 'vec2_test.cc'; else $(CYGPATH_W) '$(srcdir)/vec2_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vec2_test_CXXFLAGS) $(CXXFLAGS) -MT vec2_test-vec2_test.obj -MD -MP -MF $(DEPDIR)/vec2_test-vec2_test.Tpo -c -o vec2_test-vec2_test.obj `if test -f 'vec2_test.cc'; then $(CYGPATH_W) 'vec2_test.cc'; else $(CYGPATH_W) '$(srcdir)/vec2_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/vec2_test-vec2_test.Tpo $(DEPDIR)/vec2_test-vec2_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/vec2_test-vec2_test.Tpo $(DEPDIR)/vec2_test-vec2_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='vec2_test.cc' object='vec2_test-vec2_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vec2_test_CXXFLAGS) $(CXXFLAGS) -c -o vec2_test-vec2_test.obj `if test -f 'vec2_test.cc'; then $(CYGPATH_W) 'vec2_test.cc'; else $(CYGPATH_W) '$(srcdir)/vec2_test.cc'; fi`
  
  xal_test-xal_test.o: xal_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xal_test_CXXFLAGS) $(CXXFLAGS) -MT xal_test-xal_test.o -MD -MP -MF "$(DEPDIR)/xal_test-xal_test.Tpo" -c -o xal_test-xal_test.o `test -f 'xal_test.cc' || echo '$(srcdir)/'`xal_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/xal_test-xal_test.Tpo" "$(DEPDIR)/xal_test-xal_test.Po"; else rm -f "$(DEPDIR)/xal_test-xal_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xal_test_CXXFLAGS) $(CXXFLAGS) -MT xal_test-xal_test.o -MD -MP -MF $(DEPDIR)/xal_test-xal_test.Tpo -c -o xal_test-xal_test.o `test -f 'xal_test.cc' || echo '$(srcdir)/'`xal_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xal_test_CXXFLAGS) $(CXXFLAGS) -MT xal_test-xal_test.o -MD -MP -MF $(DEPDIR)/xal_test-xal_test.Tpo -c -o xal_test-xal_test.o `test -f 'xal_test.cc' || echo '$(srcdir)/'`xal_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/xal_test-xal_test.Tpo $(DEPDIR)/xal_test-xal_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/xal_test-xal_test.Tpo $(DEPDIR)/xal_test-xal_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='xal_test.cc' object='xal_test-xal_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xal_test_CXXFLAGS) $(CXXFLAGS) -c -o xal_test-xal_test.o `test -f 'xal_test.cc' || echo '$(srcdir)/'`xal_test.cc
  
  xal_test-xal_test.obj: xal_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xal_test_CXXFLAGS) $(CXXFLAGS) -MT xal_test-xal_test.obj -MD -MP -MF "$(DEPDIR)/xal_test-xal_test.Tpo" -c -o xal_test-xal_test.obj `if test -f 'xal_test.cc'; then $(CYGPATH_W) 'xal_test.cc'; else $(CYGPATH_W) '$(srcdir)/xal_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/xal_test-xal_test.Tpo" "$(DEPDIR)/xal_test-xal_test.Po"; else rm -f "$(DEPDIR)/xal_test-xal_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xal_test_CXXFLAGS) $(CXXFLAGS) -MT xal_test-xal_test.obj -MD -MP -MF $(DEPDIR)/xal_test-xal_test.Tpo -c -o xal_test-xal_test.obj `if test -f 'xal_test.cc'; then $(CYGPATH_W) 'xal_test.cc'; else $(CYGPATH_W) '$(srcdir)/xal_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xal_test_CXXFLAGS) $(CXXFLAGS) -MT xal_test-xal_test.obj -MD -MP -MF $(DEPDIR)/xal_test-xal_test.Tpo -c -o xal_test-xal_test.obj `if test -f 'xal_test.cc'; then $(CYGPATH_W) 'xal_test.cc'; else $(CYGPATH_W) '$(srcdir)/xal_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/xal_test-xal_test.Tpo $(DEPDIR)/xal_test-xal_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/xal_test-xal_test.Tpo $(DEPDIR)/xal_test-xal_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='xal_test.cc' object='xal_test-xal_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xal_test_CXXFLAGS) $(CXXFLAGS) -c -o xal_test-xal_test.obj `if test -f 'xal_test.cc'; then $(CYGPATH_W) 'xal_test.cc'; else $(CYGPATH_W) '$(srcdir)/xal_test.cc'; fi`
  
  xml_serializer_test-xml_serializer_test.o: xml_serializer_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xml_serializer_test_CXXFLAGS) $(CXXFLAGS) -MT xml_serializer_test-xml_serializer_test.o -MD -MP -MF "$(DEPDIR)/xml_serializer_test-xml_serializer_test.Tpo" -c -o xml_serializer_test-xml_serializer_test.o `test -f 'xml_serializer_test.cc' || echo '$(srcdir)/'`xml_serializer_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/xml_serializer_test-xml_serializer_test.Tpo" "$(DEPDIR)/xml_serializer_test-xml_serializer_test.Po"; else rm -f "$(DEPDIR)/xml_serializer_test-xml_serializer_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xml_serializer_test_CXXFLAGS) $(CXXFLAGS) -MT xml_serializer_test-xml_serializer_test.o -MD -MP -MF $(DEPDIR)/xml_serializer_test-xml_serializer_test.Tpo -c -o xml_serializer_test-xml_serializer_test.o `test -f 'xml_serializer_test.cc' || echo '$(srcdir)/'`xml_serializer_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xml_serializer_test_CXXFLAGS) $(CXXFLAGS) -MT xml_serializer_test-xml_serializer_test.o -MD -MP -MF $(DEPDIR)/xml_serializer_test-xml_serializer_test.Tpo -c -o xml_serializer_test-xml_serializer_test.o `test -f 'xml_serializer_test.cc' || echo '$(srcdir)/'`xml_serializer_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/xml_serializer_test-xml_serializer_test.Tpo $(DEPDIR)/xml_serializer_test-xml_serializer_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/xml_serializer_test-xml_serializer_test.Tpo $(DEPDIR)/xml_serializer_test-xml_serializer_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='xml_serializer_test.cc' object='xml_serializer_test-xml_serializer_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xml_serializer_test_CXXFLAGS) $(CXXFLAGS) -c -o xml_serializer_test-xml_serializer_test.o `test -f 'xml_serializer_test.cc' || echo '$(srcdir)/'`xml_serializer_test.cc
  
  xml_serializer_test-xml_serializer_test.obj: xml_serializer_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xml_serializer_test_CXXFLAGS) $(CXXFLAGS) -MT xml_serializer_test-xml_serializer_test.obj -MD -MP -MF "$(DEPDIR)/xml_serializer_test-xml_serializer_test.Tpo" -c -o xml_serializer_test-xml_serializer_test.obj `if test -f 'xml_serializer_test.cc'; then $(CYGPATH_W) 'xml_serializer_test.cc'; else $(CYGPATH_W) '$(srcdir)/xml_serializer_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/xml_serializer_test-xml_serializer_test.Tpo" "$(DEPDIR)/xml_serializer_test-xml_serializer_test.Po"; else rm -f "$(DEPDIR)/xml_serializer_test-xml_serializer_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xml_serializer_test_CXXFLAGS) $(CXXFLAGS) -MT xml_serializer_test-xml_serializer_test.obj -MD -MP -MF $(DEPDIR)/xml_serializer_test-xml_serializer_test.Tpo -c -o xml_serializer_test-xml_serializer_test.obj `if test -f 'xml_serializer_test.cc'; then $(CYGPATH_W) 'xml_serializer_test.cc'; else $(CYGPATH_W) '$(srcdir)/xml_serializer_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xml_serializer_test_CXXFLAGS) $(CXXFLAGS) -MT xml_serializer_test-xml_serializer_test.obj -MD -MP -MF $(DEPDIR)/xml_serializer_test-xml_serializer_test.Tpo -c -o xml_serializer_test-xml_serializer_test.obj `if test -f 'xml_serializer_test.cc'; then $(CYGPATH_W) 'xml_serializer_test.cc'; else $(CYGPATH_W) '$(srcdir)/xml_serializer_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/xml_serializer_test-xml_serializer_test.Tpo $(DEPDIR)/xml_serializer_test-xml_serializer_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/xml_serializer_test-xml_serializer_test.Tpo $(DEPDIR)/xml_serializer_test-xml_serializer_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='xml_serializer_test.cc' object='xml_serializer_test-xml_serializer_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xml_serializer_test_CXXFLAGS) $(CXXFLAGS) -c -o xml_serializer_test-xml_serializer_test.obj `if test -f 'xml_serializer_test.cc'; then $(CYGPATH_W) 'xml_serializer_test.cc'; else $(CYGPATH_W) '$(srcdir)/xml_serializer_test.cc'; fi`
  
  xsd_test-xsd_test.o: xsd_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsd_test_CXXFLAGS) $(CXXFLAGS) -MT xsd_test-xsd_test.o -MD -MP -MF "$(DEPDIR)/xsd_test-xsd_test.Tpo" -c -o xsd_test-xsd_test.o `test -f 'xsd_test.cc' || echo '$(srcdir)/'`xsd_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/xsd_test-xsd_test.Tpo" "$(DEPDIR)/xsd_test-xsd_test.Po"; else rm -f "$(DEPDIR)/xsd_test-xsd_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsd_test_CXXFLAGS) $(CXXFLAGS) -MT xsd_test-xsd_test.o -MD -MP -MF $(DEPDIR)/xsd_test-xsd_test.Tpo -c -o xsd_test-xsd_test.o `test -f 'xsd_test.cc' || echo '$(srcdir)/'`xsd_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsd_test_CXXFLAGS) $(CXXFLAGS) -MT xsd_test-xsd_test.o -MD -MP -MF $(DEPDIR)/xsd_test-xsd_test.Tpo -c -o xsd_test-xsd_test.o `test -f 'xsd_test.cc' || echo '$(srcdir)/'`xsd_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/xsd_test-xsd_test.Tpo $(DEPDIR)/xsd_test-xsd_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/xsd_test-xsd_test.Tpo $(DEPDIR)/xsd_test-xsd_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='xsd_test.cc' object='xsd_test-xsd_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsd_test_CXXFLAGS) $(CXXFLAGS) -c -o xsd_test-xsd_test.o `test -f 'xsd_test.cc' || echo '$(srcdir)/'`xsd_test.cc
  
  xsd_test-xsd_test.obj: xsd_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsd_test_CXXFLAGS) $(CXXFLAGS) -MT xsd_test-xsd_test.obj -MD -MP -MF "$(DEPDIR)/xsd_test-xsd_test.Tpo" -c -o xsd_test-xsd_test.obj `if test -f 'xsd_test.cc'; then $(CYGPATH_W) 'xsd_test.cc'; else $(CYGPATH_W) '$(srcdir)/xsd_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/xsd_test-xsd_test.Tpo" "$(DEPDIR)/xsd_test-xsd_test.Po"; else rm -f "$(DEPDIR)/xsd_test-xsd_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsd_test_CXXFLAGS) $(CXXFLAGS) -MT xsd_test-xsd_test.obj -MD -MP -MF $(DEPDIR)/xsd_test-xsd_test.Tpo -c -o xsd_test-xsd_test.obj `if test -f 'xsd_test.cc'; then $(CYGPATH_W) 'xsd_test.cc'; else $(CYGPATH_W) '$(srcdir)/xsd_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsd_test_CXXFLAGS) $(CXXFLAGS) -MT xsd_test-xsd_test.obj -MD -MP -MF $(DEPDIR)/xsd_test-xsd_test.Tpo -c -o xsd_test-xsd_test.obj `if test -f 'xsd_test.cc'; then $(CYGPATH_W) 'xsd_test.cc'; else $(CYGPATH_W) '$(srcdir)/xsd_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/xsd_test-xsd_test.Tpo $(DEPDIR)/xsd_test-xsd_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/xsd_test-xsd_test.Tpo $(DEPDIR)/xsd_test-xsd_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='xsd_test.cc' object='xsd_test-xsd_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsd_test_CXXFLAGS) $(CXXFLAGS) -c -o xsd_test-xsd_test.obj `if test -f 'xsd_test.cc'; then $(CYGPATH_W) 'xsd_test.cc'; else $(CYGPATH_W) '$(srcdir)/xsd_test.cc'; fi`
-@@ -2040,72 +2218,75 @@
- 
- clean-libtool:
- 	-rm -rf .libs _libs
--
--distclean-libtool:
--	-rm -f libtool
--uninstall-info-am:
+@@ -2194,20 +2221,23 @@
  install-libkmldomincludeHEADERS: $(libkmldominclude_HEADERS)
  	@$(NORMAL_INSTALL)
--	test -z "$(libkmldomincludedir)" || $(mkdir_p) "$(DESTDIR)$(libkmldomincludedir)"
+ 	test -z "$(libkmldomincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libkmldomincludedir)"
 -	@list='$(libkmldominclude_HEADERS)'; for p in $$list; do \
-+	test -z "$(libkmldomincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libkmldomincludedir)"
 +	@list='$(libkmldominclude_HEADERS)'; test -n "$(libkmldomincludedir)" || list=; \
 +	for p in $$list; do \
  	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
@@ -79355,15 +20403,7 @@
  
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- 	unique=`for i in $$list; do \
- 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- 	  done | \
--	  $(AWK) '    { files[$$0] = 1; } \
--	       END { for (i in files) print i; }'`; \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
- 	mkid -fID $$unique
- tags: TAGS
+@@ -2221,7 +2251,7 @@
  
  TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
@@ -79372,13 +20412,11 @@
  	here=`pwd`; \
  	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
- 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+@@ -2229,29 +2259,34 @@
  	  done | \
--	  $(AWK) '    { files[$$0] = 1; } \
--	       END { for (i in files) print i; }'`; \
+ 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 -	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 +	shift; \
 +	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
  	  test -n "$$unique" || unique=$$empty_fix; \
@@ -79396,16 +20434,13 @@
  CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
 -	tags=; \
--	here=`pwd`; \
  	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  	  done | \
--	  $(AWK) '    { files[$$0] = 1; } \
--	       END { for (i in files) print i; }'`; \
+ 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 -	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 +	test -z "$(CTAGS_ARGS)$$unique" \
  	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 -	     $$tags $$unique
@@ -79420,22 +20455,16 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-@@ -2113,7 +2294,8 @@
- check-TESTS: $(TESTS)
+@@ -2260,6 +2295,7 @@
  	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
  	srcdir=$(srcdir); export srcdir; \
--	list='$(TESTS)'; \
-+	list=' $(TESTS) '; \
+ 	list=' $(TESTS) '; \
 +	$(am__tty_colors); \
  	if test -n "$$list"; then \
  	  for tst in $$list; do \
  	    if test -f ./$$tst; then dir=./; \
-@@ -2122,49 +2304,63 @@
- 	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *" $$tst "*) \
-+	      *[\ \	]$$tst[\ \	]*) \
+@@ -2271,10 +2307,10 @@
+ 	      *[\ \	]$$tst[\ \	]*) \
  		xpass=`expr $$xpass + 1`; \
  		failed=`expr $$failed + 1`; \
 -		echo "XPASS: $$tst"; \
@@ -79447,10 +20476,9 @@
  	      ;; \
  	      esac; \
  	    elif test $$? -ne 77; then \
- 	      all=`expr $$all + 1`; \
+@@ -2282,17 +2318,18 @@
  	      case " $(XFAIL_TESTS) " in \
--	      *" $$tst "*) \
-+	      *[\ \	]$$tst[\ \	]*) \
+ 	      *[\ \	]$$tst[\ \	]*) \
  		xfail=`expr $$xfail + 1`; \
 -		echo "XFAIL: $$tst"; \
 +		col=$$lgn; res=XFAIL; \
@@ -79468,45 +20496,9 @@
  	    fi; \
 +	    echo "$${col}$$res$${std}: $$tst"; \
  	  done; \
-+	  if test "$$all" -eq 1; then \
-+	    tests="test"; \
-+	    All=""; \
-+	  else \
-+	    tests="tests"; \
-+	    All="All "; \
-+	  fi; \
- 	  if test "$$failed" -eq 0; then \
- 	    if test "$$xfail" -eq 0; then \
--	      banner="All $$all tests passed"; \
-+	      banner="$$All$$all $$tests passed"; \
- 	    else \
--	      banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
-+	      if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
-+	      banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
- 	    fi; \
- 	  else \
- 	    if test "$$xpass" -eq 0; then \
--	      banner="$$failed of $$all tests failed"; \
-+	      banner="$$failed of $$all $$tests failed"; \
- 	    else \
--	      banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
-+	      if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
-+	      banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
- 	    fi; \
- 	  fi; \
- 	  dashes="$$banner"; \
- 	  skipped=""; \
- 	  if test "$$skip" -ne 0; then \
--	    skipped="($$skip tests were not run)"; \
-+	    if test "$$skip" -eq 1; then \
-+	      skipped="($$skip test was not run)"; \
-+	    else \
-+	      skipped="($$skip tests were not run)"; \
-+	    fi; \
- 	    test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
- 	      dashes="$$skipped"; \
- 	  fi; \
-@@ -2175,38 +2371,45 @@
+ 	  if test "$$all" -eq 1; then \
+ 	    tests="test"; \
+@@ -2334,11 +2371,15 @@
  	      dashes="$$report"; \
  	  fi; \
  	  dashes=`echo "$$dashes" | sed s/./=/g`; \
@@ -79524,36 +20516,10 @@
  	  test "$$failed" -eq 0; \
  	else :; fi
  
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
--	list='$(DISTFILES)'; for file in $$list; do \
--	  case $$file in \
--	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
--	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
--	  esac; \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
+@@ -2358,13 +2399,17 @@
  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
--	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
--	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
--	    dir="/$$dir"; \
--	    $(mkdir_p) "$(distdir)$$dir"; \
--	  else \
--	    dir=''; \
--	  fi; \
  	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 +	    if test -d "$(distdir)/$$file"; then \
 +	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 +	    fi; \
@@ -79572,16 +20538,7 @@
  	    || exit 1; \
  	  fi; \
  	done
-@@ -2217,7 +2420,7 @@
- all-am: Makefile $(LTLIBRARIES) $(HEADERS)
- installdirs:
- 	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libkmldomincludedir)"; do \
--	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- 	done
- install: install-am
- install-exec: install-exec-am
-@@ -2240,6 +2443,7 @@
+@@ -2398,6 +2443,7 @@
  
  distclean-generic:
  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -79589,17 +20546,8 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -2253,7 +2457,7 @@
- 	-rm -rf ./$(DEPDIR)
- 	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
--	distclean-libtool distclean-tags
-+	distclean-tags
+@@ -2419,6 +2465,8 @@
  
- dvi: dvi-am
- 
-@@ -2261,18 +2465,38 @@
- 
  html: html-am
  
 +html-am:
@@ -79607,17 +20555,16 @@
  info: info-am
  
  info-am:
+@@ -2427,18 +2475,28 @@
  
- install-data-am: install-libkmldomincludeHEADERS
+ install-dvi: install-dvi-am
  
-+install-dvi: install-dvi-am
-+
 +install-dvi-am:
 +
  install-exec-am: install-libLTLIBRARIES
  
-+install-html: install-html-am
-+
+ install-html: install-html-am
+ 
 +install-html-am:
 +
  install-info: install-info-am
@@ -79626,117 +20573,62 @@
 +
  install-man:
  
-+install-pdf: install-pdf-am
-+
+ install-pdf: install-pdf-am
+ 
 +install-pdf-am:
 +
-+install-ps: install-ps-am
-+
+ install-ps: install-ps-am
+ 
 +install-ps-am:
 +
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
-@@ -2293,22 +2517,27 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
-+uninstall-am: uninstall-libLTLIBRARIES \
+@@ -2462,7 +2520,7 @@
+ uninstall-am: uninstall-libLTLIBRARIES \
  	uninstall-libkmldomincludeHEADERS
  
+-.MAKE: install-am install-strip
 +.MAKE: check-am install-am install-strip
-+
+ 
  .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
  	clean-checkPROGRAMS clean-generic clean-libLTLIBRARIES \
- 	clean-libtool ctags distclean distclean-compile \
- 	distclean-generic distclean-libtool distclean-tags distdir dvi \
- 	dvi-am html html-am info info-am install install-am \
--	install-data install-data-am install-exec install-exec-am \
-+	install-data install-data-am install-dvi install-dvi-am \
-+	install-exec install-exec-am install-html install-html-am \
- 	install-info install-info-am install-libLTLIBRARIES \
--	install-libkmldomincludeHEADERS install-man install-strip \
-+	install-libkmldomincludeHEADERS install-man install-pdf \
-+	install-pdf-am install-ps install-ps-am install-strip \
- 	installcheck installcheck-am installdirs maintainer-clean \
- 	maintainer-clean-generic mostlyclean mostlyclean-compile \
- 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
--	tags uninstall uninstall-am uninstall-info-am \
--	uninstall-libLTLIBRARIES uninstall-libkmldomincludeHEADERS
-+	tags uninstall uninstall-am uninstall-libLTLIBRARIES \
-+	uninstall-libkmldomincludeHEADERS
-+
+@@ -2480,6 +2538,7 @@
+ 	tags uninstall uninstall-am uninstall-libLTLIBRARIES \
+ 	uninstall-libkmldomincludeHEADERS
  
++
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-Index: libkml-1.0.1/src/kml/engine/Makefile.in
+ .NOEXPORT:
+Index: libkml-1.1.0/src/kml/engine/Makefile.in
 ===================================================================
---- libkml-1.0.1.orig/src/kml/engine/Makefile.in	2009-07-03 01:23:33.000000000 +0200
-+++ libkml-1.0.1/src/kml/engine/Makefile.in	2009-12-10 10:19:47.000000000 +0100
+--- libkml-1.1.0.orig/src/kml/engine/Makefile.in	2009-12-10 13:05:40.000000000 +0100
++++ libkml-1.1.0/src/kml/engine/Makefile.in	2009-12-10 17:29:37.000000000 +0100
 @@ -1,8 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
+-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
-@@ -15,15 +16,12 @@
- @SET_MAKE@
+@@ -17,8 +18,9 @@
  
- 
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
  VPATH = @srcdir@
  pkgdatadir = $(datadir)/@PACKAGE@
 -pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../../..
 +pkglibdir = $(libdir)/@PACKAGE@
 +pkglibexecdir = $(libexecdir)/@PACKAGE@
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -37,27 +35,61 @@
- POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
-+TESTS = bbox_test$(EXEEXT) clone_test$(EXEEXT) \
-+	entity_mapper_test$(EXEEXT) feature_balloon_test$(EXEEXT) \
-+	feature_visitor_test$(EXEEXT) feature_view_test$(EXEEXT) \
-+	find_test$(EXEEXT) find_xml_namespaces_test$(EXEEXT) \
-+	get_link_parents_test$(EXEEXT) get_links_test$(EXEEXT) \
-+	href_test$(EXEEXT) id_mapper_test$(EXEEXT) \
-+	kmz_cache_test$(EXEEXT) kml_cache_test$(EXEEXT) \
-+	kml_file_test$(EXEEXT) kml_stream_test$(EXEEXT) \
-+	kml_uri_test$(EXEEXT) kmz_file_test$(EXEEXT) \
-+	link_util_test$(EXEEXT) location_util_test$(EXEEXT) \
-+	merge_test$(EXEEXT) object_id_parser_observer_test$(EXEEXT) \
-+	parse_old_schema_test$(EXEEXT) \
-+	schema_parser_observer_test$(EXEEXT) \
-+	shared_style_parser_observer_test$(EXEEXT) \
-+	style_inliner_test$(EXEEXT) style_merger_test$(EXEEXT) \
-+	style_resolver_test$(EXEEXT) style_splitter_test$(EXEEXT) \
-+	update_processor_test$(EXEEXT) update_test$(EXEEXT)
- check_PROGRAMS = $(am__EXEEXT_1)
- subdir = src/kml/engine
- DIST_COMMON = $(libkmlengineinclude_HEADERS) $(srcdir)/Makefile.am \
- 	$(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_curl.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)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
+@@ -65,15 +67,30 @@
  mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
@@ -79768,346 +20660,24 @@
 -libLTLIBRARIES_INSTALL = $(INSTALL)
  LTLIBRARIES = $(lib_LTLIBRARIES)
  libkmlengine_la_DEPENDENCIES =  \
- 	$(top_builddir)/third_party/libminizip.la \
-@@ -94,12 +126,18 @@
+ 	$(top_builddir)/src/kml/base/libkmlbase.la
+@@ -376,7 +393,6 @@
+ style_inliner_test_DEPENDENCIES = libkmlengine.la \
  	$(top_builddir)/src/kml/dom/libkmldom.la \
  	$(top_builddir)/src/kml/base/libkmlbase.la \
+-	$(top_builddir)/third_party/liburiparser.la \
  	$(top_builddir)/third_party/libgtest.la
-+bbox_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(bbox_test_CXXFLAGS) \
-+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- am_clone_test_OBJECTS = clone_test-clone_test.$(OBJEXT)
- clone_test_OBJECTS = $(am_clone_test_OBJECTS)
- clone_test_DEPENDENCIES = libkmlengine.la \
- 	$(top_builddir)/src/kml/dom/libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+clone_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(clone_test_CXXFLAGS) \
-+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- am_entity_mapper_test_OBJECTS =  \
- 	entity_mapper_test-entity_mapper_test.$(OBJEXT)
- entity_mapper_test_OBJECTS = $(am_entity_mapper_test_OBJECTS)
-@@ -107,6 +145,10 @@
- 	$(top_builddir)/src/kml/dom/libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+entity_mapper_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-+	$(entity_mapper_test_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- am_feature_balloon_test_OBJECTS =  \
- 	feature_balloon_test-feature_balloon_test.$(OBJEXT)
- feature_balloon_test_OBJECTS = $(am_feature_balloon_test_OBJECTS)
-@@ -114,6 +156,10 @@
- 	$(top_builddir)/src/kml/dom/libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+feature_balloon_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-+	$(feature_balloon_test_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- am_feature_view_test_OBJECTS =  \
- 	feature_view_test-feature_view_test.$(OBJEXT)
- feature_view_test_OBJECTS = $(am_feature_view_test_OBJECTS)
-@@ -121,6 +167,10 @@
- 	$(top_builddir)/src/kml/dom/libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+feature_view_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-+	$(feature_view_test_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- am_feature_visitor_test_OBJECTS =  \
- 	feature_visitor_test-feature_visitor_test.$(OBJEXT)
- feature_visitor_test_OBJECTS = $(am_feature_visitor_test_OBJECTS)
-@@ -128,12 +178,19 @@
- 	$(top_builddir)/src/kml/dom/libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+feature_visitor_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-+	$(feature_visitor_test_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- am_find_test_OBJECTS = find_test-find_test.$(OBJEXT)
- find_test_OBJECTS = $(am_find_test_OBJECTS)
- find_test_DEPENDENCIES = libkmlengine.la \
- 	$(top_builddir)/src/kml/dom/libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+find_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(find_test_CXXFLAGS) \
-+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- am_find_xml_namespaces_test_OBJECTS =  \
- 	find_xml_namespaces_test-find_xml_namespaces_test.$(OBJEXT)
- find_xml_namespaces_test_OBJECTS =  \
-@@ -142,6 +199,10 @@
- 	$(top_builddir)/src/kml/dom/libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+find_xml_namespaces_test_LINK = $(LIBTOOL) --tag=CXX \
-+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-+	$(find_xml_namespaces_test_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- am_get_link_parents_test_OBJECTS =  \
- 	get_link_parents_test-get_link_parents_test.$(OBJEXT)
- get_link_parents_test_OBJECTS = $(am_get_link_parents_test_OBJECTS)
-@@ -149,36 +210,58 @@
- 	$(top_builddir)/src/kml/dom/libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+get_link_parents_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-+	$(get_link_parents_test_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- am_get_links_test_OBJECTS = get_links_test-get_links_test.$(OBJEXT)
- get_links_test_OBJECTS = $(am_get_links_test_OBJECTS)
- get_links_test_DEPENDENCIES = libkmlengine.la \
- 	$(top_builddir)/src/kml/dom/libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+get_links_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-+	$(get_links_test_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- am_href_test_OBJECTS = href_test-href_test.$(OBJEXT)
- href_test_OBJECTS = $(am_href_test_OBJECTS)
- href_test_DEPENDENCIES = libkmlengine.la \
- 	$(top_builddir)/src/kml/dom/libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+href_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(href_test_CXXFLAGS) \
-+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- am_id_mapper_test_OBJECTS = id_mapper_test-id_mapper_test.$(OBJEXT)
- id_mapper_test_OBJECTS = $(am_id_mapper_test_OBJECTS)
- id_mapper_test_DEPENDENCIES = libkmlengine.la \
- 	$(top_builddir)/src/kml/dom/libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+id_mapper_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-+	$(id_mapper_test_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- am_kml_cache_test_OBJECTS = kml_cache_test-kml_cache_test.$(OBJEXT)
- kml_cache_test_OBJECTS = $(am_kml_cache_test_OBJECTS)
- kml_cache_test_DEPENDENCIES = libkmlengine.la \
- 	$(top_builddir)/src/kml/dom/libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+kml_cache_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-+	$(kml_cache_test_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- am_kml_file_test_OBJECTS = kml_file_test-kml_file_test.$(OBJEXT)
- kml_file_test_OBJECTS = $(am_kml_file_test_OBJECTS)
- kml_file_test_DEPENDENCIES = libkmlengine.la \
- 	$(top_builddir)/src/kml/dom/libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+kml_file_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(kml_file_test_CXXFLAGS) \
-+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- am_kml_stream_test_OBJECTS =  \
- 	kml_stream_test-kml_stream_test.$(OBJEXT)
- kml_stream_test_OBJECTS = $(am_kml_stream_test_OBJECTS)
-@@ -186,30 +269,48 @@
- 	$(top_builddir)/src/kml/dom/libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+kml_stream_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-+	$(kml_stream_test_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- am_kml_uri_test_OBJECTS = kml_uri_test-kml_uri_test.$(OBJEXT)
- kml_uri_test_OBJECTS = $(am_kml_uri_test_OBJECTS)
- kml_uri_test_DEPENDENCIES = libkmlengine.la \
- 	$(top_builddir)/src/kml/dom/libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+kml_uri_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(kml_uri_test_CXXFLAGS) \
-+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- am_kmz_cache_test_OBJECTS = kmz_cache_test-kmz_cache_test.$(OBJEXT)
- kmz_cache_test_OBJECTS = $(am_kmz_cache_test_OBJECTS)
- kmz_cache_test_DEPENDENCIES = libkmlengine.la \
- 	$(top_builddir)/src/kml/dom/libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+kmz_cache_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-+	$(kmz_cache_test_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- am_kmz_file_test_OBJECTS = kmz_file_test-kmz_file_test.$(OBJEXT)
- kmz_file_test_OBJECTS = $(am_kmz_file_test_OBJECTS)
- kmz_file_test_DEPENDENCIES = libkmlengine.la \
- 	$(top_builddir)/src/kml/dom/libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+kmz_file_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(kmz_file_test_CXXFLAGS) \
-+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- am_link_util_test_OBJECTS = link_util_test-link_util_test.$(OBJEXT)
- link_util_test_OBJECTS = $(am_link_util_test_OBJECTS)
- link_util_test_DEPENDENCIES = libkmlengine.la \
- 	$(top_builddir)/src/kml/dom/libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+link_util_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-+	$(link_util_test_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- am_location_util_test_OBJECTS =  \
- 	location_util_test-location_util_test.$(OBJEXT)
- location_util_test_OBJECTS = $(am_location_util_test_OBJECTS)
-@@ -217,12 +318,19 @@
- 	$(top_builddir)/src/kml/dom/libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+location_util_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-+	$(location_util_test_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- am_merge_test_OBJECTS = merge_test-merge_test.$(OBJEXT)
- merge_test_OBJECTS = $(am_merge_test_OBJECTS)
- merge_test_DEPENDENCIES = libkmlengine.la \
- 	$(top_builddir)/src/kml/dom/libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+merge_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(merge_test_CXXFLAGS) \
-+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- am_object_id_parser_observer_test_OBJECTS = object_id_parser_observer_test-object_id_parser_observer_test.$(OBJEXT)
- object_id_parser_observer_test_OBJECTS =  \
- 	$(am_object_id_parser_observer_test_OBJECTS)
-@@ -230,6 +338,10 @@
- 	$(top_builddir)/src/kml/dom/libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+object_id_parser_observer_test_LINK = $(LIBTOOL) --tag=CXX \
-+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-+	$(object_id_parser_observer_test_CXXFLAGS) $(CXXFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- am_parse_old_schema_test_OBJECTS =  \
- 	parse_old_schema_test-parse_old_schema_test.$(OBJEXT)
- parse_old_schema_test_OBJECTS = $(am_parse_old_schema_test_OBJECTS)
-@@ -237,6 +349,10 @@
- 	$(top_builddir)/src/kml/dom/libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+parse_old_schema_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-+	$(parse_old_schema_test_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- am_schema_parser_observer_test_OBJECTS = schema_parser_observer_test-schema_parser_observer_test.$(OBJEXT)
- schema_parser_observer_test_OBJECTS =  \
- 	$(am_schema_parser_observer_test_OBJECTS)
-@@ -244,6 +360,10 @@
- 	$(top_builddir)/src/kml/dom/libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+schema_parser_observer_test_LINK = $(LIBTOOL) --tag=CXX \
-+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-+	$(schema_parser_observer_test_CXXFLAGS) $(CXXFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- am_shared_style_parser_observer_test_OBJECTS = shared_style_parser_observer_test-shared_style_parser_observer_test.$(OBJEXT)
- shared_style_parser_observer_test_OBJECTS =  \
- 	$(am_shared_style_parser_observer_test_OBJECTS)
-@@ -251,6 +371,10 @@
- 	$(top_builddir)/src/kml/dom/libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+shared_style_parser_observer_test_LINK = $(LIBTOOL) --tag=CXX \
-+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-+	$(shared_style_parser_observer_test_CXXFLAGS) $(CXXFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- am_style_inliner_test_OBJECTS =  \
- 	style_inliner_test-style_inliner_test.$(OBJEXT)
- style_inliner_test_OBJECTS = $(am_style_inliner_test_OBJECTS)
-@@ -259,6 +383,10 @@
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/liburiparser.la \
- 	$(top_builddir)/third_party/libgtest.la
-+style_inliner_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-+	$(style_inliner_test_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- am_style_merger_test_OBJECTS =  \
- 	style_merger_test-style_merger_test.$(OBJEXT)
- style_merger_test_OBJECTS = $(am_style_merger_test_OBJECTS)
-@@ -266,6 +394,10 @@
- 	$(top_builddir)/src/kml/dom/libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+style_merger_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-+	$(style_merger_test_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- am_style_resolver_test_OBJECTS =  \
- 	style_resolver_test-style_resolver_test.$(OBJEXT)
- style_resolver_test_OBJECTS = $(am_style_resolver_test_OBJECTS)
-@@ -273,6 +405,10 @@
- 	$(top_builddir)/src/kml/dom/libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+style_resolver_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-+	$(style_resolver_test_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- am_style_splitter_test_OBJECTS =  \
- 	style_splitter_test-style_splitter_test.$(OBJEXT)
- style_splitter_test_OBJECTS = $(am_style_splitter_test_OBJECTS)
-@@ -280,6 +416,10 @@
- 	$(top_builddir)/src/kml/dom/libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+style_splitter_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-+	$(style_splitter_test_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- am_update_processor_test_OBJECTS =  \
- 	update_processor_test-update_processor_test.$(OBJEXT)
- update_processor_test_OBJECTS = $(am_update_processor_test_OBJECTS)
-@@ -287,23 +427,32 @@
- 	$(top_builddir)/src/kml/dom/libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+update_processor_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-+	$(update_processor_test_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- am_update_test_OBJECTS = update_test-update_test.$(OBJEXT)
- update_test_OBJECTS = $(am_update_test_OBJECTS)
- update_test_DEPENDENCIES = libkmlengine.la \
- 	$(top_builddir)/src/kml/dom/libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
--DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+update_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(update_test_CXXFLAGS) \
-+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+ style_inliner_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
+ 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
+@@ -438,6 +454,7 @@
+ DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
  depcomp = $(SHELL) $(top_srcdir)/config/depcomp
  am__depfiles_maybe = depfiles
 +am__mv = mv -f
  CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
  	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
--	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
--	$(AM_CXXFLAGS) $(CXXFLAGS)
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- CXXLD = $(CXX)
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- SOURCES = $(libkmlengine_la_SOURCES) $(bbox_test_SOURCES) \
- 	$(clone_test_SOURCES) $(entity_mapper_test_SOURCES) \
- 	$(feature_balloon_test_SOURCES) $(feature_view_test_SOURCES) \
-@@ -342,14 +491,13 @@
+ LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+@@ -487,10 +504,11 @@
  	$(style_inliner_test_SOURCES) $(style_merger_test_SOURCES) \
  	$(style_resolver_test_SOURCES) $(style_splitter_test_SOURCES) \
  	$(update_processor_test_SOURCES) $(update_test_SOURCES)
@@ -80119,57 +20689,8 @@
 +red=; grn=; lgn=; blu=; std=
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  ACLOCAL = @ACLOCAL@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
  AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -371,18 +519,16 @@
- CYGPATH_W = @CYGPATH_W@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
--ECHO = @ECHO@
-+DSYMUTIL = @DSYMUTIL@
-+DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
--F77 = @F77@
--FFLAGS = @FFLAGS@
--GCC_FALSE = @GCC_FALSE@
--GCC_TRUE = @GCC_TRUE@
--HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
--HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
-+FGREP = @FGREP@
-+GREP = @GREP@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -392,19 +538,28 @@
- JAVAC = @JAVAC@
- JAVA_INCLUDE_DIR = @JAVA_INCLUDE_DIR@
- JAVA_LIB_DIR = @JAVA_LIB_DIR@
-+LD = @LD@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
-+LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
-+NM = @NM@
-+NMEDIT = @NMEDIT@
-+OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
-+OTOOL = @OTOOL@
-+OTOOL64 = @OTOOL64@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -554,6 +572,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -80177,123 +20698,30 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PLATFORM = @PLATFORM@
-@@ -421,22 +576,13 @@
- STRIP = @STRIP@
- SWIG = @SWIG@
- VERSION = @VERSION@
--WITH_JAVA_FALSE = @WITH_JAVA_FALSE@
--WITH_JAVA_TRUE = @WITH_JAVA_TRUE@
--WITH_PYTHON_FALSE = @WITH_PYTHON_FALSE@
--WITH_PYTHON_TRUE = @WITH_PYTHON_TRUE@
--WITH_SWIG_FALSE = @WITH_SWIG_FALSE@
--WITH_SWIG_TRUE = @WITH_SWIG_TRUE@
--ac_ct_AR = @ac_ct_AR@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
--ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -448,28 +594,41 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- AM_CPPFLAGS = -I$(top_srcdir)/src \
+@@ -627,8 +646,8 @@
  	     -I$(top_srcdir)/third_party/boost_1_34_1 \
- 	     -I$(top_srcdir)/third_party/zlib-1.2.3/contrib \
-@@ -561,38 +720,6 @@
- 	update_processor.h
+ 	     -I$(top_srcdir)/third_party/googletest-r108/include
  
- DATA_DIR = $(top_srcdir)/testdata
--TESTS = bbox_test \
--	clone_test \
--	entity_mapper_test \
--	feature_balloon_test \
--	feature_visitor_test \
--	feature_view_test\
--	find_test \
--	find_xml_namespaces_test \
--	get_link_parents_test \
--	get_links_test \
--	href_test \
--	id_mapper_test \
--	kmz_cache_test \
--	kml_cache_test \
--	kml_file_test \
--	kml_stream_test \
--	kml_uri_test \
--	kmz_file_test \
--	link_util_test \
--	location_util_test \
--	merge_test \
--	object_id_parser_observer_test \
--	parse_old_schema_test \
--	schema_parser_observer_test \
--	shared_style_parser_observer_test \
--	style_inliner_test \
--	style_merger_test \
--	style_resolver_test \
--	style_splitter_test \
--	update_processor_test \
--	update_test
--
+- at GCC_TRUE@AM_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -Werror -ansi -pedantic -fno-rtti
+- at GCC_TRUE@AM_TEST_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -Werror -ansi -fno-rtti -DGTEST_HAS_RTTI=0
++ at GCC_TRUE@AM_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -ansi -pedantic -fno-rtti
++ at GCC_TRUE@AM_TEST_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -ansi -fno-rtti -DGTEST_HAS_RTTI=0
+ lib_LTLIBRARIES = libkmlengine.la
+ libkmlengine_la_SOURCES = \
+ 	clone.cc \
+@@ -891,10 +910,9 @@
  
- # Unit tests for KML Engine
- bbox_test_SOURCES = bbox_test.cc
-@@ -822,14 +949,14 @@
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
--	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
--		&& exit 0; \
-+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-+	        && { if test -f $@; then exit 0; else break; fi; }; \
+ style_inliner_test_SOURCES = style_inliner_test.cc
+ style_inliner_test_CXXFLAGS = -DDATADIR=\"$(DATA_DIR)\" $(AM_TEST_CXXFLAGS)
+-style_inliner_test_LDADD = libkmlengine.la \
++style_inliner_test_LDADD = libkmlengine.la -luriparser \
+ 	$(top_builddir)/src/kml/dom/libkmldom.la \
+ 	$(top_builddir)/src/kml/base/libkmlbase.la \
+-	$(top_builddir)/third_party/liburiparser.la \
+ 	$(top_builddir)/third_party/libgtest.la
+ 
+ style_merger_test_SOURCES = style_merger_test.cc
+@@ -953,9 +971,9 @@
  	      exit 1;; \
  	  esac; \
  	done; \
@@ -80306,22 +20734,21 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -847,23 +974,28 @@
+@@ -973,23 +991,28 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(am__aclocal_m4_deps):
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
--	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ 	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 -	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 +	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
 +	list2=; for p in $$list; do \
  	  if test -f $$p; then \
 -	    f=$(am__strip_dir) \
--	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
--	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+-	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+-	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
 +	    list2="$$list2 $$p"; \
  	  else :; fi; \
 -	done
@@ -80333,10 +20760,10 @@
  
  uninstall-libLTLIBRARIES:
  	@$(NORMAL_UNINSTALL)
--	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 -	  p=$(am__strip_dir) \
--	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
--	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
 +	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
 +	for p in $$list; do \
 +	  $(am__strip_dir) \
@@ -80345,12 +20772,8 @@
  	done
  
  clean-libLTLIBRARIES:
-@@ -875,107 +1007,109 @@
- 	  rm -f "$${dir}/so_locations"; \
- 	done
- libkmlengine.la: $(libkmlengine_la_OBJECTS) $(libkmlengine_la_DEPENDENCIES) 
--	$(CXXLINK) -rpath $(libdir) $(libkmlengine_la_LDFLAGS) $(libkmlengine_la_OBJECTS) $(libkmlengine_la_LIBADD) $(LIBS)
-+	$(CXXLINK) -rpath $(libdir) $(libkmlengine_la_OBJECTS) $(libkmlengine_la_LIBADD) $(LIBS)
+@@ -1004,11 +1027,13 @@
+ 	$(CXXLINK) -rpath $(libdir) $(libkmlengine_la_OBJECTS) $(libkmlengine_la_LIBADD) $(LIBS)
  
  clean-checkPROGRAMS:
 -	@list='$(check_PROGRAMS)'; for p in $$list; do \
@@ -80367,731 +20790,549 @@
 +	rm -f $$list
  bbox_test$(EXEEXT): $(bbox_test_OBJECTS) $(bbox_test_DEPENDENCIES) 
  	@rm -f bbox_test$(EXEEXT)
--	$(CXXLINK) $(bbox_test_LDFLAGS) $(bbox_test_OBJECTS) $(bbox_test_LDADD) $(LIBS)
-+	$(bbox_test_LINK) $(bbox_test_OBJECTS) $(bbox_test_LDADD) $(LIBS)
- clone_test$(EXEEXT): $(clone_test_OBJECTS) $(clone_test_DEPENDENCIES) 
- 	@rm -f clone_test$(EXEEXT)
--	$(CXXLINK) $(clone_test_LDFLAGS) $(clone_test_OBJECTS) $(clone_test_LDADD) $(LIBS)
-+	$(clone_test_LINK) $(clone_test_OBJECTS) $(clone_test_LDADD) $(LIBS)
- entity_mapper_test$(EXEEXT): $(entity_mapper_test_OBJECTS) $(entity_mapper_test_DEPENDENCIES) 
- 	@rm -f entity_mapper_test$(EXEEXT)
--	$(CXXLINK) $(entity_mapper_test_LDFLAGS) $(entity_mapper_test_OBJECTS) $(entity_mapper_test_LDADD) $(LIBS)
-+	$(entity_mapper_test_LINK) $(entity_mapper_test_OBJECTS) $(entity_mapper_test_LDADD) $(LIBS)
- feature_balloon_test$(EXEEXT): $(feature_balloon_test_OBJECTS) $(feature_balloon_test_DEPENDENCIES) 
- 	@rm -f feature_balloon_test$(EXEEXT)
--	$(CXXLINK) $(feature_balloon_test_LDFLAGS) $(feature_balloon_test_OBJECTS) $(feature_balloon_test_LDADD) $(LIBS)
-+	$(feature_balloon_test_LINK) $(feature_balloon_test_OBJECTS) $(feature_balloon_test_LDADD) $(LIBS)
- feature_view_test$(EXEEXT): $(feature_view_test_OBJECTS) $(feature_view_test_DEPENDENCIES) 
- 	@rm -f feature_view_test$(EXEEXT)
--	$(CXXLINK) $(feature_view_test_LDFLAGS) $(feature_view_test_OBJECTS) $(feature_view_test_LDADD) $(LIBS)
-+	$(feature_view_test_LINK) $(feature_view_test_OBJECTS) $(feature_view_test_LDADD) $(LIBS)
- feature_visitor_test$(EXEEXT): $(feature_visitor_test_OBJECTS) $(feature_visitor_test_DEPENDENCIES) 
- 	@rm -f feature_visitor_test$(EXEEXT)
--	$(CXXLINK) $(feature_visitor_test_LDFLAGS) $(feature_visitor_test_OBJECTS) $(feature_visitor_test_LDADD) $(LIBS)
-+	$(feature_visitor_test_LINK) $(feature_visitor_test_OBJECTS) $(feature_visitor_test_LDADD) $(LIBS)
- find_test$(EXEEXT): $(find_test_OBJECTS) $(find_test_DEPENDENCIES) 
- 	@rm -f find_test$(EXEEXT)
--	$(CXXLINK) $(find_test_LDFLAGS) $(find_test_OBJECTS) $(find_test_LDADD) $(LIBS)
-+	$(find_test_LINK) $(find_test_OBJECTS) $(find_test_LDADD) $(LIBS)
- find_xml_namespaces_test$(EXEEXT): $(find_xml_namespaces_test_OBJECTS) $(find_xml_namespaces_test_DEPENDENCIES) 
- 	@rm -f find_xml_namespaces_test$(EXEEXT)
--	$(CXXLINK) $(find_xml_namespaces_test_LDFLAGS) $(find_xml_namespaces_test_OBJECTS) $(find_xml_namespaces_test_LDADD) $(LIBS)
-+	$(find_xml_namespaces_test_LINK) $(find_xml_namespaces_test_OBJECTS) $(find_xml_namespaces_test_LDADD) $(LIBS)
- get_link_parents_test$(EXEEXT): $(get_link_parents_test_OBJECTS) $(get_link_parents_test_DEPENDENCIES) 
- 	@rm -f get_link_parents_test$(EXEEXT)
--	$(CXXLINK) $(get_link_parents_test_LDFLAGS) $(get_link_parents_test_OBJECTS) $(get_link_parents_test_LDADD) $(LIBS)
-+	$(get_link_parents_test_LINK) $(get_link_parents_test_OBJECTS) $(get_link_parents_test_LDADD) $(LIBS)
- get_links_test$(EXEEXT): $(get_links_test_OBJECTS) $(get_links_test_DEPENDENCIES) 
- 	@rm -f get_links_test$(EXEEXT)
--	$(CXXLINK) $(get_links_test_LDFLAGS) $(get_links_test_OBJECTS) $(get_links_test_LDADD) $(LIBS)
-+	$(get_links_test_LINK) $(get_links_test_OBJECTS) $(get_links_test_LDADD) $(LIBS)
- href_test$(EXEEXT): $(href_test_OBJECTS) $(href_test_DEPENDENCIES) 
- 	@rm -f href_test$(EXEEXT)
--	$(CXXLINK) $(href_test_LDFLAGS) $(href_test_OBJECTS) $(href_test_LDADD) $(LIBS)
-+	$(href_test_LINK) $(href_test_OBJECTS) $(href_test_LDADD) $(LIBS)
- id_mapper_test$(EXEEXT): $(id_mapper_test_OBJECTS) $(id_mapper_test_DEPENDENCIES) 
- 	@rm -f id_mapper_test$(EXEEXT)
--	$(CXXLINK) $(id_mapper_test_LDFLAGS) $(id_mapper_test_OBJECTS) $(id_mapper_test_LDADD) $(LIBS)
-+	$(id_mapper_test_LINK) $(id_mapper_test_OBJECTS) $(id_mapper_test_LDADD) $(LIBS)
- kml_cache_test$(EXEEXT): $(kml_cache_test_OBJECTS) $(kml_cache_test_DEPENDENCIES) 
- 	@rm -f kml_cache_test$(EXEEXT)
--	$(CXXLINK) $(kml_cache_test_LDFLAGS) $(kml_cache_test_OBJECTS) $(kml_cache_test_LDADD) $(LIBS)
-+	$(kml_cache_test_LINK) $(kml_cache_test_OBJECTS) $(kml_cache_test_LDADD) $(LIBS)
- kml_file_test$(EXEEXT): $(kml_file_test_OBJECTS) $(kml_file_test_DEPENDENCIES) 
- 	@rm -f kml_file_test$(EXEEXT)
--	$(CXXLINK) $(kml_file_test_LDFLAGS) $(kml_file_test_OBJECTS) $(kml_file_test_LDADD) $(LIBS)
-+	$(kml_file_test_LINK) $(kml_file_test_OBJECTS) $(kml_file_test_LDADD) $(LIBS)
- kml_stream_test$(EXEEXT): $(kml_stream_test_OBJECTS) $(kml_stream_test_DEPENDENCIES) 
- 	@rm -f kml_stream_test$(EXEEXT)
--	$(CXXLINK) $(kml_stream_test_LDFLAGS) $(kml_stream_test_OBJECTS) $(kml_stream_test_LDADD) $(LIBS)
-+	$(kml_stream_test_LINK) $(kml_stream_test_OBJECTS) $(kml_stream_test_LDADD) $(LIBS)
- kml_uri_test$(EXEEXT): $(kml_uri_test_OBJECTS) $(kml_uri_test_DEPENDENCIES) 
- 	@rm -f kml_uri_test$(EXEEXT)
--	$(CXXLINK) $(kml_uri_test_LDFLAGS) $(kml_uri_test_OBJECTS) $(kml_uri_test_LDADD) $(LIBS)
-+	$(kml_uri_test_LINK) $(kml_uri_test_OBJECTS) $(kml_uri_test_LDADD) $(LIBS)
- kmz_cache_test$(EXEEXT): $(kmz_cache_test_OBJECTS) $(kmz_cache_test_DEPENDENCIES) 
- 	@rm -f kmz_cache_test$(EXEEXT)
--	$(CXXLINK) $(kmz_cache_test_LDFLAGS) $(kmz_cache_test_OBJECTS) $(kmz_cache_test_LDADD) $(LIBS)
-+	$(kmz_cache_test_LINK) $(kmz_cache_test_OBJECTS) $(kmz_cache_test_LDADD) $(LIBS)
- kmz_file_test$(EXEEXT): $(kmz_file_test_OBJECTS) $(kmz_file_test_DEPENDENCIES) 
- 	@rm -f kmz_file_test$(EXEEXT)
--	$(CXXLINK) $(kmz_file_test_LDFLAGS) $(kmz_file_test_OBJECTS) $(kmz_file_test_LDADD) $(LIBS)
-+	$(kmz_file_test_LINK) $(kmz_file_test_OBJECTS) $(kmz_file_test_LDADD) $(LIBS)
- link_util_test$(EXEEXT): $(link_util_test_OBJECTS) $(link_util_test_DEPENDENCIES) 
- 	@rm -f link_util_test$(EXEEXT)
--	$(CXXLINK) $(link_util_test_LDFLAGS) $(link_util_test_OBJECTS) $(link_util_test_LDADD) $(LIBS)
-+	$(link_util_test_LINK) $(link_util_test_OBJECTS) $(link_util_test_LDADD) $(LIBS)
- location_util_test$(EXEEXT): $(location_util_test_OBJECTS) $(location_util_test_DEPENDENCIES) 
- 	@rm -f location_util_test$(EXEEXT)
--	$(CXXLINK) $(location_util_test_LDFLAGS) $(location_util_test_OBJECTS) $(location_util_test_LDADD) $(LIBS)
-+	$(location_util_test_LINK) $(location_util_test_OBJECTS) $(location_util_test_LDADD) $(LIBS)
- merge_test$(EXEEXT): $(merge_test_OBJECTS) $(merge_test_DEPENDENCIES) 
- 	@rm -f merge_test$(EXEEXT)
--	$(CXXLINK) $(merge_test_LDFLAGS) $(merge_test_OBJECTS) $(merge_test_LDADD) $(LIBS)
-+	$(merge_test_LINK) $(merge_test_OBJECTS) $(merge_test_LDADD) $(LIBS)
- object_id_parser_observer_test$(EXEEXT): $(object_id_parser_observer_test_OBJECTS) $(object_id_parser_observer_test_DEPENDENCIES) 
- 	@rm -f object_id_parser_observer_test$(EXEEXT)
--	$(CXXLINK) $(object_id_parser_observer_test_LDFLAGS) $(object_id_parser_observer_test_OBJECTS) $(object_id_parser_observer_test_LDADD) $(LIBS)
-+	$(object_id_parser_observer_test_LINK) $(object_id_parser_observer_test_OBJECTS) $(object_id_parser_observer_test_LDADD) $(LIBS)
- parse_old_schema_test$(EXEEXT): $(parse_old_schema_test_OBJECTS) $(parse_old_schema_test_DEPENDENCIES) 
- 	@rm -f parse_old_schema_test$(EXEEXT)
--	$(CXXLINK) $(parse_old_schema_test_LDFLAGS) $(parse_old_schema_test_OBJECTS) $(parse_old_schema_test_LDADD) $(LIBS)
-+	$(parse_old_schema_test_LINK) $(parse_old_schema_test_OBJECTS) $(parse_old_schema_test_LDADD) $(LIBS)
- schema_parser_observer_test$(EXEEXT): $(schema_parser_observer_test_OBJECTS) $(schema_parser_observer_test_DEPENDENCIES) 
- 	@rm -f schema_parser_observer_test$(EXEEXT)
--	$(CXXLINK) $(schema_parser_observer_test_LDFLAGS) $(schema_parser_observer_test_OBJECTS) $(schema_parser_observer_test_LDADD) $(LIBS)
-+	$(schema_parser_observer_test_LINK) $(schema_parser_observer_test_OBJECTS) $(schema_parser_observer_test_LDADD) $(LIBS)
- shared_style_parser_observer_test$(EXEEXT): $(shared_style_parser_observer_test_OBJECTS) $(shared_style_parser_observer_test_DEPENDENCIES) 
- 	@rm -f shared_style_parser_observer_test$(EXEEXT)
--	$(CXXLINK) $(shared_style_parser_observer_test_LDFLAGS) $(shared_style_parser_observer_test_OBJECTS) $(shared_style_parser_observer_test_LDADD) $(LIBS)
-+	$(shared_style_parser_observer_test_LINK) $(shared_style_parser_observer_test_OBJECTS) $(shared_style_parser_observer_test_LDADD) $(LIBS)
- style_inliner_test$(EXEEXT): $(style_inliner_test_OBJECTS) $(style_inliner_test_DEPENDENCIES) 
- 	@rm -f style_inliner_test$(EXEEXT)
--	$(CXXLINK) $(style_inliner_test_LDFLAGS) $(style_inliner_test_OBJECTS) $(style_inliner_test_LDADD) $(LIBS)
-+	$(style_inliner_test_LINK) $(style_inliner_test_OBJECTS) $(style_inliner_test_LDADD) $(LIBS)
- style_merger_test$(EXEEXT): $(style_merger_test_OBJECTS) $(style_merger_test_DEPENDENCIES) 
- 	@rm -f style_merger_test$(EXEEXT)
--	$(CXXLINK) $(style_merger_test_LDFLAGS) $(style_merger_test_OBJECTS) $(style_merger_test_LDADD) $(LIBS)
-+	$(style_merger_test_LINK) $(style_merger_test_OBJECTS) $(style_merger_test_LDADD) $(LIBS)
- style_resolver_test$(EXEEXT): $(style_resolver_test_OBJECTS) $(style_resolver_test_DEPENDENCIES) 
- 	@rm -f style_resolver_test$(EXEEXT)
--	$(CXXLINK) $(style_resolver_test_LDFLAGS) $(style_resolver_test_OBJECTS) $(style_resolver_test_LDADD) $(LIBS)
-+	$(style_resolver_test_LINK) $(style_resolver_test_OBJECTS) $(style_resolver_test_LDADD) $(LIBS)
- style_splitter_test$(EXEEXT): $(style_splitter_test_OBJECTS) $(style_splitter_test_DEPENDENCIES) 
- 	@rm -f style_splitter_test$(EXEEXT)
--	$(CXXLINK) $(style_splitter_test_LDFLAGS) $(style_splitter_test_OBJECTS) $(style_splitter_test_LDADD) $(LIBS)
-+	$(style_splitter_test_LINK) $(style_splitter_test_OBJECTS) $(style_splitter_test_LDADD) $(LIBS)
- update_processor_test$(EXEEXT): $(update_processor_test_OBJECTS) $(update_processor_test_DEPENDENCIES) 
- 	@rm -f update_processor_test$(EXEEXT)
--	$(CXXLINK) $(update_processor_test_LDFLAGS) $(update_processor_test_OBJECTS) $(update_processor_test_LDADD) $(LIBS)
-+	$(update_processor_test_LINK) $(update_processor_test_OBJECTS) $(update_processor_test_LDADD) $(LIBS)
- update_test$(EXEEXT): $(update_test_OBJECTS) $(update_test_DEPENDENCIES) 
- 	@rm -f update_test$(EXEEXT)
--	$(CXXLINK) $(update_test_LDFLAGS) $(update_test_OBJECTS) $(update_test_LDADD) $(LIBS)
-+	$(update_test_LINK) $(update_test_OBJECTS) $(update_test_LDADD) $(LIBS)
+ 	$(bbox_test_LINK) $(bbox_test_OBJECTS) $(bbox_test_LDADD) $(LIBS)
+@@ -1174,469 +1199,469 @@
  
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -1043,456 +1177,456 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/update_test-update_test.Po at am__quote@
- 
  .cc.o:
-- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
  
  .cc.obj:
-- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
  
  .cc.lo:
-- at am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
  
  bbox_test-bbox_test.o: bbox_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bbox_test_CXXFLAGS) $(CXXFLAGS) -MT bbox_test-bbox_test.o -MD -MP -MF "$(DEPDIR)/bbox_test-bbox_test.Tpo" -c -o bbox_test-bbox_test.o `test -f 'bbox_test.cc' || echo '$(srcdir)/'`bbox_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/bbox_test-bbox_test.Tpo" "$(DEPDIR)/bbox_test-bbox_test.Po"; else rm -f "$(DEPDIR)/bbox_test-bbox_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bbox_test_CXXFLAGS) $(CXXFLAGS) -MT bbox_test-bbox_test.o -MD -MP -MF $(DEPDIR)/bbox_test-bbox_test.Tpo -c -o bbox_test-bbox_test.o `test -f 'bbox_test.cc' || echo '$(srcdir)/'`bbox_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bbox_test_CXXFLAGS) $(CXXFLAGS) -MT bbox_test-bbox_test.o -MD -MP -MF $(DEPDIR)/bbox_test-bbox_test.Tpo -c -o bbox_test-bbox_test.o `test -f 'bbox_test.cc' || echo '$(srcdir)/'`bbox_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/bbox_test-bbox_test.Tpo $(DEPDIR)/bbox_test-bbox_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/bbox_test-bbox_test.Tpo $(DEPDIR)/bbox_test-bbox_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='bbox_test.cc' object='bbox_test-bbox_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bbox_test_CXXFLAGS) $(CXXFLAGS) -c -o bbox_test-bbox_test.o `test -f 'bbox_test.cc' || echo '$(srcdir)/'`bbox_test.cc
  
  bbox_test-bbox_test.obj: bbox_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bbox_test_CXXFLAGS) $(CXXFLAGS) -MT bbox_test-bbox_test.obj -MD -MP -MF "$(DEPDIR)/bbox_test-bbox_test.Tpo" -c -o bbox_test-bbox_test.obj `if test -f 'bbox_test.cc'; then $(CYGPATH_W) 'bbox_test.cc'; else $(CYGPATH_W) '$(srcdir)/bbox_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/bbox_test-bbox_test.Tpo" "$(DEPDIR)/bbox_test-bbox_test.Po"; else rm -f "$(DEPDIR)/bbox_test-bbox_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bbox_test_CXXFLAGS) $(CXXFLAGS) -MT bbox_test-bbox_test.obj -MD -MP -MF $(DEPDIR)/bbox_test-bbox_test.Tpo -c -o bbox_test-bbox_test.obj `if test -f 'bbox_test.cc'; then $(CYGPATH_W) 'bbox_test.cc'; else $(CYGPATH_W) '$(srcdir)/bbox_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bbox_test_CXXFLAGS) $(CXXFLAGS) -MT bbox_test-bbox_test.obj -MD -MP -MF $(DEPDIR)/bbox_test-bbox_test.Tpo -c -o bbox_test-bbox_test.obj `if test -f 'bbox_test.cc'; then $(CYGPATH_W) 'bbox_test.cc'; else $(CYGPATH_W) '$(srcdir)/bbox_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/bbox_test-bbox_test.Tpo $(DEPDIR)/bbox_test-bbox_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/bbox_test-bbox_test.Tpo $(DEPDIR)/bbox_test-bbox_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='bbox_test.cc' object='bbox_test-bbox_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(bbox_test_CXXFLAGS) $(CXXFLAGS) -c -o bbox_test-bbox_test.obj `if test -f 'bbox_test.cc'; then $(CYGPATH_W) 'bbox_test.cc'; else $(CYGPATH_W) '$(srcdir)/bbox_test.cc'; fi`
  
  clone_test-clone_test.o: clone_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clone_test_CXXFLAGS) $(CXXFLAGS) -MT clone_test-clone_test.o -MD -MP -MF "$(DEPDIR)/clone_test-clone_test.Tpo" -c -o clone_test-clone_test.o `test -f 'clone_test.cc' || echo '$(srcdir)/'`clone_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/clone_test-clone_test.Tpo" "$(DEPDIR)/clone_test-clone_test.Po"; else rm -f "$(DEPDIR)/clone_test-clone_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clone_test_CXXFLAGS) $(CXXFLAGS) -MT clone_test-clone_test.o -MD -MP -MF $(DEPDIR)/clone_test-clone_test.Tpo -c -o clone_test-clone_test.o `test -f 'clone_test.cc' || echo '$(srcdir)/'`clone_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clone_test_CXXFLAGS) $(CXXFLAGS) -MT clone_test-clone_test.o -MD -MP -MF $(DEPDIR)/clone_test-clone_test.Tpo -c -o clone_test-clone_test.o `test -f 'clone_test.cc' || echo '$(srcdir)/'`clone_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/clone_test-clone_test.Tpo $(DEPDIR)/clone_test-clone_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/clone_test-clone_test.Tpo $(DEPDIR)/clone_test-clone_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='clone_test.cc' object='clone_test-clone_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clone_test_CXXFLAGS) $(CXXFLAGS) -c -o clone_test-clone_test.o `test -f 'clone_test.cc' || echo '$(srcdir)/'`clone_test.cc
  
  clone_test-clone_test.obj: clone_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clone_test_CXXFLAGS) $(CXXFLAGS) -MT clone_test-clone_test.obj -MD -MP -MF "$(DEPDIR)/clone_test-clone_test.Tpo" -c -o clone_test-clone_test.obj `if test -f 'clone_test.cc'; then $(CYGPATH_W) 'clone_test.cc'; else $(CYGPATH_W) '$(srcdir)/clone_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/clone_test-clone_test.Tpo" "$(DEPDIR)/clone_test-clone_test.Po"; else rm -f "$(DEPDIR)/clone_test-clone_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clone_test_CXXFLAGS) $(CXXFLAGS) -MT clone_test-clone_test.obj -MD -MP -MF $(DEPDIR)/clone_test-clone_test.Tpo -c -o clone_test-clone_test.obj `if test -f 'clone_test.cc'; then $(CYGPATH_W) 'clone_test.cc'; else $(CYGPATH_W) '$(srcdir)/clone_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clone_test_CXXFLAGS) $(CXXFLAGS) -MT clone_test-clone_test.obj -MD -MP -MF $(DEPDIR)/clone_test-clone_test.Tpo -c -o clone_test-clone_test.obj `if test -f 'clone_test.cc'; then $(CYGPATH_W) 'clone_test.cc'; else $(CYGPATH_W) '$(srcdir)/clone_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/clone_test-clone_test.Tpo $(DEPDIR)/clone_test-clone_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/clone_test-clone_test.Tpo $(DEPDIR)/clone_test-clone_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='clone_test.cc' object='clone_test-clone_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(clone_test_CXXFLAGS) $(CXXFLAGS) -c -o clone_test-clone_test.obj `if test -f 'clone_test.cc'; then $(CYGPATH_W) 'clone_test.cc'; else $(CYGPATH_W) '$(srcdir)/clone_test.cc'; fi`
  
  entity_mapper_test-entity_mapper_test.o: entity_mapper_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(entity_mapper_test_CXXFLAGS) $(CXXFLAGS) -MT entity_mapper_test-entity_mapper_test.o -MD -MP -MF "$(DEPDIR)/entity_mapper_test-entity_mapper_test.Tpo" -c -o entity_mapper_test-entity_mapper_test.o `test -f 'entity_mapper_test.cc' || echo '$(srcdir)/'`entity_mapper_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/entity_mapper_test-entity_mapper_test.Tpo" "$(DEPDIR)/entity_mapper_test-entity_mapper_test.Po"; else rm -f "$(DEPDIR)/entity_mapper_test-entity_mapper_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(entity_mapper_test_CXXFLAGS) $(CXXFLAGS) -MT entity_mapper_test-entity_mapper_test.o -MD -MP -MF $(DEPDIR)/entity_mapper_test-entity_mapper_test.Tpo -c -o entity_mapper_test-entity_mapper_test.o `test -f 'entity_mapper_test.cc' || echo '$(srcdir)/'`entity_mapper_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(entity_mapper_test_CXXFLAGS) $(CXXFLAGS) -MT entity_mapper_test-entity_mapper_test.o -MD -MP -MF $(DEPDIR)/entity_mapper_test-entity_mapper_test.Tpo -c -o entity_mapper_test-entity_mapper_test.o `test -f 'entity_mapper_test.cc' || echo '$(srcdir)/'`entity_mapper_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/entity_mapper_test-entity_mapper_test.Tpo $(DEPDIR)/entity_mapper_test-entity_mapper_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/entity_mapper_test-entity_mapper_test.Tpo $(DEPDIR)/entity_mapper_test-entity_mapper_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='entity_mapper_test.cc' object='entity_mapper_test-entity_mapper_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(entity_mapper_test_CXXFLAGS) $(CXXFLAGS) -c -o entity_mapper_test-entity_mapper_test.o `test -f 'entity_mapper_test.cc' || echo '$(srcdir)/'`entity_mapper_test.cc
  
  entity_mapper_test-entity_mapper_test.obj: entity_mapper_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(entity_mapper_test_CXXFLAGS) $(CXXFLAGS) -MT entity_mapper_test-entity_mapper_test.obj -MD -MP -MF "$(DEPDIR)/entity_mapper_test-entity_mapper_test.Tpo" -c -o entity_mapper_test-entity_mapper_test.obj `if test -f 'entity_mapper_test.cc'; then $(CYGPATH_W) 'entity_mapper_test.cc'; else $(CYGPATH_W) '$(srcdir)/entity_mapper_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/entity_mapper_test-entity_mapper_test.Tpo" "$(DEPDIR)/entity_mapper_test-entity_mapper_test.Po"; else rm -f "$(DEPDIR)/entity_mapper_test-entity_mapper_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(entity_mapper_test_CXXFLAGS) $(CXXFLAGS) -MT entity_mapper_test-entity_mapper_test.obj -MD -MP -MF $(DEPDIR)/entity_mapper_test-entity_mapper_test.Tpo -c -o entity_mapper_test-entity_mapper_test.obj `if test -f 'entity_mapper_test.cc'; then $(CYGPATH_W) 'entity_mapper_test.cc'; else $(CYGPATH_W) '$(srcdir)/entity_mapper_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(entity_mapper_test_CXXFLAGS) $(CXXFLAGS) -MT entity_mapper_test-entity_mapper_test.obj -MD -MP -MF $(DEPDIR)/entity_mapper_test-entity_mapper_test.Tpo -c -o entity_mapper_test-entity_mapper_test.obj `if test -f 'entity_mapper_test.cc'; then $(CYGPATH_W) 'entity_mapper_test.cc'; else $(CYGPATH_W) '$(srcdir)/entity_mapper_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/entity_mapper_test-entity_mapper_test.Tpo $(DEPDIR)/entity_mapper_test-entity_mapper_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/entity_mapper_test-entity_mapper_test.Tpo $(DEPDIR)/entity_mapper_test-entity_mapper_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='entity_mapper_test.cc' object='entity_mapper_test-entity_mapper_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(entity_mapper_test_CXXFLAGS) $(CXXFLAGS) -c -o entity_mapper_test-entity_mapper_test.obj `if test -f 'entity_mapper_test.cc'; then $(CYGPATH_W) 'entity_mapper_test.cc'; else $(CYGPATH_W) '$(srcdir)/entity_mapper_test.cc'; fi`
  
  feature_balloon_test-feature_balloon_test.o: feature_balloon_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(feature_balloon_test_CXXFLAGS) $(CXXFLAGS) -MT feature_balloon_test-feature_balloon_test.o -MD -MP -MF "$(DEPDIR)/feature_balloon_test-feature_balloon_test.Tpo" -c -o feature_balloon_test-feature_balloon_test.o `test -f 'feature_balloon_test.cc' || echo '$(srcdir)/'`feature_balloon_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/feature_balloon_test-feature_balloon_test.Tpo" "$(DEPDIR)/feature_balloon_test-feature_balloon_test.Po"; else rm -f "$(DEPDIR)/feature_balloon_test-feature_balloon_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(feature_balloon_test_CXXFLAGS) $(CXXFLAGS) -MT feature_balloon_test-feature_balloon_test.o -MD -MP -MF $(DEPDIR)/feature_balloon_test-feature_balloon_test.Tpo -c -o feature_balloon_test-feature_balloon_test.o `test -f 'feature_balloon_test.cc' || echo '$(srcdir)/'`feature_balloon_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(feature_balloon_test_CXXFLAGS) $(CXXFLAGS) -MT feature_balloon_test-feature_balloon_test.o -MD -MP -MF $(DEPDIR)/feature_balloon_test-feature_balloon_test.Tpo -c -o feature_balloon_test-feature_balloon_test.o `test -f 'feature_balloon_test.cc' || echo '$(srcdir)/'`feature_balloon_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/feature_balloon_test-feature_balloon_test.Tpo $(DEPDIR)/feature_balloon_test-feature_balloon_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/feature_balloon_test-feature_balloon_test.Tpo $(DEPDIR)/feature_balloon_test-feature_balloon_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='feature_balloon_test.cc' object='feature_balloon_test-feature_balloon_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(feature_balloon_test_CXXFLAGS) $(CXXFLAGS) -c -o feature_balloon_test-feature_balloon_test.o `test -f 'feature_balloon_test.cc' || echo '$(srcdir)/'`feature_balloon_test.cc
  
  feature_balloon_test-feature_balloon_test.obj: feature_balloon_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(feature_balloon_test_CXXFLAGS) $(CXXFLAGS) -MT feature_balloon_test-feature_balloon_test.obj -MD -MP -MF "$(DEPDIR)/feature_balloon_test-feature_balloon_test.Tpo" -c -o feature_balloon_test-feature_balloon_test.obj `if test -f 'feature_balloon_test.cc'; then $(CYGPATH_W) 'feature_balloon_test.cc'; else $(CYGPATH_W) '$(srcdir)/feature_balloon_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/feature_balloon_test-feature_balloon_test.Tpo" "$(DEPDIR)/feature_balloon_test-feature_balloon_test.Po"; else rm -f "$(DEPDIR)/feature_balloon_test-feature_balloon_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(feature_balloon_test_CXXFLAGS) $(CXXFLAGS) -MT feature_balloon_test-feature_balloon_test.obj -MD -MP -MF $(DEPDIR)/feature_balloon_test-feature_balloon_test.Tpo -c -o feature_balloon_test-feature_balloon_test.obj `if test -f 'feature_balloon_test.cc'; then $(CYGPATH_W) 'feature_balloon_test.cc'; else $(CYGPATH_W) '$(srcdir)/feature_balloon_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(feature_balloon_test_CXXFLAGS) $(CXXFLAGS) -MT feature_balloon_test-feature_balloon_test.obj -MD -MP -MF $(DEPDIR)/feature_balloon_test-feature_balloon_test.Tpo -c -o feature_balloon_test-feature_balloon_test.obj `if test -f 'feature_balloon_test.cc'; then $(CYGPATH_W) 'feature_balloon_test.cc'; else $(CYGPATH_W) '$(srcdir)/feature_balloon_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/feature_balloon_test-feature_balloon_test.Tpo $(DEPDIR)/feature_balloon_test-feature_balloon_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/feature_balloon_test-feature_balloon_test.Tpo $(DEPDIR)/feature_balloon_test-feature_balloon_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='feature_balloon_test.cc' object='feature_balloon_test-feature_balloon_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(feature_balloon_test_CXXFLAGS) $(CXXFLAGS) -c -o feature_balloon_test-feature_balloon_test.obj `if test -f 'feature_balloon_test.cc'; then $(CYGPATH_W) 'feature_balloon_test.cc'; else $(CYGPATH_W) '$(srcdir)/feature_balloon_test.cc'; fi`
  
  feature_view_test-feature_view_test.o: feature_view_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(feature_view_test_CXXFLAGS) $(CXXFLAGS) -MT feature_view_test-feature_view_test.o -MD -MP -MF "$(DEPDIR)/feature_view_test-feature_view_test.Tpo" -c -o feature_view_test-feature_view_test.o `test -f 'feature_view_test.cc' || echo '$(srcdir)/'`feature_view_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/feature_view_test-feature_view_test.Tpo" "$(DEPDIR)/feature_view_test-feature_view_test.Po"; else rm -f "$(DEPDIR)/feature_view_test-feature_view_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(feature_view_test_CXXFLAGS) $(CXXFLAGS) -MT feature_view_test-feature_view_test.o -MD -MP -MF $(DEPDIR)/feature_view_test-feature_view_test.Tpo -c -o feature_view_test-feature_view_test.o `test -f 'feature_view_test.cc' || echo '$(srcdir)/'`feature_view_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(feature_view_test_CXXFLAGS) $(CXXFLAGS) -MT feature_view_test-feature_view_test.o -MD -MP -MF $(DEPDIR)/feature_view_test-feature_view_test.Tpo -c -o feature_view_test-feature_view_test.o `test -f 'feature_view_test.cc' || echo '$(srcdir)/'`feature_view_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/feature_view_test-feature_view_test.Tpo $(DEPDIR)/feature_view_test-feature_view_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/feature_view_test-feature_view_test.Tpo $(DEPDIR)/feature_view_test-feature_view_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='feature_view_test.cc' object='feature_view_test-feature_view_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(feature_view_test_CXXFLAGS) $(CXXFLAGS) -c -o feature_view_test-feature_view_test.o `test -f 'feature_view_test.cc' || echo '$(srcdir)/'`feature_view_test.cc
  
  feature_view_test-feature_view_test.obj: feature_view_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(feature_view_test_CXXFLAGS) $(CXXFLAGS) -MT feature_view_test-feature_view_test.obj -MD -MP -MF "$(DEPDIR)/feature_view_test-feature_view_test.Tpo" -c -o feature_view_test-feature_view_test.obj `if test -f 'feature_view_test.cc'; then $(CYGPATH_W) 'feature_view_test.cc'; else $(CYGPATH_W) '$(srcdir)/feature_view_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/feature_view_test-feature_view_test.Tpo" "$(DEPDIR)/feature_view_test-feature_view_test.Po"; else rm -f "$(DEPDIR)/feature_view_test-feature_view_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(feature_view_test_CXXFLAGS) $(CXXFLAGS) -MT feature_view_test-feature_view_test.obj -MD -MP -MF $(DEPDIR)/feature_view_test-feature_view_test.Tpo -c -o feature_view_test-feature_view_test.obj `if test -f 'feature_view_test.cc'; then $(CYGPATH_W) 'feature_view_test.cc'; else $(CYGPATH_W) '$(srcdir)/feature_view_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(feature_view_test_CXXFLAGS) $(CXXFLAGS) -MT feature_view_test-feature_view_test.obj -MD -MP -MF $(DEPDIR)/feature_view_test-feature_view_test.Tpo -c -o feature_view_test-feature_view_test.obj `if test -f 'feature_view_test.cc'; then $(CYGPATH_W) 'feature_view_test.cc'; else $(CYGPATH_W) '$(srcdir)/feature_view_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/feature_view_test-feature_view_test.Tpo $(DEPDIR)/feature_view_test-feature_view_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/feature_view_test-feature_view_test.Tpo $(DEPDIR)/feature_view_test-feature_view_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='feature_view_test.cc' object='feature_view_test-feature_view_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(feature_view_test_CXXFLAGS) $(CXXFLAGS) -c -o feature_view_test-feature_view_test.obj `if test -f 'feature_view_test.cc'; then $(CYGPATH_W) 'feature_view_test.cc'; else $(CYGPATH_W) '$(srcdir)/feature_view_test.cc'; fi`
  
  feature_visitor_test-feature_visitor_test.o: feature_visitor_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(feature_visitor_test_CXXFLAGS) $(CXXFLAGS) -MT feature_visitor_test-feature_visitor_test.o -MD -MP -MF "$(DEPDIR)/feature_visitor_test-feature_visitor_test.Tpo" -c -o feature_visitor_test-feature_visitor_test.o `test -f 'feature_visitor_test.cc' || echo '$(srcdir)/'`feature_visitor_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/feature_visitor_test-feature_visitor_test.Tpo" "$(DEPDIR)/feature_visitor_test-feature_visitor_test.Po"; else rm -f "$(DEPDIR)/feature_visitor_test-feature_visitor_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(feature_visitor_test_CXXFLAGS) $(CXXFLAGS) -MT feature_visitor_test-feature_visitor_test.o -MD -MP -MF $(DEPDIR)/feature_visitor_test-feature_visitor_test.Tpo -c -o feature_visitor_test-feature_visitor_test.o `test -f 'feature_visitor_test.cc' || echo '$(srcdir)/'`feature_visitor_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(feature_visitor_test_CXXFLAGS) $(CXXFLAGS) -MT feature_visitor_test-feature_visitor_test.o -MD -MP -MF $(DEPDIR)/feature_visitor_test-feature_visitor_test.Tpo -c -o feature_visitor_test-feature_visitor_test.o `test -f 'feature_visitor_test.cc' || echo '$(srcdir)/'`feature_visitor_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/feature_visitor_test-feature_visitor_test.Tpo $(DEPDIR)/feature_visitor_test-feature_visitor_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/feature_visitor_test-feature_visitor_test.Tpo $(DEPDIR)/feature_visitor_test-feature_visitor_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='feature_visitor_test.cc' object='feature_visitor_test-feature_visitor_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(feature_visitor_test_CXXFLAGS) $(CXXFLAGS) -c -o feature_visitor_test-feature_visitor_test.o `test -f 'feature_visitor_test.cc' || echo '$(srcdir)/'`feature_visitor_test.cc
  
  feature_visitor_test-feature_visitor_test.obj: feature_visitor_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(feature_visitor_test_CXXFLAGS) $(CXXFLAGS) -MT feature_visitor_test-feature_visitor_test.obj -MD -MP -MF "$(DEPDIR)/feature_visitor_test-feature_visitor_test.Tpo" -c -o feature_visitor_test-feature_visitor_test.obj `if test -f 'feature_visitor_test.cc'; then $(CYGPATH_W) 'feature_visitor_test.cc'; else $(CYGPATH_W) '$(srcdir)/feature_visitor_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/feature_visitor_test-feature_visitor_test.Tpo" "$(DEPDIR)/feature_visitor_test-feature_visitor_test.Po"; else rm -f "$(DEPDIR)/feature_visitor_test-feature_visitor_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(feature_visitor_test_CXXFLAGS) $(CXXFLAGS) -MT feature_visitor_test-feature_visitor_test.obj -MD -MP -MF $(DEPDIR)/feature_visitor_test-feature_visitor_test.Tpo -c -o feature_visitor_test-feature_visitor_test.obj `if test -f 'feature_visitor_test.cc'; then $(CYGPATH_W) 'feature_visitor_test.cc'; else $(CYGPATH_W) '$(srcdir)/feature_visitor_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(feature_visitor_test_CXXFLAGS) $(CXXFLAGS) -MT feature_visitor_test-feature_visitor_test.obj -MD -MP -MF $(DEPDIR)/feature_visitor_test-feature_visitor_test.Tpo -c -o feature_visitor_test-feature_visitor_test.obj `if test -f 'feature_visitor_test.cc'; then $(CYGPATH_W) 'feature_visitor_test.cc'; else $(CYGPATH_W) '$(srcdir)/feature_visitor_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/feature_visitor_test-feature_visitor_test.Tpo $(DEPDIR)/feature_visitor_test-feature_visitor_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/feature_visitor_test-feature_visitor_test.Tpo $(DEPDIR)/feature_visitor_test-feature_visitor_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='feature_visitor_test.cc' object='feature_visitor_test-feature_visitor_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(feature_visitor_test_CXXFLAGS) $(CXXFLAGS) -c -o feature_visitor_test-feature_visitor_test.obj `if test -f 'feature_visitor_test.cc'; then $(CYGPATH_W) 'feature_visitor_test.cc'; else $(CYGPATH_W) '$(srcdir)/feature_visitor_test.cc'; fi`
  
  find_test-find_test.o: find_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(find_test_CXXFLAGS) $(CXXFLAGS) -MT find_test-find_test.o -MD -MP -MF "$(DEPDIR)/find_test-find_test.Tpo" -c -o find_test-find_test.o `test -f 'find_test.cc' || echo '$(srcdir)/'`find_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/find_test-find_test.Tpo" "$(DEPDIR)/find_test-find_test.Po"; else rm -f "$(DEPDIR)/find_test-find_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(find_test_CXXFLAGS) $(CXXFLAGS) -MT find_test-find_test.o -MD -MP -MF $(DEPDIR)/find_test-find_test.Tpo -c -o find_test-find_test.o `test -f 'find_test.cc' || echo '$(srcdir)/'`find_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(find_test_CXXFLAGS) $(CXXFLAGS) -MT find_test-find_test.o -MD -MP -MF $(DEPDIR)/find_test-find_test.Tpo -c -o find_test-find_test.o `test -f 'find_test.cc' || echo '$(srcdir)/'`find_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/find_test-find_test.Tpo $(DEPDIR)/find_test-find_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/find_test-find_test.Tpo $(DEPDIR)/find_test-find_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='find_test.cc' object='find_test-find_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(find_test_CXXFLAGS) $(CXXFLAGS) -c -o find_test-find_test.o `test -f 'find_test.cc' || echo '$(srcdir)/'`find_test.cc
  
  find_test-find_test.obj: find_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(find_test_CXXFLAGS) $(CXXFLAGS) -MT find_test-find_test.obj -MD -MP -MF "$(DEPDIR)/find_test-find_test.Tpo" -c -o find_test-find_test.obj `if test -f 'find_test.cc'; then $(CYGPATH_W) 'find_test.cc'; else $(CYGPATH_W) '$(srcdir)/find_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/find_test-find_test.Tpo" "$(DEPDIR)/find_test-find_test.Po"; else rm -f "$(DEPDIR)/find_test-find_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(find_test_CXXFLAGS) $(CXXFLAGS) -MT find_test-find_test.obj -MD -MP -MF $(DEPDIR)/find_test-find_test.Tpo -c -o find_test-find_test.obj `if test -f 'find_test.cc'; then $(CYGPATH_W) 'find_test.cc'; else $(CYGPATH_W) '$(srcdir)/find_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(find_test_CXXFLAGS) $(CXXFLAGS) -MT find_test-find_test.obj -MD -MP -MF $(DEPDIR)/find_test-find_test.Tpo -c -o find_test-find_test.obj `if test -f 'find_test.cc'; then $(CYGPATH_W) 'find_test.cc'; else $(CYGPATH_W) '$(srcdir)/find_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/find_test-find_test.Tpo $(DEPDIR)/find_test-find_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/find_test-find_test.Tpo $(DEPDIR)/find_test-find_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='find_test.cc' object='find_test-find_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(find_test_CXXFLAGS) $(CXXFLAGS) -c -o find_test-find_test.obj `if test -f 'find_test.cc'; then $(CYGPATH_W) 'find_test.cc'; else $(CYGPATH_W) '$(srcdir)/find_test.cc'; fi`
  
  find_xml_namespaces_test-find_xml_namespaces_test.o: find_xml_namespaces_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(find_xml_namespaces_test_CXXFLAGS) $(CXXFLAGS) -MT find_xml_namespaces_test-find_xml_namespaces_test.o -MD -MP -MF "$(DEPDIR)/find_xml_namespaces_test-find_xml_namespaces_test.Tpo" -c -o find_xml_namespaces_test-find_xml_namespaces_test.o `test -f 'find_xml_namespaces_test.cc' || echo '$(srcdir)/'`find_xml_namespaces_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/find_xml_namespaces_test-find_xml_namespaces_test.Tpo" "$(DEPDIR)/find_xml_namespaces_test-find_xml_namespaces_test.Po"; else rm -f "$(DEPDIR)/find_xml_namespaces_test-find_xml_namespaces_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(find_xml_namespaces_test_CXXFLAGS) $(CXXFLAGS) -MT find_xml_namespaces_test-find_xml_namespaces_test.o -MD -MP -MF $(DEPDIR)/find_xml_namespaces_test-find_xml_namespaces_test.Tpo -c -o find_xml_namespaces_test-find_xml_namespaces_test.o `test -f 'find_xml_namespaces_test.cc' || echo '$(srcdir)/'`find_xml_namespaces_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(find_xml_namespaces_test_CXXFLAGS) $(CXXFLAGS) -MT find_xml_namespaces_test-find_xml_namespaces_test.o -MD -MP -MF $(DEPDIR)/find_xml_namespaces_test-find_xml_namespaces_test.Tpo -c -o find_xml_namespaces_test-find_xml_namespaces_test.o `test -f 'find_xml_namespaces_test.cc' || echo '$(srcdir)/'`find_xml_namespaces_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/find_xml_namespaces_test-find_xml_namespaces_test.Tpo $(DEPDIR)/find_xml_namespaces_test-find_xml_namespaces_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/find_xml_namespaces_test-find_xml_namespaces_test.Tpo $(DEPDIR)/find_xml_namespaces_test-find_xml_namespaces_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='find_xml_namespaces_test.cc' object='find_xml_namespaces_test-find_xml_namespaces_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(find_xml_namespaces_test_CXXFLAGS) $(CXXFLAGS) -c -o find_xml_namespaces_test-find_xml_namespaces_test.o `test -f 'find_xml_namespaces_test.cc' || echo '$(srcdir)/'`find_xml_namespaces_test.cc
  
  find_xml_namespaces_test-find_xml_namespaces_test.obj: find_xml_namespaces_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(find_xml_namespaces_test_CXXFLAGS) $(CXXFLAGS) -MT find_xml_namespaces_test-find_xml_namespaces_test.obj -MD -MP -MF "$(DEPDIR)/find_xml_namespaces_test-find_xml_namespaces_test.Tpo" -c -o find_xml_namespaces_test-find_xml_namespaces_test.obj `if test -f 'find_xml_namespaces_test.cc'; then $(CYGPATH_W) 'find_xml_namespaces_test.cc'; else $(CYGPATH_W) '$(srcdir)/find_xml_namespaces_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/find_xml_namespaces_test-find_xml_namespaces_test.Tpo" "$(DEPDIR)/find_xml_namespaces_test-find_xml_namespaces_test.Po"; else rm -f "$(DEPDIR)/find_xml_namespaces_test-find_xml_namespaces_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(find_xml_namespaces_test_CXXFLAGS) $(CXXFLAGS) -MT find_xml_namespaces_test-find_xml_namespaces_test.obj -MD -MP -MF $(DEPDIR)/find_xml_namespaces_test-find_xml_namespaces_test.Tpo -c -o find_xml_namespaces_test-find_xml_namespaces_test.obj `if test -f 'find_xml_namespaces_test.cc'; then $(CYGPATH_W) 'find_xml_namespaces_test.cc'; else $(CYGPATH_W) '$(srcdir)/find_xml_namespaces_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(find_xml_namespaces_test_CXXFLAGS) $(CXXFLAGS) -MT find_xml_namespaces_test-find_xml_namespaces_test.obj -MD -MP -MF $(DEPDIR)/find_xml_namespaces_test-find_xml_namespaces_test.Tpo -c -o find_xml_namespaces_test-find_xml_namespaces_test.obj `if test -f 'find_xml_namespaces_test.cc'; then $(CYGPATH_W) 'find_xml_namespaces_test.cc'; else $(CYGPATH_W) '$(srcdir)/find_xml_namespaces_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/find_xml_namespaces_test-find_xml_namespaces_test.Tpo $(DEPDIR)/find_xml_namespaces_test-find_xml_namespaces_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/find_xml_namespaces_test-find_xml_namespaces_test.Tpo $(DEPDIR)/find_xml_namespaces_test-find_xml_namespaces_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='find_xml_namespaces_test.cc' object='find_xml_namespaces_test-find_xml_namespaces_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(find_xml_namespaces_test_CXXFLAGS) $(CXXFLAGS) -c -o find_xml_namespaces_test-find_xml_namespaces_test.obj `if test -f 'find_xml_namespaces_test.cc'; then $(CYGPATH_W) 'find_xml_namespaces_test.cc'; else $(CYGPATH_W) '$(srcdir)/find_xml_namespaces_test.cc'; fi`
  
  get_link_parents_test-get_link_parents_test.o: get_link_parents_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(get_link_parents_test_CXXFLAGS) $(CXXFLAGS) -MT get_link_parents_test-get_link_parents_test.o -MD -MP -MF "$(DEPDIR)/get_link_parents_test-get_link_parents_test.Tpo" -c -o get_link_parents_test-get_link_parents_test.o `test -f 'get_link_parents_test.cc' || echo '$(srcdir)/'`get_link_parents_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/get_link_parents_test-get_link_parents_test.Tpo" "$(DEPDIR)/get_link_parents_test-get_link_parents_test.Po"; else rm -f "$(DEPDIR)/get_link_parents_test-get_link_parents_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(get_link_parents_test_CXXFLAGS) $(CXXFLAGS) -MT get_link_parents_test-get_link_parents_test.o -MD -MP -MF $(DEPDIR)/get_link_parents_test-get_link_parents_test.Tpo -c -o get_link_parents_test-get_link_parents_test.o `test -f 'get_link_parents_test.cc' || echo '$(srcdir)/'`get_link_parents_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(get_link_parents_test_CXXFLAGS) $(CXXFLAGS) -MT get_link_parents_test-get_link_parents_test.o -MD -MP -MF $(DEPDIR)/get_link_parents_test-get_link_parents_test.Tpo -c -o get_link_parents_test-get_link_parents_test.o `test -f 'get_link_parents_test.cc' || echo '$(srcdir)/'`get_link_parents_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/get_link_parents_test-get_link_parents_test.Tpo $(DEPDIR)/get_link_parents_test-get_link_parents_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/get_link_parents_test-get_link_parents_test.Tpo $(DEPDIR)/get_link_parents_test-get_link_parents_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='get_link_parents_test.cc' object='get_link_parents_test-get_link_parents_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(get_link_parents_test_CXXFLAGS) $(CXXFLAGS) -c -o get_link_parents_test-get_link_parents_test.o `test -f 'get_link_parents_test.cc' || echo '$(srcdir)/'`get_link_parents_test.cc
  
  get_link_parents_test-get_link_parents_test.obj: get_link_parents_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(get_link_parents_test_CXXFLAGS) $(CXXFLAGS) -MT get_link_parents_test-get_link_parents_test.obj -MD -MP -MF "$(DEPDIR)/get_link_parents_test-get_link_parents_test.Tpo" -c -o get_link_parents_test-get_link_parents_test.obj `if test -f 'get_link_parents_test.cc'; then $(CYGPATH_W) 'get_link_parents_test.cc'; else $(CYGPATH_W) '$(srcdir)/get_link_parents_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/get_link_parents_test-get_link_parents_test.Tpo" "$(DEPDIR)/get_link_parents_test-get_link_parents_test.Po"; else rm -f "$(DEPDIR)/get_link_parents_test-get_link_parents_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(get_link_parents_test_CXXFLAGS) $(CXXFLAGS) -MT get_link_parents_test-get_link_parents_test.obj -MD -MP -MF $(DEPDIR)/get_link_parents_test-get_link_parents_test.Tpo -c -o get_link_parents_test-get_link_parents_test.obj `if test -f 'get_link_parents_test.cc'; then $(CYGPATH_W) 'get_link_parents_test.cc'; else $(CYGPATH_W) '$(srcdir)/get_link_parents_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(get_link_parents_test_CXXFLAGS) $(CXXFLAGS) -MT get_link_parents_test-get_link_parents_test.obj -MD -MP -MF $(DEPDIR)/get_link_parents_test-get_link_parents_test.Tpo -c -o get_link_parents_test-get_link_parents_test.obj `if test -f 'get_link_parents_test.cc'; then $(CYGPATH_W) 'get_link_parents_test.cc'; else $(CYGPATH_W) '$(srcdir)/get_link_parents_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/get_link_parents_test-get_link_parents_test.Tpo $(DEPDIR)/get_link_parents_test-get_link_parents_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/get_link_parents_test-get_link_parents_test.Tpo $(DEPDIR)/get_link_parents_test-get_link_parents_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='get_link_parents_test.cc' object='get_link_parents_test-get_link_parents_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(get_link_parents_test_CXXFLAGS) $(CXXFLAGS) -c -o get_link_parents_test-get_link_parents_test.obj `if test -f 'get_link_parents_test.cc'; then $(CYGPATH_W) 'get_link_parents_test.cc'; else $(CYGPATH_W) '$(srcdir)/get_link_parents_test.cc'; fi`
  
  get_links_test-get_links_test.o: get_links_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(get_links_test_CXXFLAGS) $(CXXFLAGS) -MT get_links_test-get_links_test.o -MD -MP -MF "$(DEPDIR)/get_links_test-get_links_test.Tpo" -c -o get_links_test-get_links_test.o `test -f 'get_links_test.cc' || echo '$(srcdir)/'`get_links_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/get_links_test-get_links_test.Tpo" "$(DEPDIR)/get_links_test-get_links_test.Po"; else rm -f "$(DEPDIR)/get_links_test-get_links_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(get_links_test_CXXFLAGS) $(CXXFLAGS) -MT get_links_test-get_links_test.o -MD -MP -MF $(DEPDIR)/get_links_test-get_links_test.Tpo -c -o get_links_test-get_links_test.o `test -f 'get_links_test.cc' || echo '$(srcdir)/'`get_links_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(get_links_test_CXXFLAGS) $(CXXFLAGS) -MT get_links_test-get_links_test.o -MD -MP -MF $(DEPDIR)/get_links_test-get_links_test.Tpo -c -o get_links_test-get_links_test.o `test -f 'get_links_test.cc' || echo '$(srcdir)/'`get_links_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/get_links_test-get_links_test.Tpo $(DEPDIR)/get_links_test-get_links_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/get_links_test-get_links_test.Tpo $(DEPDIR)/get_links_test-get_links_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='get_links_test.cc' object='get_links_test-get_links_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(get_links_test_CXXFLAGS) $(CXXFLAGS) -c -o get_links_test-get_links_test.o `test -f 'get_links_test.cc' || echo '$(srcdir)/'`get_links_test.cc
  
  get_links_test-get_links_test.obj: get_links_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(get_links_test_CXXFLAGS) $(CXXFLAGS) -MT get_links_test-get_links_test.obj -MD -MP -MF "$(DEPDIR)/get_links_test-get_links_test.Tpo" -c -o get_links_test-get_links_test.obj `if test -f 'get_links_test.cc'; then $(CYGPATH_W) 'get_links_test.cc'; else $(CYGPATH_W) '$(srcdir)/get_links_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/get_links_test-get_links_test.Tpo" "$(DEPDIR)/get_links_test-get_links_test.Po"; else rm -f "$(DEPDIR)/get_links_test-get_links_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(get_links_test_CXXFLAGS) $(CXXFLAGS) -MT get_links_test-get_links_test.obj -MD -MP -MF $(DEPDIR)/get_links_test-get_links_test.Tpo -c -o get_links_test-get_links_test.obj `if test -f 'get_links_test.cc'; then $(CYGPATH_W) 'get_links_test.cc'; else $(CYGPATH_W) '$(srcdir)/get_links_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(get_links_test_CXXFLAGS) $(CXXFLAGS) -MT get_links_test-get_links_test.obj -MD -MP -MF $(DEPDIR)/get_links_test-get_links_test.Tpo -c -o get_links_test-get_links_test.obj `if test -f 'get_links_test.cc'; then $(CYGPATH_W) 'get_links_test.cc'; else $(CYGPATH_W) '$(srcdir)/get_links_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/get_links_test-get_links_test.Tpo $(DEPDIR)/get_links_test-get_links_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/get_links_test-get_links_test.Tpo $(DEPDIR)/get_links_test-get_links_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='get_links_test.cc' object='get_links_test-get_links_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(get_links_test_CXXFLAGS) $(CXXFLAGS) -c -o get_links_test-get_links_test.obj `if test -f 'get_links_test.cc'; then $(CYGPATH_W) 'get_links_test.cc'; else $(CYGPATH_W) '$(srcdir)/get_links_test.cc'; fi`
  
  href_test-href_test.o: href_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(href_test_CXXFLAGS) $(CXXFLAGS) -MT href_test-href_test.o -MD -MP -MF "$(DEPDIR)/href_test-href_test.Tpo" -c -o href_test-href_test.o `test -f 'href_test.cc' || echo '$(srcdir)/'`href_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/href_test-href_test.Tpo" "$(DEPDIR)/href_test-href_test.Po"; else rm -f "$(DEPDIR)/href_test-href_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(href_test_CXXFLAGS) $(CXXFLAGS) -MT href_test-href_test.o -MD -MP -MF $(DEPDIR)/href_test-href_test.Tpo -c -o href_test-href_test.o `test -f 'href_test.cc' || echo '$(srcdir)/'`href_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(href_test_CXXFLAGS) $(CXXFLAGS) -MT href_test-href_test.o -MD -MP -MF $(DEPDIR)/href_test-href_test.Tpo -c -o href_test-href_test.o `test -f 'href_test.cc' || echo '$(srcdir)/'`href_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/href_test-href_test.Tpo $(DEPDIR)/href_test-href_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/href_test-href_test.Tpo $(DEPDIR)/href_test-href_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='href_test.cc' object='href_test-href_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(href_test_CXXFLAGS) $(CXXFLAGS) -c -o href_test-href_test.o `test -f 'href_test.cc' || echo '$(srcdir)/'`href_test.cc
  
  href_test-href_test.obj: href_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(href_test_CXXFLAGS) $(CXXFLAGS) -MT href_test-href_test.obj -MD -MP -MF "$(DEPDIR)/href_test-href_test.Tpo" -c -o href_test-href_test.obj `if test -f 'href_test.cc'; then $(CYGPATH_W) 'href_test.cc'; else $(CYGPATH_W) '$(srcdir)/href_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/href_test-href_test.Tpo" "$(DEPDIR)/href_test-href_test.Po"; else rm -f "$(DEPDIR)/href_test-href_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(href_test_CXXFLAGS) $(CXXFLAGS) -MT href_test-href_test.obj -MD -MP -MF $(DEPDIR)/href_test-href_test.Tpo -c -o href_test-href_test.obj `if test -f 'href_test.cc'; then $(CYGPATH_W) 'href_test.cc'; else $(CYGPATH_W) '$(srcdir)/href_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(href_test_CXXFLAGS) $(CXXFLAGS) -MT href_test-href_test.obj -MD -MP -MF $(DEPDIR)/href_test-href_test.Tpo -c -o href_test-href_test.obj `if test -f 'href_test.cc'; then $(CYGPATH_W) 'href_test.cc'; else $(CYGPATH_W) '$(srcdir)/href_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/href_test-href_test.Tpo $(DEPDIR)/href_test-href_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/href_test-href_test.Tpo $(DEPDIR)/href_test-href_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='href_test.cc' object='href_test-href_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(href_test_CXXFLAGS) $(CXXFLAGS) -c -o href_test-href_test.obj `if test -f 'href_test.cc'; then $(CYGPATH_W) 'href_test.cc'; else $(CYGPATH_W) '$(srcdir)/href_test.cc'; fi`
  
  id_mapper_test-id_mapper_test.o: id_mapper_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(id_mapper_test_CXXFLAGS) $(CXXFLAGS) -MT id_mapper_test-id_mapper_test.o -MD -MP -MF "$(DEPDIR)/id_mapper_test-id_mapper_test.Tpo" -c -o id_mapper_test-id_mapper_test.o `test -f 'id_mapper_test.cc' || echo '$(srcdir)/'`id_mapper_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/id_mapper_test-id_mapper_test.Tpo" "$(DEPDIR)/id_mapper_test-id_mapper_test.Po"; else rm -f "$(DEPDIR)/id_mapper_test-id_mapper_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(id_mapper_test_CXXFLAGS) $(CXXFLAGS) -MT id_mapper_test-id_mapper_test.o -MD -MP -MF $(DEPDIR)/id_mapper_test-id_mapper_test.Tpo -c -o id_mapper_test-id_mapper_test.o `test -f 'id_mapper_test.cc' || echo '$(srcdir)/'`id_mapper_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(id_mapper_test_CXXFLAGS) $(CXXFLAGS) -MT id_mapper_test-id_mapper_test.o -MD -MP -MF $(DEPDIR)/id_mapper_test-id_mapper_test.Tpo -c -o id_mapper_test-id_mapper_test.o `test -f 'id_mapper_test.cc' || echo '$(srcdir)/'`id_mapper_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/id_mapper_test-id_mapper_test.Tpo $(DEPDIR)/id_mapper_test-id_mapper_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/id_mapper_test-id_mapper_test.Tpo $(DEPDIR)/id_mapper_test-id_mapper_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='id_mapper_test.cc' object='id_mapper_test-id_mapper_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(id_mapper_test_CXXFLAGS) $(CXXFLAGS) -c -o id_mapper_test-id_mapper_test.o `test -f 'id_mapper_test.cc' || echo '$(srcdir)/'`id_mapper_test.cc
  
  id_mapper_test-id_mapper_test.obj: id_mapper_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(id_mapper_test_CXXFLAGS) $(CXXFLAGS) -MT id_mapper_test-id_mapper_test.obj -MD -MP -MF "$(DEPDIR)/id_mapper_test-id_mapper_test.Tpo" -c -o id_mapper_test-id_mapper_test.obj `if test -f 'id_mapper_test.cc'; then $(CYGPATH_W) 'id_mapper_test.cc'; else $(CYGPATH_W) '$(srcdir)/id_mapper_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/id_mapper_test-id_mapper_test.Tpo" "$(DEPDIR)/id_mapper_test-id_mapper_test.Po"; else rm -f "$(DEPDIR)/id_mapper_test-id_mapper_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(id_mapper_test_CXXFLAGS) $(CXXFLAGS) -MT id_mapper_test-id_mapper_test.obj -MD -MP -MF $(DEPDIR)/id_mapper_test-id_mapper_test.Tpo -c -o id_mapper_test-id_mapper_test.obj `if test -f 'id_mapper_test.cc'; then $(CYGPATH_W) 'id_mapper_test.cc'; else $(CYGPATH_W) '$(srcdir)/id_mapper_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(id_mapper_test_CXXFLAGS) $(CXXFLAGS) -MT id_mapper_test-id_mapper_test.obj -MD -MP -MF $(DEPDIR)/id_mapper_test-id_mapper_test.Tpo -c -o id_mapper_test-id_mapper_test.obj `if test -f 'id_mapper_test.cc'; then $(CYGPATH_W) 'id_mapper_test.cc'; else $(CYGPATH_W) '$(srcdir)/id_mapper_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/id_mapper_test-id_mapper_test.Tpo $(DEPDIR)/id_mapper_test-id_mapper_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/id_mapper_test-id_mapper_test.Tpo $(DEPDIR)/id_mapper_test-id_mapper_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='id_mapper_test.cc' object='id_mapper_test-id_mapper_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(id_mapper_test_CXXFLAGS) $(CXXFLAGS) -c -o id_mapper_test-id_mapper_test.obj `if test -f 'id_mapper_test.cc'; then $(CYGPATH_W) 'id_mapper_test.cc'; else $(CYGPATH_W) '$(srcdir)/id_mapper_test.cc'; fi`
  
  kml_cache_test-kml_cache_test.o: kml_cache_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kml_cache_test_CXXFLAGS) $(CXXFLAGS) -MT kml_cache_test-kml_cache_test.o -MD -MP -MF "$(DEPDIR)/kml_cache_test-kml_cache_test.Tpo" -c -o kml_cache_test-kml_cache_test.o `test -f 'kml_cache_test.cc' || echo '$(srcdir)/'`kml_cache_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/kml_cache_test-kml_cache_test.Tpo" "$(DEPDIR)/kml_cache_test-kml_cache_test.Po"; else rm -f "$(DEPDIR)/kml_cache_test-kml_cache_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kml_cache_test_CXXFLAGS) $(CXXFLAGS) -MT kml_cache_test-kml_cache_test.o -MD -MP -MF $(DEPDIR)/kml_cache_test-kml_cache_test.Tpo -c -o kml_cache_test-kml_cache_test.o `test -f 'kml_cache_test.cc' || echo '$(srcdir)/'`kml_cache_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kml_cache_test_CXXFLAGS) $(CXXFLAGS) -MT kml_cache_test-kml_cache_test.o -MD -MP -MF $(DEPDIR)/kml_cache_test-kml_cache_test.Tpo -c -o kml_cache_test-kml_cache_test.o `test -f 'kml_cache_test.cc' || echo '$(srcdir)/'`kml_cache_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/kml_cache_test-kml_cache_test.Tpo $(DEPDIR)/kml_cache_test-kml_cache_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/kml_cache_test-kml_cache_test.Tpo $(DEPDIR)/kml_cache_test-kml_cache_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='kml_cache_test.cc' object='kml_cache_test-kml_cache_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kml_cache_test_CXXFLAGS) $(CXXFLAGS) -c -o kml_cache_test-kml_cache_test.o `test -f 'kml_cache_test.cc' || echo '$(srcdir)/'`kml_cache_test.cc
  
  kml_cache_test-kml_cache_test.obj: kml_cache_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kml_cache_test_CXXFLAGS) $(CXXFLAGS) -MT kml_cache_test-kml_cache_test.obj -MD -MP -MF "$(DEPDIR)/kml_cache_test-kml_cache_test.Tpo" -c -o kml_cache_test-kml_cache_test.obj `if test -f 'kml_cache_test.cc'; then $(CYGPATH_W) 'kml_cache_test.cc'; else $(CYGPATH_W) '$(srcdir)/kml_cache_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/kml_cache_test-kml_cache_test.Tpo" "$(DEPDIR)/kml_cache_test-kml_cache_test.Po"; else rm -f "$(DEPDIR)/kml_cache_test-kml_cache_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kml_cache_test_CXXFLAGS) $(CXXFLAGS) -MT kml_cache_test-kml_cache_test.obj -MD -MP -MF $(DEPDIR)/kml_cache_test-kml_cache_test.Tpo -c -o kml_cache_test-kml_cache_test.obj `if test -f 'kml_cache_test.cc'; then $(CYGPATH_W) 'kml_cache_test.cc'; else $(CYGPATH_W) '$(srcdir)/kml_cache_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kml_cache_test_CXXFLAGS) $(CXXFLAGS) -MT kml_cache_test-kml_cache_test.obj -MD -MP -MF $(DEPDIR)/kml_cache_test-kml_cache_test.Tpo -c -o kml_cache_test-kml_cache_test.obj `if test -f 'kml_cache_test.cc'; then $(CYGPATH_W) 'kml_cache_test.cc'; else $(CYGPATH_W) '$(srcdir)/kml_cache_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/kml_cache_test-kml_cache_test.Tpo $(DEPDIR)/kml_cache_test-kml_cache_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/kml_cache_test-kml_cache_test.Tpo $(DEPDIR)/kml_cache_test-kml_cache_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='kml_cache_test.cc' object='kml_cache_test-kml_cache_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kml_cache_test_CXXFLAGS) $(CXXFLAGS) -c -o kml_cache_test-kml_cache_test.obj `if test -f 'kml_cache_test.cc'; then $(CYGPATH_W) 'kml_cache_test.cc'; else $(CYGPATH_W) '$(srcdir)/kml_cache_test.cc'; fi`
  
  kml_file_test-kml_file_test.o: kml_file_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kml_file_test_CXXFLAGS) $(CXXFLAGS) -MT kml_file_test-kml_file_test.o -MD -MP -MF "$(DEPDIR)/kml_file_test-kml_file_test.Tpo" -c -o kml_file_test-kml_file_test.o `test -f 'kml_file_test.cc' || echo '$(srcdir)/'`kml_file_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/kml_file_test-kml_file_test.Tpo" "$(DEPDIR)/kml_file_test-kml_file_test.Po"; else rm -f "$(DEPDIR)/kml_file_test-kml_file_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kml_file_test_CXXFLAGS) $(CXXFLAGS) -MT kml_file_test-kml_file_test.o -MD -MP -MF $(DEPDIR)/kml_file_test-kml_file_test.Tpo -c -o kml_file_test-kml_file_test.o `test -f 'kml_file_test.cc' || echo '$(srcdir)/'`kml_file_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kml_file_test_CXXFLAGS) $(CXXFLAGS) -MT kml_file_test-kml_file_test.o -MD -MP -MF $(DEPDIR)/kml_file_test-kml_file_test.Tpo -c -o kml_file_test-kml_file_test.o `test -f 'kml_file_test.cc' || echo '$(srcdir)/'`kml_file_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/kml_file_test-kml_file_test.Tpo $(DEPDIR)/kml_file_test-kml_file_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/kml_file_test-kml_file_test.Tpo $(DEPDIR)/kml_file_test-kml_file_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='kml_file_test.cc' object='kml_file_test-kml_file_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kml_file_test_CXXFLAGS) $(CXXFLAGS) -c -o kml_file_test-kml_file_test.o `test -f 'kml_file_test.cc' || echo '$(srcdir)/'`kml_file_test.cc
  
  kml_file_test-kml_file_test.obj: kml_file_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kml_file_test_CXXFLAGS) $(CXXFLAGS) -MT kml_file_test-kml_file_test.obj -MD -MP -MF "$(DEPDIR)/kml_file_test-kml_file_test.Tpo" -c -o kml_file_test-kml_file_test.obj `if test -f 'kml_file_test.cc'; then $(CYGPATH_W) 'kml_file_test.cc'; else $(CYGPATH_W) '$(srcdir)/kml_file_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/kml_file_test-kml_file_test.Tpo" "$(DEPDIR)/kml_file_test-kml_file_test.Po"; else rm -f "$(DEPDIR)/kml_file_test-kml_file_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kml_file_test_CXXFLAGS) $(CXXFLAGS) -MT kml_file_test-kml_file_test.obj -MD -MP -MF $(DEPDIR)/kml_file_test-kml_file_test.Tpo -c -o kml_file_test-kml_file_test.obj `if test -f 'kml_file_test.cc'; then $(CYGPATH_W) 'kml_file_test.cc'; else $(CYGPATH_W) '$(srcdir)/kml_file_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kml_file_test_CXXFLAGS) $(CXXFLAGS) -MT kml_file_test-kml_file_test.obj -MD -MP -MF $(DEPDIR)/kml_file_test-kml_file_test.Tpo -c -o kml_file_test-kml_file_test.obj `if test -f 'kml_file_test.cc'; then $(CYGPATH_W) 'kml_file_test.cc'; else $(CYGPATH_W) '$(srcdir)/kml_file_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/kml_file_test-kml_file_test.Tpo $(DEPDIR)/kml_file_test-kml_file_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/kml_file_test-kml_file_test.Tpo $(DEPDIR)/kml_file_test-kml_file_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='kml_file_test.cc' object='kml_file_test-kml_file_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kml_file_test_CXXFLAGS) $(CXXFLAGS) -c -o kml_file_test-kml_file_test.obj `if test -f 'kml_file_test.cc'; then $(CYGPATH_W) 'kml_file_test.cc'; else $(CYGPATH_W) '$(srcdir)/kml_file_test.cc'; fi`
  
  kml_stream_test-kml_stream_test.o: kml_stream_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kml_stream_test_CXXFLAGS) $(CXXFLAGS) -MT kml_stream_test-kml_stream_test.o -MD -MP -MF "$(DEPDIR)/kml_stream_test-kml_stream_test.Tpo" -c -o kml_stream_test-kml_stream_test.o `test -f 'kml_stream_test.cc' || echo '$(srcdir)/'`kml_stream_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/kml_stream_test-kml_stream_test.Tpo" "$(DEPDIR)/kml_stream_test-kml_stream_test.Po"; else rm -f "$(DEPDIR)/kml_stream_test-kml_stream_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kml_stream_test_CXXFLAGS) $(CXXFLAGS) -MT kml_stream_test-kml_stream_test.o -MD -MP -MF $(DEPDIR)/kml_stream_test-kml_stream_test.Tpo -c -o kml_stream_test-kml_stream_test.o `test -f 'kml_stream_test.cc' || echo '$(srcdir)/'`kml_stream_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kml_stream_test_CXXFLAGS) $(CXXFLAGS) -MT kml_stream_test-kml_stream_test.o -MD -MP -MF $(DEPDIR)/kml_stream_test-kml_stream_test.Tpo -c -o kml_stream_test-kml_stream_test.o `test -f 'kml_stream_test.cc' || echo '$(srcdir)/'`kml_stream_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/kml_stream_test-kml_stream_test.Tpo $(DEPDIR)/kml_stream_test-kml_stream_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/kml_stream_test-kml_stream_test.Tpo $(DEPDIR)/kml_stream_test-kml_stream_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='kml_stream_test.cc' object='kml_stream_test-kml_stream_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kml_stream_test_CXXFLAGS) $(CXXFLAGS) -c -o kml_stream_test-kml_stream_test.o `test -f 'kml_stream_test.cc' || echo '$(srcdir)/'`kml_stream_test.cc
  
  kml_stream_test-kml_stream_test.obj: kml_stream_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kml_stream_test_CXXFLAGS) $(CXXFLAGS) -MT kml_stream_test-kml_stream_test.obj -MD -MP -MF "$(DEPDIR)/kml_stream_test-kml_stream_test.Tpo" -c -o kml_stream_test-kml_stream_test.obj `if test -f 'kml_stream_test.cc'; then $(CYGPATH_W) 'kml_stream_test.cc'; else $(CYGPATH_W) '$(srcdir)/kml_stream_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/kml_stream_test-kml_stream_test.Tpo" "$(DEPDIR)/kml_stream_test-kml_stream_test.Po"; else rm -f "$(DEPDIR)/kml_stream_test-kml_stream_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kml_stream_test_CXXFLAGS) $(CXXFLAGS) -MT kml_stream_test-kml_stream_test.obj -MD -MP -MF $(DEPDIR)/kml_stream_test-kml_stream_test.Tpo -c -o kml_stream_test-kml_stream_test.obj `if test -f 'kml_stream_test.cc'; then $(CYGPATH_W) 'kml_stream_test.cc'; else $(CYGPATH_W) '$(srcdir)/kml_stream_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kml_stream_test_CXXFLAGS) $(CXXFLAGS) -MT kml_stream_test-kml_stream_test.obj -MD -MP -MF $(DEPDIR)/kml_stream_test-kml_stream_test.Tpo -c -o kml_stream_test-kml_stream_test.obj `if test -f 'kml_stream_test.cc'; then $(CYGPATH_W) 'kml_stream_test.cc'; else $(CYGPATH_W) '$(srcdir)/kml_stream_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/kml_stream_test-kml_stream_test.Tpo $(DEPDIR)/kml_stream_test-kml_stream_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/kml_stream_test-kml_stream_test.Tpo $(DEPDIR)/kml_stream_test-kml_stream_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='kml_stream_test.cc' object='kml_stream_test-kml_stream_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kml_stream_test_CXXFLAGS) $(CXXFLAGS) -c -o kml_stream_test-kml_stream_test.obj `if test -f 'kml_stream_test.cc'; then $(CYGPATH_W) 'kml_stream_test.cc'; else $(CYGPATH_W) '$(srcdir)/kml_stream_test.cc'; fi`
  
  kml_uri_test-kml_uri_test.o: kml_uri_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kml_uri_test_CXXFLAGS) $(CXXFLAGS) -MT kml_uri_test-kml_uri_test.o -MD -MP -MF "$(DEPDIR)/kml_uri_test-kml_uri_test.Tpo" -c -o kml_uri_test-kml_uri_test.o `test -f 'kml_uri_test.cc' || echo '$(srcdir)/'`kml_uri_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/kml_uri_test-kml_uri_test.Tpo" "$(DEPDIR)/kml_uri_test-kml_uri_test.Po"; else rm -f "$(DEPDIR)/kml_uri_test-kml_uri_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kml_uri_test_CXXFLAGS) $(CXXFLAGS) -MT kml_uri_test-kml_uri_test.o -MD -MP -MF $(DEPDIR)/kml_uri_test-kml_uri_test.Tpo -c -o kml_uri_test-kml_uri_test.o `test -f 'kml_uri_test.cc' || echo '$(srcdir)/'`kml_uri_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kml_uri_test_CXXFLAGS) $(CXXFLAGS) -MT kml_uri_test-kml_uri_test.o -MD -MP -MF $(DEPDIR)/kml_uri_test-kml_uri_test.Tpo -c -o kml_uri_test-kml_uri_test.o `test -f 'kml_uri_test.cc' || echo '$(srcdir)/'`kml_uri_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/kml_uri_test-kml_uri_test.Tpo $(DEPDIR)/kml_uri_test-kml_uri_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/kml_uri_test-kml_uri_test.Tpo $(DEPDIR)/kml_uri_test-kml_uri_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='kml_uri_test.cc' object='kml_uri_test-kml_uri_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kml_uri_test_CXXFLAGS) $(CXXFLAGS) -c -o kml_uri_test-kml_uri_test.o `test -f 'kml_uri_test.cc' || echo '$(srcdir)/'`kml_uri_test.cc
  
  kml_uri_test-kml_uri_test.obj: kml_uri_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kml_uri_test_CXXFLAGS) $(CXXFLAGS) -MT kml_uri_test-kml_uri_test.obj -MD -MP -MF "$(DEPDIR)/kml_uri_test-kml_uri_test.Tpo" -c -o kml_uri_test-kml_uri_test.obj `if test -f 'kml_uri_test.cc'; then $(CYGPATH_W) 'kml_uri_test.cc'; else $(CYGPATH_W) '$(srcdir)/kml_uri_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/kml_uri_test-kml_uri_test.Tpo" "$(DEPDIR)/kml_uri_test-kml_uri_test.Po"; else rm -f "$(DEPDIR)/kml_uri_test-kml_uri_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kml_uri_test_CXXFLAGS) $(CXXFLAGS) -MT kml_uri_test-kml_uri_test.obj -MD -MP -MF $(DEPDIR)/kml_uri_test-kml_uri_test.Tpo -c -o kml_uri_test-kml_uri_test.obj `if test -f 'kml_uri_test.cc'; then $(CYGPATH_W) 'kml_uri_test.cc'; else $(CYGPATH_W) '$(srcdir)/kml_uri_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kml_uri_test_CXXFLAGS) $(CXXFLAGS) -MT kml_uri_test-kml_uri_test.obj -MD -MP -MF $(DEPDIR)/kml_uri_test-kml_uri_test.Tpo -c -o kml_uri_test-kml_uri_test.obj `if test -f 'kml_uri_test.cc'; then $(CYGPATH_W) 'kml_uri_test.cc'; else $(CYGPATH_W) '$(srcdir)/kml_uri_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/kml_uri_test-kml_uri_test.Tpo $(DEPDIR)/kml_uri_test-kml_uri_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/kml_uri_test-kml_uri_test.Tpo $(DEPDIR)/kml_uri_test-kml_uri_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='kml_uri_test.cc' object='kml_uri_test-kml_uri_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kml_uri_test_CXXFLAGS) $(CXXFLAGS) -c -o kml_uri_test-kml_uri_test.obj `if test -f 'kml_uri_test.cc'; then $(CYGPATH_W) 'kml_uri_test.cc'; else $(CYGPATH_W) '$(srcdir)/kml_uri_test.cc'; fi`
  
  kmz_cache_test-kmz_cache_test.o: kmz_cache_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kmz_cache_test_CXXFLAGS) $(CXXFLAGS) -MT kmz_cache_test-kmz_cache_test.o -MD -MP -MF "$(DEPDIR)/kmz_cache_test-kmz_cache_test.Tpo" -c -o kmz_cache_test-kmz_cache_test.o `test -f 'kmz_cache_test.cc' || echo '$(srcdir)/'`kmz_cache_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/kmz_cache_test-kmz_cache_test.Tpo" "$(DEPDIR)/kmz_cache_test-kmz_cache_test.Po"; else rm -f "$(DEPDIR)/kmz_cache_test-kmz_cache_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kmz_cache_test_CXXFLAGS) $(CXXFLAGS) -MT kmz_cache_test-kmz_cache_test.o -MD -MP -MF $(DEPDIR)/kmz_cache_test-kmz_cache_test.Tpo -c -o kmz_cache_test-kmz_cache_test.o `test -f 'kmz_cache_test.cc' || echo '$(srcdir)/'`kmz_cache_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kmz_cache_test_CXXFLAGS) $(CXXFLAGS) -MT kmz_cache_test-kmz_cache_test.o -MD -MP -MF $(DEPDIR)/kmz_cache_test-kmz_cache_test.Tpo -c -o kmz_cache_test-kmz_cache_test.o `test -f 'kmz_cache_test.cc' || echo '$(srcdir)/'`kmz_cache_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/kmz_cache_test-kmz_cache_test.Tpo $(DEPDIR)/kmz_cache_test-kmz_cache_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/kmz_cache_test-kmz_cache_test.Tpo $(DEPDIR)/kmz_cache_test-kmz_cache_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='kmz_cache_test.cc' object='kmz_cache_test-kmz_cache_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kmz_cache_test_CXXFLAGS) $(CXXFLAGS) -c -o kmz_cache_test-kmz_cache_test.o `test -f 'kmz_cache_test.cc' || echo '$(srcdir)/'`kmz_cache_test.cc
  
  kmz_cache_test-kmz_cache_test.obj: kmz_cache_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kmz_cache_test_CXXFLAGS) $(CXXFLAGS) -MT kmz_cache_test-kmz_cache_test.obj -MD -MP -MF "$(DEPDIR)/kmz_cache_test-kmz_cache_test.Tpo" -c -o kmz_cache_test-kmz_cache_test.obj `if test -f 'kmz_cache_test.cc'; then $(CYGPATH_W) 'kmz_cache_test.cc'; else $(CYGPATH_W) '$(srcdir)/kmz_cache_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/kmz_cache_test-kmz_cache_test.Tpo" "$(DEPDIR)/kmz_cache_test-kmz_cache_test.Po"; else rm -f "$(DEPDIR)/kmz_cache_test-kmz_cache_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kmz_cache_test_CXXFLAGS) $(CXXFLAGS) -MT kmz_cache_test-kmz_cache_test.obj -MD -MP -MF $(DEPDIR)/kmz_cache_test-kmz_cache_test.Tpo -c -o kmz_cache_test-kmz_cache_test.obj `if test -f 'kmz_cache_test.cc'; then $(CYGPATH_W) 'kmz_cache_test.cc'; else $(CYGPATH_W) '$(srcdir)/kmz_cache_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kmz_cache_test_CXXFLAGS) $(CXXFLAGS) -MT kmz_cache_test-kmz_cache_test.obj -MD -MP -MF $(DEPDIR)/kmz_cache_test-kmz_cache_test.Tpo -c -o kmz_cache_test-kmz_cache_test.obj `if test -f 'kmz_cache_test.cc'; then $(CYGPATH_W) 'kmz_cache_test.cc'; else $(CYGPATH_W) '$(srcdir)/kmz_cache_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/kmz_cache_test-kmz_cache_test.Tpo $(DEPDIR)/kmz_cache_test-kmz_cache_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/kmz_cache_test-kmz_cache_test.Tpo $(DEPDIR)/kmz_cache_test-kmz_cache_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='kmz_cache_test.cc' object='kmz_cache_test-kmz_cache_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kmz_cache_test_CXXFLAGS) $(CXXFLAGS) -c -o kmz_cache_test-kmz_cache_test.obj `if test -f 'kmz_cache_test.cc'; then $(CYGPATH_W) 'kmz_cache_test.cc'; else $(CYGPATH_W) '$(srcdir)/kmz_cache_test.cc'; fi`
  
  kmz_file_test-kmz_file_test.o: kmz_file_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kmz_file_test_CXXFLAGS) $(CXXFLAGS) -MT kmz_file_test-kmz_file_test.o -MD -MP -MF "$(DEPDIR)/kmz_file_test-kmz_file_test.Tpo" -c -o kmz_file_test-kmz_file_test.o `test -f 'kmz_file_test.cc' || echo '$(srcdir)/'`kmz_file_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/kmz_file_test-kmz_file_test.Tpo" "$(DEPDIR)/kmz_file_test-kmz_file_test.Po"; else rm -f "$(DEPDIR)/kmz_file_test-kmz_file_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kmz_file_test_CXXFLAGS) $(CXXFLAGS) -MT kmz_file_test-kmz_file_test.o -MD -MP -MF $(DEPDIR)/kmz_file_test-kmz_file_test.Tpo -c -o kmz_file_test-kmz_file_test.o `test -f 'kmz_file_test.cc' || echo '$(srcdir)/'`kmz_file_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kmz_file_test_CXXFLAGS) $(CXXFLAGS) -MT kmz_file_test-kmz_file_test.o -MD -MP -MF $(DEPDIR)/kmz_file_test-kmz_file_test.Tpo -c -o kmz_file_test-kmz_file_test.o `test -f 'kmz_file_test.cc' || echo '$(srcdir)/'`kmz_file_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/kmz_file_test-kmz_file_test.Tpo $(DEPDIR)/kmz_file_test-kmz_file_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/kmz_file_test-kmz_file_test.Tpo $(DEPDIR)/kmz_file_test-kmz_file_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='kmz_file_test.cc' object='kmz_file_test-kmz_file_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kmz_file_test_CXXFLAGS) $(CXXFLAGS) -c -o kmz_file_test-kmz_file_test.o `test -f 'kmz_file_test.cc' || echo '$(srcdir)/'`kmz_file_test.cc
  
  kmz_file_test-kmz_file_test.obj: kmz_file_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kmz_file_test_CXXFLAGS) $(CXXFLAGS) -MT kmz_file_test-kmz_file_test.obj -MD -MP -MF "$(DEPDIR)/kmz_file_test-kmz_file_test.Tpo" -c -o kmz_file_test-kmz_file_test.obj `if test -f 'kmz_file_test.cc'; then $(CYGPATH_W) 'kmz_file_test.cc'; else $(CYGPATH_W) '$(srcdir)/kmz_file_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/kmz_file_test-kmz_file_test.Tpo" "$(DEPDIR)/kmz_file_test-kmz_file_test.Po"; else rm -f "$(DEPDIR)/kmz_file_test-kmz_file_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kmz_file_test_CXXFLAGS) $(CXXFLAGS) -MT kmz_file_test-kmz_file_test.obj -MD -MP -MF $(DEPDIR)/kmz_file_test-kmz_file_test.Tpo -c -o kmz_file_test-kmz_file_test.obj `if test -f 'kmz_file_test.cc'; then $(CYGPATH_W) 'kmz_file_test.cc'; else $(CYGPATH_W) '$(srcdir)/kmz_file_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kmz_file_test_CXXFLAGS) $(CXXFLAGS) -MT kmz_file_test-kmz_file_test.obj -MD -MP -MF $(DEPDIR)/kmz_file_test-kmz_file_test.Tpo -c -o kmz_file_test-kmz_file_test.obj `if test -f 'kmz_file_test.cc'; then $(CYGPATH_W) 'kmz_file_test.cc'; else $(CYGPATH_W) '$(srcdir)/kmz_file_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/kmz_file_test-kmz_file_test.Tpo $(DEPDIR)/kmz_file_test-kmz_file_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/kmz_file_test-kmz_file_test.Tpo $(DEPDIR)/kmz_file_test-kmz_file_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='kmz_file_test.cc' object='kmz_file_test-kmz_file_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(kmz_file_test_CXXFLAGS) $(CXXFLAGS) -c -o kmz_file_test-kmz_file_test.obj `if test -f 'kmz_file_test.cc'; then $(CYGPATH_W) 'kmz_file_test.cc'; else $(CYGPATH_W) '$(srcdir)/kmz_file_test.cc'; fi`
  
  link_util_test-link_util_test.o: link_util_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(link_util_test_CXXFLAGS) $(CXXFLAGS) -MT link_util_test-link_util_test.o -MD -MP -MF "$(DEPDIR)/link_util_test-link_util_test.Tpo" -c -o link_util_test-link_util_test.o `test -f 'link_util_test.cc' || echo '$(srcdir)/'`link_util_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/link_util_test-link_util_test.Tpo" "$(DEPDIR)/link_util_test-link_util_test.Po"; else rm -f "$(DEPDIR)/link_util_test-link_util_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(link_util_test_CXXFLAGS) $(CXXFLAGS) -MT link_util_test-link_util_test.o -MD -MP -MF $(DEPDIR)/link_util_test-link_util_test.Tpo -c -o link_util_test-link_util_test.o `test -f 'link_util_test.cc' || echo '$(srcdir)/'`link_util_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(link_util_test_CXXFLAGS) $(CXXFLAGS) -MT link_util_test-link_util_test.o -MD -MP -MF $(DEPDIR)/link_util_test-link_util_test.Tpo -c -o link_util_test-link_util_test.o `test -f 'link_util_test.cc' || echo '$(srcdir)/'`link_util_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/link_util_test-link_util_test.Tpo $(DEPDIR)/link_util_test-link_util_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/link_util_test-link_util_test.Tpo $(DEPDIR)/link_util_test-link_util_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='link_util_test.cc' object='link_util_test-link_util_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(link_util_test_CXXFLAGS) $(CXXFLAGS) -c -o link_util_test-link_util_test.o `test -f 'link_util_test.cc' || echo '$(srcdir)/'`link_util_test.cc
  
  link_util_test-link_util_test.obj: link_util_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(link_util_test_CXXFLAGS) $(CXXFLAGS) -MT link_util_test-link_util_test.obj -MD -MP -MF "$(DEPDIR)/link_util_test-link_util_test.Tpo" -c -o link_util_test-link_util_test.obj `if test -f 'link_util_test.cc'; then $(CYGPATH_W) 'link_util_test.cc'; else $(CYGPATH_W) '$(srcdir)/link_util_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/link_util_test-link_util_test.Tpo" "$(DEPDIR)/link_util_test-link_util_test.Po"; else rm -f "$(DEPDIR)/link_util_test-link_util_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(link_util_test_CXXFLAGS) $(CXXFLAGS) -MT link_util_test-link_util_test.obj -MD -MP -MF $(DEPDIR)/link_util_test-link_util_test.Tpo -c -o link_util_test-link_util_test.obj `if test -f 'link_util_test.cc'; then $(CYGPATH_W) 'link_util_test.cc'; else $(CYGPATH_W) '$(srcdir)/link_util_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(link_util_test_CXXFLAGS) $(CXXFLAGS) -MT link_util_test-link_util_test.obj -MD -MP -MF $(DEPDIR)/link_util_test-link_util_test.Tpo -c -o link_util_test-link_util_test.obj `if test -f 'link_util_test.cc'; then $(CYGPATH_W) 'link_util_test.cc'; else $(CYGPATH_W) '$(srcdir)/link_util_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/link_util_test-link_util_test.Tpo $(DEPDIR)/link_util_test-link_util_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/link_util_test-link_util_test.Tpo $(DEPDIR)/link_util_test-link_util_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='link_util_test.cc' object='link_util_test-link_util_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(link_util_test_CXXFLAGS) $(CXXFLAGS) -c -o link_util_test-link_util_test.obj `if test -f 'link_util_test.cc'; then $(CYGPATH_W) 'link_util_test.cc'; else $(CYGPATH_W) '$(srcdir)/link_util_test.cc'; fi`
  
  location_util_test-location_util_test.o: location_util_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(location_util_test_CXXFLAGS) $(CXXFLAGS) -MT location_util_test-location_util_test.o -MD -MP -MF "$(DEPDIR)/location_util_test-location_util_test.Tpo" -c -o location_util_test-location_util_test.o `test -f 'location_util_test.cc' || echo '$(srcdir)/'`location_util_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/location_util_test-location_util_test.Tpo" "$(DEPDIR)/location_util_test-location_util_test.Po"; else rm -f "$(DEPDIR)/location_util_test-location_util_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(location_util_test_CXXFLAGS) $(CXXFLAGS) -MT location_util_test-location_util_test.o -MD -MP -MF $(DEPDIR)/location_util_test-location_util_test.Tpo -c -o location_util_test-location_util_test.o `test -f 'location_util_test.cc' || echo '$(srcdir)/'`location_util_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(location_util_test_CXXFLAGS) $(CXXFLAGS) -MT location_util_test-location_util_test.o -MD -MP -MF $(DEPDIR)/location_util_test-location_util_test.Tpo -c -o location_util_test-location_util_test.o `test -f 'location_util_test.cc' || echo '$(srcdir)/'`location_util_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/location_util_test-location_util_test.Tpo $(DEPDIR)/location_util_test-location_util_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/location_util_test-location_util_test.Tpo $(DEPDIR)/location_util_test-location_util_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='location_util_test.cc' object='location_util_test-location_util_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(location_util_test_CXXFLAGS) $(CXXFLAGS) -c -o location_util_test-location_util_test.o `test -f 'location_util_test.cc' || echo '$(srcdir)/'`location_util_test.cc
  
  location_util_test-location_util_test.obj: location_util_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(location_util_test_CXXFLAGS) $(CXXFLAGS) -MT location_util_test-location_util_test.obj -MD -MP -MF "$(DEPDIR)/location_util_test-location_util_test.Tpo" -c -o location_util_test-location_util_test.obj `if test -f 'location_util_test.cc'; then $(CYGPATH_W) 'location_util_test.cc'; else $(CYGPATH_W) '$(srcdir)/location_util_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/location_util_test-location_util_test.Tpo" "$(DEPDIR)/location_util_test-location_util_test.Po"; else rm -f "$(DEPDIR)/location_util_test-location_util_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(location_util_test_CXXFLAGS) $(CXXFLAGS) -MT location_util_test-location_util_test.obj -MD -MP -MF $(DEPDIR)/location_util_test-location_util_test.Tpo -c -o location_util_test-location_util_test.obj `if test -f 'location_util_test.cc'; then $(CYGPATH_W) 'location_util_test.cc'; else $(CYGPATH_W) '$(srcdir)/location_util_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(location_util_test_CXXFLAGS) $(CXXFLAGS) -MT location_util_test-location_util_test.obj -MD -MP -MF $(DEPDIR)/location_util_test-location_util_test.Tpo -c -o location_util_test-location_util_test.obj `if test -f 'location_util_test.cc'; then $(CYGPATH_W) 'location_util_test.cc'; else $(CYGPATH_W) '$(srcdir)/location_util_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/location_util_test-location_util_test.Tpo $(DEPDIR)/location_util_test-location_util_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/location_util_test-location_util_test.Tpo $(DEPDIR)/location_util_test-location_util_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='location_util_test.cc' object='location_util_test-location_util_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(location_util_test_CXXFLAGS) $(CXXFLAGS) -c -o location_util_test-location_util_test.obj `if test -f 'location_util_test.cc'; then $(CYGPATH_W) 'location_util_test.cc'; else $(CYGPATH_W) '$(srcdir)/location_util_test.cc'; fi`
  
  merge_test-merge_test.o: merge_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(merge_test_CXXFLAGS) $(CXXFLAGS) -MT merge_test-merge_test.o -MD -MP -MF "$(DEPDIR)/merge_test-merge_test.Tpo" -c -o merge_test-merge_test.o `test -f 'merge_test.cc' || echo '$(srcdir)/'`merge_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/merge_test-merge_test.Tpo" "$(DEPDIR)/merge_test-merge_test.Po"; else rm -f "$(DEPDIR)/merge_test-merge_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(merge_test_CXXFLAGS) $(CXXFLAGS) -MT merge_test-merge_test.o -MD -MP -MF $(DEPDIR)/merge_test-merge_test.Tpo -c -o merge_test-merge_test.o `test -f 'merge_test.cc' || echo '$(srcdir)/'`merge_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(merge_test_CXXFLAGS) $(CXXFLAGS) -MT merge_test-merge_test.o -MD -MP -MF $(DEPDIR)/merge_test-merge_test.Tpo -c -o merge_test-merge_test.o `test -f 'merge_test.cc' || echo '$(srcdir)/'`merge_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/merge_test-merge_test.Tpo $(DEPDIR)/merge_test-merge_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/merge_test-merge_test.Tpo $(DEPDIR)/merge_test-merge_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='merge_test.cc' object='merge_test-merge_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(merge_test_CXXFLAGS) $(CXXFLAGS) -c -o merge_test-merge_test.o `test -f 'merge_test.cc' || echo '$(srcdir)/'`merge_test.cc
  
  merge_test-merge_test.obj: merge_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(merge_test_CXXFLAGS) $(CXXFLAGS) -MT merge_test-merge_test.obj -MD -MP -MF "$(DEPDIR)/merge_test-merge_test.Tpo" -c -o merge_test-merge_test.obj `if test -f 'merge_test.cc'; then $(CYGPATH_W) 'merge_test.cc'; else $(CYGPATH_W) '$(srcdir)/merge_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/merge_test-merge_test.Tpo" "$(DEPDIR)/merge_test-merge_test.Po"; else rm -f "$(DEPDIR)/merge_test-merge_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(merge_test_CXXFLAGS) $(CXXFLAGS) -MT merge_test-merge_test.obj -MD -MP -MF $(DEPDIR)/merge_test-merge_test.Tpo -c -o merge_test-merge_test.obj `if test -f 'merge_test.cc'; then $(CYGPATH_W) 'merge_test.cc'; else $(CYGPATH_W) '$(srcdir)/merge_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(merge_test_CXXFLAGS) $(CXXFLAGS) -MT merge_test-merge_test.obj -MD -MP -MF $(DEPDIR)/merge_test-merge_test.Tpo -c -o merge_test-merge_test.obj `if test -f 'merge_test.cc'; then $(CYGPATH_W) 'merge_test.cc'; else $(CYGPATH_W) '$(srcdir)/merge_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/merge_test-merge_test.Tpo $(DEPDIR)/merge_test-merge_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/merge_test-merge_test.Tpo $(DEPDIR)/merge_test-merge_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='merge_test.cc' object='merge_test-merge_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(merge_test_CXXFLAGS) $(CXXFLAGS) -c -o merge_test-merge_test.obj `if test -f 'merge_test.cc'; then $(CYGPATH_W) 'merge_test.cc'; else $(CYGPATH_W) '$(srcdir)/merge_test.cc'; fi`
  
  object_id_parser_observer_test-object_id_parser_observer_test.o: object_id_parser_observer_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(object_id_parser_observer_test_CXXFLAGS) $(CXXFLAGS) -MT object_id_parser_observer_test-object_id_parser_observer_test.o -MD -MP -MF "$(DEPDIR)/object_id_parser_observer_test-object_id_parser_observer_test.Tpo" -c -o object_id_parser_observer_test-object_id_parser_observer_test.o `test -f 'object_id_parser_observer_test.cc' || echo '$(srcdir)/'`object_id_parser_observer_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/object_id_parser_observer_test-object_id_parser_observer_test.Tpo" "$(DEPDIR)/object_id_parser_observer_test-object_id_parser_observer_test.Po"; else rm -f "$(DEPDIR)/object_id_parser_observer_test-object_id_parser_observer_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(object_id_parser_observer_test_CXXFLAGS) $(CXXFLAGS) -MT object_id_parser_observer_test-object_id_parser_observer_test.o -MD -MP -MF $(DEPDIR)/object_id_parser_observer_test-object_id_parser_observer_test.Tpo -c -o object_id_parser_observer_test-object_id_parser_observer_test.o `test -f 'object_id_parser_observer_test.cc' || echo '$(srcdir)/'`object_id_parser_observer_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(object_id_parser_observer_test_CXXFLAGS) $(CXXFLAGS) -MT object_id_parser_observer_test-object_id_parser_observer_test.o -MD -MP -MF $(DEPDIR)/object_id_parser_observer_test-object_id_parser_observer_test.Tpo -c -o object_id_parser_observer_test-object_id_parser_observer_test.o `test -f 'object_id_parser_observer_test.cc' || echo '$(srcdir)/'`object_id_parser_observer_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/object_id_parser_observer_test-object_id_parser_observer_test.Tpo $(DEPDIR)/object_id_parser_observer_test-object_id_parser_observer_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/object_id_parser_observer_test-object_id_parser_observer_test.Tpo $(DEPDIR)/object_id_parser_observer_test-object_id_parser_observer_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='object_id_parser_observer_test.cc' object='object_id_parser_observer_test-object_id_parser_observer_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(object_id_parser_observer_test_CXXFLAGS) $(CXXFLAGS) -c -o object_id_parser_observer_test-object_id_parser_observer_test.o `test -f 'object_id_parser_observer_test.cc' || echo '$(srcdir)/'`object_id_parser_observer_test.cc
  
  object_id_parser_observer_test-object_id_parser_observer_test.obj: object_id_parser_observer_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(object_id_parser_observer_test_CXXFLAGS) $(CXXFLAGS) -MT object_id_parser_observer_test-object_id_parser_observer_test.obj -MD -MP -MF "$(DEPDIR)/object_id_parser_observer_test-object_id_parser_observer_test.Tpo" -c -o object_id_parser_observer_test-object_id_parser_observer_test.obj `if test -f 'object_id_parser_observer_test.cc'; then $(CYGPATH_W) 'object_id_parser_observer_test.cc'; else $(CYGPATH_W) '$(srcdir)/object_id_parser_observer_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/object_id_parser_observer_test-object_id_parser_observer_test.Tpo" "$(DEPDIR)/object_id_parser_observer_test-object_id_parser_observer_test.Po"; else rm -f "$(DEPDIR)/object_id_parser_observer_test-object_id_parser_observer_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(object_id_parser_observer_test_CXXFLAGS) $(CXXFLAGS) -MT object_id_parser_observer_test-object_id_parser_observer_test.obj -MD -MP -MF $(DEPDIR)/object_id_parser_observer_test-object_id_parser_observer_test.Tpo -c -o object_id_parser_observer_test-object_id_parser_observer_test.obj `if test -f 'object_id_parser_observer_test.cc'; then $(CYGPATH_W) 'object_id_parser_observer_test.cc'; else $(CYGPATH_W) '$(srcdir)/object_id_parser_observer_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(object_id_parser_observer_test_CXXFLAGS) $(CXXFLAGS) -MT object_id_parser_observer_test-object_id_parser_observer_test.obj -MD -MP -MF $(DEPDIR)/object_id_parser_observer_test-object_id_parser_observer_test.Tpo -c -o object_id_parser_observer_test-object_id_parser_observer_test.obj `if test -f 'object_id_parser_observer_test.cc'; then $(CYGPATH_W) 'object_id_parser_observer_test.cc'; else $(CYGPATH_W) '$(srcdir)/object_id_parser_observer_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/object_id_parser_observer_test-object_id_parser_observer_test.Tpo $(DEPDIR)/object_id_parser_observer_test-object_id_parser_observer_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/object_id_parser_observer_test-object_id_parser_observer_test.Tpo $(DEPDIR)/object_id_parser_observer_test-object_id_parser_observer_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='object_id_parser_observer_test.cc' object='object_id_parser_observer_test-object_id_parser_observer_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(object_id_parser_observer_test_CXXFLAGS) $(CXXFLAGS) -c -o object_id_parser_observer_test-object_id_parser_observer_test.obj `if test -f 'object_id_parser_observer_test.cc'; then $(CYGPATH_W) 'object_id_parser_observer_test.cc'; else $(CYGPATH_W) '$(srcdir)/object_id_parser_observer_test.cc'; fi`
  
+ old_schema_parser_observer_test-old_schema_parser_observer_test.o: old_schema_parser_observer_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(old_schema_parser_observer_test_CXXFLAGS) $(CXXFLAGS) -MT old_schema_parser_observer_test-old_schema_parser_observer_test.o -MD -MP -MF $(DEPDIR)/old_schema_parser_observer_test-old_schema_parser_observer_test.Tpo -c -o old_schema_parser_observer_test-old_schema_parser_observer_test.o `test -f 'old_schema_parser_observer_test.cc' || echo '$(srcdir)/'`old_schema_parser_observer_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/old_schema_parser_observer_test-old_schema_parser_observer_test.Tpo $(DEPDIR)/old_schema_parser_observer_test-old_schema_parser_observer_test.Po
++ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/old_schema_parser_observer_test-old_schema_parser_observer_test.Tpo $(DEPDIR)/old_schema_parser_observer_test-old_schema_parser_observer_test.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='old_schema_parser_observer_test.cc' object='old_schema_parser_observer_test-old_schema_parser_observer_test.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(old_schema_parser_observer_test_CXXFLAGS) $(CXXFLAGS) -c -o old_schema_parser_observer_test-old_schema_parser_observer_test.o `test -f 'old_schema_parser_observer_test.cc' || echo '$(srcdir)/'`old_schema_parser_observer_test.cc
+ 
+ old_schema_parser_observer_test-old_schema_parser_observer_test.obj: old_schema_parser_observer_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(old_schema_parser_observer_test_CXXFLAGS) $(CXXFLAGS) -MT old_schema_parser_observer_test-old_schema_parser_observer_test.obj -MD -MP -MF $(DEPDIR)/old_schema_parser_observer_test-old_schema_parser_observer_test.Tpo -c -o old_schema_parser_observer_test-old_schema_parser_observer_test.obj `if test -f 'old_schema_parser_observer_test.cc'; then $(CYGPATH_W) 'old_schema_parser_observer_test.cc'; else $(CYGPATH_W) '$(srcdir)/old_schema_parser_observer_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/old_schema_parser_observer_test-old_schema_parser_observer_test.Tpo $(DEPDIR)/old_schema_parser_observer_test-old_schema_parser_observer_test.Po
++ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/old_schema_parser_observer_test-old_schema_parser_observer_test.Tpo $(DEPDIR)/old_schema_parser_observer_test-old_schema_parser_observer_test.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='old_schema_parser_observer_test.cc' object='old_schema_parser_observer_test-old_schema_parser_observer_test.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(old_schema_parser_observer_test_CXXFLAGS) $(CXXFLAGS) -c -o old_schema_parser_observer_test-old_schema_parser_observer_test.obj `if test -f 'old_schema_parser_observer_test.cc'; then $(CYGPATH_W) 'old_schema_parser_observer_test.cc'; else $(CYGPATH_W) '$(srcdir)/old_schema_parser_observer_test.cc'; fi`
+ 
  parse_old_schema_test-parse_old_schema_test.o: parse_old_schema_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(parse_old_schema_test_CXXFLAGS) $(CXXFLAGS) -MT parse_old_schema_test-parse_old_schema_test.o -MD -MP -MF "$(DEPDIR)/parse_old_schema_test-parse_old_schema_test.Tpo" -c -o parse_old_schema_test-parse_old_schema_test.o `test -f 'parse_old_schema_test.cc' || echo '$(srcdir)/'`parse_old_schema_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/parse_old_schema_test-parse_old_schema_test.Tpo" "$(DEPDIR)/parse_old_schema_test-parse_old_schema_test.Po"; else rm -f "$(DEPDIR)/parse_old_schema_test-parse_old_schema_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(parse_old_schema_test_CXXFLAGS) $(CXXFLAGS) -MT parse_old_schema_test-parse_old_schema_test.o -MD -MP -MF $(DEPDIR)/parse_old_schema_test-parse_old_schema_test.Tpo -c -o parse_old_schema_test-parse_old_schema_test.o `test -f 'parse_old_schema_test.cc' || echo '$(srcdir)/'`parse_old_schema_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(parse_old_schema_test_CXXFLAGS) $(CXXFLAGS) -MT parse_old_schema_test-parse_old_schema_test.o -MD -MP -MF $(DEPDIR)/parse_old_schema_test-parse_old_schema_test.Tpo -c -o parse_old_schema_test-parse_old_schema_test.o `test -f 'parse_old_schema_test.cc' || echo '$(srcdir)/'`parse_old_schema_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/parse_old_schema_test-parse_old_schema_test.Tpo $(DEPDIR)/parse_old_schema_test-parse_old_schema_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/parse_old_schema_test-parse_old_schema_test.Tpo $(DEPDIR)/parse_old_schema_test-parse_old_schema_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='parse_old_schema_test.cc' object='parse_old_schema_test-parse_old_schema_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(parse_old_schema_test_CXXFLAGS) $(CXXFLAGS) -c -o parse_old_schema_test-parse_old_schema_test.o `test -f 'parse_old_schema_test.cc' || echo '$(srcdir)/'`parse_old_schema_test.cc
  
  parse_old_schema_test-parse_old_schema_test.obj: parse_old_schema_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(parse_old_schema_test_CXXFLAGS) $(CXXFLAGS) -MT parse_old_schema_test-parse_old_schema_test.obj -MD -MP -MF "$(DEPDIR)/parse_old_schema_test-parse_old_schema_test.Tpo" -c -o parse_old_schema_test-parse_old_schema_test.obj `if test -f 'parse_old_schema_test.cc'; then $(CYGPATH_W) 'parse_old_schema_test.cc'; else $(CYGPATH_W) '$(srcdir)/parse_old_schema_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/parse_old_schema_test-parse_old_schema_test.Tpo" "$(DEPDIR)/parse_old_schema_test-parse_old_schema_test.Po"; else rm -f "$(DEPDIR)/parse_old_schema_test-parse_old_schema_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(parse_old_schema_test_CXXFLAGS) $(CXXFLAGS) -MT parse_old_schema_test-parse_old_schema_test.obj -MD -MP -MF $(DEPDIR)/parse_old_schema_test-parse_old_schema_test.Tpo -c -o parse_old_schema_test-parse_old_schema_test.obj `if test -f 'parse_old_schema_test.cc'; then $(CYGPATH_W) 'parse_old_schema_test.cc'; else $(CYGPATH_W) '$(srcdir)/parse_old_schema_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(parse_old_schema_test_CXXFLAGS) $(CXXFLAGS) -MT parse_old_schema_test-parse_old_schema_test.obj -MD -MP -MF $(DEPDIR)/parse_old_schema_test-parse_old_schema_test.Tpo -c -o parse_old_schema_test-parse_old_schema_test.obj `if test -f 'parse_old_schema_test.cc'; then $(CYGPATH_W) 'parse_old_schema_test.cc'; else $(CYGPATH_W) '$(srcdir)/parse_old_schema_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/parse_old_schema_test-parse_old_schema_test.Tpo $(DEPDIR)/parse_old_schema_test-parse_old_schema_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/parse_old_schema_test-parse_old_schema_test.Tpo $(DEPDIR)/parse_old_schema_test-parse_old_schema_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='parse_old_schema_test.cc' object='parse_old_schema_test-parse_old_schema_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(parse_old_schema_test_CXXFLAGS) $(CXXFLAGS) -c -o parse_old_schema_test-parse_old_schema_test.obj `if test -f 'parse_old_schema_test.cc'; then $(CYGPATH_W) 'parse_old_schema_test.cc'; else $(CYGPATH_W) '$(srcdir)/parse_old_schema_test.cc'; fi`
  
  schema_parser_observer_test-schema_parser_observer_test.o: schema_parser_observer_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(schema_parser_observer_test_CXXFLAGS) $(CXXFLAGS) -MT schema_parser_observer_test-schema_parser_observer_test.o -MD -MP -MF "$(DEPDIR)/schema_parser_observer_test-schema_parser_observer_test.Tpo" -c -o schema_parser_observer_test-schema_parser_observer_test.o `test -f 'schema_parser_observer_test.cc' || echo '$(srcdir)/'`schema_parser_observer_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/schema_parser_observer_test-schema_parser_observer_test.Tpo" "$(DEPDIR)/schema_parser_observer_test-schema_parser_observer_test.Po"; else rm -f "$(DEPDIR)/schema_parser_observer_test-schema_parser_observer_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(schema_parser_observer_test_CXXFLAGS) $(CXXFLAGS) -MT schema_parser_observer_test-schema_parser_observer_test.o -MD -MP -MF $(DEPDIR)/schema_parser_observer_test-schema_parser_observer_test.Tpo -c -o schema_parser_observer_test-schema_parser_observer_test.o `test -f 'schema_parser_observer_test.cc' || echo '$(srcdir)/'`schema_parser_observer_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(schema_parser_observer_test_CXXFLAGS) $(CXXFLAGS) -MT schema_parser_observer_test-schema_parser_observer_test.o -MD -MP -MF $(DEPDIR)/schema_parser_observer_test-schema_parser_observer_test.Tpo -c -o schema_parser_observer_test-schema_parser_observer_test.o `test -f 'schema_parser_observer_test.cc' || echo '$(srcdir)/'`schema_parser_observer_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/schema_parser_observer_test-schema_parser_observer_test.Tpo $(DEPDIR)/schema_parser_observer_test-schema_parser_observer_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/schema_parser_observer_test-schema_parser_observer_test.Tpo $(DEPDIR)/schema_parser_observer_test-schema_parser_observer_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='schema_parser_observer_test.cc' object='schema_parser_observer_test-schema_parser_observer_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(schema_parser_observer_test_CXXFLAGS) $(CXXFLAGS) -c -o schema_parser_observer_test-schema_parser_observer_test.o `test -f 'schema_parser_observer_test.cc' || echo '$(srcdir)/'`schema_parser_observer_test.cc
  
  schema_parser_observer_test-schema_parser_observer_test.obj: schema_parser_observer_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(schema_parser_observer_test_CXXFLAGS) $(CXXFLAGS) -MT schema_parser_observer_test-schema_parser_observer_test.obj -MD -MP -MF "$(DEPDIR)/schema_parser_observer_test-schema_parser_observer_test.Tpo" -c -o schema_parser_observer_test-schema_parser_observer_test.obj `if test -f 'schema_parser_observer_test.cc'; then $(CYGPATH_W) 'schema_parser_observer_test.cc'; else $(CYGPATH_W) '$(srcdir)/schema_parser_observer_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/schema_parser_observer_test-schema_parser_observer_test.Tpo" "$(DEPDIR)/schema_parser_observer_test-schema_parser_observer_test.Po"; else rm -f "$(DEPDIR)/schema_parser_observer_test-schema_parser_observer_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(schema_parser_observer_test_CXXFLAGS) $(CXXFLAGS) -MT schema_parser_observer_test-schema_parser_observer_test.obj -MD -MP -MF $(DEPDIR)/schema_parser_observer_test-schema_parser_observer_test.Tpo -c -o schema_parser_observer_test-schema_parser_observer_test.obj `if test -f 'schema_parser_observer_test.cc'; then $(CYGPATH_W) 'schema_parser_observer_test.cc'; else $(CYGPATH_W) '$(srcdir)/schema_parser_observer_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(schema_parser_observer_test_CXXFLAGS) $(CXXFLAGS) -MT schema_parser_observer_test-schema_parser_observer_test.obj -MD -MP -MF $(DEPDIR)/schema_parser_observer_test-schema_parser_observer_test.Tpo -c -o schema_parser_observer_test-schema_parser_observer_test.obj `if test -f 'schema_parser_observer_test.cc'; then $(CYGPATH_W) 'schema_parser_observer_test.cc'; else $(CYGPATH_W) '$(srcdir)/schema_parser_observer_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/schema_parser_observer_test-schema_parser_observer_test.Tpo $(DEPDIR)/schema_parser_observer_test-schema_parser_observer_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/schema_parser_observer_test-schema_parser_observer_test.Tpo $(DEPDIR)/schema_parser_observer_test-schema_parser_observer_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='schema_parser_observer_test.cc' object='schema_parser_observer_test-schema_parser_observer_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(schema_parser_observer_test_CXXFLAGS) $(CXXFLAGS) -c -o schema_parser_observer_test-schema_parser_observer_test.obj `if test -f 'schema_parser_observer_test.cc'; then $(CYGPATH_W) 'schema_parser_observer_test.cc'; else $(CYGPATH_W) '$(srcdir)/schema_parser_observer_test.cc'; fi`
  
  shared_style_parser_observer_test-shared_style_parser_observer_test.o: shared_style_parser_observer_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shared_style_parser_observer_test_CXXFLAGS) $(CXXFLAGS) -MT shared_style_parser_observer_test-shared_style_parser_observer_test.o -MD -MP -MF "$(DEPDIR)/shared_style_parser_observer_test-shared_style_parser_observer_test.Tpo" -c -o shared_style_parser_observer_test-shared_style_parser_observer_test.o `test -f 'shared_style_parser_observer_test.cc' || echo '$(srcdir)/'`shared_style_parser_observer_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/shared_style_parser_observer_test-shared_style_parser_observer_test.Tpo" "$(DEPDIR)/shared_style_parser_observer_test-shared_style_parser_observer_test.Po"; else rm -f "$(DEPDIR)/shared_style_parser_observer_test-shared_style_parser_observer_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shared_style_parser_observer_test_CXXFLAGS) $(CXXFLAGS) -MT shared_style_parser_observer_test-shared_style_parser_observer_test.o -MD -MP -MF $(DEPDIR)/shared_style_parser_observer_test-shared_style_parser_observer_test.Tpo -c -o shared_style_parser_observer_test-shared_style_parser_observer_test.o `test -f 'shared_style_parser_observer_test.cc' || echo '$(srcdir)/'`shared_style_parser_observer_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shared_style_parser_observer_test_CXXFLAGS) $(CXXFLAGS) -MT shared_style_parser_observer_test-shared_style_parser_observer_test.o -MD -MP -MF $(DEPDIR)/shared_style_parser_observer_test-shared_style_parser_observer_test.Tpo -c -o shared_style_parser_observer_test-shared_style_parser_observer_test.o `test -f 'shared_style_parser_observer_test.cc' || echo '$(srcdir)/'`shared_style_parser_observer_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/shared_style_parser_observer_test-shared_style_parser_observer_test.Tpo $(DEPDIR)/shared_style_parser_observer_test-shared_style_parser_observer_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/shared_style_parser_observer_test-shared_style_parser_observer_test.Tpo $(DEPDIR)/shared_style_parser_observer_test-shared_style_parser_observer_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='shared_style_parser_observer_test.cc' object='shared_style_parser_observer_test-shared_style_parser_observer_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shared_style_parser_observer_test_CXXFLAGS) $(CXXFLAGS) -c -o shared_style_parser_observer_test-shared_style_parser_observer_test.o `test -f 'shared_style_parser_observer_test.cc' || echo '$(srcdir)/'`shared_style_parser_observer_test.cc
  
  shared_style_parser_observer_test-shared_style_parser_observer_test.obj: shared_style_parser_observer_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shared_style_parser_observer_test_CXXFLAGS) $(CXXFLAGS) -MT shared_style_parser_observer_test-shared_style_parser_observer_test.obj -MD -MP -MF "$(DEPDIR)/shared_style_parser_observer_test-shared_style_parser_observer_test.Tpo" -c -o shared_style_parser_observer_test-shared_style_parser_observer_test.obj `if test -f 'shared_style_parser_observer_test.cc'; then $(CYGPATH_W) 'shared_style_parser_observer_test.cc'; else $(CYGPATH_W) '$(srcdir)/shared_style_parser_observer_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/shared_style_parser_observer_test-shared_style_parser_observer_test.Tpo" "$(DEPDIR)/shared_style_parser_observer_test-shared_style_parser_observer_test.Po"; else rm -f "$(DEPDIR)/shared_style_parser_observer_test-shared_style_parser_observer_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shared_style_parser_observer_test_CXXFLAGS) $(CXXFLAGS) -MT shared_style_parser_observer_test-shared_style_parser_observer_test.obj -MD -MP -MF $(DEPDIR)/shared_style_parser_observer_test-shared_style_parser_observer_test.Tpo -c -o shared_style_parser_observer_test-shared_style_parser_observer_test.obj `if test -f 'shared_style_parser_observer_test.cc'; then $(CYGPATH_W) 'shared_style_parser_observer_test.cc'; else $(CYGPATH_W) '$(srcdir)/shared_style_parser_observer_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shared_style_parser_observer_test_CXXFLAGS) $(CXXFLAGS) -MT shared_style_parser_observer_test-shared_style_parser_observer_test.obj -MD -MP -MF $(DEPDIR)/shared_style_parser_observer_test-shared_style_parser_observer_test.Tpo -c -o shared_style_parser_observer_test-shared_style_parser_observer_test.obj `if test -f 'shared_style_parser_observer_test.cc'; then $(CYGPATH_W) 'shared_style_parser_observer_test.cc'; else $(CYGPATH_W) '$(srcdir)/shared_style_parser_observer_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/shared_style_parser_observer_test-shared_style_parser_observer_test.Tpo $(DEPDIR)/shared_style_parser_observer_test-shared_style_parser_observer_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/shared_style_parser_observer_test-shared_style_parser_observer_test.Tpo $(DEPDIR)/shared_style_parser_observer_test-shared_style_parser_observer_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='shared_style_parser_observer_test.cc' object='shared_style_parser_observer_test-shared_style_parser_observer_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(shared_style_parser_observer_test_CXXFLAGS) $(CXXFLAGS) -c -o shared_style_parser_observer_test-shared_style_parser_observer_test.obj `if test -f 'shared_style_parser_observer_test.cc'; then $(CYGPATH_W) 'shared_style_parser_observer_test.cc'; else $(CYGPATH_W) '$(srcdir)/shared_style_parser_observer_test.cc'; fi`
  
  style_inliner_test-style_inliner_test.o: style_inliner_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(style_inliner_test_CXXFLAGS) $(CXXFLAGS) -MT style_inliner_test-style_inliner_test.o -MD -MP -MF "$(DEPDIR)/style_inliner_test-style_inliner_test.Tpo" -c -o style_inliner_test-style_inliner_test.o `test -f 'style_inliner_test.cc' || echo '$(srcdir)/'`style_inliner_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/style_inliner_test-style_inliner_test.Tpo" "$(DEPDIR)/style_inliner_test-style_inliner_test.Po"; else rm -f "$(DEPDIR)/style_inliner_test-style_inliner_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(style_inliner_test_CXXFLAGS) $(CXXFLAGS) -MT style_inliner_test-style_inliner_test.o -MD -MP -MF $(DEPDIR)/style_inliner_test-style_inliner_test.Tpo -c -o style_inliner_test-style_inliner_test.o `test -f 'style_inliner_test.cc' || echo '$(srcdir)/'`style_inliner_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(style_inliner_test_CXXFLAGS) $(CXXFLAGS) -MT style_inliner_test-style_inliner_test.o -MD -MP -MF $(DEPDIR)/style_inliner_test-style_inliner_test.Tpo -c -o style_inliner_test-style_inliner_test.o `test -f 'style_inliner_test.cc' || echo '$(srcdir)/'`style_inliner_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/style_inliner_test-style_inliner_test.Tpo $(DEPDIR)/style_inliner_test-style_inliner_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/style_inliner_test-style_inliner_test.Tpo $(DEPDIR)/style_inliner_test-style_inliner_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='style_inliner_test.cc' object='style_inliner_test-style_inliner_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(style_inliner_test_CXXFLAGS) $(CXXFLAGS) -c -o style_inliner_test-style_inliner_test.o `test -f 'style_inliner_test.cc' || echo '$(srcdir)/'`style_inliner_test.cc
  
  style_inliner_test-style_inliner_test.obj: style_inliner_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(style_inliner_test_CXXFLAGS) $(CXXFLAGS) -MT style_inliner_test-style_inliner_test.obj -MD -MP -MF "$(DEPDIR)/style_inliner_test-style_inliner_test.Tpo" -c -o style_inliner_test-style_inliner_test.obj `if test -f 'style_inliner_test.cc'; then $(CYGPATH_W) 'style_inliner_test.cc'; else $(CYGPATH_W) '$(srcdir)/style_inliner_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/style_inliner_test-style_inliner_test.Tpo" "$(DEPDIR)/style_inliner_test-style_inliner_test.Po"; else rm -f "$(DEPDIR)/style_inliner_test-style_inliner_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(style_inliner_test_CXXFLAGS) $(CXXFLAGS) -MT style_inliner_test-style_inliner_test.obj -MD -MP -MF $(DEPDIR)/style_inliner_test-style_inliner_test.Tpo -c -o style_inliner_test-style_inliner_test.obj `if test -f 'style_inliner_test.cc'; then $(CYGPATH_W) 'style_inliner_test.cc'; else $(CYGPATH_W) '$(srcdir)/style_inliner_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(style_inliner_test_CXXFLAGS) $(CXXFLAGS) -MT style_inliner_test-style_inliner_test.obj -MD -MP -MF $(DEPDIR)/style_inliner_test-style_inliner_test.Tpo -c -o style_inliner_test-style_inliner_test.obj `if test -f 'style_inliner_test.cc'; then $(CYGPATH_W) 'style_inliner_test.cc'; else $(CYGPATH_W) '$(srcdir)/style_inliner_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/style_inliner_test-style_inliner_test.Tpo $(DEPDIR)/style_inliner_test-style_inliner_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/style_inliner_test-style_inliner_test.Tpo $(DEPDIR)/style_inliner_test-style_inliner_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='style_inliner_test.cc' object='style_inliner_test-style_inliner_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(style_inliner_test_CXXFLAGS) $(CXXFLAGS) -c -o style_inliner_test-style_inliner_test.obj `if test -f 'style_inliner_test.cc'; then $(CYGPATH_W) 'style_inliner_test.cc'; else $(CYGPATH_W) '$(srcdir)/style_inliner_test.cc'; fi`
  
  style_merger_test-style_merger_test.o: style_merger_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(style_merger_test_CXXFLAGS) $(CXXFLAGS) -MT style_merger_test-style_merger_test.o -MD -MP -MF "$(DEPDIR)/style_merger_test-style_merger_test.Tpo" -c -o style_merger_test-style_merger_test.o `test -f 'style_merger_test.cc' || echo '$(srcdir)/'`style_merger_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/style_merger_test-style_merger_test.Tpo" "$(DEPDIR)/style_merger_test-style_merger_test.Po"; else rm -f "$(DEPDIR)/style_merger_test-style_merger_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(style_merger_test_CXXFLAGS) $(CXXFLAGS) -MT style_merger_test-style_merger_test.o -MD -MP -MF $(DEPDIR)/style_merger_test-style_merger_test.Tpo -c -o style_merger_test-style_merger_test.o `test -f 'style_merger_test.cc' || echo '$(srcdir)/'`style_merger_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(style_merger_test_CXXFLAGS) $(CXXFLAGS) -MT style_merger_test-style_merger_test.o -MD -MP -MF $(DEPDIR)/style_merger_test-style_merger_test.Tpo -c -o style_merger_test-style_merger_test.o `test -f 'style_merger_test.cc' || echo '$(srcdir)/'`style_merger_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/style_merger_test-style_merger_test.Tpo $(DEPDIR)/style_merger_test-style_merger_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/style_merger_test-style_merger_test.Tpo $(DEPDIR)/style_merger_test-style_merger_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='style_merger_test.cc' object='style_merger_test-style_merger_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(style_merger_test_CXXFLAGS) $(CXXFLAGS) -c -o style_merger_test-style_merger_test.o `test -f 'style_merger_test.cc' || echo '$(srcdir)/'`style_merger_test.cc
  
  style_merger_test-style_merger_test.obj: style_merger_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(style_merger_test_CXXFLAGS) $(CXXFLAGS) -MT style_merger_test-style_merger_test.obj -MD -MP -MF "$(DEPDIR)/style_merger_test-style_merger_test.Tpo" -c -o style_merger_test-style_merger_test.obj `if test -f 'style_merger_test.cc'; then $(CYGPATH_W) 'style_merger_test.cc'; else $(CYGPATH_W) '$(srcdir)/style_merger_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/style_merger_test-style_merger_test.Tpo" "$(DEPDIR)/style_merger_test-style_merger_test.Po"; else rm -f "$(DEPDIR)/style_merger_test-style_merger_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(style_merger_test_CXXFLAGS) $(CXXFLAGS) -MT style_merger_test-style_merger_test.obj -MD -MP -MF $(DEPDIR)/style_merger_test-style_merger_test.Tpo -c -o style_merger_test-style_merger_test.obj `if test -f 'style_merger_test.cc'; then $(CYGPATH_W) 'style_merger_test.cc'; else $(CYGPATH_W) '$(srcdir)/style_merger_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(style_merger_test_CXXFLAGS) $(CXXFLAGS) -MT style_merger_test-style_merger_test.obj -MD -MP -MF $(DEPDIR)/style_merger_test-style_merger_test.Tpo -c -o style_merger_test-style_merger_test.obj `if test -f 'style_merger_test.cc'; then $(CYGPATH_W) 'style_merger_test.cc'; else $(CYGPATH_W) '$(srcdir)/style_merger_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/style_merger_test-style_merger_test.Tpo $(DEPDIR)/style_merger_test-style_merger_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/style_merger_test-style_merger_test.Tpo $(DEPDIR)/style_merger_test-style_merger_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='style_merger_test.cc' object='style_merger_test-style_merger_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(style_merger_test_CXXFLAGS) $(CXXFLAGS) -c -o style_merger_test-style_merger_test.obj `if test -f 'style_merger_test.cc'; then $(CYGPATH_W) 'style_merger_test.cc'; else $(CYGPATH_W) '$(srcdir)/style_merger_test.cc'; fi`
  
  style_resolver_test-style_resolver_test.o: style_resolver_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(style_resolver_test_CXXFLAGS) $(CXXFLAGS) -MT style_resolver_test-style_resolver_test.o -MD -MP -MF "$(DEPDIR)/style_resolver_test-style_resolver_test.Tpo" -c -o style_resolver_test-style_resolver_test.o `test -f 'style_resolver_test.cc' || echo '$(srcdir)/'`style_resolver_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/style_resolver_test-style_resolver_test.Tpo" "$(DEPDIR)/style_resolver_test-style_resolver_test.Po"; else rm -f "$(DEPDIR)/style_resolver_test-style_resolver_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(style_resolver_test_CXXFLAGS) $(CXXFLAGS) -MT style_resolver_test-style_resolver_test.o -MD -MP -MF $(DEPDIR)/style_resolver_test-style_resolver_test.Tpo -c -o style_resolver_test-style_resolver_test.o `test -f 'style_resolver_test.cc' || echo '$(srcdir)/'`style_resolver_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(style_resolver_test_CXXFLAGS) $(CXXFLAGS) -MT style_resolver_test-style_resolver_test.o -MD -MP -MF $(DEPDIR)/style_resolver_test-style_resolver_test.Tpo -c -o style_resolver_test-style_resolver_test.o `test -f 'style_resolver_test.cc' || echo '$(srcdir)/'`style_resolver_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/style_resolver_test-style_resolver_test.Tpo $(DEPDIR)/style_resolver_test-style_resolver_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/style_resolver_test-style_resolver_test.Tpo $(DEPDIR)/style_resolver_test-style_resolver_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='style_resolver_test.cc' object='style_resolver_test-style_resolver_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(style_resolver_test_CXXFLAGS) $(CXXFLAGS) -c -o style_resolver_test-style_resolver_test.o `test -f 'style_resolver_test.cc' || echo '$(srcdir)/'`style_resolver_test.cc
  
  style_resolver_test-style_resolver_test.obj: style_resolver_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(style_resolver_test_CXXFLAGS) $(CXXFLAGS) -MT style_resolver_test-style_resolver_test.obj -MD -MP -MF "$(DEPDIR)/style_resolver_test-style_resolver_test.Tpo" -c -o style_resolver_test-style_resolver_test.obj `if test -f 'style_resolver_test.cc'; then $(CYGPATH_W) 'style_resolver_test.cc'; else $(CYGPATH_W) '$(srcdir)/style_resolver_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/style_resolver_test-style_resolver_test.Tpo" "$(DEPDIR)/style_resolver_test-style_resolver_test.Po"; else rm -f "$(DEPDIR)/style_resolver_test-style_resolver_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(style_resolver_test_CXXFLAGS) $(CXXFLAGS) -MT style_resolver_test-style_resolver_test.obj -MD -MP -MF $(DEPDIR)/style_resolver_test-style_resolver_test.Tpo -c -o style_resolver_test-style_resolver_test.obj `if test -f 'style_resolver_test.cc'; then $(CYGPATH_W) 'style_resolver_test.cc'; else $(CYGPATH_W) '$(srcdir)/style_resolver_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(style_resolver_test_CXXFLAGS) $(CXXFLAGS) -MT style_resolver_test-style_resolver_test.obj -MD -MP -MF $(DEPDIR)/style_resolver_test-style_resolver_test.Tpo -c -o style_resolver_test-style_resolver_test.obj `if test -f 'style_resolver_test.cc'; then $(CYGPATH_W) 'style_resolver_test.cc'; else $(CYGPATH_W) '$(srcdir)/style_resolver_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/style_resolver_test-style_resolver_test.Tpo $(DEPDIR)/style_resolver_test-style_resolver_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/style_resolver_test-style_resolver_test.Tpo $(DEPDIR)/style_resolver_test-style_resolver_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='style_resolver_test.cc' object='style_resolver_test-style_resolver_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(style_resolver_test_CXXFLAGS) $(CXXFLAGS) -c -o style_resolver_test-style_resolver_test.obj `if test -f 'style_resolver_test.cc'; then $(CYGPATH_W) 'style_resolver_test.cc'; else $(CYGPATH_W) '$(srcdir)/style_resolver_test.cc'; fi`
  
  style_splitter_test-style_splitter_test.o: style_splitter_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(style_splitter_test_CXXFLAGS) $(CXXFLAGS) -MT style_splitter_test-style_splitter_test.o -MD -MP -MF "$(DEPDIR)/style_splitter_test-style_splitter_test.Tpo" -c -o style_splitter_test-style_splitter_test.o `test -f 'style_splitter_test.cc' || echo '$(srcdir)/'`style_splitter_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/style_splitter_test-style_splitter_test.Tpo" "$(DEPDIR)/style_splitter_test-style_splitter_test.Po"; else rm -f "$(DEPDIR)/style_splitter_test-style_splitter_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(style_splitter_test_CXXFLAGS) $(CXXFLAGS) -MT style_splitter_test-style_splitter_test.o -MD -MP -MF $(DEPDIR)/style_splitter_test-style_splitter_test.Tpo -c -o style_splitter_test-style_splitter_test.o `test -f 'style_splitter_test.cc' || echo '$(srcdir)/'`style_splitter_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(style_splitter_test_CXXFLAGS) $(CXXFLAGS) -MT style_splitter_test-style_splitter_test.o -MD -MP -MF $(DEPDIR)/style_splitter_test-style_splitter_test.Tpo -c -o style_splitter_test-style_splitter_test.o `test -f 'style_splitter_test.cc' || echo '$(srcdir)/'`style_splitter_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/style_splitter_test-style_splitter_test.Tpo $(DEPDIR)/style_splitter_test-style_splitter_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/style_splitter_test-style_splitter_test.Tpo $(DEPDIR)/style_splitter_test-style_splitter_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='style_splitter_test.cc' object='style_splitter_test-style_splitter_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(style_splitter_test_CXXFLAGS) $(CXXFLAGS) -c -o style_splitter_test-style_splitter_test.o `test -f 'style_splitter_test.cc' || echo '$(srcdir)/'`style_splitter_test.cc
  
  style_splitter_test-style_splitter_test.obj: style_splitter_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(style_splitter_test_CXXFLAGS) $(CXXFLAGS) -MT style_splitter_test-style_splitter_test.obj -MD -MP -MF "$(DEPDIR)/style_splitter_test-style_splitter_test.Tpo" -c -o style_splitter_test-style_splitter_test.obj `if test -f 'style_splitter_test.cc'; then $(CYGPATH_W) 'style_splitter_test.cc'; else $(CYGPATH_W) '$(srcdir)/style_splitter_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/style_splitter_test-style_splitter_test.Tpo" "$(DEPDIR)/style_splitter_test-style_splitter_test.Po"; else rm -f "$(DEPDIR)/style_splitter_test-style_splitter_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(style_splitter_test_CXXFLAGS) $(CXXFLAGS) -MT style_splitter_test-style_splitter_test.obj -MD -MP -MF $(DEPDIR)/style_splitter_test-style_splitter_test.Tpo -c -o style_splitter_test-style_splitter_test.obj `if test -f 'style_splitter_test.cc'; then $(CYGPATH_W) 'style_splitter_test.cc'; else $(CYGPATH_W) '$(srcdir)/style_splitter_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(style_splitter_test_CXXFLAGS) $(CXXFLAGS) -MT style_splitter_test-style_splitter_test.obj -MD -MP -MF $(DEPDIR)/style_splitter_test-style_splitter_test.Tpo -c -o style_splitter_test-style_splitter_test.obj `if test -f 'style_splitter_test.cc'; then $(CYGPATH_W) 'style_splitter_test.cc'; else $(CYGPATH_W) '$(srcdir)/style_splitter_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/style_splitter_test-style_splitter_test.Tpo $(DEPDIR)/style_splitter_test-style_splitter_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/style_splitter_test-style_splitter_test.Tpo $(DEPDIR)/style_splitter_test-style_splitter_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='style_splitter_test.cc' object='style_splitter_test-style_splitter_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(style_splitter_test_CXXFLAGS) $(CXXFLAGS) -c -o style_splitter_test-style_splitter_test.obj `if test -f 'style_splitter_test.cc'; then $(CYGPATH_W) 'style_splitter_test.cc'; else $(CYGPATH_W) '$(srcdir)/style_splitter_test.cc'; fi`
  
  update_processor_test-update_processor_test.o: update_processor_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(update_processor_test_CXXFLAGS) $(CXXFLAGS) -MT update_processor_test-update_processor_test.o -MD -MP -MF "$(DEPDIR)/update_processor_test-update_processor_test.Tpo" -c -o update_processor_test-update_processor_test.o `test -f 'update_processor_test.cc' || echo '$(srcdir)/'`update_processor_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/update_processor_test-update_processor_test.Tpo" "$(DEPDIR)/update_processor_test-update_processor_test.Po"; else rm -f "$(DEPDIR)/update_processor_test-update_processor_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(update_processor_test_CXXFLAGS) $(CXXFLAGS) -MT update_processor_test-update_processor_test.o -MD -MP -MF $(DEPDIR)/update_processor_test-update_processor_test.Tpo -c -o update_processor_test-update_processor_test.o `test -f 'update_processor_test.cc' || echo '$(srcdir)/'`update_processor_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(update_processor_test_CXXFLAGS) $(CXXFLAGS) -MT update_processor_test-update_processor_test.o -MD -MP -MF $(DEPDIR)/update_processor_test-update_processor_test.Tpo -c -o update_processor_test-update_processor_test.o `test -f 'update_processor_test.cc' || echo '$(srcdir)/'`update_processor_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/update_processor_test-update_processor_test.Tpo $(DEPDIR)/update_processor_test-update_processor_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/update_processor_test-update_processor_test.Tpo $(DEPDIR)/update_processor_test-update_processor_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='update_processor_test.cc' object='update_processor_test-update_processor_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(update_processor_test_CXXFLAGS) $(CXXFLAGS) -c -o update_processor_test-update_processor_test.o `test -f 'update_processor_test.cc' || echo '$(srcdir)/'`update_processor_test.cc
  
  update_processor_test-update_processor_test.obj: update_processor_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(update_processor_test_CXXFLAGS) $(CXXFLAGS) -MT update_processor_test-update_processor_test.obj -MD -MP -MF "$(DEPDIR)/update_processor_test-update_processor_test.Tpo" -c -o update_processor_test-update_processor_test.obj `if test -f 'update_processor_test.cc'; then $(CYGPATH_W) 'update_processor_test.cc'; else $(CYGPATH_W) '$(srcdir)/update_processor_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/update_processor_test-update_processor_test.Tpo" "$(DEPDIR)/update_processor_test-update_processor_test.Po"; else rm -f "$(DEPDIR)/update_processor_test-update_processor_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(update_processor_test_CXXFLAGS) $(CXXFLAGS) -MT update_processor_test-update_processor_test.obj -MD -MP -MF $(DEPDIR)/update_processor_test-update_processor_test.Tpo -c -o update_processor_test-update_processor_test.obj `if test -f 'update_processor_test.cc'; then $(CYGPATH_W) 'update_processor_test.cc'; else $(CYGPATH_W) '$(srcdir)/update_processor_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(update_processor_test_CXXFLAGS) $(CXXFLAGS) -MT update_processor_test-update_processor_test.obj -MD -MP -MF $(DEPDIR)/update_processor_test-update_processor_test.Tpo -c -o update_processor_test-update_processor_test.obj `if test -f 'update_processor_test.cc'; then $(CYGPATH_W) 'update_processor_test.cc'; else $(CYGPATH_W) '$(srcdir)/update_processor_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/update_processor_test-update_processor_test.Tpo $(DEPDIR)/update_processor_test-update_processor_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/update_processor_test-update_processor_test.Tpo $(DEPDIR)/update_processor_test-update_processor_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='update_processor_test.cc' object='update_processor_test-update_processor_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(update_processor_test_CXXFLAGS) $(CXXFLAGS) -c -o update_processor_test-update_processor_test.obj `if test -f 'update_processor_test.cc'; then $(CYGPATH_W) 'update_processor_test.cc'; else $(CYGPATH_W) '$(srcdir)/update_processor_test.cc'; fi`
  
  update_test-update_test.o: update_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(update_test_CXXFLAGS) $(CXXFLAGS) -MT update_test-update_test.o -MD -MP -MF "$(DEPDIR)/update_test-update_test.Tpo" -c -o update_test-update_test.o `test -f 'update_test.cc' || echo '$(srcdir)/'`update_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/update_test-update_test.Tpo" "$(DEPDIR)/update_test-update_test.Po"; else rm -f "$(DEPDIR)/update_test-update_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(update_test_CXXFLAGS) $(CXXFLAGS) -MT update_test-update_test.o -MD -MP -MF $(DEPDIR)/update_test-update_test.Tpo -c -o update_test-update_test.o `test -f 'update_test.cc' || echo '$(srcdir)/'`update_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(update_test_CXXFLAGS) $(CXXFLAGS) -MT update_test-update_test.o -MD -MP -MF $(DEPDIR)/update_test-update_test.Tpo -c -o update_test-update_test.o `test -f 'update_test.cc' || echo '$(srcdir)/'`update_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/update_test-update_test.Tpo $(DEPDIR)/update_test-update_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/update_test-update_test.Tpo $(DEPDIR)/update_test-update_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='update_test.cc' object='update_test-update_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(update_test_CXXFLAGS) $(CXXFLAGS) -c -o update_test-update_test.o `test -f 'update_test.cc' || echo '$(srcdir)/'`update_test.cc
  
  update_test-update_test.obj: update_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(update_test_CXXFLAGS) $(CXXFLAGS) -MT update_test-update_test.obj -MD -MP -MF "$(DEPDIR)/update_test-update_test.Tpo" -c -o update_test-update_test.obj `if test -f 'update_test.cc'; then $(CYGPATH_W) 'update_test.cc'; else $(CYGPATH_W) '$(srcdir)/update_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/update_test-update_test.Tpo" "$(DEPDIR)/update_test-update_test.Po"; else rm -f "$(DEPDIR)/update_test-update_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(update_test_CXXFLAGS) $(CXXFLAGS) -MT update_test-update_test.obj -MD -MP -MF $(DEPDIR)/update_test-update_test.Tpo -c -o update_test-update_test.obj `if test -f 'update_test.cc'; then $(CYGPATH_W) 'update_test.cc'; else $(CYGPATH_W) '$(srcdir)/update_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(update_test_CXXFLAGS) $(CXXFLAGS) -MT update_test-update_test.obj -MD -MP -MF $(DEPDIR)/update_test-update_test.Tpo -c -o update_test-update_test.obj `if test -f 'update_test.cc'; then $(CYGPATH_W) 'update_test.cc'; else $(CYGPATH_W) '$(srcdir)/update_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/update_test-update_test.Tpo $(DEPDIR)/update_test-update_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/update_test-update_test.Tpo $(DEPDIR)/update_test-update_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='update_test.cc' object='update_test-update_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(update_test_CXXFLAGS) $(CXXFLAGS) -c -o update_test-update_test.obj `if test -f 'update_test.cc'; then $(CYGPATH_W) 'update_test.cc'; else $(CYGPATH_W) '$(srcdir)/update_test.cc'; fi`
-@@ -1502,72 +1636,75 @@
- 
- clean-libtool:
- 	-rm -rf .libs _libs
--
--distclean-libtool:
--	-rm -f libtool
--uninstall-info-am:
+@@ -1649,20 +1674,23 @@
  install-libkmlengineincludeHEADERS: $(libkmlengineinclude_HEADERS)
  	@$(NORMAL_INSTALL)
--	test -z "$(libkmlengineincludedir)" || $(mkdir_p) "$(DESTDIR)$(libkmlengineincludedir)"
+ 	test -z "$(libkmlengineincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libkmlengineincludedir)"
 -	@list='$(libkmlengineinclude_HEADERS)'; for p in $$list; do \
-+	test -z "$(libkmlengineincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libkmlengineincludedir)"
 +	@list='$(libkmlengineinclude_HEADERS)'; test -n "$(libkmlengineincludedir)" || list=; \
 +	for p in $$list; do \
  	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
@@ -81120,15 +21361,7 @@
  
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- 	unique=`for i in $$list; do \
- 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- 	  done | \
--	  $(AWK) '    { files[$$0] = 1; } \
--	       END { for (i in files) print i; }'`; \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
- 	mkid -fID $$unique
- tags: TAGS
+@@ -1676,7 +1704,7 @@
  
  TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
@@ -81137,13 +21370,11 @@
  	here=`pwd`; \
  	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
- 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+@@ -1684,29 +1712,34 @@
  	  done | \
--	  $(AWK) '    { files[$$0] = 1; } \
--	       END { for (i in files) print i; }'`; \
+ 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 -	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 +	shift; \
 +	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
  	  test -n "$$unique" || unique=$$empty_fix; \
@@ -81161,16 +21392,13 @@
  CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
 -	tags=; \
--	here=`pwd`; \
  	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  	  done | \
--	  $(AWK) '    { files[$$0] = 1; } \
--	       END { for (i in files) print i; }'`; \
+ 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 -	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 +	test -z "$(CTAGS_ARGS)$$unique" \
  	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 -	     $$tags $$unique
@@ -81185,22 +21413,16 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-@@ -1575,7 +1712,8 @@
- check-TESTS: $(TESTS)
+@@ -1715,6 +1748,7 @@
  	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
  	srcdir=$(srcdir); export srcdir; \
--	list='$(TESTS)'; \
-+	list=' $(TESTS) '; \
+ 	list=' $(TESTS) '; \
 +	$(am__tty_colors); \
  	if test -n "$$list"; then \
  	  for tst in $$list; do \
  	    if test -f ./$$tst; then dir=./; \
-@@ -1584,49 +1722,63 @@
- 	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *" $$tst "*) \
-+	      *[\ \	]$$tst[\ \	]*) \
+@@ -1726,10 +1760,10 @@
+ 	      *[\ \	]$$tst[\ \	]*) \
  		xpass=`expr $$xpass + 1`; \
  		failed=`expr $$failed + 1`; \
 -		echo "XPASS: $$tst"; \
@@ -81212,10 +21434,9 @@
  	      ;; \
  	      esac; \
  	    elif test $$? -ne 77; then \
- 	      all=`expr $$all + 1`; \
+@@ -1737,17 +1771,18 @@
  	      case " $(XFAIL_TESTS) " in \
--	      *" $$tst "*) \
-+	      *[\ \	]$$tst[\ \	]*) \
+ 	      *[\ \	]$$tst[\ \	]*) \
  		xfail=`expr $$xfail + 1`; \
 -		echo "XFAIL: $$tst"; \
 +		col=$$lgn; res=XFAIL; \
@@ -81233,45 +21454,9 @@
  	    fi; \
 +	    echo "$${col}$$res$${std}: $$tst"; \
  	  done; \
-+	  if test "$$all" -eq 1; then \
-+	    tests="test"; \
-+	    All=""; \
-+	  else \
-+	    tests="tests"; \
-+	    All="All "; \
-+	  fi; \
- 	  if test "$$failed" -eq 0; then \
- 	    if test "$$xfail" -eq 0; then \
--	      banner="All $$all tests passed"; \
-+	      banner="$$All$$all $$tests passed"; \
- 	    else \
--	      banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
-+	      if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
-+	      banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
- 	    fi; \
- 	  else \
- 	    if test "$$xpass" -eq 0; then \
--	      banner="$$failed of $$all tests failed"; \
-+	      banner="$$failed of $$all $$tests failed"; \
- 	    else \
--	      banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
-+	      if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
-+	      banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
- 	    fi; \
- 	  fi; \
- 	  dashes="$$banner"; \
- 	  skipped=""; \
- 	  if test "$$skip" -ne 0; then \
--	    skipped="($$skip tests were not run)"; \
-+	    if test "$$skip" -eq 1; then \
-+	      skipped="($$skip test was not run)"; \
-+	    else \
-+	      skipped="($$skip tests were not run)"; \
-+	    fi; \
- 	    test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
- 	      dashes="$$skipped"; \
- 	  fi; \
-@@ -1637,38 +1789,45 @@
+ 	  if test "$$all" -eq 1; then \
+ 	    tests="test"; \
+@@ -1789,11 +1824,15 @@
  	      dashes="$$report"; \
  	  fi; \
  	  dashes=`echo "$$dashes" | sed s/./=/g`; \
@@ -81289,36 +21474,10 @@
  	  test "$$failed" -eq 0; \
  	else :; fi
  
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
--	list='$(DISTFILES)'; for file in $$list; do \
--	  case $$file in \
--	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
--	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
--	  esac; \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
+@@ -1813,13 +1852,17 @@
  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
--	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
--	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
--	    dir="/$$dir"; \
--	    $(mkdir_p) "$(distdir)$$dir"; \
--	  else \
--	    dir=''; \
--	  fi; \
  	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 +	    if test -d "$(distdir)/$$file"; then \
 +	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 +	    fi; \
@@ -81337,16 +21496,7 @@
  	    || exit 1; \
  	  fi; \
  	done
-@@ -1679,7 +1838,7 @@
- all-am: Makefile $(LTLIBRARIES) $(HEADERS)
- installdirs:
- 	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libkmlengineincludedir)"; do \
--	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- 	done
- install: install-am
- install-exec: install-exec-am
-@@ -1702,6 +1861,7 @@
+@@ -1853,6 +1896,7 @@
  
  distclean-generic:
  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -81354,17 +21504,8 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -1715,7 +1875,7 @@
- 	-rm -rf ./$(DEPDIR)
- 	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
--	distclean-libtool distclean-tags
-+	distclean-tags
+@@ -1874,6 +1918,8 @@
  
- dvi: dvi-am
- 
-@@ -1723,18 +1883,38 @@
- 
  html: html-am
  
 +html-am:
@@ -81372,17 +21513,16 @@
  info: info-am
  
  info-am:
+@@ -1882,18 +1928,28 @@
  
- install-data-am: install-libkmlengineincludeHEADERS
+ install-dvi: install-dvi-am
  
-+install-dvi: install-dvi-am
-+
 +install-dvi-am:
 +
  install-exec-am: install-libLTLIBRARIES
  
-+install-html: install-html-am
-+
+ install-html: install-html-am
+ 
 +install-html-am:
 +
  install-info: install-info-am
@@ -81391,94 +21531,62 @@
 +
  install-man:
  
-+install-pdf: install-pdf-am
-+
+ install-pdf: install-pdf-am
+ 
 +install-pdf-am:
 +
-+install-ps: install-ps-am
-+
+ install-ps: install-ps-am
+ 
 +install-ps-am:
 +
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
-@@ -1755,22 +1935,27 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
-+uninstall-am: uninstall-libLTLIBRARIES \
+@@ -1917,7 +1973,7 @@
+ uninstall-am: uninstall-libLTLIBRARIES \
  	uninstall-libkmlengineincludeHEADERS
  
+-.MAKE: install-am install-strip
 +.MAKE: check-am install-am install-strip
-+
+ 
  .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
  	clean-checkPROGRAMS clean-generic clean-libLTLIBRARIES \
- 	clean-libtool ctags distclean distclean-compile \
- 	distclean-generic distclean-libtool distclean-tags distdir dvi \
- 	dvi-am html html-am info info-am install install-am \
--	install-data install-data-am install-exec install-exec-am \
-+	install-data install-data-am install-dvi install-dvi-am \
-+	install-exec install-exec-am install-html install-html-am \
- 	install-info install-info-am install-libLTLIBRARIES \
--	install-libkmlengineincludeHEADERS install-man install-strip \
-+	install-libkmlengineincludeHEADERS install-man install-pdf \
-+	install-pdf-am install-ps install-ps-am install-strip \
- 	installcheck installcheck-am installdirs maintainer-clean \
- 	maintainer-clean-generic mostlyclean mostlyclean-compile \
- 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
--	tags uninstall uninstall-am uninstall-info-am \
--	uninstall-libLTLIBRARIES uninstall-libkmlengineincludeHEADERS
-+	tags uninstall uninstall-am uninstall-libLTLIBRARIES \
-+	uninstall-libkmlengineincludeHEADERS
-+
+@@ -1935,6 +1991,7 @@
+ 	tags uninstall uninstall-am uninstall-libLTLIBRARIES \
+ 	uninstall-libkmlengineincludeHEADERS
  
++
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-Index: libkml-1.0.1/src/kml/Makefile.in
+ .NOEXPORT:
+Index: libkml-1.1.0/src/kml/Makefile.in
 ===================================================================
---- libkml-1.0.1.orig/src/kml/Makefile.in	2009-07-03 01:23:31.000000000 +0200
-+++ libkml-1.0.1/src/kml/Makefile.in	2009-12-10 10:19:45.000000000 +0100
+--- libkml-1.1.0.orig/src/kml/Makefile.in	2009-12-10 13:05:40.000000000 +0100
++++ libkml-1.1.0/src/kml/Makefile.in	2009-12-10 17:29:36.000000000 +0100
 @@ -1,8 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
+-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
-@@ -14,15 +15,12 @@
+@@ -16,8 +17,9 @@
  
- @SET_MAKE@
- 
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
  VPATH = @srcdir@
  pkgdatadir = $(datadir)/@PACKAGE@
 -pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../..
 +pkglibdir = $(libdir)/@PACKAGE@
 +pkglibexecdir = $(libexecdir)/@PACKAGE@
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -41,36 +39,82 @@
- 	$(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_curl.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)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
+@@ -45,6 +47,7 @@
  mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
@@ -81486,18 +21594,7 @@
  SOURCES =
  DIST_SOURCES =
  RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- 	html-recursive info-recursive install-data-recursive \
--	install-exec-recursive install-info-recursive \
--	install-recursive installcheck-recursive installdirs-recursive \
--	pdf-recursive ps-recursive uninstall-info-recursive \
--	uninstall-recursive
-+	install-dvi-recursive install-exec-recursive \
-+	install-html-recursive install-info-recursive \
-+	install-pdf-recursive install-ps-recursive install-recursive \
-+	installcheck-recursive installdirs-recursive pdf-recursive \
-+	ps-recursive uninstall-recursive
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
- am__vpath_adj = case $$p in \
+@@ -59,16 +62,58 @@
      $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
      *) f=$$p;; \
    esac;
@@ -81521,8 +21618,8 @@
  am__installdirs = "$(DESTDIR)$(domincludedir)"
 -domincludeHEADERS_INSTALL = $(INSTALL_HEADER)
  HEADERS = $(dominclude_HEADERS)
-+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-+  distclean-recursive maintainer-clean-recursive
+ RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+   distclean-recursive maintainer-clean-recursive
 +AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
 +	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
 +	distdir
@@ -81556,57 +21653,9 @@
 +  done; \
 +  reldir="$$dir2"
  ACLOCAL = @ACLOCAL@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
  AMTAR = @AMTAR@
  AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -92,18 +136,16 @@
- CYGPATH_W = @CYGPATH_W@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
--ECHO = @ECHO@
-+DSYMUTIL = @DSYMUTIL@
-+DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
--F77 = @F77@
--FFLAGS = @FFLAGS@
--GCC_FALSE = @GCC_FALSE@
--GCC_TRUE = @GCC_TRUE@
--HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
--HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
-+FGREP = @FGREP@
-+GREP = @GREP@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -113,19 +155,28 @@
- JAVAC = @JAVAC@
- JAVA_INCLUDE_DIR = @JAVA_INCLUDE_DIR@
- JAVA_LIB_DIR = @JAVA_LIB_DIR@
-+LD = @LD@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
-+LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
-+NM = @NM@
-+NMEDIT = @NMEDIT@
-+OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
-+OTOOL = @OTOOL@
-+OTOOL64 = @OTOOL64@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -131,6 +176,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -81614,84 +21663,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PLATFORM = @PLATFORM@
-@@ -142,22 +193,13 @@
- STRIP = @STRIP@
- SWIG = @SWIG@
- VERSION = @VERSION@
--WITH_JAVA_FALSE = @WITH_JAVA_FALSE@
--WITH_JAVA_TRUE = @WITH_JAVA_TRUE@
--WITH_PYTHON_FALSE = @WITH_PYTHON_FALSE@
--WITH_PYTHON_TRUE = @WITH_PYTHON_TRUE@
--WITH_SWIG_FALSE = @WITH_SWIG_FALSE@
--WITH_SWIG_TRUE = @WITH_SWIG_TRUE@
--ac_ct_AR = @ac_ct_AR@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
--ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -169,28 +211,41 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- 
- # base must be built before engine.
- SUBDIRS = . base convenience dom engine regionator xsd
-@@ -203,14 +258,14 @@
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
--	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
--		&& exit 0; \
-+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-+	        && { if test -f $@; then exit 0; else break; fi; }; \
+@@ -217,9 +263,9 @@
  	      exit 1;; \
  	  esac; \
  	done; \
@@ -81704,7 +21676,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -228,33 +283,33 @@
+@@ -237,6 +283,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -81712,18 +21684,11 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
- 
- clean-libtool:
- 	-rm -rf .libs _libs
--
--distclean-libtool:
--	-rm -f libtool
--uninstall-info-am:
+@@ -246,20 +293,23 @@
  install-domincludeHEADERS: $(dominclude_HEADERS)
  	@$(NORMAL_INSTALL)
--	test -z "$(domincludedir)" || $(mkdir_p) "$(DESTDIR)$(domincludedir)"
+ 	test -z "$(domincludedir)" || $(MKDIR_P) "$(DESTDIR)$(domincludedir)"
 -	@list='$(dominclude_HEADERS)'; for p in $$list; do \
-+	test -z "$(domincludedir)" || $(MKDIR_P) "$(DESTDIR)$(domincludedir)"
 +	@list='$(dominclude_HEADERS)'; test -n "$(domincludedir)" || list=; \
 +	for p in $$list; do \
  	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
@@ -81752,7 +21717,7 @@
  
  # This directory's subdirectories are mostly independent; you can cd
  # into them and run `make' without going through this Makefile.
-@@ -280,15 +335,14 @@
+@@ -285,7 +335,7 @@
  	  else \
  	    local_target="$$target"; \
  	  fi; \
@@ -81761,16 +21726,7 @@
  	  || eval $$failcom; \
  	done; \
  	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
- 	fi; test -z "$$fail"
- 
--mostlyclean-recursive clean-recursive distclean-recursive \
--maintainer-clean-recursive:
-+$(RECURSIVE_CLEAN_TARGETS):
- 	@failcom='exit 1'; \
- 	for f in x $$MAKEFLAGS; do \
- 	  case $$f in \
-@@ -315,16 +369,16 @@
+@@ -319,16 +369,16 @@
  	  else \
  	    local_target="$$target"; \
  	  fi; \
@@ -81790,16 +21746,7 @@
  	done
  
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-@@ -332,14 +386,14 @@
- 	unique=`for i in $$list; do \
- 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- 	  done | \
--	  $(AWK) '    { files[$$0] = 1; } \
--	       END { for (i in files) print i; }'`; \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
- 	mkid -fID $$unique
- tags: TAGS
+@@ -343,7 +393,7 @@
  
  TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
@@ -81808,7 +21755,7 @@
  	here=`pwd`; \
  	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
  	  include_option=--etags-include; \
-@@ -351,81 +405,101 @@
+@@ -355,7 +405,7 @@
  	list='$(SUBDIRS)'; for subdir in $$list; do \
  	  if test "$$subdir" = .; then :; else \
  	    test ! -f $$subdir/TAGS || \
@@ -81817,14 +21764,11 @@
  	  fi; \
  	done; \
  	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
- 	unique=`for i in $$list; do \
- 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+@@ -364,29 +414,34 @@
  	  done | \
--	  $(AWK) '    { files[$$0] = 1; } \
--	       END { for (i in files) print i; }'`; \
+ 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 -	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 +	shift; \
 +	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
  	  test -n "$$unique" || unique=$$empty_fix; \
@@ -81842,16 +21786,13 @@
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
 -	tags=; \
--	here=`pwd`; \
  	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  	  done | \
--	  $(AWK) '    { files[$$0] = 1; } \
--	       END { for (i in files) print i; }'`; \
+ 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 -	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 +	test -z "$(CTAGS_ARGS)$$unique" \
  	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 -	     $$tags $$unique
@@ -81866,37 +21807,10 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
--	list='$(DISTFILES)'; for file in $$list; do \
--	  case $$file in \
--	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
--	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
--	  esac; \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
+@@ -407,29 +462,44 @@
  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
--	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
--	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
--	    dir="/$$dir"; \
--	    $(mkdir_p) "$(distdir)$$dir"; \
--	  else \
--	    dir=''; \
--	  fi; \
  	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 +	    if test -d "$(distdir)/$$file"; then \
 +	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 +	    fi; \
@@ -81919,8 +21833,7 @@
 +	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
  	  if test "$$subdir" = .; then :; else \
  	    test -d "$(distdir)/$$subdir" \
--	    || $(mkdir_p) "$(distdir)/$$subdir" \
-+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+ 	    || $(MKDIR_P) "$(distdir)/$$subdir" \
  	    || exit 1; \
 -	    distdir=`$(am__cd) $(distdir) && pwd`; \
 -	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -81943,22 +21856,13 @@
 -	        distdir="$$distdir/$$subdir" \
 +	        top_distdir="$$new_top_distdir" \
 +	        distdir="$$new_distdir" \
-+		am__remove_distdir=: \
-+		am__skip_length_check=: \
+ 		am__remove_distdir=: \
+ 		am__skip_length_check=: \
 +		am__skip_mode_fix=: \
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -436,7 +510,7 @@
- installdirs: installdirs-recursive
- installdirs-am:
- 	for dir in "$(DESTDIR)$(domincludedir)"; do \
--	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- 	done
- install: install-recursive
- install-exec: install-exec-recursive
-@@ -458,6 +532,7 @@
+@@ -462,6 +532,7 @@
  
  distclean-generic:
  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -81966,18 +21870,8 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -468,8 +543,7 @@
+@@ -480,6 +551,8 @@
  
- distclean: distclean-recursive
- 	-rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool \
--	distclean-tags
-+distclean-am: clean-am distclean-generic distclean-tags
- 
- dvi: dvi-recursive
- 
-@@ -477,18 +551,38 @@
- 
  html: html-recursive
  
 +html-am:
@@ -81985,17 +21879,16 @@
  info: info-recursive
  
  info-am:
+@@ -488,18 +561,28 @@
  
- install-data-am: install-domincludeHEADERS
+ install-dvi: install-dvi-recursive
  
-+install-dvi: install-dvi-recursive
-+
 +install-dvi-am:
 +
  install-exec-am:
  
-+install-html: install-html-recursive
-+
+ install-html: install-html-recursive
+ 
 +install-html-am:
 +
  install-info: install-info-recursive
@@ -82004,109 +21897,64 @@
 +
  install-man:
  
-+install-pdf: install-pdf-recursive
-+
+ install-pdf: install-pdf-recursive
+ 
 +install-pdf-am:
 +
-+install-ps: install-ps-recursive
-+
+ install-ps: install-ps-recursive
+ 
 +install-ps-am:
 +
  installcheck-am:
  
  maintainer-clean: maintainer-clean-recursive
-@@ -507,23 +601,26 @@
+@@ -520,8 +603,8 @@
  
- ps-am:
+ uninstall-am: uninstall-domincludeHEADERS
  
--uninstall-am: uninstall-domincludeHEADERS uninstall-info-am
-+uninstall-am: uninstall-domincludeHEADERS
- 
--uninstall-info: uninstall-info-recursive
+-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+-	install-strip
 +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
 +	install-am install-strip tags-recursive
  
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
--	clean clean-generic clean-libtool clean-recursive ctags \
--	ctags-recursive distclean distclean-generic distclean-libtool \
--	distclean-recursive distclean-tags distdir dvi dvi-am html \
-+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-+	all all-am check check-am clean clean-generic clean-libtool \
-+	ctags ctags-recursive distclean distclean-generic \
-+	distclean-libtool distclean-tags distdir dvi dvi-am html \
- 	html-am info info-am install install-am install-data \
--	install-data-am install-domincludeHEADERS install-exec \
--	install-exec-am install-info install-info-am install-man \
-+	install-data-am install-domincludeHEADERS install-dvi \
-+	install-dvi-am install-exec install-exec-am install-html \
-+	install-html-am install-info install-info-am install-man \
-+	install-pdf install-pdf-am install-ps install-ps-am \
- 	install-strip installcheck installcheck-am installdirs \
- 	installdirs-am maintainer-clean maintainer-clean-generic \
--	maintainer-clean-recursive mostlyclean mostlyclean-generic \
--	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
--	tags tags-recursive uninstall uninstall-am \
--	uninstall-domincludeHEADERS uninstall-info-am
-+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-+	ps ps-am tags tags-recursive uninstall uninstall-am \
-+	uninstall-domincludeHEADERS
-+
+ .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ 	all all-am check check-am clean clean-generic clean-libtool \
+@@ -538,6 +621,7 @@
+ 	ps ps-am tags tags-recursive uninstall uninstall-am \
+ 	uninstall-domincludeHEADERS
  
++
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-Index: libkml-1.0.1/src/kml/regionator/Makefile.in
+ .NOEXPORT:
+Index: libkml-1.1.0/src/kml/regionator/Makefile.in
 ===================================================================
---- libkml-1.0.1.orig/src/kml/regionator/Makefile.in	2009-07-03 01:23:33.000000000 +0200
-+++ libkml-1.0.1/src/kml/regionator/Makefile.in	2009-12-10 10:19:47.000000000 +0100
+--- libkml-1.1.0.orig/src/kml/regionator/Makefile.in	2009-12-10 13:05:40.000000000 +0100
++++ libkml-1.1.0/src/kml/regionator/Makefile.in	2009-12-10 17:29:37.000000000 +0100
 @@ -1,8 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
+-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
-@@ -15,15 +16,12 @@
- @SET_MAKE@
+@@ -17,8 +18,9 @@
  
- 
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
  VPATH = @srcdir@
  pkgdatadir = $(datadir)/@PACKAGE@
 -pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../../..
 +pkglibdir = $(libdir)/@PACKAGE@
 +pkglibexecdir = $(libexecdir)/@PACKAGE@
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -37,27 +35,47 @@
- POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
-+TESTS = feature_list_region_handler_test$(EXEEXT) \
-+	regionator_test$(EXEEXT) regionator_qid_test$(EXEEXT) \
-+	regionator_util_test$(EXEEXT)
- check_PROGRAMS = $(am__EXEEXT_1)
- subdir = src/kml/regionator
- DIST_COMMON = $(libkmlregionatorinclude_HEADERS) $(srcdir)/Makefile.am \
- 	$(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_curl.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)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
+@@ -50,15 +52,30 @@
  mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
@@ -82139,72 +21987,17 @@
  LTLIBRARIES = $(lib_LTLIBRARIES)
  libkmlregionator_la_LIBADD =
  am_libkmlregionator_la_OBJECTS = feature_list_region_handler.lo \
-@@ -75,6 +93,10 @@
- 	$(top_builddir)/src/kml/dom/libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+feature_list_region_handler_test_LINK = $(LIBTOOL) --tag=CXX \
-+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-+	$(feature_list_region_handler_test_CXXFLAGS) $(CXXFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- am_regionator_qid_test_OBJECTS =  \
- 	regionator_qid_test-regionator_qid_test.$(OBJEXT)
- regionator_qid_test_OBJECTS = $(am_regionator_qid_test_OBJECTS)
-@@ -84,6 +106,10 @@
- 	$(top_builddir)/src/kml/dom/libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+regionator_qid_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-+	$(regionator_qid_test_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- am_regionator_test_OBJECTS =  \
- 	regionator_test-regionator_test.$(OBJEXT)
- regionator_test_OBJECTS = $(am_regionator_test_OBJECTS)
-@@ -93,6 +119,10 @@
- 	$(top_builddir)/src/kml/dom/libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+regionator_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-+	$(regionator_test_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- am_regionator_util_test_OBJECTS =  \
- 	regionator_util_test-regionator_util_test.$(OBJEXT)
- regionator_util_test_OBJECTS = $(am_regionator_util_test_OBJECTS)
-@@ -102,17 +132,23 @@
- 	$(top_builddir)/src/kml/dom/libkmldom.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
--DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+regionator_util_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-+	$(regionator_util_test_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
-+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+@@ -122,6 +139,7 @@
+ DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
  depcomp = $(SHELL) $(top_srcdir)/config/depcomp
  am__depfiles_maybe = depfiles
 +am__mv = mv -f
  CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
  	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
--	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
--	$(AM_CXXFLAGS) $(CXXFLAGS)
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- CXXLD = $(CXX)
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- SOURCES = $(libkmlregionator_la_SOURCES) \
+ LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+@@ -139,10 +157,11 @@
  	$(feature_list_region_handler_test_SOURCES) \
  	$(regionator_qid_test_SOURCES) $(regionator_test_SOURCES) \
-@@ -121,14 +157,13 @@
- 	$(feature_list_region_handler_test_SOURCES) \
- 	$(regionator_qid_test_SOURCES) $(regionator_test_SOURCES) \
  	$(regionator_util_test_SOURCES)
 -libkmlregionatorincludeHEADERS_INSTALL = $(INSTALL_HEADER)
  HEADERS = $(libkmlregionatorinclude_HEADERS)
@@ -82214,57 +22007,8 @@
 +red=; grn=; lgn=; blu=; std=
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  ACLOCAL = @ACLOCAL@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
  AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -150,18 +185,16 @@
- CYGPATH_W = @CYGPATH_W@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
--ECHO = @ECHO@
-+DSYMUTIL = @DSYMUTIL@
-+DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
--F77 = @F77@
--FFLAGS = @FFLAGS@
--GCC_FALSE = @GCC_FALSE@
--GCC_TRUE = @GCC_TRUE@
--HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
--HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
-+FGREP = @FGREP@
-+GREP = @GREP@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -171,19 +204,28 @@
- JAVAC = @JAVAC@
- JAVA_INCLUDE_DIR = @JAVA_INCLUDE_DIR@
- JAVA_LIB_DIR = @JAVA_LIB_DIR@
-+LD = @LD@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
-+LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
-+NM = @NM@
-+NMEDIT = @NMEDIT@
-+OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
-+OTOOL = @OTOOL@
-+OTOOL64 = @OTOOL64@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -206,6 +225,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -82272,97 +22016,18 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PLATFORM = @PLATFORM@
-@@ -200,22 +242,13 @@
- STRIP = @STRIP@
- SWIG = @SWIG@
- VERSION = @VERSION@
--WITH_JAVA_FALSE = @WITH_JAVA_FALSE@
--WITH_JAVA_TRUE = @WITH_JAVA_TRUE@
--WITH_PYTHON_FALSE = @WITH_PYTHON_FALSE@
--WITH_PYTHON_TRUE = @WITH_PYTHON_TRUE@
--WITH_SWIG_FALSE = @WITH_SWIG_FALSE@
--WITH_SWIG_TRUE = @WITH_SWIG_TRUE@
--ac_ct_AR = @ac_ct_AR@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
--ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -227,28 +260,41 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- AM_CPPFLAGS = -I$(top_srcdir)/src \
+@@ -279,8 +299,8 @@
               -I$(top_srcdir)/third_party/boost_1_34_1 \
  	     -I$(top_srcdir)/third_party/googletest-r108/include
-@@ -271,12 +317,6 @@
- 	regionator_qid.h \
- 	regionator_util.h
  
--TESTS = \
--	feature_list_region_handler_test \
--	regionator_test \
--	regionator_qid_test \
--	regionator_util_test
--
- feature_list_region_handler_test_SOURCES = feature_list_region_handler_test.cc
- feature_list_region_handler_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
- feature_list_region_handler_test_LDADD = libkmlregionator.la \
-@@ -322,14 +362,14 @@
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
--	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
--		&& exit 0; \
-+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-+	        && { if test -f $@; then exit 0; else break; fi; }; \
+- at GCC_TRUE@AM_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -Werror -ansi -pedantic -fno-rtti
+- at GCC_TRUE@AM_TEST_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -Werror -ansi -fno-rtti -DGTEST_HAS_RTTI=0
++ at GCC_TRUE@AM_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -ansi -pedantic -fno-rtti
++ at GCC_TRUE@AM_TEST_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -ansi -fno-rtti -DGTEST_HAS_RTTI=0
+ lib_LTLIBRARIES = libkmlregionator.la
+ libkmlregionator_la_SOURCES = \
+ 	feature_list_region_handler.cc \
+@@ -347,9 +367,9 @@
  	      exit 1;; \
  	  esac; \
  	done; \
@@ -82375,22 +22040,21 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -347,23 +387,28 @@
+@@ -367,23 +387,28 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(am__aclocal_m4_deps):
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
--	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ 	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 -	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 +	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
 +	list2=; for p in $$list; do \
  	  if test -f $$p; then \
 -	    f=$(am__strip_dir) \
--	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
--	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+-	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+-	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
 +	    list2="$$list2 $$p"; \
  	  else :; fi; \
 -	done
@@ -82402,10 +22066,10 @@
  
  uninstall-libLTLIBRARIES:
  	@$(NORMAL_UNINSTALL)
--	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 -	  p=$(am__strip_dir) \
--	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
--	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
 +	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
 +	for p in $$list; do \
 +	  $(am__strip_dir) \
@@ -82414,12 +22078,8 @@
  	done
  
  clean-libLTLIBRARIES:
-@@ -375,26 +420,28 @@
- 	  rm -f "$${dir}/so_locations"; \
- 	done
- libkmlregionator.la: $(libkmlregionator_la_OBJECTS) $(libkmlregionator_la_DEPENDENCIES) 
--	$(CXXLINK) -rpath $(libdir) $(libkmlregionator_la_LDFLAGS) $(libkmlregionator_la_OBJECTS) $(libkmlregionator_la_LIBADD) $(LIBS)
-+	$(CXXLINK) -rpath $(libdir) $(libkmlregionator_la_OBJECTS) $(libkmlregionator_la_LIBADD) $(LIBS)
+@@ -398,11 +423,13 @@
+ 	$(CXXLINK) -rpath $(libdir) $(libkmlregionator_la_OBJECTS) $(libkmlregionator_la_LIBADD) $(LIBS)
  
  clean-checkPROGRAMS:
 -	@list='$(check_PROGRAMS)'; for p in $$list; do \
@@ -82436,137 +22096,101 @@
 +	rm -f $$list
  feature_list_region_handler_test$(EXEEXT): $(feature_list_region_handler_test_OBJECTS) $(feature_list_region_handler_test_DEPENDENCIES) 
  	@rm -f feature_list_region_handler_test$(EXEEXT)
--	$(CXXLINK) $(feature_list_region_handler_test_LDFLAGS) $(feature_list_region_handler_test_OBJECTS) $(feature_list_region_handler_test_LDADD) $(LIBS)
-+	$(feature_list_region_handler_test_LINK) $(feature_list_region_handler_test_OBJECTS) $(feature_list_region_handler_test_LDADD) $(LIBS)
- regionator_qid_test$(EXEEXT): $(regionator_qid_test_OBJECTS) $(regionator_qid_test_DEPENDENCIES) 
- 	@rm -f regionator_qid_test$(EXEEXT)
--	$(CXXLINK) $(regionator_qid_test_LDFLAGS) $(regionator_qid_test_OBJECTS) $(regionator_qid_test_LDADD) $(LIBS)
-+	$(regionator_qid_test_LINK) $(regionator_qid_test_OBJECTS) $(regionator_qid_test_LDADD) $(LIBS)
- regionator_test$(EXEEXT): $(regionator_test_OBJECTS) $(regionator_test_DEPENDENCIES) 
- 	@rm -f regionator_test$(EXEEXT)
--	$(CXXLINK) $(regionator_test_LDFLAGS) $(regionator_test_OBJECTS) $(regionator_test_LDADD) $(LIBS)
-+	$(regionator_test_LINK) $(regionator_test_OBJECTS) $(regionator_test_LDADD) $(LIBS)
- regionator_util_test$(EXEEXT): $(regionator_util_test_OBJECTS) $(regionator_util_test_DEPENDENCIES) 
- 	@rm -f regionator_util_test$(EXEEXT)
--	$(CXXLINK) $(regionator_util_test_LDFLAGS) $(regionator_util_test_OBJECTS) $(regionator_util_test_LDADD) $(LIBS)
-+	$(regionator_util_test_LINK) $(regionator_util_test_OBJECTS) $(regionator_util_test_LDADD) $(LIBS)
+ 	$(feature_list_region_handler_test_LINK) $(feature_list_region_handler_test_OBJECTS) $(feature_list_region_handler_test_LDADD) $(LIBS)
+@@ -432,77 +459,77 @@
  
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -411,78 +458,78 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/regionator_util_test-regionator_util_test.Po at am__quote@
- 
  .cc.o:
-- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
  
  .cc.obj:
-- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
  
  .cc.lo:
-- at am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
  
  feature_list_region_handler_test-feature_list_region_handler_test.o: feature_list_region_handler_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(feature_list_region_handler_test_CXXFLAGS) $(CXXFLAGS) -MT feature_list_region_handler_test-feature_list_region_handler_test.o -MD -MP -MF "$(DEPDIR)/feature_list_region_handler_test-feature_list_region_handler_test.Tpo" -c -o feature_list_region_handler_test-feature_list_region_handler_test.o `test -f 'feature_list_region_handler_test.cc' || echo '$(srcdir)/'`feature_list_region_handler_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/feature_list_region_handler_test-feature_list_region_handler_test.Tpo" "$(DEPDIR)/feature_list_region_handler_test-feature_list_region_handler_test.Po"; else rm -f "$(DEPDIR)/feature_list_region_handler_test-feature_list_region_handler_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(feature_list_region_handler_test_CXXFLAGS) $(CXXFLAGS) -MT feature_list_region_handler_test-feature_list_region_handler_test.o -MD -MP -MF $(DEPDIR)/feature_list_region_handler_test-feature_list_region_handler_test.Tpo -c -o feature_list_region_handler_test-feature_list_region_handler_test.o `test -f 'feature_list_region_handler_test.cc' || echo '$(srcdir)/'`feature_list_region_handler_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(feature_list_region_handler_test_CXXFLAGS) $(CXXFLAGS) -MT feature_list_region_handler_test-feature_list_region_handler_test.o -MD -MP -MF $(DEPDIR)/feature_list_region_handler_test-feature_list_region_handler_test.Tpo -c -o feature_list_region_handler_test-feature_list_region_handler_test.o `test -f 'feature_list_region_handler_test.cc' || echo '$(srcdir)/'`feature_list_region_handler_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/feature_list_region_handler_test-feature_list_region_handler_test.Tpo $(DEPDIR)/feature_list_region_handler_test-feature_list_region_handler_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/feature_list_region_handler_test-feature_list_region_handler_test.Tpo $(DEPDIR)/feature_list_region_handler_test-feature_list_region_handler_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='feature_list_region_handler_test.cc' object='feature_list_region_handler_test-feature_list_region_handler_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(feature_list_region_handler_test_CXXFLAGS) $(CXXFLAGS) -c -o feature_list_region_handler_test-feature_list_region_handler_test.o `test -f 'feature_list_region_handler_test.cc' || echo '$(srcdir)/'`feature_list_region_handler_test.cc
  
  feature_list_region_handler_test-feature_list_region_handler_test.obj: feature_list_region_handler_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(feature_list_region_handler_test_CXXFLAGS) $(CXXFLAGS) -MT feature_list_region_handler_test-feature_list_region_handler_test.obj -MD -MP -MF "$(DEPDIR)/feature_list_region_handler_test-feature_list_region_handler_test.Tpo" -c -o feature_list_region_handler_test-feature_list_region_handler_test.obj `if test -f 'feature_list_region_handler_test.cc'; then $(CYGPATH_W) 'feature_list_region_handler_test.cc'; else $(CYGPATH_W) '$(srcdir)/feature_list_region_handler_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/feature_list_region_handler_test-feature_list_region_handler_test.Tpo" "$(DEPDIR)/feature_list_region_handler_test-feature_list_region_handler_test.Po"; else rm -f "$(DEPDIR)/feature_list_region_handler_test-feature_list_region_handler_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(feature_list_region_handler_test_CXXFLAGS) $(CXXFLAGS) -MT feature_list_region_handler_test-feature_list_region_handler_test.obj -MD -MP -MF $(DEPDIR)/feature_list_region_handler_test-feature_list_region_handler_test.Tpo -c -o feature_list_region_handler_test-feature_list_region_handler_test.obj `if test -f 'feature_list_region_handler_test.cc'; then $(CYGPATH_W) 'feature_list_region_handler_test.cc'; else $(CYGPATH_W) '$(srcdir)/feature_list_region_handler_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(feature_list_region_handler_test_CXXFLAGS) $(CXXFLAGS) -MT feature_list_region_handler_test-feature_list_region_handler_test.obj -MD -MP -MF $(DEPDIR)/feature_list_region_handler_test-feature_list_region_handler_test.Tpo -c -o feature_list_region_handler_test-feature_list_region_handler_test.obj `if test -f 'feature_list_region_handler_test.cc'; then $(CYGPATH_W) 'feature_list_region_handler_test.cc'; else $(CYGPATH_W) '$(srcdir)/feature_list_region_handler_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/feature_list_region_handler_test-feature_list_region_handler_test.Tpo $(DEPDIR)/feature_list_region_handler_test-feature_list_region_handler_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/feature_list_region_handler_test-feature_list_region_handler_test.Tpo $(DEPDIR)/feature_list_region_handler_test-feature_list_region_handler_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='feature_list_region_handler_test.cc' object='feature_list_region_handler_test-feature_list_region_handler_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(feature_list_region_handler_test_CXXFLAGS) $(CXXFLAGS) -c -o feature_list_region_handler_test-feature_list_region_handler_test.obj `if test -f 'feature_list_region_handler_test.cc'; then $(CYGPATH_W) 'feature_list_region_handler_test.cc'; else $(CYGPATH_W) '$(srcdir)/feature_list_region_handler_test.cc'; fi`
  
  regionator_qid_test-regionator_qid_test.o: regionator_qid_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(regionator_qid_test_CXXFLAGS) $(CXXFLAGS) -MT regionator_qid_test-regionator_qid_test.o -MD -MP -MF "$(DEPDIR)/regionator_qid_test-regionator_qid_test.Tpo" -c -o regionator_qid_test-regionator_qid_test.o `test -f 'regionator_qid_test.cc' || echo '$(srcdir)/'`regionator_qid_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/regionator_qid_test-regionator_qid_test.Tpo" "$(DEPDIR)/regionator_qid_test-regionator_qid_test.Po"; else rm -f "$(DEPDIR)/regionator_qid_test-regionator_qid_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(regionator_qid_test_CXXFLAGS) $(CXXFLAGS) -MT regionator_qid_test-regionator_qid_test.o -MD -MP -MF $(DEPDIR)/regionator_qid_test-regionator_qid_test.Tpo -c -o regionator_qid_test-regionator_qid_test.o `test -f 'regionator_qid_test.cc' || echo '$(srcdir)/'`regionator_qid_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(regionator_qid_test_CXXFLAGS) $(CXXFLAGS) -MT regionator_qid_test-regionator_qid_test.o -MD -MP -MF $(DEPDIR)/regionator_qid_test-regionator_qid_test.Tpo -c -o regionator_qid_test-regionator_qid_test.o `test -f 'regionator_qid_test.cc' || echo '$(srcdir)/'`regionator_qid_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/regionator_qid_test-regionator_qid_test.Tpo $(DEPDIR)/regionator_qid_test-regionator_qid_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/regionator_qid_test-regionator_qid_test.Tpo $(DEPDIR)/regionator_qid_test-regionator_qid_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='regionator_qid_test.cc' object='regionator_qid_test-regionator_qid_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(regionator_qid_test_CXXFLAGS) $(CXXFLAGS) -c -o regionator_qid_test-regionator_qid_test.o `test -f 'regionator_qid_test.cc' || echo '$(srcdir)/'`regionator_qid_test.cc
  
  regionator_qid_test-regionator_qid_test.obj: regionator_qid_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(regionator_qid_test_CXXFLAGS) $(CXXFLAGS) -MT regionator_qid_test-regionator_qid_test.obj -MD -MP -MF "$(DEPDIR)/regionator_qid_test-regionator_qid_test.Tpo" -c -o regionator_qid_test-regionator_qid_test.obj `if test -f 'regionator_qid_test.cc'; then $(CYGPATH_W) 'regionator_qid_test.cc'; else $(CYGPATH_W) '$(srcdir)/regionator_qid_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/regionator_qid_test-regionator_qid_test.Tpo" "$(DEPDIR)/regionator_qid_test-regionator_qid_test.Po"; else rm -f "$(DEPDIR)/regionator_qid_test-regionator_qid_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(regionator_qid_test_CXXFLAGS) $(CXXFLAGS) -MT regionator_qid_test-regionator_qid_test.obj -MD -MP -MF $(DEPDIR)/regionator_qid_test-regionator_qid_test.Tpo -c -o regionator_qid_test-regionator_qid_test.obj `if test -f 'regionator_qid_test.cc'; then $(CYGPATH_W) 'regionator_qid_test.cc'; else $(CYGPATH_W) '$(srcdir)/regionator_qid_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(regionator_qid_test_CXXFLAGS) $(CXXFLAGS) -MT regionator_qid_test-regionator_qid_test.obj -MD -MP -MF $(DEPDIR)/regionator_qid_test-regionator_qid_test.Tpo -c -o regionator_qid_test-regionator_qid_test.obj `if test -f 'regionator_qid_test.cc'; then $(CYGPATH_W) 'regionator_qid_test.cc'; else $(CYGPATH_W) '$(srcdir)/regionator_qid_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/regionator_qid_test-regionator_qid_test.Tpo $(DEPDIR)/regionator_qid_test-regionator_qid_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/regionator_qid_test-regionator_qid_test.Tpo $(DEPDIR)/regionator_qid_test-regionator_qid_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='regionator_qid_test.cc' object='regionator_qid_test-regionator_qid_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(regionator_qid_test_CXXFLAGS) $(CXXFLAGS) -c -o regionator_qid_test-regionator_qid_test.obj `if test -f 'regionator_qid_test.cc'; then $(CYGPATH_W) 'regionator_qid_test.cc'; else $(CYGPATH_W) '$(srcdir)/regionator_qid_test.cc'; fi`
  
  regionator_test-regionator_test.o: regionator_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(regionator_test_CXXFLAGS) $(CXXFLAGS) -MT regionator_test-regionator_test.o -MD -MP -MF "$(DEPDIR)/regionator_test-regionator_test.Tpo" -c -o regionator_test-regionator_test.o `test -f 'regionator_test.cc' || echo '$(srcdir)/'`regionator_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/regionator_test-regionator_test.Tpo" "$(DEPDIR)/regionator_test-regionator_test.Po"; else rm -f "$(DEPDIR)/regionator_test-regionator_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(regionator_test_CXXFLAGS) $(CXXFLAGS) -MT regionator_test-regionator_test.o -MD -MP -MF $(DEPDIR)/regionator_test-regionator_test.Tpo -c -o regionator_test-regionator_test.o `test -f 'regionator_test.cc' || echo '$(srcdir)/'`regionator_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(regionator_test_CXXFLAGS) $(CXXFLAGS) -MT regionator_test-regionator_test.o -MD -MP -MF $(DEPDIR)/regionator_test-regionator_test.Tpo -c -o regionator_test-regionator_test.o `test -f 'regionator_test.cc' || echo '$(srcdir)/'`regionator_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/regionator_test-regionator_test.Tpo $(DEPDIR)/regionator_test-regionator_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/regionator_test-regionator_test.Tpo $(DEPDIR)/regionator_test-regionator_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='regionator_test.cc' object='regionator_test-regionator_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(regionator_test_CXXFLAGS) $(CXXFLAGS) -c -o regionator_test-regionator_test.o `test -f 'regionator_test.cc' || echo '$(srcdir)/'`regionator_test.cc
  
  regionator_test-regionator_test.obj: regionator_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(regionator_test_CXXFLAGS) $(CXXFLAGS) -MT regionator_test-regionator_test.obj -MD -MP -MF "$(DEPDIR)/regionator_test-regionator_test.Tpo" -c -o regionator_test-regionator_test.obj `if test -f 'regionator_test.cc'; then $(CYGPATH_W) 'regionator_test.cc'; else $(CYGPATH_W) '$(srcdir)/regionator_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/regionator_test-regionator_test.Tpo" "$(DEPDIR)/regionator_test-regionator_test.Po"; else rm -f "$(DEPDIR)/regionator_test-regionator_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(regionator_test_CXXFLAGS) $(CXXFLAGS) -MT regionator_test-regionator_test.obj -MD -MP -MF $(DEPDIR)/regionator_test-regionator_test.Tpo -c -o regionator_test-regionator_test.obj `if test -f 'regionator_test.cc'; then $(CYGPATH_W) 'regionator_test.cc'; else $(CYGPATH_W) '$(srcdir)/regionator_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(regionator_test_CXXFLAGS) $(CXXFLAGS) -MT regionator_test-regionator_test.obj -MD -MP -MF $(DEPDIR)/regionator_test-regionator_test.Tpo -c -o regionator_test-regionator_test.obj `if test -f 'regionator_test.cc'; then $(CYGPATH_W) 'regionator_test.cc'; else $(CYGPATH_W) '$(srcdir)/regionator_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/regionator_test-regionator_test.Tpo $(DEPDIR)/regionator_test-regionator_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/regionator_test-regionator_test.Tpo $(DEPDIR)/regionator_test-regionator_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='regionator_test.cc' object='regionator_test-regionator_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(regionator_test_CXXFLAGS) $(CXXFLAGS) -c -o regionator_test-regionator_test.obj `if test -f 'regionator_test.cc'; then $(CYGPATH_W) 'regionator_test.cc'; else $(CYGPATH_W) '$(srcdir)/regionator_test.cc'; fi`
  
  regionator_util_test-regionator_util_test.o: regionator_util_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(regionator_util_test_CXXFLAGS) $(CXXFLAGS) -MT regionator_util_test-regionator_util_test.o -MD -MP -MF "$(DEPDIR)/regionator_util_test-regionator_util_test.Tpo" -c -o regionator_util_test-regionator_util_test.o `test -f 'regionator_util_test.cc' || echo '$(srcdir)/'`regionator_util_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/regionator_util_test-regionator_util_test.Tpo" "$(DEPDIR)/regionator_util_test-regionator_util_test.Po"; else rm -f "$(DEPDIR)/regionator_util_test-regionator_util_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(regionator_util_test_CXXFLAGS) $(CXXFLAGS) -MT regionator_util_test-regionator_util_test.o -MD -MP -MF $(DEPDIR)/regionator_util_test-regionator_util_test.Tpo -c -o regionator_util_test-regionator_util_test.o `test -f 'regionator_util_test.cc' || echo '$(srcdir)/'`regionator_util_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(regionator_util_test_CXXFLAGS) $(CXXFLAGS) -MT regionator_util_test-regionator_util_test.o -MD -MP -MF $(DEPDIR)/regionator_util_test-regionator_util_test.Tpo -c -o regionator_util_test-regionator_util_test.o `test -f 'regionator_util_test.cc' || echo '$(srcdir)/'`regionator_util_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/regionator_util_test-regionator_util_test.Tpo $(DEPDIR)/regionator_util_test-regionator_util_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/regionator_util_test-regionator_util_test.Tpo $(DEPDIR)/regionator_util_test-regionator_util_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='regionator_util_test.cc' object='regionator_util_test-regionator_util_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(regionator_util_test_CXXFLAGS) $(CXXFLAGS) -c -o regionator_util_test-regionator_util_test.o `test -f 'regionator_util_test.cc' || echo '$(srcdir)/'`regionator_util_test.cc
  
  regionator_util_test-regionator_util_test.obj: regionator_util_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(regionator_util_test_CXXFLAGS) $(CXXFLAGS) -MT regionator_util_test-regionator_util_test.obj -MD -MP -MF "$(DEPDIR)/regionator_util_test-regionator_util_test.Tpo" -c -o regionator_util_test-regionator_util_test.obj `if test -f 'regionator_util_test.cc'; then $(CYGPATH_W) 'regionator_util_test.cc'; else $(CYGPATH_W) '$(srcdir)/regionator_util_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/regionator_util_test-regionator_util_test.Tpo" "$(DEPDIR)/regionator_util_test-regionator_util_test.Po"; else rm -f "$(DEPDIR)/regionator_util_test-regionator_util_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(regionator_util_test_CXXFLAGS) $(CXXFLAGS) -MT regionator_util_test-regionator_util_test.obj -MD -MP -MF $(DEPDIR)/regionator_util_test-regionator_util_test.Tpo -c -o regionator_util_test-regionator_util_test.obj `if test -f 'regionator_util_test.cc'; then $(CYGPATH_W) 'regionator_util_test.cc'; else $(CYGPATH_W) '$(srcdir)/regionator_util_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(regionator_util_test_CXXFLAGS) $(CXXFLAGS) -MT regionator_util_test-regionator_util_test.obj -MD -MP -MF $(DEPDIR)/regionator_util_test-regionator_util_test.Tpo -c -o regionator_util_test-regionator_util_test.obj `if test -f 'regionator_util_test.cc'; then $(CYGPATH_W) 'regionator_util_test.cc'; else $(CYGPATH_W) '$(srcdir)/regionator_util_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/regionator_util_test-regionator_util_test.Tpo $(DEPDIR)/regionator_util_test-regionator_util_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/regionator_util_test-regionator_util_test.Tpo $(DEPDIR)/regionator_util_test-regionator_util_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='regionator_util_test.cc' object='regionator_util_test-regionator_util_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(regionator_util_test_CXXFLAGS) $(CXXFLAGS) -c -o regionator_util_test-regionator_util_test.obj `if test -f 'regionator_util_test.cc'; then $(CYGPATH_W) 'regionator_util_test.cc'; else $(CYGPATH_W) '$(srcdir)/regionator_util_test.cc'; fi`
-@@ -492,72 +539,75 @@
- 
- clean-libtool:
- 	-rm -rf .libs _libs
--
--distclean-libtool:
--	-rm -f libtool
--uninstall-info-am:
+@@ -515,20 +542,23 @@
  install-libkmlregionatorincludeHEADERS: $(libkmlregionatorinclude_HEADERS)
  	@$(NORMAL_INSTALL)
--	test -z "$(libkmlregionatorincludedir)" || $(mkdir_p) "$(DESTDIR)$(libkmlregionatorincludedir)"
+ 	test -z "$(libkmlregionatorincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libkmlregionatorincludedir)"
 -	@list='$(libkmlregionatorinclude_HEADERS)'; for p in $$list; do \
-+	test -z "$(libkmlregionatorincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libkmlregionatorincludedir)"
 +	@list='$(libkmlregionatorinclude_HEADERS)'; test -n "$(libkmlregionatorincludedir)" || list=; \
 +	for p in $$list; do \
  	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
@@ -82595,15 +22219,7 @@
  
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- 	unique=`for i in $$list; do \
- 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- 	  done | \
--	  $(AWK) '    { files[$$0] = 1; } \
--	       END { for (i in files) print i; }'`; \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
- 	mkid -fID $$unique
- tags: TAGS
+@@ -542,7 +572,7 @@
  
  TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
@@ -82612,13 +22228,11 @@
  	here=`pwd`; \
  	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
- 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+@@ -550,29 +580,34 @@
  	  done | \
--	  $(AWK) '    { files[$$0] = 1; } \
--	       END { for (i in files) print i; }'`; \
+ 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 -	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 +	shift; \
 +	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
  	  test -n "$$unique" || unique=$$empty_fix; \
@@ -82636,16 +22250,13 @@
  CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
 -	tags=; \
--	here=`pwd`; \
  	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  	  done | \
--	  $(AWK) '    { files[$$0] = 1; } \
--	       END { for (i in files) print i; }'`; \
+ 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 -	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 +	test -z "$(CTAGS_ARGS)$$unique" \
  	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 -	     $$tags $$unique
@@ -82660,22 +22271,16 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-@@ -565,7 +615,8 @@
- check-TESTS: $(TESTS)
+@@ -581,6 +616,7 @@
  	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
  	srcdir=$(srcdir); export srcdir; \
--	list='$(TESTS)'; \
-+	list=' $(TESTS) '; \
+ 	list=' $(TESTS) '; \
 +	$(am__tty_colors); \
  	if test -n "$$list"; then \
  	  for tst in $$list; do \
  	    if test -f ./$$tst; then dir=./; \
-@@ -574,49 +625,63 @@
- 	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *" $$tst "*) \
-+	      *[\ \	]$$tst[\ \	]*) \
+@@ -592,10 +628,10 @@
+ 	      *[\ \	]$$tst[\ \	]*) \
  		xpass=`expr $$xpass + 1`; \
  		failed=`expr $$failed + 1`; \
 -		echo "XPASS: $$tst"; \
@@ -82687,10 +22292,9 @@
  	      ;; \
  	      esac; \
  	    elif test $$? -ne 77; then \
- 	      all=`expr $$all + 1`; \
+@@ -603,17 +639,18 @@
  	      case " $(XFAIL_TESTS) " in \
--	      *" $$tst "*) \
-+	      *[\ \	]$$tst[\ \	]*) \
+ 	      *[\ \	]$$tst[\ \	]*) \
  		xfail=`expr $$xfail + 1`; \
 -		echo "XFAIL: $$tst"; \
 +		col=$$lgn; res=XFAIL; \
@@ -82708,45 +22312,9 @@
  	    fi; \
 +	    echo "$${col}$$res$${std}: $$tst"; \
  	  done; \
-+	  if test "$$all" -eq 1; then \
-+	    tests="test"; \
-+	    All=""; \
-+	  else \
-+	    tests="tests"; \
-+	    All="All "; \
-+	  fi; \
- 	  if test "$$failed" -eq 0; then \
- 	    if test "$$xfail" -eq 0; then \
--	      banner="All $$all tests passed"; \
-+	      banner="$$All$$all $$tests passed"; \
- 	    else \
--	      banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
-+	      if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
-+	      banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
- 	    fi; \
- 	  else \
- 	    if test "$$xpass" -eq 0; then \
--	      banner="$$failed of $$all tests failed"; \
-+	      banner="$$failed of $$all $$tests failed"; \
- 	    else \
--	      banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
-+	      if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
-+	      banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
- 	    fi; \
- 	  fi; \
- 	  dashes="$$banner"; \
- 	  skipped=""; \
- 	  if test "$$skip" -ne 0; then \
--	    skipped="($$skip tests were not run)"; \
-+	    if test "$$skip" -eq 1; then \
-+	      skipped="($$skip test was not run)"; \
-+	    else \
-+	      skipped="($$skip tests were not run)"; \
-+	    fi; \
- 	    test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
- 	      dashes="$$skipped"; \
- 	  fi; \
-@@ -627,38 +692,45 @@
+ 	  if test "$$all" -eq 1; then \
+ 	    tests="test"; \
+@@ -655,11 +692,15 @@
  	      dashes="$$report"; \
  	  fi; \
  	  dashes=`echo "$$dashes" | sed s/./=/g`; \
@@ -82764,36 +22332,10 @@
  	  test "$$failed" -eq 0; \
  	else :; fi
  
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
--	list='$(DISTFILES)'; for file in $$list; do \
--	  case $$file in \
--	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
--	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
--	  esac; \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
+@@ -679,13 +720,17 @@
  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
--	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
--	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
--	    dir="/$$dir"; \
--	    $(mkdir_p) "$(distdir)$$dir"; \
--	  else \
--	    dir=''; \
--	  fi; \
  	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 +	    if test -d "$(distdir)/$$file"; then \
 +	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 +	    fi; \
@@ -82812,16 +22354,7 @@
  	    || exit 1; \
  	  fi; \
  	done
-@@ -669,7 +741,7 @@
- all-am: Makefile $(LTLIBRARIES) $(HEADERS)
- installdirs:
- 	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libkmlregionatorincludedir)"; do \
--	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- 	done
- install: install-am
- install-exec: install-exec-am
-@@ -692,6 +764,7 @@
+@@ -719,6 +764,7 @@
  
  distclean-generic:
  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -82829,17 +22362,8 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -705,7 +778,7 @@
- 	-rm -rf ./$(DEPDIR)
- 	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
--	distclean-libtool distclean-tags
-+	distclean-tags
+@@ -740,6 +786,8 @@
  
- dvi: dvi-am
- 
-@@ -713,18 +786,38 @@
- 
  html: html-am
  
 +html-am:
@@ -82847,17 +22371,16 @@
  info: info-am
  
  info-am:
+@@ -748,18 +796,28 @@
  
- install-data-am: install-libkmlregionatorincludeHEADERS
+ install-dvi: install-dvi-am
  
-+install-dvi: install-dvi-am
-+
 +install-dvi-am:
 +
  install-exec-am: install-libLTLIBRARIES
  
-+install-html: install-html-am
-+
+ install-html: install-html-am
+ 
 +install-html-am:
 +
  install-info: install-info-am
@@ -82866,109 +22389,62 @@
 +
  install-man:
  
-+install-pdf: install-pdf-am
-+
+ install-pdf: install-pdf-am
+ 
 +install-pdf-am:
 +
-+install-ps: install-ps-am
-+
+ install-ps: install-ps-am
+ 
 +install-ps-am:
 +
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
-@@ -745,24 +838,28 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
-+uninstall-am: uninstall-libLTLIBRARIES \
+@@ -783,7 +841,7 @@
+ uninstall-am: uninstall-libLTLIBRARIES \
  	uninstall-libkmlregionatorincludeHEADERS
  
+-.MAKE: install-am install-strip
 +.MAKE: check-am install-am install-strip
-+
+ 
  .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
  	clean-checkPROGRAMS clean-generic clean-libLTLIBRARIES \
- 	clean-libtool ctags distclean distclean-compile \
- 	distclean-generic distclean-libtool distclean-tags distdir dvi \
- 	dvi-am html html-am info info-am install install-am \
--	install-data install-data-am install-exec install-exec-am \
-+	install-data install-data-am install-dvi install-dvi-am \
-+	install-exec install-exec-am install-html install-html-am \
- 	install-info install-info-am install-libLTLIBRARIES \
--	install-libkmlregionatorincludeHEADERS install-man \
--	install-strip installcheck installcheck-am installdirs \
--	maintainer-clean maintainer-clean-generic mostlyclean \
--	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
--	pdf pdf-am ps ps-am tags uninstall uninstall-am \
--	uninstall-info-am uninstall-libLTLIBRARIES \
-+	install-libkmlregionatorincludeHEADERS install-man install-pdf \
-+	install-pdf-am install-ps install-ps-am install-strip \
-+	installcheck installcheck-am installdirs maintainer-clean \
-+	maintainer-clean-generic mostlyclean mostlyclean-compile \
-+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-+	tags uninstall uninstall-am uninstall-libLTLIBRARIES \
+@@ -801,6 +859,7 @@
+ 	tags uninstall uninstall-am uninstall-libLTLIBRARIES \
  	uninstall-libkmlregionatorincludeHEADERS
  
 +
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
-Index: libkml-1.0.1/src/kml/xsd/Makefile.in
+Index: libkml-1.1.0/src/kml/xsd/Makefile.in
 ===================================================================
---- libkml-1.0.1.orig/src/kml/xsd/Makefile.in	2009-07-03 01:23:33.000000000 +0200
-+++ libkml-1.0.1/src/kml/xsd/Makefile.in	2009-12-10 10:19:47.000000000 +0100
+--- libkml-1.1.0.orig/src/kml/xsd/Makefile.in	2009-12-10 13:05:40.000000000 +0100
++++ libkml-1.1.0/src/kml/xsd/Makefile.in	2009-12-10 17:29:37.000000000 +0100
 @@ -1,8 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
+-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
-@@ -15,15 +16,12 @@
- @SET_MAKE@
+@@ -17,8 +18,9 @@
  
- 
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
  VPATH = @srcdir@
  pkgdatadir = $(datadir)/@PACKAGE@
 -pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../../..
 +pkglibdir = $(libdir)/@PACKAGE@
 +pkglibexecdir = $(libexecdir)/@PACKAGE@
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -37,27 +35,49 @@
- POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
-+TESTS = xsd_complex_type_test$(EXEEXT) xsd_file_test$(EXEEXT) \
-+	xsd_element_test$(EXEEXT) xsd_handler_test$(EXEEXT) \
-+	xsd_primitive_type_test$(EXEEXT) xsd_simple_type_test$(EXEEXT) \
-+	xsd_schema_test$(EXEEXT) xsd_util_test$(EXEEXT) \
-+	xst_parser_test$(EXEEXT)
- check_PROGRAMS = $(am__EXEEXT_1)
- subdir = src/kml/xsd
- DIST_COMMON = $(libkmlxsdinclude_HEADERS) $(srcdir)/Makefile.am \
- 	$(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_curl.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)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
+@@ -52,15 +54,30 @@
  mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
@@ -83001,114 +22477,15 @@
  LTLIBRARIES = $(lib_LTLIBRARIES)
  libkmlxsd_la_LIBADD =
  am_libkmlxsd_la_OBJECTS = xsd_complex_type.lo xsd_element.lo \
-@@ -75,23 +95,38 @@
- xsd_complex_type_test_DEPENDENCIES = libkmlxsd.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+xsd_complex_type_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-+	$(xsd_complex_type_test_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- am_xsd_element_test_OBJECTS =  \
- 	xsd_element_test-xsd_element_test.$(OBJEXT)
- xsd_element_test_OBJECTS = $(am_xsd_element_test_OBJECTS)
- xsd_element_test_DEPENDENCIES = libkmlxsd.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+xsd_element_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-+	$(xsd_element_test_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- am_xsd_file_test_OBJECTS = xsd_file_test-xsd_file_test.$(OBJEXT)
- xsd_file_test_OBJECTS = $(am_xsd_file_test_OBJECTS)
- xsd_file_test_DEPENDENCIES = libkmlxsd.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+xsd_file_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(xsd_file_test_CXXFLAGS) \
-+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- am_xsd_handler_test_OBJECTS =  \
- 	xsd_handler_test-xsd_handler_test.$(OBJEXT)
- xsd_handler_test_OBJECTS = $(am_xsd_handler_test_OBJECTS)
- xsd_handler_test_DEPENDENCIES = libkmlxsd.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+xsd_handler_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-+	$(xsd_handler_test_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- am_xsd_primitive_type_test_OBJECTS =  \
- 	xsd_primitive_type_test-xsd_primitive_type_test.$(OBJEXT)
- xsd_primitive_type_test_OBJECTS =  \
-@@ -99,40 +134,61 @@
- xsd_primitive_type_test_DEPENDENCIES = libkmlxsd.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+xsd_primitive_type_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-+	$(xsd_primitive_type_test_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- am_xsd_schema_test_OBJECTS =  \
- 	xsd_schema_test-xsd_schema_test.$(OBJEXT)
- xsd_schema_test_OBJECTS = $(am_xsd_schema_test_OBJECTS)
- xsd_schema_test_DEPENDENCIES = libkmlxsd.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+xsd_schema_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-+	$(xsd_schema_test_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- am_xsd_simple_type_test_OBJECTS =  \
- 	xsd_simple_type_test-xsd_simple_type_test.$(OBJEXT)
- xsd_simple_type_test_OBJECTS = $(am_xsd_simple_type_test_OBJECTS)
- xsd_simple_type_test_DEPENDENCIES = libkmlxsd.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+xsd_simple_type_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-+	$(xsd_simple_type_test_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- am_xsd_util_test_OBJECTS = xsd_util_test-xsd_util_test.$(OBJEXT)
- xsd_util_test_OBJECTS = $(am_xsd_util_test_OBJECTS)
- xsd_util_test_DEPENDENCIES = libkmlxsd.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
-+xsd_util_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(xsd_util_test_CXXFLAGS) \
-+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- am_xst_parser_test_OBJECTS =  \
- 	xst_parser_test-xst_parser_test.$(OBJEXT)
- xst_parser_test_OBJECTS = $(am_xst_parser_test_OBJECTS)
- xst_parser_test_DEPENDENCIES = libkmlxsd.la \
- 	$(top_builddir)/src/kml/base/libkmlbase.la \
- 	$(top_builddir)/third_party/libgtest.la
--DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+xst_parser_test_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-+	$(xst_parser_test_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
-+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+@@ -162,6 +179,7 @@
+ DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
  depcomp = $(SHELL) $(top_srcdir)/config/depcomp
  am__depfiles_maybe = depfiles
 +am__mv = mv -f
  CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
  	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
--	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
--	$(AM_CXXFLAGS) $(CXXFLAGS)
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- CXXLD = $(CXX)
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- SOURCES = $(libkmlxsd_la_SOURCES) $(xsd_complex_type_test_SOURCES) \
- 	$(xsd_element_test_SOURCES) $(xsd_file_test_SOURCES) \
- 	$(xsd_handler_test_SOURCES) $(xsd_primitive_type_test_SOURCES) \
-@@ -144,14 +200,13 @@
+ LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+@@ -182,10 +200,11 @@
  	$(xsd_primitive_type_test_SOURCES) $(xsd_schema_test_SOURCES) \
  	$(xsd_simple_type_test_SOURCES) $(xsd_util_test_SOURCES) \
  	$(xst_parser_test_SOURCES)
@@ -83120,57 +22497,8 @@
 +red=; grn=; lgn=; blu=; std=
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  ACLOCAL = @ACLOCAL@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
  AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -173,18 +228,16 @@
- CYGPATH_W = @CYGPATH_W@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
--ECHO = @ECHO@
-+DSYMUTIL = @DSYMUTIL@
-+DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
--F77 = @F77@
--FFLAGS = @FFLAGS@
--GCC_FALSE = @GCC_FALSE@
--GCC_TRUE = @GCC_TRUE@
--HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
--HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
-+FGREP = @FGREP@
-+GREP = @GREP@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -194,19 +247,28 @@
- JAVAC = @JAVAC@
- JAVA_INCLUDE_DIR = @JAVA_INCLUDE_DIR@
- JAVA_LIB_DIR = @JAVA_LIB_DIR@
-+LD = @LD@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
-+LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
-+NM = @NM@
-+NMEDIT = @NMEDIT@
-+OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
-+OTOOL = @OTOOL@
-+OTOOL64 = @OTOOL64@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -249,6 +268,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -83178,102 +22506,18 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PLATFORM = @PLATFORM@
-@@ -223,22 +285,13 @@
- STRIP = @STRIP@
- SWIG = @SWIG@
- VERSION = @VERSION@
--WITH_JAVA_FALSE = @WITH_JAVA_FALSE@
--WITH_JAVA_TRUE = @WITH_JAVA_TRUE@
--WITH_PYTHON_FALSE = @WITH_PYTHON_FALSE@
--WITH_PYTHON_TRUE = @WITH_PYTHON_TRUE@
--WITH_SWIG_FALSE = @WITH_SWIG_FALSE@
--WITH_SWIG_TRUE = @WITH_SWIG_TRUE@
--ac_ct_AR = @ac_ct_AR@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
--ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -250,28 +303,41 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- AM_CPPFLAGS = -I$(top_srcdir)/src \
+@@ -322,8 +342,8 @@
                -I$(top_srcdir)/third_party/boost_1_34_1 \
  	      -I$(top_srcdir)/third_party/googletest-r108/include
-@@ -304,17 +370,6 @@
- 	xst_parser.h
  
- DATA_DIR = $(top_srcdir)/testdata
--TESTS = \
--	xsd_complex_type_test \
--	xsd_file_test \
--	xsd_element_test \
--	xsd_handler_test \
--	xsd_primitive_type_test \
--	xsd_simple_type_test \
--	xsd_schema_test \
--	xsd_util_test \
--	xst_parser_test
--
- xsd_complex_type_test_SOURCES = xsd_complex_type_test.cc
- xsd_complex_type_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
- xsd_complex_type_test_LDADD = libkmlxsd.la \
-@@ -378,14 +433,14 @@
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
--	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
--		&& exit 0; \
-+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-+	        && { if test -f $@; then exit 0; else break; fi; }; \
+- at GCC_TRUE@AM_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -Werror -ansi -pedantic -fno-rtti
+- at GCC_TRUE@AM_TEST_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -Werror -ansi -fno-rtti -DGTEST_HAS_RTTI=0
++ at GCC_TRUE@AM_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -ansi -pedantic -fno-rtti
++ at GCC_TRUE@AM_TEST_CXXFLAGS = -Wall -Wextra -Wno-unused-parameter -ansi -fno-rtti -DGTEST_HAS_RTTI=0
+ lib_LTLIBRARIES = libkmlxsd.la
+ libkmlxsd_la_SOURCES = \
+ 	xsd_complex_type.cc \
+@@ -418,9 +438,9 @@
  	      exit 1;; \
  	  esac; \
  	done; \
@@ -83286,22 +22530,21 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -403,23 +458,28 @@
+@@ -438,23 +458,28 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(am__aclocal_m4_deps):
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
--	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ 	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 -	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 +	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
 +	list2=; for p in $$list; do \
  	  if test -f $$p; then \
 -	    f=$(am__strip_dir) \
--	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
--	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+-	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+-	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
 +	    list2="$$list2 $$p"; \
  	  else :; fi; \
 -	done
@@ -83313,10 +22556,10 @@
  
  uninstall-libLTLIBRARIES:
  	@$(NORMAL_UNINSTALL)
--	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 -	  p=$(am__strip_dir) \
--	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
--	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
 +	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
 +	for p in $$list; do \
 +	  $(am__strip_dir) \
@@ -83325,12 +22568,8 @@
  	done
  
  clean-libLTLIBRARIES:
-@@ -431,41 +491,43 @@
- 	  rm -f "$${dir}/so_locations"; \
- 	done
- libkmlxsd.la: $(libkmlxsd_la_OBJECTS) $(libkmlxsd_la_DEPENDENCIES) 
--	$(CXXLINK) -rpath $(libdir) $(libkmlxsd_la_LDFLAGS) $(libkmlxsd_la_OBJECTS) $(libkmlxsd_la_LIBADD) $(LIBS)
-+	$(CXXLINK) -rpath $(libdir) $(libkmlxsd_la_OBJECTS) $(libkmlxsd_la_LIBADD) $(LIBS)
+@@ -469,11 +494,13 @@
+ 	$(CXXLINK) -rpath $(libdir) $(libkmlxsd_la_OBJECTS) $(libkmlxsd_la_LIBADD) $(LIBS)
  
  clean-checkPROGRAMS:
 -	@list='$(check_PROGRAMS)'; for p in $$list; do \
@@ -83347,247 +22586,181 @@
 +	rm -f $$list
  xsd_complex_type_test$(EXEEXT): $(xsd_complex_type_test_OBJECTS) $(xsd_complex_type_test_DEPENDENCIES) 
  	@rm -f xsd_complex_type_test$(EXEEXT)
--	$(CXXLINK) $(xsd_complex_type_test_LDFLAGS) $(xsd_complex_type_test_OBJECTS) $(xsd_complex_type_test_LDADD) $(LIBS)
-+	$(xsd_complex_type_test_LINK) $(xsd_complex_type_test_OBJECTS) $(xsd_complex_type_test_LDADD) $(LIBS)
- xsd_element_test$(EXEEXT): $(xsd_element_test_OBJECTS) $(xsd_element_test_DEPENDENCIES) 
- 	@rm -f xsd_element_test$(EXEEXT)
--	$(CXXLINK) $(xsd_element_test_LDFLAGS) $(xsd_element_test_OBJECTS) $(xsd_element_test_LDADD) $(LIBS)
-+	$(xsd_element_test_LINK) $(xsd_element_test_OBJECTS) $(xsd_element_test_LDADD) $(LIBS)
- xsd_file_test$(EXEEXT): $(xsd_file_test_OBJECTS) $(xsd_file_test_DEPENDENCIES) 
- 	@rm -f xsd_file_test$(EXEEXT)
--	$(CXXLINK) $(xsd_file_test_LDFLAGS) $(xsd_file_test_OBJECTS) $(xsd_file_test_LDADD) $(LIBS)
-+	$(xsd_file_test_LINK) $(xsd_file_test_OBJECTS) $(xsd_file_test_LDADD) $(LIBS)
- xsd_handler_test$(EXEEXT): $(xsd_handler_test_OBJECTS) $(xsd_handler_test_DEPENDENCIES) 
- 	@rm -f xsd_handler_test$(EXEEXT)
--	$(CXXLINK) $(xsd_handler_test_LDFLAGS) $(xsd_handler_test_OBJECTS) $(xsd_handler_test_LDADD) $(LIBS)
-+	$(xsd_handler_test_LINK) $(xsd_handler_test_OBJECTS) $(xsd_handler_test_LDADD) $(LIBS)
- xsd_primitive_type_test$(EXEEXT): $(xsd_primitive_type_test_OBJECTS) $(xsd_primitive_type_test_DEPENDENCIES) 
- 	@rm -f xsd_primitive_type_test$(EXEEXT)
--	$(CXXLINK) $(xsd_primitive_type_test_LDFLAGS) $(xsd_primitive_type_test_OBJECTS) $(xsd_primitive_type_test_LDADD) $(LIBS)
-+	$(xsd_primitive_type_test_LINK) $(xsd_primitive_type_test_OBJECTS) $(xsd_primitive_type_test_LDADD) $(LIBS)
- xsd_schema_test$(EXEEXT): $(xsd_schema_test_OBJECTS) $(xsd_schema_test_DEPENDENCIES) 
- 	@rm -f xsd_schema_test$(EXEEXT)
--	$(CXXLINK) $(xsd_schema_test_LDFLAGS) $(xsd_schema_test_OBJECTS) $(xsd_schema_test_LDADD) $(LIBS)
-+	$(xsd_schema_test_LINK) $(xsd_schema_test_OBJECTS) $(xsd_schema_test_LDADD) $(LIBS)
- xsd_simple_type_test$(EXEEXT): $(xsd_simple_type_test_OBJECTS) $(xsd_simple_type_test_DEPENDENCIES) 
- 	@rm -f xsd_simple_type_test$(EXEEXT)
--	$(CXXLINK) $(xsd_simple_type_test_LDFLAGS) $(xsd_simple_type_test_OBJECTS) $(xsd_simple_type_test_LDADD) $(LIBS)
-+	$(xsd_simple_type_test_LINK) $(xsd_simple_type_test_OBJECTS) $(xsd_simple_type_test_LDADD) $(LIBS)
- xsd_util_test$(EXEEXT): $(xsd_util_test_OBJECTS) $(xsd_util_test_DEPENDENCIES) 
- 	@rm -f xsd_util_test$(EXEEXT)
--	$(CXXLINK) $(xsd_util_test_LDFLAGS) $(xsd_util_test_OBJECTS) $(xsd_util_test_LDADD) $(LIBS)
-+	$(xsd_util_test_LINK) $(xsd_util_test_OBJECTS) $(xsd_util_test_LDADD) $(LIBS)
- xst_parser_test$(EXEEXT): $(xst_parser_test_OBJECTS) $(xst_parser_test_DEPENDENCIES) 
- 	@rm -f xst_parser_test$(EXEEXT)
--	$(CXXLINK) $(xst_parser_test_LDFLAGS) $(xst_parser_test_OBJECTS) $(xst_parser_test_LDADD) $(LIBS)
-+	$(xst_parser_test_LINK) $(xst_parser_test_OBJECTS) $(xst_parser_test_LDADD) $(LIBS)
+ 	$(xsd_complex_type_test_LINK) $(xsd_complex_type_test_OBJECTS) $(xsd_complex_type_test_LDADD) $(LIBS)
+@@ -527,147 +554,147 @@
  
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -491,148 +553,148 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/xst_parser_test-xst_parser_test.Po at am__quote@
- 
  .cc.o:
-- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
  
  .cc.obj:
-- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
  
  .cc.lo:
-- at am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
  
  xsd_complex_type_test-xsd_complex_type_test.o: xsd_complex_type_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsd_complex_type_test_CXXFLAGS) $(CXXFLAGS) -MT xsd_complex_type_test-xsd_complex_type_test.o -MD -MP -MF "$(DEPDIR)/xsd_complex_type_test-xsd_complex_type_test.Tpo" -c -o xsd_complex_type_test-xsd_complex_type_test.o `test -f 'xsd_complex_type_test.cc' || echo '$(srcdir)/'`xsd_complex_type_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/xsd_complex_type_test-xsd_complex_type_test.Tpo" "$(DEPDIR)/xsd_complex_type_test-xsd_complex_type_test.Po"; else rm -f "$(DEPDIR)/xsd_complex_type_test-xsd_complex_type_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsd_complex_type_test_CXXFLAGS) $(CXXFLAGS) -MT xsd_complex_type_test-xsd_complex_type_test.o -MD -MP -MF $(DEPDIR)/xsd_complex_type_test-xsd_complex_type_test.Tpo -c -o xsd_complex_type_test-xsd_complex_type_test.o `test -f 'xsd_complex_type_test.cc' || echo '$(srcdir)/'`xsd_complex_type_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsd_complex_type_test_CXXFLAGS) $(CXXFLAGS) -MT xsd_complex_type_test-xsd_complex_type_test.o -MD -MP -MF $(DEPDIR)/xsd_complex_type_test-xsd_complex_type_test.Tpo -c -o xsd_complex_type_test-xsd_complex_type_test.o `test -f 'xsd_complex_type_test.cc' || echo '$(srcdir)/'`xsd_complex_type_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/xsd_complex_type_test-xsd_complex_type_test.Tpo $(DEPDIR)/xsd_complex_type_test-xsd_complex_type_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/xsd_complex_type_test-xsd_complex_type_test.Tpo $(DEPDIR)/xsd_complex_type_test-xsd_complex_type_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='xsd_complex_type_test.cc' object='xsd_complex_type_test-xsd_complex_type_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsd_complex_type_test_CXXFLAGS) $(CXXFLAGS) -c -o xsd_complex_type_test-xsd_complex_type_test.o `test -f 'xsd_complex_type_test.cc' || echo '$(srcdir)/'`xsd_complex_type_test.cc
  
  xsd_complex_type_test-xsd_complex_type_test.obj: xsd_complex_type_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsd_complex_type_test_CXXFLAGS) $(CXXFLAGS) -MT xsd_complex_type_test-xsd_complex_type_test.obj -MD -MP -MF "$(DEPDIR)/xsd_complex_type_test-xsd_complex_type_test.Tpo" -c -o xsd_complex_type_test-xsd_complex_type_test.obj `if test -f 'xsd_complex_type_test.cc'; then $(CYGPATH_W) 'xsd_complex_type_test.cc'; else $(CYGPATH_W) '$(srcdir)/xsd_complex_type_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/xsd_complex_type_test-xsd_complex_type_test.Tpo" "$(DEPDIR)/xsd_complex_type_test-xsd_complex_type_test.Po"; else rm -f "$(DEPDIR)/xsd_complex_type_test-xsd_complex_type_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsd_complex_type_test_CXXFLAGS) $(CXXFLAGS) -MT xsd_complex_type_test-xsd_complex_type_test.obj -MD -MP -MF $(DEPDIR)/xsd_complex_type_test-xsd_complex_type_test.Tpo -c -o xsd_complex_type_test-xsd_complex_type_test.obj `if test -f 'xsd_complex_type_test.cc'; then $(CYGPATH_W) 'xsd_complex_type_test.cc'; else $(CYGPATH_W) '$(srcdir)/xsd_complex_type_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsd_complex_type_test_CXXFLAGS) $(CXXFLAGS) -MT xsd_complex_type_test-xsd_complex_type_test.obj -MD -MP -MF $(DEPDIR)/xsd_complex_type_test-xsd_complex_type_test.Tpo -c -o xsd_complex_type_test-xsd_complex_type_test.obj `if test -f 'xsd_complex_type_test.cc'; then $(CYGPATH_W) 'xsd_complex_type_test.cc'; else $(CYGPATH_W) '$(srcdir)/xsd_complex_type_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/xsd_complex_type_test-xsd_complex_type_test.Tpo $(DEPDIR)/xsd_complex_type_test-xsd_complex_type_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/xsd_complex_type_test-xsd_complex_type_test.Tpo $(DEPDIR)/xsd_complex_type_test-xsd_complex_type_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='xsd_complex_type_test.cc' object='xsd_complex_type_test-xsd_complex_type_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsd_complex_type_test_CXXFLAGS) $(CXXFLAGS) -c -o xsd_complex_type_test-xsd_complex_type_test.obj `if test -f 'xsd_complex_type_test.cc'; then $(CYGPATH_W) 'xsd_complex_type_test.cc'; else $(CYGPATH_W) '$(srcdir)/xsd_complex_type_test.cc'; fi`
  
  xsd_element_test-xsd_element_test.o: xsd_element_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsd_element_test_CXXFLAGS) $(CXXFLAGS) -MT xsd_element_test-xsd_element_test.o -MD -MP -MF "$(DEPDIR)/xsd_element_test-xsd_element_test.Tpo" -c -o xsd_element_test-xsd_element_test.o `test -f 'xsd_element_test.cc' || echo '$(srcdir)/'`xsd_element_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/xsd_element_test-xsd_element_test.Tpo" "$(DEPDIR)/xsd_element_test-xsd_element_test.Po"; else rm -f "$(DEPDIR)/xsd_element_test-xsd_element_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsd_element_test_CXXFLAGS) $(CXXFLAGS) -MT xsd_element_test-xsd_element_test.o -MD -MP -MF $(DEPDIR)/xsd_element_test-xsd_element_test.Tpo -c -o xsd_element_test-xsd_element_test.o `test -f 'xsd_element_test.cc' || echo '$(srcdir)/'`xsd_element_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsd_element_test_CXXFLAGS) $(CXXFLAGS) -MT xsd_element_test-xsd_element_test.o -MD -MP -MF $(DEPDIR)/xsd_element_test-xsd_element_test.Tpo -c -o xsd_element_test-xsd_element_test.o `test -f 'xsd_element_test.cc' || echo '$(srcdir)/'`xsd_element_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/xsd_element_test-xsd_element_test.Tpo $(DEPDIR)/xsd_element_test-xsd_element_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/xsd_element_test-xsd_element_test.Tpo $(DEPDIR)/xsd_element_test-xsd_element_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='xsd_element_test.cc' object='xsd_element_test-xsd_element_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsd_element_test_CXXFLAGS) $(CXXFLAGS) -c -o xsd_element_test-xsd_element_test.o `test -f 'xsd_element_test.cc' || echo '$(srcdir)/'`xsd_element_test.cc
  
  xsd_element_test-xsd_element_test.obj: xsd_element_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsd_element_test_CXXFLAGS) $(CXXFLAGS) -MT xsd_element_test-xsd_element_test.obj -MD -MP -MF "$(DEPDIR)/xsd_element_test-xsd_element_test.Tpo" -c -o xsd_element_test-xsd_element_test.obj `if test -f 'xsd_element_test.cc'; then $(CYGPATH_W) 'xsd_element_test.cc'; else $(CYGPATH_W) '$(srcdir)/xsd_element_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/xsd_element_test-xsd_element_test.Tpo" "$(DEPDIR)/xsd_element_test-xsd_element_test.Po"; else rm -f "$(DEPDIR)/xsd_element_test-xsd_element_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsd_element_test_CXXFLAGS) $(CXXFLAGS) -MT xsd_element_test-xsd_element_test.obj -MD -MP -MF $(DEPDIR)/xsd_element_test-xsd_element_test.Tpo -c -o xsd_element_test-xsd_element_test.obj `if test -f 'xsd_element_test.cc'; then $(CYGPATH_W) 'xsd_element_test.cc'; else $(CYGPATH_W) '$(srcdir)/xsd_element_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsd_element_test_CXXFLAGS) $(CXXFLAGS) -MT xsd_element_test-xsd_element_test.obj -MD -MP -MF $(DEPDIR)/xsd_element_test-xsd_element_test.Tpo -c -o xsd_element_test-xsd_element_test.obj `if test -f 'xsd_element_test.cc'; then $(CYGPATH_W) 'xsd_element_test.cc'; else $(CYGPATH_W) '$(srcdir)/xsd_element_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/xsd_element_test-xsd_element_test.Tpo $(DEPDIR)/xsd_element_test-xsd_element_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/xsd_element_test-xsd_element_test.Tpo $(DEPDIR)/xsd_element_test-xsd_element_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='xsd_element_test.cc' object='xsd_element_test-xsd_element_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsd_element_test_CXXFLAGS) $(CXXFLAGS) -c -o xsd_element_test-xsd_element_test.obj `if test -f 'xsd_element_test.cc'; then $(CYGPATH_W) 'xsd_element_test.cc'; else $(CYGPATH_W) '$(srcdir)/xsd_element_test.cc'; fi`
  
  xsd_file_test-xsd_file_test.o: xsd_file_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsd_file_test_CXXFLAGS) $(CXXFLAGS) -MT xsd_file_test-xsd_file_test.o -MD -MP -MF "$(DEPDIR)/xsd_file_test-xsd_file_test.Tpo" -c -o xsd_file_test-xsd_file_test.o `test -f 'xsd_file_test.cc' || echo '$(srcdir)/'`xsd_file_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/xsd_file_test-xsd_file_test.Tpo" "$(DEPDIR)/xsd_file_test-xsd_file_test.Po"; else rm -f "$(DEPDIR)/xsd_file_test-xsd_file_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsd_file_test_CXXFLAGS) $(CXXFLAGS) -MT xsd_file_test-xsd_file_test.o -MD -MP -MF $(DEPDIR)/xsd_file_test-xsd_file_test.Tpo -c -o xsd_file_test-xsd_file_test.o `test -f 'xsd_file_test.cc' || echo '$(srcdir)/'`xsd_file_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsd_file_test_CXXFLAGS) $(CXXFLAGS) -MT xsd_file_test-xsd_file_test.o -MD -MP -MF $(DEPDIR)/xsd_file_test-xsd_file_test.Tpo -c -o xsd_file_test-xsd_file_test.o `test -f 'xsd_file_test.cc' || echo '$(srcdir)/'`xsd_file_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/xsd_file_test-xsd_file_test.Tpo $(DEPDIR)/xsd_file_test-xsd_file_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/xsd_file_test-xsd_file_test.Tpo $(DEPDIR)/xsd_file_test-xsd_file_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='xsd_file_test.cc' object='xsd_file_test-xsd_file_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsd_file_test_CXXFLAGS) $(CXXFLAGS) -c -o xsd_file_test-xsd_file_test.o `test -f 'xsd_file_test.cc' || echo '$(srcdir)/'`xsd_file_test.cc
  
  xsd_file_test-xsd_file_test.obj: xsd_file_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsd_file_test_CXXFLAGS) $(CXXFLAGS) -MT xsd_file_test-xsd_file_test.obj -MD -MP -MF "$(DEPDIR)/xsd_file_test-xsd_file_test.Tpo" -c -o xsd_file_test-xsd_file_test.obj `if test -f 'xsd_file_test.cc'; then $(CYGPATH_W) 'xsd_file_test.cc'; else $(CYGPATH_W) '$(srcdir)/xsd_file_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/xsd_file_test-xsd_file_test.Tpo" "$(DEPDIR)/xsd_file_test-xsd_file_test.Po"; else rm -f "$(DEPDIR)/xsd_file_test-xsd_file_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsd_file_test_CXXFLAGS) $(CXXFLAGS) -MT xsd_file_test-xsd_file_test.obj -MD -MP -MF $(DEPDIR)/xsd_file_test-xsd_file_test.Tpo -c -o xsd_file_test-xsd_file_test.obj `if test -f 'xsd_file_test.cc'; then $(CYGPATH_W) 'xsd_file_test.cc'; else $(CYGPATH_W) '$(srcdir)/xsd_file_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsd_file_test_CXXFLAGS) $(CXXFLAGS) -MT xsd_file_test-xsd_file_test.obj -MD -MP -MF $(DEPDIR)/xsd_file_test-xsd_file_test.Tpo -c -o xsd_file_test-xsd_file_test.obj `if test -f 'xsd_file_test.cc'; then $(CYGPATH_W) 'xsd_file_test.cc'; else $(CYGPATH_W) '$(srcdir)/xsd_file_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/xsd_file_test-xsd_file_test.Tpo $(DEPDIR)/xsd_file_test-xsd_file_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/xsd_file_test-xsd_file_test.Tpo $(DEPDIR)/xsd_file_test-xsd_file_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='xsd_file_test.cc' object='xsd_file_test-xsd_file_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsd_file_test_CXXFLAGS) $(CXXFLAGS) -c -o xsd_file_test-xsd_file_test.obj `if test -f 'xsd_file_test.cc'; then $(CYGPATH_W) 'xsd_file_test.cc'; else $(CYGPATH_W) '$(srcdir)/xsd_file_test.cc'; fi`
  
  xsd_handler_test-xsd_handler_test.o: xsd_handler_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsd_handler_test_CXXFLAGS) $(CXXFLAGS) -MT xsd_handler_test-xsd_handler_test.o -MD -MP -MF "$(DEPDIR)/xsd_handler_test-xsd_handler_test.Tpo" -c -o xsd_handler_test-xsd_handler_test.o `test -f 'xsd_handler_test.cc' || echo '$(srcdir)/'`xsd_handler_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/xsd_handler_test-xsd_handler_test.Tpo" "$(DEPDIR)/xsd_handler_test-xsd_handler_test.Po"; else rm -f "$(DEPDIR)/xsd_handler_test-xsd_handler_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsd_handler_test_CXXFLAGS) $(CXXFLAGS) -MT xsd_handler_test-xsd_handler_test.o -MD -MP -MF $(DEPDIR)/xsd_handler_test-xsd_handler_test.Tpo -c -o xsd_handler_test-xsd_handler_test.o `test -f 'xsd_handler_test.cc' || echo '$(srcdir)/'`xsd_handler_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsd_handler_test_CXXFLAGS) $(CXXFLAGS) -MT xsd_handler_test-xsd_handler_test.o -MD -MP -MF $(DEPDIR)/xsd_handler_test-xsd_handler_test.Tpo -c -o xsd_handler_test-xsd_handler_test.o `test -f 'xsd_handler_test.cc' || echo '$(srcdir)/'`xsd_handler_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/xsd_handler_test-xsd_handler_test.Tpo $(DEPDIR)/xsd_handler_test-xsd_handler_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/xsd_handler_test-xsd_handler_test.Tpo $(DEPDIR)/xsd_handler_test-xsd_handler_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='xsd_handler_test.cc' object='xsd_handler_test-xsd_handler_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsd_handler_test_CXXFLAGS) $(CXXFLAGS) -c -o xsd_handler_test-xsd_handler_test.o `test -f 'xsd_handler_test.cc' || echo '$(srcdir)/'`xsd_handler_test.cc
  
  xsd_handler_test-xsd_handler_test.obj: xsd_handler_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsd_handler_test_CXXFLAGS) $(CXXFLAGS) -MT xsd_handler_test-xsd_handler_test.obj -MD -MP -MF "$(DEPDIR)/xsd_handler_test-xsd_handler_test.Tpo" -c -o xsd_handler_test-xsd_handler_test.obj `if test -f 'xsd_handler_test.cc'; then $(CYGPATH_W) 'xsd_handler_test.cc'; else $(CYGPATH_W) '$(srcdir)/xsd_handler_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/xsd_handler_test-xsd_handler_test.Tpo" "$(DEPDIR)/xsd_handler_test-xsd_handler_test.Po"; else rm -f "$(DEPDIR)/xsd_handler_test-xsd_handler_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsd_handler_test_CXXFLAGS) $(CXXFLAGS) -MT xsd_handler_test-xsd_handler_test.obj -MD -MP -MF $(DEPDIR)/xsd_handler_test-xsd_handler_test.Tpo -c -o xsd_handler_test-xsd_handler_test.obj `if test -f 'xsd_handler_test.cc'; then $(CYGPATH_W) 'xsd_handler_test.cc'; else $(CYGPATH_W) '$(srcdir)/xsd_handler_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsd_handler_test_CXXFLAGS) $(CXXFLAGS) -MT xsd_handler_test-xsd_handler_test.obj -MD -MP -MF $(DEPDIR)/xsd_handler_test-xsd_handler_test.Tpo -c -o xsd_handler_test-xsd_handler_test.obj `if test -f 'xsd_handler_test.cc'; then $(CYGPATH_W) 'xsd_handler_test.cc'; else $(CYGPATH_W) '$(srcdir)/xsd_handler_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/xsd_handler_test-xsd_handler_test.Tpo $(DEPDIR)/xsd_handler_test-xsd_handler_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/xsd_handler_test-xsd_handler_test.Tpo $(DEPDIR)/xsd_handler_test-xsd_handler_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='xsd_handler_test.cc' object='xsd_handler_test-xsd_handler_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsd_handler_test_CXXFLAGS) $(CXXFLAGS) -c -o xsd_handler_test-xsd_handler_test.obj `if test -f 'xsd_handler_test.cc'; then $(CYGPATH_W) 'xsd_handler_test.cc'; else $(CYGPATH_W) '$(srcdir)/xsd_handler_test.cc'; fi`
  
  xsd_primitive_type_test-xsd_primitive_type_test.o: xsd_primitive_type_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsd_primitive_type_test_CXXFLAGS) $(CXXFLAGS) -MT xsd_primitive_type_test-xsd_primitive_type_test.o -MD -MP -MF "$(DEPDIR)/xsd_primitive_type_test-xsd_primitive_type_test.Tpo" -c -o xsd_primitive_type_test-xsd_primitive_type_test.o `test -f 'xsd_primitive_type_test.cc' || echo '$(srcdir)/'`xsd_primitive_type_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/xsd_primitive_type_test-xsd_primitive_type_test.Tpo" "$(DEPDIR)/xsd_primitive_type_test-xsd_primitive_type_test.Po"; else rm -f "$(DEPDIR)/xsd_primitive_type_test-xsd_primitive_type_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsd_primitive_type_test_CXXFLAGS) $(CXXFLAGS) -MT xsd_primitive_type_test-xsd_primitive_type_test.o -MD -MP -MF $(DEPDIR)/xsd_primitive_type_test-xsd_primitive_type_test.Tpo -c -o xsd_primitive_type_test-xsd_primitive_type_test.o `test -f 'xsd_primitive_type_test.cc' || echo '$(srcdir)/'`xsd_primitive_type_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsd_primitive_type_test_CXXFLAGS) $(CXXFLAGS) -MT xsd_primitive_type_test-xsd_primitive_type_test.o -MD -MP -MF $(DEPDIR)/xsd_primitive_type_test-xsd_primitive_type_test.Tpo -c -o xsd_primitive_type_test-xsd_primitive_type_test.o `test -f 'xsd_primitive_type_test.cc' || echo '$(srcdir)/'`xsd_primitive_type_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/xsd_primitive_type_test-xsd_primitive_type_test.Tpo $(DEPDIR)/xsd_primitive_type_test-xsd_primitive_type_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/xsd_primitive_type_test-xsd_primitive_type_test.Tpo $(DEPDIR)/xsd_primitive_type_test-xsd_primitive_type_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='xsd_primitive_type_test.cc' object='xsd_primitive_type_test-xsd_primitive_type_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsd_primitive_type_test_CXXFLAGS) $(CXXFLAGS) -c -o xsd_primitive_type_test-xsd_primitive_type_test.o `test -f 'xsd_primitive_type_test.cc' || echo '$(srcdir)/'`xsd_primitive_type_test.cc
  
  xsd_primitive_type_test-xsd_primitive_type_test.obj: xsd_primitive_type_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsd_primitive_type_test_CXXFLAGS) $(CXXFLAGS) -MT xsd_primitive_type_test-xsd_primitive_type_test.obj -MD -MP -MF "$(DEPDIR)/xsd_primitive_type_test-xsd_primitive_type_test.Tpo" -c -o xsd_primitive_type_test-xsd_primitive_type_test.obj `if test -f 'xsd_primitive_type_test.cc'; then $(CYGPATH_W) 'xsd_primitive_type_test.cc'; else $(CYGPATH_W) '$(srcdir)/xsd_primitive_type_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/xsd_primitive_type_test-xsd_primitive_type_test.Tpo" "$(DEPDIR)/xsd_primitive_type_test-xsd_primitive_type_test.Po"; else rm -f "$(DEPDIR)/xsd_primitive_type_test-xsd_primitive_type_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsd_primitive_type_test_CXXFLAGS) $(CXXFLAGS) -MT xsd_primitive_type_test-xsd_primitive_type_test.obj -MD -MP -MF $(DEPDIR)/xsd_primitive_type_test-xsd_primitive_type_test.Tpo -c -o xsd_primitive_type_test-xsd_primitive_type_test.obj `if test -f 'xsd_primitive_type_test.cc'; then $(CYGPATH_W) 'xsd_primitive_type_test.cc'; else $(CYGPATH_W) '$(srcdir)/xsd_primitive_type_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsd_primitive_type_test_CXXFLAGS) $(CXXFLAGS) -MT xsd_primitive_type_test-xsd_primitive_type_test.obj -MD -MP -MF $(DEPDIR)/xsd_primitive_type_test-xsd_primitive_type_test.Tpo -c -o xsd_primitive_type_test-xsd_primitive_type_test.obj `if test -f 'xsd_primitive_type_test.cc'; then $(CYGPATH_W) 'xsd_primitive_type_test.cc'; else $(CYGPATH_W) '$(srcdir)/xsd_primitive_type_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/xsd_primitive_type_test-xsd_primitive_type_test.Tpo $(DEPDIR)/xsd_primitive_type_test-xsd_primitive_type_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/xsd_primitive_type_test-xsd_primitive_type_test.Tpo $(DEPDIR)/xsd_primitive_type_test-xsd_primitive_type_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='xsd_primitive_type_test.cc' object='xsd_primitive_type_test-xsd_primitive_type_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsd_primitive_type_test_CXXFLAGS) $(CXXFLAGS) -c -o xsd_primitive_type_test-xsd_primitive_type_test.obj `if test -f 'xsd_primitive_type_test.cc'; then $(CYGPATH_W) 'xsd_primitive_type_test.cc'; else $(CYGPATH_W) '$(srcdir)/xsd_primitive_type_test.cc'; fi`
  
  xsd_schema_test-xsd_schema_test.o: xsd_schema_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsd_schema_test_CXXFLAGS) $(CXXFLAGS) -MT xsd_schema_test-xsd_schema_test.o -MD -MP -MF "$(DEPDIR)/xsd_schema_test-xsd_schema_test.Tpo" -c -o xsd_schema_test-xsd_schema_test.o `test -f 'xsd_schema_test.cc' || echo '$(srcdir)/'`xsd_schema_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/xsd_schema_test-xsd_schema_test.Tpo" "$(DEPDIR)/xsd_schema_test-xsd_schema_test.Po"; else rm -f "$(DEPDIR)/xsd_schema_test-xsd_schema_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsd_schema_test_CXXFLAGS) $(CXXFLAGS) -MT xsd_schema_test-xsd_schema_test.o -MD -MP -MF $(DEPDIR)/xsd_schema_test-xsd_schema_test.Tpo -c -o xsd_schema_test-xsd_schema_test.o `test -f 'xsd_schema_test.cc' || echo '$(srcdir)/'`xsd_schema_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsd_schema_test_CXXFLAGS) $(CXXFLAGS) -MT xsd_schema_test-xsd_schema_test.o -MD -MP -MF $(DEPDIR)/xsd_schema_test-xsd_schema_test.Tpo -c -o xsd_schema_test-xsd_schema_test.o `test -f 'xsd_schema_test.cc' || echo '$(srcdir)/'`xsd_schema_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/xsd_schema_test-xsd_schema_test.Tpo $(DEPDIR)/xsd_schema_test-xsd_schema_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/xsd_schema_test-xsd_schema_test.Tpo $(DEPDIR)/xsd_schema_test-xsd_schema_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='xsd_schema_test.cc' object='xsd_schema_test-xsd_schema_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsd_schema_test_CXXFLAGS) $(CXXFLAGS) -c -o xsd_schema_test-xsd_schema_test.o `test -f 'xsd_schema_test.cc' || echo '$(srcdir)/'`xsd_schema_test.cc
  
  xsd_schema_test-xsd_schema_test.obj: xsd_schema_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsd_schema_test_CXXFLAGS) $(CXXFLAGS) -MT xsd_schema_test-xsd_schema_test.obj -MD -MP -MF "$(DEPDIR)/xsd_schema_test-xsd_schema_test.Tpo" -c -o xsd_schema_test-xsd_schema_test.obj `if test -f 'xsd_schema_test.cc'; then $(CYGPATH_W) 'xsd_schema_test.cc'; else $(CYGPATH_W) '$(srcdir)/xsd_schema_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/xsd_schema_test-xsd_schema_test.Tpo" "$(DEPDIR)/xsd_schema_test-xsd_schema_test.Po"; else rm -f "$(DEPDIR)/xsd_schema_test-xsd_schema_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsd_schema_test_CXXFLAGS) $(CXXFLAGS) -MT xsd_schema_test-xsd_schema_test.obj -MD -MP -MF $(DEPDIR)/xsd_schema_test-xsd_schema_test.Tpo -c -o xsd_schema_test-xsd_schema_test.obj `if test -f 'xsd_schema_test.cc'; then $(CYGPATH_W) 'xsd_schema_test.cc'; else $(CYGPATH_W) '$(srcdir)/xsd_schema_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsd_schema_test_CXXFLAGS) $(CXXFLAGS) -MT xsd_schema_test-xsd_schema_test.obj -MD -MP -MF $(DEPDIR)/xsd_schema_test-xsd_schema_test.Tpo -c -o xsd_schema_test-xsd_schema_test.obj `if test -f 'xsd_schema_test.cc'; then $(CYGPATH_W) 'xsd_schema_test.cc'; else $(CYGPATH_W) '$(srcdir)/xsd_schema_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/xsd_schema_test-xsd_schema_test.Tpo $(DEPDIR)/xsd_schema_test-xsd_schema_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/xsd_schema_test-xsd_schema_test.Tpo $(DEPDIR)/xsd_schema_test-xsd_schema_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='xsd_schema_test.cc' object='xsd_schema_test-xsd_schema_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsd_schema_test_CXXFLAGS) $(CXXFLAGS) -c -o xsd_schema_test-xsd_schema_test.obj `if test -f 'xsd_schema_test.cc'; then $(CYGPATH_W) 'xsd_schema_test.cc'; else $(CYGPATH_W) '$(srcdir)/xsd_schema_test.cc'; fi`
  
  xsd_simple_type_test-xsd_simple_type_test.o: xsd_simple_type_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsd_simple_type_test_CXXFLAGS) $(CXXFLAGS) -MT xsd_simple_type_test-xsd_simple_type_test.o -MD -MP -MF "$(DEPDIR)/xsd_simple_type_test-xsd_simple_type_test.Tpo" -c -o xsd_simple_type_test-xsd_simple_type_test.o `test -f 'xsd_simple_type_test.cc' || echo '$(srcdir)/'`xsd_simple_type_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/xsd_simple_type_test-xsd_simple_type_test.Tpo" "$(DEPDIR)/xsd_simple_type_test-xsd_simple_type_test.Po"; else rm -f "$(DEPDIR)/xsd_simple_type_test-xsd_simple_type_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsd_simple_type_test_CXXFLAGS) $(CXXFLAGS) -MT xsd_simple_type_test-xsd_simple_type_test.o -MD -MP -MF $(DEPDIR)/xsd_simple_type_test-xsd_simple_type_test.Tpo -c -o xsd_simple_type_test-xsd_simple_type_test.o `test -f 'xsd_simple_type_test.cc' || echo '$(srcdir)/'`xsd_simple_type_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsd_simple_type_test_CXXFLAGS) $(CXXFLAGS) -MT xsd_simple_type_test-xsd_simple_type_test.o -MD -MP -MF $(DEPDIR)/xsd_simple_type_test-xsd_simple_type_test.Tpo -c -o xsd_simple_type_test-xsd_simple_type_test.o `test -f 'xsd_simple_type_test.cc' || echo '$(srcdir)/'`xsd_simple_type_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/xsd_simple_type_test-xsd_simple_type_test.Tpo $(DEPDIR)/xsd_simple_type_test-xsd_simple_type_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/xsd_simple_type_test-xsd_simple_type_test.Tpo $(DEPDIR)/xsd_simple_type_test-xsd_simple_type_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='xsd_simple_type_test.cc' object='xsd_simple_type_test-xsd_simple_type_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsd_simple_type_test_CXXFLAGS) $(CXXFLAGS) -c -o xsd_simple_type_test-xsd_simple_type_test.o `test -f 'xsd_simple_type_test.cc' || echo '$(srcdir)/'`xsd_simple_type_test.cc
  
  xsd_simple_type_test-xsd_simple_type_test.obj: xsd_simple_type_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsd_simple_type_test_CXXFLAGS) $(CXXFLAGS) -MT xsd_simple_type_test-xsd_simple_type_test.obj -MD -MP -MF "$(DEPDIR)/xsd_simple_type_test-xsd_simple_type_test.Tpo" -c -o xsd_simple_type_test-xsd_simple_type_test.obj `if test -f 'xsd_simple_type_test.cc'; then $(CYGPATH_W) 'xsd_simple_type_test.cc'; else $(CYGPATH_W) '$(srcdir)/xsd_simple_type_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/xsd_simple_type_test-xsd_simple_type_test.Tpo" "$(DEPDIR)/xsd_simple_type_test-xsd_simple_type_test.Po"; else rm -f "$(DEPDIR)/xsd_simple_type_test-xsd_simple_type_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsd_simple_type_test_CXXFLAGS) $(CXXFLAGS) -MT xsd_simple_type_test-xsd_simple_type_test.obj -MD -MP -MF $(DEPDIR)/xsd_simple_type_test-xsd_simple_type_test.Tpo -c -o xsd_simple_type_test-xsd_simple_type_test.obj `if test -f 'xsd_simple_type_test.cc'; then $(CYGPATH_W) 'xsd_simple_type_test.cc'; else $(CYGPATH_W) '$(srcdir)/xsd_simple_type_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsd_simple_type_test_CXXFLAGS) $(CXXFLAGS) -MT xsd_simple_type_test-xsd_simple_type_test.obj -MD -MP -MF $(DEPDIR)/xsd_simple_type_test-xsd_simple_type_test.Tpo -c -o xsd_simple_type_test-xsd_simple_type_test.obj `if test -f 'xsd_simple_type_test.cc'; then $(CYGPATH_W) 'xsd_simple_type_test.cc'; else $(CYGPATH_W) '$(srcdir)/xsd_simple_type_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/xsd_simple_type_test-xsd_simple_type_test.Tpo $(DEPDIR)/xsd_simple_type_test-xsd_simple_type_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/xsd_simple_type_test-xsd_simple_type_test.Tpo $(DEPDIR)/xsd_simple_type_test-xsd_simple_type_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='xsd_simple_type_test.cc' object='xsd_simple_type_test-xsd_simple_type_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsd_simple_type_test_CXXFLAGS) $(CXXFLAGS) -c -o xsd_simple_type_test-xsd_simple_type_test.obj `if test -f 'xsd_simple_type_test.cc'; then $(CYGPATH_W) 'xsd_simple_type_test.cc'; else $(CYGPATH_W) '$(srcdir)/xsd_simple_type_test.cc'; fi`
  
  xsd_util_test-xsd_util_test.o: xsd_util_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsd_util_test_CXXFLAGS) $(CXXFLAGS) -MT xsd_util_test-xsd_util_test.o -MD -MP -MF "$(DEPDIR)/xsd_util_test-xsd_util_test.Tpo" -c -o xsd_util_test-xsd_util_test.o `test -f 'xsd_util_test.cc' || echo '$(srcdir)/'`xsd_util_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/xsd_util_test-xsd_util_test.Tpo" "$(DEPDIR)/xsd_util_test-xsd_util_test.Po"; else rm -f "$(DEPDIR)/xsd_util_test-xsd_util_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsd_util_test_CXXFLAGS) $(CXXFLAGS) -MT xsd_util_test-xsd_util_test.o -MD -MP -MF $(DEPDIR)/xsd_util_test-xsd_util_test.Tpo -c -o xsd_util_test-xsd_util_test.o `test -f 'xsd_util_test.cc' || echo '$(srcdir)/'`xsd_util_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsd_util_test_CXXFLAGS) $(CXXFLAGS) -MT xsd_util_test-xsd_util_test.o -MD -MP -MF $(DEPDIR)/xsd_util_test-xsd_util_test.Tpo -c -o xsd_util_test-xsd_util_test.o `test -f 'xsd_util_test.cc' || echo '$(srcdir)/'`xsd_util_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/xsd_util_test-xsd_util_test.Tpo $(DEPDIR)/xsd_util_test-xsd_util_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/xsd_util_test-xsd_util_test.Tpo $(DEPDIR)/xsd_util_test-xsd_util_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='xsd_util_test.cc' object='xsd_util_test-xsd_util_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsd_util_test_CXXFLAGS) $(CXXFLAGS) -c -o xsd_util_test-xsd_util_test.o `test -f 'xsd_util_test.cc' || echo '$(srcdir)/'`xsd_util_test.cc
  
  xsd_util_test-xsd_util_test.obj: xsd_util_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsd_util_test_CXXFLAGS) $(CXXFLAGS) -MT xsd_util_test-xsd_util_test.obj -MD -MP -MF "$(DEPDIR)/xsd_util_test-xsd_util_test.Tpo" -c -o xsd_util_test-xsd_util_test.obj `if test -f 'xsd_util_test.cc'; then $(CYGPATH_W) 'xsd_util_test.cc'; else $(CYGPATH_W) '$(srcdir)/xsd_util_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/xsd_util_test-xsd_util_test.Tpo" "$(DEPDIR)/xsd_util_test-xsd_util_test.Po"; else rm -f "$(DEPDIR)/xsd_util_test-xsd_util_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsd_util_test_CXXFLAGS) $(CXXFLAGS) -MT xsd_util_test-xsd_util_test.obj -MD -MP -MF $(DEPDIR)/xsd_util_test-xsd_util_test.Tpo -c -o xsd_util_test-xsd_util_test.obj `if test -f 'xsd_util_test.cc'; then $(CYGPATH_W) 'xsd_util_test.cc'; else $(CYGPATH_W) '$(srcdir)/xsd_util_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsd_util_test_CXXFLAGS) $(CXXFLAGS) -MT xsd_util_test-xsd_util_test.obj -MD -MP -MF $(DEPDIR)/xsd_util_test-xsd_util_test.Tpo -c -o xsd_util_test-xsd_util_test.obj `if test -f 'xsd_util_test.cc'; then $(CYGPATH_W) 'xsd_util_test.cc'; else $(CYGPATH_W) '$(srcdir)/xsd_util_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/xsd_util_test-xsd_util_test.Tpo $(DEPDIR)/xsd_util_test-xsd_util_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/xsd_util_test-xsd_util_test.Tpo $(DEPDIR)/xsd_util_test-xsd_util_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='xsd_util_test.cc' object='xsd_util_test-xsd_util_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsd_util_test_CXXFLAGS) $(CXXFLAGS) -c -o xsd_util_test-xsd_util_test.obj `if test -f 'xsd_util_test.cc'; then $(CYGPATH_W) 'xsd_util_test.cc'; else $(CYGPATH_W) '$(srcdir)/xsd_util_test.cc'; fi`
  
  xst_parser_test-xst_parser_test.o: xst_parser_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xst_parser_test_CXXFLAGS) $(CXXFLAGS) -MT xst_parser_test-xst_parser_test.o -MD -MP -MF "$(DEPDIR)/xst_parser_test-xst_parser_test.Tpo" -c -o xst_parser_test-xst_parser_test.o `test -f 'xst_parser_test.cc' || echo '$(srcdir)/'`xst_parser_test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/xst_parser_test-xst_parser_test.Tpo" "$(DEPDIR)/xst_parser_test-xst_parser_test.Po"; else rm -f "$(DEPDIR)/xst_parser_test-xst_parser_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xst_parser_test_CXXFLAGS) $(CXXFLAGS) -MT xst_parser_test-xst_parser_test.o -MD -MP -MF $(DEPDIR)/xst_parser_test-xst_parser_test.Tpo -c -o xst_parser_test-xst_parser_test.o `test -f 'xst_parser_test.cc' || echo '$(srcdir)/'`xst_parser_test.cc
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xst_parser_test_CXXFLAGS) $(CXXFLAGS) -MT xst_parser_test-xst_parser_test.o -MD -MP -MF $(DEPDIR)/xst_parser_test-xst_parser_test.Tpo -c -o xst_parser_test-xst_parser_test.o `test -f 'xst_parser_test.cc' || echo '$(srcdir)/'`xst_parser_test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/xst_parser_test-xst_parser_test.Tpo $(DEPDIR)/xst_parser_test-xst_parser_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/xst_parser_test-xst_parser_test.Tpo $(DEPDIR)/xst_parser_test-xst_parser_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='xst_parser_test.cc' object='xst_parser_test-xst_parser_test.o' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xst_parser_test_CXXFLAGS) $(CXXFLAGS) -c -o xst_parser_test-xst_parser_test.o `test -f 'xst_parser_test.cc' || echo '$(srcdir)/'`xst_parser_test.cc
  
  xst_parser_test-xst_parser_test.obj: xst_parser_test.cc
-- at am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xst_parser_test_CXXFLAGS) $(CXXFLAGS) -MT xst_parser_test-xst_parser_test.obj -MD -MP -MF "$(DEPDIR)/xst_parser_test-xst_parser_test.Tpo" -c -o xst_parser_test-xst_parser_test.obj `if test -f 'xst_parser_test.cc'; then $(CYGPATH_W) 'xst_parser_test.cc'; else $(CYGPATH_W) '$(srcdir)/xst_parser_test.cc'; fi`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/xst_parser_test-xst_parser_test.Tpo" "$(DEPDIR)/xst_parser_test-xst_parser_test.Po"; else rm -f "$(DEPDIR)/xst_parser_test-xst_parser_test.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xst_parser_test_CXXFLAGS) $(CXXFLAGS) -MT xst_parser_test-xst_parser_test.obj -MD -MP -MF $(DEPDIR)/xst_parser_test-xst_parser_test.Tpo -c -o xst_parser_test-xst_parser_test.obj `if test -f 'xst_parser_test.cc'; then $(CYGPATH_W) 'xst_parser_test.cc'; else $(CYGPATH_W) '$(srcdir)/xst_parser_test.cc'; fi`
+ @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xst_parser_test_CXXFLAGS) $(CXXFLAGS) -MT xst_parser_test-xst_parser_test.obj -MD -MP -MF $(DEPDIR)/xst_parser_test-xst_parser_test.Tpo -c -o xst_parser_test-xst_parser_test.obj `if test -f 'xst_parser_test.cc'; then $(CYGPATH_W) 'xst_parser_test.cc'; else $(CYGPATH_W) '$(srcdir)/xst_parser_test.cc'; fi`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/xst_parser_test-xst_parser_test.Tpo $(DEPDIR)/xst_parser_test-xst_parser_test.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/xst_parser_test-xst_parser_test.Tpo $(DEPDIR)/xst_parser_test-xst_parser_test.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='xst_parser_test.cc' object='xst_parser_test-xst_parser_test.obj' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xst_parser_test_CXXFLAGS) $(CXXFLAGS) -c -o xst_parser_test-xst_parser_test.obj `if test -f 'xst_parser_test.cc'; then $(CYGPATH_W) 'xst_parser_test.cc'; else $(CYGPATH_W) '$(srcdir)/xst_parser_test.cc'; fi`
-@@ -642,72 +704,75 @@
- 
- clean-libtool:
- 	-rm -rf .libs _libs
--
--distclean-libtool:
--	-rm -f libtool
--uninstall-info-am:
+@@ -680,20 +707,23 @@
  install-libkmlxsdincludeHEADERS: $(libkmlxsdinclude_HEADERS)
  	@$(NORMAL_INSTALL)
--	test -z "$(libkmlxsdincludedir)" || $(mkdir_p) "$(DESTDIR)$(libkmlxsdincludedir)"
+ 	test -z "$(libkmlxsdincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libkmlxsdincludedir)"
 -	@list='$(libkmlxsdinclude_HEADERS)'; for p in $$list; do \
-+	test -z "$(libkmlxsdincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libkmlxsdincludedir)"
 +	@list='$(libkmlxsdinclude_HEADERS)'; test -n "$(libkmlxsdincludedir)" || list=; \
 +	for p in $$list; do \
  	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
@@ -83616,15 +22789,7 @@
  
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- 	unique=`for i in $$list; do \
- 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- 	  done | \
--	  $(AWK) '    { files[$$0] = 1; } \
--	       END { for (i in files) print i; }'`; \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
- 	mkid -fID $$unique
- tags: TAGS
+@@ -707,7 +737,7 @@
  
  TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
@@ -83633,13 +22798,11 @@
  	here=`pwd`; \
  	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
- 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+@@ -715,29 +745,34 @@
  	  done | \
--	  $(AWK) '    { files[$$0] = 1; } \
--	       END { for (i in files) print i; }'`; \
+ 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 -	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 +	shift; \
 +	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
  	  test -n "$$unique" || unique=$$empty_fix; \
@@ -83657,16 +22820,13 @@
  CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
 -	tags=; \
--	here=`pwd`; \
  	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  	  done | \
--	  $(AWK) '    { files[$$0] = 1; } \
--	       END { for (i in files) print i; }'`; \
+ 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 -	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 +	test -z "$(CTAGS_ARGS)$$unique" \
  	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 -	     $$tags $$unique
@@ -83681,22 +22841,16 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-@@ -715,7 +780,8 @@
- check-TESTS: $(TESTS)
+@@ -746,6 +781,7 @@
  	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
  	srcdir=$(srcdir); export srcdir; \
--	list='$(TESTS)'; \
-+	list=' $(TESTS) '; \
+ 	list=' $(TESTS) '; \
 +	$(am__tty_colors); \
  	if test -n "$$list"; then \
  	  for tst in $$list; do \
  	    if test -f ./$$tst; then dir=./; \
-@@ -724,49 +790,63 @@
- 	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
- 	      all=`expr $$all + 1`; \
- 	      case " $(XFAIL_TESTS) " in \
--	      *" $$tst "*) \
-+	      *[\ \	]$$tst[\ \	]*) \
+@@ -757,10 +793,10 @@
+ 	      *[\ \	]$$tst[\ \	]*) \
  		xpass=`expr $$xpass + 1`; \
  		failed=`expr $$failed + 1`; \
 -		echo "XPASS: $$tst"; \
@@ -83708,10 +22862,9 @@
  	      ;; \
  	      esac; \
  	    elif test $$? -ne 77; then \
- 	      all=`expr $$all + 1`; \
+@@ -768,17 +804,18 @@
  	      case " $(XFAIL_TESTS) " in \
--	      *" $$tst "*) \
-+	      *[\ \	]$$tst[\ \	]*) \
+ 	      *[\ \	]$$tst[\ \	]*) \
  		xfail=`expr $$xfail + 1`; \
 -		echo "XFAIL: $$tst"; \
 +		col=$$lgn; res=XFAIL; \
@@ -83729,45 +22882,9 @@
  	    fi; \
 +	    echo "$${col}$$res$${std}: $$tst"; \
  	  done; \
-+	  if test "$$all" -eq 1; then \
-+	    tests="test"; \
-+	    All=""; \
-+	  else \
-+	    tests="tests"; \
-+	    All="All "; \
-+	  fi; \
- 	  if test "$$failed" -eq 0; then \
- 	    if test "$$xfail" -eq 0; then \
--	      banner="All $$all tests passed"; \
-+	      banner="$$All$$all $$tests passed"; \
- 	    else \
--	      banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
-+	      if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
-+	      banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
- 	    fi; \
- 	  else \
- 	    if test "$$xpass" -eq 0; then \
--	      banner="$$failed of $$all tests failed"; \
-+	      banner="$$failed of $$all $$tests failed"; \
- 	    else \
--	      banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
-+	      if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
-+	      banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
- 	    fi; \
- 	  fi; \
- 	  dashes="$$banner"; \
- 	  skipped=""; \
- 	  if test "$$skip" -ne 0; then \
--	    skipped="($$skip tests were not run)"; \
-+	    if test "$$skip" -eq 1; then \
-+	      skipped="($$skip test was not run)"; \
-+	    else \
-+	      skipped="($$skip tests were not run)"; \
-+	    fi; \
- 	    test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
- 	      dashes="$$skipped"; \
- 	  fi; \
-@@ -777,38 +857,45 @@
+ 	  if test "$$all" -eq 1; then \
+ 	    tests="test"; \
+@@ -820,11 +857,15 @@
  	      dashes="$$report"; \
  	  fi; \
  	  dashes=`echo "$$dashes" | sed s/./=/g`; \
@@ -83785,36 +22902,10 @@
  	  test "$$failed" -eq 0; \
  	else :; fi
  
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
--	list='$(DISTFILES)'; for file in $$list; do \
--	  case $$file in \
--	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
--	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
--	  esac; \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
+@@ -844,13 +885,17 @@
  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
--	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
--	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
--	    dir="/$$dir"; \
--	    $(mkdir_p) "$(distdir)$$dir"; \
--	  else \
--	    dir=''; \
--	  fi; \
  	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 +	    if test -d "$(distdir)/$$file"; then \
 +	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 +	    fi; \
@@ -83833,16 +22924,7 @@
  	    || exit 1; \
  	  fi; \
  	done
-@@ -819,7 +906,7 @@
- all-am: Makefile $(LTLIBRARIES) $(HEADERS)
- installdirs:
- 	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libkmlxsdincludedir)"; do \
--	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- 	done
- install: install-am
- install-exec: install-exec-am
-@@ -842,6 +929,7 @@
+@@ -884,6 +929,7 @@
  
  distclean-generic:
  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -83850,17 +22932,8 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -855,7 +943,7 @@
- 	-rm -rf ./$(DEPDIR)
- 	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
--	distclean-libtool distclean-tags
-+	distclean-tags
+@@ -905,6 +951,8 @@
  
- dvi: dvi-am
- 
-@@ -863,18 +951,38 @@
- 
  html: html-am
  
 +html-am:
@@ -83868,17 +22941,16 @@
  info: info-am
  
  info-am:
+@@ -913,18 +961,28 @@
  
- install-data-am: install-libkmlxsdincludeHEADERS
+ install-dvi: install-dvi-am
  
-+install-dvi: install-dvi-am
-+
 +install-dvi-am:
 +
  install-exec-am: install-libLTLIBRARIES
  
-+install-html: install-html-am
-+
+ install-html: install-html-am
+ 
 +install-html-am:
 +
  install-info: install-info-am
@@ -83887,94 +22959,62 @@
 +
  install-man:
  
-+install-pdf: install-pdf-am
-+
+ install-pdf: install-pdf-am
+ 
 +install-pdf-am:
 +
-+install-ps: install-ps-am
-+
+ install-ps: install-ps-am
+ 
 +install-ps-am:
 +
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
-@@ -895,22 +1003,27 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
-+uninstall-am: uninstall-libLTLIBRARIES \
+@@ -948,7 +1006,7 @@
+ uninstall-am: uninstall-libLTLIBRARIES \
  	uninstall-libkmlxsdincludeHEADERS
  
+-.MAKE: install-am install-strip
 +.MAKE: check-am install-am install-strip
-+
+ 
  .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
  	clean-checkPROGRAMS clean-generic clean-libLTLIBRARIES \
- 	clean-libtool ctags distclean distclean-compile \
- 	distclean-generic distclean-libtool distclean-tags distdir dvi \
- 	dvi-am html html-am info info-am install install-am \
--	install-data install-data-am install-exec install-exec-am \
-+	install-data install-data-am install-dvi install-dvi-am \
-+	install-exec install-exec-am install-html install-html-am \
- 	install-info install-info-am install-libLTLIBRARIES \
--	install-libkmlxsdincludeHEADERS install-man install-strip \
-+	install-libkmlxsdincludeHEADERS install-man install-pdf \
-+	install-pdf-am install-ps install-ps-am install-strip \
- 	installcheck installcheck-am installdirs maintainer-clean \
- 	maintainer-clean-generic mostlyclean mostlyclean-compile \
- 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
--	tags uninstall uninstall-am uninstall-info-am \
--	uninstall-libLTLIBRARIES uninstall-libkmlxsdincludeHEADERS
-+	tags uninstall uninstall-am uninstall-libLTLIBRARIES \
-+	uninstall-libkmlxsdincludeHEADERS
-+
+@@ -966,6 +1024,7 @@
+ 	tags uninstall uninstall-am uninstall-libLTLIBRARIES \
+ 	uninstall-libkmlxsdincludeHEADERS
  
++
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-Index: libkml-1.0.1/src/Makefile.in
+ .NOEXPORT:
+Index: libkml-1.1.0/src/Makefile.in
 ===================================================================
---- libkml-1.0.1.orig/src/Makefile.in	2009-07-03 01:23:31.000000000 +0200
-+++ libkml-1.0.1/src/Makefile.in	2009-12-10 10:19:45.000000000 +0100
+--- libkml-1.1.0.orig/src/Makefile.in	2009-12-10 13:05:40.000000000 +0100
++++ libkml-1.1.0/src/Makefile.in	2009-12-10 17:29:36.000000000 +0100
 @@ -1,8 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
+-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
-@@ -13,15 +14,12 @@
- # PARTICULAR PURPOSE.
- 
+@@ -15,8 +16,9 @@
  @SET_MAKE@
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
  VPATH = @srcdir@
  pkgdatadir = $(datadir)/@PACKAGE@
 -pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ..
 +pkglibdir = $(libdir)/@PACKAGE@
 +pkglibexecdir = $(libexecdir)/@PACKAGE@
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -39,27 +37,59 @@
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_curl.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)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
+@@ -43,6 +45,7 @@
  mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
@@ -83982,18 +23022,10 @@
  SOURCES =
  DIST_SOURCES =
  RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- 	html-recursive info-recursive install-data-recursive \
--	install-exec-recursive install-info-recursive \
--	install-recursive installcheck-recursive installdirs-recursive \
--	pdf-recursive ps-recursive uninstall-info-recursive \
--	uninstall-recursive
-+	install-dvi-recursive install-exec-recursive \
-+	install-html-recursive install-info-recursive \
-+	install-pdf-recursive install-ps-recursive install-recursive \
-+	installcheck-recursive installdirs-recursive pdf-recursive \
-+	ps-recursive uninstall-recursive
-+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-+  distclean-recursive maintainer-clean-recursive
+@@ -54,10 +57,38 @@
+ 	ps-recursive uninstall-recursive
+ RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+   distclean-recursive maintainer-clean-recursive
 +AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
 +	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
 +	distdir
@@ -84027,57 +23059,9 @@
 +  done; \
 +  reldir="$$dir2"
  ACLOCAL = @ACLOCAL@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
  AMTAR = @AMTAR@
  AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -81,18 +111,16 @@
- CYGPATH_W = @CYGPATH_W@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
--ECHO = @ECHO@
-+DSYMUTIL = @DSYMUTIL@
-+DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
--F77 = @F77@
--FFLAGS = @FFLAGS@
--GCC_FALSE = @GCC_FALSE@
--GCC_TRUE = @GCC_TRUE@
--HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
--HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
-+FGREP = @FGREP@
-+GREP = @GREP@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -102,19 +130,28 @@
- JAVAC = @JAVAC@
- JAVA_INCLUDE_DIR = @JAVA_INCLUDE_DIR@
- JAVA_LIB_DIR = @JAVA_LIB_DIR@
-+LD = @LD@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
-+LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
-+NM = @NM@
-+NMEDIT = @NMEDIT@
-+OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
-+OTOOL = @OTOOL@
-+OTOOL64 = @OTOOL64@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -120,6 +151,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -84085,84 +23069,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PLATFORM = @PLATFORM@
-@@ -131,22 +168,13 @@
- STRIP = @STRIP@
- SWIG = @SWIG@
- VERSION = @VERSION@
--WITH_JAVA_FALSE = @WITH_JAVA_FALSE@
--WITH_JAVA_TRUE = @WITH_JAVA_TRUE@
--WITH_PYTHON_FALSE = @WITH_PYTHON_FALSE@
--WITH_PYTHON_TRUE = @WITH_PYTHON_TRUE@
--WITH_SWIG_FALSE = @WITH_SWIG_FALSE@
--WITH_SWIG_TRUE = @WITH_SWIG_TRUE@
--ac_ct_AR = @ac_ct_AR@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
--ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -158,28 +186,41 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- SUBDIRS = kml swig
- 
- # TODO: use the phc files in msvc.
-@@ -194,14 +235,14 @@
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
--	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
--		&& exit 0; \
-+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-+	        && { if test -f $@; then exit 0; else break; fi; }; \
+@@ -208,9 +240,9 @@
  	      exit 1;; \
  	  esac; \
  	done; \
@@ -84175,7 +23082,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -219,6 +260,7 @@
+@@ -228,6 +260,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -84183,18 +23090,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -226,10 +268,6 @@
- clean-libtool:
- 	-rm -rf .libs _libs
- 
--distclean-libtool:
--	-rm -f libtool
--uninstall-info-am:
--
- # This directory's subdirectories are mostly independent; you can cd
- # into them and run `make' without going through this Makefile.
- # To change the values of `make' variables: instead of editing Makefiles,
-@@ -254,15 +292,14 @@
+@@ -259,7 +292,7 @@
  	  else \
  	    local_target="$$target"; \
  	  fi; \
@@ -84203,16 +23099,7 @@
  	  || eval $$failcom; \
  	done; \
  	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
- 	fi; test -z "$$fail"
- 
--mostlyclean-recursive clean-recursive distclean-recursive \
--maintainer-clean-recursive:
-+$(RECURSIVE_CLEAN_TARGETS):
- 	@failcom='exit 1'; \
- 	for f in x $$MAKEFLAGS; do \
- 	  case $$f in \
-@@ -289,16 +326,16 @@
+@@ -293,16 +326,16 @@
  	  else \
  	    local_target="$$target"; \
  	  fi; \
@@ -84232,16 +23119,7 @@
  	done
  
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-@@ -306,14 +343,14 @@
- 	unique=`for i in $$list; do \
- 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- 	  done | \
--	  $(AWK) '    { files[$$0] = 1; } \
--	       END { for (i in files) print i; }'`; \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
- 	mkid -fID $$unique
- tags: TAGS
+@@ -317,7 +350,7 @@
  
  TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
@@ -84250,7 +23128,7 @@
  	here=`pwd`; \
  	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
  	  include_option=--etags-include; \
-@@ -325,81 +362,101 @@
+@@ -329,7 +362,7 @@
  	list='$(SUBDIRS)'; for subdir in $$list; do \
  	  if test "$$subdir" = .; then :; else \
  	    test ! -f $$subdir/TAGS || \
@@ -84259,14 +23137,11 @@
  	  fi; \
  	done; \
  	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
- 	unique=`for i in $$list; do \
- 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+@@ -338,29 +371,34 @@
  	  done | \
--	  $(AWK) '    { files[$$0] = 1; } \
--	       END { for (i in files) print i; }'`; \
+ 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 -	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 +	shift; \
 +	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
  	  test -n "$$unique" || unique=$$empty_fix; \
@@ -84284,16 +23159,13 @@
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
 -	tags=; \
--	here=`pwd`; \
  	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  	  done | \
--	  $(AWK) '    { files[$$0] = 1; } \
--	       END { for (i in files) print i; }'`; \
+ 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 -	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 +	test -z "$(CTAGS_ARGS)$$unique" \
  	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 -	     $$tags $$unique
@@ -84308,37 +23180,10 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
--	list='$(DISTFILES)'; for file in $$list; do \
--	  case $$file in \
--	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
--	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
--	  esac; \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
+@@ -381,29 +419,44 @@
  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
--	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
--	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
--	    dir="/$$dir"; \
--	    $(mkdir_p) "$(distdir)$$dir"; \
--	  else \
--	    dir=''; \
--	  fi; \
  	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 +	    if test -d "$(distdir)/$$file"; then \
 +	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 +	    fi; \
@@ -84361,8 +23206,7 @@
 +	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
  	  if test "$$subdir" = .; then :; else \
  	    test -d "$(distdir)/$$subdir" \
--	    || $(mkdir_p) "$(distdir)/$$subdir" \
-+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+ 	    || $(MKDIR_P) "$(distdir)/$$subdir" \
  	    || exit 1; \
 -	    distdir=`$(am__cd) $(distdir) && pwd`; \
 -	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -84385,13 +23229,13 @@
 -	        distdir="$$distdir/$$subdir" \
 +	        top_distdir="$$new_top_distdir" \
 +	        distdir="$$new_distdir" \
-+		am__remove_distdir=: \
-+		am__skip_length_check=: \
+ 		am__remove_distdir=: \
+ 		am__skip_length_check=: \
 +		am__skip_mode_fix=: \
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -429,6 +486,7 @@
+@@ -433,6 +486,7 @@
  
  distclean-generic:
  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -84399,18 +23243,8 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -439,8 +497,7 @@
+@@ -451,6 +505,8 @@
  
- distclean: distclean-recursive
- 	-rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool \
--	distclean-tags
-+distclean-am: clean-am distclean-generic distclean-tags
- 
- dvi: dvi-recursive
- 
-@@ -448,18 +505,38 @@
- 
  html: html-recursive
  
 +html-am:
@@ -84418,17 +23252,16 @@
  info: info-recursive
  
  info-am:
+@@ -459,18 +515,28 @@
  
- install-data-am:
+ install-dvi: install-dvi-recursive
  
-+install-dvi: install-dvi-recursive
-+
 +install-dvi-am:
 +
  install-exec-am:
  
-+install-html: install-html-recursive
-+
+ install-html: install-html-recursive
+ 
 +install-html-am:
 +
  install-info: install-info-recursive
@@ -84437,99 +23270,64 @@
 +
  install-man:
  
-+install-pdf: install-pdf-recursive
-+
+ install-pdf: install-pdf-recursive
+ 
 +install-pdf-am:
 +
-+install-ps: install-ps-recursive
-+
+ install-ps: install-ps-recursive
+ 
 +install-ps-am:
 +
  installcheck-am:
  
  maintainer-clean: maintainer-clean-recursive
-@@ -478,22 +555,25 @@
+@@ -491,8 +557,8 @@
  
- ps-am:
+ uninstall-am:
  
--uninstall-am: uninstall-info-am
-+uninstall-am:
- 
--uninstall-info: uninstall-info-recursive
+-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+-	install-strip
 +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
 +	install-am install-strip tags-recursive
  
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
--	clean clean-generic clean-libtool clean-recursive ctags \
--	ctags-recursive distclean distclean-generic distclean-libtool \
--	distclean-recursive distclean-tags distdir dvi dvi-am html \
-+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-+	all all-am check check-am clean clean-generic clean-libtool \
-+	ctags ctags-recursive distclean distclean-generic \
-+	distclean-libtool distclean-tags distdir dvi dvi-am html \
- 	html-am info info-am install install-am install-data \
--	install-data-am install-exec install-exec-am install-info \
--	install-info-am install-man install-strip installcheck \
-+	install-data-am install-dvi install-dvi-am install-exec \
-+	install-exec-am install-html install-html-am install-info \
-+	install-info-am install-man install-pdf install-pdf-am \
-+	install-ps install-ps-am install-strip installcheck \
- 	installcheck-am installdirs installdirs-am maintainer-clean \
--	maintainer-clean-generic maintainer-clean-recursive \
--	mostlyclean mostlyclean-generic mostlyclean-libtool \
--	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
--	uninstall uninstall-am uninstall-info-am
-+	maintainer-clean-generic mostlyclean mostlyclean-generic \
-+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-+	uninstall uninstall-am
-+
+ .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ 	all all-am check check-am clean clean-generic clean-libtool \
+@@ -508,6 +574,7 @@
+ 	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+ 	uninstall uninstall-am
  
++
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-Index: libkml-1.0.1/src/swig/java/Makefile.in
+ .NOEXPORT:
+Index: libkml-1.1.0/src/swig/java/Makefile.in
 ===================================================================
---- libkml-1.0.1.orig/src/swig/java/Makefile.in	2009-07-03 01:23:34.000000000 +0200
-+++ libkml-1.0.1/src/swig/java/Makefile.in	2009-12-10 10:19:47.000000000 +0100
+--- libkml-1.1.0.orig/src/swig/java/Makefile.in	2009-12-10 13:05:40.000000000 +0100
++++ libkml-1.1.0/src/swig/java/Makefile.in	2009-12-10 17:29:38.000000000 +0100
 @@ -1,8 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
+-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
-@@ -13,15 +14,12 @@
- # PARTICULAR PURPOSE.
- 
+@@ -15,8 +16,9 @@
  @SET_MAKE@
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
  VPATH = @srcdir@
  pkgdatadir = $(datadir)/@PACKAGE@
 -pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../../..
 +pkglibdir = $(libdir)/@PACKAGE@
 +pkglibexecdir = $(libexecdir)/@PACKAGE@
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -39,18 +37,19 @@
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_curl.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)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
+@@ -43,6 +45,7 @@
  mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
@@ -84537,58 +23335,7 @@
  SOURCES =
  DIST_SOURCES =
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -72,18 +71,16 @@
- CYGPATH_W = @CYGPATH_W@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
--ECHO = @ECHO@
-+DSYMUTIL = @DSYMUTIL@
-+DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
--F77 = @F77@
--FFLAGS = @FFLAGS@
--GCC_FALSE = @GCC_FALSE@
--GCC_TRUE = @GCC_TRUE@
--HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
--HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
-+FGREP = @FGREP@
-+GREP = @GREP@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -93,19 +90,28 @@
- JAVAC = @JAVAC@
- JAVA_INCLUDE_DIR = @JAVA_INCLUDE_DIR@
- JAVA_LIB_DIR = @JAVA_LIB_DIR@
-+LD = @LD@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
-+LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
-+NM = @NM@
-+NMEDIT = @NMEDIT@
-+OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
-+OTOOL = @OTOOL@
-+OTOOL64 = @OTOOL64@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -108,6 +111,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -84596,84 +23343,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PLATFORM = @PLATFORM@
-@@ -122,22 +128,13 @@
- STRIP = @STRIP@
- SWIG = @SWIG@
- VERSION = @VERSION@
--WITH_JAVA_FALSE = @WITH_JAVA_FALSE@
--WITH_JAVA_TRUE = @WITH_JAVA_TRUE@
--WITH_PYTHON_FALSE = @WITH_PYTHON_FALSE@
--WITH_PYTHON_TRUE = @WITH_PYTHON_TRUE@
--WITH_SWIG_FALSE = @WITH_SWIG_FALSE@
--WITH_SWIG_TRUE = @WITH_SWIG_TRUE@
--ac_ct_AR = @ac_ct_AR@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
--ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -149,28 +146,41 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- EXTRA_DIST = \
- 	libkml_boost_intrusive_ptr.i
- 
-@@ -181,14 +191,14 @@
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
--	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
--		&& exit 0; \
-+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-+	        && { if test -f $@; then exit 0; else break; fi; }; \
+@@ -192,9 +196,9 @@
  	      exit 1;; \
  	  esac; \
  	done; \
@@ -84686,7 +23356,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -206,16 +216,13 @@
+@@ -212,6 +216,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -84694,49 +23364,10 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
- 
- clean-libtool:
- 	-rm -rf .libs _libs
--
--distclean-libtool:
--	-rm -f libtool
--uninstall-info-am:
- tags: TAGS
- TAGS:
- 
-@@ -224,29 +231,32 @@
- 
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
--	list='$(DISTFILES)'; for file in $$list; do \
--	  case $$file in \
--	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
--	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
--	  esac; \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
+@@ -241,13 +246,17 @@
  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
--	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
--	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
--	    dir="/$$dir"; \
--	    $(mkdir_p) "$(distdir)$$dir"; \
--	  else \
--	    dir=''; \
--	  fi; \
  	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 +	    if test -d "$(distdir)/$$file"; then \
 +	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 +	    fi; \
@@ -84755,7 +23386,7 @@
  	    || exit 1; \
  	  fi; \
  	done
-@@ -274,6 +284,7 @@
+@@ -275,6 +284,7 @@
  
  distclean-generic:
  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -84763,17 +23394,8 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -284,7 +295,7 @@
+@@ -293,6 +303,8 @@
  
- distclean: distclean-am
- 	-rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool
-+distclean-am: clean-am distclean-generic
- 
- dvi: dvi-am
- 
-@@ -292,18 +303,38 @@
- 
  html: html-am
  
 +html-am:
@@ -84781,17 +23403,16 @@
  info: info-am
  
  info-am:
+@@ -301,18 +313,28 @@
  
- install-data-am:
+ install-dvi: install-dvi-am
  
-+install-dvi: install-dvi-am
-+
 +install-dvi-am:
 +
  install-exec-am:
  
-+install-html: install-html-am
-+
+ install-html: install-html-am
+ 
 +install-html-am:
 +
  install-info: install-info-am
@@ -84800,88 +23421,53 @@
 +
  install-man:
  
-+install-pdf: install-pdf-am
-+
+ install-pdf: install-pdf-am
+ 
 +install-pdf-am:
 +
-+install-ps: install-ps-am
-+
+ install-ps: install-ps-am
+ 
 +install-ps-am:
 +
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
-@@ -322,17 +353,21 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-info-am
-+uninstall-am:
-+
-+.MAKE: install-am install-strip
- 
- .PHONY: all all-am check check-am clean clean-generic clean-libtool \
- 	distclean distclean-generic distclean-libtool distdir dvi \
- 	dvi-am html html-am info info-am install install-am \
--	install-data install-data-am install-exec install-exec-am \
--	install-info install-info-am install-man install-strip \
-+	install-data install-data-am install-dvi install-dvi-am \
-+	install-exec install-exec-am install-html install-html-am \
-+	install-info install-info-am install-man install-pdf \
-+	install-pdf-am install-ps install-ps-am install-strip \
- 	installcheck installcheck-am installdirs maintainer-clean \
+@@ -346,6 +368,7 @@
  	maintainer-clean-generic mostlyclean mostlyclean-generic \
--	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
--	uninstall-info-am
-+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
-+
+ 	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
  
++
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-Index: libkml-1.0.1/src/swig/Makefile.in
+ .NOEXPORT:
+Index: libkml-1.1.0/src/swig/Makefile.in
 ===================================================================
---- libkml-1.0.1.orig/src/swig/Makefile.in	2009-07-03 01:23:34.000000000 +0200
-+++ libkml-1.0.1/src/swig/Makefile.in	2009-12-10 10:19:47.000000000 +0100
+--- libkml-1.1.0.orig/src/swig/Makefile.in	2009-12-10 13:05:40.000000000 +0100
++++ libkml-1.1.0/src/swig/Makefile.in	2009-12-10 17:29:38.000000000 +0100
 @@ -1,8 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
+-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
-@@ -15,15 +16,12 @@
- @SET_MAKE@
+@@ -17,8 +18,9 @@
  
- 
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
  VPATH = @srcdir@
  pkgdatadir = $(datadir)/@PACKAGE@
 -pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../..
 +pkglibdir = $(libdir)/@PACKAGE@
 +pkglibexecdir = $(libexecdir)/@PACKAGE@
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -49,77 +47,105 @@
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_curl.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)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
+@@ -53,15 +55,30 @@
  mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
@@ -84912,108 +23498,25 @@
  	"$(DESTDIR)$(pythonextdir)"
 -pkglibLTLIBRARIES_INSTALL = $(INSTALL)
  LTLIBRARIES = $(pkglib_LTLIBRARIES)
--am__DEPENDENCIES_1 = $(top_builddir)/src/kml/engine/libkmlengine.la \
--	$(top_builddir)/src/kml/dom/libkmldom.la \
--	$(top_builddir)/src/kml/base/libkmlbase.la
--libkmlbase_swig_java_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-+libkmlbase_swig_java_la_DEPENDENCIES = $(COMMONLIBS)
+ libkmlbase_swig_java_la_DEPENDENCIES = $(COMMONLIBS)
  am_libkmlbase_swig_java_la_OBJECTS =  \
- 	libkmlbase_swig_java_la-kmlbase_java.lo
- libkmlbase_swig_java_la_OBJECTS =  \
- 	$(am_libkmlbase_swig_java_la_OBJECTS)
- @WITH_JAVA_TRUE@@WITH_SWIG_TRUE at am_libkmlbase_swig_java_la_rpath =  \
- @WITH_JAVA_TRUE@@WITH_SWIG_TRUE@	-rpath $(pkglibdir)
--libkmlbase_swig_python_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-+libkmlbase_swig_python_la_DEPENDENCIES = $(COMMONLIBS)
- am_libkmlbase_swig_python_la_OBJECTS =  \
- 	libkmlbase_swig_python_la-kmlbase_python.lo
- libkmlbase_swig_python_la_OBJECTS =  \
- 	$(am_libkmlbase_swig_python_la_OBJECTS)
-+libkmlbase_swig_python_la_LINK = $(LIBTOOL) --tag=CXX \
-+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-+	$(AM_CXXFLAGS) $(CXXFLAGS) \
-+	$(libkmlbase_swig_python_la_LDFLAGS) $(LDFLAGS) -o $@
- @WITH_PYTHON_TRUE@@WITH_SWIG_TRUE at am_libkmlbase_swig_python_la_rpath =  \
- @WITH_PYTHON_TRUE@@WITH_SWIG_TRUE@	-rpath $(pkglibdir)
--libkmldom_swig_java_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-+libkmldom_swig_java_la_DEPENDENCIES = $(COMMONLIBS)
- am_libkmldom_swig_java_la_OBJECTS =  \
- 	libkmldom_swig_java_la-kmldom_java.lo
- libkmldom_swig_java_la_OBJECTS = $(am_libkmldom_swig_java_la_OBJECTS)
- @WITH_JAVA_TRUE@@WITH_SWIG_TRUE at am_libkmldom_swig_java_la_rpath =  \
- @WITH_JAVA_TRUE@@WITH_SWIG_TRUE@	-rpath $(pkglibdir)
--libkmldom_swig_python_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-+libkmldom_swig_python_la_DEPENDENCIES = $(COMMONLIBS)
- am_libkmldom_swig_python_la_OBJECTS =  \
- 	libkmldom_swig_python_la-kmldom_python.lo
- libkmldom_swig_python_la_OBJECTS =  \
- 	$(am_libkmldom_swig_python_la_OBJECTS)
-+libkmldom_swig_python_la_LINK = $(LIBTOOL) --tag=CXX \
-+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-+	$(AM_CXXFLAGS) $(CXXFLAGS) $(libkmldom_swig_python_la_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- @WITH_PYTHON_TRUE@@WITH_SWIG_TRUE at am_libkmldom_swig_python_la_rpath =  \
- @WITH_PYTHON_TRUE@@WITH_SWIG_TRUE@	-rpath $(pkglibdir)
--libkmlengine_swig_java_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-+libkmlengine_swig_java_la_DEPENDENCIES = $(COMMONLIBS)
- am_libkmlengine_swig_java_la_OBJECTS =  \
- 	libkmlengine_swig_java_la-kmlengine_java.lo
- libkmlengine_swig_java_la_OBJECTS =  \
- 	$(am_libkmlengine_swig_java_la_OBJECTS)
- @WITH_JAVA_TRUE@@WITH_SWIG_TRUE at am_libkmlengine_swig_java_la_rpath =  \
- @WITH_JAVA_TRUE@@WITH_SWIG_TRUE@	-rpath $(pkglibdir)
--libkmlengine_swig_python_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-+libkmlengine_swig_python_la_DEPENDENCIES = $(COMMONLIBS)
- am_libkmlengine_swig_python_la_OBJECTS =  \
- 	libkmlengine_swig_python_la-kmlengine_python.lo
- libkmlengine_swig_python_la_OBJECTS =  \
- 	$(am_libkmlengine_swig_python_la_OBJECTS)
-+libkmlengine_swig_python_la_LINK = $(LIBTOOL) --tag=CXX \
-+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
-+	$(AM_CXXFLAGS) $(CXXFLAGS) \
-+	$(libkmlengine_swig_python_la_LDFLAGS) $(LDFLAGS) -o $@
- @WITH_PYTHON_TRUE@@WITH_SWIG_TRUE at am_libkmlengine_swig_python_la_rpath =  \
- @WITH_PYTHON_TRUE@@WITH_SWIG_TRUE@	-rpath $(pkglibdir)
--DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+@@ -119,6 +136,7 @@
+ DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
  depcomp = $(SHELL) $(top_srcdir)/config/depcomp
  am__depfiles_maybe = depfiles
 +am__mv = mv -f
  CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
  	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
--	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
--	$(AM_CXXFLAGS) $(CXXFLAGS)
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- CXXLD = $(CXX)
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- SOURCES = $(libkmlbase_swig_java_la_SOURCES) \
- 	$(libkmlbase_swig_python_la_SOURCES) \
- 	$(libkmldom_swig_java_la_SOURCES) \
-@@ -134,20 +160,47 @@
- 	$(libkmlengine_swig_python_la_SOURCES)
- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- 	html-recursive info-recursive install-data-recursive \
--	install-exec-recursive install-info-recursive \
--	install-recursive installcheck-recursive installdirs-recursive \
--	pdf-recursive ps-recursive uninstall-info-recursive \
--	uninstall-recursive
+ LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+@@ -147,15 +165,41 @@
+ 	install-pdf-recursive install-ps-recursive install-recursive \
+ 	installcheck-recursive installdirs-recursive pdf-recursive \
+ 	ps-recursive uninstall-recursive
 -javaDATA_INSTALL = $(INSTALL_DATA)
 -pythonextDATA_INSTALL = $(INSTALL_DATA)
-+	install-dvi-recursive install-exec-recursive \
-+	install-html-recursive install-info-recursive \
-+	install-pdf-recursive install-ps-recursive install-recursive \
-+	installcheck-recursive installdirs-recursive pdf-recursive \
-+	ps-recursive uninstall-recursive
  DATA = $(java_DATA) $(pythonext_DATA)
-+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-+  distclean-recursive maintainer-clean-recursive
+ RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+   distclean-recursive maintainer-clean-recursive
 +AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
 +	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
 +	distdir
@@ -85047,57 +23550,9 @@
 +  done; \
 +  reldir="$$dir2"
  ACLOCAL = @ACLOCAL@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
  AMTAR = @AMTAR@
  AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -169,18 +222,16 @@
- CYGPATH_W = @CYGPATH_W@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
--ECHO = @ECHO@
-+DSYMUTIL = @DSYMUTIL@
-+DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
--F77 = @F77@
--FFLAGS = @FFLAGS@
--GCC_FALSE = @GCC_FALSE@
--GCC_TRUE = @GCC_TRUE@
--HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
--HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
-+FGREP = @FGREP@
-+GREP = @GREP@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -190,19 +241,28 @@
- JAVAC = @JAVAC@
- JAVA_INCLUDE_DIR = @JAVA_INCLUDE_DIR@
- JAVA_LIB_DIR = @JAVA_LIB_DIR@
-+LD = @LD@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
-+LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
-+NM = @NM@
-+NMEDIT = @NMEDIT@
-+OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
-+OTOOL = @OTOOL@
-+OTOOL64 = @OTOOL64@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -218,6 +262,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -85105,84 +23560,17 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PLATFORM = @PLATFORM@
-@@ -219,22 +279,13 @@
- STRIP = @STRIP@
- SWIG = @SWIG@
- VERSION = @VERSION@
--WITH_JAVA_FALSE = @WITH_JAVA_FALSE@
--WITH_JAVA_TRUE = @WITH_JAVA_TRUE@
--WITH_PYTHON_FALSE = @WITH_PYTHON_FALSE@
--WITH_PYTHON_TRUE = @WITH_PYTHON_TRUE@
--WITH_SWIG_FALSE = @WITH_SWIG_FALSE@
--WITH_SWIG_TRUE = @WITH_SWIG_TRUE@
--ac_ct_AR = @ac_ct_AR@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
--ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -246,28 +297,41 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
+@@ -289,8 +334,7 @@
+ top_srcdir = @top_srcdir@
  SUBDIRS = java python
  AM_CPPFLAGS = -I$(top_srcdir)/src \
- 	      -I$(top_srcdir)/third_party/boost_1_34_1 \
-@@ -322,14 +386,14 @@
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
--	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
--		&& exit 0; \
-+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-+	        && { if test -f $@; then exit 0; else break; fi; }; \
+-	      -I$(top_srcdir)/third_party/boost_1_34_1 \
+-	      -I$(top_srcdir)/third_party/uriparser-0.7.1/include
++	      -I$(top_srcdir)/third_party/boost_1_34_1
+ 
+ COMMONLIBS = $(top_builddir)/src/kml/engine/libkmlengine.la \
+              $(top_builddir)/src/kml/dom/libkmldom.la \
+@@ -346,9 +390,9 @@
  	      exit 1;; \
  	  esac; \
  	done; \
@@ -85195,22 +23583,21 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -347,23 +411,28 @@
+@@ -366,23 +410,28 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(am__aclocal_m4_deps):
  install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
--	test -z "$(pkglibdir)" || $(mkdir_p) "$(DESTDIR)$(pkglibdir)"
+ 	test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)"
 -	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
-+	test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)"
 +	@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
 +	list2=; for p in $$list; do \
  	  if test -f $$p; then \
 -	    f=$(am__strip_dir) \
--	    echo " $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \
--	    $(LIBTOOL) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \
+-	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \
+-	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pkglibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \
 +	    list2="$$list2 $$p"; \
  	  else :; fi; \
 -	done
@@ -85222,10 +23609,10 @@
  
  uninstall-pkglibLTLIBRARIES:
  	@$(NORMAL_UNINSTALL)
--	@set -x; list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
+-	@list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \
 -	  p=$(am__strip_dir) \
--	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$p'"; \
--	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$p"; \
+-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$p'"; \
+-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$p"; \
 +	@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
 +	for p in $$list; do \
 +	  $(am__strip_dir) \
@@ -85234,134 +23621,99 @@
  	done
  
  clean-pkglibLTLIBRARIES:
-@@ -375,17 +444,17 @@
- 	  rm -f "$${dir}/so_locations"; \
- 	done
- libkmlbase_swig_java.la: $(libkmlbase_swig_java_la_OBJECTS) $(libkmlbase_swig_java_la_DEPENDENCIES) 
--	$(CXXLINK) $(am_libkmlbase_swig_java_la_rpath) $(libkmlbase_swig_java_la_LDFLAGS) $(libkmlbase_swig_java_la_OBJECTS) $(libkmlbase_swig_java_la_LIBADD) $(LIBS)
-+	$(CXXLINK) $(am_libkmlbase_swig_java_la_rpath) $(libkmlbase_swig_java_la_OBJECTS) $(libkmlbase_swig_java_la_LIBADD) $(LIBS)
- libkmlbase_swig_python.la: $(libkmlbase_swig_python_la_OBJECTS) $(libkmlbase_swig_python_la_DEPENDENCIES) 
--	$(CXXLINK) $(am_libkmlbase_swig_python_la_rpath) $(libkmlbase_swig_python_la_LDFLAGS) $(libkmlbase_swig_python_la_OBJECTS) $(libkmlbase_swig_python_la_LIBADD) $(LIBS)
-+	$(libkmlbase_swig_python_la_LINK) $(am_libkmlbase_swig_python_la_rpath) $(libkmlbase_swig_python_la_OBJECTS) $(libkmlbase_swig_python_la_LIBADD) $(LIBS)
- libkmldom_swig_java.la: $(libkmldom_swig_java_la_OBJECTS) $(libkmldom_swig_java_la_DEPENDENCIES) 
--	$(CXXLINK) $(am_libkmldom_swig_java_la_rpath) $(libkmldom_swig_java_la_LDFLAGS) $(libkmldom_swig_java_la_OBJECTS) $(libkmldom_swig_java_la_LIBADD) $(LIBS)
-+	$(CXXLINK) $(am_libkmldom_swig_java_la_rpath) $(libkmldom_swig_java_la_OBJECTS) $(libkmldom_swig_java_la_LIBADD) $(LIBS)
- libkmldom_swig_python.la: $(libkmldom_swig_python_la_OBJECTS) $(libkmldom_swig_python_la_DEPENDENCIES) 
--	$(CXXLINK) $(am_libkmldom_swig_python_la_rpath) $(libkmldom_swig_python_la_LDFLAGS) $(libkmldom_swig_python_la_OBJECTS) $(libkmldom_swig_python_la_LIBADD) $(LIBS)
-+	$(libkmldom_swig_python_la_LINK) $(am_libkmldom_swig_python_la_rpath) $(libkmldom_swig_python_la_OBJECTS) $(libkmldom_swig_python_la_LIBADD) $(LIBS)
- libkmlengine_swig_java.la: $(libkmlengine_swig_java_la_OBJECTS) $(libkmlengine_swig_java_la_DEPENDENCIES) 
--	$(CXXLINK) $(am_libkmlengine_swig_java_la_rpath) $(libkmlengine_swig_java_la_LDFLAGS) $(libkmlengine_swig_java_la_OBJECTS) $(libkmlengine_swig_java_la_LIBADD) $(LIBS)
-+	$(CXXLINK) $(am_libkmlengine_swig_java_la_rpath) $(libkmlengine_swig_java_la_OBJECTS) $(libkmlengine_swig_java_la_LIBADD) $(LIBS)
- libkmlengine_swig_python.la: $(libkmlengine_swig_python_la_OBJECTS) $(libkmlengine_swig_python_la_DEPENDENCIES) 
--	$(CXXLINK) $(am_libkmlengine_swig_python_la_rpath) $(libkmlengine_swig_python_la_LDFLAGS) $(libkmlengine_swig_python_la_OBJECTS) $(libkmlengine_swig_python_la_LIBADD) $(LIBS)
-+	$(libkmlengine_swig_python_la_LINK) $(am_libkmlengine_swig_python_la_rpath) $(libkmlengine_swig_python_la_OBJECTS) $(libkmlengine_swig_python_la_LIBADD) $(LIBS)
+@@ -421,66 +470,66 @@
  
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -401,111 +470,113 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkmlengine_swig_python_la-kmlengine_python.Plo at am__quote@
- 
  .cc.o:
-- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
  
  .cc.obj:
-- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
  
  .cc.lo:
-- at am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
  
  libkmlbase_swig_java_la-kmlbase_java.lo: kmlbase_java.cc
-- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkmlbase_swig_java_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libkmlbase_swig_java_la-kmlbase_java.lo -MD -MP -MF "$(DEPDIR)/libkmlbase_swig_java_la-kmlbase_java.Tpo" -c -o libkmlbase_swig_java_la-kmlbase_java.lo `test -f 'kmlbase_java.cc' || echo '$(srcdir)/'`kmlbase_java.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libkmlbase_swig_java_la-kmlbase_java.Tpo" "$(DEPDIR)/libkmlbase_swig_java_la-kmlbase_java.Plo"; else rm -f "$(DEPDIR)/libkmlbase_swig_java_la-kmlbase_java.Tpo"; exit 1; fi
+- at am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkmlbase_swig_java_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libkmlbase_swig_java_la-kmlbase_java.lo -MD -MP -MF $(DEPDIR)/libkmlbase_swig_java_la-kmlbase_java.Tpo -c -o libkmlbase_swig_java_la-kmlbase_java.lo `test -f 'kmlbase_java.cc' || echo '$(srcdir)/'`kmlbase_java.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libkmlbase_swig_java_la-kmlbase_java.Tpo $(DEPDIR)/libkmlbase_swig_java_la-kmlbase_java.Plo
 + at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkmlbase_swig_java_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libkmlbase_swig_java_la-kmlbase_java.lo -MD -MP -MF $(DEPDIR)/libkmlbase_swig_java_la-kmlbase_java.Tpo -c -o libkmlbase_swig_java_la-kmlbase_java.lo `test -f 'kmlbase_java.cc' || echo '$(srcdir)/'`kmlbase_java.cc
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libkmlbase_swig_java_la-kmlbase_java.Tpo $(DEPDIR)/libkmlbase_swig_java_la-kmlbase_java.Plo
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='kmlbase_java.cc' object='libkmlbase_swig_java_la-kmlbase_java.lo' libtool=yes @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkmlbase_swig_java_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libkmlbase_swig_java_la-kmlbase_java.lo `test -f 'kmlbase_java.cc' || echo '$(srcdir)/'`kmlbase_java.cc
+- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkmlbase_swig_java_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libkmlbase_swig_java_la-kmlbase_java.lo `test -f 'kmlbase_java.cc' || echo '$(srcdir)/'`kmlbase_java.cc
 + at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkmlbase_swig_java_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libkmlbase_swig_java_la-kmlbase_java.lo `test -f 'kmlbase_java.cc' || echo '$(srcdir)/'`kmlbase_java.cc
  
  libkmlbase_swig_python_la-kmlbase_python.lo: kmlbase_python.cc
-- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkmlbase_swig_python_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libkmlbase_swig_python_la-kmlbase_python.lo -MD -MP -MF "$(DEPDIR)/libkmlbase_swig_python_la-kmlbase_python.Tpo" -c -o libkmlbase_swig_python_la-kmlbase_python.lo `test -f 'kmlbase_python.cc' || echo '$(srcdir)/'`kmlbase_python.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libkmlbase_swig_python_la-kmlbase_python.Tpo" "$(DEPDIR)/libkmlbase_swig_python_la-kmlbase_python.Plo"; else rm -f "$(DEPDIR)/libkmlbase_swig_python_la-kmlbase_python.Tpo"; exit 1; fi
+- at am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkmlbase_swig_python_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libkmlbase_swig_python_la-kmlbase_python.lo -MD -MP -MF $(DEPDIR)/libkmlbase_swig_python_la-kmlbase_python.Tpo -c -o libkmlbase_swig_python_la-kmlbase_python.lo `test -f 'kmlbase_python.cc' || echo '$(srcdir)/'`kmlbase_python.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libkmlbase_swig_python_la-kmlbase_python.Tpo $(DEPDIR)/libkmlbase_swig_python_la-kmlbase_python.Plo
 + at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkmlbase_swig_python_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libkmlbase_swig_python_la-kmlbase_python.lo -MD -MP -MF $(DEPDIR)/libkmlbase_swig_python_la-kmlbase_python.Tpo -c -o libkmlbase_swig_python_la-kmlbase_python.lo `test -f 'kmlbase_python.cc' || echo '$(srcdir)/'`kmlbase_python.cc
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libkmlbase_swig_python_la-kmlbase_python.Tpo $(DEPDIR)/libkmlbase_swig_python_la-kmlbase_python.Plo
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='kmlbase_python.cc' object='libkmlbase_swig_python_la-kmlbase_python.lo' libtool=yes @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkmlbase_swig_python_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libkmlbase_swig_python_la-kmlbase_python.lo `test -f 'kmlbase_python.cc' || echo '$(srcdir)/'`kmlbase_python.cc
+- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkmlbase_swig_python_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libkmlbase_swig_python_la-kmlbase_python.lo `test -f 'kmlbase_python.cc' || echo '$(srcdir)/'`kmlbase_python.cc
 + at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkmlbase_swig_python_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libkmlbase_swig_python_la-kmlbase_python.lo `test -f 'kmlbase_python.cc' || echo '$(srcdir)/'`kmlbase_python.cc
  
  libkmldom_swig_java_la-kmldom_java.lo: kmldom_java.cc
-- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkmldom_swig_java_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libkmldom_swig_java_la-kmldom_java.lo -MD -MP -MF "$(DEPDIR)/libkmldom_swig_java_la-kmldom_java.Tpo" -c -o libkmldom_swig_java_la-kmldom_java.lo `test -f 'kmldom_java.cc' || echo '$(srcdir)/'`kmldom_java.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libkmldom_swig_java_la-kmldom_java.Tpo" "$(DEPDIR)/libkmldom_swig_java_la-kmldom_java.Plo"; else rm -f "$(DEPDIR)/libkmldom_swig_java_la-kmldom_java.Tpo"; exit 1; fi
+- at am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkmldom_swig_java_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libkmldom_swig_java_la-kmldom_java.lo -MD -MP -MF $(DEPDIR)/libkmldom_swig_java_la-kmldom_java.Tpo -c -o libkmldom_swig_java_la-kmldom_java.lo `test -f 'kmldom_java.cc' || echo '$(srcdir)/'`kmldom_java.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libkmldom_swig_java_la-kmldom_java.Tpo $(DEPDIR)/libkmldom_swig_java_la-kmldom_java.Plo
 + at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkmldom_swig_java_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libkmldom_swig_java_la-kmldom_java.lo -MD -MP -MF $(DEPDIR)/libkmldom_swig_java_la-kmldom_java.Tpo -c -o libkmldom_swig_java_la-kmldom_java.lo `test -f 'kmldom_java.cc' || echo '$(srcdir)/'`kmldom_java.cc
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libkmldom_swig_java_la-kmldom_java.Tpo $(DEPDIR)/libkmldom_swig_java_la-kmldom_java.Plo
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='kmldom_java.cc' object='libkmldom_swig_java_la-kmldom_java.lo' libtool=yes @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkmldom_swig_java_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libkmldom_swig_java_la-kmldom_java.lo `test -f 'kmldom_java.cc' || echo '$(srcdir)/'`kmldom_java.cc
+- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkmldom_swig_java_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libkmldom_swig_java_la-kmldom_java.lo `test -f 'kmldom_java.cc' || echo '$(srcdir)/'`kmldom_java.cc
 + at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkmldom_swig_java_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libkmldom_swig_java_la-kmldom_java.lo `test -f 'kmldom_java.cc' || echo '$(srcdir)/'`kmldom_java.cc
  
  libkmldom_swig_python_la-kmldom_python.lo: kmldom_python.cc
-- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkmldom_swig_python_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libkmldom_swig_python_la-kmldom_python.lo -MD -MP -MF "$(DEPDIR)/libkmldom_swig_python_la-kmldom_python.Tpo" -c -o libkmldom_swig_python_la-kmldom_python.lo `test -f 'kmldom_python.cc' || echo '$(srcdir)/'`kmldom_python.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libkmldom_swig_python_la-kmldom_python.Tpo" "$(DEPDIR)/libkmldom_swig_python_la-kmldom_python.Plo"; else rm -f "$(DEPDIR)/libkmldom_swig_python_la-kmldom_python.Tpo"; exit 1; fi
+- at am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkmldom_swig_python_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libkmldom_swig_python_la-kmldom_python.lo -MD -MP -MF $(DEPDIR)/libkmldom_swig_python_la-kmldom_python.Tpo -c -o libkmldom_swig_python_la-kmldom_python.lo `test -f 'kmldom_python.cc' || echo '$(srcdir)/'`kmldom_python.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libkmldom_swig_python_la-kmldom_python.Tpo $(DEPDIR)/libkmldom_swig_python_la-kmldom_python.Plo
 + at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkmldom_swig_python_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libkmldom_swig_python_la-kmldom_python.lo -MD -MP -MF $(DEPDIR)/libkmldom_swig_python_la-kmldom_python.Tpo -c -o libkmldom_swig_python_la-kmldom_python.lo `test -f 'kmldom_python.cc' || echo '$(srcdir)/'`kmldom_python.cc
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libkmldom_swig_python_la-kmldom_python.Tpo $(DEPDIR)/libkmldom_swig_python_la-kmldom_python.Plo
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='kmldom_python.cc' object='libkmldom_swig_python_la-kmldom_python.lo' libtool=yes @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkmldom_swig_python_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libkmldom_swig_python_la-kmldom_python.lo `test -f 'kmldom_python.cc' || echo '$(srcdir)/'`kmldom_python.cc
+- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkmldom_swig_python_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libkmldom_swig_python_la-kmldom_python.lo `test -f 'kmldom_python.cc' || echo '$(srcdir)/'`kmldom_python.cc
 + at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkmldom_swig_python_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libkmldom_swig_python_la-kmldom_python.lo `test -f 'kmldom_python.cc' || echo '$(srcdir)/'`kmldom_python.cc
  
  libkmlengine_swig_java_la-kmlengine_java.lo: kmlengine_java.cc
-- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkmlengine_swig_java_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libkmlengine_swig_java_la-kmlengine_java.lo -MD -MP -MF "$(DEPDIR)/libkmlengine_swig_java_la-kmlengine_java.Tpo" -c -o libkmlengine_swig_java_la-kmlengine_java.lo `test -f 'kmlengine_java.cc' || echo '$(srcdir)/'`kmlengine_java.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libkmlengine_swig_java_la-kmlengine_java.Tpo" "$(DEPDIR)/libkmlengine_swig_java_la-kmlengine_java.Plo"; else rm -f "$(DEPDIR)/libkmlengine_swig_java_la-kmlengine_java.Tpo"; exit 1; fi
+- at am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkmlengine_swig_java_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libkmlengine_swig_java_la-kmlengine_java.lo -MD -MP -MF $(DEPDIR)/libkmlengine_swig_java_la-kmlengine_java.Tpo -c -o libkmlengine_swig_java_la-kmlengine_java.lo `test -f 'kmlengine_java.cc' || echo '$(srcdir)/'`kmlengine_java.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libkmlengine_swig_java_la-kmlengine_java.Tpo $(DEPDIR)/libkmlengine_swig_java_la-kmlengine_java.Plo
 + at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkmlengine_swig_java_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libkmlengine_swig_java_la-kmlengine_java.lo -MD -MP -MF $(DEPDIR)/libkmlengine_swig_java_la-kmlengine_java.Tpo -c -o libkmlengine_swig_java_la-kmlengine_java.lo `test -f 'kmlengine_java.cc' || echo '$(srcdir)/'`kmlengine_java.cc
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libkmlengine_swig_java_la-kmlengine_java.Tpo $(DEPDIR)/libkmlengine_swig_java_la-kmlengine_java.Plo
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='kmlengine_java.cc' object='libkmlengine_swig_java_la-kmlengine_java.lo' libtool=yes @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkmlengine_swig_java_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libkmlengine_swig_java_la-kmlengine_java.lo `test -f 'kmlengine_java.cc' || echo '$(srcdir)/'`kmlengine_java.cc
+- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkmlengine_swig_java_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libkmlengine_swig_java_la-kmlengine_java.lo `test -f 'kmlengine_java.cc' || echo '$(srcdir)/'`kmlengine_java.cc
 + at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkmlengine_swig_java_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libkmlengine_swig_java_la-kmlengine_java.lo `test -f 'kmlengine_java.cc' || echo '$(srcdir)/'`kmlengine_java.cc
  
  libkmlengine_swig_python_la-kmlengine_python.lo: kmlengine_python.cc
-- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkmlengine_swig_python_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libkmlengine_swig_python_la-kmlengine_python.lo -MD -MP -MF "$(DEPDIR)/libkmlengine_swig_python_la-kmlengine_python.Tpo" -c -o libkmlengine_swig_python_la-kmlengine_python.lo `test -f 'kmlengine_python.cc' || echo '$(srcdir)/'`kmlengine_python.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libkmlengine_swig_python_la-kmlengine_python.Tpo" "$(DEPDIR)/libkmlengine_swig_python_la-kmlengine_python.Plo"; else rm -f "$(DEPDIR)/libkmlengine_swig_python_la-kmlengine_python.Tpo"; exit 1; fi
+- at am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkmlengine_swig_python_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libkmlengine_swig_python_la-kmlengine_python.lo -MD -MP -MF $(DEPDIR)/libkmlengine_swig_python_la-kmlengine_python.Tpo -c -o libkmlengine_swig_python_la-kmlengine_python.lo `test -f 'kmlengine_python.cc' || echo '$(srcdir)/'`kmlengine_python.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libkmlengine_swig_python_la-kmlengine_python.Tpo $(DEPDIR)/libkmlengine_swig_python_la-kmlengine_python.Plo
 + at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkmlengine_swig_python_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libkmlengine_swig_python_la-kmlengine_python.lo -MD -MP -MF $(DEPDIR)/libkmlengine_swig_python_la-kmlengine_python.Tpo -c -o libkmlengine_swig_python_la-kmlengine_python.lo `test -f 'kmlengine_python.cc' || echo '$(srcdir)/'`kmlengine_python.cc
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libkmlengine_swig_python_la-kmlengine_python.Tpo $(DEPDIR)/libkmlengine_swig_python_la-kmlengine_python.Plo
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='kmlengine_python.cc' object='libkmlengine_swig_python_la-kmlengine_python.lo' libtool=yes @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkmlengine_swig_python_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libkmlengine_swig_python_la-kmlengine_python.lo `test -f 'kmlengine_python.cc' || echo '$(srcdir)/'`kmlengine_python.cc
+- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkmlengine_swig_python_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libkmlengine_swig_python_la-kmlengine_python.lo `test -f 'kmlengine_python.cc' || echo '$(srcdir)/'`kmlengine_python.cc
 + at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkmlengine_swig_python_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libkmlengine_swig_python_la-kmlengine_python.lo `test -f 'kmlengine_python.cc' || echo '$(srcdir)/'`kmlengine_python.cc
  
  mostlyclean-libtool:
  	-rm -f *.lo
- 
- clean-libtool:
- 	-rm -rf .libs _libs
--
--distclean-libtool:
--	-rm -f libtool
--uninstall-info-am:
+@@ -490,37 +539,43 @@
  install-javaDATA: $(java_DATA)
  	@$(NORMAL_INSTALL)
--	test -z "$(javadir)" || $(mkdir_p) "$(DESTDIR)$(javadir)"
+ 	test -z "$(javadir)" || $(MKDIR_P) "$(DESTDIR)$(javadir)"
 -	@list='$(java_DATA)'; for p in $$list; do \
-+	test -z "$(javadir)" || $(MKDIR_P) "$(DESTDIR)$(javadir)"
 +	@list='$(java_DATA)'; test -n "$(javadir)" || list=; \
 +	for p in $$list; do \
  	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
@@ -85389,9 +23741,8 @@
 +	cd "$(DESTDIR)$(javadir)" && rm -f $$files
  install-pythonextDATA: $(pythonext_DATA)
  	@$(NORMAL_INSTALL)
--	test -z "$(pythonextdir)" || $(mkdir_p) "$(DESTDIR)$(pythonextdir)"
+ 	test -z "$(pythonextdir)" || $(MKDIR_P) "$(DESTDIR)$(pythonextdir)"
 -	@list='$(pythonext_DATA)'; for p in $$list; do \
-+	test -z "$(pythonextdir)" || $(MKDIR_P) "$(DESTDIR)$(pythonextdir)"
 +	@list='$(pythonext_DATA)'; test -n "$(pythonextdir)" || list=; \
 +	for p in $$list; do \
  	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
@@ -85420,7 +23771,7 @@
  
  # This directory's subdirectories are mostly independent; you can cd
  # into them and run `make' without going through this Makefile.
-@@ -531,15 +602,14 @@
+@@ -546,7 +601,7 @@
  	  else \
  	    local_target="$$target"; \
  	  fi; \
@@ -85429,16 +23780,7 @@
  	  || eval $$failcom; \
  	done; \
  	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
- 	fi; test -z "$$fail"
- 
--mostlyclean-recursive clean-recursive distclean-recursive \
--maintainer-clean-recursive:
-+$(RECURSIVE_CLEAN_TARGETS):
- 	@failcom='exit 1'; \
- 	for f in x $$MAKEFLAGS; do \
- 	  case $$f in \
-@@ -566,16 +636,16 @@
+@@ -580,16 +635,16 @@
  	  else \
  	    local_target="$$target"; \
  	  fi; \
@@ -85458,16 +23800,7 @@
  	done
  
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-@@ -583,14 +653,14 @@
- 	unique=`for i in $$list; do \
- 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- 	  done | \
--	  $(AWK) '    { files[$$0] = 1; } \
--	       END { for (i in files) print i; }'`; \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
- 	mkid -fID $$unique
- tags: TAGS
+@@ -604,7 +659,7 @@
  
  TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
@@ -85476,7 +23809,7 @@
  	here=`pwd`; \
  	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
  	  include_option=--etags-include; \
-@@ -602,39 +672,43 @@
+@@ -616,7 +671,7 @@
  	list='$(SUBDIRS)'; for subdir in $$list; do \
  	  if test "$$subdir" = .; then :; else \
  	    test ! -f $$subdir/TAGS || \
@@ -85485,14 +23818,11 @@
  	  fi; \
  	done; \
  	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
- 	unique=`for i in $$list; do \
- 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+@@ -625,29 +680,34 @@
  	  done | \
--	  $(AWK) '    { files[$$0] = 1; } \
--	       END { for (i in files) print i; }'`; \
+ 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 -	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 +	shift; \
 +	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
  	  test -n "$$unique" || unique=$$empty_fix; \
@@ -85510,16 +23840,13 @@
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
 -	tags=; \
--	here=`pwd`; \
  	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  	  done | \
--	  $(AWK) '    { files[$$0] = 1; } \
--	       END { for (i in files) print i; }'`; \
+ 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 -	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 +	test -z "$(CTAGS_ARGS)$$unique" \
  	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 -	     $$tags $$unique
@@ -85534,39 +23861,10 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-@@ -642,43 +716,59 @@
- @WITH_SWIG_FALSE at dist-hook:
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
--	list='$(DISTFILES)'; for file in $$list; do \
--	  case $$file in \
--	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
--	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
--	  esac; \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
+@@ -670,29 +730,44 @@
  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
--	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
--	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
--	    dir="/$$dir"; \
--	    $(mkdir_p) "$(distdir)$$dir"; \
--	  else \
--	    dir=''; \
--	  fi; \
  	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 +	    if test -d "$(distdir)/$$file"; then \
 +	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 +	    fi; \
@@ -85589,8 +23887,7 @@
 +	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
  	  if test "$$subdir" = .; then :; else \
  	    test -d "$(distdir)/$$subdir" \
--	    || $(mkdir_p) "$(distdir)/$$subdir" \
-+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+ 	    || $(MKDIR_P) "$(distdir)/$$subdir" \
  	    || exit 1; \
 -	    distdir=`$(am__cd) $(distdir) && pwd`; \
 -	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -85613,22 +23910,13 @@
 -	        distdir="$$distdir/$$subdir" \
 +	        top_distdir="$$new_top_distdir" \
 +	        distdir="$$new_distdir" \
-+		am__remove_distdir=: \
-+		am__skip_length_check=: \
+ 		am__remove_distdir=: \
+ 		am__skip_length_check=: \
 +		am__skip_mode_fix=: \
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -692,7 +782,7 @@
- installdirs: installdirs-recursive
- installdirs-am:
- 	for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(javadir)" "$(DESTDIR)$(pythonextdir)"; do \
--	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- 	done
- install: install-recursive
- install-exec: install-exec-recursive
-@@ -714,6 +804,7 @@
+@@ -728,6 +803,7 @@
  
  distclean-generic:
  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -85636,17 +23924,8 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -728,7 +819,7 @@
- 	-rm -rf ./$(DEPDIR)
- 	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
--	distclean-libtool distclean-tags
-+	distclean-tags
+@@ -750,6 +826,8 @@
  
- dvi: dvi-recursive
- 
-@@ -736,18 +827,38 @@
- 
  html: html-recursive
  
 +html-am:
@@ -85654,17 +23933,16 @@
  info: info-recursive
  
  info-am:
+@@ -758,18 +836,28 @@
  
- install-data-am: install-javaDATA install-pythonextDATA
+ install-dvi: install-dvi-recursive
  
-+install-dvi: install-dvi-recursive
-+
 +install-dvi-am:
 +
  install-exec-am: install-pkglibLTLIBRARIES
  
-+install-html: install-html-recursive
-+
+ install-html: install-html-recursive
+ 
 +install-html-am:
 +
  install-info: install-info-recursive
@@ -85673,63 +23951,29 @@
 +
  install-man:
  
-+install-pdf: install-pdf-recursive
-+
+ install-pdf: install-pdf-recursive
+ 
 +install-pdf-am:
 +
-+install-ps: install-ps-recursive
-+
+ install-ps: install-ps-recursive
+ 
 +install-ps-am:
 +
  installcheck-am:
  
  maintainer-clean: maintainer-clean-recursive
-@@ -768,26 +879,27 @@
+@@ -793,8 +881,8 @@
+ uninstall-am: uninstall-javaDATA uninstall-pkglibLTLIBRARIES \
+ 	uninstall-pythonextDATA
  
- ps-am:
- 
--uninstall-am: uninstall-info-am uninstall-javaDATA \
--	uninstall-pkglibLTLIBRARIES uninstall-pythonextDATA
-+uninstall-am: uninstall-javaDATA uninstall-pkglibLTLIBRARIES \
-+	uninstall-pythonextDATA
- 
--uninstall-info: uninstall-info-recursive
+-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+-	install-strip
 +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
 +	install-am install-strip tags-recursive
  
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
--	clean clean-generic clean-libtool clean-local \
--	clean-pkglibLTLIBRARIES clean-recursive ctags ctags-recursive \
-+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-+	all all-am check check-am clean clean-generic clean-libtool \
-+	clean-local clean-pkglibLTLIBRARIES ctags ctags-recursive \
- 	dist-hook distclean distclean-compile distclean-generic \
--	distclean-libtool distclean-recursive distclean-tags distdir \
--	dvi dvi-am html html-am info info-am install install-am \
--	install-data install-data-am install-exec install-exec-am \
--	install-info install-info-am install-javaDATA install-man \
--	install-pkglibLTLIBRARIES install-pythonextDATA install-strip \
--	installcheck installcheck-am installdirs installdirs-am \
--	maintainer-clean maintainer-clean-generic \
--	maintainer-clean-recursive mostlyclean mostlyclean-compile \
--	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
--	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
--	uninstall-info-am uninstall-javaDATA \
-+	distclean-libtool distclean-tags distdir dvi dvi-am html \
-+	html-am info info-am install install-am install-data \
-+	install-data-am install-dvi install-dvi-am install-exec \
-+	install-exec-am install-html install-html-am install-info \
-+	install-info-am install-javaDATA install-man install-pdf \
-+	install-pdf-am install-pkglibLTLIBRARIES install-ps \
-+	install-ps-am install-pythonextDATA install-strip installcheck \
-+	installcheck-am installdirs installdirs-am maintainer-clean \
-+	maintainer-clean-generic mostlyclean mostlyclean-compile \
-+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-+	tags tags-recursive uninstall uninstall-am uninstall-javaDATA \
- 	uninstall-pkglibLTLIBRARIES uninstall-pythonextDATA
- 
- kmlbase_java.cc: kmlbase.i
-@@ -847,6 +959,7 @@
+ .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ 	all all-am check check-am clean clean-generic clean-libtool \
+@@ -870,6 +958,7 @@
  # there is an inherit dependency, we have to disable parallel builds in this
  # file, otherwise 'make -j3' or similar is likely to hit the race condition.
  .NOTPARALLEL:
@@ -85737,50 +23981,34 @@
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
-Index: libkml-1.0.1/src/swig/python/Makefile.in
+Index: libkml-1.1.0/src/swig/python/Makefile.in
 ===================================================================
---- libkml-1.0.1.orig/src/swig/python/Makefile.in	2009-07-03 01:23:34.000000000 +0200
-+++ libkml-1.0.1/src/swig/python/Makefile.in	2009-12-10 10:19:47.000000000 +0100
+--- libkml-1.1.0.orig/src/swig/python/Makefile.in	2009-12-10 13:05:40.000000000 +0100
++++ libkml-1.1.0/src/swig/python/Makefile.in	2009-12-10 17:29:38.000000000 +0100
 @@ -1,8 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
+-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
-@@ -13,15 +14,12 @@
- # PARTICULAR PURPOSE.
- 
+@@ -15,8 +16,9 @@
  @SET_MAKE@
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
  VPATH = @srcdir@
  pkgdatadir = $(datadir)/@PACKAGE@
 -pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../../..
 +pkglibdir = $(libdir)/@PACKAGE@
 +pkglibexecdir = $(libexecdir)/@PACKAGE@
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -39,18 +37,19 @@
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_curl.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)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
+@@ -43,6 +45,7 @@
  mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
@@ -85788,58 +24016,7 @@
  SOURCES =
  DIST_SOURCES =
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -72,18 +71,16 @@
- CYGPATH_W = @CYGPATH_W@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
--ECHO = @ECHO@
-+DSYMUTIL = @DSYMUTIL@
-+DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
--F77 = @F77@
--FFLAGS = @FFLAGS@
--GCC_FALSE = @GCC_FALSE@
--GCC_TRUE = @GCC_TRUE@
--HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
--HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
-+FGREP = @FGREP@
-+GREP = @GREP@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -93,19 +90,28 @@
- JAVAC = @JAVAC@
- JAVA_INCLUDE_DIR = @JAVA_INCLUDE_DIR@
- JAVA_LIB_DIR = @JAVA_LIB_DIR@
-+LD = @LD@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
-+LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
-+NM = @NM@
-+NMEDIT = @NMEDIT@
-+OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
-+OTOOL = @OTOOL@
-+OTOOL64 = @OTOOL64@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -108,6 +111,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -85847,84 +24024,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PLATFORM = @PLATFORM@
-@@ -122,22 +128,13 @@
- STRIP = @STRIP@
- SWIG = @SWIG@
- VERSION = @VERSION@
--WITH_JAVA_FALSE = @WITH_JAVA_FALSE@
--WITH_JAVA_TRUE = @WITH_JAVA_TRUE@
--WITH_PYTHON_FALSE = @WITH_PYTHON_FALSE@
--WITH_PYTHON_TRUE = @WITH_PYTHON_TRUE@
--WITH_SWIG_FALSE = @WITH_SWIG_FALSE@
--WITH_SWIG_TRUE = @WITH_SWIG_TRUE@
--ac_ct_AR = @ac_ct_AR@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
--ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -149,28 +146,41 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- EXTRA_DIST = \
- 	libkml_boost_intrusive_ptr.i
- 
-@@ -181,14 +191,14 @@
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
--	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
--		&& exit 0; \
-+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-+	        && { if test -f $@; then exit 0; else break; fi; }; \
+@@ -192,9 +196,9 @@
  	      exit 1;; \
  	  esac; \
  	done; \
@@ -85937,7 +24037,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -206,16 +216,13 @@
+@@ -212,6 +216,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -85945,49 +24045,10 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
- 
- clean-libtool:
- 	-rm -rf .libs _libs
--
--distclean-libtool:
--	-rm -f libtool
--uninstall-info-am:
- tags: TAGS
- TAGS:
- 
-@@ -224,29 +231,32 @@
- 
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
--	list='$(DISTFILES)'; for file in $$list; do \
--	  case $$file in \
--	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
--	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
--	  esac; \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
+@@ -241,13 +246,17 @@
  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
--	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
--	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
--	    dir="/$$dir"; \
--	    $(mkdir_p) "$(distdir)$$dir"; \
--	  else \
--	    dir=''; \
--	  fi; \
  	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 +	    if test -d "$(distdir)/$$file"; then \
 +	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 +	    fi; \
@@ -86006,7 +24067,7 @@
  	    || exit 1; \
  	  fi; \
  	done
-@@ -274,6 +284,7 @@
+@@ -275,6 +284,7 @@
  
  distclean-generic:
  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -86014,17 +24075,8 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -284,7 +295,7 @@
+@@ -293,6 +303,8 @@
  
- distclean: distclean-am
- 	-rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool
-+distclean-am: clean-am distclean-generic
- 
- dvi: dvi-am
- 
-@@ -292,18 +303,38 @@
- 
  html: html-am
  
 +html-am:
@@ -86032,17 +24084,16 @@
  info: info-am
  
  info-am:
+@@ -301,18 +313,28 @@
  
- install-data-am:
+ install-dvi: install-dvi-am
  
-+install-dvi: install-dvi-am
-+
 +install-dvi-am:
 +
  install-exec-am:
  
-+install-html: install-html-am
-+
+ install-html: install-html-am
+ 
 +install-html-am:
 +
  install-info: install-info-am
@@ -86051,88 +24102,53 @@
 +
  install-man:
  
-+install-pdf: install-pdf-am
-+
+ install-pdf: install-pdf-am
+ 
 +install-pdf-am:
 +
-+install-ps: install-ps-am
-+
+ install-ps: install-ps-am
+ 
 +install-ps-am:
 +
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
-@@ -322,17 +353,21 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-info-am
-+uninstall-am:
-+
-+.MAKE: install-am install-strip
- 
- .PHONY: all all-am check check-am clean clean-generic clean-libtool \
- 	distclean distclean-generic distclean-libtool distdir dvi \
- 	dvi-am html html-am info info-am install install-am \
--	install-data install-data-am install-exec install-exec-am \
--	install-info install-info-am install-man install-strip \
-+	install-data install-data-am install-dvi install-dvi-am \
-+	install-exec install-exec-am install-html install-html-am \
-+	install-info install-info-am install-man install-pdf \
-+	install-pdf-am install-ps install-ps-am install-strip \
- 	installcheck installcheck-am installdirs maintainer-clean \
+@@ -346,6 +368,7 @@
  	maintainer-clean-generic mostlyclean mostlyclean-generic \
--	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
--	uninstall-info-am
-+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
-+
+ 	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
  
++
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-Index: libkml-1.0.1/testdata/atom/Makefile.in
+ .NOEXPORT:
+Index: libkml-1.1.0/testdata/atom/Makefile.in
 ===================================================================
---- libkml-1.0.1.orig/testdata/atom/Makefile.in	2009-07-03 01:23:34.000000000 +0200
-+++ libkml-1.0.1/testdata/atom/Makefile.in	2009-12-10 10:19:47.000000000 +0100
+--- libkml-1.1.0.orig/testdata/atom/Makefile.in	2009-12-10 13:05:41.000000000 +0100
++++ libkml-1.1.0/testdata/atom/Makefile.in	2009-12-10 17:29:38.000000000 +0100
 @@ -1,8 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
+-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
-@@ -13,15 +14,12 @@
- # PARTICULAR PURPOSE.
- 
+@@ -15,8 +16,9 @@
  @SET_MAKE@
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
  VPATH = @srcdir@
  pkgdatadir = $(datadir)/@PACKAGE@
 -pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../..
 +pkglibdir = $(libdir)/@PACKAGE@
 +pkglibexecdir = $(libexecdir)/@PACKAGE@
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -39,18 +37,19 @@
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_curl.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)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
+@@ -43,6 +45,7 @@
  mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
@@ -86140,58 +24156,7 @@
  SOURCES =
  DIST_SOURCES =
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -72,18 +71,16 @@
- CYGPATH_W = @CYGPATH_W@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
--ECHO = @ECHO@
-+DSYMUTIL = @DSYMUTIL@
-+DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
--F77 = @F77@
--FFLAGS = @FFLAGS@
--GCC_FALSE = @GCC_FALSE@
--GCC_TRUE = @GCC_TRUE@
--HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
--HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
-+FGREP = @FGREP@
-+GREP = @GREP@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -93,19 +90,28 @@
- JAVAC = @JAVAC@
- JAVA_INCLUDE_DIR = @JAVA_INCLUDE_DIR@
- JAVA_LIB_DIR = @JAVA_LIB_DIR@
-+LD = @LD@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
-+LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
-+NM = @NM@
-+NMEDIT = @NMEDIT@
-+OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
-+OTOOL = @OTOOL@
-+OTOOL64 = @OTOOL64@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -108,6 +111,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -86199,84 +24164,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PLATFORM = @PLATFORM@
-@@ -122,22 +128,13 @@
- STRIP = @STRIP@
- SWIG = @SWIG@
- VERSION = @VERSION@
--WITH_JAVA_FALSE = @WITH_JAVA_FALSE@
--WITH_JAVA_TRUE = @WITH_JAVA_TRUE@
--WITH_PYTHON_FALSE = @WITH_PYTHON_FALSE@
--WITH_PYTHON_TRUE = @WITH_PYTHON_TRUE@
--WITH_SWIG_FALSE = @WITH_SWIG_FALSE@
--WITH_SWIG_TRUE = @WITH_SWIG_TRUE@
--ac_ct_AR = @ac_ct_AR@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
--ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -149,28 +146,41 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- EXTRA_DIST = \
- 	atom-all-a.kml atom-all.kml atom-author-ns.kml atom-author.kml \
- 	entry-faulkner.atom
-@@ -182,14 +192,14 @@
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
--	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
--		&& exit 0; \
-+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-+	        && { if test -f $@; then exit 0; else break; fi; }; \
+@@ -193,9 +197,9 @@
  	      exit 1;; \
  	  esac; \
  	done; \
@@ -86289,7 +24177,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -207,16 +217,13 @@
+@@ -213,6 +217,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -86297,49 +24185,10 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
- 
- clean-libtool:
- 	-rm -rf .libs _libs
--
--distclean-libtool:
--	-rm -f libtool
--uninstall-info-am:
- tags: TAGS
- TAGS:
- 
-@@ -225,29 +232,32 @@
- 
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
--	list='$(DISTFILES)'; for file in $$list; do \
--	  case $$file in \
--	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
--	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
--	  esac; \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
+@@ -242,13 +247,17 @@
  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
--	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
--	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
--	    dir="/$$dir"; \
--	    $(mkdir_p) "$(distdir)$$dir"; \
--	  else \
--	    dir=''; \
--	  fi; \
  	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 +	    if test -d "$(distdir)/$$file"; then \
 +	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 +	    fi; \
@@ -86358,7 +24207,7 @@
  	    || exit 1; \
  	  fi; \
  	done
-@@ -275,6 +285,7 @@
+@@ -276,6 +285,7 @@
  
  distclean-generic:
  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -86366,17 +24215,8 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -285,7 +296,7 @@
+@@ -294,6 +304,8 @@
  
- distclean: distclean-am
- 	-rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool
-+distclean-am: clean-am distclean-generic
- 
- dvi: dvi-am
- 
-@@ -293,18 +304,38 @@
- 
  html: html-am
  
 +html-am:
@@ -86384,17 +24224,16 @@
  info: info-am
  
  info-am:
+@@ -302,18 +314,28 @@
  
- install-data-am:
+ install-dvi: install-dvi-am
  
-+install-dvi: install-dvi-am
-+
 +install-dvi-am:
 +
  install-exec-am:
  
-+install-html: install-html-am
-+
+ install-html: install-html-am
+ 
 +install-html-am:
 +
  install-info: install-info-am
@@ -86403,88 +24242,53 @@
 +
  install-man:
  
-+install-pdf: install-pdf-am
-+
+ install-pdf: install-pdf-am
+ 
 +install-pdf-am:
 +
-+install-ps: install-ps-am
-+
+ install-ps: install-ps-am
+ 
 +install-ps-am:
 +
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
-@@ -323,17 +354,21 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-info-am
-+uninstall-am:
-+
-+.MAKE: install-am install-strip
- 
- .PHONY: all all-am check check-am clean clean-generic clean-libtool \
- 	distclean distclean-generic distclean-libtool distdir dvi \
- 	dvi-am html html-am info info-am install install-am \
--	install-data install-data-am install-exec install-exec-am \
--	install-info install-info-am install-man install-strip \
-+	install-data install-data-am install-dvi install-dvi-am \
-+	install-exec install-exec-am install-html install-html-am \
-+	install-info install-info-am install-man install-pdf \
-+	install-pdf-am install-ps install-ps-am install-strip \
- 	installcheck installcheck-am installdirs maintainer-clean \
+@@ -347,6 +369,7 @@
  	maintainer-clean-generic mostlyclean mostlyclean-generic \
--	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
--	uninstall-info-am
-+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
-+
+ 	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
  
++
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-Index: libkml-1.0.1/testdata/balloon/Makefile.in
+ .NOEXPORT:
+Index: libkml-1.1.0/testdata/balloon/Makefile.in
 ===================================================================
---- libkml-1.0.1.orig/testdata/balloon/Makefile.in	2009-07-03 01:23:34.000000000 +0200
-+++ libkml-1.0.1/testdata/balloon/Makefile.in	2009-12-10 10:19:47.000000000 +0100
+--- libkml-1.1.0.orig/testdata/balloon/Makefile.in	2009-12-10 13:05:40.000000000 +0100
++++ libkml-1.1.0/testdata/balloon/Makefile.in	2009-12-10 17:29:38.000000000 +0100
 @@ -1,8 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
+-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
-@@ -13,15 +14,12 @@
- # PARTICULAR PURPOSE.
- 
+@@ -15,8 +16,9 @@
  @SET_MAKE@
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
  VPATH = @srcdir@
  pkgdatadir = $(datadir)/@PACKAGE@
 -pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../..
 +pkglibdir = $(libdir)/@PACKAGE@
 +pkglibexecdir = $(libexecdir)/@PACKAGE@
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -39,18 +37,19 @@
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_curl.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)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
+@@ -43,6 +45,7 @@
  mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
@@ -86492,58 +24296,7 @@
  SOURCES =
  DIST_SOURCES =
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -72,18 +71,16 @@
- CYGPATH_W = @CYGPATH_W@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
--ECHO = @ECHO@
-+DSYMUTIL = @DSYMUTIL@
-+DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
--F77 = @F77@
--FFLAGS = @FFLAGS@
--GCC_FALSE = @GCC_FALSE@
--GCC_TRUE = @GCC_TRUE@
--HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
--HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
-+FGREP = @FGREP@
-+GREP = @GREP@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -93,19 +90,28 @@
- JAVAC = @JAVAC@
- JAVA_INCLUDE_DIR = @JAVA_INCLUDE_DIR@
- JAVA_LIB_DIR = @JAVA_LIB_DIR@
-+LD = @LD@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
-+LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
-+NM = @NM@
-+NMEDIT = @NMEDIT@
-+OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
-+OTOOL = @OTOOL@
-+OTOOL64 = @OTOOL64@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -108,6 +111,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -86551,84 +24304,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PLATFORM = @PLATFORM@
-@@ -122,22 +128,13 @@
- STRIP = @STRIP@
- SWIG = @SWIG@
- VERSION = @VERSION@
--WITH_JAVA_FALSE = @WITH_JAVA_FALSE@
--WITH_JAVA_TRUE = @WITH_JAVA_TRUE@
--WITH_PYTHON_FALSE = @WITH_PYTHON_FALSE@
--WITH_PYTHON_TRUE = @WITH_PYTHON_TRUE@
--WITH_SWIG_FALSE = @WITH_SWIG_FALSE@
--WITH_SWIG_TRUE = @WITH_SWIG_TRUE@
--ac_ct_AR = @ac_ct_AR@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
--ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -149,28 +146,41 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- EXTRA_DIST = \
- 	all-balloons.kml
- 
-@@ -181,14 +191,14 @@
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
--	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
--		&& exit 0; \
-+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-+	        && { if test -f $@; then exit 0; else break; fi; }; \
+@@ -192,9 +196,9 @@
  	      exit 1;; \
  	  esac; \
  	done; \
@@ -86641,7 +24317,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -206,16 +216,13 @@
+@@ -212,6 +216,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -86649,49 +24325,10 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
- 
- clean-libtool:
- 	-rm -rf .libs _libs
--
--distclean-libtool:
--	-rm -f libtool
--uninstall-info-am:
- tags: TAGS
- TAGS:
- 
-@@ -224,29 +231,32 @@
- 
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
--	list='$(DISTFILES)'; for file in $$list; do \
--	  case $$file in \
--	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
--	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
--	  esac; \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
+@@ -241,13 +246,17 @@
  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
--	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
--	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
--	    dir="/$$dir"; \
--	    $(mkdir_p) "$(distdir)$$dir"; \
--	  else \
--	    dir=''; \
--	  fi; \
  	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 +	    if test -d "$(distdir)/$$file"; then \
 +	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 +	    fi; \
@@ -86710,7 +24347,7 @@
  	    || exit 1; \
  	  fi; \
  	done
-@@ -274,6 +284,7 @@
+@@ -275,6 +284,7 @@
  
  distclean-generic:
  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -86718,17 +24355,8 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -284,7 +295,7 @@
+@@ -293,6 +303,8 @@
  
- distclean: distclean-am
- 	-rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool
-+distclean-am: clean-am distclean-generic
- 
- dvi: dvi-am
- 
-@@ -292,18 +303,38 @@
- 
  html: html-am
  
 +html-am:
@@ -86736,17 +24364,16 @@
  info: info-am
  
  info-am:
+@@ -301,18 +313,28 @@
  
- install-data-am:
+ install-dvi: install-dvi-am
  
-+install-dvi: install-dvi-am
-+
 +install-dvi-am:
 +
  install-exec-am:
  
-+install-html: install-html-am
-+
+ install-html: install-html-am
+ 
 +install-html-am:
 +
  install-info: install-info-am
@@ -86755,88 +24382,53 @@
 +
  install-man:
  
-+install-pdf: install-pdf-am
-+
+ install-pdf: install-pdf-am
+ 
 +install-pdf-am:
 +
-+install-ps: install-ps-am
-+
+ install-ps: install-ps-am
+ 
 +install-ps-am:
 +
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
-@@ -322,17 +353,21 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-info-am
-+uninstall-am:
-+
-+.MAKE: install-am install-strip
- 
- .PHONY: all all-am check check-am clean clean-generic clean-libtool \
- 	distclean distclean-generic distclean-libtool distdir dvi \
- 	dvi-am html html-am info info-am install install-am \
--	install-data install-data-am install-exec install-exec-am \
--	install-info install-info-am install-man install-strip \
-+	install-data install-data-am install-dvi install-dvi-am \
-+	install-exec install-exec-am install-html install-html-am \
-+	install-info install-info-am install-man install-pdf \
-+	install-pdf-am install-ps install-ps-am install-strip \
- 	installcheck installcheck-am installdirs maintainer-clean \
+@@ -346,6 +368,7 @@
  	maintainer-clean-generic mostlyclean mostlyclean-generic \
--	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
--	uninstall-info-am
-+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
-+
+ 	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
  
++
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-Index: libkml-1.0.1/testdata/csv/Makefile.in
+ .NOEXPORT:
+Index: libkml-1.1.0/testdata/csv/Makefile.in
 ===================================================================
---- libkml-1.0.1.orig/testdata/csv/Makefile.in	2009-07-03 01:23:34.000000000 +0200
-+++ libkml-1.0.1/testdata/csv/Makefile.in	2009-12-10 10:19:48.000000000 +0100
+--- libkml-1.1.0.orig/testdata/csv/Makefile.in	2009-12-10 13:05:41.000000000 +0100
++++ libkml-1.1.0/testdata/csv/Makefile.in	2009-12-10 17:29:38.000000000 +0100
 @@ -1,8 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
+-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
-@@ -13,15 +14,12 @@
- # PARTICULAR PURPOSE.
- 
+@@ -15,8 +16,9 @@
  @SET_MAKE@
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
  VPATH = @srcdir@
  pkgdatadir = $(datadir)/@PACKAGE@
 -pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../..
 +pkglibdir = $(libdir)/@PACKAGE@
 +pkglibexecdir = $(libexecdir)/@PACKAGE@
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -39,18 +37,19 @@
- DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_curl.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)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
+@@ -43,6 +45,7 @@
  mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
@@ -86844,58 +24436,7 @@
  SOURCES =
  DIST_SOURCES =
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -72,18 +71,16 @@
- CYGPATH_W = @CYGPATH_W@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
--ECHO = @ECHO@
-+DSYMUTIL = @DSYMUTIL@
-+DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
--F77 = @F77@
--FFLAGS = @FFLAGS@
--GCC_FALSE = @GCC_FALSE@
--GCC_TRUE = @GCC_TRUE@
--HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
--HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
-+FGREP = @FGREP@
-+GREP = @GREP@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -93,19 +90,28 @@
- JAVAC = @JAVAC@
- JAVA_INCLUDE_DIR = @JAVA_INCLUDE_DIR@
- JAVA_LIB_DIR = @JAVA_LIB_DIR@
-+LD = @LD@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
-+LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
-+NM = @NM@
-+NMEDIT = @NMEDIT@
-+OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
-+OTOOL = @OTOOL@
-+OTOOL64 = @OTOOL64@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -108,6 +111,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -86903,84 +24444,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PLATFORM = @PLATFORM@
-@@ -122,22 +128,13 @@
- STRIP = @STRIP@
- SWIG = @SWIG@
- VERSION = @VERSION@
--WITH_JAVA_FALSE = @WITH_JAVA_FALSE@
--WITH_JAVA_TRUE = @WITH_JAVA_TRUE@
--WITH_PYTHON_FALSE = @WITH_PYTHON_FALSE@
--WITH_PYTHON_TRUE = @WITH_PYTHON_TRUE@
--WITH_SWIG_FALSE = @WITH_SWIG_FALSE@
--WITH_SWIG_TRUE = @WITH_SWIG_TRUE@
--ac_ct_AR = @ac_ct_AR@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
--ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -149,28 +146,41 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- EXTRA_DIST = \
- 	README \
- 	test.csv
-@@ -182,14 +192,14 @@
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
--	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
--		&& exit 0; \
-+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-+	        && { if test -f $@; then exit 0; else break; fi; }; \
+@@ -193,9 +197,9 @@
  	      exit 1;; \
  	  esac; \
  	done; \
@@ -86993,7 +24457,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -207,16 +217,13 @@
+@@ -213,6 +217,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -87001,49 +24465,10 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
- 
- clean-libtool:
- 	-rm -rf .libs _libs
--
--distclean-libtool:
--	-rm -f libtool
--uninstall-info-am:
- tags: TAGS
- TAGS:
- 
-@@ -225,29 +232,32 @@
- 
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
--	list='$(DISTFILES)'; for file in $$list; do \
--	  case $$file in \
--	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
--	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
--	  esac; \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
+@@ -242,13 +247,17 @@
  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
--	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
--	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
--	    dir="/$$dir"; \
--	    $(mkdir_p) "$(distdir)$$dir"; \
--	  else \
--	    dir=''; \
--	  fi; \
  	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 +	    if test -d "$(distdir)/$$file"; then \
 +	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 +	    fi; \
@@ -87062,7 +24487,7 @@
  	    || exit 1; \
  	  fi; \
  	done
-@@ -275,6 +285,7 @@
+@@ -276,6 +285,7 @@
  
  distclean-generic:
  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -87070,17 +24495,8 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -285,7 +296,7 @@
+@@ -294,6 +304,8 @@
  
- distclean: distclean-am
- 	-rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool
-+distclean-am: clean-am distclean-generic
- 
- dvi: dvi-am
- 
-@@ -293,18 +304,38 @@
- 
  html: html-am
  
 +html-am:
@@ -87088,17 +24504,16 @@
  info: info-am
  
  info-am:
+@@ -302,18 +314,28 @@
  
- install-data-am:
+ install-dvi: install-dvi-am
  
-+install-dvi: install-dvi-am
-+
 +install-dvi-am:
 +
  install-exec-am:
  
-+install-html: install-html-am
-+
+ install-html: install-html-am
+ 
 +install-html-am:
 +
  install-info: install-info-am
@@ -87107,88 +24522,53 @@
 +
  install-man:
  
-+install-pdf: install-pdf-am
-+
+ install-pdf: install-pdf-am
+ 
 +install-pdf-am:
 +
-+install-ps: install-ps-am
-+
+ install-ps: install-ps-am
+ 
 +install-ps-am:
 +
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
-@@ -323,17 +354,21 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-info-am
-+uninstall-am:
-+
-+.MAKE: install-am install-strip
- 
- .PHONY: all all-am check check-am clean clean-generic clean-libtool \
- 	distclean distclean-generic distclean-libtool distdir dvi \
- 	dvi-am html html-am info info-am install install-am \
--	install-data install-data-am install-exec install-exec-am \
--	install-info install-info-am install-man install-strip \
-+	install-data install-data-am install-dvi install-dvi-am \
-+	install-exec install-exec-am install-html install-html-am \
-+	install-info install-info-am install-man install-pdf \
-+	install-pdf-am install-ps install-ps-am install-strip \
- 	installcheck installcheck-am installdirs maintainer-clean \
+@@ -347,6 +369,7 @@
  	maintainer-clean-generic mostlyclean mostlyclean-generic \
--	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
--	uninstall-info-am
-+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
-+
+ 	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
  
++
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-Index: libkml-1.0.1/testdata/deprecated/Makefile.in
+ .NOEXPORT:
+Index: libkml-1.1.0/testdata/deprecated/Makefile.in
 ===================================================================
---- libkml-1.0.1.orig/testdata/deprecated/Makefile.in	2009-07-03 01:23:34.000000000 +0200
-+++ libkml-1.0.1/testdata/deprecated/Makefile.in	2009-12-10 10:19:48.000000000 +0100
+--- libkml-1.1.0.orig/testdata/deprecated/Makefile.in	2009-12-10 13:05:40.000000000 +0100
++++ libkml-1.1.0/testdata/deprecated/Makefile.in	2009-12-10 17:29:38.000000000 +0100
 @@ -1,8 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
+-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
-@@ -13,15 +14,12 @@
- # PARTICULAR PURPOSE.
- 
+@@ -15,8 +16,9 @@
  @SET_MAKE@
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
  VPATH = @srcdir@
  pkgdatadir = $(datadir)/@PACKAGE@
 -pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../..
 +pkglibdir = $(libdir)/@PACKAGE@
 +pkglibexecdir = $(libexecdir)/@PACKAGE@
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -39,18 +37,19 @@
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_curl.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)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
+@@ -43,6 +45,7 @@
  mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
@@ -87196,58 +24576,7 @@
  SOURCES =
  DIST_SOURCES =
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -72,18 +71,16 @@
- CYGPATH_W = @CYGPATH_W@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
--ECHO = @ECHO@
-+DSYMUTIL = @DSYMUTIL@
-+DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
--F77 = @F77@
--FFLAGS = @FFLAGS@
--GCC_FALSE = @GCC_FALSE@
--GCC_TRUE = @GCC_TRUE@
--HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
--HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
-+FGREP = @FGREP@
-+GREP = @GREP@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -93,19 +90,28 @@
- JAVAC = @JAVAC@
- JAVA_INCLUDE_DIR = @JAVA_INCLUDE_DIR@
- JAVA_LIB_DIR = @JAVA_LIB_DIR@
-+LD = @LD@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
-+LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
-+NM = @NM@
-+NMEDIT = @NMEDIT@
-+OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
-+OTOOL = @OTOOL@
-+OTOOL64 = @OTOOL64@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -108,6 +111,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -87255,84 +24584,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PLATFORM = @PLATFORM@
-@@ -122,22 +128,13 @@
- STRIP = @STRIP@
- SWIG = @SWIG@
- VERSION = @VERSION@
--WITH_JAVA_FALSE = @WITH_JAVA_FALSE@
--WITH_JAVA_TRUE = @WITH_JAVA_TRUE@
--WITH_PYTHON_FALSE = @WITH_PYTHON_FALSE@
--WITH_PYTHON_TRUE = @WITH_PYTHON_TRUE@
--WITH_SWIG_FALSE = @WITH_SWIG_FALSE@
--WITH_SWIG_TRUE = @WITH_SWIG_TRUE@
--ac_ct_AR = @ac_ct_AR@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
--ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -149,28 +146,41 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- EXTRA_DIST = \
- 	deprecated.kml
- 
-@@ -181,14 +191,14 @@
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
--	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
--		&& exit 0; \
-+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-+	        && { if test -f $@; then exit 0; else break; fi; }; \
+@@ -192,9 +196,9 @@
  	      exit 1;; \
  	  esac; \
  	done; \
@@ -87345,7 +24597,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -206,16 +216,13 @@
+@@ -212,6 +216,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -87353,49 +24605,10 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
- 
- clean-libtool:
- 	-rm -rf .libs _libs
--
--distclean-libtool:
--	-rm -f libtool
--uninstall-info-am:
- tags: TAGS
- TAGS:
- 
-@@ -224,29 +231,32 @@
- 
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
--	list='$(DISTFILES)'; for file in $$list; do \
--	  case $$file in \
--	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
--	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
--	  esac; \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
+@@ -241,13 +246,17 @@
  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
--	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
--	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
--	    dir="/$$dir"; \
--	    $(mkdir_p) "$(distdir)$$dir"; \
--	  else \
--	    dir=''; \
--	  fi; \
  	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 +	    if test -d "$(distdir)/$$file"; then \
 +	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 +	    fi; \
@@ -87414,7 +24627,7 @@
  	    || exit 1; \
  	  fi; \
  	done
-@@ -274,6 +284,7 @@
+@@ -275,6 +284,7 @@
  
  distclean-generic:
  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -87422,17 +24635,8 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -284,7 +295,7 @@
+@@ -293,6 +303,8 @@
  
- distclean: distclean-am
- 	-rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool
-+distclean-am: clean-am distclean-generic
- 
- dvi: dvi-am
- 
-@@ -292,18 +303,38 @@
- 
  html: html-am
  
 +html-am:
@@ -87440,17 +24644,16 @@
  info: info-am
  
  info-am:
+@@ -301,18 +313,28 @@
  
- install-data-am:
+ install-dvi: install-dvi-am
  
-+install-dvi: install-dvi-am
-+
 +install-dvi-am:
 +
  install-exec-am:
  
-+install-html: install-html-am
-+
+ install-html: install-html-am
+ 
 +install-html-am:
 +
  install-info: install-info-am
@@ -87459,88 +24662,193 @@
 +
  install-man:
  
-+install-pdf: install-pdf-am
-+
+ install-pdf: install-pdf-am
+ 
 +install-pdf-am:
 +
-+install-ps: install-ps-am
-+
+ install-ps: install-ps-am
+ 
 +install-ps-am:
 +
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
-@@ -322,17 +353,21 @@
+@@ -346,6 +368,7 @@
+ 	maintainer-clean-generic mostlyclean mostlyclean-generic \
+ 	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
  
- ps-am:
++
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+Index: libkml-1.1.0/testdata/gmaps/Makefile.in
+===================================================================
+--- libkml-1.1.0.orig/testdata/gmaps/Makefile.in	2009-12-10 13:05:41.000000000 +0100
++++ libkml-1.1.0/testdata/gmaps/Makefile.in	2009-12-10 17:29:38.000000000 +0100
+@@ -1,8 +1,9 @@
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
++# Makefile.in generated by automake 1.11 from Makefile.am.
+ # @configure_input@
  
--uninstall-am: uninstall-info-am
-+uninstall-am:
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
++# Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,8 +16,9 @@
+ @SET_MAKE@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+-pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
++pkglibdir = $(libdir)/@PACKAGE@
++pkglibexecdir = $(libexecdir)/@PACKAGE@
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+@@ -43,6 +45,7 @@
+ mkinstalldirs = $(install_sh) -d
+ CONFIG_HEADER = $(top_builddir)/config.h
+ CONFIG_CLEAN_FILES =
++CONFIG_CLEAN_VPATH_FILES =
+ SOURCES =
+ DIST_SOURCES =
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+@@ -108,6 +111,7 @@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PLATFORM = @PLATFORM@
+@@ -192,9 +196,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  testdata/gmaps/Makefile'; \
+-	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --gnu  testdata/gmaps/Makefile
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu testdata/gmaps/Makefile'; \
++	$(am__cd) $(top_srcdir) && \
++	  $(AUTOMAKE) --gnu testdata/gmaps/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+@@ -212,6 +216,7 @@
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++$(am__aclocal_m4_deps):
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -241,13 +246,17 @@
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ 	  if test -d $$d/$$file; then \
+ 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
++	    if test -d "$(distdir)/$$file"; then \
++	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
++	    fi; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
++	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
++	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+ 	    fi; \
+-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
++	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+ 	  else \
+-	    test -f $(distdir)/$$file \
+-	    || cp -p $$d/$$file $(distdir)/$$file \
++	    test -f "$(distdir)/$$file" \
++	    || cp -p $$d/$$file "$(distdir)/$$file" \
+ 	    || exit 1; \
+ 	  fi; \
+ 	done
+@@ -275,6 +284,7 @@
+ 
+ distclean-generic:
+ 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+ 
+ maintainer-clean-generic:
+ 	@echo "This command is intended for maintainers to use"
+@@ -293,6 +303,8 @@
+ 
+ html: html-am
+ 
++html-am:
 +
-+.MAKE: install-am install-strip
+ info: info-am
  
- .PHONY: all all-am check check-am clean clean-generic clean-libtool \
- 	distclean distclean-generic distclean-libtool distdir dvi \
- 	dvi-am html html-am info info-am install install-am \
--	install-data install-data-am install-exec install-exec-am \
--	install-info install-info-am install-man install-strip \
-+	install-data install-data-am install-dvi install-dvi-am \
-+	install-exec install-exec-am install-html install-html-am \
-+	install-info install-info-am install-man install-pdf \
-+	install-pdf-am install-ps install-ps-am install-strip \
- 	installcheck installcheck-am installdirs maintainer-clean \
- 	maintainer-clean-generic mostlyclean mostlyclean-generic \
--	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
--	uninstall-info-am
-+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
+ info-am:
+@@ -301,18 +313,28 @@
+ 
+ install-dvi: install-dvi-am
+ 
++install-dvi-am:
 +
+ install-exec-am:
  
+ install-html: install-html-am
+ 
++install-html-am:
++
+ install-info: install-info-am
+ 
++install-info-am:
++
+ install-man:
+ 
+ install-pdf: install-pdf-am
+ 
++install-pdf-am:
++
+ install-ps: install-ps-am
+ 
++install-ps-am:
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -346,6 +368,7 @@
+ 	maintainer-clean-generic mostlyclean mostlyclean-generic \
+ 	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
+ 
++
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-Index: libkml-1.0.1/testdata/gpx/Makefile.in
+ .NOEXPORT:
+Index: libkml-1.1.0/testdata/gpx/Makefile.in
 ===================================================================
---- libkml-1.0.1.orig/testdata/gpx/Makefile.in	2009-07-03 01:23:34.000000000 +0200
-+++ libkml-1.0.1/testdata/gpx/Makefile.in	2009-12-10 10:19:48.000000000 +0100
+--- libkml-1.1.0.orig/testdata/gpx/Makefile.in	2009-12-10 13:05:40.000000000 +0100
++++ libkml-1.1.0/testdata/gpx/Makefile.in	2009-12-10 17:29:38.000000000 +0100
 @@ -1,8 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
+-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
-@@ -13,15 +14,12 @@
- # PARTICULAR PURPOSE.
- 
+@@ -15,8 +16,9 @@
  @SET_MAKE@
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
  VPATH = @srcdir@
  pkgdatadir = $(datadir)/@PACKAGE@
 -pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../..
 +pkglibdir = $(libdir)/@PACKAGE@
 +pkglibexecdir = $(libexecdir)/@PACKAGE@
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -39,18 +37,19 @@
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_curl.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)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
+@@ -43,6 +45,7 @@
  mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
@@ -87548,58 +24856,7 @@
  SOURCES =
  DIST_SOURCES =
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -72,18 +71,16 @@
- CYGPATH_W = @CYGPATH_W@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
--ECHO = @ECHO@
-+DSYMUTIL = @DSYMUTIL@
-+DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
--F77 = @F77@
--FFLAGS = @FFLAGS@
--GCC_FALSE = @GCC_FALSE@
--GCC_TRUE = @GCC_TRUE@
--HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
--HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
-+FGREP = @FGREP@
-+GREP = @GREP@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -93,19 +90,28 @@
- JAVAC = @JAVAC@
- JAVA_INCLUDE_DIR = @JAVA_INCLUDE_DIR@
- JAVA_LIB_DIR = @JAVA_LIB_DIR@
-+LD = @LD@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
-+LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
-+NM = @NM@
-+NMEDIT = @NMEDIT@
-+OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
-+OTOOL = @OTOOL@
-+OTOOL64 = @OTOOL64@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -108,6 +111,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -87607,84 +24864,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PLATFORM = @PLATFORM@
-@@ -122,22 +128,13 @@
- STRIP = @STRIP@
- SWIG = @SWIG@
- VERSION = @VERSION@
--WITH_JAVA_FALSE = @WITH_JAVA_FALSE@
--WITH_JAVA_TRUE = @WITH_JAVA_TRUE@
--WITH_PYTHON_FALSE = @WITH_PYTHON_FALSE@
--WITH_PYTHON_TRUE = @WITH_PYTHON_TRUE@
--WITH_SWIG_FALSE = @WITH_SWIG_FALSE@
--WITH_SWIG_TRUE = @WITH_SWIG_TRUE@
--ac_ct_AR = @ac_ct_AR@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
--ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -149,28 +146,41 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- EXTRA_DIST = \
- 	trkpts.gpx
- 
-@@ -181,14 +191,14 @@
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
--	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
--		&& exit 0; \
-+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-+	        && { if test -f $@; then exit 0; else break; fi; }; \
+@@ -192,9 +196,9 @@
  	      exit 1;; \
  	  esac; \
  	done; \
@@ -87697,7 +24877,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -206,16 +216,13 @@
+@@ -212,6 +216,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -87705,49 +24885,10 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
- 
- clean-libtool:
- 	-rm -rf .libs _libs
--
--distclean-libtool:
--	-rm -f libtool
--uninstall-info-am:
- tags: TAGS
- TAGS:
- 
-@@ -224,29 +231,32 @@
- 
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
--	list='$(DISTFILES)'; for file in $$list; do \
--	  case $$file in \
--	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
--	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
--	  esac; \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
+@@ -241,13 +246,17 @@
  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
--	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
--	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
--	    dir="/$$dir"; \
--	    $(mkdir_p) "$(distdir)$$dir"; \
--	  else \
--	    dir=''; \
--	  fi; \
  	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 +	    if test -d "$(distdir)/$$file"; then \
 +	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 +	    fi; \
@@ -87766,7 +24907,7 @@
  	    || exit 1; \
  	  fi; \
  	done
-@@ -274,6 +284,7 @@
+@@ -275,6 +284,7 @@
  
  distclean-generic:
  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -87774,17 +24915,8 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -284,7 +295,7 @@
+@@ -293,6 +303,8 @@
  
- distclean: distclean-am
- 	-rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool
-+distclean-am: clean-am distclean-generic
- 
- dvi: dvi-am
- 
-@@ -292,18 +303,38 @@
- 
  html: html-am
  
 +html-am:
@@ -87792,17 +24924,16 @@
  info: info-am
  
  info-am:
+@@ -301,18 +313,28 @@
  
- install-data-am:
+ install-dvi: install-dvi-am
  
-+install-dvi: install-dvi-am
-+
 +install-dvi-am:
 +
  install-exec-am:
  
-+install-html: install-html-am
-+
+ install-html: install-html-am
+ 
 +install-html-am:
 +
  install-info: install-info-am
@@ -87811,88 +24942,53 @@
 +
  install-man:
  
-+install-pdf: install-pdf-am
-+
+ install-pdf: install-pdf-am
+ 
 +install-pdf-am:
 +
-+install-ps: install-ps-am
-+
+ install-ps: install-ps-am
+ 
 +install-ps-am:
 +
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
-@@ -322,17 +353,21 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-info-am
-+uninstall-am:
-+
-+.MAKE: install-am install-strip
- 
- .PHONY: all all-am check check-am clean clean-generic clean-libtool \
- 	distclean distclean-generic distclean-libtool distdir dvi \
- 	dvi-am html html-am info info-am install install-am \
--	install-data install-data-am install-exec install-exec-am \
--	install-info install-info-am install-man install-strip \
-+	install-data install-data-am install-dvi install-dvi-am \
-+	install-exec install-exec-am install-html install-html-am \
-+	install-info install-info-am install-man install-pdf \
-+	install-pdf-am install-ps install-ps-am install-strip \
- 	installcheck installcheck-am installdirs maintainer-clean \
+@@ -346,6 +368,7 @@
  	maintainer-clean-generic mostlyclean mostlyclean-generic \
--	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
--	uninstall-info-am
-+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
-+
+ 	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
  
++
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-Index: libkml-1.0.1/testdata/gx/Makefile.in
+ .NOEXPORT:
+Index: libkml-1.1.0/testdata/gx/Makefile.in
 ===================================================================
---- libkml-1.0.1.orig/testdata/gx/Makefile.in	2009-07-03 01:23:35.000000000 +0200
-+++ libkml-1.0.1/testdata/gx/Makefile.in	2009-12-10 10:19:48.000000000 +0100
+--- libkml-1.1.0.orig/testdata/gx/Makefile.in	2009-12-10 13:05:40.000000000 +0100
++++ libkml-1.1.0/testdata/gx/Makefile.in	2009-12-10 17:29:38.000000000 +0100
 @@ -1,8 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
+-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
-@@ -13,15 +14,12 @@
- # PARTICULAR PURPOSE.
- 
+@@ -15,8 +16,9 @@
  @SET_MAKE@
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
  VPATH = @srcdir@
  pkgdatadir = $(datadir)/@PACKAGE@
 -pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../..
 +pkglibdir = $(libdir)/@PACKAGE@
 +pkglibexecdir = $(libexecdir)/@PACKAGE@
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -39,18 +37,19 @@
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_curl.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)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
+@@ -43,6 +45,7 @@
  mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
@@ -87900,58 +24996,7 @@
  SOURCES =
  DIST_SOURCES =
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -72,18 +71,16 @@
- CYGPATH_W = @CYGPATH_W@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
--ECHO = @ECHO@
-+DSYMUTIL = @DSYMUTIL@
-+DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
--F77 = @F77@
--FFLAGS = @FFLAGS@
--GCC_FALSE = @GCC_FALSE@
--GCC_TRUE = @GCC_TRUE@
--HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
--HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
-+FGREP = @FGREP@
-+GREP = @GREP@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -93,19 +90,28 @@
- JAVAC = @JAVAC@
- JAVA_INCLUDE_DIR = @JAVA_INCLUDE_DIR@
- JAVA_LIB_DIR = @JAVA_LIB_DIR@
-+LD = @LD@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
-+LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
-+NM = @NM@
-+NMEDIT = @NMEDIT@
-+OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
-+OTOOL = @OTOOL@
-+OTOOL64 = @OTOOL64@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -108,6 +111,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -87959,84 +25004,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PLATFORM = @PLATFORM@
-@@ -122,22 +128,13 @@
- STRIP = @STRIP@
- SWIG = @SWIG@
- VERSION = @VERSION@
--WITH_JAVA_FALSE = @WITH_JAVA_FALSE@
--WITH_JAVA_TRUE = @WITH_JAVA_TRUE@
--WITH_PYTHON_FALSE = @WITH_PYTHON_FALSE@
--WITH_PYTHON_TRUE = @WITH_PYTHON_TRUE@
--WITH_SWIG_FALSE = @WITH_SWIG_FALSE@
--WITH_SWIG_TRUE = @WITH_SWIG_TRUE@
--ac_ct_AR = @ac_ct_AR@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
--ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -149,28 +146,41 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- EXTRA_DIST = \
-     all-gx-altitudemodes.kml all-gx-altitudemodes-golden.kml \
-     all-gx.kml all-gx-golden.kml
-@@ -182,14 +192,14 @@
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
--	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
--		&& exit 0; \
-+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-+	        && { if test -f $@; then exit 0; else break; fi; }; \
+@@ -193,9 +197,9 @@
  	      exit 1;; \
  	  esac; \
  	done; \
@@ -88049,7 +25017,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -207,16 +217,13 @@
+@@ -213,6 +217,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -88057,49 +25025,10 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
- 
- clean-libtool:
- 	-rm -rf .libs _libs
--
--distclean-libtool:
--	-rm -f libtool
--uninstall-info-am:
- tags: TAGS
- TAGS:
- 
-@@ -225,29 +232,32 @@
- 
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
--	list='$(DISTFILES)'; for file in $$list; do \
--	  case $$file in \
--	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
--	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
--	  esac; \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
+@@ -242,13 +247,17 @@
  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
--	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
--	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
--	    dir="/$$dir"; \
--	    $(mkdir_p) "$(distdir)$$dir"; \
--	  else \
--	    dir=''; \
--	  fi; \
  	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 +	    if test -d "$(distdir)/$$file"; then \
 +	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 +	    fi; \
@@ -88118,7 +25047,7 @@
  	    || exit 1; \
  	  fi; \
  	done
-@@ -275,6 +285,7 @@
+@@ -276,6 +285,7 @@
  
  distclean-generic:
  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -88126,17 +25055,8 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -285,7 +296,7 @@
+@@ -294,6 +304,8 @@
  
- distclean: distclean-am
- 	-rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool
-+distclean-am: clean-am distclean-generic
- 
- dvi: dvi-am
- 
-@@ -293,18 +304,38 @@
- 
  html: html-am
  
 +html-am:
@@ -88144,17 +25064,16 @@
  info: info-am
  
  info-am:
+@@ -302,18 +314,28 @@
  
- install-data-am:
+ install-dvi: install-dvi-am
  
-+install-dvi: install-dvi-am
-+
 +install-dvi-am:
 +
  install-exec-am:
  
-+install-html: install-html-am
-+
+ install-html: install-html-am
+ 
 +install-html-am:
 +
  install-info: install-info-am
@@ -88163,88 +25082,53 @@
 +
  install-man:
  
-+install-pdf: install-pdf-am
-+
+ install-pdf: install-pdf-am
+ 
 +install-pdf-am:
 +
-+install-ps: install-ps-am
-+
+ install-ps: install-ps-am
+ 
 +install-ps-am:
 +
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
-@@ -323,17 +354,21 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-info-am
-+uninstall-am:
-+
-+.MAKE: install-am install-strip
- 
- .PHONY: all all-am check check-am clean clean-generic clean-libtool \
- 	distclean distclean-generic distclean-libtool distdir dvi \
- 	dvi-am html html-am info info-am install install-am \
--	install-data install-data-am install-exec install-exec-am \
--	install-info install-info-am install-man install-strip \
-+	install-data install-data-am install-dvi install-dvi-am \
-+	install-exec install-exec-am install-html install-html-am \
-+	install-info install-info-am install-man install-pdf \
-+	install-pdf-am install-ps install-ps-am install-strip \
- 	installcheck installcheck-am installdirs maintainer-clean \
+@@ -347,6 +369,7 @@
  	maintainer-clean-generic mostlyclean mostlyclean-generic \
--	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
--	uninstall-info-am
-+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
-+
+ 	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
  
++
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-Index: libkml-1.0.1/testdata/kml/Makefile.in
+ .NOEXPORT:
+Index: libkml-1.1.0/testdata/kml/Makefile.in
 ===================================================================
---- libkml-1.0.1.orig/testdata/kml/Makefile.in	2009-07-03 01:23:35.000000000 +0200
-+++ libkml-1.0.1/testdata/kml/Makefile.in	2009-12-10 10:19:48.000000000 +0100
+--- libkml-1.1.0.orig/testdata/kml/Makefile.in	2009-12-10 13:05:40.000000000 +0100
++++ libkml-1.1.0/testdata/kml/Makefile.in	2009-12-10 17:29:38.000000000 +0100
 @@ -1,8 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
+-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
-@@ -13,15 +14,12 @@
- # PARTICULAR PURPOSE.
- 
+@@ -15,8 +16,9 @@
  @SET_MAKE@
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
  VPATH = @srcdir@
  pkgdatadir = $(datadir)/@PACKAGE@
 -pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../..
 +pkglibdir = $(libdir)/@PACKAGE@
 +pkglibexecdir = $(libexecdir)/@PACKAGE@
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -39,18 +37,19 @@
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_curl.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)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
+@@ -43,6 +45,7 @@
  mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
@@ -88252,58 +25136,7 @@
  SOURCES =
  DIST_SOURCES =
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -72,18 +71,16 @@
- CYGPATH_W = @CYGPATH_W@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
--ECHO = @ECHO@
-+DSYMUTIL = @DSYMUTIL@
-+DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
--F77 = @F77@
--FFLAGS = @FFLAGS@
--GCC_FALSE = @GCC_FALSE@
--GCC_TRUE = @GCC_TRUE@
--HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
--HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
-+FGREP = @FGREP@
-+GREP = @GREP@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -93,19 +90,28 @@
- JAVAC = @JAVAC@
- JAVA_INCLUDE_DIR = @JAVA_INCLUDE_DIR@
- JAVA_LIB_DIR = @JAVA_LIB_DIR@
-+LD = @LD@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
-+LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
-+NM = @NM@
-+NMEDIT = @NMEDIT@
-+OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
-+OTOOL = @OTOOL@
-+OTOOL64 = @OTOOL64@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -108,6 +111,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -88311,84 +25144,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PLATFORM = @PLATFORM@
-@@ -122,22 +128,13 @@
- STRIP = @STRIP@
- SWIG = @SWIG@
- VERSION = @VERSION@
--WITH_JAVA_FALSE = @WITH_JAVA_FALSE@
--WITH_JAVA_TRUE = @WITH_JAVA_TRUE@
--WITH_PYTHON_FALSE = @WITH_PYTHON_FALSE@
--WITH_PYTHON_TRUE = @WITH_PYTHON_TRUE@
--WITH_SWIG_FALSE = @WITH_SWIG_FALSE@
--WITH_SWIG_TRUE = @WITH_SWIG_TRUE@
--ac_ct_AR = @ac_ct_AR@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
--ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -149,28 +146,41 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- EXTRA_DIST = \
-     all-altitudemodes.kml all-altitudemodes-golden.kml \
-     all-arrays.kml all-arrays-golden.kml \
-@@ -186,14 +196,14 @@
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
--	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
--		&& exit 0; \
-+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-+	        && { if test -f $@; then exit 0; else break; fi; }; \
+@@ -198,9 +202,9 @@
  	      exit 1;; \
  	  esac; \
  	done; \
@@ -88401,7 +25157,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -211,16 +221,13 @@
+@@ -218,6 +222,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -88409,49 +25165,10 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
- 
- clean-libtool:
- 	-rm -rf .libs _libs
--
--distclean-libtool:
--	-rm -f libtool
--uninstall-info-am:
- tags: TAGS
- TAGS:
- 
-@@ -229,29 +236,32 @@
- 
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
--	list='$(DISTFILES)'; for file in $$list; do \
--	  case $$file in \
--	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
--	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
--	  esac; \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
+@@ -247,13 +252,17 @@
  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
--	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
--	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
--	    dir="/$$dir"; \
--	    $(mkdir_p) "$(distdir)$$dir"; \
--	  else \
--	    dir=''; \
--	  fi; \
  	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 +	    if test -d "$(distdir)/$$file"; then \
 +	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 +	    fi; \
@@ -88470,7 +25187,7 @@
  	    || exit 1; \
  	  fi; \
  	done
-@@ -279,6 +289,7 @@
+@@ -281,6 +290,7 @@
  
  distclean-generic:
  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -88478,17 +25195,8 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -289,7 +300,7 @@
+@@ -299,6 +309,8 @@
  
- distclean: distclean-am
- 	-rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool
-+distclean-am: clean-am distclean-generic
- 
- dvi: dvi-am
- 
-@@ -297,18 +308,38 @@
- 
  html: html-am
  
 +html-am:
@@ -88496,17 +25204,16 @@
  info: info-am
  
  info-am:
+@@ -307,18 +319,28 @@
  
- install-data-am:
+ install-dvi: install-dvi-am
  
-+install-dvi: install-dvi-am
-+
 +install-dvi-am:
 +
  install-exec-am:
  
-+install-html: install-html-am
-+
+ install-html: install-html-am
+ 
 +install-html-am:
 +
  install-info: install-info-am
@@ -88515,88 +25222,53 @@
 +
  install-man:
  
-+install-pdf: install-pdf-am
-+
+ install-pdf: install-pdf-am
+ 
 +install-pdf-am:
 +
-+install-ps: install-ps-am
-+
+ install-ps: install-ps-am
+ 
 +install-ps-am:
 +
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
-@@ -327,17 +358,21 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-info-am
-+uninstall-am:
-+
-+.MAKE: install-am install-strip
- 
- .PHONY: all all-am check check-am clean clean-generic clean-libtool \
- 	distclean distclean-generic distclean-libtool distdir dvi \
- 	dvi-am html html-am info info-am install install-am \
--	install-data install-data-am install-exec install-exec-am \
--	install-info install-info-am install-man install-strip \
-+	install-data install-data-am install-dvi install-dvi-am \
-+	install-exec install-exec-am install-html install-html-am \
-+	install-info install-info-am install-man install-pdf \
-+	install-pdf-am install-ps install-ps-am install-strip \
- 	installcheck installcheck-am installdirs maintainer-clean \
+@@ -352,6 +374,7 @@
  	maintainer-clean-generic mostlyclean mostlyclean-generic \
--	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
--	uninstall-info-am
-+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
-+
+ 	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
  
++
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-Index: libkml-1.0.1/testdata/kmz/files/Makefile.in
+ .NOEXPORT:
+Index: libkml-1.1.0/testdata/kmz/files/Makefile.in
 ===================================================================
---- libkml-1.0.1.orig/testdata/kmz/files/Makefile.in	2009-07-03 01:23:35.000000000 +0200
-+++ libkml-1.0.1/testdata/kmz/files/Makefile.in	2009-12-10 10:19:48.000000000 +0100
+--- libkml-1.1.0.orig/testdata/kmz/files/Makefile.in	2009-12-10 13:05:41.000000000 +0100
++++ libkml-1.1.0/testdata/kmz/files/Makefile.in	2009-12-10 17:29:39.000000000 +0100
 @@ -1,8 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
+-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
-@@ -13,15 +14,12 @@
- # PARTICULAR PURPOSE.
- 
+@@ -15,8 +16,9 @@
  @SET_MAKE@
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
  VPATH = @srcdir@
  pkgdatadir = $(datadir)/@PACKAGE@
 -pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../../..
 +pkglibdir = $(libdir)/@PACKAGE@
 +pkglibexecdir = $(libexecdir)/@PACKAGE@
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -39,18 +37,19 @@
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_curl.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)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
+@@ -43,6 +45,7 @@
  mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
@@ -88604,58 +25276,7 @@
  SOURCES =
  DIST_SOURCES =
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -72,18 +71,16 @@
- CYGPATH_W = @CYGPATH_W@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
--ECHO = @ECHO@
-+DSYMUTIL = @DSYMUTIL@
-+DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
--F77 = @F77@
--FFLAGS = @FFLAGS@
--GCC_FALSE = @GCC_FALSE@
--GCC_TRUE = @GCC_TRUE@
--HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
--HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
-+FGREP = @FGREP@
-+GREP = @GREP@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -93,19 +90,28 @@
- JAVAC = @JAVAC@
- JAVA_INCLUDE_DIR = @JAVA_INCLUDE_DIR@
- JAVA_LIB_DIR = @JAVA_LIB_DIR@
-+LD = @LD@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
-+LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
-+NM = @NM@
-+NMEDIT = @NMEDIT@
-+OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
-+OTOOL = @OTOOL@
-+OTOOL64 = @OTOOL64@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -108,6 +111,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -88663,84 +25284,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PLATFORM = @PLATFORM@
-@@ -122,22 +128,13 @@
- STRIP = @STRIP@
- SWIG = @SWIG@
- VERSION = @VERSION@
--WITH_JAVA_FALSE = @WITH_JAVA_FALSE@
--WITH_JAVA_TRUE = @WITH_JAVA_TRUE@
--WITH_PYTHON_FALSE = @WITH_PYTHON_FALSE@
--WITH_PYTHON_TRUE = @WITH_PYTHON_TRUE@
--WITH_SWIG_FALSE = @WITH_SWIG_FALSE@
--WITH_SWIG_TRUE = @WITH_SWIG_TRUE@
--ac_ct_AR = @ac_ct_AR@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
--ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -149,28 +146,41 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- EXTRA_DIST = \
- 	camelblack200.png \
- 	camelbrown200.png \
-@@ -184,14 +194,14 @@
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
--	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
--		&& exit 0; \
-+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-+	        && { if test -f $@; then exit 0; else break; fi; }; \
+@@ -195,9 +199,9 @@
  	      exit 1;; \
  	  esac; \
  	done; \
@@ -88753,7 +25297,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -209,16 +219,13 @@
+@@ -215,6 +219,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -88761,49 +25305,10 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
- 
- clean-libtool:
- 	-rm -rf .libs _libs
--
--distclean-libtool:
--	-rm -f libtool
--uninstall-info-am:
- tags: TAGS
- TAGS:
- 
-@@ -227,29 +234,32 @@
- 
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
--	list='$(DISTFILES)'; for file in $$list; do \
--	  case $$file in \
--	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
--	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
--	  esac; \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
+@@ -244,13 +249,17 @@
  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
--	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
--	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
--	    dir="/$$dir"; \
--	    $(mkdir_p) "$(distdir)$$dir"; \
--	  else \
--	    dir=''; \
--	  fi; \
  	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 +	    if test -d "$(distdir)/$$file"; then \
 +	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 +	    fi; \
@@ -88822,7 +25327,7 @@
  	    || exit 1; \
  	  fi; \
  	done
-@@ -277,6 +287,7 @@
+@@ -278,6 +287,7 @@
  
  distclean-generic:
  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -88830,17 +25335,8 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -287,7 +298,7 @@
+@@ -296,6 +306,8 @@
  
- distclean: distclean-am
- 	-rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool
-+distclean-am: clean-am distclean-generic
- 
- dvi: dvi-am
- 
-@@ -295,18 +306,38 @@
- 
  html: html-am
  
 +html-am:
@@ -88848,17 +25344,16 @@
  info: info-am
  
  info-am:
+@@ -304,18 +316,28 @@
  
- install-data-am:
+ install-dvi: install-dvi-am
  
-+install-dvi: install-dvi-am
-+
 +install-dvi-am:
 +
  install-exec-am:
  
-+install-html: install-html-am
-+
+ install-html: install-html-am
+ 
 +install-html-am:
 +
  install-info: install-info-am
@@ -88867,88 +25362,53 @@
 +
  install-man:
  
-+install-pdf: install-pdf-am
-+
+ install-pdf: install-pdf-am
+ 
 +install-pdf-am:
 +
-+install-ps: install-ps-am
-+
+ install-ps: install-ps-am
+ 
 +install-ps-am:
 +
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
-@@ -325,17 +356,21 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-info-am
-+uninstall-am:
-+
-+.MAKE: install-am install-strip
- 
- .PHONY: all all-am check check-am clean clean-generic clean-libtool \
- 	distclean distclean-generic distclean-libtool distdir dvi \
- 	dvi-am html html-am info info-am install install-am \
--	install-data install-data-am install-exec install-exec-am \
--	install-info install-info-am install-man install-strip \
-+	install-data install-data-am install-dvi install-dvi-am \
-+	install-exec install-exec-am install-html install-html-am \
-+	install-info install-info-am install-man install-pdf \
-+	install-pdf-am install-ps install-ps-am install-strip \
- 	installcheck installcheck-am installdirs maintainer-clean \
+@@ -349,6 +371,7 @@
  	maintainer-clean-generic mostlyclean mostlyclean-generic \
--	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
--	uninstall-info-am
-+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
-+
+ 	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
  
++
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-Index: libkml-1.0.1/testdata/kmz/kmzfiles/Makefile.in
+ .NOEXPORT:
+Index: libkml-1.1.0/testdata/kmz/kmzfiles/Makefile.in
 ===================================================================
---- libkml-1.0.1.orig/testdata/kmz/kmzfiles/Makefile.in	2009-07-03 01:23:35.000000000 +0200
-+++ libkml-1.0.1/testdata/kmz/kmzfiles/Makefile.in	2009-12-10 10:19:48.000000000 +0100
+--- libkml-1.1.0.orig/testdata/kmz/kmzfiles/Makefile.in	2009-12-10 13:05:41.000000000 +0100
++++ libkml-1.1.0/testdata/kmz/kmzfiles/Makefile.in	2009-12-10 17:29:39.000000000 +0100
 @@ -1,8 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
+-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
-@@ -13,15 +14,12 @@
- # PARTICULAR PURPOSE.
- 
+@@ -15,8 +16,9 @@
  @SET_MAKE@
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
  VPATH = @srcdir@
  pkgdatadir = $(datadir)/@PACKAGE@
 -pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../../..
 +pkglibdir = $(libdir)/@PACKAGE@
 +pkglibexecdir = $(libexecdir)/@PACKAGE@
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -39,18 +37,19 @@
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_curl.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)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
+@@ -43,6 +45,7 @@
  mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
@@ -88956,58 +25416,7 @@
  SOURCES =
  DIST_SOURCES =
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -72,18 +71,16 @@
- CYGPATH_W = @CYGPATH_W@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
--ECHO = @ECHO@
-+DSYMUTIL = @DSYMUTIL@
-+DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
--F77 = @F77@
--FFLAGS = @FFLAGS@
--GCC_FALSE = @GCC_FALSE@
--GCC_TRUE = @GCC_TRUE@
--HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
--HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
-+FGREP = @FGREP@
-+GREP = @GREP@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -93,19 +90,28 @@
- JAVAC = @JAVAC@
- JAVA_INCLUDE_DIR = @JAVA_INCLUDE_DIR@
- JAVA_LIB_DIR = @JAVA_LIB_DIR@
-+LD = @LD@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
-+LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
-+NM = @NM@
-+NMEDIT = @NMEDIT@
-+OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
-+OTOOL = @OTOOL@
-+OTOOL64 = @OTOOL64@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -108,6 +111,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -89015,84 +25424,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PLATFORM = @PLATFORM@
-@@ -122,22 +128,13 @@
- STRIP = @STRIP@
- SWIG = @SWIG@
- VERSION = @VERSION@
--WITH_JAVA_FALSE = @WITH_JAVA_FALSE@
--WITH_JAVA_TRUE = @WITH_JAVA_TRUE@
--WITH_PYTHON_FALSE = @WITH_PYTHON_FALSE@
--WITH_PYTHON_TRUE = @WITH_PYTHON_TRUE@
--WITH_SWIG_FALSE = @WITH_SWIG_FALSE@
--WITH_SWIG_TRUE = @WITH_SWIG_TRUE@
--ac_ct_AR = @ac_ct_AR@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
--ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -149,28 +146,41 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- EXTRA_DIST = \
- 	dummy.kml
- 
-@@ -181,14 +191,14 @@
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
--	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
--		&& exit 0; \
-+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-+	        && { if test -f $@; then exit 0; else break; fi; }; \
+@@ -192,9 +196,9 @@
  	      exit 1;; \
  	  esac; \
  	done; \
@@ -89105,7 +25437,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -206,16 +216,13 @@
+@@ -212,6 +216,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -89113,49 +25445,10 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
- 
- clean-libtool:
- 	-rm -rf .libs _libs
--
--distclean-libtool:
--	-rm -f libtool
--uninstall-info-am:
- tags: TAGS
- TAGS:
- 
-@@ -224,29 +231,32 @@
- 
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
--	list='$(DISTFILES)'; for file in $$list; do \
--	  case $$file in \
--	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
--	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
--	  esac; \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
+@@ -241,13 +246,17 @@
  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
--	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
--	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
--	    dir="/$$dir"; \
--	    $(mkdir_p) "$(distdir)$$dir"; \
--	  else \
--	    dir=''; \
--	  fi; \
  	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 +	    if test -d "$(distdir)/$$file"; then \
 +	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 +	    fi; \
@@ -89174,7 +25467,7 @@
  	    || exit 1; \
  	  fi; \
  	done
-@@ -274,6 +284,7 @@
+@@ -275,6 +284,7 @@
  
  distclean-generic:
  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -89182,17 +25475,8 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -284,7 +295,7 @@
+@@ -293,6 +303,8 @@
  
- distclean: distclean-am
- 	-rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool
-+distclean-am: clean-am distclean-generic
- 
- dvi: dvi-am
- 
-@@ -292,18 +303,38 @@
- 
  html: html-am
  
 +html-am:
@@ -89200,17 +25484,16 @@
  info: info-am
  
  info-am:
+@@ -301,18 +313,28 @@
  
- install-data-am:
+ install-dvi: install-dvi-am
  
-+install-dvi: install-dvi-am
-+
 +install-dvi-am:
 +
  install-exec-am:
  
-+install-html: install-html-am
-+
+ install-html: install-html-am
+ 
 +install-html-am:
 +
  install-info: install-info-am
@@ -89219,88 +25502,53 @@
 +
  install-man:
  
-+install-pdf: install-pdf-am
-+
+ install-pdf: install-pdf-am
+ 
 +install-pdf-am:
 +
-+install-ps: install-ps-am
-+
+ install-ps: install-ps-am
+ 
 +install-ps-am:
 +
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
-@@ -322,17 +353,21 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-info-am
-+uninstall-am:
-+
-+.MAKE: install-am install-strip
- 
- .PHONY: all all-am check check-am clean clean-generic clean-libtool \
- 	distclean distclean-generic distclean-libtool distdir dvi \
- 	dvi-am html html-am info info-am install install-am \
--	install-data install-data-am install-exec install-exec-am \
--	install-info install-info-am install-man install-strip \
-+	install-data install-data-am install-dvi install-dvi-am \
-+	install-exec install-exec-am install-html install-html-am \
-+	install-info install-info-am install-man install-pdf \
-+	install-pdf-am install-ps install-ps-am install-strip \
- 	installcheck installcheck-am installdirs maintainer-clean \
+@@ -346,6 +368,7 @@
  	maintainer-clean-generic mostlyclean mostlyclean-generic \
--	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
--	uninstall-info-am
-+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
-+
+ 	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
  
++
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-Index: libkml-1.0.1/testdata/kmz/Makefile.in
+ .NOEXPORT:
+Index: libkml-1.1.0/testdata/kmz/Makefile.in
 ===================================================================
---- libkml-1.0.1.orig/testdata/kmz/Makefile.in	2009-07-03 01:23:35.000000000 +0200
-+++ libkml-1.0.1/testdata/kmz/Makefile.in	2009-12-10 10:19:48.000000000 +0100
+--- libkml-1.1.0.orig/testdata/kmz/Makefile.in	2009-12-10 13:05:41.000000000 +0100
++++ libkml-1.1.0/testdata/kmz/Makefile.in	2009-12-10 17:29:38.000000000 +0100
 @@ -1,8 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
+-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
-@@ -13,15 +14,12 @@
- # PARTICULAR PURPOSE.
- 
+@@ -15,8 +16,9 @@
  @SET_MAKE@
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
  VPATH = @srcdir@
  pkgdatadir = $(datadir)/@PACKAGE@
 -pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../..
 +pkglibdir = $(libdir)/@PACKAGE@
 +pkglibexecdir = $(libexecdir)/@PACKAGE@
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -39,27 +37,59 @@
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_curl.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)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
+@@ -43,6 +45,7 @@
  mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
@@ -89308,18 +25556,10 @@
  SOURCES =
  DIST_SOURCES =
  RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- 	html-recursive info-recursive install-data-recursive \
--	install-exec-recursive install-info-recursive \
--	install-recursive installcheck-recursive installdirs-recursive \
--	pdf-recursive ps-recursive uninstall-info-recursive \
--	uninstall-recursive
-+	install-dvi-recursive install-exec-recursive \
-+	install-html-recursive install-info-recursive \
-+	install-pdf-recursive install-ps-recursive install-recursive \
-+	installcheck-recursive installdirs-recursive pdf-recursive \
-+	ps-recursive uninstall-recursive
-+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-+  distclean-recursive maintainer-clean-recursive
+@@ -54,10 +57,38 @@
+ 	ps-recursive uninstall-recursive
+ RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+   distclean-recursive maintainer-clean-recursive
 +AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
 +	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
 +	distdir
@@ -89353,57 +25593,9 @@
 +  done; \
 +  reldir="$$dir2"
  ACLOCAL = @ACLOCAL@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
  AMTAR = @AMTAR@
  AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -81,18 +111,16 @@
- CYGPATH_W = @CYGPATH_W@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
--ECHO = @ECHO@
-+DSYMUTIL = @DSYMUTIL@
-+DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
--F77 = @F77@
--FFLAGS = @FFLAGS@
--GCC_FALSE = @GCC_FALSE@
--GCC_TRUE = @GCC_TRUE@
--HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
--HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
-+FGREP = @FGREP@
-+GREP = @GREP@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -102,19 +130,28 @@
- JAVAC = @JAVAC@
- JAVA_INCLUDE_DIR = @JAVA_INCLUDE_DIR@
- JAVA_LIB_DIR = @JAVA_LIB_DIR@
-+LD = @LD@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
-+LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
-+NM = @NM@
-+NMEDIT = @NMEDIT@
-+OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
-+OTOOL = @OTOOL@
-+OTOOL64 = @OTOOL64@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -120,6 +151,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -89411,84 +25603,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PLATFORM = @PLATFORM@
-@@ -131,22 +168,13 @@
- STRIP = @STRIP@
- SWIG = @SWIG@
- VERSION = @VERSION@
--WITH_JAVA_FALSE = @WITH_JAVA_FALSE@
--WITH_JAVA_TRUE = @WITH_JAVA_TRUE@
--WITH_PYTHON_FALSE = @WITH_PYTHON_FALSE@
--WITH_PYTHON_TRUE = @WITH_PYTHON_TRUE@
--WITH_SWIG_FALSE = @WITH_SWIG_FALSE@
--WITH_SWIG_TRUE = @WITH_SWIG_TRUE@
--ac_ct_AR = @ac_ct_AR@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
--ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -158,28 +186,41 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- SUBDIRS = files kmzfiles rumsey
- EXTRA_DIST = \
- 	bad.kmz \
-@@ -205,14 +246,14 @@
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
--	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
--		&& exit 0; \
-+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-+	        && { if test -f $@; then exit 0; else break; fi; }; \
+@@ -225,9 +257,9 @@
  	      exit 1;; \
  	  esac; \
  	done; \
@@ -89501,7 +25616,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -230,6 +271,7 @@
+@@ -245,6 +277,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -89509,18 +25624,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -237,10 +279,6 @@
- clean-libtool:
- 	-rm -rf .libs _libs
- 
--distclean-libtool:
--	-rm -f libtool
--uninstall-info-am:
--
- # This directory's subdirectories are mostly independent; you can cd
- # into them and run `make' without going through this Makefile.
- # To change the values of `make' variables: instead of editing Makefiles,
-@@ -265,15 +303,14 @@
+@@ -276,7 +309,7 @@
  	  else \
  	    local_target="$$target"; \
  	  fi; \
@@ -89529,16 +25633,7 @@
  	  || eval $$failcom; \
  	done; \
  	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
- 	fi; test -z "$$fail"
- 
--mostlyclean-recursive clean-recursive distclean-recursive \
--maintainer-clean-recursive:
-+$(RECURSIVE_CLEAN_TARGETS):
- 	@failcom='exit 1'; \
- 	for f in x $$MAKEFLAGS; do \
- 	  case $$f in \
-@@ -300,16 +337,16 @@
+@@ -310,16 +343,16 @@
  	  else \
  	    local_target="$$target"; \
  	  fi; \
@@ -89558,16 +25653,7 @@
  	done
  
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-@@ -317,14 +354,14 @@
- 	unique=`for i in $$list; do \
- 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- 	  done | \
--	  $(AWK) '    { files[$$0] = 1; } \
--	       END { for (i in files) print i; }'`; \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
- 	mkid -fID $$unique
- tags: TAGS
+@@ -334,7 +367,7 @@
  
  TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
@@ -89576,7 +25662,7 @@
  	here=`pwd`; \
  	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
  	  include_option=--etags-include; \
-@@ -336,81 +373,101 @@
+@@ -346,7 +379,7 @@
  	list='$(SUBDIRS)'; for subdir in $$list; do \
  	  if test "$$subdir" = .; then :; else \
  	    test ! -f $$subdir/TAGS || \
@@ -89585,14 +25671,11 @@
  	  fi; \
  	done; \
  	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
- 	unique=`for i in $$list; do \
- 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+@@ -355,29 +388,34 @@
  	  done | \
--	  $(AWK) '    { files[$$0] = 1; } \
--	       END { for (i in files) print i; }'`; \
+ 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 -	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 +	shift; \
 +	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
  	  test -n "$$unique" || unique=$$empty_fix; \
@@ -89610,16 +25693,13 @@
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
 -	tags=; \
--	here=`pwd`; \
  	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  	  done | \
--	  $(AWK) '    { files[$$0] = 1; } \
--	       END { for (i in files) print i; }'`; \
+ 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 -	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 +	test -z "$(CTAGS_ARGS)$$unique" \
  	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 -	     $$tags $$unique
@@ -89634,37 +25714,10 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
--	list='$(DISTFILES)'; for file in $$list; do \
--	  case $$file in \
--	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
--	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
--	  esac; \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
+@@ -398,29 +436,44 @@
  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
--	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
--	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
--	    dir="/$$dir"; \
--	    $(mkdir_p) "$(distdir)$$dir"; \
--	  else \
--	    dir=''; \
--	  fi; \
  	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 +	    if test -d "$(distdir)/$$file"; then \
 +	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 +	    fi; \
@@ -89687,8 +25740,7 @@
 +	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
  	  if test "$$subdir" = .; then :; else \
  	    test -d "$(distdir)/$$subdir" \
--	    || $(mkdir_p) "$(distdir)/$$subdir" \
-+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+ 	    || $(MKDIR_P) "$(distdir)/$$subdir" \
  	    || exit 1; \
 -	    distdir=`$(am__cd) $(distdir) && pwd`; \
 -	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -89711,13 +25763,13 @@
 -	        distdir="$$distdir/$$subdir" \
 +	        top_distdir="$$new_top_distdir" \
 +	        distdir="$$new_distdir" \
-+		am__remove_distdir=: \
-+		am__skip_length_check=: \
+ 		am__remove_distdir=: \
+ 		am__skip_length_check=: \
 +		am__skip_mode_fix=: \
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -440,6 +497,7 @@
+@@ -450,6 +503,7 @@
  
  distclean-generic:
  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -89725,18 +25777,8 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -450,8 +508,7 @@
+@@ -468,6 +522,8 @@
  
- distclean: distclean-recursive
- 	-rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool \
--	distclean-tags
-+distclean-am: clean-am distclean-generic distclean-tags
- 
- dvi: dvi-recursive
- 
-@@ -459,18 +516,38 @@
- 
  html: html-recursive
  
 +html-am:
@@ -89744,17 +25786,16 @@
  info: info-recursive
  
  info-am:
+@@ -476,18 +532,28 @@
  
- install-data-am:
+ install-dvi: install-dvi-recursive
  
-+install-dvi: install-dvi-recursive
-+
 +install-dvi-am:
 +
  install-exec-am:
  
-+install-html: install-html-recursive
-+
+ install-html: install-html-recursive
+ 
 +install-html-am:
 +
  install-info: install-info-recursive
@@ -89763,99 +25804,64 @@
 +
  install-man:
  
-+install-pdf: install-pdf-recursive
-+
+ install-pdf: install-pdf-recursive
+ 
 +install-pdf-am:
 +
-+install-ps: install-ps-recursive
-+
+ install-ps: install-ps-recursive
+ 
 +install-ps-am:
 +
  installcheck-am:
  
  maintainer-clean: maintainer-clean-recursive
-@@ -489,22 +566,25 @@
+@@ -508,8 +574,8 @@
  
- ps-am:
+ uninstall-am:
  
--uninstall-am: uninstall-info-am
-+uninstall-am:
- 
--uninstall-info: uninstall-info-recursive
+-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+-	install-strip
 +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
 +	install-am install-strip tags-recursive
  
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
--	clean clean-generic clean-libtool clean-recursive ctags \
--	ctags-recursive distclean distclean-generic distclean-libtool \
--	distclean-recursive distclean-tags distdir dvi dvi-am html \
-+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-+	all all-am check check-am clean clean-generic clean-libtool \
-+	ctags ctags-recursive distclean distclean-generic \
-+	distclean-libtool distclean-tags distdir dvi dvi-am html \
- 	html-am info info-am install install-am install-data \
--	install-data-am install-exec install-exec-am install-info \
--	install-info-am install-man install-strip installcheck \
-+	install-data-am install-dvi install-dvi-am install-exec \
-+	install-exec-am install-html install-html-am install-info \
-+	install-info-am install-man install-pdf install-pdf-am \
-+	install-ps install-ps-am install-strip installcheck \
- 	installcheck-am installdirs installdirs-am maintainer-clean \
--	maintainer-clean-generic maintainer-clean-recursive \
--	mostlyclean mostlyclean-generic mostlyclean-libtool \
--	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
--	uninstall uninstall-am uninstall-info-am
-+	maintainer-clean-generic mostlyclean mostlyclean-generic \
-+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-+	uninstall uninstall-am
-+
+ .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ 	all all-am check check-am clean clean-generic clean-libtool \
+@@ -525,6 +591,7 @@
+ 	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+ 	uninstall uninstall-am
  
++
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-Index: libkml-1.0.1/testdata/kmz/rumsey/imagery/Makefile.in
+ .NOEXPORT:
+Index: libkml-1.1.0/testdata/kmz/rumsey/imagery/Makefile.in
 ===================================================================
---- libkml-1.0.1.orig/testdata/kmz/rumsey/imagery/Makefile.in	2009-07-03 01:23:35.000000000 +0200
-+++ libkml-1.0.1/testdata/kmz/rumsey/imagery/Makefile.in	2009-12-10 10:19:48.000000000 +0100
+--- libkml-1.1.0.orig/testdata/kmz/rumsey/imagery/Makefile.in	2009-12-10 13:05:41.000000000 +0100
++++ libkml-1.1.0/testdata/kmz/rumsey/imagery/Makefile.in	2009-12-10 17:29:39.000000000 +0100
 @@ -1,8 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
+-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
-@@ -13,15 +14,12 @@
- # PARTICULAR PURPOSE.
- 
+@@ -15,8 +16,9 @@
  @SET_MAKE@
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
  VPATH = @srcdir@
  pkgdatadir = $(datadir)/@PACKAGE@
 -pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../../../..
 +pkglibdir = $(libdir)/@PACKAGE@
 +pkglibexecdir = $(libexecdir)/@PACKAGE@
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -39,18 +37,19 @@
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_curl.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)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
+@@ -43,6 +45,7 @@
  mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
@@ -89863,58 +25869,7 @@
  SOURCES =
  DIST_SOURCES =
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -72,18 +71,16 @@
- CYGPATH_W = @CYGPATH_W@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
--ECHO = @ECHO@
-+DSYMUTIL = @DSYMUTIL@
-+DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
--F77 = @F77@
--FFLAGS = @FFLAGS@
--GCC_FALSE = @GCC_FALSE@
--GCC_TRUE = @GCC_TRUE@
--HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
--HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
-+FGREP = @FGREP@
-+GREP = @GREP@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -93,19 +90,28 @@
- JAVAC = @JAVAC@
- JAVA_INCLUDE_DIR = @JAVA_INCLUDE_DIR@
- JAVA_LIB_DIR = @JAVA_LIB_DIR@
-+LD = @LD@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
-+LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
-+NM = @NM@
-+NMEDIT = @NMEDIT@
-+OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
-+OTOOL = @OTOOL@
-+OTOOL64 = @OTOOL64@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -108,6 +111,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -89922,84 +25877,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PLATFORM = @PLATFORM@
-@@ -122,22 +128,13 @@
- STRIP = @STRIP@
- SWIG = @SWIG@
- VERSION = @VERSION@
--WITH_JAVA_FALSE = @WITH_JAVA_FALSE@
--WITH_JAVA_TRUE = @WITH_JAVA_TRUE@
--WITH_PYTHON_FALSE = @WITH_PYTHON_FALSE@
--WITH_PYTHON_TRUE = @WITH_PYTHON_TRUE@
--WITH_SWIG_FALSE = @WITH_SWIG_FALSE@
--WITH_SWIG_TRUE = @WITH_SWIG_TRUE@
--ac_ct_AR = @ac_ct_AR@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
--ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -149,28 +146,41 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- EXTRA_DIST = 01_4.png 01_8.png
- all: all-am
- 
-@@ -179,14 +189,14 @@
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
--	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
--		&& exit 0; \
-+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-+	        && { if test -f $@; then exit 0; else break; fi; }; \
+@@ -190,9 +194,9 @@
  	      exit 1;; \
  	  esac; \
  	done; \
@@ -90012,7 +25890,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -204,16 +214,13 @@
+@@ -210,6 +214,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -90020,49 +25898,10 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
- 
- clean-libtool:
- 	-rm -rf .libs _libs
--
--distclean-libtool:
--	-rm -f libtool
--uninstall-info-am:
- tags: TAGS
- TAGS:
- 
-@@ -222,29 +229,32 @@
- 
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
--	list='$(DISTFILES)'; for file in $$list; do \
--	  case $$file in \
--	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
--	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
--	  esac; \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
+@@ -239,13 +244,17 @@
  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
--	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
--	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
--	    dir="/$$dir"; \
--	    $(mkdir_p) "$(distdir)$$dir"; \
--	  else \
--	    dir=''; \
--	  fi; \
  	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 +	    if test -d "$(distdir)/$$file"; then \
 +	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 +	    fi; \
@@ -90081,7 +25920,7 @@
  	    || exit 1; \
  	  fi; \
  	done
-@@ -272,6 +282,7 @@
+@@ -273,6 +282,7 @@
  
  distclean-generic:
  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -90089,17 +25928,8 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -282,7 +293,7 @@
+@@ -291,6 +301,8 @@
  
- distclean: distclean-am
- 	-rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool
-+distclean-am: clean-am distclean-generic
- 
- dvi: dvi-am
- 
-@@ -290,18 +301,38 @@
- 
  html: html-am
  
 +html-am:
@@ -90107,17 +25937,16 @@
  info: info-am
  
  info-am:
+@@ -299,18 +311,28 @@
  
- install-data-am:
+ install-dvi: install-dvi-am
  
-+install-dvi: install-dvi-am
-+
 +install-dvi-am:
 +
  install-exec-am:
  
-+install-html: install-html-am
-+
+ install-html: install-html-am
+ 
 +install-html-am:
 +
  install-info: install-info-am
@@ -90126,88 +25955,53 @@
 +
  install-man:
  
-+install-pdf: install-pdf-am
-+
+ install-pdf: install-pdf-am
+ 
 +install-pdf-am:
 +
-+install-ps: install-ps-am
-+
+ install-ps: install-ps-am
+ 
 +install-ps-am:
 +
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
-@@ -320,17 +351,21 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-info-am
-+uninstall-am:
-+
-+.MAKE: install-am install-strip
- 
- .PHONY: all all-am check check-am clean clean-generic clean-libtool \
- 	distclean distclean-generic distclean-libtool distdir dvi \
- 	dvi-am html html-am info info-am install install-am \
--	install-data install-data-am install-exec install-exec-am \
--	install-info install-info-am install-man install-strip \
-+	install-data install-data-am install-dvi install-dvi-am \
-+	install-exec install-exec-am install-html install-html-am \
-+	install-info install-info-am install-man install-pdf \
-+	install-pdf-am install-ps install-ps-am install-strip \
- 	installcheck installcheck-am installdirs maintainer-clean \
+@@ -344,6 +366,7 @@
  	maintainer-clean-generic mostlyclean mostlyclean-generic \
--	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
--	uninstall-info-am
-+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
-+
+ 	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
  
++
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-Index: libkml-1.0.1/testdata/kmz/rumsey/kml/Makefile.in
+ .NOEXPORT:
+Index: libkml-1.1.0/testdata/kmz/rumsey/kml/Makefile.in
 ===================================================================
---- libkml-1.0.1.orig/testdata/kmz/rumsey/kml/Makefile.in	2009-07-03 01:23:35.000000000 +0200
-+++ libkml-1.0.1/testdata/kmz/rumsey/kml/Makefile.in	2009-12-10 10:19:48.000000000 +0100
+--- libkml-1.1.0.orig/testdata/kmz/rumsey/kml/Makefile.in	2009-12-10 13:05:41.000000000 +0100
++++ libkml-1.1.0/testdata/kmz/rumsey/kml/Makefile.in	2009-12-10 17:29:39.000000000 +0100
 @@ -1,8 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
+-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
-@@ -13,15 +14,12 @@
- # PARTICULAR PURPOSE.
- 
+@@ -15,8 +16,9 @@
  @SET_MAKE@
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
  VPATH = @srcdir@
  pkgdatadir = $(datadir)/@PACKAGE@
 -pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../../../..
 +pkglibdir = $(libdir)/@PACKAGE@
 +pkglibexecdir = $(libexecdir)/@PACKAGE@
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -39,18 +37,19 @@
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_curl.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)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
+@@ -43,6 +45,7 @@
  mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
@@ -90215,58 +26009,7 @@
  SOURCES =
  DIST_SOURCES =
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -72,18 +71,16 @@
- CYGPATH_W = @CYGPATH_W@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
--ECHO = @ECHO@
-+DSYMUTIL = @DSYMUTIL@
-+DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
--F77 = @F77@
--FFLAGS = @FFLAGS@
--GCC_FALSE = @GCC_FALSE@
--GCC_TRUE = @GCC_TRUE@
--HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
--HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
-+FGREP = @FGREP@
-+GREP = @GREP@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -93,19 +90,28 @@
- JAVAC = @JAVAC@
- JAVA_INCLUDE_DIR = @JAVA_INCLUDE_DIR@
- JAVA_LIB_DIR = @JAVA_LIB_DIR@
-+LD = @LD@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
-+LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
-+NM = @NM@
-+NMEDIT = @NMEDIT@
-+OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
-+OTOOL = @OTOOL@
-+OTOOL64 = @OTOOL64@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -108,6 +111,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -90274,84 +26017,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PLATFORM = @PLATFORM@
-@@ -122,22 +128,13 @@
- STRIP = @STRIP@
- SWIG = @SWIG@
- VERSION = @VERSION@
--WITH_JAVA_FALSE = @WITH_JAVA_FALSE@
--WITH_JAVA_TRUE = @WITH_JAVA_TRUE@
--WITH_PYTHON_FALSE = @WITH_PYTHON_FALSE@
--WITH_PYTHON_TRUE = @WITH_PYTHON_TRUE@
--WITH_SWIG_FALSE = @WITH_SWIG_FALSE@
--WITH_SWIG_TRUE = @WITH_SWIG_TRUE@
--ac_ct_AR = @ac_ct_AR@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
--ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -149,28 +146,41 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- EXTRA_DIST = \
- 	lc01.kmz \
- 	010.kmz \
-@@ -183,14 +193,14 @@
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
--	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
--		&& exit 0; \
-+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-+	        && { if test -f $@; then exit 0; else break; fi; }; \
+@@ -194,9 +198,9 @@
  	      exit 1;; \
  	  esac; \
  	done; \
@@ -90364,7 +26030,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -208,16 +218,13 @@
+@@ -214,6 +218,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -90372,49 +26038,10 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
- 
- clean-libtool:
- 	-rm -rf .libs _libs
--
--distclean-libtool:
--	-rm -f libtool
--uninstall-info-am:
- tags: TAGS
- TAGS:
- 
-@@ -226,29 +233,32 @@
- 
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
--	list='$(DISTFILES)'; for file in $$list; do \
--	  case $$file in \
--	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
--	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
--	  esac; \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
+@@ -243,13 +248,17 @@
  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
--	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
--	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
--	    dir="/$$dir"; \
--	    $(mkdir_p) "$(distdir)$$dir"; \
--	  else \
--	    dir=''; \
--	  fi; \
  	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 +	    if test -d "$(distdir)/$$file"; then \
 +	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 +	    fi; \
@@ -90433,7 +26060,7 @@
  	    || exit 1; \
  	  fi; \
  	done
-@@ -276,6 +286,7 @@
+@@ -277,6 +286,7 @@
  
  distclean-generic:
  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -90441,17 +26068,8 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -286,7 +297,7 @@
+@@ -295,6 +305,8 @@
  
- distclean: distclean-am
- 	-rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool
-+distclean-am: clean-am distclean-generic
- 
- dvi: dvi-am
- 
-@@ -294,18 +305,38 @@
- 
  html: html-am
  
 +html-am:
@@ -90459,17 +26077,16 @@
  info: info-am
  
  info-am:
+@@ -303,18 +315,28 @@
  
- install-data-am:
+ install-dvi: install-dvi-am
  
-+install-dvi: install-dvi-am
-+
 +install-dvi-am:
 +
  install-exec-am:
  
-+install-html: install-html-am
-+
+ install-html: install-html-am
+ 
 +install-html-am:
 +
  install-info: install-info-am
@@ -90478,88 +26095,53 @@
 +
  install-man:
  
-+install-pdf: install-pdf-am
-+
+ install-pdf: install-pdf-am
+ 
 +install-pdf-am:
 +
-+install-ps: install-ps-am
-+
+ install-ps: install-ps-am
+ 
 +install-ps-am:
 +
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
-@@ -324,17 +355,21 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-info-am
-+uninstall-am:
-+
-+.MAKE: install-am install-strip
- 
- .PHONY: all all-am check check-am clean clean-generic clean-libtool \
- 	distclean distclean-generic distclean-libtool distdir dvi \
- 	dvi-am html html-am info info-am install install-am \
--	install-data install-data-am install-exec install-exec-am \
--	install-info install-info-am install-man install-strip \
-+	install-data install-data-am install-dvi install-dvi-am \
-+	install-exec install-exec-am install-html install-html-am \
-+	install-info install-info-am install-man install-pdf \
-+	install-pdf-am install-ps install-ps-am install-strip \
- 	installcheck installcheck-am installdirs maintainer-clean \
+@@ -348,6 +370,7 @@
  	maintainer-clean-generic mostlyclean mostlyclean-generic \
--	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
--	uninstall-info-am
-+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
-+
+ 	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
  
++
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-Index: libkml-1.0.1/testdata/kmz/rumsey/Makefile.in
+ .NOEXPORT:
+Index: libkml-1.1.0/testdata/kmz/rumsey/Makefile.in
 ===================================================================
---- libkml-1.0.1.orig/testdata/kmz/rumsey/Makefile.in	2009-07-03 01:23:35.000000000 +0200
-+++ libkml-1.0.1/testdata/kmz/rumsey/Makefile.in	2009-12-10 10:19:48.000000000 +0100
+--- libkml-1.1.0.orig/testdata/kmz/rumsey/Makefile.in	2009-12-10 13:05:41.000000000 +0100
++++ libkml-1.1.0/testdata/kmz/rumsey/Makefile.in	2009-12-10 17:29:39.000000000 +0100
 @@ -1,8 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
+-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
-@@ -13,15 +14,12 @@
- # PARTICULAR PURPOSE.
- 
+@@ -15,8 +16,9 @@
  @SET_MAKE@
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
  VPATH = @srcdir@
  pkgdatadir = $(datadir)/@PACKAGE@
 -pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../../..
 +pkglibdir = $(libdir)/@PACKAGE@
 +pkglibexecdir = $(libexecdir)/@PACKAGE@
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -39,27 +37,59 @@
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_curl.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)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
+@@ -43,6 +45,7 @@
  mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
@@ -90567,18 +26149,10 @@
  SOURCES =
  DIST_SOURCES =
  RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- 	html-recursive info-recursive install-data-recursive \
--	install-exec-recursive install-info-recursive \
--	install-recursive installcheck-recursive installdirs-recursive \
--	pdf-recursive ps-recursive uninstall-info-recursive \
--	uninstall-recursive
-+	install-dvi-recursive install-exec-recursive \
-+	install-html-recursive install-info-recursive \
-+	install-pdf-recursive install-ps-recursive install-recursive \
-+	installcheck-recursive installdirs-recursive pdf-recursive \
-+	ps-recursive uninstall-recursive
-+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-+  distclean-recursive maintainer-clean-recursive
+@@ -54,10 +57,38 @@
+ 	ps-recursive uninstall-recursive
+ RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+   distclean-recursive maintainer-clean-recursive
 +AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
 +	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
 +	distdir
@@ -90612,57 +26186,9 @@
 +  done; \
 +  reldir="$$dir2"
  ACLOCAL = @ACLOCAL@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
  AMTAR = @AMTAR@
  AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -81,18 +111,16 @@
- CYGPATH_W = @CYGPATH_W@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
--ECHO = @ECHO@
-+DSYMUTIL = @DSYMUTIL@
-+DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
--F77 = @F77@
--FFLAGS = @FFLAGS@
--GCC_FALSE = @GCC_FALSE@
--GCC_TRUE = @GCC_TRUE@
--HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
--HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
-+FGREP = @FGREP@
-+GREP = @GREP@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -102,19 +130,28 @@
- JAVAC = @JAVAC@
- JAVA_INCLUDE_DIR = @JAVA_INCLUDE_DIR@
- JAVA_LIB_DIR = @JAVA_LIB_DIR@
-+LD = @LD@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
-+LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
-+NM = @NM@
-+NMEDIT = @NMEDIT@
-+OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
-+OTOOL = @OTOOL@
-+OTOOL64 = @OTOOL64@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -120,6 +151,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -90670,84 +26196,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PLATFORM = @PLATFORM@
-@@ -131,22 +168,13 @@
- STRIP = @STRIP@
- SWIG = @SWIG@
- VERSION = @VERSION@
--WITH_JAVA_FALSE = @WITH_JAVA_FALSE@
--WITH_JAVA_TRUE = @WITH_JAVA_TRUE@
--WITH_PYTHON_FALSE = @WITH_PYTHON_FALSE@
--WITH_PYTHON_TRUE = @WITH_PYTHON_TRUE@
--WITH_SWIG_FALSE = @WITH_SWIG_FALSE@
--WITH_SWIG_TRUE = @WITH_SWIG_TRUE@
--ac_ct_AR = @ac_ct_AR@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
--ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -158,28 +186,41 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- SUBDIRS = imagery kml
- all: all-recursive
- 
-@@ -188,14 +229,14 @@
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
--	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
--		&& exit 0; \
-+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-+	        && { if test -f $@; then exit 0; else break; fi; }; \
+@@ -202,9 +234,9 @@
  	      exit 1;; \
  	  esac; \
  	done; \
@@ -90760,7 +26209,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -213,6 +254,7 @@
+@@ -222,6 +254,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -90768,18 +26217,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -220,10 +262,6 @@
- clean-libtool:
- 	-rm -rf .libs _libs
- 
--distclean-libtool:
--	-rm -f libtool
--uninstall-info-am:
--
- # This directory's subdirectories are mostly independent; you can cd
- # into them and run `make' without going through this Makefile.
- # To change the values of `make' variables: instead of editing Makefiles,
-@@ -248,15 +286,14 @@
+@@ -253,7 +286,7 @@
  	  else \
  	    local_target="$$target"; \
  	  fi; \
@@ -90788,16 +26226,7 @@
  	  || eval $$failcom; \
  	done; \
  	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
- 	fi; test -z "$$fail"
- 
--mostlyclean-recursive clean-recursive distclean-recursive \
--maintainer-clean-recursive:
-+$(RECURSIVE_CLEAN_TARGETS):
- 	@failcom='exit 1'; \
- 	for f in x $$MAKEFLAGS; do \
- 	  case $$f in \
-@@ -283,16 +320,16 @@
+@@ -287,16 +320,16 @@
  	  else \
  	    local_target="$$target"; \
  	  fi; \
@@ -90817,16 +26246,7 @@
  	done
  
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-@@ -300,14 +337,14 @@
- 	unique=`for i in $$list; do \
- 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- 	  done | \
--	  $(AWK) '    { files[$$0] = 1; } \
--	       END { for (i in files) print i; }'`; \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
- 	mkid -fID $$unique
- tags: TAGS
+@@ -311,7 +344,7 @@
  
  TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
@@ -90835,7 +26255,7 @@
  	here=`pwd`; \
  	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
  	  include_option=--etags-include; \
-@@ -319,81 +356,101 @@
+@@ -323,7 +356,7 @@
  	list='$(SUBDIRS)'; for subdir in $$list; do \
  	  if test "$$subdir" = .; then :; else \
  	    test ! -f $$subdir/TAGS || \
@@ -90844,14 +26264,11 @@
  	  fi; \
  	done; \
  	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
- 	unique=`for i in $$list; do \
- 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+@@ -332,29 +365,34 @@
  	  done | \
--	  $(AWK) '    { files[$$0] = 1; } \
--	       END { for (i in files) print i; }'`; \
+ 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 -	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 +	shift; \
 +	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
  	  test -n "$$unique" || unique=$$empty_fix; \
@@ -90869,16 +26286,13 @@
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
 -	tags=; \
--	here=`pwd`; \
  	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  	  done | \
--	  $(AWK) '    { files[$$0] = 1; } \
--	       END { for (i in files) print i; }'`; \
+ 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 -	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 +	test -z "$(CTAGS_ARGS)$$unique" \
  	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 -	     $$tags $$unique
@@ -90893,37 +26307,10 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
--	list='$(DISTFILES)'; for file in $$list; do \
--	  case $$file in \
--	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
--	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
--	  esac; \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
+@@ -375,29 +413,44 @@
  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
--	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
--	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
--	    dir="/$$dir"; \
--	    $(mkdir_p) "$(distdir)$$dir"; \
--	  else \
--	    dir=''; \
--	  fi; \
  	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 +	    if test -d "$(distdir)/$$file"; then \
 +	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 +	    fi; \
@@ -90946,8 +26333,7 @@
 +	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
  	  if test "$$subdir" = .; then :; else \
  	    test -d "$(distdir)/$$subdir" \
--	    || $(mkdir_p) "$(distdir)/$$subdir" \
-+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+ 	    || $(MKDIR_P) "$(distdir)/$$subdir" \
  	    || exit 1; \
 -	    distdir=`$(am__cd) $(distdir) && pwd`; \
 -	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -90970,13 +26356,13 @@
 -	        distdir="$$distdir/$$subdir" \
 +	        top_distdir="$$new_top_distdir" \
 +	        distdir="$$new_distdir" \
-+		am__remove_distdir=: \
-+		am__skip_length_check=: \
+ 		am__remove_distdir=: \
+ 		am__skip_length_check=: \
 +		am__skip_mode_fix=: \
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -423,6 +480,7 @@
+@@ -427,6 +480,7 @@
  
  distclean-generic:
  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -90984,18 +26370,8 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -433,8 +491,7 @@
+@@ -445,6 +499,8 @@
  
- distclean: distclean-recursive
- 	-rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool \
--	distclean-tags
-+distclean-am: clean-am distclean-generic distclean-tags
- 
- dvi: dvi-recursive
- 
-@@ -442,18 +499,38 @@
- 
  html: html-recursive
  
 +html-am:
@@ -91003,17 +26379,16 @@
  info: info-recursive
  
  info-am:
+@@ -453,18 +509,28 @@
  
- install-data-am:
+ install-dvi: install-dvi-recursive
  
-+install-dvi: install-dvi-recursive
-+
 +install-dvi-am:
 +
  install-exec-am:
  
-+install-html: install-html-recursive
-+
+ install-html: install-html-recursive
+ 
 +install-html-am:
 +
  install-info: install-info-recursive
@@ -91022,99 +26397,64 @@
 +
  install-man:
  
-+install-pdf: install-pdf-recursive
-+
+ install-pdf: install-pdf-recursive
+ 
 +install-pdf-am:
 +
-+install-ps: install-ps-recursive
-+
+ install-ps: install-ps-recursive
+ 
 +install-ps-am:
 +
  installcheck-am:
  
  maintainer-clean: maintainer-clean-recursive
-@@ -472,22 +549,25 @@
+@@ -485,8 +551,8 @@
  
- ps-am:
+ uninstall-am:
  
--uninstall-am: uninstall-info-am
-+uninstall-am:
- 
--uninstall-info: uninstall-info-recursive
+-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+-	install-strip
 +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
 +	install-am install-strip tags-recursive
  
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
--	clean clean-generic clean-libtool clean-recursive ctags \
--	ctags-recursive distclean distclean-generic distclean-libtool \
--	distclean-recursive distclean-tags distdir dvi dvi-am html \
-+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-+	all all-am check check-am clean clean-generic clean-libtool \
-+	ctags ctags-recursive distclean distclean-generic \
-+	distclean-libtool distclean-tags distdir dvi dvi-am html \
- 	html-am info info-am install install-am install-data \
--	install-data-am install-exec install-exec-am install-info \
--	install-info-am install-man install-strip installcheck \
-+	install-data-am install-dvi install-dvi-am install-exec \
-+	install-exec-am install-html install-html-am install-info \
-+	install-info-am install-man install-pdf install-pdf-am \
-+	install-ps install-ps-am install-strip installcheck \
- 	installcheck-am installdirs installdirs-am maintainer-clean \
--	maintainer-clean-generic maintainer-clean-recursive \
--	mostlyclean mostlyclean-generic mostlyclean-libtool \
--	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
--	uninstall uninstall-am uninstall-info-am
-+	maintainer-clean-generic mostlyclean mostlyclean-generic \
-+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-+	uninstall uninstall-am
-+
+ .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ 	all all-am check check-am clean clean-generic clean-libtool \
+@@ -502,6 +568,7 @@
+ 	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+ 	uninstall uninstall-am
  
++
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-Index: libkml-1.0.1/testdata/links/Makefile.in
+ .NOEXPORT:
+Index: libkml-1.1.0/testdata/links/Makefile.in
 ===================================================================
---- libkml-1.0.1.orig/testdata/links/Makefile.in	2009-07-03 01:23:35.000000000 +0200
-+++ libkml-1.0.1/testdata/links/Makefile.in	2009-12-10 10:19:48.000000000 +0100
+--- libkml-1.1.0.orig/testdata/links/Makefile.in	2009-12-10 13:05:41.000000000 +0100
++++ libkml-1.1.0/testdata/links/Makefile.in	2009-12-10 17:29:39.000000000 +0100
 @@ -1,8 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
+-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
-@@ -13,15 +14,12 @@
- # PARTICULAR PURPOSE.
- 
+@@ -15,8 +16,9 @@
  @SET_MAKE@
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
  VPATH = @srcdir@
  pkgdatadir = $(datadir)/@PACKAGE@
 -pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../..
 +pkglibdir = $(libdir)/@PACKAGE@
 +pkglibexecdir = $(libexecdir)/@PACKAGE@
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -39,18 +37,19 @@
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_curl.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)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
+@@ -43,6 +45,7 @@
  mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
@@ -91122,58 +26462,7 @@
  SOURCES =
  DIST_SOURCES =
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -72,18 +71,16 @@
- CYGPATH_W = @CYGPATH_W@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
--ECHO = @ECHO@
-+DSYMUTIL = @DSYMUTIL@
-+DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
--F77 = @F77@
--FFLAGS = @FFLAGS@
--GCC_FALSE = @GCC_FALSE@
--GCC_TRUE = @GCC_TRUE@
--HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
--HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
-+FGREP = @FGREP@
-+GREP = @GREP@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -93,19 +90,28 @@
- JAVAC = @JAVAC@
- JAVA_INCLUDE_DIR = @JAVA_INCLUDE_DIR@
- JAVA_LIB_DIR = @JAVA_LIB_DIR@
-+LD = @LD@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
-+LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
-+NM = @NM@
-+NMEDIT = @NMEDIT@
-+OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
-+OTOOL = @OTOOL@
-+OTOOL64 = @OTOOL64@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -108,6 +111,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -91181,84 +26470,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PLATFORM = @PLATFORM@
-@@ -122,22 +128,13 @@
- STRIP = @STRIP@
- SWIG = @SWIG@
- VERSION = @VERSION@
--WITH_JAVA_FALSE = @WITH_JAVA_FALSE@
--WITH_JAVA_TRUE = @WITH_JAVA_TRUE@
--WITH_PYTHON_FALSE = @WITH_PYTHON_FALSE@
--WITH_PYTHON_TRUE = @WITH_PYTHON_TRUE@
--WITH_SWIG_FALSE = @WITH_SWIG_FALSE@
--WITH_SWIG_TRUE = @WITH_SWIG_TRUE@
--ac_ct_AR = @ac_ct_AR@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
--ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -149,28 +146,41 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- EXTRA_DIST = \
- 	alllinks.kml
- 
-@@ -181,14 +191,14 @@
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
--	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
--		&& exit 0; \
-+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-+	        && { if test -f $@; then exit 0; else break; fi; }; \
+@@ -192,9 +196,9 @@
  	      exit 1;; \
  	  esac; \
  	done; \
@@ -91271,7 +26483,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -206,16 +216,13 @@
+@@ -212,6 +216,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -91279,49 +26491,10 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
- 
- clean-libtool:
- 	-rm -rf .libs _libs
--
--distclean-libtool:
--	-rm -f libtool
--uninstall-info-am:
- tags: TAGS
- TAGS:
- 
-@@ -224,29 +231,32 @@
- 
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
--	list='$(DISTFILES)'; for file in $$list; do \
--	  case $$file in \
--	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
--	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
--	  esac; \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
+@@ -241,13 +246,17 @@
  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
--	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
--	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
--	    dir="/$$dir"; \
--	    $(mkdir_p) "$(distdir)$$dir"; \
--	  else \
--	    dir=''; \
--	  fi; \
  	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 +	    if test -d "$(distdir)/$$file"; then \
 +	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 +	    fi; \
@@ -91340,7 +26513,7 @@
  	    || exit 1; \
  	  fi; \
  	done
-@@ -274,6 +284,7 @@
+@@ -275,6 +284,7 @@
  
  distclean-generic:
  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -91348,17 +26521,8 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -284,7 +295,7 @@
+@@ -293,6 +303,8 @@
  
- distclean: distclean-am
- 	-rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool
-+distclean-am: clean-am distclean-generic
- 
- dvi: dvi-am
- 
-@@ -292,18 +303,38 @@
- 
  html: html-am
  
 +html-am:
@@ -91366,17 +26530,16 @@
  info: info-am
  
  info-am:
+@@ -301,18 +313,28 @@
  
- install-data-am:
+ install-dvi: install-dvi-am
  
-+install-dvi: install-dvi-am
-+
 +install-dvi-am:
 +
  install-exec-am:
  
-+install-html: install-html-am
-+
+ install-html: install-html-am
+ 
 +install-html-am:
 +
  install-info: install-info-am
@@ -91385,88 +26548,53 @@
 +
  install-man:
  
-+install-pdf: install-pdf-am
-+
+ install-pdf: install-pdf-am
+ 
 +install-pdf-am:
 +
-+install-ps: install-ps-am
-+
+ install-ps: install-ps-am
+ 
 +install-ps-am:
 +
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
-@@ -322,17 +353,21 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-info-am
-+uninstall-am:
-+
-+.MAKE: install-am install-strip
- 
- .PHONY: all all-am check check-am clean clean-generic clean-libtool \
- 	distclean distclean-generic distclean-libtool distdir dvi \
- 	dvi-am html html-am info info-am install install-am \
--	install-data install-data-am install-exec install-exec-am \
--	install-info install-info-am install-man install-strip \
-+	install-data install-data-am install-dvi install-dvi-am \
-+	install-exec install-exec-am install-html install-html-am \
-+	install-info install-info-am install-man install-pdf \
-+	install-pdf-am install-ps install-ps-am install-strip \
- 	installcheck installcheck-am installdirs maintainer-clean \
+@@ -346,6 +368,7 @@
  	maintainer-clean-generic mostlyclean mostlyclean-generic \
--	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
--	uninstall-info-am
-+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
-+
+ 	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
  
++
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-Index: libkml-1.0.1/testdata/Makefile.in
+ .NOEXPORT:
+Index: libkml-1.1.0/testdata/Makefile.in
 ===================================================================
---- libkml-1.0.1.orig/testdata/Makefile.in	2009-07-03 01:23:34.000000000 +0200
-+++ libkml-1.0.1/testdata/Makefile.in	2009-12-10 10:19:47.000000000 +0100
+--- libkml-1.1.0.orig/testdata/Makefile.in	2009-12-10 13:05:40.000000000 +0100
++++ libkml-1.1.0/testdata/Makefile.in	2009-12-10 17:29:38.000000000 +0100
 @@ -1,8 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
+-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
-@@ -13,15 +14,12 @@
- # PARTICULAR PURPOSE.
- 
+@@ -15,8 +16,9 @@
  @SET_MAKE@
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
  VPATH = @srcdir@
  pkgdatadir = $(datadir)/@PACKAGE@
 -pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ..
 +pkglibdir = $(libdir)/@PACKAGE@
 +pkglibexecdir = $(libexecdir)/@PACKAGE@
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -39,27 +37,59 @@
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_curl.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)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
+@@ -43,6 +45,7 @@
  mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
@@ -91474,18 +26602,10 @@
  SOURCES =
  DIST_SOURCES =
  RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- 	html-recursive info-recursive install-data-recursive \
--	install-exec-recursive install-info-recursive \
--	install-recursive installcheck-recursive installdirs-recursive \
--	pdf-recursive ps-recursive uninstall-info-recursive \
--	uninstall-recursive
-+	install-dvi-recursive install-exec-recursive \
-+	install-html-recursive install-info-recursive \
-+	install-pdf-recursive install-ps-recursive install-recursive \
-+	installcheck-recursive installdirs-recursive pdf-recursive \
-+	ps-recursive uninstall-recursive
-+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-+  distclean-recursive maintainer-clean-recursive
+@@ -54,10 +57,38 @@
+ 	ps-recursive uninstall-recursive
+ RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+   distclean-recursive maintainer-clean-recursive
 +AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
 +	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
 +	distdir
@@ -91519,57 +26639,9 @@
 +  done; \
 +  reldir="$$dir2"
  ACLOCAL = @ACLOCAL@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
  AMTAR = @AMTAR@
  AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -81,18 +111,16 @@
- CYGPATH_W = @CYGPATH_W@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
--ECHO = @ECHO@
-+DSYMUTIL = @DSYMUTIL@
-+DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
--F77 = @F77@
--FFLAGS = @FFLAGS@
--GCC_FALSE = @GCC_FALSE@
--GCC_TRUE = @GCC_TRUE@
--HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
--HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
-+FGREP = @FGREP@
-+GREP = @GREP@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -102,19 +130,28 @@
- JAVAC = @JAVAC@
- JAVA_INCLUDE_DIR = @JAVA_INCLUDE_DIR@
- JAVA_LIB_DIR = @JAVA_LIB_DIR@
-+LD = @LD@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
-+LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
-+NM = @NM@
-+NMEDIT = @NMEDIT@
-+OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
-+OTOOL = @OTOOL@
-+OTOOL64 = @OTOOL64@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -120,6 +151,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -91577,84 +26649,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PLATFORM = @PLATFORM@
-@@ -131,22 +168,13 @@
- STRIP = @STRIP@
- SWIG = @SWIG@
- VERSION = @VERSION@
--WITH_JAVA_FALSE = @WITH_JAVA_FALSE@
--WITH_JAVA_TRUE = @WITH_JAVA_TRUE@
--WITH_PYTHON_FALSE = @WITH_PYTHON_FALSE@
--WITH_PYTHON_TRUE = @WITH_PYTHON_TRUE@
--WITH_SWIG_FALSE = @WITH_SWIG_FALSE@
--WITH_SWIG_TRUE = @WITH_SWIG_TRUE@
--ac_ct_AR = @ac_ct_AR@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
--ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -158,28 +186,41 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- SUBDIRS = \
- 	atom balloon csv deprecated gpx gx kml kmz links style update\
- 	xal xsd
-@@ -191,14 +232,14 @@
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
--	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
--		&& exit 0; \
-+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-+	        && { if test -f $@; then exit 0; else break; fi; }; \
+@@ -205,9 +237,9 @@
  	      exit 1;; \
  	  esac; \
  	done; \
@@ -91667,7 +26662,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -216,6 +257,7 @@
+@@ -225,6 +257,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -91675,18 +26670,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -223,10 +265,6 @@
- clean-libtool:
- 	-rm -rf .libs _libs
- 
--distclean-libtool:
--	-rm -f libtool
--uninstall-info-am:
--
- # This directory's subdirectories are mostly independent; you can cd
- # into them and run `make' without going through this Makefile.
- # To change the values of `make' variables: instead of editing Makefiles,
-@@ -251,15 +289,14 @@
+@@ -256,7 +289,7 @@
  	  else \
  	    local_target="$$target"; \
  	  fi; \
@@ -91695,16 +26679,7 @@
  	  || eval $$failcom; \
  	done; \
  	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
- 	fi; test -z "$$fail"
- 
--mostlyclean-recursive clean-recursive distclean-recursive \
--maintainer-clean-recursive:
-+$(RECURSIVE_CLEAN_TARGETS):
- 	@failcom='exit 1'; \
- 	for f in x $$MAKEFLAGS; do \
- 	  case $$f in \
-@@ -286,16 +323,16 @@
+@@ -290,16 +323,16 @@
  	  else \
  	    local_target="$$target"; \
  	  fi; \
@@ -91724,16 +26699,7 @@
  	done
  
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-@@ -303,14 +340,14 @@
- 	unique=`for i in $$list; do \
- 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- 	  done | \
--	  $(AWK) '    { files[$$0] = 1; } \
--	       END { for (i in files) print i; }'`; \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
- 	mkid -fID $$unique
- tags: TAGS
+@@ -314,7 +347,7 @@
  
  TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
@@ -91742,7 +26708,7 @@
  	here=`pwd`; \
  	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
  	  include_option=--etags-include; \
-@@ -322,81 +359,101 @@
+@@ -326,7 +359,7 @@
  	list='$(SUBDIRS)'; for subdir in $$list; do \
  	  if test "$$subdir" = .; then :; else \
  	    test ! -f $$subdir/TAGS || \
@@ -91751,14 +26717,11 @@
  	  fi; \
  	done; \
  	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
- 	unique=`for i in $$list; do \
- 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+@@ -335,29 +368,34 @@
  	  done | \
--	  $(AWK) '    { files[$$0] = 1; } \
--	       END { for (i in files) print i; }'`; \
+ 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 -	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 +	shift; \
 +	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
  	  test -n "$$unique" || unique=$$empty_fix; \
@@ -91776,16 +26739,13 @@
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
 -	tags=; \
--	here=`pwd`; \
  	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  	  done | \
--	  $(AWK) '    { files[$$0] = 1; } \
--	       END { for (i in files) print i; }'`; \
+ 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 -	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 +	test -z "$(CTAGS_ARGS)$$unique" \
  	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 -	     $$tags $$unique
@@ -91800,37 +26760,10 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
--	list='$(DISTFILES)'; for file in $$list; do \
--	  case $$file in \
--	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
--	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
--	  esac; \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
+@@ -378,29 +416,44 @@
  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
--	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
--	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
--	    dir="/$$dir"; \
--	    $(mkdir_p) "$(distdir)$$dir"; \
--	  else \
--	    dir=''; \
--	  fi; \
  	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 +	    if test -d "$(distdir)/$$file"; then \
 +	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 +	    fi; \
@@ -91853,8 +26786,7 @@
 +	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
  	  if test "$$subdir" = .; then :; else \
  	    test -d "$(distdir)/$$subdir" \
--	    || $(mkdir_p) "$(distdir)/$$subdir" \
-+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+ 	    || $(MKDIR_P) "$(distdir)/$$subdir" \
  	    || exit 1; \
 -	    distdir=`$(am__cd) $(distdir) && pwd`; \
 -	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -91877,13 +26809,13 @@
 -	        distdir="$$distdir/$$subdir" \
 +	        top_distdir="$$new_top_distdir" \
 +	        distdir="$$new_distdir" \
-+		am__remove_distdir=: \
-+		am__skip_length_check=: \
+ 		am__remove_distdir=: \
+ 		am__skip_length_check=: \
 +		am__skip_mode_fix=: \
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -426,6 +483,7 @@
+@@ -430,6 +483,7 @@
  
  distclean-generic:
  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -91891,18 +26823,8 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -436,8 +494,7 @@
+@@ -448,6 +502,8 @@
  
- distclean: distclean-recursive
- 	-rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool \
--	distclean-tags
-+distclean-am: clean-am distclean-generic distclean-tags
- 
- dvi: dvi-recursive
- 
-@@ -445,18 +502,38 @@
- 
  html: html-recursive
  
 +html-am:
@@ -91910,17 +26832,16 @@
  info: info-recursive
  
  info-am:
+@@ -456,18 +512,28 @@
  
- install-data-am:
+ install-dvi: install-dvi-recursive
  
-+install-dvi: install-dvi-recursive
-+
 +install-dvi-am:
 +
  install-exec-am:
  
-+install-html: install-html-recursive
-+
+ install-html: install-html-recursive
+ 
 +install-html-am:
 +
  install-info: install-info-recursive
@@ -91929,99 +26850,64 @@
 +
  install-man:
  
-+install-pdf: install-pdf-recursive
-+
+ install-pdf: install-pdf-recursive
+ 
 +install-pdf-am:
 +
-+install-ps: install-ps-recursive
-+
+ install-ps: install-ps-recursive
+ 
 +install-ps-am:
 +
  installcheck-am:
  
  maintainer-clean: maintainer-clean-recursive
-@@ -475,22 +552,25 @@
+@@ -488,8 +554,8 @@
  
- ps-am:
+ uninstall-am:
  
--uninstall-am: uninstall-info-am
-+uninstall-am:
- 
--uninstall-info: uninstall-info-recursive
+-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+-	install-strip
 +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
 +	install-am install-strip tags-recursive
  
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
--	clean clean-generic clean-libtool clean-recursive ctags \
--	ctags-recursive distclean distclean-generic distclean-libtool \
--	distclean-recursive distclean-tags distdir dvi dvi-am html \
-+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-+	all all-am check check-am clean clean-generic clean-libtool \
-+	ctags ctags-recursive distclean distclean-generic \
-+	distclean-libtool distclean-tags distdir dvi dvi-am html \
- 	html-am info info-am install install-am install-data \
--	install-data-am install-exec install-exec-am install-info \
--	install-info-am install-man install-strip installcheck \
-+	install-data-am install-dvi install-dvi-am install-exec \
-+	install-exec-am install-html install-html-am install-info \
-+	install-info-am install-man install-pdf install-pdf-am \
-+	install-ps install-ps-am install-strip installcheck \
- 	installcheck-am installdirs installdirs-am maintainer-clean \
--	maintainer-clean-generic maintainer-clean-recursive \
--	mostlyclean mostlyclean-generic mostlyclean-libtool \
--	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
--	uninstall uninstall-am uninstall-info-am
-+	maintainer-clean-generic mostlyclean mostlyclean-generic \
-+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-+	uninstall uninstall-am
-+
+ .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ 	all all-am check check-am clean clean-generic clean-libtool \
+@@ -505,6 +571,7 @@
+ 	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+ 	uninstall uninstall-am
  
++
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-Index: libkml-1.0.1/testdata/style/Makefile.in
+ .NOEXPORT:
+Index: libkml-1.1.0/testdata/style/Makefile.in
 ===================================================================
---- libkml-1.0.1.orig/testdata/style/Makefile.in	2009-07-03 01:23:35.000000000 +0200
-+++ libkml-1.0.1/testdata/style/Makefile.in	2009-12-10 10:19:48.000000000 +0100
+--- libkml-1.1.0.orig/testdata/style/Makefile.in	2009-12-10 13:05:41.000000000 +0100
++++ libkml-1.1.0/testdata/style/Makefile.in	2009-12-10 17:29:39.000000000 +0100
 @@ -1,8 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
+-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
-@@ -13,15 +14,12 @@
- # PARTICULAR PURPOSE.
- 
+@@ -15,8 +16,9 @@
  @SET_MAKE@
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
  VPATH = @srcdir@
  pkgdatadir = $(datadir)/@PACKAGE@
 -pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../..
 +pkglibdir = $(libdir)/@PACKAGE@
 +pkglibexecdir = $(libexecdir)/@PACKAGE@
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -39,27 +37,59 @@
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_curl.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)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
+@@ -43,6 +45,7 @@
  mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
@@ -92029,18 +26915,10 @@
  SOURCES =
  DIST_SOURCES =
  RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- 	html-recursive info-recursive install-data-recursive \
--	install-exec-recursive install-info-recursive \
--	install-recursive installcheck-recursive installdirs-recursive \
--	pdf-recursive ps-recursive uninstall-info-recursive \
--	uninstall-recursive
-+	install-dvi-recursive install-exec-recursive \
-+	install-html-recursive install-info-recursive \
-+	install-pdf-recursive install-ps-recursive install-recursive \
-+	installcheck-recursive installdirs-recursive pdf-recursive \
-+	ps-recursive uninstall-recursive
-+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-+  distclean-recursive maintainer-clean-recursive
+@@ -54,10 +57,38 @@
+ 	ps-recursive uninstall-recursive
+ RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+   distclean-recursive maintainer-clean-recursive
 +AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
 +	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
 +	distdir
@@ -92074,57 +26952,9 @@
 +  done; \
 +  reldir="$$dir2"
  ACLOCAL = @ACLOCAL@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
  AMTAR = @AMTAR@
  AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -81,18 +111,16 @@
- CYGPATH_W = @CYGPATH_W@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
--ECHO = @ECHO@
-+DSYMUTIL = @DSYMUTIL@
-+DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
--F77 = @F77@
--FFLAGS = @FFLAGS@
--GCC_FALSE = @GCC_FALSE@
--GCC_TRUE = @GCC_TRUE@
--HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
--HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
-+FGREP = @FGREP@
-+GREP = @GREP@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -102,19 +130,28 @@
- JAVAC = @JAVAC@
- JAVA_INCLUDE_DIR = @JAVA_INCLUDE_DIR@
- JAVA_LIB_DIR = @JAVA_LIB_DIR@
-+LD = @LD@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
-+LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
-+NM = @NM@
-+NMEDIT = @NMEDIT@
-+OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
-+OTOOL = @OTOOL@
-+OTOOL64 = @OTOOL64@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -120,6 +151,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -92132,84 +26962,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PLATFORM = @PLATFORM@
-@@ -131,22 +168,13 @@
- STRIP = @STRIP@
- SWIG = @SWIG@
- VERSION = @VERSION@
--WITH_JAVA_FALSE = @WITH_JAVA_FALSE@
--WITH_JAVA_TRUE = @WITH_JAVA_TRUE@
--WITH_PYTHON_FALSE = @WITH_PYTHON_FALSE@
--WITH_PYTHON_TRUE = @WITH_PYTHON_TRUE@
--WITH_SWIG_FALSE = @WITH_SWIG_FALSE@
--WITH_SWIG_TRUE = @WITH_SWIG_TRUE@
--ac_ct_AR = @ac_ct_AR@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
--ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -158,28 +186,41 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- SUBDIRS = weather
- EXTRA_DIST = \
- 	allstyles-f0-highlight-check.kml \
-@@ -221,14 +262,14 @@
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
--	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
--		&& exit 0; \
-+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-+	        && { if test -f $@; then exit 0; else break; fi; }; \
+@@ -235,9 +267,9 @@
  	      exit 1;; \
  	  esac; \
  	done; \
@@ -92222,7 +26975,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -246,6 +287,7 @@
+@@ -255,6 +287,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -92230,18 +26983,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -253,10 +295,6 @@
- clean-libtool:
- 	-rm -rf .libs _libs
- 
--distclean-libtool:
--	-rm -f libtool
--uninstall-info-am:
--
- # This directory's subdirectories are mostly independent; you can cd
- # into them and run `make' without going through this Makefile.
- # To change the values of `make' variables: instead of editing Makefiles,
-@@ -281,15 +319,14 @@
+@@ -286,7 +319,7 @@
  	  else \
  	    local_target="$$target"; \
  	  fi; \
@@ -92250,16 +26992,7 @@
  	  || eval $$failcom; \
  	done; \
  	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
- 	fi; test -z "$$fail"
- 
--mostlyclean-recursive clean-recursive distclean-recursive \
--maintainer-clean-recursive:
-+$(RECURSIVE_CLEAN_TARGETS):
- 	@failcom='exit 1'; \
- 	for f in x $$MAKEFLAGS; do \
- 	  case $$f in \
-@@ -316,16 +353,16 @@
+@@ -320,16 +353,16 @@
  	  else \
  	    local_target="$$target"; \
  	  fi; \
@@ -92279,16 +27012,7 @@
  	done
  
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-@@ -333,14 +370,14 @@
- 	unique=`for i in $$list; do \
- 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- 	  done | \
--	  $(AWK) '    { files[$$0] = 1; } \
--	       END { for (i in files) print i; }'`; \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
- 	mkid -fID $$unique
- tags: TAGS
+@@ -344,7 +377,7 @@
  
  TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
@@ -92297,7 +27021,7 @@
  	here=`pwd`; \
  	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
  	  include_option=--etags-include; \
-@@ -352,81 +389,101 @@
+@@ -356,7 +389,7 @@
  	list='$(SUBDIRS)'; for subdir in $$list; do \
  	  if test "$$subdir" = .; then :; else \
  	    test ! -f $$subdir/TAGS || \
@@ -92306,14 +27030,11 @@
  	  fi; \
  	done; \
  	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
- 	unique=`for i in $$list; do \
- 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+@@ -365,29 +398,34 @@
  	  done | \
--	  $(AWK) '    { files[$$0] = 1; } \
--	       END { for (i in files) print i; }'`; \
+ 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 -	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 +	shift; \
 +	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
  	  test -n "$$unique" || unique=$$empty_fix; \
@@ -92331,16 +27052,13 @@
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
 -	tags=; \
--	here=`pwd`; \
  	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  	  done | \
--	  $(AWK) '    { files[$$0] = 1; } \
--	       END { for (i in files) print i; }'`; \
+ 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 -	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 +	test -z "$(CTAGS_ARGS)$$unique" \
  	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 -	     $$tags $$unique
@@ -92355,37 +27073,10 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
--	list='$(DISTFILES)'; for file in $$list; do \
--	  case $$file in \
--	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
--	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
--	  esac; \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
+@@ -408,29 +446,44 @@
  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
--	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
--	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
--	    dir="/$$dir"; \
--	    $(mkdir_p) "$(distdir)$$dir"; \
--	  else \
--	    dir=''; \
--	  fi; \
  	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 +	    if test -d "$(distdir)/$$file"; then \
 +	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 +	    fi; \
@@ -92408,8 +27099,7 @@
 +	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
  	  if test "$$subdir" = .; then :; else \
  	    test -d "$(distdir)/$$subdir" \
--	    || $(mkdir_p) "$(distdir)/$$subdir" \
-+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+ 	    || $(MKDIR_P) "$(distdir)/$$subdir" \
  	    || exit 1; \
 -	    distdir=`$(am__cd) $(distdir) && pwd`; \
 -	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -92432,13 +27122,13 @@
 -	        distdir="$$distdir/$$subdir" \
 +	        top_distdir="$$new_top_distdir" \
 +	        distdir="$$new_distdir" \
-+		am__remove_distdir=: \
-+		am__skip_length_check=: \
+ 		am__remove_distdir=: \
+ 		am__skip_length_check=: \
 +		am__skip_mode_fix=: \
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -456,6 +513,7 @@
+@@ -460,6 +513,7 @@
  
  distclean-generic:
  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -92446,18 +27136,8 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -466,8 +524,7 @@
+@@ -478,6 +532,8 @@
  
- distclean: distclean-recursive
- 	-rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool \
--	distclean-tags
-+distclean-am: clean-am distclean-generic distclean-tags
- 
- dvi: dvi-recursive
- 
-@@ -475,18 +532,38 @@
- 
  html: html-recursive
  
 +html-am:
@@ -92465,17 +27145,16 @@
  info: info-recursive
  
  info-am:
+@@ -486,18 +542,28 @@
  
- install-data-am:
+ install-dvi: install-dvi-recursive
  
-+install-dvi: install-dvi-recursive
-+
 +install-dvi-am:
 +
  install-exec-am:
  
-+install-html: install-html-recursive
-+
+ install-html: install-html-recursive
+ 
 +install-html-am:
 +
  install-info: install-info-recursive
@@ -92484,99 +27163,64 @@
 +
  install-man:
  
-+install-pdf: install-pdf-recursive
-+
+ install-pdf: install-pdf-recursive
+ 
 +install-pdf-am:
 +
-+install-ps: install-ps-recursive
-+
+ install-ps: install-ps-recursive
+ 
 +install-ps-am:
 +
  installcheck-am:
  
  maintainer-clean: maintainer-clean-recursive
-@@ -505,22 +582,25 @@
+@@ -518,8 +584,8 @@
  
- ps-am:
+ uninstall-am:
  
--uninstall-am: uninstall-info-am
-+uninstall-am:
- 
--uninstall-info: uninstall-info-recursive
+-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+-	install-strip
 +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
 +	install-am install-strip tags-recursive
  
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
--	clean clean-generic clean-libtool clean-recursive ctags \
--	ctags-recursive distclean distclean-generic distclean-libtool \
--	distclean-recursive distclean-tags distdir dvi dvi-am html \
-+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-+	all all-am check check-am clean clean-generic clean-libtool \
-+	ctags ctags-recursive distclean distclean-generic \
-+	distclean-libtool distclean-tags distdir dvi dvi-am html \
- 	html-am info info-am install install-am install-data \
--	install-data-am install-exec install-exec-am install-info \
--	install-info-am install-man install-strip installcheck \
-+	install-data-am install-dvi install-dvi-am install-exec \
-+	install-exec-am install-html install-html-am install-info \
-+	install-info-am install-man install-pdf install-pdf-am \
-+	install-ps install-ps-am install-strip installcheck \
- 	installcheck-am installdirs installdirs-am maintainer-clean \
--	maintainer-clean-generic maintainer-clean-recursive \
--	mostlyclean mostlyclean-generic mostlyclean-libtool \
--	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
--	uninstall uninstall-am uninstall-info-am
-+	maintainer-clean-generic mostlyclean mostlyclean-generic \
-+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-+	uninstall uninstall-am
-+
+ .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ 	all all-am check check-am clean clean-generic clean-libtool \
+@@ -535,6 +601,7 @@
+ 	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+ 	uninstall uninstall-am
  
++
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-Index: libkml-1.0.1/testdata/style/weather/Makefile.in
+ .NOEXPORT:
+Index: libkml-1.1.0/testdata/style/weather/Makefile.in
 ===================================================================
---- libkml-1.0.1.orig/testdata/style/weather/Makefile.in	2009-07-03 01:23:35.000000000 +0200
-+++ libkml-1.0.1/testdata/style/weather/Makefile.in	2009-12-10 10:19:48.000000000 +0100
+--- libkml-1.1.0.orig/testdata/style/weather/Makefile.in	2009-12-10 13:05:41.000000000 +0100
++++ libkml-1.1.0/testdata/style/weather/Makefile.in	2009-12-10 17:29:39.000000000 +0100
 @@ -1,8 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
+-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
-@@ -13,15 +14,12 @@
- # PARTICULAR PURPOSE.
- 
+@@ -15,8 +16,9 @@
  @SET_MAKE@
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
  VPATH = @srcdir@
  pkgdatadir = $(datadir)/@PACKAGE@
 -pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../../..
 +pkglibdir = $(libdir)/@PACKAGE@
 +pkglibexecdir = $(libexecdir)/@PACKAGE@
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -39,18 +37,19 @@
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_curl.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)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
+@@ -43,6 +45,7 @@
  mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
@@ -92584,58 +27228,7 @@
  SOURCES =
  DIST_SOURCES =
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -72,18 +71,16 @@
- CYGPATH_W = @CYGPATH_W@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
--ECHO = @ECHO@
-+DSYMUTIL = @DSYMUTIL@
-+DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
--F77 = @F77@
--FFLAGS = @FFLAGS@
--GCC_FALSE = @GCC_FALSE@
--GCC_TRUE = @GCC_TRUE@
--HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
--HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
-+FGREP = @FGREP@
-+GREP = @GREP@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -93,19 +90,28 @@
- JAVAC = @JAVAC@
- JAVA_INCLUDE_DIR = @JAVA_INCLUDE_DIR@
- JAVA_LIB_DIR = @JAVA_LIB_DIR@
-+LD = @LD@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
-+LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
-+NM = @NM@
-+NMEDIT = @NMEDIT@
-+OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
-+OTOOL = @OTOOL@
-+OTOOL64 = @OTOOL64@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -108,6 +111,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -92643,84 +27236,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PLATFORM = @PLATFORM@
-@@ -122,22 +128,13 @@
- STRIP = @STRIP@
- SWIG = @SWIG@
- VERSION = @VERSION@
--WITH_JAVA_FALSE = @WITH_JAVA_FALSE@
--WITH_JAVA_TRUE = @WITH_JAVA_TRUE@
--WITH_PYTHON_FALSE = @WITH_PYTHON_FALSE@
--WITH_PYTHON_TRUE = @WITH_PYTHON_TRUE@
--WITH_SWIG_FALSE = @WITH_SWIG_FALSE@
--WITH_SWIG_TRUE = @WITH_SWIG_TRUE@
--ac_ct_AR = @ac_ct_AR@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
--ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -149,28 +146,41 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- EXTRA_DIST = \
- 	point-sarnen-abs.kml \
- 	point-sarnen-green.kml \
-@@ -193,14 +203,14 @@
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
--	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
--		&& exit 0; \
-+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-+	        && { if test -f $@; then exit 0; else break; fi; }; \
+@@ -204,9 +208,9 @@
  	      exit 1;; \
  	  esac; \
  	done; \
@@ -92733,7 +27249,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -218,16 +228,13 @@
+@@ -224,6 +228,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -92741,49 +27257,10 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
- 
- clean-libtool:
- 	-rm -rf .libs _libs
--
--distclean-libtool:
--	-rm -f libtool
--uninstall-info-am:
- tags: TAGS
- TAGS:
- 
-@@ -236,29 +243,32 @@
- 
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
--	list='$(DISTFILES)'; for file in $$list; do \
--	  case $$file in \
--	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
--	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
--	  esac; \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
+@@ -253,13 +258,17 @@
  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
--	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
--	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
--	    dir="/$$dir"; \
--	    $(mkdir_p) "$(distdir)$$dir"; \
--	  else \
--	    dir=''; \
--	  fi; \
  	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 +	    if test -d "$(distdir)/$$file"; then \
 +	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 +	    fi; \
@@ -92802,7 +27279,7 @@
  	    || exit 1; \
  	  fi; \
  	done
-@@ -286,6 +296,7 @@
+@@ -287,6 +296,7 @@
  
  distclean-generic:
  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -92810,17 +27287,8 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -296,7 +307,7 @@
+@@ -305,6 +315,8 @@
  
- distclean: distclean-am
- 	-rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool
-+distclean-am: clean-am distclean-generic
- 
- dvi: dvi-am
- 
-@@ -304,18 +315,38 @@
- 
  html: html-am
  
 +html-am:
@@ -92828,17 +27296,16 @@
  info: info-am
  
  info-am:
+@@ -313,18 +325,28 @@
  
- install-data-am:
+ install-dvi: install-dvi-am
  
-+install-dvi: install-dvi-am
-+
 +install-dvi-am:
 +
  install-exec-am:
  
-+install-html: install-html-am
-+
+ install-html: install-html-am
+ 
 +install-html-am:
 +
  install-info: install-info-am
@@ -92847,88 +27314,53 @@
 +
  install-man:
  
-+install-pdf: install-pdf-am
-+
+ install-pdf: install-pdf-am
+ 
 +install-pdf-am:
 +
-+install-ps: install-ps-am
-+
+ install-ps: install-ps-am
+ 
 +install-ps-am:
 +
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
-@@ -334,17 +365,21 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-info-am
-+uninstall-am:
-+
-+.MAKE: install-am install-strip
- 
- .PHONY: all all-am check check-am clean clean-generic clean-libtool \
- 	distclean distclean-generic distclean-libtool distdir dvi \
- 	dvi-am html html-am info info-am install install-am \
--	install-data install-data-am install-exec install-exec-am \
--	install-info install-info-am install-man install-strip \
-+	install-data install-data-am install-dvi install-dvi-am \
-+	install-exec install-exec-am install-html install-html-am \
-+	install-info install-info-am install-man install-pdf \
-+	install-pdf-am install-ps install-ps-am install-strip \
- 	installcheck installcheck-am installdirs maintainer-clean \
+@@ -358,6 +380,7 @@
  	maintainer-clean-generic mostlyclean mostlyclean-generic \
--	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
--	uninstall-info-am
-+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
-+
+ 	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
  
++
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-Index: libkml-1.0.1/testdata/update/Makefile.in
+ .NOEXPORT:
+Index: libkml-1.1.0/testdata/update/Makefile.in
 ===================================================================
---- libkml-1.0.1.orig/testdata/update/Makefile.in	2009-07-03 01:23:36.000000000 +0200
-+++ libkml-1.0.1/testdata/update/Makefile.in	2009-12-10 10:19:48.000000000 +0100
+--- libkml-1.1.0.orig/testdata/update/Makefile.in	2009-12-10 13:05:40.000000000 +0100
++++ libkml-1.1.0/testdata/update/Makefile.in	2009-12-10 17:29:39.000000000 +0100
 @@ -1,8 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
+-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
-@@ -13,15 +14,12 @@
- # PARTICULAR PURPOSE.
- 
+@@ -15,8 +16,9 @@
  @SET_MAKE@
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
  VPATH = @srcdir@
  pkgdatadir = $(datadir)/@PACKAGE@
 -pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../..
 +pkglibdir = $(libdir)/@PACKAGE@
 +pkglibexecdir = $(libexecdir)/@PACKAGE@
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -39,18 +37,19 @@
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_curl.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)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
+@@ -43,6 +45,7 @@
  mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
@@ -92936,58 +27368,7 @@
  SOURCES =
  DIST_SOURCES =
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -72,18 +71,16 @@
- CYGPATH_W = @CYGPATH_W@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
--ECHO = @ECHO@
-+DSYMUTIL = @DSYMUTIL@
-+DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
--F77 = @F77@
--FFLAGS = @FFLAGS@
--GCC_FALSE = @GCC_FALSE@
--GCC_TRUE = @GCC_TRUE@
--HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
--HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
-+FGREP = @FGREP@
-+GREP = @GREP@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -93,19 +90,28 @@
- JAVAC = @JAVAC@
- JAVA_INCLUDE_DIR = @JAVA_INCLUDE_DIR@
- JAVA_LIB_DIR = @JAVA_LIB_DIR@
-+LD = @LD@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
-+LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
-+NM = @NM@
-+NMEDIT = @NMEDIT@
-+OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
-+OTOOL = @OTOOL@
-+OTOOL64 = @OTOOL64@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -108,6 +111,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -92995,84 +27376,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PLATFORM = @PLATFORM@
-@@ -122,22 +128,13 @@
- STRIP = @STRIP@
- SWIG = @SWIG@
- VERSION = @VERSION@
--WITH_JAVA_FALSE = @WITH_JAVA_FALSE@
--WITH_JAVA_TRUE = @WITH_JAVA_TRUE@
--WITH_PYTHON_FALSE = @WITH_PYTHON_FALSE@
--WITH_PYTHON_TRUE = @WITH_PYTHON_TRUE@
--WITH_SWIG_FALSE = @WITH_SWIG_FALSE@
--WITH_SWIG_TRUE = @WITH_SWIG_TRUE@
--ac_ct_AR = @ac_ct_AR@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
--ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -149,28 +146,41 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- EXTRA_DIST = \
- 	california.kml \
- 	california-change-linestring.kml \
-@@ -200,14 +210,14 @@
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
--	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
--		&& exit 0; \
-+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-+	        && { if test -f $@; then exit 0; else break; fi; }; \
+@@ -211,9 +215,9 @@
  	      exit 1;; \
  	  esac; \
  	done; \
@@ -93085,7 +27389,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -225,16 +235,13 @@
+@@ -231,6 +235,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -93093,49 +27397,10 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
- 
- clean-libtool:
- 	-rm -rf .libs _libs
--
--distclean-libtool:
--	-rm -f libtool
--uninstall-info-am:
- tags: TAGS
- TAGS:
- 
-@@ -243,29 +250,32 @@
- 
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
--	list='$(DISTFILES)'; for file in $$list; do \
--	  case $$file in \
--	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
--	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
--	  esac; \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
+@@ -260,13 +265,17 @@
  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
--	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
--	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
--	    dir="/$$dir"; \
--	    $(mkdir_p) "$(distdir)$$dir"; \
--	  else \
--	    dir=''; \
--	  fi; \
  	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 +	    if test -d "$(distdir)/$$file"; then \
 +	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 +	    fi; \
@@ -93154,7 +27419,7 @@
  	    || exit 1; \
  	  fi; \
  	done
-@@ -293,6 +303,7 @@
+@@ -294,6 +303,7 @@
  
  distclean-generic:
  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -93162,17 +27427,8 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -303,7 +314,7 @@
+@@ -312,6 +322,8 @@
  
- distclean: distclean-am
- 	-rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool
-+distclean-am: clean-am distclean-generic
- 
- dvi: dvi-am
- 
-@@ -311,18 +322,38 @@
- 
  html: html-am
  
 +html-am:
@@ -93180,17 +27436,16 @@
  info: info-am
  
  info-am:
+@@ -320,18 +332,28 @@
  
- install-data-am:
+ install-dvi: install-dvi-am
  
-+install-dvi: install-dvi-am
-+
 +install-dvi-am:
 +
  install-exec-am:
  
-+install-html: install-html-am
-+
+ install-html: install-html-am
+ 
 +install-html-am:
 +
  install-info: install-info-am
@@ -93199,88 +27454,53 @@
 +
  install-man:
  
-+install-pdf: install-pdf-am
-+
+ install-pdf: install-pdf-am
+ 
 +install-pdf-am:
 +
-+install-ps: install-ps-am
-+
+ install-ps: install-ps-am
+ 
 +install-ps-am:
 +
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
-@@ -341,17 +372,21 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-info-am
-+uninstall-am:
-+
-+.MAKE: install-am install-strip
- 
- .PHONY: all all-am check check-am clean clean-generic clean-libtool \
- 	distclean distclean-generic distclean-libtool distdir dvi \
- 	dvi-am html html-am info info-am install install-am \
--	install-data install-data-am install-exec install-exec-am \
--	install-info install-info-am install-man install-strip \
-+	install-data install-data-am install-dvi install-dvi-am \
-+	install-exec install-exec-am install-html install-html-am \
-+	install-info install-info-am install-man install-pdf \
-+	install-pdf-am install-ps install-ps-am install-strip \
- 	installcheck installcheck-am installdirs maintainer-clean \
+@@ -365,6 +387,7 @@
  	maintainer-clean-generic mostlyclean mostlyclean-generic \
--	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
--	uninstall-info-am
-+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
-+
+ 	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
  
++
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-Index: libkml-1.0.1/testdata/xal/Makefile.in
+ .NOEXPORT:
+Index: libkml-1.1.0/testdata/xal/Makefile.in
 ===================================================================
---- libkml-1.0.1.orig/testdata/xal/Makefile.in	2009-07-03 01:23:36.000000000 +0200
-+++ libkml-1.0.1/testdata/xal/Makefile.in	2009-12-10 10:19:49.000000000 +0100
+--- libkml-1.1.0.orig/testdata/xal/Makefile.in	2009-12-10 13:05:40.000000000 +0100
++++ libkml-1.1.0/testdata/xal/Makefile.in	2009-12-10 17:29:39.000000000 +0100
 @@ -1,8 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
+-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
-@@ -13,15 +14,12 @@
- # PARTICULAR PURPOSE.
- 
+@@ -15,8 +16,9 @@
  @SET_MAKE@
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
  VPATH = @srcdir@
  pkgdatadir = $(datadir)/@PACKAGE@
 -pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../..
 +pkglibdir = $(libdir)/@PACKAGE@
 +pkglibexecdir = $(libexecdir)/@PACKAGE@
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -39,18 +37,19 @@
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_curl.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)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
+@@ -43,6 +45,7 @@
  mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
@@ -93288,58 +27508,7 @@
  SOURCES =
  DIST_SOURCES =
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -72,18 +71,16 @@
- CYGPATH_W = @CYGPATH_W@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
--ECHO = @ECHO@
-+DSYMUTIL = @DSYMUTIL@
-+DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
--F77 = @F77@
--FFLAGS = @FFLAGS@
--GCC_FALSE = @GCC_FALSE@
--GCC_TRUE = @GCC_TRUE@
--HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
--HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
-+FGREP = @FGREP@
-+GREP = @GREP@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -93,19 +90,28 @@
- JAVAC = @JAVAC@
- JAVA_INCLUDE_DIR = @JAVA_INCLUDE_DIR@
- JAVA_LIB_DIR = @JAVA_LIB_DIR@
-+LD = @LD@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
-+LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
-+NM = @NM@
-+NMEDIT = @NMEDIT@
-+OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
-+OTOOL = @OTOOL@
-+OTOOL64 = @OTOOL64@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -108,6 +111,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -93347,84 +27516,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PLATFORM = @PLATFORM@
-@@ -122,22 +128,13 @@
- STRIP = @STRIP@
- SWIG = @SWIG@
- VERSION = @VERSION@
--WITH_JAVA_FALSE = @WITH_JAVA_FALSE@
--WITH_JAVA_TRUE = @WITH_JAVA_TRUE@
--WITH_PYTHON_FALSE = @WITH_PYTHON_FALSE@
--WITH_PYTHON_TRUE = @WITH_PYTHON_TRUE@
--WITH_SWIG_FALSE = @WITH_SWIG_FALSE@
--WITH_SWIG_TRUE = @WITH_SWIG_TRUE@
--ac_ct_AR = @ac_ct_AR@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
--ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -149,28 +146,41 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- EXTRA_DIST = \
- 	gaddr.kml
- 
-@@ -181,14 +191,14 @@
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
--	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
--		&& exit 0; \
-+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-+	        && { if test -f $@; then exit 0; else break; fi; }; \
+@@ -192,9 +196,9 @@
  	      exit 1;; \
  	  esac; \
  	done; \
@@ -93437,7 +27529,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -206,16 +216,13 @@
+@@ -212,6 +216,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -93445,49 +27537,10 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
- 
- clean-libtool:
- 	-rm -rf .libs _libs
--
--distclean-libtool:
--	-rm -f libtool
--uninstall-info-am:
- tags: TAGS
- TAGS:
- 
-@@ -224,29 +231,32 @@
- 
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
--	list='$(DISTFILES)'; for file in $$list; do \
--	  case $$file in \
--	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
--	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
--	  esac; \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
+@@ -241,13 +246,17 @@
  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
--	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
--	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
--	    dir="/$$dir"; \
--	    $(mkdir_p) "$(distdir)$$dir"; \
--	  else \
--	    dir=''; \
--	  fi; \
  	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 +	    if test -d "$(distdir)/$$file"; then \
 +	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 +	    fi; \
@@ -93506,7 +27559,7 @@
  	    || exit 1; \
  	  fi; \
  	done
-@@ -274,6 +284,7 @@
+@@ -275,6 +284,7 @@
  
  distclean-generic:
  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -93514,17 +27567,8 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -284,7 +295,7 @@
+@@ -293,6 +303,8 @@
  
- distclean: distclean-am
- 	-rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool
-+distclean-am: clean-am distclean-generic
- 
- dvi: dvi-am
- 
-@@ -292,18 +303,38 @@
- 
  html: html-am
  
 +html-am:
@@ -93532,17 +27576,16 @@
  info: info-am
  
  info-am:
+@@ -301,18 +313,28 @@
  
- install-data-am:
+ install-dvi: install-dvi-am
  
-+install-dvi: install-dvi-am
-+
 +install-dvi-am:
 +
  install-exec-am:
  
-+install-html: install-html-am
-+
+ install-html: install-html-am
+ 
 +install-html-am:
 +
  install-info: install-info-am
@@ -93551,88 +27594,53 @@
 +
  install-man:
  
-+install-pdf: install-pdf-am
-+
+ install-pdf: install-pdf-am
+ 
 +install-pdf-am:
 +
-+install-ps: install-ps-am
-+
+ install-ps: install-ps-am
+ 
 +install-ps-am:
 +
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
-@@ -322,17 +353,21 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-info-am
-+uninstall-am:
-+
-+.MAKE: install-am install-strip
- 
- .PHONY: all all-am check check-am clean clean-generic clean-libtool \
- 	distclean distclean-generic distclean-libtool distdir dvi \
- 	dvi-am html html-am info info-am install install-am \
--	install-data install-data-am install-exec install-exec-am \
--	install-info install-info-am install-man install-strip \
-+	install-data install-data-am install-dvi install-dvi-am \
-+	install-exec install-exec-am install-html install-html-am \
-+	install-info install-info-am install-man install-pdf \
-+	install-pdf-am install-ps install-ps-am install-strip \
- 	installcheck installcheck-am installdirs maintainer-clean \
+@@ -346,6 +368,7 @@
  	maintainer-clean-generic mostlyclean mostlyclean-generic \
--	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
--	uninstall-info-am
-+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
-+
+ 	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
  
++
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-Index: libkml-1.0.1/testdata/xsd/Makefile.in
+ .NOEXPORT:
+Index: libkml-1.1.0/testdata/xsd/Makefile.in
 ===================================================================
---- libkml-1.0.1.orig/testdata/xsd/Makefile.in	2009-07-03 01:23:36.000000000 +0200
-+++ libkml-1.0.1/testdata/xsd/Makefile.in	2009-12-10 10:19:49.000000000 +0100
+--- libkml-1.1.0.orig/testdata/xsd/Makefile.in	2009-12-10 13:05:40.000000000 +0100
++++ libkml-1.1.0/testdata/xsd/Makefile.in	2009-12-10 17:29:39.000000000 +0100
 @@ -1,8 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
+-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
-@@ -13,15 +14,12 @@
- # PARTICULAR PURPOSE.
- 
+@@ -15,8 +16,9 @@
  @SET_MAKE@
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
  VPATH = @srcdir@
  pkgdatadir = $(datadir)/@PACKAGE@
 -pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../..
 +pkglibdir = $(libdir)/@PACKAGE@
 +pkglibexecdir = $(libexecdir)/@PACKAGE@
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -39,18 +37,19 @@
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_curl.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)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
+@@ -43,6 +45,7 @@
  mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
@@ -93640,58 +27648,7 @@
  SOURCES =
  DIST_SOURCES =
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -72,18 +71,16 @@
- CYGPATH_W = @CYGPATH_W@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
--ECHO = @ECHO@
-+DSYMUTIL = @DSYMUTIL@
-+DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
--F77 = @F77@
--FFLAGS = @FFLAGS@
--GCC_FALSE = @GCC_FALSE@
--GCC_TRUE = @GCC_TRUE@
--HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
--HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
-+FGREP = @FGREP@
-+GREP = @GREP@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -93,19 +90,28 @@
- JAVAC = @JAVAC@
- JAVA_INCLUDE_DIR = @JAVA_INCLUDE_DIR@
- JAVA_LIB_DIR = @JAVA_LIB_DIR@
-+LD = @LD@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
-+LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
-+NM = @NM@
-+NMEDIT = @NMEDIT@
-+OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
-+OTOOL = @OTOOL@
-+OTOOL64 = @OTOOL64@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -108,6 +111,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -93699,84 +27656,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PLATFORM = @PLATFORM@
-@@ -122,22 +128,13 @@
- STRIP = @STRIP@
- SWIG = @SWIG@
- VERSION = @VERSION@
--WITH_JAVA_FALSE = @WITH_JAVA_FALSE@
--WITH_JAVA_TRUE = @WITH_JAVA_TRUE@
--WITH_PYTHON_FALSE = @WITH_PYTHON_FALSE@
--WITH_PYTHON_TRUE = @WITH_PYTHON_TRUE@
--WITH_SWIG_FALSE = @WITH_SWIG_FALSE@
--WITH_SWIG_TRUE = @WITH_SWIG_TRUE@
--ac_ct_AR = @ac_ct_AR@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
--ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -149,28 +146,41 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- EXTRA_DIST = \
- 	kml21.xsd
- 
-@@ -181,14 +191,14 @@
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
--	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
--		&& exit 0; \
-+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-+	        && { if test -f $@; then exit 0; else break; fi; }; \
+@@ -192,9 +196,9 @@
  	      exit 1;; \
  	  esac; \
  	done; \
@@ -93789,7 +27669,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -206,16 +216,13 @@
+@@ -212,6 +216,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -93797,49 +27677,10 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
- 
- clean-libtool:
- 	-rm -rf .libs _libs
--
--distclean-libtool:
--	-rm -f libtool
--uninstall-info-am:
- tags: TAGS
- TAGS:
- 
-@@ -224,29 +231,32 @@
- 
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
--	list='$(DISTFILES)'; for file in $$list; do \
--	  case $$file in \
--	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
--	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
--	  esac; \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
+@@ -241,13 +246,17 @@
  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
--	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
--	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
--	    dir="/$$dir"; \
--	    $(mkdir_p) "$(distdir)$$dir"; \
--	  else \
--	    dir=''; \
--	  fi; \
  	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 +	    if test -d "$(distdir)/$$file"; then \
 +	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 +	    fi; \
@@ -93858,7 +27699,7 @@
  	    || exit 1; \
  	  fi; \
  	done
-@@ -274,6 +284,7 @@
+@@ -275,6 +284,7 @@
  
  distclean-generic:
  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -93866,17 +27707,8 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -284,7 +295,7 @@
+@@ -293,6 +303,8 @@
  
- distclean: distclean-am
- 	-rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool
-+distclean-am: clean-am distclean-generic
- 
- dvi: dvi-am
- 
-@@ -292,18 +303,38 @@
- 
  html: html-am
  
 +html-am:
@@ -93884,17 +27716,16 @@
  info: info-am
  
  info-am:
+@@ -301,18 +313,28 @@
  
- install-data-am:
+ install-dvi: install-dvi-am
  
-+install-dvi: install-dvi-am
-+
 +install-dvi-am:
 +
  install-exec-am:
  
-+install-html: install-html-am
-+
+ install-html: install-html-am
+ 
 +install-html-am:
 +
  install-info: install-info-am
@@ -93903,88 +27734,63 @@
 +
  install-man:
  
-+install-pdf: install-pdf-am
-+
+ install-pdf: install-pdf-am
+ 
 +install-pdf-am:
 +
-+install-ps: install-ps-am
-+
+ install-ps: install-ps-am
+ 
 +install-ps-am:
 +
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
-@@ -322,17 +353,21 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-info-am
-+uninstall-am:
-+
-+.MAKE: install-am install-strip
- 
- .PHONY: all all-am check check-am clean clean-generic clean-libtool \
- 	distclean distclean-generic distclean-libtool distdir dvi \
- 	dvi-am html html-am info info-am install install-am \
--	install-data install-data-am install-exec install-exec-am \
--	install-info install-info-am install-man install-strip \
-+	install-data install-data-am install-dvi install-dvi-am \
-+	install-exec install-exec-am install-html install-html-am \
-+	install-info install-info-am install-man install-pdf \
-+	install-pdf-am install-ps install-ps-am install-strip \
- 	installcheck installcheck-am installdirs maintainer-clean \
+@@ -346,6 +368,7 @@
  	maintainer-clean-generic mostlyclean mostlyclean-generic \
--	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
--	uninstall-info-am
-+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
-+
+ 	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
  
++
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-Index: libkml-1.0.1/third_party/Makefile.in
+ .NOEXPORT:
+Index: libkml-1.1.0/third_party/Makefile.in
 ===================================================================
---- libkml-1.0.1.orig/third_party/Makefile.in	2009-07-03 01:23:36.000000000 +0200
-+++ libkml-1.0.1/third_party/Makefile.in	2009-12-10 10:19:49.000000000 +0100
+--- libkml-1.1.0.orig/third_party/Makefile.in	2009-12-10 13:05:40.000000000 +0100
++++ libkml-1.1.0/third_party/Makefile.in	2009-12-10 17:29:40.000000000 +0100
 @@ -1,8 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
+-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
-@@ -15,15 +16,12 @@
- @SET_MAKE@
+@@ -17,8 +18,9 @@
  
- 
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
  VPATH = @srcdir@
  pkgdatadir = $(datadir)/@PACKAGE@
 -pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ..
 +pkglibdir = $(libdir)/@PACKAGE@
 +pkglibexecdir = $(libexecdir)/@PACKAGE@
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -48,18 +46,36 @@
- 	$(srcdir)/Makefile.in
+@@ -40,8 +42,7 @@
+ 	$(libboostconfigplatforminclude_HEADERS) \
+ 	$(libboostconfigstdlibinclude_HEADERS) \
+ 	$(libboostdetailinclude_HEADERS) $(libboostinclude_HEADERS) \
+-	$(liburiparserinclude_HEADERS) $(srcdir)/Makefile.am \
+-	$(srcdir)/Makefile.in
++	$(srcdir)/Makefile.am $(srcdir)/Makefile.in
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_curl.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)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
+ 	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+@@ -52,12 +53,28 @@
  mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
@@ -94014,67 +27820,45 @@
  am__installdirs = "$(DESTDIR)$(libdir)" \
  	"$(DESTDIR)$(libboostconfigcompilerincludedir)" \
  	"$(DESTDIR)$(libboostconfigincludedir)" \
-@@ -69,7 +85,6 @@
+@@ -65,9 +82,7 @@
+ 	"$(DESTDIR)$(libboostconfigplatformincludedir)" \
+ 	"$(DESTDIR)$(libboostconfigstdlibincludedir)" \
  	"$(DESTDIR)$(libboostdetailincludedir)" \
- 	"$(DESTDIR)$(libboostincludedir)" \
- 	"$(DESTDIR)$(liburiparserincludedir)"
+-	"$(DESTDIR)$(libboostincludedir)" \
+-	"$(DESTDIR)$(liburiparserincludedir)"
 -libLTLIBRARIES_INSTALL = $(INSTALL)
++	"$(DESTDIR)$(libboostincludedir)"
  LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES)
  libgtest_la_LIBADD =
  am_libgtest_la_OBJECTS = gtest.lo gtest-death-test.lo \
-@@ -79,43 +94,44 @@
- libminizip_la_LIBADD =
- am_libminizip_la_OBJECTS = unzip.lo ioapi.lo zip.lo
- libminizip_la_OBJECTS = $(am_libminizip_la_OBJECTS)
-+libminizip_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+	$(libminizip_la_LDFLAGS) $(LDFLAGS) -o $@
- liburiparser_la_LIBADD =
- am_liburiparser_la_OBJECTS = UriCommon.lo UriCompare.lo UriEscape.lo \
- 	UriFile.lo UriIp4.lo UriIp4Base.lo UriNormalize.lo \
- 	UriNormalizeBase.lo UriParse.lo UriParseBase.lo UriQuery.lo \
- 	UriRecompose.lo UriResolve.lo UriShorten.lo
- liburiparser_la_OBJECTS = $(am_liburiparser_la_OBJECTS)
--DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-+liburiparser_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+	$(liburiparser_la_LDFLAGS) $(LDFLAGS) -o $@
-+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+@@ -80,18 +95,10 @@
+ libminizip_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(libminizip_la_LDFLAGS) $(LDFLAGS) -o $@
+-liburiparser_la_LIBADD =
+-am_liburiparser_la_OBJECTS = UriCommon.lo UriCompare.lo UriEscape.lo \
+-	UriFile.lo UriIp4.lo UriIp4Base.lo UriNormalize.lo \
+-	UriNormalizeBase.lo UriParse.lo UriParseBase.lo UriQuery.lo \
+-	UriRecompose.lo UriResolve.lo UriShorten.lo
+-liburiparser_la_OBJECTS = $(am_liburiparser_la_OBJECTS)
+-liburiparser_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-	$(liburiparser_la_LDFLAGS) $(LDFLAGS) -o $@
+ DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
  depcomp = $(SHELL) $(top_srcdir)/config/depcomp
  am__depfiles_maybe = depfiles
 +am__mv = mv -f
  COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
  	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
--	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
--	$(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
--	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
--LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
--	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
--	$(AM_CXXFLAGS) $(CXXFLAGS)
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- CXXLD = $(CXX)
--CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
--	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- SOURCES = $(libgtest_la_SOURCES) $(libminizip_la_SOURCES) \
- 	$(liburiparser_la_SOURCES)
- DIST_SOURCES = $(libgtest_la_SOURCES) $(libminizip_la_SOURCES) \
- 	$(liburiparser_la_SOURCES)
+ LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+@@ -110,25 +117,14 @@
+ CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ 	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+ 	$(LDFLAGS) -o $@
+-SOURCES = $(libgtest_la_SOURCES) $(libminizip_la_SOURCES) \
+-	$(liburiparser_la_SOURCES)
+-DIST_SOURCES = $(libgtest_la_SOURCES) $(libminizip_la_SOURCES) \
+-	$(liburiparser_la_SOURCES)
 -libboostconfigcompilerincludeHEADERS_INSTALL = $(INSTALL_HEADER)
 -libboostconfigincludeHEADERS_INSTALL = $(INSTALL_HEADER)
 -libboostconfigno_tr1includeHEADERS_INSTALL = $(INSTALL_HEADER)
@@ -94083,64 +27867,20 @@
 -libboostdetailincludeHEADERS_INSTALL = $(INSTALL_HEADER)
 -libboostincludeHEADERS_INSTALL = $(INSTALL_HEADER)
 -liburiparserincludeHEADERS_INSTALL = $(INSTALL_HEADER)
++SOURCES = $(libgtest_la_SOURCES) $(libminizip_la_SOURCES)
++DIST_SOURCES = $(libgtest_la_SOURCES) $(libminizip_la_SOURCES)
  HEADERS = $(libboostconfigcompilerinclude_HEADERS) \
  	$(libboostconfiginclude_HEADERS) \
  	$(libboostconfigno_tr1include_HEADERS) \
-@@ -127,8 +143,6 @@
+ 	$(libboostconfigplatforminclude_HEADERS) \
+ 	$(libboostconfigstdlibinclude_HEADERS) \
+-	$(libboostdetailinclude_HEADERS) $(libboostinclude_HEADERS) \
+-	$(liburiparserinclude_HEADERS)
++	$(libboostdetailinclude_HEADERS) $(libboostinclude_HEADERS)
+ ETAGS = etags
  CTAGS = ctags
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -150,18 +164,16 @@
- CYGPATH_W = @CYGPATH_W@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
--ECHO = @ECHO@
-+DSYMUTIL = @DSYMUTIL@
-+DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
--F77 = @F77@
--FFLAGS = @FFLAGS@
--GCC_FALSE = @GCC_FALSE@
--GCC_TRUE = @GCC_TRUE@
--HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
--HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
-+FGREP = @FGREP@
-+GREP = @GREP@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -171,19 +183,28 @@
- JAVAC = @JAVAC@
- JAVA_INCLUDE_DIR = @JAVA_INCLUDE_DIR@
- JAVA_LIB_DIR = @JAVA_LIB_DIR@
-+LD = @LD@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
-+LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
-+NM = @NM@
-+NMEDIT = @NMEDIT@
-+OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
-+OTOOL = @OTOOL@
-+OTOOL64 = @OTOOL64@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -194,6 +190,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -94148,84 +27888,59 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PLATFORM = @PLATFORM@
-@@ -200,22 +221,13 @@
- STRIP = @STRIP@
- SWIG = @SWIG@
- VERSION = @VERSION@
--WITH_JAVA_FALSE = @WITH_JAVA_FALSE@
--WITH_JAVA_TRUE = @WITH_JAVA_TRUE@
--WITH_PYTHON_FALSE = @WITH_PYTHON_FALSE@
--WITH_PYTHON_TRUE = @WITH_PYTHON_TRUE@
--WITH_SWIG_FALSE = @WITH_SWIG_FALSE@
--WITH_SWIG_TRUE = @WITH_SWIG_TRUE@
--ac_ct_AR = @ac_ct_AR@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
--ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -227,28 +239,41 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
+@@ -264,11 +261,10 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
  AM_CPPFLAGS = -I$(top_srcdir)/third_party/zlib-1.2.3/contrib \
- 	      -I$(top_srcdir)/third_party/uriparser-0.7.1/include \
+-	      -I$(top_srcdir)/third_party/uriparser-0.7.1/include \
  	      -I$(top_srcdir)/third_party/googletest-r108 \
-@@ -446,14 +471,14 @@
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
--	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
--		&& exit 0; \
-+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-+	        && { if test -f $@; then exit 0; else break; fi; }; \
+ 	      -I$(top_srcdir)/third_party/googletest-r108/include
+ 
+-lib_LTLIBRARIES = libminizip.la liburiparser.la
++lib_LTLIBRARIES = libminizip.la 
+ noinst_LTLIBRARIES = libgtest.la
+ libminizip_la_SOURCES = \
+ 	zlib-1.2.3/contrib/minizip/unzip.c \
+@@ -277,38 +273,6 @@
+ 	zlib-1.2.3/contrib/minizip/zip.c
+ 
+ libminizip_la_LDFLAGS = -lz
+-liburiparser_la_SOURCES = \
+-	uriparser-0.7.1/lib/UriCommon.c \
+-	uriparser-0.7.1/lib/UriCommon.h \
+-	uriparser-0.7.1/lib/UriCompare.c \
+-	uriparser-0.7.1/lib/UriEscape.c \
+-	uriparser-0.7.1/lib/UriFile.c \
+-	uriparser-0.7.1/lib/UriIp4.c \
+-	uriparser-0.7.1/lib/UriIp4Base.c \
+-	uriparser-0.7.1/lib/UriIp4Base.h \
+-	uriparser-0.7.1/lib/UriNormalize.c \
+-	uriparser-0.7.1/lib/UriNormalizeBase.c \
+-	uriparser-0.7.1/lib/UriNormalizeBase.h \
+-	uriparser-0.7.1/lib/UriParse.c \
+-	uriparser-0.7.1/lib/UriParseBase.c \
+-	uriparser-0.7.1/lib/UriParseBase.h \
+-	uriparser-0.7.1/lib/UriQuery.c \
+-	uriparser-0.7.1/lib/UriRecompose.c \
+-	uriparser-0.7.1/lib/UriResolve.c \
+-	uriparser-0.7.1/lib/UriShorten.c
+-
+-uriparser = uriparser-0.7.1
+-uriparserinc = $(includedir)/kml/third_party/$(uriparser)/include
+-liburiparserincludedir = $(uriparserinc)
+-liburiparserinclude_HEADERS = \
+-	$(uriparser)/include/uriparser/Uri.h \
+-	$(uriparser)/include/uriparser/UriBase.h \
+-	$(uriparser)/include/uriparser/UriDefsAnsi.h \
+-	$(uriparser)/include/uriparser/UriDefsConfig.h \
+-	$(uriparser)/include/uriparser/UriDefsUnicode.h \
+-	$(uriparser)/include/uriparser/UriIp4.h
+-
+-liburiparser_la_LDFLAGS = -version-info 1:5:0
+ boost_root = boost_1_34_1
+ boost = $(boost_root)/boost
+ boostinc = $(includedir)/kml/third_party/$(boost)
+@@ -466,9 +430,9 @@
  	      exit 1;; \
  	  esac; \
  	done; \
@@ -94238,22 +27953,21 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -471,23 +496,28 @@
+@@ -486,23 +450,28 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(am__aclocal_m4_deps):
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
--	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ 	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 -	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 +	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
 +	list2=; for p in $$list; do \
  	  if test -f $$p; then \
 -	    f=$(am__strip_dir) \
--	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
--	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+-	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
+-	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
 +	    list2="$$list2 $$p"; \
  	  else :; fi; \
 -	done
@@ -94265,10 +27979,10 @@
  
  uninstall-libLTLIBRARIES:
  	@$(NORMAL_UNINSTALL)
--	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 -	  p=$(am__strip_dir) \
--	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
--	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
 +	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
 +	for p in $$list; do \
 +	  $(am__strip_dir) \
@@ -94277,322 +27991,291 @@
  	done
  
  clean-libLTLIBRARIES:
-@@ -508,11 +538,11 @@
- 	  rm -f "$${dir}/so_locations"; \
- 	done
- libgtest.la: $(libgtest_la_OBJECTS) $(libgtest_la_DEPENDENCIES) 
--	$(CXXLINK)  $(libgtest_la_LDFLAGS) $(libgtest_la_OBJECTS) $(libgtest_la_LIBADD) $(LIBS)
-+	$(CXXLINK)  $(libgtest_la_OBJECTS) $(libgtest_la_LIBADD) $(LIBS)
+@@ -526,8 +495,6 @@
+ 	$(CXXLINK)  $(libgtest_la_OBJECTS) $(libgtest_la_LIBADD) $(LIBS)
  libminizip.la: $(libminizip_la_OBJECTS) $(libminizip_la_DEPENDENCIES) 
--	$(LINK) -rpath $(libdir) $(libminizip_la_LDFLAGS) $(libminizip_la_OBJECTS) $(libminizip_la_LIBADD) $(LIBS)
-+	$(libminizip_la_LINK) -rpath $(libdir) $(libminizip_la_OBJECTS) $(libminizip_la_LIBADD) $(LIBS)
- liburiparser.la: $(liburiparser_la_OBJECTS) $(liburiparser_la_DEPENDENCIES) 
--	$(LINK) -rpath $(libdir) $(liburiparser_la_LDFLAGS) $(liburiparser_la_OBJECTS) $(liburiparser_la_LIBADD) $(LIBS)
-+	$(liburiparser_la_LINK) -rpath $(libdir) $(liburiparser_la_OBJECTS) $(liburiparser_la_LIBADD) $(LIBS)
+ 	$(libminizip_la_LINK) -rpath $(libdir) $(libminizip_la_OBJECTS) $(libminizip_la_LIBADD) $(LIBS)
+-liburiparser.la: $(liburiparser_la_OBJECTS) $(liburiparser_la_DEPENDENCIES) 
+-	$(liburiparser_la_LINK) -rpath $(libdir) $(liburiparser_la_OBJECTS) $(liburiparser_la_LIBADD) $(LIBS)
  
  mostlyclean-compile:
  	-rm -f *.$(OBJEXT)
-@@ -545,427 +575,453 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/zip.Plo at am__quote@
+@@ -535,20 +502,6 @@
+ distclean-compile:
+ 	-rm -f *.tab.c
  
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/UriCommon.Plo at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/UriCompare.Plo at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/UriEscape.Plo at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/UriFile.Plo at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/UriIp4.Plo at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/UriIp4Base.Plo at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/UriNormalize.Plo at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/UriNormalizeBase.Plo at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/UriParse.Plo at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/UriParseBase.Plo at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/UriQuery.Plo at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/UriRecompose.Plo at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/UriResolve.Plo at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/UriShorten.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gtest-death-test.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gtest-filepath.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gtest-port.Plo at am__quote@
+@@ -562,213 +515,115 @@
+ 
  .c.o:
-- at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 + at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(COMPILE) -c $<
  
  .c.obj:
-- at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 + at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
  
  .c.lo:
-- at am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 + at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
  
  unzip.lo: zlib-1.2.3/contrib/minizip/unzip.c
-- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT unzip.lo -MD -MP -MF "$(DEPDIR)/unzip.Tpo" -c -o unzip.lo `test -f 'zlib-1.2.3/contrib/minizip/unzip.c' || echo '$(srcdir)/'`zlib-1.2.3/contrib/minizip/unzip.c; \
-- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/unzip.Tpo" "$(DEPDIR)/unzip.Plo"; else rm -f "$(DEPDIR)/unzip.Tpo"; exit 1; fi
+- at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT unzip.lo -MD -MP -MF $(DEPDIR)/unzip.Tpo -c -o unzip.lo `test -f 'zlib-1.2.3/contrib/minizip/unzip.c' || echo '$(srcdir)/'`zlib-1.2.3/contrib/minizip/unzip.c
+- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/unzip.Tpo $(DEPDIR)/unzip.Plo
 + at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT unzip.lo -MD -MP -MF $(DEPDIR)/unzip.Tpo -c -o unzip.lo `test -f 'zlib-1.2.3/contrib/minizip/unzip.c' || echo '$(srcdir)/'`zlib-1.2.3/contrib/minizip/unzip.c
 + at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/unzip.Tpo $(DEPDIR)/unzip.Plo
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='zlib-1.2.3/contrib/minizip/unzip.c' object='unzip.lo' libtool=yes @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o unzip.lo `test -f 'zlib-1.2.3/contrib/minizip/unzip.c' || echo '$(srcdir)/'`zlib-1.2.3/contrib/minizip/unzip.c
+- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o unzip.lo `test -f 'zlib-1.2.3/contrib/minizip/unzip.c' || echo '$(srcdir)/'`zlib-1.2.3/contrib/minizip/unzip.c
 + at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o unzip.lo `test -f 'zlib-1.2.3/contrib/minizip/unzip.c' || echo '$(srcdir)/'`zlib-1.2.3/contrib/minizip/unzip.c
  
  ioapi.lo: zlib-1.2.3/contrib/minizip/ioapi.c
-- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ioapi.lo -MD -MP -MF "$(DEPDIR)/ioapi.Tpo" -c -o ioapi.lo `test -f 'zlib-1.2.3/contrib/minizip/ioapi.c' || echo '$(srcdir)/'`zlib-1.2.3/contrib/minizip/ioapi.c; \
-- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/ioapi.Tpo" "$(DEPDIR)/ioapi.Plo"; else rm -f "$(DEPDIR)/ioapi.Tpo"; exit 1; fi
+- at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ioapi.lo -MD -MP -MF $(DEPDIR)/ioapi.Tpo -c -o ioapi.lo `test -f 'zlib-1.2.3/contrib/minizip/ioapi.c' || echo '$(srcdir)/'`zlib-1.2.3/contrib/minizip/ioapi.c
+- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/ioapi.Tpo $(DEPDIR)/ioapi.Plo
 + at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ioapi.lo -MD -MP -MF $(DEPDIR)/ioapi.Tpo -c -o ioapi.lo `test -f 'zlib-1.2.3/contrib/minizip/ioapi.c' || echo '$(srcdir)/'`zlib-1.2.3/contrib/minizip/ioapi.c
 + at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/ioapi.Tpo $(DEPDIR)/ioapi.Plo
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='zlib-1.2.3/contrib/minizip/ioapi.c' object='ioapi.lo' libtool=yes @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ioapi.lo `test -f 'zlib-1.2.3/contrib/minizip/ioapi.c' || echo '$(srcdir)/'`zlib-1.2.3/contrib/minizip/ioapi.c
+- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ioapi.lo `test -f 'zlib-1.2.3/contrib/minizip/ioapi.c' || echo '$(srcdir)/'`zlib-1.2.3/contrib/minizip/ioapi.c
 + at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ioapi.lo `test -f 'zlib-1.2.3/contrib/minizip/ioapi.c' || echo '$(srcdir)/'`zlib-1.2.3/contrib/minizip/ioapi.c
  
+ iomem_simple.lo: zlib-1.2.3/contrib/minizip/iomem_simple.c
+- at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iomem_simple.lo -MD -MP -MF $(DEPDIR)/iomem_simple.Tpo -c -o iomem_simple.lo `test -f 'zlib-1.2.3/contrib/minizip/iomem_simple.c' || echo '$(srcdir)/'`zlib-1.2.3/contrib/minizip/iomem_simple.c
+- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/iomem_simple.Tpo $(DEPDIR)/iomem_simple.Plo
++ at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iomem_simple.lo -MD -MP -MF $(DEPDIR)/iomem_simple.Tpo -c -o iomem_simple.lo `test -f 'zlib-1.2.3/contrib/minizip/iomem_simple.c' || echo '$(srcdir)/'`zlib-1.2.3/contrib/minizip/iomem_simple.c
++ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/iomem_simple.Tpo $(DEPDIR)/iomem_simple.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='zlib-1.2.3/contrib/minizip/iomem_simple.c' object='iomem_simple.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iomem_simple.lo `test -f 'zlib-1.2.3/contrib/minizip/iomem_simple.c' || echo '$(srcdir)/'`zlib-1.2.3/contrib/minizip/iomem_simple.c
++ at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o iomem_simple.lo `test -f 'zlib-1.2.3/contrib/minizip/iomem_simple.c' || echo '$(srcdir)/'`zlib-1.2.3/contrib/minizip/iomem_simple.c
+ 
  zip.lo: zlib-1.2.3/contrib/minizip/zip.c
-- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT zip.lo -MD -MP -MF "$(DEPDIR)/zip.Tpo" -c -o zip.lo `test -f 'zlib-1.2.3/contrib/minizip/zip.c' || echo '$(srcdir)/'`zlib-1.2.3/contrib/minizip/zip.c; \
-- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/zip.Tpo" "$(DEPDIR)/zip.Plo"; else rm -f "$(DEPDIR)/zip.Tpo"; exit 1; fi
+- at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT zip.lo -MD -MP -MF $(DEPDIR)/zip.Tpo -c -o zip.lo `test -f 'zlib-1.2.3/contrib/minizip/zip.c' || echo '$(srcdir)/'`zlib-1.2.3/contrib/minizip/zip.c
+- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/zip.Tpo $(DEPDIR)/zip.Plo
 + at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT zip.lo -MD -MP -MF $(DEPDIR)/zip.Tpo -c -o zip.lo `test -f 'zlib-1.2.3/contrib/minizip/zip.c' || echo '$(srcdir)/'`zlib-1.2.3/contrib/minizip/zip.c
 + at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/zip.Tpo $(DEPDIR)/zip.Plo
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='zlib-1.2.3/contrib/minizip/zip.c' object='zip.lo' libtool=yes @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o zip.lo `test -f 'zlib-1.2.3/contrib/minizip/zip.c' || echo '$(srcdir)/'`zlib-1.2.3/contrib/minizip/zip.c
+- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o zip.lo `test -f 'zlib-1.2.3/contrib/minizip/zip.c' || echo '$(srcdir)/'`zlib-1.2.3/contrib/minizip/zip.c
+-
+-UriCommon.lo: uriparser-0.7.1/lib/UriCommon.c
+- at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT UriCommon.lo -MD -MP -MF $(DEPDIR)/UriCommon.Tpo -c -o UriCommon.lo `test -f 'uriparser-0.7.1/lib/UriCommon.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriCommon.c
+- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/UriCommon.Tpo $(DEPDIR)/UriCommon.Plo
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='uriparser-0.7.1/lib/UriCommon.c' object='UriCommon.lo' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o UriCommon.lo `test -f 'uriparser-0.7.1/lib/UriCommon.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriCommon.c
+-
+-UriCompare.lo: uriparser-0.7.1/lib/UriCompare.c
+- at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT UriCompare.lo -MD -MP -MF $(DEPDIR)/UriCompare.Tpo -c -o UriCompare.lo `test -f 'uriparser-0.7.1/lib/UriCompare.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriCompare.c
+- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/UriCompare.Tpo $(DEPDIR)/UriCompare.Plo
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='uriparser-0.7.1/lib/UriCompare.c' object='UriCompare.lo' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o UriCompare.lo `test -f 'uriparser-0.7.1/lib/UriCompare.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriCompare.c
+-
+-UriEscape.lo: uriparser-0.7.1/lib/UriEscape.c
+- at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT UriEscape.lo -MD -MP -MF $(DEPDIR)/UriEscape.Tpo -c -o UriEscape.lo `test -f 'uriparser-0.7.1/lib/UriEscape.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriEscape.c
+- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/UriEscape.Tpo $(DEPDIR)/UriEscape.Plo
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='uriparser-0.7.1/lib/UriEscape.c' object='UriEscape.lo' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o UriEscape.lo `test -f 'uriparser-0.7.1/lib/UriEscape.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriEscape.c
+-
+-UriFile.lo: uriparser-0.7.1/lib/UriFile.c
+- at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT UriFile.lo -MD -MP -MF $(DEPDIR)/UriFile.Tpo -c -o UriFile.lo `test -f 'uriparser-0.7.1/lib/UriFile.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriFile.c
+- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/UriFile.Tpo $(DEPDIR)/UriFile.Plo
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='uriparser-0.7.1/lib/UriFile.c' object='UriFile.lo' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o UriFile.lo `test -f 'uriparser-0.7.1/lib/UriFile.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriFile.c
+-
+-UriIp4.lo: uriparser-0.7.1/lib/UriIp4.c
+- at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT UriIp4.lo -MD -MP -MF $(DEPDIR)/UriIp4.Tpo -c -o UriIp4.lo `test -f 'uriparser-0.7.1/lib/UriIp4.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriIp4.c
+- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/UriIp4.Tpo $(DEPDIR)/UriIp4.Plo
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='uriparser-0.7.1/lib/UriIp4.c' object='UriIp4.lo' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o UriIp4.lo `test -f 'uriparser-0.7.1/lib/UriIp4.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriIp4.c
+-
+-UriIp4Base.lo: uriparser-0.7.1/lib/UriIp4Base.c
+- at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT UriIp4Base.lo -MD -MP -MF $(DEPDIR)/UriIp4Base.Tpo -c -o UriIp4Base.lo `test -f 'uriparser-0.7.1/lib/UriIp4Base.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriIp4Base.c
+- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/UriIp4Base.Tpo $(DEPDIR)/UriIp4Base.Plo
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='uriparser-0.7.1/lib/UriIp4Base.c' object='UriIp4Base.lo' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o UriIp4Base.lo `test -f 'uriparser-0.7.1/lib/UriIp4Base.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriIp4Base.c
+-
+-UriNormalize.lo: uriparser-0.7.1/lib/UriNormalize.c
+- at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT UriNormalize.lo -MD -MP -MF $(DEPDIR)/UriNormalize.Tpo -c -o UriNormalize.lo `test -f 'uriparser-0.7.1/lib/UriNormalize.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriNormalize.c
+- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/UriNormalize.Tpo $(DEPDIR)/UriNormalize.Plo
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='uriparser-0.7.1/lib/UriNormalize.c' object='UriNormalize.lo' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o UriNormalize.lo `test -f 'uriparser-0.7.1/lib/UriNormalize.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriNormalize.c
+-
+-UriNormalizeBase.lo: uriparser-0.7.1/lib/UriNormalizeBase.c
+- at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT UriNormalizeBase.lo -MD -MP -MF $(DEPDIR)/UriNormalizeBase.Tpo -c -o UriNormalizeBase.lo `test -f 'uriparser-0.7.1/lib/UriNormalizeBase.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriNormalizeBase.c
+- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/UriNormalizeBase.Tpo $(DEPDIR)/UriNormalizeBase.Plo
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='uriparser-0.7.1/lib/UriNormalizeBase.c' object='UriNormalizeBase.lo' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o UriNormalizeBase.lo `test -f 'uriparser-0.7.1/lib/UriNormalizeBase.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriNormalizeBase.c
+-
+-UriParse.lo: uriparser-0.7.1/lib/UriParse.c
+- at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT UriParse.lo -MD -MP -MF $(DEPDIR)/UriParse.Tpo -c -o UriParse.lo `test -f 'uriparser-0.7.1/lib/UriParse.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriParse.c
+- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/UriParse.Tpo $(DEPDIR)/UriParse.Plo
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='uriparser-0.7.1/lib/UriParse.c' object='UriParse.lo' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o UriParse.lo `test -f 'uriparser-0.7.1/lib/UriParse.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriParse.c
+-
+-UriParseBase.lo: uriparser-0.7.1/lib/UriParseBase.c
+- at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT UriParseBase.lo -MD -MP -MF $(DEPDIR)/UriParseBase.Tpo -c -o UriParseBase.lo `test -f 'uriparser-0.7.1/lib/UriParseBase.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriParseBase.c
+- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/UriParseBase.Tpo $(DEPDIR)/UriParseBase.Plo
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='uriparser-0.7.1/lib/UriParseBase.c' object='UriParseBase.lo' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o UriParseBase.lo `test -f 'uriparser-0.7.1/lib/UriParseBase.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriParseBase.c
+-
+-UriQuery.lo: uriparser-0.7.1/lib/UriQuery.c
+- at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT UriQuery.lo -MD -MP -MF $(DEPDIR)/UriQuery.Tpo -c -o UriQuery.lo `test -f 'uriparser-0.7.1/lib/UriQuery.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriQuery.c
+- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/UriQuery.Tpo $(DEPDIR)/UriQuery.Plo
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='uriparser-0.7.1/lib/UriQuery.c' object='UriQuery.lo' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o UriQuery.lo `test -f 'uriparser-0.7.1/lib/UriQuery.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriQuery.c
+-
+-UriRecompose.lo: uriparser-0.7.1/lib/UriRecompose.c
+- at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT UriRecompose.lo -MD -MP -MF $(DEPDIR)/UriRecompose.Tpo -c -o UriRecompose.lo `test -f 'uriparser-0.7.1/lib/UriRecompose.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriRecompose.c
+- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/UriRecompose.Tpo $(DEPDIR)/UriRecompose.Plo
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='uriparser-0.7.1/lib/UriRecompose.c' object='UriRecompose.lo' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o UriRecompose.lo `test -f 'uriparser-0.7.1/lib/UriRecompose.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriRecompose.c
+-
+-UriResolve.lo: uriparser-0.7.1/lib/UriResolve.c
+- at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT UriResolve.lo -MD -MP -MF $(DEPDIR)/UriResolve.Tpo -c -o UriResolve.lo `test -f 'uriparser-0.7.1/lib/UriResolve.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriResolve.c
+- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/UriResolve.Tpo $(DEPDIR)/UriResolve.Plo
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='uriparser-0.7.1/lib/UriResolve.c' object='UriResolve.lo' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o UriResolve.lo `test -f 'uriparser-0.7.1/lib/UriResolve.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriResolve.c
+-
+-UriShorten.lo: uriparser-0.7.1/lib/UriShorten.c
+- at am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT UriShorten.lo -MD -MP -MF $(DEPDIR)/UriShorten.Tpo -c -o UriShorten.lo `test -f 'uriparser-0.7.1/lib/UriShorten.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriShorten.c
+- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/UriShorten.Tpo $(DEPDIR)/UriShorten.Plo
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='uriparser-0.7.1/lib/UriShorten.c' object='UriShorten.lo' libtool=yes @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o UriShorten.lo `test -f 'uriparser-0.7.1/lib/UriShorten.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriShorten.c
 + at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o zip.lo `test -f 'zlib-1.2.3/contrib/minizip/zip.c' || echo '$(srcdir)/'`zlib-1.2.3/contrib/minizip/zip.c
  
- UriCommon.lo: uriparser-0.7.1/lib/UriCommon.c
-- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT UriCommon.lo -MD -MP -MF "$(DEPDIR)/UriCommon.Tpo" -c -o UriCommon.lo `test -f 'uriparser-0.7.1/lib/UriCommon.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriCommon.c; \
-- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/UriCommon.Tpo" "$(DEPDIR)/UriCommon.Plo"; else rm -f "$(DEPDIR)/UriCommon.Tpo"; exit 1; fi
-+ at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT UriCommon.lo -MD -MP -MF $(DEPDIR)/UriCommon.Tpo -c -o UriCommon.lo `test -f 'uriparser-0.7.1/lib/UriCommon.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriCommon.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/UriCommon.Tpo $(DEPDIR)/UriCommon.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='uriparser-0.7.1/lib/UriCommon.c' object='UriCommon.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o UriCommon.lo `test -f 'uriparser-0.7.1/lib/UriCommon.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriCommon.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o UriCommon.lo `test -f 'uriparser-0.7.1/lib/UriCommon.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriCommon.c
- 
- UriCompare.lo: uriparser-0.7.1/lib/UriCompare.c
-- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT UriCompare.lo -MD -MP -MF "$(DEPDIR)/UriCompare.Tpo" -c -o UriCompare.lo `test -f 'uriparser-0.7.1/lib/UriCompare.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriCompare.c; \
-- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/UriCompare.Tpo" "$(DEPDIR)/UriCompare.Plo"; else rm -f "$(DEPDIR)/UriCompare.Tpo"; exit 1; fi
-+ at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT UriCompare.lo -MD -MP -MF $(DEPDIR)/UriCompare.Tpo -c -o UriCompare.lo `test -f 'uriparser-0.7.1/lib/UriCompare.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriCompare.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/UriCompare.Tpo $(DEPDIR)/UriCompare.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='uriparser-0.7.1/lib/UriCompare.c' object='UriCompare.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o UriCompare.lo `test -f 'uriparser-0.7.1/lib/UriCompare.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriCompare.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o UriCompare.lo `test -f 'uriparser-0.7.1/lib/UriCompare.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriCompare.c
- 
- UriEscape.lo: uriparser-0.7.1/lib/UriEscape.c
-- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT UriEscape.lo -MD -MP -MF "$(DEPDIR)/UriEscape.Tpo" -c -o UriEscape.lo `test -f 'uriparser-0.7.1/lib/UriEscape.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriEscape.c; \
-- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/UriEscape.Tpo" "$(DEPDIR)/UriEscape.Plo"; else rm -f "$(DEPDIR)/UriEscape.Tpo"; exit 1; fi
-+ at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT UriEscape.lo -MD -MP -MF $(DEPDIR)/UriEscape.Tpo -c -o UriEscape.lo `test -f 'uriparser-0.7.1/lib/UriEscape.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriEscape.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/UriEscape.Tpo $(DEPDIR)/UriEscape.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='uriparser-0.7.1/lib/UriEscape.c' object='UriEscape.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o UriEscape.lo `test -f 'uriparser-0.7.1/lib/UriEscape.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriEscape.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o UriEscape.lo `test -f 'uriparser-0.7.1/lib/UriEscape.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriEscape.c
- 
- UriFile.lo: uriparser-0.7.1/lib/UriFile.c
-- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT UriFile.lo -MD -MP -MF "$(DEPDIR)/UriFile.Tpo" -c -o UriFile.lo `test -f 'uriparser-0.7.1/lib/UriFile.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriFile.c; \
-- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/UriFile.Tpo" "$(DEPDIR)/UriFile.Plo"; else rm -f "$(DEPDIR)/UriFile.Tpo"; exit 1; fi
-+ at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT UriFile.lo -MD -MP -MF $(DEPDIR)/UriFile.Tpo -c -o UriFile.lo `test -f 'uriparser-0.7.1/lib/UriFile.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriFile.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/UriFile.Tpo $(DEPDIR)/UriFile.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='uriparser-0.7.1/lib/UriFile.c' object='UriFile.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o UriFile.lo `test -f 'uriparser-0.7.1/lib/UriFile.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriFile.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o UriFile.lo `test -f 'uriparser-0.7.1/lib/UriFile.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriFile.c
- 
- UriIp4.lo: uriparser-0.7.1/lib/UriIp4.c
-- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT UriIp4.lo -MD -MP -MF "$(DEPDIR)/UriIp4.Tpo" -c -o UriIp4.lo `test -f 'uriparser-0.7.1/lib/UriIp4.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriIp4.c; \
-- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/UriIp4.Tpo" "$(DEPDIR)/UriIp4.Plo"; else rm -f "$(DEPDIR)/UriIp4.Tpo"; exit 1; fi
-+ at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT UriIp4.lo -MD -MP -MF $(DEPDIR)/UriIp4.Tpo -c -o UriIp4.lo `test -f 'uriparser-0.7.1/lib/UriIp4.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriIp4.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/UriIp4.Tpo $(DEPDIR)/UriIp4.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='uriparser-0.7.1/lib/UriIp4.c' object='UriIp4.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o UriIp4.lo `test -f 'uriparser-0.7.1/lib/UriIp4.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriIp4.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o UriIp4.lo `test -f 'uriparser-0.7.1/lib/UriIp4.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriIp4.c
- 
- UriIp4Base.lo: uriparser-0.7.1/lib/UriIp4Base.c
-- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT UriIp4Base.lo -MD -MP -MF "$(DEPDIR)/UriIp4Base.Tpo" -c -o UriIp4Base.lo `test -f 'uriparser-0.7.1/lib/UriIp4Base.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriIp4Base.c; \
-- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/UriIp4Base.Tpo" "$(DEPDIR)/UriIp4Base.Plo"; else rm -f "$(DEPDIR)/UriIp4Base.Tpo"; exit 1; fi
-+ at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT UriIp4Base.lo -MD -MP -MF $(DEPDIR)/UriIp4Base.Tpo -c -o UriIp4Base.lo `test -f 'uriparser-0.7.1/lib/UriIp4Base.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriIp4Base.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/UriIp4Base.Tpo $(DEPDIR)/UriIp4Base.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='uriparser-0.7.1/lib/UriIp4Base.c' object='UriIp4Base.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o UriIp4Base.lo `test -f 'uriparser-0.7.1/lib/UriIp4Base.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriIp4Base.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o UriIp4Base.lo `test -f 'uriparser-0.7.1/lib/UriIp4Base.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriIp4Base.c
- 
- UriNormalize.lo: uriparser-0.7.1/lib/UriNormalize.c
-- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT UriNormalize.lo -MD -MP -MF "$(DEPDIR)/UriNormalize.Tpo" -c -o UriNormalize.lo `test -f 'uriparser-0.7.1/lib/UriNormalize.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriNormalize.c; \
-- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/UriNormalize.Tpo" "$(DEPDIR)/UriNormalize.Plo"; else rm -f "$(DEPDIR)/UriNormalize.Tpo"; exit 1; fi
-+ at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT UriNormalize.lo -MD -MP -MF $(DEPDIR)/UriNormalize.Tpo -c -o UriNormalize.lo `test -f 'uriparser-0.7.1/lib/UriNormalize.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriNormalize.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/UriNormalize.Tpo $(DEPDIR)/UriNormalize.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='uriparser-0.7.1/lib/UriNormalize.c' object='UriNormalize.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o UriNormalize.lo `test -f 'uriparser-0.7.1/lib/UriNormalize.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriNormalize.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o UriNormalize.lo `test -f 'uriparser-0.7.1/lib/UriNormalize.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriNormalize.c
- 
- UriNormalizeBase.lo: uriparser-0.7.1/lib/UriNormalizeBase.c
-- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT UriNormalizeBase.lo -MD -MP -MF "$(DEPDIR)/UriNormalizeBase.Tpo" -c -o UriNormalizeBase.lo `test -f 'uriparser-0.7.1/lib/UriNormalizeBase.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriNormalizeBase.c; \
-- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/UriNormalizeBase.Tpo" "$(DEPDIR)/UriNormalizeBase.Plo"; else rm -f "$(DEPDIR)/UriNormalizeBase.Tpo"; exit 1; fi
-+ at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT UriNormalizeBase.lo -MD -MP -MF $(DEPDIR)/UriNormalizeBase.Tpo -c -o UriNormalizeBase.lo `test -f 'uriparser-0.7.1/lib/UriNormalizeBase.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriNormalizeBase.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/UriNormalizeBase.Tpo $(DEPDIR)/UriNormalizeBase.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='uriparser-0.7.1/lib/UriNormalizeBase.c' object='UriNormalizeBase.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o UriNormalizeBase.lo `test -f 'uriparser-0.7.1/lib/UriNormalizeBase.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriNormalizeBase.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o UriNormalizeBase.lo `test -f 'uriparser-0.7.1/lib/UriNormalizeBase.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriNormalizeBase.c
- 
- UriParse.lo: uriparser-0.7.1/lib/UriParse.c
-- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT UriParse.lo -MD -MP -MF "$(DEPDIR)/UriParse.Tpo" -c -o UriParse.lo `test -f 'uriparser-0.7.1/lib/UriParse.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriParse.c; \
-- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/UriParse.Tpo" "$(DEPDIR)/UriParse.Plo"; else rm -f "$(DEPDIR)/UriParse.Tpo"; exit 1; fi
-+ at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT UriParse.lo -MD -MP -MF $(DEPDIR)/UriParse.Tpo -c -o UriParse.lo `test -f 'uriparser-0.7.1/lib/UriParse.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriParse.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/UriParse.Tpo $(DEPDIR)/UriParse.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='uriparser-0.7.1/lib/UriParse.c' object='UriParse.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o UriParse.lo `test -f 'uriparser-0.7.1/lib/UriParse.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriParse.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o UriParse.lo `test -f 'uriparser-0.7.1/lib/UriParse.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriParse.c
- 
- UriParseBase.lo: uriparser-0.7.1/lib/UriParseBase.c
-- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT UriParseBase.lo -MD -MP -MF "$(DEPDIR)/UriParseBase.Tpo" -c -o UriParseBase.lo `test -f 'uriparser-0.7.1/lib/UriParseBase.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriParseBase.c; \
-- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/UriParseBase.Tpo" "$(DEPDIR)/UriParseBase.Plo"; else rm -f "$(DEPDIR)/UriParseBase.Tpo"; exit 1; fi
-+ at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT UriParseBase.lo -MD -MP -MF $(DEPDIR)/UriParseBase.Tpo -c -o UriParseBase.lo `test -f 'uriparser-0.7.1/lib/UriParseBase.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriParseBase.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/UriParseBase.Tpo $(DEPDIR)/UriParseBase.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='uriparser-0.7.1/lib/UriParseBase.c' object='UriParseBase.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o UriParseBase.lo `test -f 'uriparser-0.7.1/lib/UriParseBase.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriParseBase.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o UriParseBase.lo `test -f 'uriparser-0.7.1/lib/UriParseBase.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriParseBase.c
- 
- UriQuery.lo: uriparser-0.7.1/lib/UriQuery.c
-- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT UriQuery.lo -MD -MP -MF "$(DEPDIR)/UriQuery.Tpo" -c -o UriQuery.lo `test -f 'uriparser-0.7.1/lib/UriQuery.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriQuery.c; \
-- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/UriQuery.Tpo" "$(DEPDIR)/UriQuery.Plo"; else rm -f "$(DEPDIR)/UriQuery.Tpo"; exit 1; fi
-+ at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT UriQuery.lo -MD -MP -MF $(DEPDIR)/UriQuery.Tpo -c -o UriQuery.lo `test -f 'uriparser-0.7.1/lib/UriQuery.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriQuery.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/UriQuery.Tpo $(DEPDIR)/UriQuery.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='uriparser-0.7.1/lib/UriQuery.c' object='UriQuery.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o UriQuery.lo `test -f 'uriparser-0.7.1/lib/UriQuery.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriQuery.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o UriQuery.lo `test -f 'uriparser-0.7.1/lib/UriQuery.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriQuery.c
- 
- UriRecompose.lo: uriparser-0.7.1/lib/UriRecompose.c
-- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT UriRecompose.lo -MD -MP -MF "$(DEPDIR)/UriRecompose.Tpo" -c -o UriRecompose.lo `test -f 'uriparser-0.7.1/lib/UriRecompose.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriRecompose.c; \
-- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/UriRecompose.Tpo" "$(DEPDIR)/UriRecompose.Plo"; else rm -f "$(DEPDIR)/UriRecompose.Tpo"; exit 1; fi
-+ at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT UriRecompose.lo -MD -MP -MF $(DEPDIR)/UriRecompose.Tpo -c -o UriRecompose.lo `test -f 'uriparser-0.7.1/lib/UriRecompose.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriRecompose.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/UriRecompose.Tpo $(DEPDIR)/UriRecompose.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='uriparser-0.7.1/lib/UriRecompose.c' object='UriRecompose.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o UriRecompose.lo `test -f 'uriparser-0.7.1/lib/UriRecompose.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriRecompose.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o UriRecompose.lo `test -f 'uriparser-0.7.1/lib/UriRecompose.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriRecompose.c
- 
- UriResolve.lo: uriparser-0.7.1/lib/UriResolve.c
-- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT UriResolve.lo -MD -MP -MF "$(DEPDIR)/UriResolve.Tpo" -c -o UriResolve.lo `test -f 'uriparser-0.7.1/lib/UriResolve.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriResolve.c; \
-- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/UriResolve.Tpo" "$(DEPDIR)/UriResolve.Plo"; else rm -f "$(DEPDIR)/UriResolve.Tpo"; exit 1; fi
-+ at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT UriResolve.lo -MD -MP -MF $(DEPDIR)/UriResolve.Tpo -c -o UriResolve.lo `test -f 'uriparser-0.7.1/lib/UriResolve.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriResolve.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/UriResolve.Tpo $(DEPDIR)/UriResolve.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='uriparser-0.7.1/lib/UriResolve.c' object='UriResolve.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o UriResolve.lo `test -f 'uriparser-0.7.1/lib/UriResolve.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriResolve.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o UriResolve.lo `test -f 'uriparser-0.7.1/lib/UriResolve.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriResolve.c
- 
- UriShorten.lo: uriparser-0.7.1/lib/UriShorten.c
-- at am__fastdepCC_TRUE@	if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT UriShorten.lo -MD -MP -MF "$(DEPDIR)/UriShorten.Tpo" -c -o UriShorten.lo `test -f 'uriparser-0.7.1/lib/UriShorten.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriShorten.c; \
-- at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/UriShorten.Tpo" "$(DEPDIR)/UriShorten.Plo"; else rm -f "$(DEPDIR)/UriShorten.Tpo"; exit 1; fi
-+ at am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT UriShorten.lo -MD -MP -MF $(DEPDIR)/UriShorten.Tpo -c -o UriShorten.lo `test -f 'uriparser-0.7.1/lib/UriShorten.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriShorten.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/UriShorten.Tpo $(DEPDIR)/UriShorten.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='uriparser-0.7.1/lib/UriShorten.c' object='UriShorten.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o UriShorten.lo `test -f 'uriparser-0.7.1/lib/UriShorten.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriShorten.c
-+ at am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o UriShorten.lo `test -f 'uriparser-0.7.1/lib/UriShorten.c' || echo '$(srcdir)/'`uriparser-0.7.1/lib/UriShorten.c
- 
  .cc.o:
-- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
  
  .cc.obj:
-- at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+ @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
  
  .cc.lo:
-- at am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
  
  gtest.lo: $(googletest)/src/gtest.cc
-- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gtest.lo -MD -MP -MF "$(DEPDIR)/gtest.Tpo" -c -o gtest.lo `test -f '$(googletest)/src/gtest.cc' || echo '$(srcdir)/'`$(googletest)/src/gtest.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/gtest.Tpo" "$(DEPDIR)/gtest.Plo"; else rm -f "$(DEPDIR)/gtest.Tpo"; exit 1; fi
+- at am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gtest.lo -MD -MP -MF $(DEPDIR)/gtest.Tpo -c -o gtest.lo `test -f '$(googletest)/src/gtest.cc' || echo '$(srcdir)/'`$(googletest)/src/gtest.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/gtest.Tpo $(DEPDIR)/gtest.Plo
 + at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gtest.lo -MD -MP -MF $(DEPDIR)/gtest.Tpo -c -o gtest.lo `test -f '$(googletest)/src/gtest.cc' || echo '$(srcdir)/'`$(googletest)/src/gtest.cc
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/gtest.Tpo $(DEPDIR)/gtest.Plo
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(googletest)/src/gtest.cc' object='gtest.lo' libtool=yes @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gtest.lo `test -f '$(googletest)/src/gtest.cc' || echo '$(srcdir)/'`$(googletest)/src/gtest.cc
+- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gtest.lo `test -f '$(googletest)/src/gtest.cc' || echo '$(srcdir)/'`$(googletest)/src/gtest.cc
 + at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gtest.lo `test -f '$(googletest)/src/gtest.cc' || echo '$(srcdir)/'`$(googletest)/src/gtest.cc
  
  gtest-death-test.lo: $(googletest)/src/gtest-death-test.cc
-- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gtest-death-test.lo -MD -MP -MF "$(DEPDIR)/gtest-death-test.Tpo" -c -o gtest-death-test.lo `test -f '$(googletest)/src/gtest-death-test.cc' || echo '$(srcdir)/'`$(googletest)/src/gtest-death-test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/gtest-death-test.Tpo" "$(DEPDIR)/gtest-death-test.Plo"; else rm -f "$(DEPDIR)/gtest-death-test.Tpo"; exit 1; fi
+- at am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gtest-death-test.lo -MD -MP -MF $(DEPDIR)/gtest-death-test.Tpo -c -o gtest-death-test.lo `test -f '$(googletest)/src/gtest-death-test.cc' || echo '$(srcdir)/'`$(googletest)/src/gtest-death-test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/gtest-death-test.Tpo $(DEPDIR)/gtest-death-test.Plo
 + at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gtest-death-test.lo -MD -MP -MF $(DEPDIR)/gtest-death-test.Tpo -c -o gtest-death-test.lo `test -f '$(googletest)/src/gtest-death-test.cc' || echo '$(srcdir)/'`$(googletest)/src/gtest-death-test.cc
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/gtest-death-test.Tpo $(DEPDIR)/gtest-death-test.Plo
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(googletest)/src/gtest-death-test.cc' object='gtest-death-test.lo' libtool=yes @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gtest-death-test.lo `test -f '$(googletest)/src/gtest-death-test.cc' || echo '$(srcdir)/'`$(googletest)/src/gtest-death-test.cc
+- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gtest-death-test.lo `test -f '$(googletest)/src/gtest-death-test.cc' || echo '$(srcdir)/'`$(googletest)/src/gtest-death-test.cc
 + at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gtest-death-test.lo `test -f '$(googletest)/src/gtest-death-test.cc' || echo '$(srcdir)/'`$(googletest)/src/gtest-death-test.cc
  
  gtest-filepath.lo: $(googletest)/src/gtest-filepath.cc
-- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gtest-filepath.lo -MD -MP -MF "$(DEPDIR)/gtest-filepath.Tpo" -c -o gtest-filepath.lo `test -f '$(googletest)/src/gtest-filepath.cc' || echo '$(srcdir)/'`$(googletest)/src/gtest-filepath.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/gtest-filepath.Tpo" "$(DEPDIR)/gtest-filepath.Plo"; else rm -f "$(DEPDIR)/gtest-filepath.Tpo"; exit 1; fi
+- at am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gtest-filepath.lo -MD -MP -MF $(DEPDIR)/gtest-filepath.Tpo -c -o gtest-filepath.lo `test -f '$(googletest)/src/gtest-filepath.cc' || echo '$(srcdir)/'`$(googletest)/src/gtest-filepath.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/gtest-filepath.Tpo $(DEPDIR)/gtest-filepath.Plo
 + at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gtest-filepath.lo -MD -MP -MF $(DEPDIR)/gtest-filepath.Tpo -c -o gtest-filepath.lo `test -f '$(googletest)/src/gtest-filepath.cc' || echo '$(srcdir)/'`$(googletest)/src/gtest-filepath.cc
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/gtest-filepath.Tpo $(DEPDIR)/gtest-filepath.Plo
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(googletest)/src/gtest-filepath.cc' object='gtest-filepath.lo' libtool=yes @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gtest-filepath.lo `test -f '$(googletest)/src/gtest-filepath.cc' || echo '$(srcdir)/'`$(googletest)/src/gtest-filepath.cc
+- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gtest-filepath.lo `test -f '$(googletest)/src/gtest-filepath.cc' || echo '$(srcdir)/'`$(googletest)/src/gtest-filepath.cc
 + at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gtest-filepath.lo `test -f '$(googletest)/src/gtest-filepath.cc' || echo '$(srcdir)/'`$(googletest)/src/gtest-filepath.cc
  
  gtest-port.lo: $(googletest)/src/gtest-port.cc
-- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gtest-port.lo -MD -MP -MF "$(DEPDIR)/gtest-port.Tpo" -c -o gtest-port.lo `test -f '$(googletest)/src/gtest-port.cc' || echo '$(srcdir)/'`$(googletest)/src/gtest-port.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/gtest-port.Tpo" "$(DEPDIR)/gtest-port.Plo"; else rm -f "$(DEPDIR)/gtest-port.Tpo"; exit 1; fi
+- at am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gtest-port.lo -MD -MP -MF $(DEPDIR)/gtest-port.Tpo -c -o gtest-port.lo `test -f '$(googletest)/src/gtest-port.cc' || echo '$(srcdir)/'`$(googletest)/src/gtest-port.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/gtest-port.Tpo $(DEPDIR)/gtest-port.Plo
 + at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gtest-port.lo -MD -MP -MF $(DEPDIR)/gtest-port.Tpo -c -o gtest-port.lo `test -f '$(googletest)/src/gtest-port.cc' || echo '$(srcdir)/'`$(googletest)/src/gtest-port.cc
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/gtest-port.Tpo $(DEPDIR)/gtest-port.Plo
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(googletest)/src/gtest-port.cc' object='gtest-port.lo' libtool=yes @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gtest-port.lo `test -f '$(googletest)/src/gtest-port.cc' || echo '$(srcdir)/'`$(googletest)/src/gtest-port.cc
+- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gtest-port.lo `test -f '$(googletest)/src/gtest-port.cc' || echo '$(srcdir)/'`$(googletest)/src/gtest-port.cc
 + at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gtest-port.lo `test -f '$(googletest)/src/gtest-port.cc' || echo '$(srcdir)/'`$(googletest)/src/gtest-port.cc
  
  gtest-test-part.lo: $(googletest)/src/gtest-test-part.cc
-- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gtest-test-part.lo -MD -MP -MF "$(DEPDIR)/gtest-test-part.Tpo" -c -o gtest-test-part.lo `test -f '$(googletest)/src/gtest-test-part.cc' || echo '$(srcdir)/'`$(googletest)/src/gtest-test-part.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/gtest-test-part.Tpo" "$(DEPDIR)/gtest-test-part.Plo"; else rm -f "$(DEPDIR)/gtest-test-part.Tpo"; exit 1; fi
+- at am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gtest-test-part.lo -MD -MP -MF $(DEPDIR)/gtest-test-part.Tpo -c -o gtest-test-part.lo `test -f '$(googletest)/src/gtest-test-part.cc' || echo '$(srcdir)/'`$(googletest)/src/gtest-test-part.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/gtest-test-part.Tpo $(DEPDIR)/gtest-test-part.Plo
 + at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gtest-test-part.lo -MD -MP -MF $(DEPDIR)/gtest-test-part.Tpo -c -o gtest-test-part.lo `test -f '$(googletest)/src/gtest-test-part.cc' || echo '$(srcdir)/'`$(googletest)/src/gtest-test-part.cc
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/gtest-test-part.Tpo $(DEPDIR)/gtest-test-part.Plo
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(googletest)/src/gtest-test-part.cc' object='gtest-test-part.lo' libtool=yes @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gtest-test-part.lo `test -f '$(googletest)/src/gtest-test-part.cc' || echo '$(srcdir)/'`$(googletest)/src/gtest-test-part.cc
+- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gtest-test-part.lo `test -f '$(googletest)/src/gtest-test-part.cc' || echo '$(srcdir)/'`$(googletest)/src/gtest-test-part.cc
 + at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gtest-test-part.lo `test -f '$(googletest)/src/gtest-test-part.cc' || echo '$(srcdir)/'`$(googletest)/src/gtest-test-part.cc
  
  gtest-typed-test.lo: $(googletest)/src/gtest-typed-test.cc
-- at am__fastdepCXX_TRUE@	if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gtest-typed-test.lo -MD -MP -MF "$(DEPDIR)/gtest-typed-test.Tpo" -c -o gtest-typed-test.lo `test -f '$(googletest)/src/gtest-typed-test.cc' || echo '$(srcdir)/'`$(googletest)/src/gtest-typed-test.cc; \
-- at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/gtest-typed-test.Tpo" "$(DEPDIR)/gtest-typed-test.Plo"; else rm -f "$(DEPDIR)/gtest-typed-test.Tpo"; exit 1; fi
+- at am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gtest-typed-test.lo -MD -MP -MF $(DEPDIR)/gtest-typed-test.Tpo -c -o gtest-typed-test.lo `test -f '$(googletest)/src/gtest-typed-test.cc' || echo '$(srcdir)/'`$(googletest)/src/gtest-typed-test.cc
+- at am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/gtest-typed-test.Tpo $(DEPDIR)/gtest-typed-test.Plo
 + at am__fastdepCXX_TRUE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gtest-typed-test.lo -MD -MP -MF $(DEPDIR)/gtest-typed-test.Tpo -c -o gtest-typed-test.lo `test -f '$(googletest)/src/gtest-typed-test.cc' || echo '$(srcdir)/'`$(googletest)/src/gtest-typed-test.cc
 + at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/gtest-typed-test.Tpo $(DEPDIR)/gtest-typed-test.Plo
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(googletest)/src/gtest-typed-test.cc' object='gtest-typed-test.lo' libtool=yes @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gtest-typed-test.lo `test -f '$(googletest)/src/gtest-typed-test.cc' || echo '$(srcdir)/'`$(googletest)/src/gtest-typed-test.cc
+- at am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gtest-typed-test.lo `test -f '$(googletest)/src/gtest-typed-test.cc' || echo '$(srcdir)/'`$(googletest)/src/gtest-typed-test.cc
 + at am__fastdepCXX_FALSE@	$(LIBTOOL)  --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gtest-typed-test.lo `test -f '$(googletest)/src/gtest-typed-test.cc' || echo '$(srcdir)/'`$(googletest)/src/gtest-typed-test.cc
  
  mostlyclean-libtool:
  	-rm -f *.lo
- 
- clean-libtool:
- 	-rm -rf .libs _libs
--
--distclean-libtool:
--	-rm -f libtool
--uninstall-info-am:
+@@ -778,139 +633,143 @@
  install-libboostconfigcompilerincludeHEADERS: $(libboostconfigcompilerinclude_HEADERS)
  	@$(NORMAL_INSTALL)
--	test -z "$(libboostconfigcompilerincludedir)" || $(mkdir_p) "$(DESTDIR)$(libboostconfigcompilerincludedir)"
+ 	test -z "$(libboostconfigcompilerincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libboostconfigcompilerincludedir)"
 -	@list='$(libboostconfigcompilerinclude_HEADERS)'; for p in $$list; do \
-+	test -z "$(libboostconfigcompilerincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libboostconfigcompilerincludedir)"
 +	@list='$(libboostconfigcompilerinclude_HEADERS)'; test -n "$(libboostconfigcompilerincludedir)" || list=; \
 +	for p in $$list; do \
  	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
@@ -94620,9 +28303,8 @@
 +	cd "$(DESTDIR)$(libboostconfigcompilerincludedir)" && rm -f $$files
  install-libboostconfigincludeHEADERS: $(libboostconfiginclude_HEADERS)
  	@$(NORMAL_INSTALL)
--	test -z "$(libboostconfigincludedir)" || $(mkdir_p) "$(DESTDIR)$(libboostconfigincludedir)"
+ 	test -z "$(libboostconfigincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libboostconfigincludedir)"
 -	@list='$(libboostconfiginclude_HEADERS)'; for p in $$list; do \
-+	test -z "$(libboostconfigincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libboostconfigincludedir)"
 +	@list='$(libboostconfiginclude_HEADERS)'; test -n "$(libboostconfigincludedir)" || list=; \
 +	for p in $$list; do \
  	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
@@ -94650,9 +28332,8 @@
 +	cd "$(DESTDIR)$(libboostconfigincludedir)" && rm -f $$files
  install-libboostconfigno_tr1includeHEADERS: $(libboostconfigno_tr1include_HEADERS)
  	@$(NORMAL_INSTALL)
--	test -z "$(libboostconfigno_tr1includedir)" || $(mkdir_p) "$(DESTDIR)$(libboostconfigno_tr1includedir)"
+ 	test -z "$(libboostconfigno_tr1includedir)" || $(MKDIR_P) "$(DESTDIR)$(libboostconfigno_tr1includedir)"
 -	@list='$(libboostconfigno_tr1include_HEADERS)'; for p in $$list; do \
-+	test -z "$(libboostconfigno_tr1includedir)" || $(MKDIR_P) "$(DESTDIR)$(libboostconfigno_tr1includedir)"
 +	@list='$(libboostconfigno_tr1include_HEADERS)'; test -n "$(libboostconfigno_tr1includedir)" || list=; \
 +	for p in $$list; do \
  	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
@@ -94680,9 +28361,8 @@
 +	cd "$(DESTDIR)$(libboostconfigno_tr1includedir)" && rm -f $$files
  install-libboostconfigplatformincludeHEADERS: $(libboostconfigplatforminclude_HEADERS)
  	@$(NORMAL_INSTALL)
--	test -z "$(libboostconfigplatformincludedir)" || $(mkdir_p) "$(DESTDIR)$(libboostconfigplatformincludedir)"
+ 	test -z "$(libboostconfigplatformincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libboostconfigplatformincludedir)"
 -	@list='$(libboostconfigplatforminclude_HEADERS)'; for p in $$list; do \
-+	test -z "$(libboostconfigplatformincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libboostconfigplatformincludedir)"
 +	@list='$(libboostconfigplatforminclude_HEADERS)'; test -n "$(libboostconfigplatformincludedir)" || list=; \
 +	for p in $$list; do \
  	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
@@ -94710,9 +28390,8 @@
 +	cd "$(DESTDIR)$(libboostconfigplatformincludedir)" && rm -f $$files
  install-libboostconfigstdlibincludeHEADERS: $(libboostconfigstdlibinclude_HEADERS)
  	@$(NORMAL_INSTALL)
--	test -z "$(libboostconfigstdlibincludedir)" || $(mkdir_p) "$(DESTDIR)$(libboostconfigstdlibincludedir)"
+ 	test -z "$(libboostconfigstdlibincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libboostconfigstdlibincludedir)"
 -	@list='$(libboostconfigstdlibinclude_HEADERS)'; for p in $$list; do \
-+	test -z "$(libboostconfigstdlibincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libboostconfigstdlibincludedir)"
 +	@list='$(libboostconfigstdlibinclude_HEADERS)'; test -n "$(libboostconfigstdlibincludedir)" || list=; \
 +	for p in $$list; do \
  	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
@@ -94740,9 +28419,8 @@
 +	cd "$(DESTDIR)$(libboostconfigstdlibincludedir)" && rm -f $$files
  install-libboostdetailincludeHEADERS: $(libboostdetailinclude_HEADERS)
  	@$(NORMAL_INSTALL)
--	test -z "$(libboostdetailincludedir)" || $(mkdir_p) "$(DESTDIR)$(libboostdetailincludedir)"
+ 	test -z "$(libboostdetailincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libboostdetailincludedir)"
 -	@list='$(libboostdetailinclude_HEADERS)'; for p in $$list; do \
-+	test -z "$(libboostdetailincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libboostdetailincludedir)"
 +	@list='$(libboostdetailinclude_HEADERS)'; test -n "$(libboostdetailincludedir)" || list=; \
 +	for p in $$list; do \
  	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
@@ -94770,9 +28448,8 @@
 +	cd "$(DESTDIR)$(libboostdetailincludedir)" && rm -f $$files
  install-libboostincludeHEADERS: $(libboostinclude_HEADERS)
  	@$(NORMAL_INSTALL)
--	test -z "$(libboostincludedir)" || $(mkdir_p) "$(DESTDIR)$(libboostincludedir)"
+ 	test -z "$(libboostincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libboostincludedir)"
 -	@list='$(libboostinclude_HEADERS)'; for p in $$list; do \
-+	test -z "$(libboostincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libboostincludedir)"
 +	@list='$(libboostinclude_HEADERS)'; test -n "$(libboostincludedir)" || list=; \
 +	for p in $$list; do \
  	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
@@ -94793,53 +28470,32 @@
 -	  echo " rm -f '$(DESTDIR)$(libboostincludedir)/$$f'"; \
 -	  rm -f "$(DESTDIR)$(libboostincludedir)/$$f"; \
 -	done
-+	@list='$(libboostinclude_HEADERS)'; test -n "$(libboostincludedir)" || list=; \
-+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-+	test -n "$$files" || exit 0; \
-+	echo " ( cd '$(DESTDIR)$(libboostincludedir)' && rm -f" $$files ")"; \
-+	cd "$(DESTDIR)$(libboostincludedir)" && rm -f $$files
- install-liburiparserincludeHEADERS: $(liburiparserinclude_HEADERS)
- 	@$(NORMAL_INSTALL)
--	test -z "$(liburiparserincludedir)" || $(mkdir_p) "$(DESTDIR)$(liburiparserincludedir)"
+-install-liburiparserincludeHEADERS: $(liburiparserinclude_HEADERS)
+-	@$(NORMAL_INSTALL)
+-	test -z "$(liburiparserincludedir)" || $(MKDIR_P) "$(DESTDIR)$(liburiparserincludedir)"
 -	@list='$(liburiparserinclude_HEADERS)'; for p in $$list; do \
-+	test -z "$(liburiparserincludedir)" || $(MKDIR_P) "$(DESTDIR)$(liburiparserincludedir)"
-+	@list='$(liburiparserinclude_HEADERS)'; test -n "$(liburiparserincludedir)" || list=; \
-+	for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 -	  f=$(am__strip_dir) \
 -	  echo " $(liburiparserincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(liburiparserincludedir)/$$f'"; \
 -	  $(liburiparserincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(liburiparserincludedir)/$$f"; \
-+	  echo "$$d$$p"; \
-+	done | $(am__base_list) | \
-+	while read files; do \
-+	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(liburiparserincludedir)'"; \
-+	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(liburiparserincludedir)" || exit $$?; \
- 	done
- 
- uninstall-liburiparserincludeHEADERS:
- 	@$(NORMAL_UNINSTALL)
+-	done
+-
+-uninstall-liburiparserincludeHEADERS:
+-	@$(NORMAL_UNINSTALL)
 -	@list='$(liburiparserinclude_HEADERS)'; for p in $$list; do \
 -	  f=$(am__strip_dir) \
 -	  echo " rm -f '$(DESTDIR)$(liburiparserincludedir)/$$f'"; \
 -	  rm -f "$(DESTDIR)$(liburiparserincludedir)/$$f"; \
 -	done
-+	@list='$(liburiparserinclude_HEADERS)'; test -n "$(liburiparserincludedir)" || list=; \
++	@list='$(libboostinclude_HEADERS)'; test -n "$(libboostincludedir)" || list=; \
 +	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 +	test -n "$$files" || exit 0; \
-+	echo " ( cd '$(DESTDIR)$(liburiparserincludedir)' && rm -f" $$files ")"; \
-+	cd "$(DESTDIR)$(liburiparserincludedir)" && rm -f $$files
++	echo " ( cd '$(DESTDIR)$(libboostincludedir)' && rm -f" $$files ")"; \
++	cd "$(DESTDIR)$(libboostincludedir)" && rm -f $$files
  
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- 	unique=`for i in $$list; do \
- 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- 	  done | \
--	  $(AWK) '    { files[$$0] = 1; } \
--	       END { for (i in files) print i; }'`; \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
- 	mkid -fID $$unique
- tags: TAGS
+@@ -924,7 +783,7 @@
  
  TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
@@ -94848,13 +28504,11 @@
  	here=`pwd`; \
  	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
- 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+@@ -932,29 +791,34 @@
  	  done | \
--	  $(AWK) '    { files[$$0] = 1; } \
--	       END { for (i in files) print i; }'`; \
+ 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 -	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 +	shift; \
 +	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
  	  test -n "$$unique" || unique=$$empty_fix; \
@@ -94872,16 +28526,13 @@
  CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
 -	tags=; \
--	here=`pwd`; \
  	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  	  done | \
--	  $(AWK) '    { files[$$0] = 1; } \
--	       END { for (i in files) print i; }'`; \
+ 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 -	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 +	test -z "$(CTAGS_ARGS)$$unique" \
  	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 -	     $$tags $$unique
@@ -94896,38 +28547,10 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- distdir: $(DISTFILES)
--	$(mkdir_p) $(distdir)/$(boost) $(distdir)/$(boost)/config $(distdir)/$(boost)/config/abi $(distdir)/$(boost)/config/compiler $(distdir)/$(boost)/config/no_tr1 $(distdir)/$(boost)/config/platform $(distdir)/$(boost)/config/stdlib $(distdir)/$(boost)/detail $(distdir)/$(boost_root) $(distdir)/$(googletest).win32/debug $(distdir)/$(googletest).win32/release $(distdir)/$(googletest)/include/gtest $(distdir)/$(googletest)/include/gtest/internal $(distdir)/$(uriparser) $(distdir)/$(uriparser).win32/debug $(distdir)/$(uriparser).win32/release $(distdir)/$(uriparser)/include/uriparser $(distdir)/${boost} $(distdir)/expat.win32 $(distdir)/zlib-1.2.3 $(distdir)/zlib-1.2.3.win32/bin $(distdir)/zlib-1.2.3.win32/lib $(distdir)/zlib-1.2.3/contrib/minizip
--	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
--	list='$(DISTFILES)'; for file in $$list; do \
--	  case $$file in \
--	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
--	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
--	  esac; \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
+@@ -975,13 +839,17 @@
  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
--	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
--	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
--	    dir="/$$dir"; \
--	    $(mkdir_p) "$(distdir)$$dir"; \
--	  else \
--	    dir=''; \
--	  fi; \
  	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 +	    if test -d "$(distdir)/$$file"; then \
 +	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 +	    fi; \
@@ -94946,16 +28569,16 @@
  	    || exit 1; \
  	  fi; \
  	done
-@@ -974,7 +1030,7 @@
+@@ -989,7 +857,7 @@
+ check: check-am
  all-am: Makefile $(LTLIBRARIES) $(HEADERS)
  installdirs:
- 	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libboostconfigcompilerincludedir)" "$(DESTDIR)$(libboostconfigincludedir)" "$(DESTDIR)$(libboostconfigno_tr1includedir)" "$(DESTDIR)$(libboostconfigplatformincludedir)" "$(DESTDIR)$(libboostconfigstdlibincludedir)" "$(DESTDIR)$(libboostdetailincludedir)" "$(DESTDIR)$(libboostincludedir)" "$(DESTDIR)$(liburiparserincludedir)"; do \
--	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+-	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libboostconfigcompilerincludedir)" "$(DESTDIR)$(libboostconfigincludedir)" "$(DESTDIR)$(libboostconfigno_tr1includedir)" "$(DESTDIR)$(libboostconfigplatformincludedir)" "$(DESTDIR)$(libboostconfigstdlibincludedir)" "$(DESTDIR)$(libboostdetailincludedir)" "$(DESTDIR)$(libboostincludedir)" "$(DESTDIR)$(liburiparserincludedir)"; do \
++	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libboostconfigcompilerincludedir)" "$(DESTDIR)$(libboostconfigincludedir)" "$(DESTDIR)$(libboostconfigno_tr1includedir)" "$(DESTDIR)$(libboostconfigplatformincludedir)" "$(DESTDIR)$(libboostconfigstdlibincludedir)" "$(DESTDIR)$(libboostdetailincludedir)" "$(DESTDIR)$(libboostincludedir)"; do \
+ 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
  	done
  install: install-am
- install-exec: install-exec-am
-@@ -996,6 +1052,7 @@
+@@ -1012,6 +880,7 @@
  
  distclean-generic:
  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -94963,17 +28586,8 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -1009,7 +1066,7 @@
- 	-rm -rf ./$(DEPDIR)
- 	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
--	distclean-libtool distclean-tags
-+	distclean-tags
+@@ -1033,6 +902,8 @@
  
- dvi: dvi-am
- 
-@@ -1017,6 +1074,8 @@
- 
  html: html-am
  
 +html-am:
@@ -94981,18 +28595,22 @@
  info: info-am
  
  info-am:
-@@ -1030,12 +1089,30 @@
- 	install-libboostincludeHEADERS \
- 	install-liburiparserincludeHEADERS
+@@ -1043,23 +914,32 @@
+ 	install-libboostconfigplatformincludeHEADERS \
+ 	install-libboostconfigstdlibincludeHEADERS \
+ 	install-libboostdetailincludeHEADERS \
+-	install-libboostincludeHEADERS \
+-	install-liburiparserincludeHEADERS
++	install-libboostincludeHEADERS
  
-+install-dvi: install-dvi-am
-+
+ install-dvi: install-dvi-am
+ 
 +install-dvi-am:
 +
  install-exec-am: install-libLTLIBRARIES
  
-+install-html: install-html-am
-+
+ install-html: install-html-am
+ 
 +install-html-am:
 +
  install-info: install-info-am
@@ -95001,111 +28619,76 @@
 +
  install-man:
  
-+install-pdf: install-pdf-am
-+
+ install-pdf: install-pdf-am
+ 
 +install-pdf-am:
 +
-+install-ps: install-ps-am
-+
+ install-ps: install-ps-am
+ 
 +install-ps-am:
 +
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
-@@ -1056,7 +1133,7 @@
+@@ -1087,8 +967,7 @@
+ 	uninstall-libboostconfigplatformincludeHEADERS \
+ 	uninstall-libboostconfigstdlibincludeHEADERS \
+ 	uninstall-libboostdetailincludeHEADERS \
+-	uninstall-libboostincludeHEADERS \
+-	uninstall-liburiparserincludeHEADERS
++	uninstall-libboostincludeHEADERS
  
- ps-am:
+ .MAKE: install-am install-strip
  
--uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
-+uninstall-am: uninstall-libLTLIBRARIES \
- 	uninstall-libboostconfigcompilerincludeHEADERS \
- 	uninstall-libboostconfigincludeHEADERS \
- 	uninstall-libboostconfigno_tr1includeHEADERS \
-@@ -1066,12 +1143,15 @@
- 	uninstall-libboostincludeHEADERS \
- 	uninstall-liburiparserincludeHEADERS
- 
-+.MAKE: install-am install-strip
-+
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- 	clean-libLTLIBRARIES clean-libtool clean-noinstLTLIBRARIES \
- 	ctags distclean distclean-compile distclean-generic \
- 	distclean-libtool distclean-tags distdir dvi dvi-am html \
- 	html-am info info-am install install-am install-data \
--	install-data-am install-exec install-exec-am install-info \
-+	install-data-am install-dvi install-dvi-am install-exec \
-+	install-exec-am install-html install-html-am install-info \
- 	install-info-am install-libLTLIBRARIES \
- 	install-libboostconfigcompilerincludeHEADERS \
- 	install-libboostconfigincludeHEADERS \
-@@ -1080,12 +1160,12 @@
+@@ -1106,8 +985,7 @@
+ 	install-libboostconfigplatformincludeHEADERS \
  	install-libboostconfigstdlibincludeHEADERS \
  	install-libboostdetailincludeHEADERS \
- 	install-libboostincludeHEADERS \
--	install-liburiparserincludeHEADERS install-man install-strip \
-+	install-liburiparserincludeHEADERS install-man install-pdf \
-+	install-pdf-am install-ps install-ps-am install-strip \
+-	install-libboostincludeHEADERS \
+-	install-liburiparserincludeHEADERS install-man install-pdf \
++	install-libboostincludeHEADERS install-man install-pdf \
+ 	install-pdf-am install-ps install-ps-am install-strip \
  	installcheck installcheck-am installdirs maintainer-clean \
  	maintainer-clean-generic mostlyclean mostlyclean-compile \
- 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
--	tags uninstall uninstall-am uninstall-info-am \
--	uninstall-libLTLIBRARIES \
-+	tags uninstall uninstall-am uninstall-libLTLIBRARIES \
- 	uninstall-libboostconfigcompilerincludeHEADERS \
- 	uninstall-libboostconfigincludeHEADERS \
- 	uninstall-libboostconfigno_tr1includeHEADERS \
-@@ -1095,6 +1175,7 @@
- 	uninstall-libboostincludeHEADERS \
- 	uninstall-liburiparserincludeHEADERS
- 
+@@ -1119,8 +997,8 @@
+ 	uninstall-libboostconfigplatformincludeHEADERS \
+ 	uninstall-libboostconfigstdlibincludeHEADERS \
+ 	uninstall-libboostdetailincludeHEADERS \
+-	uninstall-libboostincludeHEADERS \
+-	uninstall-liburiparserincludeHEADERS
++	uninstall-libboostincludeHEADERS
 +
+ 
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-Index: libkml-1.0.1/xcode/LibKML/Makefile.in
+Index: libkml-1.1.0/xcode/LibKML/Makefile.in
 ===================================================================
---- libkml-1.0.1.orig/xcode/LibKML/Makefile.in	2009-07-03 01:23:36.000000000 +0200
-+++ libkml-1.0.1/xcode/LibKML/Makefile.in	2009-12-10 10:19:49.000000000 +0100
+--- libkml-1.1.0.orig/xcode/LibKML/Makefile.in	2009-12-10 13:05:40.000000000 +0100
++++ libkml-1.1.0/xcode/LibKML/Makefile.in	2009-12-10 17:29:40.000000000 +0100
 @@ -1,8 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
+-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
-@@ -13,15 +14,12 @@
- # PARTICULAR PURPOSE.
- 
+@@ -15,8 +16,9 @@
  @SET_MAKE@
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
  VPATH = @srcdir@
  pkgdatadir = $(datadir)/@PACKAGE@
 -pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../..
 +pkglibdir = $(libdir)/@PACKAGE@
 +pkglibexecdir = $(libexecdir)/@PACKAGE@
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -39,18 +37,19 @@
- DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_curl.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)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
+@@ -43,6 +45,7 @@
  mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
@@ -95113,58 +28696,7 @@
  SOURCES =
  DIST_SOURCES =
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -72,18 +71,16 @@
- CYGPATH_W = @CYGPATH_W@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
--ECHO = @ECHO@
-+DSYMUTIL = @DSYMUTIL@
-+DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
--F77 = @F77@
--FFLAGS = @FFLAGS@
--GCC_FALSE = @GCC_FALSE@
--GCC_TRUE = @GCC_TRUE@
--HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
--HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
-+FGREP = @FGREP@
-+GREP = @GREP@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -93,19 +90,28 @@
- JAVAC = @JAVAC@
- JAVA_INCLUDE_DIR = @JAVA_INCLUDE_DIR@
- JAVA_LIB_DIR = @JAVA_LIB_DIR@
-+LD = @LD@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
-+LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
-+NM = @NM@
-+NMEDIT = @NMEDIT@
-+OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
-+OTOOL = @OTOOL@
-+OTOOL64 = @OTOOL64@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -108,6 +111,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -95172,84 +28704,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PLATFORM = @PLATFORM@
-@@ -122,22 +128,13 @@
- STRIP = @STRIP@
- SWIG = @SWIG@
- VERSION = @VERSION@
--WITH_JAVA_FALSE = @WITH_JAVA_FALSE@
--WITH_JAVA_TRUE = @WITH_JAVA_TRUE@
--WITH_PYTHON_FALSE = @WITH_PYTHON_FALSE@
--WITH_PYTHON_TRUE = @WITH_PYTHON_TRUE@
--WITH_SWIG_FALSE = @WITH_SWIG_FALSE@
--WITH_SWIG_TRUE = @WITH_SWIG_TRUE@
--ac_ct_AR = @ac_ct_AR@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
--ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -149,28 +146,41 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- EXTRA_DIST = \
- 	LibKML-Info.plist \
- 	README \
-@@ -183,14 +193,14 @@
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
--	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
--		&& exit 0; \
-+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-+	        && { if test -f $@; then exit 0; else break; fi; }; \
+@@ -195,9 +199,9 @@
  	      exit 1;; \
  	  esac; \
  	done; \
@@ -95262,7 +28717,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -208,16 +218,13 @@
+@@ -215,6 +219,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -95270,50 +28725,10 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
- 
- clean-libtool:
- 	-rm -rf .libs _libs
--
--distclean-libtool:
--	-rm -f libtool
--uninstall-info-am:
- tags: TAGS
- TAGS:
- 
-@@ -226,30 +233,32 @@
- 
- 
- distdir: $(DISTFILES)
--	$(mkdir_p) $(distdir)/LibKML.xcodeproj
--	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
--	list='$(DISTFILES)'; for file in $$list; do \
--	  case $$file in \
--	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
--	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
--	  esac; \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
+@@ -244,13 +249,17 @@
  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
--	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
--	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
--	    dir="/$$dir"; \
--	    $(mkdir_p) "$(distdir)$$dir"; \
--	  else \
--	    dir=''; \
--	  fi; \
  	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 +	    if test -d "$(distdir)/$$file"; then \
 +	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 +	    fi; \
@@ -95332,7 +28747,7 @@
  	    || exit 1; \
  	  fi; \
  	done
-@@ -277,6 +286,7 @@
+@@ -278,6 +287,7 @@
  
  distclean-generic:
  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -95340,17 +28755,8 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -287,7 +297,7 @@
+@@ -296,6 +306,8 @@
  
- distclean: distclean-am
- 	-rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool
-+distclean-am: clean-am distclean-generic
- 
- dvi: dvi-am
- 
-@@ -295,18 +305,38 @@
- 
  html: html-am
  
 +html-am:
@@ -95358,17 +28764,16 @@
  info: info-am
  
  info-am:
+@@ -304,18 +316,28 @@
  
- install-data-am:
+ install-dvi: install-dvi-am
  
-+install-dvi: install-dvi-am
-+
 +install-dvi-am:
 +
  install-exec-am:
  
-+install-html: install-html-am
-+
+ install-html: install-html-am
+ 
 +install-html-am:
 +
  install-info: install-info-am
@@ -95377,88 +28782,53 @@
 +
  install-man:
  
-+install-pdf: install-pdf-am
-+
+ install-pdf: install-pdf-am
+ 
 +install-pdf-am:
 +
-+install-ps: install-ps-am
-+
+ install-ps: install-ps-am
+ 
 +install-ps-am:
 +
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
-@@ -325,17 +355,21 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-info-am
-+uninstall-am:
-+
-+.MAKE: install-am install-strip
- 
- .PHONY: all all-am check check-am clean clean-generic clean-libtool \
- 	distclean distclean-generic distclean-libtool distdir dvi \
- 	dvi-am html html-am info info-am install install-am \
--	install-data install-data-am install-exec install-exec-am \
--	install-info install-info-am install-man install-strip \
-+	install-data install-data-am install-dvi install-dvi-am \
-+	install-exec install-exec-am install-html install-html-am \
-+	install-info install-info-am install-man install-pdf \
-+	install-pdf-am install-ps install-ps-am install-strip \
- 	installcheck installcheck-am installdirs maintainer-clean \
+@@ -349,6 +371,7 @@
  	maintainer-clean-generic mostlyclean mostlyclean-generic \
--	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
--	uninstall-info-am
-+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
-+
+ 	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
  
++
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-Index: libkml-1.0.1/xcode/Makefile.in
+ .NOEXPORT:
+Index: libkml-1.1.0/xcode/Makefile.in
 ===================================================================
---- libkml-1.0.1.orig/xcode/Makefile.in	2009-07-03 01:23:36.000000000 +0200
-+++ libkml-1.0.1/xcode/Makefile.in	2009-12-10 10:19:49.000000000 +0100
+--- libkml-1.1.0.orig/xcode/Makefile.in	2009-12-10 13:05:40.000000000 +0100
++++ libkml-1.1.0/xcode/Makefile.in	2009-12-10 17:29:40.000000000 +0100
 @@ -1,8 +1,9 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
+-# Makefile.in generated by automake 1.10.2 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
+-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
 +# Inc.
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
-@@ -13,15 +14,12 @@
- # PARTICULAR PURPOSE.
- 
+@@ -15,8 +16,9 @@
  @SET_MAKE@
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
  VPATH = @srcdir@
  pkgdatadir = $(datadir)/@PACKAGE@
 -pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ..
 +pkglibdir = $(libdir)/@PACKAGE@
 +pkglibexecdir = $(libexecdir)/@PACKAGE@
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -39,27 +37,59 @@
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_curl.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)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- 	$(ACLOCAL_M4)
+@@ -43,6 +45,7 @@
  mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
@@ -95466,18 +28836,10 @@
  SOURCES =
  DIST_SOURCES =
  RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- 	html-recursive info-recursive install-data-recursive \
--	install-exec-recursive install-info-recursive \
--	install-recursive installcheck-recursive installdirs-recursive \
--	pdf-recursive ps-recursive uninstall-info-recursive \
--	uninstall-recursive
-+	install-dvi-recursive install-exec-recursive \
-+	install-html-recursive install-info-recursive \
-+	install-pdf-recursive install-ps-recursive install-recursive \
-+	installcheck-recursive installdirs-recursive pdf-recursive \
-+	ps-recursive uninstall-recursive
-+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-+  distclean-recursive maintainer-clean-recursive
+@@ -54,10 +57,38 @@
+ 	ps-recursive uninstall-recursive
+ RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+   distclean-recursive maintainer-clean-recursive
 +AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
 +	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
 +	distdir
@@ -95511,57 +28873,9 @@
 +  done; \
 +  reldir="$$dir2"
  ACLOCAL = @ACLOCAL@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
  AMTAR = @AMTAR@
  AR = @AR@
- AUTOCONF = @AUTOCONF@
-@@ -81,18 +111,16 @@
- CYGPATH_W = @CYGPATH_W@
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
--ECHO = @ECHO@
-+DSYMUTIL = @DSYMUTIL@
-+DUMPBIN = @DUMPBIN@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
- ECHO_T = @ECHO_T@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
--F77 = @F77@
--FFLAGS = @FFLAGS@
--GCC_FALSE = @GCC_FALSE@
--GCC_TRUE = @GCC_TRUE@
--HAVE_CURL_FALSE = @HAVE_CURL_FALSE@
--HAVE_CURL_TRUE = @HAVE_CURL_TRUE@
-+FGREP = @FGREP@
-+GREP = @GREP@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -102,19 +130,28 @@
- JAVAC = @JAVAC@
- JAVA_INCLUDE_DIR = @JAVA_INCLUDE_DIR@
- JAVA_LIB_DIR = @JAVA_LIB_DIR@
-+LD = @LD@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
- LIBTOOL = @LIBTOOL@
-+LIPO = @LIPO@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
-+NM = @NM@
-+NMEDIT = @NMEDIT@
-+OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
-+OTOOL = @OTOOL@
-+OTOOL64 = @OTOOL64@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -120,6 +151,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -95569,84 +28883,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PLATFORM = @PLATFORM@
-@@ -131,22 +168,13 @@
- STRIP = @STRIP@
- SWIG = @SWIG@
- VERSION = @VERSION@
--WITH_JAVA_FALSE = @WITH_JAVA_FALSE@
--WITH_JAVA_TRUE = @WITH_JAVA_TRUE@
--WITH_PYTHON_FALSE = @WITH_PYTHON_FALSE@
--WITH_PYTHON_TRUE = @WITH_PYTHON_TRUE@
--WITH_SWIG_FALSE = @WITH_SWIG_FALSE@
--WITH_SWIG_TRUE = @WITH_SWIG_TRUE@
--ac_ct_AR = @ac_ct_AR@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
--ac_ct_F77 = @ac_ct_F77@
--ac_ct_RANLIB = @ac_ct_RANLIB@
--ac_ct_STRIP = @ac_ct_STRIP@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -158,28 +186,41 @@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
- host_alias = @host_alias@
- host_cpu = @host_cpu@
- host_os = @host_os@
- host_vendor = @host_vendor@
-+htmldir = @htmldir@
- includedir = @includedir@
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
- libexecdir = @libexecdir@
-+localedir = @localedir@
- localstatedir = @localstatedir@
-+lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-+psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- SUBDIRS = LibKML
- all: all-recursive
- 
-@@ -188,14 +229,14 @@
- 	@for dep in $?; do \
- 	  case '$(am__configure_deps)' in \
- 	    *$$dep*) \
--	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
--		&& exit 0; \
-+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-+	        && { if test -f $@; then exit 0; else break; fi; }; \
+@@ -202,9 +234,9 @@
  	      exit 1;; \
  	  esac; \
  	done; \
@@ -95659,7 +28896,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -213,6 +254,7 @@
+@@ -222,6 +254,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -95667,18 +28904,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -220,10 +262,6 @@
- clean-libtool:
- 	-rm -rf .libs _libs
- 
--distclean-libtool:
--	-rm -f libtool
--uninstall-info-am:
--
- # This directory's subdirectories are mostly independent; you can cd
- # into them and run `make' without going through this Makefile.
- # To change the values of `make' variables: instead of editing Makefiles,
-@@ -248,15 +286,14 @@
+@@ -253,7 +286,7 @@
  	  else \
  	    local_target="$$target"; \
  	  fi; \
@@ -95687,16 +28913,7 @@
  	  || eval $$failcom; \
  	done; \
  	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
- 	fi; test -z "$$fail"
- 
--mostlyclean-recursive clean-recursive distclean-recursive \
--maintainer-clean-recursive:
-+$(RECURSIVE_CLEAN_TARGETS):
- 	@failcom='exit 1'; \
- 	for f in x $$MAKEFLAGS; do \
- 	  case $$f in \
-@@ -283,16 +320,16 @@
+@@ -287,16 +320,16 @@
  	  else \
  	    local_target="$$target"; \
  	  fi; \
@@ -95716,16 +28933,7 @@
  	done
  
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-@@ -300,14 +337,14 @@
- 	unique=`for i in $$list; do \
- 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- 	  done | \
--	  $(AWK) '    { files[$$0] = 1; } \
--	       END { for (i in files) print i; }'`; \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
- 	mkid -fID $$unique
- tags: TAGS
+@@ -311,7 +344,7 @@
  
  TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
@@ -95734,7 +28942,7 @@
  	here=`pwd`; \
  	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
  	  include_option=--etags-include; \
-@@ -319,81 +356,101 @@
+@@ -323,7 +356,7 @@
  	list='$(SUBDIRS)'; for subdir in $$list; do \
  	  if test "$$subdir" = .; then :; else \
  	    test ! -f $$subdir/TAGS || \
@@ -95743,14 +28951,11 @@
  	  fi; \
  	done; \
  	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
- 	unique=`for i in $$list; do \
- 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+@@ -332,29 +365,34 @@
  	  done | \
--	  $(AWK) '    { files[$$0] = 1; } \
--	       END { for (i in files) print i; }'`; \
+ 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 -	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 +	shift; \
 +	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
  	  test -n "$$unique" || unique=$$empty_fix; \
@@ -95768,16 +28973,13 @@
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
 -	tags=; \
--	here=`pwd`; \
  	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  	  done | \
--	  $(AWK) '    { files[$$0] = 1; } \
--	       END { for (i in files) print i; }'`; \
+ 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 -	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 +	test -z "$(CTAGS_ARGS)$$unique" \
  	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 -	     $$tags $$unique
@@ -95792,37 +28994,10 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
--	list='$(DISTFILES)'; for file in $$list; do \
--	  case $$file in \
--	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
--	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
--	  esac; \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
+@@ -375,29 +413,44 @@
  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
--	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
--	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
--	    dir="/$$dir"; \
--	    $(mkdir_p) "$(distdir)$$dir"; \
--	  else \
--	    dir=''; \
--	  fi; \
  	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 +	    if test -d "$(distdir)/$$file"; then \
 +	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 +	    fi; \
@@ -95845,8 +29020,7 @@
 +	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
  	  if test "$$subdir" = .; then :; else \
  	    test -d "$(distdir)/$$subdir" \
--	    || $(mkdir_p) "$(distdir)/$$subdir" \
-+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
+ 	    || $(MKDIR_P) "$(distdir)/$$subdir" \
  	    || exit 1; \
 -	    distdir=`$(am__cd) $(distdir) && pwd`; \
 -	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -95869,13 +29043,13 @@
 -	        distdir="$$distdir/$$subdir" \
 +	        top_distdir="$$new_top_distdir" \
 +	        distdir="$$new_distdir" \
-+		am__remove_distdir=: \
-+		am__skip_length_check=: \
+ 		am__remove_distdir=: \
+ 		am__skip_length_check=: \
 +		am__skip_mode_fix=: \
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -423,6 +480,7 @@
+@@ -427,6 +480,7 @@
  
  distclean-generic:
  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -95883,18 +29057,8 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -433,8 +491,7 @@
+@@ -445,6 +499,8 @@
  
- distclean: distclean-recursive
- 	-rm -f Makefile
--distclean-am: clean-am distclean-generic distclean-libtool \
--	distclean-tags
-+distclean-am: clean-am distclean-generic distclean-tags
- 
- dvi: dvi-recursive
- 
-@@ -442,18 +499,38 @@
- 
  html: html-recursive
  
 +html-am:
@@ -95902,17 +29066,16 @@
  info: info-recursive
  
  info-am:
+@@ -453,18 +509,28 @@
  
- install-data-am:
+ install-dvi: install-dvi-recursive
  
-+install-dvi: install-dvi-recursive
-+
 +install-dvi-am:
 +
  install-exec-am:
  
-+install-html: install-html-recursive
-+
+ install-html: install-html-recursive
+ 
 +install-html-am:
 +
  install-info: install-info-recursive
@@ -95921,52 +29084,33 @@
 +
  install-man:
  
-+install-pdf: install-pdf-recursive
-+
+ install-pdf: install-pdf-recursive
+ 
 +install-pdf-am:
 +
-+install-ps: install-ps-recursive
-+
+ install-ps: install-ps-recursive
+ 
 +install-ps-am:
 +
  installcheck-am:
  
  maintainer-clean: maintainer-clean-recursive
-@@ -472,22 +549,25 @@
+@@ -485,8 +551,8 @@
  
- ps-am:
+ uninstall-am:
  
--uninstall-am: uninstall-info-am
-+uninstall-am:
- 
--uninstall-info: uninstall-info-recursive
+-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+-	install-strip
 +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
 +	install-am install-strip tags-recursive
  
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
--	clean clean-generic clean-libtool clean-recursive ctags \
--	ctags-recursive distclean distclean-generic distclean-libtool \
--	distclean-recursive distclean-tags distdir dvi dvi-am html \
-+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-+	all all-am check check-am clean clean-generic clean-libtool \
-+	ctags ctags-recursive distclean distclean-generic \
-+	distclean-libtool distclean-tags distdir dvi dvi-am html \
- 	html-am info info-am install install-am install-data \
--	install-data-am install-exec install-exec-am install-info \
--	install-info-am install-man install-strip installcheck \
-+	install-data-am install-dvi install-dvi-am install-exec \
-+	install-exec-am install-html install-html-am install-info \
-+	install-info-am install-man install-pdf install-pdf-am \
-+	install-ps install-ps-am install-strip installcheck \
- 	installcheck-am installdirs installdirs-am maintainer-clean \
--	maintainer-clean-generic maintainer-clean-recursive \
--	mostlyclean mostlyclean-generic mostlyclean-libtool \
--	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
--	uninstall uninstall-am uninstall-info-am
-+	maintainer-clean-generic mostlyclean mostlyclean-generic \
-+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-+	uninstall uninstall-am
-+
+ .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ 	all all-am check check-am clean clean-generic clean-libtool \
+@@ -502,6 +568,7 @@
+ 	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+ 	uninstall uninstall-am
  
++
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:

Modified: packages/libkml/trunk/debian/patches/series
===================================================================
--- packages/libkml/trunk/debian/patches/series	2009-12-10 09:25:53 UTC (rev 2621)
+++ packages/libkml/trunk/debian/patches/series	2009-12-10 16:47:37 UTC (rev 2622)
@@ -1,4 +1,4 @@
 kfreebsd.diff
+automake.diff
 reautoconfiscated.diff
-automake.diff
 clone.diff




More information about the Pkg-grass-devel mailing list