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

frankie at alioth.debian.org frankie at alioth.debian.org
Thu Dec 10 09:25:53 UTC 2009


Author: frankie
Date: 2009-12-10 09:25:53 +0000 (Thu, 10 Dec 2009)
New Revision: 2621

Modified:
   packages/libkml/trunk/debian/changelog
   packages/libkml/trunk/debian/patches/kfreebsd.diff
   packages/libkml/trunk/debian/patches/reautoconfiscated.diff
Log:
Fixed #558208


Modified: packages/libkml/trunk/debian/changelog
===================================================================
--- packages/libkml/trunk/debian/changelog	2009-12-10 09:13:59 UTC (rev 2620)
+++ packages/libkml/trunk/debian/changelog	2009-12-10 09:25:53 UTC (rev 2621)
@@ -4,8 +4,11 @@
     (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.
 
- -- Francesco Paolo Lovergine <frankie at debian.org>  Thu, 10 Dec 2009 09:47:05 +0100
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Thu, 10 Dec 2009 10:20:53 +0100
 
 libkml (1.0.1-3) unstable; urgency=high
 

Modified: packages/libkml/trunk/debian/patches/kfreebsd.diff
===================================================================
--- packages/libkml/trunk/debian/patches/kfreebsd.diff	2009-12-10 09:13:59 UTC (rev 2620)
+++ packages/libkml/trunk/debian/patches/kfreebsd.diff	2009-12-10 09:25:53 UTC (rev 2621)
@@ -1,13 +1,13 @@
 Index: libkml-1.0.1/configure.ac
 ===================================================================
---- libkml-1.0.1.orig/configure.ac	2009-12-10 10:10:14.000000000 +0100
-+++ libkml-1.0.1/configure.ac	2009-12-10 10:10:24.000000000 +0100
+--- libkml-1.0.1.orig/configure.ac	2009-06-10 03:47:15.000000000 +0200
++++ libkml-1.0.1/configure.ac	2009-12-10 10:18:01.000000000 +0100
 @@ -27,7 +27,7 @@
  PLATFORM=
  SHLIBSUFFIX=
  case "`uname -s`" in
--	Linux) PLATFORM=linux
-+	Linux|GNU/kFreeBSD) PLATFORM=linux
+-	Linux)	PLATFORM=linux
++	Linux|GNU/kFreeBSD)	PLATFORM=linux
  		SHLIBSUFFIX="so"
  	;;
  	Darwin)	PLATFORM=darwin

Modified: packages/libkml/trunk/debian/patches/reautoconfiscated.diff
===================================================================
--- packages/libkml/trunk/debian/patches/reautoconfiscated.diff	2009-12-10 09:13:59 UTC (rev 2620)
+++ packages/libkml/trunk/debian/patches/reautoconfiscated.diff	2009-12-10 09:25:53 UTC (rev 2621)
@@ -1,6 +1,7 @@
-diff -urN libkml-1.0.1.orig/aclocal.m4 libkml-1.0.1/aclocal.m4
+Index: libkml-1.0.1/aclocal.m4
+===================================================================
 --- libkml-1.0.1.orig/aclocal.m4	2009-07-03 01:23:22.000000000 +0200
-+++ libkml-1.0.1/aclocal.m4	2009-09-30 11:41:54.000000000 +0200
++++ libkml-1.0.1/aclocal.m4	2009-12-10 10:19:41.000000000 +0100
 @@ -1,7 +1,7 @@
 -# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
 +# generated automatically by aclocal 1.11 -*- Autoconf -*-
@@ -18,8 +19,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_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],,
-+[m4_warning([this file was generated for autoconf 2.64.
++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'.])])
@@ -7144,9 +7145,10 @@
 +m4_include([m4/ltsugar.m4])
 +m4_include([m4/ltversion.m4])
 +m4_include([m4/lt~obsolete.m4])
-diff -urN libkml-1.0.1.orig/config/config.guess libkml-1.0.1/config/config.guess
+Index: libkml-1.0.1/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-09-30 11:42:03.000000000 +0200
++++ libkml-1.0.1/config/config.guess	2009-12-10 10:19:44.000000000 +0100
 @@ -1,9 +1,10 @@
  #! /bin/sh
  # Attempt to guess a canonical system name.
@@ -7574,9 +7576,10 @@
  
  If the version you run ($0) is already up to date, please
  send the following data and any information you think might be
-diff -urN libkml-1.0.1.orig/config/config.sub libkml-1.0.1/config/config.sub
+Index: libkml-1.0.1/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-09-30 11:42:03.000000000 +0200
++++ libkml-1.0.1/config/config.sub	2009-12-10 10:19:44.000000000 +0100
 @@ -1,9 +1,10 @@
  #! /bin/sh
  # Configuration validation subroutine script.
@@ -8082,9 +8085,10 @@
  				vendor=ibm
  				;;
  			-beos*)
-diff -urN libkml-1.0.1.orig/config/depcomp libkml-1.0.1/config/depcomp
+Index: libkml-1.0.1/config/depcomp
+===================================================================
 --- libkml-1.0.1.orig/config/depcomp	2009-07-03 01:23:36.000000000 +0200
-+++ libkml-1.0.1/config/depcomp	2009-09-30 11:42:18.000000000 +0200
++++ libkml-1.0.1/config/depcomp	2009-12-10 10:19:49.000000000 +0100
 @@ -1,9 +1,10 @@
  #! /bin/sh
  # depcomp - compile a program generating dependencies as side-effects
@@ -8411,9 +8415,10 @@
 +# time-stamp-time-zone: "UTC"
 +# time-stamp-end: "; # UTC"
  # End:
-diff -urN libkml-1.0.1.orig/config/install-sh libkml-1.0.1/config/install-sh
+Index: libkml-1.0.1/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-09-30 11:42:03.000000000 +0200
++++ libkml-1.0.1/config/install-sh	2009-12-10 10:19:44.000000000 +0100
 @@ -1,7 +1,7 @@
  #!/bin/sh
  # install - install a program, script, or datafile
@@ -9065,9 +9070,10 @@
 +# time-stamp-time-zone: "UTC"
 +# time-stamp-end: "; # UTC"
  # End:
-diff -urN libkml-1.0.1.orig/config/ltmain.sh libkml-1.0.1/config/ltmain.sh
+Index: libkml-1.0.1/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-09-30 11:41:41.000000000 +0200
++++ 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.
@@ -9079,7 +9085,7 @@
 -# This program is free software; you can redistribute it and/or modify
 +# 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.
@@ -9168,7 +9174,7 @@
 +#       compiler:		$LTCC
 +#       compiler flags:		$LTCFLAGS
 +#       linker:		$LD (gnu? $with_gnu_ld)
-+#       $progname:		(GNU libtool) 2.2.6 Debian-2.2.6a-4
++#       $progname:		(GNU libtool) 2.2.6b Debian-2.2.6b-2
 +#       automake:		$automake_version
 +#       autoconf:		$autoconf_version
 +#
@@ -9178,9 +9184,9 @@
  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-4"
++VERSION="2.2.6b Debian-2.2.6b-2"
 +TIMESTAMP=""
-+package_revision=1.3012
++package_revision=1.3017
  
 -# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
 +# Be Bourne compatible
@@ -23232,9 +23238,10 @@
  # End:
 +# vi:sw=2
 +
-diff -urN libkml-1.0.1.orig/config/missing libkml-1.0.1/config/missing
+Index: libkml-1.0.1/config/missing
+===================================================================
 --- libkml-1.0.1.orig/config/missing	2009-07-03 01:23:28.000000000 +0200
-+++ libkml-1.0.1/config/missing	2009-09-30 11:42:03.000000000 +0200
++++ libkml-1.0.1/config/missing	2009-12-10 10:19:44.000000000 +0100
 @@ -1,10 +1,10 @@
  #! /bin/sh
  # Common stub for a few missing GNU programs while installing.
@@ -23531,9 +23538,10 @@
 +# time-stamp-time-zone: "UTC"
 +# time-stamp-end: "; # UTC"
  # End:
-diff -urN libkml-1.0.1.orig/config.h.in libkml-1.0.1/config.h.in
+Index: libkml-1.0.1/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-09-30 11:42:01.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
@@ -23562,22 +23570,25 @@
 -/* Define to `unsigned' if <sys/types.h> does not define. */
 +/* Define to `unsigned int' if <sys/types.h> does not define. */
  #undef size_t
-diff -urN libkml-1.0.1.orig/configure libkml-1.0.1/configure
+Index: libkml-1.0.1/configure
+===================================================================
 --- libkml-1.0.1.orig/configure	2009-07-03 01:23:24.000000000 +0200
-+++ libkml-1.0.1/configure	2009-09-30 11:41:58.000000000 +0200
-@@ -1,83 +1,416 @@
++++ libkml-1.0.1/configure	2009-12-10 10:19:42.000000000 +0100
+@@ -1,83 +1,418 @@
  #! /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.64 for libkml 1.0.1.
++# Generated by GNU Autoconf 2.65 for libkml 1.0.1.
  #
  # 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,
-+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
-+# Foundation, Inc.
++# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
++# Inc.
 +#
++#
  # This configure script is free software; the Free Software Foundation
  # gives unlimited permission to copy, distribute and modify it.
 -## --------------------- ##
@@ -23653,8 +23664,8 @@
 +  fi
 +  export as_echo_body
 +  as_echo='sh -c $as_echo_body as_echo'
-+fi
-+
+ fi
+ 
 +# The user is always right.
 +if test "${PATH_SEPARATOR+set}" != set; then
 +  PATH_SEPARATOR=:
@@ -23662,11 +23673,9 @@
 +    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
 +      PATH_SEPARATOR=';'
 +  }
- fi
- 
- 
--# Work around bugs in pre-3.0 UWIN ksh.
--$as_unset ENV MAIL MAILPATH
++fi
++
++
 +# IFS
 +# We need space, tab and new line, in precisely that order.  Quoting is
 +# there to prevent editors from complaining about space-tab.
@@ -23685,7 +23694,9 @@
 +    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
 +  done
 +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'
@@ -23951,9 +23962,7 @@
 +  }
 +fi # as_fn_arith
 +
- 
--# Required to use basename.
--if expr a : '\(a\)' >/dev/null 2>&1; then
++
 +# as_fn_error ERROR [LINENO LOG_FD]
 +# ---------------------------------
 +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
@@ -23969,7 +23978,9 @@
 +  $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
    as_expr=expr
@@ -24023,7 +24034,7 @@
  # Avoid depending upon Character Ranges.
  as_cr_letters='abcdefghijklmnopqrstuvwxyz'
  as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-@@ -85,146 +418,107 @@
+@@ -85,146 +420,107 @@
  as_cr_digits='0123456789'
  as_cr_alnum=$as_cr_Letters$as_cr_digits
  
@@ -24243,7 +24254,7 @@
  
  # 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 +527,26 @@
+@@ -233,36 +529,26 @@
  as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
  
  
@@ -24285,7 +24296,7 @@
    :
  else
    # Restart under the correct shell.
-@@ -272,9 +556,9 @@
+@@ -272,9 +558,9 @@
  if test "X$1" = X--fallback-echo; then
    # used as fallback echo
    shift
@@ -24297,7 +24308,7 @@
    exit 0
  fi
  
-@@ -282,143 +566,134 @@
+@@ -282,143 +568,135 @@
  # if CDPATH is set.
  (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
  
@@ -24398,6 +24409,15 @@
 -      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` &&
 +    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' &&
@@ -24419,16 +24439,7 @@
 +        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
--	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=:
@@ -24506,7 +24517,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,
@@ -24535,7 +24547,7 @@
  
  # Identity of this package.
  PACKAGE_NAME='libkml'
-@@ -426,51 +701,228 @@
+@@ -426,51 +704,228 @@
  PACKAGE_VERSION='1.0.1'
  PACKAGE_STRING='libkml 1.0.1'
  PACKAGE_BUGREPORT='http://code.google.com/p/libkml/issues'
@@ -24778,7 +24790,7 @@
  # The variables have the same names as the options, with
  # dashes changed to underlines.
  cache_file=/dev/null
-@@ -493,34 +945,48 @@
+@@ -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.
@@ -24834,7 +24846,7 @@
  
    -bindir | --bindir | --bindi | --bind | --bin | --bi)
      ac_prev=bindir ;;
-@@ -542,33 +1008,59 @@
+@@ -542,33 +1011,59 @@
    --config-cache | -C)
      cache_file=config.cache ;;
  
@@ -24912,7 +24924,7 @@
  
    -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
    | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-@@ -595,6 +1087,12 @@
+@@ -595,6 +1090,12 @@
    -host=* | --host=* | --hos=* | --ho=*)
      host_alias=$ac_optarg ;;
  
@@ -24925,7 +24937,7 @@
    -includedir | --includedir | --includedi | --included | --include \
    | --includ | --inclu | --incl | --inc)
      ac_prev=includedir ;;
-@@ -619,13 +1117,16 @@
+@@ -619,13 +1120,16 @@
    | --libexe=* | --libex=* | --libe=*)
      libexecdir=$ac_optarg ;;
  
@@ -24946,7 +24958,7 @@
      localstatedir=$ac_optarg ;;
  
    -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-@@ -690,6 +1191,16 @@
+@@ -690,6 +1194,16 @@
    | --progr-tra=* | --program-tr=* | --program-t=*)
      program_transform_name=$ac_optarg ;;
  
@@ -24963,7 +24975,7 @@
    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
    | -silent | --silent | --silen | --sile | --sil)
      silent=yes ;;
-@@ -740,26 +1251,36 @@
+@@ -740,26 +1254,36 @@
      ac_init_version=: ;;
  
    -with-* | --with-*)
@@ -25015,7 +25027,7 @@
  
    --x)
      # Obsolete; use --with-x.
-@@ -779,26 +1300,25 @@
+@@ -779,26 +1303,25 @@
    | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
      x_libraries=$ac_optarg ;;
  
@@ -25051,7 +25063,7 @@
      : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
      ;;
  
-@@ -807,31 +1327,36 @@
+@@ -807,31 +1330,36 @@
  
  if test -n "$ac_prev"; then
    ac_option=--`echo $ac_prev | sed 's/_/-/g'`
@@ -25089,24 +25101,24 @@
 -  eval ac_val=$`echo $ac_var`
 +  eval ac_val=\$$ac_var
 +  # Remove trailing slashes.
-   case $ac_val in
--    [\\/$]* | ?:[\\/]* ) ;;
--    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
--   { (exit 1); exit 1; }; };;
++  case $ac_val in
 +    */ )
 +      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
 +      eval $ac_var=\$ac_val;;
-   esac
++  esac
 +  # Be sure to have absolute directory names.
-+  case $ac_val in
+   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;;
-+  esac
+   esac
 +  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 +1370,7 @@
+@@ -845,7 +1373,7 @@
  if test "x$host_alias" != x; then
    if test "x$build_alias" = x; then
      cross_compiling=maybe
@@ -25115,7 +25127,7 @@
      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 +1383,72 @@
+@@ -858,94 +1386,72 @@
  test "$silent" = yes && exec 6>/dev/null
  
  
@@ -25267,7 +25279,7 @@
  
  #
  # Report the --help message.
-@@ -974,14 +1477,11 @@
+@@ -974,14 +1480,11 @@
    -n, --no-create         do not create output files
        --srcdir=DIR        find the sources in DIR [configure dir or \`..']
  
@@ -25284,7 +25296,7 @@
  
  By default, \`make install' will install all the files in
  \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-@@ -991,18 +1491,25 @@
+@@ -991,18 +1494,25 @@
  For better control, use the options below.
  
  Fine tuning of the installation directories:
@@ -25322,7 +25334,7 @@
  _ACEOF
  
    cat <<\_ACEOF
-@@ -1025,14 +1532,13 @@
+@@ -1025,14 +1535,13 @@
    cat <<\_ACEOF
  
  Optional Features:
@@ -25340,7 +25352,7 @@
    --enable-fast-install[=PKGS]
                            optimize for fast installation [default=yes]
    --disable-libtool-lock  avoid locking (might break parallel builds)
-@@ -1045,11 +1551,9 @@
+@@ -1045,11 +1554,9 @@
  Optional Packages:
    --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
    --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
@@ -25353,14 +25365,14 @@
  --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 +1566,633 @@
+@@ -1062,134 +1569,633 @@
    CFLAGS      C compiler flags
    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>
-+  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>
    CPP         C preprocessor
    CXX         C++ compiler command
@@ -25428,8 +25440,15 @@
 -  *) # Relative path.
 -    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
 -    ac_top_srcdir=$ac_top_builddir$srcdir ;;
--esac
--
++    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
@@ -25467,14 +25486,21 @@
 -  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
 -  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
 -  esac;;
-+    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
+-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.
@@ -25488,31 +25514,20 @@
 -	   test -f $ac_srcdir/configure.in; then
 -      echo
 -      $ac_configure --help
-+    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
+-    else
 -      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
 -    fi
 -    cd $ac_popdir
-+      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-+    fi || ac_status=$?
-+    cd "$ac_pwd" || { ac_status=$?; break; }
-   done
- fi
- 
+-  done
+-fi
+-
 -test -n "$ac_init_help" && exit 0
 +test -n "$ac_init_help" && exit $ac_status
  if $ac_init_version; then
    cat <<\_ACEOF
  libkml configure 1.0.1
 -generated by GNU Autoconf 2.59
-+generated by GNU Autoconf 2.64
++generated by GNU Autoconf 2.65
  
 -Copyright (C) 2003 Free Software Foundation, Inc.
 +Copyright (C) 2009 Free Software Foundation, Inc.
@@ -25563,7 +25578,7 @@
 +	ac_retval=1
 +fi
 +  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+  return $ac_retval
++  as_fn_set_status $ac_retval
 +
 +} # ac_fn_c_try_compile
 +
@@ -25600,7 +25615,7 @@
 +    ac_retval=1
 +fi
 +  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+  return $ac_retval
++  as_fn_set_status $ac_retval
 +
 +} # ac_fn_c_try_cpp
 +
@@ -25638,7 +25653,7 @@
 +	ac_retval=1
 +fi
 +  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+  return $ac_retval
++  as_fn_set_status $ac_retval
 +
 +} # ac_fn_cxx_try_compile
 +
@@ -25684,7 +25699,7 @@
 +  # left behind by Apple's compiler.  We do this before executing the actions.
 +  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
 +  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+  return $ac_retval
++  as_fn_set_status $ac_retval
 +
 +} # ac_fn_c_try_link
 +
@@ -25757,7 +25772,7 @@
 +fi
 +  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
 +  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+  return $ac_retval
++  as_fn_set_status $ac_retval
 +
 +} # ac_fn_c_try_run
 +
@@ -25861,7 +25876,7 @@
 +    ac_retval=1
 +fi
 +  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+  return $ac_retval
++  as_fn_set_status $ac_retval
 +
 +} # ac_fn_cxx_try_cpp
 +
@@ -25907,7 +25922,7 @@
 +  # left behind by Apple's compiler.  We do this before executing the actions.
 +  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
 +  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+  return $ac_retval
++  as_fn_set_status $ac_retval
 +
 +} # ac_fn_cxx_try_link
 +
@@ -26063,7 +26078,7 @@
  
  It was created by libkml $as_me 1.0.1, which was
 -generated by GNU Autoconf 2.59.  Invocation command line was
-+generated by GNU Autoconf 2.64.  Invocation command line was
++generated by GNU Autoconf 2.65.  Invocation command line was
  
    $ $0 $@
  
@@ -26072,7 +26087,7 @@
  {
  cat <<_ASUNAME
  ## --------- ##
-@@ -1208,7 +2211,7 @@
+@@ -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`
@@ -26081,7 +26096,7 @@
  /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 +2223,9 @@
+@@ -1220,8 +2226,9 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -26093,7 +26108,7 @@
  
  } >&5
  
-@@ -1243,7 +2247,6 @@
+@@ -1243,7 +2250,6 @@
  ac_configure_args=
  ac_configure_args0=
  ac_configure_args1=
@@ -26101,7 +26116,7 @@
  ac_must_keep_next=false
  for ac_pass in 1 2
  do
-@@ -1254,13 +2257,13 @@
+@@ -1254,13 +2260,13 @@
      -q | -quiet | --quiet | --quie | --qui | --qu | --q \
      | -silent | --silent | --silen | --sile | --sil)
        continue ;;
@@ -26119,7 +26134,7 @@
        if test $ac_must_keep_next = true; then
  	ac_must_keep_next=false # Got value, back to normal.
        else
-@@ -1276,21 +2279,19 @@
+@@ -1276,21 +2282,19 @@
  	  -* ) ac_must_keep_next=true ;;
  	esac
        fi
@@ -26146,7 +26161,7 @@
  trap 'exit_status=$?
    # Save into config.log some information that might help in debugging.
    {
-@@ -1303,20 +2304,35 @@
+@@ -1303,20 +2307,35 @@
  _ASBOX
      echo
      # The following way of writing the cache mishandles newlines in values,
@@ -26192,7 +26207,7 @@
      echo
  
      cat <<\_ASBOX
-@@ -1327,22 +2343,28 @@
+@@ -1327,22 +2346,28 @@
      echo
      for ac_var in $ac_subst_vars
      do
@@ -26228,7 +26243,7 @@
        done | sort
        echo
      fi
-@@ -1354,26 +2376,26 @@
+@@ -1354,26 +2379,26 @@
  ## ----------- ##
  _ASBOX
        echo
@@ -26265,7 +26280,7 @@
  
  # Predefined preprocessor variables.
  
-@@ -1381,40 +2403,46 @@
+@@ -1381,112 +2406,128 @@
  #define PACKAGE_NAME "$PACKAGE_NAME"
  _ACEOF
  
@@ -26315,23 +26330,29 @@
 +  ac_site_file2=$ac_default_prefix/etc/config.site
  fi
 -for ac_site_file in $CONFIG_SITE; do
+-  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
-   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;}
++  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;}
      sed 's/^/| /' "$ac_site_file" >&5
      . "$ac_site_file"
    fi
-@@ -1424,69 +2452,79 @@
-   # Some versions of bash will fail to source /dev/null (special
-   # files actually), so we avoid doing that.
-   if test -f "$cache_file"; then
+ 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;}
++  # 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;}
      case $cache_file in
@@ -26436,7 +26457,7 @@
  
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
-@@ -1496,57 +2534,31 @@
+@@ -1496,57 +2537,31 @@
  
  
  
@@ -26515,7 +26536,7 @@
  # 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 +2572,23 @@
+@@ -1560,22 +2575,23 @@
  # 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.
@@ -26547,7 +26568,7 @@
    /usr/ucb/* ) ;;
    *)
      # OSF1 and SCO ODT 3.0 have their own names for install.
-@@ -1583,7 +2596,7 @@
+@@ -1583,7 +2599,7 @@
      # by default.
      for ac_prog in ginstall scoinst install; do
        for ac_exec_ext in '' $ac_executable_extensions; do
@@ -26556,7 +26577,7 @@
  	  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 +2606,43 @@
+@@ -1593,30 +2609,43 @@
  	    # program-specific install script used by HP pwplus--don't use.
  	    :
  	  else
@@ -26608,7 +26629,7 @@
  
  # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
  # It thinks the first close brace ends the variable substitution.
-@@ -1626,21 +2652,34 @@
+@@ -1626,21 +2655,34 @@
  
  test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
  
@@ -26647,7 +26668,7 @@
     fi
     rm -f conftest.file
     if test "$*" != "X $srcdir/configure conftest.file" \
-@@ -1650,11 +2689,8 @@
+@@ -1650,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".
@@ -26661,7 +26682,7 @@
     fi
  
     test "$2" = conftest.file
-@@ -1663,82 +2699,207 @@
+@@ -1663,81 +2702,206 @@
     # Ok.
     :
  else
@@ -26746,9 +26767,6 @@
 -  # $(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
 +if test x"${install_sh}" != xset; then
 +  case $am_aux_dir in
 +  *\ * | *\	*)
@@ -26756,17 +26774,8 @@
 +  *)
 +    install_sh="\${SHELL} $am_aux_dir/install-sh"
 +  esac
- fi
- 
--for ac_prog in gawk mawk nawk awk
--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
--else
++fi
++
 +# Installed binaries are usually stripped using `strip' when the user
 +# run `make install-strip'.  However `strip' might not be the right
 +# tool to use in cross-compilation environments, therefore Automake
@@ -26895,17 +26904,18 @@
 +
 +fi
 +
++  test -d ./--version && rmdir ./--version
 +  if test "${ac_cv_path_mkdir+set}" = set; then
 +    MKDIR_P="$ac_cv_path_mkdir -p"
-+  else
+   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.
-+    test -d ./--version && rmdir ./--version
 +    MKDIR_P="$ac_install_sh -d"
-+  fi
-+fi
+   fi
+ fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
 +$as_echo "$MKDIR_P" >&6; }
 +
@@ -26914,20 +26924,23 @@
 +  [\\/$]* | ?:[\\/]*) ;;
 +  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
 +esac
-+
-+for ac_prog in gawk mawk nawk awk
-+do
-+  # Extract the first word of "$ac_prog", so it can be a program name with args.
-+set dummy $ac_prog; ac_word=$2
+ 
+ for ac_prog in gawk mawk nawk awk
+ 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:${as_lineno-$LINENO}: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
 +if test "${ac_cv_prog_AWK+set}" = set; then :
 +  $as_echo_n "(cached) " >&6
-+else
+ else
    if test -n "$AWK"; then
    ac_cv_prog_AWK="$AWK" # Let the user override the test.
- else
-@@ -1747,55 +2908,59 @@
+@@ -1747,55 +2911,59 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -27012,7 +27025,7 @@
    SET_MAKE="MAKE=${MAKE-make}"
  fi
  
-@@ -1808,12 +2973,14 @@
+@@ -1808,12 +2976,14 @@
  fi
  rmdir .tst 2>/dev/null
  
@@ -27033,7 +27046,7 @@
  fi
  
  # test whether we have cygpath
-@@ -1856,96 +3023,6 @@
+@@ -1856,96 +3026,6 @@
  
  MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
  
@@ -27130,7 +27143,7 @@
  # We need awk for the "check" target.  The system "awk" is bad on
  # some platforms.
  # Always define AMTAR for backward compatibility.
-@@ -1961,60 +3038,58 @@
+@@ -1961,60 +3041,58 @@
  
  DEPDIR="${am__leading_dot}deps"
  
@@ -27217,7 +27230,7 @@
    AMDEP_TRUE=
    AMDEP_FALSE='#'
  else
-@@ -2023,7 +3098,6 @@
+@@ -2023,7 +3101,6 @@
  fi
  
  
@@ -27225,7 +27238,7 @@
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -2032,10 +3106,10 @@
+@@ -2032,10 +3109,10 @@
  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
@@ -27240,7 +27253,7 @@
  else
    if test -n "$CC"; then
    ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -2045,35 +3119,37 @@
+@@ -2045,35 +3122,37 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -27290,7 +27303,7 @@
  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 +3159,50 @@
+@@ -2083,39 +3162,50 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -27356,7 +27369,7 @@
  else
    if test -n "$CC"; then
    ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -2125,77 +3212,37 @@
+@@ -2125,77 +3215,37 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -27448,7 +27461,7 @@
  else
    if test -n "$CC"; then
    ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -2206,18 +3253,19 @@
+@@ -2206,18 +3256,19 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -27472,7 +27485,7 @@
  
  if test $ac_prog_rejected = yes; then
    # We found a bogon in the path, so make sure we never use it.
-@@ -2235,24 +3283,25 @@
+@@ -2235,24 +3286,25 @@
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
@@ -27507,7 +27520,7 @@
  else
    if test -n "$CC"; then
    ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -2262,39 +3311,41 @@
+@@ -2262,39 +3314,41 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -27562,7 +27575,7 @@
  else
    if test -n "$ac_ct_CC"; then
    ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-@@ -2304,183 +3355,227 @@
+@@ -2304,66 +3358,78 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -27662,8 +27675,8 @@
 +... rest of stderr output deleted ...
 +         10q' conftest.err >conftest.er1
 +    cat conftest.er1 >&5
-+    rm -f conftest.er1 conftest.err
 +  fi
++  rm -f conftest.er1 conftest.err
 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 +  test $ac_status = 0; }
 +done
@@ -27675,21 +27688,14 @@
 -cat >>conftest.$ac_ext <<_ACEOF
 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
--
-+#include <stdio.h>
- int
- main ()
- {
-+FILE *f = fopen ("conftest.out", "w");
-+ return ferror (f) || fclose (f) != 0;
  
-   ;
-   return 0;
+ 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 conftest.out"
++ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
  # 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.
@@ -27710,8 +27716,8 @@
 -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:${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}: 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:
@@ -27719,13 +27725,8 @@
 +
 +ac_rmfiles=
 +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.
++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
@@ -27749,9 +27750,13 @@
 +# 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
+ 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 )
@@ -27778,89 +27783,78 @@
  	break;;
    esac
  done
-+test "$ac_cv_exeext" = no && ac_cv_exeext=
-+
- else
+-else
 -  echo "$as_me: failed program was:" >&5
-+  ac_file=''
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-+$as_echo "$ac_file" >&6; }
-+if test -z "$ac_file"; then :
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&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=''
+ fi
++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
+ 
 +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 +{ as_fn_set_status 77
 +as_fn_error "C compiler cannot create executables
 +See \`config.log' for more details." "$LINENO" 5; }; }
- fi
--
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++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.
+-# 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
 -# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-+$as_echo_n "checking whether the C compiler works... " >&6; }
- # If not cross compiling, check that we can run a simple program.
- if test "$cross_compiling" != yes; then
-   if { ac_try='./$ac_file'
+-# 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:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
+-  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
-     cross_compiling=no
-   else
-     if test "$cross_compiling" = maybe; then
- 	cross_compiling=yes
-     else
+-    cross_compiling=no
+-  else
+-    if test "$cross_compiling" = maybe; then
+-	cross_compiling=yes
+-    else
 -	{ { 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:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error "cannot run C compiled programs.
- If you meant to cross compile, use \`--host'.
+-If you meant to cross compile, use \`--host'.
 -See \`config.log' for more details." >&2;}
 -   { (exit 1); exit 1; }; }
-+See \`config.log' for more details." "$LINENO" 5; }
-     fi
-   fi
- fi
+-    fi
+-  fi
+-fi
 -echo "$as_me:$LINENO: result: yes" >&5
 -echo "${ECHO_T}yes" >&6
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "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 conftest.out
++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.
+-# 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
@@ -27870,11 +27864,6 @@
 -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:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-+$as_echo_n "checking whether we are cross compiling... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-+$as_echo "$cross_compiling" >&6; }
-+
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
 +$as_echo_n "checking for suffix of executables... " >&6; }
 +if { { ac_try="$ac_link"
@@ -27893,7 +27882,7 @@
    # 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 +3583,31 @@
+@@ -2488,38 +3551,90 @@
  for ac_file in conftest.exe conftest conftest.*; do
    test -f "$ac_file" || continue
    case $ac_file in
@@ -27911,15 +27900,17 @@
 -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;}
 +as_fn_error "cannot compute suffix of executables: cannot compile and link
 +See \`config.log' for more details." "$LINENO" 5; }
- fi
--
- rm -f conftest$ac_cv_exeext
--echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
--echo "${ECHO_T}$ac_cv_exeext" >&6
++fi
++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; }
  
@@ -27930,21 +27921,80 @@
 -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
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
-+$as_echo_n "checking for suffix of object files... " >&6; }
-+if test "${ac_cv_objext+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
- else
+-else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
--_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <stdio.h>
++int
++main ()
++{
++FILE *f = fopen ("conftest.out", "w");
++ return ferror (f) || fclose (f) != 0;
++
++  ;
++  return 0;
++}
+ _ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_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.
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
++$as_echo_n "checking whether we are cross compiling... " >&6; }
++if test "$cross_compiling" != yes; then
++  { { 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:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++  (eval "$ac_link") 2>&5
++  ac_status=$?
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }
++  if { ac_try='./conftest$ac_cv_exeext'
++  { { case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++  (eval "$ac_try") 2>&5
++  ac_status=$?
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; }; then
++    cross_compiling=no
++  else
++    if test "$cross_compiling" = maybe; then
++	cross_compiling=yes
++    else
++	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++as_fn_error "cannot run C compiled programs.
++If you meant to cross compile, use \`--host'.
++See \`config.log' for more details." "$LINENO" 5; }
++    fi
++  fi
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
++$as_echo "$cross_compiling" >&6; }
++
++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; }
++if test "${ac_cv_objext+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
  int
-@@ -2531,45 +3619,46 @@
+@@ -2531,45 +3646,46 @@
  }
  _ACEOF
  rm -f conftest.o conftest.obj
@@ -28016,7 +28066,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -2583,55 +3672,34 @@
+@@ -2583,55 +3699,34 @@
    return 0;
  }
  _ACEOF
@@ -28092,7 +28142,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -2642,39 +3710,49 @@
+@@ -2642,39 +3737,49 @@
    return 0;
  }
  _ACEOF
@@ -28136,8 +28186,7 @@
 +}
 +_ACEOF
 +if ac_fn_c_try_compile "$LINENO"; then :
- 
--ac_cv_prog_cc_g=no
++
 +else
 +  ac_c_werror_flag=$ac_save_c_werror_flag
 +	 CFLAGS="-g"
@@ -28147,13 +28196,16 @@
 +int
 +main ()
 +{
-+
+ 
+-ac_cv_prog_cc_g=no
 +  ;
 +  return 0;
 +}
 +_ACEOF
 +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
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -28161,8 +28213,6 @@
 -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
-+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:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
@@ -28170,7 +28220,7 @@
  if test "$ac_test_CFLAGS" = set; then
    CFLAGS=$ac_save_CFLAGS
  elif test $ac_cv_prog_cc_g = yes; then
-@@ -2690,18 +3768,14 @@
+@@ -2690,18 +3795,14 @@
      CFLAGS=
    fi
  fi
@@ -28195,7 +28245,7 @@
  /* end confdefs.h.  */
  #include <stdarg.h>
  #include <stdio.h>
-@@ -2729,12 +3803,17 @@
+@@ -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
@@ -28215,7 +28265,7 @@
  int test (int i, double x);
  struct s1 {int (*f) (int a);};
  struct s2 {int (*f) (double a);};
-@@ -2749,205 +3828,37 @@
+@@ -2749,205 +3855,37 @@
    return 0;
  }
  _ACEOF
@@ -28292,7 +28342,8 @@
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
 +$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
