r23959 - in /desktop/unstable/pyorbit/debian: changelog control control.in patches/02_python2.6.patch patches/90_relibtoolize.patch patches/series rules source/ source/format

pochu at users.alioth.debian.org pochu at users.alioth.debian.org
Thu Apr 22 19:33:36 UTC 2010


Author: pochu
Date: Thu Apr 22 19:33:35 2010
New Revision: 23959

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=23959
Log:
* debian/control.in,
  debian/rules,
  debian/source/format:
  - Switch to CDBS with python-autotools.mk.
  - Switch to source format 3.0 (quilt).
* debian/patches/02_python2.6.patch:
  - Don't use MODLIBS from the python config, it's not supposed to be
    used and the Python 2.6 one includes -lssl which makes the build fail.
  debian/patches/90_relibtoolize.patch:
  - Regenerated for the above patch.

Added:
    desktop/unstable/pyorbit/debian/patches/02_python2.6.patch
    desktop/unstable/pyorbit/debian/source/
    desktop/unstable/pyorbit/debian/source/format
Modified:
    desktop/unstable/pyorbit/debian/changelog
    desktop/unstable/pyorbit/debian/control
    desktop/unstable/pyorbit/debian/control.in
    desktop/unstable/pyorbit/debian/patches/90_relibtoolize.patch
    desktop/unstable/pyorbit/debian/patches/series
    desktop/unstable/pyorbit/debian/rules

Modified: desktop/unstable/pyorbit/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pyorbit/debian/changelog?rev=23959&op=diff
==============================================================================
--- desktop/unstable/pyorbit/debian/changelog [utf-8] (original)
+++ desktop/unstable/pyorbit/debian/changelog [utf-8] Thu Apr 22 19:33:35 2010
@@ -1,3 +1,18 @@
+pyorbit (2.24.0-7) UNRELEASED; urgency=low
+
+  * debian/control.in,
+    debian/rules,
+    debian/source/format:
+    - Switch to CDBS with python-autotools.mk.
+    - Switch to source format 3.0 (quilt).
+  * debian/patches/02_python2.6.patch:
+    - Don't use MODLIBS from the python config, it's not supposed to be
+      used and the Python 2.6 one includes -lssl which makes the build fail.
+    debian/patches/90_relibtoolize.patch:
+    - Regenerated for the above patch.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org>  Thu, 22 Apr 2010 13:34:16 +0200
+
 pyorbit (2.24.0-6) unstable; urgency=low
 
   * debian/python-pyorbit.install, debian/python-pyorbit-omg.install:

Modified: desktop/unstable/pyorbit/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pyorbit/debian/control?rev=23959&op=diff
==============================================================================
--- desktop/unstable/pyorbit/debian/control [utf-8] (original)
+++ desktop/unstable/pyorbit/debian/control [utf-8] Thu Apr 22 19:33:35 2010
@@ -7,14 +7,13 @@
 Section: python
 Priority: optional
 Maintainer: Sebastien Bacher <seb128 at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>, Luca Falavigna <dktrkranz at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>, Luca Falavigna <dktrkranz at debian.org>
 Build-Depends: debhelper (>= 5.0.37.2),
+               cdbs (>= 0.4.73),
                python-support (>= 1.0.4),
                gnome-pkg-tools (>= 0.10),
                python-all-dev (>= 2.3.5-11),
-               liborbit2-dev (>= 1:2.12),
-               autotools-dev,
-               quilt
+               liborbit2-dev (>= 1:2.12)
 Standards-Version: 3.8.3
 XS-Python-Version: >= 2.4
 

Modified: desktop/unstable/pyorbit/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pyorbit/debian/control.in?rev=23959&op=diff
==============================================================================
--- desktop/unstable/pyorbit/debian/control.in [utf-8] (original)
+++ desktop/unstable/pyorbit/debian/control.in [utf-8] Thu Apr 22 19:33:35 2010
@@ -4,12 +4,11 @@
 Maintainer: Sebastien Bacher <seb128 at debian.org>
 Uploaders: @GNOME_TEAM@
 Build-Depends: debhelper (>= 5.0.37.2),
+               cdbs (>= 0.4.73),
                python-support (>= 1.0.4),
                gnome-pkg-tools (>= 0.10),
                python-all-dev (>= 2.3.5-11),
-               liborbit2-dev (>= 1:2.12),
-               autotools-dev,
-               quilt
+               liborbit2-dev (>= 1:2.12)
 Standards-Version: 3.8.3
 XS-Python-Version: >= 2.4
 

Added: desktop/unstable/pyorbit/debian/patches/02_python2.6.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pyorbit/debian/patches/02_python2.6.patch?rev=23959&op=file
==============================================================================
--- desktop/unstable/pyorbit/debian/patches/02_python2.6.patch (added)
+++ desktop/unstable/pyorbit/debian/patches/02_python2.6.patch [utf-8] Thu Apr 22 19:33:35 2010
@@ -1,0 +1,11 @@
+--- a/m4/python-module.m4
++++ b/m4/python-module.m4
+@@ -81,7 +81,7 @@
+ 
+ dnl use distutils to get some python configuration variables..
+ PYTHON_CC=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_config_var('CC')"`
+-PYTHON_LIB_DEPS=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_config_var('SYSLIBS'), sysconfig.get_config_var('SHLIBS'), sysconfig.get_config_var('MODLIBS')"`
++PYTHON_LIB_DEPS=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_config_var('SYSLIBS'), sysconfig.get_config_var('SHLIBS')"`
+ PYTHON_LIBDIR=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_config_var('LIBDIR')"`
+ PYTHON_LIBPL=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_config_var('LIBPL')"`
+ 

Modified: desktop/unstable/pyorbit/debian/patches/90_relibtoolize.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pyorbit/debian/patches/90_relibtoolize.patch?rev=23959&op=diff
==============================================================================
--- desktop/unstable/pyorbit/debian/patches/90_relibtoolize.patch [utf-8] (original)
+++ desktop/unstable/pyorbit/debian/patches/90_relibtoolize.patch [utf-8] Thu Apr 22 19:33:35 2010
@@ -4,11 +4,9 @@
 autoconf
 rm -rf autom4te.cache
 
-Index: pyorbit-2.24.0/INSTALL
-===================================================================
---- pyorbit-2.24.0.orig/INSTALL	2009-11-21 10:17:40.310267810 +0100
-+++ pyorbit-2.24.0/INSTALL	2009-11-21 10:17:34.266759982 +0100
-@@ -2,15 +2,15 @@ Installation Instructions
+--- a/INSTALL
++++ b/INSTALL
+@@ -2,18 +2,24 @@
  *************************
  
  Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
@@ -16,8 +14,11 @@
 +2006, 2007, 2008, 2009 Free Software Foundation, Inc.
  
 -This file is free documentation; the Free Software Foundation gives
-+   This file is free documentation; the Free Software Foundation gives
- unlimited permission to copy, distribute and modify it.
+-unlimited permission to copy, distribute and modify it.
++   Copying and distribution of this file, with or without modification,
++are permitted in any medium without royalty provided the copyright
++notice and this notice are preserved.  This file is offered as-is,
++without warranty of any kind.
  
  Basic Installation
  ==================
@@ -26,8 +27,66 @@
 +   Briefly, the shell commands `./configure; make; make install' should
  configure, build, and install this package.  The following
  more-detailed instructions are generic; see the `README' file for
- instructions specific to this package.
-@@ -73,9 +73,9 @@ The simplest way to compile this package
+-instructions specific to this package.
++instructions specific to this package.  Some packages provide this
++`INSTALL' file but do not implement all of the features documented
++below.  The lack of an optional feature in a given package is not
++necessarily a bug.  More recommendations for GNU packages can be found
++in *note Makefile Conventions: (standards)Makefile Conventions.
+ 
+    The `configure' shell script attempts to guess correct values for
+ various system-dependent variables used during compilation.  It uses
+@@ -42,7 +48,7 @@
+ you want to change it or regenerate `configure' using a newer version
+ of `autoconf'.
+ 
+-The simplest way to compile this package is:
++   The simplest way to compile this package is:
+ 
+   1. `cd' to the directory containing the package's source code and type
+      `./configure' to configure the package for your system.
+@@ -53,12 +59,22 @@
+   2. Type `make' to compile the package.
+ 
+   3. Optionally, type `make check' to run any self-tests that come with
+-     the package.
++     the package, generally using the just-built uninstalled binaries.
+ 
+   4. Type `make install' to install the programs and any data files and
+-     documentation.
++     documentation.  When installing into a prefix owned by root, it is
++     recommended that the package be configured and built as a regular
++     user, and only the `make install' phase executed with root
++     privileges.
++
++  5. Optionally, type `make installcheck' to repeat any self-tests, but
++     this time using the binaries in their final installed location.
++     This target does not install anything.  Running this target as a
++     regular user, particularly if the prior `make install' required
++     root privileges, verifies that the installation completed
++     correctly.
+ 
+-  5. You can remove the program binaries and object files from the
++  6. You can remove the program binaries and object files from the
+      source code directory by typing `make clean'.  To also remove the
+      files that `configure' created (so you can compile the package for
+      a different kind of computer), type `make distclean'.  There is
+@@ -67,15 +83,22 @@
+      all sorts of other programs in order to regenerate files that came
+      with the distribution.
+ 
+-  6. Often, you can also type `make uninstall' to remove the installed
+-     files again.
++  7. Often, you can also type `make uninstall' to remove the installed
++     files again.  In practice, not all packages have tested that
++     uninstallation works correctly, even though it is required by the
++     GNU Coding Standards.
++
++  8. Some packages, particularly those that use Automake, provide `make
++     distcheck', which can by used by developers to test that all other
++     targets like `make install' and `make uninstall' work correctly.
++     This target is generally not run by end users.
+ 
  Compilers and Options
  =====================
  
@@ -40,7 +99,7 @@
  
     You can give `configure' initial values for configuration parameters
  by setting variables in the command line or in the environment.  Here
-@@ -88,7 +88,7 @@ is an example:
+@@ -88,25 +111,41 @@
  Compiling For Multiple Architectures
  ====================================
  
@@ -49,7 +108,13 @@
  same time, by placing the object files for each architecture in their
  own directory.  To do this, you can use GNU `make'.  `cd' to the
  directory where you want the object files and executables to go and run
-@@ -100,10 +100,24 @@ architecture at a time in the source cod
+ the `configure' script.  `configure' automatically checks for the
+-source code in the directory that `configure' is in and in `..'.
++source code in the directory that `configure' is in and in `..'.  This
++is known as a "VPATH" build.
+ 
+    With a non-GNU `make', it is safer to compile the package for one
+ architecture at a time in the source code directory.  After you have
  installed the package for one architecture, use `make distclean' before
  reconfiguring for another architecture.
  
@@ -74,20 +139,76 @@
 +   By default, `make install' installs the package's commands under
  `/usr/local/bin', include files under `/usr/local/include', etc.  You
  can specify an installation prefix other than `/usr/local' by giving
- `configure' the option `--prefix=PREFIX'.
-@@ -126,7 +140,7 @@ option `--program-prefix=PREFIX' or `--p
- Optional Features
- =================
- 
+-`configure' the option `--prefix=PREFIX'.
++`configure' the option `--prefix=PREFIX', where PREFIX must be an
++absolute file name.
+ 
+    You can specify separate installation prefixes for
+ architecture-specific files and architecture-independent files.  If you
+@@ -117,16 +156,47 @@
+    In addition, if you use an unusual directory layout you can give
+ options like `--bindir=DIR' to specify different values for particular
+ kinds of files.  Run `configure --help' for a list of the directories
+-you can set and what kinds of files go in them.
++you can set and what kinds of files go in them.  In general, the
++default for these options is expressed in terms of `${prefix}', so that
++specifying just `--prefix' will affect all of the other directory
++specifications that were not explicitly provided.
++
++   The most portable way to affect installation locations is to pass the
++correct locations to `configure'; however, many packages provide one or
++both of the following shortcuts of passing variable assignments to the
++`make install' command line to change installation locations without
++having to reconfigure or recompile.
++
++   The first method involves providing an override variable for each
++affected directory.  For example, `make install
++prefix=/alternate/directory' will choose an alternate location for all
++directory configuration variables that were expressed in terms of
++`${prefix}'.  Any directories that were specified during `configure',
++but not in terms of `${prefix}', must each be overridden at install
++time for the entire installation to be relocated.  The approach of
++makefile variable overrides for each directory variable is required by
++the GNU Coding Standards, and ideally causes no recompilation.
++However, some platforms have known limitations with the semantics of
++shared libraries that end up requiring recompilation when using this
++method, particularly noticeable in packages that use GNU Libtool.
++
++   The second method involves providing the `DESTDIR' variable.  For
++example, `make install DESTDIR=/alternate/directory' will prepend
++`/alternate/directory' before all installation names.  The approach of
++`DESTDIR' overrides is not required by the GNU Coding Standards, and
++does not work on platforms that have drive letters.  On the other hand,
++it does better at avoiding recompilation issues, and works well even
++when some directory options were not specified in terms of `${prefix}'
++at `configure' time.
++
++Optional Features
++=================
+ 
+    If the package supports it, you can cause programs to be installed
+ with an extra prefix or suffix on their names by giving `configure' the
+ option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+ 
+-Optional Features
+-=================
+-
 -Some packages pay attention to `--enable-FEATURE' options to
 +   Some packages pay attention to `--enable-FEATURE' options to
  `configure', where FEATURE indicates an optional part of the package.
  They may also pay attention to `--with-PACKAGE' options, where PACKAGE
  is something like `gnu-as' or `x' (for the X Window System).  The
-@@ -138,14 +152,46 @@ find the X include and library files aut
+@@ -138,14 +208,53 @@
  you can use the `configure' options `--x-includes=DIR' and
  `--x-libraries=DIR' to specify their locations.
  
++   Some packages offer the ability to configure how verbose the
++execution of `make' will be.  For these packages, running `./configure
++--enable-silent-rules' sets the default to minimal output, which can be
++overridden with `make V=1'; while running `./configure
++--disable-silent-rules' sets the default to verbose, which can be
++overridden with `make V=0'.
++
 +Particular systems
 +==================
 +
@@ -136,7 +257,7 @@
  `--build=TYPE' option.  TYPE can either be a short name for the system
  type, such as `sun4', or a canonical name which has the form:
  
-@@ -153,7 +199,8 @@ type, such as `sun4', or a canonical nam
+@@ -153,7 +262,8 @@
  
  where SYSTEM can have one of these forms:
  
@@ -146,7 +267,7 @@
  
     See the file `config.sub' for the possible values of each field.  If
  `config.sub' isn't included in this package, then this package doesn't
-@@ -171,9 +218,9 @@ eventually be run) with `--host=TYPE'.
+@@ -171,9 +281,9 @@
  Sharing Defaults
  ================
  
@@ -159,7 +280,7 @@
  `configure' looks for `PREFIX/share/config.site' if it exists, then
  `PREFIX/etc/config.site' if it exists.  Or, you can set the
  `CONFIG_SITE' environment variable to the location of the site script.
-@@ -182,7 +229,7 @@ A warning: not all `configure' scripts l
+@@ -182,7 +292,7 @@
  Defining Variables
  ==================
  
@@ -168,7 +289,7 @@
  environment passed to `configure'.  However, some packages may run
  configure again during the build, and the customized values of these
  variables may be lost.  In order to avoid this problem, you should set
-@@ -201,11 +248,19 @@ an Autoconf bug.  Until the bug is fixed
+@@ -201,11 +311,19 @@
  `configure' Invocation
  ======================
  
@@ -190,12 +311,12 @@
  
  `--version'
  `-V'
-@@ -232,6 +287,16 @@ an Autoconf bug.  Until the bug is fixed
+@@ -232,6 +350,16 @@
       Look for the package's source code in directory DIR.  Usually
       `configure' can determine that directory automatically.
  
 +`--prefix=DIR'
-+     Use DIR as the installation prefix.  *Note Installation Names::
++     Use DIR as the installation prefix.  *note Installation Names::
 +     for more details, including other options available for fine-tuning
 +     the installation locations.
 +
@@ -207,13 +328,11 @@
  `configure' also accepts some other, not widely useful, options.  Run
  `configure --help' for more details.
  
-Index: pyorbit-2.24.0/Makefile.in
-===================================================================
---- pyorbit-2.24.0.orig/Makefile.in	2009-11-21 10:17:40.194761924 +0100
-+++ pyorbit-2.24.0/Makefile.in	2009-11-21 10:17:34.326761326 +0100
+--- a/Makefile.in
++++ b/Makefile.in
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -234,7 +353,7 @@
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
-@@ -41,6 +43,9 @@ DIST_COMMON = README $(am__configure_dep
+@@ -41,6 +43,9 @@
  	depcomp install-sh ltmain.sh missing py-compile
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  am__aclocal_m4_deps = $(top_srcdir)/m4/jhflags.m4 \
@@ -244,7 +363,7 @@
  	$(top_srcdir)/m4/python-module.m4 $(top_srcdir)/configure.in
  am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
  	$(ACLOCAL_M4)
-@@ -49,6 +54,7 @@ am__CONFIG_DISTCLEAN_FILES = config.stat
+@@ -49,6 +54,7 @@
  mkinstalldirs = $(install_sh) -d
  CONFIG_HEADER = config.h
  CONFIG_CLEAN_FILES = pyorbit-2.pc pyorbit.spec PKG-INFO
@@ -252,7 +371,7 @@
  SOURCES =
  DIST_SOURCES =
  RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-@@ -63,12 +69,29 @@ am__vpath_adj = case $$p in \
+@@ -63,12 +69,29 @@
      $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
      *) f=$$p;; \
    esac;
@@ -284,7 +403,7 @@
  ETAGS = etags
  CTAGS = ctags
  DIST_SUBDIRS = $(SUBDIRS)
-@@ -76,9 +99,34 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCE
+@@ -76,9 +99,34 @@
  distdir = $(PACKAGE)-$(VERSION)
  top_distdir = $(distdir)
  am__remove_distdir = \
@@ -322,7 +441,7 @@
  DIST_ARCHIVES = $(distdir).tar.gz
  GZIP_ENV = --best
  distuninstallcheck_listfiles = find . -type f -print
-@@ -96,44 +144,47 @@ CCDEPMODE = @CCDEPMODE@
+@@ -96,44 +144,47 @@
  CFLAGS = @CFLAGS@
  CPP = @CPP@
  CPPFLAGS = @CPPFLAGS@
@@ -377,7 +496,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PKG_CONFIG = @PKG_CONFIG@
-@@ -160,8 +211,7 @@ abs_srcdir = @abs_srcdir@
+@@ -160,8 +211,7 @@
  abs_top_builddir = @abs_top_builddir@
  abs_top_srcdir = @abs_top_srcdir@
  ac_ct_CC = @ac_ct_CC@
@@ -387,7 +506,7 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
-@@ -192,6 +242,7 @@ libdir = @libdir@
+@@ -192,6 +242,7 @@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -395,7 +514,7 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  oldincludedir = @oldincludedir@
-@@ -233,19 +284,19 @@ all: config.h
+@@ -233,19 +284,19 @@
  .SUFFIXES:
  am--refresh:
  	@:
@@ -421,7 +540,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -260,10 +311,11 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
+@@ -260,10 +311,11 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	$(SHELL) ./config.status --recheck
  
@@ -437,7 +556,7 @@
  
  config.h: stamp-h1
  	@if test ! -f $@; then \
-@@ -274,8 +326,8 @@ config.h: stamp-h1
+@@ -274,8 +326,8 @@
  stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
  	@rm -f stamp-h1
  	cd $(top_builddir) && $(SHELL) ./config.status config.h
@@ -448,7 +567,7 @@
  	rm -f stamp-h1
  	touch $@
  
-@@ -295,24 +347,27 @@ clean-libtool:
+@@ -295,24 +347,27 @@
  	-rm -rf .libs _libs
  
  distclean-libtool:
@@ -486,7 +605,16 @@
  
  # This directory's subdirectories are mostly independent; you can cd
  # into them and run `make' without going through this Makefile.
-@@ -338,7 +393,7 @@ $(RECURSIVE_TARGETS):
+@@ -321,7 +376,7 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@failcom='exit 1'; \
++	@fail= failcom='exit 1'; \
+ 	for f in x $$MAKEFLAGS; do \
+ 	  case $$f in \
+ 	    *=* | --[!k]*);; \
+@@ -338,7 +393,7 @@
  	  else \
  	    local_target="$$target"; \
  	  fi; \
@@ -495,7 +623,16 @@
  	  || eval $$failcom; \
  	done; \
  	if test "$$dot_seen" = "no"; then \
-@@ -372,16 +427,16 @@ $(RECURSIVE_CLEAN_TARGETS):
+@@ -346,7 +401,7 @@
+ 	fi; test -z "$$fail"
+ 
+ $(RECURSIVE_CLEAN_TARGETS):
+-	@failcom='exit 1'; \
++	@fail= failcom='exit 1'; \
+ 	for f in x $$MAKEFLAGS; do \
+ 	  case $$f in \
+ 	    *=* | --[!k]*);; \
+@@ -372,16 +427,16 @@
  	  else \
  	    local_target="$$target"; \
  	  fi; \
@@ -515,7 +652,7 @@
  	done
  
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-@@ -389,14 +444,14 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
+@@ -389,14 +444,14 @@
  	unique=`for i in $$list; do \
  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  	  done | \
@@ -532,7 +669,7 @@
  	here=`pwd`; \
  	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
  	  include_option=--etags-include; \
-@@ -408,7 +463,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE
+@@ -408,7 +463,7 @@
  	list='$(SUBDIRS)'; for subdir in $$list; do \
  	  if test "$$subdir" = .; then :; else \
  	    test ! -f $$subdir/TAGS || \
@@ -541,7 +678,7 @@
  	  fi; \
  	done; \
  	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-@@ -417,36 +472,41 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE
+@@ -417,36 +472,41 @@
  	  done | \
  	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
  	      END { if (nonempty) { for (i in files) print i; }; }'`; \
@@ -592,7 +729,7 @@
  	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
  	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
  	list='$(DISTFILES)'; \
-@@ -462,38 +522,54 @@ distdir: $(DISTFILES)
+@@ -462,38 +522,55 @@
  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
  	  if test -d $$d/$$file; then \
  	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
@@ -650,7 +787,8 @@
  	done
 -	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
 +	-test -n "$(am__skip_mode_fix)" \
-+	|| find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
++	|| find "$(distdir)" -type d ! -perm -755 \
++		-exec chmod u+rwx,go+rx {} \; -o \
  	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
  	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
  	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
@@ -659,7 +797,7 @@
  dist-gzip: distdir
  	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
  	$(am__remove_distdir)
-@@ -506,6 +582,10 @@ dist-lzma: distdir
+@@ -506,6 +583,10 @@
  	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
  	$(am__remove_distdir)
  
@@ -670,16 +808,29 @@
  dist-tarZ: distdir
  	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
  	$(am__remove_distdir)
-@@ -534,6 +614,8 @@ distcheck: dist
- 	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+@@ -529,15 +610,17 @@
+ distcheck: dist
+ 	case '$(DIST_ARCHIVES)' in \
+ 	*.tar.gz*) \
+-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
++	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
+ 	*.tar.bz2*) \
+-	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
++	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
  	*.tar.lzma*) \
- 	  unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
+-	  unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
++	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
 +	*.tar.xz*) \
 +	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
  	*.tar.Z*) \
  	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
  	*.shar.gz*) \
-@@ -545,9 +627,11 @@ distcheck: dist
+-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
++	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
+ 	*.zip*) \
+ 	  unzip $(distdir).zip ;;\
+ 	esac
+@@ -545,9 +628,11 @@
  	mkdir $(distdir)/_build
  	mkdir $(distdir)/_inst
  	chmod a-w $(distdir)
@@ -692,7 +843,7 @@
  	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
  	    $(DISTCHECK_CONFIGURE_FLAGS) \
  	  && $(MAKE) $(AM_MAKEFLAGS) \
-@@ -569,13 +653,15 @@ distcheck: dist
+@@ -569,13 +654,15 @@
  	  && rm -rf "$$dc_destdir" \
  	  && $(MAKE) $(AM_MAKEFLAGS) dist \
  	  && rm -rf $(DIST_ARCHIVES) \
@@ -710,7 +861,7 @@
  	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
  	   || { echo "ERROR: files left after uninstall:" ; \
  	        if test -n "$(DESTDIR)"; then \
-@@ -620,6 +706,7 @@ clean-generic:
+@@ -620,6 +707,7 @@
  
  distclean-generic:
  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -718,7 +869,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -640,6 +727,8 @@ dvi-am:
+@@ -640,6 +728,8 @@
  
  html: html-recursive
  
@@ -727,7 +878,7 @@
  info: info-recursive
  
  info-am:
-@@ -648,18 +737,28 @@ install-data-am: install-pkgconfigDATA
+@@ -648,18 +738,28 @@
  
  install-dvi: install-dvi-recursive
  
@@ -756,7 +907,7 @@
  installcheck-am:
  
  maintainer-clean: maintainer-clean-recursive
-@@ -682,25 +781,26 @@ ps-am:
+@@ -682,25 +782,26 @@
  
  uninstall-am: uninstall-pkgconfigDATA
  
@@ -798,13 +949,11 @@
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-Index: pyorbit-2.24.0/aclocal.m4
-===================================================================
---- pyorbit-2.24.0.orig/aclocal.m4	2009-11-21 10:17:41.054759657 +0100
-+++ pyorbit-2.24.0/aclocal.m4	2009-11-21 10:17:32.386765393 +0100
+--- a/aclocal.m4
++++ b/aclocal.m4
 @@ -1,7 +1,7 @@
 -# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
-+# generated automatically by aclocal 1.11 -*- Autoconf -*-
++# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
  
  # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 -# 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
@@ -818,8 +967,8 @@
    [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 -m4_if(AC_AUTOCONF_VERSION, [2.62],,
 -[m4_warning([this file was generated for autoconf 2.62.
-+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'.])])
@@ -987,7 +1136,7 @@
  #
  # This file is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
-@@ -31,10 +189,10 @@ To do so, use the procedure documented b
+@@ -31,10 +189,10 @@
  # generated from the m4 files accompanying Automake X.Y.
  # (This private macro should not be called outside this file.)
  AC_DEFUN([AM_AUTOMAKE_VERSION],
@@ -996,11 +1145,11 @@
  dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
  dnl require some minimum version.  Point them to the right macro.
 -m4_if([$1], [1.10.1], [],
-+m4_if([$1], [1.11], [],
++m4_if([$1], [1.11.1], [],
        [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
  ])
  
-@@ -48,12 +206,12 @@ m4_define([_AM_AUTOCONF_VERSION], [])
+@@ -48,12 +206,12 @@
  # AM_SET_CURRENT_AUTOMAKE_VERSION
  # -------------------------------
  # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
@@ -1008,7 +1157,7 @@
 +# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
  AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
 -[AM_AUTOMAKE_VERSION([1.10.1])dnl
-+[AM_AUTOMAKE_VERSION([1.11])dnl
++[AM_AUTOMAKE_VERSION([1.11.1])dnl
  m4_ifndef([AC_AUTOCONF_VERSION],
    [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 -_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
@@ -1016,7 +1165,7 @@
  
  # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
  
-@@ -110,14 +268,14 @@ am_aux_dir=`cd $ac_aux_dir && pwd`
+@@ -110,14 +268,14 @@
  
  # AM_CONDITIONAL                                            -*- Autoconf -*-
  
@@ -1033,7 +1182,7 @@
  
  # AM_CONDITIONAL(NAME, SHELL-CONDITION)
  # -------------------------------------
-@@ -130,6 +288,7 @@ AC_SUBST([$1_TRUE])dnl
+@@ -130,6 +288,7 @@
  AC_SUBST([$1_FALSE])dnl
  _AM_SUBST_NOTMAKE([$1_TRUE])dnl
  _AM_SUBST_NOTMAKE([$1_FALSE])dnl
@@ -1041,7 +1190,7 @@
  if $2; then
    $1_TRUE=
    $1_FALSE='#'
-@@ -143,14 +302,14 @@ AC_CONFIG_COMMANDS_PRE(
+@@ -143,14 +302,14 @@
  Usually this means the macro was only invoked conditionally.]])
  fi])])
  
@@ -1058,7 +1207,7 @@
  
  # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
  # written in clear, in which case automake, when reading aclocal.m4,
-@@ -207,6 +366,16 @@ AC_CACHE_CHECK([dependency style of $dep
+@@ -207,6 +366,16 @@
    if test "$am_compiler_list" = ""; then
       am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
    fi
@@ -1075,7 +1224,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
-@@ -224,7 +393,17 @@ AC_CACHE_CHECK([dependency style of $dep
+@@ -224,7 +393,17 @@
      done
      echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
  
@@ -1093,7 +1242,7 @@
      nosideeffect)
        # after this tag, mechanisms are not by side-effect, so they'll
        # only be used when explicitly requested
-@@ -234,19 +413,23 @@ AC_CACHE_CHECK([dependency style of $dep
+@@ -234,19 +413,23 @@
  	break
        fi
        ;;
@@ -1123,7 +1272,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
-@@ -303,57 +486,68 @@ _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+@@ -303,57 +486,68 @@
  
  # Generate code to set up dependency tracking.              -*- Autoconf -*-
  
@@ -1232,7 +1381,7 @@
  ])# _AM_OUTPUT_DEPENDENCY_COMMANDS
  
  
-@@ -373,13 +567,13 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS]
+@@ -373,13 +567,13 @@
  # Do all the work for Automake.                             -*- Autoconf -*-
  
  # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
@@ -1248,7 +1397,7 @@
  
  # This macro actually does too much.  Some checks are only needed if
  # your package does certain things.  But this isn't really a big deal.
-@@ -396,7 +590,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS]
+@@ -396,7 +590,7 @@
  # arguments mandatory, and then we can depend on a new Autoconf
  # release and drop the old call support.
  AC_DEFUN([AM_INIT_AUTOMAKE],
@@ -1257,7 +1406,7 @@
  dnl Autoconf wants to disallow AM_ names.  We explicitly allow
  dnl the ones we care about.
  m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-@@ -447,8 +641,8 @@ AM_MISSING_PROG(AUTOCONF, autoconf)
+@@ -447,8 +641,8 @@
  AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
  AM_MISSING_PROG(AUTOHEADER, autoheader)
  AM_MISSING_PROG(MAKEINFO, makeinfo)
@@ -1268,7 +1417,7 @@
  AC_REQUIRE([AM_PROG_MKDIR_P])dnl
  # We need awk for the "check" target.  The system "awk" is bad on
  # some platforms.
-@@ -456,23 +650,36 @@ AC_REQUIRE([AC_PROG_AWK])dnl
+@@ -456,23 +650,36 @@
  AC_REQUIRE([AC_PROG_MAKE_SET])dnl
  AC_REQUIRE([AM_SET_LEADING_DOT])dnl
  _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
@@ -1318,7 +1467,7 @@
  
  
  # When config.status generates a header, we must update the stamp-h file.
-@@ -496,7 +703,7 @@ for _am_header in $config_headers :; do
+@@ -496,7 +703,7 @@
  done
  echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
  
@@ -1327,7 +1476,7 @@
  #
  # This file is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
-@@ -507,7 +714,14 @@ echo "timestamp for $_am_arg" >`AS_DIRNA
+@@ -507,7 +714,14 @@
  # Define $install_sh.
  AC_DEFUN([AM_PROG_INSTALL_SH],
  [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
@@ -1343,7 +1492,7 @@
  AC_SUBST(install_sh)])
  
  # Copyright (C) 2003, 2005  Free Software Foundation, Inc.
-@@ -531,15 +745,55 @@ fi
+@@ -531,15 +745,55 @@
  rmdir .tst 2>/dev/null
  AC_SUBST([am__leading_dot])])
  
@@ -1401,7 +1550,7 @@
  
  # AM_MAKE_INCLUDE()
  # -----------------
-@@ -548,7 +802,7 @@ AC_DEFUN([AM_MAKE_INCLUDE],
+@@ -548,7 +802,7 @@
  [am_make=${MAKE-make}
  cat > confinc << 'END'
  am__doit:
@@ -1410,7 +1559,7 @@
  .PHONY: am__doit
  END
  # If we don't find an include directive, just comment out the code.
-@@ -558,24 +812,24 @@ am__quote=
+@@ -558,24 +812,24 @@
  _am_result=none
  # First try GNU make style include.
  echo "include confinc" > confmf
@@ -1450,7 +1599,7 @@
  fi
  AC_SUBST([am__include])
  AC_SUBST([am__quote])
-@@ -585,14 +839,14 @@ rm -f confinc confmf
+@@ -585,14 +839,14 @@
  
  # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
  
@@ -1467,7 +1616,7 @@
  
  # AM_MISSING_PROG(NAME, PROGRAM)
  # ------------------------------
-@@ -609,7 +863,14 @@ AC_SUBST($1)])
+@@ -609,7 +863,14 @@
  AC_DEFUN([AM_MISSING_HAS_RUN],
  [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
  AC_REQUIRE_AUX_FILE([missing])dnl
@@ -1483,7 +1632,7 @@
  # Use eval to expand $SHELL
  if eval "$MISSING --run true"; then
    am_missing_run="$MISSING --run "
-@@ -647,13 +908,13 @@ esac
+@@ -647,13 +908,13 @@
  
  # Helper functions for option handling.                     -*- Autoconf -*-
  
@@ -1499,7 +1648,7 @@
  
  # _AM_MANGLE_OPTION(NAME)
  # -----------------------
-@@ -670,7 +931,7 @@ AC_DEFUN([_AM_SET_OPTION],
+@@ -670,7 +931,7 @@
  # ----------------------------------
  # OPTIONS is a space-separated list of Automake options.
  AC_DEFUN([_AM_SET_OPTIONS],
@@ -1508,7 +1657,7 @@
  
  # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
  # -------------------------------------------
-@@ -678,7 +939,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
+@@ -678,7 +939,7 @@
  AC_DEFUN([_AM_IF_OPTION],
  [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
  
@@ -1517,7 +1666,7 @@
  # Free Software Foundation, Inc.
  #
  # This file is free software; the Free Software Foundation
-@@ -709,13 +970,11 @@ AC_DEFUN([_AM_IF_OPTION],
+@@ -709,13 +970,11 @@
  # numbers and dots only.
  AC_DEFUN([AM_PATH_PYTHON],
   [
@@ -1535,7 +1684,7 @@
  
    m4_if([$1],[],[
      dnl No version check is needed.
-@@ -762,7 +1021,7 @@ python2.1 python2.0 python1.6 python1.5]
+@@ -762,7 +1021,7 @@
    dnl library.
  
    AC_CACHE_CHECK([for $am_display_PYTHON version], [am_cv_python_version],
@@ -1544,7 +1693,7 @@
    AC_SUBST([PYTHON_VERSION], [$am_cv_python_version])
  
    dnl Use the values of $prefix and $exec_prefix for the corresponding
-@@ -777,7 +1036,7 @@ python2.1 python2.0 python1.6 python1.5]
+@@ -777,7 +1036,7 @@
    dnl to know which OS platform Python thinks this is.
  
    AC_CACHE_CHECK([for $am_display_PYTHON platform], [am_cv_python_platform],
@@ -1553,7 +1702,7 @@
    AC_SUBST([PYTHON_PLATFORM], [$am_cv_python_platform])
  
  
-@@ -792,8 +1051,21 @@ python2.1 python2.0 python1.6 python1.5]
+@@ -792,8 +1051,29 @@
    dnl doesn't work.
    AC_CACHE_CHECK([for $am_display_PYTHON script directory],
      [am_cv_python_pythondir],
@@ -1572,12 +1721,20 @@
 +       am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
 +       am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"`
 +       ;;
++     *)
++       case $am_py_prefix in
++         /usr|/System*) ;;
++         *)
++	  am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages
++	  ;;
++       esac
++       ;;
 +     esac
 +    ])
    AC_SUBST([pythondir], [$am_cv_python_pythondir])
  
    dnl pkgpythondir -- $PACKAGE directory under pythondir.  Was
-@@ -809,8 +1081,21 @@ python2.1 python2.0 python1.6 python1.5]
+@@ -809,8 +1089,29 @@
    dnl doesn't work.
    AC_CACHE_CHECK([for $am_display_PYTHON extension module directory],
      [am_cv_python_pyexecdir],
@@ -1596,12 +1753,20 @@
 +       am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
 +       am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"`
 +       ;;
++     *)
++       case $am_py_exec_prefix in
++         /usr|/System*) ;;
++         *)
++	   am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages
++	   ;;
++       esac
++       ;;
 +     esac
 +    ])
    AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir])
  
    dnl pkgpyexecdir -- $(pyexecdir)/$(PACKAGE)
-@@ -830,15 +1115,16 @@ python2.1 python2.0 python1.6 python1.5]
+@@ -830,15 +1131,16 @@
  # Run ACTION-IF-FALSE otherwise.
  # This test uses sys.hexversion instead of the string equivalent (first
  # word of sys.version), in order to cope with versions such as 2.2c1.
@@ -1623,7 +1788,7 @@
  sys.exit(sys.hexversion < minverhex)"
    AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])])
  
-@@ -861,14 +1147,14 @@ AC_DEFUN([AM_RUN_LOG],
+@@ -861,14 +1163,14 @@
  
  # Check to make sure that the build environment is sane.    -*- Autoconf -*-
  
@@ -1640,7 +1805,7 @@
  
  # AM_SANITY_CHECK
  # ---------------
-@@ -877,16 +1163,29 @@ AC_DEFUN([AM_SANITY_CHECK],
+@@ -877,16 +1179,29 @@
  # Just in case
  sleep 1
  echo timestamp > conftest.file
@@ -1672,7 +1837,7 @@
     fi
     rm -f conftest.file
     if test "$[*]" != "X $srcdir/configure conftest.file" \
-@@ -939,18 +1238,25 @@ fi
+@@ -939,18 +1254,25 @@
  INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
  AC_SUBST([INSTALL_STRIP_PROGRAM])])
  
@@ -1699,7 +1864,7 @@
  # Check how to create a tarball.                            -*- Autoconf -*-
  
  # Copyright (C) 2004, 2005  Free Software Foundation, Inc.
-@@ -1047,6800 +1353,10 @@ AC_SUBST([am__tar])
+@@ -1047,6800 +1369,10 @@
  AC_SUBST([am__untar])
  ]) # _AM_PROG_TAR
  
@@ -8505,24 +8670,56 @@
 +m4_include([m4/ltversion.m4])
 +m4_include([m4/lt~obsolete.m4])
  m4_include([m4/python-module.m4])
-Index: pyorbit-2.24.0/config.guess
-===================================================================
---- pyorbit-2.24.0.orig/config.guess	2009-11-21 10:17:40.942762037 +0100
-+++ pyorbit-2.24.0/config.guess	2009-11-21 10:17:33.730259605 +0100
+--- a/config.guess
++++ b/config.guess
 @@ -1,10 +1,10 @@
  #! /bin/sh
  # Attempt to guess a canonical system name.
  #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 -#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
++#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
  #   Free Software Foundation, Inc.
  
 -timestamp='2008-01-23'
-+timestamp='2009-06-10'
++timestamp='2009-12-30'
  
  # This file is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License as published by
-@@ -170,7 +170,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+@@ -27,16 +27,16 @@
+ # the same distribution terms that you use for the rest of that program.
+ 
+ 
+-# Originally written by Per Bothner <per at bothner.com>.
+-# Please send patches to <config-patches at gnu.org>.  Submit a context
+-# diff and a properly formatted ChangeLog entry.
++# Originally written by Per Bothner.  Please send patches (context
++# diff format) to <config-patches at gnu.org> and include a ChangeLog
++# entry.
+ #
+ # This script attempts to guess a canonical system name similar to
+ # config.sub.  If it succeeds, it prints the system name on stdout, and
+ # exits with 0.  Otherwise, it exits with 1.
+ #
+-# The plan is that this can be called by configure scripts if you
+-# don't specify an explicit build system type.
++# You can get the latest version of this script from:
++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+ 
+ me=`echo "$0" | sed -e 's,.*/,,'`
+ 
+@@ -56,8 +56,9 @@
+ GNU config.guess ($timestamp)
+ 
+ Originally written by Per Bothner.
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
++Software Foundation, Inc.
+ 
+ This is free software; see the source for copying conditions.  There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -170,7 +171,7 @@
  	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
  		eval $set_cc_for_build
  		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
@@ -8531,7 +8728,7 @@
  		then
  		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
  		    # Return netbsd for either.  FIX?
-@@ -324,6 +324,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+@@ -324,14 +325,33 @@
  	case `/usr/bin/uname -p` in
  	    sparc) echo sparc-icl-nx7; exit ;;
  	esac ;;
@@ -8541,9 +8738,12 @@
      sun4H:SunOS:5.*:*)
  	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
  	exit ;;
-@@ -331,7 +334,20 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
+     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
  	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
  	exit ;;
++    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
++	echo i386-pc-auroraux${UNAME_RELEASE}
++	exit ;;
      i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
 -	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 +	eval $set_cc_for_build
@@ -8563,7 +8763,7 @@
  	exit ;;
      sun4*:SunOS:6*:*)
  	# According to config.sub, this is the proper way to canonicalize
-@@ -640,7 +656,7 @@ EOF
+@@ -640,7 +660,7 @@
  	    # => hppa64-hp-hpux11.23
  
  	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
@@ -8572,16 +8772,22 @@
  	    then
  		HP_ARCH="hppa2.0w"
  	    else
-@@ -796,7 +812,7 @@ EOF
+@@ -791,12 +811,12 @@
+     i*:PW*:*)
+ 	echo ${UNAME_MACHINE}-pc-pw32
+ 	exit ;;
+-    *:Interix*:[3456]*)
++    *:Interix*:*)
+     	case ${UNAME_MACHINE} in
  	    x86)
  		echo i586-pc-interix${UNAME_RELEASE}
  		exit ;;
 -	    EM64T | authenticamd)
-+	    EM64T | authenticamd | genuineintel)
++	    authenticamd | genuineintel | EM64T)
  		echo x86_64-unknown-interix${UNAME_RELEASE}
  		exit ;;
  	    IA64)
-@@ -806,6 +822,9 @@ EOF
+@@ -806,6 +826,9 @@
      [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
  	echo i${UNAME_MACHINE}-pc-mks
  	exit ;;
@@ -8591,24 +8797,59 @@
      i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
  	# How do we know it's Interix rather than the generic POSIX subsystem?
  	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-@@ -866,40 +885,17 @@ EOF
+@@ -835,6 +858,20 @@
+     i*86:Minix:*:*)
+ 	echo ${UNAME_MACHINE}-pc-minix
+ 	exit ;;
++    alpha:Linux:*:*)
++	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
++	  EV5)   UNAME_MACHINE=alphaev5 ;;
++	  EV56)  UNAME_MACHINE=alphaev56 ;;
++	  PCA56) UNAME_MACHINE=alphapca56 ;;
++	  PCA57) UNAME_MACHINE=alphapca56 ;;
++	  EV6)   UNAME_MACHINE=alphaev6 ;;
++	  EV67)  UNAME_MACHINE=alphaev67 ;;
++	  EV68*) UNAME_MACHINE=alphaev68 ;;
++        esac
++	objdump --private-headers /bin/sh | grep -q ld.so.1
++	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
++	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
++	exit ;;
+     arm*:Linux:*:*)
+ 	eval $set_cc_for_build
+ 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+@@ -857,6 +894,17 @@
+     frv:Linux:*:*)
+     	echo frv-unknown-linux-gnu
+ 	exit ;;
++    i*86:Linux:*:*)
++	LIBC=gnu
++	eval $set_cc_for_build
++	sed 's/^	//' << EOF >$dummy.c
++	#ifdef __dietlibc__
++	LIBC=dietlibc
++	#endif
++EOF
++	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
++	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
++	exit ;;
+     ia64:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit ;;
+@@ -866,74 +914,33 @@
      m68*:Linux:*:*)
  	echo ${UNAME_MACHINE}-unknown-linux-gnu
  	exit ;;
 -    mips:Linux:*:*)
-+    mips:Linux:*:* | mips64:Linux:*:*)
- 	eval $set_cc_for_build
- 	sed 's/^	//' << EOF >$dummy.c
- 	#undef CPU
+-	eval $set_cc_for_build
+-	sed 's/^	//' << EOF >$dummy.c
+-	#undef CPU
 -	#undef mips
 -	#undef mipsel
-+	#undef ${UNAME_MACHINE}
-+	#undef ${UNAME_MACHINE}el
- 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
 -	CPU=mipsel
-+	CPU=${UNAME_MACHINE}el
- 	#else
- 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+-	#else
+-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
 -	CPU=mips
 -	#else
 -	CPU=
@@ -8623,39 +8864,96 @@
 -	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 -	;;
 -    mips64:Linux:*:*)
--	eval $set_cc_for_build
--	sed 's/^	//' << EOF >$dummy.c
--	#undef CPU
++    mips:Linux:*:* | mips64:Linux:*:*)
+ 	eval $set_cc_for_build
+ 	sed 's/^	//' << EOF >$dummy.c
+ 	#undef CPU
 -	#undef mips64
 -	#undef mips64el
--	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
++	#undef ${UNAME_MACHINE}
++	#undef ${UNAME_MACHINE}el
+ 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
 -	CPU=mips64el
--	#else
--	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
++	CPU=${UNAME_MACHINE}el
+ 	#else
+ 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
 -	CPU=mips64
 +	CPU=${UNAME_MACHINE}
  	#else
  	CPU=
  	#endif
-@@ -931,10 +927,13 @@ EOF
- 	  EV67)  UNAME_MACHINE=alphaev67 ;;
- 	  EV68*) UNAME_MACHINE=alphaev68 ;;
-         esac
--	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-+	objdump --private-headers /bin/sh | grep -q ld.so.1
- 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+ 	#endif
+ EOF
+-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+-	    /^CPU/{
+-		s: ::g
+-		p
+-	    }'`"
++	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
+ 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+ 	;;
+     or32:Linux:*:*)
+ 	echo or32-unknown-linux-gnu
  	exit ;;
+-    ppc:Linux:*:*)
+-	echo powerpc-unknown-linux-gnu
+-	exit ;;
+-    ppc64:Linux:*:*)
+-	echo powerpc64-unknown-linux-gnu
 +    padre:Linux:*:*)
 +	echo sparc-unknown-linux-gnu
-+	exit ;;
+ 	exit ;;
+-    alpha:Linux:*:*)
+-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+-	  EV5)   UNAME_MACHINE=alphaev5 ;;
+-	  EV56)  UNAME_MACHINE=alphaev56 ;;
+-	  PCA56) UNAME_MACHINE=alphapca56 ;;
+-	  PCA57) UNAME_MACHINE=alphapca56 ;;
+-	  EV6)   UNAME_MACHINE=alphaev6 ;;
+-	  EV67)  UNAME_MACHINE=alphaev67 ;;
+-	  EV68*) UNAME_MACHINE=alphaev68 ;;
+-        esac
+-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
+-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
++    parisc64:Linux:*:* | hppa64:Linux:*:*)
++	echo hppa64-unknown-linux-gnu
+ 	exit ;;
      parisc:Linux:*:* | hppa:Linux:*:*)
  	# Look for CPU level
- 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-@@ -982,17 +981,6 @@ EOF
- 	  elf32-i386)
- 		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
- 		;;
+@@ -943,8 +950,11 @@
+ 	  *)    echo hppa-unknown-linux-gnu ;;
+ 	esac
+ 	exit ;;
+-    parisc64:Linux:*:* | hppa64:Linux:*:*)
+-	echo hppa64-unknown-linux-gnu
++    ppc64:Linux:*:*)
++	echo powerpc64-unknown-linux-gnu
++	exit ;;
++    ppc:Linux:*:*)
++	echo powerpc-unknown-linux-gnu
+ 	exit ;;
+     s390:Linux:*:* | s390x:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-ibm-linux
+@@ -967,69 +977,6 @@
+     xtensa*:Linux:*:*)
+     	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit ;;
+-    i*86:Linux:*:*)
+-	# The BFD linker knows what the default object file format is, so
+-	# first see if it will tell us. cd to the root directory to prevent
+-	# problems with other programs or directories called `ld' in the path.
+-	# Set LC_ALL=C to ensure ld outputs messages in English.
+-	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
+-			 | sed -ne '/supported targets:/!d
+-				    s/[ 	][ 	]*/ /g
+-				    s/.*supported targets: *//
+-				    s/ .*//
+-				    p'`
+-        case "$ld_supported_targets" in
+-	  elf32-i386)
+-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
+-		;;
 -	  a.out-i386-linux)
 -		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
 -		exit ;;
@@ -8667,10 +8965,47 @@
 -		# one that does not give us useful --help.
 -		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
 -		exit ;;
- 	esac
- 	# Determine whether the default compiler is a.out or elf
- 	eval $set_cc_for_build
-@@ -1058,7 +1046,7 @@ EOF
+-	esac
+-	# Determine whether the default compiler is a.out or elf
+-	eval $set_cc_for_build
+-	sed 's/^	//' << EOF >$dummy.c
+-	#include <features.h>
+-	#ifdef __ELF__
+-	# ifdef __GLIBC__
+-	#  if __GLIBC__ >= 2
+-	LIBC=gnu
+-	#  else
+-	LIBC=gnulibc1
+-	#  endif
+-	# else
+-	LIBC=gnulibc1
+-	# endif
+-	#else
+-	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
+-	LIBC=gnu
+-	#else
+-	LIBC=gnuaout
+-	#endif
+-	#endif
+-	#ifdef __dietlibc__
+-	LIBC=dietlibc
+-	#endif
+-EOF
+-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+-	    /^LIBC/{
+-		s: ::g
+-		p
+-	    }'`"
+-	test x"${LIBC}" != x && {
+-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+-		exit
+-	}
+-	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
+-	;;
+     i*86:DYNIX/ptx:4*:*)
+ 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+ 	# earlier versions are messed up and put the nodename in both
+@@ -1058,7 +1005,7 @@
      i*86:syllable:*:*)
  	echo ${UNAME_MACHINE}-pc-syllable
  	exit ;;
@@ -8679,7 +9014,7 @@
  	echo i386-unknown-lynxos${UNAME_RELEASE}
  	exit ;;
      i*86:*DOS:*:*)
-@@ -1102,8 +1090,11 @@ EOF
+@@ -1102,8 +1049,11 @@
      pc:*:*:*)
  	# Left here for compatibility:
          # uname -m prints for DJGPP always 'pc', but it prints nothing about
@@ -8693,7 +9028,7 @@
          exit ;;
      Intel:Mach:3*:*)
  	echo i386-pc-mach3
-@@ -1141,6 +1132,16 @@ EOF
+@@ -1141,6 +1091,16 @@
      3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
          /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
            && { echo i486-ncr-sysv4; exit; } ;;
@@ -8710,7 +9045,7 @@
      m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
  	echo m68k-unknown-lynxos${UNAME_RELEASE}
  	exit ;;
-@@ -1153,7 +1154,7 @@ EOF
+@@ -1153,7 +1113,7 @@
      rs6000:LynxOS:2.*:*)
  	echo rs6000-unknown-lynxos${UNAME_RELEASE}
  	exit ;;
@@ -8719,7 +9054,7 @@
  	echo powerpc-unknown-lynxos${UNAME_RELEASE}
  	exit ;;
      SM[BE]S:UNIX_SV:*:*)
-@@ -1216,6 +1217,9 @@ EOF
+@@ -1216,6 +1176,9 @@
      BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
  	echo i586-pc-beos
  	exit ;;
@@ -8729,7 +9064,24 @@
      SX-4:SUPER-UX:*:*)
  	echo sx4-nec-superux${UNAME_RELEASE}
  	exit ;;
-@@ -1324,6 +1328,9 @@ EOF
+@@ -1243,6 +1206,16 @@
+     *:Darwin:*:*)
+ 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+ 	case $UNAME_PROCESSOR in
++	    i386)
++		eval $set_cc_for_build
++		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
++		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
++		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
++		      grep IS_64BIT_ARCH >/dev/null
++		  then
++		      UNAME_PROCESSOR="x86_64"
++		  fi
++		fi ;;
+ 	    unknown) UNAME_PROCESSOR=powerpc ;;
+ 	esac
+ 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+@@ -1324,6 +1297,9 @@
      i*86:rdos:*:*)
  	echo ${UNAME_MACHINE}-pc-rdos
  	exit ;;
@@ -8739,24 +9091,52 @@
  esac
  
  #echo '(No uname command or uname output not recognized.)' 1>&2
-Index: pyorbit-2.24.0/config.sub
-===================================================================
---- pyorbit-2.24.0.orig/config.sub	2009-11-21 10:17:40.838761175 +0100
-+++ pyorbit-2.24.0/config.sub	2009-11-21 10:17:33.730259605 +0100
+--- a/config.sub
++++ b/config.sub
 @@ -1,10 +1,10 @@
  #! /bin/sh
  # Configuration validation subroutine script.
  #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 -#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
++#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
  #   Free Software Foundation, Inc.
  
 -timestamp='2008-01-16'
-+timestamp='2009-06-11'
++timestamp='2010-01-22'
  
  # This file is (in principle) common to ALL GNU software.
  # The presence of a machine in this file suggests that SOME GNU software
-@@ -122,6 +122,7 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-
+@@ -32,13 +32,16 @@
+ 
+ 
+ # Please send patches to <config-patches at gnu.org>.  Submit a context
+-# diff and a properly formatted ChangeLog entry.
++# diff and a properly formatted GNU ChangeLog entry.
+ #
+ # Configuration subroutine to validate and canonicalize a configuration type.
+ # Supply the specified configuration type as an argument.
+ # If it is invalid, we print an error message on stderr and exit with code 1.
+ # Otherwise, we print the canonical config type on stdout and succeed.
+ 
++# You can get the latest version of this script from:
++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
++
+ # This file is supposed to be the same for all GNU packages
+ # and recognize all the CPU types, system types and aliases
+ # that are meaningful with *any* GNU software.
+@@ -72,8 +75,9 @@
+ version="\
+ GNU config.sub ($timestamp)
+ 
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
++Software Foundation, Inc.
+ 
+ This is free software; see the source for copying conditions.  There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -122,6 +126,7 @@
  case $maybe_os in
    nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
    uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
@@ -8764,7 +9144,12 @@
    storm-chaos* | os2-emx* | rtmk-nova*)
      os=-$maybe_os
      basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-@@ -152,6 +153,9 @@ case $os in
+@@ -148,10 +153,13 @@
+ 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+ 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+ 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+-	-apple | -axis | -knuth | -cray)
++	-apple | -axis | -knuth | -cray | -microblaze)
  		os=
  		basic_machine=$1
  		;;
@@ -8774,7 +9159,7 @@
  	-sim | -cisco | -oki | -wec | -winbond)
  		os=
  		basic_machine=$1
-@@ -249,13 +253,16 @@ case $basic_machine in
+@@ -249,13 +257,16 @@
  	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
  	| i370 | i860 | i960 | ia64 \
  	| ip2k | iq2000 \
@@ -8793,7 +9178,7 @@
  	| mips64vr4100 | mips64vr4100el \
  	| mips64vr4300 | mips64vr4300el \
  	| mips64vr5000 | mips64vr5000el \
-@@ -268,6 +275,7 @@ case $basic_machine in
+@@ -268,6 +279,7 @@
  	| mipsisa64sr71k | mipsisa64sr71kel \
  	| mipstx39 | mipstx39el \
  	| mn10200 | mn10300 \
@@ -8801,16 +9186,20 @@
  	| mt \
  	| msp430 \
  	| nios | nios2 \
-@@ -277,7 +285,7 @@ case $basic_machine in
+@@ -276,20 +288,22 @@
+ 	| pdp10 | pdp11 | pj | pjl \
  	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
  	| pyramid \
++	| rx \
  	| score \
 -	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 +	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
  	| sh64 | sh64le \
  	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
  	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-@@ -286,7 +294,7 @@ case $basic_machine in
+ 	| spu | strongarm \
+ 	| tahoe | thumb | tic4x | tic80 | tron \
++	| ubicom32 \
  	| v850 | v850e \
  	| we32k \
  	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
@@ -8818,8 +9207,12 @@
 +	| z8k | z80)
  		basic_machine=$basic_machine-unknown
  		;;
- 	m6811 | m68hc11 | m6812 | m68hc12)
-@@ -329,14 +337,17 @@ case $basic_machine in
+-	m6811 | m68hc11 | m6812 | m68hc12)
++	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
+ 		# Motorola 68HC11/12.
+ 		basic_machine=$basic_machine-unknown
+ 		os=-none
+@@ -329,14 +343,17 @@
  	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
  	| i*86-* | i860-* | i960-* | ia64-* \
  	| ip2k-* | iq2000-* \
@@ -8827,7 +9220,7 @@
  	| m32c-* | m32r-* | m32rle-* \
  	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
 -	| m88110-* | m88k-* | maxq-* | mcore-* \
-+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
++	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
  	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
  	| mips16-* \
  	| mips64-* | mips64el-* \
@@ -8839,20 +9232,23 @@
  	| mips64vr4100-* | mips64vr4100el-* \
  	| mips64vr4300-* | mips64vr4300el-* \
  	| mips64vr5000-* | mips64vr5000el-* \
-@@ -358,20 +369,20 @@ case $basic_machine in
+@@ -357,21 +374,23 @@
+ 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
  	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
  	| pyramid-* \
- 	| romp-* | rs6000-* \
+-	| romp-* | rs6000-* \
 -	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
++	| romp-* | rs6000-* | rx-* \
 +	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
  	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
  	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
  	| sparclite-* \
  	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
  	| tahoe-* | thumb-* \
--	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
+ 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
++	| tile-* | tilegx-* \
  	| tron-* \
++	| ubicom32-* \
  	| v850-* | v850e-* | vax-* \
  	| we32k-* \
  	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
@@ -8863,7 +9259,7 @@
  		;;
  	# Recognize the basic CPU types without company name, with glob match.
  	xtensa*)
-@@ -439,6 +450,10 @@ case $basic_machine in
+@@ -439,6 +458,10 @@
  		basic_machine=m68k-apollo
  		os=-bsd
  		;;
@@ -8874,7 +9270,7 @@
  	aux)
  		basic_machine=m68k-apple
  		os=-aux
-@@ -455,10 +470,18 @@ case $basic_machine in
+@@ -455,10 +478,18 @@
  		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
  		os=-linux
  		;;
@@ -8893,7 +9289,7 @@
  	convex-c1)
  		basic_machine=c1-convex
  		os=-bsd
-@@ -526,6 +549,10 @@ case $basic_machine in
+@@ -526,6 +557,10 @@
  		basic_machine=m88k-motorola
  		os=-sysv3
  		;;
@@ -8904,7 +9300,29 @@
  	djgpp)
  		basic_machine=i586-pc
  		os=-msdosdjgpp
-@@ -1128,6 +1155,10 @@ case $basic_machine in
+@@ -699,6 +734,9 @@
+ 		basic_machine=ns32k-utek
+ 		os=-sysv
+ 		;;
++        microblaze)
++		basic_machine=microblaze-xilinx
++		;;
+ 	mingw32)
+ 		basic_machine=i386-pc
+ 		os=-mingw32
+@@ -1049,6 +1087,11 @@
+ 		basic_machine=tic6x-unknown
+ 		os=-coff
+ 		;;
++        # This must be matched before tile*.
++        tilegx*)
++		basic_machine=tilegx-unknown
++		os=-linux-gnu
++		;;
+ 	tile*)
+ 		basic_machine=tile-unknown
+ 		os=-linux-gnu
+@@ -1128,6 +1171,10 @@
  		basic_machine=z8k-unknown
  		os=-sim
  		;;
@@ -8915,7 +9333,7 @@
  	none)
  		basic_machine=none-none
  		os=-none
-@@ -1166,7 +1197,7 @@ case $basic_machine in
+@@ -1166,7 +1213,7 @@
  	we32k)
  		basic_machine=we32k-att
  		;;
@@ -8924,21 +9342,32 @@
  		basic_machine=sh-unknown
  		;;
  	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
-@@ -1236,10 +1267,11 @@ case $os in
+@@ -1216,6 +1263,9 @@
+         # First match some system type aliases
+         # that might get confused with valid system types.
+ 	# -solaris* is a basic system type, with this one exception.
++        -auroraux)
++	        os=-auroraux
++		;;
+ 	-solaris1 | -solaris1.*)
+ 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
+ 		;;
+@@ -1236,10 +1286,11 @@
  	# Each alternative MUST END IN A *, to match a version number.
  	# -sysv* is not here because it comes later, after sysvr4.
  	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
 -	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
+-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
 +	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
- 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-+	      | -kopensolaris* \
++	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
++	      | -sym* | -kopensolaris* \
  	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
 -	      | -aos* \
 +	      | -aos* | -aros* \
  	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
  	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
  	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-@@ -1248,7 +1280,7 @@ case $os in
+@@ -1248,7 +1299,7 @@
  	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
  	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
  	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
@@ -8947,17 +9376,28 @@
  	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
  	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
  	      | -uxpv* | -beos* | -mpeix* | -udk* \
-@@ -1388,6 +1420,9 @@ case $os in
+@@ -1258,7 +1309,7 @@
+ 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+ 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+ 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
++	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
+ 	# Remember, each alternative MUST END IN *, to match a version number.
+ 		;;
+ 	-qnx*)
+@@ -1388,6 +1439,11 @@
  	-zvmoe)
  		os=-zvmoe
  		;;
 +	-dicos*)
 +		os=-dicos
 +		;;
++        -nacl*)
++	        ;;
  	-none)
  		;;
  	*)
-@@ -1585,7 +1620,7 @@ case $basic_machine in
+@@ -1585,7 +1641,7 @@
  			-sunos*)
  				vendor=sun
  				;;
@@ -8966,22 +9406,22 @@
  				vendor=ibm
  				;;
  			-beos*)
-Index: pyorbit-2.24.0/configure
-===================================================================
---- pyorbit-2.24.0.orig/configure	2009-11-21 10:17:40.094771426 +0100
-+++ pyorbit-2.24.0/configure	2009-11-21 10:17:34.958757858 +0100
-@@ -1,20 +1,22 @@
+--- a/configure
++++ b/configure
+@@ -1,20 +1,24 @@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
 -# Generated by GNU Autoconf 2.62 for pyorbit 2.24.0.
-+# Generated by GNU Autoconf 2.64 for pyorbit 2.24.0.
++# Generated by GNU Autoconf 2.65 for pyorbit 2.24.0.
  #
  # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=pyorbit>.
  #
++#
  # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 -# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
-+# Foundation, Inc.
++# 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.
@@ -8999,7 +9439,7 @@
    emulate sh
    NULLCMD=:
    # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-@@ -22,23 +24,15 @@ if test -n "${ZSH_VERSION+set}" && (emul
+@@ -22,23 +26,15 @@
    alias -g '${1+"$@"}'='"$@"'
    setopt NO_GLOB_SUBST
  else
@@ -9028,7 +9468,7 @@
  as_nl='
  '
  export as_nl
-@@ -46,7 +40,13 @@ export as_nl
+@@ -46,7 +42,13 @@
  as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
  as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
  as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
@@ -9043,7 +9483,7 @@
    as_echo='printf %s\n'
    as_echo_n='printf %s'
  else
-@@ -57,7 +57,7 @@ else
+@@ -57,7 +59,7 @@
      as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
      as_echo_n_body='eval
        arg=$1;
@@ -9052,7 +9492,7 @@
        *"$as_nl"*)
  	expr "X$arg" : "X\\(.*\\)$as_nl";
  	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -80,13 +80,6 @@ if test "${PATH_SEPARATOR+set}" != set; 
+@@ -80,13 +82,6 @@
    }
  fi
  
@@ -9066,7 +9506,7 @@
  
  # IFS
  # We need space, tab and new line, in precisely that order.  Quoting is
-@@ -96,15 +89,15 @@ fi
+@@ -96,15 +91,15 @@
  IFS=" ""	$as_nl"
  
  # Find who we are.  Look in the path if we contain no directory separator.
@@ -9085,7 +9525,7 @@
  IFS=$as_save_IFS
  
       ;;
-@@ -116,12 +109,16 @@ if test "x$as_myself" = x; then
+@@ -116,12 +111,16 @@
  fi
  if test ! -f "$as_myself"; then
    $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
@@ -9106,7 +9546,7 @@
  done
  PS1='$ '
  PS2='> '
-@@ -133,330 +130,301 @@ export LC_ALL
+@@ -133,330 +132,301 @@
  LANGUAGE=C
  export LANGUAGE
  
@@ -9442,7 +9882,7 @@
 +# Unset more variables known to interfere with behavior of common tools.
 +CLICOLOR_FORCE= GREP_OPTIONS=
 +unset CLICOLOR_FORCE GREP_OPTIONS
-+
+ 
 +## --------------------- ##
 +## M4sh Shell Functions. ##
 +## --------------------- ##
@@ -9478,7 +9918,7 @@
 +# Create "$as_dir" as a directory, including parents if necessary.
 +as_fn_mkdir_p ()
 +{
- 
++
 +  case $as_dir in #(
 +  -*) as_dir=./$as_dir;;
 +  esac
@@ -9684,7 +10124,7 @@
    sed -n '
      p
      /[$]LINENO/=
-@@ -473,8 +441,7 @@ test \$exitcode = 0") || {
+@@ -473,8 +443,7 @@
        s/-\n.*//
      ' >$as_me.lineno &&
    chmod +x "$as_me.lineno" ||
@@ -9694,7 +10134,7 @@
  
    # Don't try to exec as it changes $[0], causing all sort of problems
    # (the dirname of $[0] is not the place where we might find the
-@@ -484,29 +451,18 @@ test \$exitcode = 0") || {
+@@ -484,29 +453,18 @@
    exit
  }
  
@@ -9729,7 +10169,7 @@
  
  rm -f conf$$ conf$$.exe conf$$.file
  if test -d conf$$.dir; then
-@@ -536,7 +492,7 @@ rm -f conf$$ conf$$.exe conf$$.dir/conf$
+@@ -536,7 +494,7 @@
  rmdir conf$$.dir 2>/dev/null
  
  if mkdir -p . 2>/dev/null; then
@@ -9738,7 +10178,7 @@
  else
    test -d ./-p && rmdir ./-p
    as_mkdir_p=false
-@@ -555,10 +511,10 @@ else
+@@ -555,10 +513,10 @@
        if test -d "$1"; then
  	test -d "$1/.";
        else
@@ -9751,7 +10191,7 @@
  	???[sx]*):;;*)false;;esac;fi
      '\'' sh
    '
-@@ -573,26 +529,25 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr
+@@ -573,26 +531,25 @@
  
  
  
@@ -9783,7 +10223,7 @@
    :
  else
    # Restart under the correct shell.
-@@ -602,9 +557,9 @@ fi
+@@ -602,9 +559,9 @@
  if test "X$1" = X--fallback-echo; then
    # used as fallback echo
    shift
@@ -9795,7 +10235,7 @@
    exit 0
  fi
  
-@@ -612,121 +567,116 @@ fi
+@@ -612,122 +569,118 @@
  # if CDPATH is set.
  (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
  
@@ -9896,15 +10336,6 @@
 -      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' &&
@@ -9926,6 +10357,15 @@
 +        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...
@@ -10005,10 +10445,13 @@
 -
 -tagnames=${tagnames+${tagnames},}F77
 -
- exec 7<&0 </dev/null 6>&1
+-exec 7<&0 </dev/null 6>&1
++test -n "$DJDIR" || exec 7<&0 </dev/null
++exec 6>&1
  
  # Name of the host.
-@@ -745,7 +695,6 @@ cross_compiling=no
+ # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+@@ -745,7 +698,6 @@
  subdirs=
  MFLAGS=
  MAKEFLAGS=
@@ -10016,7 +10459,7 @@
  
  # Identity of this package.
  PACKAGE_NAME='pyorbit'
-@@ -753,6 +702,7 @@ PACKAGE_TARNAME='pyorbit'
+@@ -753,6 +705,7 @@
  PACKAGE_VERSION='2.24.0'
  PACKAGE_STRING='pyorbit 2.24.0'
  PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=pyorbit'
@@ -10024,7 +10467,7 @@
  
  ac_unique_file="src/pyorbit.h"
  # Factoring default headers for most tests.
-@@ -791,159 +741,158 @@ ac_includes_default="\
+@@ -791,159 +744,158 @@
  # include <unistd.h>
  #endif"
  
@@ -10328,7 +10771,7 @@
  PKG_CONFIG
  PYORBIT_CFLAGS
  PYORBIT_LIBS'
-@@ -1055,8 +1004,7 @@ do
+@@ -1055,8 +1007,7 @@
      ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
      # Reject names that are not valid shell variable names.
      expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -10338,7 +10781,7 @@
      ac_useropt_orig=$ac_useropt
      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
      case $ac_user_opts in
-@@ -1082,8 +1030,7 @@ do
+@@ -1082,8 +1033,7 @@
      ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
      # Reject names that are not valid shell variable names.
      expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -10348,7 +10791,7 @@
      ac_useropt_orig=$ac_useropt
      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
      case $ac_user_opts in
-@@ -1287,8 +1234,7 @@ do
+@@ -1287,8 +1237,7 @@
      ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
      # Reject names that are not valid shell variable names.
      expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -10358,7 +10801,7 @@
      ac_useropt_orig=$ac_useropt
      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
      case $ac_user_opts in
-@@ -1304,8 +1250,7 @@ do
+@@ -1304,8 +1253,7 @@
      ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
      # Reject names that are not valid shell variable names.
      expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -10368,7 +10811,7 @@
      ac_useropt_orig=$ac_useropt
      ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
      case $ac_user_opts in
-@@ -1335,17 +1280,17 @@ do
+@@ -1335,17 +1283,17 @@
    | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
      x_libraries=$ac_optarg ;;
  
@@ -10392,7 +10835,7 @@
      eval $ac_envvar=\$ac_optarg
      export $ac_envvar ;;
  
-@@ -1362,16 +1307,14 @@ done
+@@ -1362,16 +1310,14 @@
  
  if test -n "$ac_prev"; then
    ac_option=--`echo $ac_prev | sed 's/_/-/g'`
@@ -10412,7 +10855,7 @@
    esac
  fi
  
-@@ -1393,8 +1336,7 @@ do
+@@ -1393,8 +1339,7 @@
      [\\/$]* | ?:[\\/]* )  continue;;
      NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
    esac
@@ -10422,7 +10865,7 @@
  done
  
  # There might be people who depend on the old broken behavior: `$host'
-@@ -1424,11 +1366,9 @@ test "$silent" = yes && exec 6>/dev/null
+@@ -1424,11 +1369,9 @@
  ac_pwd=`pwd` && test -n "$ac_pwd" &&
  ac_ls_di=`ls -di .` &&
  ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
@@ -10436,7 +10879,7 @@
  
  
  # Find the source files, if location was not specified.
-@@ -1467,13 +1407,11 @@ else
+@@ -1467,13 +1410,11 @@
  fi
  if test ! -r "$srcdir/$ac_unique_file"; then
    test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
@@ -10452,7 +10895,7 @@
  	pwd)`
  # When building in place, set srcdir=.
  if test "$ac_abs_confdir" = "$ac_pwd"; then
-@@ -1577,6 +1515,8 @@ Optional Features:
+@@ -1577,6 +1518,8 @@
    --disable-option-checking  ignore unrecognized --enable/--with options
    --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
    --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
@@ -10461,7 +10904,7 @@
    --enable-static[=PKGS]  build static libraries [default=no]
    --enable-shared[=PKGS]  build shared libraries [default=yes]
    --enable-fast-install[=PKGS]
-@@ -1588,10 +1528,9 @@ Optional Features:
+@@ -1588,10 +1531,9 @@
  Optional Packages:
    --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
    --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
@@ -10473,8 +10916,12 @@
  
  Some influential environment variables:
    CC          C compiler command
-@@ -1602,11 +1541,6 @@ Some influential environment variables:
-   CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
+@@ -1599,14 +1541,9 @@
+   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
+               nonstandard directory <lib dir>
+   LIBS        libraries to pass to the linker, e.g. -l<library>
+-  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
++  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
@@ -10485,12 +10932,12 @@
    PKG_CONFIG  path to pkg-config utility
    PYORBIT_CFLAGS
                C compiler flags for PYORBIT, overriding pkg-config
-@@ -1680,21 +1614,285 @@ test -n "$ac_init_help" && exit $ac_stat
+@@ -1680,21 +1617,285 @@
  if $ac_init_version; then
    cat <<\_ACEOF
  pyorbit configure 2.24.0
 -generated by GNU Autoconf 2.62
-+generated by GNU Autoconf 2.64
++generated by GNU Autoconf 2.65
  
 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
@@ -10539,7 +10986,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
 +
@@ -10585,7 +11032,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
 +
@@ -10653,7 +11100,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
 +
@@ -10695,7 +11142,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
 +
@@ -10771,11 +11218,11 @@
  
  It was created by pyorbit $as_me 2.24.0, which was
 -generated by GNU Autoconf 2.62.  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 $@
  
-@@ -1730,8 +1928,8 @@ for as_dir in $PATH
+@@ -1730,8 +1931,8 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -10786,7 +11233,7 @@
  IFS=$as_save_IFS
  
  } >&5
-@@ -1768,9 +1966,9 @@ do
+@@ -1768,9 +1969,9 @@
        ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
      esac
      case $ac_pass in
@@ -10798,7 +11245,7 @@
        if test $ac_must_keep_next = true; then
  	ac_must_keep_next=false # Got value, back to normal.
        else
-@@ -1786,13 +1984,13 @@ do
+@@ -1786,13 +1987,13 @@
  	  -* ) ac_must_keep_next=true ;;
  	esac
        fi
@@ -10815,7 +11262,7 @@
  
  # When interrupted or exit'd, cleanup temporary files, and complete
  # config.log.  We remove comments because anyway the quotes in there
-@@ -1817,13 +2015,13 @@ _ASBOX
+@@ -1817,13 +2018,13 @@
      case $ac_val in #(
      *${as_nl}*)
        case $ac_var in #(
@@ -10832,7 +11279,7 @@
        esac ;;
      esac
    done
-@@ -1895,39 +2093,41 @@ _ASBOX
+@@ -1895,39 +2096,41 @@
      exit $exit_status
  ' 0
  for ac_signal in 1 2 13 15; do
@@ -10879,25 +11326,33 @@
  
  # Let the site file select an alternate cache file if it wants to.
  # Prefer an explicitly selected file to automatically selected ones.
-@@ -1946,7 +2146,7 @@ for ac_site_file in "$ac_site_file1" "$a
+@@ -1945,8 +2148,8 @@
+ for ac_site_file in "$ac_site_file1" "$ac_site_file2"
  do
    test "x$ac_site_file" = xNONE && continue
-   if test -r "$ac_site_file"; then
+-  if test -r "$ac_site_file"; then
 -    { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
++  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
  $as_echo "$as_me: loading site script $ac_site_file" >&6;}
      sed 's/^/| /' "$ac_site_file" >&5
      . "$ac_site_file"
-@@ -1957,7 +2157,7 @@ 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
+@@ -1954,10 +2157,10 @@
+ done
+ 
+ if test -r "$cache_file"; then
+-  # Some versions of bash will fail to source /dev/null (special
+-  # files actually), so we avoid doing that.
+-  if test -f "$cache_file"; then
 -    { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
++  # Some versions of bash will fail to source /dev/null (special files
++  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
++  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
  $as_echo "$as_me: loading cache $cache_file" >&6;}
      case $cache_file in
        [\\/]* | ?:[\\/]* ) . "$cache_file";;
-@@ -1965,7 +2165,7 @@ $as_echo "$as_me: loading cache $cache_f
+@@ -1965,7 +2168,7 @@
      esac
    fi
  else
@@ -10906,7 +11361,7 @@
  $as_echo "$as_me: creating cache $cache_file" >&6;}
    >$cache_file
  fi
-@@ -1980,11 +2180,11 @@ for ac_var in $ac_precious_vars; do
+@@ -1980,11 +2183,11 @@
    eval ac_new_val=\$ac_env_${ac_var}_value
    case $ac_old_set,$ac_new_set in
      set,)
@@ -10920,7 +11375,7 @@
  $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
        ac_cache_corrupted=: ;;
      ,);;
-@@ -1994,17 +2194,17 @@ $as_echo "$as_me: error: \`$ac_var' was 
+@@ -1994,17 +2197,17 @@
  	ac_old_val_w=`echo x $ac_old_val`
  	ac_new_val_w=`echo x $ac_new_val`
  	if test "$ac_old_val_w" != "$ac_new_val_w"; then
@@ -10942,7 +11397,7 @@
  $as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
        fi;;
    esac
-@@ -2016,41 +2216,20 @@ $as_echo "$as_me:   current value: \`$ac
+@@ -2016,41 +2219,20 @@
      esac
      case " $ac_configure_args " in
        *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
@@ -10992,7 +11447,7 @@
  
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
-@@ -2065,28 +2244,20 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -2065,28 +2247,20 @@
  ac_config_headers="$ac_config_headers config.h"
  
  
@@ -11030,7 +11485,7 @@
  fi
  
  # These three variables are undocumented and unsupported,
-@@ -2112,10 +2283,10 @@ ac_configure="$SHELL $ac_aux_dir/configu
+@@ -2112,10 +2286,10 @@
  # OS/2's system install, which has a completely different semantic
  # ./install, which can be erroneously created by make from ./install.sh.
  # Reject install programs that cannot install multiple files.
@@ -11043,7 +11498,7 @@
    $as_echo_n "(cached) " >&6
  else
    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2123,11 +2294,11 @@ for as_dir in $PATH
+@@ -2123,11 +2297,11 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -11059,7 +11514,7 @@
    /usr/ucb/* ) ;;
    *)
      # OSF1 and SCO ODT 3.0 have their own names for install.
-@@ -2164,7 +2335,7 @@ case $as_dir/ in
+@@ -2164,7 +2338,7 @@
      ;;
  esac
  
@@ -11068,7 +11523,7 @@
  IFS=$as_save_IFS
  
  rm -rf conftest.one conftest.two conftest.dir
-@@ -2180,7 +2351,7 @@ fi
+@@ -2180,7 +2354,7 @@
      INSTALL=$ac_install_sh
    fi
  fi
@@ -11077,7 +11532,7 @@
  $as_echo "$INSTALL" >&6; }
  
  # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-@@ -2191,21 +2362,34 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR
+@@ -2191,21 +2365,34 @@
  
  test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
  
@@ -11115,7 +11570,7 @@
     fi
     rm -f conftest.file
     if test "$*" != "X $srcdir/configure conftest.file" \
-@@ -2215,11 +2399,8 @@ if (
+@@ -2215,11 +2402,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".
@@ -11129,7 +11584,7 @@
     fi
  
     test "$2" = conftest.file
-@@ -2228,13 +2409,10 @@ then
+@@ -2228,13 +2412,10 @@
     # Ok.
     :
  else
@@ -11146,7 +11601,7 @@
  $as_echo "yes" >&6; }
  test "$program_prefix" != NONE &&
    program_transform_name="s&^&$program_prefix&;$program_transform_name"
-@@ -2249,30 +2427,146 @@ program_transform_name=`$as_echo "$progr
+@@ -2249,29 +2430,145 @@
  # expand $ac_aux_dir to an absolute path
  am_aux_dir=`cd $ac_aux_dir && pwd`
  
@@ -11197,17 +11652,19 @@
  else
 -  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 -for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for ac_prog in mkdir gmkdir; do
+-	 for ac_exec_ext in '' $ac_executable_extensions; do
 +  if test -n "$STRIP"; then
 +  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
 +else
 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +for as_dir in $PATH
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_prog in mkdir gmkdir; do
--	 for ac_exec_ext in '' $ac_executable_extensions; do
--	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
++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_STRIP="${ac_tool_prefix}strip"
@@ -11300,11 +11757,10 @@
 +  test -z "$as_dir" && as_dir=.
 +    for ac_prog in mkdir gmkdir; do
 +	 for ac_exec_ext in '' $ac_executable_extensions; do
-+	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+ 	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
  	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
  	     'mkdir (GNU coreutils) '* | \
- 	     'mkdir (coreutils) '* | \
-@@ -2282,7 +2576,7 @@ do
+@@ -2282,11 +2579,12 @@
  	   esac
  	 done
         done
@@ -11313,7 +11769,16 @@
  IFS=$as_save_IFS
  
  fi
-@@ -2298,7 +2592,7 @@ fi
+ 
++  test -d ./--version && rmdir ./--version
+   if test "${ac_cv_path_mkdir+set}" = set; then
+     MKDIR_P="$ac_cv_path_mkdir -p"
+   else
+@@ -2294,11 +2592,10 @@
+     # value for MKDIR_P within a source directory, because that will
+     # break other packages using the cache if that directory is
+     # removed, or if the value is a relative name.
+-    test -d ./--version && rmdir ./--version
      MKDIR_P="$ac_install_sh -d"
    fi
  fi
@@ -11322,7 +11787,7 @@
  $as_echo "$MKDIR_P" >&6; }
  
  mkdir_p="$MKDIR_P"
-@@ -2311,9 +2605,9 @@ for ac_prog in gawk mawk nawk awk
+@@ -2311,9 +2608,9 @@
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
@@ -11334,7 +11799,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$AWK"; then
-@@ -2324,24 +2618,24 @@ for as_dir in $PATH
+@@ -2324,24 +2621,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -11364,7 +11829,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -2349,11 +2643,11 @@ fi
+@@ -2349,11 +2646,11 @@
    test -n "$AWK" && break
  done
  
@@ -11378,7 +11843,7 @@
    $as_echo_n "(cached) " >&6
  else
    cat >conftest.make <<\_ACEOF
-@@ -2371,11 +2665,11 @@ esac
+@@ -2371,11 +2668,11 @@
  rm -f conftest.make
  fi
  if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
@@ -11392,7 +11857,7 @@
  $as_echo "no" >&6; }
    SET_MAKE="MAKE=${MAKE-make}"
  fi
-@@ -2395,9 +2689,7 @@ if test "`cd $srcdir && pwd`" != "`pwd`"
+@@ -2395,9 +2692,7 @@
    am__isrc=' -I$(srcdir)'
    # test to see if srcdir already configured
    if test -f $srcdir/config.status; then
@@ -11403,7 +11868,7 @@
    fi
  fi
  
-@@ -2441,122 +2733,39 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_ru
+@@ -2441,122 +2736,39 @@
  
  MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
  
@@ -11548,7 +12013,7 @@
  
  
  
-@@ -2565,19 +2774,13 @@ ACLOCAL_AMFLAGS="-I $ac_macro_dir \${ACL
+@@ -2565,19 +2777,13 @@
  
  
  
@@ -11571,7 +12036,7 @@
  
  
  # used in the spec file ...
-@@ -2585,7 +2788,7 @@ ORBIT2_REQUIRED_VERSION=2.12
+@@ -2585,7 +2791,7 @@
  
  
  # Check whether --enable-static was given.
@@ -11580,7 +12045,7 @@
    enableval=$enable_static; p=${PACKAGE-default}
      case $enableval in
      yes) enable_static=yes ;;
-@@ -2609,85 +2812,60 @@ fi
+@@ -2609,85 +2815,60 @@
  
  
  
@@ -11642,8 +12107,8 @@
 +
 +
 +
-+macro_version='2.2.6'
-+macro_revision='1.3012'
++macro_version='2.2.6b'
++macro_revision='1.3017'
 +
 +
 +
@@ -11700,7 +12165,7 @@
  esac
  build=$ac_cv_build
  ac_save_IFS=$IFS; IFS='-'
-@@ -2703,28 +2881,24 @@ IFS=$ac_save_IFS
+@@ -2703,28 +2884,24 @@
  case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
  
  
@@ -11734,7 +12199,7 @@
  esac
  host=$ac_cv_host
  ac_save_IFS=$IFS; IFS='-'
-@@ -2748,44 +2922,44 @@ ac_config_commands="$ac_config_commands 
+@@ -2748,44 +2925,44 @@
  am_make=${MAKE-make}
  cat > confinc << 'END'
  am__doit:
@@ -11798,7 +12263,7 @@
    enableval=$enable_dependency_tracking;
  fi
  
-@@ -2810,9 +2984,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -2810,9 +2987,9 @@
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
  set dummy ${ac_tool_prefix}gcc; ac_word=$2
@@ -11810,7 +12275,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-@@ -2823,24 +2997,24 @@ for as_dir in $PATH
+@@ -2823,24 +3000,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -11840,7 +12305,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -2850,9 +3024,9 @@ if test -z "$ac_cv_prog_CC"; then
+@@ -2850,9 +3027,9 @@
    ac_ct_CC=$CC
    # Extract the first word of "gcc", so it can be a program name with args.
  set dummy gcc; ac_word=$2
@@ -11852,7 +12317,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_CC"; then
-@@ -2863,24 +3037,24 @@ for as_dir in $PATH
+@@ -2863,24 +3040,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -11882,7 +12347,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -2889,12 +3063,8 @@ fi
+@@ -2889,12 +3066,8 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -11897,7 +12362,7 @@
  ac_tool_warned=yes ;;
  esac
      CC=$ac_ct_CC
-@@ -2907,9 +3077,9 @@ if test -z "$CC"; then
+@@ -2907,9 +3080,9 @@
            if test -n "$ac_tool_prefix"; then
      # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
  set dummy ${ac_tool_prefix}cc; ac_word=$2
@@ -11909,7 +12374,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-@@ -2920,24 +3090,24 @@ for as_dir in $PATH
+@@ -2920,24 +3093,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -11939,7 +12404,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -2947,9 +3117,9 @@ fi
+@@ -2947,9 +3120,9 @@
  if test -z "$CC"; then
    # Extract the first word of "cc", so it can be a program name with args.
  set dummy cc; ac_word=$2
@@ -11951,7 +12416,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-@@ -2961,18 +3131,18 @@ for as_dir in $PATH
+@@ -2961,18 +3134,18 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -11973,7 +12438,7 @@
  IFS=$as_save_IFS
  
  if test $ac_prog_rejected = yes; then
-@@ -2991,10 +3161,10 @@ fi
+@@ -2991,10 +3164,10 @@
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
@@ -11986,7 +12451,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -3006,9 +3176,9 @@ if test -z "$CC"; then
+@@ -3006,9 +3179,9 @@
    do
      # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -11998,7 +12463,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$CC"; then
-@@ -3019,24 +3189,24 @@ for as_dir in $PATH
+@@ -3019,24 +3192,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -12028,7 +12493,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -3050,9 +3220,9 @@ if test -z "$CC"; then
+@@ -3050,9 +3223,9 @@
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
@@ -12040,7 +12505,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$ac_ct_CC"; then
-@@ -3063,24 +3233,24 @@ for as_dir in $PATH
+@@ -3063,24 +3236,24 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -12070,7 +12535,7 @@
  $as_echo "no" >&6; }
  fi
  
-@@ -3093,12 +3263,8 @@ done
+@@ -3093,12 +3266,8 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -12085,7 +12550,7 @@
  ac_tool_warned=yes ;;
  esac
      CC=$ac_ct_CC
-@@ -3108,71 +3274,55 @@ fi
+@@ -3108,55 +3277,37 @@
  fi
  
  
@@ -12116,6 +12581,17 @@
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }
 -{ (ac_try="$ac_compiler -v >&5"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compiler -v >&5") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }
+-{ (ac_try="$ac_compiler -V >&5"
 +for ac_option in --version -v -V -qversion; do
 +  { { ac_try="$ac_compiler $ac_option >&5"
  case "(($ac_try" in
@@ -12124,22 +12600,11 @@
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compiler -v >&5") 2>&5
+-  (eval "$ac_compiler -V >&5") 2>&5
 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
 +$as_echo "$ac_try_echo"; } >&5
 +  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
    ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }
--{ (ac_try="$ac_compiler -V >&5"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compiler -V >&5") 2>&5
--  ac_status=$?
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }
 +  if test -s conftest.err; then
@@ -12147,8 +12612,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
@@ -12160,30 +12625,20 @@
 -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;
- }
- _ACEOF
- ac_clean_files_save=$ac_clean_files
--ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
-+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"
+@@ -3172,8 +3323,8 @@
  # Try to create an executable without -o first, disregard a.out.
  # It will help us diagnose broken compilers, and finding out an intuition
  # of exeext.
 -{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-+{ $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_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[^ ]*//'`
  
-@@ -3189,17 +3339,17 @@ do
+ # The possible output files:
+@@ -3189,17 +3340,17 @@
  done
  rm -f $ac_rmfiles
  
@@ -12206,7 +12661,7 @@
    # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
  # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
  # in a Makefile.  We should not override ac_cv_exeext if it was cached,
-@@ -3216,7 +3366,7 @@ do
+@@ -3216,7 +3367,7 @@
  	# certainly right.
  	break;;
      *.* )
@@ -12215,17 +12670,19 @@
  	then :; else
  	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
  	fi
-@@ -3235,80 +3385,75 @@ test "$ac_cv_exeext" = no && ac_cv_exeex
+@@ -3235,80 +3386,42 @@
  else
    ac_file=''
  fi
 -
 -{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
- $as_echo "$ac_file" >&6; }
+-$as_echo "$ac_file" >&6; }
 -if test -z "$ac_file"; then
+-  $as_echo "$as_me: failed program was:" >&5
 +if test -z "$ac_file"; then :
-   $as_echo "$as_me: failed program was:" >&5
++  { $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:$LINENO: error: C compiler cannot create executables
@@ -12238,69 +12695,62 @@
 +{ as_fn_set_status 77
 +as_fn_error "C compiler cannot create executables
 +See \`config.log' for more details." "$LINENO" 5; }; }
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
  fi
 -
++{ $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
  
- # Check that the compiler produces executables we can run.  If not, either
- # the compiler is broken, or we cross compile.
+-# Check that the compiler produces executables we can run.  If not, either
+-# the compiler is broken, or we cross compile.
 -{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
- $as_echo_n "checking whether the C compiler works... " >&6; }
+-$as_echo_n "checking whether the C compiler works... " >&6; }
 -# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
- # If not cross compiling, check that we can run a simple program.
- if test "$cross_compiling" != yes; then
-   if { ac_try='./$ac_file'
+-# If not cross compiling, check that we can run a simple program.
+-if test "$cross_compiling" != yes; then
+-  if { ac_try='./$ac_file'
 -  { (case "(($ac_try" in
-+  { { case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-   (eval "$ac_try") 2>&5
-   ac_status=$?
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }; }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; }; then
-     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
 -	{ { $as_echo "$as_me:$LINENO: 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." >&5
 -$as_echo "$as_me: error: cannot run C compiled programs.
 -If you meant to cross compile, use \`--host'.
 -See \`config.log' for more details." >&2;}
 -   { (exit 1); exit 1; }; }
-+See \`config.log' for more details." "$LINENO" 5; }
-     fi
-   fi
- fi
+-    fi
+-  fi
+-fi
 -{ $as_echo "$as_me:$LINENO: result: yes" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 
--rm -f -r a.out a.out.dSYM 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
+-$as_echo "yes" >&6; }
+-
+ rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
  ac_clean_files=$ac_clean_files_save
- # Check that the compiler produces executables we can run.  If not, either
- # the compiler is broken, or we cross compile.
+-# Check that the compiler produces executables we can run.  If not, either
+-# the compiler is broken, or we cross compile.
 -{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&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_n "checking whether we are cross compiling... " >&6; }
 -{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
- $as_echo "$cross_compiling" >&6; }
- 
+-$as_echo "$cross_compiling" >&6; }
+-
 -{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
  $as_echo_n "checking for suffix of executables... " >&6; }
@@ -12323,7 +12773,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
-@@ -3323,30 +3468,24 @@ for ac_file in conftest.exe conftest con
+@@ -3323,30 +3436,83 @@
    esac
  done
  else
@@ -12338,8 +12788,9 @@
 +See \`config.log' for more details." "$LINENO" 5; }
  fi
 -
- rm -f conftest$ac_cv_exeext
+-rm -f conftest$ac_cv_exeext
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
++rm -f conftest conftest$ac_cv_exeext
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
  $as_echo "$ac_cv_exeext" >&6; }
  
@@ -12347,6 +12798,65 @@
  EXEEXT=$ac_cv_exeext
  ac_exeext=$EXEEXT
 -{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <stdio.h>
++int
++main ()
++{
++FILE *f = fopen ("conftest.out", "w");
++ return ferror (f) || fclose (f) != 0;
++
++  ;
++  return 0;
++}
++_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
@@ -12362,7 +12872,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -3358,17 +3497,17 @@ main ()
+@@ -3358,17 +3524,17 @@
  }
  _ACEOF
  rm -f conftest.o conftest.obj
@@ -12385,7 +12895,7 @@
    for ac_file in conftest.o conftest.obj conftest.*; do
    test -f "$ac_file" || continue;
    case $ac_file in
-@@ -3381,29 +3520,23 @@ else
+@@ -3381,29 +3547,23 @@
    $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -12423,7 +12933,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -3417,37 +3550,16 @@ main ()
+@@ -3417,37 +3577,16 @@
    return 0;
  }
  _ACEOF
@@ -12464,7 +12974,7 @@
  $as_echo "$ac_cv_c_compiler_gnu" >&6; }
  if test $ac_compiler_gnu = yes; then
    GCC=yes
-@@ -3456,20 +3568,16 @@ else
+@@ -3456,20 +3595,16 @@
  fi
  ac_test_CFLAGS=${CFLAGS+set}
  ac_save_CFLAGS=$CFLAGS
@@ -12488,7 +12998,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -3480,35 +3588,11 @@ main ()
+@@ -3480,35 +3615,11 @@
    return 0;
  }
  _ACEOF
@@ -12527,7 +13037,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -3519,36 +3603,12 @@ main ()
+@@ -3519,36 +3630,12 @@
    return 0;
  }
  _ACEOF
@@ -12568,7 +13078,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -3559,42 +3619,17 @@ main ()
+@@ -3559,42 +3646,17 @@
    return 0;
  }
  _ACEOF
@@ -12613,7 +13123,7 @@
  $as_echo "$ac_cv_prog_cc_g" >&6; }
  if test "$ac_test_CFLAGS" = set; then
    CFLAGS=$ac_save_CFLAGS
-@@ -3611,18 +3646,14 @@ else
+@@ -3611,18 +3673,14 @@
      CFLAGS=
    fi
  fi
@@ -12635,7 +13145,7 @@
  /* end confdefs.h.  */
  #include <stdarg.h>
  #include <stdio.h>
-@@ -3679,32 +3710,9 @@ for ac_arg in '' -qlanglvl=extc89 -qlang
+@@ -3679,32 +3737,9 @@
  	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
  do
    CC="$ac_save_CC $ac_arg"
@@ -12669,7 +13179,7 @@
  rm -f core conftest.err conftest.$ac_objext
    test "x$ac_cv_prog_cc_c89" != "xno" && break
  done
-@@ -3715,17 +3723,19 @@ fi
+@@ -3715,17 +3750,19 @@
  # AC_CACHE_VAL
  case "x$ac_cv_prog_cc_c89" in
    x)
@@ -12692,7 +13202,7 @@
  
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
-@@ -3735,9 +3745,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -3735,9 +3772,9 @@
  
  depcc="$CC"   am_compiler_list=
  
@@ -12704,7 +13214,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -3763,6 +3773,11 @@ else
+@@ -3763,6 +3800,11 @@
    if test "$am_compiler_list" = ""; then
       am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
    fi
@@ -12716,7 +13226,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
-@@ -3780,7 +3795,17 @@ else
+@@ -3780,7 +3822,17 @@
      done
      echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
  
@@ -12734,7 +13244,7 @@
      nosideeffect)
        # after this tag, mechanisms are not by side-effect, so they'll
        # only be used when explicitly requested
-@@ -3790,19 +3815,23 @@ else
+@@ -3790,19 +3842,23 @@
  	break
        fi
        ;;
@@ -12764,7 +13274,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
-@@ -3826,7 +3855,7 @@ else
+@@ -3826,7 +3882,7 @@
  fi
  
  fi
@@ -12773,7 +13283,7 @@
  $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
  CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
  
-@@ -3841,68 +3870,91 @@ else
+@@ -3841,68 +3897,91 @@
  fi
  
  
@@ -12888,11 +13398,6 @@
 +test -z "$SED" && SED=sed
 +Xsed="$SED -e 1s/^X//"
 +
-+
-+
-+
-+
-+
  
 -SED=$lt_cv_path_SED
  
@@ -12900,6 +13405,11 @@
 -$as_echo "$SED" >&6; }
  
 -{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
++
++
++
++
++
 +
 +
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
@@ -12909,7 +13419,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -z "$GREP"; then
-@@ -3913,7 +3965,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/x
+@@ -3913,7 +3992,7 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -12918,7 +13428,7 @@
      for ac_exec_ext in '' $ac_executable_extensions; do
        ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
        { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-@@ -3933,7 +3985,7 @@ case `"$ac_path_GREP" --version 2>&1` in
+@@ -3933,7 +4012,7 @@
      $as_echo 'GREP' >> "conftest.nl"
      "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
      diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -12927,7 +13437,7 @@
      if test $ac_count -gt ${ac_path_GREP_max-0}; then
        # Best one so far, save it but keep looking for a better one
        ac_cv_path_GREP="$ac_path_GREP"
-@@ -3948,26 +4000,24 @@ esac
+@@ -3948,26 +4027,24 @@
        $ac_path_GREP_found && break 3
      done
    done
@@ -12959,7 +13469,7 @@
    $as_echo_n "(cached) " >&6
  else
    if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-@@ -3981,7 +4031,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/x
+@@ -3981,7 +4058,7 @@
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -12968,7 +13478,7 @@
      for ac_exec_ext in '' $ac_executable_extensions; do
        ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
        { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-@@ -4001,7 +4051,7 @@ case `"$ac_path_EGREP" --version 2>&1` i
+@@ -4001,7 +4078,7 @@
      $as_echo 'EGREP' >> "conftest.nl"
      "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
      diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -12977,7 +13487,7 @@
      if test $ac_count -gt ${ac_path_EGREP_max-0}; then
        # Best one so far, save it but keep looking for a better one
        ac_cv_path_EGREP="$ac_path_EGREP"
-@@ -4016,12 +4066,10 @@ esac
+@@ -4016,12 +4093,10 @@
        $ac_path_EGREP_found && break 3
      done
    done
@@ -12992,7 +13502,7 @@
    fi
  else
    ac_cv_path_EGREP=$EGREP
-@@ -4029,14 +4077,100 @@ fi
+@@ -4029,39 +4104,125 @@
  
     fi
  fi
@@ -13002,11 +13512,33 @@
   EGREP="$ac_cv_path_EGREP"
  
  
+-
+-# 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
 +{ $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
+ 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:$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.
+-    [\\/]* | ?:[\\/]*)
 +  if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
 +   then ac_cv_path_FGREP="$GREP -F"
 +   else
@@ -13088,24 +13620,29 @@
 +
 +
 +
- 
- # Check whether --with-gnu-ld was given.
--if test "${with_gnu_ld+set}" = set; then
++
++# 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
-@@ -4045,7 +4179,7 @@ fi
- ac_prog=ld
- if test "$GCC" = yes; then
-   # Check if gcc -print-prog-name=ld gives a path.
--  { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5
++  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*)
-@@ -4059,9 +4193,9 @@ $as_echo_n "checking for ld used by $CC.
-     [\\/]* | ?:[\\/]*)
++$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'`
@@ -13117,7 +13654,7 @@
        done
        test -z "$LD" && LD="$ac_prog"
        ;;
-@@ -4075,13 +4209,13 @@ $as_echo_n "checking for ld used by $CC.
+@@ -4075,13 +4236,13 @@
      ;;
    esac
  elif test "$with_gnu_ld" = yes; then
@@ -13134,7 +13671,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -z "$LD"; then
-@@ -4112,18 +4246,16 @@ fi
+@@ -4112,18 +4273,16 @@
  
  LD="$lt_cv_path_LD"
  if test -n "$LD"; then
@@ -13158,7 +13695,7 @@
    $as_echo_n "(cached) " >&6
  else
    # I'd rather use --version here, but apparently some GNU lds only accept -v.
-@@ -4136,39 +4268,21 @@ case `$LD -v 2>&1 </dev/null` in
+@@ -4136,39 +4295,21 @@
    ;;
  esac
  fi
@@ -13208,7 +13745,7 @@
    $as_echo_n "(cached) " >&6
  else
    if test -n "$NM"; then
-@@ -4212,2213 +4326,1069 @@ else
+@@ -4212,2251 +4353,1092 @@
      done
      IFS="$lt_save_ifs"
    done
@@ -13220,38 +13757,9 @@
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
  $as_echo "$lt_cv_path_NM" >&6; }
 -NM="$lt_cv_path_NM"
--
--{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
--$as_echo_n "checking whether ln -s works... " >&6; }
--LN_S=$as_ln_s
--if test "$LN_S" = "ln -s"; then
--  { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
 +if test "$lt_cv_path_NM" != "no"; then
 +  NM="$lt_cv_path_NM"
- else
--  { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5
--$as_echo "no, using $LN_S" >&6; }
--fi
--
--{ $as_echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
--$as_echo_n "checking how to recognize dependent libraries... " >&6; }
--if test "${lt_cv_deplibs_check_method+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
 +  # 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"
@@ -13281,30 +13789,29 @@
 +  done
 +IFS=$as_save_IFS
  
--case $host_os in
--aix[4-9]*)
--  lt_cv_deplibs_check_method=pass_all
--  ;;
+-{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
+-$as_echo_n "checking whether ln -s works... " >&6; }
+-LN_S=$as_ln_s
+-if test "$LN_S" = "ln -s"; then
+-  { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "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
+-  { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5
+-$as_echo "no, using $LN_S" >&6; }
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
-+fi
- 
--beos*)
--  lt_cv_deplibs_check_method=pass_all
--  ;;
- 
--bsdi[45]*)
--  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
--  lt_cv_file_magic_cmd='/usr/bin/file -L'
--  lt_cv_file_magic_test_file=/shlib/libc.so
--  ;;
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
+-$as_echo_n "checking how to recognize dependent libraries... " >&6; }
+-if test "${lt_cv_deplibs_check_method+set}" = set; then
++
 +    test -n "$DUMPBIN" && break
 +  done
 +fi
@@ -13317,8 +13824,26 @@
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
 +if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
+   $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.
+-
+-case $host_os in
+-aix[4-9]*)
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
 +  if test -n "$ac_ct_DUMPBIN"; then
 +  ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test.
 +else
@@ -13337,10 +13862,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
@@ -13353,6 +13876,20 @@
 +$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',
@@ -13360,17 +13897,25 @@
 -  if ( file / ) >/dev/null 2>&1; then
 -    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
 -    lt_cv_file_magic_cmd='func_win32_libid'
--  else
++  if test "x$ac_ct_DUMPBIN" = x; then
++    DUMPBIN=":"
+   else
 -    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
 -    lt_cv_file_magic_cmd='$OBJDUMP -f'
--  fi
++    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* | dragonfly*)
 -  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
@@ -13383,24 +13928,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
@@ -13424,11 +13963,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
@@ -13450,24 +13984,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 :
@@ -13475,29 +13991,27 @@
 +else
 +  lt_cv_nm_interface="BSD nm"
 +  echo "int some_variable = 0;" > conftest.$ac_ext
-+  (eval echo "\"\$as_me:4457: $ac_compile\"" >&5)
++  (eval echo "\"\$as_me:4484: $ac_compile\"" >&5)
 +  (eval "$ac_compile" 2>conftest.err)
 +  cat conftest.err >&5
-+  (eval echo "\"\$as_me:4460: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++  (eval echo "\"\$as_me:4487: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
 +  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
 +  cat conftest.err >&5
-+  (eval echo "\"\$as_me:4463: output\"" >&5)
++  (eval echo "\"\$as_me:4490: 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; }
  
--rdos*)
--  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; }
@@ -13510,8 +14024,8 @@
 +$as_echo "no, using $LN_S" >&6; }
 +fi
  
--solaris*)
--  lt_cv_deplibs_check_method=pass_all
+-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
@@ -13522,14 +14036,13 @@
 +    i=0
 +  teststring="ABCD"
  
--sysv4 | sysv4.3*)
--  case $host_vendor in
--  motorola)
--    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
--    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
--    ;;
--  ncr)
--    lt_cv_deplibs_check_method=pass_all
+-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
@@ -13537,22 +14050,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
-     ;;
--  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 )'
-+
++    ;;
+ 
+-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;
-     ;;
--  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
-+
++    ;;
+ 
+-rdos*)
+-  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.
@@ -13562,18 +14074,22 @@
 +    # 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;
-     ;;
--  siemens)
--    lt_cv_deplibs_check_method=pass_all
-+
++    ;;
+ 
+-solaris*)
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
 +  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;
-     ;;
--  pc)
--    lt_cv_deplibs_check_method=pass_all
-+
++    ;;
+ 
+-sysv4 | sysv4.3*)
+-  case $host_vendor in
+-  motorola)
+-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
+-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
 +  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
 +    # This has been around since 386BSD, at least.  Likely further.
 +    if test -x /sbin/sysctl; then
@@ -13587,17 +14103,16 @@
 +    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`
      ;;
--  esac
--  ;;
- 
--sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
--  lt_cv_deplibs_check_method=pass_all
--  ;;
--esac
+-  ncr)
+-    lt_cv_deplibs_check_method=pass_all
++
 +  interix*)
 +    # We know the value 262144 and hardcode it with a safety zone (like BSD)
 +    lt_cv_sys_max_cmd_len=196608
-+    ;;
+     ;;
+-  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 )'
 +
 +  osf*)
 +    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
@@ -13611,10 +14126,16 @@
 +        *1*) lt_cv_sys_max_cmd_len=-1 ;;
 +      esac
 +    fi
-+    ;;
+     ;;
+-  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
 +  sco3.2v5*)
 +    lt_cv_sys_max_cmd_len=102400
-+    ;;
+     ;;
+-  siemens)
+-    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
@@ -13622,7 +14143,9 @@
 +    else
 +      lt_cv_sys_max_cmd_len=32768
 +    fi
-+    ;;
+     ;;
+-  pc)
+-    lt_cv_deplibs_check_method=pass_all
 +  *)
 +    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
 +    if test -n "$lt_cv_sys_max_cmd_len"; then
@@ -13653,24 +14176,30 @@
 +      # linker.  It appears as though 1/2 is a usable value.
 +      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
 +    fi
-+    ;;
-+  esac
- 
+     ;;
+   esac
+-  ;;
+ 
+-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
+-esac
++fi
+ 
++if test -n $lt_cv_sys_max_cmd_len ; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
++$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
++$as_echo "none" >&6; }
  fi
 -{ $as_echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
 -$as_echo "$lt_cv_deplibs_check_method" >&6; }
 -file_magic_cmd=$lt_cv_file_magic_cmd
 -deplibs_check_method=$lt_cv_deplibs_check_method
 -test -z "$deplibs_check_method" && deplibs_check_method=unknown
- 
-+if test -n $lt_cv_sys_max_cmd_len ; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
-+$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
-+$as_echo "none" >&6; }
-+fi
 +max_cmd_len=$lt_cv_sys_max_cmd_len
+ 
  
  
  
@@ -13682,7 +14211,6 @@
  
 -# Allow CC to be a program name with arguments.
 -compiler=$CC
- 
 +: ${CP="cp -f"}
 +: ${MV="mv -f"}
 +: ${RM="rm -f"}
@@ -13710,10 +14238,10 @@
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5
 +$as_echo "$lt_shell_append" >&6; }
  
+ 
 -# Check whether --enable-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
@@ -13855,42 +14383,13 @@
 -  { $as_echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
 -$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
 -if test "${lt_cv_cc_needs_belf+set}" = set; then
-+
-+
-+
-+
-+
-+
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
-+$as_echo_n "checking for $LD option to reload object files... " >&6; }
-+if test "${lt_cv_ld_reload_flag+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
+-  $as_echo_n "(cached) " >&6
+-else
 -  ac_ext=c
 -ac_cpp='$CPP $CPPFLAGS'
 -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 -ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+  lt_cv_ld_reload_flag='-r'
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
-+$as_echo "$lt_cv_ld_reload_flag" >&6; }
-+reload_flag=$lt_cv_ld_reload_flag
-+case $reload_flag in
-+"" | " "*) ;;
-+*) reload_flag=" $reload_flag" ;;
-+esac
-+reload_cmds='$LD$reload_flag -o $output$reload_objs'
-+case $host_os in
-+  darwin*)
-+    if test "$GCC" = yes; then
-+      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
-+    else
-+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
-+    fi
-+    ;;
-+esac
  
 -     cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
@@ -13945,7 +14444,14 @@
 -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 -ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
--fi
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
++$as_echo_n "checking for $LD option to reload object files... " >&6; }
++if test "${lt_cv_ld_reload_flag+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  lt_cv_ld_reload_flag='-r'
+ fi
 -{ $as_echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
 -$as_echo "$lt_cv_cc_needs_belf" >&6; }
 -  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
@@ -13976,47 +14482,28 @@
 -  fi
 -  rm -rf conftest*
 -  ;;
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
++$as_echo "$lt_cv_ld_reload_flag" >&6; }
++reload_flag=$lt_cv_ld_reload_flag
++case $reload_flag in
++"" | " "*) ;;
++*) reload_flag=" $reload_flag" ;;
++esac
++reload_cmds='$LD$reload_flag -o $output$reload_objs'
++case $host_os in
++  darwin*)
++    if test "$GCC" = yes; then
++      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
++    else
++      reload_cmds='$LD$reload_flag -o $output$reload_objs'
++    fi
++    ;;
++esac
  
  
 -esac
  
 -need_locks="$enable_libtool_lock"
-+if test -n "$ac_tool_prefix"; then
-+  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}objdump; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$OBJDUMP"; then
-+  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+OBJDUMP=$ac_cv_prog_OBJDUMP
-+if test -n "$OBJDUMP"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
-+$as_echo "$OBJDUMP" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
  
  
 -ac_ext=c
@@ -14029,16 +14516,19 @@
 -# On Suns, sometimes $CPP names a directory.
 -if test -n "$CPP" && test -d "$CPP"; then
 -  CPP=
- fi
+-fi
 -if test -z "$CPP"; then
 -  if test "${ac_cv_prog_CPP+set}" = set; then
-+if test -z "$ac_cv_prog_OBJDUMP"; then
-+  ac_ct_OBJDUMP=$OBJDUMP
-+  # Extract the first word of "objdump", so it can be a program name with args.
-+set dummy objdump; ac_word=$2
++
++
++
++
++if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
++set dummy ${ac_tool_prefix}objdump; ac_word=$2
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
++if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
 -      # Double quotes because CPP needs to be expanded
@@ -14084,13 +14574,29 @@
 -	 test ! -s conftest.err
 -       }; then
 -  :
--else
++  if test -n "$OBJDUMP"; then
++  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
++    $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
+ 
 -  # Broken: fails on valid input.
 -continue
--fi
+ fi
 -
 -rm -f conftest.err conftest.$ac_ext
 -
@@ -14123,8 +14629,11 @@
 -       }; then
 -  # Broken: success on invalid input.
 -continue
-+  if test -n "$ac_ct_OBJDUMP"; then
-+  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
++fi
++OBJDUMP=$ac_cv_prog_OBJDUMP
++if test -n "$OBJDUMP"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
++$as_echo "$OBJDUMP" >&6; }
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -14132,10 +14641,33 @@
 -  # Passes both tests.
 -ac_preproc_ok=:
 -break
--fi
--
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+ 
 -rm -f conftest.err conftest.$ac_ext
--
+ 
+-done
+-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+-rm -f conftest.err conftest.$ac_ext
+-if $ac_preproc_ok; then
+-  break
+ fi
+-
+-    done
+-    ac_cv_prog_CPP=$CPP
++if test -z "$ac_cv_prog_OBJDUMP"; then
++  ac_ct_OBJDUMP=$OBJDUMP
++  # Extract the first word of "objdump", so it can be a program name with args.
++set dummy objdump; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  if test -n "$ac_ct_OBJDUMP"; then
++  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
++else
 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +for as_dir in $PATH
 +do
@@ -14147,22 +14679,21 @@
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
 +  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
--
--    done
--    ac_cv_prog_CPP=$CPP
++done
 +  done
 +IFS=$as_save_IFS
  
  fi
 -  CPP=$ac_cv_prog_CPP
--else
++fi
++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
++$as_echo "$ac_ct_OBJDUMP" >&6; }
+ else
 -  ac_cv_prog_CPP=$CPP
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
  fi
 -{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
 -$as_echo "$CPP" >&6; }
@@ -14192,50 +14723,7 @@
 -case "(($ac_try" in
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 -  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } >/dev/null && {
--	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       }; then
--  :
-+ac_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
-+$as_echo "$ac_ct_OBJDUMP" >&6; }
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--  # Broken: fails on valid input.
--continue
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
- fi
- 
--rm -f conftest.err conftest.$ac_ext
--
--  # OK, works on sane cases.  Now check whether nonexistent headers
--  # can be detected and how.
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include <ac_nonexistent.h>
--_ACEOF
--if { (ac_try="$ac_cpp conftest.$ac_ext"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
++
 +  if test "x$ac_ct_OBJDUMP" = x; then
 +    OBJDUMP="false"
 +  else
@@ -14257,22 +14745,61 @@
 -	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 -	 test ! -s conftest.err
 -       }; then
--  # Broken: success on invalid input.
--continue
+-  :
 +    OBJDUMP=$ac_ct_OBJDUMP
 +  fi
  else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
+-  # Broken: fails on valid input.
+-continue
++  OBJDUMP="$ac_cv_prog_OBJDUMP"
+ fi
+ 
+-rm -f conftest.err conftest.$ac_ext
++test -z "$OBJDUMP" && OBJDUMP=objdump
+ 
+-  # OK, works on sane cases.  Now check whether nonexistent headers
+-  # can be detected and how.
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <ac_nonexistent.h>
+-_ACEOF
+-if { (ac_try="$ac_cpp conftest.$ac_ext"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null && {
+-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       }; then
+-  # Broken: success on invalid input.
+-continue
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+ 
 -  # Passes both tests.
 -ac_preproc_ok=:
 -break
-+  OBJDUMP="$ac_cv_prog_OBJDUMP"
- fi
+-fi
  
 -rm -f conftest.err conftest.$ac_ext
--
+ 
 -done
 -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 -rm -f conftest.err conftest.$ac_ext
@@ -14285,7 +14812,6 @@
 -See \`config.log' for more details." >&2;}
 -   { (exit 1); exit 1; }; }
 -fi
-+test -z "$OBJDUMP" && OBJDUMP=objdump
  
 -ac_ext=c
 -ac_cpp='$CPP $CPPFLAGS'
@@ -14309,11 +14835,11 @@
 -#include <stdarg.h>
 -#include <string.h>
 -#include <float.h>
- 
+-
 -int
 -main ()
 -{
- 
+-
 -  ;
 -  return 0;
 -}
@@ -14340,10 +14866,10 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
- 
+-
 -	ac_cv_header_stdc=no
 -fi
- 
+-
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
 -if test $ac_cv_header_stdc = yes; then
@@ -14512,7 +15038,7 @@
 +darwin* | rhapsody*)
 +  lt_cv_deplibs_check_method=pass_all
 +  ;;
-+
+ 
 +freebsd* | dragonfly*)
 +  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
 +    case $host_cpu in
@@ -14529,15 +15055,18 @@
 +  fi
 +  ;;
  
-+gnu*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
- 
 -fi
 -fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
 -$as_echo "$ac_cv_header_stdc" >&6; }
 -if test $ac_cv_header_stdc = yes; then
++gnu*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define STDC_HEADERS 1
+-_ACEOF
 +hpux10.20* | hpux11*)
 +  lt_cv_file_magic_cmd=/usr/bin/file
 +  case $host_cpu in
@@ -14556,15 +15085,13 @@
 +  esac
 +  ;;
  
--cat >>confdefs.h <<\_ACEOF
--#define STDC_HEADERS 1
--_ACEOF
+-fi
 +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
+-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
 +irix5* | irix6* | nonstopux*)
 +  case $LD in
 +  *-32|*"-32 ") libmagic=32-bit;;
@@ -14575,9 +15102,8 @@
 +  lt_cv_deplibs_check_method=pass_all
 +  ;;
  
--# On IRIX 5.3, sys/types and inttypes.h are conflicting.
 +# This must be Linux ELF.
-+linux* | k*bsd*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
 +  lt_cv_deplibs_check_method=pass_all
 +  ;;
  
@@ -14616,10 +15142,6 @@
 +  ;;
  
 +solaris*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
- 
-+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
 +  lt_cv_deplibs_check_method=pass_all
 +  ;;
  
@@ -14639,6 +15161,34 @@
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -$ac_includes_default
++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
+ 
+-#include <$ac_header>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
+-  eval "$as_ac_Header=yes"
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
 +sysv4 | sysv4.3*)
 +  case $host_vendor in
 +  motorola)
@@ -14666,44 +15216,15 @@
 +  esac
 +  ;;
  
--#include <$ac_header>
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
+-	eval "$as_ac_Header=no"
+-fi
 +tpf*)
 +  lt_cv_deplibs_check_method=pass_all
 +  ;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  eval "$as_ac_Header=yes"
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
- 
--	eval "$as_ac_Header=no"
++esac
+ 
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
-+$as_echo "$lt_cv_deplibs_check_method" >&6; }
-+file_magic_cmd=$lt_cv_file_magic_cmd
-+deplibs_check_method=$lt_cv_deplibs_check_method
-+test -z "$deplibs_check_method" && deplibs_check_method=unknown
- 
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
 -ac_res=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -14713,6 +15234,11 @@
 -  cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 -_ACEOF
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
++$as_echo "$lt_cv_deplibs_check_method" >&6; }
++file_magic_cmd=$lt_cv_file_magic_cmd
++deplibs_check_method=$lt_cv_deplibs_check_method
++test -z "$deplibs_check_method" && deplibs_check_method=unknown
  
 -fi
  
@@ -14727,13 +15253,26 @@
 -  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
 -$as_echo_n "checking for $ac_header... " >&6; }
 -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  $as_echo_n "(cached) " >&6
++
++
++
++
++
++
++
++if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
++set dummy ${ac_tool_prefix}ar; ac_word=$2
++{ $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_AR+set}" = set; then :
+   $as_echo_n "(cached) " >&6
 -fi
 -ac_res=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 -$as_echo "$ac_res" >&6; }
--else
+ else
 -  # Is the header compilable?
 -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
 -$as_echo_n "checking $ac_header usability... " >&6; }
@@ -14765,12 +15304,37 @@
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  ac_header_compiler=yes
--else
++  if test -n "$AR"; then
++  ac_cv_prog_AR="$AR" # Let the user override the test.
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_AR="${ac_tool_prefix}ar"
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++  done
++IFS=$as_save_IFS
  
 -	ac_header_compiler=no
--fi
++fi
++fi
++AR=$ac_cv_prog_AR
++if test -n "$AR"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
++$as_echo "$AR" >&6; }
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ fi
  
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
@@ -14805,17 +15369,52 @@
 -	 test ! -s conftest.err
 -       }; then
 -  ac_header_preproc=yes
--else
++fi
++if test -z "$ac_cv_prog_AR"; then
++  ac_ct_AR=$AR
++  # Extract the first word of "ar", so it can be a program name with args.
++set dummy ar; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
++  if test -n "$ac_ct_AR"; then
++  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_ac_ct_AR="ar"
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++  done
++IFS=$as_save_IFS
  
 -  ac_header_preproc=no
--fi
++fi
++fi
++ac_ct_AR=$ac_cv_prog_ac_ct_AR
++if test -n "$ac_ct_AR"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
++$as_echo "$ac_ct_AR" >&6; }
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ fi
  
 -rm -f conftest.err conftest.$ac_ext
 -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 -$as_echo "$ac_header_preproc" >&6; }
- 
+-
 -# So?  What about this header?
 -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
 -  yes:no: )
@@ -14845,36 +15444,43 @@
 -_ASBOX
 -     ) | sed "s/^/$as_me: WARNING:     /" >&2
 -    ;;
--esac
++  if test "x$ac_ct_AR" = x; then
++    AR="false"
++  else
++    case $cross_compiling:$ac_tool_warned in
++yes:)
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++ac_tool_warned=yes ;;
+ esac
 -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
 -$as_echo_n "checking for $ac_header... " >&6; }
 -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+if test -n "$ac_tool_prefix"; then
-+  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}ar; ac_word=$2
-+{ $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_AR+set}" = set; then :
-   $as_echo_n "(cached) " >&6
+-  $as_echo_n "(cached) " >&6
++    AR=$ac_ct_AR
++  fi
  else
 -  eval "$as_ac_Header=\$ac_header_preproc"
--fi
++  AR="$ac_cv_prog_AR"
+ fi
 -ac_res=`eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'`
 -	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 -$as_echo "$ac_res" >&6; }
--
+ 
 -fi
 -if test `eval 'as_val=${'$as_ac_Header'}
 -		 $as_echo "$as_val"'` = yes; then
 -  cat >>confdefs.h <<_ACEOF
 -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 -_ACEOF
--
++test -z "$AR" && AR=ar
++test -z "$AR_FLAGS" && AR_FLAGS=cru
+ 
 -fi
--
+ 
 -done
--
+ 
 -ac_ext=cpp
 -ac_cpp='$CXXCPP $CPPFLAGS'
 -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -14890,14 +15496,27 @@
 -    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 -set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
++
++
++
++
++
++
++
++
++if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
++set dummy ${ac_tool_prefix}strip; ac_word=$2
++{ $as_echo "$as_me:${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 "${ac_cv_prog_STRIP+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.
-+  if test -n "$AR"; then
-+  ac_cv_prog_AR="$AR" # Let the user override the test.
++  if test -n "$STRIP"; then
++  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
  else
  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  for as_dir in $PATH
@@ -14909,7 +15528,7 @@
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 -    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
 -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    ac_cv_prog_AR="${ac_tool_prefix}ar"
++    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
@@ -14924,10 +15543,10 @@
 -if test -n "$CXX"; then
 -  { $as_echo "$as_me:$LINENO: result: $CXX" >&5
 -$as_echo "$CXX" >&6; }
-+AR=$ac_cv_prog_AR
-+if test -n "$AR"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
-+$as_echo "$AR" >&6; }
++STRIP=$ac_cv_prog_STRIP
++if test -n "$STRIP"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
++$as_echo "$STRIP" >&6; }
  else
 -  { $as_echo "$as_me:$LINENO: result: no" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
@@ -14945,20 +15564,20 @@
 -  # Extract the first word of "$ac_prog", so it can be a program name with args.
 -set dummy $ac_prog; ac_word=$2
 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+if test -z "$ac_cv_prog_AR"; then
-+  ac_ct_AR=$AR
-+  # Extract the first word of "ar", so it can be a program name with args.
-+set dummy ar; ac_word=$2
++if test -z "$ac_cv_prog_STRIP"; then
++  ac_ct_STRIP=$STRIP
++  # Extract the first word of "strip", so it can be a program name with args.
++set dummy strip; ac_word=$2
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
 -if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
-+if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
++if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
 -  if test -n "$ac_ct_CXX"; then
 -  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
-+  if test -n "$ac_ct_AR"; then
-+  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
++  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
@@ -14970,7 +15589,7 @@
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 -    ac_cv_prog_ac_ct_CXX="$ac_prog"
 -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    ac_cv_prog_ac_ct_AR="ar"
++    ac_cv_prog_ac_ct_STRIP="strip"
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
@@ -14985,10 +15604,10 @@
 -if test -n "$ac_ct_CXX"; then
 -  { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
 -$as_echo "$ac_ct_CXX" >&6; }
-+ac_ct_AR=$ac_cv_prog_ac_ct_AR
-+if test -n "$ac_ct_AR"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
-+$as_echo "$ac_ct_AR" >&6; }
++ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
++if test -n "$ac_ct_STRIP"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
++$as_echo "$ac_ct_STRIP" >&6; }
  else
 -  { $as_echo "$as_me:$LINENO: result: no" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
@@ -15001,8 +15620,8 @@
 -
 -  if test "x$ac_ct_CXX" = x; then
 -    CXX="g++"
-+  if test "x$ac_ct_AR" = x; then
-+    AR="false"
++  if test "x$ac_ct_STRIP" = x; then
++    STRIP=":"
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -15017,10 +15636,10 @@
  ac_tool_warned=yes ;;
  esac
 -    CXX=$ac_ct_CXX
-+    AR=$ac_ct_AR
++    STRIP=$ac_ct_STRIP
    fi
 +else
-+  AR="$ac_cv_prog_AR"
++  STRIP="$ac_cv_prog_STRIP"
  fi
  
 -  fi
@@ -15062,8 +15681,7 @@
 -  ac_status=$?
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }
-+test -z "$AR" && AR=ar
-+test -z "$AR_FLAGS" && AR_FLAGS=cru
++test -z "$STRIP" && STRIP=:
  
 -{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
 -$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
@@ -15116,15 +15734,48 @@
  
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
- 
--fi
++
++if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
++set dummy ${ac_tool_prefix}ranlib; ac_word=$2
++{ $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_RANLIB+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  if test -n "$RANLIB"; then
++  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++  done
++IFS=$as_save_IFS
+ 
+ fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
 -$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
 -if test $ac_compiler_gnu = yes; then
 -  GXX=yes
--else
++fi
++RANLIB=$ac_cv_prog_RANLIB
++if test -n "$RANLIB"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
++$as_echo "$RANLIB" >&6; }
+ else
 -  GXX=
--fi
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ fi
 -ac_test_CXXFLAGS=${CXXFLAGS+set}
 -ac_save_CXXFLAGS=$CXXFLAGS
 -{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
@@ -15142,6 +15793,134 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
+ 
+-int
+-main ()
+-{
+ 
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_cxx_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
+-  ac_cv_prog_cxx_g=yes
++fi
++if test -z "$ac_cv_prog_RANLIB"; then
++  ac_ct_RANLIB=$RANLIB
++  # Extract the first word of "ranlib", so it can be a program name with args.
++set dummy ranlib; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	CXXFLAGS=""
+-      cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
++  if test -n "$ac_ct_RANLIB"; then
++  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_ac_ct_RANLIB="ranlib"
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++  done
++IFS=$as_save_IFS
+ 
+-int
+-main ()
+-{
++fi
++fi
++ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
++if test -n "$ac_ct_RANLIB"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
++$as_echo "$ac_ct_RANLIB" >&6; }
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
+ 
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
++  if test "x$ac_ct_RANLIB" = x; then
++    RANLIB=":"
++  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
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_cxx_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
+-  :
++    RANLIB=$ac_ct_RANLIB
++  fi
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++  RANLIB="$ac_cv_prog_RANLIB"
++fi
+ 
+-	ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+-	 CXXFLAGS="-g"
+-	 cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
++test -z "$RANLIB" && RANLIB=:
  
 -int
 -main ()
@@ -15174,163 +15953,22 @@
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
  
--	CXXFLAGS=""
--      cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
- 
--int
--main ()
--{
- 
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_cxx_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  :
-+if test -n "$ac_tool_prefix"; then
-+  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}strip; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_STRIP+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cxx_werror_flag=$ac_save_cxx_werror_flag
--	 CXXFLAGS="-g"
--	 cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--int
--main ()
--{
-+  if test -n "$STRIP"; then
-+  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
- 
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_cxx_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  ac_cv_prog_cxx_g=yes
-+fi
-+fi
-+STRIP=$ac_cv_prog_STRIP
-+if test -n "$STRIP"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-+$as_echo "$STRIP" >&6; }
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
- 
- 
- fi
-+if test -z "$ac_cv_prog_STRIP"; then
-+  ac_ct_STRIP=$STRIP
-+  # Extract the first word of "strip", so it can be a program name with args.
-+set dummy strip; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$ac_ct_STRIP"; then
-+  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_ac_ct_STRIP="strip"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
+ 
+-fi
  
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--
+-fi
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--
+-fi
++# Determine commands to create old-style static archives.
++old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
++old_postinstall_cmds='chmod 644 $oldlib'
++old_postuninstall_cmds=
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-+if test -n "$ac_ct_STRIP"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-+$as_echo "$ac_ct_STRIP" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
- fi
+-fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
 -$as_echo "$ac_cv_prog_cxx_g" >&6; }
 -if test "$ac_test_CXXFLAGS" = set; then
@@ -15338,26 +15976,25 @@
 -elif test $ac_cv_prog_cxx_g = yes; then
 -  if test "$GXX" = yes; then
 -    CXXFLAGS="-g -O2"
-+
-+  if test "x$ac_ct_STRIP" = x; then
-+    STRIP=":"
-   else
+-  else
 -    CXXFLAGS="-g"
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    STRIP=$ac_ct_STRIP
-   fi
- else
+-  fi
+-else
 -  if test "$GXX" = yes; then
 -    CXXFLAGS="-O2"
 -  else
 -    CXXFLAGS=
 -  fi
-+  STRIP="$ac_cv_prog_STRIP"
++if test -n "$RANLIB"; then
++  case $host_os in
++  openbsd*)
++    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
++    ;;
++  *)
++    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
++    ;;
++  esac
++  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
  fi
 -ac_ext=cpp
 -ac_cpp='$CXXCPP $CPPFLAGS'
@@ -15366,24 +16003,12 @@
 -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
  
 -depcc="$CXX"  am_compiler_list=
-+test -z "$STRIP" && STRIP=:
-+
  
 -{ $as_echo "$as_me:$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
-+
-+
-+
-+
-+if test -n "$ac_tool_prefix"; then
-+  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_prog_RANLIB+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
+-  $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
@@ -15402,7 +16027,7 @@
 -  # the current directory while Tru64 will put them in the object
 -  # directory.
 -  mkdir sub
--
+ 
 -  am_cv_CXX_dependencies_compiler_type=none
 -  if test "$am_compiler_list" = ""; then
 -     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
@@ -15423,7 +16048,7 @@
 -      touch sub/conftst$i.h
 -    done
 -    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
--
+ 
 -    case $depmode in
 -    nosideeffect)
 -      # after this tag, mechanisms are not by side-effect, so they'll
@@ -15462,18 +16087,18 @@
 -      fi
 -    fi
 -  done
--
+ 
 -  cd ..
 -  rm -rf conftest.dir
 -else
 -  am_cv_CXX_dependencies_compiler_type=none
 -fi
--
+ 
 -fi
 -{ $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
 -$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
 -CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
--
+ 
 - if
 -  test "x$enable_dependency_tracking" != xno \
 -  && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
@@ -15483,10 +16108,10 @@
 -  am__fastdepCXX_TRUE='#'
 -  am__fastdepCXX_FALSE=
 -fi
--
--
--
--
+ 
+ 
+ 
+ 
 -if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
 -    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
 -    (test "X$CXX" != "Xg++"))) ; then
@@ -15591,19 +16216,19 @@
 -ac_preproc_ok=:
 -break
 -fi
--
+ 
 -rm -f conftest.err conftest.$ac_ext
--
+ 
 -done
 -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 -rm -f conftest.err conftest.$ac_ext
 -if $ac_preproc_ok; then
 -  break
 -fi
--
+ 
 -    done
 -    ac_cv_prog_CXXCPP=$CXXCPP
--
+ 
 -fi
 -  CXXCPP=$ac_cv_prog_CXXCPP
 -else
@@ -15654,13 +16279,13 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
+ 
 -  # Broken: fails on valid input.
 -continue
 -fi
--
+ 
 -rm -f conftest.err conftest.$ac_ext
--
+ 
 -  # OK, works on sane cases.  Now check whether nonexistent headers
 -  # can be detected and how.
 -  cat >conftest.$ac_ext <<_ACEOF
@@ -15693,14 +16318,14 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
+ 
 -  # Passes both tests.
 -ac_preproc_ok=:
 -break
 -fi
--
+ 
 -rm -f conftest.err conftest.$ac_ext
--
+ 
 -done
 -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 -rm -f conftest.err conftest.$ac_ext
@@ -15713,16 +16338,16 @@
 -See \`config.log' for more details." >&2;}
 -   { (exit 1); exit 1; }; }
 -fi
--
+ 
 -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
--
--
+ 
+ 
 -ac_ext=f
 -ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
 -ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -15739,48 +16364,37 @@
 -else
 -  if test -n "$F77"; then
 -  ac_cv_prog_F77="$F77" # Let the user override the test.
-+  if test -n "$RANLIB"; then
-+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
- else
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- for as_dir in $PATH
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
+-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
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 -    ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
 -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
+-    break 2
+-  fi
 -done
-+  done
- IFS=$as_save_IFS
- 
- fi
- fi
+-done
+-IFS=$as_save_IFS
+ 
+-fi
+-fi
 -F77=$ac_cv_prog_F77
 -if test -n "$F77"; then
 -  { $as_echo "$as_me:$LINENO: result: $F77" >&5
 -$as_echo "$F77" >&6; }
-+RANLIB=$ac_cv_prog_RANLIB
-+if test -n "$RANLIB"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
-+$as_echo "$RANLIB" >&6; }
- else
+-else
 -  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
+-$as_echo "no" >&6; }
+-fi
  
  
 -    test -n "$F77" && break
 -  done
- fi
+-fi
 -if test -z "$F77"; then
 -  ac_ct_F77=$F77
 -  for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn
@@ -15788,85 +16402,60 @@
 -  # Extract the first word of "$ac_prog", so it can be a program name with args.
 -set dummy $ac_prog; ac_word=$2
 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+if test -z "$ac_cv_prog_RANLIB"; then
-+  ac_ct_RANLIB=$RANLIB
-+  # Extract the first word of "ranlib", so it can be a program name with args.
-+set dummy ranlib; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
+-$as_echo_n "checking for $ac_word... " >&6; }
 -if test "${ac_cv_prog_ac_ct_F77+set}" = set; then
-+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
+-  $as_echo_n "(cached) " >&6
+-else
 -  if test -n "$ac_ct_F77"; then
 -  ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test.
-+  if test -n "$ac_ct_RANLIB"; then
-+  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
- else
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- for as_dir in $PATH
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
+-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
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 -    ac_cv_prog_ac_ct_F77="$ac_prog"
 -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    ac_cv_prog_ac_ct_RANLIB="ranlib"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
+-    break 2
+-  fi
 -done
-+  done
- IFS=$as_save_IFS
- 
- fi
- fi
+-done
+-IFS=$as_save_IFS
+ 
+-fi
+-fi
 -ac_ct_F77=$ac_cv_prog_ac_ct_F77
 -if test -n "$ac_ct_F77"; then
 -  { $as_echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
 -$as_echo "$ac_ct_F77" >&6; }
-+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-+if test -n "$ac_ct_RANLIB"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
-+$as_echo "$ac_ct_RANLIB" >&6; }
- else
+-else
 -  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
--
+-$as_echo "no" >&6; }
+-fi
+ 
+ 
 -  test -n "$ac_ct_F77" && break
 -done
--
+ 
 -  if test "x$ac_ct_F77" = x; then
 -    F77=""
-+  if test "x$ac_ct_RANLIB" = x; then
-+    RANLIB=":"
-   else
-     case $cross_compiling:$ac_tool_warned in
- yes:)
+-  else
+-    case $cross_compiling:$ac_tool_warned in
+-yes:)
 -{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
 -whose name does not start with the host triplet.  If you think this
 -configuration is useful to you, please write to autoconf at gnu.org." >&5
 -$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
 -whose name does not start with the host triplet.  If you think this
 -configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+{ $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
+-ac_tool_warned=yes ;;
+-esac
 -    F77=$ac_ct_F77
-+    RANLIB=$ac_ct_RANLIB
-   fi
-+else
-+  RANLIB="$ac_cv_prog_RANLIB"
- fi
- 
-+test -z "$RANLIB" && RANLIB=:
+-  fi
+-fi
+ 
  
 -# Provide some information about the compiler.
 -$as_echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5
@@ -15921,6 +16510,8 @@
 -#ifndef __GNUC__
 -       choke me
 -#endif
++# If no C compiler was specified, use CC.
++LTCC=${LTCC-"$CC"}
  
 -      end
 -_ACEOF
@@ -15946,9 +16537,13 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
++# If no C compiler flags were specified, use CFLAGS.
++LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
  
 -	ac_compiler_gnu=no
 -fi
++# Allow CC to be a program name with arguments.
++compiler=$CC
  
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -ac_cv_f77_compiler_gnu=$ac_compiler_gnu
@@ -15963,8 +16558,12 @@
 -{ $as_echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
 -$as_echo_n "checking whether $F77 accepts -g... " >&6; }
 -if test "${ac_cv_prog_f77_g+set}" = set; then
--  $as_echo_n "(cached) " >&6
--else
++# Check for command to grab the raw symbol name followed by C symbol from nm.
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
++$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
++if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
 -  FFLAGS=-g
 -cat >conftest.$ac_ext <<_ACEOF
 -      program main
@@ -15993,25 +16592,17 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+# Determine commands to create old-style static archives.
-+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
-+old_postinstall_cmds='chmod 644 $oldlib'
-+old_postuninstall_cmds=
++# These are sane defaults that work on at least a few old systems.
++# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
  
 -	ac_cv_prog_f77_g=no
-+if test -n "$RANLIB"; then
-+  case $host_os in
-+  openbsd*)
-+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
-+    ;;
-+  *)
-+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
-+    ;;
-+  esac
-+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
- fi
+-fi
++# Character class describing NM global symbol codes.
++symcode='[BCDEGRST]'
  
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++# Regexp to match symbols that can be accessed directly from C.
++sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
  
 -fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
@@ -16031,7 +16622,7 @@
 -    FFLAGS=
 -  fi
 -fi
- 
+-
 -if test $ac_compiler_gnu = yes; then
 -  G77=yes
 -else
@@ -16042,9 +16633,9 @@
 -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
- 
- 
- 
+-
+-
+-
 -# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
 -# find the maximum length of command line arguments
 -{ $as_echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
@@ -16054,7 +16645,7 @@
 -else
 -    i=0
 -  teststring="ABCD"
- 
+-
 -  case $build_os in
 -  msdosdjgpp*)
 -    # On DJGPP, this test can blow up pretty badly due to problems in libc
@@ -16063,14 +16654,14 @@
 -    # check would be larger than it should be.
 -    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
 -    ;;
- 
+-
 -  gnu*)
 -    # Under GNU Hurd, this test is not required because there is
 -    # no limit to the length of command line arguments.
 -    # Libtool will interpret -1 as no limit whatsoever
 -    lt_cv_sys_max_cmd_len=-1;
 -    ;;
- 
+-
 -  cygwin* | mingw*)
 -    # On Win9x/ME, this test blows up -- it succeeds, but takes
 -    # about 5 minutes as the teststring grows exponentially.
@@ -16081,13 +16672,13 @@
 -    # all of the supported platforms: 8192 (on NT/2K/XP).
 -    lt_cv_sys_max_cmd_len=8192;
 -    ;;
- 
+-
 -  amigaos*)
 -    # On AmigaOS with pdksh, this test takes hours, literally.
 -    # So we just punt and use a minimum line length of 8192.
 -    lt_cv_sys_max_cmd_len=8192;
 -    ;;
- 
+-
 -  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
 -    # This has been around since 386BSD, at least.  Likely further.
 -    if test -x /sbin/sysctl; then
@@ -16101,12 +16692,12 @@
 -    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
 -    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
 -    ;;
- 
+-
 -  interix*)
 -    # We know the value 262144 and hardcode it with a safety zone (like BSD)
 -    lt_cv_sys_max_cmd_len=196608
 -    ;;
- 
+-
 -  osf*)
 -    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
 -    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
@@ -16155,9 +16746,9 @@
 -    fi
 -    ;;
 -  esac
- 
+-
 -fi
- 
+-
 -if test -n $lt_cv_sys_max_cmd_len ; then
 -  { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
 -$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
@@ -16165,68 +16756,45 @@
 -  { $as_echo "$as_me:$LINENO: result: none" >&5
 -$as_echo "none" >&6; }
 -fi
- 
- 
- 
- 
- 
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+# If no C compiler was specified, use CC.
-+LTCC=${LTCC-"$CC"}
-+
-+# If no C compiler flags were specified, use CFLAGS.
-+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-+
-+# Allow CC to be a program name with arguments.
-+compiler=$CC
-+
-+
- # Check for command to grab the raw symbol name followed by C symbol from nm.
+-
+-
+-
+-
+-
+-# Check for command to grab the raw symbol name followed by C symbol from nm.
 -{ $as_echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
- $as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
+-$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
 -if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
-+if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
- 
-@@ -6431,33 +5401,18 @@ symcode='[BCDEGRST]'
- # Regexp to match symbols that can be accessed directly from C.
- sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
- 
+-  $as_echo_n "(cached) " >&6
+-else
+-
+-# These are sane defaults that work on at least a few old systems.
+-# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
+-
+-# Character class describing NM global symbol codes.
+-symcode='[BCDEGRST]'
+-
+-# Regexp to match symbols that can be accessed directly from C.
+-sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
+-
 -# Transform an extracted symbol line into a proper C declaration
 -lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
 -
 -# Transform an extracted symbol line into symbol name and symbol address
 -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
 -
- # Define system-specific variables.
- case $host_os in
- aix*)
-   symcode='[BCDT]'
-   ;;
+-# Define system-specific variables.
+-case $host_os in
+-aix*)
+-  symcode='[BCDT]'
+-  ;;
 -cygwin* | mingw* | pw32*)
-+cygwin* | mingw* | pw32* | cegcc*)
-   symcode='[ABCDGISTW]'
-   ;;
+-  symcode='[ABCDGISTW]'
+-  ;;
 -hpux*) # Its linker distinguishes data from code symbols
-+hpux*)
-   if test "$host_cpu" = ia64; then
-     symcode='[ABCDEGRST]'
-   fi
+-  if test "$host_cpu" = ia64; then
+-    symcode='[ABCDEGRST]'
+-  fi
 -  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
 -  lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
 -  ;;
@@ -16235,11 +16803,21 @@
 -    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
++# Define system-specific variables.
++case $host_os in
++aix*)
++  symcode='[BCDT]'
++  ;;
++cygwin* | mingw* | pw32* | cegcc*)
++  symcode='[ABCDGISTW]'
++  ;;
++hpux*)
++  if test "$host_cpu" = ia64; then
++    symcode='[ABCDEGRST]'
+   fi
    ;;
  irix* | nonstopux*)
-   symcode='[BCDEGRST]'
-@@ -6482,57 +5437,85 @@ sysv4)
+@@ -6482,57 +5464,85 @@
    ;;
  esac
  
@@ -16343,7 +16921,7 @@
        # Try sorting and uniquifying the output.
        if sort "$nlist" | uniq > "$nlist"T; then
  	mv -f "$nlist"T "$nlist"
-@@ -6541,53 +5524,55 @@ EOF
+@@ -6541,53 +5551,55 @@
        fi
  
        # Make sure that we snagged all the symbols we need.
@@ -16422,7 +17000,7 @@
  	    pipe_works=yes
  	  fi
  	  LIBS="$lt_save_LIBS"
-@@ -6621,783 +5606,756 @@ if test -z "$lt_cv_sys_global_symbol_pip
+@@ -6621,783 +5633,756 @@
    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
@@ -16466,17 +17044,77 @@
 -  if test "X${COLLECT_NAMES+set}" != Xset; then
 -    COLLECT_NAMES=
 -    export COLLECT_NAMES
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
+-  fi
+-  ;;
+-esac
+ 
+-# Sed substitution that helps us do robust quoting.  It backslashifies
+-# metacharacters that are still active within double-quoted strings.
+-Xsed='sed -e 1s/^X//'
+-sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
+ 
+-# Same as above, but do not quote variable references.
+-double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'
+ 
+-# Sed substitution to delay expansion of an escaped shell variable in a
+-# double_quote_subst'ed string.
+-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+ 
+-# Sed substitution to avoid accidental globbing in evaled expressions
+-no_glob_subst='s/\*/\\\*/g'
+ 
+-# Constants:
+-rm="rm -f"
+ 
+-# Global variables:
+-default_ofile=libtool
+-can_build_shared=yes
+ 
+-# All known linkers require a `.a' archive for static linking (except MSVC,
+-# which needs '.lib').
+-libext=a
+-ltmain="$ac_aux_dir/ltmain.sh"
+-ofile="$default_ofile"
+-with_gnu_ld="$lt_cv_prog_gnu_ld"
+ 
+-if test -n "$ac_tool_prefix"; then
+-  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}ar; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_AR+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  if test -n "$AR"; then
+-  ac_cv_prog_AR="$AR" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+-    ac_cv_prog_AR="${ac_tool_prefix}ar"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-done
+-IFS=$as_save_IFS
+ 
+-fi
+-fi
+-AR=$ac_cv_prog_AR
+-if test -n "$AR"; then
+-  { $as_echo "$as_me:$LINENO: result: $AR" >&5
+-$as_echo "$AR" >&6; }
+-else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+ 
+ 
 +
 +
 +
@@ -16486,7 +17124,14 @@
 +# Check whether --enable-libtool-lock was given.
 +if test "${enable_libtool_lock+set}" = set; then :
 +  enableval=$enable_libtool_lock;
-+fi
+ fi
+-if test -z "$ac_cv_prog_AR"; then
+-  ac_ct_AR=$AR
+-  # Extract the first word of "ar", so it can be a program name with args.
+-set dummy ar; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
 +
 +test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
 +
@@ -16509,12 +17154,12 @@
 +	HPUX_IA64_MODE="64"
 +	;;
 +    esac
-   fi
++  fi
 +  rm -rf conftest*
 +  ;;
 +*-*-irix6*)
 +  # Find out which ABI we are using.
-+  echo '#line 5669 "configure"' > conftest.$ac_ext
++  echo '#line 5696 "configure"' > conftest.$ac_ext
 +  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
@@ -16547,13 +17192,8 @@
 +    fi
 +  fi
 +  rm -rf conftest*
-   ;;
--esac
- 
--# Sed substitution that helps us do robust quoting.  It backslashifies
--# metacharacters that are still active within double-quoted strings.
--Xsed='sed -e 1s/^X//'
--sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
++  ;;
++
 +x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
 +s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
 +  # Find out which ABI we are using.
@@ -16606,9 +17246,7 @@
 +  fi
 +  rm -rf conftest*
 +  ;;
- 
--# Same as above, but do not quote variable references.
--double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'
++
 +*-*-sco3.2v5*)
 +  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
 +  SAVE_CFLAGS="$CFLAGS"
@@ -16616,37 +17254,55 @@
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
 +$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
 +if test "${lt_cv_cc_needs_belf+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
+   $as_echo_n "(cached) " >&6
+ else
+-  if test -n "$ac_ct_AR"; then
+-  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+-    ac_cv_prog_ac_ct_AR="ar"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-done
+-IFS=$as_save_IFS
 +  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
  
--# Sed substitution to delay expansion of an escaped shell variable in a
--# double_quote_subst'ed string.
--delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+-fi
+-fi
+-ac_ct_AR=$ac_cv_prog_ac_ct_AR
+-if test -n "$ac_ct_AR"; then
+-  { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
+-$as_echo "$ac_ct_AR" >&6; }
 +     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
- 
--# Sed substitution to avoid accidental globbing in evaled expressions
--no_glob_subst='s/\*/\\\*/g'
++
 +int
 +main ()
 +{
- 
--# Constants:
--rm="rm -f"
++
 +  ;
 +  return 0;
 +}
 +_ACEOF
 +if ac_fn_c_try_link "$LINENO"; then :
 +  lt_cv_cc_needs_belf=yes
-+else
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
 +  lt_cv_cc_needs_belf=no
-+fi
+ fi
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext conftest.$ac_ext
 +     ac_ext=c
@@ -16655,10 +17311,24 @@
 +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 +ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
--# Global variables:
--default_ofile=libtool
--can_build_shared=yes
-+fi
+-  if test "x$ac_ct_AR" = x; then
+-    AR="false"
+-  else
+-    case $cross_compiling:$ac_tool_warned in
+-yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+-whose name does not start with the host triplet.  If you think this
+-configuration is useful to you, please write to autoconf at gnu.org." >&5
+-$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+-whose name does not start with the host triplet.  If you think this
+-configuration is useful to you, please write to autoconf at gnu.org." >&2;}
+-ac_tool_warned=yes ;;
+-esac
+-    AR=$ac_ct_AR
+-  fi
+-else
+-  AR="$ac_cv_prog_AR"
+ fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
 +$as_echo "$lt_cv_cc_needs_belf" >&6; }
 +  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
@@ -16691,18 +17361,12 @@
 +  ;;
 +esac
  
--# All known linkers require a `.a' archive for static linking (except MSVC,
--# which needs '.lib').
--libext=a
--ltmain="$ac_aux_dir/ltmain.sh"
--ofile="$default_ofile"
--with_gnu_ld="$lt_cv_prog_gnu_ld"
+-if test -n "$ac_tool_prefix"; then
+-  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 +need_locks="$enable_libtool_lock"
- 
--if test -n "$ac_tool_prefix"; then
--  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
--set dummy ${ac_tool_prefix}ar; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++
 +
 +  case $host_os in
 +    rhapsody* | darwin*)
@@ -16711,12 +17375,12 @@
 +set dummy ${ac_tool_prefix}dsymutil; 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_AR+set}" = set; then
+-if test "${ac_cv_prog_RANLIB+set}" = set; then
 +if test "${ac_cv_prog_DSYMUTIL+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
--  if test -n "$AR"; then
--  ac_cv_prog_AR="$AR" # Let the user override the test.
+-  if test -n "$RANLIB"; then
+-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
 +  if test -n "$DSYMUTIL"; then
 +  ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
  else
@@ -16728,7 +17392,7 @@
 -  for ac_exec_ext in '' $ac_executable_extensions; do
 +    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
--    ac_cv_prog_AR="${ac_tool_prefix}ar"
+-    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
 -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
@@ -16741,10 +17405,10 @@
  
  fi
  fi
--AR=$ac_cv_prog_AR
--if test -n "$AR"; then
--  { $as_echo "$as_me:$LINENO: result: $AR" >&5
--$as_echo "$AR" >&6; }
+-RANLIB=$ac_cv_prog_RANLIB
+-if test -n "$RANLIB"; then
+-  { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
+-$as_echo "$RANLIB" >&6; }
 +DSYMUTIL=$ac_cv_prog_DSYMUTIL
 +if test -n "$DSYMUTIL"; then
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
@@ -16757,10 +17421,10 @@
  
  
  fi
--if test -z "$ac_cv_prog_AR"; then
--  ac_ct_AR=$AR
--  # Extract the first word of "ar", so it can be a program name with args.
--set dummy ar; ac_word=$2
+-if test -z "$ac_cv_prog_RANLIB"; then
+-  ac_ct_RANLIB=$RANLIB
+-  # Extract the first word of "ranlib", so it can be a program name with args.
+-set dummy ranlib; ac_word=$2
 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 +if test -z "$ac_cv_prog_DSYMUTIL"; then
 +  ac_ct_DSYMUTIL=$DSYMUTIL
@@ -16768,12 +17432,12 @@
 +set dummy dsymutil; ac_word=$2
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
+-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
 +if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
--  if test -n "$ac_ct_AR"; then
--  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
+-  if test -n "$ac_ct_RANLIB"; then
+-  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
 +  if test -n "$ac_ct_DSYMUTIL"; then
 +  ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
  else
@@ -16785,7 +17449,7 @@
 -  for ac_exec_ext in '' $ac_executable_extensions; do
 +    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
--    ac_cv_prog_ac_ct_AR="ar"
+-    ac_cv_prog_ac_ct_RANLIB="ranlib"
 -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
@@ -16798,10 +17462,10 @@
  
  fi
  fi
--ac_ct_AR=$ac_cv_prog_ac_ct_AR
--if test -n "$ac_ct_AR"; then
--  { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
--$as_echo "$ac_ct_AR" >&6; }
+-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+-if test -n "$ac_ct_RANLIB"; then
+-  { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
+-$as_echo "$ac_ct_RANLIB" >&6; }
 +ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
 +if test -n "$ac_ct_DSYMUTIL"; then
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
@@ -16812,8 +17476,8 @@
  $as_echo "no" >&6; }
  fi
  
--  if test "x$ac_ct_AR" = x; then
--    AR="false"
+-  if test "x$ac_ct_RANLIB" = x; then
+-    RANLIB=":"
 +  if test "x$ac_ct_DSYMUTIL" = x; then
 +    DSYMUTIL=":"
    else
@@ -16829,29 +17493,29 @@
 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
--    AR=$ac_ct_AR
+-    RANLIB=$ac_ct_RANLIB
 +    DSYMUTIL=$ac_ct_DSYMUTIL
    fi
  else
--  AR="$ac_cv_prog_AR"
+-  RANLIB="$ac_cv_prog_RANLIB"
 +  DSYMUTIL="$ac_cv_prog_DSYMUTIL"
  fi
  
 -if test -n "$ac_tool_prefix"; then
--  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
--set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}strip; ac_word=$2
 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 +    if test -n "$ac_tool_prefix"; then
 +  # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
 +set dummy ${ac_tool_prefix}nmedit; ac_word=$2
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_RANLIB+set}" = set; then
+-if test "${ac_cv_prog_STRIP+set}" = set; then
 +if test "${ac_cv_prog_NMEDIT+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
--  if test -n "$RANLIB"; then
--  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+-  if test -n "$STRIP"; then
+-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
 +  if test -n "$NMEDIT"; then
 +  ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
  else
@@ -16863,7 +17527,7 @@
 -  for ac_exec_ext in '' $ac_executable_extensions; do
 +    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
--    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
 -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
@@ -16876,10 +17540,10 @@
  
  fi
  fi
--RANLIB=$ac_cv_prog_RANLIB
--if test -n "$RANLIB"; then
--  { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
--$as_echo "$RANLIB" >&6; }
+-STRIP=$ac_cv_prog_STRIP
+-if test -n "$STRIP"; then
+-  { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
+-$as_echo "$STRIP" >&6; }
 +NMEDIT=$ac_cv_prog_NMEDIT
 +if test -n "$NMEDIT"; then
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
@@ -16892,10 +17556,10 @@
  
  
  fi
--if test -z "$ac_cv_prog_RANLIB"; then
--  ac_ct_RANLIB=$RANLIB
--  # Extract the first word of "ranlib", so it can be a program name with args.
--set dummy ranlib; ac_word=$2
+-if test -z "$ac_cv_prog_STRIP"; then
+-  ac_ct_STRIP=$STRIP
+-  # Extract the first word of "strip", so it can be a program name with args.
+-set dummy strip; ac_word=$2
 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
 +if test -z "$ac_cv_prog_NMEDIT"; then
 +  ac_ct_NMEDIT=$NMEDIT
@@ -16903,12 +17567,12 @@
 +set dummy nmedit; ac_word=$2
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
+-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
 +if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then :
    $as_echo_n "(cached) " >&6
  else
--  if test -n "$ac_ct_RANLIB"; then
--  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
+-  if test -n "$ac_ct_STRIP"; then
+-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
 +  if test -n "$ac_ct_NMEDIT"; then
 +  ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
  else
@@ -16920,7 +17584,7 @@
 -  for ac_exec_ext in '' $ac_executable_extensions; do
 +    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
--    ac_cv_prog_ac_ct_RANLIB="ranlib"
+-    ac_cv_prog_ac_ct_STRIP="strip"
 -    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    ac_cv_prog_ac_ct_NMEDIT="nmedit"
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
@@ -16933,23 +17597,22 @@
  
  fi
  fi
--ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
--if test -n "$ac_ct_RANLIB"; then
--  { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
--$as_echo "$ac_ct_RANLIB" >&6; }
--else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
+-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+-if test -n "$ac_ct_STRIP"; then
+-  { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+-$as_echo "$ac_ct_STRIP" >&6; }
 +ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
 +if test -n "$ac_ct_NMEDIT"; then
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
 +$as_echo "$ac_ct_NMEDIT" >&6; }
-+else
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }
  fi
  
--  if test "x$ac_ct_RANLIB" = x; then
--    RANLIB=":"
+-  if test "x$ac_ct_STRIP" = x; then
+-    STRIP=":"
 +  if test "x$ac_ct_NMEDIT" = x; then
 +    NMEDIT=":"
    else
@@ -16965,143 +17628,8 @@
 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  ac_tool_warned=yes ;;
  esac
--    RANLIB=$ac_ct_RANLIB
+-    STRIP=$ac_ct_STRIP
 +    NMEDIT=$ac_ct_NMEDIT
-   fi
- else
--  RANLIB="$ac_cv_prog_RANLIB"
-+  NMEDIT="$ac_cv_prog_NMEDIT"
- fi
- 
--if test -n "$ac_tool_prefix"; then
--  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
--set dummy ${ac_tool_prefix}strip; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+    if test -n "$ac_tool_prefix"; then
-+  # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}lipo; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_STRIP+set}" = set; then
-+if test "${ac_cv_prog_LIPO+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
--  if test -n "$STRIP"; then
--  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-+  if test -n "$LIPO"; then
-+  ac_cv_prog_LIPO="$LIPO" # Let the user override the test.
- else
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- for as_dir in $PATH
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
--    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
- fi
- fi
--STRIP=$ac_cv_prog_STRIP
--if test -n "$STRIP"; then
--  { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
--$as_echo "$STRIP" >&6; }
-+LIPO=$ac_cv_prog_LIPO
-+if test -n "$LIPO"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
-+$as_echo "$LIPO" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
- 
- fi
--if test -z "$ac_cv_prog_STRIP"; then
--  ac_ct_STRIP=$STRIP
--  # Extract the first word of "strip", so it can be a program name with args.
--set dummy strip; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+if test -z "$ac_cv_prog_LIPO"; then
-+  ac_ct_LIPO=$LIPO
-+  # Extract the first word of "lipo", so it can be a program name with args.
-+set dummy lipo; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
-+if test "${ac_cv_prog_ac_ct_LIPO+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.
-+  if test -n "$ac_ct_LIPO"; then
-+  ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test.
- else
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- for as_dir in $PATH
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
--    ac_cv_prog_ac_ct_STRIP="strip"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    ac_cv_prog_ac_ct_LIPO="lipo"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
- fi
- fi
--ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
--if test -n "$ac_ct_STRIP"; then
--  { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
--$as_echo "$ac_ct_STRIP" >&6; }
-+ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
-+if test -n "$ac_ct_LIPO"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
-+$as_echo "$ac_ct_LIPO" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
--  if test "x$ac_ct_STRIP" = x; then
--    STRIP=":"
-+  if test "x$ac_ct_LIPO" = x; then
-+    LIPO=":"
-   else
-     case $cross_compiling:$ac_tool_warned in
- yes:)
--{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
--whose name does not start with the host triplet.  If you think this
--configuration is useful to you, please write to autoconf at gnu.org." >&5
--$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
--whose name does not start with the host triplet.  If you think this
--configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- ac_tool_warned=yes ;;
- esac
--    STRIP=$ac_ct_STRIP
-+    LIPO=$ac_ct_LIPO
    fi
  else
 -  STRIP="$ac_cv_prog_STRIP"
@@ -17144,8 +17672,9 @@
 -    ;;
 -  esac
 -  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
--fi
--
++  NMEDIT="$ac_cv_prog_NMEDIT"
+ fi
+ 
 -for cc_temp in $compiler""; do
 -  case $cc_temp in
 -    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
@@ -17164,8 +17693,14 @@
 -    { $as_echo "$as_me:$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
++    if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
++set dummy ${ac_tool_prefix}lipo; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_LIPO+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.
@@ -17205,29 +17740,61 @@
 -      fi
 -      break
 -    fi
--  done
++  if test -n "$LIPO"; then
++  ac_cv_prog_LIPO="$LIPO" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
+   done
 -  IFS="$lt_save_ifs"
 -  MAGIC_CMD="$lt_save_MAGIC_CMD"
 -  ;;
 -esac
 -fi
--
++IFS=$as_save_IFS
+ 
 -MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 -if test -n "$MAGIC_CMD"; then
 -  { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
 -$as_echo "$MAGIC_CMD" >&6; }
--else
++fi
++fi
++LIPO=$ac_cv_prog_LIPO
++if test -n "$LIPO"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
++$as_echo "$LIPO" >&6; }
+ else
 -  { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
--fi
--
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
 -if test -z "$lt_cv_path_MAGIC_CMD"; then
 -  if test -n "$ac_tool_prefix"; then
 -    { $as_echo "$as_me:$LINENO: checking for file" >&5
 -$as_echo_n "checking for file... " >&6; }
 -if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
--  $as_echo_n "(cached) " >&6
--else
++
++fi
++if test -z "$ac_cv_prog_LIPO"; then
++  ac_ct_LIPO=$LIPO
++  # Extract the first word of "lipo", so it can be a program name with args.
++set dummy lipo; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_prog_ac_ct_LIPO+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.
@@ -17267,25 +17834,58 @@
 -      fi
 -      break
 -    fi
--  done
++  if test -n "$ac_ct_LIPO"; then
++  ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_ac_ct_LIPO="lipo"
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
+   done
 -  IFS="$lt_save_ifs"
 -  MAGIC_CMD="$lt_save_MAGIC_CMD"
 -  ;;
 -esac
 -fi
--
++IFS=$as_save_IFS
+ 
 -MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 -if test -n "$MAGIC_CMD"; then
 -  { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
 -$as_echo "$MAGIC_CMD" >&6; }
--else
++fi
++fi
++ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
++if test -n "$ac_ct_LIPO"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
++$as_echo "$ac_ct_LIPO" >&6; }
+ else
 -  { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
--fi
--
--  else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
++  if test "x$ac_ct_LIPO" = x; then
++    LIPO=":"
+   else
 -    MAGIC_CMD=:
--  fi
++    case $cross_compiling:$ac_tool_warned in
++yes:)
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++ac_tool_warned=yes ;;
++esac
++    LIPO=$ac_ct_LIPO
+   fi
++else
 +  LIPO="$ac_cv_prog_LIPO"
  fi
  
@@ -17566,39 +18166,12 @@
  
  
 -    { $as_echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
- $as_echo_n "checking for -single_module linker flag... " >&6; }
+-$as_echo_n "checking for -single_module linker flag... " >&6; }
 -if test "${lt_cv_apple_cc_single_mod+set}" = set; then
-+if test "${lt_cv_apple_cc_single_mod+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   lt_cv_apple_cc_single_mod=no
-       if test -z "${LT_MULTI_MODULE}"; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  lt_cv_apple_cc_single_mod=no
+-      if test -z "${LT_MULTI_MODULE}"; then
 -   # By default we will add the -single_module flag. You can override
 -   # by either setting the environment variable LT_MULTI_MODULE
 -   # non-empty at configure time, or by adding -multi_module to the
@@ -17611,6 +18184,41 @@
 -     rm -rf libconftest.dylib*
 -   fi
 -   rm conftest.c
+-      fi
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
++$as_echo_n "checking for -single_module linker flag... " >&6; }
++if test "${lt_cv_apple_cc_single_mod+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  lt_cv_apple_cc_single_mod=no
++      if test -z "${LT_MULTI_MODULE}"; then
 +	# By default we will add the -single_module flag. You can override
 +	# by either setting the environment variable LT_MULTI_MODULE
 +	# non-empty at configure time, or by adding -multi_module to the
@@ -17629,9 +18237,8 @@
 +	fi
 +	rm -rf libconftest.dylib*
 +	rm -f conftest.*
-       fi
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
++      fi
++fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
  $as_echo "$lt_cv_apple_cc_single_mod" >&6; }
 -    { $as_echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
@@ -17654,7 +18261,7 @@
  /* end confdefs.h.  */
  
  int
-@@ -7408,59 +6366,34 @@ main ()
+@@ -7408,59 +6393,34 @@
    return 0;
  }
  _ACEOF
@@ -17729,7 +18336,7 @@
        esac
      ;;
    esac
-@@ -7470,40 +6403,147 @@ $as_echo "$lt_cv_ld_exported_symbols_lis
+@@ -7470,40 +6430,147 @@
      if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
        _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
      else
@@ -17893,7 +18500,7 @@
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -7511,9523 +6551,770 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
+@@ -7511,5625 +6578,2463 @@
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  
@@ -18180,34 +18787,10 @@
 -      ;;
 +# Set options
  
-+
-+
-+        enable_dlopen=no
-+
-+
-+  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 ;;
-     *)
+-    *)
 -      lt_prog_compiler_pic='-fPIC'
-+      enable_shared=no
-+      # Look at the argument we got.  We use all the common list separators.
-+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-+      for pkg in $enableval; do
-+	IFS="$lt_save_ifs"
-+	if test "X$pkg" = "X$p"; then
-+	  enable_shared=yes
-+	fi
-+      done
-+      IFS="$lt_save_ifs"
-       ;;
-     esac
+-      ;;
+-    esac
 -  else
 -    # PORTME Check for flag to pass linker flags through the system compiler.
 -    case $host_os in
@@ -18230,9 +18813,6 @@
 -         ;;
 -       esac
 -       ;;
-+else
-+  enable_shared=yes
-+fi
  
 -    mingw* | cygwin* | pw32* | os2*)
 -      # This hack is so that the source file can tell whether it is being
@@ -18255,6 +18835,7 @@
 -      # Is there a better lt_prog_compiler_static that works with the bundled CC?
 -      lt_prog_compiler_static='${wl}-a ${wl}archive'
 -      ;;
++        enable_dlopen=no
  
 -    irix5* | irix6* | nonstopux*)
 -      lt_prog_compiler_wl='-Wl,'
@@ -18266,6 +18847,7 @@
 -      lt_prog_compiler_pic='-KPIC'
 -      lt_prog_compiler_static='-Bstatic'
 -      ;;
++  enable_win32_dll=no
  
 -    linux* | k*bsd*-gnu)
 -      case $cc_basename in
@@ -18309,7 +18891,28 @@
 -      lt_prog_compiler_wl='-Wl,'
 -      # All OSF/1 code is PIC.
 -      lt_prog_compiler_static='-non_shared'
--      ;;
++            # 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
++      done
++      IFS="$lt_save_ifs"
+       ;;
++    esac
++else
++  enable_shared=yes
++fi
  
 -    rdos*)
 -      lt_prog_compiler_static='-non_shared'
@@ -18344,15 +18947,6 @@
 -	lt_prog_compiler_static='-Bstatic'
 -      fi
 -      ;;
-+# Check whether --with-pic was given.
-+if test "${with_pic+set}" = set; then :
-+  withval=$with_pic; pic_mode="$withval"
-+else
-+  pic_mode=default
-+fi
-+
-+
-+test -z "$pic_mode" && pic_mode=default
  
 -    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
 -      lt_prog_compiler_wl='-Wl,'
@@ -18364,39 +18958,17 @@
 -      lt_prog_compiler_wl='-Wl,'
 -      lt_prog_compiler_can_build_shared=no
 -      ;;
- 
+-
 -    uts4*)
 -      lt_prog_compiler_pic='-pic'
 -      lt_prog_compiler_static='-Bstatic'
 -      ;;
  
-+
-+
-+
-+  # 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 ;;
-     *)
+-    *)
 -      lt_prog_compiler_can_build_shared=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
+-      ;;
+-    esac
 -  fi
-+else
-+  enable_fast_install=yes
-+fi
  
 -{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
 -$as_echo "$lt_prog_compiler_pic" >&6; }
@@ -18410,7 +18982,10 @@
 -$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
 -if test "${lt_cv_prog_compiler_pic_works+set}" = set; then
 -  $as_echo_n "(cached) " >&6
--else
++# Check whether --with-pic was given.
++if test "${with_pic+set}" = set; then :
++  withval=$with_pic; pic_mode="$withval"
+ else
 -  lt_cv_prog_compiler_pic_works=no
 -  ac_outfile=conftest.$ac_objext
 -   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -18439,8 +19014,9 @@
 -     fi
 -   fi
 -   $rm conftest*
- 
--fi
+-
++  pic_mode=default
+ fi
 -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
 -$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
  
@@ -18464,6 +19040,7 @@
 -    lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
 -    ;;
 -esac
++test -z "$pic_mode" && pic_mode=default
  
 -#
 -# Check to make sure the static flag actually works.
@@ -18502,9 +19079,33 @@
  
 -if test x"$lt_cv_prog_compiler_static_works" = xyes; then
 -    :
--else
++
++
++
++
++  # 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
 -    lt_prog_compiler_static=
--fi
++  enable_fast_install=yes
+ fi
  
  
 -{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
@@ -18518,8 +19119,6 @@
 -   cd conftest
 -   mkdir out
 -   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-+# This can be used to rebuild libtool when needed
-+LIBTOOL_DEPS="$ltmain"
  
 -   lt_compiler_flag="-o out/conftest2.$ac_objext"
 -   # Insert the option either (1) after the last *FLAGS variable, or
@@ -18554,8 +19153,6 @@
 -   cd ..
 -   rmdir conftest
 -   $rm conftest*
-+# Always use our own libtool.
-+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
  
 -fi
 -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
@@ -18678,6 +19275,8 @@
 -      *\ 2.11.*) ;; # other 2.11 versions
 -      *) supports_anon_versioning=yes ;;
 -    esac
++# This can be used to rebuild libtool when needed
++LIBTOOL_DEPS="$ltmain"
  
 -    # See if GNU ld supports shared libraries.
 -    case $host_os in
@@ -18686,6 +19285,8 @@
 -      if test "$host_cpu" != ia64; then
 -	ld_shlibs=no
 -	cat <<EOF 1>&2
++# Always use our own libtool.
++LIBTOOL='$(SHELL) $(top_builddir)/libtool'
  
 -*** Warning: the GNU linker, at least up to release 2.9.1, is reported
 -*** to be unable to reliably create shared libraries on AIX.
@@ -18845,7 +19446,6 @@
 -*** 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.
-+test -z "$LN_S" && LN_S="ln -s"
  
 -_LT_EOF
 -	;;
@@ -18945,6 +19545,7 @@
 -      hardcode_direct=yes
 -      hardcode_libdir_separator=':'
 -      link_all_deplibs=yes
++test -z "$LN_S" && LN_S="ln -s"
  
 -      if test "$GCC" = yes; then
 -	case $host_os in aix4.[012]|aix4.[012].*)
@@ -19043,30 +19644,10 @@
 -# 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"`
-+if test -n "${ZSH_VERSION+set}" ; then
-+   setopt NO_GLOB_SUBST
- fi
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
-+$as_echo_n "checking for objdir... " >&6; }
-+if test "${lt_cv_objdir+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
- else
+-fi
+-else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+  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
  
  
 -fi
@@ -19087,10 +19668,7 @@
 -	 # Determine the default libpath from the value encoded in an empty executable.
 -	 cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
-+
-+cat >>confdefs.h <<_ACEOF
-+#define LT_OBJDIR "$lt_cv_objdir/"
- _ACEOF
+-_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
@@ -19142,12 +19720,32 @@
 -sed 's/^/| /' conftest.$ac_ext >&5
  
  
--fi
++if test -n "${ZSH_VERSION+set}" ; then
++   setopt NO_GLOB_SUBST
+ fi
  
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
 -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
++{ $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
  
 -	 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
 -	  # Warning - without using the other run time loading flags,
@@ -19244,6 +19842,9 @@
 -      esac
 -    fi
 -      ;;
++cat >>confdefs.h <<_ACEOF
++#define LT_OBJDIR "$lt_cv_objdir/"
++_ACEOF
  
 -    dgux*)
 -      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
@@ -19291,26 +19892,12 @@
 -      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
 -      hardcode_libdir_separator=:
 -      hardcode_direct=yes
-+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
  
 -      # 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'
 -      ;;
-+# 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'
  
 -    hpux10*)
 -      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
@@ -19321,22 +19908,15 @@
 -      if test "$with_gnu_ld" = no; then
 -	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
 -	hardcode_libdir_separator=:
-+# Same as above, but do not quote variable references.
-+double_quote_subst='s/\(["`\\]\)/\\\1/g'
  
 -	hardcode_direct=yes
 -	export_dynamic_flag_spec='${wl}-E'
-+# Sed substitution to delay expansion of an escaped shell variable in a
-+# double_quote_subst'ed string.
-+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
  
 -	# hardcode_minus_L: Not really in the search PATH,
 -	# but as the default location of the library.
 -	hardcode_minus_L=yes
 -      fi
 -      ;;
-+# Sed substitution to delay expansion of an escaped single quote.
-+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
  
 -    hpux11*)
 -      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
@@ -19367,8 +19947,6 @@
 -      if test "$with_gnu_ld" = no; then
 -	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
 -	hardcode_libdir_separator=:
-+# Sed substitution to avoid accidental globbing in evaled expressions
-+no_glob_subst='s/\*/\\\*/g'
  
 -	case $host_cpu in
 -	hppa*64*|ia64*)
@@ -19379,9 +19957,6 @@
 -	*)
 -	  hardcode_direct=yes
 -	  export_dynamic_flag_spec='${wl}-E'
-+# Global variables:
-+ofile=libtool
-+can_build_shared=yes
  
 -	  # hardcode_minus_L: Not really in the search PATH,
 -	  # but as the default location of the library.
@@ -19390,9 +19965,6 @@
 -	esac
 -      fi
 -      ;;
-+# All known linkers require a `.a' archive for static linking (except MSVC,
-+# which needs '.lib').
-+libext=a
  
 -    irix5* | irix6* | nonstopux*)
 -      if test "$GCC" = yes; then
@@ -19405,7 +19977,7 @@
 -      hardcode_libdir_separator=:
 -      link_all_deplibs=yes
 -      ;;
--
+ 
 -    netbsd*)
 -      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 -	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
@@ -19416,7 +19988,6 @@
 -      hardcode_direct=yes
 -      hardcode_shlibpath_var=no
 -      ;;
-+with_gnu_ld="$lt_cv_prog_gnu_ld"
  
 -    newsos6)
 -      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
@@ -19425,8 +19996,6 @@
 -      hardcode_libdir_separator=:
 -      hardcode_shlibpath_var=no
 -      ;;
-+old_CC="$CC"
-+old_CFLAGS="$CFLAGS"
  
 -    openbsd*)
 -      if test -f /usr/libexec/ld.so; then
@@ -19453,12 +20022,17 @@
 -	ld_shlibs=no
 -      fi
 -      ;;
-+# 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
++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
  
 -    os2*)
 -      hardcode_libdir_flag_spec='-L$libdir'
@@ -19467,15 +20041,9 @@
 -      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'
 -      ;;
-+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-%%"`
++# 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'
  
 -    osf3*)
 -      if test "$GCC" = yes; then
@@ -19488,6 +20056,8 @@
 -      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
 -      hardcode_libdir_separator=:
 -      ;;
++# Same as above, but do not quote variable references.
++double_quote_subst='s/\(["`\\]\)/\\\1/g'
  
 -    osf4* | osf5*)	# as osf3* with the addition of -msym flag
 -      if test "$GCC" = yes; then
@@ -19499,6 +20069,166 @@
 -	archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
 -	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
 -	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
++# Sed substitution to delay expansion of an escaped shell variable in a
++# double_quote_subst'ed string.
++delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+ 
+-	# Both c and cxx compiler support -rpath directly
+-	hardcode_libdir_flag_spec='-rpath $libdir'
+-      fi
+-      hardcode_libdir_separator=:
+-      ;;
++# Sed substitution to delay expansion of an escaped single quote.
++delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+ 
+-    solaris*)
+-      no_undefined_flag=' -z text'
+-      if test "$GCC" = yes; then
+-	wlarc='${wl}'
+-	archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+-	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
+-      else
+-	wlarc=''
+-	archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-	archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+-  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+-      fi
+-      hardcode_libdir_flag_spec='-R$libdir'
+-      hardcode_shlibpath_var=no
+-      case $host_os in
+-      solaris2.[0-5] | solaris2.[0-5].*) ;;
+-      *)
+-	# The compiler driver will combine 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
+-      ;;
++# Sed substitution to avoid accidental globbing in evaled expressions
++no_glob_subst='s/\*/\\\*/g'
+ 
+-    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
+-      ;;
++# Global variables:
++ofile=libtool
++can_build_shared=yes
+ 
+-    sysv4)
+-      case $host_vendor in
+-	sni)
+-	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-	  hardcode_direct=yes # is this really true???
+-	;;
+-	siemens)
+-	  ## LD is ld it makes a PLAMLIB
+-	  ## CC just makes a GrossModule.
+-	  archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+-	  reload_cmds='$CC -r -o $output$reload_objs'
+-	  hardcode_direct=no
+-        ;;
+-	motorola)
+-	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-	  hardcode_direct=no #Motorola manual says yes, but my tests say they lie
+-	;;
+-      esac
+-      runpath_var='LD_RUN_PATH'
+-      hardcode_shlibpath_var=no
+-      ;;
++# All known linkers require a `.a' archive for static linking (except MSVC,
++# which needs '.lib').
++libext=a
+ 
+-    sysv4.3*)
+-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      hardcode_shlibpath_var=no
+-      export_dynamic_flag_spec='-Bexport'
+-      ;;
++with_gnu_ld="$lt_cv_prog_gnu_ld"
+ 
+-    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
+-      ;;
++old_CC="$CC"
++old_CFLAGS="$CFLAGS"
+ 
+-    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'
++# 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
+ 
+-      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
+-      ;;
++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-%%"`
+ 
+-    sysv5* | sco3.2v5* | sco5v6*)
+-      # Note: We can NOT use -z defs as we might desire, because we do not
+-      # link with -lc, and that would cause any symbols used from libc to
+-      # always be unresolved, which means just about no library would
+-      # ever link correctly.  If we're not using GNU ld we use -z text
+-      # though, which does catch some bad symbols but isn't as heavy-handed
+-      # as -z defs.
+-      no_undefined_flag='${wl}-z,text'
+-      allow_undefined_flag='${wl}-z,nodefs'
+-      archive_cmds_need_lc=no
+-      hardcode_shlibpath_var=no
+-      hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
+-      hardcode_libdir_separator=':'
+-      link_all_deplibs=yes
+-      export_dynamic_flag_spec='${wl}-Bexport'
+-      runpath_var='LD_RUN_PATH'
+ 
+-      if test "$GCC" = yes; then
+-	archive_cmds='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-      else
+-	archive_cmds='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
 +# Only perform the check for file, if the check method requires it
 +test -z "$MAGIC_CMD" && MAGIC_CMD=file
 +case $deplibs_check_method in
@@ -19532,12 +20262,7 @@
 +	    :
 +	  else
 +	    cat <<_LT_EOF 1>&2
- 
--	# Both c and cxx compiler support -rpath directly
--	hardcode_libdir_flag_spec='-rpath $libdir'
--      fi
--      hardcode_libdir_separator=:
--      ;;
++
 +*** 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
@@ -19546,40 +20271,11 @@
 +*** 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
- 
--    solaris*)
--      no_undefined_flag=' -z text'
--      if test "$GCC" = yes; then
--	wlarc='${wl}'
--	archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
--	archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
--	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
--      else
--	wlarc=''
--	archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
--	archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
--  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
++
 +_LT_EOF
 +	  fi ;;
 +	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
 -      ;;
 +      break
 +    fi
@@ -19590,17 +20286,9 @@
 +esac
 +fi
  
--    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
+-    uts4*)
+-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
 -      hardcode_libdir_flag_spec='-L$libdir'
--      hardcode_direct=yes
--      hardcode_minus_L=yes
 -      hardcode_shlibpath_var=no
 -      ;;
 +MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
@@ -19612,157 +20300,15 @@
 +$as_echo "no" >&6; }
 +fi
  
--    sysv4)
--      case $host_vendor in
--	sni)
--	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--	  hardcode_direct=yes # is this really true???
--	;;
--	siemens)
--	  ## LD is ld it makes a PLAMLIB
--	  ## CC just makes a GrossModule.
--	  archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
--	  reload_cmds='$CC -r -o $output$reload_objs'
--	  hardcode_direct=no
--        ;;
--	motorola)
--	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--	  hardcode_direct=no #Motorola manual says yes, but my tests say they lie
--	;;
--      esac
--      runpath_var='LD_RUN_PATH'
--      hardcode_shlibpath_var=no
--      ;;
- 
--    sysv4.3*)
--      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--      hardcode_shlibpath_var=no
--      export_dynamic_flag_spec='-Bexport'
--      ;;
- 
--    sysv4*MP*)
--      if test -d /usr/nec; then
--	archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--	hardcode_shlibpath_var=no
--	runpath_var=LD_RUN_PATH
--	hardcode_runpath_var=yes
--	ld_shlibs=yes
--      fi
--      ;;
- 
--    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | 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 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 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
-+  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
- 
--    sysv5* | sco3.2v5* | sco5v6*)
--      # Note: We can NOT use -z defs as we might desire, because we do not
--      # link with -lc, and that would cause any symbols used from libc to
--      # always be unresolved, which means just about no library would
--      # ever link correctly.  If we're not using GNU ld we use -z text
--      # though, which does catch some bad symbols but isn't as heavy-handed
--      # as -z defs.
--      no_undefined_flag='${wl}-z,text'
--      allow_undefined_flag='${wl}-z,nodefs'
--      archive_cmds_need_lc=no
--      hardcode_shlibpath_var=no
--      hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
--      hardcode_libdir_separator=':'
--      link_all_deplibs=yes
--      export_dynamic_flag_spec='${wl}-Bexport'
--      runpath_var='LD_RUN_PATH'
-+*** 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
- 
--      if test "$GCC" = yes; then
--	archive_cmds='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
--	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
--      else
--	archive_cmds='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
--	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+_LT_EOF
-+	  fi ;;
-+	esac
-       fi
--      ;;
--
--    uts4*)
--      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--      hardcode_libdir_flag_spec='-L$libdir'
--      hardcode_shlibpath_var=no
--      ;;
--
 -    *)
 -      ld_shlibs=no
 -      ;;
 -    esac
 -  fi
-+      break
-+    fi
-+  done
-+  IFS="$lt_save_ifs"
-+  MAGIC_CMD="$lt_save_MAGIC_CMD"
-+  ;;
-+esac
-+fi
  
 -{ $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5
 -$as_echo "$ld_shlibs" >&6; }
 -test "$ld_shlibs" = no && can_build_shared=no
-+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
  
 -#
 -# Do we need to explicitly link libc?
@@ -19785,10 +20331,6 @@
 -$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
 -      $rm conftest*
 -      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-+  else
-+    MAGIC_CMD=:
-+  fi
-+fi
  
 -      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>&5
@@ -19827,9 +20369,38 @@
 -$as_echo "$archive_cmds_need_lc" >&6; }
 -      ;;
 -    esac
-   fi
+-  fi
++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
++  case $MAGIC_CMD in
++[\\/*] |  ?:[\\/]*)
++  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
    ;;
- esac
+-esac
++*)
++  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
  
 -{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
 -$as_echo_n "checking dynamic linker characteristics... " >&6; }
@@ -19846,7 +20417,14 @@
 -version_type=none
 -dynamic_linker="$host_os ld.so"
 -sys_lib_dlsearch_path_spec="/lib /usr/lib"
-+# Use C for the default configuration in the libtool script
++*** 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
  
 -if test "$GCC" = yes; then
 -  case $host_os in
@@ -19873,8 +20451,13 @@
 -    else
 -      test -d "$lt_sys_path" && \
 -	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
--    fi
--  done
++_LT_EOF
++	  fi ;;
++	esac
++      fi
++      break
+     fi
+   done
 -  lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
 -BEGIN {RS=" "; FS="/|\n";} {
 -  lt_foo="";
@@ -19898,16 +20481,14 @@
 -  sys_lib_search_path_spec=`echo $lt_search_path_spec`
 -else
 -  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
--fi
++  IFS="$lt_save_ifs"
++  MAGIC_CMD="$lt_save_MAGIC_CMD"
++  ;;
++esac
+ fi
 -need_lib_prefix=unknown
 -hardcode_into_libs=no
-+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
- 
+-
 -# when you set need_version to no, make sure it does not cause -set_version
 -# flags to be left without arguments
 -need_version=unknown
@@ -19917,15 +20498,18 @@
 -  version_type=linux
 -  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
 -  shlibpath_var=LIBPATH
-+# Source file extension for C test sources.
-+ac_ext=c
++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
  
 -  # AIX 3 has no versioning support, so we append a major version to the name.
 -  soname_spec='${libname}${release}${shared_ext}$major'
 -  ;;
-+# Object file extension for compiled C test sources.
-+objext=o
-+objext=$objext
  
 -aix[4-9]*)
 -  version_type=linux
@@ -19936,7 +20520,7 @@
 -    # 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
+   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
@@ -19968,24 +20552,25 @@
 -      soname_spec='${libname}${release}${shared_ext}$major'
 -    fi
 -    shlibpath_var=LIBPATH
--  fi
++    MAGIC_CMD=:
+   fi
 -  ;;
-+# Code to be used in simple compile tests
-+lt_simple_compile_test_code="int some_variable = 0;"
++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'
--  ;;
-+# Code to be used in simple link tests
-+lt_simple_link_test_code='int main(){return(0);}'
++  fi
+   ;;
++esac
  
 -beos*)
 -  library_names_spec='${libname}${shared_ext}'
 -  dynamic_linker="$host_os ld.so"
 -  shlibpath_var=LIBRARY_PATH
 -  ;;
++# Use C for the default configuration in the libtool script
  
 -bsdi[45]*)
 -  version_type=linux
@@ -20000,6 +20585,12 @@
 -  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
 -  # libtool to hard-code these into programs
 -  ;;
++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
  
 -cygwin* | mingw* | pw32*)
 -  version_type=windows
@@ -20021,110 +20612,10 @@
 -      dlpath=$dir/\$dldll~
 -       $rm \$dlpath'
 -    shlibpath_overrides_runpath=yes
-+
-+
-+
-+# 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 the default compiler, since it gets overwritten when the other
-+# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
-+compiler_DEFAULT=$CC
-+
-+# save warnings/boilerplate of simple test code
-+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*
-+
-+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*
-+
-+
-+## CAVEAT EMPTOR:
-+## There is no encapsulation within the following macros, do not change
-+## the running order or otherwise move them around unless you know exactly
-+## what you are doing...
-+if test -n "$compiler"; then
-+
-+lt_prog_compiler_no_builtin_flag=
-+
-+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:7169: $lt_compile\"" >&5)
-+   (eval "$lt_compile" 2>conftest.err)
-+   ac_status=$?
-+   cat conftest.err >&5
-+   echo "$as_me:7173: \$? = $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
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-+$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
-+
-+if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
-+    lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
-+else
-+    :
-+fi
-+
-+fi
-+
-+
-+
-+
-+
-+
-+  lt_prog_compiler_wl=
-+lt_prog_compiler_pic=
-+lt_prog_compiler_static=
-+
-+{ $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'
- 
-     case $host_os in
++# Source file extension for C test sources.
++ac_ext=c
+ 
+-    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}'
@@ -20144,33 +20635,17 @@
 -        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"`
-+      aix*)
-+      # All AIX code is PIC.
-+      if test "$host_cpu" = ia64; then
-+	# AIX 5 now supports IA64 processor
-+	lt_prog_compiler_static='-Bstatic'
-       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}'
-+
-+    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
-       ;;
+-      ;;
 -    esac
 -    ;;
++# Object file extension for compiled C test sources.
++objext=o
++objext=$objext
  
 -  *)
 -    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
@@ -20180,9 +20655,8 @@
 -  # FIXME: first we should search . and the directory the executable is in
 -  shlibpath_var=PATH
 -  ;;
-+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-+      # PIC is the default for these OSes.
-+      ;;
++# Code to be used in simple compile tests
++lt_simple_compile_test_code="int some_variable = 0;"
  
 -darwin* | rhapsody*)
 -  dynamic_linker="$host_os dyld"
@@ -20194,22 +20668,12 @@
 -  shlibpath_overrides_runpath=yes
 -  shlibpath_var=DYLD_LIBRARY_PATH
 -  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-+    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'
-+      ;;
++# Code to be used in simple link tests
++lt_simple_link_test_code='int main(){return(0);}'
  
 -  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
 -  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
 -  ;;
-+    darwin* | rhapsody*)
-+      # PIC is the default on this platform
-+      # Common symbols not allowed in MH_DYLIB files
-+      lt_prog_compiler_pic='-fno-common'
-+      ;;
  
 -dgux*)
 -  version_type=linux
@@ -20219,59 +20683,18 @@
 -  soname_spec='${libname}${release}${shared_ext}$major'
 -  shlibpath_var=LD_LIBRARY_PATH
 -  ;;
-+    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
-+      ;;
  
 -freebsd1*)
 -  dynamic_linker=no
 -  ;;
-+    interix[3-9]*)
-+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-+      # Instead, we relocate shared libraries at runtime.
-+      ;;
  
 -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`
-+    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'
-+      ;;
-+
-+    sysv4*MP*)
-+      if test -d /usr/nec; then
-+	lt_prog_compiler_pic=-Kconform_pic
-+      fi
-+      ;;
-+
-+    *)
-+      lt_prog_compiler_pic='-fPIC'
-+      ;;
-+    esac
-   else
-+    # PORTME Check for flag to pass linker flags through the system compiler.
-     case $host_os in
+-  else
+-    case $host_os in
 -    freebsd[123]*) objformat=aout ;;
 -    *) objformat=elf ;;
 -    esac
@@ -20282,15 +20705,7 @@
 -      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
 -      need_version=no
 -      need_lib_prefix=no
-+    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
-       ;;
+-      ;;
 -    freebsd-*)
 -      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
 -      need_version=yes
@@ -20316,7 +20731,7 @@
 -    ;;
 -  esac
 -  ;;
--
+ 
 -gnu*)
 -  version_type=linux
 -  need_lib_prefix=no
@@ -20326,7 +20741,7 @@
 -  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.
@@ -20372,7 +20787,7 @@
 -  # HP-UX runs *really* slowly unless shared libraries are mode 555.
 -  postinstall_cmds='chmod 555 $lib'
 -  ;;
--
+ 
 -interix[3-9]*)
 -  version_type=linux
 -  need_lib_prefix=no
@@ -20384,7 +20799,9 @@
 -  shlibpath_overrides_runpath=no
 -  hardcode_into_libs=yes
 -  ;;
--
++# If no C compiler was specified, use CC.
++LTCC=${LTCC-"$CC"}
+ 
 -irix5* | irix6* | nonstopux*)
 -  case $host_os in
 -    nonstopux*) version_type=nonstopux ;;
@@ -20421,12 +20838,16 @@
 -  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
 -  hardcode_into_libs=yes
 -  ;;
--
++# If no C compiler flags were specified, use CFLAGS.
++LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+ 
 -# No shared lib support for Linux oldld, aout, or coff.
 -linux*oldld* | linux*aout* | linux*coff*)
 -  dynamic_linker=no
 -  ;;
--
++# Allow CC to be a program name with arguments.
++compiler=$CC
+ 
 -# This must be Linux ELF.
 -linux* | k*bsd*-gnu)
 -  version_type=linux
@@ -20443,13 +20864,22 @@
 -  hardcode_into_libs=yes
 -  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
 -  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
--
++# 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
+ 
 -  # 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="$sys_lib_dlsearch_path_spec $lt_ld_extra"
 -  fi
--
++# 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*
+ 
 -  # 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,
@@ -20458,7 +20888,12 @@
 -  # assume the GNU/Linux dynamic linker is in use.
 -  dynamic_linker='GNU/Linux ld.so'
 -  ;;
--
++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*
+ 
 -netbsd*)
 -  version_type=sunos
 -  need_lib_prefix=no
@@ -20476,14 +20911,19 @@
 -  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
 -  ;;
--
++## 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
+ 
 -nto-qnx*)
 -  version_type=linux
 -  need_lib_prefix=no
@@ -20631,7 +21071,8 @@
 -  soname_spec='${libname}${release}${shared_ext}$major'
 -  shlibpath_var=LD_LIBRARY_PATH
 -  ;;
--
++lt_prog_compiler_no_builtin_flag=
+ 
 -*)
 -  dynamic_linker=no
 -  ;;
@@ -20639,34 +21080,73 @@
 -{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
 -$as_echo "$dynamic_linker" >&6; }
 -test "$dynamic_linker" = no && can_build_shared=no
--
++if test "$GCC" = yes; then
++  lt_prog_compiler_no_builtin_flag=' -fno-builtin'
+ 
 -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
--  $as_echo_n "(cached) " >&6
--else
++  { $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_sys_lib_search_path_spec="$sys_lib_search_path_spec"
--fi
--
++  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:7196: $lt_compile\"" >&5)
++   (eval "$lt_compile" 2>conftest.err)
++   ac_status=$?
++   cat conftest.err >&5
++   echo "$as_me:7200: \$? = $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
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
++$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
+ 
 -sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
 -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
 -  $as_echo_n "(cached) " >&6
--else
++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
 -  lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
--fi
--
++    :
+ fi
+ 
 -sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
 -
 -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
--
+ fi
+ 
 -{ $as_echo "$as_me:$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-existant directories.
 -  if test "$hardcode_direct" != no &&
 -     # If the only mechanism to avoid hardcoding is shlibpath_var, we
@@ -20687,7 +21167,7 @@
 -fi
 -{ $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5
 -$as_echo "$hardcode_action" >&6; }
--
+ 
 -if test "$hardcode_action" = relink; then
 -  # Fast installation is not supported
 -  enable_fast_install=no
@@ -20696,7 +21176,7 @@
 -  # Fast installation is not necessary
 -  enable_fast_install=needless
 -fi
--
+ 
 -striplib=
 -old_striplib=
 -{ $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
@@ -20726,7 +21206,7 @@
 -    ;;
 -  esac
 -fi
--
+ 
 -if test "x$enable_dlopen" != xyes; then
 -  enable_dlopen=unknown
 -  enable_dlopen_self=unknown
@@ -20734,24 +21214,32 @@
 -else
 -  lt_cv_dlopen=no
 -  lt_cv_dlopen_libs=
--
+ 
 -  case $host_os in
 -  beos*)
 -    lt_cv_dlopen="load_add_on"
 -    lt_cv_dlopen_libs=
 -    lt_cv_dlopen_self=yes
 -    ;;
--
++  lt_prog_compiler_wl=
++lt_prog_compiler_pic=
++lt_prog_compiler_static=
+ 
 -  mingw* | pw32*)
 -    lt_cv_dlopen="LoadLibrary"
 -    lt_cv_dlopen_libs=
 -   ;;
--
++{ $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; }
+ 
 -  cygwin*)
 -    lt_cv_dlopen="dlopen"
 -    lt_cv_dlopen_libs=
 -   ;;
--
++  if test "$GCC" = yes; then
++    lt_prog_compiler_wl='-Wl,'
++    lt_prog_compiler_static='-static'
+ 
 -  darwin*)
 -  # if libdl is installed we need to link against it
 -    { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
@@ -20767,7 +21255,15 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
--
++    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
++      ;;
+ 
 -/* 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.  */
@@ -20808,10 +21304,27 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++    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
++      ;;
+ 
 -	ac_cv_lib_dl_dlopen=no
 -fi
--
++    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++      # PIC is the default for these OSes.
++      ;;
+ 
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
@@ -20822,15 +21335,44 @@
 -if test $ac_cv_lib_dl_dlopen = yes; then
 -  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
 -else
--
++    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'
++      ;;
+ 
 -    lt_cv_dlopen="dyld"
 -    lt_cv_dlopen_libs=
 -    lt_cv_dlopen_self=yes
--
++    darwin* | rhapsody*)
++      # PIC is the default on this platform
++      # Common symbols not allowed in MH_DYLIB files
++      lt_prog_compiler_pic='-fno-common'
++      ;;
+ 
 -fi
--
++    hpux*)
++      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
++      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
++      # sets the default TLS model and affects inlining.
++      case $host_cpu in
++      hppa*64*)
++	# +Z the default
++	;;
++      *)
++	lt_prog_compiler_pic='-fPIC'
++	;;
++      esac
++      ;;
+ 
 -   ;;
--
++    interix[3-9]*)
++      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
++      # Instead, we relocate shared libraries at runtime.
++      ;;
+ 
 -  *)
 -    { $as_echo "$as_me:$LINENO: checking for shl_load" >&5
 -$as_echo_n "checking for shl_load... " >&6; }
@@ -20846,20 +21388,52 @@
 -/* 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
--
++    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
++      ;;
+ 
 -/* 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.  */
--
++    *nto* | *qnx*)
++      # QNX uses GNU C++, but need to define -shared option too, otherwise
++      # it will coredump.
++      lt_prog_compiler_pic='-fPIC -shared'
++      ;;
+ 
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
--
++    sysv4*MP*)
++      if test -d /usr/nec; then
++	lt_prog_compiler_pic=-Kconform_pic
++      fi
++      ;;
+ 
 -#undef shl_load
--
++    *)
++      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
++      ;;
+ 
 -/* 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.  */
@@ -20873,7 +21447,12 @@
 -#if defined __stub_shl_load || defined __stub___shl_load
 -choke me
 -#endif
--
++    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'
++      ;;
+ 
 -int
 -main ()
 -{
@@ -20907,10 +21486,30 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++    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'
++      ;;
+ 
 -	ac_cv_func_shl_load=no
 -fi
--
++    irix5* | irix6* | nonstopux*)
++      lt_prog_compiler_wl='-Wl,'
++      # PIC (with -KPIC) is the default.
++      lt_prog_compiler_static='-non_shared'
++      ;;
+ 
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
@@ -20933,7 +21532,64 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
--
++    linux* | k*bsd*-gnu | kopensolaris*-gnu)
++      case $cc_basename in
++      # old Intel for x86_64 which still supported -KPIC.
++      ecc*)
++	lt_prog_compiler_wl='-Wl,'
++	lt_prog_compiler_pic='-KPIC'
++	lt_prog_compiler_static='-static'
++        ;;
++      # icc used to be incompatible with GCC.
++      # ICC 10 doesn't accept -KPIC any more.
++      icc* | ifort*)
++	lt_prog_compiler_wl='-Wl,'
++	lt_prog_compiler_pic='-fPIC'
++	lt_prog_compiler_static='-static'
++        ;;
++      # Lahey Fortran 8.1.
++      lf95*)
++	lt_prog_compiler_wl='-Wl,'
++	lt_prog_compiler_pic='--shared'
++	lt_prog_compiler_static='--static'
++	;;
++      pgcc* | pgf77* | pgf90* | pgf95*)
++        # Portland Group compilers (*not* the Pentium gcc compiler,
++	# which looks to be a dead project)
++	lt_prog_compiler_wl='-Wl,'
++	lt_prog_compiler_pic='-fpic'
++	lt_prog_compiler_static='-Bstatic'
++        ;;
++      ccc*)
++        lt_prog_compiler_wl='-Wl,'
++        # All Alpha code is PIC.
++        lt_prog_compiler_static='-non_shared'
++        ;;
++      xl*)
++	# IBM XL C 8.0/Fortran 10.1 on PPC
++	lt_prog_compiler_wl='-Wl,'
++	lt_prog_compiler_pic='-qpic'
++	lt_prog_compiler_static='-qstaticlink'
++	;;
++      *)
++	case `$CC -V 2>&1 | sed 5q` in
++	*Sun\ C*)
++	  # Sun C 5.9
++	  lt_prog_compiler_pic='-KPIC'
++	  lt_prog_compiler_static='-Bstatic'
++	  lt_prog_compiler_wl='-Wl,'
++	  ;;
++	*Sun\ F*)
++	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
++	  lt_prog_compiler_pic='-KPIC'
++	  lt_prog_compiler_static='-Bstatic'
++	  lt_prog_compiler_wl=''
++	  ;;
++	esac
++	;;
++      esac
++      ;;
+ 
 -/* 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.  */
@@ -20974,10 +21630,19 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++    newsos6)
++      lt_prog_compiler_pic='-KPIC'
++      lt_prog_compiler_static='-Bstatic'
++      ;;
+ 
 -	ac_cv_lib_dld_shl_load=no
 -fi
--
++    *nto* | *qnx*)
++      # QNX uses GNU C++, but need to define -shared option too, otherwise
++      # it will coredump.
++      lt_prog_compiler_pic='-fPIC -shared'
++      ;;
+ 
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
@@ -21002,20 +21667,43 @@
 -/* 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
--
++    osf3* | osf4* | osf5*)
++      lt_prog_compiler_wl='-Wl,'
++      # All OSF/1 code is PIC.
++      lt_prog_compiler_static='-non_shared'
++      ;;
+ 
 -/* System header to define __stub macros and hopefully few prototypes,
 -    which can conflict with char dlopen (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
--
++    rdos*)
++      lt_prog_compiler_static='-non_shared'
++      ;;
+ 
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
--
++    solaris*)
++      lt_prog_compiler_pic='-KPIC'
++      lt_prog_compiler_static='-Bstatic'
++      case $cc_basename in
++      f77* | f90* | f95*)
++	lt_prog_compiler_wl='-Qoption ld ';;
++      *)
++	lt_prog_compiler_wl='-Wl,';;
++      esac
++      ;;
+ 
 -#undef dlopen
--
++    sunos4*)
++      lt_prog_compiler_wl='-Qoption ld '
++      lt_prog_compiler_pic='-PIC'
++      lt_prog_compiler_static='-Bstatic'
++      ;;
+ 
 -/* 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.  */
@@ -21029,7 +21717,12 @@
 -#if defined __stub_dlopen || defined __stub___dlopen
 -choke me
 -#endif
--
++    sysv4 | sysv4.2uw2* | sysv4.3*)
++      lt_prog_compiler_wl='-Wl,'
++      lt_prog_compiler_pic='-KPIC'
++      lt_prog_compiler_static='-Bstatic'
++      ;;
+ 
 -int
 -main ()
 -{
@@ -21063,10 +21756,21 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++    sysv4*MP*)
++      if test -d /usr/nec ;then
++	lt_prog_compiler_pic='-Kconform_pic'
++	lt_prog_compiler_static='-Bstatic'
++      fi
++      ;;
+ 
 -	ac_cv_func_dlopen=no
 -fi
--
++    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
++      lt_prog_compiler_wl='-Wl,'
++      lt_prog_compiler_pic='-KPIC'
++      lt_prog_compiler_static='-Bstatic'
++      ;;
+ 
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
@@ -21089,7 +21793,11 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
--
++    unicos*)
++      lt_prog_compiler_wl='-Wl,'
++      lt_prog_compiler_can_build_shared=no
++      ;;
+ 
 -/* 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.  */
@@ -21110,7 +21818,26 @@
 -case "(($ac_try" in
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 -  *) ac_try_echo=$ac_try;;
--esac
++    uts4*)
++      lt_prog_compiler_pic='-pic'
++      lt_prog_compiler_static='-Bstatic'
++      ;;
++
++    *)
++      lt_prog_compiler_can_build_shared=no
++      ;;
++    esac
++  fi
++
++case $host_os in
++  # For platforms which do not support PIC, -DPIC is meaningless:
++  *djgpp*)
++    lt_prog_compiler_pic=
++    ;;
++  *)
++    lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
++    ;;
+ esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
 -  (eval "$ac_link") 2>conftest.er1
@@ -21130,10 +21857,12 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
++$as_echo "$lt_prog_compiler_pic" >&6; }
+ 
 -	ac_cv_lib_dl_dlopen=no
 -fi
--
+ 
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
@@ -21147,8 +21876,19 @@
 -  { $as_echo "$as_me:$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
++
++
++
++
++#
++# Check to make sure the PIC flag actually works.
++#
++if test -n "$lt_prog_compiler_pic"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
++$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
++if test "${lt_cv_prog_compiler_pic_works+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
 -  ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lsvld  $LIBS"
 -cat >conftest.$ac_ext <<_ACEOF
@@ -21157,7 +21897,35 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
--
++  lt_cv_prog_compiler_pic_works=no
++   ac_outfile=conftest.$ac_objext
++   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
++   lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
++   # Insert the option either (1) after the last *FLAGS variable, or
++   # (2) before a word containing "conftest.", or (3) at the end.
++   # Note that $ac_compile itself does not contain backslashes and begins
++   # with a dollar sign (not a hyphen), so the echo should work correctly.
++   # The option is referenced via a variable to avoid confusing sed.
++   lt_compile=`echo "$ac_compile" | $SED \
++   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
++   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
++   -e 's:$: $lt_compiler_flag:'`
++   (eval echo "\"\$as_me:7535: $lt_compile\"" >&5)
++   (eval "$lt_compile" 2>conftest.err)
++   ac_status=$?
++   cat conftest.err >&5
++   echo "$as_me:7539: \$? = $ac_status" >&5
++   if (exit $ac_status) && test -s "$ac_outfile"; then
++     # The compiler can only warn and ignore the option if not recognized
++     # So say no if there are warnings other than the usual output.
++     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
++     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
++       lt_cv_prog_compiler_pic_works=yes
++     fi
++   fi
++   $RM conftest*
+ 
 -/* 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.  */
@@ -21198,15 +21966,26 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++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; }
+ 
 -	ac_cv_lib_svld_dlopen=no
--fi
--
++if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
++    case $lt_prog_compiler_pic in
++     "" | " "*) ;;
++     *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
++     esac
++else
++    lt_prog_compiler_pic=
++     lt_prog_compiler_can_build_shared=no
+ fi
+ 
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
 -LIBS=$ac_check_lib_save_LIBS
--fi
+ fi
 -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
 -$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
 -if test $ac_cv_lib_svld_dlopen = yes; then
@@ -21225,7 +22004,7 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
--
+ 
 -/* Override any GCC internal prototype to avoid an error.
 -   Use char because int might match the return type of a GCC
 -   builtin and then its argument prototype would still apply.  */
@@ -21263,13 +22042,49 @@
 -	 $as_test_x conftest$ac_exeext
 -       }; then
 -  ac_cv_lib_dld_dld_link=yes
--else
++
++
++
++
++
++#
++# Check to make sure the static flag actually works.
++#
++wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
++{ $as_echo "$as_me:${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+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++  lt_cv_prog_compiler_static_works=no
++   save_LDFLAGS="$LDFLAGS"
++   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
++   echo "$lt_simple_link_test_code" > conftest.$ac_ext
++   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
++     # The linker can only warn and ignore the option if not recognized
++     # So say no if there are warnings
++     if test -s conftest.err; then
++       # Append any errors to the config.log.
++       cat conftest.err 1>&5
++       $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
++       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++       if diff conftest.exp conftest.er2 >/dev/null; then
++         lt_cv_prog_compiler_static_works=yes
++       fi
++     else
++       lt_cv_prog_compiler_static_works=yes
++     fi
++   fi
++   $RM -r conftest*
++   LDFLAGS="$save_LDFLAGS"
+ 
 -	ac_cv_lib_dld_dld_link=no
--fi
--
+ 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; }
+ 
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
@@ -21279,48 +22094,101 @@
 -$as_echo "$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="-ldld"
++if test x"$lt_cv_prog_compiler_static_works" = xyes; then
++    :
++else
++    lt_prog_compiler_static=
+ fi
+ 
+ 
 -fi
 -
--
+ 
 -fi
--
--
+ 
+ 
 -fi
--
--
+ 
+ 
 -fi
--
--
--fi
--
--
--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+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  lt_cv_prog_compiler_c_o=no
++   $RM -r conftest 2>/dev/null
++   mkdir conftest
++   cd conftest
++   mkdir out
++   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
++   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:7640: $lt_compile\"" >&5)
++   (eval "$lt_compile" 2>out/conftest.err)
++   ac_status=$?
++   cat out/conftest.err >&5
++   echo "$as_me:7644: \$? = $ac_status" >&5
++   if (exit $ac_status) && test -s out/conftest2.$ac_objext
++   then
++     # The compiler can only warn and ignore the option if not recognized
++     # So say no if there are warnings
++     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
++     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
++     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
++       lt_cv_prog_compiler_c_o=yes
++     fi
++   fi
++   chmod u+w . 2>&5
++   $RM conftest*
++   # SGI C++ compiler will create directory out/ii_files/ for
++   # template instantiation
++   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
++   $RM out/* && rmdir out
++   cd ..
++   $RM -r conftest
++   $RM conftest*
+ 
+ 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; }
+ 
 -    ;;
 -  esac
--
+ 
 -  if test "x$lt_cv_dlopen" != xno; then
 -    enable_dlopen=yes
 -  else
 -    enable_dlopen=no
 -  fi
--
+ 
 -  case $lt_cv_dlopen in
 -  dlopen)
 -    save_CPPFLAGS="$CPPFLAGS"
 -    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
--
+ 
 -    save_LDFLAGS="$LDFLAGS"
 -    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
--
+ 
 -    save_LIBS="$LIBS"
 -    LIBS="$lt_cv_dlopen_libs $LIBS"
--
+ 
 -    { $as_echo "$as_me:$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
++  { $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 :
+   $as_echo_n "(cached) " >&6
+ else
 -  	  if test "$cross_compiling" = yes; then :
 -  lt_cv_dlopen_self=cross
 -else
@@ -21335,7 +22203,13 @@
 -#endif
 -
 -#include <stdio.h>
--
++  lt_cv_prog_compiler_c_o=no
++   $RM -r conftest 2>/dev/null
++   mkdir conftest
++   cd conftest
++   mkdir out
++   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
 -#ifdef RTLD_GLOBAL
 -#  define LT_DLGLOBAL		RTLD_GLOBAL
 -#else
@@ -21345,7 +22219,40 @@
 -#    define LT_DLGLOBAL		0
 -#  endif
 -#endif
--
++   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:7695: $lt_compile\"" >&5)
++   (eval "$lt_compile" 2>out/conftest.err)
++   ac_status=$?
++   cat out/conftest.err >&5
++   echo "$as_me:7699: \$? = $ac_status" >&5
++   if (exit $ac_status) && test -s out/conftest2.$ac_objext
++   then
++     # The compiler can only warn and ignore the option if not recognized
++     # So say no if there are warnings
++     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
++     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
++     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
++       lt_cv_prog_compiler_c_o=yes
++     fi
++   fi
++   chmod u+w . 2>&5
++   $RM conftest*
++   # SGI C++ compiler will create directory out/ii_files/ for
++   # template instantiation
++   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
++   $RM out/* && rmdir out
++   cd ..
++   $RM -r conftest
++   $RM conftest*
+ 
 -/* 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
@@ -21367,17 +22274,20 @@
 -#    endif
 -#  endif
 -#endif
--
++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; }
+ 
 -#ifdef __cplusplus
 -extern "C" void exit (int);
 -#endif
--
+ 
 -void fnord() { int i=42;}
 -int main ()
 -{
 -  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
 -  int status = $lt_dlunknown;
--
+ 
 -  if (self)
 -    {
 -      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
@@ -21386,7 +22296,7 @@
 -    }
 -  else
 -    puts (dlerror ());
--
+ 
 -    exit (status);
 -}
 -EOF
@@ -21405,15 +22315,34 @@
 -  else :
 -    # compilation failed
 -    lt_cv_dlopen_self=no
--  fi
--fi
++hard_links="nottested"
++if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
++  # do not overwrite the value of need_locks provided by the user
++  { $as_echo "$as_me:${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
 -rm -fr conftest*
--
--
+ 
+ 
 -fi
 -{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
 -$as_echo "$lt_cv_dlopen_self" >&6; }
--
+ 
 -    if test "x$lt_cv_dlopen_self" = xyes; then
 -      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
 -      { $as_echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
@@ -21471,13 +22400,13 @@
 -#ifdef __cplusplus
 -extern "C" void exit (int);
 -#endif
--
+ 
 -void fnord() { int i=42;}
 -int main ()
 -{
 -  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
 -  int status = $lt_dlunknown;
--
+ 
 -  if (self)
 -    {
 -      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
@@ -21486,7 +22415,7 @@
 -    }
 -  else
 -    puts (dlerror ());
--
+ 
 -    exit (status);
 -}
 -EOF
@@ -21508,19 +22437,78 @@
 -  fi
 -fi
 -rm -fr conftest*
--
--
++  { $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; }
+ 
++  runpath_var=
++  allow_undefined_flag=
++  always_export_symbols=no
++  archive_cmds=
++  archive_expsym_cmds=
++  compiler_needs_object=no
++  enable_shared_with_static_runtimes=no
++  export_dynamic_flag_spec=
++  export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
++  hardcode_automatic=no
++  hardcode_direct=no
++  hardcode_direct_absolute=no
++  hardcode_libdir_flag_spec=
++  hardcode_libdir_flag_spec_ld=
++  hardcode_libdir_separator=
++  hardcode_minus_L=no
++  hardcode_shlibpath_var=unsupported
++  inherit_rpath=no
++  link_all_deplibs=unknown
++  module_cmds=
++  module_expsym_cmds=
++  old_archive_from_new_cmds=
++  old_archive_from_expsyms_cmds=
++  thread_safe_flag_spec=
++  whole_archive_flag_spec=
++  # include_expsyms should be a list of space-separated symbols to be *always*
++  # included in the symbol list
++  include_expsyms=
++  # exclude_expsyms can be an extended regexp of symbols to exclude
++  # it will be wrapped by ` (' and `)$', so one must not match beginning or
++  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
++  # as well as any symbol that contains `d'.
++  exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
++  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
++  # platforms (ab)use it in PIC code, but their linkers get confused if
++  # the symbol is explicitly referenced.  Since portable code cannot
++  # rely on this symbol name, it's probably fine to never include it in
++  # preloaded symbol tables.
++  # Exclude shared library initialization/finalization symbols.
++  extract_expsyms_cmds=
+ 
 -fi
 -{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
 -$as_echo "$lt_cv_dlopen_self_static" >&6; }
--    fi
++  case $host_os in
++  cygwin* | mingw* | pw32* | cegcc*)
++    # FIXME: the MSVC++ port hasn't been tested in a loooong time
++    # When not using gcc, we currently assume that we are using
++    # Microsoft Visual C++.
++    if test "$GCC" != yes; then
++      with_gnu_ld=no
+     fi
 -
 -    CPPFLAGS="$save_CPPFLAGS"
 -    LDFLAGS="$save_LDFLAGS"
 -    LIBS="$save_LIBS"
--    ;;
--  esac
--
++    ;;
++  interix*)
++    # we just hope/assume this is gcc and not c89 (= MSVC++)
++    with_gnu_ld=yes
++    ;;
++  openbsd*)
++    with_gnu_ld=no
++    ;;
++  linux* | k*bsd*-gnu)
++    link_all_deplibs=no
+     ;;
+   esac
+ 
 -  case $lt_cv_dlopen_self in
 -  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
 -  *) enable_dlopen_self=unknown ;;
@@ -21538,11 +22526,36 @@
 -$as_echo_n "checking if libtool supports shared libraries... " >&6; }
 -{ $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5
 -$as_echo "$can_build_shared" >&6; }
--
++  ld_shlibs=yes
++  if test "$with_gnu_ld" = yes; then
++    # If archive_cmds runs LD, not CC, wlarc should be empty
++    wlarc='${wl}'
+ 
 -{ $as_echo "$as_me:$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
--
++    # Set some defaults for GNU ld with shared library support. These
++    # are reset later if shared libraries are not supported. Putting them
++    # here allows them to be overridden if necessary.
++    runpath_var=LD_RUN_PATH
++    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++    export_dynamic_flag_spec='${wl}--export-dynamic'
++    # ancient GNU ld didn't support --whole-archive et. al.
++    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
++      whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++    else
++      whole_archive_flag_spec=
++    fi
++    supports_anon_versioning=no
++    case `$LD -v 2>&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
+ 
 -# On AIX, shared libraries and static libraries use the same namespace, and
 -# are all built from PIC.
 -case $host_os in
@@ -21553,7 +22566,14 @@
 -    postinstall_cmds='$RANLIB $lib'
 -  fi
 -  ;;
--
++    # See if GNU ld supports shared libraries.
++    case $host_os in
++    aix[3-9]*)
++      # On AIX/PPC, the GNU linker is very broken
++      if test "$host_cpu" != ia64; then
++	ld_shlibs=no
++	cat <<_LT_EOF 1>&2
+ 
 -aix[4-9]*)
 -  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
 -    test "$enable_shared" = yes && enable_static=no
@@ -21562,14 +22582,22 @@
 -esac
 -{ $as_echo "$as_me:$LINENO: result: $enable_shared" >&5
 -$as_echo "$enable_shared" >&6; }
--
++*** 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.
+ 
 -{ $as_echo "$as_me:$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:$LINENO: result: $enable_static" >&5
 -$as_echo "$enable_static" >&6; }
--
++_LT_EOF
++      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
@@ -21645,28 +22673,88 @@
 -    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\"\`\\\""
--      ;;
++    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
+       ;;
 -    *)
 -      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
--      ;;
++
++    beos*)
++      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
++	allow_undefined_flag=unsupported
++	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
++	# support --undefined.  This deserves some investigation.  FIXME
++	archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++      else
++	ld_shlibs=no
++      fi
+       ;;
 -    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
--
++    cygwin* | mingw* | pw32* | cegcc*)
++      # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
++      # as there is no search path for DLLs.
++      hardcode_libdir_flag_spec='-L$libdir'
++      allow_undefined_flag=unsupported
++      always_export_symbols=no
++      enable_shared_with_static_runtimes=yes
++      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+ 
 -cfgfile="${ofile}T"
 -  trap "$rm \"$cfgfile\"; exit 1" 1 2 15
 -  $rm -f "$cfgfile"
 -  { $as_echo "$as_me:$LINENO: creating $ofile" >&5
 -$as_echo "$as_me: creating $ofile" >&6;}
--
++      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
++        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
++	# If the export-symbols file already is a .def file (1st line
++	# is EXPORTS), use it as is; otherwise, prepend...
++	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
++	  cp $export_symbols $output_objdir/$soname.def;
++	else
++	  echo EXPORTS > $output_objdir/$soname.def;
++	  cat $export_symbols >> $output_objdir/$soname.def;
++	fi~
++	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
++      else
++	ld_shlibs=no
++      fi
++      ;;
+ 
 -  cat <<__EOF__ >> "$cfgfile"
 -#! $SHELL
--
++    interix[3-9]*)
++      hardcode_direct=no
++      hardcode_shlibpath_var=no
++      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++      export_dynamic_flag_spec='${wl}-E'
++      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
++      # Instead, shared libraries are loaded at an image base (0x10000000 by
++      # default) and relocated if they conflict, which is a slow very memory
++      # consuming and fragmenting process.  To avoid this, we pick a random,
++      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
++      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
++      archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++      archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++      ;;
+ 
 -# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
 -# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
 -# NOTE: Changes made to this file will be lost: look at ltmain.sh.
@@ -21698,77 +22786,355 @@
 -
 -# A sed program that does not truncate output.
 -SED=$lt_SED
--
++    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
++      tmp_diet=no
++      if test "$host_os" = linux-dietlibc; then
++	case $cc_basename in
++	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
++	esac
++      fi
++      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
++	 && test "$tmp_diet" = no
++      then
++	tmp_addflag=
++	tmp_sharedflag='-shared'
++	case $cc_basename,$host_cpu in
++        pgcc*)				# Portland Group C compiler
++	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
++	  tmp_addflag=' $pic_flag'
++	  ;;
++	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
++	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
++	  tmp_addflag=' $pic_flag -Mnomain' ;;
++	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
++	  tmp_addflag=' -i_dynamic' ;;
++	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
++	  tmp_addflag=' -i_dynamic -nofor_main' ;;
++	ifc* | ifort*)			# Intel Fortran compiler
++	  tmp_addflag=' -nofor_main' ;;
++	lf95*)				# Lahey Fortran 8.1
++	  whole_archive_flag_spec=
++	  tmp_sharedflag='--shared' ;;
++	xl[cC]*)			# IBM XL C 8.0 on PPC (deal with xlf below)
++	  tmp_sharedflag='-qmkshrobj'
++	  tmp_addflag= ;;
++	esac
++	case `$CC -V 2>&1 | sed 5q` in
++	*Sun\ C*)			# Sun C 5.9
++	  whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
++	  compiler_needs_object=yes
++	  tmp_sharedflag='-G' ;;
++	*Sun\ F*)			# Sun Fortran 8.3
++	  tmp_sharedflag='-G' ;;
++	esac
++	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ 
 -# Sed that helps us avoid accidentally triggering echo(1) options like -n.
 -Xsed="$SED -e 1s/^X//"
--
++        if test "x$supports_anon_versioning" = xyes; then
++          archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
++	    cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++	    echo "local: *; };" >> $output_objdir/$libname.ver~
++	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++        fi
+ 
 -# 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
--
++	case $cc_basename in
++	xlf*)
++	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
++	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
++	  hardcode_libdir_flag_spec=
++	  hardcode_libdir_flag_spec_ld='-rpath $libdir'
++	  archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
++	  if test "x$supports_anon_versioning" = xyes; then
++	    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
++	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++	      echo "local: *; };" >> $output_objdir/$libname.ver~
++	      $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
++	  fi
++	  ;;
++	esac
++      else
++        ld_shlibs=no
++      fi
++      ;;
+ 
 -# The names of the tagged configurations supported by this script.
 -available_tags=
--
++    netbsd* | netbsdelf*-gnu)
++      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
++	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
++	wlarc=
++      else
++	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      fi
++      ;;
+ 
 -# ### BEGIN LIBTOOL CONFIG
--
++    solaris*)
++      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
++	ld_shlibs=no
++	cat <<_LT_EOF 1>&2
+ 
 -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
--
++*** 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.
+ 
 -# Shell to use when invoking shell scripts.
 -SHELL=$lt_SHELL
--
++_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
++      ;;
+ 
 -# Whether or not to build shared libraries.
 -build_libtool_libs=$enable_shared
--
++    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 or not to build static libraries.
 -build_old_libs=$enable_static
--
++*** 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.
+ 
 -# Whether or not to add -lc for building shared libraries.
 -build_libtool_need_lc=$archive_cmds_need_lc
--
++_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
++      ;;
+ 
 -# Whether or not to disallow shared libs when runtime libs are static
 -allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
--
++    sunos4*)
++      archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++      wlarc=
++      hardcode_direct=yes
++      hardcode_shlibpath_var=no
++      ;;
+ 
 -# Whether or not to optimize for fast installation.
 -fast_install=$enable_fast_install
--
++    *)
++      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
+ 
 -# The host system.
 -host_alias=$host_alias
 -host=$host
 -host_os=$host_os
--
++    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
++      ;;
+ 
 -# The build system.
 -build_alias=$build_alias
 -build=$build
 -build_os=$build_os
--
++    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
+ 
 -# An echo program that does not interpret backslashes.
 -echo=$lt_echo
--
++	# 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
+ 
 -# The archiver.
 -AR=$lt_AR
 -AR_FLAGS=$lt_AR_FLAGS
--
++	exp_sym_flag='-bexport'
++	no_entry_flag='-bnoentry'
++      fi
+ 
 -# A C compiler.
 -LTCC=$lt_LTCC
--
++      # 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.
+ 
 -# LTCC compiler flags.
 -LTCFLAGS=$lt_LTCFLAGS
--
++      archive_cmds=''
++      hardcode_direct=yes
++      hardcode_direct_absolute=yes
++      hardcode_libdir_separator=':'
++      link_all_deplibs=yes
++      file_list_spec='${wl}-f,'
+ 
 -# A language-specific compiler.
 -CC=$lt_compiler
--
++      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
+ 
 -# Is the compiler the GNU C compiler?
 -with_gcc=$GCC
--
++      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.  */
+ 
 -# An ERE matcher.
 -EGREP=$lt_EGREP
--
++int
++main ()
++{
+ 
 -# The linker used to build libraries.
 -LD=$lt_LD
--
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
+ 
 -# Whether we need hard or soft links.
 -LN_S=$lt_LN_S
--
++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
+ 
 -# A BSD-compatible nm program.
 -NM=$lt_NM
 -
@@ -21777,94 +23143,358 @@
 -
 -# Used to examine libraries when file_magic_cmd begins "file"
 -MAGIC_CMD=$MAGIC_CMD
--
++        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.  */
+ 
 -# Used on cygwin: DLL creation program.
 -DLLTOOL="$DLLTOOL"
--
++int
++main ()
++{
+ 
 -# Used on cygwin: object dumper.
 -OBJDUMP="$OBJDUMP"
--
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
+ 
 -# Used on cygwin: assembler.
 -AS="$AS"
--
++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
+ 
 -# The name of the directory that contains temporary libtool files.
 -objdir=$objdir
--
++	 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
++      ;;
+ 
 -# How to create reloadable object files.
 -reload_flag=$lt_reload_flag
 -reload_cmds=$lt_reload_cmds
--
++    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
++      ;;
+ 
 -# How to pass a linker flag through the compiler.
 -wl=$lt_lt_prog_compiler_wl
--
++    bsdi[45]*)
++      export_dynamic_flag_spec=-rdynamic
++      ;;
+ 
 -# Object file suffix (normally "o").
 -objext="$ac_objext"
--
++    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
++      ;;
+ 
 -# Old archive suffix (normally "a").
 -libext="$libext"
--
++    darwin* | rhapsody*)
+ 
 -# Shared library suffix (normally ".so").
 -shrext_cmds='$shrext_cmds'
--
+ 
 -# Executable file suffix (normally "").
 -exeext="$exeext"
--
++  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}"
+ 
 -# Additional compiler flags for building library objects.
 -pic_flag=$lt_lt_prog_compiler_pic
 -pic_mode=$pic_mode
--
++  else
++  ld_shlibs=no
++  fi
+ 
 -# 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
--
++    dgux*)
++      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_libdir_flag_spec='-L$libdir'
++      hardcode_shlibpath_var=no
++      ;;
+ 
 -# Must we lock files when doing compilation?
 -need_locks=$lt_need_locks
--
++    freebsd1*)
++      ld_shlibs=no
++      ;;
+ 
 -# Do we need the lib prefix for modules?
 -need_lib_prefix=$need_lib_prefix
--
++    # 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
++      ;;
+ 
 -# Do we need a version for libraries?
 -need_version=$need_version
--
++    # 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
++      ;;
+ 
 -# Whether dlopen is supported.
 -dlopen_support=$enable_dlopen
--
++    # 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
++      ;;
+ 
 -# Whether dlopen of programs is supported.
 -dlopen_self=$enable_dlopen_self
--
++    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
+ 
 -# Whether dlopen of statically linked programs is supported.
 -dlopen_self_static=$enable_dlopen_self_static
--
++      # 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'
++      ;;
+ 
 -# Compiler flag to prevent dynamic linking.
 -link_static_flag=$lt_lt_prog_compiler_static
--
++    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
++      ;;
+ 
 -# Compiler flag to turn off builtin functions.
 -no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
--
++    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=:
+ 
 -# Compiler flag to allow reflexive dlopens.
 -export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
--
++	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'
+ 
 -# Compiler flag to generate shared objects directly from archives.
 -whole_archive_flag_spec=$lt_whole_archive_flag_spec
--
++	  # hardcode_minus_L: Not really in the search PATH,
++	  # but as the default location of the library.
++	  hardcode_minus_L=yes
++	  ;;
++	esac
++      fi
++      ;;
+ 
 -# Compiler flag to generate thread-safe objects.
 -thread_safe_flag_spec=$lt_thread_safe_flag_spec
--
++    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'
+ 
 -# Library versioning type.
 -version_type=$version_type
--
++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
++      ;;
+ 
 -# Format of library name prefix.
 -libname_spec=$lt_libname_spec
--
++    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
++      ;;
+ 
 -# 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
--
++    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
++      ;;
+ 
 -# The coded name of the library, if different from the real name.
 -soname_spec=$lt_soname_spec
--
++    *nto* | *qnx*)
++      ;;
+ 
 -# Commands used to build and install an old-style archive.
 -RANLIB=$lt_RANLIB
 -old_archive_cmds=$lt_old_archive_cmds
@@ -21876,21 +23506,76 @@
 -
 -# Create a temporary old-style archive to link instead of a shared archive.
 -old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
--
++    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
++      ;;
+ 
 -# 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
--
++    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'
++      ;;
+ 
 -# 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
--
++    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=:
++      ;;
+ 
 -# Commands to strip libraries.
 -old_striplib=$lt_old_striplib
 -striplib=$lt_striplib
--
++    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'
+ 
 -# Dependencies to place before the objects being linked to create a
 -# shared library.
 -predep_objects=$lt_predep_objects
@@ -21914,117 +23599,344 @@
 -# The library search path used internally by the compiler when linking
 -# a shared library.
 -compiler_lib_search_path=$lt_compiler_lib_search_path
--
++	# Both c and cxx compiler support -rpath directly
++	hardcode_libdir_flag_spec='-rpath $libdir'
++      fi
++      archive_cmds_need_lc='no'
++      hardcode_libdir_separator=:
++      ;;
+ 
 -# Method to check whether dependent libraries are shared objects.
 -deplibs_check_method=$lt_deplibs_check_method
--
++    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
++      ;;
+ 
 -# Command to use when deplibs_check_method == file_magic.
 -file_magic_cmd=$lt_file_magic_cmd
--
++    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
++      ;;
+ 
 -# Flag that allows shared libraries with undefined symbols to be built.
 -allow_undefined_flag=$lt_allow_undefined_flag
--
++    sysv4)
++      case $host_vendor in
++	sni)
++	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	  hardcode_direct=yes # is this really true???
++	;;
++	siemens)
++	  ## LD is ld it makes a PLAMLIB
++	  ## CC just makes a GrossModule.
++	  archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
++	  reload_cmds='$CC -r -o $output$reload_objs'
++	  hardcode_direct=no
++        ;;
++	motorola)
++	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	  hardcode_direct=no #Motorola manual says yes, but my tests say they lie
++	;;
++      esac
++      runpath_var='LD_RUN_PATH'
++      hardcode_shlibpath_var=no
++      ;;
+ 
 -# Flag that forces no undefined symbols.
 -no_undefined_flag=$lt_no_undefined_flag
--
++    sysv4.3*)
++      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_shlibpath_var=no
++      export_dynamic_flag_spec='-Bexport'
++      ;;
+ 
 -# Commands used to finish a libtool library installation in a directory.
 -finish_cmds=$lt_finish_cmds
--
++    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
++      ;;
+ 
 -# Same as above, but a single script fragment to be evaled but not shown.
 -finish_eval=$lt_finish_eval
--
++    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'
+ 
 -# Take the output of nm and produce a listing of raw symbols and C names.
 -global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
--
++      if test "$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
++      ;;
+ 
 -# Transform the output of nm in a proper C declaration
 -global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
--
++    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'
+ 
 -# 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
--
++      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
++      ;;
+ 
 -# This is the shared library runtime path variable.
 -runpath_var=$runpath_var
--
++    uts4*)
++      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_libdir_flag_spec='-L$libdir'
++      hardcode_shlibpath_var=no
++      ;;
+ 
 -# This is the shared library path variable.
 -shlibpath_var=$shlibpath_var
--
++    *)
++      ld_shlibs=no
++      ;;
++    esac
+ 
 -# Is shlibpath searched before the hard-coded library search path?
 -shlibpath_overrides_runpath=$shlibpath_overrides_runpath
--
++    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
+ 
 -# How to hardcode a shared library path into an executable.
 -hardcode_action=$hardcode_action
--
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
++$as_echo "$ld_shlibs" >&6; }
++test "$ld_shlibs" = no && can_build_shared=no
+ 
 -# Whether we should hardcode library paths into libraries.
 -hardcode_into_libs=$hardcode_into_libs
--
++with_gnu_ld=$with_gnu_ld
+ 
 -# 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
--
+ 
 -# If ld is used when linking, flag to hardcode \$libdir into
 -# a binary during linking. This must work even if \$libdir does
 -# not exist.
 -hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
--
+ 
 -# Whether we need a single -rpath flag with a separated argument.
 -hardcode_libdir_separator=$lt_hardcode_libdir_separator
--
+ 
 -# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
 -# resulting binary.
 -hardcode_direct=$hardcode_direct
--
+ 
 -# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
 -# resulting binary.
 -hardcode_minus_L=$hardcode_minus_L
--
+ 
 -# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
 -# the resulting binary.
 -hardcode_shlibpath_var=$hardcode_shlibpath_var
--
+ 
 -# Set to yes if building a shared library automatically hardcodes DIR into the library
 -# and all subsequent libraries and executables linked against it.
 -hardcode_automatic=$hardcode_automatic
--
+ 
 -# 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
--
+ 
 -# Compile-time system search path for libraries
 -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
--
+ 
 -# Run-time system search path for libraries
 -sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
--
+ 
 -# Fix the shell variable \$srcfile for the compiler.
 -fix_srcfile_path=$lt_fix_srcfile_path
--
+ 
 -# Set to yes if exported symbols are required.
 -always_export_symbols=$always_export_symbols
--
+ 
 -# The commands to list exported symbols.
 -export_symbols_cmds=$lt_export_symbols_cmds
--
+ 
 -# The commands to extract the exported symbol list from a shared archive.
 -extract_expsyms_cmds=$lt_extract_expsyms_cmds
--
++#
++# Do we need to explicitly link libc?
++#
++case "x$archive_cmds_need_lc" in
++x|xyes)
++  # Assume -lc should be added
++  archive_cmds_need_lc=yes
++
++  if test "$enable_shared" = yes && test "$GCC" = yes; then
++    case $archive_cmds in
++    *'~'*)
++      # FIXME: we may have to deal with multi-command sequences.
++      ;;
++    '$CC '*)
++      # Test whether the compiler implicitly links with -lc since on some
++      # systems, -lgcc has to come before -lc. If gcc already passes -lc
++      # to ld, don't add -lc before -lgcc.
++      { $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
++
++
++
++
++
++
++
++
++
++
++
++
+ 
 -# Symbols that should not be listed in the preloaded symbols.
 -exclude_expsyms=$lt_exclude_expsyms
--
+ 
 -# Symbols that must always be exported.
 -include_expsyms=$lt_include_expsyms
--
+ 
 -# ### END LIBTOOL CONFIG
--
+ 
 -__EOF__
--
--
+ 
+ 
 -  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.
@@ -22035,17 +23947,17 @@
 -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
@@ -22055,29 +23967,29 @@
 -    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"
--
--
+ 
+ 
 -# Check whether --with-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
 -    { $as_echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5
 -$as_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
@@ -22091,11 +24003,11 @@
 -  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"
@@ -22107,14 +24019,14 @@
 -   { (exit 1); exit 1; }; }
 -	;;
 -    esac
--
+ 
 -    if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
 -    then
 -      { { $as_echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5
 -$as_echo "$as_me: error: tag name \"$tagname\" already exists" >&2;}
 -   { (exit 1); exit 1; }; }
 -    fi
--
+ 
 -    # Update the list of available tags.
 -    if test -n "$tagname"; then
 -      echo appending configuration tag \"$tagname\" to $ofile
@@ -22129,10 +24041,10 @@
 -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
--
--
--
--
+ 
+ 
+ 
+ 
 -archive_cmds_need_lc_CXX=no
 -allow_undefined_flag_CXX=
 -always_export_symbols_CXX=no
@@ -22160,46 +24072,46 @@
 -postdeps_CXX=
 -compiler_lib_search_path_CXX=
 -compiler_lib_search_dirs_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;"
--
+ 
 -# 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.
--
+ 
 -# 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
 -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*
--
+ 
 -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*
--
--
+ 
+ 
 -# Allow CC to be a program name with arguments.
 -lt_save_CC=$CC
 -lt_save_LD=$LD
@@ -22230,8 +24142,8 @@
 -  esac
 -done
 -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
--
--
+ 
+ 
 -# We don't want -fno-exception wen compiling C++ code, so set the
 -# no_builtin_flag separately
 -if test "$GXX" = yes; then
@@ -22239,18 +24151,18 @@
 -else
 -  lt_prog_compiler_no_builtin_flag_CXX=
 -fi
--
+ 
 -if test "$GXX" = yes; then
 -  # Set up default GNU C++ configuration
--
--
+ 
+ 
 -# 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.
@@ -22318,7 +24230,7 @@
 -  lt_cv_path_LD="$LD" # Let the user override the test with a path.
 -fi
 -fi
--
+ 
 -LD="$lt_cv_path_LD"
 -if test -n "$LD"; then
 -  { $as_echo "$as_me:$LINENO: result: $LD" >&5
@@ -22348,23 +24260,23 @@
 -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
 -$as_echo "$lt_cv_prog_gnu_ld" >&6; }
 -with_gnu_ld=$lt_cv_prog_gnu_ld
--
--
--
+ 
+ 
+ 
 -  # Check if GNU C++ uses GNU ld as the underlying linker, since the
 -  # archiving commands below assume that GNU ld is being used.
 -  if test "$with_gnu_ld" = yes; then
 -    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
 -    archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
--
+ 
 -    hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
 -    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
--
+ 
 -    # 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
@@ -22375,7 +24287,7 @@
 -  else
 -    with_gnu_ld=no
 -    wlarc=
--
+ 
 -    # A generic and very simple default shared library creation
 -    # command for GNU C++ for the case where it uses the native
 -    # linker, instead of GNU ld.  If possible, this setting should
@@ -22383,18 +24295,18 @@
 -    # the platform it is being used on.
 -    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
 -  fi
--
+ 
 -  # Commands to make compiler produce verbose output that lists
 -  # what "hidden" libraries, object files and flags are used when
 -  # linking a shared library.
 -  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
--
+ 
 -else
 -  GXX=no
 -  with_gnu_ld=no
 -  wlarc=
 -fi
--
+ 
 -# PORTME: fill in a description of your system's C++ link characteristics
 -{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
 -$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
@@ -22413,7 +24325,7 @@
 -      no_entry_flag=""
 -    else
 -      aix_use_runtimelinking=no
--
+ 
 -      # Test if we are trying to use run time linking or normal
 -      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
 -      # need to do runtime linking.
@@ -22428,11 +24340,11 @@
 -	done
 -	;;
 -      esac
--
+ 
 -      exp_sym_flag='-bexport'
 -      no_entry_flag='-bnoentry'
 -    fi
--
+ 
 -    # When large executables or shared objects are built, AIX ld can
 -    # have problems creating the table of contents.  If linking a library
 -    # or program results in "error TOC overflow" add -mminimal-toc to
@@ -22484,7 +24396,7 @@
 -	fi
 -      fi
 -    fi
--
+ 
 -    # It seems that -bexpall does not export symbols beginning with
 -    # underscore (_), so it is better to generate a list of symbols to export.
 -    always_export_symbols_CXX=yes
@@ -22499,11 +24411,11 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
--
+ 
 -int
 -main ()
 -{
--
+ 
 -  ;
 -  return 0;
 -}
@@ -22529,7 +24441,7 @@
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
--
+ 
 -lt_aix_libpath_sed='
 -    /Import File Strings/,/^$/ {
 -	/^0/ {
@@ -22545,17 +24457,17 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
--
+ 
+ 
 -fi
--
+ 
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
 -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
@@ -22570,11 +24482,11 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
--
+ 
 -int
 -main ()
 -{
--
+ 
 -  ;
 -  return 0;
 -}
@@ -22600,7 +24512,7 @@
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
--
+ 
 -lt_aix_libpath_sed='
 -    /Import File Strings/,/^$/ {
 -	/^0/ {
@@ -22616,15 +24528,15 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
--
+ 
+ 
 -fi
--
+ 
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
 -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
--
+ 
 -	hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
 -	# Warning - without using the other run time loading flags,
 -	# -berok will link without error, but may produce a broken library.
@@ -22638,7 +24550,7 @@
 -      fi
 -    fi
 -    ;;
--
+ 
 -  beos*)
 -    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 -      allow_undefined_flag_CXX=unsupported
@@ -22649,7 +24561,7 @@
 -      ld_shlibs_CXX=no
 -    fi
 -    ;;
--
+ 
 -  chorus*)
 -    case $cc_basename in
 -      *)
@@ -22658,7 +24570,7 @@
 -	;;
 -    esac
 -    ;;
--
+ 
 -  cygwin* | mingw* | pw32*)
 -    # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
 -    # as there is no search path for DLLs.
@@ -22716,7 +24628,7 @@
 -      esac
 -      fi
 -        ;;
--
+ 
 -  dgux*)
 -    case $cc_basename in
 -      ec++*)
@@ -22788,7 +24700,7 @@
 -    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*) ;;
 -      *)
@@ -22808,7 +24720,7 @@
 -					      # location of the library.
 -      ;;
 -    esac
--
+ 
 -    case $cc_basename in
 -      CC*)
 -	# FIXME: insert proper C++ library support
@@ -22963,11 +24875,11 @@
 -	# 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'
--
+ 
 -	runpath_var=LD_RUN_PATH
 -	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
 -	hardcode_libdir_separator_CXX=:
--
+ 
 -	# Commands to make compiler produce verbose output that lists
 -	# what "hidden" libraries, object files and flags are used when
 -	# linking a shared library.
@@ -23070,7 +24982,7 @@
 -	# 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'
--
+ 
 -	;;
 -      RCC*)
 -	# Rational C++ 2.4.1
@@ -23106,7 +25018,7 @@
 -	  # 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
@@ -23169,7 +25081,7 @@
 -	  # 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
@@ -23221,9 +25133,9 @@
 -	    ;;
 -	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
@@ -23233,7 +25145,7 @@
 -      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'
 -	;;
@@ -23262,7 +25174,7 @@
 -	    # 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].*) ;;
@@ -23353,10 +25265,10 @@
 -{ $as_echo "$as_me:$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"
--
+ 
 -cat > conftest.$ac_ext <<EOF
 -class Foo
 -{
@@ -23366,7 +25278,7 @@
 -  int a;
 -};
 -EOF
--
+ 
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>&5
 -  ac_status=$?
@@ -23397,7 +25309,7 @@
 -       else
 -	 prev=
 -       fi
--
+ 
 -       if test "$pre_test_object_deps_done" = no; then
 -	 case $p in
 -	 -L* | -R*)
@@ -23421,7 +25333,7 @@
 -	 fi
 -       fi
 -       ;;
--
+ 
 -    *.$objext)
 -       # This assumes that the test object file only shows up
 -       # once in the compiler output.
@@ -23429,7 +25341,7 @@
 -	 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"
@@ -23444,25 +25356,25 @@
 -	 fi
 -       fi
 -       ;;
--
+ 
 -    *) ;; # Ignore the rest.
--
+ 
 -    esac
 -  done
--
+ 
 -  # Clean up.
 -  rm -f a.out a.exe
 -else
 -  echo "libtool.m4: error: problem compiling CXX test program"
 -fi
--
+ 
 -$rm -f confest.$objext
--
+ 
 -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
--
+ 
 -# PORTME: override above test on systems where it is broken
 -case $host_os in
 -interix[3-9]*)
@@ -23472,7 +25384,7 @@
 -  postdep_objects_CXX=
 -  postdeps_CXX=
 -  ;;
--
+ 
 -linux*)
 -  case `$CC -V 2>&1 | sed 5q` in
 -  *Sun\ C*)
@@ -23493,7 +25405,7 @@
 -    ;;
 -  esac
 -  ;;
--
+ 
 -solaris*)
 -  case $cc_basename in
 -  CC*)
@@ -23506,7 +25418,7 @@
 -      solaris_use_stlport4=yes
 -      ;;
 -    esac
--
+ 
 -    # Adding this requires a known-good setup of shared libraries for
 -    # Sun compiler versions before 5.6, else PIC objects from an old
 -    # archive will be linked into the output, leading to subtle bugs.
@@ -23517,23 +25429,23 @@
 -  esac
 -  ;;
 -esac
--
+ 
 -case " $postdeps_CXX " in
 -*" -lc "*) archive_cmds_need_lc_CXX=no ;;
 -esac
--
+ 
 -lt_prog_compiler_wl_CXX=
 -lt_prog_compiler_pic_CXX=
 -lt_prog_compiler_static_CXX=
--
+ 
 -{ $as_echo "$as_me:$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.
@@ -23809,15 +25721,15 @@
 -	;;
 -    esac
 -  fi
--
+ 
 -{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
 -$as_echo "$lt_prog_compiler_pic_CXX" >&6; }
--
+ 
 -#
 -# Check to make sure the PIC flag actually works.
 -#
 -if test -n "$lt_prog_compiler_pic_CXX"; then
--
+ 
 -{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
 -$as_echo_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
@@ -23851,11 +25763,11 @@
 -     fi
 -   fi
 -   $rm conftest*
--
+ 
 -fi
 -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
 -$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; }
--
+ 
 -if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
 -    case $lt_prog_compiler_pic_CXX in
 -     "" | " "*) ;;
@@ -23865,7 +25777,7 @@
 -    lt_prog_compiler_pic_CXX=
 -     lt_prog_compiler_can_build_shared_CXX=no
 -fi
--
+ 
 -fi
 -case $host_os in
 -  # For platforms which do not support PIC, -DPIC is meaningless:
@@ -23876,7 +25788,7 @@
 -    lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
 -    ;;
 -esac
--
+ 
 -#
 -# Check to make sure the static flag actually works.
 -#
@@ -23907,18 +25819,18 @@
 -   fi
 -   $rm -r conftest*
 -   LDFLAGS="$save_LDFLAGS"
--
+ 
 -fi
 -{ $as_echo "$as_me:$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:$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
@@ -23930,7 +25842,7 @@
 -   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.
@@ -23964,12 +25876,12 @@
 -   cd ..
 -   rmdir conftest
 -   $rm conftest*
--
+ 
 -fi
 -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
 -$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
--
--
+ 
+ 
 -hard_links="nottested"
 -if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
 -  # do not overwrite the value of need_locks provided by the user
@@ -23991,10 +25903,10 @@
 -else
 -  need_locks=no
 -fi
--
+ 
 -{ $as_echo "$as_me:$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]*)
@@ -24017,11 +25929,11 @@
 -  ;;
 -  esac
 -  exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
--
+ 
 -{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
 -$as_echo "$ld_shlibs_CXX" >&6; }
 -test "$ld_shlibs_CXX" = no && can_build_shared=no
--
+ 
 -#
 -# Do we need to explicitly link libc?
 -#
@@ -24029,7 +25941,7 @@
 -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
 -    *'~'*)
@@ -24043,7 +25955,7 @@
 -$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:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>&5
 -  ac_status=$?
@@ -24084,272 +25996,196 @@
 -  fi
 -  ;;
 -esac
--
+ 
 -{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
--$as_echo_n "checking dynamic linker characteristics... " >&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"
--
--need_lib_prefix=unknown
--hardcode_into_libs=no
--
--# when you set need_version to no, make sure it does not cause -set_version
--# flags to be left without arguments
--need_version=unknown
--
--case $host_os in
--aix3*)
--  version_type=linux
--  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
--  shlibpath_var=LIBPATH
--
--  # AIX 3 has no versioning support, so we append a major version to the name.
--  soname_spec='${libname}${release}${shared_ext}$major'
--  ;;
--
--aix[4-9]*)
--  version_type=linux
--  need_lib_prefix=no
--  need_version=no
--  hardcode_into_libs=yes
--  if test "$host_cpu" = ia64; then
--    # AIX 5 supports IA64
--    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
--    shlibpath_var=LD_LIBRARY_PATH
--  else
--    # With GCC up to 2.95.x, collect2 would create an import file
--    # for dependence libraries.  The import file would start with
--    # the line `#! .'.  This would cause the generated library to
--    # depend on `.', always an invalid library.  This was fixed in
--    # development snapshots of GCC prior to 3.0.
--    case $host_os in
--      aix4 | aix4.[01] | aix4.[01].*)
--      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
--	   echo ' yes '
++
++
++
++
++
++
++
++
++
++
++
++
++
++  { $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=
+@@ -13143,7 +9048,6 @@
+ 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
+ 
+@@ -13180,7 +9084,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
--      ;;
--    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*)
++	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
+ 	:
+       else
+ 	can_build_shared=no
+@@ -13206,9 +9110,18 @@
+   ;;
+ 
+ amigaos*)
 -  library_names_spec='$libname.ixlibrary $libname.a'
 -  # Create ${libname}_ixlibrary.a entries in /sys/libs.
 -  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
--  ;;
--
--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
--  ;;
--
++  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*)
+@@ -13231,25 +9144,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 $GCC,$host_os in
++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*)
--    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
--
--    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"
--      ;;
++       $RM \$dlpath'
+     shlibpath_overrides_runpath=yes
+ 
+     case $host_os in
+@@ -13258,20 +9174,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*)
+@@ -13295,12 +9211,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`'
--
--  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
--  ;;
--
--dgux*)
--  version_type=linux
--  need_lib_prefix=no
--  need_version=no
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
--  soname_spec='${libname}${release}${shared_ext}$major'
--  shlibpath_var=LD_LIBRARY_PATH
--  ;;
--
--freebsd1*)
--  dynamic_linker=no
--  ;;
--
--freebsd* | dragonfly*)
--  # DragonFly does not have aout.  When/if they implement a new
--  # versioning mechanism, adjust this.
--  if test -x /usr/bin/objformat; then
--    objformat=`/usr/bin/objformat`
--  else
--    case $host_os in
--    freebsd[123]*) objformat=aout ;;
--    *) objformat=elf ;;
--    esac
--  fi
--  version_type=freebsd-$objformat
--  case $version_type in
--    freebsd-elf*)
--      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
--      need_version=no
--      need_lib_prefix=no
--      ;;
--    freebsd-*)
--      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
--      need_version=yes
--      ;;
--  esac
--  shlibpath_var=LD_LIBRARY_PATH
--  case $host_os in
--  freebsd2*)
--    shlibpath_overrides_runpath=yes
--    ;;
--  freebsd3.[01]* | freebsdelf3.[01]*)
--    shlibpath_overrides_runpath=yes
--    hardcode_into_libs=yes
--    ;;
--  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
--  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
--    shlibpath_overrides_runpath=no
--    hardcode_into_libs=yes
--    ;;
--  *) # from 4.6 on, and DragonFly
--    shlibpath_overrides_runpath=yes
--    hardcode_into_libs=yes
--    ;;
--  esac
--  ;;
--
--gnu*)
--  version_type=linux
--  need_lib_prefix=no
--  need_version=no
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
--  soname_spec='${libname}${release}${shared_ext}$major'
--  shlibpath_var=LD_LIBRARY_PATH
--  hardcode_into_libs=yes
--  ;;
--
--hpux9* | hpux10* | hpux11*)
--  # Give a soname corresponding to the major version so that dld.sl refuses to
--  # link against other versions.
--  version_type=sunos
--  need_lib_prefix=no
--  need_version=no
--  case $host_cpu in
--  ia64*)
--    shrext_cmds='.so'
--    hardcode_into_libs=yes
--    dynamic_linker="$host_os dld.so"
--    shlibpath_var=LD_LIBRARY_PATH
--    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
--    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
--    soname_spec='${libname}${release}${shared_ext}$major'
--    if test "X$HPUX_IA64_MODE" = X32; then
--      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
--    else
--      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
--    fi
--    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
--    ;;
++  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'
+   ;;
+ 
+@@ -13393,18 +9310,18 @@
+     fi
+     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+     ;;
 -   hppa*64*)
 -     shrext_cmds='.sl'
 -     hardcode_into_libs=yes
@@ -24362,312 +26198,222 @@
 -     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
 -     ;;
 -   *)
--    shrext_cmds='.sl'
--    dynamic_linker="$host_os dld.sl"
--    shlibpath_var=SHLIB_PATH
--    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
--    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
--    soname_spec='${libname}${release}${shared_ext}$major'
--    ;;
--  esac
--  # HP-UX runs *really* slowly unless shared libraries are mode 555.
--  postinstall_cmds='chmod 555 $lib'
--  ;;
--
--interix[3-9]*)
--  version_type=linux
--  need_lib_prefix=no
--  need_version=no
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
--  soname_spec='${libname}${release}${shared_ext}$major'
--  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
--  shlibpath_var=LD_LIBRARY_PATH
--  shlibpath_overrides_runpath=no
--  hardcode_into_libs=yes
--  ;;
--
--irix5* | irix6* | nonstopux*)
--  case $host_os in
--    nonstopux*) version_type=nonstopux ;;
--    *)
--	if test "$lt_cv_prog_gnu_ld" = yes; then
--		version_type=linux
--	else
--		version_type=irix
--	fi ;;
--  esac
--  need_lib_prefix=no
--  need_version=no
--  soname_spec='${libname}${release}${shared_ext}$major'
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
--  case $host_os in
--  irix5* | nonstopux*)
--    libsuff= shlibsuff=
--    ;;
--  *)
--    case $LD in # libtool.m4 will add one of these switches to LD
--    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
--      libsuff= shlibsuff= libmagic=32-bit;;
--    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
--      libsuff=32 shlibsuff=N32 libmagic=N32;;
--    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
--      libsuff=64 shlibsuff=64 libmagic=64-bit;;
--    *) libsuff= shlibsuff= libmagic=never-match;;
--    esac
--    ;;
--  esac
--  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
--  shlibpath_overrides_runpath=no
++  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
+@@ -13472,7 +9389,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
+@@ -13481,17 +9398,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
 -  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
 -  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
--  hardcode_into_libs=yes
--  ;;
--
--# No shared lib support for Linux oldld, aout, or coff.
--linux*oldld* | linux*aout* | linux*coff*)
--  dynamic_linker=no
--  ;;
--
--# This must be Linux ELF.
--linux* | k*bsd*-gnu)
--  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
--  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
--  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
--
--  # 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/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
 -    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
--  fi
--
--  # We used to test for /lib/ld.so.1 and disable shared libraries on
--  # 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'
--  ;;
--
--netbsd*)
--  version_type=sunos
--  need_lib_prefix=no
--  need_version=no
++    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
+@@ -13503,11 +9444,23 @@
+   dynamic_linker='GNU/Linux ld.so'
+   ;;
+ 
++netbsdelf*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='NetBSD ld.elf_so'
++  ;;
++
+ netbsd*)
+   version_type=sunos
+   need_lib_prefix=no
+   need_version=no
 -  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
--    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
--    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
--    dynamic_linker='NetBSD (a.out) ld.so'
--  else
--    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
--    soname_spec='${libname}${release}${shared_ext}$major'
--    dynamic_linker='NetBSD ld.elf_so'
--  fi
--  shlibpath_var=LD_LIBRARY_PATH
--  shlibpath_overrides_runpath=yes
--  hardcode_into_libs=yes
--  ;;
--
--newsos6)
--  version_type=linux
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
--  shlibpath_var=LD_LIBRARY_PATH
--  shlibpath_overrides_runpath=yes
--  ;;
--
++  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'
+@@ -13528,14 +9481,16 @@
+   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
--  ;;
--
--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
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='ldqnx.so'
+   ;;
+ 
+ openbsd*)
+@@ -13544,13 +9499,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
++  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
+@@ -13622,7 +9577,6 @@
+     sni)
+       shlibpath_overrides_runpath=no
+       need_lib_prefix=no
+-      export_dynamic_flag_spec='${wl}-Blargedynsym'
+       runpath_var=LD_RUN_PATH
+       ;;
+     siemens)
+@@ -13653,13 +9607,12 @@
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+   soname_spec='${libname}${release}${shared_ext}$major'
+   shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
+   hardcode_into_libs=yes
+   if test "$with_gnu_ld" = yes; then
+     sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+-    shlibpath_overrides_runpath=no
+   else
+     sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
 -    shlibpath_overrides_runpath=yes
--  fi
--  ;;
--
--os2*)
--  libname_spec='$name'
--  shrext_cmds=".dll"
--  need_lib_prefix=no
--  library_names_spec='$libname${shared_ext} $libname.a'
--  dynamic_linker='OS/2 ld.exe'
--  shlibpath_var=LIBPATH
--  ;;
--
--osf3* | osf4* | osf5*)
--  version_type=osf
--  need_lib_prefix=no
--  need_version=no
--  soname_spec='${libname}${release}${shared_ext}$major'
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
--  shlibpath_var=LD_LIBRARY_PATH
--  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
--  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
--  ;;
--
--rdos*)
--  dynamic_linker=no
--  ;;
--
--solaris*)
--  version_type=linux
--  need_lib_prefix=no
--  need_version=no
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
--  soname_spec='${libname}${release}${shared_ext}$major'
--  shlibpath_var=LD_LIBRARY_PATH
--  shlibpath_overrides_runpath=yes
--  hardcode_into_libs=yes
--  # ldd complains unless libraries are executable
--  postinstall_cmds='chmod +x $lib'
--  ;;
--
--sunos4*)
--  version_type=sunos
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
--  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
--  shlibpath_var=LD_LIBRARY_PATH
--  shlibpath_overrides_runpath=yes
--  if test "$with_gnu_ld" = yes; then
--    need_lib_prefix=no
--  fi
--  need_version=yes
--  ;;
--
--sysv4 | sysv4.3*)
--  version_type=linux
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
--  soname_spec='${libname}${release}${shared_ext}$major'
--  shlibpath_var=LD_LIBRARY_PATH
--  case $host_vendor in
--    sni)
--      shlibpath_overrides_runpath=no
--      need_lib_prefix=no
--      export_dynamic_flag_spec='${wl}-Blargedynsym'
--      runpath_var=LD_RUN_PATH
--      ;;
--    siemens)
--      need_lib_prefix=no
--      ;;
--    motorola)
--      need_lib_prefix=no
--      need_version=no
--      shlibpath_overrides_runpath=no
--      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
--      ;;
--  esac
--  ;;
--
--sysv4*MP*)
--  if test -d /usr/nec ;then
--    version_type=linux
--    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
--    soname_spec='$libname${shared_ext}.$major'
--    shlibpath_var=LD_LIBRARY_PATH
--  fi
--  ;;
--
--sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
--  version_type=freebsd-elf
--  need_lib_prefix=no
--  need_version=no
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
--  soname_spec='${libname}${release}${shared_ext}$major'
--  shlibpath_var=LD_LIBRARY_PATH
--  hardcode_into_libs=yes
--  if test "$with_gnu_ld" = yes; then
--    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
--    shlibpath_overrides_runpath=no
--  else
--    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
--    shlibpath_overrides_runpath=yes
--    case $host_os in
--      sco3.2v5*)
--        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
--	;;
--    esac
--  fi
--  sys_lib_dlsearch_path_spec='/usr/lib'
--  ;;
--
--uts4*)
--  version_type=linux
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
--  soname_spec='${libname}${release}${shared_ext}$major'
--  shlibpath_var=LD_LIBRARY_PATH
--  ;;
--
--*)
--  dynamic_linker=no
--  ;;
--esac
+     case $host_os in
+       sco3.2v5*)
+         sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+@@ -13669,6 +9622,17 @@
+   sys_lib_dlsearch_path_spec='/usr/lib'
+   ;;
+ 
++tpf*)
++  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  ;;
++
+ uts4*)
+   version_type=linux
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -13680,8563 +9644,3772 @@
+   dynamic_linker=no
+   ;;
+ esac
 -{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
--$as_echo "$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
+ 
 -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 -else
 -  lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
--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
+ 
 -sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
--if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
++if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
++  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
++fi
+ if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
 -  $as_echo_n "(cached) " >&6
 -else
 -  lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
--fi
--
++  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+ fi
+ 
 -sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
--
+ 
 -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
--
+ 
 -{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
 -$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
 -hardcode_action_CXX=
 -if test -n "$hardcode_libdir_flag_spec_CXX" || \
 -   test -n "$runpath_var_CXX" || \
 -   test "X$hardcode_automatic_CXX" = "Xyes" ; then
--
+ 
 -  # We can hardcode non-existant directories.
 -  if test "$hardcode_direct_CXX" != no &&
 -     # If the only mechanism to avoid hardcoding is shlibpath_var, we
@@ -24688,7 +26434,7 @@
 -fi
 -{ $as_echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
 -$as_echo "$hardcode_action_CXX" >&6; }
--
+ 
 -if test "$hardcode_action_CXX" = relink; then
 -  # Fast installation is not supported
 -  enable_fast_install=no
@@ -24697,8 +26443,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
@@ -24780,94 +26526,94 @@
 -      ;;
 -    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
--
+ 
 -# 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
 -
@@ -24896,82 +26642,82 @@
 -
 -# 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=$lt_predep_objects_CXX
@@ -24995,53 +26741,53 @@
 -# The library search path used internally by the compiler when linking
 -# a shared library.
 -compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
--
+ 
 -# Method to check whether dependent libraries are shared objects.
 -deplibs_check_method=$lt_deplibs_check_method
--
+ 
 -# Command to use when deplibs_check_method == file_magic.
 -file_magic_cmd=$lt_file_magic_cmd
--
+ 
 -# Flag that allows shared libraries with undefined symbols to be built.
 -allow_undefined_flag=$lt_allow_undefined_flag_CXX
--
+ 
 -# Flag that forces no undefined symbols.
 -no_undefined_flag=$lt_no_undefined_flag_CXX
--
+ 
 -# Commands used to finish a libtool library installation in a directory.
 -finish_cmds=$lt_finish_cmds
--
+ 
 -# Same as above, but a single script fragment to be evaled but not shown.
 -finish_eval=$lt_finish_eval
--
+ 
 -# Take the output of nm and produce a listing of raw symbols and C names.
 -global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
--
+ 
 -# Transform the output of nm in a proper C declaration
 -global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
--
+ 
 -# Transform the output of nm in a C name address pair
 -global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
--
+ 
 -# This is the shared library runtime path variable.
 -runpath_var=$runpath_var
--
+ 
 -# This is the shared library path variable.
 -shlibpath_var=$shlibpath_var
--
+ 
 -# Is shlibpath searched before the hard-coded library search path?
 -shlibpath_overrides_runpath=$shlibpath_overrides_runpath
--
+ 
 -# How to hardcode a shared library path into an executable.
 -hardcode_action=$hardcode_action_CXX
--
+ 
 -# Whether we should hardcode library paths into libraries.
 -hardcode_into_libs=$hardcode_into_libs
--
+ 
 -# Flag to hardcode \$libdir into a binary during linking.
 -# This must work even if \$libdir does not exist.
 -hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
--
+ 
 -# If ld is used when linking, flag to hardcode \$libdir into
 -# a binary during linking. This must work even if \$libdir does
 -# not exist.
@@ -25065,43 +26811,49 @@
 -# 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
--
+ 
 -# 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=$lt_sys_lib_search_path_spec
--
+ 
 -# Run-time system search path for libraries
 -sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
--
+ 
 -# Fix the shell variable \$srcfile for the compiler.
 -fix_srcfile_path=$lt_fix_srcfile_path
--
+ 
 -# Set to yes if exported symbols are required.
 -always_export_symbols=$always_export_symbols_CXX
--
+ 
 -# The commands to list exported symbols.
 -export_symbols_cmds=$lt_export_symbols_cmds_CXX
--
+ 
 -# The commands to extract the exported symbol list from a shared archive.
 -extract_expsyms_cmds=$lt_extract_expsyms_cmds
--
+ 
 -# Symbols that should not be listed in the preloaded symbols.
 -exclude_expsyms=$lt_exclude_expsyms_CXX
--
+ 
 -# Symbols that must always be exported.
 -include_expsyms=$lt_include_expsyms_CXX
--
+ 
 -# ### END LIBTOOL TAG CONFIG: $tagname
--
+ 
 -__EOF__
--
--
+ 
++  { $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
+ 
 -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
@@ -25109,10 +26861,37 @@
 -  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
 -  if test -f "$ltmain_in"; then
 -    test -f Makefile && make "$ltmain"
--  fi
--fi
--
--
++  # 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; }
+ 
++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
+ 
 -ac_ext=c
 -ac_cpp='$CPP $CPPFLAGS'
 -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -25165,50 +26944,114 @@
 -
 -# Source file extension for f77 test sources.
 -ac_ext=f
--
+ 
 -# Object file extension for compiled f77 test sources.
 -objext=o
 -objext_F77=$objext
--
+ 
 -# Code to be used in simple compile tests
 -lt_simple_compile_test_code="\
 -      subroutine t
 -      return
 -      end
 -"
--
+ 
 -# Code to be used in simple link tests
 -lt_simple_link_test_code="\
 -      program t
 -      end
 -"
--
+ 
 -# ltmain only uses $CC for tagged configurations so make sure $CC is set.
--
+ 
 -# If no C compiler was specified, use CC.
 -LTCC=${LTCC-"$CC"}
--
++  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=
+ 
 -# If no C compiler flags were specified, use CFLAGS.
 -LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
--
++  case $host_os in
++  beos*)
++    lt_cv_dlopen="load_add_on"
++    lt_cv_dlopen_libs=
++    lt_cv_dlopen_self=yes
++    ;;
+ 
 -# Allow CC to be a program name with arguments.
 -compiler=$CC
--
--
++  mingw* | pw32* | cegcc*)
++    lt_cv_dlopen="LoadLibrary"
++    lt_cv_dlopen_libs=
++    ;;
+ 
++  cygwin*)
++    lt_cv_dlopen="dlopen"
++    lt_cv_dlopen_libs=
++    ;;
+ 
 -# 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*
--
++  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.  */
+ 
 -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*
--
--
++/* 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
+ 
++    lt_cv_dlopen="dyld"
++    lt_cv_dlopen_libs=
++    lt_cv_dlopen_self=yes
+ 
 -# Allow CC to be a program name with arguments.
 -lt_save_CC="$CC"
 -CC=${F77-"f77"}
@@ -25223,17 +27066,75 @@
 -  esac
 -done
 -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
--
--
++fi
+ 
++    ;;
+ 
 -{ $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
 -$as_echo_n "checking if libtool supports shared libraries... " >&6; }
 -{ $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5
 -$as_echo "$can_build_shared" >&6; }
--
++  *)
++    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.  */
+ 
 -{ $as_echo "$as_me:$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
--
++/* 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.  */
+ 
 -# On AIX, shared libraries and static libraries use the same namespace, and
 -# are all built from PIC.
 -case $host_os in
@@ -25259,21 +27160,127 @@
 -test "$enable_shared" = yes || enable_static=yes
 -{ $as_echo "$as_me:$LINENO: result: $enable_static" >&5
 -$as_echo "$enable_static" >&6; }
--
++/* 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.  */
+ 
 -GCC_F77="$G77"
 -LD_F77="$LD"
--
++/* 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.  */
+ 
 -lt_prog_compiler_wl_F77=
 -lt_prog_compiler_pic_F77=
 -lt_prog_compiler_static_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
+ 
 -{ $as_echo "$as_me:$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_F77='-Wl,'
 -    lt_prog_compiler_static_F77='-static'
--
++fi
+ 
 -    case $host_os in
 -      aix*)
 -      # All AIX code is PIC.
@@ -25282,18 +27289,19 @@
 -	lt_prog_compiler_static_F77='-Bstatic'
 -      fi
 -      ;;
--
+ 
 -    amigaos*)
 -      # FIXME: we need at least 68020 code to build shared libraries, but
 -      # adding the `-m68020' flag to GCC prevents building anything better,
 -      # like `-m68040'.
 -      lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
 -      ;;
--
++fi
+ 
 -    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
 -      # PIC is the default for these OSes.
 -      ;;
--
+ 
 -    mingw* | cygwin* | 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).
@@ -25301,31 +27309,34 @@
 -      # (--disable-auto-import) libraries
 -      lt_prog_compiler_pic_F77='-DDLL_EXPORT'
 -      ;;
--
++fi
+ 
 -    darwin* | rhapsody*)
 -      # PIC is the default on this platform
 -      # Common symbols not allowed in MH_DYLIB files
 -      lt_prog_compiler_pic_F77='-fno-common'
 -      ;;
--
+ 
 -    interix[3-9]*)
 -      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
 -      # Instead, we relocate shared libraries at runtime.
 -      ;;
--
++fi
+ 
 -    msdosdjgpp*)
 -      # Just because we use GCC doesn't mean we suddenly get shared libraries
 -      # on systems that don't support them.
 -      lt_prog_compiler_can_build_shared_F77=no
 -      enable_shared=no
 -      ;;
--
+ 
 -    sysv4*MP*)
 -      if test -d /usr/nec; then
 -	lt_prog_compiler_pic_F77=-Kconform_pic
 -      fi
 -      ;;
--
++fi
+ 
 -    hpux*)
 -      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
 -      # not for PA HP-UX.
@@ -25338,12 +27349,16 @@
 -	;;
 -      esac
 -      ;;
--
++    ;;
++  esac
+ 
 -    *)
 -      lt_prog_compiler_pic_F77='-fPIC'
 -      ;;
 -    esac
--  else
++  if test "x$lt_cv_dlopen" != xno; then
++    enable_dlopen=yes
+   else
 -    # PORTME Check for flag to pass linker flags through the system compiler.
 -    case $host_os in
 -    aix*)
@@ -25398,7 +27413,9 @@
 -      lt_prog_compiler_pic_F77='-KPIC'
 -      lt_prog_compiler_static_F77='-Bstatic'
 -      ;;
--
++    enable_dlopen=no
++  fi
+ 
 -    linux* | k*bsd*-gnu)
 -      case $cc_basename in
 -      icc* | ecc*)
@@ -25436,17 +27453,25 @@
 -	;;
 -      esac
 -      ;;
--
++  case $lt_cv_dlopen in
++  dlopen)
++    save_CPPFLAGS="$CPPFLAGS"
++    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+ 
 -    osf3* | osf4* | osf5*)
 -      lt_prog_compiler_wl_F77='-Wl,'
 -      # All OSF/1 code is PIC.
 -      lt_prog_compiler_static_F77='-non_shared'
 -      ;;
--
++    save_LDFLAGS="$LDFLAGS"
++    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+ 
 -    rdos*)
 -      lt_prog_compiler_static_F77='-non_shared'
 -      ;;
--
++    save_LIBS="$LIBS"
++    LIBS="$lt_cv_dlopen_libs $LIBS"
+ 
 -    solaris*)
 -      lt_prog_compiler_pic_F77='-KPIC'
 -      lt_prog_compiler_static_F77='-Bstatic'
@@ -25457,61 +27482,148 @@
 -	lt_prog_compiler_wl_F77='-Wl,';;
 -      esac
 -      ;;
--
++    { $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 10079 "configure"
++#include "confdefs.h"
+ 
 -    sunos4*)
 -      lt_prog_compiler_wl_F77='-Qoption ld '
 -      lt_prog_compiler_pic_F77='-PIC'
 -      lt_prog_compiler_static_F77='-Bstatic'
 -      ;;
--
++#if HAVE_DLFCN_H
++#include <dlfcn.h>
++#endif
+ 
 -    sysv4 | sysv4.2uw2* | sysv4.3*)
 -      lt_prog_compiler_wl_F77='-Wl,'
 -      lt_prog_compiler_pic_F77='-KPIC'
 -      lt_prog_compiler_static_F77='-Bstatic'
 -      ;;
--
++#include <stdio.h>
+ 
 -    sysv4*MP*)
 -      if test -d /usr/nec ;then
 -	lt_prog_compiler_pic_F77='-Kconform_pic'
 -	lt_prog_compiler_static_F77='-Bstatic'
 -      fi
 -      ;;
--
++#ifdef RTLD_GLOBAL
++#  define LT_DLGLOBAL		RTLD_GLOBAL
++#else
++#  ifdef DL_GLOBAL
++#    define LT_DLGLOBAL		DL_GLOBAL
++#  else
++#    define LT_DLGLOBAL		0
++#  endif
++#endif
+ 
 -    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
 -      lt_prog_compiler_wl_F77='-Wl,'
 -      lt_prog_compiler_pic_F77='-KPIC'
 -      lt_prog_compiler_static_F77='-Bstatic'
 -      ;;
--
++/* 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
+ 
 -    unicos*)
 -      lt_prog_compiler_wl_F77='-Wl,'
 -      lt_prog_compiler_can_build_shared_F77=no
 -      ;;
--
++void fnord() { int i=42;}
++int main ()
++{
++  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
++  int status = $lt_dlunknown;
+ 
 -    uts4*)
 -      lt_prog_compiler_pic_F77='-pic'
 -      lt_prog_compiler_static_F77='-Bstatic'
 -      ;;
--
++  if (self)
++    {
++      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
++      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
++      /* dlclose (self); */
++    }
++  else
++    puts (dlerror ());
+ 
 -    *)
 -      lt_prog_compiler_can_build_shared_F77=no
 -      ;;
--    esac
--  fi
--
++  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*
+ 
 -{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
 -$as_echo "$lt_prog_compiler_pic_F77" >&6; }
--
+ 
 -#
 -# Check to make sure the PIC flag actually works.
 -#
 -if test -n "$lt_prog_compiler_pic_F77"; then
--
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
++$as_echo "$lt_cv_dlopen_self" >&6; }
+ 
 -{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
 -$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... " >&6; }
 -if test "${lt_cv_prog_compiler_pic_works_F77+set}" = set; then
--  $as_echo_n "(cached) " >&6
--else
++    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
 -  lt_cv_prog_compiler_pic_works_F77=no
 -  ac_outfile=conftest.$ac_objext
 -   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -25540,11 +27652,22 @@
 -     fi
 -   fi
 -   $rm conftest*
--
++  	  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 10175 "configure"
++#include "confdefs.h"
+ 
 -fi
 -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5
 -$as_echo "$lt_cv_prog_compiler_pic_works_F77" >&6; }
--
++#if HAVE_DLFCN_H
++#include <dlfcn.h>
++#endif
+ 
 -if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then
 -    case $lt_prog_compiler_pic_F77 in
 -     "" | " "*) ;;
@@ -25553,9 +27676,79 @@
 -else
 -    lt_prog_compiler_pic_F77=
 -     lt_prog_compiler_can_build_shared_F77=no
--fi
--
--fi
++#include <stdio.h>
++
++#ifdef RTLD_GLOBAL
++#  define LT_DLGLOBAL		RTLD_GLOBAL
++#else
++#  ifdef DL_GLOBAL
++#    define LT_DLGLOBAL		DL_GLOBAL
++#  else
++#    define LT_DLGLOBAL		0
++#  endif
++#endif
++
++/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
++   find out it does not work in some platform. */
++#ifndef LT_DLLAZY_OR_NOW
++#  ifdef RTLD_LAZY
++#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
++#  else
++#    ifdef DL_LAZY
++#      define LT_DLLAZY_OR_NOW		DL_LAZY
++#    else
++#      ifdef RTLD_NOW
++#        define LT_DLLAZY_OR_NOW	RTLD_NOW
++#      else
++#        ifdef DL_NOW
++#          define LT_DLLAZY_OR_NOW	DL_NOW
++#        else
++#          define LT_DLLAZY_OR_NOW	0
++#        endif
++#      endif
++#    endif
++#  endif
++#endif
++
++void fnord() { int i=42;}
++int main ()
++{
++  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
++  int status = $lt_dlunknown;
++
++  if (self)
++    {
++      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
++      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
++      /* dlclose (self); */
++    }
++  else
++    puts (dlerror ());
++
++  return status;
++}
++_LT_EOF
++  if { { 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*
++
+ 
+ fi
 -case $host_os in
 -  # For platforms which do not support PIC, -DPIC is meaningless:
 -  *djgpp*)
@@ -25563,9 +27756,17 @@
 -    ;;
 -  *)
 -    lt_prog_compiler_pic_F77="$lt_prog_compiler_pic_F77"
--    ;;
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
++$as_echo "$lt_cv_dlopen_self_static" >&6; }
++    fi
++
++    CPPFLAGS="$save_CPPFLAGS"
++    LDFLAGS="$save_LDFLAGS"
++    LIBS="$save_LIBS"
+     ;;
 -esac
--
++  esac
+ 
 -#
 -# Check to make sure the static flag actually works.
 -#
@@ -25596,18 +27797,26 @@
 -   fi
 -   $rm -r conftest*
 -   LDFLAGS="$save_LDFLAGS"
--
--fi
++  case $lt_cv_dlopen_self in
++  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
++  *) enable_dlopen_self=unknown ;;
++  esac
+ 
++  case $lt_cv_dlopen_self_static in
++  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
++  *) enable_dlopen_self_static=unknown ;;
++  esac
+ fi
 -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5
 -$as_echo "$lt_cv_prog_compiler_static_works_F77" >&6; }
--
+ 
 -if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then
 -    :
 -else
 -    lt_prog_compiler_static_F77=
 -fi
--
--
+ 
+ 
 -{ $as_echo "$as_me:$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_F77+set}" = set; then
@@ -25619,7 +27828,7 @@
 -   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.
@@ -25653,12 +27862,12 @@
 -   cd ..
 -   rmdir conftest
 -   $rm conftest*
--
+ 
 -fi
 -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
 -$as_echo "$lt_cv_prog_compiler_c_o_F77" >&6; }
--
--
+ 
+ 
 -hard_links="nottested"
 -if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then
 -  # do not overwrite the value of need_locks provided by the user
@@ -25680,10 +27889,10 @@
 -else
 -  need_locks=no
 -fi
--
+ 
 -{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
 -$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
--
+ 
 -  runpath_var=
 -  allow_undefined_flag_F77=
 -  enable_shared_with_static_runtimes_F77=no
@@ -25731,30 +27940,61 @@
 -  esac
 -done
 -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
--
--  case $host_os in
+ 
++
++
++
++
++
++
++
++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
 -  cygwin* | mingw* | pw32*)
 -    # FIXME: the MSVC++ port hasn't been tested in a loooong time
 -    # When not using gcc, we currently assume that we are using
 -    # Microsoft Visual C++.
 -    if test "$GCC" != yes; then
 -      with_gnu_ld=no
--    fi
--    ;;
++  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
+     ;;
 -  interix*)
 -    # we just hope/assume this is gcc and not c89 (= MSVC++)
 -    with_gnu_ld=yes
 -    ;;
 -  openbsd*)
 -    with_gnu_ld=no
--    ;;
--  esac
--
++  *)
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+     ;;
+   esac
++fi
+ 
 -  ld_shlibs_F77=yes
 -  if test "$with_gnu_ld" = yes; then
 -    # If archive_cmds runs LD, not CC, wlarc should be empty
 -    wlarc='${wl}'
--
+ 
 -    # Set some defaults for GNU ld with shared library support. These
 -    # are reset later if shared libraries are not supported. Putting them
 -    # here allows them to be overridden if necessary.
@@ -25766,7 +28006,35 @@
 -	whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
 -      else
 -  	whole_archive_flag_spec_F77=
--    fi
++
++
++
++
++
++
++
++
++
++
++  # 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
 -    supports_anon_versioning=no
 -    case `$LD -v 2>/dev/null` in
 -      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
@@ -25775,7 +28043,8 @@
 -      *\ 2.11.*) ;; # other 2.11 versions
 -      *) supports_anon_versioning=yes ;;
 -    esac
--
++    ;;
+ 
 -    # See if GNU ld supports shared libraries.
 -    case $host_os in
 -    aix[3-9]*)
@@ -25783,17 +28052,31 @@
 -      if test "$host_cpu" != ia64; then
 -	ld_shlibs_F77=no
 -	cat <<EOF 1>&2
--
++  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; }
+ 
 -*** 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.
--
++  { $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; }
+ 
 -EOF
 -      fi
 -      ;;
--
+ 
 -    amigaos*)
 -      archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
 -      hardcode_libdir_flag_spec_F77='-L$libdir'
@@ -25807,7 +28090,7 @@
 -      # them.
 -      ld_shlibs_F77=no
 -      ;;
--
+ 
 -    beos*)
 -      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 -	allow_undefined_flag_F77=unsupported
@@ -25818,7 +28101,7 @@
 -	ld_shlibs_F77=no
 -      fi
 -      ;;
--
+ 
 -    cygwin* | mingw* | pw32*)
 -      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless,
 -      # as there is no search path for DLLs.
@@ -25827,7 +28110,13 @@
 -      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/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
--
++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 $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
 -        archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
 -	# If the export-symbols file already is a .def file (1st line
@@ -25843,7 +28132,8 @@
 -	ld_shlibs_F77=no
 -      fi
 -      ;;
--
++CC="$lt_save_CC"
+ 
 -    interix[3-9]*)
 -      hardcode_direct_F77=no
 -      hardcode_shlibpath_var_F77=no
@@ -25858,7 +28148,7 @@
 -      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'
 -      ;;
--
+ 
 -    gnu* | linux* | k*bsd*-gnu)
 -      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 -	tmp_addflag=
@@ -25887,7 +28177,7 @@
 -	  tmp_sharedflag='-shared' ;;
 -	esac
 -	archive_cmds_F77='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--
+ 
 -	if test $supports_anon_versioning = yes; then
 -	  archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
 -  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
@@ -25898,7 +28188,7 @@
 -	ld_shlibs_F77=no
 -      fi
 -      ;;
--
+ 
 -    netbsd*)
 -      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 -	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
@@ -25908,19 +28198,19 @@
 -	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 -      fi
 -      ;;
--
+ 
 -    solaris*)
 -      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
 -	ld_shlibs_F77=no
 -	cat <<EOF 1>&2
--
+ 
 -*** Warning: The releases 2.8.* of the GNU linker cannot reliably
 -*** create shared libraries on Solaris systems.  Therefore, libtool
 -*** is disabling shared libraries support.  We urge you to upgrade GNU
 -*** binutils to release 2.9.1 or newer.  Another option is to modify
 -*** your PATH or compiler configuration so that the native linker is
 -*** used, and then restart.
--
+ 
 -EOF
 -      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 -	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
@@ -25929,20 +28219,20 @@
 -	ld_shlibs_F77=no
 -      fi
 -      ;;
--
+ 
 -    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
 -      case `$LD -v 2>&1` in
 -        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
 -	ld_shlibs_F77=no
 -	cat <<_LT_EOF 1>&2
--
+ 
 -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
 -*** reliably create shared libraries on SCO systems.  Therefore, libtool
 -*** is disabling shared libraries support.  We urge you to upgrade GNU
 -*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
 -*** your PATH or compiler configuration so that the native linker is
 -*** used, and then restart.
--
+ 
 -_LT_EOF
 -	;;
 -	*)
@@ -25956,14 +28246,14 @@
 -	;;
 -      esac
 -      ;;
--
+ 
 -    sunos4*)
 -      archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
 -      wlarc=
 -      hardcode_direct_F77=yes
 -      hardcode_shlibpath_var_F77=no
 -      ;;
--
+ 
 -    *)
 -      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 -	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
@@ -25973,7 +28263,7 @@
 -      fi
 -      ;;
 -    esac
--
+ 
 -    if test "$ld_shlibs_F77" = no; then
 -      runpath_var=
 -      hardcode_libdir_flag_spec_F77=
@@ -25996,7 +28286,8 @@
 -	hardcode_direct_F77=unsupported
 -      fi
 -      ;;
--
++        ac_config_commands="$ac_config_commands libtool"
+ 
 -    aix[4-9]*)
 -      if test "$host_cpu" = ia64; then
 -	# On IA64, the linker does run time linking by default, so we don't
@@ -26013,7 +28304,7 @@
 -	  export_symbols_cmds_F77='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
 -	fi
 -	aix_use_runtimelinking=no
--
+ 
 -	# Test if we are trying to use run time linking or normal
 -	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
 -	# need to do runtime linking.
@@ -26026,22 +28317,23 @@
 -	  done
 -	  ;;
 -	esac
--
+ 
 -	exp_sym_flag='-bexport'
 -	no_entry_flag='-bnoentry'
 -      fi
--
+ 
 -      # When large executables or shared objects are built, AIX ld can
 -      # have problems creating the table of contents.  If linking a library
 -      # or program results in "error TOC overflow" add -mminimal-toc to
 -      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
 -      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
--
++# Only expand once:
+ 
 -      archive_cmds_F77=''
 -      hardcode_direct_F77=yes
 -      hardcode_libdir_separator_F77=':'
 -      link_all_deplibs_F77=yes
--
+ 
 -      if test "$GCC" = yes; then
 -	case $host_os in aix4.[012]|aix4.[012].*)
 -	# We only want to do this on AIX 4.2 and lower, the check
@@ -26082,7 +28374,7 @@
 -	  fi
 -	fi
 -      fi
--
+ 
 -      # It seems that -bexpall does not export symbols beginning with
 -      # underscore (_), so it is better to generate a list of symbols to export.
 -      always_export_symbols_F77=yes
@@ -26093,7 +28385,7 @@
 -       # Determine the default libpath from the value encoded in an empty executable.
 -       cat >conftest.$ac_ext <<_ACEOF
 -      program main
--
+ 
 -      end
 -_ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
@@ -26117,7 +28409,7 @@
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
--
+ 
 -lt_aix_libpath_sed='
 -    /Import File Strings/,/^$/ {
 -	/^0/ {
@@ -26129,19 +28421,113 @@
 -# 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
--else
++
++
++        if test -n "$PYTHON"; then
++      # If the user set $PYTHON, use it and don't search something else.
++      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version >= 2.4" >&5
++$as_echo_n "checking whether $PYTHON version >= 2.4... " >&6; }
++      prog="import sys
++# split strings by '.' and convert to numeric.  Append some zeros
++# because we need at least 4 digits for the hex conversion.
++# map returns an iterator in Python 3.0 and a list in 2.x
++minver = list(map(int, '2.4'.split('.'))) + [0, 0, 0]
++minverhex = 0
++# xrange is not present in Python 3.0 and range returns an iterator
++for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i]
++sys.exit(sys.hexversion < minverhex)"
++  if { echo "$as_me:$LINENO: $PYTHON -c "$prog"" >&5
++   ($PYTHON -c "$prog") >&5 2>&5
++   ac_status=$?
++   echo "$as_me:$LINENO: \$? = $ac_status" >&5
++   (exit $ac_status); }; then :
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++else
++  as_fn_error "too old" "$LINENO" 5
+ fi
++      am_display_PYTHON=$PYTHON
++    else
++      # Otherwise, try each interpreter until we find one that satisfies
++      # VERSION.
++      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= 2.4" >&5
++$as_echo_n "checking for a Python interpreter with version >= 2.4... " >&6; }
++if test "${am_cv_pathless_PYTHON+set}" = set; then :
++  $as_echo_n "(cached) " >&6
+ else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
--
--fi
--
+ 
++	for am_cv_pathless_PYTHON in python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
++	  test "$am_cv_pathless_PYTHON" = none && break
++	  prog="import sys
++# split strings by '.' and convert to numeric.  Append some zeros
++# because we need at least 4 digits for the hex conversion.
++# map returns an iterator in Python 3.0 and a list in 2.x
++minver = list(map(int, '2.4'.split('.'))) + [0, 0, 0]
++minverhex = 0
++# xrange is not present in Python 3.0 and range returns an iterator
++for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i]
++sys.exit(sys.hexversion < minverhex)"
++  if { echo "$as_me:$LINENO: $am_cv_pathless_PYTHON -c "$prog"" >&5
++   ($am_cv_pathless_PYTHON -c "$prog") >&5 2>&5
++   ac_status=$?
++   echo "$as_me:$LINENO: \$? = $ac_status" >&5
++   (exit $ac_status); }; then :
++  break
++fi
++	done
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_pathless_PYTHON" >&5
++$as_echo "$am_cv_pathless_PYTHON" >&6; }
++      # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON.
++      if test "$am_cv_pathless_PYTHON" = none; then
++	PYTHON=:
++      else
++        # Extract the first word of "$am_cv_pathless_PYTHON", so it can be a program name with args.
++set dummy $am_cv_pathless_PYTHON; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_path_PYTHON+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  case $PYTHON in
++  [\\/]* | ?:[\\/]*)
++  ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path.
++  ;;
++  *)
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++  done
++IFS=$as_save_IFS
+ 
++  ;;
++esac
++fi
++PYTHON=$ac_cv_path_PYTHON
++if test -n "$PYTHON"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5
++$as_echo "$PYTHON" >&6; }
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+ 
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
 -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
--
+ 
 -       hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
 -	archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
 -       else
@@ -26153,7 +28539,10 @@
 -	 # Determine the default libpath from the value encoded in an empty executable.
 -	 cat >conftest.$ac_ext <<_ACEOF
 -      program main
--
++      fi
++      am_display_PYTHON=$am_cv_pathless_PYTHON
++    fi
+ 
 -      end
 -_ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
@@ -26177,7 +28566,7 @@
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
--
+ 
 -lt_aix_libpath_sed='
 -    /Import File Strings/,/^$/ {
 -	/^0/ {
@@ -26193,15 +28582,27 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
--
--fi
--
++  if test "$PYTHON" = :; then
++      as_fn_error "no suitable Python interpreter found" "$LINENO" 5
++  else
+ 
+ 
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON version" >&5
++$as_echo_n "checking for $am_display_PYTHON version... " >&6; }
++if test "${am_cv_python_version+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
+ fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
++$as_echo "$am_cv_python_version" >&6; }
++  PYTHON_VERSION=$am_cv_python_version
+ 
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
 -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
--
+ 
 -	 hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
 -	  # Warning - without using the other run time loading flags,
 -	  # -berok will link without error, but may produce a broken library.
@@ -26215,7 +28616,7 @@
 -	fi
 -      fi
 -      ;;
--
+ 
 -    amigaos*)
 -      archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
 -      hardcode_libdir_flag_spec_F77='-L$libdir'
@@ -26223,11 +28624,13 @@
 -      # see comment about different semantics on the GNU ld section
 -      ld_shlibs_F77=no
 -      ;;
--
++  PYTHON_PREFIX='${prefix}'
+ 
 -    bsdi[45]*)
 -      export_dynamic_flag_spec_F77=-rdynamic
 -      ;;
--
++  PYTHON_EXEC_PREFIX='${exec_prefix}'
+ 
 -    cygwin* | mingw* | pw32*)
 -      # When not using gcc, we currently assume that we are using
 -      # Microsoft Visual C++.
@@ -26248,7 +28651,7 @@
 -      fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
 -      enable_shared_with_static_runtimes_F77=yes
 -      ;;
--
+ 
 -    darwin* | rhapsody*)
 -      case $host_os in
 -        rhapsody* | darwin1.[012])
@@ -26297,17 +28700,27 @@
 -      esac
 -    fi
 -      ;;
--
+ 
 -    dgux*)
 -      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
 -      hardcode_libdir_flag_spec_F77='-L$libdir'
 -      hardcode_shlibpath_var_F77=no
 -      ;;
--
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON platform" >&5
++$as_echo_n "checking for $am_display_PYTHON platform... " >&6; }
++if test "${am_cv_python_platform+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_platform" >&5
++$as_echo "$am_cv_python_platform" >&6; }
++  PYTHON_PLATFORM=$am_cv_python_platform
+ 
 -    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
@@ -26318,7 +28731,7 @@
 -      hardcode_direct_F77=yes
 -      hardcode_shlibpath_var_F77=no
 -      ;;
--
+ 
 -    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
 -    freebsd2*)
 -      archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
@@ -26326,7 +28739,7 @@
 -      hardcode_minus_L_F77=yes
 -      hardcode_shlibpath_var_F77=no
 -      ;;
--
+ 
 -    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
 -    freebsd* | dragonfly*)
 -      archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
@@ -26334,7 +28747,34 @@
 -      hardcode_direct_F77=yes
 -      hardcode_shlibpath_var_F77=no
 -      ;;
--
++                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5
++$as_echo_n "checking for $am_display_PYTHON script directory... " >&6; }
++if test "${am_cv_python_pythondir+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  if test "x$prefix" = xNONE
++     then
++       am_py_prefix=$ac_default_prefix
++     else
++       am_py_prefix=$prefix
++     fi
++     am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null ||
++     echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
++     case $am_cv_python_pythondir in
++     $am_py_prefix*)
++       am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
++       am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"`
++       ;;
++     *)
++       case $am_py_prefix in
++         /usr|/System*) ;;
++         *)
++	  am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages
++	  ;;
++       esac
++       ;;
++     esac
+ 
 -    hpux9*)
 -      if test "$GCC" = yes; then
 -	archive_cmds_F77='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
@@ -26344,13 +28784,17 @@
 -      hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
 -      hardcode_libdir_separator_F77=:
 -      hardcode_direct_F77=yes
--
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pythondir" >&5
++$as_echo "$am_cv_python_pythondir" >&6; }
++  pythondir=$am_cv_python_pythondir
+ 
 -      # hardcode_minus_L: Not really in the search PATH,
 -      # but as the default location of the library.
 -      hardcode_minus_L_F77=yes
 -      export_dynamic_flag_spec_F77='${wl}-E'
 -      ;;
--
+ 
 -    hpux10*)
 -      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
 -	archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
@@ -26360,16 +28804,17 @@
 -      if test "$with_gnu_ld" = no; then
 -	hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
 -	hardcode_libdir_separator_F77=:
--
+ 
 -	hardcode_direct_F77=yes
 -	export_dynamic_flag_spec_F77='${wl}-E'
--
++  pkgpythondir=\${pythondir}/$PACKAGE
+ 
 -	# hardcode_minus_L: Not really in the search PATH,
 -	# but as the default location of the library.
 -	hardcode_minus_L_F77=yes
 -      fi
 -      ;;
--
+ 
 -    hpux11*)
 -      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
 -	case $host_cpu in
@@ -26399,7 +28844,34 @@
 -      if test "$with_gnu_ld" = no; then
 -	hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
 -	hardcode_libdir_separator_F77=:
--
++            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON extension module directory" >&5
++$as_echo_n "checking for $am_display_PYTHON extension module directory... " >&6; }
++if test "${am_cv_python_pyexecdir+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  if test "x$exec_prefix" = xNONE
++     then
++       am_py_exec_prefix=$am_py_prefix
++     else
++       am_py_exec_prefix=$exec_prefix
++     fi
++     am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null ||
++     echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
++     case $am_cv_python_pyexecdir in
++     $am_py_exec_prefix*)
++       am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
++       am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"`
++       ;;
++     *)
++       case $am_py_exec_prefix in
++         /usr|/System*) ;;
++         *)
++	   am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages
++	   ;;
++       esac
++       ;;
++     esac
+ 
 -	case $host_cpu in
 -	hppa*64*|ia64*)
 -	  hardcode_libdir_flag_spec_ld_F77='+b $libdir'
@@ -26409,7 +28881,11 @@
 -	*)
 -	  hardcode_direct_F77=yes
 -	  export_dynamic_flag_spec_F77='${wl}-E'
--
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pyexecdir" >&5
++$as_echo "$am_cv_python_pyexecdir" >&6; }
++  pyexecdir=$am_cv_python_pyexecdir
+ 
 -	  # hardcode_minus_L: Not really in the search PATH,
 -	  # but as the default location of the library.
 -	  hardcode_minus_L_F77=yes
@@ -26417,7 +28893,7 @@
 -	esac
 -      fi
 -      ;;
--
+ 
 -    irix5* | irix6* | nonstopux*)
 -      if test "$GCC" = yes; then
 -	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
@@ -26429,7 +28905,7 @@
 -      hardcode_libdir_separator_F77=:
 -      link_all_deplibs_F77=yes
 -      ;;
--
+ 
 -    netbsd*)
 -      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 -	archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
@@ -26440,7 +28916,8 @@
 -      hardcode_direct_F77=yes
 -      hardcode_shlibpath_var_F77=no
 -      ;;
--
++  pkgpyexecdir=\${pyexecdir}/$PACKAGE
+ 
 -    newsos6)
 -      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
 -      hardcode_direct_F77=yes
@@ -26448,7 +28925,7 @@
 -      hardcode_libdir_separator_F77=:
 -      hardcode_shlibpath_var_F77=no
 -      ;;
--
+ 
 -    openbsd*)
 -      if test -f /usr/libexec/ld.so; then
 -	hardcode_direct_F77=yes
@@ -26474,7 +28951,7 @@
 -	ld_shlibs_F77=no
 -      fi
 -      ;;
--
+ 
 -    os2*)
 -      hardcode_libdir_flag_spec_F77='-L$libdir'
 -      hardcode_minus_L_F77=yes
@@ -26482,7 +28959,8 @@
 -      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'
 -      ;;
--
++  fi
+ 
 -    osf3*)
 -      if test "$GCC" = yes; then
 -	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
@@ -26494,7 +28972,7 @@
 -      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
 -      hardcode_libdir_separator_F77=:
 -      ;;
--
+ 
 -    osf4* | osf5*)	# as osf3* with the addition of -msym flag
 -      if test "$GCC" = yes; then
 -	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
@@ -26505,13 +28983,13 @@
 -	archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
 -	archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
 -	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
--
+ 
 -	# Both c and cxx compiler support -rpath directly
 -	hardcode_libdir_flag_spec_F77='-rpath $libdir'
 -      fi
 -      hardcode_libdir_separator_F77=:
 -      ;;
--
+ 
 -    solaris*)
 -      no_undefined_flag_F77=' -z text'
 -      if test "$GCC" = yes; then
@@ -26543,7 +29021,7 @@
 -      esac
 -      link_all_deplibs_F77=yes
 -      ;;
--
+ 
 -    sunos4*)
 -      if test "x$host_vendor" = xsequent; then
 -	# Use $CC to link under sequent, because it throws in some extra .o
@@ -26557,7 +29035,7 @@
 -      hardcode_minus_L_F77=yes
 -      hardcode_shlibpath_var_F77=no
 -      ;;
--
+ 
 -    sysv4)
 -      case $host_vendor in
 -	sni)
@@ -26579,13 +29057,13 @@
 -      runpath_var='LD_RUN_PATH'
 -      hardcode_shlibpath_var_F77=no
 -      ;;
--
+ 
 -    sysv4.3*)
 -      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
 -      hardcode_shlibpath_var_F77=no
 -      export_dynamic_flag_spec_F77='-Bexport'
 -      ;;
--
+ 
 -    sysv4*MP*)
 -      if test -d /usr/nec; then
 -	archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
@@ -26595,13 +29073,13 @@
 -	ld_shlibs_F77=yes
 -      fi
 -      ;;
--
+ 
 -    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
 -      no_undefined_flag_F77='${wl}-z,text'
 -      archive_cmds_need_lc_F77=no
 -      hardcode_shlibpath_var_F77=no
 -      runpath_var='LD_RUN_PATH'
--
+ 
 -      if test "$GCC" = yes; then
 -	archive_cmds_F77='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 -	archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -26610,7 +29088,7 @@
 -	archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 -      fi
 -      ;;
--
+ 
 -    sysv5* | sco3.2v5* | sco5v6*)
 -      # Note: We can NOT use -z defs as we might desire, because we do not
 -      # link with -lc, and that would cause any symbols used from libc to
@@ -26627,7 +29105,28 @@
 -      link_all_deplibs_F77=yes
 -      export_dynamic_flag_spec_F77='${wl}-Bexport'
 -      runpath_var='LD_RUN_PATH'
--
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for headers required to compile python extensions" >&5
++$as_echo_n "checking for headers required to compile python extensions... " >&6; }
++py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
++py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
++if test -x "$PYTHON-config"; then
++PYTHON_INCLUDES=`$PYTHON-config --includes 2>/dev/null`
++else
++PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
++if test "$py_prefix" != "$py_exec_prefix"; then
++  PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
++fi
++fi
++save_CPPFLAGS="$CPPFLAGS"
++CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <Python.h>
++_ACEOF
++if ac_fn_c_try_cpp "$LINENO"; then :
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
++$as_echo "found" >&6; }
+ 
 -      if test "$GCC" = yes; then
 -	archive_cmds_F77='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
 -	archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -26636,23 +29135,35 @@
 -	archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
 -      fi
 -      ;;
--
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for python libraries" >&5
++$as_echo_n "checking for python libraries... " >&6; }
+ 
 -    uts4*)
 -      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
 -      hardcode_libdir_flag_spec_F77='-L$libdir'
 -      hardcode_shlibpath_var_F77=no
 -      ;;
--
+ 
 -    *)
 -      ld_shlibs_F77=no
 -      ;;
 -    esac
--  fi
--
++link_pymodules_libpython=false;
++if egrep "^#define Py_ENABLE_SHARED" "${py_exec_prefix}/include/python${PYTHON_VERSION}/pyconfig.h" > /dev/null ; then
++  if test x`uname -s` != xDarwin; then
++      PYTHON_LDFLAGS="-no-undefined"
++      link_pymodules_libpython=true;
+   fi
++fi
+ 
 -{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
 -$as_echo "$ld_shlibs_F77" >&6; }
 -test "$ld_shlibs_F77" = no && can_build_shared=no
--
++PYTHON_CC=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_config_var('CC')"`
++PYTHON_LIB_DEPS=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_config_var('SYSLIBS'), sysconfig.get_config_var('SHLIBS')"`
++PYTHON_LIBDIR=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_config_var('LIBDIR')"`
++PYTHON_LIBPL=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_config_var('LIBPL')"`
+ 
 -#
 -# Do we need to explicitly link libc?
 -#
@@ -26660,7 +29171,9 @@
 -x|xyes)
 -  # Assume -lc should be added
 -  archive_cmds_need_lc_F77=yes
--
++save_CC="$CC"
++save_LIBS="$LIBS"
+ 
 -  if test "$enable_shared" = yes && test "$GCC" = yes; then
 -    case $archive_cmds_F77 in
 -    *'~'*)
@@ -26674,7 +29187,8 @@
 -$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
 -      $rm conftest*
 -      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
--
++PYTHON_EMBED_LIBS="-L${PYTHON_LIBDIR} ${PYTHON_LIB_DEPS} -lpython${PYTHON_VERSION}"
+ 
 -      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>&5
 -  ac_status=$?
@@ -26715,7 +29229,11 @@
 -  fi
 -  ;;
 -esac
--
++CC="$PYTHON_CC"
++LIBS="$LIBS $PYTHON_EMBED_LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
+ 
 -{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
 -$as_echo_n "checking dynamic linker characteristics... " >&6; }
 -library_names_spec=
@@ -26731,20 +29249,43 @@
 -version_type=none
 -dynamic_linker="$host_os ld.so"
 -sys_lib_dlsearch_path_spec="/lib /usr/lib"
--
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char Py_Initialize ();
++int
++main ()
++{
++return Py_Initialize ();
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
+ 
 -need_lib_prefix=unknown
 -hardcode_into_libs=no
--
++            LIBS="$save_LIBS";
++            if $link_pymodules_libpython; then
++                PYTHON_LIBS="$PYTHON_EMBED_LIBS";
++            fi
++            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_EMBED_LIBS" >&5
++$as_echo "$PYTHON_EMBED_LIBS" >&6; };
+ 
 -# when you set need_version to no, make sure it does not cause -set_version
 -# flags to be left without arguments
 -need_version=unknown
--
++else
+ 
 -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'
 -  ;;
@@ -26758,7 +29299,9 @@
 -    # 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
++  if test -x "$PYTHON-config"; then
++    PYTHON_EMBED_LIBS=`$PYTHON-config --ldflags 2>/dev/null`
+   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
@@ -26790,21 +29333,41 @@
 -      soname_spec='${libname}${release}${shared_ext}$major'
 -    fi
 -    shlibpath_var=LIBPATH
--  fi
++    PYTHON_EMBED_LIBS="-L${PYTHON_LIBPL} ${PYTHON_LIB_DEPS} -lpython${PYTHON_VERSION}"
+   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'
 -  ;;
--
++  LIBS="$save_LIBS $PYTHON_EMBED_LIBS";
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
+ 
 -beos*)
 -  library_names_spec='${libname}${shared_ext}'
 -  dynamic_linker="$host_os ld.so"
 -  shlibpath_var=LIBRARY_PATH
 -  ;;
--
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char Py_Initialize ();
++int
++main ()
++{
++return Py_Initialize ();
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
+ 
 -bsdi[45]*)
 -  version_type=linux
 -  need_version=no
@@ -26818,13 +29381,25 @@
 -  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
 -  # libtool to hard-code these into programs
 -  ;;
--
++            LIBS="$save_LIBS";
++            if $link_pymodules_libpython; then
++                PYTHON_LIBS="$PYTHON_EMBED_LIBS";
++            fi
++            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_EMBED_LIBS" >&5
++$as_echo "$PYTHON_EMBED_LIBS" >&6; };
+ 
 -cygwin* | mingw* | pw32*)
 -  version_type=windows
 -  shrext_cmds=".dll"
 -  need_version=no
 -  need_lib_prefix=no
--
++else
++           { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
++$as_echo "not found" >&6; }; as_fn_error "could not find Python headers" "$LINENO" 5
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ 
 -  case $GCC,$host_os in
 -  yes,cygwin* | yes,mingw* | yes,pw32*)
 -    library_names_spec='$libname.dll.a'
@@ -26839,7 +29414,11 @@
 -      dlpath=$dir/\$dldll~
 -       $rm \$dlpath'
 -    shlibpath_overrides_runpath=yes
--
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++CC="$save_CC"
+ 
 -    case $host_os in
 -    cygwin*)
 -      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
@@ -26868,7 +29447,7 @@
 -      ;;
 -    esac
 -    ;;
--
+ 
 -  *)
 -    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
 -    ;;
@@ -26877,7 +29456,14 @@
 -  # FIXME: first we should search . and the directory the executable is in
 -  shlibpath_var=PATH
 -  ;;
--
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
++$as_echo "not found" >&6; }
++as_fn_error "could not find Python headers" "$LINENO" 5
++fi
++rm -f conftest.err conftest.$ac_ext
++CPPFLAGS="$save_CPPFLAGS"
+ 
 -darwin* | rhapsody*)
 -  dynamic_linker="$host_os dyld"
 -  version_type=darwin
@@ -26888,10 +29474,40 @@
 -  shlibpath_overrides_runpath=yes
 -  shlibpath_var=DYLD_LIBRARY_PATH
 -  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
--
++CC="$PYTHON_CC"
+ 
 -  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
--  ;;
--
++
++
++if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
++	if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
++set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  case $PKG_CONFIG in
++  [\\/]* | ?:[\\/]*)
++  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+   ;;
++  *)
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++  done
++IFS=$as_save_IFS
+ 
 -dgux*)
 -  version_type=linux
 -  need_lib_prefix=no
@@ -26899,23 +29515,83 @@
 -  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
--  ;;
--
+   ;;
++esac
++fi
++PKG_CONFIG=$ac_cv_path_PKG_CONFIG
++if test -n "$PKG_CONFIG"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
++$as_echo "$PKG_CONFIG" >&6; }
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++
++fi
++if test -z "$ac_cv_path_PKG_CONFIG"; then
++  ac_pt_PKG_CONFIG=$PKG_CONFIG
++  # Extract the first word of "pkg-config", so it can be a program name with args.
++set dummy pkg-config; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  case $ac_pt_PKG_CONFIG in
++  [\\/]* | ?:[\\/]*)
++  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
++  ;;
++  *)
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++  done
++IFS=$as_save_IFS
+ 
 -freebsd1*)
 -  dynamic_linker=no
--  ;;
--
+   ;;
++esac
++fi
++ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
++if test -n "$ac_pt_PKG_CONFIG"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
++$as_echo "$ac_pt_PKG_CONFIG" >&6; }
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
+ 
 -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
++  if test "x$ac_pt_PKG_CONFIG" = x; then
++    PKG_CONFIG=""
+   else
 -    case $host_os in
 -    freebsd[123]*) objformat=aout ;;
 -    *) objformat=elf ;;
 -    esac
--  fi
++    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
++    PKG_CONFIG=$ac_pt_PKG_CONFIG
+   fi
 -  version_type=freebsd-$objformat
 -  case $version_type in
 -    freebsd-elf*)
@@ -27981,305 +30657,192 @@
 -      # 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).
 -
-+
-+    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'
-       ;;
- 
-     hpux9* | hpux10* | hpux11*)
+-      ;;
+-
+-    hpux9* | hpux10* | hpux11*)
 -      lt_prog_compiler_wl_GCJ='-Wl,'
-+      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
-@@ -17035,141 +7322,180 @@ $as_echo_n "checking for $compiler optio
- 	# +Z the default
- 	;;
-       *)
+-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+-      # not for PA HP-UX.
+-      case $host_cpu in
+-      hppa*64*|ia64*)
+-	# +Z the default
+-	;;
+-      *)
 -	lt_prog_compiler_pic_GCJ='+Z'
-+	lt_prog_compiler_pic='+Z'
- 	;;
-       esac
-       # Is there a better lt_prog_compiler_static that works with the bundled CC?
+-	;;
+-      esac
+-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
 -      lt_prog_compiler_static_GCJ='${wl}-a ${wl}archive'
-+      lt_prog_compiler_static='${wl}-a ${wl}archive'
-       ;;
- 
-     irix5* | irix6* | nonstopux*)
+-      ;;
+-
+-    irix5* | irix6* | nonstopux*)
 -      lt_prog_compiler_wl_GCJ='-Wl,'
-+      lt_prog_compiler_wl='-Wl,'
-       # PIC (with -KPIC) is the default.
+-      # PIC (with -KPIC) is the default.
 -      lt_prog_compiler_static_GCJ='-non_shared'
 -      ;;
 -
 -    newsos6)
 -      lt_prog_compiler_pic_GCJ='-KPIC'
 -      lt_prog_compiler_static_GCJ='-Bstatic'
-+      lt_prog_compiler_static='-non_shared'
-       ;;
- 
-     linux* | k*bsd*-gnu)
-       case $cc_basename in
+-      ;;
+-
+-    linux* | k*bsd*-gnu)
+-      case $cc_basename in
 -      icc* | ecc*)
 -	lt_prog_compiler_wl_GCJ='-Wl,'
 -	lt_prog_compiler_pic_GCJ='-KPIC'
 -	lt_prog_compiler_static_GCJ='-static'
-+      # old Intel for x86_64 which still supported -KPIC.
-+      ecc*)
-+	lt_prog_compiler_wl='-Wl,'
-+	lt_prog_compiler_pic='-KPIC'
-+	lt_prog_compiler_static='-static'
-+        ;;
-+      # icc used to be incompatible with GCC.
-+      # ICC 10 doesn't accept -KPIC any more.
-+      icc* | ifort*)
-+	lt_prog_compiler_wl='-Wl,'
-+	lt_prog_compiler_pic='-fPIC'
-+	lt_prog_compiler_static='-static'
-         ;;
-+      # Lahey Fortran 8.1.
-+      lf95*)
-+	lt_prog_compiler_wl='-Wl,'
-+	lt_prog_compiler_pic='--shared'
-+	lt_prog_compiler_static='--static'
-+	;;
-       pgcc* | pgf77* | pgf90* | pgf95*)
-         # Portland Group compilers (*not* the Pentium gcc compiler,
- 	# which looks to be a dead project)
+-        ;;
+-      pgcc* | pgf77* | pgf90* | pgf95*)
+-        # Portland Group compilers (*not* the Pentium gcc compiler,
+-	# which looks to be a dead project)
 -	lt_prog_compiler_wl_GCJ='-Wl,'
 -	lt_prog_compiler_pic_GCJ='-fpic'
 -	lt_prog_compiler_static_GCJ='-Bstatic'
-+	lt_prog_compiler_wl='-Wl,'
-+	lt_prog_compiler_pic='-fpic'
-+	lt_prog_compiler_static='-Bstatic'
-         ;;
-       ccc*)
+-        ;;
+-      ccc*)
 -        lt_prog_compiler_wl_GCJ='-Wl,'
-+        lt_prog_compiler_wl='-Wl,'
-         # All Alpha code is PIC.
+-        # All Alpha code is PIC.
 -        lt_prog_compiler_static_GCJ='-non_shared'
-+        lt_prog_compiler_static='-non_shared'
-         ;;
-+      xl*)
-+	# IBM XL C 8.0/Fortran 10.1 on PPC
-+	lt_prog_compiler_wl='-Wl,'
-+	lt_prog_compiler_pic='-qpic'
-+	lt_prog_compiler_static='-qstaticlink'
-+	;;
-       *)
+-        ;;
+-      *)
 -        case `$CC -V 2>&1 | sed 5q` in
-+	case `$CC -V 2>&1 | sed 5q` in
- 	*Sun\ C*)
- 	  # Sun C 5.9
+-	*Sun\ C*)
+-	  # Sun C 5.9
 -	  lt_prog_compiler_pic_GCJ='-KPIC'
 -	  lt_prog_compiler_static_GCJ='-Bstatic'
 -	  lt_prog_compiler_wl_GCJ='-Wl,'
-+	  lt_prog_compiler_pic='-KPIC'
-+	  lt_prog_compiler_static='-Bstatic'
-+	  lt_prog_compiler_wl='-Wl,'
- 	  ;;
- 	*Sun\ F*)
- 	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+-	  ;;
+-	*Sun\ F*)
+-	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
 -	  lt_prog_compiler_pic_GCJ='-KPIC'
 -	  lt_prog_compiler_static_GCJ='-Bstatic'
 -	  lt_prog_compiler_wl_GCJ=''
-+	  lt_prog_compiler_pic='-KPIC'
-+	  lt_prog_compiler_static='-Bstatic'
-+	  lt_prog_compiler_wl=''
- 	  ;;
- 	esac
- 	;;
-       esac
-       ;;
- 
-+    newsos6)
-+      lt_prog_compiler_pic='-KPIC'
-+      lt_prog_compiler_static='-Bstatic'
-+      ;;
-+
-+    *nto* | *qnx*)
-+      # QNX uses GNU C++, but need to define -shared option too, otherwise
-+      # it will coredump.
-+      lt_prog_compiler_pic='-fPIC -shared'
-+      ;;
-+
-     osf3* | osf4* | osf5*)
+-	  ;;
+-	esac
+-	;;
+-      esac
+-      ;;
+-
+-    osf3* | osf4* | osf5*)
 -      lt_prog_compiler_wl_GCJ='-Wl,'
-+      lt_prog_compiler_wl='-Wl,'
-       # All OSF/1 code is PIC.
+-      # All OSF/1 code is PIC.
 -      lt_prog_compiler_static_GCJ='-non_shared'
-+      lt_prog_compiler_static='-non_shared'
-       ;;
- 
-     rdos*)
+-      ;;
+-
+-    rdos*)
 -      lt_prog_compiler_static_GCJ='-non_shared'
-+      lt_prog_compiler_static='-non_shared'
-       ;;
- 
-     solaris*)
+-      ;;
+-
+-    solaris*)
 -      lt_prog_compiler_pic_GCJ='-KPIC'
 -      lt_prog_compiler_static_GCJ='-Bstatic'
-+      lt_prog_compiler_pic='-KPIC'
-+      lt_prog_compiler_static='-Bstatic'
-       case $cc_basename in
-       f77* | f90* | f95*)
+-      case $cc_basename in
+-      f77* | f90* | f95*)
 -	lt_prog_compiler_wl_GCJ='-Qoption ld ';;
-+	lt_prog_compiler_wl='-Qoption ld ';;
-       *)
+-      *)
 -	lt_prog_compiler_wl_GCJ='-Wl,';;
-+	lt_prog_compiler_wl='-Wl,';;
-       esac
-       ;;
- 
-     sunos4*)
+-      esac
+-      ;;
+-
+-    sunos4*)
 -      lt_prog_compiler_wl_GCJ='-Qoption ld '
 -      lt_prog_compiler_pic_GCJ='-PIC'
 -      lt_prog_compiler_static_GCJ='-Bstatic'
-+      lt_prog_compiler_wl='-Qoption ld '
-+      lt_prog_compiler_pic='-PIC'
-+      lt_prog_compiler_static='-Bstatic'
-       ;;
- 
-     sysv4 | sysv4.2uw2* | sysv4.3*)
+-      ;;
+-
+-    sysv4 | sysv4.2uw2* | sysv4.3*)
 -      lt_prog_compiler_wl_GCJ='-Wl,'
 -      lt_prog_compiler_pic_GCJ='-KPIC'
 -      lt_prog_compiler_static_GCJ='-Bstatic'
-+      lt_prog_compiler_wl='-Wl,'
-+      lt_prog_compiler_pic='-KPIC'
-+      lt_prog_compiler_static='-Bstatic'
-       ;;
- 
-     sysv4*MP*)
-       if test -d /usr/nec ;then
+-      ;;
+-
+-    sysv4*MP*)
+-      if test -d /usr/nec ;then
 -	lt_prog_compiler_pic_GCJ='-Kconform_pic'
 -	lt_prog_compiler_static_GCJ='-Bstatic'
-+	lt_prog_compiler_pic='-Kconform_pic'
-+	lt_prog_compiler_static='-Bstatic'
-       fi
-       ;;
- 
-     sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+-      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'
-+      lt_prog_compiler_wl='-Wl,'
-+      lt_prog_compiler_pic='-KPIC'
-+      lt_prog_compiler_static='-Bstatic'
-       ;;
- 
-     unicos*)
+-      ;;
+-
+-    unicos*)
 -      lt_prog_compiler_wl_GCJ='-Wl,'
 -      lt_prog_compiler_can_build_shared_GCJ=no
-+      lt_prog_compiler_wl='-Wl,'
-+      lt_prog_compiler_can_build_shared=no
-       ;;
- 
-     uts4*)
+-      ;;
+-
+-    uts4*)
 -      lt_prog_compiler_pic_GCJ='-pic'
 -      lt_prog_compiler_static_GCJ='-Bstatic'
-+      lt_prog_compiler_pic='-pic'
-+      lt_prog_compiler_static='-Bstatic'
-       ;;
- 
-     *)
+-      ;;
+-
+-    *)
 -      lt_prog_compiler_can_build_shared_GCJ=no
-+      lt_prog_compiler_can_build_shared=no
-       ;;
-     esac
-   fi
- 
+-      ;;
+-    esac
+-  fi
+-
 -{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
 -$as_echo "$lt_prog_compiler_pic_GCJ" >&6; }
-+case $host_os in
-+  # For platforms which do not support PIC, -DPIC is meaningless:
-+  *djgpp*)
-+    lt_prog_compiler_pic=
-+    ;;
-+  *)
-+    lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
-+    ;;
-+esac
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
-+$as_echo "$lt_prog_compiler_pic" >&6; }
-+
-+
-+
-+
-+
- 
- #
- # Check to make sure the PIC flag actually works.
- #
+-
+-#
+-# Check to make sure the PIC flag actually works.
+-#
 -if test -n "$lt_prog_compiler_pic_GCJ"; then
 -
 -{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
 -$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... " >&6; }
 -if test "${lt_cv_prog_compiler_pic_works_GCJ+set}" = set; then
-+if test -n "$lt_prog_compiler_pic"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
-+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
-+if test "${lt_cv_prog_compiler_pic_works+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
+-  $as_echo_n "(cached) " >&6
+-else
 -  lt_cv_prog_compiler_pic_works_GCJ=no
 -  ac_outfile=conftest.$ac_objext
-+  lt_cv_prog_compiler_pic_works=no
-+   ac_outfile=conftest.$ac_objext
-    echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 -   lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
-+   lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
-    # Insert the option either (1) after the last *FLAGS variable, or
-    # (2) before a word containing "conftest.", or (3) at the end.
-    # Note that $ac_compile itself does not contain backslashes and begins
-@@ -17179,57 +7505,53 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
+-   # 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:17182: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:7508: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
+-   (eval "$lt_compile" 2>conftest.err)
+-   ac_status=$?
+-   cat conftest.err >&5
 -   echo "$as_me:17186: \$? = $ac_status" >&5
-+   echo "$as_me:7512: \$? = $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.
+-   if (exit $ac_status) && test -s "$ac_outfile"; then
+-     # The compiler can only warn and ignore the option if not recognized
+-     # So say no if there are warnings other than the usual output.
 -     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-+     $ECHO "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
+-     $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_GCJ=yes
-+       lt_cv_prog_compiler_pic_works=yes
-      fi
-    fi
+-     fi
+-   fi
 -   $rm conftest*
-+   $RM conftest*
- 
- fi
+-
+-fi
 -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5
 -$as_echo "$lt_cv_prog_compiler_pic_works_GCJ" >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
-+$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
- 
+-
 -if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then
 -    case $lt_prog_compiler_pic_GCJ in
-+if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
-+    case $lt_prog_compiler_pic in
-      "" | " "*) ;;
+-     "" | " "*) ;;
 -     *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;;
-+     *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
-      esac
- else
+-     esac
+-else
 -    lt_prog_compiler_pic_GCJ=
 -     lt_prog_compiler_can_build_shared_GCJ=no
-+    lt_prog_compiler_pic=
-+     lt_prog_compiler_can_build_shared=no
- fi
- 
- fi
+-fi
+-
+-fi
 -case $host_os in
 -  # For platforms which do not support PIC, -DPIC is meaningless:
 -  *djgpp*)
@@ -28289,226 +30852,126 @@
 -    lt_prog_compiler_pic_GCJ="$lt_prog_compiler_pic_GCJ"
 -    ;;
 -esac
-+
-+
-+
-+
-+
- 
- #
- # Check to make sure the static flag actually works.
- #
+-
+-#
+-# Check to make sure the static flag actually works.
+-#
 -wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
 -{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-+wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
- $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+-$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
 -if test "${lt_cv_prog_compiler_static_works_GCJ+set}" = set; then
-+if test "${lt_cv_prog_compiler_static_works+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
+-  $as_echo_n "(cached) " >&6
+-else
 -  lt_cv_prog_compiler_static_works_GCJ=no
-+  lt_cv_prog_compiler_static_works=no
-    save_LDFLAGS="$LDFLAGS"
-    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-    echo "$lt_simple_link_test_code" > conftest.$ac_ext
-@@ -17239,36 +7561,96 @@ else
-      if test -s conftest.err; then
-        # Append any errors to the config.log.
-        cat conftest.err 1>&5
+-   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
-+       $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
+-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+-       if diff conftest.exp conftest.er2 >/dev/null; then
 -         lt_cv_prog_compiler_static_works_GCJ=yes
-+         lt_cv_prog_compiler_static_works=yes
-        fi
-      else
+-       fi
+-     else
 -       lt_cv_prog_compiler_static_works_GCJ=yes
-+       lt_cv_prog_compiler_static_works=yes
-      fi
-    fi
+-     fi
+-   fi
 -   $rm -r conftest*
-+   $RM -r conftest*
-    LDFLAGS="$save_LDFLAGS"
- 
+-   LDFLAGS="$save_LDFLAGS"
+-
 -fi
 -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5
 -$as_echo "$lt_cv_prog_compiler_static_works_GCJ" >&6; }
-+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; }
-+
-+if test x"$lt_cv_prog_compiler_static_works" = xyes; then
-+    :
-+else
-+    lt_prog_compiler_static=
-+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+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  lt_cv_prog_compiler_c_o=no
-+   $RM -r conftest 2>/dev/null
-+   mkdir conftest
-+   cd conftest
-+   mkdir out
-+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-+
-+   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:7613: $lt_compile\"" >&5)
-+   (eval "$lt_compile" 2>out/conftest.err)
-+   ac_status=$?
-+   cat out/conftest.err >&5
-+   echo "$as_me:7617: \$? = $ac_status" >&5
-+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-+   then
-+     # The compiler can only warn and ignore the option if not recognized
-+     # So say no if there are warnings
-+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
-+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-+       lt_cv_prog_compiler_c_o=yes
-+     fi
-+   fi
-+   chmod u+w . 2>&5
-+   $RM conftest*
-+   # SGI C++ compiler will create directory out/ii_files/ for
-+   # template instantiation
-+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
-+   $RM out/* && rmdir out
-+   cd ..
-+   $RM -r conftest
-+   $RM conftest*
-+
-+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; }
-+
-+
-+
- 
+-
 -if test x"$lt_cv_prog_compiler_static_works_GCJ" = xyes; then
 -    :
 -else
 -    lt_prog_compiler_static_GCJ=
 -fi
- 
- 
+-
+-
 -{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
- $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
 -if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
-+if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
+-  $as_echo_n "(cached) " >&6
+-else
 -  lt_cv_prog_compiler_c_o_GCJ=no
 -   $rm -r conftest 2>/dev/null
-+  lt_cv_prog_compiler_c_o=no
-+   $RM -r conftest 2>/dev/null
-    mkdir conftest
-    cd conftest
-    mkdir out
-@@ -17283,51 +7665,53 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
+-   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:17286: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:7668: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
+-   (eval "$lt_compile" 2>out/conftest.err)
+-   ac_status=$?
+-   cat out/conftest.err >&5
 -   echo "$as_me:17290: \$? = $ac_status" >&5
-+   echo "$as_me:7672: \$? = $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
+-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+-   then
+-     # The compiler can only warn and ignore the option if not recognized
+-     # So say no if there are warnings
 -     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
-+     $ECHO "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
+-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
 -       lt_cv_prog_compiler_c_o_GCJ=yes
-+       lt_cv_prog_compiler_c_o=yes
-      fi
-    fi
-    chmod u+w . 2>&5
+-     fi
+-   fi
+-   chmod u+w . 2>&5
 -   $rm conftest*
-+   $RM conftest*
-    # SGI C++ compiler will create directory out/ii_files/ for
-    # template instantiation
+-   # 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
-+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
-+   $RM out/* && rmdir out
-    cd ..
+-   cd ..
 -   rmdir conftest
 -   $rm conftest*
-+   $RM -r conftest
-+   $RM conftest*
- 
- fi
+-
+-fi
 -{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
 -$as_echo "$lt_cv_prog_compiler_c_o_GCJ" >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
-+$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-+
-+
- 
- 
- hard_links="nottested"
+-
+-
+-hard_links="nottested"
 -if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then
-+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
+-  # do not overwrite the value of need_locks provided by the user
 -  { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
- $as_echo_n "checking if we can lock with hard links... " >&6; }
-   hard_links=yes
+-$as_echo_n "checking if we can lock with hard links... " >&6; }
+-  hard_links=yes
 -  $rm conftest*
-+  $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
+-  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:$LINENO: result: $hard_links" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
- $as_echo "$hard_links" >&6; }
-   if test "$hard_links" = no; then
+-$as_echo "$hard_links" >&6; }
+-  if test "$hard_links" = no; then
 -    { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
- $as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-     need_locks=warn
-   fi
-@@ -17335,39 +7719,47 @@ else
-   need_locks=no
- fi
- 
+-$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+-    need_locks=warn
+-  fi
+-else
+-  need_locks=no
+-fi
+-
 -{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
- $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
- 
-   runpath_var=
+-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
+-
+-  runpath_var=
 -  allow_undefined_flag_GCJ=
 -  enable_shared_with_static_runtimes_GCJ=no
 -  archive_cmds_GCJ=
@@ -28530,47 +30993,21 @@
 -  module_expsym_cmds_GCJ=
 -  always_export_symbols_GCJ=no
 -  export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-+  allow_undefined_flag=
-+  always_export_symbols=no
-+  archive_cmds=
-+  archive_expsym_cmds=
-+  compiler_needs_object=no
-+  enable_shared_with_static_runtimes=no
-+  export_dynamic_flag_spec=
-+  export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-+  hardcode_automatic=no
-+  hardcode_direct=no
-+  hardcode_direct_absolute=no
-+  hardcode_libdir_flag_spec=
-+  hardcode_libdir_flag_spec_ld=
-+  hardcode_libdir_separator=
-+  hardcode_minus_L=no
-+  hardcode_shlibpath_var=unsupported
-+  inherit_rpath=no
-+  link_all_deplibs=unknown
-+  module_cmds=
-+  module_expsym_cmds=
-+  old_archive_from_new_cmds=
-+  old_archive_from_expsyms_cmds=
-+  thread_safe_flag_spec=
-+  whole_archive_flag_spec=
-   # include_expsyms should be a list of space-separated symbols to be *always*
-   # included in the symbol list
+-  # include_expsyms should be a list of space-separated symbols to be *always*
+-  # included in the symbol list
 -  include_expsyms_GCJ=
-+  include_expsyms=
-   # exclude_expsyms can be an extended regexp of symbols to exclude
-   # it will be wrapped by ` (' and `)$', so one must not match beginning or
-   # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-   # as well as any symbol that contains `d'.
+-  # exclude_expsyms can be an extended regexp of symbols to exclude
+-  # it will be wrapped by ` (' and `)$', so one must not match beginning or
+-  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+-  # as well as any symbol that contains `d'.
 -  exclude_expsyms_GCJ='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
-+  exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
-   # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-   # platforms (ab)use it in PIC code, but their linkers get confused if
-   # the symbol is explicitly referenced.  Since portable code cannot
-@@ -17375,19 +7767,9 @@ $as_echo_n "checking whether the $compil
-   # preloaded symbol tables.
-   # Exclude shared library initialization/finalization symbols.
-   extract_expsyms_cmds=
+-  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+-  # platforms (ab)use it in PIC code, but their linkers get confused if
+-  # the symbol is explicitly referenced.  Since portable code cannot
+-  # rely on this symbol name, it's probably fine to never include it in
+-  # preloaded symbol tables.
+-  # Exclude shared library initialization/finalization symbols.
+-  extract_expsyms_cmds=
 -  # Just being paranoid about ensuring that cc_basename is set.
 -  for cc_temp in $compiler""; do
 -  case $cc_temp in
@@ -28581,72 +31018,70 @@
 -  esac
 -done
 -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
- 
-   case $host_os in
+-
+-  case $host_os in
 -  cygwin* | mingw* | pw32*)
-+  cygwin* | mingw* | pw32* | cegcc*)
-     # FIXME: the MSVC++ port hasn't been tested in a loooong time
-     # When not using gcc, we currently assume that we are using
-     # Microsoft Visual C++.
-@@ -17402,9 +7784,12 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -
-   openbsd*)
-     with_gnu_ld=no
-     ;;
-+  linux* | k*bsd*-gnu)
-+    link_all_deplibs=no
-+    ;;
-   esac
- 
+-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+-    # When not using gcc, we currently assume that we are using
+-    # Microsoft Visual C++.
+-    if test "$GCC" != yes; then
+-      with_gnu_ld=no
+-    fi
+-    ;;
+-  interix*)
+-    # we just hope/assume this is gcc and not c89 (= MSVC++)
+-    with_gnu_ld=yes
+-    ;;
+-  openbsd*)
+-    with_gnu_ld=no
+-    ;;
+-  esac
+-
 -  ld_shlibs_GCJ=yes
-+  ld_shlibs=yes
-   if test "$with_gnu_ld" = yes; then
-     # If archive_cmds runs LD, not CC, wlarc should be empty
-     wlarc='${wl}'
-@@ -17413,16 +7798,16 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -
-     # are reset later if shared libraries are not supported. Putting them
-     # here allows them to be overridden if necessary.
-     runpath_var=LD_RUN_PATH
+-  if test "$with_gnu_ld" = yes; then
+-    # If archive_cmds runs LD, not CC, wlarc should be empty
+-    wlarc='${wl}'
+-
+-    # Set some defaults for GNU ld with shared library support. These
+-    # are reset later if shared libraries are not supported. Putting them
+-    # here allows them to be overridden if necessary.
+-    runpath_var=LD_RUN_PATH
 -    hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir'
 -    export_dynamic_flag_spec_GCJ='${wl}--export-dynamic'
-+    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+    export_dynamic_flag_spec='${wl}--export-dynamic'
-     # ancient GNU ld didn't support --whole-archive et. al.
+-    # ancient GNU ld didn't support --whole-archive et. al.
 -    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
 -	whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
 -      else
 -  	whole_archive_flag_spec_GCJ=
-+    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
-+      whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+    else
-+      whole_archive_flag_spec=
-     fi
-     supports_anon_versioning=no
+-    fi
+-    supports_anon_versioning=no
 -    case `$LD -v 2>/dev/null` in
-+    case `$LD -v 2>&1` in
-       *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-       *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-       *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-@@ -17435,8 +7820,8 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -
-     aix[3-9]*)
-       # On AIX/PPC, the GNU linker is very broken
-       if test "$host_cpu" != ia64; then
+-      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
+-      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+-      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+-      *\ 2.11.*) ;; # other 2.11 versions
+-      *) supports_anon_versioning=yes ;;
+-    esac
+-
+-    # See if GNU ld supports shared libraries.
+-    case $host_os in
+-    aix[3-9]*)
+-      # On AIX/PPC, the GNU linker is very broken
+-      if test "$host_cpu" != ia64; then
 -	ld_shlibs_GCJ=no
 -	cat <<EOF 1>&2
-+	ld_shlibs=no
-+	cat <<_LT_EOF 1>&2
- 
- *** Warning: the GNU linker, at least up to release 2.9.1, is reported
- *** to be unable to reliably create shared libraries on AIX.
-@@ -17444,49 +7829,50 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -
- *** really care for shared libraries, you may want to modify your PATH
- *** so that a non-GNU linker is found, and then restart.
- 
+-
+-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
+-*** to be unable to reliably create shared libraries on AIX.
+-*** Therefore, libtool is disabling shared libraries support.  If you
+-*** really care for shared libraries, you may want to modify your PATH
+-*** so that a non-GNU linker is found, and then restart.
+-
 -EOF
-+_LT_EOF
-       fi
-       ;;
- 
-     amigaos*)
+-      fi
+-      ;;
+-
+-    amigaos*)
 -      archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
 -      hardcode_libdir_flag_spec_GCJ='-L$libdir'
 -      hardcode_minus_L_GCJ=yes
@@ -28658,369 +31093,253 @@
 -      # behavior of shared libraries on other platforms, we can't use
 -      # them.
 -      ld_shlibs_GCJ=no
-+      case $host_cpu in
-+      powerpc)
-+            # see comment about AmigaOS4 .so support
-+            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+            archive_expsym_cmds=''
-+        ;;
-+      m68k)
-+            archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-+            hardcode_libdir_flag_spec='-L$libdir'
-+            hardcode_minus_L=yes
-+        ;;
-+      esac
-       ;;
- 
-     beos*)
+-      ;;
+-
+-    beos*)
 -      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 -	allow_undefined_flag_GCJ=unsupported
-+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-+	allow_undefined_flag=unsupported
- 	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
- 	# support --undefined.  This deserves some investigation.  FIXME
+-	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
+-	# support --undefined.  This deserves some investigation.  FIXME
 -	archive_cmds_GCJ='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-       else
+-      else
 -	ld_shlibs_GCJ=no
-+	ld_shlibs=no
-       fi
-       ;;
- 
+-      fi
+-      ;;
+-
 -    cygwin* | mingw* | pw32*)
 -      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, GCJ) is actually meaningless,
-+    cygwin* | mingw* | pw32* | cegcc*)
-+      # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
-       # as there is no search path for DLLs.
+-      # as there is no search path for DLLs.
 -      hardcode_libdir_flag_spec_GCJ='-L$libdir'
 -      allow_undefined_flag_GCJ=unsupported
 -      always_export_symbols_GCJ=no
 -      enable_shared_with_static_runtimes_GCJ=yes
 -      export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
-+      hardcode_libdir_flag_spec='-L$libdir'
-+      allow_undefined_flag=unsupported
-+      always_export_symbols=no
-+      enable_shared_with_static_runtimes=yes
-+      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
- 
+-
 -      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
 -        archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-+      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-+        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
- 	# If the export-symbols file already is a .def file (1st line
- 	# is EXPORTS), use it as is; otherwise, prepend...
+-	# If the export-symbols file already is a .def file (1st line
+-	# is EXPORTS), use it as is; otherwise, prepend...
 -	archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-+	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- 	  cp $export_symbols $output_objdir/$soname.def;
- 	else
- 	  echo EXPORTS > $output_objdir/$soname.def;
-@@ -17494,79 +7880,109 @@ EOF
- 	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
+-	  cp $export_symbols $output_objdir/$soname.def;
+-	else
+-	  echo EXPORTS > $output_objdir/$soname.def;
+-	  cat $export_symbols >> $output_objdir/$soname.def;
+-	fi~
+-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+-      else
 -	ld_shlibs_GCJ=no
-+	ld_shlibs=no
-       fi
-       ;;
- 
-     interix[3-9]*)
+-      fi
+-      ;;
+-
+-    interix[3-9]*)
 -      hardcode_direct_GCJ=no
 -      hardcode_shlibpath_var_GCJ=no
 -      hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
 -      export_dynamic_flag_spec_GCJ='${wl}-E'
-+      hardcode_direct=no
-+      hardcode_shlibpath_var=no
-+      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-+      export_dynamic_flag_spec='${wl}-E'
-       # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-       # Instead, shared libraries are loaded at an image base (0x10000000 by
-       # default) and relocated if they conflict, which is a slow very memory
-       # consuming and fragmenting process.  To avoid this, we pick a random,
-       # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-       # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+-      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+-      # Instead, shared libraries are loaded at an image base (0x10000000 by
+-      # default) and relocated if they conflict, which is a slow very memory
+-      # consuming and fragmenting process.  To avoid this, we pick a random,
+-      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+-      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
 -      archive_cmds_GCJ='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
 -      archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-+      archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-+      archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-       ;;
- 
+-      ;;
+-
 -    gnu* | linux* | k*bsd*-gnu)
 -      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+    gnu* | linux* | tpf* | k*bsd*-gnu)
-+      tmp_diet=no
-+      if test "$host_os" = linux-dietlibc; then
-+	case $cc_basename in
-+	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
-+	esac
-+      fi
-+      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
-+	 && test "$tmp_diet" = no
-+      then
- 	tmp_addflag=
-+	tmp_sharedflag='-shared'
- 	case $cc_basename,$host_cpu in
+-	tmp_addflag=
+-	case $cc_basename,$host_cpu in
 -	pgcc*)				# Portland Group C compiler
 -	  whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-+        pgcc*)				# Portland Group C compiler
-+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
- 	  tmp_addflag=' $pic_flag'
- 	  ;;
- 	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
+-	  tmp_addflag=' $pic_flag'
+-	  ;;
+-	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
 -	  whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
- 	  tmp_addflag=' $pic_flag -Mnomain' ;;
+-	  tmp_addflag=' $pic_flag -Mnomain' ;;
 -	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
-+	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
- 	  tmp_addflag=' -i_dynamic' ;;
- 	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
- 	  tmp_addflag=' -i_dynamic -nofor_main' ;;
- 	ifc* | ifort*)			# Intel Fortran compiler
- 	  tmp_addflag=' -nofor_main' ;;
-+	lf95*)				# Lahey Fortran 8.1
-+	  whole_archive_flag_spec=
-+	  tmp_sharedflag='--shared' ;;
-+	xl[cC]*)			# IBM XL C 8.0 on PPC (deal with xlf below)
-+	  tmp_sharedflag='-qmkshrobj'
-+	  tmp_addflag= ;;
- 	esac
- 	case `$CC -V 2>&1 | sed 5q` in
- 	*Sun\ C*)			# Sun C 5.9
+-	  tmp_addflag=' -i_dynamic' ;;
+-	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
+-	  tmp_addflag=' -i_dynamic -nofor_main' ;;
+-	ifc* | ifort*)			# Intel Fortran compiler
+-	  tmp_addflag=' -nofor_main' ;;
+-	esac
+-	case `$CC -V 2>&1 | sed 5q` in
+-	*Sun\ C*)			# Sun C 5.9
 -	  whole_archive_flag_spec_GCJ='${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'
-+	  whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-+	  compiler_needs_object=yes
- 	  tmp_sharedflag='-G' ;;
- 	*Sun\ F*)			# Sun Fortran 8.3
- 	  tmp_sharedflag='-G' ;;
+-	  tmp_sharedflag='-G' ;;
+-	*Sun\ F*)			# Sun Fortran 8.3
+-	  tmp_sharedflag='-G' ;;
 -	*)
 -	  tmp_sharedflag='-shared' ;;
- 	esac
+-	esac
 -	archive_cmds_GCJ='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	archive_cmds='$CC '"$tmp_sharedflag""$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 '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
 -	fi
-+        if test "x$supports_anon_versioning" = xyes; then
-+          archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
-+	    cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-+	    echo "local: *; };" >> $output_objdir/$libname.ver~
-+	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+        fi
-+
-+	case $cc_basename in
-+	xlf*)
-+	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
-+	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
-+	  hardcode_libdir_flag_spec=
-+	  hardcode_libdir_flag_spec_ld='-rpath $libdir'
-+	  archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
-+	  if test "x$supports_anon_versioning" = xyes; then
-+	    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
-+	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-+	      echo "local: *; };" >> $output_objdir/$libname.ver~
-+	      $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
-+	  fi
-+	  ;;
-+	esac
-       else
+-      else
 -	ld_shlibs_GCJ=no
-+        ld_shlibs=no
-       fi
-       ;;
- 
+-      fi
+-      ;;
+-
 -    netbsd*)
 -      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 -	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-+    netbsd* | netbsdelf*-gnu)
-+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-+	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- 	wlarc=
-       else
+-	wlarc=
+-      else
 -	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 -	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+	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
-       ;;
- 
-     solaris*)
+-      fi
+-      ;;
+-
+-    solaris*)
 -      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
 -	ld_shlibs_GCJ=no
 -	cat <<EOF 1>&2
-+      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
-+	ld_shlibs=no
-+	cat <<_LT_EOF 1>&2
- 
- *** Warning: The releases 2.8.* of the GNU linker cannot reliably
- *** create shared libraries on Solaris systems.  Therefore, libtool
-@@ -17575,19 +7991,19 @@ EOF
- *** your PATH or compiler configuration so that the native linker is
- *** used, and then restart.
- 
+-
+-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+-*** create shared libraries on Solaris systems.  Therefore, libtool
+-*** is disabling shared libraries support.  We urge you to upgrade GNU
+-*** binutils to release 2.9.1 or newer.  Another option is to modify
+-*** your PATH or compiler configuration so that the native linker is
+-*** used, and then restart.
+-
 -EOF
 -      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 -	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 -	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+_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
+-      else
 -	ld_shlibs_GCJ=no
-+	ld_shlibs=no
-       fi
-       ;;
- 
-     sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-       case `$LD -v 2>&1` in
-         *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
+-      fi
+-      ;;
+-
+-    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+-      case `$LD -v 2>&1` in
+-        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
 -	ld_shlibs_GCJ=no
-+	ld_shlibs=no
- 	cat <<_LT_EOF 1>&2
- 
- *** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
-@@ -17600,54 +8016,58 @@ EOF
- _LT_EOF
- 	;;
- 	*)
+-	cat <<_LT_EOF 1>&2
+-
+-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+-*** reliably create shared libraries on SCO systems.  Therefore, libtool
+-*** is disabling shared libraries support.  We urge you to upgrade GNU
+-*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
+-*** your PATH or compiler configuration so that the native linker is
+-*** used, and then restart.
+-
+-_LT_EOF
+-	;;
+-	*)
 -	  if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 -	    hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
 -	    archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
 -	    archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
-+	  # 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
+-	  else
 -	    ld_shlibs_GCJ=no
-+	    ld_shlibs=no
- 	  fi
- 	;;
-       esac
-       ;;
- 
-     sunos4*)
+-	  fi
+-	;;
+-      esac
+-      ;;
+-
+-    sunos4*)
 -      archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+      archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-       wlarc=
+-      wlarc=
 -      hardcode_direct_GCJ=yes
 -      hardcode_shlibpath_var_GCJ=no
-+      hardcode_direct=yes
-+      hardcode_shlibpath_var=no
-       ;;
- 
-     *)
+-      ;;
+-
+-    *)
 -      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 -	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 -	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+      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
+-      else
 -	ld_shlibs_GCJ=no
-+	ld_shlibs=no
-       fi
-       ;;
-     esac
- 
+-      fi
+-      ;;
+-    esac
+-
 -    if test "$ld_shlibs_GCJ" = no; then
-+    if test "$ld_shlibs" = no; then
-       runpath_var=
+-      runpath_var=
 -      hardcode_libdir_flag_spec_GCJ=
 -      export_dynamic_flag_spec_GCJ=
 -      whole_archive_flag_spec_GCJ=
-+      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*)
+-    fi
+-  else
+-    # PORTME fill in a description of your system's linker (not GNU ld)
+-    case $host_os in
+-    aix3*)
 -      allow_undefined_flag_GCJ=unsupported
 -      always_export_symbols_GCJ=yes
 -      archive_expsym_cmds_GCJ='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-+      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.
+-      # Note: this linker hardcodes the directories in LIBPATH if there
+-      # are no directories specified by -L.
 -      hardcode_minus_L_GCJ=yes
-+      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.
+-      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+-	# Neither direct hardcoding nor static linking is supported with a
+-	# broken collect2.
 -	hardcode_direct_GCJ=unsupported
-+	hardcode_direct=unsupported
-       fi
-       ;;
- 
-@@ -17661,10 +8081,10 @@ _LT_EOF
-       else
- 	# If we're using GNU nm, then we don't want the "-C" option.
- 	# -C means demangle to AIX nm, but means don't demangle with GNU nm
+-      fi
+-      ;;
+-
+-    aix[4-9]*)
+-      if test "$host_cpu" = ia64; then
+-	# On IA64, the linker does run time linking by default, so we don't
+-	# have to do anything special.
+-	aix_use_runtimelinking=no
+-	exp_sym_flag='-Bexport'
+-	no_entry_flag=""
+-      else
+-	# If we're using GNU nm, then we don't want the "-C" option.
+-	# -C means demangle to AIX nm, but means don't demangle with GNU nm
 -	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
 -	  export_symbols_cmds_GCJ='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-+	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
+-	else
 -	  export_symbols_cmds_GCJ='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-+	  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
- 
-@@ -17673,10 +8093,10 @@ _LT_EOF
- 	# need to do runtime linking.
- 	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
- 	  for ld_flag in $LDFLAGS; do
+-	fi
+-	aix_use_runtimelinking=no
+-
+-	# Test if we are trying to use run time linking or normal
+-	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
+-	# need to do runtime linking.
+-	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+-	  for ld_flag in $LDFLAGS; do
 -  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
 -  	    aix_use_runtimelinking=yes
 -  	    break
 -  	  fi
-+	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-+	    aix_use_runtimelinking=yes
-+	    break
-+	  fi
- 	  done
- 	  ;;
- 	esac
-@@ -17691,30 +8111,32 @@ _LT_EOF
-       # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-       # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
- 
+-	  done
+-	  ;;
+-	esac
+-
+-	exp_sym_flag='-bexport'
+-	no_entry_flag='-bnoentry'
+-      fi
+-
+-      # When large executables or shared objects are built, AIX ld can
+-      # have problems creating the table of contents.  If linking a library
+-      # or program results in "error TOC overflow" add -mminimal-toc to
+-      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+-      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+-
 -      archive_cmds_GCJ=''
 -      hardcode_direct_GCJ=yes
 -      hardcode_libdir_separator_GCJ=':'
 -      link_all_deplibs_GCJ=yes
-+      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 "$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
-+	  if test -f "$collect2name" &&
-+	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
- 	  then
+-	  then
 -  	  # We have reworked collect2
 -  	  :
-+	  # We have reworked collect2
-+	  :
- 	  else
+-	  else
 -  	  # We have old collect2
 -  	  hardcode_direct_GCJ=unsupported
 -  	  # It fails to find uninstalled libraries when the uninstalled
@@ -29029,44 +31348,34 @@
 -  	  hardcode_minus_L_GCJ=yes
 -  	  hardcode_libdir_flag_spec_GCJ='-L$libdir'
 -  	  hardcode_libdir_separator_GCJ=
-+	  # 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
-@@ -17722,11 +8144,12 @@ _LT_EOF
- 	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
+-	  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:
-+	# 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
-@@ -17737,19 +8160,17 @@ _LT_EOF
- 	fi
-       fi
- 
-+      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.
+-	  shared_flag='-G'
+-	else
+-	  if test "$aix_use_runtimelinking" = yes; then
+-	    shared_flag='${wl}-G'
+-	  else
+-	    shared_flag='${wl}-bM:SRE'
+-	  fi
+-	fi
+-      fi
+-
+-      # It seems that -bexpall does not export symbols beginning with
+-      # underscore (_), so it is better to generate a list of symbols to export.
 -      always_export_symbols_GCJ=yes
-+      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.
+-      if test "$aix_use_runtimelinking" = yes; then
+-	# Warning - without using the other runtime loading flags (-brtl),
+-	# -berok will link without error, but may produce a broken library.
 -	allow_undefined_flag_GCJ='-berok'
 -       # Determine the default libpath from the value encoded in an empty executable.
 -       cat >conftest.$ac_ext <<_ACEOF
@@ -29074,17 +31383,16 @@
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+	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
-@@ -17760,27 +8181,7 @@ main ()
-   return 0;
- }
- _ACEOF
+-/* end confdefs.h.  */
+-
+-int
+-main ()
+-{
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -29106,58 +31414,55 @@
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
-+if ac_fn_c_try_link "$LINENO"; then :
- 
- lt_aix_libpath_sed='
-     /Import File Strings/,/^$/ {
-@@ -17794,32 +8195,22 @@ aix_libpath=`dump -H conftest$ac_exeext 
- if test -z "$aix_libpath"; then
-   aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- 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
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -
- fi
+-fi
 -
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
- 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_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
-+        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
+-	if test "$host_cpu" = ia64; then
 -	  hardcode_libdir_flag_spec_GCJ='${wl}-R $libdir:/usr/lib:/lib'
 -	  allow_undefined_flag_GCJ="-z nodefs"
 -	  archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-+	  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
+-	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
-+	 # Determine the default libpath from the value encoded in an
-+	 # empty executable.
-+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- int
-@@ -17830,27 +8221,7 @@ main ()
-   return 0;
- }
- _ACEOF
+-/* end confdefs.h.  */
+-
+-int
+-main ()
+-{
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
 -rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
@@ -29179,103 +31484,79 @@
 -	 test "$cross_compiling" = yes ||
 -	 $as_test_x conftest$ac_exeext
 -       }; then
-+if ac_fn_c_try_link "$LINENO"; then :
- 
- lt_aix_libpath_sed='
-     /Import File Strings/,/^$/ {
-@@ -17864,122 +8235,100 @@ aix_libpath=`dump -H conftest$ac_exeext 
- if test -z "$aix_libpath"; then
-   aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- 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
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -
- fi
+-fi
 -
 -rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
- 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_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
-+	 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.
+-	  # Warning - without using the other run time loading flags,
+-	  # -berok will link without error, but may produce a broken library.
 -	  no_undefined_flag_GCJ=' ${wl}-bernotok'
 -	  allow_undefined_flag_GCJ=' ${wl}-berok'
-+	  no_undefined_flag=' ${wl}-bernotok'
-+	  allow_undefined_flag=' ${wl}-berok'
- 	  # Exported symbols can be pulled into shared objects from archives
+-	  # Exported symbols can be pulled into shared objects from archives
 -	  whole_archive_flag_spec_GCJ='$convenience'
 -	  archive_cmds_need_lc_GCJ=yes
-+	  whole_archive_flag_spec='$convenience'
-+	  archive_cmds_need_lc=yes
- 	  # This is similar to how AIX traditionally builds its shared libraries.
+-	  # This is similar to how AIX traditionally builds its shared libraries.
 -	  archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-+	  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
-       ;;
- 
-     amigaos*)
+-	fi
+-      fi
+-      ;;
+-
+-    amigaos*)
 -      archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
 -      hardcode_libdir_flag_spec_GCJ='-L$libdir'
 -      hardcode_minus_L_GCJ=yes
 -      # see comment about different semantics on the GNU ld section
 -      ld_shlibs_GCJ=no
-+      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
-       ;;
- 
-     bsdi[45]*)
+-      ;;
+-
+-    bsdi[45]*)
 -      export_dynamic_flag_spec_GCJ=-rdynamic
-+      export_dynamic_flag_spec=-rdynamic
-       ;;
- 
+-      ;;
+-
 -    cygwin* | mingw* | pw32*)
-+    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.
+-      # When not using gcc, we currently assume that we are using
+-      # Microsoft Visual C++.
+-      # hardcode_libdir_flag_spec is actually meaningless, as there is
+-      # no search path for DLLs.
 -      hardcode_libdir_flag_spec_GCJ=' '
 -      allow_undefined_flag_GCJ=unsupported
-+      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.
+-      # Tell ltmain to make .lib files, not .a files.
+-      libext=lib
+-      # Tell ltmain to make .dll files, not .so files.
+-      shrext_cmds=".dll"
+-      # FIXME: Setting linknames here is a bad hack.
 -      archive_cmds_GCJ='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
-+      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.
+-      # The linker will automatically build a .lib file if we build a DLL.
 -      old_archive_From_new_cmds_GCJ='true'
-+      old_archive_from_new_cmds='true'
-       # FIXME: Should let the user specify the lib program.
+-      # FIXME: Should let the user specify the lib program.
 -      old_archive_cmds_GCJ='lib -OUT:$oldlib$oldobjs$old_deplibs'
 -      fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`'
 -      enable_shared_with_static_runtimes_GCJ=yes
-+      old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
-+      fix_srcfile_path='`cygpath -w "$srcfile"`'
-+      enable_shared_with_static_runtimes=yes
-       ;;
- 
-     darwin* | rhapsody*)
+-      ;;
+-
+-    darwin* | rhapsody*)
 -      case $host_os in
 -        rhapsody* | darwin1.[012])
 -         allow_undefined_flag_GCJ='${wl}-undefined ${wl}suppress'
@@ -29322,270 +31603,161 @@
 -          ;;
 -      esac
 -    fi
-+
-+
-+  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*)
+-      ;;
+-
+-    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
-+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+      hardcode_libdir_flag_spec='-L$libdir'
-+      hardcode_shlibpath_var=no
-       ;;
- 
-     freebsd1*)
+-      ;;
+-
+-    freebsd1*)
 -      ld_shlibs_GCJ=no
-+      ld_shlibs=no
-       ;;
- 
-     # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-@@ -17987,60 +8336,60 @@ if test -z "$aix_libpath"; then aix_libp
-     # does not break anything, and helps significantly (at the cost of a little
-     # extra space).
-     freebsd2.2*)
+-      ;;
+-
+-    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+-    # support.  Future versions do this automatically, but an explicit c++rt0.o
+-    # does not break anything, and helps significantly (at the cost of a little
+-    # extra space).
+-    freebsd2.2*)
 -      archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
 -      hardcode_libdir_flag_spec_GCJ='-R$libdir'
 -      hardcode_direct_GCJ=yes
 -      hardcode_shlibpath_var_GCJ=no
-+      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-+      hardcode_libdir_flag_spec='-R$libdir'
-+      hardcode_direct=yes
-+      hardcode_shlibpath_var=no
-       ;;
- 
-     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-     freebsd2*)
+-      ;;
+-
+-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+-    freebsd2*)
 -      archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
 -      hardcode_direct_GCJ=yes
 -      hardcode_minus_L_GCJ=yes
 -      hardcode_shlibpath_var_GCJ=no
-+      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+      hardcode_direct=yes
-+      hardcode_minus_L=yes
-+      hardcode_shlibpath_var=no
-       ;;
- 
-     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-     freebsd* | dragonfly*)
+-      ;;
+-
+-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+-    freebsd* | dragonfly*)
 -      archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
 -      hardcode_libdir_flag_spec_GCJ='-R$libdir'
 -      hardcode_direct_GCJ=yes
 -      hardcode_shlibpath_var_GCJ=no
-+      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
+-      ;;
+-
+-    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'
-+	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
+-      else
 -	archive_cmds_GCJ='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-+	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
+-      fi
 -      hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
 -      hardcode_libdir_separator_GCJ=:
 -      hardcode_direct_GCJ=yes
-+      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: 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'
-+      hardcode_minus_L=yes
-+      export_dynamic_flag_spec='${wl}-E'
-       ;;
- 
-     hpux10*)
-       if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+-      ;;
+-
+-    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'
-+	archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-       else
+-      else
 -	archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-+	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-       fi
-       if test "$with_gnu_ld" = no; then
+-      fi
+-      if test "$with_gnu_ld" = no; then
 -	hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
 -	hardcode_libdir_separator_GCJ=:
 -
 -	hardcode_direct_GCJ=yes
 -	export_dynamic_flag_spec_GCJ='${wl}-E'
 -
-+	hardcode_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: Not really in the search PATH,
+-	# but as the default location of the library.
 -	hardcode_minus_L_GCJ=yes
-+	hardcode_minus_L=yes
-       fi
-       ;;
- 
-@@ -18048,45 +8397,45 @@ if test -z "$aix_libpath"; then aix_libp
-       if test "$GCC" = yes -a "$with_gnu_ld" = no; then
- 	case $host_cpu in
- 	hppa*64*)
+-      fi
+-      ;;
+-
+-    hpux11*)
+-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+-	case $host_cpu in
+-	hppa*64*)
 -	  archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- 	  ;;
- 	ia64*)
+-	  ;;
+-	ia64*)
 -	  archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-+	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
- 	  ;;
- 	*)
+-	  ;;
+-	*)
 -	  archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-+	  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*)
+-	  ;;
+-	esac
+-      else
+-	case $host_cpu in
+-	hppa*64*)
 -	  archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	  archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- 	  ;;
- 	ia64*)
+-	  ;;
+-	ia64*)
 -	  archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-+	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
- 	  ;;
- 	*)
+-	  ;;
+-	*)
 -	  archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-+	  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
+-	  ;;
+-	esac
+-      fi
+-      if test "$with_gnu_ld" = no; then
 -	hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
 -	hardcode_libdir_separator_GCJ=:
-+	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-+	hardcode_libdir_separator=:
- 
- 	case $host_cpu in
- 	hppa*64*|ia64*)
+-
+-	case $host_cpu in
+-	hppa*64*|ia64*)
 -	  hardcode_libdir_flag_spec_ld_GCJ='+b $libdir'
 -	  hardcode_direct_GCJ=no
 -	  hardcode_shlibpath_var_GCJ=no
-+	  hardcode_direct=no
-+	  hardcode_shlibpath_var=no
- 	  ;;
- 	*)
+-	  ;;
+-	*)
 -	  hardcode_direct_GCJ=yes
 -	  export_dynamic_flag_spec_GCJ='${wl}-E'
-+	  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: Not really in the search PATH,
+-	  # but as the default location of the library.
 -	  hardcode_minus_L_GCJ=yes
-+	  hardcode_minus_L=yes
- 	  ;;
- 	esac
-       fi
-@@ -18094,194 +8443,228 @@ if test -z "$aix_libpath"; then aix_libp
- 
-     irix5* | irix6* | nonstopux*)
-       if test "$GCC" = yes; then
+-	  ;;
+-	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'
-+	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'
-+
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+        LDFLAGS="$save_LDFLAGS"
-       else
+-      else
 -	archive_cmds_GCJ='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
 -	hardcode_libdir_flag_spec_ld_GCJ='-rpath $libdir'
-+	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
+-      fi
 -      hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
 -      hardcode_libdir_separator_GCJ=:
 -      link_all_deplibs_GCJ=yes
-+      archive_cmds_need_lc='no'
-+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+      hardcode_libdir_separator=:
-+      inherit_rpath=yes
-+      link_all_deplibs=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
-+    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
+-      else
 -	archive_cmds_GCJ='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-+	archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-       fi
+-      fi
 -      hardcode_libdir_flag_spec_GCJ='-R$libdir'
 -      hardcode_direct_GCJ=yes
 -      hardcode_shlibpath_var_GCJ=no
-+      hardcode_libdir_flag_spec='-R$libdir'
-+      hardcode_direct=yes
-+      hardcode_shlibpath_var=no
-       ;;
- 
-     newsos6)
+-      ;;
+-
+-    newsos6)
 -      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
 -      hardcode_direct_GCJ=yes
 -      hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
 -      hardcode_libdir_separator_GCJ=:
 -      hardcode_shlibpath_var_GCJ=no
-+      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
-+      ;;
-+
-+    *nto* | *qnx*)
-       ;;
- 
-     openbsd*)
-       if test -f /usr/libexec/ld.so; then
+-      ;;
+-
+-    openbsd*)
+-      if test -f /usr/libexec/ld.so; then
 -	hardcode_direct_GCJ=yes
 -	hardcode_shlibpath_var_GCJ=no
 -	if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -29593,250 +31765,166 @@
 -	  archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
 -	  hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
 -	  export_dynamic_flag_spec_GCJ='${wl}-E'
-+	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].*)
+-	else
+-	  case $host_os in
+-	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
 -	     archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
 -	     hardcode_libdir_flag_spec_GCJ='-R$libdir'
-+	     archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+	     hardcode_libdir_flag_spec='-R$libdir'
- 	     ;;
- 	   *)
+-	     ;;
+-	   *)
 -	     archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
 -	     hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-+	     archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+	     hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
- 	     ;;
- 	  esac
+-	     ;;
+-	  esac
 -        fi
-+	fi
-       else
+-      else
 -	ld_shlibs_GCJ=no
-+	ld_shlibs=no
-       fi
-       ;;
- 
-     os2*)
+-      fi
+-      ;;
+-
+-    os2*)
 -      hardcode_libdir_flag_spec_GCJ='-L$libdir'
 -      hardcode_minus_L_GCJ=yes
 -      allow_undefined_flag_GCJ=unsupported
 -      archive_cmds_GCJ='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
 -      old_archive_From_new_cmds_GCJ='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-+      hardcode_libdir_flag_spec='-L$libdir'
-+      hardcode_minus_L=yes
-+      allow_undefined_flag=unsupported
-+      archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-+      old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-       ;;
- 
-     osf3*)
-       if test "$GCC" = yes; then
+-      ;;
+-
+-    osf3*)
+-      if test "$GCC" = yes; then
 -	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
 -	archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+	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
+-      else
 -	allow_undefined_flag_GCJ=' -expect_unresolved \*'
 -	archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-+	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
+-      fi
 -      hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
 -      hardcode_libdir_separator_GCJ=:
-+      archive_cmds_need_lc='no'
-+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-+      hardcode_libdir_separator=:
-       ;;
- 
-     osf4* | osf5*)	# as osf3* with the addition of -msym flag
-       if test "$GCC" = yes; then
+-      ;;
+-
+-    osf4* | osf5*)	# as osf3* with the addition of -msym flag
+-      if test "$GCC" = yes; then
 -	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
 -	archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 -	hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
-+	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
+-      else
 -	allow_undefined_flag_GCJ=' -expect_unresolved \*'
 -	archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
 -	archive_expsym_cmds_GCJ='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
 -	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
-+	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'
- 
- 	# Both c and cxx compiler support -rpath directly
+-
+-	# Both c and cxx compiler support -rpath directly
 -	hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
-+	hardcode_libdir_flag_spec='-rpath $libdir'
-       fi
+-      fi
 -      hardcode_libdir_separator_GCJ=:
-+      archive_cmds_need_lc='no'
-+      hardcode_libdir_separator=:
-       ;;
- 
-     solaris*)
+-      ;;
+-
+-    solaris*)
 -      no_undefined_flag_GCJ=' -z text'
-+      no_undefined_flag=' -z defs'
-       if test "$GCC" = yes; then
- 	wlarc='${wl}'
+-      if test "$GCC" = yes; then
+-	wlarc='${wl}'
 -	archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 -	archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
 -	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
-+	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
+-      else
 -	wlarc=''
 -	archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
 -	archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
 -  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-+	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
+-      fi
 -      hardcode_libdir_flag_spec_GCJ='-R$libdir'
 -      hardcode_shlibpath_var_GCJ=no
-+      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.
+-      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?)
-+	# Supported since Solaris 2.6 (maybe 2.5.1?)
- 	if test "$GCC" = yes; then
+-	if test "$GCC" = yes; then
 -	  whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-+	  whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
- 	else
+-	else
 -	  whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract'
-+	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
- 	fi
- 	;;
-       esac
+-	fi
+-	;;
+-      esac
 -      link_all_deplibs_GCJ=yes
-+      link_all_deplibs=yes
-       ;;
- 
-     sunos4*)
-       if test "x$host_vendor" = xsequent; then
- 	# Use $CC to link under sequent, because it throws in some extra .o
- 	# files that make .init and .fini sections work.
+-      ;;
+-
+-    sunos4*)
+-      if test "x$host_vendor" = xsequent; then
+-	# Use $CC to link under sequent, because it throws in some extra .o
+-	# files that make .init and .fini sections work.
 -	archive_cmds_GCJ='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-       else
+-      else
 -	archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-+	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-       fi
+-      fi
 -      hardcode_libdir_flag_spec_GCJ='-L$libdir'
 -      hardcode_direct_GCJ=yes
 -      hardcode_minus_L_GCJ=yes
 -      hardcode_shlibpath_var_GCJ=no
-+      hardcode_libdir_flag_spec='-L$libdir'
-+      hardcode_direct=yes
-+      hardcode_minus_L=yes
-+      hardcode_shlibpath_var=no
-       ;;
- 
-     sysv4)
-       case $host_vendor in
- 	sni)
+-      ;;
+-
+-    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???
-+	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+	  hardcode_direct=yes # is this really true???
- 	;;
- 	siemens)
- 	  ## LD is ld it makes a PLAMLIB
- 	  ## CC just makes a GrossModule.
+-	;;
+-	siemens)
+-	  ## LD is ld it makes a PLAMLIB
+-	  ## CC just makes a GrossModule.
 -	  archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags'
 -	  reload_cmds_GCJ='$CC -r -o $output$reload_objs'
 -	  hardcode_direct_GCJ=no
-+	  archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-+	  reload_cmds='$CC -r -o $output$reload_objs'
-+	  hardcode_direct=no
-         ;;
- 	motorola)
+-        ;;
+-	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
-+	  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'
+-	;;
+-      esac
+-      runpath_var='LD_RUN_PATH'
 -      hardcode_shlibpath_var_GCJ=no
-+      hardcode_shlibpath_var=no
-       ;;
- 
-     sysv4.3*)
+-      ;;
+-
+-    sysv4.3*)
 -      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
 -      hardcode_shlibpath_var_GCJ=no
 -      export_dynamic_flag_spec_GCJ='-Bexport'
-+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+      hardcode_shlibpath_var=no
-+      export_dynamic_flag_spec='-Bexport'
-       ;;
- 
-     sysv4*MP*)
-       if test -d /usr/nec; then
+-      ;;
+-
+-    sysv4*MP*)
+-      if test -d /usr/nec; then
 -	archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
 -	hardcode_shlibpath_var_GCJ=no
-+	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
+-	runpath_var=LD_RUN_PATH
+-	hardcode_runpath_var=yes
 -	ld_shlibs_GCJ=yes
-+	ld_shlibs=yes
-       fi
-       ;;
- 
-     sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
+-      fi
+-      ;;
+-
+-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
 -      no_undefined_flag_GCJ='${wl}-z,text'
 -      archive_cmds_need_lc_GCJ=no
 -      hardcode_shlibpath_var_GCJ=no
-+      no_undefined_flag='${wl}-z,text'
-+      archive_cmds_need_lc=no
-+      hardcode_shlibpath_var=no
-       runpath_var='LD_RUN_PATH'
- 
-       if test "$GCC" = yes; then
+-      runpath_var='LD_RUN_PATH'
+-
+-      if test "$GCC" = yes; then
 -	archive_cmds_GCJ='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 -	archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	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
+-      else
 -	archive_cmds_GCJ='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 -	archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	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
-       ;;
- 
-@@ -18292,51 +8675,75 @@ if test -z "$aix_libpath"; then aix_libp
-       # 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.
+-      fi
+-      ;;
+-
+-    sysv5* | sco3.2v5* | sco5v6*)
+-      # Note: We can NOT use -z defs as we might desire, because we do not
+-      # link with -lc, and that would cause any symbols used from libc to
+-      # always be unresolved, which means just about no library would
+-      # ever link correctly.  If we're not using GNU ld we use -z text
+-      # though, which does catch some bad symbols but isn't as heavy-handed
+-      # as -z defs.
 -      no_undefined_flag_GCJ='${wl}-z,text'
 -      allow_undefined_flag_GCJ='${wl}-z,nodefs'
 -      archive_cmds_need_lc_GCJ=no
@@ -29845,493 +31933,361 @@
 -      hardcode_libdir_separator_GCJ=':'
 -      link_all_deplibs_GCJ=yes
 -      export_dynamic_flag_spec_GCJ='${wl}-Bexport'
-+      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'
- 
-       if test "$GCC" = yes; then
+-      runpath_var='LD_RUN_PATH'
+-
+-      if test "$GCC" = yes; then
 -	archive_cmds_GCJ='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
 -	archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	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
+-      else
 -	archive_cmds_GCJ='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
 -	archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	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
-       ;;
- 
-     uts4*)
+-      fi
+-      ;;
+-
+-    uts4*)
 -      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
 -      hardcode_libdir_flag_spec_GCJ='-L$libdir'
 -      hardcode_shlibpath_var_GCJ=no
-+      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+      hardcode_libdir_flag_spec='-L$libdir'
-+      hardcode_shlibpath_var=no
-       ;;
- 
-     *)
+-      ;;
+-
+-    *)
 -      ld_shlibs_GCJ=no
-+      ld_shlibs=no
-       ;;
-     esac
-+
-+    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
- 
+-      ;;
+-    esac
+-  fi
+-
 -{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
 -$as_echo "$ld_shlibs_GCJ" >&6; }
 -test "$ld_shlibs_GCJ" = no && can_build_shared=no
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
-+$as_echo "$ld_shlibs" >&6; }
-+test "$ld_shlibs" = no && can_build_shared=no
-+
-+with_gnu_ld=$with_gnu_ld
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
- 
- #
- # Do we need to explicitly link libc?
- #
+-
+-#
+-# Do we need to explicitly link libc?
+-#
 -case "x$archive_cmds_need_lc_GCJ" in
-+case "x$archive_cmds_need_lc" in
- x|xyes)
-   # Assume -lc should be added
+-x|xyes)
+-  # Assume -lc should be added
 -  archive_cmds_need_lc_GCJ=yes
-+  archive_cmds_need_lc=yes
- 
-   if test "$enable_shared" = yes && test "$GCC" = yes; then
+-
+-  if test "$enable_shared" = yes && test "$GCC" = yes; then
 -    case $archive_cmds_GCJ in
-+    case $archive_cmds in
-     *'~'*)
-       # FIXME: we may have to deal with multi-command sequences.
-       ;;
-@@ -18344,54 +8751,262 @@ x|xyes)
-       # 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.
+-    *'~'*)
+-      # 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:$LINENO: checking whether -lc should be explicitly linked in" >&5
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
- $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
+-$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
 -      $rm conftest*
-+      $RM conftest*
-       echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- 
+-      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+-
 -      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+      if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } 2>conftest.err; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; } 2>conftest.err; then
-         soname=conftest
-         lib=conftest
-         libobjs=conftest.$ac_objext
-         deplibs=
+-        soname=conftest
+-        lib=conftest
+-        libobjs=conftest.$ac_objext
+-        deplibs=
 -        wl=$lt_prog_compiler_wl_GCJ
 -	pic_flag=$lt_prog_compiler_pic_GCJ
-+        wl=$lt_prog_compiler_wl
-+	pic_flag=$lt_prog_compiler_pic
-         compiler_flags=-v
-         linker_flags=-v
-         verstring=
-         output_objdir=.
-         libname=conftest
+-        compiler_flags=-v
+-        linker_flags=-v
+-        verstring=
+-        output_objdir=.
+-        libname=conftest
 -        lt_save_allow_undefined_flag=$allow_undefined_flag_GCJ
 -        allow_undefined_flag_GCJ=
 -        if { (eval echo "$as_me:$LINENO: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
 -  (eval $archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
-+        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=$?
+-  ac_status=$?
 -  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); }
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }
-         then
+-        then
 -	  archive_cmds_need_lc_GCJ=no
-+	  archive_cmds_need_lc=no
-         else
+-        else
 -	  archive_cmds_need_lc_GCJ=yes
-+	  archive_cmds_need_lc=yes
-         fi
+-        fi
 -        allow_undefined_flag_GCJ=$lt_save_allow_undefined_flag
-+        allow_undefined_flag=$lt_save_allow_undefined_flag
-       else
-         cat conftest.err 1>&5
-       fi
+-      else
+-        cat conftest.err 1>&5
+-      fi
 -      $rm conftest*
 -      { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
 -$as_echo "$archive_cmds_need_lc_GCJ" >&6; }
-+      $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
- 
+-      ;;
+-    esac
+-  fi
+-  ;;
+-esac
+-
 -{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
- $as_echo_n "checking dynamic linker characteristics... " >&6; }
-+
-+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=
-@@ -18405,7 +9020,6 @@ 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
- 
-@@ -18442,7 +9056,7 @@ aix[4-9]*)
-       aix4 | aix4.[01] | aix4.[01].*)
-       if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
- 	   echo ' yes '
+-$as_echo_n "checking dynamic linker characteristics... " >&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"
+-
+-need_lib_prefix=unknown
+-hardcode_into_libs=no
+-
+-# when you set need_version to no, make sure it does not cause -set_version
+-# flags to be left without arguments
+-need_version=unknown
+-
+-case $host_os in
+-aix3*)
+-  version_type=linux
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+-  shlibpath_var=LIBPATH
+-
+-  # AIX 3 has no versioning support, so we append a major version to the name.
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  ;;
+-
+-aix[4-9]*)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  hardcode_into_libs=yes
+-  if test "$host_cpu" = ia64; then
+-    # AIX 5 supports IA64
+-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+-    shlibpath_var=LD_LIBRARY_PATH
+-  else
+-    # With GCC up to 2.95.x, collect2 would create an import file
+-    # for dependence libraries.  The import file would start with
+-    # the line `#! .'.  This would cause the generated library to
+-    # depend on `.', always an invalid library.  This was fixed in
+-    # development snapshots of GCC prior to 3.0.
+-    case $host_os in
+-      aix4 | aix4.[01] | aix4.[01].*)
+-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+-	   echo ' yes '
 -	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
-+	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
- 	:
-       else
- 	can_build_shared=no
-@@ -18468,9 +9082,18 @@ aix[4-9]*)
-   ;;
- 
- amigaos*)
+-	:
+-      else
+-	can_build_shared=no
+-      fi
+-      ;;
+-    esac
+-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+-    # soname into executable. Probably we can add versioning support to
+-    # collect2, so additional links can be useful in future.
+-    if test "$aix_use_runtimelinking" = yes; then
+-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+-      # instead of lib<name>.a to let people know that these are not
+-      # typical AIX shared libraries.
+-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-    else
+-      # We preserve .a as extension for shared libraries through AIX4.2
+-      # and later when we are not doing run time linking.
+-      library_names_spec='${libname}${release}.a $libname.a'
+-      soname_spec='${libname}${release}${shared_ext}$major'
+-    fi
+-    shlibpath_var=LIBPATH
+-  fi
+-  ;;
+-
+-amigaos*)
 -  library_names_spec='$libname.ixlibrary $libname.a'
 -  # Create ${libname}_ixlibrary.a entries in /sys/libs.
 -  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-+  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*)
-@@ -18493,25 +9116,28 @@ bsdi[45]*)
-   # libtool to hard-code these into programs
-   ;;
- 
+-  ;;
+-
+-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*)
-+cygwin* | mingw* | pw32* | cegcc*)
-   version_type=windows
-   shrext_cmds=".dll"
-   need_version=no
-   need_lib_prefix=no
- 
-   case $GCC,$host_os in
+-  version_type=windows
+-  shrext_cmds=".dll"
+-  need_version=no
+-  need_lib_prefix=no
+-
+-  case $GCC,$host_os in
 -  yes,cygwin* | yes,mingw* | yes,pw32*)
-+  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
-     library_names_spec='$libname.dll.a'
-     # DLL is installed to $(libdir)/../bin by postinstall_cmds
-     postinstall_cmds='base_file=`basename \${file}`~
+-    library_names_spec='$libname.dll.a'
+-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+-    postinstall_cmds='base_file=`basename \${file}`~
 -      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
-       dldir=$destdir/`dirname \$dlpath`~
-       test -d \$dldir || mkdir -p \$dldir~
-       $install_prog $dir/$dlname \$dldir/$dlname~
+-      dldir=$destdir/`dirname \$dlpath`~
+-      test -d \$dldir || mkdir -p \$dldir~
+-      $install_prog $dir/$dlname \$dldir/$dlname~
 -      chmod a+x \$dldir/$dlname'
-+      chmod a+x \$dldir/$dlname~
-+      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
-+        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
-+      fi'
-     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-       dlpath=$dir/\$dldll~
+-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+-      dlpath=$dir/\$dldll~
 -       $rm \$dlpath'
-+       $RM \$dlpath'
-     shlibpath_overrides_runpath=yes
- 
-     case $host_os in
-@@ -18520,20 +9146,20 @@ cygwin* | mingw* | pw32*)
-       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"
-       ;;
+-    shlibpath_overrides_runpath=yes
+-
+-    case $host_os in
+-    cygwin*)
+-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+-      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+-      ;;
 -    mingw*)
-+    mingw* | cegcc*)
-       # MinGW DLLs use traditional 'lib' prefix
-       soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+-      # MinGW DLLs use traditional 'lib' prefix
+-      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
 -      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
 -      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
-+      sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-+      if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
-         # It is most probably a Windows format PATH printed by
-         # mingw gcc, but we are running on Cygwin. Gcc prints its search
-         # path with ; separators, and with drive letters. We can handle the
-         # drive letters (cygwin fileutils understands them), so leave them,
-         # especially as we might pass files found there to a mingw objdump,
-         # which wouldn't understand a cygwinified path. Ahh.
+-        # It is most probably a Windows format PATH printed by
+-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
+-        # path with ; separators, and with drive letters. We can handle the
+-        # drive letters (cygwin fileutils understands them), so leave them,
+-        # especially as we might pass files found there to a mingw objdump,
+-        # which wouldn't understand a cygwinified path. Ahh.
 -        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-       else
+-      else
 -        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-       fi
-       ;;
-     pw32*)
-@@ -18557,12 +9183,13 @@ darwin* | rhapsody*)
-   version_type=darwin
-   need_lib_prefix=no
-   need_version=no
+-      fi
+-      ;;
+-    pw32*)
+-      # pw32 DLLs use 'pw' prefix rather than 'lib'
+-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+-      ;;
+-    esac
+-    ;;
+-
+-  *)
+-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+-    ;;
+-  esac
+-  dynamic_linker='Win32 ld.exe'
+-  # FIXME: first we should search . and the directory the executable is in
+-  shlibpath_var=PATH
+-  ;;
+-
+-darwin* | rhapsody*)
+-  dynamic_linker="$host_os dyld"
+-  version_type=darwin
+-  need_lib_prefix=no
+-  need_version=no
 -  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-+  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'
-   ;;
- 
-@@ -18655,18 +9282,18 @@ hpux9* | hpux10* | hpux11*)
-     fi
-     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-     ;;
+-  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_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+-  ;;
+-
+-dgux*)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  ;;
+-
+-freebsd1*)
+-  dynamic_linker=no
+-  ;;
+-
+-freebsd* | dragonfly*)
+-  # DragonFly does not have aout.  When/if they implement a new
+-  # versioning mechanism, adjust this.
+-  if test -x /usr/bin/objformat; then
+-    objformat=`/usr/bin/objformat`
+-  else
+-    case $host_os in
+-    freebsd[123]*) objformat=aout ;;
+-    *) objformat=elf ;;
+-    esac
+-  fi
+-  version_type=freebsd-$objformat
+-  case $version_type in
+-    freebsd-elf*)
+-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+-      need_version=no
+-      need_lib_prefix=no
+-      ;;
+-    freebsd-*)
+-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+-      need_version=yes
+-      ;;
+-  esac
+-  shlibpath_var=LD_LIBRARY_PATH
+-  case $host_os in
+-  freebsd2*)
+-    shlibpath_overrides_runpath=yes
+-    ;;
+-  freebsd3.[01]* | freebsdelf3.[01]*)
+-    shlibpath_overrides_runpath=yes
+-    hardcode_into_libs=yes
+-    ;;
+-  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
+-  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
+-    shlibpath_overrides_runpath=no
+-    hardcode_into_libs=yes
+-    ;;
+-  *) # from 4.6 on, and DragonFly
+-    shlibpath_overrides_runpath=yes
+-    hardcode_into_libs=yes
+-    ;;
+-  esac
+-  ;;
+-
+-gnu*)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  hardcode_into_libs=yes
+-  ;;
+-
+-hpux9* | hpux10* | hpux11*)
+-  # Give a soname corresponding to the major version so that dld.sl refuses to
+-  # link against other versions.
+-  version_type=sunos
+-  need_lib_prefix=no
+-  need_version=no
+-  case $host_cpu in
+-  ia64*)
+-    shrext_cmds='.so'
+-    hardcode_into_libs=yes
+-    dynamic_linker="$host_os dld.so"
+-    shlibpath_var=LD_LIBRARY_PATH
+-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-    soname_spec='${libname}${release}${shared_ext}$major'
+-    if test "X$HPUX_IA64_MODE" = X32; then
+-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+-    else
+-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+-    fi
+-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+-    ;;
 -   hppa*64*)
 -     shrext_cmds='.sl'
 -     hardcode_into_libs=yes
@@ -30344,141 +32300,238 @@
 -     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
-@@ -18743,17 +9370,41 @@ linux* | k*bsd*-gnu)
-   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
+-    shrext_cmds='.sl'
+-    dynamic_linker="$host_os dld.sl"
+-    shlibpath_var=SHLIB_PATH
+-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-    soname_spec='${libname}${release}${shared_ext}$major'
+-    ;;
+-  esac
+-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
+-  postinstall_cmds='chmod 555 $lib'
+-  ;;
+-
+-interix[3-9]*)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=no
+-  hardcode_into_libs=yes
+-  ;;
+-
+-irix5* | irix6* | nonstopux*)
+-  case $host_os in
+-    nonstopux*) version_type=nonstopux ;;
+-    *)
+-	if test "$lt_cv_prog_gnu_ld" = yes; then
+-		version_type=linux
+-	else
+-		version_type=irix
+-	fi ;;
+-  esac
+-  need_lib_prefix=no
+-  need_version=no
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+-  case $host_os in
+-  irix5* | nonstopux*)
+-    libsuff= shlibsuff=
+-    ;;
+-  *)
+-    case $LD in # libtool.m4 will add one of these switches to LD
+-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+-      libsuff= shlibsuff= libmagic=32-bit;;
+-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+-      libsuff=32 shlibsuff=N32 libmagic=N32;;
+-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+-    *) libsuff= shlibsuff= libmagic=never-match;;
+-    esac
+-    ;;
+-  esac
+-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+-  shlibpath_overrides_runpath=no
 -  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
 -  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
- 
-   # Append ld.so.conf contents to the search path
-   if test -f /etc/ld.so.conf; then
+-  hardcode_into_libs=yes
+-  ;;
+-
+-# No shared lib support for Linux oldld, aout, or coff.
+-linux*oldld* | linux*aout* | linux*coff*)
+-  dynamic_linker=no
+-  ;;
+-
+-# This must be Linux ELF.
+-linux* | k*bsd*-gnu)
+-  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
+-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+-
+-  # 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="$sys_lib_dlsearch_path_spec $lt_ld_extra"
-+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-   fi
- 
-   # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -18765,11 +9416,23 @@ linux* | k*bsd*-gnu)
-   dynamic_linker='GNU/Linux ld.so'
-   ;;
- 
-+netbsdelf*-gnu)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  dynamic_linker='NetBSD ld.elf_so'
-+  ;;
-+
- netbsd*)
-   version_type=sunos
-   need_lib_prefix=no
-   need_version=no
+-  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'
+-  ;;
+-
+-netbsd*)
+-  version_type=sunos
+-  need_lib_prefix=no
+-  need_version=no
 -  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-     dynamic_linker='NetBSD (a.out) ld.so'
-@@ -18790,14 +9453,16 @@ newsos6)
-   shlibpath_overrides_runpath=yes
-   ;;
- 
+-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+-    dynamic_linker='NetBSD (a.out) ld.so'
+-  else
+-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+-    soname_spec='${libname}${release}${shared_ext}$major'
+-    dynamic_linker='NetBSD ld.elf_so'
+-  fi
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=yes
+-  hardcode_into_libs=yes
+-  ;;
+-
+-newsos6)
+-  version_type=linux
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=yes
+-  ;;
+-
 -nto-qnx*)
 -  version_type=linux
-+*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
+-  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*)
-@@ -18806,13 +9471,13 @@ openbsd*)
-   need_lib_prefix=no
-   # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-   case $host_os in
+-  ;;
+-
+-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  ;;
-+    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
+-  esac
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+-  shlibpath_var=LD_LIBRARY_PATH
 -  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-     case $host_os in
-       openbsd2.[89] | openbsd2.[89].*)
- 	shlibpath_overrides_runpath=no
-@@ -18884,7 +9549,6 @@ sysv4 | sysv4.3*)
-     sni)
-       shlibpath_overrides_runpath=no
-       need_lib_prefix=no
+-    case $host_os in
+-      openbsd2.[89] | openbsd2.[89].*)
+-	shlibpath_overrides_runpath=no
+-	;;
+-      *)
+-	shlibpath_overrides_runpath=yes
+-	;;
+-      esac
+-  else
+-    shlibpath_overrides_runpath=yes
+-  fi
+-  ;;
+-
+-os2*)
+-  libname_spec='$name'
+-  shrext_cmds=".dll"
+-  need_lib_prefix=no
+-  library_names_spec='$libname${shared_ext} $libname.a'
+-  dynamic_linker='OS/2 ld.exe'
+-  shlibpath_var=LIBPATH
+-  ;;
+-
+-osf3* | osf4* | osf5*)
+-  version_type=osf
+-  need_lib_prefix=no
+-  need_version=no
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+-  ;;
+-
+-rdos*)
+-  dynamic_linker=no
+-  ;;
+-
+-solaris*)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=yes
+-  hardcode_into_libs=yes
+-  # ldd complains unless libraries are executable
+-  postinstall_cmds='chmod +x $lib'
+-  ;;
+-
+-sunos4*)
+-  version_type=sunos
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=yes
+-  if test "$with_gnu_ld" = yes; then
+-    need_lib_prefix=no
+-  fi
+-  need_version=yes
+-  ;;
+-
+-sysv4 | sysv4.3*)
+-  version_type=linux
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  case $host_vendor in
+-    sni)
+-      shlibpath_overrides_runpath=no
+-      need_lib_prefix=no
 -      export_dynamic_flag_spec='${wl}-Blargedynsym'
-       runpath_var=LD_RUN_PATH
-       ;;
-     siemens)
-@@ -18899,3344 +9563,3805 @@ sysv4 | sysv4.3*)
-   esac
-   ;;
- 
+-      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
@@ -30487,156 +32540,7 @@
 -    shlibpath_var=LD_LIBRARY_PATH
 -  fi
 -  ;;
-+sysv4*MP*)
-+  if test -d /usr/nec ;then
-+    version_type=linux
-+    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-+    soname_spec='$libname${shared_ext}.$major'
-+    shlibpath_var=LD_LIBRARY_PATH
-+  fi
-+  ;;
-+
-+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-+  version_type=freebsd-elf
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  hardcode_into_libs=yes
-+  if test "$with_gnu_ld" = yes; then
-+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-+  else
-+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-+    case $host_os in
-+      sco3.2v5*)
-+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-+	;;
-+    esac
-+  fi
-+  sys_lib_dlsearch_path_spec='/usr/lib'
-+  ;;
-+
-+tpf*)
-+  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  ;;
-+
-+uts4*)
-+  version_type=linux
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  ;;
-+
-+*)
-+  dynamic_linker=no
-+  ;;
-+esac
-+{ $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
-+
-+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
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
- 
+-
 -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
 -  version_type=freebsd-elf
 -  need_lib_prefix=no
@@ -30648,28 +32552,7 @@
 -  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
-+
-+
-+
-+
-+
-+  { $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_TAGVAR(hardcode_shlibpath_var, )" != no &&
-+     test "$hardcode_minus_L" != no; then
-+    # Linking always hardcodes the temporary library directory.
-+    hardcode_action=relink
-   else
+-  else
 -    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
 -    shlibpath_overrides_runpath=yes
 -    case $host_os in
@@ -30677,35 +32560,17 @@
 -        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
 -	;;
 -    esac
-+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-+    hardcode_action=immediate
-   fi
+-  fi
 -  sys_lib_dlsearch_path_spec='/usr/lib'
 -  ;;
-+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; }
- 
+-
 -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
 -  ;;
-+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
- 
+-
 -*)
 -  dynamic_linker=no
 -  ;;
@@ -30713,238 +32578,34 @@
 -{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
 -$as_echo "$dynamic_linker" >&6; }
 -test "$dynamic_linker" = no && can_build_shared=no
- 
+-
 -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-+
-+
-+
-+
-+  if test "x$enable_dlopen" != xyes; then
-+  enable_dlopen=unknown
-+  enable_dlopen_self=unknown
-+  enable_dlopen_self_static=unknown
-+else
-+  lt_cv_dlopen=no
-+  lt_cv_dlopen_libs=
-+
-+  case $host_os in
-+  beos*)
-+    lt_cv_dlopen="load_add_on"
-+    lt_cv_dlopen_libs=
-+    lt_cv_dlopen_self=yes
-+    ;;
-+
-+  mingw* | pw32* | cegcc*)
-+    lt_cv_dlopen="LoadLibrary"
-+    lt_cv_dlopen_libs=
-+    ;;
-+
-+  cygwin*)
-+    lt_cv_dlopen="dlopen"
-+    lt_cv_dlopen_libs=
-+    ;;
-+
-+  darwin*)
-+  # if libdl is installed we need to link against it
-+    { $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
+-  $as_echo_n "(cached) " >&6
+-else
 -  lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ldl  $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char 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
-+
-+    lt_cv_dlopen="dyld"
-+    lt_cv_dlopen_libs=
-+    lt_cv_dlopen_self=yes
-+
- fi
- 
+-fi
+-
 -sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
 -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-+    ;;
-+
-+  *)
-+    ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
-+if test "x$ac_cv_func_shl_load" = x""yes; then :
-+  lt_cv_dlopen="shl_load"
-+else
-+  { $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
+-  $as_echo_n "(cached) " >&6
+-else
 -  lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
 -fi
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ldld  $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
- 
+-
 -sys_lib_dlsearch_path_spec="$lt_cv_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 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.  */
- 
+-
 -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"
-+/* 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.  */
- 
+-fi
+-
 -{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
 -$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
 -hardcode_action_GCJ=
 -if test -n "$hardcode_libdir_flag_spec_GCJ" || \
 -   test -n "$runpath_var_GCJ" || \
 -   test "X$hardcode_automatic_GCJ" = "Xyes" ; then
-+/* 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.  */
- 
+-
 -  # We can hardcode non-existant directories.
 -  if test "$hardcode_direct_GCJ" != no &&
 -     # If the only mechanism to avoid hardcoding is shlibpath_var, we
@@ -30958,29 +32619,11 @@
 -    # We can link without hardcoding, and we can hardcode nonexisting dirs.
 -    hardcode_action_GCJ=immediate
 -  fi
-+/* 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
+-else
 -  # We cannot hardcode anything, or else we can only hardcode existing
 -  # directories.
 -  hardcode_action_GCJ=unsupported
-+  ac_cv_lib_dld_dld_link=no
- fi
+-fi
 -{ $as_echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
 -$as_echo "$hardcode_action_GCJ" >&6; }
 -
@@ -30991,17 +32634,9 @@
 -     test "$enable_shared" = no; then
 -  # Fast installation is not necessary
 -  enable_fast_install=needless
-+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
- 
- 
+-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
@@ -31091,424 +32726,190 @@
 -  esac
 -
 -cfgfile="$ofile"
-+fi
- 
+-
 -  cat <<__EOF__ >> "$cfgfile"
 -# ### BEGIN LIBTOOL TAG CONFIG: $tagname
- 
+-
 -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-+fi
- 
+-
 -# Shell to use when invoking shell scripts.
 -SHELL=$lt_SHELL
- 
+-
 -# 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_GCJ
-+fi
- 
+-
 -# Whether or not to disallow shared libs when runtime libs are static
 -allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_GCJ
- 
+-
 -# Whether or not to optimize for fast installation.
 -fast_install=$enable_fast_install
-+fi
- 
+-
 -# The host system.
 -host_alias=$host_alias
 -host=$host
 -host_os=$host_os
-+    ;;
-+  esac
- 
+-
 -# The build system.
 -build_alias=$build_alias
 -build=$build
 -build_os=$build_os
-+  if test "x$lt_cv_dlopen" != xno; then
-+    enable_dlopen=yes
-+  else
-+    enable_dlopen=no
-+  fi
- 
+-
 -# An echo program that does not interpret backslashes.
 -echo=$lt_echo
-+  case $lt_cv_dlopen in
-+  dlopen)
-+    save_CPPFLAGS="$CPPFLAGS"
-+    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
- 
+-
 -# The archiver.
 -AR=$lt_AR
 -AR_FLAGS=$lt_AR_FLAGS
-+    save_LDFLAGS="$LDFLAGS"
-+    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
- 
+-
 -# A C compiler.
 -LTCC=$lt_LTCC
-+    save_LIBS="$LIBS"
-+    LIBS="$lt_cv_dlopen_libs $LIBS"
- 
+-
 -# LTCC compiler flags.
 -LTCFLAGS=$lt_LTCFLAGS
-+    { $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 10051 "configure"
-+#include "confdefs.h"
- 
+-
 -# A language-specific compiler.
 -CC=$lt_compiler_GCJ
-+#if HAVE_DLFCN_H
-+#include <dlfcn.h>
-+#endif
- 
+-
 -# Is the compiler the GNU C compiler?
 -with_gcc=$GCC_GCJ
-+#include <stdio.h>
- 
+-
 -# An ERE matcher.
 -EGREP=$lt_EGREP
-+#ifdef RTLD_GLOBAL
-+#  define LT_DLGLOBAL		RTLD_GLOBAL
-+#else
-+#  ifdef DL_GLOBAL
-+#    define LT_DLGLOBAL		DL_GLOBAL
-+#  else
-+#    define LT_DLGLOBAL		0
-+#  endif
-+#endif
- 
+-
 -# The linker used to build libraries.
 -LD=$lt_LD_GCJ
-+/* 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
- 
+-
 -# Whether we need hard or soft links.
 -LN_S=$lt_LN_S
-+void fnord() { int i=42;}
-+int main ()
-+{
-+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-+  int status = $lt_dlunknown;
- 
+-
 -# A BSD-compatible nm program.
 -NM=$lt_NM
-+  if (self)
-+    {
-+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-+      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-+      /* dlclose (self); */
-+    }
-+  else
-+    puts (dlerror ());
- 
+-
 -# A symbol stripping program
 -STRIP=$lt_STRIP
-+  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*
- 
+-
 -# Used to examine libraries when file_magic_cmd begins "file"
 -MAGIC_CMD=$MAGIC_CMD
- 
+-
 -# Used on cygwin: DLL creation program.
 -DLLTOOL="$DLLTOOL"
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
-+$as_echo "$lt_cv_dlopen_self" >&6; }
- 
+-
 -# Used on cygwin: object dumper.
 -OBJDUMP="$OBJDUMP"
-+    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 10147 "configure"
-+#include "confdefs.h"
- 
+-
 -# Used on cygwin: assembler.
 -AS="$AS"
-+#if HAVE_DLFCN_H
-+#include <dlfcn.h>
-+#endif
- 
+-
 -# The name of the directory that contains temporary libtool files.
 -objdir=$objdir
-+#include <stdio.h>
- 
+-
 -# How to create reloadable object files.
 -reload_flag=$lt_reload_flag
 -reload_cmds=$lt_reload_cmds
-+#ifdef RTLD_GLOBAL
-+#  define LT_DLGLOBAL		RTLD_GLOBAL
-+#else
-+#  ifdef DL_GLOBAL
-+#    define LT_DLGLOBAL		DL_GLOBAL
-+#  else
-+#    define LT_DLGLOBAL		0
-+#  endif
-+#endif
- 
+-
 -# How to pass a linker flag through the compiler.
 -wl=$lt_lt_prog_compiler_wl_GCJ
-+/* 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
- 
+-
 -# Object file suffix (normally "o").
 -objext="$ac_objext"
-+void fnord() { int i=42;}
-+int main ()
-+{
-+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-+  int status = $lt_dlunknown;
- 
+-
 -# Old archive suffix (normally "a").
 -libext="$libext"
-+  if (self)
-+    {
-+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-+      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-+      /* dlclose (self); */
-+    }
-+  else
-+    puts (dlerror ());
- 
+-
 -# Shared library suffix (normally ".so").
 -shrext_cmds='$shrext_cmds'
-+  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*
- 
+-
 -# Executable file suffix (normally "").
 -exeext="$exeext"
- 
+-
 -# Additional compiler flags for building library objects.
 -pic_flag=$lt_lt_prog_compiler_pic_GCJ
 -pic_mode=$pic_mode
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
-+$as_echo "$lt_cv_dlopen_self_static" >&6; }
-+    fi
- 
+-
 -# What is the maximum length of a command?
 -max_cmd_len=$lt_cv_sys_max_cmd_len
-+    CPPFLAGS="$save_CPPFLAGS"
-+    LDFLAGS="$save_LDFLAGS"
-+    LIBS="$save_LIBS"
-+    ;;
-+  esac
- 
+-
 -# Does compiler simultaneously support -c and -o options?
 -compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
-+  case $lt_cv_dlopen_self in
-+  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-+  *) enable_dlopen_self=unknown ;;
-+  esac
- 
+-
 -# Must we lock files when doing compilation?
 -need_locks=$lt_need_locks
-+  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
- 
+-
 -# Do we need the lib prefix for modules?
 -need_lib_prefix=$need_lib_prefix
- 
+-
 -# Do we need a version for libraries?
 -need_version=$need_version
- 
+-
 -# Whether dlopen is supported.
 -dlopen_support=$enable_dlopen
- 
+-
 -# Whether dlopen of programs is supported.
 -dlopen_self=$enable_dlopen_self
- 
+-
 -# Whether dlopen of statically linked programs is supported.
 -dlopen_self_static=$enable_dlopen_self_static
- 
+-
 -# Compiler flag to prevent dynamic linking.
 -link_static_flag=$lt_lt_prog_compiler_static_GCJ
- 
+-
 -# Compiler flag to turn off builtin functions.
 -no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_GCJ
- 
+-
 -# Compiler flag to allow reflexive dlopens.
 -export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_GCJ
- 
+-
 -# Compiler flag to generate shared objects directly from archives.
 -whole_archive_flag_spec=$lt_whole_archive_flag_spec_GCJ
- 
+-
 -# Compiler flag to generate thread-safe objects.
 -thread_safe_flag_spec=$lt_thread_safe_flag_spec_GCJ
- 
+-
 -# Library versioning type.
 -version_type=$version_type
- 
+-
 -# Format of library name prefix.
 -libname_spec=$lt_libname_spec
- 
+-
 -# List of archive names.  First name is the real one, the rest are links.
 -# The last name is the one that the linker finds with -lNAME.
 -library_names_spec=$lt_library_names_spec
- 
+-
 -# The coded name of the library, if different from the real name.
 -soname_spec=$lt_soname_spec
- 
+-
 -# 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
-+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
- 
+-
 -# 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 build a loadable module (assumed same as above if empty)
 -module_cmds=$lt_module_cmds_GCJ
 -module_expsym_cmds=$lt_module_expsym_cmds_GCJ
- 
+-
 -# 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=$lt_predep_objects_GCJ
@@ -31532,85 +32933,53 @@
 -# The library search path used internally by the compiler when linking
 -# a shared library.
 -compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
- 
+-
 -# 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_GCJ
- 
+-
 -# Flag that forces no undefined symbols.
 -no_undefined_flag=$lt_no_undefined_flag_GCJ
- 
+-
 -# 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
-+  # 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; }
- 
+-
 -# 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
-+  { $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
- 
+-
 -# This is the shared library runtime path variable.
 -runpath_var=$runpath_var
-+  # 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
-+    ;;
- 
+-
 -# This is the shared library path variable.
 -shlibpath_var=$shlibpath_var
-+  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; }
- 
+-
 -# Is shlibpath searched before the hard-coded library search path?
 -shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-+  { $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; }
- 
+-
 -# How to hardcode a shared library path into an executable.
 -hardcode_action=$hardcode_action_GCJ
- 
+-
 -# 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_GCJ
- 
+-
 -# If ld is used when linking, flag to hardcode \$libdir into
 -# a binary during linking. This must work even if \$libdir does
 -# not exist.
@@ -31634,50 +33003,43 @@
 -# 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
-+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
- 
+-
 -# Variables whose values should be saved in libtool wrapper scripts and
 -# restored at relink time.
 -variables_saved_for_relink="$variables_saved_for_relink"
-+CC="$lt_save_CC"
- 
+-
 -# Whether libtool must link a program against all its dependency libraries.
 -link_all_deplibs=$link_all_deplibs_GCJ
- 
+-
 -# Compile-time system search path for libraries
 -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
- 
+-
 -# Run-time system search path for libraries
 -sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
- 
+-
 -# Fix the shell variable \$srcfile for the compiler.
 -fix_srcfile_path=$lt_fix_srcfile_path
- 
+-
 -# Set to yes if exported symbols are required.
 -always_export_symbols=$always_export_symbols_GCJ
- 
+-
 -# The commands to list exported symbols.
 -export_symbols_cmds=$lt_export_symbols_cmds_GCJ
- 
+-
 -# The commands to extract the exported symbol list from a shared archive.
 -extract_expsyms_cmds=$lt_extract_expsyms_cmds
- 
+-
 -# Symbols that should not be listed in the preloaded symbols.
 -exclude_expsyms=$lt_exclude_expsyms_GCJ
- 
+-
 -# Symbols that must always be exported.
 -include_expsyms=$lt_include_expsyms_GCJ
- 
+-
 -# ### 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
@@ -31687,166 +33049,63 @@
 -    test -f Makefile && make "$ltmain"
 -  fi
 -fi
-+        ac_config_commands="$ac_config_commands libtool"
- 
- 
+-
+-
 -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
 -	;;
-+# Only expand once:
- 
+-
 -      RC)
- 
- 
+-
+-
 -# Source file extension for RC test sources.
 -ac_ext=rc
- 
+-
 -# Object file extension for compiled RC test sources.
 -objext=o
 -objext_RC=$objext
- 
+-
 -# Code to be used in simple compile tests
 -lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
- 
+-
 -# Code to be used in simple link tests
 -lt_simple_link_test_code="$lt_simple_compile_test_code"
- 
+-
 -# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-+        if test -n "$PYTHON"; then
-+      # If the user set $PYTHON, use it and don't search something else.
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version >= 2.4" >&5
-+$as_echo_n "checking whether $PYTHON version >= 2.4... " >&6; }
-+      prog="import sys
-+# split strings by '.' and convert to numeric.  Append some zeros
-+# because we need at least 4 digits for the hex conversion.
-+# map returns an iterator in Python 3.0 and a list in 2.x
-+minver = list(map(int, '2.4'.split('.'))) + [0, 0, 0]
-+minverhex = 0
-+# xrange is not present in Python 3.0 and range returns an iterator
-+for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i]
-+sys.exit(sys.hexversion < minverhex)"
-+  if { echo "$as_me:$LINENO: $PYTHON -c "$prog"" >&5
-+   ($PYTHON -c "$prog") >&5 2>&5
-+   ac_status=$?
-+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+   (exit $ac_status); }; then :
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+else
-+  as_fn_error "too old" "$LINENO" 5
-+fi
-+      am_display_PYTHON=$PYTHON
-+    else
-+      # Otherwise, try each interpreter until we find one that satisfies
-+      # VERSION.
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= 2.4" >&5
-+$as_echo_n "checking for a Python interpreter with version >= 2.4... " >&6; }
-+if test "${am_cv_pathless_PYTHON+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
- 
+-
 -# If no C compiler was specified, use CC.
 -LTCC=${LTCC-"$CC"}
-+	for am_cv_pathless_PYTHON in python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do
-+	  test "$am_cv_pathless_PYTHON" = none && break
-+	  prog="import sys
-+# split strings by '.' and convert to numeric.  Append some zeros
-+# because we need at least 4 digits for the hex conversion.
-+# map returns an iterator in Python 3.0 and a list in 2.x
-+minver = list(map(int, '2.4'.split('.'))) + [0, 0, 0]
-+minverhex = 0
-+# xrange is not present in Python 3.0 and range returns an iterator
-+for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i]
-+sys.exit(sys.hexversion < minverhex)"
-+  if { echo "$as_me:$LINENO: $am_cv_pathless_PYTHON -c "$prog"" >&5
-+   ($am_cv_pathless_PYTHON -c "$prog") >&5 2>&5
-+   ac_status=$?
-+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+   (exit $ac_status); }; then :
-+  break
-+fi
-+	done
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_pathless_PYTHON" >&5
-+$as_echo "$am_cv_pathless_PYTHON" >&6; }
-+      # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON.
-+      if test "$am_cv_pathless_PYTHON" = none; then
-+	PYTHON=:
-+      else
-+        # Extract the first word of "$am_cv_pathless_PYTHON", so it can be a program name with args.
-+set dummy $am_cv_pathless_PYTHON; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_path_PYTHON+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  case $PYTHON in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
- 
+-
 -# If no C compiler flags were specified, use CFLAGS.
 -LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-+  ;;
-+esac
-+fi
-+PYTHON=$ac_cv_path_PYTHON
-+if test -n "$PYTHON"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5
-+$as_echo "$PYTHON" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
- 
+-
 -# Allow CC to be a program name with arguments.
 -compiler=$CC
- 
-+      fi
-+      am_display_PYTHON=$am_cv_pathless_PYTHON
-+    fi
- 
+-
+-
 -# 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*
- 
+-
 -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 "$PYTHON" = :; then
-+      as_fn_error "no suitable Python interpreter found" "$LINENO" 5
-+  else
- 
- 
+-
+-
 -# Allow CC to be a program name with arguments.
 -lt_save_CC="$CC"
 -CC=${RC-"windres"}
@@ -31861,19 +33120,9 @@
 -  esac
 -done
 -cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON version" >&5
-+$as_echo_n "checking for $am_display_PYTHON version... " >&6; }
-+if test "${am_cv_python_version+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
-+$as_echo "$am_cv_python_version" >&6; }
-+  PYTHON_VERSION=$am_cv_python_version
- 
+-
 -lt_cv_prog_compiler_c_o_RC=yes
- 
+-
 -# The else clause should only fire when bootstrapping the
 -# libtool distribution, otherwise you forgot to ship ltmain.sh
 -# with your package, and you will get complaints that there are
@@ -31955,410 +33204,198 @@
 -      ;;
 -    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
-+  PYTHON_PREFIX='${prefix}'
- 
+-
 -cfgfile="$ofile"
-+  PYTHON_EXEC_PREFIX='${exec_prefix}'
- 
+-
 -  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
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON platform" >&5
-+$as_echo_n "checking for $am_display_PYTHON platform... " >&6; }
-+if test "${am_cv_python_platform+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_platform" >&5
-+$as_echo "$am_cv_python_platform" >&6; }
-+  PYTHON_PLATFORM=$am_cv_python_platform
- 
+-
 -# Whether or not to build shared libraries.
 -build_libtool_libs=$enable_shared
- 
+-
 -# Whether or not to build static libraries.
 -build_old_libs=$enable_static
- 
+-
 -# Whether or not to add -lc for building shared libraries.
 -build_libtool_need_lc=$archive_cmds_need_lc_RC
- 
+-
 -# Whether or not to disallow shared libs when runtime libs are static
 -allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_RC
-+                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5
-+$as_echo_n "checking for $am_display_PYTHON script directory... " >&6; }
-+if test "${am_cv_python_pythondir+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test "x$prefix" = xNONE
-+     then
-+       am_py_prefix=$ac_default_prefix
-+     else
-+       am_py_prefix=$prefix
-+     fi
-+     am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null ||
-+     echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
-+     case $am_cv_python_pythondir in
-+     $am_py_prefix*)
-+       am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
-+       am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"`
-+       ;;
-+     esac
- 
+-
 -# Whether or not to optimize for fast installation.
 -fast_install=$enable_fast_install
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pythondir" >&5
-+$as_echo "$am_cv_python_pythondir" >&6; }
-+  pythondir=$am_cv_python_pythondir
- 
+-
 -# 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
-+  pkgpythondir=\${pythondir}/$PACKAGE
- 
+-
 -# The archiver.
 -AR=$lt_AR
 -AR_FLAGS=$lt_AR_FLAGS
- 
+-
 -# A C compiler.
 -LTCC=$lt_LTCC
-+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON extension module directory" >&5
-+$as_echo_n "checking for $am_display_PYTHON extension module directory... " >&6; }
-+if test "${am_cv_python_pyexecdir+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test "x$exec_prefix" = xNONE
-+     then
-+       am_py_exec_prefix=$am_py_prefix
-+     else
-+       am_py_exec_prefix=$exec_prefix
-+     fi
-+     am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null ||
-+     echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"`
-+     case $am_cv_python_pyexecdir in
-+     $am_py_exec_prefix*)
-+       am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
-+       am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"`
-+       ;;
-+     esac
- 
+-
 -# LTCC compiler flags.
 -LTCFLAGS=$lt_LTCFLAGS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pyexecdir" >&5
-+$as_echo "$am_cv_python_pyexecdir" >&6; }
-+  pyexecdir=$am_cv_python_pyexecdir
- 
+-
 -# A language-specific compiler.
 -CC=$lt_compiler_RC
- 
+-
 -# Is the compiler the GNU C compiler?
 -with_gcc=$GCC_RC
- 
+-
 -# An ERE matcher.
 -EGREP=$lt_EGREP
-+  pkgpyexecdir=\${pyexecdir}/$PACKAGE
- 
+-
 -# The linker used to build libraries.
 -LD=$lt_LD_RC
- 
+-
 -# Whether we need hard or soft links.
 -LN_S=$lt_LN_S
- 
+-
 -# A BSD-compatible nm program.
 -NM=$lt_NM
-+  fi
- 
+-
 -# 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_RC
- 
+-
 -# Object file suffix (normally "o").
 -objext="$ac_objext"
- 
+-
 -# Old archive suffix (normally "a").
 -libext="$libext"
- 
+-
 -# Shared library suffix (normally ".so").
 -shrext_cmds='$shrext_cmds'
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for headers required to compile python extensions" >&5
-+$as_echo_n "checking for headers required to compile python extensions... " >&6; }
-+py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
-+py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
-+if test -x "$PYTHON-config"; then
-+PYTHON_INCLUDES=`$PYTHON-config --includes 2>/dev/null`
-+else
-+PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
-+if test "$py_prefix" != "$py_exec_prefix"; then
-+  PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
-+fi
-+fi
-+save_CPPFLAGS="$CPPFLAGS"
-+CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <Python.h>
-+_ACEOF
-+if ac_fn_c_try_cpp "$LINENO"; then :
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
-+$as_echo "found" >&6; }
- 
+-
 -# Executable file suffix (normally "").
 -exeext="$exeext"
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for python libraries" >&5
-+$as_echo_n "checking for python libraries... " >&6; }
- 
+-
 -# Additional compiler flags for building library objects.
 -pic_flag=$lt_lt_prog_compiler_pic_RC
 -pic_mode=$pic_mode
- 
+-
 -# What is the maximum length of a command?
 -max_cmd_len=$lt_cv_sys_max_cmd_len
-+link_pymodules_libpython=false;
-+if egrep "^#define Py_ENABLE_SHARED" "${py_exec_prefix}/include/python${PYTHON_VERSION}/pyconfig.h" > /dev/null ; then
-+  if test x`uname -s` != xDarwin; then
-+      PYTHON_LDFLAGS="-no-undefined"
-+      link_pymodules_libpython=true;
-+  fi
-+fi
- 
+-
 -# Does compiler simultaneously support -c and -o options?
 -compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
-+PYTHON_CC=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_config_var('CC')"`
-+PYTHON_LIB_DEPS=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_config_var('SYSLIBS'), sysconfig.get_config_var('SHLIBS'), sysconfig.get_config_var('MODLIBS')"`
-+PYTHON_LIBDIR=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_config_var('LIBDIR')"`
-+PYTHON_LIBPL=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_config_var('LIBPL')"`
- 
+-
 -# Must we lock files when doing compilation?
 -need_locks=$lt_need_locks
-+save_CC="$CC"
-+save_LIBS="$LIBS"
- 
+-
 -# Do we need the lib prefix for modules?
 -need_lib_prefix=$need_lib_prefix
-+PYTHON_EMBED_LIBS="-L${PYTHON_LIBDIR} ${PYTHON_LIB_DEPS} -lpython${PYTHON_VERSION}"
- 
+-
 -# Do we need a version for libraries?
 -need_version=$need_version
-+CC="$PYTHON_CC"
-+LIBS="$LIBS $PYTHON_EMBED_LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
- 
+-
 -# Whether dlopen is supported.
 -dlopen_support=$enable_dlopen
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char Py_Initialize ();
-+int
-+main ()
-+{
-+return Py_Initialize ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
- 
+-
 -# Whether dlopen of programs is supported.
 -dlopen_self=$enable_dlopen_self
-+            LIBS="$save_LIBS";
-+            if $link_pymodules_libpython; then
-+                PYTHON_LIBS="$PYTHON_EMBED_LIBS";
-+            fi
-+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_EMBED_LIBS" >&5
-+$as_echo "$PYTHON_EMBED_LIBS" >&6; };
- 
+-
 -# Whether dlopen of statically linked programs is supported.
 -dlopen_self_static=$enable_dlopen_self_static
-+else
- 
+-
 -# 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
-+  if test -x "$PYTHON-config"; then
-+    PYTHON_EMBED_LIBS=`$PYTHON-config --ldflags 2>/dev/null`
-+  else
-+    PYTHON_EMBED_LIBS="-L${PYTHON_LIBPL} ${PYTHON_LIB_DEPS} -lpython${PYTHON_VERSION}"
-+  fi
- 
+-
 -# Compiler flag to allow reflexive dlopens.
 -export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_RC
-+  LIBS="$save_LIBS $PYTHON_EMBED_LIBS";
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
- 
+-
 -# Compiler flag to generate shared objects directly from archives.
 -whole_archive_flag_spec=$lt_whole_archive_flag_spec_RC
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char Py_Initialize ();
-+int
-+main ()
-+{
-+return Py_Initialize ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
- 
+-
 -# Compiler flag to generate thread-safe objects.
 -thread_safe_flag_spec=$lt_thread_safe_flag_spec_RC
-+            LIBS="$save_LIBS";
-+            if $link_pymodules_libpython; then
-+                PYTHON_LIBS="$PYTHON_EMBED_LIBS";
-+            fi
-+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_EMBED_LIBS" >&5
-+$as_echo "$PYTHON_EMBED_LIBS" >&6; };
- 
+-
 -# Library versioning type.
 -version_type=$version_type
-+else
-+           { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
-+$as_echo "not found" >&6; }; as_fn_error "could not find Python headers" "$LINENO" 5
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
- 
+-
 -# Format of library name prefix.
 -libname_spec=$lt_libname_spec
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+CC="$save_CC"
- 
+-
 -# 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
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
-+$as_echo "not found" >&6; }
-+as_fn_error "could not find Python headers" "$LINENO" 5
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+CPPFLAGS="$save_CPPFLAGS"
- 
+-
 -# 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
-+CC="$PYTHON_CC"
- 
+-
 -# Create an old-style archive from a shared archive.
 -old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_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
- 
+-
 -# 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
-+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-+	if test -n "$ac_tool_prefix"; then
-+  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  case $PKG_CONFIG in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
- 
+-
 -# 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
-+  ;;
-+esac
-+fi
-+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-+if test -n "$PKG_CONFIG"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-+$as_echo "$PKG_CONFIG" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
- 
+-
 -# 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=$lt_predep_objects_RC
@@ -32382,63 +33419,12 @@
 -# The library search path used internally by the compiler when linking
 -# a shared library.
 -compiler_lib_search_path=$lt_compiler_lib_search_path_RC
-+fi
-+if test -z "$ac_cv_path_PKG_CONFIG"; then
-+  ac_pt_PKG_CONFIG=$PKG_CONFIG
-+  # Extract the first word of "pkg-config", so it can be a program name with args.
-+set dummy pkg-config; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  case $ac_pt_PKG_CONFIG in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
- 
+-
 -# Method to check whether dependent libraries are shared objects.
 -deplibs_check_method=$lt_deplibs_check_method
-+  ;;
-+esac
-+fi
-+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
-+if test -n "$ac_pt_PKG_CONFIG"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
-+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
- 
+-
 -# Command to use when deplibs_check_method == file_magic.
 -file_magic_cmd=$lt_file_magic_cmd
-+  if test "x$ac_pt_PKG_CONFIG" = x; then
-+    PKG_CONFIG=""
-+  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
-+    PKG_CONFIG=$ac_pt_PKG_CONFIG
-+  fi
 +else
 +  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
 +fi
@@ -33192,11 +34178,11 @@
 -   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -   (exit $ac_status); }; then
 -  break
+-fi
+-
+-	done
 +  as_basename=false
  fi
- 
--	done
--fi
 -{ $as_echo "$as_me:$LINENO: result: $am_cv_pathless_PYTHON" >&5
 -$as_echo "$am_cv_pathless_PYTHON" >&6; }
 -      # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON.
@@ -33209,9 +34195,7 @@
 -$as_echo_n "checking for $ac_word... " >&6; }
 -if test "${ac_cv_path_PYTHON+set}" = set; then
 -  $as_echo_n "(cached) " >&6
-+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-+  as_dirname=dirname
- else
+-else
 -  case $PYTHON in
 -  [\\/]* | ?:[\\/]*)
 -  ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path.
@@ -33231,10 +34215,22 @@
 -done
 -done
 -IFS=$as_save_IFS
+ 
+-  ;;
+-esac
+-fi
+-PYTHON=$ac_cv_path_PYTHON
+-if test -n "$PYTHON"; then
+-  { $as_echo "$as_me:$LINENO: result: $PYTHON" >&5
+-$as_echo "$PYTHON" >&6; }
++if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
++  as_dirname=dirname
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
 +  as_dirname=false
-+fi
- 
--  ;;
+ fi
+ 
 +as_me=`$as_basename -- "$0" ||
 +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 +	 X"$0" : 'X\(//\)$' \| \
@@ -33253,14 +34249,17 @@
 +	    q
 +	  }
 +	  s/.*/./; q'`
-+
+ 
+-      fi
+-      am_display_PYTHON=$am_cv_pathless_PYTHON
+-    fi
 +# Avoid depending upon Character Ranges.
 +as_cr_letters='abcdefghijklmnopqrstuvwxyz'
 +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
 +as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 +as_cr_digits='0123456789'
 +as_cr_alnum=$as_cr_Letters$as_cr_digits
-+
+ 
 +ECHO_C= ECHO_N= ECHO_T=
 +case `echo -n x` in #(((((
 +-n*)
@@ -33272,33 +34271,19 @@
 +  esac;;
 +*)
 +  ECHO_N='-n';;
- esac
--fi
--PYTHON=$ac_cv_path_PYTHON
--if test -n "$PYTHON"; then
--  { $as_echo "$as_me:$LINENO: result: $PYTHON" >&5
--$as_echo "$PYTHON" >&6; }
-+
-+rm -f conf$$ conf$$.exe conf$$.file
-+if test -d conf$$.dir; then
-+  rm -f conf$$.dir/conf$$.file
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
-+  rm -f conf$$.dir
-+  mkdir conf$$.dir 2>/dev/null
- fi
--
--
--      fi
--      am_display_PYTHON=$am_cv_pathless_PYTHON
--    fi
--
--
++esac
+ 
 -  if test "$PYTHON" = :; then
 -      { { $as_echo "$as_me:$LINENO: error: no suitable Python interpreter found" >&5
 -$as_echo "$as_me: error: no suitable Python interpreter found" >&2;}
 -   { (exit 1); exit 1; }; }
++rm -f conf$$ conf$$.exe conf$$.file
++if test -d conf$$.dir; then
++  rm -f conf$$.dir/conf$$.file
++else
++  rm -f conf$$.dir
++  mkdir conf$$.dir 2>/dev/null
++fi
 +if (echo >conf$$.file) 2>/dev/null; then
 +  if ln -s conf$$.file conf$$ 2>/dev/null; then
 +    as_ln_s='ln -s'
@@ -33395,8 +34380,8 @@
 -{ $as_echo "$as_me:$LINENO: result: $am_cv_python_platform" >&5
 -$as_echo "$am_cv_python_platform" >&6; }
 -  PYTHON_PLATFORM=$am_cv_python_platform
--
- 
+ 
+-
 -
 -
 -                { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON script directory" >&5
@@ -33464,7 +34449,7 @@
 +# values after options handling.
 +ac_log="
 +This file was extended by pyorbit $as_me 2.24.0, which was
-+generated by GNU Autoconf 2.64.  Invocation command line was
++generated by GNU Autoconf 2.65.  Invocation command line was
  
 +  CONFIG_FILES    = $CONFIG_FILES
 +  CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -33506,6 +34491,7 @@
  
 +  -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
@@ -33588,10 +34574,11 @@
 -save_CC="$CC"
 -save_LIBS="$LIBS"
 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
++ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 +ac_cs_version="\\
 +pyorbit config.status 2.24.0
-+configured by $0, generated by GNU Autoconf 2.64,
-+  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
++configured by $0, generated by GNU Autoconf 2.65,
++  with options \\"\$ac_cs_config\\"
  
 -PYTHON_EMBED_LIBS="-L${PYTHON_LIBDIR} ${PYTHON_LIB_DEPS} -lpython${PYTHON_VERSION}"
 +Copyright (C) 2009 Free Software Foundation, Inc.
@@ -33679,6 +34666,8 @@
 +    ac_cs_recheck=: ;;
 +  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
 +    $as_echo "$ac_cs_version"; exit ;;
++  --config | --confi | --conf | --con | --co | --c )
++    $as_echo "$ac_cs_config"; exit ;;
 +  --debug | --debu | --deb | --de | --d | -d )
 +    debug=: ;;
 +  --file | --fil | --fi | --f )
@@ -34280,9 +35269,6 @@
 -  pkg_cv_PYORBIT_CFLAGS=`$PKG_CONFIG --cflags "ORBit-2.0 >= 2.12" 2>/dev/null`
 -else
 -  pkg_failed=yes
--fi
-- else
--    pkg_failed=untried
 +ac_cr=`echo X | tr X '\015'`
 +# On cygwin, bash can eat \r inside `` if the user requested igncr.
 +# But we know of no other shell where ac_cr would be empty at this
@@ -34290,6 +35276,9 @@
 +if test "x$ac_cr" = x; then
 +  eval ac_cr=\$\'\\r\'
  fi
+- else
+-    pkg_failed=untried
+-fi
 -if test -n "$PYORBIT_LIBS"; then
 -    pkg_cv_PYORBIT_LIBS="$PYORBIT_LIBS"
 - elif test -n "$PKG_CONFIG"; then
@@ -34330,6 +35319,16 @@
  
 -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
 -        _pkg_short_errors_supported=yes
+-else
+-        _pkg_short_errors_supported=no
+-fi
+-        if test $_pkg_short_errors_supported = yes; then
+-	        PYORBIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ORBit-2.0 >= 2.12" 2>&1`
+-        else
+-	        PYORBIT_PKG_ERRORS=`$PKG_CONFIG --print-errors "ORBit-2.0 >= 2.12" 2>&1`
+-        fi
+-	# Put the nasty error message in config.log where it belongs
+-	echo "$PYORBIT_PKG_ERRORS" >&5
 +  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
 +  if test $ac_delim_n = $ac_delim_num; then
 +    break
@@ -34340,7 +35339,8 @@
 +  fi
 +done
 +rm -f conf$$subs.sh
-+
+ 
+-	{ { $as_echo "$as_me:$LINENO: error: Package requirements (ORBit-2.0 >= 2.12) were not met:
 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 +cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
 +_ACEOF
@@ -34356,7 +35356,7 @@
 +t delim
 +:nl
 +h
-+s/\(.\{148\}\).*/\1/
++s/\(.\{148\}\)..*/\1/
 +t more1
 +s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
 +p
@@ -34370,7 +35370,7 @@
 +t nl
 +:delim
 +h
-+s/\(.\{148\}\).*/\1/
++s/\(.\{148\}\)..*/\1/
 +t more2
 +s/["\\]/\\&/g; s/^/"/; s/$/"/
 +p
@@ -34393,7 +35393,8 @@
 +cat >>"\$tmp/subs1.awk" <<_ACAWK &&
 +  for (key in S) S_is_set[key] = 1
 +  FS = ""
-+
+ 
+-$PYORBIT_PKG_ERRORS
 +}
 +{
 +  line = $ 0
@@ -34411,22 +35412,29 @@
 +    } else
 +      len += 1 + keylen
 +  }
-+
+ 
+-Consider adjusting the PKG_CONFIG_PATH environment variable if you
+-installed software in a non-standard prefix.
 +  print line
 +}
-+
+ 
+-Alternatively, you may set the environment variables PYORBIT_CFLAGS
+-and PYORBIT_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" >&5
+-$as_echo "$as_me: error: Package requirements (ORBit-2.0 >= 2.12) were not met:
 +_ACAWK
 +_ACEOF
 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 +if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
 +  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
- else
--        _pkg_short_errors_supported=no
++else
 +  cat
 +fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
 +  || as_fn_error "could not setup config files machinery" "$LINENO" 5
 +_ACEOF
-+
+ 
+-$PYORBIT_PKG_ERRORS
 +# VPATH may cause trouble with some makes, so we remove $(srcdir),
 +# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
 +# trailing colons and then remove the whole line if VPATH becomes empty
@@ -34440,20 +35448,22 @@
 +s/:*$//
 +s/^[^=]*=[	 ]*$//
 +}'
- fi
--        if test $_pkg_short_errors_supported = yes; then
--	        PYORBIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ORBit-2.0 >= 2.12" 2>&1`
--        else
--	        PYORBIT_PKG_ERRORS=`$PKG_CONFIG --print-errors "ORBit-2.0 >= 2.12" 2>&1`
--        fi
--	# Put the nasty error message in config.log where it belongs
--	echo "$PYORBIT_PKG_ERRORS" >&5
- 
--	{ { $as_echo "$as_me:$LINENO: error: Package requirements (ORBit-2.0 >= 2.12) were not met:
++fi
+ 
+-Consider adjusting the PKG_CONFIG_PATH environment variable if you
+-installed software in a non-standard prefix.
 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 +fi # test -n "$CONFIG_FILES"
  
--$PYORBIT_PKG_ERRORS
+-Alternatively, you may set the environment variables PYORBIT_CFLAGS
+-and PYORBIT_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" >&2;}
+-   { (exit 1); exit 1; }; }
+-elif test $pkg_failed = untried; then
+-	{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
+-is in your PATH or set the PKG_CONFIG environment variable to the full
+-path to pkg-config.
 +# Set up the scripts for CONFIG_HEADERS section.
 +# No need to generate them if there are no CONFIG_HEADERS.
 +# This happens for instance with `./config.status Makefile'.
@@ -34462,17 +35472,18 @@
 +BEGIN {
 +_ACEOF
  
--Consider adjusting the PKG_CONFIG_PATH environment variable if you
--installed software in a non-standard prefix.
+-Alternatively, you may set the environment variables PYORBIT_CFLAGS
+-and PYORBIT_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
 +# Transform confdefs.h into an awk script `defines.awk', embedded as
 +# here-document in config.status, that substitutes the proper values into
 +# config.h.in to produce config.h.
  
--Alternatively, you may set the environment variables PYORBIT_CFLAGS
--and PYORBIT_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details.
--" >&5
--$as_echo "$as_me: error: Package requirements (ORBit-2.0 >= 2.12) were not met:
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
+-is in your PATH or set the PKG_CONFIG environment variable to the full
+-path to pkg-config.
 +# Create a delimiter string that does not exist in confdefs.h, to ease
 +# handling of long lines.
 +ac_delim='%!_!# '
@@ -34487,13 +35498,13 @@
 +  fi
 +done
  
--$PYORBIT_PKG_ERRORS
+-Alternatively, you may set the environment variables PYORBIT_CFLAGS
+-and PYORBIT_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
 +# For the awk script, D is an array of macro values keyed by name,
 +# likewise P contains macro parameters if any.  Preserve backslash
 +# newline sequences.
- 
--Consider adjusting the PKG_CONFIG_PATH environment variable if you
--installed software in a non-standard prefix.
++
 +ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
 +sed -n '
 +s/.\{148\}/&'"$ac_delim"'/g
@@ -34533,7 +35544,17 @@
 +' <confdefs.h | sed '
 +s/'"$ac_delim"'/"\\\
 +"/g' >>$CONFIG_STATUS || ac_write_fail=1
-+
+ 
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-else
+-	PYORBIT_CFLAGS=$pkg_cv_PYORBIT_CFLAGS
+-	PYORBIT_LIBS=$pkg_cv_PYORBIT_LIBS
+-        { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
+-	:
+-fi
 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 +  for (key in D) D_is_set[key] = 1
 +  FS = ""
@@ -34572,19 +35593,22 @@
 +  as_fn_error "could not setup config headers machinery" "$LINENO" 5
 +fi # test -n "$CONFIG_HEADERS"
  
--Alternatively, you may set the environment variables PYORBIT_CFLAGS
--and PYORBIT_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details.
--" >&2;}
--   { (exit 1); exit 1; }; }
--elif test $pkg_failed = untried; then
--	{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
--is in your PATH or set the PKG_CONFIG environment variable to the full
--path to pkg-config.
- 
--Alternatively, you may set the environment variables PYORBIT_CFLAGS
--and PYORBIT_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details.
+-# link with the imodule service if it is available
+-{ $as_echo "$as_me:$LINENO: checking for the ORBit2 imodule service" >&5
+-$as_echo_n "checking for the ORBit2 imodule service... " >&6; }
+-if { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --print-errors --exists ORBit-imodule-2.0") >&5
+-  ($PKG_CONFIG --print-errors --exists ORBit-imodule-2.0) 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-   { $as_echo "$as_me:$LINENO: result: found" >&5
+-$as_echo "found" >&6; }
+-   PYORBIT_CFLAGS=`$PKG_CONFIG --cflags ORBit-imodule-2.0`
+-   PYORBIT_LIBS=`$PKG_CONFIG --libs ORBit-imodule-2.0`
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_ORBIT2_IMODULE /**/
+-_ACEOF
 +eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
 +shift
 +for ac_tag
@@ -34606,11 +35630,10 @@
 +  ac_file=$1
 +  shift
  
--To get pkg-config, see <http://pkg-config.freedesktop.org/>.
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
--is in your PATH or set the PKG_CONFIG environment variable to the full
--path to pkg-config.
+-else
+-   { $as_echo "$as_me:$LINENO: result: not found" >&5
+-$as_echo "not found" >&6; }
+-fi
 +  case $ac_mode in
 +  :L) ac_source=$1;;
 +  :[FH])
@@ -34633,9 +35656,11 @@
 +      as_fn_append ac_file_inputs " '$ac_f'"
 +    done
  
--Alternatively, you may set the environment variables PYORBIT_CFLAGS
--and PYORBIT_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details.
+-# get rid of the -export-dynamic stuff from the configure flags ...
+-export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
+-if test -n "$export_dynamic"; then
+-  PYORBIT_LIBS=`echo $PYORBIT_LIBS | sed -e "s/$export_dynamic//"`
+-fi
 +    # Let's still pretend it is `configure' which instantiates (i.e., don't
 +    # use $as_me), people would be surprised to read:
 +    #    /* config.h.  Generated by config.status.  */
@@ -34655,16 +35680,6 @@
 +    *) ac_sed_conf_input=$configure_input;;
 +    esac
  
--To get pkg-config, see <http://pkg-config.freedesktop.org/>.
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
--else
--	PYORBIT_CFLAGS=$pkg_cv_PYORBIT_CFLAGS
--	PYORBIT_LIBS=$pkg_cv_PYORBIT_LIBS
--        { $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
--	:
--fi
 +    case $ac_tag in
 +    *:-:* | *:-) cat >"$tmp/stdin" \
 +      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
@@ -34672,18 +35687,20 @@
 +    ;;
 +  esac
  
--# link with the imodule service if it is available
--{ $as_echo "$as_me:$LINENO: checking for the ORBit2 imodule service" >&5
--$as_echo_n "checking for the ORBit2 imodule service... " >&6; }
--if { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --print-errors --exists ORBit-imodule-2.0") >&5
--  ($PKG_CONFIG --print-errors --exists ORBit-imodule-2.0) 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
--   { $as_echo "$as_me:$LINENO: result: found" >&5
--$as_echo "found" >&6; }
--   PYORBIT_CFLAGS=`$PKG_CONFIG --cflags ORBit-imodule-2.0`
--   PYORBIT_LIBS=`$PKG_CONFIG --libs ORBit-imodule-2.0`
+-case " $CFLAGS " in
+-*[\	\ ]-Wall[\	\ ]*)
+-  ;;
+-*)
+-  save_CFLAGS="$CFLAGS"
+-  CFLAGS="$CFLAGS -Wall"
+-  { $as_echo "$as_me:$LINENO: checking whether $CC understands -Wall" >&5
+-$as_echo_n "checking whether $CC understands -Wall... " >&6; }
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
 +  ac_dir=`$as_dirname -- "$ac_file" ||
 +$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 +	 X"$ac_file" : 'X\(//\)[^/]' \| \
@@ -34710,9 +35727,9 @@
 +  as_dir="$ac_dir"; as_fn_mkdir_p
 +  ac_builddir=.
  
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_ORBIT2_IMODULE /**/
--_ACEOF
+-int
+-main ()
+-{
 +case "$ac_dir" in
 +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 +*)
@@ -34729,10 +35746,15 @@
 +# for backward compatibility:
 +ac_top_builddir=$ac_top_build_prefix
  
--else
--   { $as_echo "$as_me:$LINENO: result: not found" >&5
--$as_echo "not found" >&6; }
--fi
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
 +case $srcdir in
 +  .)  # We are building in place.
 +    ac_srcdir=.
@@ -34746,84 +35768,6 @@
 +    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
- 
--# get rid of the -export-dynamic stuff from the configure flags ...
--export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
--if test -n "$export_dynamic"; then
--  PYORBIT_LIBS=`echo $PYORBIT_LIBS | sed -e "s/$export_dynamic//"`
--fi
- 
-+  case $ac_mode in
-+  :F)
-+  #
-+  # CONFIG_FILE
-+  #
- 
--case " $CFLAGS " in
--*[\	\ ]-Wall[\	\ ]*)
--  ;;
--*)
--  save_CFLAGS="$CFLAGS"
--  CFLAGS="$CFLAGS -Wall"
--  { $as_echo "$as_me:$LINENO: checking whether $CC understands -Wall" >&5
--$as_echo_n "checking whether $CC understands -Wall... " >&6; }
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
-+  case $INSTALL in
-+  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-+  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
-+  esac
-+  ac_MKDIR_P=$MKDIR_P
-+  case $MKDIR_P in
-+  [\\/$]* | ?:[\\/]* ) ;;
-+  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
-+  esac
- _ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--int
--main ()
--{
- 
--  ;
--  return 0;
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-+# If the template does not know about datarootdir, expand it.
-+# FIXME: This hack should be removed a few years after 2.60.
-+ac_datarootdir_hack=; ac_datarootdir_seen=
-+ac_sed_dataroot='
-+/datarootdir/ {
-+  p
-+  q
- }
-+/@datadir@/p
-+/@docdir@/p
-+/@infodir@/p
-+/@localedir@/p
-+/@mandir@/p'
-+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
-+*datarootdir*) ac_datarootdir_seen=yes;;
-+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
- _ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
-+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+  ac_datarootdir_hack='
-+  s&@datadir@&$datadir&g
-+  s&@docdir@&$docdir&g
-+  s&@infodir@&$infodir&g
-+  s&@localedir@&$localedir&g
-+  s&@mandir@&$mandir&g
-+  s&\\\${datarootdir}&$datarootdir&g' ;;
  esac
 -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 -$as_echo "$ac_try_echo") >&5
@@ -34841,15 +35785,115 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
++ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+ 
+-	jh_has_option=no
+-fi
+ 
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-  { $as_echo "$as_me:$LINENO: result: $jh_has_option" >&5
+-$as_echo "$jh_has_option" >&6; }
+-  if test $jh_has_option = no; then
+-    CFLAGS="$save_CFLAGS"
+-  fi
+-  ;;
+-esac
++  case $ac_mode in
++  :F)
++  #
++  # CONFIG_FILE
++  #
+ 
+-case " $CFLAGS " in
+-*[\	\ ]-std=c9x[\	\ ]*)
+-  ;;
+-*)
+-  save_CFLAGS="$CFLAGS"
+-  CFLAGS="$CFLAGS -std=c9x"
+-  { $as_echo "$as_me:$LINENO: checking whether $CC understands -std=c9x" >&5
+-$as_echo_n "checking whether $CC understands -std=c9x... " >&6; }
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
++  case $INSTALL in
++  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
++  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
++  esac
++  ac_MKDIR_P=$MKDIR_P
++  case $MKDIR_P in
++  [\\/$]* | ?:[\\/]* ) ;;
++  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
++  esac
+ _ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+ 
+-int
+-main ()
+-{
++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
++# If the template does not know about datarootdir, expand it.
++# FIXME: This hack should be removed a few years after 2.60.
++ac_datarootdir_hack=; ac_datarootdir_seen=
++ac_sed_dataroot='
++/datarootdir/ {
++  p
++  q
++}
++/@datadir@/p
++/@docdir@/p
++/@infodir@/p
++/@localedir@/p
++/@mandir@/p'
++case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
++*datarootdir*) ac_datarootdir_seen=yes;;
++*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
++  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
++$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 +_ACEOF
-+
++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
++  ac_datarootdir_hack='
++  s&@datadir@&$datadir&g
++  s&@docdir@&$docdir&g
++  s&@infodir@&$infodir&g
++  s&@localedir@&$localedir&g
++  s&@mandir@&$mandir&g
++  s&\\\${datarootdir}&$datarootdir&g' ;;
++esac
++_ACEOF
+ 
+-  ;
+-  return 0;
+-}
 +# Neutralize VPATH when `$srcdir' = `.'.
 +# Shell code in configure.ac might set extrasub.
 +# FIXME: do we really want to maintain this feature?
 +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 +ac_sed_extra="$ac_vpsub
 +$extrasub
-+_ACEOF
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
+-  jh_has_option=yes
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
 +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 +:t
 +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
@@ -34954,13 +35998,13 @@
 + ;;
  
 -case " $CFLAGS " in
--*[\	\ ]-std=c9x[\	\ ]*)
+-*[\	\ ]-fno-strict-aliasing[\	\ ]*)
 -  ;;
 -*)
 -  save_CFLAGS="$CFLAGS"
--  CFLAGS="$CFLAGS -std=c9x"
--  { $as_echo "$as_me:$LINENO: checking whether $CC understands -std=c9x" >&5
--$as_echo_n "checking whether $CC understands -std=c9x... " >&6; }
+-  CFLAGS="$CFLAGS -fno-strict-aliasing"
+-  { $as_echo "$as_me:$LINENO: checking whether $CC understands -fno-strict-aliasing" >&5
+-$as_echo_n "checking whether $CC understands -fno-strict-aliasing... " >&6; }
 -  cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
@@ -35096,16 +36140,11 @@
 -else
 -  $as_echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	jh_has_option=no
+-fi
 + ;;
 +    "libtool":C)
- 
--	jh_has_option=no
--fi
-+    # See if we are running on zsh, and set the options which allow our
-+    # commands through without removal of \ escapes.
-+    if test -n "${ZSH_VERSION+set}" ; then
-+      setopt NO_GLOB_SUBST
-+    fi
  
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -  { $as_echo "$as_me:$LINENO: result: $jh_has_option" >&5
@@ -35115,39 +36154,40 @@
 -  fi
 -  ;;
 -esac
++    # See if we are running on zsh, and set the options which allow our
++    # commands through without removal of \ escapes.
++    if test -n "${ZSH_VERSION+set}" ; then
++      setopt NO_GLOB_SUBST
++    fi
+ 
+-ac_config_files="$ac_config_files Makefile src/Makefile tests/Makefile tests/c-inproc/Makefile examples/Makefile examples/threaded/Makefile pyorbit-2.pc pyorbit.spec PKG-INFO"
 +    cfgfile="${ofile}T"
 +    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
 +    $RM "$cfgfile"
  
--case " $CFLAGS " in
--*[\	\ ]-fno-strict-aliasing[\	\ ]*)
--  ;;
--*)
--  save_CFLAGS="$CFLAGS"
--  CFLAGS="$CFLAGS -fno-strict-aliasing"
--  { $as_echo "$as_me:$LINENO: checking whether $CC understands -fno-strict-aliasing" >&5
--$as_echo_n "checking whether $CC understands -fno-strict-aliasing... " >&6; }
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
 +    cat <<_LT_EOF >> "$cfgfile"
 +#! $SHELL
  
--int
--main ()
--{
+-cat >confcache <<\_ACEOF
+-# This file is a shell script that caches the results of configure
+-# tests run on this system so they can be shared between configure
+-# scripts and configure runs, see configure's option --config-cache.
+-# It is not useful on other systems.  If it contains results you don't
+-# want to keep, you may remove or edit it.
 +# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
 +# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
 +# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
 +# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-+#
+ #
+-# config.status only pays attention to the cache file if you give it
+-# the --recheck option to rerun configure.
 +#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
 +#                 2006, 2007, 2008 Free Software Foundation, Inc.
 +#   Written by Gordon Matzigkeit, 1996
-+#
+ #
+-# `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.
 +#   This file is part of GNU Libtool.
 +#
 +# GNU Libtool is free software; you can redistribute it and/or
@@ -35171,75 +36211,7 @@
 +# obtained by writing to the Free Software Foundation, Inc.,
 +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  
--  ;
--  return 0;
--}
 -_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest.$ac_objext; then
--  jh_has_option=yes
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
- 
--	jh_has_option=no
--fi
-+# The names of the tagged configurations supported by this script.
-+available_tags=""
- 
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--  { $as_echo "$as_me:$LINENO: result: $jh_has_option" >&5
--$as_echo "$jh_has_option" >&6; }
--  if test $jh_has_option = no; then
--    CFLAGS="$save_CFLAGS"
--  fi
--  ;;
--esac
-+# ### BEGIN LIBTOOL CONFIG
- 
--ac_config_files="$ac_config_files Makefile src/Makefile tests/Makefile tests/c-inproc/Makefile examples/Makefile examples/threaded/Makefile pyorbit-2.pc pyorbit.spec PKG-INFO"
-+# Whether or not to build static libraries.
-+build_old_libs=$enable_static
- 
-+# Which release of libtool.m4 was used?
-+macro_version=$macro_version
-+macro_revision=$macro_revision
- 
--cat >confcache <<\_ACEOF
--# This file is a shell script that caches the results of configure
--# tests run on this system so they can be shared between configure
--# scripts and configure runs, see configure's option --config-cache.
--# It is not useful on other systems.  If it contains results you don't
--# want to keep, you may remove or edit it.
--#
--# config.status only pays attention to the cache file if you give it
--# the --recheck option to rerun configure.
--#
--# `ac_cv_env_foo' variables (set or unset) will be overridden when
--# loading this file, other *unset* `ac_cv_foo' will be assigned the
--# following values.
-+# Whether or not to build shared libraries.
-+build_libtool_libs=$enable_shared
- 
--_ACEOF
-+# What type of objects to build.
-+pic_mode=$pic_mode
  
 -# The following way of writing the cache mishandles newlines in values,
 -# but we know of no workaround that is simple, portable, and efficient.
@@ -35262,8 +36234,20 @@
 -      esac ;;
 -    esac
 -  done
-+# Whether or not to optimize for fast installation.
-+fast_install=$enable_fast_install
++# The names of the tagged configurations supported by this script.
++available_tags=""
++
++# ### BEGIN LIBTOOL CONFIG
++
++# Whether or not to build static libraries.
++build_old_libs=$enable_static
++
++# Which release of libtool.m4 was used?
++macro_version=$macro_version
++macro_revision=$macro_revision
++
++# Whether or not to build shared libraries.
++build_libtool_libs=$enable_shared
  
 -  (set) 2>&1 |
 -    case $as_nl`(ac_space=' '; set) 2>&1` in #(
@@ -35301,22 +36285,20 @@
 -  fi
 -fi
 -rm -f confcache
++# What type of objects to build.
++pic_mode=$pic_mode
+ 
+-test "x$prefix" = xNONE && prefix=$ac_default_prefix
+-# Let make expand exec_prefix.
+-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
++# Whether or not to optimize for fast installation.
++fast_install=$enable_fast_install
+ 
+-DEFS=-DHAVE_CONFIG_H
 +# The host system.
 +host_alias=$host_alias
 +host=$host
 +host_os=$host_os
- 
--test "x$prefix" = xNONE && prefix=$ac_default_prefix
--# Let make expand exec_prefix.
--test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-+# The build system.
-+build_alias=$build_alias
-+build=$build
-+build_os=$build_os
- 
--DEFS=-DHAVE_CONFIG_H
-+# A sed program that does not truncate output.
-+SED=$lt_SED
  
 -ac_libobjs=
 -ac_ltlibobjs=
@@ -35330,15 +36312,17 @@
 -  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
 -done
 -LIBOBJS=$ac_libobjs
++# The build system.
++build_alias=$build_alias
++build=$build
++build_os=$build_os
+ 
+-LTLIBOBJS=$ac_ltlibobjs
++# 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//"
- 
--LTLIBOBJS=$ac_ltlibobjs
-+# A grep program that handles long lines.
-+GREP=$lt_GREP
- 
-+# An ERE matcher.
-+EGREP=$lt_EGREP
  
 -if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
 -  { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
@@ -35361,8 +36345,8 @@
 -Usually this means the macro was only invoked conditionally." >&2;}
 -   { (exit 1); exit 1; }; }
 -fi
-+# A literal string matcher.
-+FGREP=$lt_FGREP
++# A grep program that handles long lines.
++GREP=$lt_GREP
  
 -: ${CONFIG_STATUS=./config.status}
 -ac_write_fail=0
@@ -35376,23 +36360,23 @@
 -# Run this file to recreate the current configuration.
 -# Compiler output produced by configure, useful for debugging
 -# configure, is in config.log if it exists.
-+# A BSD- or MS-compatible name lister.
-+NM=$lt_NM
++# An ERE matcher.
++EGREP=$lt_EGREP
  
 -debug=false
 -ac_cs_recheck=false
 -ac_cs_silent=false
 -SHELL=\${CONFIG_SHELL-$SHELL}
 -_ACEOF
-+# Whether we need soft or hard links.
-+LN_S=$lt_LN_S
++# A literal string matcher.
++FGREP=$lt_FGREP
  
 -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 -## --------------------- ##
 -## M4sh Initialization.  ##
 -## --------------------- ##
-+# What is the maximum length of a command?
-+max_cmd_len=$max_cmd_len
++# A BSD- or MS-compatible name lister.
++NM=$lt_NM
  
 -# Be more Bourne compatible
 -DUALCASE=1; export DUALCASE # for MKS sh
@@ -35407,21 +36391,21 @@
 -  case `(set -o) 2>/dev/null` in
 -  *posix*) set -o posix ;;
 -esac
++# Whether we need soft or hard links.
++LN_S=$lt_LN_S
+ 
+-fi
++# What is the maximum length of a command?
++max_cmd_len=$max_cmd_len
+ 
 +# Object file suffix (normally "o").
 +objext=$ac_objext
  
--fi
 +# Executable file suffix (normally "").
 +exeext=$exeext
  
 +# whether the shell understands "unset".
 +lt_unset=$lt_unset
- 
-+# turn spaces into newlines.
-+SP2NL=$lt_lt_SP2NL
- 
-+# turn newlines into spaces.
-+NL2SP=$lt_lt_NL2SP
  
 -# PATH needs CR
 -# Avoid depending upon Character Ranges.
@@ -35430,9 +36414,8 @@
 -as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 -as_cr_digits='0123456789'
 -as_cr_alnum=$as_cr_Letters$as_cr_digits
-+# How to create reloadable object files.
-+reload_flag=$lt_reload_flag
-+reload_cmds=$lt_reload_cmds
++# turn spaces into newlines.
++SP2NL=$lt_lt_SP2NL
  
 -as_nl='
 -'
@@ -35465,8 +36448,8 @@
 -  export as_echo_body
 -  as_echo='sh -c $as_echo_body as_echo'
 -fi
-+# An object symbol dumper.
-+OBJDUMP=$lt_OBJDUMP
++# turn newlines into spaces.
++NL2SP=$lt_lt_NL2SP
  
 -# The user is always right.
 -if test "${PATH_SEPARATOR+set}" != set; then
@@ -35476,8 +36459,9 @@
 -      PATH_SEPARATOR=';'
 -  }
 -fi
-+# Method to check whether dependent libraries are shared objects.
-+deplibs_check_method=$lt_deplibs_check_method
++# How to create reloadable object files.
++reload_flag=$lt_reload_flag
++reload_cmds=$lt_reload_cmds
  
 -# Support unset when possible.
 -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
@@ -35485,12 +36469,11 @@
 -else
 -  as_unset=false
 -fi
-+# Command to use when deplibs_check_method == "file_magic".
-+file_magic_cmd=$lt_file_magic_cmd
- 
-+# The archiver.
-+AR=$lt_AR
-+AR_FLAGS=$lt_AR_FLAGS
++# An object symbol dumper.
++OBJDUMP=$lt_OBJDUMP
+ 
++# Method to check whether dependent libraries are shared objects.
++deplibs_check_method=$lt_deplibs_check_method
  
 -# IFS
 -# We need space, tab and new line, in precisely that order.  Quoting is
@@ -35498,8 +36481,8 @@
 -# (If _AS_PATH_WALK were called with IFS unset, it would disable word
 -# splitting by setting IFS to empty value.)
 -IFS=" ""	$as_nl"
-+# A symbol stripping program.
-+STRIP=$lt_STRIP
++# Command to use when deplibs_check_method == "file_magic".
++file_magic_cmd=$lt_file_magic_cmd
  
 -# Find who we are.  Look in the path if we contain no directory separator.
 -case $0 in
@@ -35512,10 +36495,9 @@
 -  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
 -done
 -IFS=$as_save_IFS
-+# Commands used to install an old-style archive.
-+RANLIB=$lt_RANLIB
-+old_postinstall_cmds=$lt_old_postinstall_cmds
-+old_postuninstall_cmds=$lt_old_postuninstall_cmds
++# The archiver.
++AR=$lt_AR
++AR_FLAGS=$lt_AR_FLAGS
  
 -     ;;
 -esac
@@ -35528,8 +36510,8 @@
 -  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
 -  { (exit 1); exit 1; }
 -fi
-+# A C compiler.
-+LTCC=$lt_CC
++# A symbol stripping program.
++STRIP=$lt_STRIP
  
 -# Work around bugs in pre-3.0 UWIN ksh.
 -for as_var in ENV MAIL MAILPATH
@@ -35538,16 +36520,18 @@
 -PS1='$ '
 -PS2='> '
 -PS4='+ '
-+# LTCC compiler flags.
-+LTCFLAGS=$lt_CFLAGS
++# Commands used to install an old-style archive.
++RANLIB=$lt_RANLIB
++old_postinstall_cmds=$lt_old_postinstall_cmds
++old_postuninstall_cmds=$lt_old_postuninstall_cmds
  
 -# NLS nuisances.
 -LC_ALL=C
 -export LC_ALL
 -LANGUAGE=C
 -export LANGUAGE
-+# 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
++# A C compiler.
++LTCC=$lt_CC
  
 -# Required to use basename.
 -if expr a : '\(a\)' >/dev/null 2>&1 &&
@@ -35556,19 +36540,19 @@
 -else
 -  as_expr=false
 -fi
-+# Transform the output of nm in a proper C declaration.
-+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
++# LTCC compiler flags.
++LTCFLAGS=$lt_CFLAGS
  
 -if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
 -  as_basename=basename
 -else
 -  as_basename=false
 -fi
-+# 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
- 
-+# Transform the output of nm in a C name address pair when lib prefix is needed.
-+global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
++# 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
  
 -# Name of the executable.
 -as_me=`$as_basename -- "$0" ||
@@ -35589,19 +36573,19 @@
 -	    q
 -	  }
 -	  s/.*/./; q'`
++# 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
+ 
+-# CDPATH.
+-$as_unset CDPATH
++# Transform the output of nm in a C name address pair when lib prefix is needed.
++global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
+ 
 +# The name of the directory that contains temporary libtool files.
 +objdir=$objdir
  
--# CDPATH.
--$as_unset CDPATH
 +# Shell to use when invoking shell scripts.
 +SHELL=$lt_SHELL
- 
-+# An echo program that does not interpret backslashes.
-+ECHO=$lt_ECHO
- 
-+# Used to examine libraries when file_magic_cmd begins with "file".
-+MAGIC_CMD=$MAGIC_CMD
  
 -  as_lineno_1=$LINENO
 -  as_lineno_2=$LINENO
@@ -35636,17 +36620,14 @@
 -  chmod +x "$as_me.lineno" ||
 -    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
 -   { (exit 1); exit 1; }; }
++# An echo program that does not interpret backslashes.
++ECHO=$lt_ECHO
++
++# Used to examine libraries when file_magic_cmd begins with "file".
++MAGIC_CMD=$MAGIC_CMD
++
 +# Must we lock files when doing compilation?
 +need_locks=$lt_need_locks
-+
-+# Tool to manipulate archived DWARF debug symbol files on Mac OS X.
-+DSYMUTIL=$lt_DSYMUTIL
-+
-+# Tool to change global to local symbols on Mac OS X.
-+NMEDIT=$lt_NMEDIT
-+
-+# Tool to manipulate fat objects and archives on Mac OS X.
-+LIPO=$lt_LIPO
  
 -  # Don't try to exec as it changes $[0], causing all sort of problems
 -  # (the dirname of $[0] is not the place where we might find the
@@ -35655,19 +36636,19 @@
 -  # Exit status is that of the last command.
 -  exit
 -}
-+# ldd/readelf like tool for Mach-O binaries on Mac OS X.
-+OTOOL=$lt_OTOOL
- 
-+# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4.
-+OTOOL64=$lt_OTOOL64
++# Tool to manipulate archived DWARF debug symbol files on Mac OS X.
++DSYMUTIL=$lt_DSYMUTIL
+ 
++# Tool to change global to local symbols on Mac OS X.
++NMEDIT=$lt_NMEDIT
  
 -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
 -  as_dirname=dirname
 -else
 -  as_dirname=false
 -fi
-+# Old archive suffix (normally "a").
-+libext=$libext
++# Tool to manipulate fat objects and archives on Mac OS X.
++LIPO=$lt_LIPO
  
 -ECHO_C= ECHO_N= ECHO_T=
 -case `echo -n x` in
@@ -35685,8 +36666,8 @@
 -else
 -  as_expr=false
 -fi
-+# Shared library suffix (normally ".so").
-+shrext_cmds=$lt_shrext_cmds
++# ldd/readelf like tool for Mach-O binaries on Mac OS X.
++OTOOL=$lt_OTOOL
  
 -rm -f conf$$ conf$$.exe conf$$.file
 -if test -d conf$$.dir; then
@@ -35714,8 +36695,8 @@
 -fi
 -rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 -rmdir conf$$.dir 2>/dev/null
-+# The commands to extract the exported symbol list from a shared archive.
-+extract_expsyms_cmds=$lt_extract_expsyms_cmds
++# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4.
++OTOOL64=$lt_OTOOL64
  
 -if mkdir -p . 2>/dev/null; then
 -  as_mkdir_p=:
@@ -35723,9 +36704,8 @@
 -  test -d ./-p && rmdir ./-p
 -  as_mkdir_p=false
 -fi
-+# Variables whose values should be saved in libtool wrapper scripts and
-+# restored at link time.
-+variables_saved_for_relink=$lt_variables_saved_for_relink
++# Old archive suffix (normally "a").
++libext=$libext
  
 -if test -x / >/dev/null 2>&1; then
 -  as_test_x='test -x'
@@ -35749,25 +36729,26 @@
 -  '
 -fi
 -as_executable_p=$as_test_x
++# Shared library suffix (normally ".so").
++shrext_cmds=$lt_shrext_cmds
+ 
+-# 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'"
++# The commands to extract the exported symbol list from a shared archive.
++extract_expsyms_cmds=$lt_extract_expsyms_cmds
+ 
+-# Sed expression to map a string onto a valid variable name.
+-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
++# Variables whose values should be saved in libtool wrapper scripts and
++# restored at link time.
++variables_saved_for_relink=$lt_variables_saved_for_relink
+ 
 +# Do we need the "lib" prefix for modules?
 +need_lib_prefix=$need_lib_prefix
  
--# 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'"
+-exec 6>&1
 +# Do we need a version for libraries?
 +need_version=$need_version
- 
--# Sed expression to map a string onto a valid variable name.
--as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-+# Library versioning type.
-+version_type=$version_type
- 
-+# Shared library runtime path variable.
-+runpath_var=$runpath_var
- 
--exec 6>&1
-+# Shared library path variable.
-+shlibpath_var=$shlibpath_var
  
 -# Save the log message, to keep $[0] and so on meaningful, and to
 -# report actual input values of CONFIG_FILES etc. instead of their
@@ -35775,50 +36756,49 @@
 -ac_log="
 -This file was extended by pyorbit $as_me 2.24.0, which was
 -generated by GNU Autoconf 2.62.  Invocation command line was
-+# Is shlibpath searched before the hard-coded library search path?
-+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
++# Library versioning type.
++version_type=$version_type
  
 -  CONFIG_FILES    = $CONFIG_FILES
 -  CONFIG_HEADERS  = $CONFIG_HEADERS
 -  CONFIG_LINKS    = $CONFIG_LINKS
 -  CONFIG_COMMANDS = $CONFIG_COMMANDS
 -  $ $0 $@
-+# Format of library name prefix.
-+libname_spec=$lt_libname_spec
++# Shared library runtime path variable.
++runpath_var=$runpath_var
  
 -on `(hostname || uname -n) 2>/dev/null | sed 1q`
 -"
-+# 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
++# Shared library path variable.
++shlibpath_var=$shlibpath_var
  
 -_ACEOF
-+# The coded name of the library, if different from the real name.
-+soname_spec=$lt_soname_spec
++# Is shlibpath searched before the hard-coded library search path?
++shlibpath_overrides_runpath=$shlibpath_overrides_runpath
  
 -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"
-+# Command to use after installation of a shared archive.
-+postinstall_cmds=$lt_postinstall_cmds
++# Format of library name prefix.
++libname_spec=$lt_libname_spec
  
 -_ACEOF
-+# Command to use after uninstallation of a shared archive.
-+postuninstall_cmds=$lt_postuninstall_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
  
 -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 -ac_cs_usage="\
 -\`$as_me' instantiates files from templates according to the
 -current configuration.
-+# Commands used to finish a libtool library installation in a directory.
-+finish_cmds=$lt_finish_cmds
++# The coded name of the library, if different from the real name.
++soname_spec=$lt_soname_spec
  
 -Usage: $0 [OPTIONS] [FILE]...
-+# As "finish_cmds", except a single script fragment to be evaled but
-+# not shown.
-+finish_eval=$lt_finish_eval
++# Command to use after installation of a shared archive.
++postinstall_cmds=$lt_postinstall_cmds
  
 -  -h, --help       print this help, then exit
 -  -V, --version    print version number and configuration settings, then exit
@@ -35829,27 +36809,28 @@
 -                   instantiate the configuration file FILE
 -  --header=FILE[:TEMPLATE]
 -                   instantiate the configuration header FILE
++# Command to use after uninstallation of a shared archive.
++postuninstall_cmds=$lt_postuninstall_cmds
+ 
+-Configuration files:
+-$config_files
++# Commands used to finish a libtool library installation in a directory.
++finish_cmds=$lt_finish_cmds
+ 
+-Configuration headers:
+-$config_headers
++# As "finish_cmds", except a single script fragment to be evaled but
++# not shown.
++finish_eval=$lt_finish_eval
+ 
+-Configuration commands:
+-$config_commands
 +# Whether we should hardcode library paths into libraries.
 +hardcode_into_libs=$hardcode_into_libs
  
--Configuration files:
--$config_files
+-Report bugs to <bug-autoconf at gnu.org>."
 +# Compile-time system search path for libraries.
 +sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
- 
--Configuration headers:
--$config_headers
-+# Run-time system search path for libraries.
-+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
- 
--Configuration commands:
--$config_commands
-+# Whether dlopen is supported.
-+dlopen_support=$enable_dlopen
- 
--Report bugs to <bug-autoconf at gnu.org>."
-+# Whether dlopen of programs is supported.
-+dlopen_self=$enable_dlopen_self
  
 -_ACEOF
 -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
@@ -35857,15 +36838,14 @@
 -pyorbit config.status 2.24.0
 -configured by $0, generated by GNU Autoconf 2.62,
 -  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-+# Whether dlopen of statically linked programs is supported.
-+dlopen_self_static=$enable_dlopen_self_static
++# Run-time system search path for libraries.
++sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
  
 -Copyright (C) 2008 Free Software Foundation, Inc.
 -This config.status script is free software; the Free Software Foundation
 -gives unlimited permission to copy, distribute and modify it."
-+# Commands to strip libraries.
-+old_striplib=$lt_old_striplib
-+striplib=$lt_striplib
++# Whether dlopen is supported.
++dlopen_support=$enable_dlopen
  
 -ac_pwd='$ac_pwd'
 -srcdir='$srcdir'
@@ -35874,6 +36854,8 @@
 -AWK='$AWK'
 -test -n "\$AWK" || AWK=awk
 -_ACEOF
++# Whether dlopen of programs is supported.
++dlopen_self=$enable_dlopen_self
  
 -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 -# The default lists apply if the user does not specify any file.
@@ -35892,8 +36874,8 @@
 -    ac_shift=shift
 -    ;;
 -  esac
-+# The linker used to build libraries.
-+LD=$lt_LD
++# Whether dlopen of statically linked programs is supported.
++dlopen_self_static=$enable_dlopen_self_static
  
 -  case $ac_option in
 -  # Handling of the options.
@@ -35927,37 +36909,36 @@
 -  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
 -  | -silent | --silent | --silen | --sile | --sil | --si | --s)
 -    ac_cs_silent=: ;;
-+# Commands used to build an old-style archive.
-+old_archive_cmds=$lt_old_archive_cmds
++# Commands to strip libraries.
++old_striplib=$lt_old_striplib
++striplib=$lt_striplib
  
 -  # This is an error.
 -  -*) { $as_echo "$as_me: error: unrecognized option: $1
 -Try \`$0 --help' for more information." >&2
 -   { (exit 1); exit 1; }; } ;;
-+# A language specific compiler.
-+CC=$lt_compiler
  
 -  *) ac_config_targets="$ac_config_targets $1"
 -     ac_need_defaults=false ;;
-+# Is the compiler the GNU compiler?
-+with_gcc=$GCC
++# The linker used to build libraries.
++LD=$lt_LD
  
 -  esac
 -  shift
 -done
-+# Compiler flag to turn off builtin functions.
-+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
++# Commands used to build an old-style archive.
++old_archive_cmds=$lt_old_archive_cmds
  
 -ac_configure_extra_args=
-+# How to pass a linker flag through the compiler.
-+wl=$lt_lt_prog_compiler_wl
++# A language specific compiler.
++CC=$lt_compiler
  
 -if $ac_cs_silent; then
 -  exec 6>/dev/null
 -  ac_configure_extra_args="$ac_configure_extra_args --silent"
 -fi
-+# Additional compiler flags for building library objects.
-+pic_flag=$lt_lt_prog_compiler_pic
++# Is the compiler the GNU compiler?
++with_gcc=$GCC
  
 -_ACEOF
 -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
@@ -35969,6 +36950,15 @@
 -  export CONFIG_SHELL
 -  exec "\$@"
 -fi
++# Compiler flag to turn off builtin functions.
++no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
++
++# How to pass a linker flag through the compiler.
++wl=$lt_lt_prog_compiler_wl
++
++# Additional compiler flags for building library objects.
++pic_flag=$lt_lt_prog_compiler_pic
++
 +# Compiler flag to prevent dynamic linking.
 +link_static_flag=$lt_lt_prog_compiler_static
 +
@@ -37093,7 +38083,7 @@
  
  
  # configure is writing to config.log, and then calls config.status.
-@@ -22257,10 +13382,10 @@ if test "$no_create" != yes; then
+@@ -22257,10 +13430,10 @@
    exec 5>>config.log
    # Use ||, not &&, to avoid exiting from the if with $? = 1, which
    # would make configure fail if this is the last instruction.
@@ -37107,10 +38097,8 @@
 +$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
  fi
  
-Index: pyorbit-2.24.0/depcomp
-===================================================================
---- pyorbit-2.24.0.orig/depcomp	2009-11-21 10:17:40.430268054 +0100
-+++ pyorbit-2.24.0/depcomp	2009-11-21 10:17:34.186761621 +0100
+--- a/depcomp
++++ b/depcomp
 @@ -1,10 +1,10 @@
  #! /bin/sh
  # depcomp - compile a program generating dependencies as side-effects
@@ -37125,7 +38113,7 @@
  
  # This program is free software; you can redistribute it and/or modify
  # it under the terms of the GNU General Public License as published by
-@@ -17,9 +17,7 @@ scriptversion=2007-03-29.01
+@@ -17,9 +17,7 @@
  # GNU General Public License for more details.
  
  # You should have received a copy of the GNU General Public License
@@ -37136,7 +38124,7 @@
  
  # As a special exception to the GNU General Public License, if you
  # distribute this file as part of a program that contains a
-@@ -87,6 +85,15 @@ if test "$depmode" = dashXmstdout; then
+@@ -87,6 +85,15 @@
     depmode=dashmstdout
  fi
  
@@ -37152,7 +38140,7 @@
  case "$depmode" in
  gcc3)
  ## gcc 3 implements dependency tracking that does exactly what
-@@ -192,14 +199,14 @@ sgi)
+@@ -192,14 +199,14 @@
  ' < "$tmpdepfile" \
      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
      tr '
@@ -37170,7 +38158,7 @@
    else
      # The sourcefile does not contain any dependencies, so just
      # store a dummy comment line, to avoid errors with the Makefile
-@@ -328,7 +335,12 @@ hp2)
+@@ -328,7 +335,12 @@
    if test -f "$tmpdepfile"; then
      sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
      # Add `dependent.h:' lines.
@@ -37184,7 +38172,7 @@
    else
      echo "#dummy" > "$depfile"
    fi
-@@ -404,7 +416,7 @@ dashmstdout)
+@@ -404,7 +416,7 @@
  
    # Remove the call to Libtool.
    if test "$libtool" = yes; then
@@ -37193,7 +38181,7 @@
        shift
      done
      shift
-@@ -455,32 +467,39 @@ makedepend)
+@@ -455,32 +467,39 @@
    "$@" || exit $?
    # Remove any Libtool call
    if test "$libtool" = yes; then
@@ -37237,7 +38225,7 @@
    touch "$tmpdepfile"
    ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
    rm -f "$depfile"
-@@ -500,7 +519,7 @@ cpp)
+@@ -500,7 +519,7 @@
  
    # Remove the call to Libtool.
    if test "$libtool" = yes; then
@@ -37246,7 +38234,7 @@
        shift
      done
      shift
-@@ -538,13 +557,27 @@ cpp)
+@@ -538,13 +557,27 @@
  
  msvisualcpp)
    # Important note: in order to support this mode, a compiler *must*
@@ -37276,7 +38264,7 @@
      "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
  	set fnord "$@"
  	shift
-@@ -557,16 +590,23 @@ msvisualcpp)
+@@ -557,16 +590,23 @@
  	;;
      esac
    done
@@ -37304,7 +38292,7 @@
  none)
    exec "$@"
    ;;
-@@ -585,5 +625,6 @@ exit 0
+@@ -585,5 +625,6 @@
  # eval: (add-hook 'write-file-hooks 'time-stamp)
  # time-stamp-start: "scriptversion="
  # time-stamp-format: "%:y-%02m-%02d.%02H"
@@ -37312,13 +38300,11 @@
 +# time-stamp-time-zone: "UTC"
 +# time-stamp-end: "; # UTC"
  # End:
-Index: pyorbit-2.24.0/examples/Makefile.in
-===================================================================
---- pyorbit-2.24.0.orig/examples/Makefile.in	2009-11-21 10:17:42.226269084 +0100
-+++ pyorbit-2.24.0/examples/Makefile.in	2009-11-21 10:17:33.890758916 +0100
+--- a/examples/Makefile.in
++++ b/examples/Makefile.in
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -37339,7 +38325,7 @@
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
-@@ -35,12 +37,16 @@ subdir = examples
+@@ -35,12 +37,16 @@
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  am__aclocal_m4_deps = $(top_srcdir)/m4/jhflags.m4 \
@@ -37356,7 +38342,7 @@
  SOURCES =
  DIST_SOURCES =
  RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-@@ -52,10 +58,38 @@ RECURSIVE_TARGETS = all-recursive check-
+@@ -52,10 +58,38 @@
  	ps-recursive uninstall-recursive
  RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
    distclean-recursive maintainer-clean-recursive
@@ -37395,7 +38381,7 @@
  ACLOCAL = @ACLOCAL@
  ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
  AMTAR = @AMTAR@
-@@ -69,44 +103,47 @@ CCDEPMODE = @CCDEPMODE@
+@@ -69,44 +103,47 @@
  CFLAGS = @CFLAGS@
  CPP = @CPP@
  CPPFLAGS = @CPPFLAGS@
@@ -37450,7 +38436,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PKG_CONFIG = @PKG_CONFIG@
-@@ -133,8 +170,7 @@ abs_srcdir = @abs_srcdir@
+@@ -133,8 +170,7 @@
  abs_top_builddir = @abs_top_builddir@
  abs_top_srcdir = @abs_top_srcdir@
  ac_ct_CC = @ac_ct_CC@
@@ -37460,7 +38446,7 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
-@@ -165,6 +201,7 @@ libdir = @libdir@
+@@ -165,6 +201,7 @@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -37468,7 +38454,7 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  oldincludedir = @oldincludedir@
-@@ -191,18 +228,18 @@ EXTRA_DIST = echo/Makefile echo/echo.idl
+@@ -191,18 +228,18 @@
  all: all-recursive
  
  .SUFFIXES:
@@ -37493,7 +38479,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -216,10 +253,11 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
+@@ -216,10 +253,11 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -37507,7 +38493,16 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -251,7 +289,7 @@ $(RECURSIVE_TARGETS):
+@@ -234,7 +272,7 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@failcom='exit 1'; \
++	@fail= failcom='exit 1'; \
+ 	for f in x $$MAKEFLAGS; do \
+ 	  case $$f in \
+ 	    *=* | --[!k]*);; \
+@@ -251,7 +289,7 @@
  	  else \
  	    local_target="$$target"; \
  	  fi; \
@@ -37516,7 +38511,16 @@
  	  || eval $$failcom; \
  	done; \
  	if test "$$dot_seen" = "no"; then \
-@@ -285,16 +323,16 @@ $(RECURSIVE_CLEAN_TARGETS):
+@@ -259,7 +297,7 @@
+ 	fi; test -z "$$fail"
+ 
+ $(RECURSIVE_CLEAN_TARGETS):
+-	@failcom='exit 1'; \
++	@fail= failcom='exit 1'; \
+ 	for f in x $$MAKEFLAGS; do \
+ 	  case $$f in \
+ 	    *=* | --[!k]*);; \
+@@ -285,16 +323,16 @@
  	  else \
  	    local_target="$$target"; \
  	  fi; \
@@ -37536,7 +38540,7 @@
  	done
  
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-@@ -302,14 +340,14 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
+@@ -302,14 +340,14 @@
  	unique=`for i in $$list; do \
  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  	  done | \
@@ -37553,7 +38557,7 @@
  	here=`pwd`; \
  	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
  	  include_option=--etags-include; \
-@@ -321,7 +359,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE
+@@ -321,7 +359,7 @@
  	list='$(SUBDIRS)'; for subdir in $$list; do \
  	  if test "$$subdir" = .; then :; else \
  	    test ! -f $$subdir/TAGS || \
@@ -37562,7 +38566,7 @@
  	  fi; \
  	done; \
  	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-@@ -330,29 +368,34 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE
+@@ -330,29 +368,34 @@
  	  done | \
  	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
  	      END { if (nonempty) { for (i in files) print i; }; }'`; \
@@ -37605,7 +38609,7 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-@@ -373,29 +416,44 @@ distdir: $(DISTFILES)
+@@ -373,29 +416,44 @@
  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
  	  if test -d $$d/$$file; then \
  	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
@@ -37660,7 +38664,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -425,6 +483,7 @@ clean-generic:
+@@ -425,6 +483,7 @@
  
  distclean-generic:
  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -37668,7 +38672,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -443,6 +502,8 @@ dvi-am:
+@@ -443,6 +502,8 @@
  
  html: html-recursive
  
@@ -37677,7 +38681,7 @@
  info: info-recursive
  
  info-am:
-@@ -451,18 +512,28 @@ install-data-am:
+@@ -451,18 +512,28 @@
  
  install-dvi: install-dvi-recursive
  
@@ -37706,7 +38710,7 @@
  installcheck-am:
  
  maintainer-clean: maintainer-clean-recursive
-@@ -483,8 +554,8 @@ ps-am:
+@@ -483,8 +554,8 @@
  
  uninstall-am:
  
@@ -37717,7 +38721,7 @@
  
  .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
  	all all-am check check-am clean clean-generic clean-libtool \
-@@ -500,6 +571,7 @@ uninstall-am:
+@@ -500,6 +571,7 @@
  	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
  	uninstall uninstall-am
  
@@ -37725,13 +38729,11 @@
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
-Index: pyorbit-2.24.0/examples/threaded/Makefile.in
-===================================================================
---- pyorbit-2.24.0.orig/examples/threaded/Makefile.in	2009-11-21 10:17:42.346267367 +0100
-+++ pyorbit-2.24.0/examples/threaded/Makefile.in	2009-11-21 10:17:33.958758486 +0100
+--- a/examples/threaded/Makefile.in
++++ b/examples/threaded/Makefile.in
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -37752,7 +38754,7 @@
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
-@@ -35,12 +37,16 @@ subdir = examples/threaded
+@@ -35,12 +37,16 @@
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  am__aclocal_m4_deps = $(top_srcdir)/m4/jhflags.m4 \
@@ -37769,7 +38771,7 @@
  SOURCES =
  DIST_SOURCES =
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-@@ -57,44 +63,47 @@ CCDEPMODE = @CCDEPMODE@
+@@ -57,44 +63,47 @@
  CFLAGS = @CFLAGS@
  CPP = @CPP@
  CPPFLAGS = @CPPFLAGS@
@@ -37824,7 +38826,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PKG_CONFIG = @PKG_CONFIG@
-@@ -121,8 +130,7 @@ abs_srcdir = @abs_srcdir@
+@@ -121,8 +130,7 @@
  abs_top_builddir = @abs_top_builddir@
  abs_top_srcdir = @abs_top_srcdir@
  ac_ct_CC = @ac_ct_CC@
@@ -37834,7 +38836,7 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
-@@ -153,6 +161,7 @@ libdir = @libdir@
+@@ -153,6 +161,7 @@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -37842,7 +38844,7 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  oldincludedir = @oldincludedir@
-@@ -178,18 +187,18 @@ EXTRA_DIST = client.py server.py pyt.idl
+@@ -178,18 +187,18 @@
  all: all-am
  
  .SUFFIXES:
@@ -37867,7 +38869,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -203,10 +212,11 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
+@@ -203,10 +212,11 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -37881,7 +38883,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -236,13 +246,17 @@ distdir: $(DISTFILES)
+@@ -236,13 +246,17 @@
  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
  	  if test -d $$d/$$file; then \
  	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
@@ -37903,7 +38905,7 @@
  	    || exit 1; \
  	  fi; \
  	done
-@@ -270,6 +284,7 @@ clean-generic:
+@@ -270,6 +284,7 @@
  
  distclean-generic:
  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -37911,7 +38913,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -288,6 +303,8 @@ dvi-am:
+@@ -288,6 +303,8 @@
  
  html: html-am
  
@@ -37920,7 +38922,7 @@
  info: info-am
  
  info-am:
-@@ -296,18 +313,28 @@ install-data-am:
+@@ -296,18 +313,28 @@
  
  install-dvi: install-dvi-am
  
@@ -37949,7 +38951,7 @@
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
-@@ -341,6 +368,7 @@ uninstall-am:
+@@ -341,6 +368,7 @@
  	maintainer-clean-generic mostlyclean mostlyclean-generic \
  	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
  
@@ -37957,10 +38959,8 @@
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
-Index: pyorbit-2.24.0/install-sh
-===================================================================
---- pyorbit-2.24.0.orig/install-sh	2009-11-21 10:17:40.730762668 +0100
-+++ pyorbit-2.24.0/install-sh	2009-11-21 10:17:33.750259561 +0100
+--- a/install-sh
++++ b/install-sh
 @@ -1,7 +1,7 @@
  #!/bin/sh
  # install - install a program, script, or datafile
@@ -37970,7 +38970,7 @@
  
  # This originates from X11R5 (mit/util/scripts/install.sh), which was
  # later released in X11R6 (xc/config/util/install.sh) with the
-@@ -515,5 +515,6 @@ done
+@@ -515,5 +515,6 @@
  # eval: (add-hook 'write-file-hooks 'time-stamp)
  # time-stamp-start: "scriptversion="
  # time-stamp-format: "%:y-%02m-%02d.%02H"
@@ -37978,10 +38978,8 @@
 +# time-stamp-time-zone: "UTC"
 +# time-stamp-end: "; # UTC"
  # End:
-Index: pyorbit-2.24.0/ltmain.sh
-===================================================================
---- pyorbit-2.24.0.orig/ltmain.sh	2009-11-21 10:17:41.162760598 +0100
-+++ pyorbit-2.24.0/ltmain.sh	2009-11-21 10:17:23.018261720 +0100
+--- a/ltmain.sh
++++ b/ltmain.sh
 @@ -1,52 +1,83 @@
 -# ltmain.sh - Provide generalized library-building support services.
 -# NOTE: Changing this file will not affect anything until you rerun configure.
@@ -37993,7 +38991,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.
@@ -38082,7 +39080,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
 +#
@@ -38092,16 +39090,16 @@
  PACKAGE=libtool
 -VERSION=1.5.26
 -TIMESTAMP=" (1.1220.2.492 2008/01/30 06:40:56)"
-+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
  if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
    emulate sh
    NULLCMD=:
-@@ -60,104 +91,261 @@ fi
+@@ -60,104 +91,261 @@
  BIN_SH=xpg4; export BIN_SH # for Tru64
  DUALCASE=1; export DUALCASE # for MKS sh
  
@@ -38443,7 +39441,7 @@
  
  # func_mktempdir [string]
  # Make a temporary directory that won't clash with other running
-@@ -167,7 +355,7 @@ func_mktempdir ()
+@@ -167,7 +355,7 @@
  {
      my_template="${TMPDIR-/tmp}/${1-$progname}"
  
@@ -38452,7 +39450,7 @@
        # Return a directory name, but don't create it in dry-run mode
        my_tmpdir="${my_template}-$$"
      else
-@@ -176,526 +364,787 @@ func_mktempdir ()
+@@ -176,526 +364,787 @@
        my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
  
        if test ! -d "$my_tmpdir"; then
@@ -39673,7 +40671,7 @@
  
  	-no-suppress)
  	  suppress_opt=no
-@@ -708,31 +1157,25 @@ if test -z "$show_help"; then
+@@ -708,31 +1157,25 @@
  	  ;;            #  replaced later.  I would guess that would be a bug.
  
  	-Wc,*)
@@ -39713,7 +40711,7 @@
  	  # Accept the current argument as the source file.
  	  # The previous "srcfile" becomes the current argument.
  	  #
-@@ -744,66 +1187,42 @@ if test -z "$show_help"; then
+@@ -744,66 +1187,42 @@
        esac    #  case $arg_mode
  
        # Aesthetically quote the previous argument.
@@ -39797,7 +40795,7 @@
        ;;
      esac
  
-@@ -811,7 +1230,15 @@ if test -z "$show_help"; then
+@@ -811,7 +1230,15 @@
  
      for arg in $later; do
        case $arg in
@@ -39813,7 +40811,7 @@
  	build_old_libs=yes
  	continue
  	;;
-@@ -828,28 +1255,17 @@ if test -z "$show_help"; then
+@@ -828,28 +1255,17 @@
        esac
      done
  
@@ -39851,7 +40849,7 @@
  
      # Delete any leftover library objects.
      if test "$build_old_libs" = yes; then
-@@ -858,12 +1274,9 @@ if test -z "$show_help"; then
+@@ -858,12 +1274,9 @@
        removelist="$lobj $libobj ${libobj}T"
      fi
  
@@ -39865,7 +40863,7 @@
        pic_mode=default
        ;;
      esac
-@@ -875,10 +1288,8 @@ if test -z "$show_help"; then
+@@ -875,10 +1288,8 @@
      # Calculate the filename of the output object if compiler does
      # not support -o with -c
      if test "$compiler_c_o" = no; then
@@ -39877,7 +40875,7 @@
      else
        output_obj=
        need_locks=no
-@@ -888,13 +1299,13 @@ if test -z "$show_help"; then
+@@ -888,13 +1299,13 @@
      # Lock this critical section if it is needed
      # We use this script file to make the link, it avoids creating a new file
      if test "$need_locks" = yes; then
@@ -39894,7 +40892,7 @@
  *** ERROR, $lockfile exists and contains:
  `cat $lockfile 2>/dev/null`
  
-@@ -905,34 +1316,22 @@ repeat this compilation, it may succeed,
+@@ -905,34 +1316,22 @@
  avoid parallel builds (make -j) in this platform, or get a better
  compiler."
  
@@ -39938,7 +40936,7 @@
  
      # Only build a PIC object if we are building libtool libraries.
      if test "$build_libtool_libs" = yes; then
-@@ -946,32 +1345,19 @@ EOF
+@@ -946,32 +1345,19 @@
  	command="$base_compile $qsrcfile"
        fi
  
@@ -39975,7 +40973,7 @@
  *** ERROR, $lockfile contains:
  `cat $lockfile 2>/dev/null`
  
-@@ -985,45 +1371,27 @@ repeat this compilation, it may succeed,
+@@ -985,45 +1371,27 @@
  avoid parallel builds (make -j) in this platform, or get a better
  compiler."
  
@@ -40026,7 +41024,7 @@
        else
  	command="$base_compile $qsrcfile $pic_flag"
        fi
-@@ -1033,17 +1401,12 @@ EOF
+@@ -1033,17 +1401,12 @@
  
        # Suppress compiler output if we already did a PIC compilation.
        command="$command$suppress_output"
@@ -40047,7 +41045,7 @@
  *** ERROR, $lockfile contains:
  `cat $lockfile 2>/dev/null`
  
-@@ -1057,5477 +1420,6784 @@ repeat this compilation, it may succeed,
+@@ -1057,5477 +1420,6784 @@
  avoid parallel builds (make -j) in this platform, or get a better
  compiler."
  
@@ -51746,7 +52744,7 @@
      files=
      rmforce=
      exit_status=0
-@@ -6539,30 +8209,28 @@ relink_command=\"$relink_command\""
+@@ -6539,30 +8209,28 @@
      for arg
      do
        case $arg in
@@ -51786,7 +52784,7 @@
        test "$mode" = uninstall && objdir="$dir"
  
        # Remember objdir for removal later, being careful to avoid duplicates
-@@ -6574,9 +8242,9 @@ relink_command=\"$relink_command\""
+@@ -6574,9 +8242,9 @@
        fi
  
        # Don't error if the file doesn't exist and rm -f was used.
@@ -51799,7 +52797,7 @@
  	:
        elif test -d "$file"; then
  	exit_status=1
-@@ -6590,8 +8258,8 @@ relink_command=\"$relink_command\""
+@@ -6590,8 +8258,8 @@
        case $name in
        *.la)
  	# Possibly a libtool archive, so verify it.
@@ -51810,7 +52808,7 @@
  
  	  # Delete the libtool libraries and symlinks.
  	  for n in $library_names; do
-@@ -6606,39 +8274,17 @@ relink_command=\"$relink_command\""
+@@ -6606,39 +8274,17 @@
  	    *" $dlname "*) ;;
  	    *) rmfiles="$rmfiles $objdir/$dlname" ;;
  	    esac
@@ -51853,7 +52851,7 @@
  	    fi
  	    # FIXME: should reinstall the best remaining shared library.
  	    ;;
-@@ -6648,20 +8294,20 @@ relink_command=\"$relink_command\""
+@@ -6648,20 +8294,20 @@
  
        *.lo)
  	# Possibly a libtool object, so verify it.
@@ -51880,7 +52878,7 @@
  	    rmfiles="$rmfiles $dir/$non_pic_object"
  	  fi
  	fi
-@@ -6672,17 +8318,26 @@ relink_command=\"$relink_command\""
+@@ -6672,17 +8318,26 @@
  	  noexename=$name
  	  case $file in
  	  *.exe)
@@ -51912,7 +52910,7 @@
  
  	    # note $name still contains .exe if it was in $file originally
  	    # as does the version of $file that was added into $rmfiles
-@@ -6697,239 +8352,38 @@ relink_command=\"$relink_command\""
+@@ -6697,239 +8352,38 @@
  	fi
  	;;
        esac
@@ -52166,7 +53164,7 @@
  
  # The TAGs below are defined such that we never get into a situation
  # in which we disable both kinds of libraries.  Given conflicting
-@@ -6943,14 +8397,17 @@ exit $?
+@@ -6943,14 +8397,17 @@
  # configuration.  But we'll never go from static-only to shared-only.
  
  # ### BEGIN LIBTOOL TAG CONFIG: disable-shared
@@ -52186,11 +53184,9 @@
  # End:
 +# vi:sw=2
 +
-Index: pyorbit-2.24.0/m4/libtool.m4
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ pyorbit-2.24.0/m4/libtool.m4	2009-11-21 10:17:23.234766670 +0100
-@@ -0,0 +1,7376 @@
+--- /dev/null
++++ b/m4/libtool.m4
+@@ -0,0 +1,7377 @@
 +# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 +#
 +#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -54638,7 +55634,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
@@ -55277,7 +56273,7 @@
 +  ;;
 +
 +# This must be Linux ELF.
-+linux* | k*bsd*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
 +  lt_cv_deplibs_check_method=pass_all
 +  ;;
 +
@@ -55898,7 +56894,7 @@
 +	    ;;
 +	esac
 +	;;
-+      linux* | k*bsd*-gnu)
++      linux* | k*bsd*-gnu | kopensolaris*-gnu)
 +	case $cc_basename in
 +	  KCC*)
 +	    # KAI C++ Compiler
@@ -56182,7 +57178,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*)
@@ -56478,6 +57474,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 ...
@@ -56569,7 +57566,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
@@ -58053,7 +59050,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
@@ -59567,10 +60564,8 @@
 +    ;;
 +  esac
 +])
-Index: pyorbit-2.24.0/m4/ltoptions.m4
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ pyorbit-2.24.0/m4/ltoptions.m4	2009-11-21 10:17:23.462768354 +0100
+--- /dev/null
++++ b/m4/ltoptions.m4
 @@ -0,0 +1,368 @@
 +# Helper functions for option handling.                    -*- Autoconf -*-
 +#
@@ -59940,10 +60935,8 @@
 +		 [m4_define([_LTDL_TYPE], [installable])])
 +LT_OPTION_DEFINE([LTDL_INIT], [convenience],
 +		 [m4_define([_LTDL_TYPE], [convenience])])
-Index: pyorbit-2.24.0/m4/ltsugar.m4
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ pyorbit-2.24.0/m4/ltsugar.m4	2009-11-21 10:17:23.702268688 +0100
+--- /dev/null
++++ b/m4/ltsugar.m4
 @@ -0,0 +1,123 @@
 +# ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
 +#
@@ -60068,10 +61061,8 @@
 +           lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]),
 +		      [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl
 +])
-Index: pyorbit-2.24.0/m4/ltversion.m4
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ pyorbit-2.24.0/m4/ltversion.m4	2009-11-21 10:17:23.906273737 +0100
+--- /dev/null
++++ b/m4/ltversion.m4
 @@ -0,0 +1,23 @@
 +# ltversion.m4 -- version numbers			-*- Autoconf -*-
 +#
@@ -60084,22 +61075,20 @@
 +
 +# 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)
 +])
-Index: pyorbit-2.24.0/m4/lt~obsolete.m4
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ pyorbit-2.24.0/m4/lt~obsolete.m4	2009-11-21 10:17:24.162762484 +0100
+--- /dev/null
++++ b/m4/lt~obsolete.m4
 @@ -0,0 +1,92 @@
 +# lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
 +#
@@ -60193,10 +61182,8 @@
 +m4_ifndef([_LT_AC_LANG_RC_CONFIG],	[AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
 +m4_ifndef([AC_LIBTOOL_CONFIG],		[AC_DEFUN([AC_LIBTOOL_CONFIG])])
 +m4_ifndef([_LT_AC_FILE_LTDLL_C],	[AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
-Index: pyorbit-2.24.0/missing
-===================================================================
---- pyorbit-2.24.0.orig/missing	2009-11-21 10:17:40.634765419 +0100
-+++ pyorbit-2.24.0/missing	2009-11-21 10:17:33.754260139 +0100
+--- a/missing
++++ b/missing
 @@ -1,10 +1,10 @@
  #! /bin/sh
  # Common stub for a few missing GNU programs while installing.
@@ -60211,7 +61198,7 @@
  # Originally by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
  
  # This program is free software; you can redistribute it and/or modify
-@@ -18,9 +18,7 @@ scriptversion=2006-05-10.23
+@@ -18,9 +18,7 @@
  # GNU General Public License for more details.
  
  # You should have received a copy of the GNU General Public License
@@ -60222,7 +61209,7 @@
  
  # As a special exception to the GNU General Public License, if you
  # distribute this file as part of a program that contains a
-@@ -89,6 +87,9 @@ Supported PROGRAM values:
+@@ -89,6 +87,9 @@
    tar          try tar, gnutar, gtar, then tar without non-portable flags
    yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
  
@@ -60232,7 +61219,7 @@
  Send bug reports to <bug-automake at gnu.org>."
      exit $?
      ;;
-@@ -106,15 +107,22 @@ Send bug reports to <bug-automake at gnu.or
+@@ -106,15 +107,22 @@
  
  esac
  
@@ -60258,7 +61245,7 @@
      if test -n "$run"; then
         echo 1>&2 "ERROR: \`tar' requires --run"
         exit 1
-@@ -138,7 +146,7 @@ esac
+@@ -138,7 +146,7 @@
  
  # If it does not exist, or fails to run (possibly an outdated version),
  # try to emulate it.
@@ -60267,7 +61254,7 @@
    aclocal*)
      echo 1>&2 "\
  WARNING: \`$1' is $msg.  You should only need it if
-@@ -148,7 +156,7 @@ WARNING: \`$1' is $msg.  You should only
+@@ -148,7 +156,7 @@
      touch aclocal.m4
      ;;
  
@@ -60276,7 +61263,7 @@
      echo 1>&2 "\
  WARNING: \`$1' is $msg.  You should only need it if
           you modified \`${configure_ac}'.  You might want to install the
-@@ -157,7 +165,7 @@ WARNING: \`$1' is $msg.  You should only
+@@ -157,7 +165,7 @@
      touch configure
      ;;
  
@@ -60285,7 +61272,7 @@
      echo 1>&2 "\
  WARNING: \`$1' is $msg.  You should only need it if
           you modified \`acconfig.h' or \`${configure_ac}'.  You might want
-@@ -187,7 +195,7 @@ WARNING: \`$1' is $msg.  You should only
+@@ -187,7 +195,7 @@
  	   while read f; do touch "$f"; done
      ;;
  
@@ -60294,7 +61281,7 @@
      echo 1>&2 "\
  WARNING: \`$1' is needed, but is $msg.
           You might have modified some files without having the
-@@ -210,7 +218,7 @@ WARNING: \`$1' is needed, but is $msg.
+@@ -210,7 +218,7 @@
      fi
      ;;
  
@@ -60303,7 +61290,7 @@
      echo 1>&2 "\
  WARNING: \`$1' $msg.  You should only need it if
           you modified a \`.y' file.  You may need the \`Bison' package
-@@ -240,7 +248,7 @@ WARNING: \`$1' $msg.  You should only ne
+@@ -240,7 +248,7 @@
      fi
      ;;
  
@@ -60312,7 +61299,7 @@
      echo 1>&2 "\
  WARNING: \`$1' is $msg.  You should only need it if
           you modified a \`.l' file.  You may need the \`Flex' package
-@@ -263,7 +271,7 @@ WARNING: \`$1' is $msg.  You should only
+@@ -263,7 +271,7 @@
      fi
      ;;
  
@@ -60321,7 +61308,7 @@
      echo 1>&2 "\
  WARNING: \`$1' is $msg.  You should only need it if
  	 you modified a dependency of a manual page.  You may need the
-@@ -277,11 +285,11 @@ WARNING: \`$1' is $msg.  You should only
+@@ -277,11 +285,11 @@
      else
  	test -z "$file" || exec >$file
  	echo ".ab help2man is required to generate this page"
@@ -60335,7 +61322,7 @@
      echo 1>&2 "\
  WARNING: \`$1' is $msg.  You should only need it if
           you modified a \`.texi' or \`.texinfo' file, or any other file
-@@ -310,7 +318,7 @@ WARNING: \`$1' is $msg.  You should only
+@@ -310,7 +318,7 @@
      touch $file
      ;;
  
@@ -60344,7 +61331,7 @@
      shift
  
      # We have already tried tar in the generic part.
-@@ -363,5 +371,6 @@ exit 0
+@@ -363,5 +371,6 @@
  # eval: (add-hook 'write-file-hooks 'time-stamp)
  # time-stamp-start: "scriptversion="
  # time-stamp-format: "%:y-%02m-%02d.%02H"
@@ -60352,10 +61339,8 @@
 +# time-stamp-time-zone: "UTC"
 +# time-stamp-end: "; # UTC"
  # End:
-Index: pyorbit-2.24.0/py-compile
-===================================================================
---- pyorbit-2.24.0.orig/py-compile	2009-11-21 10:17:40.530768475 +0100
-+++ pyorbit-2.24.0/py-compile	2009-11-21 10:17:34.046765835 +0100
+--- a/py-compile
++++ b/py-compile
 @@ -1,9 +1,10 @@
  #!/bin/sh
  # py-compile - Compile a Python program
@@ -60369,7 +61354,7 @@
  
  # This program is free software; you can redistribute it and/or modify
  # it under the terms of the GNU General Public License as published by
-@@ -16,9 +17,7 @@ scriptversion=2005-05-14.22
+@@ -16,9 +17,7 @@
  # GNU General Public License for more details.
  
  # You should have received a copy of the GNU General Public License
@@ -60380,7 +61365,7 @@
  
  # As a special exception to the GNU General Public License, if you
  # distribute this file as part of a program that contains a
-@@ -103,38 +102,38 @@ else
+@@ -103,38 +102,38 @@
  fi
  
  $PYTHON -c "
@@ -60431,7 +61416,7 @@
  
  # Local Variables:
  # mode: shell-script
-@@ -142,5 +141,6 @@ print" 2>/dev/null || :
+@@ -142,5 +141,6 @@
  # eval: (add-hook 'write-file-hooks 'time-stamp)
  # time-stamp-start: "scriptversion="
  # time-stamp-format: "%:y-%02m-%02d.%02H"
@@ -60439,13 +61424,11 @@
 +# time-stamp-time-zone: "UTC"
 +# time-stamp-end: "; # UTC"
  # End:
-Index: pyorbit-2.24.0/src/Makefile.in
-===================================================================
---- pyorbit-2.24.0.orig/src/Makefile.in	2009-11-21 10:17:41.274762119 +0100
-+++ pyorbit-2.24.0/src/Makefile.in	2009-11-21 10:17:34.086758417 +0100
+--- a/src/Makefile.in
++++ b/src/Makefile.in
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -60466,7 +61449,7 @@
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
-@@ -38,21 +40,39 @@ DIST_COMMON = $(pyexec_PYTHON) $(pyorbit
+@@ -38,21 +40,39 @@
  	$(srcdir)/Makefile.am $(srcdir)/Makefile.in
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  am__aclocal_m4_deps = $(top_srcdir)/m4/jhflags.m4 \
@@ -60508,7 +61491,7 @@
  LTLIBRARIES = $(pyexec_LTLIBRARIES)
  am__DEPENDENCIES_1 =
  ORBit_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-@@ -69,6 +89,7 @@ ORBit_la_LINK = $(LIBTOOL) --tag=CC $(AM
+@@ -69,6 +89,7 @@
  DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
  depcomp = $(SHELL) $(top_srcdir)/depcomp
  am__depfiles_maybe = depfiles
@@ -60516,7 +61499,7 @@
  COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
  	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-@@ -80,9 +101,7 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLF
+@@ -80,9 +101,7 @@
  	$(LDFLAGS) -o $@
  SOURCES = $(ORBit_la_SOURCES)
  DIST_SOURCES = $(ORBit_la_SOURCES)
@@ -60526,7 +61509,7 @@
  HEADERS = $(pyorbitinclude_HEADERS)
  ETAGS = etags
  CTAGS = ctags
-@@ -100,44 +119,47 @@ CCDEPMODE = @CCDEPMODE@
+@@ -100,44 +119,47 @@
  CFLAGS = @CFLAGS@
  CPP = @CPP@
  CPPFLAGS = @CPPFLAGS@
@@ -60581,7 +61564,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PKG_CONFIG = @PKG_CONFIG@
-@@ -164,8 +186,7 @@ abs_srcdir = @abs_srcdir@
+@@ -164,8 +186,7 @@
  abs_top_builddir = @abs_top_builddir@
  abs_top_srcdir = @abs_top_srcdir@
  ac_ct_CC = @ac_ct_CC@
@@ -60591,7 +61574,7 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
-@@ -196,6 +217,7 @@ libdir = @libdir@
+@@ -196,6 +217,7 @@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -60599,7 +61582,7 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  oldincludedir = @oldincludedir@
-@@ -246,18 +268,18 @@ all: all-am
+@@ -246,18 +268,18 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -60624,7 +61607,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -271,27 +293,32 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
+@@ -271,27 +293,32 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -60668,7 +61651,7 @@
  	done
  
  clean-pyexecLTLIBRARIES:
-@@ -330,21 +357,21 @@ distclean-compile:
+@@ -330,21 +357,21 @@
  
  .c.o:
  @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -60693,7 +61676,7 @@
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-@@ -357,15 +384,20 @@ clean-libtool:
+@@ -357,15 +384,20 @@
  install-pyexecPYTHON: $(pyexec_PYTHON)
  	@$(NORMAL_INSTALL)
  	test -z "$(pyexecdir)" || $(MKDIR_P) "$(DESTDIR)$(pyexecdir)"
@@ -60718,7 +61701,7 @@
  	if test -n "$$dlist"; then \
  	  if test -z "$(DESTDIR)"; then \
  	    PYTHON=$(PYTHON) $(py_compile) --basedir "$(pyexecdir)" $$dlist; \
-@@ -376,43 +408,51 @@ install-pyexecPYTHON: $(pyexec_PYTHON)
+@@ -376,43 +408,51 @@
  
  uninstall-pyexecPYTHON:
  	@$(NORMAL_UNINSTALL)
@@ -60787,7 +61770,7 @@
  	here=`pwd`; \
  	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -420,29 +460,34 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEP
+@@ -420,29 +460,34 @@
  	  done | \
  	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
  	      END { if (nonempty) { for (i in files) print i; }; }'`; \
@@ -60830,7 +61813,7 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-@@ -463,13 +508,17 @@ distdir: $(DISTFILES)
+@@ -463,13 +508,17 @@
  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
  	  if test -d $$d/$$file; then \
  	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
@@ -60852,7 +61835,7 @@
  	    || exit 1; \
  	  fi; \
  	done
-@@ -500,6 +549,7 @@ clean-generic:
+@@ -500,6 +549,7 @@
  
  distclean-generic:
  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -60860,7 +61843,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -521,6 +571,8 @@ dvi-am:
+@@ -521,6 +571,8 @@
  
  html: html-am
  
@@ -60869,7 +61852,7 @@
  info: info-am
  
  info-am:
-@@ -529,18 +581,28 @@ install-data-am: install-pyorbitincludeH
+@@ -529,18 +581,28 @@
  
  install-dvi: install-dvi-am
  
@@ -60898,7 +61881,7 @@
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
-@@ -582,6 +644,7 @@ uninstall-am: uninstall-pyexecLTLIBRARIE
+@@ -582,6 +644,7 @@
  	tags uninstall uninstall-am uninstall-pyexecLTLIBRARIES \
  	uninstall-pyexecPYTHON uninstall-pyorbitincludeHEADERS
  
@@ -60906,13 +61889,11 @@
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
-Index: pyorbit-2.24.0/tests/Makefile.in
-===================================================================
---- pyorbit-2.24.0.orig/tests/Makefile.in	2009-11-21 10:17:41.970266306 +0100
-+++ pyorbit-2.24.0/tests/Makefile.in	2009-11-21 10:17:34.150758376 +0100
+--- a/tests/Makefile.in
++++ b/tests/Makefile.in
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -60933,7 +61914,7 @@
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
-@@ -35,12 +37,16 @@ subdir = tests
+@@ -35,12 +37,16 @@
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  am__aclocal_m4_deps = $(top_srcdir)/m4/jhflags.m4 \
@@ -60950,7 +61931,7 @@
  SOURCES =
  DIST_SOURCES =
  RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-@@ -52,10 +58,38 @@ RECURSIVE_TARGETS = all-recursive check-
+@@ -52,10 +58,38 @@
  	ps-recursive uninstall-recursive
  RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
    distclean-recursive maintainer-clean-recursive
@@ -60989,7 +61970,7 @@
  ACLOCAL = @ACLOCAL@
  ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
  AMTAR = @AMTAR@
-@@ -69,44 +103,47 @@ CCDEPMODE = @CCDEPMODE@
+@@ -69,44 +103,47 @@
  CFLAGS = @CFLAGS@
  CPP = @CPP@
  CPPFLAGS = @CPPFLAGS@
@@ -61044,7 +62025,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PKG_CONFIG = @PKG_CONFIG@
-@@ -133,8 +170,7 @@ abs_srcdir = @abs_srcdir@
+@@ -133,8 +170,7 @@
  abs_top_builddir = @abs_top_builddir@
  abs_top_srcdir = @abs_top_srcdir@
  ac_ct_CC = @ac_ct_CC@
@@ -61054,7 +62035,7 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
-@@ -165,6 +201,7 @@ libdir = @libdir@
+@@ -165,6 +201,7 @@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -61062,7 +62043,7 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  oldincludedir = @oldincludedir@
-@@ -194,18 +231,18 @@ EXTRA_DIST = \
+@@ -194,18 +231,18 @@
  all: all-recursive
  
  .SUFFIXES:
@@ -61087,7 +62068,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -219,10 +256,11 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
+@@ -219,10 +256,11 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -61101,7 +62082,16 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -254,7 +292,7 @@ $(RECURSIVE_TARGETS):
+@@ -237,7 +275,7 @@
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+-	@failcom='exit 1'; \
++	@fail= failcom='exit 1'; \
+ 	for f in x $$MAKEFLAGS; do \
+ 	  case $$f in \
+ 	    *=* | --[!k]*);; \
+@@ -254,7 +292,7 @@
  	  else \
  	    local_target="$$target"; \
  	  fi; \
@@ -61110,7 +62100,16 @@
  	  || eval $$failcom; \
  	done; \
  	if test "$$dot_seen" = "no"; then \
-@@ -288,16 +326,16 @@ $(RECURSIVE_CLEAN_TARGETS):
+@@ -262,7 +300,7 @@
+ 	fi; test -z "$$fail"
+ 
+ $(RECURSIVE_CLEAN_TARGETS):
+-	@failcom='exit 1'; \
++	@fail= failcom='exit 1'; \
+ 	for f in x $$MAKEFLAGS; do \
+ 	  case $$f in \
+ 	    *=* | --[!k]*);; \
+@@ -288,16 +326,16 @@
  	  else \
  	    local_target="$$target"; \
  	  fi; \
@@ -61130,7 +62129,7 @@
  	done
  
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-@@ -305,14 +343,14 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
+@@ -305,14 +343,14 @@
  	unique=`for i in $$list; do \
  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  	  done | \
@@ -61147,7 +62146,7 @@
  	here=`pwd`; \
  	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
  	  include_option=--etags-include; \
-@@ -324,7 +362,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE
+@@ -324,7 +362,7 @@
  	list='$(SUBDIRS)'; for subdir in $$list; do \
  	  if test "$$subdir" = .; then :; else \
  	    test ! -f $$subdir/TAGS || \
@@ -61156,7 +62155,7 @@
  	  fi; \
  	done; \
  	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-@@ -333,29 +371,34 @@ TAGS: tags-recursive $(HEADERS) $(SOURCE
+@@ -333,29 +371,34 @@
  	  done | \
  	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
  	      END { if (nonempty) { for (i in files) print i; }; }'`; \
@@ -61199,7 +62198,7 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-@@ -376,29 +419,44 @@ distdir: $(DISTFILES)
+@@ -376,29 +419,44 @@
  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
  	  if test -d $$d/$$file; then \
  	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
@@ -61254,7 +62253,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -428,6 +486,7 @@ clean-generic:
+@@ -428,6 +486,7 @@
  
  distclean-generic:
  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -61262,7 +62261,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -446,6 +505,8 @@ dvi-am:
+@@ -446,6 +505,8 @@
  
  html: html-recursive
  
@@ -61271,7 +62270,7 @@
  info: info-recursive
  
  info-am:
-@@ -454,18 +515,28 @@ install-data-am:
+@@ -454,18 +515,28 @@
  
  install-dvi: install-dvi-recursive
  
@@ -61300,7 +62299,7 @@
  installcheck-am:
  
  maintainer-clean: maintainer-clean-recursive
-@@ -486,8 +557,8 @@ ps-am:
+@@ -486,8 +557,8 @@
  
  uninstall-am:
  
@@ -61311,7 +62310,7 @@
  
  .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
  	all all-am check check-am clean clean-generic clean-libtool \
-@@ -503,6 +574,7 @@ uninstall-am:
+@@ -503,6 +574,7 @@
  	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
  	uninstall uninstall-am
  
@@ -61319,13 +62318,11 @@
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
-Index: pyorbit-2.24.0/tests/c-inproc/Makefile.in
-===================================================================
---- pyorbit-2.24.0.orig/tests/c-inproc/Makefile.in	2009-11-21 10:17:42.074268633 +0100
-+++ pyorbit-2.24.0/tests/c-inproc/Makefile.in	2009-11-21 10:17:34.242762379 +0100
+--- a/tests/c-inproc/Makefile.in
++++ b/tests/c-inproc/Makefile.in
 @@ -1,8 +1,9 @@
 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
-+# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -61346,7 +62343,7 @@
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
  install_sh_DATA = $(install_sh) -c -m 644
  install_sh_PROGRAM = $(install_sh) -c
-@@ -36,12 +38,16 @@ subdir = tests/c-inproc
+@@ -36,12 +38,16 @@
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  am__aclocal_m4_deps = $(top_srcdir)/m4/jhflags.m4 \
@@ -61363,7 +62360,7 @@
  LTLIBRARIES = $(noinst_LTLIBRARIES)
  am__DEPENDENCIES_1 =
  TestCall_module_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-@@ -60,6 +66,7 @@ cTestCall_la_LINK = $(LIBTOOL) --tag=CC 
+@@ -60,6 +66,7 @@
  DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
  depcomp = $(SHELL) $(top_srcdir)/depcomp
  am__depfiles_maybe = depfiles
@@ -61371,7 +62368,7 @@
  COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
  	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-@@ -87,44 +94,47 @@ CCDEPMODE = @CCDEPMODE@
+@@ -87,44 +94,47 @@
  CFLAGS = @CFLAGS@
  CPP = @CPP@
  CPPFLAGS = @CPPFLAGS@
@@ -61426,7 +62423,7 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PKG_CONFIG = @PKG_CONFIG@
-@@ -151,8 +161,7 @@ abs_srcdir = @abs_srcdir@
+@@ -151,8 +161,7 @@
  abs_top_builddir = @abs_top_builddir@
  abs_top_srcdir = @abs_top_srcdir@
  ac_ct_CC = @ac_ct_CC@
@@ -61436,7 +62433,7 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
-@@ -183,6 +192,7 @@ libdir = @libdir@
+@@ -183,6 +192,7 @@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -61444,7 +62441,7 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  oldincludedir = @oldincludedir@
-@@ -230,18 +240,18 @@ all: $(BUILT_SOURCES)
+@@ -230,18 +240,18 @@
  
  .SUFFIXES:
  .SUFFIXES: .c .lo .o .obj
@@ -61469,7 +62466,7 @@
  .PRECIOUS: Makefile
  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
  	@case '$?' in \
-@@ -255,10 +265,11 @@ Makefile: $(srcdir)/Makefile.in $(top_bu
+@@ -255,10 +265,11 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -61483,7 +62480,7 @@
  
  clean-noinstLTLIBRARIES:
  	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-@@ -287,21 +298,21 @@ distclean-compile:
+@@ -287,21 +298,21 @@
  
  .c.o:
  @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -61508,7 +62505,7 @@
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-@@ -317,14 +328,14 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS
+@@ -317,14 +328,14 @@
  	unique=`for i in $$list; do \
  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  	  done | \
@@ -61525,7 +62522,7 @@
  	here=`pwd`; \
  	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -332,29 +343,34 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEP
+@@ -332,29 +343,34 @@
  	  done | \
  	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
  	      END { if (nonempty) { for (i in files) print i; }; }'`; \
@@ -61568,7 +62565,7 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-@@ -375,13 +391,17 @@ distdir: $(DISTFILES)
+@@ -375,13 +391,17 @@
  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
  	  if test -d $$d/$$file; then \
  	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
@@ -61590,7 +62587,7 @@
  	    || exit 1; \
  	  fi; \
  	done
-@@ -415,6 +435,7 @@ clean-generic:
+@@ -415,6 +435,7 @@
  
  distclean-generic:
  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -61598,7 +62595,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -437,6 +458,8 @@ dvi-am:
+@@ -437,6 +458,8 @@
  
  html: html-am
  
@@ -61607,7 +62604,7 @@
  info: info-am
  
  info-am:
-@@ -445,18 +468,28 @@ install-data-am:
+@@ -445,18 +468,28 @@
  
  install-dvi: install-dvi-am
  
@@ -61636,7 +62633,7 @@
  installcheck-am:
  
  maintainer-clean: maintainer-clean-am
-@@ -479,7 +512,7 @@ ps-am:
+@@ -479,7 +512,7 @@
  
  uninstall-am:
  
@@ -61645,7 +62642,7 @@
  
  .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
  	clean-libtool clean-noinstLTLIBRARIES ctags dist-hook \
-@@ -500,6 +533,7 @@ $(idlgen_sources): testcall.idl
+@@ -500,6 +533,7 @@
  	orbit-idl-2 --add-imodule $<
  dist-hook:
  	-cd $(distdir) && rm -f $(idlgen_sources)

Modified: desktop/unstable/pyorbit/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pyorbit/debian/patches/series?rev=23959&op=diff
==============================================================================
--- desktop/unstable/pyorbit/debian/patches/series [utf-8] (original)
+++ desktop/unstable/pyorbit/debian/patches/series [utf-8] Thu Apr 22 19:33:35 2010
@@ -1,2 +1,3 @@
 01_maintainer_mode.patch
+02_python2.6.patch
 90_relibtoolize.patch

Modified: desktop/unstable/pyorbit/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pyorbit/debian/rules?rev=23959&op=diff
==============================================================================
--- desktop/unstable/pyorbit/debian/rules [utf-8] (original)
+++ desktop/unstable/pyorbit/debian/rules [utf-8] Thu Apr 22 19:33:35 2010
@@ -1,118 +1,9 @@
 #!/usr/bin/make -f
 
+DEB_BUILDDIR = debian/build
+DEB_PYTHON_SYSTEM = pysupport
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/python-autotools.mk
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
-
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-configure_flags += --prefix=/usr --build=$(DEB_BUILD_GNU_TYPE)
-
-ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
-	configure_flags += --host=$(DEB_HOST_GNU_TYPE)
-endif
-
-CFLAGS += -Wall -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2)
-
-PYVERS := $(shell pyversions -vr debian/control 2>/dev/null)
-
-# how to call quilt
-PATCH_DIR := $(CURDIR)/debian/patches
-QUILT := QUILT_PATCHES=$(PATCH_DIR) quilt --quiltrc /dev/null
-
-patch-stamp:
-	dh_testdir
-	# apply patches
-	$(QUILT) push -a || test $$? = 2
-	# backup the original files to restore them in the clean target
-	[ ! -r config.sub ]   || \
-	    (cp config.sub   config.sub.orig   && \
-	     cp /usr/share/misc/config.sub   config.sub)
-	[ ! -r config.guess ] || \
-	    (cp config.guess config.guess.orig && \
-	     cp /usr/share/misc/config.guess config.guess)
-	touch $@
-
-patch: patch-stamp
-
-unpatch:
-	rm -f patch-stamp
-	# restore files from backup (before unpatching)
-	[ ! -r config.sub.orig ]   || \
-	    cp config.sub.orig   config.sub
-	[ ! -r config.guess.orig ]   || \
-	    cp config.guess.orig config.guess
-	# unapply patches, if any
-	$(QUILT) pop -a || test $$? = 2
-	rm -rf .pc
-
-build-%/configure-stamp: configure patch-stamp
-	dh_testdir
-	mkdir -p build-$*
-	cd build-$* && \
-		PYTHON=`which python$*` CFLAGS="$(CFLAGS)" \
-			$(CURDIR)/configure $(configure_flags)
-	touch $@
-
-build-%/build-stamp: build-%/configure-stamp
-	dh_testdir
-	$(MAKE) -C build-$*
-	touch $@
-
-build: $(PYVERS:%=build-%/build-stamp)
-
-install-clean:
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-
-install-%: build-%/build-stamp
-	dh_testdir
-	dh_testroot
-	$(MAKE) -C build-$* install DESTDIR=$(CURDIR)/debian/tmp
-	dh_install
-
-install: $(PYVERS:%=install-%)
-
-clean::
-	dh_testdir
-	rm -Rf build-*
-	$(MAKE) -f debian/rules unpatch
-	dh_clean
-
-binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_installdocs -i
-	dh_installexamples -i
-	dh_installinfo -i
-	dh_installchangelogs ChangeLog -i
-	dh_link -i
-	dh_compress -i
-	dh_fixperms -i
-	dh_pysupport -i
-	dh_installdeb -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
-
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installdocs -a
-	dh_installexamples -a
-	dh_installinfo -a
-	dh_installchangelogs ChangeLog -a
-	dh_strip -a
-	dh_link -a
-	dh_compress -a
-	dh_fixperms -a
-	dh_pysupport -a
-	dh_installdeb -a
-	dh_shlibdeps -a
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install patch unpatch

Added: desktop/unstable/pyorbit/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pyorbit/debian/source/format?rev=23959&op=file
==============================================================================
--- desktop/unstable/pyorbit/debian/source/format (added)
+++ desktop/unstable/pyorbit/debian/source/format [utf-8] Thu Apr 22 19:33:35 2010
@@ -1,0 +1,1 @@
+3.0 (quilt)




More information about the pkg-gnome-commits mailing list