@@ -28419,9 +28470,8 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+if test "x$ac_cv_prog_cc_c89" != xno; then :
- 
- fi
+-
+-fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 -done
 -rm -f conftest*
@@ -28429,18 +28479,18 @@
 -  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 +3867,10 @@
+@@ -2956,10 +3894,10 @@
  
  depcc="$CC"   am_compiler_list=
  
@@ -28455,7 +28505,7 @@
  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 +3895,11 @@
+@@ -2984,6 +3922,11 @@
    if test "$am_compiler_list" = ""; then
       am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
    fi
@@ -28467,7 +28517,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 +3917,17 @@
+@@ -3001,7 +3944,17 @@
      done
      echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
  
@@ -28485,7 +28535,7 @@
      nosideeffect)
        # after this tag, mechanisms are not by side-effect, so they'll
        # only be used when explicitly requested
-@@ -3011,18 +3937,23 @@
+@@ -3011,18 +3964,23 @@
  	break
        fi
        ;;
@@ -28515,7 +28565,7 @@
         ${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 +3977,11 @@
+@@ -3046,13 +4004,11 @@
  fi
  
  fi
@@ -28532,7 +28582,7 @@
    test "x$enable_dependency_tracking" != xno \
    && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
    am__fastdepCC_TRUE=
-@@ -3068,15 +3997,15 @@
+@@ -3068,15 +4024,15 @@
  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
@@ -28552,7 +28602,7 @@
  else
        # Double quotes because CPP needs to be expanded
      for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-@@ -3090,11 +4019,7 @@
+@@ -3090,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.
@@ -28565,7 +28615,7 @@
  /* end confdefs.h.  */
  #ifdef __STDC__
  # include <limits.h>
-@@ -3103,68 +4028,24 @@
+@@ -3103,68 +4055,24 @@
  #endif
  		     Syntax error
  _ACEOF
@@ -28639,7 +28689,7 @@
    # Passes both tests.
  ac_preproc_ok=:
  break
-@@ -3174,7 +4055,7 @@
+@@ -3174,7 +4082,7 @@
  done
  # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
  rm -f conftest.err conftest.$ac_ext
@@ -28648,7 +28698,7 @@
    break
  fi
  
-@@ -3186,8 +4067,8 @@
+@@ -3186,8 +4094,8 @@
  else
    ac_cv_prog_CPP=$CPP
  fi
@@ -28659,7 +28709,7 @@
  ac_preproc_ok=false
  for ac_c_preproc_warn_flag in '' yes
  do
-@@ -3197,11 +4078,7 @@
+@@ -3197,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.
@@ -28672,7 +28722,7 @@
  /* end confdefs.h.  */
  #ifdef __STDC__
  # include <limits.h>
-@@ -3210,68 +4087,24 @@
+@@ -3210,68 +4114,24 @@
  #endif
  		     Syntax error
  _ACEOF
@@ -28746,7 +28796,7 @@
    # Passes both tests.
  ac_preproc_ok=:
  break
-@@ -3281,14 +4114,13 @@
+@@ -3281,14 +4141,13 @@
  done
  # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
  rm -f conftest.err conftest.$ac_ext
@@ -28767,7 +28817,7 @@
  fi
  
  ac_ext=c
-@@ -3297,20 +4129,24 @@
+@@ -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
  
@@ -28799,7 +28849,7 @@
  else
    if test -n "$CXX"; then
    ac_cv_prog_CXX="$CXX" # Let the user override the test.
-@@ -3320,39 +4156,41 @@
+@@ -3320,39 +4183,41 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -28854,7 +28904,7 @@
  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 +4200,77 @@
+@@ -3362,64 +4227,77 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -28950,8 +29000,8 @@
 +... rest of stderr output deleted ...
 +         10q' conftest.err >conftest.er1
 +    cat conftest.er1 >&5
-+    rm -f conftest.er1 conftest.err
 +  fi
++  rm -f conftest.er1 conftest.err
 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 +  test $ac_status = 0; }
 +done
@@ -28970,7 +29020,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -3433,55 +4284,34 @@
+@@ -3433,55 +4311,34 @@
    return 0;
  }
  _ACEOF
@@ -29046,7 +29096,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -3492,39 +4322,49 @@
+@@ -3492,160 +4349,64 @@
    return 0;
  }
  _ACEOF
@@ -29077,57 +29127,28 @@
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+  CXXFLAGS=""
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+
-+else
-+  ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-+	 CXXFLAGS="-g"
-+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
- 
+-
 -ac_cv_prog_cxx_g=no
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+  ac_cv_prog_cxx_g=yes
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
+-fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
- fi
+-fi
 -echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
 -echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
-+{ $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
-@@ -3540,112 +4380,6 @@
-     CXXFLAGS=
-   fi
- fi
+-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;' \
@@ -29141,17 +29162,21 @@
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
++  CXXFLAGS=""
++      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
 -$ac_declaration
 -#include <stdlib.h>
--int
--main ()
--{
++
+ int
+ main ()
+ {
 -exit (42);
--  ;
--  return 0;
--}
--_ACEOF
++
+   ;
+   return 0;
+ }
+ _ACEOF
 -rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
@@ -29178,7 +29203,8 @@
 -else
 -  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
@@ -29187,16 +29213,22 @@
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
++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 ()
--{
++
+ int
+ main ()
+ {
 -exit (42);
--  ;
--  return 0;
--}
--_ACEOF
++
+   ;
+   return 0;
+ }
+ _ACEOF
 -rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
@@ -29224,7 +29256,9 @@
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
--fi
++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*
@@ -29232,12 +29266,35 @@
 -  echo '#ifdef __cplusplus' >>confdefs.h
 -  echo $ac_declaration      >>confdefs.h
 -  echo '#endif'             >>confdefs.h
--fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
++$as_echo "$ac_cv_prog_cxx_g" >&6; }
++if test "$ac_test_CXXFLAGS" = set; then
++  CXXFLAGS=$ac_save_CXXFLAGS
++elif test $ac_cv_prog_cxx_g = yes; then
++  if test "$GXX" = yes; then
++    CXXFLAGS="-g -O2"
++  else
++    CXXFLAGS="-g"
++  fi
++else
++  if test "$GXX" = yes; then
++    CXXFLAGS="-O2"
++  else
++    CXXFLAGS=
++  fi
+ fi
 -
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -3654,10 +4388,10 @@
+@@ -3654,10 +4415,10 @@
  
  depcc="$CXX"  am_compiler_list=
  
@@ -29252,7 +29309,7 @@
  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 +4416,11 @@
+@@ -3682,6 +4443,11 @@
    if test "$am_compiler_list" = ""; then
       am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
    fi
@@ -29264,7 +29321,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 +4438,17 @@
+@@ -3699,7 +4465,17 @@
      done
      echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
  
@@ -29282,7 +29339,7 @@
      nosideeffect)
        # after this tag, mechanisms are not by side-effect, so they'll
        # only be used when explicitly requested
-@@ -3709,18 +4458,23 @@
+@@ -3709,18 +4485,23 @@
  	break
        fi
        ;;
@@ -29312,7 +29369,7 @@
         ${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 +4498,11 @@
+@@ -3744,13 +4525,11 @@
  fi
  
  fi
@@ -29329,7 +29386,7 @@
    test "x$enable_dependency_tracking" != xno \
    && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
    am__fastdepCXX_TRUE=
-@@ -3761,314 +4513,430 @@
+@@ -3761,301 +4540,417 @@
  fi
  
  
@@ -29412,11 +29469,12 @@
 -# 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.6'
-+macro_revision='1.3012'
++macro_version='2.2.6b'
++macro_revision='1.3017'
 +
 +
 +
++
  
 -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
  
@@ -29497,7 +29555,6 @@
 +
 +
 +
-+
 +ltmain="$ac_aux_dir/ltmain.sh"
  
  # Make sure we can run config.sub.
@@ -29717,11 +29774,14 @@
 -    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
-+
-+fi
+ 
+ fi
 +{ $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"
@@ -29729,6 +29789,20 @@
 +
 +test -z "$SED" && SED=sed
 +Xsed="$SED -e 1s/^X//"
+ 
+-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'
 +
 +
 +
@@ -29737,9 +29811,6 @@
 +
 +
 +
-+
-+
-+
 +{ $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; }
 +if test "${ac_cv_path_GREP+set}" = set; then :
@@ -29781,11 +29852,10 @@
      fi
 +    # 10*(2^10) chars as input seems more than enough
 +    test $ac_count -gt 10 && break
-   done
--done
++  done
 +  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 +esac
- 
++
 +      $ac_path_GREP_found && break 3
 +    done
 +  done
@@ -29797,29 +29867,35 @@
 +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
  
--SED=$lt_cv_path_SED
 +fi
 +{ $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"
  
--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'
+-# 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:${as_lineno-$LINENO}: checking for egrep" >&5
 +$as_echo_n "checking for egrep... " >&6; }
 +if test "${ac_cv_path_EGREP+set}" = set; then :
 +  $as_echo_n "(cached) " >&6
-+else
+ 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
@@ -29856,7 +29932,7 @@
 +      # 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
++    fi
 +    # 10*(2^10) chars as input seems more than enough
 +    test $ac_count -gt 10 && break
 +  done
@@ -29873,50 +29949,20 @@
 +  fi
 +else
 +  ac_cv_path_EGREP=$EGREP
- 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
 +fi
 +{ $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"
- 
- 
--# 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:${as_lineno-$LINENO}: checking for fgrep" >&5
 +$as_echo_n "checking for fgrep... " >&6; }
 +if test "${ac_cv_path_FGREP+set}" = set; then :
 +  $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
--    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
++else
 +  if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
 +   then ac_cv_path_FGREP="$GREP -F"
 +   else
@@ -30014,23 +30060,23 @@
 +  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=`($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
+       done
        test -z "$LD" && LD="$ac_prog"
        ;;
-   "")
-@@ -4081,14 +4949,14 @@
+@@ -4081,14 +4976,14 @@
      ;;
    esac
  elif test "$with_gnu_ld" = yes; then
@@ -30051,7 +30097,7 @@
  else
    if test -z "$LD"; then
    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-@@ -4118,19 +4986,17 @@
+@@ -4118,19 +5013,17 @@
  
  LD="$lt_cv_path_LD"
  if test -n "$LD"; then
@@ -30080,7 +30126,7 @@
  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 +5008,22 @@
+@@ -4142,40 +5035,22 @@
    ;;
  esac
  fi
@@ -30133,7 +30179,7 @@
  else
    if test -n "$NM"; then
    # Let the user override the test.
-@@ -4218,601 +5066,480 @@
+@@ -4218,601 +5093,480 @@
      done
      IFS="$lt_save_ifs"
    done
@@ -30144,26 +30190,11 @@
 -echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
 -echo "${ECHO_T}$lt_cv_path_NM" >&6
 -NM="$lt_cv_path_NM"
--
--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
 +{ $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
--  echo "$as_me:$LINENO: result: no, using $LN_S" >&5
--echo "${ECHO_T}no, using $LN_S" >&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
 +  # 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"
@@ -30174,20 +30205,7 @@
 +$as_echo_n "checking for $ac_word... " >&6; }
 +if test "${ac_cv_prog_DUMPBIN+set}" = set; then :
 +  $as_echo_n "(cached) " >&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.
++else
 +  if test -n "$DUMPBIN"; then
 +  ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test.
 +else
@@ -30206,30 +30224,48 @@
 +  done
 +IFS=$as_save_IFS
  
--case $host_os in
--aix4* | aix5*)
--  lt_cv_deplibs_check_method=pass_all
--  ;;
+-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
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
 +$as_echo "$DUMPBIN" >&6; }
-+else
+ else
+-  echo "$as_me:$LINENO: result: no, using $LN_S" >&5
+-echo "${ECHO_T}no, using $LN_S" >&6
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
-+fi
+ fi
  
--beos*)
+-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
 -  ;;
- 
--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
--  ;;
 +    test -n "$DUMPBIN" && break
 +  done
 +fi
@@ -30262,10 +30298,8 @@
 +  done
 +IFS=$as_save_IFS
  
--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'
+-beos*)
+-  lt_cv_deplibs_check_method=pass_all
 -  ;;
 +fi
 +fi
@@ -30278,18 +30312,42 @@
 +$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:)
++{ $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
  
 -darwin* | rhapsody*)
 -  lt_cv_deplibs_check_method=pass_all
 -  ;;
-+  test -n "$ac_ct_DUMPBIN" && break
-+done
  
 -freebsd* | kfreebsd*-gnu | dragonfly*)
 -  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
@@ -30302,24 +30360,18 @@
 -      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
 -      ;;
 -    esac
-+  if test "x$ac_ct_DUMPBIN" = x; then
-+    DUMPBIN=":"
-   else
+-  else
 -    lt_cv_deplibs_check_method=pass_all
-+    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
-+    DUMPBIN=$ac_ct_DUMPBIN
++  if test "$DUMPBIN" != ":"; then
++    NM="$DUMPBIN"
    fi
 -  ;;
--
++fi
++test -z "$NM" && NM=nm
+ 
 -gnu*)
 -  lt_cv_deplibs_check_method=pass_all
 -  ;;
-+fi
  
 -hpux10.20* | hpux11*)
 -  lt_cv_file_magic_cmd=/usr/bin/file
@@ -30343,11 +30395,6 @@
 -  # 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)$'
 -  ;;
-+  if test "$DUMPBIN" != ":"; then
-+    NM="$DUMPBIN"
-+  fi
-+fi
-+test -z "$NM" && NM=nm
  
 -irix5* | irix6* | nonstopux*)
 -  case $LD in
@@ -30369,24 +30416,6 @@
 -    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)$'
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
 +$as_echo_n "checking the name lister ($NM) interface... " >&6; }
 +if test "${lt_cv_nm_interface+set}" = set; then :
@@ -30394,29 +30423,27 @@
 +else
 +  lt_cv_nm_interface="BSD nm"
 +  echo "int some_variable = 0;" > conftest.$ac_ext
-+  (eval echo "\"\$as_me:5197: $ac_compile\"" >&5)
++  (eval echo "\"\$as_me:5224: $ac_compile\"" >&5)
 +  (eval "$ac_compile" 2>conftest.err)
 +  cat conftest.err >&5
-+  (eval echo "\"\$as_me:5200: $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 echo "\"\$as_me:5203: 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"
    fi
 -  ;;
--
--osf3* | osf4* | osf5*)
--  lt_cv_deplibs_check_method=pass_all
--  ;;
 +  rm -f conftest*
 +fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
 +$as_echo "$lt_cv_nm_interface" >&6; }
  
--solaris*)
--  lt_cv_deplibs_check_method=pass_all
+-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:${as_lineno-$LINENO}: checking whether ln -s works" >&5
 +$as_echo_n "checking whether ln -s works... " >&6; }
@@ -30429,11 +30456,9 @@
 +$as_echo "no, using $LN_S" >&6; }
 +fi
  
--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*`
+-nto-qnx*)
+-  lt_cv_deplibs_check_method=unknown
+-  ;;
 +# find the maximum length of command line arguments
 +{ $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; }
@@ -30442,7 +30467,14 @@
 +else
 +    i=0
 +  teststring="ABCD"
-+
+ 
+-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
@@ -30450,20 +30482,21 @@
 +    # 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
-     ;;
--  ncr)
--    lt_cv_deplibs_check_method=pass_all
-+
++    ;;
+ 
+-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;
-     ;;
--  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 )'
-+
++    ;;
+ 
+-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.
@@ -30473,18 +30506,19 @@
 +    # 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;
-     ;;
--  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
-+
++    ;;
+ 
+-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;
      ;;
--  siemens)
+-  ncr)
 -    lt_cv_deplibs_check_method=pass_all
 +
 +  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
@@ -30500,13 +30534,18 @@
 +    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`
      ;;
--  pc)
--    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 )'
 +
 +  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
@@ -30520,10 +30559,14 @@
 +        *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
@@ -30623,17 +30666,19 @@
 +  && lt_shell_append=yes
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5
 +$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"
++
++
 +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
 +  lt_unset=unset
 +else
 +  lt_unset=false
 +fi
  
+ 
+-# 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
  
@@ -30659,8 +30704,6 @@
 -  fi
 -  rm -rf conftest*
 +
-+
-+
 +# test EBCDIC or ASCII
 +case `echo X|tr X '\101'` in
 + A) # ASCII based system
@@ -31089,8 +31132,17 @@
 -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
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
@@ -31114,23 +31166,14 @@
 +else
 +  OBJDUMP="$ac_cv_prog_OBJDUMP"
  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
--
--fi
--
--# On IRIX 5.3, sys/types and inttypes.h are conflicting.
  
+-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
+-
 +test -z "$OBJDUMP" && OBJDUMP=objdump
  
  
  
-@@ -4821,865 +5548,617 @@
+@@ -4821,858 +5575,610 @@
  
  
  
@@ -31414,6 +31457,16 @@
 -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
@@ -31421,17 +31474,11 @@
 +  esac
 +  ;;
  
--fi
--if test `eval echo '${'$as_ac_Header'}'` = yes; then
--  cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
--_ACEOF
 +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)$'
 +  ;;
  
--fi
 +irix5* | irix6* | nonstopux*)
 +  case $LD in
 +  *-32|*"-32 ") libmagic=32-bit;;
@@ -31442,14 +31489,6 @@
 +  lt_cv_deplibs_check_method=pass_all
 +  ;;
  
--done
-+# This must be Linux ELF.
-+linux* | k*bsd*-gnu)
-+  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
@@ -31500,6 +31539,11 @@
 -  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.
++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)$'
@@ -32405,19 +32449,6 @@
 -  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]'
 +
 +
 +
@@ -32471,24 +32502,21 @@
 +case $host_os in
 +aix*)
 +  symcode='[BCDT]'
-+  ;;
+   ;;
+-linux*)
 +cygwin* | mingw* | pw32* | cegcc*)
 +  symcode='[ABCDGISTW]'
 +  ;;
 +hpux*)
-+  if test "$host_cpu" = ia64; then
+   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*)
-+  symcode='[BCDEGRST]'
-+  ;;
-+osf*)
-+  symcode='[BCDEGQRST]'
+   fi
    ;;
- solaris*)
-   symcode='[BDRT]'
-@@ -5698,57 +6177,85 @@
+ irix* | nonstopux*)
+@@ -5698,57 +6204,85 @@
    ;;
  esac
  
@@ -32592,7 +32620,7 @@
        # Try sorting and uniquifying the output.
        if sort "$nlist" | uniq > "$nlist"T; then
  	mv -f "$nlist"T "$nlist"
-@@ -5757,53 +6264,55 @@
+@@ -5757,53 +6291,55 @@
        fi
  
        # Make sure that we snagged all the symbols we need.
@@ -32671,7 +32699,7 @@
  	    pipe_works=yes
  	  fi
  	  LIBS="$lt_save_LIBS"
-@@ -5821,7 +6330,7 @@
+@@ -5821,7 +6357,7 @@
      echo "$progname: failed program was:" >&5
      cat conftest.$ac_ext >&5
    fi
@@ -32680,7 +32708,7 @@
  
    # Do not use the global_symbol_pipe unless it works.
    if test "$pipe_works" = yes; then
-@@ -5837,16615 +6346,11738 @@
+@@ -5837,4500 +6373,2992 @@
    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
@@ -32968,6 +32996,13 @@
 -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
@@ -32992,7 +33027,7 @@
 +  ;;
 +*-*-irix6*)
 +  # Find out which ABI we are using.
-+  echo '#line 6409 "configure"' > conftest.$ac_ext
++  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=$?
@@ -33088,9 +33123,7 @@
 +$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
 +if test "${lt_cv_cc_needs_belf+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
 +  ac_ext=c
 +ac_cpp='$CPP $CPPFLAGS'
 +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -33169,10 +33202,10 @@
 +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
++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
@@ -33423,7 +33456,7 @@
 -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 +  done
 +IFS=$as_save_IFS
- 
++
 +fi
 +fi
 +LIPO=$ac_cv_prog_LIPO
@@ -33435,6 +33468,7 @@
 +$as_echo "no" >&6; }
 +fi
  
+ 
 -# Only perform the check for file, if the check method requires it
 -case $deplibs_check_method in
 -file_magic*)
@@ -33443,7 +33477,6 @@
 -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
@@ -34345,7 +34378,25 @@
 -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
--else
++ac_ext=cpp
++ac_cpp='$CXXCPP $CPPFLAGS'
++ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
++if test -z "$CXX"; then
++  if test -n "$CCC"; then
++    CXX=$CCC
++  else
++    if test -n "$ac_tool_prefix"; then
++  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
++  do
++    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
++set dummy $ac_tool_prefix$ac_prog; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_CXX+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
 -  lt_prog_compiler_pic_works=no
 -  ac_outfile=conftest.$ac_objext
 -   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -34374,25 +34425,6 @@
 -     fi
 -   fi
 -   $rm conftest*
-+ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+if test -z "$CXX"; then
-+  if test -n "$CCC"; then
-+    CXX=$CCC
-+  else
-+    if test -n "$ac_tool_prefix"; then
-+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
-+  do
-+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_CXX+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
 +  if test -n "$CXX"; then
 +  ac_cv_prog_CXX="$CXX" # Let the user override the test.
 +else
@@ -34530,8 +34562,8 @@
 +... rest of stderr output deleted ...
 +         10q' conftest.err >conftest.er1
 +    cat conftest.er1 >&5
-+    rm -f conftest.er1 conftest.err
 +  fi
++  rm -f conftest.er1 conftest.err
 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 +  test $ac_status = 0; }
 +done
@@ -34564,14 +34596,14 @@
 -   LDFLAGS="$save_LDFLAGS"
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
- 
++
 +int
 +main ()
 +{
 +#ifndef __GNUC__
 +       choke me
 +#endif
-+
+ 
 +  ;
 +  return 0;
 +}
@@ -34797,30 +34829,7 @@
 -  esac
 -done
 -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
-+$as_echo_n "checking dependency style of $depcc... " >&6; }
-+if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-+  # We make a subdir and do the tests there.  Otherwise we can end up
-+  # making bogus files that we don't know about and never remove.  For
-+  # instance it was reported that on HP-UX the gcc test will end up
-+  # making a dummy file named `D' -- because `-MD' means `put the output
-+  # in D'.
-+  mkdir conftest.dir
-+  # Copy depcomp to subdir because otherwise we won't find it if we're
-+  # using a relative directory.
-+  cp "$am_depcomp" conftest.dir
-+  cd conftest.dir
-+  # We will build objects and dependencies in a subdirectory because
-+  # it helps to detect inapplicable dependency modes.  For instance
-+  # both Tru64's cc and ICC support -MD to output dependencies as a
-+  # side effect of compilation, but ICC will put the dependencies in
-+  # the current directory while Tru64 will put them in the object
-+  # directory.
-+  mkdir sub
- 
+-
 -  case $host_os in
 -  cygwin* | mingw* | pw32*)
 -    # FIXME: the MSVC++ port hasn't been tested in a loooong time
@@ -34838,36 +34847,12 @@
 -    with_gnu_ld=no
 -    ;;
 -  esac
-+  am_cv_CXX_dependencies_compiler_type=none
-+  if test "$am_compiler_list" = ""; then
-+     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-+  fi
-+  am__universal=false
-+  case " $depcc " in #(
-+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-+     esac
- 
+-
 -  ld_shlibs=yes
 -  if test "$with_gnu_ld" = yes; then
 -    # If archive_cmds runs LD, not CC, wlarc should be empty
 -    wlarc='${wl}'
-+  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
- 
+-
 -    # 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.
@@ -34877,23 +34862,7 @@
 -    # 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'
-+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-+    # mode.  It turns out that the SunPro C++ compiler does not properly
-+    # handle `-M -o', and we need to detect this.  Also, some Intel
-+    # versions had trouble with output in subdirs
-+    am__obj=sub/conftest.${OBJEXT-o}
-+    am__minus_obj="-o $am__obj"
-+    case $depmode in
-+    gcc)
-+      # This depmode causes a compiler race in universal mode.
-+      test "$am__universal" = false || continue
-+      ;;
-+    nosideeffect)
-+      # after this tag, mechanisms are not by side-effect, so they'll
-+      # only be used when explicitly requested
-+      if test "x$enable_dependency_tracking" = xyes; then
-+	continue
-       else
+-      else
 -  	whole_archive_flag_spec=
 -    fi
 -    supports_anon_versioning=no
@@ -34903,42 +34872,8 @@
 -      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
 -      *\ 2.11.*) ;; # other 2.11 versions
 -      *) supports_anon_versioning=yes ;;
-+	break
-+      fi
-+      ;;
-+    msvisualcpp | msvcmsys)
-+      # This compiler won't grok `-c -o', but also, the minuso test has
-+      # not run yet.  These depmodes are late enough in the game, and
-+      # so weak that their functioning should not be impacted.
-+      am__obj=conftest.${OBJEXT-o}
-+      am__minus_obj=
-+      ;;
-+    none) break ;;
-     esac
-+    if depmode=$depmode \
-+       source=sub/conftest.c object=$am__obj \
-+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
-+         >/dev/null 2>conftest.err &&
-+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-+       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
-+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-+      # icc doesn't choke on unknown options, it will just issue warnings
-+      # or remarks (even with -Werror).  So we grep stderr for any message
-+      # that says an option was ignored or not supported.
-+      # When given -MP, icc 7.0 and 7.1 complain thusly:
-+      #   icc: Command line warning: ignoring option '-M'; no argument required
-+      # The diagnosis changed in icc 8.0:
-+      #   icc: Command line remark: option '-MP' not supported
-+      if (grep 'ignoring option' conftest.err ||
-+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-+        am_cv_CXX_dependencies_compiler_type=$depmode
-+        break
-+      fi
-+    fi
-+  done
- 
+-    esac
+-
 -    # See if GNU ld supports shared libraries.
 -    case $host_os in
 -    aix3* | aix4* | aix5*)
@@ -34946,39 +34881,52 @@
 -      if test "$host_cpu" != ia64; then
 -	ld_shlibs=no
 -	cat <<EOF 1>&2
-+  cd ..
-+  rm -rf conftest.dir
-+else
-+  am_cv_CXX_dependencies_compiler_type=none
-+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.
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5
-+$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
-+CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
- 
+-
 -EOF
 -      fi
 -      ;;
-+ if
-+  test "x$enable_dependency_tracking" != xno \
-+  && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
-+  am__fastdepCXX_TRUE=
-+  am__fastdepCXX_FALSE='#'
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
++$as_echo_n "checking dependency style of $depcc... " >&6; }
++if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then :
++  $as_echo_n "(cached) " >&6
 +else
-+  am__fastdepCXX_TRUE='#'
-+  am__fastdepCXX_FALSE=
-+fi
++  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
++  am__universal=false
++  case " $depcc " in #(
++     *\ -arch\ *\ -arch\ *) am__universal=true ;;
++     esac
  
 -      # Samuel A. Falvo II <kc5tja at dolphin.openprojects.net> reports
 -      # that the semantics of dynamic libraries on AmigaOS, at least up
@@ -34988,42 +34936,22 @@
 -      # them.
 -      ld_shlibs=no
 -      ;;
-+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-+    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-+    (test "X$CXX" != "Xg++"))) ; then
-+  ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
-+$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
-+if test -z "$CXXCPP"; then
-+  if test "${ac_cv_prog_CXXCPP+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+      # Double quotes because CXXCPP needs to be expanded
-+    for CXXCPP in "$CXX -E" "/lib/cpp"
-+    do
-+      ac_preproc_ok=false
-+for ac_cxx_preproc_warn_flag in '' yes
-+do
-+  # Use a header file that comes with gcc, so configuring glibc
-+  # with a fresh cross-compiler works.
-+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+  # <limits.h> exists even on freestanding compilers.
-+  # On the NeXT, cc -E runs the code through the compiler's parser,
-+  # not just through cpp. "Syntax error" is here to catch this case.
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+		     Syntax error
-+_ACEOF
-+if ac_fn_cxx_try_cpp "$LINENO"; then :
++  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
@@ -35034,13 +34962,18 @@
 -      else
 -	ld_shlibs=no
 -      fi
--      ;;
-+else
-+  # Broken: fails on valid input.
-+continue
-+fi
-+rm -f conftest.err conftest.$ac_ext
- 
++    # We check with `-c' and `-o' for the sake of the "dashmstdout"
++    # mode.  It turns out that the SunPro C++ compiler does not properly
++    # handle `-M -o', and we need to detect this.  Also, some Intel
++    # versions had trouble with output in subdirs
++    am__obj=sub/conftest.${OBJEXT-o}
++    am__minus_obj="-o $am__obj"
++    case $depmode in
++    gcc)
++      # This depmode causes a compiler race in universal mode.
++      test "$am__universal" = false || continue
+       ;;
+-
 -    cygwin* | mingw* | pw32*)
 -      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
 -      # as there is no search path for DLLs.
@@ -35049,22 +34982,7 @@
 -      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'
-+  # 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 '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
@@ -35076,17 +34994,17 @@
 -	  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
++    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
--      fi
--      ;;
-+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
- 
++	break
+       fi
+       ;;
+-
 -    interix3*)
 -      hardcode_direct=no
 -      hardcode_shlibpath_var=no
@@ -35101,9 +35019,7 @@
 -      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'
 -      ;;
-+    done
-+    ac_cv_prog_CXXCPP=$CXXCPP
- 
+-
 -    linux*)
 -      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 -	tmp_addflag=
@@ -35123,33 +35039,7 @@
 -	  tmp_addflag=' -nofor_main' ;;
 -	esac
 -	archive_cmds='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+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 :
- 
+-
 -	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~
@@ -35159,13 +35049,14 @@
 -      else
 -	ld_shlibs=no
 -      fi
--      ;;
-+else
-+  # Broken: fails on valid input.
-+continue
-+fi
-+rm -f conftest.err conftest.$ac_ext
- 
++    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'
@@ -35173,32 +35064,42 @@
 -      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
++    none) break ;;
++    esac
++    if depmode=$depmode \
++       source=sub/conftest.c object=$am__obj \
++       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
++       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
++         >/dev/null 2>conftest.err &&
++       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
++       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
++       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
++       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
++      # icc doesn't choke on unknown options, it will just issue warnings
++      # or remarks (even with -Werror).  So we grep stderr for any message
++      # that says an option was ignored or not supported.
++      # When given -MP, icc 7.0 and 7.1 complain thusly:
++      #   icc: Command line warning: ignoring option '-M'; no argument required
++      # The diagnosis changed in icc 8.0:
++      #   icc: Command line remark: option '-MP' not supported
++      if (grep 'ignoring option' conftest.err ||
++          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
++        am_cv_CXX_dependencies_compiler_type=$depmode
++        break
+       fi
 -      ;;
-+  # 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
++    fi
++  done
  
 -    solaris*)
 -      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
 -	ld_shlibs=no
 -	cat <<EOF 1>&2
-+done
-+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-+rm -f conftest.err conftest.$ac_ext
-+if $ac_preproc_ok; then :
++  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
@@ -35206,11 +35107,10 @@
 -*** 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.
-+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
++{ $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
  
 -EOF
 -      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -35220,20 +35120,21 @@
 -	ld_shlibs=no
 -      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
++ 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
-+else
-+  _lt_caught_CXX_error=yes
-+fi
  
 -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
 -*** reliably create shared libraries on SCO systems.  Therefore, libtool
@@ -35241,6 +35142,42 @@
 -*** 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
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
++$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
++if test -z "$CXXCPP"; then
++  if test "${ac_cv_prog_CXXCPP+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++      # Double quotes because CXXCPP needs to be expanded
++    for CXXCPP in "$CXX -E" "/lib/cpp"
++    do
++      ac_preproc_ok=false
++for ac_cxx_preproc_warn_flag in '' yes
++do
++  # Use a header file that comes with gcc, so configuring glibc
++  # with a fresh cross-compiler works.
++  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++  # <limits.h> exists even on freestanding compilers.
++  # On the NeXT, cc -E runs the code through the compiler's parser,
++  # not just through cpp. "Syntax error" is here to catch this case.
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++		     Syntax error
++_ACEOF
++if ac_fn_cxx_try_cpp "$LINENO"; then :
  
 -_LT_EOF
 -	;;
@@ -35255,6 +35192,11 @@
 -	;;
 -      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'
@@ -35262,6 +35204,21 @@
 -      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
@@ -35272,6 +35229,12 @@
 -      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=
@@ -35295,7 +35258,8 @@
 -	hardcode_direct=unsupported
 -      fi
 -      ;;
-+# Set options
++    done
++    ac_cv_prog_CXXCPP=$CXXCPP
  
 -    aix4* | aix5*)
 -      if test "$host_cpu" = ia64; then
@@ -35313,6 +35277,32 @@
 -	  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
@@ -35326,23 +35316,50 @@
 -	  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
-+        enable_dlopen=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
  
 -      # 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
-+  enable_win32_dll=no
++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].*)
@@ -35382,30 +35399,13 @@
 -	  else
 -	    shared_flag='${wl}-bM:SRE'
 -	  fi
-+
-+            # 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
 -      fi
-+      done
-+      IFS="$lt_save_ifs"
-+      ;;
-+    esac
-+else
-+  enable_shared=yes
-+fi
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
 -      # It seems that -bexpall does not export symbols beginning with
 -      # underscore (_), so it is better to generate a list of symbols to export.
@@ -35421,6 +35421,9 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
++else
++  _lt_caught_CXX_error=yes
++fi
  
 -int
 -main ()
@@ -35482,6 +35485,7 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
++# Set options
  
 -int
 -main ()
@@ -35519,31 +35523,12 @@
 -# 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
-+  # 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
+-else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
-+  enable_static=yes
- fi
++        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
@@ -35558,9 +35543,32 @@
 -	  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
++  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)'
@@ -35680,12 +35688,27 @@
 -      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"
++  # 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
-+  pic_mode=default
++  enable_static=yes
 +fi
  
 -    hpux9*)
@@ -35703,7 +35726,6 @@
 -      hardcode_minus_L=yes
 -      export_dynamic_flag_spec='${wl}-E'
 -      ;;
-+test -z "$pic_mode" && pic_mode=default
  
 -    hpux10*)
 -      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
@@ -35782,28 +35804,7 @@
 -      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
 -      hardcode_libdir_separator=:
 -      link_all_deplibs=yes
-+  # 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
+-      ;;
  
 -    netbsd*)
 -      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
@@ -35815,6 +35816,12 @@
 -      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'
@@ -35845,6 +35852,7 @@
 -       esac
 -      fi
 -      ;;
++test -z "$pic_mode" && pic_mode=default
  
 -    os2*)
 -      hardcode_libdir_flag_spec='-L$libdir'
@@ -35950,15 +35958,34 @@
 -      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'
 -      ;;
-+# This can be used to rebuild libtool when needed
-+LIBTOOL_DEPS="$ltmain"
  
 -    sysv4*MP*)
 -      if test -d /usr/nec; then
@@ -35969,8 +35996,6 @@
 -	ld_shlibs=yes
 -      fi
 -      ;;
-+# Always use our own libtool.
-+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
  
 -    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
 -      no_undefined_flag='${wl}-z,text'
@@ -36050,6 +36075,8 @@
 -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
@@ -36091,6 +36118,8 @@
 -  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
@@ -36298,7 +36327,6 @@
 -freebsd1*)
 -  dynamic_linker=no
 -  ;;
-+test -z "$LN_S" && LN_S="ln -s"
  
 -kfreebsd*-gnu)
 -  version_type=linux
@@ -36507,6 +36535,7 @@
 -    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
@@ -36528,7 +36557,7 @@
 -  hardcode_into_libs=yes
 -  dynamic_linker='GNU ld.so'
 -  ;;
- 
+-
 -netbsd*)
 -  version_type=sunos
 -  need_lib_prefix=no
@@ -36546,16 +36575,13 @@
 -  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
 -  ;;
-+if test -n "${ZSH_VERSION+set}" ; then
-+   setopt NO_GLOB_SUBST
-+fi
  
 -nto-qnx*)
 -  version_type=linux
@@ -36566,24 +36592,6 @@
 -  shlibpath_var=LD_LIBRARY_PATH
 -  shlibpath_overrides_runpath=yes
 -  ;;
-+{ $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
-+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
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
-+$as_echo "$lt_cv_objdir" >&6; }
-+objdir=$lt_cv_objdir
  
 -openbsd*)
 -  version_type=sunos
@@ -36655,9 +36663,6 @@
 -  fi
 -  need_version=yes
 -  ;;
-+cat >>confdefs.h <<_ACEOF
-+#define LT_OBJDIR "$lt_cv_objdir/"
-+_ACEOF
  
 -sysv4 | sysv4.3*)
 -  version_type=linux
@@ -36733,7 +36738,9 @@
 -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 -n "${ZSH_VERSION+set}" ; then
++   setopt NO_GLOB_SUBST
+ 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
@@ -36741,7 +36748,7 @@
 -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
@@ -36755,14 +36762,18 @@
 -    # We can link without hardcoding, and we can hardcode nonexisting dirs.
 -    hardcode_action=immediate
 -  fi
--else
++{ $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
+ 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
@@ -36771,7 +36782,7 @@
 -  # Fast installation is not necessary
 -  enable_fast_install=needless
 -fi
- 
+-
 -striplib=
 -old_striplib=
 -echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
@@ -36781,7 +36792,11 @@
 -  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
 -  echo "$as_me:$LINENO: result: yes" >&5
 -echo "${ECHO_T}yes" >&6
--else
++  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*)
@@ -36792,14 +36807,20 @@
 -       else
 -  echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6
--fi
++  # MS-DOS does not allow filenames that begin with a dot.
++  lt_cv_objdir=_libs
+ fi
 -       ;;
 -   *)
 -  echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6
 -    ;;
 -  esac
--fi
++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
@@ -36837,7 +36858,9 @@
 -LIBS="-ldl  $LIBS"
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
--_ACEOF
++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.  */
@@ -36895,34 +36918,15 @@
 -if test $ac_cv_lib_dl_dlopen = yes; then
 -  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
 -else
-+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
- 
+-
 -    lt_cv_dlopen="dyld"
 -    lt_cv_dlopen_libs=
 -    lt_cv_dlopen_self=yes
-+# 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'
- 
+-
 -fi
-+# 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'
- 
+-
 -  *)
 -    echo "$as_me:$LINENO: checking for shl_load" >&5
 -echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
@@ -36938,29 +36942,19 @@
 -/* 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
-+# Sed substitution to delay expansion of an escaped single quote.
-+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
- 
+-
 -/* 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.  */
-+# Sed substitution to avoid accidental globbing in evaled expressions
-+no_glob_subst='s/\*/\\\*/g'
  
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
-+# Global variables:
-+ofile=libtool
-+can_build_shared=yes
  
 -#undef shl_load
-+# All known linkers require a `.a' archive for static linking (except MSVC,
-+# which needs '.lib').
-+libext=a
  
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
@@ -36981,7 +36975,6 @@
 -#ifdef __cplusplus
 -}
 -#endif
-+with_gnu_ld="$lt_cv_prog_gnu_ld"
  
 -int
 -main ()
@@ -37017,8 +37010,6 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+old_CC="$CC"
-+old_CFLAGS="$CFLAGS"
  
 -ac_cv_func_shl_load=no
 -fi
@@ -37043,12 +37034,6 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
-+# 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
  
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
@@ -37088,79 +37073,16 @@
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 -  ac_cv_lib_dld_shl_load=yes
-+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-%%"`
-+
-+
-+# 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
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
-+$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
-+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
- else
+-else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+  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
  
 -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
-+*** 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
+-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
@@ -37170,12 +37092,7 @@
 -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
-+
-+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-+if test -n "$MAGIC_CMD"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
-+$as_echo "$MAGIC_CMD" >&6; }
- else
+-else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
@@ -37185,9 +37102,6 @@
 -/* 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
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
  
 -/* System header to define __stub macros and hopefully few prototypes,
 -    which can conflict with char dlopen (); below.
@@ -37253,38 +37167,9 @@
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 -  ac_cv_func_dlopen=yes
-+if test -z "$lt_cv_path_MAGIC_CMD"; then
-+  if test -n "$ac_tool_prefix"; then
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
-+$as_echo_n "checking for file... " >&6; }
-+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
- else
+-else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+  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
  
 -ac_cv_func_dlopen=no
 -fi
@@ -37309,14 +37194,6 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
-+*** 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
  
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
@@ -37359,24 +37236,24 @@
 -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
-+_LT_EOF
-+	  fi ;;
-+	esac
-+      fi
-+      break
-+    fi
-+  done
-+  IFS="$lt_save_ifs"
-+  MAGIC_CMD="$lt_save_MAGIC_CMD"
-+  ;;
-+esac
- fi
+-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
@@ -37395,6 +37272,9 @@
 -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'
  
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
@@ -37434,18 +37314,14 @@
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 -  ac_cv_lib_svld_dlopen=yes
-+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-+if test -n "$MAGIC_CMD"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
-+$as_echo "$MAGIC_CMD" >&6; }
- else
+-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
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
- fi
+-fi
 -rm -f conftest.err conftest.$ac_objext \
 -      conftest$ac_exeext conftest.$ac_ext
 -LIBS=$ac_check_lib_save_LIBS
@@ -37468,6 +37344,9 @@
 -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'
  
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
@@ -37510,6 +37389,8 @@
 -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
@@ -37521,47 +37402,111 @@
 -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"
-+  else
-+    MAGIC_CMD=:
-+  fi
- fi
+-fi
++# Sed substitution to avoid accidental globbing in evaled expressions
++no_glob_subst='s/\*/\\\*/g'
  
-+  fi
-+  ;;
-+esac
++# Global variables:
++ofile=libtool
++can_build_shared=yes
  
 -fi
-+# Use C for the default configuration in the libtool script
++# All known linkers require a `.a' archive for static linking (except MSVC,
++# which needs '.lib').
++libext=a
  
-+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
++with_gnu_ld="$lt_cv_prog_gnu_ld"
  
 -fi
++old_CC="$CC"
++old_CFLAGS="$CFLAGS"
  
-+# Source file extension for C test sources.
-+ac_ext=c
++# 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
-+# Object file extension for compiled C test sources.
-+objext=o
-+objext=$objext
++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-%%"`
  
-+# Code to be used in simple compile tests
-+lt_simple_compile_test_code="int some_variable = 0;"
  
 -fi
-+# Code to be used in simple link tests
-+lt_simple_link_test_code='int main(){return(0);}'
++# 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
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
++$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
++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
  
++*** 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
  
--fi
++_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
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
++$as_echo "$MAGIC_CMD" >&6; }
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
  
 -  if test "x$lt_cv_dlopen" != xno; then
 -    enable_dlopen=yes
@@ -37579,8 +37524,6 @@
  
 -    save_LIBS="$LIBS"
 -    LIBS="$lt_cv_dlopen_libs $LIBS"
-+# If no C compiler was specified, use CC.
-+LTCC=${LTCC-"$CC"}
  
 -    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
@@ -37589,25 +37532,47 @@
 -else
 -  	  if test "$cross_compiling" = yes; then :
 -  lt_cv_dlopen_self=cross
--else
++if test -z "$lt_cv_path_MAGIC_CMD"; then
++  if test -n "$ac_tool_prefix"; then
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
++$as_echo_n "checking for file... " >&6; }
++if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
++  $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 no C compiler flags were specified, use CFLAGS.
-+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
- 
+-
 -#if HAVE_DLFCN_H
 -#include <dlfcn.h>
 -#endif
-+# Allow CC to be a program name with arguments.
-+compiler=$CC
- 
+-
 -#include <stdio.h>
-+# 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
++  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
  
 -#ifdef RTLD_GLOBAL
 -#  define LT_DLGLOBAL		RTLD_GLOBAL
@@ -37618,12 +37583,14 @@
 -#    define LT_DLGLOBAL		0
 -#  endif
 -#endif
-+# 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*
++*** 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. */
@@ -37646,26 +37613,36 @@
 -#    endif
 -#  endif
 -#endif
-+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_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
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
++$as_echo "$MAGIC_CMD" >&6; }
++else
++  { $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;
-+## 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
  
 -  if (self)
 -    {
@@ -37673,10 +37650,9 @@
 -      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
 -      /* dlclose (self); */
 -    }
--  else
+   else
 -    puts (dlerror ());
-+lt_prog_compiler_no_builtin_flag=
- 
+-
 -    exit (status);
 -}
 -EOF
@@ -37695,51 +37671,19 @@
 -  else :
 -    # compilation failed
 -    lt_cv_dlopen_self=no
--  fi
--fi
++    MAGIC_CMD=:
+   fi
+ fi
 -rm -fr conftest*
-+if test "$GCC" = yes; then
-+  lt_prog_compiler_no_builtin_flag=' -fno-builtin'
  
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-+$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
-+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:'`
-+   (eval echo "\"\$as_me:8329: $lt_compile\"" >&5)
-+   (eval "$lt_compile" 2>conftest.err)
-+   ac_status=$?
-+   cat conftest.err >&5
-+   echo "$as_me:8333: \$? = $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
++  ;;
++esac
  
- fi
+-fi
 -echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
 -echo "${ECHO_T}$lt_cv_dlopen_self" >&6
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-+$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&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\"
@@ -37750,23 +37694,26 @@
 -else
 -  	  if test "$cross_compiling" = yes; then :
 -  lt_cv_dlopen_self_static=cross
-+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
+-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"
-+    :
-+fi
++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
-+fi
  
 -#include <stdio.h>
++# Source file extension for C test sources.
++ac_ext=c
  
 -#ifdef RTLD_GLOBAL
 -#  define LT_DLGLOBAL		RTLD_GLOBAL
@@ -37777,6 +37724,9 @@
 -#    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. */
@@ -37799,10 +37749,14 @@
 -#    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 ()
@@ -37818,10 +37772,7 @@
 -    }
 -  else
 -    puts (dlerror ());
-+  lt_prog_compiler_wl=
-+lt_prog_compiler_pic=
-+lt_prog_compiler_static=
- 
+-
 -    exit (status);
 -}
 -EOF
@@ -37843,72 +37794,30 @@
 -  fi
 -fi
 -rm -fr conftest*
-+{ $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; }
- 
-+  if test "$GCC" = yes; then
-+    lt_prog_compiler_wl='-Wl,'
-+    lt_prog_compiler_static='-static'
- 
+-
+-
 -fi
 -echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
 -echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
 -    fi
-+    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
-+      ;;
- 
+-
 -    CPPFLAGS="$save_CPPFLAGS"
 -    LDFLAGS="$save_LDFLAGS"
 -    LIBS="$save_LIBS"
 -    ;;
 -  esac
-+    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
-+      ;;
- 
+-
 -  case $lt_cv_dlopen_self in
 -  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
 -  *) enable_dlopen_self=unknown ;;
 -  esac
-+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-+      # PIC is the default for these OSes.
-+      ;;
  
 -  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
-+    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'
-+      ;;
  
-+    darwin* | rhapsody*)
-+      # PIC is the default on this platform
-+      # Common symbols not allowed in MH_DYLIB files
-+      lt_prog_compiler_pic='-fno-common'
-+      ;;
  
 -# Report which library types will actually be built
 -echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
@@ -37919,19 +37828,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
-+    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
-+      ;;
  
 -# On AIX, shared libraries and static libraries use the same namespace, and
 -# are all built from PIC.
@@ -37943,10 +37839,6 @@
 -    postinstall_cmds='$RANLIB $lib'
 -  fi
 -  ;;
-+    interix[3-9]*)
-+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-+      # Instead, we relocate shared libraries at runtime.
-+      ;;
  
 -aix4* | aix5*)
 -  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
@@ -37956,18 +37848,8 @@
 -esac
 -echo "$as_me:$LINENO: result: $enable_shared" >&5
 -echo "${ECHO_T}$enable_shared" >&6
-+    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
-+      ;;
-+
-+    *nto* | *qnx*)
-+      # QNX uses GNU C++, but need to define -shared option too, otherwise
-+      # it will coredump.
-+      lt_prog_compiler_pic='-fPIC -shared'
-+      ;;
++# 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
@@ -38049,65 +37931,40 @@
 -    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\"\`\\\""
-+    sysv4*MP*)
-+      if test -d /usr/nec; then
-+	lt_prog_compiler_pic=-Kconform_pic
-+      fi
-       ;;
-+
-     *)
+-      ;;
+-    *)
 -      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-+      lt_prog_compiler_pic='-fPIC'
-       ;;
-     esac
+-      ;;
+-    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
-+  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
-+      ;;
++# 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;}
-+    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'
-+      ;;
++# 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
-+    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'
-+      ;;
++# 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)
@@ -38137,15 +37994,278 @@
 -# 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:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
++$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
++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:'`
++   (eval echo "\"\$as_me:8356: $lt_compile\"" >&5)
++   (eval "$lt_compile" 2>conftest.err)
++   ac_status=$?
++   cat conftest.err >&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*
+ 
+-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
++$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
+ 
+-# 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:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
++$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'
+ 
+-# 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'
 +      ;;
  
--# A sed program that does not truncate output.
--SED=$lt_SED
-+    linux* | k*bsd*-gnu)
+-# The name of the directory that contains temporary libtool files.
+-objdir=$objdir
++    linux* | k*bsd*-gnu | kopensolaris*-gnu)
 +      case $cc_basename in
 +      # old Intel for x86_64 which still supported -KPIC.
 +      ecc*)
@@ -38203,36 +38323,38 @@
 +      esac
 +      ;;
  
--# Sed that helps us avoid accidentally triggering echo(1) options like -n.
--Xsed="$SED -e 1s/^X//"
+-# 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'
 +      ;;
  
--# 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
+-# 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'
 +      ;;
  
--# The names of the tagged configurations supported by this script.
--available_tags=
+-# 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'
 +      ;;
  
--# ### BEGIN LIBTOOL CONFIG
+-# Old archive suffix (normally "a").
+-libext="$libext"
 +    rdos*)
 +      lt_prog_compiler_static='-non_shared'
 +      ;;
  
--# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+-# Shared library suffix (normally ".so").
+-shrext_cmds='$shrext_cmds'
 +    solaris*)
 +      lt_prog_compiler_pic='-KPIC'
 +      lt_prog_compiler_static='-Bstatic'
@@ -38244,24 +38366,25 @@
 +      esac
 +      ;;
  
--# Shell to use when invoking shell scripts.
--SHELL=$lt_SHELL
+-# Executable file suffix (normally "").
+-exeext="$exeext"
 +    sunos4*)
 +      lt_prog_compiler_wl='-Qoption ld '
 +      lt_prog_compiler_pic='-PIC'
 +      lt_prog_compiler_static='-Bstatic'
 +      ;;
  
--# Whether or not to build shared libraries.
--build_libtool_libs=$enable_shared
+-# 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'
 +      ;;
  
--# Whether or not to build static libraries.
--build_old_libs=$enable_static
+-# 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'
@@ -38269,42 +38392,38 @@
 +      fi
 +      ;;
  
--# Whether or not to add -lc for building shared libraries.
--build_libtool_need_lc=$archive_cmds_need_lc
+-# 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'
 +      ;;
  
--# Whether or not to disallow shared libs when runtime libs are static
--allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
+-# 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
 +      ;;
  
--# Whether or not to optimize for fast installation.
--fast_install=$enable_fast_install
+-# 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'
 +      ;;
  
--# The host system.
--host_alias=$host_alias
--host=$host
--host_os=$host_os
+-# Do we need a version for libraries?
+-need_version=$need_version
 +    *)
 +      lt_prog_compiler_can_build_shared=no
 +      ;;
 +    esac
 +  fi
  
--# The build system.
--build_alias=$build_alias
--build=$build
--build_os=$build_os
+-# Whether dlopen is supported.
+-dlopen_support=$enable_dlopen
 +case $host_os in
 +  # For platforms which do not support PIC, -DPIC is meaningless:
 +  *djgpp*)
@@ -38317,24 +38436,23 @@
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
 +$as_echo "$lt_prog_compiler_pic" >&6; }
  
--# An echo program that does not interpret backslashes.
--echo=$lt_echo
+-# Whether dlopen of programs is supported.
+-dlopen_self=$enable_dlopen_self
  
--# The archiver.
--AR=$lt_AR
--AR_FLAGS=$lt_AR_FLAGS
+-# Whether dlopen of statically linked programs is supported.
+-dlopen_self_static=$enable_dlopen_self_static
  
--# A C compiler.
--LTCC=$lt_LTCC
+-# Compiler flag to prevent dynamic linking.
+-link_static_flag=$lt_lt_prog_compiler_static
  
--# LTCC compiler flags.
--LTCFLAGS=$lt_LTCFLAGS
+-# Compiler flag to turn off builtin functions.
+-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
  
--# A language-specific compiler.
--CC=$lt_compiler
+-# Compiler flag to allow reflexive dlopens.
+-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
  
--# Is the compiler the GNU C compiler?
--with_gcc=$GCC
+-# 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.
 +#
@@ -38357,11 +38475,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:8668: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:8695: $lt_compile\"" >&5)
 +   (eval "$lt_compile" 2>conftest.err)
 +   ac_status=$?
 +   cat conftest.err >&5
-+   echo "$as_me:8672: \$? = $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.
@@ -38373,14 +38491,14 @@
 +   fi
 +   $RM conftest*
  
--gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
--gcc_ver=\`gcc -dumpversion\`
+-# Compiler flag to generate thread-safe objects.
+-thread_safe_flag_spec=$lt_thread_safe_flag_spec
 +fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
 +$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
  
--# An ERE matcher.
--EGREP=$lt_EGREP
+-# Library versioning type.
+-version_type=$version_type
 +if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
 +    case $lt_prog_compiler_pic in
 +     "" | " "*) ;;
@@ -38391,27 +38509,34 @@
 +     lt_prog_compiler_can_build_shared=no
 +fi
  
--# The linker used to build libraries.
--LD=$lt_LD
+-# Format of library name prefix.
+-libname_spec=$lt_libname_spec
 +fi
  
--# Whether we need hard or soft links.
--LN_S=$lt_LN_S
+-# 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
  
--# A BSD-compatible nm program.
--NM=$lt_NM
+-# The coded name of the library, if different from the real name.
+-soname_spec=$lt_soname_spec
  
--# A symbol stripping program
--STRIP=$lt_STRIP
+-# 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
  
--# Used to examine libraries when file_magic_cmd begins "file"
--MAGIC_CMD=$MAGIC_CMD
+-# Create an old-style archive from a shared archive.
+-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
  
--# Used on cygwin: DLL creation program.
--DLLTOOL="$DLLTOOL"
+-# Create a temporary old-style archive to link instead of a shared archive.
+-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
  
--# Used on cygwin: object dumper.
--OBJDUMP="$OBJDUMP"
+-# 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.
 +#
@@ -38443,42 +38568,50 @@
 +   $RM -r conftest*
 +   LDFLAGS="$save_LDFLAGS"
  
--# Used on cygwin: assembler.
--AS="$AS"
+-# 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
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
 +$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
  
--# The name of the directory that contains temporary libtool files.
--objdir=$objdir
+-# 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
  
--# How to create reloadable object files.
--reload_flag=$lt_reload_flag
--reload_cmds=$lt_reload_cmds
+-# 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"\`
  
--# How to pass a linker flag through the compiler.
--wl=$lt_lt_prog_compiler_wl
+-# Dependencies to place before the objects being linked to create a
+-# shared library.
+-predeps=$lt_predeps
  
--# Object file suffix (normally "o").
--objext="$ac_objext"
+-# Dependencies to place after the objects being linked to create a
+-# shared library.
+-postdeps=$lt_postdeps
  
--# Old archive suffix (normally "a").
--libext="$libext"
+-# 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"\`
  
--# Shared library suffix (normally ".so").
--shrext_cmds='$shrext_cmds'
+-# Method to check whether dependent libraries are shared objects.
+-deplibs_check_method=$lt_deplibs_check_method
  
--# Executable file suffix (normally "").
--exeext="$exeext"
+-# Command to use when deplibs_check_method == file_magic.
+-file_magic_cmd=$lt_file_magic_cmd
  
--# Additional compiler flags for building library objects.
--pic_flag=$lt_lt_prog_compiler_pic
--pic_mode=$pic_mode
+-# Flag that allows shared libraries with undefined symbols to be built.
+-allow_undefined_flag=$lt_allow_undefined_flag
 +  { $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; }
 +if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
@@ -38491,8 +38624,8 @@
 +   mkdir out
 +   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
  
--# What is the maximum length of a command?
--max_cmd_len=$lt_cv_sys_max_cmd_len
+-# 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.
@@ -38502,11 +38635,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:8773: $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
-+   echo "$as_me:8777: \$? = $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
@@ -38527,29 +38660,66 @@
 +   $RM -r conftest
 +   $RM conftest*
  
--# Does compiler simultaneously support -c and -o options?
--compiler_c_o=$lt_lt_cv_prog_compiler_c_o
+-# 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
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
 +$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
  
--# Must we lock files when doing compilation?
--need_locks=$lt_need_locks
+-# 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
  
--# Do we need the lib prefix for modules?
--need_lib_prefix=$need_lib_prefix
+-# Whether we need a single -rpath flag with a separated argument.
+-hardcode_libdir_separator=$lt_hardcode_libdir_separator
  
--# Do we need a version for libraries?
--need_version=$need_version
+-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
+-# resulting binary.
+-hardcode_direct=$hardcode_direct
  
--# Whether dlopen is supported.
--dlopen_support=$enable_dlopen
+-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+-# resulting binary.
+-hardcode_minus_L=$hardcode_minus_L
  
--# Whether dlopen of programs is supported.
--dlopen_self=$enable_dlopen_self
+-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
+-# the resulting binary.
+-hardcode_shlibpath_var=$hardcode_shlibpath_var
  
--# Whether dlopen of statically linked programs is supported.
--dlopen_self_static=$enable_dlopen_self_static
+-# 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:${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; }
 +if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
@@ -38562,8 +38732,9 @@
 +   mkdir out
 +   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
  
--# Compiler flag to prevent dynamic linking.
--link_static_flag=$lt_lt_prog_compiler_static
+-# 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.
@@ -38573,11 +38744,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:8828: $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
-+   echo "$as_me:8832: \$? = $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
@@ -38598,23 +38769,23 @@
 +   $RM -r conftest
 +   $RM conftest*
  
--# Compiler flag to turn off builtin functions.
--no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
+-# Whether libtool must link a program against all its dependency libraries.
+-link_all_deplibs=$link_all_deplibs
 +fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
 +$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
  
--# Compiler flag to allow reflexive dlopens.
--export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
+-# 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"\`
  
--# Compiler flag to generate shared objects directly from archives.
--whole_archive_flag_spec=$lt_whole_archive_flag_spec
+-# Run-time system search path for libraries
+-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
  
--# Compiler flag to generate thread-safe objects.
--thread_safe_flag_spec=$lt_thread_safe_flag_spec
+-# Fix the shell variable \$srcfile for the compiler.
+-fix_srcfile_path="$fix_srcfile_path"
  
--# Library versioning type.
--version_type=$version_type
+-# 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
@@ -38637,51 +38808,24 @@
 +  need_locks=no
 +fi
  
--# Format of library name prefix.
--libname_spec=$lt_libname_spec
+-# The commands to list exported symbols.
+-export_symbols_cmds=$lt_export_symbols_cmds
  
--# 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 commands to extract the exported symbol list from a shared archive.
+-extract_expsyms_cmds=$lt_extract_expsyms_cmds
  
--# The coded name of the library, if different from the real name.
--soname_spec=$lt_soname_spec
+-# Symbols that should not be listed in the preloaded symbols.
+-exclude_expsyms=$lt_exclude_expsyms
  
--# 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
+-# Symbols that must always be exported.
+-include_expsyms=$lt_include_expsyms
  
--# 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
+-# ### END LIBTOOL CONFIG
  
--# Commands to strip libraries.
--old_striplib=$lt_old_striplib
--striplib=$lt_striplib
+-__EOF__
 +  { $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; }
  
--# 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"\`
 +  runpath_var=
 +  allow_undefined_flag=
 +  always_export_symbols=no
@@ -38723,10 +38867,18 @@
 +  # Exclude shared library initialization/finalization symbols.
 +  extract_expsyms_cmds=
  
--# Dependencies to place before the objects being linked to create a
--# shared library.
--predeps=$lt_predeps
-+  case $host_os in
+   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
@@ -38744,20 +38896,60 @@
 +    ;;
 +  linux* | k*bsd*-gnu)
 +    link_all_deplibs=no
-+    ;;
-+  esac
+     ;;
+   esac
  
--# Dependencies to place after the objects being linked to create a
--# shared library.
--postdeps=$lt_postdeps
+-  # 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}'
  
--# 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"\`
+-# 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.
@@ -38767,20 +38959,46 @@
 +    # 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
+     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=
-+    fi
+     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
++      *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
+     esac
  
--# Method to check whether dependent libraries are shared objects.
--deplibs_check_method=$lt_deplibs_check_method
+-    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]*)
@@ -38789,22 +39007,30 @@
 +	ld_shlibs=no
 +	cat <<_LT_EOF 1>&2
  
--# Command to use when deplibs_check_method == file_magic.
--file_magic_cmd=$lt_file_magic_cmd
+-    # 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.
  
--# Flag that allows shared libraries with undefined symbols to be built.
--allow_undefined_flag=$lt_allow_undefined_flag
 +_LT_EOF
 +      fi
 +      ;;
  
--# Flag that forces no undefined symbols.
--no_undefined_flag=$lt_no_undefined_flag
 +    amigaos*)
 +      case $host_cpu in
 +      powerpc)
@@ -38820,8 +39046,6 @@
 +      esac
 +      ;;
  
--# Commands used to finish a libtool library installation in a directory.
--finish_cmds=$lt_finish_cmds
 +    beos*)
 +      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
 +	allow_undefined_flag=unsupported
@@ -38833,8 +39057,25 @@
 +      fi
 +      ;;
  
--# Same as above, but a single script fragment to be evaled but not shown.
--finish_eval=$lt_finish_eval
+-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.
@@ -38844,8 +39085,33 @@
 +      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'
  
--# 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
+-# 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
@@ -38862,8 +39128,8 @@
 +      fi
 +      ;;
  
--# Transform the output of nm in a proper C declaration
--global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+-# Allow CC to be a program name with arguments.
+-compiler=$CC
 +    interix[3-9]*)
 +      hardcode_direct=no
 +      hardcode_shlibpath_var=no
@@ -38879,9 +39145,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'
 +      ;;
  
--# 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
-+    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
@@ -38924,8 +39188,12 @@
 +	esac
 +	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
  
--# This is the shared library runtime path variable.
--runpath_var=$runpath_var
+-# 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~
@@ -38933,8 +39201,11 @@
 +	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
 +        fi
  
--# This is the shared library path variable.
--shlibpath_var=$shlibpath_var
+-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
@@ -38955,8 +39226,6 @@
 +      fi
 +      ;;
  
--# Is shlibpath searched before the hard-coded library search path?
--shlibpath_overrides_runpath=$shlibpath_overrides_runpath
 +    netbsd* | netbsdelf*-gnu)
 +      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 +	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
@@ -38967,745 +39236,7 @@
 +      fi
 +      ;;
  
--# How to hardcode a shared library path into an executable.
--hardcode_action=$hardcode_action
-+    solaris*)
-+      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
-+	ld_shlibs=no
-+	cat <<_LT_EOF 1>&2
- 
--# Whether we should hardcode library paths into libraries.
--hardcode_into_libs=$hardcode_into_libs
-+*** 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.
- 
--# 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
-+_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 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
-+    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
- 
--# Whether we need a single -rpath flag with a separated argument.
--hardcode_libdir_separator=$lt_hardcode_libdir_separator
-+*** 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.
- 
--# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
--# resulting binary.
--hardcode_direct=$hardcode_direct
-+_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
-+	    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
-+      ;;
- 
--# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
--# resulting binary.
--hardcode_minus_L=$hardcode_minus_L
-+    sunos4*)
-+      archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+      wlarc=
-+      hardcode_direct=yes
-+      hardcode_shlibpath_var=no
-+      ;;
- 
--# 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
-+    *)
-+      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
- 
--# Variables whose values should be saved in libtool wrapper scripts and
--# restored at relink time.
--variables_saved_for_relink="$variables_saved_for_relink"
-+    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
-+      ;;
- 
--# Whether libtool must link a program against all its dependency libraries.
--link_all_deplibs=$link_all_deplibs
-+    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
- 
--# 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"\`
-+	# 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
- 
--# Run-time system search path for libraries
--sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-+	exp_sym_flag='-bexport'
-+	no_entry_flag='-bnoentry'
-+      fi
- 
--# Fix the shell variable \$srcfile for the compiler.
--fix_srcfile_path="$fix_srcfile_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.
- 
--# Set to yes if exported symbols are required.
--always_export_symbols=$always_export_symbols
-+      archive_cmds=''
-+      hardcode_direct=yes
-+      hardcode_direct_absolute=yes
-+      hardcode_libdir_separator=':'
-+      link_all_deplibs=yes
-+      file_list_spec='${wl}-f,'
- 
--# The commands to list exported symbols.
--export_symbols_cmds=$lt_export_symbols_cmds
-+      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
-+	  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
-+	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'
-+	  else
-+	    shared_flag='${wl}-bM:SRE'
-+	  fi
-+	fi
-+      fi
- 
--# The commands to extract the exported symbol list from a shared archive.
--extract_expsyms_cmds=$lt_extract_expsyms_cmds
-+      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.  */
- 
--# Symbols that should not be listed in the preloaded symbols.
--exclude_expsyms=$lt_exclude_expsyms
-+int
-+main ()
-+{
- 
--# Symbols that must always be exported.
--include_expsyms=$lt_include_expsyms
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
- 
--# ### END LIBTOOL CONFIG
-+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
- 
--__EOF__
-+        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
-+	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
-+main ()
-+{
- 
--  case $host_os in
--  aix3*)
--    cat <<\EOF >> "$cfgfile"
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
- 
--# 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
-+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
--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
-+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='${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
-+      ;;
- 
--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
-+    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
-+      ;;
- 
--CC="$lt_save_CC"
-+    bsdi[45]*)
-+      export_dynamic_flag_spec=-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.
-+      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
-+      ;;
- 
--# 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;}
--    else
--      { echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5
--echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
--    fi
--  fi
--  if test -z "$LTCFLAGS"; then
--    eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
--  fi
-+    darwin* | rhapsody*)
- 
--  # 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; }; }
--	;;
--    esac
-+  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}"
- 
--    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
-+  else
-+  ld_shlibs=no
-+  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_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
-+      ;;
- 
-+    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
-+      ;;
- 
--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
-+    # 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
-+      ;;
- 
--# 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=
-+    # 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
-+      ;;
- 
--# Source file extension for C++ test sources.
--ac_ext=cpp
-+    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
- 
--# Object file extension for compiled C++ test sources.
--objext=o
--objext_CXX=$objext
-+      # 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'
-+      ;;
- 
--# Code to be used in simple compile tests
--lt_simple_compile_test_code="int some_variable = 0;\n"
-+    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
-+      ;;
- 
--# Code to be used in simple link tests
--lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n'
-+    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='$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=:
- 
--# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-+	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'
- 
--# If no C compiler was specified, use CC.
--LTCC=${LTCC-"$CC"}
-+	  # hardcode_minus_L: Not really in the search PATH,
-+	  # but as the default location of the library.
-+	  hardcode_minus_L=yes
-+	  ;;
-+	esac
-+      fi
-+      ;;
- 
--# If no C compiler flags were specified, use CFLAGS.
--LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-+    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"
-+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+int foo(void) {}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
- 
 -# Allow CC to be a program name with arguments.
--compiler=$CC
-+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
-+      ;;
- 
-+    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
-+      ;;
- 
--# 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*
-+    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
-+      ;;
- 
--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*
-+    *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
-+	  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
-+      else
-+	ld_shlibs=no
-+      fi
-+      ;;
- 
--# Allow CC to be a program name with arguments.
 -lt_save_CC=$CC
 -lt_save_LD=$LD
 -lt_save_GCC=$GCC
@@ -39735,26 +39266,17 @@
 -  esac
 -done
 -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-+    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'
-+      ;;
++    solaris*)
++      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
++	ld_shlibs=no
++	cat <<_LT_EOF 1>&2
  
-+    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=:
-+      ;;
++*** 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
@@ -39763,67 +39285,29 @@
 -else
 -  lt_prog_compiler_no_builtin_flag_CXX=
 -fi
-+    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'
++_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
-+	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'
++	ld_shlibs=no
++      fi
++      ;;
  
 -if test "$GXX" = yes; then
 -  # Set up default GNU C++ configuration
-+	# Both c and cxx compiler support -rpath directly
-+	hardcode_libdir_flag_spec='-rpath $libdir'
-+      fi
-+      archive_cmds_need_lc='no'
-+      hardcode_libdir_separator=:
-+      ;;
++    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
  
-+    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
-+	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
-+	fi
-+	;;
-+      esac
-+      link_all_deplibs=yes
-+      ;;
++*** 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
@@ -39854,19 +39338,7 @@
 -	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
 -      done
 -      test -z "$LD" && LD="$ac_prog"
-+    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
-       ;;
+-      ;;
 -  "")
 -    # If it fails, then pretend we aren't using GCC.
 -    ac_prog=ld
@@ -39899,25 +39371,22 @@
 -      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
 -      *GNU* | *'with BFD'*)
 -	test "$with_gnu_ld" != no && break
-+
-+    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???
++_LT_EOF
  	;;
 -      *)
 -	test "$with_gnu_ld" != yes && break
-+	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
++	*)
++	  # 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
@@ -39959,42 +39428,36 @@
 -with_gnu_ld=$lt_cv_prog_gnu_ld
 -
 -
-+      runpath_var='LD_RUN_PATH'
-+      hardcode_shlibpath_var=no
-+      ;;
- 
+-
 -  # 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'
-+    sysv4.3*)
-+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+      hardcode_shlibpath_var=no
-+      export_dynamic_flag_spec='-Bexport'
 +      ;;
  
 -    hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
 -    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-+    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
++    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}'
-+    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'
++    *)
++      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" | \
@@ -40002,19 +39465,16 @@
 -      whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
 -    else
 -      whole_archive_flag_spec_CXX=
--    fi
--  else
++    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=
-+      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
-+      ;;
- 
+-
 -    # 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
@@ -40022,33 +39482,24 @@
 -    # the platform it is being used on.
 -    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
 -  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'
- 
+-
 -  # 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"'
-+      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'
++    # 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
 +      ;;
  
@@ -40057,12 +39508,7 @@
 -  with_gnu_ld=no
 -  wlarc=
 -fi
-+    uts4*)
-+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+      hardcode_libdir_flag_spec='-L$libdir'
-+      hardcode_shlibpath_var=no
-+      ;;
- 
+-
 -# 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
@@ -40081,10 +39527,22 @@
 -      no_entry_flag=""
 -    else
 -      aix_use_runtimelinking=no
-+    *)
-+      ld_shlibs=no
-+      ;;
-+    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
++	# 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
@@ -40093,22 +39551,30 @@
 -	for ld_flag in $LDFLAGS; do
 -	  case $ld_flag in
 -	  *-brtl*)
--	    aix_use_runtimelinking=yes
--	    break
++	# 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
-+    if test x$host_vendor = xsni; then
-+      case $host in
-+      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-+	export_dynamic_flag_spec='${wl}-Blargedynsym'
- 	;;
-       esac
--
+-	;;
+-      esac
++	  fi
++	  done
++	  ;;
++	esac
+ 
 -      exp_sym_flag='-bexport'
 -      no_entry_flag='-bnoentry'
-     fi
-+  fi
+-    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
@@ -40120,7 +39586,12 @@
 -    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
@@ -40129,18 +39600,45 @@
 -	if test -f "$collect2name" && \
 -	   strings "$collect2name" | grep resolve_lib_name >/dev/null
 -	then
--	  # We have reworked collect2
++      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
--	  # We have old 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_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=
--	fi
++	  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'
@@ -40150,20 +39648,27 @@
 -    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:
++	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'
--	else
++	  shared_flag='-G'
+ 	else
 -	  shared_flag='${wl}-bM:SRE'
--	fi
--      fi
++	  if test "$aix_use_runtimelinking" = yes; then
++	    shared_flag='${wl}-G'
++	  else
++	    shared_flag='${wl}-bM:SRE'
++	  fi
+ 	fi
+       fi
 -    fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
-+$as_echo "$ld_shlibs" >&6; }
-+test "$ld_shlibs" = no && can_build_shared=no
  
 -    # It seems that -bexpall does not export symbols beginning with
 -    # underscore (_), so it is better to generate a list of symbols to export.
@@ -40178,17 +39683,24 @@
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
-+with_gnu_ld=$with_gnu_ld
++      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
--main ()
--{
- 
--  ;
--  return 0;
--}
--_ACEOF
+ int
+@@ -10341,58 +9369,36 @@
+   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
@@ -40211,46 +39723,67 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; 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; }
 -}'`
--# Check for a 64-bit object if we didn't find anything.
++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
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
- 
--fi
+-
++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 \
 -      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_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"
--      else
++        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
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
++	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
--main ()
--{
- 
--  ;
--  return 0;
--}
--_ACEOF
+ int
+@@ -10403,4071 +9409,792 @@
+   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
@@ -40273,20 +39806,34 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; 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; }
 -}'`
--# Check for a 64-bit object if we didn't find anything.
++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
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
- 
--fi
+-
++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 \
 -      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_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
 -	# Warning - without using the other run time loading flags,
@@ -40298,9 +39845,21 @@
 -	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
++	 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
@@ -40312,6 +39871,20 @@
 -      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
@@ -40321,6 +39894,9 @@
 -	;;
 -    esac
 -    ;;
++    bsdi[45]*)
++      export_dynamic_flag_spec=-rdynamic
++      ;;
  
 -  cygwin* | mingw* | pw32*)
 -    # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
@@ -40407,6 +39983,51 @@
 -      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
@@ -40452,7 +40073,7 @@
 -    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
@@ -40464,144 +40085,29 @@
 -      # 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'
-+#
-+# 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.
++    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'
-+    '$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=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; } 2>conftest.err; then
-+        soname=conftest
-+        lib=conftest
-+        libobjs=conftest.$ac_objext
-+        deplibs=
-+        wl=$lt_prog_compiler_wl
-+	pic_flag=$lt_prog_compiler_pic
-+        compiler_flags=-v
-+        linker_flags=-v
-+        verstring=
-+        output_objdir=.
-+        libname=conftest
-+        lt_save_allow_undefined_flag=$allow_undefined_flag
-+        allow_undefined_flag=
-+        if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
-+  (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }
-+        then
-+	  archive_cmds_need_lc=no
-+        else
-+	  archive_cmds_need_lc=yes
-+        fi
-+        allow_undefined_flag=$lt_save_allow_undefined_flag
-       else
+-      else
 -        # FIXME: insert proper C++ library support
 -        ld_shlibs_CXX=no
-+        cat conftest.err 1>&5
-       fi
-+      $RM conftest*
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5
-+$as_echo "$archive_cmds_need_lc" >&6; }
+-      fi
++
++    freebsd1*)
++      ld_shlibs=no
        ;;
-     esac
+-    esac
 -    ;;
 -  hpux10*|hpux11*)
 -    if test $with_gnu_ld = no; then
 -      hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
 -      hardcode_libdir_separator_CXX=:
-+  fi
-+  ;;
-+esac
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
  
 -      case $host_cpu in
 -      hppa*64*|ia64*)
@@ -40616,13 +40122,29 @@
 -    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
@@ -40637,11 +40159,63 @@
 -	  ;;
 -	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'
--	  ;;
--	esac
++	  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.
@@ -40751,7 +40325,11 @@
 -	*"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
@@ -40759,8 +40337,13 @@
 -	  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
++	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'
@@ -40779,10 +40362,23 @@
 -	# 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
@@ -40852,13 +40448,48 @@
 -	# 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"
++        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++int foo(void) {}
++_ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
++  archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $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*)
@@ -40887,19 +40518,58 @@
 -	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*)
++      ;;
  
--	else
++    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
--	fi
++	  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
 -    ;;
@@ -40912,9 +40582,20 @@
 -	# 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
++      ;;
  
 -	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.
@@ -40950,20 +40631,83 @@
 -	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=:
++      ;;
  
--	else
++    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
--	fi
--	;;
++	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
+ 	fi
+ 	;;
 -    esac
 -    ;;
 -  psos*)
@@ -40997,7 +40741,7 @@
 -	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
@@ -41015,8 +40759,24 @@
 -	    ;;
 -	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
@@ -41027,10 +40787,15 @@
 -      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
@@ -41039,6 +40804,21 @@
 -	    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
@@ -41050,12 +40830,26 @@
 -	    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
@@ -41141,10 +40935,39 @@
 -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
@@ -41155,6 +40978,14 @@
 -  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
@@ -41163,18 +40994,38 @@
 -  (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:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
++$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.
@@ -41186,6 +41037,7 @@
 -       else
 -	 prev=
 -       fi
++with_gnu_ld=$with_gnu_ld
  
 -       if test "$pre_test_object_deps_done" = no; then
 -	 case $p in
@@ -41286,166 +41138,14 @@
 -    lt_prog_compiler_wl_CXX='-Wl,'
 -    lt_prog_compiler_static_CXX='-static'
  
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
-+$as_echo_n "checking dynamic linker characteristics... " >&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=
-+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
+-    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'
-+      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
-       ;;
+-      fi
+-      ;;
 -    amigaos*)
 -      # FIXME: we need at least 68020 code to build shared libraries, but
 -      # adding the `-m68020' flag to GCC prevents building anything better,
@@ -41464,7 +41164,19 @@
 -      # 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=
@@ -41472,109 +41184,12 @@
 -    interix3*)
 -      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
 -      # Instead, we relocate shared libraries at runtime.
-+    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"
-       ;;
+-      ;;
 -    sysv4*MP*)
 -      if test -d /usr/nec; then
 -	lt_prog_compiler_pic_CXX=-Kconform_pic
-+    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
-       ;;
+-      fi
+-      ;;
 -    hpux*)
 -      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
 -      # not for PA HP-UX.
@@ -41588,57 +41203,10 @@
 -      ;;
 -    *)
 -      lt_prog_compiler_pic_CXX='-fPIC'
-+    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`'
-+
-+  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
+-      ;;
+-    esac
+-  else
+-    case $host_os in
 -      aix4* | aix5*)
 -	# All AIX code is PIC.
 -	if test "$host_cpu" = ia64; then
@@ -41845,43 +41413,9 @@
 -      *)
 -	lt_prog_compiler_can_build_shared_CXX=no
 -	;;
-+    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
-+  ;;
- 
+-    esac
+-  fi
+-
 -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
 -echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6
 -
@@ -41923,65 +41457,11 @@
 -     fi
 -   fi
 -   $rm conftest*
-+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
-+  ;;
- 
+-
 -fi
 -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
 -echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6
-+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'
-+  ;;
- 
+-
 -if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
 -    case $lt_prog_compiler_pic_CXX in
 -     "" | " "*) ;;
@@ -41991,53 +41471,16 @@
 -    lt_prog_compiler_pic_CXX=
 -     lt_prog_compiler_can_build_shared_CXX=no
 -fi
-+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
-+  ;;
- 
+-
 -fi
 -case $host_os in
 -  # For platforms which do not support PIC, -DPIC is meaningless:
 -  *djgpp*)
 -    lt_prog_compiler_pic_CXX=
-+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=
-     ;;
-   *)
+-    ;;
+-  *)
 -    lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
-+    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
 -
 -#
@@ -42080,19 +41523,8 @@
 -else
 -    lt_prog_compiler_static_CXX=
 -fi
-+  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
-+  ;;
- 
+-
+-
 -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
@@ -42104,24 +41536,7 @@
 -   cd conftest
 -   mkdir out
 -   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+# This must be Linux ELF.
-+linux* | k*bsd*-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\"; \
-+       LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* 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.
@@ -42155,31 +41570,12 @@
 -   cd ..
 -   rmdir conftest
 -   $rm conftest*
-+int
-+main ()
-+{
- 
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+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
+-
+-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
-+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
- 
+-
+-
 -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
@@ -42197,18 +41593,14 @@
 -    { 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
-+  # 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
+-  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*)
@@ -42228,14 +41620,7 @@
 -  ;;
 -  *)
 -    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-+  # 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'
-   ;;
+-  ;;
 -  esac
 -
 -echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
@@ -42263,7 +41648,7 @@
 -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=$?
@@ -42302,19 +41687,9 @@
 -      ;;
 -    esac
 -  fi
-+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'
-   ;;
+-  ;;
 -esac
- 
+-
 -echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
 -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
 -library_names_spec=
@@ -42338,20 +41713,9 @@
 -    # 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'`
-+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
+-  else
 -    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-+    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
+-  fi
 -else
 -  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
 -fi
@@ -42361,36 +41725,22 @@
 -# when you set need_version to no, make sure it does not cause -set_version
 -# flags to be left without arguments
 -need_version=unknown
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  hardcode_into_libs=yes
-+  ;;
- 
+-
 -case $host_os in
 -aix3*)
-+newsos6)
-   version_type=linux
+-  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'
-+  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
-   ;;
- 
+-  ;;
+-
 -aix4* | aix5*)
 -  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=no
-   hardcode_into_libs=yes
+-  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}'
@@ -42428,72 +41778,34 @@
 -    fi
 -    shlibpath_var=LIBPATH
 -  fi
-+  dynamic_linker='ldqnx.so'
-   ;;
- 
+-  ;;
+-
 -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'
-+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
-   ;;
- 
+-  ;;
+-
 -beos*)
 -  library_names_spec='${libname}${shared_ext}'
 -  dynamic_linker="$host_os ld.so"
 -  shlibpath_var=LIBRARY_PATH
-+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
-   ;;
- 
+-  ;;
+-
 -bsdi[45]*)
 -  version_type=linux
-+osf3* | osf4* | osf5*)
-+  version_type=osf
-+  need_lib_prefix=no
-   need_version=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'
+-  soname_spec='${libname}${release}${shared_ext}$major'
 -  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-   shlibpath_var=LD_LIBRARY_PATH
+-  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
-+  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"
-   ;;
- 
+-  ;;
+-
 -cygwin* | mingw* | pw32*)
 -  version_type=windows
 -  shrext_cmds=".dll"
@@ -42551,23 +41863,16 @@
 -  dynamic_linker='Win32 ld.exe'
 -  # FIXME: first we should search . and the directory the executable is in
 -  shlibpath_var=PATH
-+rdos*)
-+  dynamic_linker=no
-   ;;
- 
+-  ;;
+-
 -darwin* | rhapsody*)
 -  dynamic_linker="$host_os dyld"
 -  version_type=darwin
-+solaris*)
-+  version_type=linux
-   need_lib_prefix=no
-   need_version=no
+-  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'
-+  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=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.
@@ -42575,75 +41880,32 @@
 -    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'
-+  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
+-  fi
 -  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-+  need_version=yes
-   ;;
- 
+-  ;;
+-
 -dgux*)
-+sysv4 | sysv4.3*)
-   version_type=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'
-+  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
-   ;;
- 
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  ;;
+-
 -freebsd1*)
 -  dynamic_linker=no
-+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
-   ;;
- 
+-  ;;
+-
 -kfreebsd*-gnu)
 -  version_type=linux
-+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-+  version_type=freebsd-elf
-   need_lib_prefix=no
-   need_version=no
+-  need_lib_prefix=no
+-  need_version=no
 -  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+  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
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
 -  shlibpath_overrides_runpath=no
-+  shlibpath_overrides_runpath=yes
-   hardcode_into_libs=yes
+-  hardcode_into_libs=yes
 -  dynamic_linker='GNU ld.so'
 -  ;;
 -
@@ -42652,18 +41914,12 @@
 -  # versioning mechanism, adjust this.
 -  if test -x /usr/bin/objformat; then
 -    objformat=`/usr/bin/objformat`
-+  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
+-  else
+-    case $host_os in
 -    freebsd[123]*) objformat=aout ;;
 -    *) objformat=elf ;;
-+      sco3.2v5*)
-+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-+	;;
-     esac
-   fi
+-    esac
+-  fi
 -  version_type=freebsd-$objformat
 -  case $version_type in
 -    freebsd-elf*)
@@ -42695,23 +41951,18 @@
 -    hardcode_into_libs=yes
 -    ;;
 -  esac
-+  sys_lib_dlsearch_path_spec='/usr/lib'
-   ;;
- 
+-  ;;
+-
 -gnu*)
-+tpf*)
-+  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-   version_type=linux
-   need_lib_prefix=no
-   need_version=no
+-  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'
-+  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
-   ;;
- 
+-  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.
@@ -42759,15 +42010,13 @@
 -  ;;
 -
 -interix3*)
-+uts4*)
-   version_type=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}'
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-   soname_spec='${libname}${release}${shared_ext}$major'
+-  soname_spec='${libname}${release}${shared_ext}$major'
 -  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
-   shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_var=LD_LIBRARY_PATH
 -  shlibpath_overrides_runpath=no
 -  hardcode_into_libs=yes
 -  ;;
@@ -42807,18 +42056,13 @@
 -  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
-   ;;
-+esac
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
-+$as_echo "$dynamic_linker" >&6; }
-+test "$dynamic_linker" = no && can_build_shared=no
- 
+-  dynamic_linker=no
+-  ;;
+-
 -# This must be Linux ELF.
 -linux*)
 -  version_type=linux
@@ -42833,11 +42077,7 @@
 -  # Some rework will be needed to allow for fast_install
 -  # before this can be enabled.
 -  hardcode_into_libs=yes
-+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
- 
+-
 -  # find out which ABI we are using
 -  libsuff=
 -  case "$host_cpu" in
@@ -42858,19 +42098,13 @@
 -    rm -rf conftest*
 -    ;;
 -  esac
-+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
- 
+-
 -  # 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,
@@ -42879,7 +42113,7 @@
 -  # assume the GNU/Linux dynamic linker is in use.
 -  dynamic_linker='GNU/Linux ld.so'
 -  ;;
- 
+-
 -knetbsd*-gnu)
 -  version_type=linux
 -  need_lib_prefix=no
@@ -42891,7 +42125,7 @@
 -  hardcode_into_libs=yes
 -  dynamic_linker='GNU ld.so'
 -  ;;
- 
+-
 -netbsd*)
 -  version_type=sunos
 -  need_lib_prefix=no
@@ -42909,14 +42143,14 @@
 -  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
@@ -42926,7 +42160,7 @@
 -  shlibpath_var=LD_LIBRARY_PATH
 -  shlibpath_overrides_runpath=yes
 -  ;;
- 
+-
 -openbsd*)
 -  version_type=sunos
 -  sys_lib_dlsearch_path_spec="/usr/lib"
@@ -42952,7 +42186,7 @@
 -    shlibpath_overrides_runpath=yes
 -  fi
 -  ;;
- 
+-
 -os2*)
 -  libname_spec='$name'
 -  shrext_cmds=".dll"
@@ -42961,7 +42195,7 @@
 -  dynamic_linker='OS/2 ld.exe'
 -  shlibpath_var=LIBPATH
 -  ;;
- 
+-
 -osf3* | osf4* | osf5*)
 -  version_type=osf
 -  need_lib_prefix=no
@@ -42972,7 +42206,7 @@
 -  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
@@ -42985,7 +42219,7 @@
 -  # 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'
@@ -42997,7 +42231,7 @@
 -  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}'
@@ -43021,7 +42255,7 @@
 -      ;;
 -  esac
 -  ;;
- 
+-
 -sysv4*MP*)
 -  if test -d /usr/nec ;then
 -    version_type=linux
@@ -43030,7 +42264,7 @@
 -    shlibpath_var=LD_LIBRARY_PATH
 -  fi
 -  ;;
- 
+-
 -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
 -  version_type=freebsd-elf
 -  need_lib_prefix=no
@@ -43053,7 +42287,7 @@
 -  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}'
@@ -43073,14 +42307,14 @@
 -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
@@ -43101,7 +42335,7 @@
 -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
@@ -43110,8 +42344,8 @@
 -  # 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
@@ -43191,201 +42425,201 @@
 -      ;;
 -    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"\`
@@ -43393,388 +42627,172 @@
 -# 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
-+  { $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
- 
+-
 -# Commands used to finish a libtool library installation in a directory.
 -finish_cmds=$lt_finish_cmds
-+  # 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_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
-+else
-+  # We cannot hardcode anything, or else we can only hardcode existing
-+  # directories.
-+  hardcode_action=unsupported
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
-+$as_echo "$hardcode_action" >&6; }
- 
+-
 -# Same as above, but a single script fragment to be evaled but not shown.
 -finish_eval=$lt_finish_eval
-+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 ||
-+     test "$enable_shared" = no; then
-+  # Fast installation is not necessary
-+  enable_fast_install=needless
-+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
- 
+-
 -# 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
-+  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=
- 
+-
 -# How to hardcode a shared library path into an executable.
 -hardcode_action=$hardcode_action_CXX
-+  case $host_os in
-+  beos*)
-+    lt_cv_dlopen="load_add_on"
-+    lt_cv_dlopen_libs=
-+    lt_cv_dlopen_self=yes
-+    ;;
- 
+-
 -# Whether we should hardcode library paths into libraries.
 -hardcode_into_libs=$hardcode_into_libs
-+  mingw* | pw32* | cegcc*)
-+    lt_cv_dlopen="LoadLibrary"
-+    lt_cv_dlopen_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
-+  cygwin*)
-+    lt_cv_dlopen="dlopen"
-+    lt_cv_dlopen_libs=
-+    ;;
- 
+-
 -# 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
-+  darwin*)
-+  # if libdl is installed we need to link against it
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-+$as_echo_n "checking for dlopen in -ldl... " >&6; }
-+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"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
- 
+-
 -# Whether we need a single -rpath flag with a separated argument.
 -hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
-+/* 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
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_dl_dlopen=yes
-+else
-+  ac_cv_lib_dl_dlopen=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_dl_dlopen" >&5
-+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
-+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-+else
- 
+-
 -# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
 -# resulting binary.
 -hardcode_direct=$hardcode_direct_CXX
-+    lt_cv_dlopen="dyld"
-+    lt_cv_dlopen_libs=
-+    lt_cv_dlopen_self=yes
- 
+-
 -# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
 -# resulting binary.
 -hardcode_minus_L=$hardcode_minus_L_CXX
-+fi
- 
+-
 -# 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
-+  *)
-+    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
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
-+$as_echo_n "checking for shl_load in -ldld... " >&6; }
-+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"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
++    '$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=$?
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; } 2>conftest.err; then
++        soname=conftest
++        lib=conftest
++        libobjs=conftest.$ac_objext
++        deplibs=
++        wl=$lt_prog_compiler_wl
++	pic_flag=$lt_prog_compiler_pic
++        compiler_flags=-v
++        linker_flags=-v
++        verstring=
++        output_objdir=.
++        libname=conftest
++        lt_save_allow_undefined_flag=$allow_undefined_flag
++        allow_undefined_flag=
++        if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
++  (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
++  ac_status=$?
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }
++        then
++	  archive_cmds_need_lc=no
++        else
++	  archive_cmds_need_lc=yes
++        fi
++        allow_undefined_flag=$lt_save_allow_undefined_flag
++      else
++        cat conftest.err 1>&5
++      fi
++      $RM conftest*
++      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5
++$as_echo "$archive_cmds_need_lc" >&6; }
++      ;;
++    esac
++  fi
++  ;;
++esac
  
 -# 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"\`
-+/* 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
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_dld_shl_load=yes
-+else
-+  ac_cv_lib_dld_shl_load=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_dld_shl_load" >&5
-+$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
-+if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
-+  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
-+else
-+  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
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-+$as_echo_n "checking for dlopen in -ldl... " >&6; }
-+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"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
  
 -# Run-time system search path for libraries
 -sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-+/* 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
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_dl_dlopen=yes
-+else
-+  ac_cv_lib_dl_dlopen=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_dl_dlopen" >&5
-+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
-+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
-+$as_echo_n "checking for dlopen in -lsvld... " >&6; }
-+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"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
  
 -# Fix the shell variable \$srcfile for the compiler.
 -fix_srcfile_path="$fix_srcfile_path_CXX"
-+/* 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
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_svld_dlopen=yes
-+else
-+  ac_cv_lib_svld_dlopen=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_svld_dlopen" >&5
-+$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
-+if test "x$ac_cv_lib_svld_dlopen" = x""yes; then :
-+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
-+$as_echo_n "checking for dld_link in -ldld... " >&6; }
-+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"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
  
 -# Set to yes if exported symbols are required.
 -always_export_symbols=$always_export_symbols_CXX
-+/* 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
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_dld_dld_link=yes
-+else
-+  ac_cv_lib_dld_dld_link=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_dld_dld_link" >&5
-+$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
-+if test "x$ac_cv_lib_dld_dld_link" = x""yes; then :
-+  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
-+fi
  
 -# 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
-+fi
  
 -# 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
-+fi
  
 -# ### END LIBTOOL TAG CONFIG: $tagname
  
 -__EOF__
-+fi
  
  
 -else
@@ -43785,7 +42803,7 @@
 -  if test -f "$ltmain_in"; then
 -    test -f Makefile && make "$ltmain"
 -  fi
- fi
+-fi
  
  
 -ac_ext=c
@@ -43793,7 +42811,7 @@
 -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
@@ -43804,22 +42822,14 @@
 -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
  
 -	else
 -	  tagname=""
 -	fi
 -	;;
-+    ;;
-+  esac
  
 -      F77)
 -	if test -n "$F77" && test "X$F77" != "Xno"; then
-+  if test "x$lt_cv_dlopen" != xno; then
-+    enable_dlopen=yes
-+  else
-+    enable_dlopen=no
-+  fi
  
 -ac_ext=f
 -ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
@@ -43845,99 +42855,31 @@
 -no_undefined_flag_F77=
 -whole_archive_flag_spec_F77=
 -enable_shared_with_static_runtimes_F77=no
-+  case $lt_cv_dlopen in
-+  dlopen)
-+    save_CPPFLAGS="$CPPFLAGS"
-+    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
  
 -# Source file extension for f77 test sources.
 -ac_ext=f
-+    save_LDFLAGS="$LDFLAGS"
-+    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
  
 -# Object file extension for compiled f77 test sources.
 -objext=o
 -objext_F77=$objext
-+    save_LIBS="$LIBS"
-+    LIBS="$lt_cv_dlopen_libs $LIBS"
  
 -# Code to be used in simple compile tests
 -lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
-+    { $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; }
-+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
-+#line 11211 "configure"
-+#include "confdefs.h"
  
 -# Code to be used in simple link tests
 -lt_simple_link_test_code="      program t\n      end\n"
-+#if HAVE_DLFCN_H
-+#include <dlfcn.h>
-+#endif
  
 -# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-+#include <stdio.h>
  
 -# If no C compiler was specified, use CC.
 -LTCC=${LTCC-"$CC"}
-+#ifdef RTLD_GLOBAL
-+#  define LT_DLGLOBAL		RTLD_GLOBAL
-+#else
-+#  ifdef DL_GLOBAL
-+#    define LT_DLGLOBAL		DL_GLOBAL
-+#  else
-+#    define LT_DLGLOBAL		0
-+#  endif
-+#endif
  
 -# If no C compiler flags were specified, use CFLAGS.
 -LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-+/* 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
  
 -# Allow CC to be a program name with arguments.
 -compiler=$CC
-+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 ());
  
 -# save warnings/boilerplate of simple test code
 -ac_outfile=conftest.$ac_objext
@@ -43945,27 +42887,6 @@
 -eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 -_lt_compiler_boilerplate=`cat conftest.err`
 -$rm conftest*
-+  return status;
-+}
-+_LT_EOF
-+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  $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*
  
 -ac_outfile=conftest.$ac_objext
 -printf "$lt_simple_link_test_code" >conftest.$ac_ext
@@ -43973,9 +42894,6 @@
 -_lt_linker_boilerplate=`cat conftest.err`
 -$rm conftest*
  
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
-+$as_echo "$lt_cv_dlopen_self" >&6; }
  
 -# Allow CC to be a program name with arguments.
 -lt_save_CC="$CC"
@@ -43991,44 +42909,16 @@
 -  esac
 -done
 -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-+    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:${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; }
-+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
-+#line 11307 "configure"
-+#include "confdefs.h"
  
-+#if HAVE_DLFCN_H
-+#include <dlfcn.h>
-+#endif
  
 -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
-+#include <stdio.h>
  
 -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
-+#ifdef RTLD_GLOBAL
-+#  define LT_DLGLOBAL		RTLD_GLOBAL
-+#else
-+#  ifdef DL_GLOBAL
-+#    define LT_DLGLOBAL		DL_GLOBAL
-+#  else
-+#    define LT_DLGLOBAL		0
-+#  endif
-+#endif
  
 -# On AIX, shared libraries and static libraries use the same namespace, and
 -# are all built from PIC.
@@ -44043,68 +42933,11 @@
 -aix4* | aix5*)
 -  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
 -    test "$enable_shared" = yes && enable_static=no
-+/* 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 { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  $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
 -  ;;
 -esac
 -echo "$as_me:$LINENO: result: $enable_shared" >&5
 -echo "${ECHO_T}$enable_shared" >&6
-+fi
-+rm -fr conftest*
  
 -echo "$as_me:$LINENO: checking whether to build static libraries" >&5
 -echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6
@@ -44122,19 +42955,10 @@
  
 -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
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
-+$as_echo "$lt_cv_dlopen_self_static" >&6; }
-+    fi
  
 -  if test "$GCC" = yes; then
 -    lt_prog_compiler_wl_F77='-Wl,'
 -    lt_prog_compiler_static_F77='-static'
-+    CPPFLAGS="$save_CPPFLAGS"
-+    LDFLAGS="$save_LDFLAGS"
-+    LIBS="$save_LIBS"
-+    ;;
-+  esac
  
 -    case $host_os in
 -      aix*)
@@ -44144,10 +42968,6 @@
 -	lt_prog_compiler_static_F77='-Bstatic'
 -      fi
 -      ;;
-+  case $lt_cv_dlopen_self in
-+  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-+  *) enable_dlopen_self=unknown ;;
-+  esac
  
 -    amigaos*)
 -      # FIXME: we need at least 68020 code to build shared libraries, but
@@ -44155,11 +42975,6 @@
 -      # like `-m68040'.
 -      lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
 -      ;;
-+  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
  
 -    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
 -      # PIC is the default for these OSes.
@@ -44318,35 +43133,6 @@
 -      lt_prog_compiler_pic_F77='-KPIC'
 -      lt_prog_compiler_static_F77='-Bstatic'
 -      ;;
-+striplib=
-+old_striplib=
-+{ $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 "$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 "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+    else
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+    fi
-+    ;;
-+  *)
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+    ;;
-+  esac
-+fi
  
 -    sysv4*MP*)
 -      if test -d /usr/nec ;then
@@ -44438,47 +43224,11 @@
 -  # For platforms which do not support PIC, -DPIC is meaningless:
 -  *djgpp*)
 -    lt_prog_compiler_pic_F77=
-+
-+  # Report which library types will actually be built
-+  { $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 "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
-+$as_echo "$can_build_shared" >&6; }
-+
-+  { $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
-+
-+  # 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
-     ;;
+-    ;;
 -  *)
 -    lt_prog_compiler_pic_F77="$lt_prog_compiler_pic_F77"
-+
-+  aix[4-9]*)
-+    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-+      test "$enable_shared" = yes && enable_static=no
-+    fi
-     ;;
+-    ;;
 -esac
-+  esac
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
-+$as_echo "$enable_shared" >&6; }
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
-+$as_echo_n "checking whether to build static libraries... " >&6; }
-+  # Make sure either enable_shared or enable_static is yes.
-+  test "$enable_shared" = yes || enable_static=yes
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
-+$as_echo "$enable_static" >&6; }
-+
  
 -#
 -# Check to make sure the static flag actually works.
@@ -44519,14 +43269,8 @@
 -    :
 -else
 -    lt_prog_compiler_static_F77=
- fi
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-fi
  
-+CC="$lt_save_CC"
  
 -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
@@ -44573,40 +43317,11 @@
 -   cd ..
 -   rmdir conftest
 -   $rm conftest*
-+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
  
 -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
-+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 C++ test sources.
-+ac_ext=cpp
  
 -hard_links="nottested"
 -if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then
@@ -44629,19 +43344,9 @@
 -else
 -  need_locks=no
 -fi
-+# Object file extension for compiled C++ test sources.
-+objext=o
-+objext_CXX=$objext
  
 -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
-+# 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;"
  
 -  runpath_var=
 -  allow_undefined_flag_F77=
@@ -44689,8 +43394,6 @@
 -  esac
 -done
 -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-+  # Code to be used in simple link tests
-+  lt_simple_link_test_code='int main(int, char *[]) { return(0); }'
  
 -  case $host_os in
 -  cygwin* | mingw* | pw32*)
@@ -44709,7 +43412,6 @@
 -    with_gnu_ld=no
 -    ;;
 -  esac
-+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
  
 -  ld_shlibs_F77=yes
 -  if test "$with_gnu_ld" = yes; then
@@ -44768,8 +43470,6 @@
 -      # them.
 -      ld_shlibs_F77=no
 -      ;;
-+# If no C compiler was specified, use CC.
-+LTCC=${LTCC-"$CC"}
  
 -    beos*)
 -      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -44781,8 +43481,6 @@
 -	ld_shlibs_F77=no
 -      fi
 -      ;;
-+# If no C compiler flags were specified, use CFLAGS.
-+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
  
 -    cygwin* | mingw* | pw32*)
 -      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless,
@@ -44792,8 +43490,6 @@
 -      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'
-+# Allow CC to be a program name with arguments.
-+compiler=$CC
  
 -      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'
@@ -44825,12 +43521,6 @@
 -      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'
 -      ;;
-+  # 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*
  
 -    linux*)
 -      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -44851,11 +43541,6 @@
 -	  tmp_addflag=' -nofor_main' ;;
 -	esac
 -	archive_cmds_F77='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+  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*
  
 -	if test $supports_anon_versioning = yes; then
 -	  archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
@@ -44877,36 +43562,6 @@
 -	archive_expsym_cmds_F77='$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
@@ -44919,14 +43574,6 @@
 -*** 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.
-+  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
  
 -EOF
 -      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -44936,8 +43583,6 @@
 -	ld_shlibs_F77=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
@@ -44962,81 +43607,9 @@
 -	  else
 -	    ld_shlibs_F77=no
 -	  fi
-+# Check whether --with-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.
-+  { $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 "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
-+$as_echo_n "checking for GNU ld... " >&6; }
-+else
-+  { $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
+-	;;
+-      esac
 -      ;;
-+    fi
-+  done
-+  IFS="$lt_save_ifs"
-+else
-+  lt_cv_path_LD="$LD" # Let the user override the test with a path.
-+fi
-+fi
  
 -    sunos4*)
 -      archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
@@ -45044,72 +43617,16 @@
 -      hardcode_direct_F77=yes
 -      hardcode_shlibpath_var_F77=no
 -      ;;
-+LD="$lt_cv_path_LD"
-+if test -n "$LD"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
-+$as_echo "$LD" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
-+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-+if test "${lt_cv_prog_gnu_ld+set}" = set; then :
-+  $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 "$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
  
 -    *)
 -      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'
-+
-+
-+
-+
-+
-+
-+      # 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
+-      else
 -	ld_shlibs_F77=no
 -      fi
 -      ;;
 -    esac
-+        with_gnu_ld=no
-+        wlarc=
  
 -    if test "$ld_shlibs_F77" = no; then
 -      runpath_var=
@@ -45131,13 +43648,7 @@
 -	# Neither direct hardcoding nor static linking is supported with a
 -	# broken collect2.
 -	hardcode_direct_F77=unsupported
-+        # 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
+-      fi
 -      ;;
  
 -    aix4* | aix5*)
@@ -45156,10 +43667,6 @@
 -	  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
-+      # 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"'
  
 -	# Test if we are trying to use run time linking or normal
 -	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
@@ -45173,94 +43680,33 @@
 -	  done
 -	  ;;
 -	esac
-+    else
-+      GXX=no
-+      with_gnu_ld=no
-+      wlarc=
-+    fi
  
 -	exp_sym_flag='-bexport'
 -	no_entry_flag='-bnoentry'
 -      fi
-+    # PORTME: fill in a description of your system's C++ link characteristics
-+    { $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
-+        ;;
-+      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
  
 -      # 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.
-+          # 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
  
 -      archive_cmds_F77=''
 -      hardcode_direct_F77=yes
 -      hardcode_libdir_separator_F77=':'
 -      link_all_deplibs_F77=yes
-+          exp_sym_flag='-bexport'
-+          no_entry_flag='-bnoentry'
-+        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+
-+        # 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`
+-	  collect2name=`${CC} -print-prog-name=collect2`
 -	  if test -f "$collect2name" && \
 -  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
-+	  if test -f "$collect2name" &&
-+	     strings "$collect2name" | $GREP resolve_lib_name >/dev/null
- 	  then
+-	  then
 -  	  # We have reworked collect2
 -  	  hardcode_direct_F77=yes
-+	    # We have reworked collect2
-+	    :
- 	  else
+-	  else
 -  	  # We have old collect2
 -  	  hardcode_direct_F77=unsupported
 -  	  # It fails to find uninstalled libraries when the uninstalled
@@ -45269,15 +43715,7 @@
 -  	  hardcode_minus_L_F77=yes
 -  	  hardcode_libdir_flag_spec_F77='-L$libdir'
 -  	  hardcode_libdir_separator_F77=
-+	    # 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
+-	  fi
 -	  ;;
 -	esac
 -	shared_flag='-shared'
@@ -45291,30 +43729,13 @@
 -  	# chokes on -Wl,-G. The following line is correct:
 -	  shared_flag='-G'
 -	else
-+          esac
-+          shared_flag='-shared'
- 	  if test "$aix_use_runtimelinking" = yes; then
+-	  if test "$aix_use_runtimelinking" = yes; then
 -	    shared_flag='${wl}-G'
 -	  else
 -	    shared_flag='${wl}-bM:SRE'
-+	    shared_flag="$shared_flag "'${wl}-G'
- 	  fi
+-	  fi
 -	fi
 -      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.
@@ -45351,19 +43772,6 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+        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.  */
  
 -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
 -}'`
@@ -45373,34 +43781,11 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_link "$LINENO"; then :
  
-+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 conftest.err conftest.$ac_objext \
 -      conftest$ac_exeext conftest.$ac_ext
-+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
+-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"
@@ -45438,7 +43823,6 @@
 -  ac_status=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+          hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
  
 -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
 -}'`
@@ -45448,46 +43832,11 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+          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.  */
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_link "$LINENO"; then :
  
-+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
+-fi
 -rm -f conftest.err conftest.$ac_objext \
 -      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
+-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,
@@ -45499,33 +43848,9 @@
 -	  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'
-+	    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
-+        ;;
-+
-+      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
+-	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)'
@@ -45534,42 +43859,10 @@
 -      # see comment about different semantics on the GNU ld section
 -      ld_shlibs_F77=no
 -      ;;
-+      chorus*)
-+        case $cc_basename in
-+          *)
-+	  # FIXME: insert proper C++ library support
-+	  ld_shlibs_CXX=no
-+	  ;;
-+        esac
-+        ;;
  
 -    bsdi[45]*)
 -      export_dynamic_flag_spec_F77=-rdynamic
 -      ;;
-+      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*)
  
 -    cygwin* | mingw* | pw32*)
 -      # When not using gcc, we currently assume that we are using
@@ -45639,29 +43932,9 @@
 -         ld_shlibs_F77=no
 -          ;;
 -      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
-+  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
 -      ;;
--
+ 
 -    dgux*)
 -      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
 -      hardcode_libdir_flag_spec_F77='-L$libdir'
@@ -45671,7 +43944,7 @@
 -    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
@@ -45682,9 +43955,6 @@
 -      hardcode_direct_F77=yes
 -      hardcode_shlibpath_var_F77=no
 -      ;;
-+  else
-+  ld_shlibs_CXX=no
-+  fi
  
 -    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
 -    freebsd2*)
@@ -45693,7 +43963,6 @@
 -      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*)
@@ -45702,23 +43971,6 @@
 -      hardcode_direct_F77=yes
 -      hardcode_shlibpath_var_F77=no
 -      ;;
-+      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
-+        ;;
  
 -    hpux9*)
 -      if test "$GCC" = yes; then
@@ -45729,20 +43981,12 @@
 -      hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
 -      hardcode_libdir_separator_F77=:
 -      hardcode_direct_F77=yes
-+      freebsd[12]*)
-+        # C++ shared libraries reported to be fairly broken before
-+	# switch to ELF
-+        ld_shlibs_CXX=no
-+        ;;
  
 -      # 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'
 -      ;;
-+      freebsd-elf*)
-+        archive_cmds_need_lc_CXX=no
-+        ;;
  
 -    hpux10*)
 -      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
@@ -45753,58 +43997,15 @@
 -      if test "$with_gnu_ld" = no; then
 -	hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
 -	hardcode_libdir_separator_F77=:
-+      freebsd* | dragonfly*)
-+        # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-+        # conventions
-+        ld_shlibs_CXX=yes
-+        ;;
  
 -	hardcode_direct_F77=yes
 -	export_dynamic_flag_spec_F77='${wl}-E'
-+      gnu*)
-+        ;;
  
 -	# hardcode_minus_L: Not really in the search PATH,
 -	# but as the default location of the library.
 -	hardcode_minus_L_F77=yes
 -      fi
 -      ;;
-+      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
-+        ;;
  
 -    hpux11*)
 -      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
@@ -45835,10 +44036,6 @@
 -      if test "$with_gnu_ld" = no; then
 -	hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
 -	hardcode_libdir_separator_F77=:
-+      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*)
@@ -45849,27 +44046,6 @@
 -	*)
 -	  hardcode_direct_F77=yes
 -	  export_dynamic_flag_spec_F77='${wl}-E'
-+          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
  
 -	  # hardcode_minus_L: Not really in the search PATH,
 -	  # but as the default location of the library.
@@ -45878,55 +44054,6 @@
 -	esac
 -      fi
 -      ;;
-+        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
-+        ;;
  
 -    irix5* | irix6* | nonstopux*)
 -      if test "$GCC" = yes; then
@@ -45939,47 +44066,6 @@
 -      hardcode_libdir_separator_F77=:
 -      link_all_deplibs_F77=yes
 -      ;;
-+      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
-+        ;;
  
 -    netbsd*)
 -      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
@@ -45991,85 +44077,6 @@
 -      hardcode_direct_F77=yes
 -      hardcode_shlibpath_var_F77=no
 -      ;;
-+      linux* | k*bsd*-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
  
 -    newsos6)
 -      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
@@ -46078,14 +44085,6 @@
 -      hardcode_libdir_separator_F77=:
 -      hardcode_shlibpath_var_F77=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'
  
 -    openbsd*)
 -      hardcode_direct_F77=yes
@@ -46108,9 +44107,6 @@
 -       esac
 -      fi
 -      ;;
-+	    runpath_var=LD_RUN_PATH
-+	    hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-+	    hardcode_libdir_separator_CXX=:
  
 -    os2*)
 -      hardcode_libdir_flag_spec_F77='-L$libdir'
@@ -46119,54 +44115,6 @@
 -      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'
 -      ;;
-+	    # 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
-+	;;
  
 -    osf3*)
 -      if test "$GCC" = yes; then
@@ -46179,10 +44127,6 @@
 -      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
 -      hardcode_libdir_separator_F77=:
 -      ;;
-+      lynxos*)
-+        # FIXME: insert proper C++ library support
-+	ld_shlibs_CXX=no
-+	;;
  
 -    osf4* | osf5*)	# as osf3* with the addition of -msym flag
 -      if test "$GCC" = yes; then
@@ -46194,28 +44138,12 @@
 -	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'
-+      m88k*)
-+        # FIXME: insert proper C++ library support
-+        ld_shlibs_CXX=no
-+	;;
  
 -	# Both c and cxx compiler support -rpath directly
 -	hardcode_libdir_flag_spec_F77='-rpath $libdir'
 -      fi
 -      hardcode_libdir_separator_F77=:
 -      ;;
-+      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
-+	;;
  
 -    solaris*)
 -      no_undefined_flag_F77=' -z text'
@@ -46249,17 +44177,6 @@
 -      esac
 -      link_all_deplibs_F77=yes
 -      ;;
-+      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::"'
-+	;;
  
 -    sunos4*)
 -      if test "x$host_vendor" = xsequent; then
@@ -46274,19 +44191,13 @@
 -      hardcode_minus_L_F77=yes
 -      hardcode_shlibpath_var_F77=no
 -      ;;
-+      *nto* | *qnx*)
-+        ld_shlibs_CXX=yes
-+	;;
  
 -    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???
-+      openbsd2*)
-+        # C++ shared libraries are fairly broken
-+	ld_shlibs_CXX=no
- 	;;
+-	;;
 -	siemens)
 -	  ## LD is ld it makes a PLAMLIB
 -	  ## CC just makes a GrossModule.
@@ -46297,24 +44208,7 @@
 -	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
-+
-+      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
- 	;;
+-	;;
 -      esac
 -      runpath_var='LD_RUN_PATH'
 -      hardcode_shlibpath_var_F77=no
@@ -46325,48 +44219,6 @@
 -      hardcode_shlibpath_var_F77=no
 -      export_dynamic_flag_spec_F77='-Bexport'
 -      ;;
-+      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
  
 -    sysv4*MP*)
 -      if test -d /usr/nec; then
@@ -46377,50 +44229,12 @@
 -	ld_shlibs_F77=yes
 -      fi
 -      ;;
-+	    hardcode_libdir_separator_CXX=:
  
 -    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'
-+	    # 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
-+        ;;
  
 -      if test "$GCC" = yes; then
 -	archive_cmds_F77='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -46430,10 +44244,6 @@
 -	archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 -      fi
 -      ;;
-+      psos*)
-+        # FIXME: insert proper C++ library support
-+        ld_shlibs_CXX=no
-+        ;;
  
 -    sysv5* | sco3.2v5* | sco5v6*)
 -      # Note: We can NOT use -z defs as we might desire, because we do not
@@ -46450,106 +44260,7 @@
 -      hardcode_libdir_separator_F77=':'
 -      link_all_deplibs_F77=yes
 -      export_dynamic_flag_spec_F77='${wl}-Bexport'
-+      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 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
-+
-+	    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'
-+	    ;;
-+          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'
-+	    ;;
-+          *)
-+	    # 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
-+        ;;
-+
-+    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'
+-      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'
@@ -46558,72 +44269,23 @@
 -	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
-+      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
-       ;;
+-      ;;
  
 -    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
 -      ;;
-+      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'
  
 -    *)
 -      ld_shlibs_F77=no
-+	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
-       ;;
+-      ;;
 -    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
-+      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
-+        ;;
  
 -#
 -# Do we need to explicitly link libc?
@@ -46632,10 +44294,6 @@
 -x|xyes)
 -  # Assume -lc should be added
 -  archive_cmds_need_lc_F77=yes
-+      vxworks*)
-+        # FIXME: insert proper C++ library support
-+        ld_shlibs_CXX=no
-+        ;;
  
 -  if test "$enable_shared" = yes && test "$GCC" = yes; then
 -    case $archive_cmds_F77 in
@@ -46650,44 +44308,10 @@
 -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
-+      *)
-+        # 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
  
 -      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=$?
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } 2>conftest.err; then
 -        soname=conftest
@@ -46721,99 +44345,73 @@
 -      echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
 -echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6
 -      ;;
-+  $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.
-+
-+  # 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 "$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
+-    esac
 -  fi
 -  ;;
 -esac
-+  done
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
++$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
--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
++  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
@@ -46825,243 +44423,137 @@
 -  else
 -    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
 -  fi
-+  # Clean up.
-+  rm -f a.out a.exe
- else
+-else
 -  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-+  echo "libtool.m4: error: problem compiling CXX test program"
- fi
--need_lib_prefix=unknown
--hardcode_into_libs=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
-+$RM -f confest.$objext
- 
-+# PORTME: override above test on systems where it is broken
- 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'
-+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=
+@@ -14512,7 +10225,7 @@
+   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 '
++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
--	:
--      else
--	can_build_shared=no
--      fi
-+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
--    # 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'
-+
-+    if test "$solaris_use_stlport4" != yes; then
-+      postdeps_CXX='-library=Cstd -library=Crun'
-     fi
--    shlibpath_var=LIBPATH
--  fi
-+    ;;
-+  esac
++	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
+ 	:
+       else
+ 	can_build_shared=no
+@@ -14557,9 +10270,18 @@
    ;;
  
--amigaos*)
+ 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'
--  ;;
-+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
- 
--beos*)
--  library_names_spec='${libname}${shared_ext}'
--  dynamic_linker="$host_os ld.so"
--  shlibpath_var=LIBRARY_PATH
-+    # 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
++  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
    ;;
-+esac
  
--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
--  ;;
+ beos*)
+@@ -14582,25 +10304,28 @@
+   # libtool to hard-code these into programs
+   ;;
  
 -cygwin* | mingw* | pw32*)
--  version_type=windows
--  shrext_cmds=".dll"
--  need_version=no
--  need_lib_prefix=no
-+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
++cygwin* | mingw* | pw32* | cegcc*)
+   version_type=windows
+   shrext_cmds=".dll"
+   need_version=no
+   need_lib_prefix=no
  
--  case $GCC,$host_os in
+   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}`~
++  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~
++      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~
++      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
++       $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"
--      ;;
+     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 DLLs use traditional 'lib' prefix
--      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++    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=`$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/;/ /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
++        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'
--  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`'
++  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_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
--  ;;
++
++  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
--  ;;
+@@ -14673,18 +10394,6 @@
+   dynamic_linker=no
+   ;;
  
--freebsd1*)
--  dynamic_linker=no
--  ;;
- 
 -kfreebsd*-gnu)
 -  version_type=linux
 -  need_lib_prefix=no
@@ -47073,83 +44565,23 @@
 -  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* | 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
--    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
--    ;;
++  *) # 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
@@ -47162,86 +44594,73 @@
 -     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'
--  ;;
++  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*)
--  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
--  ;;
++interix[3-9]*)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -14840,7 +10549,7 @@
+   ;;
  
--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.
+ # 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
++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\""
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++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
++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
  
 -  # find out which ABI we are using
 -  libsuff=
@@ -47263,218 +44682,145 @@
 -    rm -rf conftest*
 -    ;;
 -  esac
- 
--  # Append ld.so.conf contents to the search path
--  if test -f /etc/ld.so.conf; then
+-
+   # 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
++    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'
--  ;;
+   # 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)
--  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
++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
+ 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
--  ;;
++  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
+   ;;
  
--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
++*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*)
--  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
+ 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  ;;
--  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
++    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
--  ;;
++  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"
+   ;;
  
--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
++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)
--      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'
+       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'
+   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'
--  ;;
+     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'
+   ;;
  
--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
++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 @@
+   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
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
++$as_echo "$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
-+    lt_prog_compiler_wl_CXX=
-+lt_prog_compiler_pic_CXX=
-+lt_prog_compiler_static_CXX=
+ 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
  
 -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
@@ -47482,65 +44828,145 @@
 -if test -n "$hardcode_libdir_flag_spec_F77" || \
 -   test -n "$runpath_var_F77" || \
 -   test "X$hardcode_automatic_F77" = "Xyes" ; then
-+{ $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; }
++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 &&
--     # 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
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++  { $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
--    # Linking always hardcodes the temporary library directory.
++     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no &&
++     test "$hardcode_minus_L" != no; then
+     # Linking always hardcodes the temporary library directory.
 -    hardcode_action_F77=relink
--  else
--    # We can link without hardcoding, and we can hardcode nonexisting dirs.
++    hardcode_action=relink
+   else
+     # We can link without hardcoding, and we can hardcode nonexisting dirs.
 -    hardcode_action_F77=immediate
--  fi
--else
--  # We cannot hardcode anything, or else we can only hardcode existing
--  # directories.
++    hardcode_action=immediate
+   fi
+ else
+   # We cannot hardcode anything, or else we can only hardcode existing
+   # directories.
 -  hardcode_action_F77=unsupported
--fi
++  hardcode_action=unsupported
+ fi
 -echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
 -echo "${ECHO_T}$hardcode_action_F77" >&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'
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
++$as_echo "$hardcode_action" >&6; }
  
 -if test "$hardcode_action_F77" = 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
-+    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
-+      ;;
++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
  
-+    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
-+      ;;
  
 -# The else clause should only fire when bootstrapping the
 -# libtool distribution, otherwise you forgot to ship ltmain.sh
@@ -47615,215 +45041,640 @@
 -    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\"\`\\\""
-+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-+      # PIC is the default for these OSes.
-       ;;
+-      ;;
 -    *)
 -      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-+    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'
-       ;;
+-      ;;
 -    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
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
++$as_echo_n "checking for dlopen in -ldl... " >&6; }
++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"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* 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
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_lib_dl_dlopen=yes
++else
++  ac_cv_lib_dl_dlopen=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_dl_dlopen" >&5
++$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
++if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
++  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
+ 
 -# 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
--
++  *)
++    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
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
++$as_echo_n "checking for shl_load in -ldld... " >&6; }
++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"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* 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
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_lib_dld_shl_load=yes
++else
++  ac_cv_lib_dld_shl_load=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_dld_shl_load" >&5
++$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
++if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
++  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
++else
++  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
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
++$as_echo_n "checking for dlopen in -ldl... " >&6; }
++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"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* 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
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_lib_dl_dlopen=yes
++else
++  ac_cv_lib_dl_dlopen=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_dl_dlopen" >&5
++$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
++if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
++  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
++$as_echo_n "checking for dlopen in -lsvld... " >&6; }
++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"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* 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
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_lib_svld_dlopen=yes
++else
++  ac_cv_lib_svld_dlopen=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_svld_dlopen" >&5
++$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
++if test "x$ac_cv_lib_svld_dlopen" = x""yes; then :
++  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
++$as_echo_n "checking for dld_link in -ldld... " >&6; }
++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"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* 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
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_lib_dld_dld_link=yes
++else
++  ac_cv_lib_dld_dld_link=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_dld_dld_link" >&5
++$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
++if test "x$ac_cv_lib_dld_dld_link" = x""yes; then :
++  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
++fi
+ 
 -# Is the compiler the GNU C compiler?
 -with_gcc=$GCC_F77
--
+ 
 -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:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
++$as_echo_n "checking whether a program can dlopen itself... " >&6; }
++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
++#line 11239 "configure"
++#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 { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  $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*
+ 
 -# 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
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
++$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\"
++      { $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; }
++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
++#line 11335 "configure"
++#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 { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  $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*
+ 
 -# Library versioning type.
 -version_type=$version_type
--
+ 
 -# Format of library name prefix.
 -libname_spec=$lt_libname_spec
--
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
++$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
+ 
 -# 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"\`
@@ -47839,57 +45690,86 @@
 -# 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=
++{ $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 "$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 "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++    else
++      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++    fi
++    ;;
++  *)
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++    ;;
++  esac
++fi
+ 
 -# 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.
@@ -47913,43 +45793,75 @@
 -# 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
++  { $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 "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
++$as_echo "$can_build_shared" >&6; }
+ 
 -# The commands to list exported symbols.
 -export_symbols_cmds=$lt_export_symbols_cmds_F77
--
++  { $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
+ 
 -# 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
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
++$as_echo "$enable_shared" >&6; }
+ 
 -# Symbols that must always be exported.
 -include_expsyms=$lt_include_expsyms_F77
--
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
++$as_echo_n "checking whether to build static libraries... " >&6; }
++  # Make sure either enable_shared or enable_static is yes.
++  test "$enable_shared" = yes || enable_static=yes
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
++$as_echo "$enable_static" >&6; }
+ 
 -# ### 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
@@ -47958,17 +45870,16 @@
 -  if test -f "$ltmain_in"; then
 -    test -f Makefile && make "$ltmain"
 -  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
--
--CC="$lt_save_CC"
--
+ 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
@@ -47976,81 +45887,168 @@
 -
 -      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.
--objext=o
++# 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
+ 
 -
--# 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`
++
++  # 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
--eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
--_lt_linker_boilerplate=`cat conftest.err`
++  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
--  case $cc_temp in
--    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
--    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
--    \-*) ;;
--    *) break;;
--  esac
--done
++  # 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
--else
++# Check whether --with-gnu-ld was given.
++if test "${with_gnu_ld+set}" = set; then :
++  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
@@ -48080,18 +46078,83 @@
 -   fi
 -   $rm conftest*
 -
--fi
++  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"
--else
++ac_prog=ld
++if test "$GCC" = yes; then
++  # Check if gcc -print-prog-name=ld gives a path.
++  { $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 "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
++$as_echo_n "checking for GNU ld... " >&6; }
+ else
 -    :
--fi
++  { $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.
+ fi
 -
--fi
--
+ fi
+ 
 -lt_prog_compiler_wl_GCJ=
 -lt_prog_compiler_pic_GCJ=
 -lt_prog_compiler_static_GCJ=
@@ -48122,37 +46185,64 @@
 -    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
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
++$as_echo "$LD" >&6; }
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
++test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
++$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
++if test "${lt_cv_prog_gnu_ld+set}" = set; then :
++  $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 "$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
+ 
 -    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'
 -      ;;
--
+ 
 -    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.
@@ -48165,7 +46255,7 @@
 -	;;
 -      esac
 -      ;;
--
+ 
 -    *)
 -      lt_prog_compiler_pic_GCJ='-fPIC'
 -      ;;
@@ -48178,7 +46268,28 @@
 -      if test "$host_cpu" = ia64; then
 -	# AIX 5 now supports IA64 processor
 -	lt_prog_compiler_static_GCJ='-Bstatic'
--      else
++      # 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
 -      ;;
@@ -48198,7 +46309,9 @@
 -      # 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
@@ -48214,18 +46327,34 @@
 -      # 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*)
@@ -48244,7 +46373,15 @@
 -        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
++    { $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
 -      ;;
 -
@@ -48264,56 +46401,183 @@
 -	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
@@ -48347,11 +46611,19 @@
 -     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
 -     "" | " "*) ;;
@@ -48360,9 +46632,20 @@
 -else
 -    lt_prog_compiler_pic_GCJ=
 -     lt_prog_compiler_can_build_shared_GCJ=no
--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
+ fi
 -case $host_os in
 -  # For platforms which do not support PIC, -DPIC is meaningless:
 -  *djgpp*)
@@ -48372,7 +46655,10 @@
 -    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.
 -#
@@ -48403,18 +46689,74 @@
 -   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
@@ -48426,7 +46768,7 @@
 -   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.
@@ -48460,12 +46802,37 @@
 -   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
@@ -48487,10 +46854,32 @@
 -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
@@ -48537,7 +46926,10 @@
 -  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
@@ -48555,12 +46947,19 @@
 -    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.
@@ -48581,7 +46980,43 @@
 -      *\ 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*)
@@ -48589,17 +47024,213 @@
 -      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'
@@ -48613,7 +47244,15 @@
 -      # 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
@@ -48624,7 +47263,10 @@
 -	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.
@@ -48633,7 +47275,55 @@
 -      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
@@ -48649,7 +47339,11 @@
 -	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
@@ -48664,7 +47358,11 @@
 -      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=
@@ -48682,20 +47380,41 @@
 -	  tmp_addflag=' -i_dynamic -nofor_main' ;;
 -	ifc* | ifort*)			# Intel Fortran compiler
 -	  tmp_addflag=' -nofor_main' ;;
--	esac
++      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'
--	fi
++      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'
@@ -48705,19 +47424,43 @@
 -	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'
@@ -48726,20 +47469,100 @@
 -	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
 -	;;
 -	*)
@@ -48753,14 +47576,36 @@
 -	;;
 -      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'
@@ -48770,7 +47615,29 @@
 -      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=
@@ -48793,7 +47660,8 @@
 -	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
@@ -48810,7 +47678,16 @@
 -	  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.
@@ -48823,22 +47700,94 @@
 -	  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
@@ -48860,7 +47809,16 @@
 -  	  hardcode_libdir_separator_GCJ=
 -	  fi
 -	  ;;
--	esac
++	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'
@@ -48879,7 +47837,22 @@
 -	  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
@@ -48894,11 +47867,47 @@
 -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
++        ;;
+ 
 -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;
 -}
@@ -48922,10 +47931,16 @@
 -	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
--  ac_status=$?
++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.
+ 
 -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.
@@ -48934,15 +47949,27 @@
 -else
 -  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 \
 -      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
+ 
 -       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"
--       else
++    -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"
@@ -48955,11 +47982,36 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
--
++	 prev=
++       fi
+ 
 -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;
 -}
@@ -48986,7 +48038,14 @@
 -  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
+ 
 -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.
@@ -48995,12 +48054,35 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
--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 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.
@@ -49014,7 +48096,8 @@
 -	fi
 -      fi
 -      ;;
--
++$RM -f confest.$objext
+ 
 -    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'
@@ -49022,11 +48105,33 @@
 -      # 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=
++  ;;
+ 
 -    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
+ 
 -    cygwin* | mingw* | pw32*)
 -      # When not using gcc, we currently assume that we are using
 -      # Microsoft Visual C++.
@@ -49046,8 +48151,26 @@
 -      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
+ 
 -    darwin* | rhapsody*)
 -      case $host_os in
 -        rhapsody* | darwin1.[012])
@@ -49095,19 +48218,46 @@
 -         ld_shlibs_GCJ=no
 -          ;;
 -      esac
--    fi
++    # 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
++
++
++
++
++
++
++
++
++
+ 
 -    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
 -      ;;
--
+ 
 -    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
@@ -49118,7 +48268,7 @@
 -      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'
@@ -49126,7 +48276,7 @@
 -      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'
@@ -49134,7 +48284,7 @@
 -      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'
@@ -49144,13 +48294,13 @@
 -      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'
@@ -49160,16 +48310,16 @@
 -      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
@@ -49199,7 +48349,7 @@
 -      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'
@@ -49209,7 +48359,7 @@
 -	*)
 -	  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
@@ -49217,7 +48367,7 @@
 -	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'
@@ -49229,7 +48379,7 @@
 -      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
@@ -49240,7 +48390,7 @@
 -      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
@@ -49248,7 +48398,7 @@
 -      hardcode_libdir_separator_GCJ=:
 -      hardcode_shlibpath_var_GCJ=no
 -      ;;
--
+ 
 -    openbsd*)
 -      hardcode_direct_GCJ=yes
 -      hardcode_shlibpath_var_GCJ=no
@@ -49270,7 +48420,7 @@
 -       esac
 -      fi
 -      ;;
--
+ 
 -    os2*)
 -      hardcode_libdir_flag_spec_GCJ='-L$libdir'
 -      hardcode_minus_L_GCJ=yes
@@ -49278,7 +48428,7 @@
 -      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}\*'
@@ -49290,7 +48440,7 @@
 -      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}\*'
@@ -49301,13 +48451,32 @@
 -	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'
--      fi
++
++    lt_prog_compiler_wl_CXX=
++lt_prog_compiler_pic_CXX=
++lt_prog_compiler_static_CXX=
++
++{ $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=:
--      ;;
--
+       ;;
+ 
 -    solaris*)
 -      no_undefined_flag_GCJ=' -z text'
 -      if test "$GCC" = yes; then
@@ -49337,10 +48506,22 @@
 - 	*)
 - 	  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 ;;
--      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
@@ -49348,19 +48529,250 @@
 -	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'
--      fi
++    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
+ 	;;
 -	siemens)
 -	  ## LD is ld it makes a PLAMLIB
 -	  ## CC just makes a GrossModule.
@@ -49371,7 +48783,45 @@
 -	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
@@ -49443,16 +48893,30 @@
 -    *)
 -      ld_shlibs_GCJ=no
 -      ;;
--    esac
--  fi
--
+     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
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_CXX" >&5
++$as_echo "$lt_prog_compiler_pic_CXX" >&6; }
++
++
+ 
+ #
 -# 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
@@ -49471,7 +48935,41 @@
 -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
++  { $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; }
++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:'`
++   (eval echo "\"\$as_me:13291: $lt_compile\"" >&5)
++   (eval "$lt_compile" 2>conftest.err)
++   ac_status=$?
++   cat conftest.err >&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 { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>&5
 -  ac_status=$?
@@ -49512,7 +49010,10 @@
 -  fi
 -  ;;
 -esac
--
++fi
++{ $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; }
+ 
 -echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
 -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
 -library_names_spec=
@@ -49539,12 +49040,19 @@
 -  else
 -    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
 -  fi
--else
++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"
--fi
++    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
@@ -49558,7 +49066,8 @@
 -  # 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
@@ -49602,19 +49111,49 @@
 -    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\"
++{ $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; }
++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"
+ 
 -bsdi[45]*)
 -  version_type=linux
 -  need_version=no
@@ -49628,13 +49167,21 @@
 -  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
 -  # libtool to hard-code these into programs
 -  ;;
--
++fi
++{ $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; }
+ 
 -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
+ 
 -  case $GCC,$host_os in
 -  yes,cygwin* | yes,mingw* | yes,pw32*)
 -    library_names_spec='$libname.dll.a'
@@ -49649,17 +49196,13 @@
 -      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"
-+    darwin* | rhapsody*)
-+      # PIC is the default on this platform
-+      # Common symbols not allowed in MH_DYLIB files
-+      lt_prog_compiler_pic_CXX='-fno-common'
-       ;;
+-      ;;
 -    mingw*)
 -      # MinGW DLLs use traditional 'lib' prefix
 -      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
@@ -49674,288 +49217,23 @@
 -        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"`
-+    *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
-       ;;
+-      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}'
-+    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
+-      ;;
+-    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)
-+	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
-+	;;
-+      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
-+  fi
  
-+case $host_os in
-+  # For platforms which do not support PIC, -DPIC is meaningless:
-+  *djgpp*)
-+    lt_prog_compiler_pic_CXX=
-+    ;;
-   *)
+-  *)
 -    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
-+    lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
-     ;;
+-    ;;
 -  esac
 -  dynamic_linker='Win32 ld.exe'
 -  # FIXME: first we should search . and the directory the executable is in
 -  shlibpath_var=PATH
 -  ;;
-+esac
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_CXX" >&5
-+$as_echo "$lt_prog_compiler_pic_CXX" >&6; }
  
 -darwin* | rhapsody*)
 -  dynamic_linker="$host_os dyld"
@@ -49975,6 +49253,17 @@
 -  fi
 -  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
 -  ;;
++    { $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; }
++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
@@ -49984,48 +49273,47 @@
 -  soname_spec='${libname}${release}${shared_ext}$major'
 -  shlibpath_var=LD_LIBRARY_PATH
 -  ;;
- 
--freebsd1*)
--  dynamic_linker=no
--  ;;
-+#
-+# Check to make sure the PIC flag actually works.
-+#
-+if test -n "$lt_prog_compiler_pic_CXX"; then
-+  { $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; }
-+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"
++   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.
-+   # 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:13263: $lt_compile\"" >&5)
-+   (eval "$lt_compile" 2>conftest.err)
++   (eval echo "\"\$as_me:13390: $lt_compile\"" >&5)
++   (eval "$lt_compile" 2>out/conftest.err)
 +   ac_status=$?
-+   cat conftest.err >&5
-+   echo "$as_me:13267: \$? = $ac_status" >&5
-+   if (exit $ac_status) && test -s "$ac_outfile"; then
++   cat out/conftest.err >&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 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
++     # 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*
  
+-freebsd1*)
+-  dynamic_linker=no
+-  ;;
++fi
++{ $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; }
+ 
 -kfreebsd*-gnu)
 -  version_type=linux
 -  need_lib_prefix=no
@@ -50037,9 +49325,6 @@
 -  hardcode_into_libs=yes
 -  dynamic_linker='GNU ld.so'
 -  ;;
-+fi
-+{ $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; }
  
 -freebsd* | dragonfly*)
 -  # DragonFly does not have aout.  When/if they implement a new
@@ -50084,15 +49369,6 @@
 -    ;;
 -  esac
 -  ;;
-+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
-+    lt_prog_compiler_pic_CXX=
-+     lt_prog_compiler_can_build_shared_CXX=no
-+fi
  
 -gnu*)
 -  version_type=linux
@@ -50103,7 +49379,17 @@
 -  shlibpath_var=LD_LIBRARY_PATH
 -  hardcode_into_libs=yes
 -  ;;
-+fi
++    { $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; }
++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
@@ -50150,6 +49436,39 @@
 -  # 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:'`
++   (eval echo "\"\$as_me:13442: $lt_compile\"" >&5)
++   (eval "$lt_compile" 2>out/conftest.err)
++   ac_status=$?
++   cat out/conftest.err >&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*
  
 -interix3*)
 -  version_type=linux
@@ -50162,6 +49481,9 @@
 -  shlibpath_overrides_runpath=no
 -  hardcode_into_libs=yes
 -  ;;
++fi
++{ $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; }
  
 -irix5* | irix6* | nonstopux*)
 -  case $host_os in
@@ -50199,103 +49521,11 @@
 -  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
 -  hardcode_into_libs=yes
 -  ;;
-+#
-+# 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:${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; }
-+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"
-+
-+fi
-+{ $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; }
-+
-+if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
-+    :
-+else
-+    lt_prog_compiler_static_CXX=
-+fi
-+
-+
-+
-+
-+    { $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; }
-+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
-+
-+   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:13362: $lt_compile\"" >&5)
-+   (eval "$lt_compile" 2>out/conftest.err)
-+   ac_status=$?
-+   cat out/conftest.err >&5
-+   echo "$as_me:13366: \$? = $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*
  
 -# No shared lib support for Linux oldld, aout, or coff.
 -linux*oldld* | linux*aout* | linux*coff*)
 -  dynamic_linker=no
 -  ;;
-+fi
-+{ $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; }
  
 -# This must be Linux ELF.
 -linux*)
@@ -50328,28 +49558,66 @@
 -        sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
 -        ;;
 -      esac
--    fi
++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:${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 "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
++$as_echo "$hard_links" >&6; }
++  if test "$hard_links" = no; then
++    { $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*
--    ;;
--  esac
+     ;;
++  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]_.*'
  
 -  # 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
-+    { $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; }
-+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
- 
+-
 -  # 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,
@@ -50358,39 +49626,9 @@
 -  # assume the GNU/Linux dynamic linker is in use.
 -  dynamic_linker='GNU/Linux ld.so'
 -  ;;
-+   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:13414: $lt_compile\"" >&5)
-+   (eval "$lt_compile" 2>out/conftest.err)
-+   ac_status=$?
-+   cat out/conftest.err >&5
-+   echo "$as_me:13418: \$? = $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*
++{ $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
@@ -50403,9 +49641,7 @@
 -  hardcode_into_libs=yes
 -  dynamic_linker='GNU ld.so'
 -  ;;
-+fi
-+{ $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; }
++with_gnu_ld_CXX=$with_gnu_ld
  
 -netbsd*)
 -  version_type=sunos
@@ -50419,34 +49655,11 @@
 -    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'
-+
-+
-+
-+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:${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 "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
-+$as_echo "$hard_links" >&6; }
-+  if test "$hard_links" = no; then
-+    { $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
+-  fi
 -  shlibpath_var=LD_LIBRARY_PATH
 -  shlibpath_overrides_runpath=yes
 -  hardcode_into_libs=yes
 -  ;;
-+else
-+  need_locks=no
-+fi
  
 -newsos6)
 -  version_type=linux
@@ -50470,11 +49683,7 @@
 -  sys_lib_dlsearch_path_spec="/usr/lib"
 -  need_lib_prefix=no
 -  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-+    { $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
+-  case $host_os in
 -    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
 -    *)                         need_version=no  ;;
 -  esac
@@ -50493,19 +49702,8 @@
 -  else
 -    shlibpath_overrides_runpath=yes
 -  fi
-+  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
-+    ;;
-+  pw32*)
-+    export_symbols_cmds_CXX="$ltdll_cmds"
-   ;;
--
+-  ;;
+ 
 -os2*)
 -  libname_spec='$name'
 -  shrext_cmds=".dll"
@@ -50513,10 +49711,8 @@
 -  library_names_spec='$libname${shared_ext} $libname.a'
 -  dynamic_linker='OS/2 ld.exe'
 -  shlibpath_var=LIBPATH
-+  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'
-   ;;
--
+-  ;;
+ 
 -osf3* | osf4* | osf5*)
 -  version_type=osf
 -  need_lib_prefix=no
@@ -50526,10 +49722,15 @@
 -  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"
-+  linux* | k*bsd*-gnu)
-+    link_all_deplibs_CXX=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
+ 
 -solaris*)
 -  version_type=linux
 -  need_lib_prefix=no
@@ -50541,11 +49742,20 @@
 -  hardcode_into_libs=yes
 -  # ldd complains unless libraries are executable
 -  postinstall_cmds='chmod +x $lib'
-+  *)
-+    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]_.*'
+-  ;;
++  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.
++      { $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
  
 -sunos4*)
 -  version_type=sunos
@@ -50555,12 +49765,47 @@
 -  shlibpath_overrides_runpath=yes
 -  if test "$with_gnu_ld" = yes; then
 -    need_lib_prefix=no
--  fi
++      if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; } 2>conftest.err; then
++        soname=conftest
++        lib=conftest
++        libobjs=conftest.$ac_objext
++        deplibs=
++        wl=$lt_prog_compiler_wl_CXX
++	pic_flag=$lt_prog_compiler_pic_CXX
++        compiler_flags=-v
++        linker_flags=-v
++        verstring=
++        output_objdir=.
++        libname=conftest
++        lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
++        allow_undefined_flag_CXX=
++        if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
++  (eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
++  ac_status=$?
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }
++        then
++	  archive_cmds_need_lc_CXX=no
++        else
++	  archive_cmds_need_lc_CXX=yes
++        fi
++        allow_undefined_flag_CXX=$lt_save_allow_undefined_flag
++      else
++        cat conftest.err 1>&5
++      fi
++      $RM conftest*
++      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc_CXX" >&5
++$as_echo "$archive_cmds_need_lc_CXX" >&6; }
++      ;;
++    esac
+   fi
 -  need_version=yes
--  ;;
-+{ $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
+   ;;
++esac
  
 -sysv4 | sysv4.3*)
 -  version_type=linux
@@ -50582,29 +49827,10 @@
 -      need_version=no
 -      shlibpath_overrides_runpath=no
 -      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-+with_gnu_ld_CXX=$with_gnu_ld
-+
-+
-+
-+
-+
-+
-+#
-+# 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.
-       ;;
+-      ;;
 -  esac
 -  ;;
--
+ 
 -sysv4*MP*)
 -  if test -d /usr/nec ;then
 -    version_type=linux
@@ -50613,14 +49839,6 @@
 -    shlibpath_var=LD_LIBRARY_PATH
 -  fi
 -  ;;
-+    '$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
  
 -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
 -  version_type=freebsd-elf
@@ -50640,47 +49858,10 @@
 -      sco3.2v5*)
 -        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
 -	;;
-+      if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; } 2>conftest.err; then
-+        soname=conftest
-+        lib=conftest
-+        libobjs=conftest.$ac_objext
-+        deplibs=
-+        wl=$lt_prog_compiler_wl_CXX
-+	pic_flag=$lt_prog_compiler_pic_CXX
-+        compiler_flags=-v
-+        linker_flags=-v
-+        verstring=
-+        output_objdir=.
-+        libname=conftest
-+        lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
-+        allow_undefined_flag_CXX=
-+        if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
-+  (eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }
-+        then
-+	  archive_cmds_need_lc_CXX=no
-+        else
-+	  archive_cmds_need_lc_CXX=yes
-+        fi
-+        allow_undefined_flag_CXX=$lt_save_allow_undefined_flag
-+      else
-+        cat conftest.err 1>&5
-+      fi
-+      $RM conftest*
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc_CXX" >&5
-+$as_echo "$archive_cmds_need_lc_CXX" >&6; }
-+      ;;
-     esac
-   fi
+-    esac
+-  fi
 -  sys_lib_dlsearch_path_spec='/usr/lib'
-   ;;
-+esac
+-  ;;
  
 -uts4*)
 -  version_type=linux
@@ -50987,21 +50168,14 @@
  
 -# The coded name of the library, if different from the real name.
 -soname_spec=$lt_soname_spec
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
++$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
- 
--# Create an old-style archive from a shared archive.
--old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_GCJ
- 
--# 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
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
-+$as_echo_n "checking dynamic linker characteristics... " >&6; }
-+
 +library_names_spec=
 +libname_spec='lib$name'
 +soname_spec=
@@ -51017,17 +50191,26 @@
 +sys_lib_dlsearch_path_spec="/lib /usr/lib"
 +need_lib_prefix=unknown
 +hardcode_into_libs=no
-+
+ 
+-# 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'
 +  ;;
@@ -51096,7 +50279,10 @@
 +  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
@@ -51110,13 +50296,31 @@
 +  # /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'
@@ -51134,7 +50338,10 @@
 +      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'
@@ -51163,7 +50370,9 @@
 +      ;;
 +    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'
 +    ;;
@@ -51172,7 +50381,9 @@
 +  # 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
@@ -51183,10 +50394,14 @@
 +  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
@@ -51196,18 +50411,14 @@
 +  shlibpath_var=LD_LIBRARY_PATH
 +  ;;
  
--# 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
+-# Commands used to finish a libtool library installation in a directory.
+-finish_cmds=$lt_finish_cmds
 +freebsd1*)
 +  dynamic_linker=no
 +  ;;
  
--# 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
+-# 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.
@@ -51252,9 +50463,8 @@
 +  esac
 +  ;;
  
--# Commands to strip libraries.
--old_striplib=$lt_old_striplib
--striplib=$lt_striplib
+-# 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
@@ -51265,21 +50475,8 @@
 +  hardcode_into_libs=yes
 +  ;;
  
--# 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
+-# 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.
@@ -51326,9 +50523,8 @@
 +  postinstall_cmds='chmod 555 $lib'
 +  ;;
  
--# 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"\`
+-# 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
@@ -51341,8 +50537,8 @@
 +  hardcode_into_libs=yes
 +  ;;
  
--# Method to check whether dependent libraries are shared objects.
--deplibs_check_method=$lt_deplibs_check_method
+-# This is the shared library runtime path variable.
+-runpath_var=$runpath_var
 +irix5* | irix6* | nonstopux*)
 +  case $host_os in
 +    nonstopux*) version_type=nonstopux ;;
@@ -51380,17 +50576,17 @@
 +  hardcode_into_libs=yes
 +  ;;
  
--# Command to use when deplibs_check_method == file_magic.
--file_magic_cmd=$lt_file_magic_cmd
+-# 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
 +  ;;
  
--# Flag that allows shared libraries with undefined symbols to be built.
--allow_undefined_flag=$lt_allow_undefined_flag_GCJ
+-# Is shlibpath searched before the hard-coded library search path?
+-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
 +# 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
@@ -51407,14 +50603,14 @@
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
  
--# Flag that forces no undefined symbols.
--no_undefined_flag=$lt_no_undefined_flag_GCJ
+-# How to hardcode a shared library path into an executable.
+-hardcode_action=$hardcode_action_GCJ
 +int
 +main ()
 +{
  
--# Commands used to finish a libtool library installation in a directory.
--finish_cmds=$lt_finish_cmds
+-# Whether we should hardcode library paths into libraries.
+-hardcode_into_libs=$hardcode_into_libs
 +  ;
 +  return 0;
 +}
@@ -51429,23 +50625,46 @@
 +  LDFLAGS=$save_LDFLAGS
 +  libdir=$save_libdir
  
--# Same as above, but a single script fragment to be evaled but not shown.
--finish_eval=$lt_finish_eval
+-# 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
  
--# 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 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
+-
+-# Whether we need a single -rpath flag with a separated argument.
+-hardcode_libdir_separator=$lt_hardcode_libdir_separator_GCJ
+-
+-# 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
+-
+-# 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
  
--# Transform the output of nm in a proper C declaration
--global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+-# 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,
@@ -51455,8 +50674,8 @@
 +  dynamic_linker='GNU/Linux ld.so'
 +  ;;
  
--# 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
+-# 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
@@ -51469,8 +50688,8 @@
 +  dynamic_linker='NetBSD ld.elf_so'
 +  ;;
  
--# This is the shared library runtime path variable.
--runpath_var=$runpath_var
+-# 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
@@ -51489,8 +50708,8 @@
 +  hardcode_into_libs=yes
 +  ;;
  
--# This is the shared library path variable.
--shlibpath_var=$shlibpath_var
+-# 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}'
@@ -51498,8 +50717,8 @@
 +  shlibpath_overrides_runpath=yes
 +  ;;
  
--# Is shlibpath searched before the hard-coded library search path?
--shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+-# Fix the shell variable \$srcfile for the compiler.
+-fix_srcfile_path="$fix_srcfile_path_GCJ"
 +*nto* | *qnx*)
 +  version_type=qnx
 +  need_lib_prefix=no
@@ -51512,8 +50731,8 @@
 +  dynamic_linker='ldqnx.so'
 +  ;;
  
--# How to hardcode a shared library path into an executable.
--hardcode_action=$hardcode_action_GCJ
+-# 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"
@@ -51540,8 +50759,8 @@
 +  fi
 +  ;;
  
--# Whether we should hardcode library paths into libraries.
--hardcode_into_libs=$hardcode_into_libs
+-# The commands to list exported symbols.
+-export_symbols_cmds=$lt_export_symbols_cmds_GCJ
 +os2*)
 +  libname_spec='$name'
 +  shrext_cmds=".dll"
@@ -51551,9 +50770,8 @@
 +  shlibpath_var=LIBPATH
 +  ;;
  
--# 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
+-# 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
@@ -51565,36 +50783,14 @@
 +  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
 +  ;;
  
--# 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
--
--# Whether we need a single -rpath flag with a separated argument.
--hardcode_libdir_separator=$lt_hardcode_libdir_separator_GCJ
--
--# 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
--
--# 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
+-# Symbols that should not be listed in the preloaded symbols.
+-exclude_expsyms=$lt_exclude_expsyms_GCJ
 +rdos*)
 +  dynamic_linker=no
 +  ;;
  
--# Variables whose values should be saved in libtool wrapper scripts and
--# restored at relink time.
--variables_saved_for_relink="$variables_saved_for_relink"
+-# Symbols that must always be exported.
+-include_expsyms=$lt_include_expsyms_GCJ
 +solaris*)
 +  version_type=linux
 +  need_lib_prefix=no
@@ -51608,8 +50804,7 @@
 +  postinstall_cmds='chmod +x $lib'
 +  ;;
  
--# Whether libtool must link a program against all its dependency libraries.
--link_all_deplibs=$link_all_deplibs_GCJ
+-# ### END LIBTOOL TAG CONFIG: $tagname
 +sunos4*)
 +  version_type=sunos
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
@@ -51622,8 +50817,7 @@
 +  need_version=yes
 +  ;;
  
--# 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"\`
+-__EOF__
 +sysv4 | sysv4.3*)
 +  version_type=linux
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -51647,8 +50841,6 @@
 +  esac
 +  ;;
  
--# Run-time system search path for libraries
--sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
 +sysv4*MP*)
 +  if test -d /usr/nec ;then
 +    version_type=linux
@@ -51658,8 +50850,13 @@
 +  fi
 +  ;;
  
--# Fix the shell variable \$srcfile for the compiler.
--fix_srcfile_path="$fix_srcfile_path_GCJ"
+-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
@@ -51678,12 +50875,11 @@
 +        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
 +	;;
 +    esac
-+  fi
+   fi
+-fi
 +  sys_lib_dlsearch_path_spec='/usr/lib'
 +  ;;
  
--# Set to yes if exported symbols are required.
--always_export_symbols=$always_export_symbols_GCJ
 +tpf*)
 +  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
 +  version_type=linux
@@ -51695,8 +50891,11 @@
 +  hardcode_into_libs=yes
 +  ;;
  
--# The commands to list exported symbols.
--export_symbols_cmds=$lt_export_symbols_cmds_GCJ
+-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}'
@@ -51704,8 +50903,7 @@
 +  shlibpath_var=LD_LIBRARY_PATH
 +  ;;
  
--# The commands to extract the exported symbol list from a shared archive.
--extract_expsyms_cmds=$lt_extract_expsyms_cmds
+-CC="$lt_save_CC"
 +*)
 +  dynamic_linker=no
 +  ;;
@@ -51714,15 +50912,15 @@
 +$as_echo "$dynamic_linker" >&6; }
 +test "$dynamic_linker" = no && can_build_shared=no
  
--# Symbols that should not be listed in the preloaded symbols.
--exclude_expsyms=$lt_exclude_expsyms_GCJ
+-	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
- 
--# Symbols that must always be exported.
--include_expsyms=$lt_include_expsyms_GCJ
++
 +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
@@ -51730,35 +50928,6 @@
 +  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
 +fi
  
--# ### 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"
- 
--	else
--	  tagname=""
--	fi
--	;;
- 
 -      RC)
  
  
@@ -51929,6 +51098,35 @@
  
 -# 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:${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=
@@ -51936,10 +51134,8 @@
 +   test -n "$runpath_var_CXX" ||
 +   test "X$hardcode_automatic_CXX" = "Xyes" ; then
  
--# The host system.
--host_alias=$host_alias
--host=$host
--host_os=$host_os
+-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
@@ -51961,10 +51157,8 @@
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX" >&5
 +$as_echo "$hardcode_action_CXX" >&6; }
  
--# The build system.
--build_alias=$build_alias
--build=$build
--build_os=$build_os
+-# An ERE matcher.
+-EGREP=$lt_EGREP
 +if test "$hardcode_action_CXX" = relink ||
 +   test "$inherit_rpath_CXX" = yes; then
 +  # Fast installation is not supported
@@ -51975,49 +51169,8 @@
 +  enable_fast_install=needless
 +fi
  
--# 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
- 
--gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
--gcc_ver=\`gcc -dumpversion\`
-+  fi # test -n "$compiler"
- 
--# An ERE matcher.
--EGREP=$lt_EGREP
-+  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 linker used to build libraries.
 -LD=$lt_LD_RC
-+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
  
 -# Whether we need hard or soft links.
 -LN_S=$lt_LN_S
@@ -52036,12 +51189,28 @@
  
 -# 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
@@ -52058,7 +51227,6 @@
  
 -# Shared library suffix (normally ".so").
 -shrext_cmds='$shrext_cmds'
-+        ac_config_commands="$ac_config_commands libtool"
  
 -# Executable file suffix (normally "").
 -exeext="$exeext"
@@ -52072,7 +51240,6 @@
  
 -# Does compiler simultaneously support -c and -o options?
 -compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
-+# Only expand once:
  
 -# Must we lock files when doing compilation?
 -need_locks=$lt_need_locks
@@ -52082,6 +51249,32 @@
  
 -# 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:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
 +$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
 +if test "${ac_cv_c_const+set}" = set; then :
@@ -52090,8 +51283,8 @@
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
  
--# Whether dlopen is supported.
--dlopen_support=$enable_dlopen
+-# Library versioning type.
+-version_type=$version_type
 +int
 +main ()
 +{
@@ -52120,8 +51313,8 @@
 +    char *t;
 +    char const *s = 0 ? (char *) 0 : (char const *) 0;
  
--# Whether dlopen of programs is supported.
--dlopen_self=$enable_dlopen_self
+-# Format of library name prefix.
+-libname_spec=$lt_libname_spec
 +    *t++ = 0;
 +    if (s) return 0;
 +  }
@@ -52147,8 +51340,9 @@
 +  return !cs[0] && !zero.x;
 +#endif
  
--# Whether dlopen of statically linked programs is supported.
--dlopen_self_static=$enable_dlopen_self_static
+-# 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;
 +}
@@ -52164,16 +51358,19 @@
 +$as_echo "$ac_cv_c_const" >&6; }
 +if test $ac_cv_c_const = no; then
  
--# Compiler flag to prevent dynamic linking.
--link_static_flag=$lt_lt_prog_compiler_static_RC
+-# The coded name of the library, if different from the real name.
+-soname_spec=$lt_soname_spec
 +$as_echo "#define const /**/" >>confdefs.h
  
--# Compiler flag to turn off builtin functions.
--no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_RC
+-# 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
  
--# Compiler flag to allow reflexive dlopens.
--export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_RC
+-# 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 :
@@ -52189,8 +51386,8 @@
 +$ac_kw foo_t foo () {return 0; }
 +#endif
  
--# Compiler flag to generate shared objects directly from archives.
--whole_archive_flag_spec=$lt_whole_archive_flag_spec_RC
+-# 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
@@ -52199,14 +51396,15 @@
 +  test "$ac_cv_c_inline" != no && break
 +done
  
--# Compiler flag to generate thread-safe objects.
--thread_safe_flag_spec=$lt_thread_safe_flag_spec_RC
+-# 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; }
- 
--# Library versioning type.
--version_type=$version_type
++
 +case $ac_cv_c_inline in
 +  inline | yes) ;;
 +  *)
@@ -52222,8 +51420,9 @@
 +    ;;
 +esac
  
--# Format of library name prefix.
--libname_spec=$lt_libname_spec
+-# 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"
@@ -52232,20 +51431,31 @@
 +#define HAVE_STDLIB_H 1
 +_ACEOF
  
--# 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
+-# Commands to strip libraries.
+-old_striplib=$lt_old_striplib
+-striplib=$lt_striplib
 +fi
  
--# The coded name of the library, if different from the real name.
--soname_spec=$lt_soname_spec
+-# 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
  
--# 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
+-# 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 :
@@ -52262,8 +51472,8 @@
 +char *malloc ();
 +#endif
  
--# Create an old-style archive from a shared archive.
--old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_RC
+-# Method to check whether dependent libraries are shared objects.
+-deplibs_check_method=$lt_deplibs_check_method
 +int
 +main ()
 +{
@@ -52281,65 +51491,30 @@
 +  conftest.$ac_objext conftest.beam conftest.$ac_ext
 +fi
  
--# 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
+-# 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 :
- 
--# 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
++
 +$as_echo "#define HAVE_MALLOC 1" >>confdefs.h
- 
--# 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
++
 +else
 +  $as_echo "#define HAVE_MALLOC 0" >>confdefs.h
- 
--# Commands to strip libraries.
--old_striplib=$lt_old_striplib
--striplib=$lt_striplib
++
 +   case " $LIBOBJS " in
 +  *" malloc.$ac_objext "* ) ;;
 +  *) LIBOBJS="$LIBOBJS malloc.$ac_objext"
 + ;;
 +esac
- 
--# 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
- 
--# 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 "#define malloc rpl_malloc" >>confdefs.h
- 
--# Method to check whether dependent libraries are shared objects.
--deplibs_check_method=$lt_deplibs_check_method
++
 +fi
- 
--# 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_RC
++
++
 +{ $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 :
@@ -52367,7 +51542,9 @@
 +    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.  */
@@ -52667,25 +51844,31 @@
 -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"
--
 +PLATFORM=
 +SHLIBSUFFIX=
 +case "`uname -s`" in
-+	Linux)	PLATFORM=linux
++	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; }; }
-+	Darwin)	PLATFORM=darwin
-+		SHLIBSUFFIX="dylib"
- 	;;
+-	;;
 -      esac
--
+ 
 -      # Append the new tag name to the list of available tags.
 -      if test -n "$tagname" ; then
 -      available_tags="$available_tags $tagname"
@@ -52693,7 +51876,11 @@
 -    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"
@@ -52704,41 +51891,26 @@
 -echo "$as_me: error: unable to update list of available tagged configurations." >&2;}
 -   { (exit 1); exit 1; }; }
 -  fi
--fi
--
-+	*) 	PLATFORM=unknown
-+		SHLIBSUFFIX="so"
-+	;;
-+esac
- 
- 
--# 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'
- 
--# Prevent multiple expansion
-+# 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
- 
- 
++
 +# 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
+ 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
@@ -52776,10 +51948,6 @@
  
 +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
 +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
@@ -52788,16 +51956,11 @@
 +$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.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
++else
 +  ac_check_lib_save_LIBS=$LIBS
 +LIBS="-lexpat  $LIBS"
 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
++/* end confdefs.h.  */
  
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
@@ -52806,9 +51969,74 @@
 +extern "C"
 +#endif
 +char XML_ParserCreate ();
- int
- main ()
- {
++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
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+ 
+-int
+-main ()
+-{
 -/* FIXME: Include the comments suggested by Paul. */
 -#ifndef __cplusplus
 -  /* Ultrix mips cc rejects this.  */
@@ -52833,7 +52061,9 @@
 -  { /* 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.  */
@@ -52855,12 +52085,11 @@
 -    const int foo = 10;
 -  }
 -#endif
--
-+return XML_ParserCreate ();
-   ;
-   return 0;
- }
- _ACEOF
+ 
+-  ;
+-  return 0;
+-}
+-_ACEOF
 -rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
@@ -52884,71 +52113,77 @@
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 -  ac_cv_c_const=yes
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_expat_XML_ParserCreate=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
  else
 -  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"
-+
++  if test -n "$SWIG"; then
++  ac_cv_prog_SWIG="$SWIG" # Let the user override the test.
 +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
++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
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
+ 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
  
 -cat >>confdefs.h <<\_ACEOF
 -#define const
-+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
+-_ACEOF
  
++	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
-+done
- 
+-
 -echo "$as_me:$LINENO: checking for inline" >&5
 -echo $ECHO_N "checking for inline... $ECHO_C" >&6
 -if test "${ac_cv_c_inline+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
++ if test "x$SWIG" != x; then
++  WITH_SWIG_TRUE=
++  WITH_SWIG_FALSE='#'
+ else
 -  ac_cv_c_inline=no
 -for ac_kw in inline __inline__ __inline; do
 -  cat >conftest.$ac_ext <<_ACEOF
@@ -52962,6 +52197,9 @@
 -static $ac_kw foo_t static_foo () {return 0; }
 -$ac_kw foo_t foo () {return 0; }
 -#endif
++  WITH_SWIG_TRUE='#'
++  WITH_SWIG_FALSE=
++fi
  
 -_ACEOF
 -rm -f conftest.$ac_objext
@@ -52987,72 +52225,29 @@
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 -  ac_cv_c_inline=$ac_kw; break
-+# 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
- else
+-else
 -  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
  
++# 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
-+fi
-+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
-+
  
-+	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
-+ if test "x$SWIG" != x; then
-+  WITH_SWIG_TRUE=
-+  WITH_SWIG_FALSE='#'
-+else
-+  WITH_SWIG_TRUE='#'
-+  WITH_SWIG_FALSE=
++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
  
++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) ;;
@@ -53068,23 +52263,6 @@
 -_ACEOF
 -    ;;
 -esac
-+# Check whether --enable-systempython was given.
-+if test "${enable_systempython+set}" = set; then :
-+  enableval=$enable_systempython;
-+fi
-+
-+USE_DEFAULT_PYTHON_LIBDIR=false
-+if test "x$enable_systempython" = xyes; then
-+	USE_DEFAULT_PYTHON_LIBDIR=true
-+fi
- 
-+if test "x$SWIG" != x; then
-+	# Check whether --enable-java was given.
-+if test "${enable_java+set}" = set; then :
-+  enableval=$enable_java;
-+fi
- 
--for ac_header in stdlib.h
 +	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
@@ -53098,6 +52276,48 @@
 +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
@@ -53109,7 +52329,7 @@
 +  test -z "$as_dir" && as_dir=.
 +    for ac_exec_ext in '' $ac_executable_extensions; do
 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_JAVA="java"
++    ac_cv_prog_JAVAC="javac"
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
 +  fi
@@ -53117,15 +52337,15 @@
 +  done
 +IFS=$as_save_IFS
 +
-+  test -z "$ac_cv_prog_JAVA" && ac_cv_prog_JAVA="nojava"
-+fi
++  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
-+JAVA=$ac_cv_prog_JAVA
-+if test -n "$JAVA"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JAVA" >&5
-+$as_echo "$JAVA" >&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
 -  # Is the header compilable?
 -echo "$as_me:$LINENO: checking $ac_header usability" >&5
@@ -53167,20 +52387,20 @@
 +fi
 +
 +
-+		if test "$JAVA" = "nojava"; then
-+		  as_fn_error "no java binary in PATH" "$LINENO" 5
++		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 "javac", so it can be a program name with args.
-+set dummy javac; ac_word=$2
++		# 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_JAVAC+set}" = set; then :
++if test "${ac_cv_prog_JAR+set}" = set; then :
 +  $as_echo_n "(cached) " >&6
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+  if test -n "$JAVAC"; then
-+  ac_cv_prog_JAVAC="$JAVAC" # Let the user override the test.
++  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
@@ -53189,7 +52409,7 @@
 +  test -z "$as_dir" && as_dir=.
 +    for ac_exec_ext in '' $ac_executable_extensions; do
 +  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_JAVAC="javac"
++    ac_cv_prog_JAR="jar"
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
 +  fi
@@ -53198,13 +52418,13 @@
 +IFS=$as_save_IFS
  
 -ac_header_compiler=no
-+  test -z "$ac_cv_prog_JAVAC" && ac_cv_prog_JAVAC="nojavac"
++  test -z "$ac_cv_prog_JAR" && ac_cv_prog_JAR="nojar"
 +fi
 +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; }
++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; }
@@ -53237,51 +52457,8 @@
 -    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
 -  else
 -    ac_cpp_err=
+-  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
-+  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
-+
-+  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
--  ac_cpp_err=yes
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
- fi
--if test -z "$ac_cpp_err"; then
--  ac_header_preproc=yes
-+
-+
 +		if test "$JAR" = "nojar"; then
 +		  as_fn_error "no jar binary in PATH, bindings will not be built" "$LINENO" 5
 +		fi
@@ -53296,13 +52473,36 @@
 +if test "x$ac_cv_header_jni_h" = x""yes; then :
 +
  else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
+-  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
+-  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
+-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
 -rm -f conftest.err conftest.$ac_ext
 -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
@@ -53344,26 +52544,6 @@
 -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
-+
-+			CPPFLAGS="$current_CPPFLAGS"
-+		fi
-+	fi
-+fi
-+ if test "x$JAVA" != x; then
-+  WITH_JAVA_TRUE=
-+  WITH_JAVA_FALSE='#'
-+else
-+  WITH_JAVA_TRUE='#'
-+  WITH_JAVA_FALSE=
-+fi
-+
-+
-+if test "x$SWIG" != x; then
-+	# Check whether --enable-python was given.
-+if test "${enable_python+set}" = set; then :
-+  enableval=$enable_python;
-+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
@@ -53660,10 +52840,8 @@
 +
 +
 +ac_config_headers="$ac_config_headers config.h"
++
  
- 
--cat >>confdefs.h <<\_ACEOF
--#define malloc rpl_malloc
 +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"
 +
 +
@@ -53680,7 +52858,9 @@
 +# `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
  
 +# The following way of writing the cache mishandles newlines in values,
@@ -53768,13 +52948,13 @@
 -echo $ECHO_N "checking for working strtod... $ECHO_C" >&6
 -if test "${ac_cv_func_strtod+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  if test "$cross_compiling" = yes; then
--  ac_cv_func_strtod=no
 + if test -n "$EXEEXT"; then
 +  am__EXEEXT_TRUE=
 +  am__EXEEXT_FALSE='#'
  else
+-  if test "$cross_compiling" = yes; then
+-  ac_cv_func_strtod=no
+-else
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
@@ -54247,8 +53427,8 @@
 +    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
@@ -54385,18 +53565,32 @@
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -ac_cv_header_stdbool_h=no
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +  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
--else
++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
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
@@ -54406,7 +53600,17 @@
 -$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))
@@ -54438,48 +53642,11 @@
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 -  ac_cv_type__Bool=yes
-+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
+-else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_cv_type__Bool=no
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+  as_ln_s='cp -p'
- 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
--
--cat >>confdefs.h <<_ACEOF
--#define HAVE__BOOL 1
--_ACEOF
-+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-+rmdir conf$$.dir 2>/dev/null
  
- 
--fi
-+# as_fn_mkdir_p
-+# -------------
-+# Create "$as_dir" as a directory, including parents if necessary.
-+as_fn_mkdir_p ()
-+{
- 
--if test $ac_cv_header_stdbool_h = yes; then
+-ac_cv_type__Bool=no
 +  case $as_dir in #(
 +  -*) as_dir=./$as_dir;;
 +  esac
@@ -54518,11 +53685,8 @@
 +    done
 +    test -z "$as_dirs" || eval "mkdir $as_dirs"
 +  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
- 
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_STDBOOL_H 1
--_ACEOF
- 
++
++
 +} # as_fn_mkdir_p
 +if mkdir -p . 2>/dev/null; then
 +  as_mkdir_p='mkdir -p "$as_dir"'
@@ -54530,7 +53694,74 @@
 +  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'"
+ 
+-fi
+ 
+-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_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
+ 
+-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`
++"
+ 
 -echo "$as_me:$LINENO: checking for size_t" >&5
 -echo $ECHO_N "checking for size_t... $ECHO_C" >&6
 -if test "${ac_cv_type_size_t+set}" = set; then
@@ -54553,7 +53784,7 @@
 -  ;
 -  return 0;
 -}
--_ACEOF
+ _ACEOF
 -rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
@@ -54577,66 +53808,48 @@
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
 -  ac_cv_type_size_t=yes
-+if test -x / >/dev/null 2>&1; then
-+  as_test_x='test -x'
- else
+-else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
+ 
 -ac_cv_type_size_t=no
 -fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+  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
+-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
 -  :
 -else
-+as_executable_p=$as_test_x
++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
  
 -cat >>confdefs.h <<_ACEOF
 -#define size_t unsigned
 -_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'"
  
 -fi
-+# Sed expression to map a string onto a valid variable name.
-+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
++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
  
-+exec 6>&1
-+## ----------------------------------- ##
-+## Main body of $CONFIG_STATUS script. ##
-+## ----------------------------------- ##
-+_ASEOF
-+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
- 
 +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.64.  Invocation command line was
++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]...
+ 
 -if test "$GCC" = yes; then
 -  GCC_TRUE=
 -  GCC_FALSE='#'
@@ -54644,14 +53857,20 @@
 -  GCC_TRUE='#'
 -  GCC_FALSE=
 -fi
-+  CONFIG_FILES    = $CONFIG_FILES
-+  CONFIG_HEADERS  = $CONFIG_HEADERS
-+  CONFIG_LINKS    = $CONFIG_LINKS
-+  CONFIG_COMMANDS = $CONFIG_COMMANDS
-+  $ $0 $@
++  -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
  
-+on `(hostname || uname -n) 2>/dev/null | sed 1q`
-+"
++Configuration files:
++$config_files
  
 -PLATFORM=
 -SHLIBSUFFIX=
@@ -54665,22 +53884,22 @@
 -	*) 	PLATFORM=unknown
 -		SHLIBSUFFIX="so"
 -	;;
-+_ACEOF
-+
-+case $ac_config_files in *"
-+"*) set x $ac_config_files; shift; ac_config_files=$*;;
- esac
+-esac
++Configuration headers:
++$config_headers
  
-+case $ac_config_headers in *"
-+"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
-+esac
++Configuration commands:
++$config_commands
  
++Report bugs to <http://code.google.com/p/libkml/issues>."
  
++_ACEOF
 +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"
++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
@@ -54707,16 +53926,36 @@
 -  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."
+ 
++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
-+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.
++# 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
  
-+Usage: $0 [OPTION]... [TAG]...
- 
 -# Check whether --with-python-include-dir or --without-python-include-dir was given.
 -if test "${with_python_include_dir+set}" = set; then
 -  withval="$with_python_include_dir"
@@ -54729,27 +53968,50 @@
 -  withval="$with_python_lib_dir"
 -  PYTHON_LIB_DIR=$withval
 -fi;
-+  -h, --help       print this help, then exit
-+  -V, --version    print version number and configuration settings, 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
++  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=: ;;
  
-+Configuration files:
-+$config_files
++  # This is an error.
++  -*) as_fn_error "unrecognized option: \`$1'
++Try \`$0 --help' for more information." ;;
  
-+Configuration headers:
-+$config_headers
++  *) as_fn_append ac_config_targets " $1"
++     ac_need_defaults=false ;;
  
-+Configuration commands:
-+$config_commands
-+
-+Report bugs to <http://code.google.com/p/libkml/issues>."
++  esac
++  shift
++done
  
 -for ac_header in expat.h
 -do
@@ -54774,7 +54036,7 @@
 -/* end confdefs.h.  */
 -$ac_includes_default
 -#include <$ac_header>
- _ACEOF
+-_ACEOF
 -rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
@@ -54801,20 +54063,16 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+ac_cs_version="\\
-+libkml config.status 1.0.1
-+configured by $0, generated by GNU Autoconf 2.64,
-+  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
++ac_configure_extra_args=
  
 -ac_header_compiler=no
--fi
++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
-+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."
  
 -# Is the header present?
 -echo "$as_me:$LINENO: checking $ac_header presence" >&5
@@ -54826,12 +54084,6 @@
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -#include <$ac_header>
-+ac_pwd='$ac_pwd'
-+srcdir='$srcdir'
-+INSTALL='$INSTALL'
-+MKDIR_P='$MKDIR_P'
-+AWK='$AWK'
-+test -n "\$AWK" || AWK=awk
  _ACEOF
 -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
 -  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -54857,7 +54109,15 @@
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -  ac_header_preproc=no
--fi
++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
 -rm -f conftest.err conftest.$ac_ext
 -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 -echo "${ECHO_T}$ac_header_preproc" >&6
@@ -54870,17 +54130,7 @@
 -    { 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
-+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=:
-     ;;
+-    ;;
 -  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;}
@@ -54899,14 +54149,17 @@
 -## ----------------------------------------------------- ##
 -## Report this to http://code.google.com/p/libkml/issues ##
 -## ----------------------------------------------------- ##
--_ASBOX
++_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
-+  *)
-+    ac_option=$1
-+    ac_optarg=$2
-+    ac_shift=shift
-     ;;
+-    ;;
 -esac
 -echo "$as_me:$LINENO: checking for $ac_header" >&5
 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
@@ -54917,174 +54170,29 @@
 -fi
 -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+  esac
++  $as_echo "$ac_log"
++} >&5
  
 -fi
 -if test `eval echo '${'$as_ac_Header'}'` = yes; then
 -  cat >>confdefs.h <<_ACEOF
 -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
--_ACEOF
+ _ACEOF
 - expat_h_found="yes"
 -else
 -  expat_h_found="no"
 -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 ;;
-+  --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
- 
--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;}
--   { (exit 1); exit 1; }; }
-+ac_configure_extra_args=
-+
-+if $ac_cs_silent; then
-+  exec 6>/dev/null
-+  ac_configure_extra_args="$ac_configure_extra_args --silent"
- fi
- 
--echo "$as_me:$LINENO: checking for XML_ParserCreate in -lexpat" >&5
--echo $ECHO_N "checking for XML_ParserCreate in -lexpat... $ECHO_C" >&6
--if test "${ac_cv_lib_expat_XML_ParserCreate+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-lexpat  $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
- _ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
 +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
- 
--/* 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 XML_ParserCreate ();
--int
--main ()
--{
--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
--  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_expat_XML_ParserCreate=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+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
-+  $as_echo "$ac_log"
-+} >&5
- 
--ac_cv_lib_expat_XML_ParserCreate=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_expat_XML_ParserCreate" >&5
--echo "${ECHO_T}$ac_cv_lib_expat_XML_ParserCreate" >&6
--if test $ac_cv_lib_expat_XML_ParserCreate = yes; then
--  cat >>confdefs.h <<_ACEOF
--#define HAVE_LIBEXPAT 1
- _ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 +#
 +# INIT-COMMANDS
 +#
 +AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
- 
--  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;}
--   { (exit 1); exit 1; }; }
++
++
 +# 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'
@@ -55363,8 +54471,14 @@
 +      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;}
+-   { (exit 1); exit 1; }; }
+-fi
 +# Double-quote double-evaled strings.
 +for var in reload_cmds \
 +old_postinstall_cmds \
@@ -55402,24 +54516,95 @@
 +      ;;
 +    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
+-if test "${ac_cv_lib_expat_XML_ParserCreate+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lexpat  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-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.  */
+-#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 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_expat_XML_ParserCreate=yes
+-else
+-  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
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      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
+-  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;}
+-   { (exit 1); exit 1; }; }
+-fi
 +    PACKAGE='$PACKAGE'
 +    VERSION='$VERSION'
 +    TIMESTAMP='$TIMESTAMP'
@@ -55429,6 +54614,8 @@
  
  
  
+ 
+ 
 -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`
@@ -55446,7 +54633,7 @@
 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
--_ACEOF
+ _ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
@@ -55485,6 +54672,7 @@
 -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
  
 -# Is the header present?
 -echo "$as_me:$LINENO: checking $ac_header presence" >&5
@@ -55496,7 +54684,7 @@
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -#include <$ac_header>
- _ACEOF
+-_ACEOF
 -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
 -  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
 -  ac_status=$?
@@ -55519,10 +54707,6 @@
 -else
 -  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
-+
 +# Handling of arguments.
 +for ac_config_target in $ac_config_targets
 +do
@@ -55582,7 +54766,8 @@
 +    "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
@@ -55732,7 +54917,7 @@
 +t delim
 +:nl
 +h
-+s/\(.\{148\}\).*/\1/
++s/\(.\{148\}\)..*/\1/
 +t more1
 +s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
 +p
@@ -55746,7 +54931,7 @@
 +t nl
 +:delim
 +h
-+s/\(.\{148\}\).*/\1/
++s/\(.\{148\}\)..*/\1/
 +t more2
 +s/["\\]/\\&/g; s/^/"/; s/$/"/
 +p
@@ -59320,7 +58505,7 @@
  
  # configure is writing to config.log, and then calls config.status.
  # config.status does its own redirection, appending to config.log.
-@@ -22465,7 +18097,11 @@
+@@ -22465,7 +18129,11 @@
    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.
@@ -59333,9 +58518,10 @@
  fi
  
  
-diff -urN libkml-1.0.1.orig/examples/domviewer/Makefile.in libkml-1.0.1/examples/domviewer/Makefile.in
+Index: libkml-1.0.1/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-09-30 11:42:03.000000000 +0200
++++ libkml-1.0.1/examples/domviewer/Makefile.in	2009-12-10 10:19:44.000000000 +0100
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -59684,9 +58870,10 @@
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-diff -urN libkml-1.0.1.orig/examples/engine/Makefile.in libkml-1.0.1/examples/engine/Makefile.in
+Index: libkml-1.0.1/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-09-30 11:42:04.000000000 +0200
++++ libkml-1.0.1/examples/engine/Makefile.in	2009-12-10 10:19:44.000000000 +0100
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -59850,7 +59037,7 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
-@@ -262,32 +261,45 @@
+@@ -262,28 +261,41 @@
  build_cpu = @build_cpu@
  build_os = @build_os@
  build_vendor = @build_vendor@
@@ -59892,11 +59079,6 @@
  AM_CPPFLAGS = -I$(top_srcdir)/src \
  	      -I$(top_srcdir)/third_party/boost_1_34_1
  
-- 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 \
 @@ -384,14 +396,14 @@
  	@for dep in $?; do \
  	  case '$(am__configure_deps)' in \
@@ -60233,9 +59415,10 @@
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-diff -urN libkml-1.0.1.orig/examples/gpx/Makefile.in libkml-1.0.1/examples/gpx/Makefile.in
+Index: libkml-1.0.1/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-09-30 11:42:04.000000000 +0200
++++ libkml-1.0.1/examples/gpx/Makefile.in	2009-12-10 10:19:44.000000000 +0100
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -60398,7 +59581,7 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
-@@ -172,32 +171,45 @@
+@@ -172,28 +171,41 @@
  build_cpu = @build_cpu@
  build_os = @build_os@
  build_vendor = @build_vendor@
@@ -60440,11 +59623,6 @@
  AM_CPPFLAGS = -I$(top_srcdir)/src \
  	      -I$(top_srcdir)/third_party/boost_1_34_1
  
-- 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 \
 @@ -213,14 +225,14 @@
  	@for dep in $?; do \
  	  case '$(am__configure_deps)' in \
@@ -60729,9 +59907,10 @@
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-diff -urN libkml-1.0.1.orig/examples/gx/Makefile.in libkml-1.0.1/examples/gx/Makefile.in
+Index: libkml-1.0.1/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-09-30 11:42:04.000000000 +0200
++++ libkml-1.0.1/examples/gx/Makefile.in	2009-12-10 10:19:44.000000000 +0100
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -60894,7 +60073,7 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
-@@ -179,32 +178,45 @@
+@@ -179,28 +178,41 @@
  build_cpu = @build_cpu@
  build_os = @build_os@
  build_vendor = @build_vendor@
@@ -60936,11 +60115,6 @@
  AM_CPPFLAGS = -I$(top_srcdir)/src \
  	      -I$(top_srcdir)/third_party/boost_1_34_1
  
-- 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 \
 @@ -227,14 +239,14 @@
  	@for dep in $?; do \
  	  case '$(am__configure_deps)' in \
@@ -61229,9 +60403,10 @@
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-diff -urN libkml-1.0.1.orig/examples/hellonet/Makefile.in libkml-1.0.1/examples/hellonet/Makefile.in
+Index: libkml-1.0.1/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-09-30 11:42:04.000000000 +0200
++++ libkml-1.0.1/examples/hellonet/Makefile.in	2009-12-10 10:19:45.000000000 +0100
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -61395,7 +60570,7 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
-@@ -213,33 +212,46 @@
+@@ -213,28 +212,41 @@
  build_cpu = @build_cpu@
  build_os = @build_os@
  build_vendor = @build_vendor@
@@ -61437,12 +60612,6 @@
  @HAVE_CURL_TRUE at AM_CPPFLAGS = -I$(top_srcdir)/src \
  @HAVE_CURL_TRUE@	      -I$(top_srcdir)/examples/hellonet \
  @HAVE_CURL_TRUE@	      -I$(top_srcdir)/third_party/boost_1_34_1
- 
-- 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
 @@ -286,14 +298,14 @@
  	@for dep in $?; do \
  	  case '$(am__configure_deps)' in \
@@ -61752,9 +60921,10 @@
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-diff -urN libkml-1.0.1.orig/examples/helloworld/Makefile.in libkml-1.0.1/examples/helloworld/Makefile.in
+Index: libkml-1.0.1/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-09-30 11:42:05.000000000 +0200
++++ libkml-1.0.1/examples/helloworld/Makefile.in	2009-12-10 10:19:45.000000000 +0100
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -61918,7 +61088,7 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
-@@ -294,33 +293,46 @@
+@@ -294,28 +293,41 @@
  build_cpu = @build_cpu@
  build_os = @build_os@
  build_vendor = @build_vendor@
@@ -61960,12 +61130,6 @@
  AM_CPPFLAGS = -I$(top_srcdir)/src \
  	      -I$(top_srcdir)/examples/helloworld \
  	      -I$(top_srcdir)/third_party/boost_1_34_1
- 
-- 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
 @@ -450,14 +462,14 @@
  	@for dep in $?; do \
  	  case '$(am__configure_deps)' in \
@@ -62335,9 +61499,10 @@
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-diff -urN libkml-1.0.1.orig/examples/java/Makefile.in libkml-1.0.1/examples/java/Makefile.in
+Index: libkml-1.0.1/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-09-30 11:42:05.000000000 +0200
++++ libkml-1.0.1/examples/java/Makefile.in	2009-12-10 10:19:45.000000000 +0100
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -62686,9 +61851,10 @@
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-diff -urN libkml-1.0.1.orig/examples/kml/Makefile.in libkml-1.0.1/examples/kml/Makefile.in
+Index: libkml-1.0.1/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-09-30 11:42:05.000000000 +0200
++++ libkml-1.0.1/examples/kml/Makefile.in	2009-12-10 10:19:45.000000000 +0100
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -63037,9 +62203,10 @@
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-diff -urN libkml-1.0.1.orig/examples/Makefile.in libkml-1.0.1/examples/Makefile.in
+Index: libkml-1.0.1/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-09-30 11:42:03.000000000 +0200
++++ libkml-1.0.1/examples/Makefile.in	2009-12-10 10:19:44.000000000 +0100
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -63591,9 +62758,10 @@
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-diff -urN libkml-1.0.1.orig/examples/python/Makefile.in libkml-1.0.1/examples/python/Makefile.in
+Index: libkml-1.0.1/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-09-30 11:42:06.000000000 +0200
++++ libkml-1.0.1/examples/python/Makefile.in	2009-12-10 10:19:45.000000000 +0100
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -63942,9 +63110,10 @@
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-diff -urN libkml-1.0.1.orig/examples/regionator/Makefile.in libkml-1.0.1/examples/regionator/Makefile.in
+Index: libkml-1.0.1/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-09-30 11:42:06.000000000 +0200
++++ libkml-1.0.1/examples/regionator/Makefile.in	2009-12-10 10:19:45.000000000 +0100
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -64107,7 +63276,7 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
-@@ -173,33 +172,46 @@
+@@ -173,28 +172,41 @@
  build_cpu = @build_cpu@
  build_os = @build_os@
  build_vendor = @build_vendor@
@@ -64149,12 +63318,6 @@
  AM_CPPFLAGS = -I$(top_srcdir)/src \
                -I$(top_srcdir)/third_party/boost_1_34_1 \
                -I$(top_srcdir)/third_party/zlib-1.2.3/contrib
- 
-- 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 \
 @@ -216,14 +228,14 @@
  	@for dep in $?; do \
  	  case '$(am__configure_deps)' in \
@@ -64439,9 +63602,10 @@
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-diff -urN libkml-1.0.1.orig/examples/wxregionator/Makefile.in libkml-1.0.1/examples/wxregionator/Makefile.in
+Index: libkml-1.0.1/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-09-30 11:42:06.000000000 +0200
++++ libkml-1.0.1/examples/wxregionator/Makefile.in	2009-12-10 10:19:45.000000000 +0100
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -64791,9 +63955,10 @@
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-diff -urN libkml-1.0.1.orig/examples/wxviewer/Makefile.in libkml-1.0.1/examples/wxviewer/Makefile.in
+Index: libkml-1.0.1/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-09-30 11:42:06.000000000 +0200
++++ libkml-1.0.1/examples/wxviewer/Makefile.in	2009-12-10 10:19:45.000000000 +0100
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -65143,9 +64308,10 @@
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-diff -urN libkml-1.0.1.orig/examples/xsd/Makefile.in libkml-1.0.1/examples/xsd/Makefile.in
+Index: libkml-1.0.1/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-09-30 11:42:07.000000000 +0200
++++ libkml-1.0.1/examples/xsd/Makefile.in	2009-12-10 10:19:45.000000000 +0100
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -65309,7 +64475,7 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
-@@ -203,33 +202,46 @@
+@@ -203,28 +202,41 @@
  build_cpu = @build_cpu@
  build_os = @build_os@
  build_vendor = @build_vendor@
@@ -65351,12 +64517,6 @@
  AM_CPPFLAGS = -I$(top_srcdir)/src \
  	      -I$(top_srcdir)/examples/xsd \
  	      -I$(top_srcdir)/third_party/boost_1_34_1
- 
-- 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 \
 @@ -279,14 +291,14 @@
  	@for dep in $?; do \
  	  case '$(am__configure_deps)' in \
@@ -65661,9 +64821,10 @@
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-diff -urN libkml-1.0.1.orig/INSTALL libkml-1.0.1/INSTALL
+Index: libkml-1.0.1/INSTALL
+===================================================================
 --- libkml-1.0.1.orig/INSTALL	2009-07-03 01:23:36.000000000 +0200
-+++ libkml-1.0.1/INSTALL	2009-09-30 11:42:19.000000000 +0200
++++ libkml-1.0.1/INSTALL	2009-12-10 10:19:49.000000000 +0100
 @@ -1,16 +1,19 @@
  Installation Instructions
  *************************
@@ -65944,10 +65105,11 @@
  `configure' also accepts some other, not widely useful, options.  Run
  `configure --help' for more details.
  
-diff -urN libkml-1.0.1.orig/m4/libtool.m4 libkml-1.0.1/m4/libtool.m4
---- libkml-1.0.1.orig/m4/libtool.m4	1970-01-01 01:00:00.000000000 +0100
-+++ libkml-1.0.1/m4/libtool.m4	2009-09-30 11:41:41.000000000 +0200
-@@ -0,0 +1,7376 @@
+Index: libkml-1.0.1/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,
@@ -68395,7 +67557,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
@@ -69034,7 +68196,7 @@
 +  ;;
 +
 +# This must be Linux ELF.
-+linux* | k*bsd*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
 +  lt_cv_deplibs_check_method=pass_all
 +  ;;
 +
@@ -69655,7 +68817,7 @@
 +	    ;;
 +	esac
 +	;;
-+      linux* | k*bsd*-gnu)
++      linux* | k*bsd*-gnu | kopensolaris*-gnu)
 +	case $cc_basename in
 +	  KCC*)
 +	    # KAI C++ Compiler
@@ -69939,7 +69101,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*)
@@ -70235,6 +69397,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 ...
@@ -70326,7 +69489,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
@@ -71810,7 +70973,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
@@ -73324,9 +72487,10 @@
 +    ;;
 +  esac
 +])
-diff -urN libkml-1.0.1.orig/m4/lt~obsolete.m4 libkml-1.0.1/m4/lt~obsolete.m4
---- libkml-1.0.1.orig/m4/lt~obsolete.m4	1970-01-01 01:00:00.000000000 +0100
-+++ libkml-1.0.1/m4/lt~obsolete.m4	2009-09-30 11:41:42.000000000 +0200
+Index: libkml-1.0.1/m4/lt~obsolete.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-*-
 +#
@@ -73420,9 +72584,10 @@
 +m4_ifndef([_LT_AC_LANG_RC_CONFIG],	[AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
 +m4_ifndef([AC_LIBTOOL_CONFIG],		[AC_DEFUN([AC_LIBTOOL_CONFIG])])
 +m4_ifndef([_LT_AC_FILE_LTDLL_C],	[AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
-diff -urN libkml-1.0.1.orig/m4/ltoptions.m4 libkml-1.0.1/m4/ltoptions.m4
---- libkml-1.0.1.orig/m4/ltoptions.m4	1970-01-01 01:00:00.000000000 +0100
-+++ libkml-1.0.1/m4/ltoptions.m4	2009-09-30 11:41:42.000000000 +0200
+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 -*-
 +#
@@ -73792,9 +72957,10 @@
 +		 [m4_define([_LTDL_TYPE], [installable])])
 +LT_OPTION_DEFINE([LTDL_INIT], [convenience],
 +		 [m4_define([_LTDL_TYPE], [convenience])])
-diff -urN libkml-1.0.1.orig/m4/ltsugar.m4 libkml-1.0.1/m4/ltsugar.m4
---- libkml-1.0.1.orig/m4/ltsugar.m4	1970-01-01 01:00:00.000000000 +0100
-+++ libkml-1.0.1/m4/ltsugar.m4	2009-09-30 11:41:42.000000000 +0200
+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-*-
 +#
@@ -73919,9 +73085,10 @@
 +           lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]),
 +		      [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl
 +])
-diff -urN libkml-1.0.1.orig/m4/ltversion.m4 libkml-1.0.1/m4/ltversion.m4
---- libkml-1.0.1.orig/m4/ltversion.m4	1970-01-01 01:00:00.000000000 +0100
-+++ libkml-1.0.1/m4/ltversion.m4	2009-09-30 11:41:42.000000000 +0200
+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 -*-
 +#
@@ -73934,21 +73101,22 @@
 +
 +# Generated from ltversion.in.
 +
-+# serial 3012 ltversion.m4
++# serial 3017 ltversion.m4
 +# 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],
-+[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)
 +])
-diff -urN libkml-1.0.1.orig/Makefile.in libkml-1.0.1/Makefile.in
+Index: libkml-1.0.1/Makefile.in
+===================================================================
 --- libkml-1.0.1.orig/Makefile.in	2009-07-03 01:23:36.000000000 +0200
-+++ libkml-1.0.1/Makefile.in	2009-09-30 11:42:19.000000000 +0200
++++ libkml-1.0.1/Makefile.in	2009-12-10 10:19:49.000000000 +0100
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -74612,9 +73780,10 @@
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-diff -urN libkml-1.0.1.orig/msvc/examples/Makefile.in libkml-1.0.1/msvc/examples/Makefile.in
+Index: libkml-1.0.1/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-09-30 11:42:07.000000000 +0200
++++ libkml-1.0.1/msvc/examples/Makefile.in	2009-12-10 10:19:45.000000000 +0100
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -74963,9 +74132,10 @@
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-diff -urN libkml-1.0.1.orig/msvc/Makefile.in libkml-1.0.1/msvc/Makefile.in
+Index: libkml-1.0.1/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-09-30 11:42:07.000000000 +0200
++++ libkml-1.0.1/msvc/Makefile.in	2009-12-10 10:19:45.000000000 +0100
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -75517,9 +74687,10 @@
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-diff -urN libkml-1.0.1.orig/msvc/tests/Makefile.in libkml-1.0.1/msvc/tests/Makefile.in
+Index: libkml-1.0.1/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-09-30 11:42:07.000000000 +0200
++++ libkml-1.0.1/msvc/tests/Makefile.in	2009-12-10 10:19:45.000000000 +0100
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -75868,9 +75039,10 @@
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-diff -urN libkml-1.0.1.orig/src/kml/base/Makefile.in libkml-1.0.1/src/kml/base/Makefile.in
+Index: libkml-1.0.1/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-09-30 11:42:09.000000000 +0200
++++ libkml-1.0.1/src/kml/base/Makefile.in	2009-12-10 10:19:46.000000000 +0100
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -75901,7 +75073,7 @@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
  install_sh_SCRIPT = $(install_sh) -c
-@@ -37,30 +35,56 @@
+@@ -37,27 +35,54 @@
  POST_UNINSTALL = :
  build_triplet = @build@
  host_triplet = @host@
@@ -75957,13 +75129,19 @@
  	"$(DESTDIR)$(libkmlbaseincludedir)"
 -libLTLIBRARIES_INSTALL = $(INSTALL)
  LTLIBRARIES = $(lib_LTLIBRARIES)
--libkmlbase_la_DEPENDENCIES =  \
--	$(top_builddir)/third_party/liburiparser.la
-+libkmlbase_la_DEPENDENCIES =
- am_libkmlbase_la_OBJECTS = attributes.lo date_time.lo \
- 	expat_handler_ns.lo expat_parser.lo file.lo file_posix.lo \
+ libkmlbase_la_DEPENDENCIES =  \
+ 	$(top_builddir)/third_party/liburiparser.la
+@@ -66,6 +91,9 @@
  	math_util.lo referent.lo string_util.lo time_util.lo \
-@@ -81,109 +105,181 @@
+ 	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
@@ -76022,7 +75200,7 @@
  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) \
@@ -76063,7 +75241,7 @@
  	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) \
@@ -76158,7 +75336,7 @@
  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 +302,13 @@
+@@ -206,14 +308,13 @@
  	$(version_test_SOURCES) $(xml_element_test_SOURCES) \
  	$(xml_file_test_SOURCES) $(xml_namespaces_test_SOURCES) \
  	$(xmlns_test_SOURCES)
@@ -76175,7 +75353,7 @@
  AMTAR = @AMTAR@
  AR = @AR@
  AUTOCONF = @AUTOCONF@
-@@ -235,18 +330,16 @@
+@@ -235,18 +336,16 @@
  CYGPATH_W = @CYGPATH_W@
  DEFS = @DEFS@
  DEPDIR = @DEPDIR@
@@ -76199,7 +75377,7 @@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -256,19 +349,28 @@
+@@ -256,19 +355,28 @@
  JAVAC = @JAVAC@
  JAVA_INCLUDE_DIR = @JAVA_INCLUDE_DIR@
  JAVA_LIB_DIR = @JAVA_LIB_DIR@
@@ -76228,7 +75406,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PLATFORM = @PLATFORM@
-@@ -285,22 +387,13 @@
+@@ -285,22 +393,13 @@
  STRIP = @STRIP@
  SWIG = @SWIG@
  VERSION = @VERSION@
@@ -76256,7 +75434,7 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
-@@ -312,36 +405,48 @@
+@@ -312,28 +411,41 @@
  build_cpu = @build_cpu@
  build_os = @build_os@
  build_vendor = @build_vendor@
@@ -76297,30 +75475,8 @@
 +top_srcdir = @top_srcdir@
  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
- 
-- 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_LIBADD = -lexpat -luriparser
- lib_LTLIBRARIES = libkmlbase.la
- libkmlbase_la_SOURCES = \
- 	attributes.cc \
-@@ -359,9 +464,6 @@
- 	version.cc \
- 	xml_namespaces.cc
- 
--libkmlbase_la_LIBADD = \
--	$(top_builddir)/third_party/liburiparser.la
--
- 
- # These header files will be installed in $(includedir)/kml/base
- libkmlbaseincludedir = $(includedir)/kml/base
-@@ -395,28 +497,6 @@
+               -I$(top_srcdir)/third_party/googletest-r108/include \
+@@ -395,28 +507,6 @@
  	uri_parser.h
  
  DATA_DIR = $(top_srcdir)/testdata
@@ -76349,27 +75505,7 @@
  attributes_test_SOURCES = attributes_test.cc
  attributes_test_CXXFLAGS = $(AM_TEST_CXXFLAGS)
  attributes_test_LDADD = libkmlbase.la \
-@@ -454,8 +534,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
-@@ -480,8 +559,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
-@@ -528,14 +606,14 @@
+@@ -528,14 +618,14 @@
  	@for dep in $?; do \
  	  case '$(am__configure_deps)' in \
  	    *$$dep*) \
@@ -76389,7 +75525,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -553,23 +631,28 @@
+@@ -553,23 +643,28 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -76428,12 +75564,12 @@
  	done
  
  clean-libLTLIBRARIES:
-@@ -581,74 +664,76 @@
+@@ -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)
-+	$(CXXLINK) -rpath $(libdir) $(libkmlbase_la_OBJECTS) $(libkmlbase_la_LIBADD) $(LIBS)
++	$(libkmlbase_la_LINK) -rpath $(libdir) $(libkmlbase_la_OBJECTS) $(libkmlbase_la_LIBADD) $(LIBS)
  
  clean-checkPROGRAMS:
 -	@list='$(check_PROGRAMS)'; for p in $$list; do \
@@ -76531,7 +75667,7 @@
  
  mostlyclean-compile:
  	-rm -f *.$(OBJEXT)
-@@ -691,302 +776,302 @@
+@@ -691,302 +788,302 @@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/xmlns_test-xmlns_test.Po at am__quote@
  
  .cc.o:
@@ -76920,7 +76056,7 @@
  @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 +1081,75 @@
+@@ -996,72 +1093,75 @@
  
  clean-libtool:
  	-rm -rf .libs _libs
@@ -77026,7 +76162,7 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-@@ -1069,7 +1157,8 @@
+@@ -1069,7 +1169,8 @@
  check-TESTS: $(TESTS)
  	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
  	srcdir=$(srcdir); export srcdir; \
@@ -77036,7 +76172,7 @@
  	if test -n "$$list"; then \
  	  for tst in $$list; do \
  	    if test -f ./$$tst; then dir=./; \
-@@ -1078,49 +1167,63 @@
+@@ -1078,49 +1179,63 @@
  	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
  	      all=`expr $$all + 1`; \
  	      case " $(XFAIL_TESTS) " in \
@@ -77112,7 +76248,7 @@
  	    test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
  	      dashes="$$skipped"; \
  	  fi; \
-@@ -1131,38 +1234,45 @@
+@@ -1131,38 +1246,45 @@
  	      dashes="$$report"; \
  	  fi; \
  	  dashes=`echo "$$dashes" | sed s/./=/g`; \
@@ -77178,7 +76314,7 @@
  	    || exit 1; \
  	  fi; \
  	done
-@@ -1173,7 +1283,7 @@
+@@ -1173,7 +1295,7 @@
  all-am: Makefile $(LTLIBRARIES) $(HEADERS)
  installdirs:
  	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libkmlbaseincludedir)"; do \
@@ -77187,7 +76323,7 @@
  	done
  install: install-am
  install-exec: install-exec-am
-@@ -1196,6 +1306,7 @@
+@@ -1196,6 +1318,7 @@
  
  distclean-generic:
  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -77195,7 +76331,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -1209,7 +1320,7 @@
+@@ -1209,7 +1332,7 @@
  	-rm -rf ./$(DEPDIR)
  	-rm -f Makefile
  distclean-am: clean-am distclean-compile distclean-generic \
@@ -77204,7 +76340,7 @@
  
  dvi: dvi-am
  
-@@ -1217,18 +1328,38 @@
+@@ -1217,18 +1340,38 @@
  
  html: html-am
  
@@ -77243,7 +76379,7 @@
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
-@@ -1249,22 +1380,27 @@
+@@ -1249,22 +1392,27 @@
  
  ps-am:
  
@@ -77276,9 +76412,10 @@
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-diff -urN libkml-1.0.1.orig/src/kml/convenience/Makefile.in libkml-1.0.1/src/kml/convenience/Makefile.in
+Index: libkml-1.0.1/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-09-30 11:42:09.000000000 +0200
++++ libkml-1.0.1/src/kml/convenience/Makefile.in	2009-12-10 10:19:46.000000000 +0100
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -77554,7 +76691,7 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
-@@ -250,34 +295,47 @@
+@@ -250,28 +295,41 @@
  build_cpu = @build_cpu@
  build_os = @build_os@
  build_vendor = @build_vendor@
@@ -77596,14 +76733,6 @@
  AM_CPPFLAGS = -I$(top_srcdir)/src \
  	      -I$(top_srcdir)/third_party/boost_1_34_1 \
                -I$(top_srcdir)/third_party/googletest-r108/include
- 
-- 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 = libkmlconvenience.la
- libkmlconvenience_la_SOURCES = \
- 	atom_util.cc \
 @@ -299,14 +357,6 @@
  	kmz_check_links.h
  
@@ -78240,9 +77369,10 @@
  # 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:
-diff -urN libkml-1.0.1.orig/src/kml/dom/Makefile.in libkml-1.0.1/src/kml/dom/Makefile.in
+Index: libkml-1.0.1/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-09-30 11:42:11.000000000 +0200
++++ libkml-1.0.1/src/kml/dom/Makefile.in	2009-12-10 10:19:46.000000000 +0100
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -78896,7 +78026,7 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
-@@ -528,34 +736,47 @@
+@@ -528,28 +736,41 @@
  build_cpu = @build_cpu@
  build_os = @build_os@
  build_vendor = @build_vendor@
@@ -78938,14 +78068,6 @@
  AM_CPPFLAGS = -I$(top_srcdir)/src \
  	     -I$(top_srcdir)/third_party/boost_1_34_1 \
  	     -I$(top_srcdir)/third_party/googletest-r108/include
- 
-- 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 \
 @@ -663,56 +884,6 @@
  	kml22.cc
  
@@ -80548,9 +79670,10 @@
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-diff -urN libkml-1.0.1.orig/src/kml/engine/Makefile.in libkml-1.0.1/src/kml/engine/Makefile.in
+Index: libkml-1.0.1/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-09-30 11:42:12.000000000 +0200
++++ libkml-1.0.1/src/kml/engine/Makefile.in	2009-12-10 10:19:47.000000000 +0100
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -80890,7 +80013,7 @@
  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,14 +371,21 @@
+@@ -251,6 +371,10 @@
  	$(top_builddir)/src/kml/dom/libkmldom.la \
  	$(top_builddir)/src/kml/base/libkmlbase.la \
  	$(top_builddir)/third_party/libgtest.la
@@ -80901,10 +80024,9 @@
  am_style_inliner_test_OBJECTS =  \
  	style_inliner_test-style_inliner_test.$(OBJEXT)
  style_inliner_test_OBJECTS = $(am_style_inliner_test_OBJECTS)
- style_inliner_test_DEPENDENCIES = libkmlengine.la \
- 	$(top_builddir)/src/kml/dom/libkmldom.la \
+@@ -259,6 +383,10 @@
  	$(top_builddir)/src/kml/base/libkmlbase.la \
--	$(top_builddir)/third_party/liburiparser.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) \
@@ -80913,7 +80035,7 @@
  am_style_merger_test_OBJECTS =  \
  	style_merger_test-style_merger_test.$(OBJEXT)
  style_merger_test_OBJECTS = $(am_style_merger_test_OBJECTS)
-@@ -266,6 +393,10 @@
+@@ -266,6 +394,10 @@
  	$(top_builddir)/src/kml/dom/libkmldom.la \
  	$(top_builddir)/src/kml/base/libkmlbase.la \
  	$(top_builddir)/third_party/libgtest.la
@@ -80924,7 +80046,7 @@
  am_style_resolver_test_OBJECTS =  \
  	style_resolver_test-style_resolver_test.$(OBJEXT)
  style_resolver_test_OBJECTS = $(am_style_resolver_test_OBJECTS)
-@@ -273,6 +404,10 @@
+@@ -273,6 +405,10 @@
  	$(top_builddir)/src/kml/dom/libkmldom.la \
  	$(top_builddir)/src/kml/base/libkmlbase.la \
  	$(top_builddir)/third_party/libgtest.la
@@ -80935,7 +80057,7 @@
  am_style_splitter_test_OBJECTS =  \
  	style_splitter_test-style_splitter_test.$(OBJEXT)
  style_splitter_test_OBJECTS = $(am_style_splitter_test_OBJECTS)
-@@ -280,6 +415,10 @@
+@@ -280,6 +416,10 @@
  	$(top_builddir)/src/kml/dom/libkmldom.la \
  	$(top_builddir)/src/kml/base/libkmlbase.la \
  	$(top_builddir)/third_party/libgtest.la
@@ -80946,7 +80068,7 @@
  am_update_processor_test_OBJECTS =  \
  	update_processor_test-update_processor_test.$(OBJEXT)
  update_processor_test_OBJECTS = $(am_update_processor_test_OBJECTS)
-@@ -287,23 +426,32 @@
+@@ -287,23 +427,32 @@
  	$(top_builddir)/src/kml/dom/libkmldom.la \
  	$(top_builddir)/src/kml/base/libkmlbase.la \
  	$(top_builddir)/third_party/libgtest.la
@@ -80985,7 +80107,7 @@
  SOURCES = $(libkmlengine_la_SOURCES) $(bbox_test_SOURCES) \
  	$(clone_test_SOURCES) $(entity_mapper_test_SOURCES) \
  	$(feature_balloon_test_SOURCES) $(feature_view_test_SOURCES) \
-@@ -342,14 +490,13 @@
+@@ -342,14 +491,13 @@
  	$(style_inliner_test_SOURCES) $(style_merger_test_SOURCES) \
  	$(style_resolver_test_SOURCES) $(style_splitter_test_SOURCES) \
  	$(update_processor_test_SOURCES) $(update_test_SOURCES)
@@ -81002,7 +80124,7 @@
  AMTAR = @AMTAR@
  AR = @AR@
  AUTOCONF = @AUTOCONF@
-@@ -371,18 +518,16 @@
+@@ -371,18 +519,16 @@
  CYGPATH_W = @CYGPATH_W@
  DEFS = @DEFS@
  DEPDIR = @DEPDIR@
@@ -81026,7 +80148,7 @@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -392,19 +537,28 @@
+@@ -392,19 +538,28 @@
  JAVAC = @JAVAC@
  JAVA_INCLUDE_DIR = @JAVA_INCLUDE_DIR@
  JAVA_LIB_DIR = @JAVA_LIB_DIR@
@@ -81055,7 +80177,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PLATFORM = @PLATFORM@
-@@ -421,22 +575,13 @@
+@@ -421,22 +576,13 @@
  STRIP = @STRIP@
  SWIG = @SWIG@
  VERSION = @VERSION@
@@ -81083,7 +80205,7 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
-@@ -448,35 +593,48 @@
+@@ -448,28 +594,41 @@
  build_cpu = @build_cpu@
  build_os = @build_os@
  build_vendor = @build_vendor@
@@ -81125,16 +80247,7 @@
  AM_CPPFLAGS = -I$(top_srcdir)/src \
  	     -I$(top_srcdir)/third_party/boost_1_34_1 \
  	     -I$(top_srcdir)/third_party/zlib-1.2.3/contrib \
- 	     -I$(top_srcdir)/third_party/googletest-r108/include
- 
-- 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 \
-@@ -561,38 +719,6 @@
+@@ -561,38 +720,6 @@
  	update_processor.h
  
  DATA_DIR = $(top_srcdir)/testdata
@@ -81173,19 +80286,7 @@
  
  # Unit tests for KML Engine
  bbox_test_SOURCES = bbox_test.cc
-@@ -765,10 +891,9 @@
- 
- 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
-@@ -822,14 +947,14 @@
+@@ -822,14 +949,14 @@
  	@for dep in $?; do \
  	  case '$(am__configure_deps)' in \
  	    *$$dep*) \
@@ -81205,7 +80306,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -847,23 +972,28 @@
+@@ -847,23 +974,28 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -81244,7 +80345,7 @@
  	done
  
  clean-libLTLIBRARIES:
-@@ -875,107 +1005,109 @@
+@@ -875,107 +1007,109 @@
  	  rm -f "$${dir}/so_locations"; \
  	done
  libkmlengine.la: $(libkmlengine_la_OBJECTS) $(libkmlengine_la_DEPENDENCIES) 
@@ -81391,7 +80492,7 @@
  
  mostlyclean-compile:
  	-rm -f *.$(OBJEXT)
-@@ -1043,456 +1175,456 @@
+@@ -1043,456 +1177,456 @@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/update_test-update_test.Po at am__quote@
  
  .cc.o:
@@ -81978,7 +81079,7 @@
  @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 +1634,75 @@
+@@ -1502,72 +1636,75 @@
  
  clean-libtool:
  	-rm -rf .libs _libs
@@ -82084,7 +81185,7 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-@@ -1575,7 +1710,8 @@
+@@ -1575,7 +1712,8 @@
  check-TESTS: $(TESTS)
  	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
  	srcdir=$(srcdir); export srcdir; \
@@ -82094,7 +81195,7 @@
  	if test -n "$$list"; then \
  	  for tst in $$list; do \
  	    if test -f ./$$tst; then dir=./; \
-@@ -1584,49 +1720,63 @@
+@@ -1584,49 +1722,63 @@
  	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
  	      all=`expr $$all + 1`; \
  	      case " $(XFAIL_TESTS) " in \
@@ -82170,7 +81271,7 @@
  	    test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
  	      dashes="$$skipped"; \
  	  fi; \
-@@ -1637,38 +1787,45 @@
+@@ -1637,38 +1789,45 @@
  	      dashes="$$report"; \
  	  fi; \
  	  dashes=`echo "$$dashes" | sed s/./=/g`; \
@@ -82236,7 +81337,7 @@
  	    || exit 1; \
  	  fi; \
  	done
-@@ -1679,7 +1836,7 @@
+@@ -1679,7 +1838,7 @@
  all-am: Makefile $(LTLIBRARIES) $(HEADERS)
  installdirs:
  	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libkmlengineincludedir)"; do \
@@ -82245,7 +81346,7 @@
  	done
  install: install-am
  install-exec: install-exec-am
-@@ -1702,6 +1859,7 @@
+@@ -1702,6 +1861,7 @@
  
  distclean-generic:
  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -82253,7 +81354,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -1715,7 +1873,7 @@
+@@ -1715,7 +1875,7 @@
  	-rm -rf ./$(DEPDIR)
  	-rm -f Makefile
  distclean-am: clean-am distclean-compile distclean-generic \
@@ -82262,7 +81363,7 @@
  
  dvi: dvi-am
  
-@@ -1723,18 +1881,38 @@
+@@ -1723,18 +1883,38 @@
  
  html: html-am
  
@@ -82301,7 +81402,7 @@
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
-@@ -1755,22 +1933,27 @@
+@@ -1755,22 +1935,27 @@
  
  ps-am:
  
@@ -82334,9 +81435,10 @@
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-diff -urN libkml-1.0.1.orig/src/kml/Makefile.in libkml-1.0.1/src/kml/Makefile.in
+Index: libkml-1.0.1/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-09-30 11:42:08.000000000 +0200
++++ libkml-1.0.1/src/kml/Makefile.in	2009-12-10 10:19:45.000000000 +0100
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -82952,9 +82054,10 @@
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-diff -urN libkml-1.0.1.orig/src/kml/regionator/Makefile.in libkml-1.0.1/src/kml/regionator/Makefile.in
+Index: libkml-1.0.1/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-09-30 11:42:13.000000000 +0200
++++ libkml-1.0.1/src/kml/regionator/Makefile.in	2009-12-10 10:19:47.000000000 +0100
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -83197,7 +82300,7 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
-@@ -227,34 +260,47 @@
+@@ -227,28 +260,41 @@
  build_cpu = @build_cpu@
  build_os = @build_os@
  build_vendor = @build_vendor@
@@ -83239,14 +82342,6 @@
  AM_CPPFLAGS = -I$(top_srcdir)/src \
               -I$(top_srcdir)/third_party/boost_1_34_1 \
  	     -I$(top_srcdir)/third_party/googletest-r108/include
- 
-- 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 \
 @@ -271,12 +317,6 @@
  	regionator_qid.h \
  	regionator_util.h
@@ -83819,9 +82914,10 @@
  # 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:
-diff -urN libkml-1.0.1.orig/src/kml/xsd/Makefile.in libkml-1.0.1/src/kml/xsd/Makefile.in
+Index: libkml-1.0.1/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-09-30 11:42:13.000000000 +0200
++++ libkml-1.0.1/src/kml/xsd/Makefile.in	2009-12-10 10:19:47.000000000 +0100
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -84110,7 +83206,7 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
-@@ -250,34 +303,47 @@
+@@ -250,28 +303,41 @@
  build_cpu = @build_cpu@
  build_os = @build_os@
  build_vendor = @build_vendor@
@@ -84152,14 +83248,6 @@
  AM_CPPFLAGS = -I$(top_srcdir)/src \
                -I$(top_srcdir)/third_party/boost_1_34_1 \
  	      -I$(top_srcdir)/third_party/googletest-r108/include
- 
-- 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 \
 @@ -304,17 +370,6 @@
  	xst_parser.h
  
@@ -84843,9 +83931,10 @@
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-diff -urN libkml-1.0.1.orig/src/Makefile.in libkml-1.0.1/src/Makefile.in
+Index: libkml-1.0.1/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-09-30 11:42:07.000000000 +0200
++++ libkml-1.0.1/src/Makefile.in	2009-12-10 10:19:45.000000000 +0100
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -85397,9 +84486,10 @@
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-diff -urN libkml-1.0.1.orig/src/swig/java/Makefile.in libkml-1.0.1/src/swig/java/Makefile.in
+Index: libkml-1.0.1/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-09-30 11:42:14.000000000 +0200
++++ libkml-1.0.1/src/swig/java/Makefile.in	2009-12-10 10:19:47.000000000 +0100
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -85748,9 +84838,10 @@
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-diff -urN libkml-1.0.1.orig/src/swig/Makefile.in libkml-1.0.1/src/swig/Makefile.in
+Index: libkml-1.0.1/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-09-30 11:42:14.000000000 +0200
++++ libkml-1.0.1/src/swig/Makefile.in	2009-12-10 10:19:47.000000000 +0100
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -86042,7 +85133,7 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
-@@ -246,32 +297,44 @@
+@@ -246,28 +297,41 @@
  build_cpu = @build_cpu@
  build_os = @build_os@
  build_vendor = @build_vendor@
@@ -86083,13 +85174,8 @@
 +top_srcdir = @top_srcdir@
  SUBDIRS = java python
  AM_CPPFLAGS = -I$(top_srcdir)/src \
--	      -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 \
-@@ -322,14 +385,14 @@
+ 	      -I$(top_srcdir)/third_party/boost_1_34_1 \
+@@ -322,14 +386,14 @@
  	@for dep in $?; do \
  	  case '$(am__configure_deps)' in \
  	    *$$dep*) \
@@ -86109,7 +85195,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -347,23 +410,28 @@
+@@ -347,23 +411,28 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -86148,7 +85234,7 @@
  	done
  
  clean-pkglibLTLIBRARIES:
-@@ -375,17 +443,17 @@
+@@ -375,17 +444,17 @@
  	  rm -f "$${dir}/so_locations"; \
  	done
  libkmlbase_swig_java.la: $(libkmlbase_swig_java_la_OBJECTS) $(libkmlbase_swig_java_la_DEPENDENCIES) 
@@ -86172,7 +85258,7 @@
  
  mostlyclean-compile:
  	-rm -f *.$(OBJEXT)
-@@ -401,111 +469,113 @@
+@@ -401,111 +470,113 @@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libkmlengine_swig_python_la-kmlengine_python.Plo at am__quote@
  
  .cc.o:
@@ -86334,7 +85420,7 @@
  
  # This directory's subdirectories are mostly independent; you can cd
  # into them and run `make' without going through this Makefile.
-@@ -531,15 +601,14 @@
+@@ -531,15 +602,14 @@
  	  else \
  	    local_target="$$target"; \
  	  fi; \
@@ -86352,7 +85438,7 @@
  	@failcom='exit 1'; \
  	for f in x $$MAKEFLAGS; do \
  	  case $$f in \
-@@ -566,16 +635,16 @@
+@@ -566,16 +636,16 @@
  	  else \
  	    local_target="$$target"; \
  	  fi; \
@@ -86372,7 +85458,7 @@
  	done
  
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-@@ -583,14 +652,14 @@
+@@ -583,14 +653,14 @@
  	unique=`for i in $$list; do \
  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  	  done | \
@@ -86390,7 +85476,7 @@
  	here=`pwd`; \
  	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
  	  include_option=--etags-include; \
-@@ -602,39 +671,43 @@
+@@ -602,39 +672,43 @@
  	list='$(SUBDIRS)'; for subdir in $$list; do \
  	  if test "$$subdir" = .; then :; else \
  	    test ! -f $$subdir/TAGS || \
@@ -86448,7 +85534,7 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-@@ -642,43 +715,59 @@
+@@ -642,43 +716,59 @@
  @WITH_SWIG_FALSE at dist-hook:
  
  distdir: $(DISTFILES)
@@ -86533,7 +85619,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -692,7 +781,7 @@
+@@ -692,7 +782,7 @@
  installdirs: installdirs-recursive
  installdirs-am:
  	for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(javadir)" "$(DESTDIR)$(pythonextdir)"; do \
@@ -86542,7 +85628,7 @@
  	done
  install: install-recursive
  install-exec: install-exec-recursive
-@@ -714,6 +803,7 @@
+@@ -714,6 +804,7 @@
  
  distclean-generic:
  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -86550,7 +85636,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -728,7 +818,7 @@
+@@ -728,7 +819,7 @@
  	-rm -rf ./$(DEPDIR)
  	-rm -f Makefile
  distclean-am: clean-am distclean-compile distclean-generic \
@@ -86559,7 +85645,7 @@
  
  dvi: dvi-recursive
  
-@@ -736,18 +826,38 @@
+@@ -736,18 +827,38 @@
  
  html: html-recursive
  
@@ -86598,7 +85684,7 @@
  installcheck-am:
  
  maintainer-clean: maintainer-clean-recursive
-@@ -768,26 +878,27 @@
+@@ -768,26 +879,27 @@
  
  ps-am:
  
@@ -86643,7 +85729,7 @@
  	uninstall-pkglibLTLIBRARIES uninstall-pythonextDATA
  
  kmlbase_java.cc: kmlbase.i
-@@ -847,6 +958,7 @@
+@@ -847,6 +959,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:
@@ -86651,9 +85737,10 @@
  # 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:
-diff -urN libkml-1.0.1.orig/src/swig/python/Makefile.in libkml-1.0.1/src/swig/python/Makefile.in
+Index: libkml-1.0.1/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-09-30 11:42:14.000000000 +0200
++++ libkml-1.0.1/src/swig/python/Makefile.in	2009-12-10 10:19:47.000000000 +0100
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -87002,9 +86089,10 @@
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-diff -urN libkml-1.0.1.orig/testdata/atom/Makefile.in libkml-1.0.1/testdata/atom/Makefile.in
+Index: libkml-1.0.1/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-09-30 11:42:14.000000000 +0200
++++ libkml-1.0.1/testdata/atom/Makefile.in	2009-12-10 10:19:47.000000000 +0100
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -87353,9 +86441,10 @@
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-diff -urN libkml-1.0.1.orig/testdata/balloon/Makefile.in libkml-1.0.1/testdata/balloon/Makefile.in
+Index: libkml-1.0.1/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-09-30 11:42:15.000000000 +0200
++++ libkml-1.0.1/testdata/balloon/Makefile.in	2009-12-10 10:19:47.000000000 +0100
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -87704,9 +86793,10 @@
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-diff -urN libkml-1.0.1.orig/testdata/csv/Makefile.in libkml-1.0.1/testdata/csv/Makefile.in
+Index: libkml-1.0.1/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-09-30 11:42:15.000000000 +0200
++++ libkml-1.0.1/testdata/csv/Makefile.in	2009-12-10 10:19:48.000000000 +0100
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -88055,9 +87145,10 @@
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-diff -urN libkml-1.0.1.orig/testdata/deprecated/Makefile.in libkml-1.0.1/testdata/deprecated/Makefile.in
+Index: libkml-1.0.1/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-09-30 11:42:15.000000000 +0200
++++ libkml-1.0.1/testdata/deprecated/Makefile.in	2009-12-10 10:19:48.000000000 +0100
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -88406,9 +87497,10 @@
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-diff -urN libkml-1.0.1.orig/testdata/gpx/Makefile.in libkml-1.0.1/testdata/gpx/Makefile.in
+Index: libkml-1.0.1/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-09-30 11:42:15.000000000 +0200
++++ libkml-1.0.1/testdata/gpx/Makefile.in	2009-12-10 10:19:48.000000000 +0100
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -88757,9 +87849,10 @@
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-diff -urN libkml-1.0.1.orig/testdata/gx/Makefile.in libkml-1.0.1/testdata/gx/Makefile.in
+Index: libkml-1.0.1/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-09-30 11:42:15.000000000 +0200
++++ libkml-1.0.1/testdata/gx/Makefile.in	2009-12-10 10:19:48.000000000 +0100
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -89108,9 +88201,10 @@
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-diff -urN libkml-1.0.1.orig/testdata/kml/Makefile.in libkml-1.0.1/testdata/kml/Makefile.in
+Index: libkml-1.0.1/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-09-30 11:42:16.000000000 +0200
++++ libkml-1.0.1/testdata/kml/Makefile.in	2009-12-10 10:19:48.000000000 +0100
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -89459,9 +88553,10 @@
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-diff -urN libkml-1.0.1.orig/testdata/kmz/files/Makefile.in libkml-1.0.1/testdata/kmz/files/Makefile.in
+Index: libkml-1.0.1/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-09-30 11:42:16.000000000 +0200
++++ libkml-1.0.1/testdata/kmz/files/Makefile.in	2009-12-10 10:19:48.000000000 +0100
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -89810,9 +88905,10 @@
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-diff -urN libkml-1.0.1.orig/testdata/kmz/kmzfiles/Makefile.in libkml-1.0.1/testdata/kmz/kmzfiles/Makefile.in
+Index: libkml-1.0.1/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-09-30 11:42:16.000000000 +0200
++++ libkml-1.0.1/testdata/kmz/kmzfiles/Makefile.in	2009-12-10 10:19:48.000000000 +0100
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -90161,9 +89257,10 @@
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-diff -urN libkml-1.0.1.orig/testdata/kmz/Makefile.in libkml-1.0.1/testdata/kmz/Makefile.in
+Index: libkml-1.0.1/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-09-30 11:42:16.000000000 +0200
++++ libkml-1.0.1/testdata/kmz/Makefile.in	2009-12-10 10:19:48.000000000 +0100
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -90715,9 +89812,10 @@
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-diff -urN libkml-1.0.1.orig/testdata/kmz/rumsey/imagery/Makefile.in libkml-1.0.1/testdata/kmz/rumsey/imagery/Makefile.in
+Index: libkml-1.0.1/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-09-30 11:42:17.000000000 +0200
++++ libkml-1.0.1/testdata/kmz/rumsey/imagery/Makefile.in	2009-12-10 10:19:48.000000000 +0100
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -91066,9 +90164,10 @@
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-diff -urN libkml-1.0.1.orig/testdata/kmz/rumsey/kml/Makefile.in libkml-1.0.1/testdata/kmz/rumsey/kml/Makefile.in
+Index: libkml-1.0.1/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-09-30 11:42:17.000000000 +0200
++++ libkml-1.0.1/testdata/kmz/rumsey/kml/Makefile.in	2009-12-10 10:19:48.000000000 +0100
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -91417,9 +90516,10 @@
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-diff -urN libkml-1.0.1.orig/testdata/kmz/rumsey/Makefile.in libkml-1.0.1/testdata/kmz/rumsey/Makefile.in
+Index: libkml-1.0.1/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-09-30 11:42:16.000000000 +0200
++++ libkml-1.0.1/testdata/kmz/rumsey/Makefile.in	2009-12-10 10:19:48.000000000 +0100
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -91971,9 +91071,10 @@
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-diff -urN libkml-1.0.1.orig/testdata/links/Makefile.in libkml-1.0.1/testdata/links/Makefile.in
+Index: libkml-1.0.1/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-09-30 11:42:17.000000000 +0200
++++ libkml-1.0.1/testdata/links/Makefile.in	2009-12-10 10:19:48.000000000 +0100
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -92322,9 +91423,10 @@
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-diff -urN libkml-1.0.1.orig/testdata/Makefile.in libkml-1.0.1/testdata/Makefile.in
+Index: libkml-1.0.1/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-09-30 11:42:14.000000000 +0200
++++ libkml-1.0.1/testdata/Makefile.in	2009-12-10 10:19:47.000000000 +0100
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -92876,9 +91978,10 @@
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-diff -urN libkml-1.0.1.orig/testdata/style/Makefile.in libkml-1.0.1/testdata/style/Makefile.in
+Index: libkml-1.0.1/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-09-30 11:42:17.000000000 +0200
++++ libkml-1.0.1/testdata/style/Makefile.in	2009-12-10 10:19:48.000000000 +0100
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -93430,9 +92533,10 @@
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-diff -urN libkml-1.0.1.orig/testdata/style/weather/Makefile.in libkml-1.0.1/testdata/style/weather/Makefile.in
+Index: libkml-1.0.1/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-09-30 11:42:18.000000000 +0200
++++ libkml-1.0.1/testdata/style/weather/Makefile.in	2009-12-10 10:19:48.000000000 +0100
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -93781,9 +92885,10 @@
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-diff -urN libkml-1.0.1.orig/testdata/update/Makefile.in libkml-1.0.1/testdata/update/Makefile.in
+Index: libkml-1.0.1/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-09-30 11:42:18.000000000 +0200
++++ libkml-1.0.1/testdata/update/Makefile.in	2009-12-10 10:19:48.000000000 +0100
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -94132,9 +93237,10 @@
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-diff -urN libkml-1.0.1.orig/testdata/xal/Makefile.in libkml-1.0.1/testdata/xal/Makefile.in
+Index: libkml-1.0.1/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-09-30 11:42:18.000000000 +0200
++++ libkml-1.0.1/testdata/xal/Makefile.in	2009-12-10 10:19:49.000000000 +0100
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -94483,9 +93589,10 @@
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-diff -urN libkml-1.0.1.orig/testdata/xsd/Makefile.in libkml-1.0.1/testdata/xsd/Makefile.in
+Index: libkml-1.0.1/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-09-30 11:42:18.000000000 +0200
++++ libkml-1.0.1/testdata/xsd/Makefile.in	2009-12-10 10:19:49.000000000 +0100
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -94834,9 +93941,10 @@
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-diff -urN libkml-1.0.1.orig/third_party/Makefile.in libkml-1.0.1/third_party/Makefile.in
+Index: libkml-1.0.1/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-09-30 11:42:19.000000000 +0200
++++ libkml-1.0.1/third_party/Makefile.in	2009-12-10 10:19:49.000000000 +0100
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -94867,13 +93975,8 @@
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
  install_sh_SCRIPT = $(install_sh) -c
-@@ -44,22 +42,39 @@
- 	$(libboostconfigplatforminclude_HEADERS) \
- 	$(libboostconfigstdlibinclude_HEADERS) \
- 	$(libboostdetailinclude_HEADERS) $(libboostinclude_HEADERS) \
--	$(liburiparserinclude_HEADERS) $(srcdir)/Makefile.am \
--	$(srcdir)/Makefile.in
-+	$(srcdir)/Makefile.am $(srcdir)/Makefile.in
+@@ -48,18 +46,36 @@
+ 	$(srcdir)/Makefile.in
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_curl.m4 \
 -	$(top_srcdir)/configure.ac
@@ -94911,31 +94014,31 @@
  am__installdirs = "$(DESTDIR)$(libdir)" \
  	"$(DESTDIR)$(libboostconfigcompilerincludedir)" \
  	"$(DESTDIR)$(libboostconfigincludedir)" \
-@@ -67,9 +82,7 @@
- 	"$(DESTDIR)$(libboostconfigplatformincludedir)" \
- 	"$(DESTDIR)$(libboostconfigstdlibincludedir)" \
+@@ -69,7 +85,6 @@
  	"$(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,56 +92,43 @@
+@@ -79,43 +94,44 @@
  libminizip_la_LIBADD =
  am_libminizip_la_OBJECTS = unzip.lo ioapi.lo zip.lo
  libminizip_la_OBJECTS = $(am_libminizip_la_OBJECTS)
--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)
 +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)
  depcomp = $(SHELL) $(top_srcdir)/config/depcomp
  am__depfiles_maybe = depfiles
@@ -94965,10 +94068,13 @@
  CXXLD = $(CXX)
 -CXXLINK = $(LIBTOOL) --tag=CXX --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)
++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)
@@ -94977,20 +94083,10 @@
 -libboostdetailincludeHEADERS_INSTALL = $(INSTALL_HEADER)
 -libboostincludeHEADERS_INSTALL = $(INSTALL_HEADER)
 -liburiparserincludeHEADERS_INSTALL = $(INSTALL_HEADER)
-+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
-+SOURCES = $(libgtest_la_SOURCES) $(libminizip_la_SOURCES)
-+DIST_SOURCES = $(libgtest_la_SOURCES) $(libminizip_la_SOURCES)
  HEADERS = $(libboostconfigcompilerinclude_HEADERS) \
  	$(libboostconfiginclude_HEADERS) \
  	$(libboostconfigno_tr1include_HEADERS) \
- 	$(libboostconfigplatforminclude_HEADERS) \
- 	$(libboostconfigstdlibinclude_HEADERS) \
--	$(libboostdetailinclude_HEADERS) $(libboostinclude_HEADERS) \
--	$(liburiparserinclude_HEADERS)
-+	$(libboostdetailinclude_HEADERS) $(libboostinclude_HEADERS)
- ETAGS = etags
+@@ -127,8 +143,6 @@
  CTAGS = ctags
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  ACLOCAL = @ACLOCAL@
@@ -94999,7 +94095,7 @@
  AMTAR = @AMTAR@
  AR = @AR@
  AUTOCONF = @AUTOCONF@
-@@ -150,18 +150,16 @@
+@@ -150,18 +164,16 @@
  CYGPATH_W = @CYGPATH_W@
  DEFS = @DEFS@
  DEPDIR = @DEPDIR@
@@ -95023,7 +94119,7 @@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -171,19 +169,28 @@
+@@ -171,19 +183,28 @@
  JAVAC = @JAVAC@
  JAVA_INCLUDE_DIR = @JAVA_INCLUDE_DIR@
  JAVA_LIB_DIR = @JAVA_LIB_DIR@
@@ -95052,7 +94148,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PLATFORM = @PLATFORM@
-@@ -200,22 +207,13 @@
+@@ -200,22 +221,13 @@
  STRIP = @STRIP@
  SWIG = @SWIG@
  VERSION = @VERSION@
@@ -95080,7 +94176,7 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
-@@ -227,34 +225,46 @@
+@@ -227,28 +239,41 @@
  build_cpu = @build_cpu@
  build_os = @build_os@
  build_vendor = @build_vendor@
@@ -95120,55 +94216,9 @@
 +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 \
- 	      -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 \
-@@ -262,38 +272,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)
-@@ -446,14 +424,14 @@
+@@ -446,14 +471,14 @@
  	@for dep in $?; do \
  	  case '$(am__configure_deps)' in \
  	    *$$dep*) \
@@ -95188,7 +94238,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -471,23 +449,28 @@
+@@ -471,23 +496,28 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -95227,7 +94277,7 @@
  	done
  
  clean-libLTLIBRARIES:
-@@ -508,11 +491,9 @@
+@@ -508,11 +538,11 @@
  	  rm -f "$${dir}/so_locations"; \
  	done
  libgtest.la: $(libgtest_la_OBJECTS) $(libgtest_la_DEPENDENCIES) 
@@ -95235,34 +94285,14 @@
 +	$(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)
--liburiparser.la: $(liburiparser_la_OBJECTS) $(liburiparser_la_DEPENDENCIES) 
--	$(LINK) -rpath $(libdir) $(liburiparser_la_LDFLAGS) $(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) 
+-	$(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)
  
  mostlyclean-compile:
  	-rm -f *.$(OBJEXT)
-@@ -520,20 +501,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@
-@@ -545,427 +512,335 @@
+@@ -545,427 +575,453 @@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/zip.Plo at am__quote@
  
  .c.o:
@@ -95320,105 +94350,147 @@
  @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
--
--UriCommon.lo: 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 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 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_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
--
--UriCompare.lo: 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 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 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_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
--
--UriEscape.lo: 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 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 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_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
--
--UriFile.lo: 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 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 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_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
--
--UriIp4.lo: 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 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 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_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
--
--UriIp4Base.lo: 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 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 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_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
--
--UriNormalize.lo: 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 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 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_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
--
--UriNormalizeBase.lo: 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 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 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_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
--
--UriParse.lo: 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 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 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_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
--
--UriParseBase.lo: 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 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 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_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
--
--UriQuery.lo: 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 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 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_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
--
--UriRecompose.lo: 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 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 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_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
--
--UriResolve.lo: 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 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 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_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
--
--UriShorten.lo: 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 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 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_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 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 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 $@ $<; \
@@ -95721,28 +94793,41 @@
 -	  echo " rm -f '$(DESTDIR)$(libboostincludedir)/$$f'"; \
 -	  rm -f "$(DESTDIR)$(libboostincludedir)/$$f"; \
 -	done
--install-liburiparserincludeHEADERS: $(liburiparserinclude_HEADERS)
--	@$(NORMAL_INSTALL)
++	@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)"
 -	@list='$(liburiparserinclude_HEADERS)'; for p in $$list; do \
--	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
++	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; \
 -	  f=$(am__strip_dir) \
 -	  echo " $(liburiparserincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(liburiparserincludedir)/$$f'"; \
 -	  $(liburiparserincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(liburiparserincludedir)/$$f"; \
--	done
--
--uninstall-liburiparserincludeHEADERS:
--	@$(NORMAL_UNINSTALL)
++	  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)
 -	@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='$(libboostinclude_HEADERS)'; test -n "$(libboostincludedir)" || list=; \
++	@list='$(liburiparserinclude_HEADERS)'; test -n "$(liburiparserincludedir)" || 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
++	echo " ( cd '$(DESTDIR)$(liburiparserincludedir)' && rm -f" $$files ")"; \
++	cd "$(DESTDIR)$(liburiparserincludedir)" && rm -f $$files
  
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -95861,18 +94946,16 @@
  	    || exit 1; \
  	  fi; \
  	done
-@@ -973,8 +848,8 @@
- check: check-am
+@@ -974,7 +1030,7 @@
  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 \
+ 	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"; \
-+	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 +871,7 @@
+@@ -996,6 +1052,7 @@
  
  distclean-generic:
  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -95880,7 +94963,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -1009,7 +885,7 @@
+@@ -1009,7 +1066,7 @@
  	-rm -rf ./$(DEPDIR)
  	-rm -f Makefile
  distclean-am: clean-am distclean-compile distclean-generic \
@@ -95889,7 +94972,7 @@
  
  dvi: dvi-am
  
-@@ -1017,6 +893,8 @@
+@@ -1017,6 +1074,8 @@
  
  html: html-am
  
@@ -95898,18 +94981,14 @@
  info: info-am
  
  info-am:
-@@ -1027,15 +905,32 @@
- 	install-libboostconfigplatformincludeHEADERS \
- 	install-libboostconfigstdlibincludeHEADERS \
- 	install-libboostdetailincludeHEADERS \
--	install-libboostincludeHEADERS \
--	install-liburiparserincludeHEADERS
-+	install-libboostincludeHEADERS
-+
+@@ -1030,12 +1089,30 @@
+ 	install-libboostincludeHEADERS \
+ 	install-liburiparserincludeHEADERS
+ 
 +install-dvi: install-dvi-am
 +
 +install-dvi-am:
- 
++
  install-exec-am: install-libLTLIBRARIES
  
 +install-html: install-html-am
@@ -95933,7 +95012,7 @@
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
-@@ -1056,22 +951,24 @@
+@@ -1056,7 +1133,7 @@
  
  ps-am:
  
@@ -95942,15 +95021,12 @@
  	uninstall-libboostconfigcompilerincludeHEADERS \
  	uninstall-libboostconfigincludeHEADERS \
  	uninstall-libboostconfigno_tr1includeHEADERS \
- 	uninstall-libboostconfigplatformincludeHEADERS \
- 	uninstall-libboostconfigstdlibincludeHEADERS \
- 	uninstall-libboostdetailincludeHEADERS \
--	uninstall-libboostincludeHEADERS \
--	uninstall-liburiparserincludeHEADERS
-+	uninstall-libboostincludeHEADERS
-+
-+.MAKE: install-am install-strip
+@@ -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 \
@@ -95962,13 +95038,12 @@
  	install-info-am install-libLTLIBRARIES \
  	install-libboostconfigcompilerincludeHEADERS \
  	install-libboostconfigincludeHEADERS \
-@@ -1079,21 +976,20 @@
- 	install-libboostconfigplatformincludeHEADERS \
+@@ -1080,12 +1160,12 @@
  	install-libboostconfigstdlibincludeHEADERS \
  	install-libboostdetailincludeHEADERS \
--	install-libboostincludeHEADERS \
+ 	install-libboostincludeHEADERS \
 -	install-liburiparserincludeHEADERS install-man install-strip \
-+	install-libboostincludeHEADERS install-man install-pdf \
++	install-liburiparserincludeHEADERS 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 \
@@ -95979,19 +95054,18 @@
  	uninstall-libboostconfigcompilerincludeHEADERS \
  	uninstall-libboostconfigincludeHEADERS \
  	uninstall-libboostconfigno_tr1includeHEADERS \
- 	uninstall-libboostconfigplatformincludeHEADERS \
- 	uninstall-libboostconfigstdlibincludeHEADERS \
- 	uninstall-libboostdetailincludeHEADERS \
--	uninstall-libboostincludeHEADERS \
--	uninstall-liburiparserincludeHEADERS
-+	uninstall-libboostincludeHEADERS
-+
+@@ -1095,6 +1175,7 @@
+ 	uninstall-libboostincludeHEADERS \
+ 	uninstall-liburiparserincludeHEADERS
  
++
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-diff -urN libkml-1.0.1.orig/xcode/LibKML/Makefile.in libkml-1.0.1/xcode/LibKML/Makefile.in
+ .NOEXPORT:
+Index: libkml-1.0.1/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-09-30 11:42:19.000000000 +0200
++++ libkml-1.0.1/xcode/LibKML/Makefile.in	2009-12-10 10:19:49.000000000 +0100
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.
@@ -96341,9 +95415,10 @@
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-diff -urN libkml-1.0.1.orig/xcode/Makefile.in libkml-1.0.1/xcode/Makefile.in
+Index: libkml-1.0.1/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-09-30 11:42:19.000000000 +0200
++++ libkml-1.0.1/xcode/Makefile.in	2009-12-10 10:19:49.000000000 +0100
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.9.6 from Makefile.am.
 +# Makefile.in generated by automake 1.11 from Makefile.am.




More information about the Pkg-grass-devel mailing list