[SCM] hdf5 branch, upstream, updated. upstream/1.8.4-patch1-79-gbfcb1ff

Sylvestre Ledru sylvestre.ledru at scilab.org
Wed Nov 16 10:34:17 UTC 2011


The following commit has been merged in the upstream branch:
commit f4bc5851fc28ef813ee28484538dd93e27acd951
Author: Sylvestre Ledru <sylvestre.ledru at scilab.org>
Date:   Fri Feb 25 10:42:00 2011 +0100

      [ Sylvestre Ledru ]
      * New upstream release (Closes: #586232)
      * Default to 1.8 interface instead of 1.6 (Closes: #537414)
      * Remove dependency on libjpeg62-dev (Closes: #569234)
      * Dependency on LAM/MPI and/or MPICH dropped (Closes: #571453)
      * MPICH2 packages provided
      * Optimisation flags plugged back (Closes: #604906)
      * Fix a bad usage of sscanf in the hdf5 code which was introducing
        a dependency on the glibc 2.7 (Closes: #599541)
      * Patch sigbus.diff removed (upstream)
      * Patch autotools.diff removed (hdf5 1.8.6 is using autoconf 2.67)

diff --git a/debian/changelog b/debian/changelog
index be2b550..0961e76 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,18 @@ hdf5 (1.8.4-patch1-3) unstable; urgency=low
   * Policy bumped to 3.9.1, no changes required.
   * Added ${misc:Depends} to all binary package due to dh use.
 
+  [ Sylvestre Ledru ]
+  * New upstream release (Closes: #586232)
+  * Default to 1.8 interface instead of 1.6 (Closes: #537414)
+  * Remove dependency on libjpeg62-dev (Closes: #569234)
+  * Dependency on LAM/MPI and/or MPICH dropped (Closes: #571453)
+  * MPICH2 packages provided
+  * Optimisation flags plugged back (Closes: #604906)
+  * Fix a bad usage of sscanf in the hdf5 code which was introducing
+    a dependency on the glibc 2.7 (Closes: #599541)
+  * Patch sigbus.diff removed (upstream)
+  * Patch autotools.diff removed (hdf5 1.8.6 is using autoconf 2.67)
+
  -- Francesco Paolo Lovergine <frankie at debian.org>  Fri, 25 Feb 2011 09:47:32 +0100
 
 hdf5 (1.8.4-patch1-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index ecfc391..2fc52aa 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: science
 Priority: optional
 Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
 Uploaders: Francesco Paolo Lovergine <frankie at debian.org>
-Build-Depends: libmpich1.0-dev (>= 1.2.7-1), zlib1g-dev, lam4-dev (>= 7.1.1-3.2),
+Build-Depends: libmpich2-dev, zlib1g-dev, lam4-dev (>= 7.1.1-3.2),
  libopenmpi-dev [!arm !armel !hppa !mips !mipsel !s390 !sh4 !m68k], libjpeg62-dev | libjpeg-dev, debhelper (>> 7), sed (>=4.1.5), 
  gfortran, libibverbs-dev [!arm !armel !hppa !mips !mipsel !s390 !kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 !sh4],
  sharutils, mpi-default-dev
@@ -42,38 +42,6 @@ Description: Hierarchical Data Format 5 (HDF5) - development files - serial vers
  .
  This package contains development files for serial platforms.
 
-Package: libhdf5-lam-1.8.4
-Section: libs
-Priority: extra
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: libhdf5-1.8.4, libhdf5-1.8, libhdf5-1.8.3
-Provides: libhdf5-1.8.4, libhdf5-1.8
-Replaces: libhdf5-1.8.3
-Description: Hierarchical Data Format 5 (HDF5) - runtime files - LAM version
- HDF5 is a file format and library for storing scientific data. 
- HDF5 was designed and implemented to address the deficiencies of
- HDF4.x. It has a more powerful and flexible data model, supports
- files larger than 2 GB, and supports parallel I/O.
- .
- This package contains runtime files for use with LAM.
-
-Package: libhdf5-lam-dev
-Section: libdevel
-Priority: extra
-Architecture: any
-Depends: libhdf5-lam-1.8.4 (= ${binary:Version}), zlib1g-dev, libjpeg62-dev, lam4-dev, ${misc:Depends}
-Conflicts: libhdf5-dev
-Provides: libhdf5-dev
-Suggests: libhdf5-doc
-Description: Hierarchical Data Format 5 (HDF5) - development files - LAM version
- HDF5 is a file format and library for storing scientific data. 
- HDF5 was designed and implemented to address the deficiencies of
- HDF4.x. It has a more powerful and flexible data model, supports
- files larger than 2 GB, and supports parallel I/O.
- .
- This package contains development files for use with LAM.
-
 Package: libhdf5-openmpi-1.8.4
 Section: libs
 Priority: extra
@@ -106,7 +74,7 @@ Description: Hierarchical Data Format 5 (HDF5) - development files - OpenMPI ver
  .
  This package contains development files for use with OpenMPI.
 
-Package: libhdf5-mpich-1.8.4
+Package: libhdf5-mpich2-1.8.4
 Section: libs
 Priority: extra
 Architecture: any
@@ -114,30 +82,30 @@ Depends: ${shlibs:Depends}, ${misc:Depends}
 Conflicts: libhdf5-1.8.4, libhdf5-1.8, libhdf5-1.8.3
 Provides: libhdf5-1.8.4, libhdf5-1.8
 Replaces: libhdf5-1.8.3
-Description: Hierarchical Data Format 5 (HDF5) - runtime files - MPICH version
+Description: Hierarchical Data Format 5 (HDF5) - runtime files - MPICH2 version
  HDF5 is a file format and library for storing scientific data. 
  HDF5 was designed and implemented to address the deficiencies of
  HDF4.x. It has a more powerful and flexible data model, supports
  files larger than 2 GB, and supports parallel I/O.
  .
- This package contains runtime files for use with MPICH. Warning: the
+ This package contains runtime files for use with MPICH2. Warning: the
  C++ interface is not provided for this version.
 
-Package: libhdf5-mpich-dev
+Package: libhdf5-mpich2-dev
 Section: libdevel
 Priority: extra
 Architecture: any
-Depends: libhdf5-mpich-1.8.4 (= ${binary:Version}), zlib1g-dev, libjpeg62-dev, libmpich1.0-dev, ${misc:Depends}
+Depends: libhdf5-mpich2-1.8.4 (= ${binary:Version}), zlib1g-dev, libjpeg62-dev, libmpich21.0-dev, ${misc:Depends}
 Conflicts: libhdf5-dev
 Provides: libhdf5-dev
 Suggests: libhdf5-doc
-Description: Hierarchical Data Format 5 (HDF5) - development files - MPICH version
+Description: Hierarchical Data Format 5 (HDF5) - development files - MPICH2 version
  HDF5 is a file format and library for storing scientific data. 
  HDF5 was designed and implemented to address the deficiencies of
  HDF4.x. It has a more powerful and flexible data model, supports
  files larger than 2 GB, and supports parallel I/O.
  .
- This package contains development files for use with MPICH. Warning:
+ This package contains development files for use with MPICH2. Warning:
  the C++ interface is not provided for this version.
 
 Package: libhdf5-mpi-dev
@@ -145,7 +113,7 @@ Section: libdevel
 Priority: extra
 Architecture: any
 Depends: ${hdf5-mpi-dev}, mpi-default-dev, ${misc:Depends}
-Description: Hierarchical Data Format 5 (HDF5) - development files - MPICH version
+Description: Hierarchical Data Format 5 (HDF5) - development files - MPICH2 version
  HDF5 is a file format and library for storing scientific data. 
  HDF5 was designed and implemented to address the deficiencies of
  HDF4.x. It has a more powerful and flexible data model, supports
@@ -156,7 +124,6 @@ Description: Hierarchical Data Format 5 (HDF5) - development files - MPICH versi
 Package: libhdf5-doc
 Section: doc
 Architecture: all
-Depends: ${misc:Depends}
 Suggests: libhdf5-dev, www-browser, pdf-viewer, doc-base
 Description: Hierarchical Data Format 5 (HDF5) - Documentation
  HDF5 is a file format and library for storing scientific data. 
diff --git a/debian/control.in b/debian/control.in
index 82eef2b..d21e512 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -3,7 +3,7 @@ Section: science
 Priority: optional
 Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
 Uploaders: Francesco Paolo Lovergine <frankie at debian.org>
-Build-Depends: libmpich1.0-dev (>= 1.2.7-1), zlib1g-dev, lam4-dev (>= 7.1.1-3.2),
+Build-Depends: libmpich2-dev, zlib1g-dev, lam4-dev (>= 7.1.1-3.2),
  libopenmpi-dev [!arm !armel !hppa !mips !mipsel !s390 !sh4 !m68k], libjpeg62-dev | libjpeg-dev, debhelper (>> 7), sed (>=4.1.5), 
  gfortran, libibverbs-dev [!arm !armel !hppa !mips !mipsel !s390 !kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 !sh4],
  sharutils, mpi-default-dev
@@ -42,38 +42,6 @@ Description: Hierarchical Data Format 5 (HDF5) - development files - serial vers
  .
  This package contains development files for serial platforms.
 
-Package: libhdf5-lam- at VERSION@
-Section: libs
-Priority: extra
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: libhdf5- at VERSION@, libhdf5- at MAJOR_VERSION@, libhdf5-1.8.3
-Provides: libhdf5- at VERSION@, libhdf5- at MAJOR_VERSION@
-Replaces: libhdf5-1.8.3
-Description: Hierarchical Data Format 5 (HDF5) - runtime files - LAM version
- HDF5 is a file format and library for storing scientific data. 
- HDF5 was designed and implemented to address the deficiencies of
- HDF4.x. It has a more powerful and flexible data model, supports
- files larger than 2 GB, and supports parallel I/O.
- .
- This package contains runtime files for use with LAM.
-
-Package: libhdf5-lam-dev
-Section: libdevel
-Priority: extra
-Architecture: any
-Depends: libhdf5-lam- at VERSION@ (= ${binary:Version}), zlib1g-dev, libjpeg62-dev, lam4-dev, ${misc:Depends}
-Conflicts: libhdf5-dev
-Provides: libhdf5-dev
-Suggests: libhdf5-doc
-Description: Hierarchical Data Format 5 (HDF5) - development files - LAM version
- HDF5 is a file format and library for storing scientific data. 
- HDF5 was designed and implemented to address the deficiencies of
- HDF4.x. It has a more powerful and flexible data model, supports
- files larger than 2 GB, and supports parallel I/O.
- .
- This package contains development files for use with LAM.
-
 Package: libhdf5-openmpi- at VERSION@
 Section: libs
 Priority: extra
@@ -106,7 +74,7 @@ Description: Hierarchical Data Format 5 (HDF5) - development files - OpenMPI ver
  .
  This package contains development files for use with OpenMPI.
 
-Package: libhdf5-mpich- at VERSION@
+Package: libhdf5-mpich2- at VERSION@
 Section: libs
 Priority: extra
 Architecture: any
@@ -114,30 +82,30 @@ Depends: ${shlibs:Depends}, ${misc:Depends}
 Conflicts: libhdf5- at VERSION@, libhdf5- at MAJOR_VERSION@, libhdf5-1.8.3
 Provides: libhdf5- at VERSION@, libhdf5- at MAJOR_VERSION@
 Replaces: libhdf5-1.8.3
-Description: Hierarchical Data Format 5 (HDF5) - runtime files - MPICH version
+Description: Hierarchical Data Format 5 (HDF5) - runtime files - MPICH2 version
  HDF5 is a file format and library for storing scientific data. 
  HDF5 was designed and implemented to address the deficiencies of
  HDF4.x. It has a more powerful and flexible data model, supports
  files larger than 2 GB, and supports parallel I/O.
  .
- This package contains runtime files for use with MPICH. Warning: the
+ This package contains runtime files for use with MPICH2. Warning: the
  C++ interface is not provided for this version.
 
-Package: libhdf5-mpich-dev
+Package: libhdf5-mpich2-dev
 Section: libdevel
 Priority: extra
 Architecture: any
-Depends: libhdf5-mpich- at VERSION@ (= ${binary:Version}), zlib1g-dev, libjpeg62-dev, libmpich1.0-dev, ${misc:Depends}
+Depends: libhdf5-mpich2- at VERSION@ (= ${binary:Version}), zlib1g-dev, libjpeg62-dev, libmpich21.0-dev, ${misc:Depends}
 Conflicts: libhdf5-dev
 Provides: libhdf5-dev
 Suggests: libhdf5-doc
-Description: Hierarchical Data Format 5 (HDF5) - development files - MPICH version
+Description: Hierarchical Data Format 5 (HDF5) - development files - MPICH2 version
  HDF5 is a file format and library for storing scientific data. 
  HDF5 was designed and implemented to address the deficiencies of
  HDF4.x. It has a more powerful and flexible data model, supports
  files larger than 2 GB, and supports parallel I/O.
  .
- This package contains development files for use with MPICH. Warning:
+ This package contains development files for use with MPICH2. Warning:
  the C++ interface is not provided for this version.
 
 Package: libhdf5-mpi-dev
@@ -145,7 +113,7 @@ Section: libdevel
 Priority: extra
 Architecture: any
 Depends: ${hdf5-mpi-dev}, mpi-default-dev, ${misc:Depends}
-Description: Hierarchical Data Format 5 (HDF5) - development files - MPICH version
+Description: Hierarchical Data Format 5 (HDF5) - development files - MPICH2 version
  HDF5 is a file format and library for storing scientific data. 
  HDF5 was designed and implemented to address the deficiencies of
  HDF4.x. It has a more powerful and flexible data model, supports
@@ -156,7 +124,6 @@ Description: Hierarchical Data Format 5 (HDF5) - development files - MPICH versi
 Package: libhdf5-doc
 Section: doc
 Architecture: all
-Depends: ${misc:Depends}
 Suggests: libhdf5-dev, www-browser, pdf-viewer, doc-base
 Description: Hierarchical Data Format 5 (HDF5) - Documentation
  HDF5 is a file format and library for storing scientific data. 
diff --git a/debian/patches/autotools.diff b/debian/patches/autotools.diff
index dc06a82..e69de29 100644
--- a/debian/patches/autotools.diff
+++ b/debian/patches/autotools.diff
@@ -1,16954 +0,0 @@
-diff -urN hdf5-1.8.4-patch1.orig/aclocal.m4 hdf5-1.8.4-patch1/aclocal.m4
---- hdf5-1.8.4-patch1.orig/aclocal.m4	2010-02-22 22:32:50.000000000 +0100
-+++ hdf5-1.8.4-patch1/aclocal.m4	2010-03-11 15:57:46.000000000 +0100
-@@ -1,4 +1,4 @@
--# 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, 2009  Free Software Foundation, Inc.
-@@ -13,3016 +13,2034 @@
- 
- m4_ifndef([AC_AUTOCONF_VERSION],
-   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
--m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],,
--[m4_warning([this file was generated for autoconf 2.64.
-+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
-+[m4_warning([this file was generated for autoconf 2.65.
- You have another version of autoconf.  It may work, but is not guaranteed to.
- If you have problems, you may need to regenerate the build system entirely.
- To do so, use the procedure documented by the package, typically `autoreconf'.])])
- 
--# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
-+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
- #
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
--
--# AM_AUTOMAKE_VERSION(VERSION)
--# ----------------------------
--# Automake X.Y traces this macro to ensure aclocal.m4 has been
--# generated from the m4 files accompanying Automake X.Y.
--# (This private macro should not be called outside this file.)
--AC_DEFUN([AM_AUTOMAKE_VERSION],
--[am__api_version='1.11'
--dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
--dnl require some minimum version.  Point them to the right macro.
--m4_if([$1], [1.11], [],
--      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
--])
--
--# _AM_AUTOCONF_VERSION(VERSION)
--# -----------------------------
--# aclocal traces this macro to find the Autoconf version.
--# This is a private macro too.  Using m4_define simplifies
--# the logic in aclocal, which can simply ignore this definition.
--m4_define([_AM_AUTOCONF_VERSION], [])
--
--# AM_SET_CURRENT_AUTOMAKE_VERSION
--# -------------------------------
--# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
--# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
--AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
--[AM_AUTOMAKE_VERSION([1.11])dnl
--m4_ifndef([AC_AUTOCONF_VERSION],
--  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
--_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
--
--# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
--
--# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-+#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-+#                 2006, 2007, 2008 Free Software Foundation, Inc.
-+#   Written by Gordon Matzigkeit, 1996
- #
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
-+# This file is free software; the Free Software Foundation gives
-+# unlimited permission to copy and/or distribute it, with or without
-+# modifications, as long as this notice is preserved.
- 
--# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
--# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
--# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
-+m4_define([_LT_COPYING], [dnl
-+#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-+#                 2006, 2007, 2008 Free Software Foundation, Inc.
-+#   Written by Gordon Matzigkeit, 1996
- #
--# Of course, Automake must honor this variable whenever it calls a
--# tool from the auxiliary directory.  The problem is that $srcdir (and
--# therefore $ac_aux_dir as well) can be either absolute or relative,
--# depending on how configure is run.  This is pretty annoying, since
--# it makes $ac_aux_dir quite unusable in subdirectories: in the top
--# source directory, any form will work fine, but in subdirectories a
--# relative path needs to be adjusted first.
-+#   This file is part of GNU Libtool.
- #
--# $ac_aux_dir/missing
--#    fails when called from a subdirectory if $ac_aux_dir is relative
--# $top_srcdir/$ac_aux_dir/missing
--#    fails if $ac_aux_dir is absolute,
--#    fails when called from a subdirectory in a VPATH build with
--#          a relative $ac_aux_dir
-+# GNU Libtool is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU General Public License as
-+# published by the Free Software Foundation; either version 2 of
-+# the License, or (at your option) any later version.
- #
--# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
--# are both prefixed by $srcdir.  In an in-source build this is usually
--# harmless because $srcdir is `.', but things will broke when you
--# start a VPATH build or use an absolute $srcdir.
-+# As a special exception to the GNU General Public License,
-+# if you distribute this file as part of a program or library that
-+# is built using GNU Libtool, you may include this file under the
-+# same distribution terms that you use for the rest of that program.
- #
--# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
--# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
--#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
--# and then we would define $MISSING as
--#   MISSING="\${SHELL} $am_aux_dir/missing"
--# This will work as long as MISSING is not called from configure, because
--# unfortunately $(top_srcdir) has no meaning in configure.
--# However there are other variables, like CC, which are often used in
--# configure, and could therefore not use this "fixed" $ac_aux_dir.
-+# GNU Libtool is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
- #
--# Another solution, used here, is to always expand $ac_aux_dir to an
--# absolute PATH.  The drawback is that using absolute paths prevent a
--# configured tree to be moved without reconfiguration.
--
--AC_DEFUN([AM_AUX_DIR_EXPAND],
--[dnl Rely on autoconf to set up CDPATH properly.
--AC_PREREQ([2.50])dnl
--# expand $ac_aux_dir to an absolute path
--am_aux_dir=`cd $ac_aux_dir && pwd`
-+# You should have received a copy of the GNU General Public License
-+# along with GNU Libtool; see the file COPYING.  If not, a copy
-+# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
-+# obtained by writing to the Free Software Foundation, Inc.,
-+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- ])
- 
--# AM_CONDITIONAL                                            -*- Autoconf -*-
-+# serial 56 LT_INIT
- 
--# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
--# Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
- 
--# serial 9
-+# LT_PREREQ(VERSION)
-+# ------------------
-+# Complain and exit if this libtool version is less that VERSION.
-+m4_defun([LT_PREREQ],
-+[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1,
-+       [m4_default([$3],
-+		   [m4_fatal([Libtool version $1 or higher is required],
-+		             63)])],
-+       [$2])])
- 
--# AM_CONDITIONAL(NAME, SHELL-CONDITION)
--# -------------------------------------
--# Define a conditional.
--AC_DEFUN([AM_CONDITIONAL],
--[AC_PREREQ(2.52)dnl
-- ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
--	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
--AC_SUBST([$1_TRUE])dnl
--AC_SUBST([$1_FALSE])dnl
--_AM_SUBST_NOTMAKE([$1_TRUE])dnl
--_AM_SUBST_NOTMAKE([$1_FALSE])dnl
--m4_define([_AM_COND_VALUE_$1], [$2])dnl
--if $2; then
--  $1_TRUE=
--  $1_FALSE='#'
--else
--  $1_TRUE='#'
--  $1_FALSE=
--fi
--AC_CONFIG_COMMANDS_PRE(
--[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
--  AC_MSG_ERROR([[conditional "$1" was never defined.
--Usually this means the macro was only invoked conditionally.]])
--fi])])
- 
--# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
--# Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
-+# _LT_CHECK_BUILDDIR
-+# ------------------
-+# Complain if the absolute build directory name contains unusual characters
-+m4_defun([_LT_CHECK_BUILDDIR],
-+[case `pwd` in
-+  *\ * | *\	*)
-+    AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;;
-+esac
-+])
- 
--# serial 10
- 
--# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
--# written in clear, in which case automake, when reading aclocal.m4,
--# will think it sees a *use*, and therefore will trigger all it's
--# C support machinery.  Also note that it means that autoscan, seeing
--# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-+# LT_INIT([OPTIONS])
-+# ------------------
-+AC_DEFUN([LT_INIT],
-+[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
-+AC_BEFORE([$0], [LT_LANG])dnl
-+AC_BEFORE([$0], [LT_OUTPUT])dnl
-+AC_BEFORE([$0], [LTDL_INIT])dnl
-+m4_require([_LT_CHECK_BUILDDIR])dnl
- 
-+dnl Autoconf doesn't catch unexpanded LT_ macros by default:
-+m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl
-+m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl
-+dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4
-+dnl unless we require an AC_DEFUNed macro:
-+AC_REQUIRE([LTOPTIONS_VERSION])dnl
-+AC_REQUIRE([LTSUGAR_VERSION])dnl
-+AC_REQUIRE([LTVERSION_VERSION])dnl
-+AC_REQUIRE([LTOBSOLETE_VERSION])dnl
-+m4_require([_LT_PROG_LTMAIN])dnl
- 
--# _AM_DEPENDENCIES(NAME)
--# ----------------------
--# See how the compiler implements dependency checking.
--# NAME is "CC", "CXX", "GCJ", or "OBJC".
--# We try a few techniques and use that to set a single cache variable.
--#
--# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
--# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
--# dependency, and given that the user is not expected to run this macro,
--# just rely on AC_PROG_CC.
--AC_DEFUN([_AM_DEPENDENCIES],
--[AC_REQUIRE([AM_SET_DEPDIR])dnl
--AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
--AC_REQUIRE([AM_MAKE_INCLUDE])dnl
--AC_REQUIRE([AM_DEP_TRACK])dnl
-+dnl Parse OPTIONS
-+_LT_SET_OPTIONS([$0], [$1])
- 
--ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
--       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
--       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
--       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
--       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
--                   [depcc="$$1"   am_compiler_list=])
-+# This can be used to rebuild libtool when needed
-+LIBTOOL_DEPS="$ltmain"
- 
--AC_CACHE_CHECK([dependency style of $depcc],
--               [am_cv_$1_dependencies_compiler_type],
--[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
--  # We make a subdir and do the tests there.  Otherwise we can end up
--  # making bogus files that we don't know about and never remove.  For
--  # instance it was reported that on HP-UX the gcc test will end up
--  # making a dummy file named `D' -- because `-MD' means `put the output
--  # in D'.
--  mkdir conftest.dir
--  # Copy depcomp to subdir because otherwise we won't find it if we're
--  # using a relative directory.
--  cp "$am_depcomp" conftest.dir
--  cd conftest.dir
--  # We will build objects and dependencies in a subdirectory because
--  # it helps to detect inapplicable dependency modes.  For instance
--  # both Tru64's cc and ICC support -MD to output dependencies as a
--  # side effect of compilation, but ICC will put the dependencies in
--  # the current directory while Tru64 will put them in the object
--  # directory.
--  mkdir sub
-+# Always use our own libtool.
-+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+AC_SUBST(LIBTOOL)dnl
- 
--  am_cv_$1_dependencies_compiler_type=none
--  if test "$am_compiler_list" = ""; then
--     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
--  fi
--  am__universal=false
--  m4_case([$1], [CC],
--    [case " $depcc " in #(
--     *\ -arch\ *\ -arch\ *) am__universal=true ;;
--     esac],
--    [CXX],
--    [case " $depcc " in #(
--     *\ -arch\ *\ -arch\ *) am__universal=true ;;
--     esac])
-+_LT_SETUP
- 
--  for depmode in $am_compiler_list; do
--    # Setup a source with many dependencies, because some compilers
--    # like to wrap large dependency lists on column 80 (with \), and
--    # we should not choose a depcomp mode which is confused by this.
--    #
--    # We need to recreate these files for each test, as the compiler may
--    # overwrite some of them when testing with obscure command lines.
--    # This happens at least with the AIX C compiler.
--    : > sub/conftest.c
--    for i in 1 2 3 4 5 6; do
--      echo '#include "conftst'$i'.h"' >> sub/conftest.c
--      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
--      # Solaris 8's {/usr,}/bin/sh.
--      touch sub/conftst$i.h
--    done
--    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-+# Only expand once:
-+m4_define([LT_INIT])
-+])# LT_INIT
- 
--    # We check with `-c' and `-o' for the sake of the "dashmstdout"
--    # mode.  It turns out that the SunPro C++ compiler does not properly
--    # handle `-M -o', and we need to detect this.  Also, some Intel
--    # versions had trouble with output in subdirs
--    am__obj=sub/conftest.${OBJEXT-o}
--    am__minus_obj="-o $am__obj"
--    case $depmode in
--    gcc)
--      # This depmode causes a compiler race in universal mode.
--      test "$am__universal" = false || continue
--      ;;
--    nosideeffect)
--      # after this tag, mechanisms are not by side-effect, so they'll
--      # only be used when explicitly requested
--      if test "x$enable_dependency_tracking" = xyes; then
--	continue
--      else
--	break
--      fi
--      ;;
--    msvisualcpp | msvcmsys)
--      # This compiler won't grok `-c -o', but also, the minuso test has
--      # not run yet.  These depmodes are late enough in the game, and
--      # so weak that their functioning should not be impacted.
--      am__obj=conftest.${OBJEXT-o}
--      am__minus_obj=
--      ;;
--    none) break ;;
--    esac
--    if depmode=$depmode \
--       source=sub/conftest.c object=$am__obj \
--       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
--       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
--         >/dev/null 2>conftest.err &&
--       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
--       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
--       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
--       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
--      # icc doesn't choke on unknown options, it will just issue warnings
--      # or remarks (even with -Werror).  So we grep stderr for any message
--      # that says an option was ignored or not supported.
--      # When given -MP, icc 7.0 and 7.1 complain thusly:
--      #   icc: Command line warning: ignoring option '-M'; no argument required
--      # The diagnosis changed in icc 8.0:
--      #   icc: Command line remark: option '-MP' not supported
--      if (grep 'ignoring option' conftest.err ||
--          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
--        am_cv_$1_dependencies_compiler_type=$depmode
--        break
--      fi
--    fi
--  done
-+# Old names:
-+AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT])
-+AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT])
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
-+dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
- 
--  cd ..
--  rm -rf conftest.dir
--else
--  am_cv_$1_dependencies_compiler_type=none
--fi
--])
--AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
--AM_CONDITIONAL([am__fastdep$1], [
--  test "x$enable_dependency_tracking" != xno \
--  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
-+
-+# _LT_CC_BASENAME(CC)
-+# -------------------
-+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
-+m4_defun([_LT_CC_BASENAME],
-+[for cc_temp in $1""; do
-+  case $cc_temp in
-+    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
-+    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
-+    \-*) ;;
-+    *) break;;
-+  esac
-+done
-+cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
- ])
- 
- 
--# AM_SET_DEPDIR
--# -------------
--# Choose a directory name for dependency files.
--# This macro is AC_REQUIREd in _AM_DEPENDENCIES
--AC_DEFUN([AM_SET_DEPDIR],
--[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
--AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
--])
-+# _LT_FILEUTILS_DEFAULTS
-+# ----------------------
-+# It is okay to use these file commands and assume they have been set
-+# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'.
-+m4_defun([_LT_FILEUTILS_DEFAULTS],
-+[: ${CP="cp -f"}
-+: ${MV="mv -f"}
-+: ${RM="rm -f"}
-+])# _LT_FILEUTILS_DEFAULTS
- 
- 
--# AM_DEP_TRACK
--# ------------
--AC_DEFUN([AM_DEP_TRACK],
--[AC_ARG_ENABLE(dependency-tracking,
--[  --disable-dependency-tracking  speeds up one-time build
--  --enable-dependency-tracking   do not reject slow dependency extractors])
--if test "x$enable_dependency_tracking" != xno; then
--  am_depcomp="$ac_aux_dir/depcomp"
--  AMDEPBACKSLASH='\'
-+# _LT_SETUP
-+# ---------
-+m4_defun([_LT_SETUP],
-+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-+_LT_DECL([], [host_alias], [0], [The host system])dnl
-+_LT_DECL([], [host], [0])dnl
-+_LT_DECL([], [host_os], [0])dnl
-+dnl
-+_LT_DECL([], [build_alias], [0], [The build system])dnl
-+_LT_DECL([], [build], [0])dnl
-+_LT_DECL([], [build_os], [0])dnl
-+dnl
-+AC_REQUIRE([AC_PROG_CC])dnl
-+AC_REQUIRE([LT_PATH_LD])dnl
-+AC_REQUIRE([LT_PATH_NM])dnl
-+dnl
-+AC_REQUIRE([AC_PROG_LN_S])dnl
-+test -z "$LN_S" && LN_S="ln -s"
-+_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl
-+dnl
-+AC_REQUIRE([LT_CMD_MAX_LEN])dnl
-+_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl
-+_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
-+dnl
-+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-+m4_require([_LT_CHECK_SHELL_FEATURES])dnl
-+m4_require([_LT_CMD_RELOAD])dnl
-+m4_require([_LT_CHECK_MAGIC_METHOD])dnl
-+m4_require([_LT_CMD_OLD_ARCHIVE])dnl
-+m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
-+
-+_LT_CONFIG_LIBTOOL_INIT([
-+# See if we are running on zsh, and set the options which allow our
-+# commands through without removal of \ escapes INIT.
-+if test -n "\${ZSH_VERSION+set}" ; then
-+   setopt NO_GLOB_SUBST
- fi
--AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
--AC_SUBST([AMDEPBACKSLASH])dnl
--_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
- ])
-+if test -n "${ZSH_VERSION+set}" ; then
-+   setopt NO_GLOB_SUBST
-+fi
- 
--# Generate code to set up dependency tracking.              -*- Autoconf -*-
-+_LT_CHECK_OBJDIR
- 
--# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
--# Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
-+m4_require([_LT_TAG_COMPILER])dnl
-+_LT_PROG_ECHO_BACKSLASH
- 
--#serial 5
-+case $host_os in
-+aix3*)
-+  # AIX sometimes has problems with the GCC collect2 program.  For some
-+  # reason, if we set the COLLECT_NAMES environment variable, the problems
-+  # vanish in a puff of smoke.
-+  if test "X${COLLECT_NAMES+set}" != Xset; then
-+    COLLECT_NAMES=
-+    export COLLECT_NAMES
-+  fi
-+  ;;
-+esac
- 
--# _AM_OUTPUT_DEPENDENCY_COMMANDS
--# ------------------------------
--AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
--[{
--  # Autoconf 2.62 quotes --file arguments for eval, but not when files
--  # are listed without --file.  Let's play safe and only enable the eval
--  # if we detect the quoting.
--  case $CONFIG_FILES in
--  *\'*) eval set x "$CONFIG_FILES" ;;
--  *)   set x $CONFIG_FILES ;;
--  esac
--  shift
--  for mf
--  do
--    # Strip MF so we end up with the name of the file.
--    mf=`echo "$mf" | sed -e 's/:.*$//'`
--    # Check whether this is an Automake generated Makefile or not.
--    # We used to match only the files named `Makefile.in', but
--    # some people rename them; so instead we look at the file content.
--    # Grep'ing the first line is not enough: some people post-process
--    # each Makefile.in and add a new line on top of each file to say so.
--    # Grep'ing the whole file is not good either: AIX grep has a line
--    # limit of 2048, but all sed's we know have understand at least 4000.
--    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
--      dirpart=`AS_DIRNAME("$mf")`
--    else
--      continue
--    fi
--    # Extract the definition of DEPDIR, am__include, and am__quote
--    # from the Makefile without running `make'.
--    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
--    test -z "$DEPDIR" && continue
--    am__include=`sed -n 's/^am__include = //p' < "$mf"`
--    test -z "am__include" && continue
--    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
--    # When using ansi2knr, U may be empty or an underscore; expand it
--    U=`sed -n 's/^U = //p' < "$mf"`
--    # Find all dependency output files, they are included files with
--    # $(DEPDIR) in their names.  We invoke sed twice because it is the
--    # simplest approach to changing $(DEPDIR) to its actual value in the
--    # expansion.
--    for file in `sed -n "
--      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
--	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
--      # Make sure the directory exists.
--      test -f "$dirpart/$file" && continue
--      fdir=`AS_DIRNAME(["$file"])`
--      AS_MKDIR_P([$dirpart/$fdir])
--      # echo "creating $dirpart/$file"
--      echo '# dummy' > "$dirpart/$file"
--    done
--  done
--}
--])# _AM_OUTPUT_DEPENDENCY_COMMANDS
-+# Sed substitution that helps us do robust quoting.  It backslashifies
-+# metacharacters that are still active within double-quoted strings.
-+sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
- 
-+# Same as above, but do not quote variable references.
-+double_quote_subst='s/\([["`\\]]\)/\\\1/g'
- 
--# AM_OUTPUT_DEPENDENCY_COMMANDS
--# -----------------------------
--# This macro should only be invoked once -- use via AC_REQUIRE.
--#
--# This code is only required when automatic dependency tracking
--# is enabled.  FIXME.  This creates each `.P' file that we will
--# need in order to bootstrap the dependency handling code.
--AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
--[AC_CONFIG_COMMANDS([depfiles],
--     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
--     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
--])
-+# Sed substitution to delay expansion of an escaped shell variable in a
-+# double_quote_subst'ed string.
-+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
- 
--# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
--# Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
-+# Sed substitution to delay expansion of an escaped single quote.
-+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
- 
--# serial 8
-+# Sed substitution to avoid accidental globbing in evaled expressions
-+no_glob_subst='s/\*/\\\*/g'
- 
--# AM_CONFIG_HEADER is obsolete.  It has been replaced by AC_CONFIG_HEADERS.
--AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
-+# Global variables:
-+ofile=libtool
-+can_build_shared=yes
- 
--# Do all the work for Automake.                             -*- Autoconf -*-
-+# All known linkers require a `.a' archive for static linking (except MSVC,
-+# which needs '.lib').
-+libext=a
- 
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
--# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
-+with_gnu_ld="$lt_cv_prog_gnu_ld"
- 
--# serial 16
-+old_CC="$CC"
-+old_CFLAGS="$CFLAGS"
- 
--# 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.
-+# 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
- 
--# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
--# AM_INIT_AUTOMAKE([OPTIONS])
--# -----------------------------------------------
--# The call with PACKAGE and VERSION arguments is the old style
--# call (pre autoconf-2.50), which is being phased out.  PACKAGE
--# and VERSION should now be passed to AC_INIT and removed from
--# the call to AM_INIT_AUTOMAKE.
--# We support both call styles for the transition.  After
--# the next Automake release, Autoconf can make the AC_INIT
--# arguments mandatory, and then we can depend on a new Autoconf
--# release and drop the old call support.
--AC_DEFUN([AM_INIT_AUTOMAKE],
--[AC_PREREQ([2.62])dnl
--dnl Autoconf wants to disallow AM_ names.  We explicitly allow
--dnl the ones we care about.
--m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
--AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
--AC_REQUIRE([AC_PROG_INSTALL])dnl
--if test "`cd $srcdir && pwd`" != "`pwd`"; then
--  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
--  # is not polluted with repeated "-I."
--  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
--  # test to see if srcdir already configured
--  if test -f $srcdir/config.status; then
--    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
--  fi
--fi
-+_LT_CC_BASENAME([$compiler])
- 
--# test whether we have cygpath
--if test -z "$CYGPATH_W"; then
--  if (cygpath --version) >/dev/null 2>/dev/null; then
--    CYGPATH_W='cygpath -w'
--  else
--    CYGPATH_W=echo
-+# Only perform the check for file, if the check method requires it
-+test -z "$MAGIC_CMD" && MAGIC_CMD=file
-+case $deplibs_check_method in
-+file_magic*)
-+  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-+    _LT_PATH_MAGIC
-   fi
--fi
--AC_SUBST([CYGPATH_W])
--
--# Define the identity of the package.
--dnl Distinguish between old-style and new-style calls.
--m4_ifval([$2],
--[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
-- AC_SUBST([PACKAGE], [$1])dnl
-- AC_SUBST([VERSION], [$2])],
--[_AM_SET_OPTIONS([$1])dnl
--dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
--m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
--  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
-- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
-- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
--
--_AM_IF_OPTION([no-define],,
--[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
-+  ;;
-+esac
- 
--# Some tools Automake needs.
--AC_REQUIRE([AM_SANITY_CHECK])dnl
--AC_REQUIRE([AC_ARG_PROGRAM])dnl
--AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
--AM_MISSING_PROG(AUTOCONF, autoconf)
--AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
--AM_MISSING_PROG(AUTOHEADER, autoheader)
--AM_MISSING_PROG(MAKEINFO, makeinfo)
--AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
--AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
--AC_REQUIRE([AM_PROG_MKDIR_P])dnl
--# We need awk for the "check" target.  The system "awk" is bad on
--# some platforms.
--AC_REQUIRE([AC_PROG_AWK])dnl
--AC_REQUIRE([AC_PROG_MAKE_SET])dnl
--AC_REQUIRE([AM_SET_LEADING_DOT])dnl
--_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
--	      [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
--			     [_AM_PROG_TAR([v7])])])
--_AM_IF_OPTION([no-dependencies],,
--[AC_PROVIDE_IFELSE([AC_PROG_CC],
--		  [_AM_DEPENDENCIES(CC)],
--		  [define([AC_PROG_CC],
--			  defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
--AC_PROVIDE_IFELSE([AC_PROG_CXX],
--		  [_AM_DEPENDENCIES(CXX)],
--		  [define([AC_PROG_CXX],
--			  defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
--AC_PROVIDE_IFELSE([AC_PROG_OBJC],
--		  [_AM_DEPENDENCIES(OBJC)],
--		  [define([AC_PROG_OBJC],
--			  defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
--])
--_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
--dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
--dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This macro
--dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
--AC_CONFIG_COMMANDS_PRE(dnl
--[m4_provide_if([_AM_COMPILER_EXEEXT],
--  [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
--])
-+# Use C for the default configuration in the libtool script
-+LT_SUPPORTED_TAG([CC])
-+_LT_LANG_C_CONFIG
-+_LT_LANG_DEFAULT_CONFIG
-+_LT_CONFIG_COMMANDS
-+])# _LT_SETUP
- 
--dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
--dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
--dnl mangled by Autoconf and run in a shell conditional statement.
--m4_define([_AC_COMPILER_EXEEXT],
--m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
- 
-+# _LT_PROG_LTMAIN
-+# ---------------
-+# Note that this code is called both from `configure', and `config.status'
-+# now that we use AC_CONFIG_COMMANDS to generate libtool.  Notably,
-+# `config.status' has no value for ac_aux_dir unless we are using Automake,
-+# so we pass a copy along to make sure it has a sensible value anyway.
-+m4_defun([_LT_PROG_LTMAIN],
-+[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl
-+_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
-+ltmain="$ac_aux_dir/ltmain.sh"
-+])# _LT_PROG_LTMAIN
- 
--# When config.status generates a header, we must update the stamp-h file.
--# This file resides in the same directory as the config header
--# that is generated.  The stamp files are numbered to have different names.
- 
--# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
--# loop where config.status creates the headers, so we can generate
--# our stamp files there.
--AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
--[# Compute $1's index in $config_headers.
--_am_arg=$1
--_am_stamp_count=1
--for _am_header in $config_headers :; do
--  case $_am_header in
--    $_am_arg | $_am_arg:* )
--      break ;;
--    * )
--      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
--  esac
--done
--echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
- 
--# Copyright (C) 2001, 2003, 2005, 2008  Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
-+# So that we can recreate a full libtool script including additional
-+# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
-+# in macros and then make a single call at the end using the `libtool'
-+# label.
- 
--# AM_PROG_INSTALL_SH
--# ------------------
--# Define $install_sh.
--AC_DEFUN([AM_PROG_INSTALL_SH],
--[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
--if test x"${install_sh}" != xset; then
--  case $am_aux_dir in
--  *\ * | *\	*)
--    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
--  *)
--    install_sh="\${SHELL} $am_aux_dir/install-sh"
--  esac
--fi
--AC_SUBST(install_sh)])
- 
--# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
-+# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS])
-+# ----------------------------------------
-+# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later.
-+m4_define([_LT_CONFIG_LIBTOOL_INIT],
-+[m4_ifval([$1],
-+          [m4_append([_LT_OUTPUT_LIBTOOL_INIT],
-+                     [$1
-+])])])
- 
--# serial 2
-+# Initialize.
-+m4_define([_LT_OUTPUT_LIBTOOL_INIT])
- 
--# Check whether the underlying file-system supports filenames
--# with a leading dot.  For instance MS-DOS doesn't.
--AC_DEFUN([AM_SET_LEADING_DOT],
--[rm -rf .tst 2>/dev/null
--mkdir .tst 2>/dev/null
--if test -d .tst; then
--  am__leading_dot=.
--else
--  am__leading_dot=_
--fi
--rmdir .tst 2>/dev/null
--AC_SUBST([am__leading_dot])])
- 
--# Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
--# From Jim Meyering
-+# _LT_CONFIG_LIBTOOL([COMMANDS])
-+# ------------------------------
-+# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later.
-+m4_define([_LT_CONFIG_LIBTOOL],
-+[m4_ifval([$1],
-+          [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS],
-+                     [$1
-+])])])
- 
--# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008
--# Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
-+# Initialize.
-+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS])
- 
--# serial 5
- 
--# AM_MAINTAINER_MODE([DEFAULT-MODE])
--# ----------------------------------
--# Control maintainer-specific portions of Makefiles.
--# Default is to disable them, unless `enable' is passed literally.
--# For symmetry, `disable' may be passed as well.  Anyway, the user
--# can override the default with the --enable/--disable switch.
--AC_DEFUN([AM_MAINTAINER_MODE],
--[m4_case(m4_default([$1], [disable]),
--       [enable], [m4_define([am_maintainer_other], [disable])],
--       [disable], [m4_define([am_maintainer_other], [enable])],
--       [m4_define([am_maintainer_other], [enable])
--        m4_warn([syntax], [unexpected argument to AM@&t at _MAINTAINER_MODE: $1])])
--AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles])
--  dnl maintainer-mode's default is 'disable' unless 'enable' is passed
--  AC_ARG_ENABLE([maintainer-mode],
--[  --][am_maintainer_other][-maintainer-mode  am_maintainer_other make rules and dependencies not useful
--			  (and sometimes confusing) to the casual installer],
--      [USE_MAINTAINER_MODE=$enableval],
--      [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
--  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
--  AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
--  MAINT=$MAINTAINER_MODE_TRUE
--  AC_SUBST([MAINT])dnl
--]
--)
-+# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS])
-+# -----------------------------------------------------
-+m4_defun([_LT_CONFIG_SAVE_COMMANDS],
-+[_LT_CONFIG_LIBTOOL([$1])
-+_LT_CONFIG_LIBTOOL_INIT([$2])
-+])
- 
--AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
- 
--# Check to see how 'make' treats includes.	            -*- Autoconf -*-
-+# _LT_FORMAT_COMMENT([COMMENT])
-+# -----------------------------
-+# Add leading comment marks to the start of each line, and a trailing
-+# full-stop to the whole comment if one is not present already.
-+m4_define([_LT_FORMAT_COMMENT],
-+[m4_ifval([$1], [
-+m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])],
-+              [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.])
-+)])
- 
--# Copyright (C) 2001, 2002, 2003, 2005, 2009  Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
- 
--# serial 4
- 
--# AM_MAKE_INCLUDE()
--# -----------------
--# Check to see how make treats includes.
--AC_DEFUN([AM_MAKE_INCLUDE],
--[am_make=${MAKE-make}
--cat > confinc << 'END'
--am__doit:
--	@echo this is the am__doit target
--.PHONY: am__doit
--END
--# If we don't find an include directive, just comment out the code.
--AC_MSG_CHECKING([for style of include used by $am_make])
--am__include="#"
--am__quote=
--_am_result=none
--# First try GNU make style include.
--echo "include confinc" > confmf
--# Ignore all kinds of additional output from `make'.
--case `$am_make -s -f confmf 2> /dev/null` in #(
--*the\ am__doit\ target*)
--  am__include=include
--  am__quote=
--  _am_result=GNU
--  ;;
--esac
--# Now try BSD make style include.
--if test "$am__include" = "#"; then
--   echo '.include "confinc"' > confmf
--   case `$am_make -s -f confmf 2> /dev/null` in #(
--   *the\ am__doit\ target*)
--     am__include=.include
--     am__quote="\""
--     _am_result=BSD
--     ;;
--   esac
--fi
--AC_SUBST([am__include])
--AC_SUBST([am__quote])
--AC_MSG_RESULT([$_am_result])
--rm -f confinc confmf
--])
- 
--# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
- 
--# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
--# Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
-+# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?])
-+# -------------------------------------------------------------------
-+# CONFIGNAME is the name given to the value in the libtool script.
-+# VARNAME is the (base) name used in the configure script.
-+# VALUE may be 0, 1 or 2 for a computed quote escaped value based on
-+# VARNAME.  Any other value will be used directly.
-+m4_define([_LT_DECL],
-+[lt_if_append_uniq([lt_decl_varnames], [$2], [, ],
-+    [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name],
-+	[m4_ifval([$1], [$1], [$2])])
-+    lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3])
-+    m4_ifval([$4],
-+	[lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])])
-+    lt_dict_add_subkey([lt_decl_dict], [$2],
-+	[tagged?], [m4_ifval([$5], [yes], [no])])])
-+])
- 
--# serial 6
- 
--# AM_MISSING_PROG(NAME, PROGRAM)
--# ------------------------------
--AC_DEFUN([AM_MISSING_PROG],
--[AC_REQUIRE([AM_MISSING_HAS_RUN])
--$1=${$1-"${am_missing_run}$2"}
--AC_SUBST($1)])
-+# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION])
-+# --------------------------------------------------------
-+m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])])
- 
- 
--# AM_MISSING_HAS_RUN
--# ------------------
--# Define MISSING if not defined so far and test if it supports --run.
--# If it does, set am_missing_run to use it, otherwise, to nothing.
--AC_DEFUN([AM_MISSING_HAS_RUN],
--[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
--AC_REQUIRE_AUX_FILE([missing])dnl
--if test x"${MISSING+set}" != xset; then
--  case $am_aux_dir in
--  *\ * | *\	*)
--    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
--  *)
--    MISSING="\${SHELL} $am_aux_dir/missing" ;;
--  esac
--fi
--# Use eval to expand $SHELL
--if eval "$MISSING --run true"; then
--  am_missing_run="$MISSING --run "
--else
--  am_missing_run=
--  AC_MSG_WARN([`missing' script is too old or missing])
--fi
--])
-+# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...])
-+# ------------------------------------------------
-+m4_define([lt_decl_tag_varnames],
-+[_lt_decl_filter([tagged?], [yes], $@)])
- 
--# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
- 
--# AM_PROG_MKDIR_P
--# ---------------
--# Check for `mkdir -p'.
--AC_DEFUN([AM_PROG_MKDIR_P],
--[AC_PREREQ([2.60])dnl
--AC_REQUIRE([AC_PROG_MKDIR_P])dnl
--dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
--dnl while keeping a definition of mkdir_p for backward compatibility.
--dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
--dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
--dnl Makefile.ins that do not define MKDIR_P, so we do our own
--dnl adjustment using top_builddir (which is defined more often than
--dnl MKDIR_P).
--AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
--case $mkdir_p in
--  [[\\/$]]* | ?:[[\\/]]*) ;;
--  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
--esac
-+# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..])
-+# ---------------------------------------------------------
-+m4_define([_lt_decl_filter],
-+[m4_case([$#],
-+  [0], [m4_fatal([$0: too few arguments: $#])],
-+  [1], [m4_fatal([$0: too few arguments: $#: $1])],
-+  [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)],
-+  [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)],
-+  [lt_dict_filter([lt_decl_dict], $@)])[]dnl
- ])
- 
--# Helper functions for option handling.                     -*- Autoconf -*-
- 
--# Copyright (C) 2001, 2002, 2003, 2005, 2008  Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
-+# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...])
-+# --------------------------------------------------
-+m4_define([lt_decl_quote_varnames],
-+[_lt_decl_filter([value], [1], $@)])
- 
--# serial 4
- 
--# _AM_MANGLE_OPTION(NAME)
--# -----------------------
--AC_DEFUN([_AM_MANGLE_OPTION],
--[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
-+# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...])
-+# ---------------------------------------------------
-+m4_define([lt_decl_dquote_varnames],
-+[_lt_decl_filter([value], [2], $@)])
- 
--# _AM_SET_OPTION(NAME)
--# ------------------------------
--# Set option NAME.  Presently that only means defining a flag for this option.
--AC_DEFUN([_AM_SET_OPTION],
--[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
- 
--# _AM_SET_OPTIONS(OPTIONS)
--# ----------------------------------
--# OPTIONS is a space-separated list of Automake options.
--AC_DEFUN([_AM_SET_OPTIONS],
--[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-+# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
-+# ---------------------------------------------------
-+m4_define([lt_decl_varnames_tagged],
-+[m4_assert([$# <= 2])dnl
-+_$0(m4_quote(m4_default([$1], [[, ]])),
-+    m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]),
-+    m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))])
-+m4_define([_lt_decl_varnames_tagged],
-+[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])])
- 
--# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
--# -------------------------------------------
--# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
--AC_DEFUN([_AM_IF_OPTION],
--[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
- 
--# Check to make sure that the build environment is sane.    -*- Autoconf -*-
-+# lt_decl_all_varnames([SEPARATOR], [VARNAME1...])
-+# ------------------------------------------------
-+m4_define([lt_decl_all_varnames],
-+[_$0(m4_quote(m4_default([$1], [[, ]])),
-+     m4_if([$2], [],
-+	   m4_quote(lt_decl_varnames),
-+	m4_quote(m4_shift($@))))[]dnl
-+])
-+m4_define([_lt_decl_all_varnames],
-+[lt_join($@, lt_decl_varnames_tagged([$1],
-+			lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl
-+])
- 
--# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
--# Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
- 
--# serial 5
-+# _LT_CONFIG_STATUS_DECLARE([VARNAME])
-+# ------------------------------------
-+# Quote a variable value, and forward it to `config.status' so that its
-+# declaration there will have the same value as in `configure'.  VARNAME
-+# must have a single quote delimited value for this to work.
-+m4_define([_LT_CONFIG_STATUS_DECLARE],
-+[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`'])
- 
--# AM_SANITY_CHECK
--# ---------------
--AC_DEFUN([AM_SANITY_CHECK],
--[AC_MSG_CHECKING([whether build environment is sane])
--# Just in case
--sleep 1
--echo timestamp > conftest.file
--# Reject unsafe characters in $srcdir or the absolute working directory
--# name.  Accept space and tab only in the latter.
--am_lf='
--'
--case `pwd` in
--  *[[\\\"\#\$\&\'\`$am_lf]]*)
--    AC_MSG_ERROR([unsafe absolute working directory name]);;
--esac
--case $srcdir in
--  *[[\\\"\#\$\&\'\`$am_lf\ \	]]*)
--    AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
--esac
--
--# Do `set' in a subshell so we don't clobber the current shell's
--# arguments.  Must try -L first in case configure is actually a
--# symlink; some systems play weird games with the mod time of symlinks
--# (eg FreeBSD returns the mod time of the symlink's containing
--# directory).
--if (
--   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
--   if test "$[*]" = "X"; then
--      # -L didn't work.
--      set X `ls -t "$srcdir/configure" conftest.file`
--   fi
--   rm -f conftest.file
--   if test "$[*]" != "X $srcdir/configure conftest.file" \
--      && test "$[*]" != "X conftest.file $srcdir/configure"; then
- 
--      # If neither matched, then we have a broken ls.  This can happen
--      # 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".
--      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
--alias in your environment])
--   fi
-+# _LT_CONFIG_STATUS_DECLARATIONS
-+# ------------------------------
-+# We delimit libtool config variables with single quotes, so when
-+# we write them to config.status, we have to be sure to quote all
-+# embedded single quotes properly.  In configure, this macro expands
-+# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
-+#
-+#    <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`'
-+m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
-+[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
-+    [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
- 
--   test "$[2]" = conftest.file
--   )
--then
--   # Ok.
--   :
--else
--   AC_MSG_ERROR([newly created file is older than distributed files!
--Check your system clock])
--fi
--AC_MSG_RESULT(yes)])
- 
--# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
-+# _LT_LIBTOOL_TAGS
-+# ----------------
-+# Output comment and list of tags supported by the script
-+m4_defun([_LT_LIBTOOL_TAGS],
-+[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
-+available_tags="_LT_TAGS"dnl
-+])
- 
--# AM_PROG_INSTALL_STRIP
--# ---------------------
--# One issue with vendor `install' (even GNU) is that you can't
--# specify the program used to strip binaries.  This is especially
--# annoying in cross-compiling environments, where the build's strip
--# is unlikely to handle the host's binaries.
--# Fortunately install-sh will honor a STRIPPROG variable, so we
--# always use install-sh in `make install-strip', and initialize
--# STRIPPROG with the value of the STRIP variable (set by the user).
--AC_DEFUN([AM_PROG_INSTALL_STRIP],
--[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
--# Installed binaries are usually stripped using `strip' when the user
--# run `make install-strip'.  However `strip' might not be the right
--# tool to use in cross-compilation environments, therefore Automake
--# will honor the `STRIP' environment variable to overrule this program.
--dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
--if test "$cross_compiling" != no; then
--  AC_CHECK_TOOL([STRIP], [strip], :)
--fi
--INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
--AC_SUBST([INSTALL_STRIP_PROGRAM])])
- 
--# Copyright (C) 2006, 2008  Free Software Foundation, Inc.
-+# _LT_LIBTOOL_DECLARE(VARNAME, [TAG])
-+# -----------------------------------
-+# Extract the dictionary values for VARNAME (optionally with TAG) and
-+# expand to a commented shell variable setting:
- #
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
-+#    # Some comment about what VAR is for.
-+#    visible_name=$lt_internal_name
-+m4_define([_LT_LIBTOOL_DECLARE],
-+[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1],
-+					   [description])))[]dnl
-+m4_pushdef([_libtool_name],
-+    m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl
-+m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])),
-+    [0], [_libtool_name=[$]$1],
-+    [1], [_libtool_name=$lt_[]$1],
-+    [2], [_libtool_name=$lt_[]$1],
-+    [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl
-+m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl
-+])
- 
--# serial 2
- 
--# _AM_SUBST_NOTMAKE(VARIABLE)
--# ---------------------------
--# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
--# This macro is traced by Automake.
--AC_DEFUN([_AM_SUBST_NOTMAKE])
-+# _LT_LIBTOOL_CONFIG_VARS
-+# -----------------------
-+# Produce commented declarations of non-tagged libtool config variables
-+# suitable for insertion in the LIBTOOL CONFIG section of the `libtool'
-+# script.  Tagged libtool config variables (even for the LIBTOOL CONFIG
-+# section) are produced by _LT_LIBTOOL_TAG_VARS.
-+m4_defun([_LT_LIBTOOL_CONFIG_VARS],
-+[m4_foreach([_lt_var],
-+    m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)),
-+    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])])
- 
--# AM_SUBST_NOTMAKE(VARIABLE)
--# ---------------------------
--# Public sister of _AM_SUBST_NOTMAKE.
--AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
- 
--# Check how to create a tarball.                            -*- Autoconf -*-
-+# _LT_LIBTOOL_TAG_VARS(TAG)
-+# -------------------------
-+m4_define([_LT_LIBTOOL_TAG_VARS],
-+[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames),
-+    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])])
- 
--# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
- 
--# serial 2
-+# _LT_TAGVAR(VARNAME, [TAGNAME])
-+# ------------------------------
-+m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])
- 
--# _AM_PROG_TAR(FORMAT)
--# --------------------
--# Check how to create a tarball in format FORMAT.
--# FORMAT should be one of `v7', `ustar', or `pax'.
--#
--# Substitute a variable $(am__tar) that is a command
--# writing to stdout a FORMAT-tarball containing the directory
--# $tardir.
--#     tardir=directory && $(am__tar) > result.tar
--#
--# Substitute a variable $(am__untar) that extract such
--# a tarball read from stdin.
--#     $(am__untar) < result.tar
--AC_DEFUN([_AM_PROG_TAR],
--[# Always define AMTAR for backward compatibility.
--AM_MISSING_PROG([AMTAR], [tar])
--m4_if([$1], [v7],
--     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
--     [m4_case([$1], [ustar],, [pax],,
--              [m4_fatal([Unknown tar format])])
--AC_MSG_CHECKING([how to create a $1 tar archive])
--# Loop over all known methods to create a tar archive until one works.
--_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
--_am_tools=${am_cv_prog_tar_$1-$_am_tools}
--# Do not fold the above two line into one, because Tru64 sh and
--# Solaris sh will not grok spaces in the rhs of `-'.
--for _am_tool in $_am_tools
--do
--  case $_am_tool in
--  gnutar)
--    for _am_tar in tar gnutar gtar;
--    do
--      AM_RUN_LOG([$_am_tar --version]) && break
--    done
--    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
--    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
--    am__untar="$_am_tar -xf -"
--    ;;
--  plaintar)
--    # Must skip GNU tar: if it does not support --format= it doesn't create
--    # ustar tarball either.
--    (tar --version) >/dev/null 2>&1 && continue
--    am__tar='tar chf - "$$tardir"'
--    am__tar_='tar chf - "$tardir"'
--    am__untar='tar xf -'
--    ;;
--  pax)
--    am__tar='pax -L -x $1 -w "$$tardir"'
--    am__tar_='pax -L -x $1 -w "$tardir"'
--    am__untar='pax -r'
--    ;;
--  cpio)
--    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
--    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
--    am__untar='cpio -i -H $1 -d'
--    ;;
--  none)
--    am__tar=false
--    am__tar_=false
--    am__untar=false
--    ;;
--  esac
- 
--  # If the value was cached, stop now.  We just wanted to have am__tar
--  # and am__untar set.
--  test -n "${am_cv_prog_tar_$1}" && break
-+# _LT_CONFIG_COMMANDS
-+# -------------------
-+# Send accumulated output to $CONFIG_STATUS.  Thanks to the lists of
-+# variables for single and double quote escaping we saved from calls
-+# to _LT_DECL, we can put quote escaped variables declarations
-+# into `config.status', and then the shell code to quote escape them in
-+# for loops in `config.status'.  Finally, any additional code accumulated
-+# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
-+m4_defun([_LT_CONFIG_COMMANDS],
-+[AC_PROVIDE_IFELSE([LT_OUTPUT],
-+	dnl If the libtool generation code has been placed in $CONFIG_LT,
-+	dnl instead of duplicating it all over again into config.status,
-+	dnl then we will have config.status run $CONFIG_LT later, so it
-+	dnl needs to know what name is stored there:
-+        [AC_CONFIG_COMMANDS([libtool],
-+            [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])],
-+    dnl If the libtool generation code is destined for config.status,
-+    dnl expand the accumulated commands and init code now:
-+    [AC_CONFIG_COMMANDS([libtool],
-+        [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])])
-+])#_LT_CONFIG_COMMANDS
- 
--  # tar/untar a dummy directory, and stop if the command works
--  rm -rf conftest.dir
--  mkdir conftest.dir
--  echo GrepMe > conftest.dir/file
--  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
--  rm -rf conftest.dir
--  if test -s conftest.tar; then
--    AM_RUN_LOG([$am__untar <conftest.tar])
--    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
--  fi
--done
--rm -rf conftest.dir
- 
--AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
--AC_MSG_RESULT([$am_cv_prog_tar_$1])])
--AC_SUBST([am__tar])
--AC_SUBST([am__untar])
--]) # _AM_PROG_TAR
-+# Initialize.
-+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT],
-+[
- 
--# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
--#
--#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
--#                 2006, 2007, 2008 Free Software Foundation, Inc.
--#   Written by Gordon Matzigkeit, 1996
--#
--# This file is free software; the Free Software Foundation gives
--# unlimited permission to copy and/or distribute it, with or without
--# modifications, as long as this notice is preserved.
--
--m4_define([_LT_COPYING], [dnl
--#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
--#                 2006, 2007, 2008 Free Software Foundation, Inc.
--#   Written by Gordon Matzigkeit, 1996
--#
--#   This file is part of GNU Libtool.
--#
--# GNU Libtool is free software; you can redistribute it and/or
--# modify it under the terms of the GNU General Public License as
--# published by the Free Software Foundation; either version 2 of
--# the License, or (at your option) any later version.
--#
--# As a special exception to the GNU General Public License,
--# if you distribute this file as part of a program or library that
--# is built using GNU Libtool, you may include this file under the
--# same distribution terms that you use for the rest of that program.
--#
--# GNU Libtool is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--#
--# You should have received a copy of the GNU General Public License
--# along with GNU Libtool; see the file COPYING.  If not, a copy
--# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
--# obtained by writing to the Free Software Foundation, Inc.,
--# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
--])
--
--# serial 56 LT_INIT
-+# The HP-UX ksh and POSIX shell print the target directory to stdout
-+# if CDPATH is set.
-+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
- 
-+sed_quote_subst='$sed_quote_subst'
-+double_quote_subst='$double_quote_subst'
-+delay_variable_subst='$delay_variable_subst'
-+_LT_CONFIG_STATUS_DECLARATIONS
-+LTCC='$LTCC'
-+LTCFLAGS='$LTCFLAGS'
-+compiler='$compiler_DEFAULT'
- 
--# LT_PREREQ(VERSION)
--# ------------------
--# Complain and exit if this libtool version is less that VERSION.
--m4_defun([LT_PREREQ],
--[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1,
--       [m4_default([$3],
--		   [m4_fatal([Libtool version $1 or higher is required],
--		             63)])],
--       [$2])])
-+# Quote evaled strings.
-+for var in lt_decl_all_varnames([[ \
-+]], lt_decl_quote_varnames); do
-+    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
-+    *[[\\\\\\\`\\"\\\$]]*)
-+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
-+      ;;
-+    *)
-+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-+      ;;
-+    esac
-+done
- 
-+# Double-quote double-evaled strings.
-+for var in lt_decl_all_varnames([[ \
-+]], lt_decl_dquote_varnames); do
-+    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
-+    *[[\\\\\\\`\\"\\\$]]*)
-+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
-+      ;;
-+    *)
-+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-+      ;;
-+    esac
-+done
- 
--# _LT_CHECK_BUILDDIR
--# ------------------
--# Complain if the absolute build directory name contains unusual characters
--m4_defun([_LT_CHECK_BUILDDIR],
--[case `pwd` in
--  *\ * | *\	*)
--    AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;;
-+# Fix-up fallback echo if it was mangled by the above quoting rules.
-+case \$lt_ECHO in
-+*'\\\[$]0 --fallback-echo"')dnl "
-+  lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\`
-+  ;;
- esac
--])
- 
-+_LT_OUTPUT_LIBTOOL_INIT
-+])
- 
--# LT_INIT([OPTIONS])
--# ------------------
--AC_DEFUN([LT_INIT],
--[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
--AC_BEFORE([$0], [LT_LANG])dnl
--AC_BEFORE([$0], [LT_OUTPUT])dnl
--AC_BEFORE([$0], [LTDL_INIT])dnl
--m4_require([_LT_CHECK_BUILDDIR])dnl
- 
--dnl Autoconf doesn't catch unexpanded LT_ macros by default:
--m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl
--m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl
--dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4
--dnl unless we require an AC_DEFUNed macro:
--AC_REQUIRE([LTOPTIONS_VERSION])dnl
--AC_REQUIRE([LTSUGAR_VERSION])dnl
--AC_REQUIRE([LTVERSION_VERSION])dnl
--AC_REQUIRE([LTOBSOLETE_VERSION])dnl
--m4_require([_LT_PROG_LTMAIN])dnl
-+# LT_OUTPUT
-+# ---------
-+# This macro allows early generation of the libtool script (before
-+# AC_OUTPUT is called), incase it is used in configure for compilation
-+# tests.
-+AC_DEFUN([LT_OUTPUT],
-+[: ${CONFIG_LT=./config.lt}
-+AC_MSG_NOTICE([creating $CONFIG_LT])
-+cat >"$CONFIG_LT" <<_LTEOF
-+#! $SHELL
-+# Generated by $as_me.
-+# Run this file to recreate a libtool stub with the current configuration.
- 
--dnl Parse OPTIONS
--_LT_SET_OPTIONS([$0], [$1])
-+lt_cl_silent=false
-+SHELL=\${CONFIG_SHELL-$SHELL}
-+_LTEOF
- 
--# This can be used to rebuild libtool when needed
--LIBTOOL_DEPS="$ltmain"
-+cat >>"$CONFIG_LT" <<\_LTEOF
-+AS_SHELL_SANITIZE
-+_AS_PREPARE
- 
--# Always use our own libtool.
--LIBTOOL='$(SHELL) $(top_builddir)/libtool'
--AC_SUBST(LIBTOOL)dnl
-+exec AS_MESSAGE_FD>&1
-+exec AS_MESSAGE_LOG_FD>>config.log
-+{
-+  echo
-+  AS_BOX([Running $as_me.])
-+} >&AS_MESSAGE_LOG_FD
- 
--_LT_SETUP
-+lt_cl_help="\
-+\`$as_me' creates a local libtool stub from the current configuration,
-+for use in further configure time tests before the real libtool is
-+generated.
- 
--# Only expand once:
--m4_define([LT_INIT])
--])# LT_INIT
-+Usage: $[0] [[OPTIONS]]
- 
--# Old names:
--AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT])
--AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT])
--dnl aclocal-1.4 backwards compatibility:
--dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
--dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
-+  -h, --help      print this help, then exit
-+  -V, --version   print version number, then exit
-+  -q, --quiet     do not print progress messages
-+  -d, --debug     don't remove temporary files
- 
-+Report bugs to <bug-libtool at gnu.org>."
- 
--# _LT_CC_BASENAME(CC)
--# -------------------
--# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
--m4_defun([_LT_CC_BASENAME],
--[for cc_temp in $1""; do
--  case $cc_temp in
--    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
--    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
--    \-*) ;;
--    *) break;;
--  esac
--done
--cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
--])
-+lt_cl_version="\
-+m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
-+m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
-+configured by $[0], generated by m4_PACKAGE_STRING.
- 
-+Copyright (C) 2008 Free Software Foundation, Inc.
-+This config.lt script is free software; the Free Software Foundation
-+gives unlimited permision to copy, distribute and modify it."
- 
--# _LT_FILEUTILS_DEFAULTS
--# ----------------------
--# It is okay to use these file commands and assume they have been set
--# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'.
--m4_defun([_LT_FILEUTILS_DEFAULTS],
--[: ${CP="cp -f"}
--: ${MV="mv -f"}
--: ${RM="rm -f"}
--])# _LT_FILEUTILS_DEFAULTS
-+while test $[#] != 0
-+do
-+  case $[1] in
-+    --version | --v* | -V )
-+      echo "$lt_cl_version"; exit 0 ;;
-+    --help | --h* | -h )
-+      echo "$lt_cl_help"; exit 0 ;;
-+    --debug | --d* | -d )
-+      debug=: ;;
-+    --quiet | --q* | --silent | --s* | -q )
-+      lt_cl_silent=: ;;
- 
-+    -*) AC_MSG_ERROR([unrecognized option: $[1]
-+Try \`$[0] --help' for more information.]) ;;
- 
--# _LT_SETUP
--# ---------
--m4_defun([_LT_SETUP],
--[AC_REQUIRE([AC_CANONICAL_HOST])dnl
--AC_REQUIRE([AC_CANONICAL_BUILD])dnl
--_LT_DECL([], [host_alias], [0], [The host system])dnl
--_LT_DECL([], [host], [0])dnl
--_LT_DECL([], [host_os], [0])dnl
--dnl
--_LT_DECL([], [build_alias], [0], [The build system])dnl
--_LT_DECL([], [build], [0])dnl
--_LT_DECL([], [build_os], [0])dnl
--dnl
--AC_REQUIRE([AC_PROG_CC])dnl
--AC_REQUIRE([LT_PATH_LD])dnl
--AC_REQUIRE([LT_PATH_NM])dnl
--dnl
--AC_REQUIRE([AC_PROG_LN_S])dnl
--test -z "$LN_S" && LN_S="ln -s"
--_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl
--dnl
--AC_REQUIRE([LT_CMD_MAX_LEN])dnl
--_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl
--_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
--dnl
--m4_require([_LT_FILEUTILS_DEFAULTS])dnl
--m4_require([_LT_CHECK_SHELL_FEATURES])dnl
--m4_require([_LT_CMD_RELOAD])dnl
--m4_require([_LT_CHECK_MAGIC_METHOD])dnl
--m4_require([_LT_CMD_OLD_ARCHIVE])dnl
--m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
-+    *) AC_MSG_ERROR([unrecognized argument: $[1]
-+Try \`$[0] --help' for more information.]) ;;
-+  esac
-+  shift
-+done
- 
--_LT_CONFIG_LIBTOOL_INIT([
--# See if we are running on zsh, and set the options which allow our
--# commands through without removal of \ escapes INIT.
--if test -n "\${ZSH_VERSION+set}" ; then
--   setopt NO_GLOB_SUBST
--fi
--])
--if test -n "${ZSH_VERSION+set}" ; then
--   setopt NO_GLOB_SUBST
-+if $lt_cl_silent; then
-+  exec AS_MESSAGE_FD>/dev/null
- fi
-+_LTEOF
- 
--_LT_CHECK_OBJDIR
--
--m4_require([_LT_TAG_COMPILER])dnl
--_LT_PROG_ECHO_BACKSLASH
--
--case $host_os in
--aix3*)
--  # AIX sometimes has problems with the GCC collect2 program.  For some
--  # reason, if we set the COLLECT_NAMES environment variable, the problems
--  # vanish in a puff of smoke.
--  if test "X${COLLECT_NAMES+set}" != Xset; then
--    COLLECT_NAMES=
--    export COLLECT_NAMES
--  fi
--  ;;
--esac
--
--# Sed substitution that helps us do robust quoting.  It backslashifies
--# metacharacters that are still active within double-quoted strings.
--sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
--
--# Same as above, but do not quote variable references.
--double_quote_subst='s/\([["`\\]]\)/\\\1/g'
--
--# Sed substitution to delay expansion of an escaped shell variable in a
--# double_quote_subst'ed string.
--delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
--
--# Sed substitution to delay expansion of an escaped single quote.
--delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-+cat >>"$CONFIG_LT" <<_LTEOF
-+_LT_OUTPUT_LIBTOOL_COMMANDS_INIT
-+_LTEOF
- 
--# Sed substitution to avoid accidental globbing in evaled expressions
--no_glob_subst='s/\*/\\\*/g'
-+cat >>"$CONFIG_LT" <<\_LTEOF
-+AC_MSG_NOTICE([creating $ofile])
-+_LT_OUTPUT_LIBTOOL_COMMANDS
-+AS_EXIT(0)
-+_LTEOF
-+chmod +x "$CONFIG_LT"
- 
--# Global variables:
--ofile=libtool
--can_build_shared=yes
-+# configure is writing to config.log, but config.lt does its own redirection,
-+# appending to config.log, which fails on DOS, as config.log is still kept
-+# open by configure.  Here we exec the FD to /dev/null, effectively closing
-+# config.log, so it can be properly (re)opened and appended to by config.lt.
-+if test "$no_create" != yes; then
-+  lt_cl_success=:
-+  test "$silent" = yes &&
-+    lt_config_lt_args="$lt_config_lt_args --quiet"
-+  exec AS_MESSAGE_LOG_FD>/dev/null
-+  $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
-+  exec AS_MESSAGE_LOG_FD>>config.log
-+  $lt_cl_success || AS_EXIT(1)
-+fi
-+])# LT_OUTPUT
- 
--# All known linkers require a `.a' archive for static linking (except MSVC,
--# which needs '.lib').
--libext=a
- 
--with_gnu_ld="$lt_cv_prog_gnu_ld"
-+# _LT_CONFIG(TAG)
-+# ---------------
-+# If TAG is the built-in tag, create an initial libtool script with a
-+# default configuration from the untagged config vars.  Otherwise add code
-+# to config.status for appending the configuration named by TAG from the
-+# matching tagged config vars.
-+m4_defun([_LT_CONFIG],
-+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-+_LT_CONFIG_SAVE_COMMANDS([
-+  m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl
-+  m4_if(_LT_TAG, [C], [
-+    # See if we are running on zsh, and set the options which allow our
-+    # commands through without removal of \ escapes.
-+    if test -n "${ZSH_VERSION+set}" ; then
-+      setopt NO_GLOB_SUBST
-+    fi
- 
--old_CC="$CC"
--old_CFLAGS="$CFLAGS"
-+    cfgfile="${ofile}T"
-+    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
-+    $RM "$cfgfile"
- 
--# 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
-+    cat <<_LT_EOF >> "$cfgfile"
-+#! $SHELL
- 
--_LT_CC_BASENAME([$compiler])
-+# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-+# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
-+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-+#
-+_LT_COPYING
-+_LT_LIBTOOL_TAGS
- 
--# Only perform the check for file, if the check method requires it
--test -z "$MAGIC_CMD" && MAGIC_CMD=file
--case $deplibs_check_method in
--file_magic*)
--  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
--    _LT_PATH_MAGIC
--  fi
--  ;;
--esac
-+# ### BEGIN LIBTOOL CONFIG
-+_LT_LIBTOOL_CONFIG_VARS
-+_LT_LIBTOOL_TAG_VARS
-+# ### END LIBTOOL CONFIG
- 
--# Use C for the default configuration in the libtool script
--LT_SUPPORTED_TAG([CC])
--_LT_LANG_C_CONFIG
--_LT_LANG_DEFAULT_CONFIG
--_LT_CONFIG_COMMANDS
--])# _LT_SETUP
-+_LT_EOF
- 
-+  case $host_os in
-+  aix3*)
-+    cat <<\_LT_EOF >> "$cfgfile"
-+# AIX sometimes has problems with the GCC collect2 program.  For some
-+# reason, if we set the COLLECT_NAMES environment variable, the problems
-+# vanish in a puff of smoke.
-+if test "X${COLLECT_NAMES+set}" != Xset; then
-+  COLLECT_NAMES=
-+  export COLLECT_NAMES
-+fi
-+_LT_EOF
-+    ;;
-+  esac
- 
--# _LT_PROG_LTMAIN
--# ---------------
--# Note that this code is called both from `configure', and `config.status'
--# now that we use AC_CONFIG_COMMANDS to generate libtool.  Notably,
--# `config.status' has no value for ac_aux_dir unless we are using Automake,
--# so we pass a copy along to make sure it has a sensible value anyway.
--m4_defun([_LT_PROG_LTMAIN],
--[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl
--_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
--ltmain="$ac_aux_dir/ltmain.sh"
--])# _LT_PROG_LTMAIN
-+  _LT_PROG_LTMAIN
- 
-+  # We use sed instead of cat because bash on DJGPP gets confused if
-+  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
-+  # text mode, it properly converts lines to CR/LF.  This bash problem
-+  # is reportedly fixed, but why not run on old versions too?
-+  sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
-+    || (rm -f "$cfgfile"; exit 1)
- 
-+  _LT_PROG_XSI_SHELLFNS
- 
--# So that we can recreate a full libtool script including additional
--# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
--# in macros and then make a single call at the end using the `libtool'
--# label.
-+  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
-+    || (rm -f "$cfgfile"; exit 1)
- 
-+  mv -f "$cfgfile" "$ofile" ||
-+    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-+  chmod +x "$ofile"
-+],
-+[cat <<_LT_EOF >> "$ofile"
- 
--# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS])
--# ----------------------------------------
--# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later.
--m4_define([_LT_CONFIG_LIBTOOL_INIT],
--[m4_ifval([$1],
--          [m4_append([_LT_OUTPUT_LIBTOOL_INIT],
--                     [$1
--])])])
-+dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded
-+dnl in a comment (ie after a #).
-+# ### BEGIN LIBTOOL TAG CONFIG: $1
-+_LT_LIBTOOL_TAG_VARS(_LT_TAG)
-+# ### END LIBTOOL TAG CONFIG: $1
-+_LT_EOF
-+])dnl /m4_if
-+],
-+[m4_if([$1], [], [
-+    PACKAGE='$PACKAGE'
-+    VERSION='$VERSION'
-+    TIMESTAMP='$TIMESTAMP'
-+    RM='$RM'
-+    ofile='$ofile'], [])
-+])dnl /_LT_CONFIG_SAVE_COMMANDS
-+])# _LT_CONFIG
- 
--# Initialize.
--m4_define([_LT_OUTPUT_LIBTOOL_INIT])
- 
-+# LT_SUPPORTED_TAG(TAG)
-+# ---------------------
-+# Trace this macro to discover what tags are supported by the libtool
-+# --tag option, using:
-+#    autoconf --trace 'LT_SUPPORTED_TAG:$1'
-+AC_DEFUN([LT_SUPPORTED_TAG], [])
- 
--# _LT_CONFIG_LIBTOOL([COMMANDS])
--# ------------------------------
--# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later.
--m4_define([_LT_CONFIG_LIBTOOL],
--[m4_ifval([$1],
--          [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS],
--                     [$1
--])])])
- 
--# Initialize.
--m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS])
-+# C support is built-in for now
-+m4_define([_LT_LANG_C_enabled], [])
-+m4_define([_LT_TAGS], [])
- 
- 
--# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS])
--# -----------------------------------------------------
--m4_defun([_LT_CONFIG_SAVE_COMMANDS],
--[_LT_CONFIG_LIBTOOL([$1])
--_LT_CONFIG_LIBTOOL_INIT([$2])
--])
-+# LT_LANG(LANG)
-+# -------------
-+# Enable libtool support for the given language if not already enabled.
-+AC_DEFUN([LT_LANG],
-+[AC_BEFORE([$0], [LT_OUTPUT])dnl
-+m4_case([$1],
-+  [C],			[_LT_LANG(C)],
-+  [C++],		[_LT_LANG(CXX)],
-+  [Java],		[_LT_LANG(GCJ)],
-+  [Fortran 77],		[_LT_LANG(F77)],
-+  [Fortran],		[_LT_LANG(FC)],
-+  [Windows Resource],	[_LT_LANG(RC)],
-+  [m4_ifdef([_LT_LANG_]$1[_CONFIG],
-+    [_LT_LANG($1)],
-+    [m4_fatal([$0: unsupported language: "$1"])])])dnl
-+])# LT_LANG
- 
- 
--# _LT_FORMAT_COMMENT([COMMENT])
--# -----------------------------
--# Add leading comment marks to the start of each line, and a trailing
--# full-stop to the whole comment if one is not present already.
--m4_define([_LT_FORMAT_COMMENT],
--[m4_ifval([$1], [
--m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])],
--              [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.])
--)])
-+# _LT_LANG(LANGNAME)
-+# ------------------
-+m4_defun([_LT_LANG],
-+[m4_ifdef([_LT_LANG_]$1[_enabled], [],
-+  [LT_SUPPORTED_TAG([$1])dnl
-+  m4_append([_LT_TAGS], [$1 ])dnl
-+  m4_define([_LT_LANG_]$1[_enabled], [])dnl
-+  _LT_LANG_$1_CONFIG($1)])dnl
-+])# _LT_LANG
- 
- 
-+# _LT_LANG_DEFAULT_CONFIG
-+# -----------------------
-+m4_defun([_LT_LANG_DEFAULT_CONFIG],
-+[AC_PROVIDE_IFELSE([AC_PROG_CXX],
-+  [LT_LANG(CXX)],
-+  [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])])
- 
-+AC_PROVIDE_IFELSE([AC_PROG_F77],
-+  [LT_LANG(F77)],
-+  [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])])
- 
-+AC_PROVIDE_IFELSE([AC_PROG_FC],
-+  [LT_LANG(FC)],
-+  [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])])
- 
--# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?])
--# -------------------------------------------------------------------
--# CONFIGNAME is the name given to the value in the libtool script.
--# VARNAME is the (base) name used in the configure script.
--# VALUE may be 0, 1 or 2 for a computed quote escaped value based on
--# VARNAME.  Any other value will be used directly.
--m4_define([_LT_DECL],
--[lt_if_append_uniq([lt_decl_varnames], [$2], [, ],
--    [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name],
--	[m4_ifval([$1], [$1], [$2])])
--    lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3])
--    m4_ifval([$4],
--	[lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])])
--    lt_dict_add_subkey([lt_decl_dict], [$2],
--	[tagged?], [m4_ifval([$5], [yes], [no])])])
--])
-+dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal
-+dnl pulling things in needlessly.
-+AC_PROVIDE_IFELSE([AC_PROG_GCJ],
-+  [LT_LANG(GCJ)],
-+  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
-+    [LT_LANG(GCJ)],
-+    [AC_PROVIDE_IFELSE([LT_PROG_GCJ],
-+      [LT_LANG(GCJ)],
-+      [m4_ifdef([AC_PROG_GCJ],
-+	[m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])])
-+       m4_ifdef([A][M_PROG_GCJ],
-+	[m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])])
-+       m4_ifdef([LT_PROG_GCJ],
-+	[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
- 
-+AC_PROVIDE_IFELSE([LT_PROG_RC],
-+  [LT_LANG(RC)],
-+  [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
-+])# _LT_LANG_DEFAULT_CONFIG
- 
--# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION])
--# --------------------------------------------------------
--m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])])
-+# Obsolete macros:
-+AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)])
-+AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
-+AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
-+AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
-+dnl AC_DEFUN([AC_LIBTOOL_F77], [])
-+dnl AC_DEFUN([AC_LIBTOOL_FC], [])
-+dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
- 
- 
--# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...])
--# ------------------------------------------------
--m4_define([lt_decl_tag_varnames],
--[_lt_decl_filter([tagged?], [yes], $@)])
-+# _LT_TAG_COMPILER
-+# ----------------
-+m4_defun([_LT_TAG_COMPILER],
-+[AC_REQUIRE([AC_PROG_CC])dnl
- 
-+_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl
-+_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl
-+_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl
-+_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl
- 
--# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..])
--# ---------------------------------------------------------
--m4_define([_lt_decl_filter],
--[m4_case([$#],
--  [0], [m4_fatal([$0: too few arguments: $#])],
--  [1], [m4_fatal([$0: too few arguments: $#: $1])],
--  [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)],
--  [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)],
--  [lt_dict_filter([lt_decl_dict], $@)])[]dnl
--])
-+# If no C compiler was specified, use CC.
-+LTCC=${LTCC-"$CC"}
- 
-+# If no C compiler flags were specified, use CFLAGS.
-+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
- 
--# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...])
--# --------------------------------------------------
--m4_define([lt_decl_quote_varnames],
--[_lt_decl_filter([value], [1], $@)])
-+# Allow CC to be a program name with arguments.
-+compiler=$CC
-+])# _LT_TAG_COMPILER
- 
- 
--# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...])
--# ---------------------------------------------------
--m4_define([lt_decl_dquote_varnames],
--[_lt_decl_filter([value], [2], $@)])
-+# _LT_COMPILER_BOILERPLATE
-+# ------------------------
-+# Check for compiler boilerplate output or warnings with
-+# the simple compiler test code.
-+m4_defun([_LT_COMPILER_BOILERPLATE],
-+[m4_require([_LT_DECL_SED])dnl
-+ac_outfile=conftest.$ac_objext
-+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
-+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-+_lt_compiler_boilerplate=`cat conftest.err`
-+$RM conftest*
-+])# _LT_COMPILER_BOILERPLATE
- 
- 
--# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
--# ---------------------------------------------------
--m4_define([lt_decl_varnames_tagged],
--[m4_assert([$# <= 2])dnl
--_$0(m4_quote(m4_default([$1], [[, ]])),
--    m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]),
--    m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))])
--m4_define([_lt_decl_varnames_tagged],
--[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])])
-+# _LT_LINKER_BOILERPLATE
-+# ----------------------
-+# Check for linker boilerplate output or warnings with
-+# the simple link test code.
-+m4_defun([_LT_LINKER_BOILERPLATE],
-+[m4_require([_LT_DECL_SED])dnl
-+ac_outfile=conftest.$ac_objext
-+echo "$lt_simple_link_test_code" >conftest.$ac_ext
-+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-+_lt_linker_boilerplate=`cat conftest.err`
-+$RM -r conftest*
-+])# _LT_LINKER_BOILERPLATE
- 
-+# _LT_REQUIRED_DARWIN_CHECKS
-+# -------------------------
-+m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
-+  case $host_os in
-+    rhapsody* | darwin*)
-+    AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
-+    AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
-+    AC_CHECK_TOOL([LIPO], [lipo], [:])
-+    AC_CHECK_TOOL([OTOOL], [otool], [:])
-+    AC_CHECK_TOOL([OTOOL64], [otool64], [:])
-+    _LT_DECL([], [DSYMUTIL], [1],
-+      [Tool to manipulate archived DWARF debug symbol files on Mac OS X])
-+    _LT_DECL([], [NMEDIT], [1],
-+      [Tool to change global to local symbols on Mac OS X])
-+    _LT_DECL([], [LIPO], [1],
-+      [Tool to manipulate fat objects and archives on Mac OS X])
-+    _LT_DECL([], [OTOOL], [1],
-+      [ldd/readelf like tool for Mach-O binaries on Mac OS X])
-+    _LT_DECL([], [OTOOL64], [1],
-+      [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4])
- 
--# lt_decl_all_varnames([SEPARATOR], [VARNAME1...])
--# ------------------------------------------------
--m4_define([lt_decl_all_varnames],
--[_$0(m4_quote(m4_default([$1], [[, ]])),
--     m4_if([$2], [],
--	   m4_quote(lt_decl_varnames),
--	m4_quote(m4_shift($@))))[]dnl
--])
--m4_define([_lt_decl_all_varnames],
--[lt_join($@, lt_decl_varnames_tagged([$1],
--			lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl
-+    AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
-+      [lt_cv_apple_cc_single_mod=no
-+      if test -z "${LT_MULTI_MODULE}"; then
-+	# By default we will add the -single_module flag. You can override
-+	# by either setting the environment variable LT_MULTI_MODULE
-+	# non-empty at configure time, or by adding -multi_module to the
-+	# link flags.
-+	rm -rf libconftest.dylib*
-+	echo "int foo(void){return 1;}" > conftest.c
-+	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-+-dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD
-+	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-+	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
-+        _lt_result=$?
-+	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
-+	  lt_cv_apple_cc_single_mod=yes
-+	else
-+	  cat conftest.err >&AS_MESSAGE_LOG_FD
-+	fi
-+	rm -rf libconftest.dylib*
-+	rm -f conftest.*
-+      fi])
-+    AC_CACHE_CHECK([for -exported_symbols_list linker flag],
-+      [lt_cv_ld_exported_symbols_list],
-+      [lt_cv_ld_exported_symbols_list=no
-+      save_LDFLAGS=$LDFLAGS
-+      echo "_main" > conftest.sym
-+      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
-+      AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
-+	[lt_cv_ld_exported_symbols_list=yes],
-+	[lt_cv_ld_exported_symbols_list=no])
-+	LDFLAGS="$save_LDFLAGS"
-+    ])
-+    case $host_os in
-+    rhapsody* | darwin1.[[012]])
-+      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-+    darwin1.*)
-+      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-+    darwin*) # darwin 5.x on
-+      # if running on 10.5 or later, the deployment target defaults
-+      # to the OS version, if on x86, and 10.4, the deployment
-+      # target defaults to 10.4. Don't you love it?
-+      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
-+	10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
-+	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-+	10.[[012]]*)
-+	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-+	10.*)
-+	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-+      esac
-+    ;;
-+  esac
-+    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
-+      _lt_dar_single_mod='$single_module'
-+    fi
-+    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
-+      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
-+    else
-+      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+    fi
-+    if test "$DSYMUTIL" != ":"; then
-+      _lt_dsymutil='~$DSYMUTIL $lib || :'
-+    else
-+      _lt_dsymutil=
-+    fi
-+    ;;
-+  esac
- ])
- 
- 
--# _LT_CONFIG_STATUS_DECLARE([VARNAME])
--# ------------------------------------
--# Quote a variable value, and forward it to `config.status' so that its
--# declaration there will have the same value as in `configure'.  VARNAME
--# must have a single quote delimited value for this to work.
--m4_define([_LT_CONFIG_STATUS_DECLARE],
--[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`'])
--
-+# _LT_DARWIN_LINKER_FEATURES
-+# --------------------------
-+# Checks for linker and compiler features on darwin
-+m4_defun([_LT_DARWIN_LINKER_FEATURES],
-+[
-+  m4_require([_LT_REQUIRED_DARWIN_CHECKS])
-+  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-+  _LT_TAGVAR(hardcode_direct, $1)=no
-+  _LT_TAGVAR(hardcode_automatic, $1)=yes
-+  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-+  _LT_TAGVAR(whole_archive_flag_spec, $1)=''
-+  _LT_TAGVAR(link_all_deplibs, $1)=yes
-+  _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
-+  case $cc_basename in
-+     ifort*) _lt_dar_can_shared=yes ;;
-+     *) _lt_dar_can_shared=$GCC ;;
-+  esac
-+  if test "$_lt_dar_can_shared" = "yes"; then
-+    output_verbose_link_cmd=echo
-+    _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-+    _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-+    _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-+    _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
-+    m4_if([$1], [CXX],
-+[   if test "$lt_cv_apple_cc_single_mod" != "yes"; then
-+      _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
-+      _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
-+    fi
-+],[])
-+  else
-+  _LT_TAGVAR(ld_shlibs, $1)=no
-+  fi
-+])
- 
--# _LT_CONFIG_STATUS_DECLARATIONS
--# ------------------------------
--# We delimit libtool config variables with single quotes, so when
--# we write them to config.status, we have to be sure to quote all
--# embedded single quotes properly.  In configure, this macro expands
--# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
--#
--#    <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`'
--m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
--[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
--    [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
--
--
--# _LT_LIBTOOL_TAGS
--# ----------------
--# Output comment and list of tags supported by the script
--m4_defun([_LT_LIBTOOL_TAGS],
--[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
--available_tags="_LT_TAGS"dnl
--])
--
--
--# _LT_LIBTOOL_DECLARE(VARNAME, [TAG])
--# -----------------------------------
--# Extract the dictionary values for VARNAME (optionally with TAG) and
--# expand to a commented shell variable setting:
--#
--#    # Some comment about what VAR is for.
--#    visible_name=$lt_internal_name
--m4_define([_LT_LIBTOOL_DECLARE],
--[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1],
--					   [description])))[]dnl
--m4_pushdef([_libtool_name],
--    m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl
--m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])),
--    [0], [_libtool_name=[$]$1],
--    [1], [_libtool_name=$lt_[]$1],
--    [2], [_libtool_name=$lt_[]$1],
--    [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl
--m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl
--])
--
--
--# _LT_LIBTOOL_CONFIG_VARS
-+# _LT_SYS_MODULE_PATH_AIX
- # -----------------------
--# Produce commented declarations of non-tagged libtool config variables
--# suitable for insertion in the LIBTOOL CONFIG section of the `libtool'
--# script.  Tagged libtool config variables (even for the LIBTOOL CONFIG
--# section) are produced by _LT_LIBTOOL_TAG_VARS.
--m4_defun([_LT_LIBTOOL_CONFIG_VARS],
--[m4_foreach([_lt_var],
--    m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)),
--    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])])
--
-+# Links a minimal program and checks the executable
-+# for the system default hardcoded library path. In most cases,
-+# this is /usr/lib:/lib, but when the MPI compilers are used
-+# the location of the communication and MPI libs are included too.
-+# If we don't find anything, use the default library path according
-+# to the aix ld manual.
-+m4_defun([_LT_SYS_MODULE_PATH_AIX],
-+[m4_require([_LT_DECL_SED])dnl
-+AC_LINK_IFELSE(AC_LANG_PROGRAM,[
-+lt_aix_libpath_sed='
-+    /Import File Strings/,/^$/ {
-+	/^0/ {
-+	    s/^0  *\(.*\)$/\1/
-+	    p
-+	}
-+    }'
-+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-+# Check for a 64-bit object if we didn't find anything.
-+if test -z "$aix_libpath"; then
-+  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-+fi],[])
-+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-+])# _LT_SYS_MODULE_PATH_AIX
- 
--# _LT_LIBTOOL_TAG_VARS(TAG)
--# -------------------------
--m4_define([_LT_LIBTOOL_TAG_VARS],
--[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames),
--    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])])
- 
-+# _LT_SHELL_INIT(ARG)
-+# -------------------
-+m4_define([_LT_SHELL_INIT],
-+[ifdef([AC_DIVERSION_NOTICE],
-+	     [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
-+	 [AC_DIVERT_PUSH(NOTICE)])
-+$1
-+AC_DIVERT_POP
-+])# _LT_SHELL_INIT
- 
--# _LT_TAGVAR(VARNAME, [TAGNAME])
--# ------------------------------
--m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])
- 
-+# _LT_PROG_ECHO_BACKSLASH
-+# -----------------------
-+# Add some code to the start of the generated configure script which
-+# will find an echo command which doesn't interpret backslashes.
-+m4_defun([_LT_PROG_ECHO_BACKSLASH],
-+[_LT_SHELL_INIT([
-+# Check that we are running under the correct shell.
-+SHELL=${CONFIG_SHELL-/bin/sh}
- 
--# _LT_CONFIG_COMMANDS
--# -------------------
--# Send accumulated output to $CONFIG_STATUS.  Thanks to the lists of
--# variables for single and double quote escaping we saved from calls
--# to _LT_DECL, we can put quote escaped variables declarations
--# into `config.status', and then the shell code to quote escape them in
--# for loops in `config.status'.  Finally, any additional code accumulated
--# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
--m4_defun([_LT_CONFIG_COMMANDS],
--[AC_PROVIDE_IFELSE([LT_OUTPUT],
--	dnl If the libtool generation code has been placed in $CONFIG_LT,
--	dnl instead of duplicating it all over again into config.status,
--	dnl then we will have config.status run $CONFIG_LT later, so it
--	dnl needs to know what name is stored there:
--        [AC_CONFIG_COMMANDS([libtool],
--            [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])],
--    dnl If the libtool generation code is destined for config.status,
--    dnl expand the accumulated commands and init code now:
--    [AC_CONFIG_COMMANDS([libtool],
--        [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])])
--])#_LT_CONFIG_COMMANDS
-+case X$lt_ECHO in
-+X*--fallback-echo)
-+  # Remove one level of quotation (which was required for Make).
-+  ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
-+  ;;
-+esac
- 
-+ECHO=${lt_ECHO-echo}
-+if test "X[$]1" = X--no-reexec; then
-+  # Discard the --no-reexec flag, and continue.
-+  shift
-+elif test "X[$]1" = X--fallback-echo; then
-+  # Avoid inline document here, it may be left over
-+  :
-+elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
-+  # Yippee, $ECHO works!
-+  :
-+else
-+  # Restart under the correct shell.
-+  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
-+fi
- 
--# Initialize.
--m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT],
--[
-+if test "X[$]1" = X--fallback-echo; then
-+  # used as fallback echo
-+  shift
-+  cat <<_LT_EOF
-+[$]*
-+_LT_EOF
-+  exit 0
-+fi
- 
- # The HP-UX ksh and POSIX shell print the target directory to stdout
- # if CDPATH is set.
- (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
- 
--sed_quote_subst='$sed_quote_subst'
--double_quote_subst='$double_quote_subst'
--delay_variable_subst='$delay_variable_subst'
--_LT_CONFIG_STATUS_DECLARATIONS
--LTCC='$LTCC'
--LTCFLAGS='$LTCFLAGS'
--compiler='$compiler_DEFAULT'
--
--# Quote evaled strings.
--for var in lt_decl_all_varnames([[ \
--]], lt_decl_quote_varnames); do
--    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
--    *[[\\\\\\\`\\"\\\$]]*)
--      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
--      ;;
--    *)
--      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
--      ;;
--    esac
--done
--
--# Double-quote double-evaled strings.
--for var in lt_decl_all_varnames([[ \
--]], lt_decl_dquote_varnames); do
--    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
--    *[[\\\\\\\`\\"\\\$]]*)
--      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
--      ;;
--    *)
--      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
--      ;;
--    esac
--done
--
--# Fix-up fallback echo if it was mangled by the above quoting rules.
--case \$lt_ECHO in
--*'\\\[$]0 --fallback-echo"')dnl "
--  lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\`
--  ;;
--esac
--
--_LT_OUTPUT_LIBTOOL_INIT
--])
--
--
--# LT_OUTPUT
--# ---------
--# This macro allows early generation of the libtool script (before
--# AC_OUTPUT is called), incase it is used in configure for compilation
--# tests.
--AC_DEFUN([LT_OUTPUT],
--[: ${CONFIG_LT=./config.lt}
--AC_MSG_NOTICE([creating $CONFIG_LT])
--cat >"$CONFIG_LT" <<_LTEOF
--#! $SHELL
--# Generated by $as_me.
--# Run this file to recreate a libtool stub with the current configuration.
-+if test -z "$lt_ECHO"; then
-+  if test "X${echo_test_string+set}" != Xset; then
-+    # find a string as large as possible, as long as the shell can cope with it
-+    for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
-+      # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-+      if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
-+	 { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
-+      then
-+        break
-+      fi
-+    done
-+  fi
- 
--lt_cl_silent=false
--SHELL=\${CONFIG_SHELL-$SHELL}
--_LTEOF
-+  if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
-+     echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
-+     test "X$echo_testing_string" = "X$echo_test_string"; then
-+    :
-+  else
-+    # The Solaris, AIX, and Digital Unix default echo programs unquote
-+    # backslashes.  This makes it impossible to quote backslashes using
-+    #   echo "$something" | sed 's/\\/\\\\/g'
-+    #
-+    # So, first we look for a working echo in the user's PATH.
- 
--cat >>"$CONFIG_LT" <<\_LTEOF
--AS_SHELL_SANITIZE
--_AS_PREPARE
-+    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-+    for dir in $PATH /usr/ucb; do
-+      IFS="$lt_save_ifs"
-+      if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
-+         test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
-+         echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
-+         test "X$echo_testing_string" = "X$echo_test_string"; then
-+        ECHO="$dir/echo"
-+        break
-+      fi
-+    done
-+    IFS="$lt_save_ifs"
- 
--exec AS_MESSAGE_FD>&1
--exec AS_MESSAGE_LOG_FD>>config.log
--{
--  echo
--  AS_BOX([Running $as_me.])
--} >&AS_MESSAGE_LOG_FD
-+    if test "X$ECHO" = Xecho; then
-+      # We didn't find a better echo, so look for alternatives.
-+      if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
-+         echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
-+         test "X$echo_testing_string" = "X$echo_test_string"; then
-+        # This shell has a builtin print -r that does the trick.
-+        ECHO='print -r'
-+      elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
-+	   test "X$CONFIG_SHELL" != X/bin/ksh; then
-+        # If we have ksh, try running configure again with it.
-+        ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-+        export ORIGINAL_CONFIG_SHELL
-+        CONFIG_SHELL=/bin/ksh
-+        export CONFIG_SHELL
-+        exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
-+      else
-+        # Try using printf.
-+        ECHO='printf %s\n'
-+        if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
-+	   echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
-+	   test "X$echo_testing_string" = "X$echo_test_string"; then
-+	  # Cool, printf works
-+	  :
-+        elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
-+	     test "X$echo_testing_string" = 'X\t' &&
-+	     echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-+	     test "X$echo_testing_string" = "X$echo_test_string"; then
-+	  CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
-+	  export CONFIG_SHELL
-+	  SHELL="$CONFIG_SHELL"
-+	  export SHELL
-+	  ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
-+        elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
-+	     test "X$echo_testing_string" = 'X\t' &&
-+	     echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-+	     test "X$echo_testing_string" = "X$echo_test_string"; then
-+	  ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
-+        else
-+	  # maybe with a smaller string...
-+	  prev=:
- 
--lt_cl_help="\
--\`$as_me' creates a local libtool stub from the current configuration,
--for use in further configure time tests before the real libtool is
--generated.
-+	  for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
-+	    if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
-+	    then
-+	      break
-+	    fi
-+	    prev="$cmd"
-+	  done
- 
--Usage: $[0] [[OPTIONS]]
-+	  if test "$prev" != 'sed 50q "[$]0"'; then
-+	    echo_test_string=`eval $prev`
-+	    export echo_test_string
-+	    exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
-+	  else
-+	    # Oops.  We lost completely, so just stick with echo.
-+	    ECHO=echo
-+	  fi
-+        fi
-+      fi
-+    fi
-+  fi
-+fi
- 
--  -h, --help      print this help, then exit
--  -V, --version   print version number, then exit
--  -q, --quiet     do not print progress messages
--  -d, --debug     don't remove temporary files
-+# Copy echo and quote the copy suitably for passing to libtool from
-+# the Makefile, instead of quoting the original, which is used later.
-+lt_ECHO=$ECHO
-+if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
-+   lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
-+fi
- 
--Report bugs to <bug-libtool at gnu.org>."
-+AC_SUBST(lt_ECHO)
-+])
-+_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
-+_LT_DECL([], [ECHO], [1],
-+    [An echo program that does not interpret backslashes])
-+])# _LT_PROG_ECHO_BACKSLASH
- 
--lt_cl_version="\
--m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
--m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
--configured by $[0], generated by m4_PACKAGE_STRING.
- 
--Copyright (C) 2008 Free Software Foundation, Inc.
--This config.lt script is free software; the Free Software Foundation
--gives unlimited permision to copy, distribute and modify it."
-+# _LT_ENABLE_LOCK
-+# ---------------
-+m4_defun([_LT_ENABLE_LOCK],
-+[AC_ARG_ENABLE([libtool-lock],
-+  [AS_HELP_STRING([--disable-libtool-lock],
-+    [avoid locking (might break parallel builds)])])
-+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
- 
--while test $[#] != 0
--do
--  case $[1] in
--    --version | --v* | -V )
--      echo "$lt_cl_version"; exit 0 ;;
--    --help | --h* | -h )
--      echo "$lt_cl_help"; exit 0 ;;
--    --debug | --d* | -d )
--      debug=: ;;
--    --quiet | --q* | --silent | --s* | -q )
--      lt_cl_silent=: ;;
-+# Some flags need to be propagated to the compiler or linker for good
-+# libtool support.
-+case $host in
-+ia64-*-hpux*)
-+  # Find out which ABI we are using.
-+  echo 'int i;' > conftest.$ac_ext
-+  if AC_TRY_EVAL(ac_compile); then
-+    case `/usr/bin/file conftest.$ac_objext` in
-+      *ELF-32*)
-+	HPUX_IA64_MODE="32"
-+	;;
-+      *ELF-64*)
-+	HPUX_IA64_MODE="64"
-+	;;
-+    esac
-+  fi
-+  rm -rf conftest*
-+  ;;
-+*-*-irix6*)
-+  # Find out which ABI we are using.
-+  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
-+  if AC_TRY_EVAL(ac_compile); then
-+    if test "$lt_cv_prog_gnu_ld" = yes; then
-+      case `/usr/bin/file conftest.$ac_objext` in
-+	*32-bit*)
-+	  LD="${LD-ld} -melf32bsmip"
-+	  ;;
-+	*N32*)
-+	  LD="${LD-ld} -melf32bmipn32"
-+	  ;;
-+	*64-bit*)
-+	  LD="${LD-ld} -melf64bmip"
-+	;;
-+      esac
-+    else
-+      case `/usr/bin/file conftest.$ac_objext` in
-+	*32-bit*)
-+	  LD="${LD-ld} -32"
-+	  ;;
-+	*N32*)
-+	  LD="${LD-ld} -n32"
-+	  ;;
-+	*64-bit*)
-+	  LD="${LD-ld} -64"
-+	  ;;
-+      esac
-+    fi
-+  fi
-+  rm -rf conftest*
-+  ;;
- 
--    -*) AC_MSG_ERROR([unrecognized option: $[1]
--Try \`$[0] --help' for more information.]) ;;
-+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
-+s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
-+  # Find out which ABI we are using.
-+  echo 'int i;' > conftest.$ac_ext
-+  if AC_TRY_EVAL(ac_compile); then
-+    case `/usr/bin/file conftest.o` in
-+      *32-bit*)
-+	case $host in
-+	  x86_64-*kfreebsd*-gnu)
-+	    LD="${LD-ld} -m elf_i386_fbsd"
-+	    ;;
-+	  x86_64-*linux*)
-+	    LD="${LD-ld} -m elf_i386"
-+	    ;;
-+	  ppc64-*linux*|powerpc64-*linux*)
-+	    LD="${LD-ld} -m elf32ppclinux"
-+	    ;;
-+	  s390x-*linux*)
-+	    LD="${LD-ld} -m elf_s390"
-+	    ;;
-+	  sparc64-*linux*)
-+	    LD="${LD-ld} -m elf32_sparc"
-+	    ;;
-+	esac
-+	;;
-+      *64-bit*)
-+	case $host in
-+	  x86_64-*kfreebsd*-gnu)
-+	    LD="${LD-ld} -m elf_x86_64_fbsd"
-+	    ;;
-+	  x86_64-*linux*)
-+	    LD="${LD-ld} -m elf_x86_64"
-+	    ;;
-+	  ppc*-*linux*|powerpc*-*linux*)
-+	    LD="${LD-ld} -m elf64ppc"
-+	    ;;
-+	  s390*-*linux*|s390*-*tpf*)
-+	    LD="${LD-ld} -m elf64_s390"
-+	    ;;
-+	  sparc*-*linux*)
-+	    LD="${LD-ld} -m elf64_sparc"
-+	    ;;
-+	esac
-+	;;
-+    esac
-+  fi
-+  rm -rf conftest*
-+  ;;
- 
--    *) AC_MSG_ERROR([unrecognized argument: $[1]
--Try \`$[0] --help' for more information.]) ;;
--  esac
--  shift
--done
-+*-*-sco3.2v5*)
-+  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-+  SAVE_CFLAGS="$CFLAGS"
-+  CFLAGS="$CFLAGS -belf"
-+  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
-+    [AC_LANG_PUSH(C)
-+     AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
-+     AC_LANG_POP])
-+  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-+    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-+    CFLAGS="$SAVE_CFLAGS"
-+  fi
-+  ;;
-+sparc*-*solaris*)
-+  # Find out which ABI we are using.
-+  echo 'int i;' > conftest.$ac_ext
-+  if AC_TRY_EVAL(ac_compile); then
-+    case `/usr/bin/file conftest.o` in
-+    *64-bit*)
-+      case $lt_cv_prog_gnu_ld in
-+      yes*) LD="${LD-ld} -m elf64_sparc" ;;
-+      *)
-+	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
-+	  LD="${LD-ld} -64"
-+	fi
-+	;;
-+      esac
-+      ;;
-+    esac
-+  fi
-+  rm -rf conftest*
-+  ;;
-+esac
- 
--if $lt_cl_silent; then
--  exec AS_MESSAGE_FD>/dev/null
--fi
--_LTEOF
-+need_locks="$enable_libtool_lock"
-+])# _LT_ENABLE_LOCK
- 
--cat >>"$CONFIG_LT" <<_LTEOF
--_LT_OUTPUT_LIBTOOL_COMMANDS_INIT
--_LTEOF
- 
--cat >>"$CONFIG_LT" <<\_LTEOF
--AC_MSG_NOTICE([creating $ofile])
--_LT_OUTPUT_LIBTOOL_COMMANDS
--AS_EXIT(0)
--_LTEOF
--chmod +x "$CONFIG_LT"
--
--# configure is writing to config.log, but config.lt does its own redirection,
--# appending to config.log, which fails on DOS, as config.log is still kept
--# open by configure.  Here we exec the FD to /dev/null, effectively closing
--# config.log, so it can be properly (re)opened and appended to by config.lt.
--if test "$no_create" != yes; then
--  lt_cl_success=:
--  test "$silent" = yes &&
--    lt_config_lt_args="$lt_config_lt_args --quiet"
--  exec AS_MESSAGE_LOG_FD>/dev/null
--  $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
--  exec AS_MESSAGE_LOG_FD>>config.log
--  $lt_cl_success || AS_EXIT(1)
--fi
--])# LT_OUTPUT
--
--
--# _LT_CONFIG(TAG)
--# ---------------
--# If TAG is the built-in tag, create an initial libtool script with a
--# default configuration from the untagged config vars.  Otherwise add code
--# to config.status for appending the configuration named by TAG from the
--# matching tagged config vars.
--m4_defun([_LT_CONFIG],
--[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
--_LT_CONFIG_SAVE_COMMANDS([
--  m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl
--  m4_if(_LT_TAG, [C], [
--    # See if we are running on zsh, and set the options which allow our
--    # commands through without removal of \ escapes.
--    if test -n "${ZSH_VERSION+set}" ; then
--      setopt NO_GLOB_SUBST
--    fi
--
--    cfgfile="${ofile}T"
--    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
--    $RM "$cfgfile"
--
--    cat <<_LT_EOF >> "$cfgfile"
--#! $SHELL
-+# _LT_CMD_OLD_ARCHIVE
-+# -------------------
-+m4_defun([_LT_CMD_OLD_ARCHIVE],
-+[AC_CHECK_TOOL(AR, ar, false)
-+test -z "$AR" && AR=ar
-+test -z "$AR_FLAGS" && AR_FLAGS=cru
-+_LT_DECL([], [AR], [1], [The archiver])
-+_LT_DECL([], [AR_FLAGS], [1])
- 
--# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
--# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
--# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
--# NOTE: Changes made to this file will be lost: look at ltmain.sh.
--#
--_LT_COPYING
--_LT_LIBTOOL_TAGS
-+AC_CHECK_TOOL(STRIP, strip, :)
-+test -z "$STRIP" && STRIP=:
-+_LT_DECL([], [STRIP], [1], [A symbol stripping program])
- 
--# ### BEGIN LIBTOOL CONFIG
--_LT_LIBTOOL_CONFIG_VARS
--_LT_LIBTOOL_TAG_VARS
--# ### END LIBTOOL CONFIG
-+AC_CHECK_TOOL(RANLIB, ranlib, :)
-+test -z "$RANLIB" && RANLIB=:
-+_LT_DECL([], [RANLIB], [1],
-+    [Commands used to install an old-style archive])
- 
--_LT_EOF
-+# Determine commands to create old-style static archives.
-+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
-+old_postinstall_cmds='chmod 644 $oldlib'
-+old_postuninstall_cmds=
- 
-+if test -n "$RANLIB"; then
-   case $host_os in
--  aix3*)
--    cat <<\_LT_EOF >> "$cfgfile"
--# AIX sometimes has problems with the GCC collect2 program.  For some
--# reason, if we set the COLLECT_NAMES environment variable, the problems
--# vanish in a puff of smoke.
--if test "X${COLLECT_NAMES+set}" != Xset; then
--  COLLECT_NAMES=
--  export COLLECT_NAMES
--fi
--_LT_EOF
-+  openbsd*)
-+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
-+    ;;
-+  *)
-+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
-     ;;
-   esac
-+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-+fi
-+_LT_DECL([], [old_postinstall_cmds], [2])
-+_LT_DECL([], [old_postuninstall_cmds], [2])
-+_LT_TAGDECL([], [old_archive_cmds], [2],
-+    [Commands used to build an old-style archive])
-+])# _LT_CMD_OLD_ARCHIVE
- 
--  _LT_PROG_LTMAIN
- 
--  # We use sed instead of cat because bash on DJGPP gets confused if
--  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
--  # text mode, it properly converts lines to CR/LF.  This bash problem
--  # is reportedly fixed, but why not run on old versions too?
--  sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
--    || (rm -f "$cfgfile"; exit 1)
-+# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-+#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
-+# ----------------------------------------------------------------
-+# Check whether the given compiler option works
-+AC_DEFUN([_LT_COMPILER_OPTION],
-+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-+m4_require([_LT_DECL_SED])dnl
-+AC_CACHE_CHECK([$1], [$2],
-+  [$2=no
-+   m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
-+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-+   lt_compiler_flag="$3"
-+   # Insert the option either (1) after the last *FLAGS variable, or
-+   # (2) before a word containing "conftest.", or (3) at the end.
-+   # Note that $ac_compile itself does not contain backslashes and begins
-+   # with a dollar sign (not a hyphen), so the echo should work correctly.
-+   # The option is referenced via a variable to avoid confusing sed.
-+   lt_compile=`echo "$ac_compile" | $SED \
-+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-+   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-+   -e 's:$: $lt_compiler_flag:'`
-+   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-+   (eval "$lt_compile" 2>conftest.err)
-+   ac_status=$?
-+   cat conftest.err >&AS_MESSAGE_LOG_FD
-+   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-+   if (exit $ac_status) && test -s "$ac_outfile"; then
-+     # The compiler can only warn and ignore the option if not recognized
-+     # So say no if there are warnings other than the usual output.
-+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-+       $2=yes
-+     fi
-+   fi
-+   $RM conftest*
-+])
- 
--  _LT_PROG_XSI_SHELLFNS
-+if test x"[$]$2" = xyes; then
-+    m4_if([$5], , :, [$5])
-+else
-+    m4_if([$6], , :, [$6])
-+fi
-+])# _LT_COMPILER_OPTION
- 
--  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
--    || (rm -f "$cfgfile"; exit 1)
-+# Old name:
-+AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION])
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [])
- 
--  mv -f "$cfgfile" "$ofile" ||
--    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
--  chmod +x "$ofile"
--],
--[cat <<_LT_EOF >> "$ofile"
- 
--dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded
--dnl in a comment (ie after a #).
--# ### BEGIN LIBTOOL TAG CONFIG: $1
--_LT_LIBTOOL_TAG_VARS(_LT_TAG)
--# ### END LIBTOOL TAG CONFIG: $1
--_LT_EOF
--])dnl /m4_if
--],
--[m4_if([$1], [], [
--    PACKAGE='$PACKAGE'
--    VERSION='$VERSION'
--    TIMESTAMP='$TIMESTAMP'
--    RM='$RM'
--    ofile='$ofile'], [])
--])dnl /_LT_CONFIG_SAVE_COMMANDS
--])# _LT_CONFIG
-+# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-+#                  [ACTION-SUCCESS], [ACTION-FAILURE])
-+# ----------------------------------------------------
-+# Check whether the given linker option works
-+AC_DEFUN([_LT_LINKER_OPTION],
-+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-+m4_require([_LT_DECL_SED])dnl
-+AC_CACHE_CHECK([$1], [$2],
-+  [$2=no
-+   save_LDFLAGS="$LDFLAGS"
-+   LDFLAGS="$LDFLAGS $3"
-+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-+     # The linker can only warn and ignore the option if not recognized
-+     # So say no if there are warnings
-+     if test -s conftest.err; then
-+       # Append any errors to the config.log.
-+       cat conftest.err 1>&AS_MESSAGE_LOG_FD
-+       $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
-+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-+       if diff conftest.exp conftest.er2 >/dev/null; then
-+         $2=yes
-+       fi
-+     else
-+       $2=yes
-+     fi
-+   fi
-+   $RM -r conftest*
-+   LDFLAGS="$save_LDFLAGS"
-+])
- 
-+if test x"[$]$2" = xyes; then
-+    m4_if([$4], , :, [$4])
-+else
-+    m4_if([$5], , :, [$5])
-+fi
-+])# _LT_LINKER_OPTION
- 
--# LT_SUPPORTED_TAG(TAG)
--# ---------------------
--# Trace this macro to discover what tags are supported by the libtool
--# --tag option, using:
--#    autoconf --trace 'LT_SUPPORTED_TAG:$1'
--AC_DEFUN([LT_SUPPORTED_TAG], [])
-+# Old name:
-+AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION])
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], [])
- 
- 
--# C support is built-in for now
--m4_define([_LT_LANG_C_enabled], [])
--m4_define([_LT_TAGS], [])
-+# LT_CMD_MAX_LEN
-+#---------------
-+AC_DEFUN([LT_CMD_MAX_LEN],
-+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+# find the maximum length of command line arguments
-+AC_MSG_CHECKING([the maximum length of command line arguments])
-+AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
-+  i=0
-+  teststring="ABCD"
- 
-+  case $build_os in
-+  msdosdjgpp*)
-+    # On DJGPP, this test can blow up pretty badly due to problems in libc
-+    # (any single argument exceeding 2000 bytes causes a buffer overrun
-+    # during glob expansion).  Even if it were fixed, the result of this
-+    # check would be larger than it should be.
-+    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
-+    ;;
- 
--# LT_LANG(LANG)
--# -------------
--# Enable libtool support for the given language if not already enabled.
--AC_DEFUN([LT_LANG],
--[AC_BEFORE([$0], [LT_OUTPUT])dnl
--m4_case([$1],
--  [C],			[_LT_LANG(C)],
--  [C++],		[_LT_LANG(CXX)],
--  [Java],		[_LT_LANG(GCJ)],
--  [Fortran 77],		[_LT_LANG(F77)],
--  [Fortran],		[_LT_LANG(FC)],
--  [Windows Resource],	[_LT_LANG(RC)],
--  [m4_ifdef([_LT_LANG_]$1[_CONFIG],
--    [_LT_LANG($1)],
--    [m4_fatal([$0: unsupported language: "$1"])])])dnl
--])# LT_LANG
--
--
--# _LT_LANG(LANGNAME)
--# ------------------
--m4_defun([_LT_LANG],
--[m4_ifdef([_LT_LANG_]$1[_enabled], [],
--  [LT_SUPPORTED_TAG([$1])dnl
--  m4_append([_LT_TAGS], [$1 ])dnl
--  m4_define([_LT_LANG_]$1[_enabled], [])dnl
--  _LT_LANG_$1_CONFIG($1)])dnl
--])# _LT_LANG
--
-+  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;
-+    ;;
- 
--# _LT_LANG_DEFAULT_CONFIG
--# -----------------------
--m4_defun([_LT_LANG_DEFAULT_CONFIG],
--[AC_PROVIDE_IFELSE([AC_PROG_CXX],
--  [LT_LANG(CXX)],
--  [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])])
-+  cygwin* | mingw* | cegcc*)
-+    # On Win9x/ME, this test blows up -- it succeeds, but takes
-+    # about 5 minutes as the teststring grows exponentially.
-+    # Worse, since 9x/ME are not pre-emptively multitasking,
-+    # you end up with a "frozen" computer, even though with patience
-+    # the test eventually succeeds (with a max line length of 256k).
-+    # Instead, let's just punt: use the minimum linelength reported by
-+    # all of the supported platforms: 8192 (on NT/2K/XP).
-+    lt_cv_sys_max_cmd_len=8192;
-+    ;;
- 
--AC_PROVIDE_IFELSE([AC_PROG_F77],
--  [LT_LANG(F77)],
--  [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])])
-+  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;
-+    ;;
- 
--AC_PROVIDE_IFELSE([AC_PROG_FC],
--  [LT_LANG(FC)],
--  [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])])
-+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
-+    # This has been around since 386BSD, at least.  Likely further.
-+    if test -x /sbin/sysctl; then
-+      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-+    elif test -x /usr/sbin/sysctl; then
-+      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
-+    else
-+      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
-+    fi
-+    # And add a safety zone
-+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-+    ;;
- 
--dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal
--dnl pulling things in needlessly.
--AC_PROVIDE_IFELSE([AC_PROG_GCJ],
--  [LT_LANG(GCJ)],
--  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
--    [LT_LANG(GCJ)],
--    [AC_PROVIDE_IFELSE([LT_PROG_GCJ],
--      [LT_LANG(GCJ)],
--      [m4_ifdef([AC_PROG_GCJ],
--	[m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])])
--       m4_ifdef([A][M_PROG_GCJ],
--	[m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])])
--       m4_ifdef([LT_PROG_GCJ],
--	[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
-+  interix*)
-+    # We know the value 262144 and hardcode it with a safety zone (like BSD)
-+    lt_cv_sys_max_cmd_len=196608
-+    ;;
- 
--AC_PROVIDE_IFELSE([LT_PROG_RC],
--  [LT_LANG(RC)],
--  [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
--])# _LT_LANG_DEFAULT_CONFIG
-+  osf*)
-+    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
-+    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
-+    # nice to cause kernel panics so lets avoid the loop below.
-+    # First set a reasonable default.
-+    lt_cv_sys_max_cmd_len=16384
-+    #
-+    if test -x /sbin/sysconfig; then
-+      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
-+        *1*) lt_cv_sys_max_cmd_len=-1 ;;
-+      esac
-+    fi
-+    ;;
-+  sco3.2v5*)
-+    lt_cv_sys_max_cmd_len=102400
-+    ;;
-+  sysv5* | sco5v6* | sysv4.2uw2*)
-+    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
-+    if test -n "$kargmax"; then
-+      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[	 ]]//'`
-+    else
-+      lt_cv_sys_max_cmd_len=32768
-+    fi
-+    ;;
-+  *)
-+    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-+    if test -n "$lt_cv_sys_max_cmd_len"; then
-+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-+    else
-+      # Make teststring a little bigger before we do anything with it.
-+      # a 1K string should be a reasonable start.
-+      for i in 1 2 3 4 5 6 7 8 ; do
-+        teststring=$teststring$teststring
-+      done
-+      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-+      # If test is not a shell built-in, we'll probably end up computing a
-+      # maximum length that is only half of the actual maximum length, but
-+      # we can't tell.
-+      while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
-+	         = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
-+	      test $i != 17 # 1/2 MB should be enough
-+      do
-+        i=`expr $i + 1`
-+        teststring=$teststring$teststring
-+      done
-+      # Only check the string length outside the loop.
-+      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
-+      teststring=
-+      # Add a significant safety factor because C++ compilers can tack on
-+      # massive amounts of additional arguments before passing them to the
-+      # linker.  It appears as though 1/2 is a usable value.
-+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-+    fi
-+    ;;
-+  esac
-+])
-+if test -n $lt_cv_sys_max_cmd_len ; then
-+  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
-+else
-+  AC_MSG_RESULT(none)
-+fi
-+max_cmd_len=$lt_cv_sys_max_cmd_len
-+_LT_DECL([], [max_cmd_len], [0],
-+    [What is the maximum length of a command?])
-+])# LT_CMD_MAX_LEN
- 
--# Obsolete macros:
--AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)])
--AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
--AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
--AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
-+# Old name:
-+AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN])
- dnl aclocal-1.4 backwards compatibility:
--dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
--dnl AC_DEFUN([AC_LIBTOOL_F77], [])
--dnl AC_DEFUN([AC_LIBTOOL_FC], [])
--dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
-+dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], [])
- 
- 
--# _LT_TAG_COMPILER
-+# _LT_HEADER_DLFCN
- # ----------------
--m4_defun([_LT_TAG_COMPILER],
--[AC_REQUIRE([AC_PROG_CC])dnl
--
--_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl
--_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl
--_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl
--_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl
-+m4_defun([_LT_HEADER_DLFCN],
-+[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl
-+])# _LT_HEADER_DLFCN
- 
--# If no C compiler was specified, use CC.
--LTCC=${LTCC-"$CC"}
- 
--# If no C compiler flags were specified, use CFLAGS.
--LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-+# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
-+#                      ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
-+# ----------------------------------------------------------------
-+m4_defun([_LT_TRY_DLOPEN_SELF],
-+[m4_require([_LT_HEADER_DLFCN])dnl
-+if test "$cross_compiling" = yes; then :
-+  [$4]
-+else
-+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-+  lt_status=$lt_dlunknown
-+  cat > conftest.$ac_ext <<_LT_EOF
-+[#line __oline__ "configure"
-+#include "confdefs.h"
- 
--# Allow CC to be a program name with arguments.
--compiler=$CC
--])# _LT_TAG_COMPILER
-+#if HAVE_DLFCN_H
-+#include <dlfcn.h>
-+#endif
- 
-+#include <stdio.h>
- 
--# _LT_COMPILER_BOILERPLATE
--# ------------------------
--# Check for compiler boilerplate output or warnings with
--# the simple compiler test code.
--m4_defun([_LT_COMPILER_BOILERPLATE],
--[m4_require([_LT_DECL_SED])dnl
--ac_outfile=conftest.$ac_objext
--echo "$lt_simple_compile_test_code" >conftest.$ac_ext
--eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
--_lt_compiler_boilerplate=`cat conftest.err`
--$RM conftest*
--])# _LT_COMPILER_BOILERPLATE
-+#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
- 
--# _LT_LINKER_BOILERPLATE
--# ----------------------
--# Check for linker boilerplate output or warnings with
--# the simple link test code.
--m4_defun([_LT_LINKER_BOILERPLATE],
--[m4_require([_LT_DECL_SED])dnl
--ac_outfile=conftest.$ac_objext
--echo "$lt_simple_link_test_code" >conftest.$ac_ext
--eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
--_lt_linker_boilerplate=`cat conftest.err`
--$RM -r conftest*
--])# _LT_LINKER_BOILERPLATE
-+void fnord() { int i=42;}
-+int main ()
-+{
-+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-+  int status = $lt_dlunknown;
-+
-+  if (self)
-+    {
-+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-+      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-+      /* dlclose (self); */
-+    }
-+  else
-+    puts (dlerror ());
-+
-+  return status;
-+}]
-+_LT_EOF
-+  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
-+    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
-+    lt_status=$?
-+    case x$lt_status in
-+      x$lt_dlno_uscore) $1 ;;
-+      x$lt_dlneed_uscore) $2 ;;
-+      x$lt_dlunknown|x*) $3 ;;
-+    esac
-+  else :
-+    # compilation failed
-+    $3
-+  fi
-+fi
-+rm -fr conftest*
-+])# _LT_TRY_DLOPEN_SELF
-+
-+
-+# LT_SYS_DLOPEN_SELF
-+# ------------------
-+AC_DEFUN([LT_SYS_DLOPEN_SELF],
-+[m4_require([_LT_HEADER_DLFCN])dnl
-+if test "x$enable_dlopen" != xyes; then
-+  enable_dlopen=unknown
-+  enable_dlopen_self=unknown
-+  enable_dlopen_self_static=unknown
-+else
-+  lt_cv_dlopen=no
-+  lt_cv_dlopen_libs=
- 
--# _LT_REQUIRED_DARWIN_CHECKS
--# -------------------------
--m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
-   case $host_os in
--    rhapsody* | darwin*)
--    AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
--    AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
--    AC_CHECK_TOOL([LIPO], [lipo], [:])
--    AC_CHECK_TOOL([OTOOL], [otool], [:])
--    AC_CHECK_TOOL([OTOOL64], [otool64], [:])
--    _LT_DECL([], [DSYMUTIL], [1],
--      [Tool to manipulate archived DWARF debug symbol files on Mac OS X])
--    _LT_DECL([], [NMEDIT], [1],
--      [Tool to change global to local symbols on Mac OS X])
--    _LT_DECL([], [LIPO], [1],
--      [Tool to manipulate fat objects and archives on Mac OS X])
--    _LT_DECL([], [OTOOL], [1],
--      [ldd/readelf like tool for Mach-O binaries on Mac OS X])
--    _LT_DECL([], [OTOOL64], [1],
--      [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4])
-+  beos*)
-+    lt_cv_dlopen="load_add_on"
-+    lt_cv_dlopen_libs=
-+    lt_cv_dlopen_self=yes
-+    ;;
- 
--    AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
--      [lt_cv_apple_cc_single_mod=no
--      if test -z "${LT_MULTI_MODULE}"; then
--	# By default we will add the -single_module flag. You can override
--	# by either setting the environment variable LT_MULTI_MODULE
--	# non-empty at configure time, or by adding -multi_module to the
--	# link flags.
--	rm -rf libconftest.dylib*
--	echo "int foo(void){return 1;}" > conftest.c
--	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
---dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD
--	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
--	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
--        _lt_result=$?
--	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
--	  lt_cv_apple_cc_single_mod=yes
--	else
--	  cat conftest.err >&AS_MESSAGE_LOG_FD
--	fi
--	rm -rf libconftest.dylib*
--	rm -f conftest.*
--      fi])
--    AC_CACHE_CHECK([for -exported_symbols_list linker flag],
--      [lt_cv_ld_exported_symbols_list],
--      [lt_cv_ld_exported_symbols_list=no
--      save_LDFLAGS=$LDFLAGS
--      echo "_main" > conftest.sym
--      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
--      AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
--	[lt_cv_ld_exported_symbols_list=yes],
--	[lt_cv_ld_exported_symbols_list=no])
--	LDFLAGS="$save_LDFLAGS"
--    ])
--    case $host_os in
--    rhapsody* | darwin1.[[012]])
--      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
--    darwin1.*)
--      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
--    darwin*) # darwin 5.x on
--      # if running on 10.5 or later, the deployment target defaults
--      # to the OS version, if on x86, and 10.4, the deployment
--      # target defaults to 10.4. Don't you love it?
--      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
--	10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
--	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
--	10.[[012]]*)
--	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
--	10.*)
--	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
--      esac
-+  mingw* | pw32* | cegcc*)
-+    lt_cv_dlopen="LoadLibrary"
-+    lt_cv_dlopen_libs=
-     ;;
--  esac
--    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
--      _lt_dar_single_mod='$single_module'
--    fi
--    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
--      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
--    else
--      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
--    fi
--    if test "$DSYMUTIL" != ":"; then
--      _lt_dsymutil='~$DSYMUTIL $lib || :'
--    else
--      _lt_dsymutil=
--    fi
-+
-+  cygwin*)
-+    lt_cv_dlopen="dlopen"
-+    lt_cv_dlopen_libs=
-     ;;
--  esac
--])
- 
-+  darwin*)
-+  # if libdl is installed we need to link against it
-+    AC_CHECK_LIB([dl], [dlopen],
-+		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
-+    lt_cv_dlopen="dyld"
-+    lt_cv_dlopen_libs=
-+    lt_cv_dlopen_self=yes
-+    ])
-+    ;;
- 
--# _LT_DARWIN_LINKER_FEATURES
--# --------------------------
--# Checks for linker and compiler features on darwin
--m4_defun([_LT_DARWIN_LINKER_FEATURES],
--[
--  m4_require([_LT_REQUIRED_DARWIN_CHECKS])
--  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
--  _LT_TAGVAR(hardcode_direct, $1)=no
--  _LT_TAGVAR(hardcode_automatic, $1)=yes
--  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
--  _LT_TAGVAR(whole_archive_flag_spec, $1)=''
--  _LT_TAGVAR(link_all_deplibs, $1)=yes
--  _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
--  case $cc_basename in
--     ifort*) _lt_dar_can_shared=yes ;;
--     *) _lt_dar_can_shared=$GCC ;;
-+  *)
-+    AC_CHECK_FUNC([shl_load],
-+	  [lt_cv_dlopen="shl_load"],
-+      [AC_CHECK_LIB([dld], [shl_load],
-+	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
-+	[AC_CHECK_FUNC([dlopen],
-+	      [lt_cv_dlopen="dlopen"],
-+	  [AC_CHECK_LIB([dl], [dlopen],
-+		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
-+	    [AC_CHECK_LIB([svld], [dlopen],
-+		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
-+	      [AC_CHECK_LIB([dld], [dld_link],
-+		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
-+	      ])
-+	    ])
-+	  ])
-+	])
-+      ])
-+    ;;
-   esac
--  if test "$_lt_dar_can_shared" = "yes"; then
--    output_verbose_link_cmd=echo
--    _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
--    _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
--    _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
--    _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
--    m4_if([$1], [CXX],
--[   if test "$lt_cv_apple_cc_single_mod" != "yes"; then
--      _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
--      _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
--    fi
--],[])
-+
-+  if test "x$lt_cv_dlopen" != xno; then
-+    enable_dlopen=yes
-   else
--  _LT_TAGVAR(ld_shlibs, $1)=no
-+    enable_dlopen=no
-   fi
--])
- 
--# _LT_SYS_MODULE_PATH_AIX
--# -----------------------
--# Links a minimal program and checks the executable
--# for the system default hardcoded library path. In most cases,
--# this is /usr/lib:/lib, but when the MPI compilers are used
--# the location of the communication and MPI libs are included too.
--# If we don't find anything, use the default library path according
--# to the aix ld manual.
--m4_defun([_LT_SYS_MODULE_PATH_AIX],
--[m4_require([_LT_DECL_SED])dnl
--AC_LINK_IFELSE(AC_LANG_PROGRAM,[
--lt_aix_libpath_sed='
--    /Import File Strings/,/^$/ {
--	/^0/ {
--	    s/^0  *\(.*\)$/\1/
--	    p
--	}
--    }'
--aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
--# Check for a 64-bit object if we didn't find anything.
--if test -z "$aix_libpath"; then
--  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
--fi],[])
--if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
--])# _LT_SYS_MODULE_PATH_AIX
-+  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\"
- 
--# _LT_SHELL_INIT(ARG)
--# -------------------
--m4_define([_LT_SHELL_INIT],
--[ifdef([AC_DIVERSION_NOTICE],
--	     [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
--	 [AC_DIVERT_PUSH(NOTICE)])
--$1
--AC_DIVERT_POP
--])# _LT_SHELL_INIT
-+    save_LIBS="$LIBS"
-+    LIBS="$lt_cv_dlopen_libs $LIBS"
- 
-+    AC_CACHE_CHECK([whether a program can dlopen itself],
-+	  lt_cv_dlopen_self, [dnl
-+	  _LT_TRY_DLOPEN_SELF(
-+	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
-+	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
-+    ])
- 
--# _LT_PROG_ECHO_BACKSLASH
--# -----------------------
--# Add some code to the start of the generated configure script which
--# will find an echo command which doesn't interpret backslashes.
--m4_defun([_LT_PROG_ECHO_BACKSLASH],
--[_LT_SHELL_INIT([
--# Check that we are running under the correct shell.
--SHELL=${CONFIG_SHELL-/bin/sh}
-+    if test "x$lt_cv_dlopen_self" = xyes; then
-+      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-+      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
-+	  lt_cv_dlopen_self_static, [dnl
-+	  _LT_TRY_DLOPEN_SELF(
-+	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
-+	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
-+      ])
-+    fi
- 
--case X$lt_ECHO in
--X*--fallback-echo)
--  # Remove one level of quotation (which was required for Make).
--  ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
--  ;;
--esac
-+    CPPFLAGS="$save_CPPFLAGS"
-+    LDFLAGS="$save_LDFLAGS"
-+    LIBS="$save_LIBS"
-+    ;;
-+  esac
- 
--ECHO=${lt_ECHO-echo}
--if test "X[$]1" = X--no-reexec; then
--  # Discard the --no-reexec flag, and continue.
--  shift
--elif test "X[$]1" = X--fallback-echo; then
--  # Avoid inline document here, it may be left over
--  :
--elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
--  # Yippee, $ECHO works!
--  :
--else
--  # Restart under the correct shell.
--  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
--fi
-+  case $lt_cv_dlopen_self in
-+  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-+  *) enable_dlopen_self=unknown ;;
-+  esac
- 
--if test "X[$]1" = X--fallback-echo; then
--  # used as fallback echo
--  shift
--  cat <<_LT_EOF
--[$]*
--_LT_EOF
--  exit 0
-+  case $lt_cv_dlopen_self_static in
-+  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-+  *) enable_dlopen_self_static=unknown ;;
-+  esac
- fi
-+_LT_DECL([dlopen_support], [enable_dlopen], [0],
-+	 [Whether dlopen is supported])
-+_LT_DECL([dlopen_self], [enable_dlopen_self], [0],
-+	 [Whether dlopen of programs is supported])
-+_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0],
-+	 [Whether dlopen of statically linked programs is supported])
-+])# LT_SYS_DLOPEN_SELF
- 
--# 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
-+# Old name:
-+AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF])
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [])
- 
--if test -z "$lt_ECHO"; then
--  if test "X${echo_test_string+set}" != Xset; then
--    # find a string as large as possible, as long as the shell can cope with it
--    for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
--      # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
--      if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
--	 { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
--      then
--        break
--      fi
--    done
--  fi
- 
--  if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
--     echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
--     test "X$echo_testing_string" = "X$echo_test_string"; then
--    :
--  else
--    # The Solaris, AIX, and Digital Unix default echo programs unquote
--    # backslashes.  This makes it impossible to quote backslashes using
--    #   echo "$something" | sed 's/\\/\\\\/g'
--    #
--    # So, first we look for a working echo in the user's PATH.
-+# _LT_COMPILER_C_O([TAGNAME])
-+# ---------------------------
-+# Check to see if options -c and -o are simultaneously supported by compiler.
-+# This macro does not hard code the compiler like AC_PROG_CC_C_O.
-+m4_defun([_LT_COMPILER_C_O],
-+[m4_require([_LT_DECL_SED])dnl
-+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-+m4_require([_LT_TAG_COMPILER])dnl
-+AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
-+  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
-+  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
-+   $RM -r conftest 2>/dev/null
-+   mkdir conftest
-+   cd conftest
-+   mkdir out
-+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- 
--    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
--    for dir in $PATH /usr/ucb; do
--      IFS="$lt_save_ifs"
--      if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
--         test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
--         echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
--         test "X$echo_testing_string" = "X$echo_test_string"; then
--        ECHO="$dir/echo"
--        break
--      fi
--    done
--    IFS="$lt_save_ifs"
-+   lt_compiler_flag="-o out/conftest2.$ac_objext"
-+   # Insert the option either (1) after the last *FLAGS variable, or
-+   # (2) before a word containing "conftest.", or (3) at the end.
-+   # Note that $ac_compile itself does not contain backslashes and begins
-+   # with a dollar sign (not a hyphen), so the echo should work correctly.
-+   lt_compile=`echo "$ac_compile" | $SED \
-+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-+   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-+   -e 's:$: $lt_compiler_flag:'`
-+   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-+   (eval "$lt_compile" 2>out/conftest.err)
-+   ac_status=$?
-+   cat out/conftest.err >&AS_MESSAGE_LOG_FD
-+   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-+   then
-+     # The compiler can only warn and ignore the option if not recognized
-+     # So say no if there are warnings
-+     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
-+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-+       _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-+     fi
-+   fi
-+   chmod u+w . 2>&AS_MESSAGE_LOG_FD
-+   $RM conftest*
-+   # SGI C++ compiler will create directory out/ii_files/ for
-+   # template instantiation
-+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
-+   $RM out/* && rmdir out
-+   cd ..
-+   $RM -r conftest
-+   $RM conftest*
-+])
-+_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1],
-+	[Does compiler simultaneously support -c and -o options?])
-+])# _LT_COMPILER_C_O
- 
--    if test "X$ECHO" = Xecho; then
--      # We didn't find a better echo, so look for alternatives.
--      if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
--         echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
--         test "X$echo_testing_string" = "X$echo_test_string"; then
--        # This shell has a builtin print -r that does the trick.
--        ECHO='print -r'
--      elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
--	   test "X$CONFIG_SHELL" != X/bin/ksh; then
--        # If we have ksh, try running configure again with it.
--        ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
--        export ORIGINAL_CONFIG_SHELL
--        CONFIG_SHELL=/bin/ksh
--        export CONFIG_SHELL
--        exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
--      else
--        # Try using printf.
--        ECHO='printf %s\n'
--        if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
--	   echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
--	   test "X$echo_testing_string" = "X$echo_test_string"; then
--	  # Cool, printf works
--	  :
--        elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
--	     test "X$echo_testing_string" = 'X\t' &&
--	     echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
--	     test "X$echo_testing_string" = "X$echo_test_string"; then
--	  CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
--	  export CONFIG_SHELL
--	  SHELL="$CONFIG_SHELL"
--	  export SHELL
--	  ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
--        elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
--	     test "X$echo_testing_string" = 'X\t' &&
--	     echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
--	     test "X$echo_testing_string" = "X$echo_test_string"; then
--	  ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
--        else
--	  # maybe with a smaller string...
--	  prev=:
- 
--	  for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
--	    if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
--	    then
--	      break
--	    fi
--	    prev="$cmd"
--	  done
-+# _LT_COMPILER_FILE_LOCKS([TAGNAME])
-+# ----------------------------------
-+# Check to see if we can do hard links to lock some files if needed
-+m4_defun([_LT_COMPILER_FILE_LOCKS],
-+[m4_require([_LT_ENABLE_LOCK])dnl
-+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-+_LT_COMPILER_C_O([$1])
- 
--	  if test "$prev" != 'sed 50q "[$]0"'; then
--	    echo_test_string=`eval $prev`
--	    export echo_test_string
--	    exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
--	  else
--	    # Oops.  We lost completely, so just stick with echo.
--	    ECHO=echo
--	  fi
--        fi
--      fi
--    fi
-+hard_links="nottested"
-+if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
-+  # do not overwrite the value of need_locks provided by the user
-+  AC_MSG_CHECKING([if we can lock with hard links])
-+  hard_links=yes
-+  $RM conftest*
-+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-+  touch conftest.a
-+  ln conftest.a conftest.b 2>&5 || hard_links=no
-+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-+  AC_MSG_RESULT([$hard_links])
-+  if test "$hard_links" = no; then
-+    AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
-+    need_locks=warn
-   fi
-+else
-+  need_locks=no
- fi
-+_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?])
-+])# _LT_COMPILER_FILE_LOCKS
- 
--# Copy echo and quote the copy suitably for passing to libtool from
--# the Makefile, instead of quoting the original, which is used later.
--lt_ECHO=$ECHO
--if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
--   lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
--fi
--
--AC_SUBST(lt_ECHO)
--])
--_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
--_LT_DECL([], [ECHO], [1],
--    [An echo program that does not interpret backslashes])
--])# _LT_PROG_ECHO_BACKSLASH
--
--
--# _LT_ENABLE_LOCK
--# ---------------
--m4_defun([_LT_ENABLE_LOCK],
--[AC_ARG_ENABLE([libtool-lock],
--  [AS_HELP_STRING([--disable-libtool-lock],
--    [avoid locking (might break parallel builds)])])
--test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
- 
--# Some flags need to be propagated to the compiler or linker for good
--# libtool support.
--case $host in
--ia64-*-hpux*)
--  # Find out which ABI we are using.
--  echo 'int i;' > conftest.$ac_ext
--  if AC_TRY_EVAL(ac_compile); then
--    case `/usr/bin/file conftest.$ac_objext` in
--      *ELF-32*)
--	HPUX_IA64_MODE="32"
--	;;
--      *ELF-64*)
--	HPUX_IA64_MODE="64"
--	;;
--    esac
--  fi
--  rm -rf conftest*
--  ;;
--*-*-irix6*)
--  # Find out which ABI we are using.
--  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
--  if AC_TRY_EVAL(ac_compile); then
--    if test "$lt_cv_prog_gnu_ld" = yes; then
--      case `/usr/bin/file conftest.$ac_objext` in
--	*32-bit*)
--	  LD="${LD-ld} -melf32bsmip"
--	  ;;
--	*N32*)
--	  LD="${LD-ld} -melf32bmipn32"
--	  ;;
--	*64-bit*)
--	  LD="${LD-ld} -melf64bmip"
--	;;
--      esac
--    else
--      case `/usr/bin/file conftest.$ac_objext` in
--	*32-bit*)
--	  LD="${LD-ld} -32"
--	  ;;
--	*N32*)
--	  LD="${LD-ld} -n32"
--	  ;;
--	*64-bit*)
--	  LD="${LD-ld} -64"
--	  ;;
--      esac
--    fi
--  fi
--  rm -rf conftest*
--  ;;
--
--x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
--s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
--  # Find out which ABI we are using.
--  echo 'int i;' > conftest.$ac_ext
--  if AC_TRY_EVAL(ac_compile); then
--    case `/usr/bin/file conftest.o` in
--      *32-bit*)
--	case $host in
--	  x86_64-*kfreebsd*-gnu)
--	    LD="${LD-ld} -m elf_i386_fbsd"
--	    ;;
--	  x86_64-*linux*)
--	    LD="${LD-ld} -m elf_i386"
--	    ;;
--	  ppc64-*linux*|powerpc64-*linux*)
--	    LD="${LD-ld} -m elf32ppclinux"
--	    ;;
--	  s390x-*linux*)
--	    LD="${LD-ld} -m elf_s390"
--	    ;;
--	  sparc64-*linux*)
--	    LD="${LD-ld} -m elf32_sparc"
--	    ;;
--	esac
--	;;
--      *64-bit*)
--	case $host in
--	  x86_64-*kfreebsd*-gnu)
--	    LD="${LD-ld} -m elf_x86_64_fbsd"
--	    ;;
--	  x86_64-*linux*)
--	    LD="${LD-ld} -m elf_x86_64"
--	    ;;
--	  ppc*-*linux*|powerpc*-*linux*)
--	    LD="${LD-ld} -m elf64ppc"
--	    ;;
--	  s390*-*linux*|s390*-*tpf*)
--	    LD="${LD-ld} -m elf64_s390"
--	    ;;
--	  sparc*-*linux*)
--	    LD="${LD-ld} -m elf64_sparc"
--	    ;;
--	esac
--	;;
--    esac
--  fi
--  rm -rf conftest*
--  ;;
--
--*-*-sco3.2v5*)
--  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
--  SAVE_CFLAGS="$CFLAGS"
--  CFLAGS="$CFLAGS -belf"
--  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
--    [AC_LANG_PUSH(C)
--     AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
--     AC_LANG_POP])
--  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
--    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
--    CFLAGS="$SAVE_CFLAGS"
--  fi
--  ;;
--sparc*-*solaris*)
--  # Find out which ABI we are using.
--  echo 'int i;' > conftest.$ac_ext
--  if AC_TRY_EVAL(ac_compile); then
--    case `/usr/bin/file conftest.o` in
--    *64-bit*)
--      case $lt_cv_prog_gnu_ld in
--      yes*) LD="${LD-ld} -m elf64_sparc" ;;
--      *)
--	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
--	  LD="${LD-ld} -64"
--	fi
--	;;
--      esac
--      ;;
--    esac
--  fi
--  rm -rf conftest*
--  ;;
--esac
--
--need_locks="$enable_libtool_lock"
--])# _LT_ENABLE_LOCK
-+# _LT_CHECK_OBJDIR
-+# ----------------
-+m4_defun([_LT_CHECK_OBJDIR],
-+[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
-+[rm -f .libs 2>/dev/null
-+mkdir .libs 2>/dev/null
-+if test -d .libs; then
-+  lt_cv_objdir=.libs
-+else
-+  # MS-DOS does not allow filenames that begin with a dot.
-+  lt_cv_objdir=_libs
-+fi
-+rmdir .libs 2>/dev/null])
-+objdir=$lt_cv_objdir
-+_LT_DECL([], [objdir], [0],
-+         [The name of the directory that contains temporary libtool files])dnl
-+m4_pattern_allow([LT_OBJDIR])dnl
-+AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/",
-+  [Define to the sub-directory in which libtool stores uninstalled libraries.])
-+])# _LT_CHECK_OBJDIR
- 
- 
--# _LT_CMD_OLD_ARCHIVE
--# -------------------
--m4_defun([_LT_CMD_OLD_ARCHIVE],
--[AC_CHECK_TOOL(AR, ar, false)
--test -z "$AR" && AR=ar
--test -z "$AR_FLAGS" && AR_FLAGS=cru
--_LT_DECL([], [AR], [1], [The archiver])
--_LT_DECL([], [AR_FLAGS], [1])
-+# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME])
-+# --------------------------------------
-+# Check hardcoding attributes.
-+m4_defun([_LT_LINKER_HARDCODE_LIBPATH],
-+[AC_MSG_CHECKING([how to hardcode library paths into programs])
-+_LT_TAGVAR(hardcode_action, $1)=
-+if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" ||
-+   test -n "$_LT_TAGVAR(runpath_var, $1)" ||
-+   test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
- 
--AC_CHECK_TOOL(STRIP, strip, :)
--test -z "$STRIP" && STRIP=:
--_LT_DECL([], [STRIP], [1], [A symbol stripping program])
-+  # We can hardcode non-existent directories.
-+  if test "$_LT_TAGVAR(hardcode_direct, $1)" != no &&
-+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-+     # have to relink, otherwise we might link with an installed library
-+     # when we should be linking with a yet-to-be-installed one
-+     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
-+     test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then
-+    # Linking always hardcodes the temporary library directory.
-+    _LT_TAGVAR(hardcode_action, $1)=relink
-+  else
-+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-+    _LT_TAGVAR(hardcode_action, $1)=immediate
-+  fi
-+else
-+  # We cannot hardcode anything, or else we can only hardcode existing
-+  # directories.
-+  _LT_TAGVAR(hardcode_action, $1)=unsupported
-+fi
-+AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)])
- 
--AC_CHECK_TOOL(RANLIB, ranlib, :)
--test -z "$RANLIB" && RANLIB=:
--_LT_DECL([], [RANLIB], [1],
--    [Commands used to install an old-style archive])
-+if test "$_LT_TAGVAR(hardcode_action, $1)" = relink ||
-+   test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then
-+  # Fast installation is not supported
-+  enable_fast_install=no
-+elif test "$shlibpath_overrides_runpath" = yes ||
-+     test "$enable_shared" = no; then
-+  # Fast installation is not necessary
-+  enable_fast_install=needless
-+fi
-+_LT_TAGDECL([], [hardcode_action], [0],
-+    [How to hardcode a shared library path into an executable])
-+])# _LT_LINKER_HARDCODE_LIBPATH
- 
--# Determine commands to create old-style static archives.
--old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
--old_postinstall_cmds='chmod 644 $oldlib'
--old_postuninstall_cmds=
- 
--if test -n "$RANLIB"; then
-+# _LT_CMD_STRIPLIB
-+# ----------------
-+m4_defun([_LT_CMD_STRIPLIB],
-+[m4_require([_LT_DECL_EGREP])
-+striplib=
-+old_striplib=
-+AC_MSG_CHECKING([whether stripping libraries is possible])
-+if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
-+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-+  AC_MSG_RESULT([yes])
-+else
-+# FIXME - insert some real tests, host_os isn't really good enough
-   case $host_os in
--  openbsd*)
--    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
-+  darwin*)
-+    if test -n "$STRIP" ; then
-+      striplib="$STRIP -x"
-+      old_striplib="$STRIP -S"
-+      AC_MSG_RESULT([yes])
-+    else
-+      AC_MSG_RESULT([no])
-+    fi
-     ;;
-   *)
--    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
-+    AC_MSG_RESULT([no])
-     ;;
-   esac
--  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
- fi
--_LT_DECL([], [old_postinstall_cmds], [2])
--_LT_DECL([], [old_postuninstall_cmds], [2])
--_LT_TAGDECL([], [old_archive_cmds], [2],
--    [Commands used to build an old-style archive])
--])# _LT_CMD_OLD_ARCHIVE
--
--
--# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
--#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
--# ----------------------------------------------------------------
--# Check whether the given compiler option works
--AC_DEFUN([_LT_COMPILER_OPTION],
--[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
--m4_require([_LT_DECL_SED])dnl
--AC_CACHE_CHECK([$1], [$2],
--  [$2=no
--   m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
--   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
--   lt_compiler_flag="$3"
--   # Insert the option either (1) after the last *FLAGS variable, or
--   # (2) before a word containing "conftest.", or (3) at the end.
--   # Note that $ac_compile itself does not contain backslashes and begins
--   # with a dollar sign (not a hyphen), so the echo should work correctly.
--   # The option is referenced via a variable to avoid confusing sed.
--   lt_compile=`echo "$ac_compile" | $SED \
--   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
--   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
--   -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
--   (eval "$lt_compile" 2>conftest.err)
--   ac_status=$?
--   cat conftest.err >&AS_MESSAGE_LOG_FD
--   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
--   if (exit $ac_status) && test -s "$ac_outfile"; then
--     # The compiler can only warn and ignore the option if not recognized
--     # So say no if there are warnings other than the usual output.
--     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
--     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
--     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
--       $2=yes
--     fi
--   fi
--   $RM conftest*
--])
--
--if test x"[$]$2" = xyes; then
--    m4_if([$5], , :, [$5])
--else
--    m4_if([$6], , :, [$6])
--fi
--])# _LT_COMPILER_OPTION
--
--# Old name:
--AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION])
--dnl aclocal-1.4 backwards compatibility:
--dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [])
--
--
--# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
--#                  [ACTION-SUCCESS], [ACTION-FAILURE])
--# ----------------------------------------------------
--# Check whether the given linker option works
--AC_DEFUN([_LT_LINKER_OPTION],
--[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
--m4_require([_LT_DECL_SED])dnl
--AC_CACHE_CHECK([$1], [$2],
--  [$2=no
--   save_LDFLAGS="$LDFLAGS"
--   LDFLAGS="$LDFLAGS $3"
--   echo "$lt_simple_link_test_code" > conftest.$ac_ext
--   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
--     # The linker can only warn and ignore the option if not recognized
--     # So say no if there are warnings
--     if test -s conftest.err; then
--       # Append any errors to the config.log.
--       cat conftest.err 1>&AS_MESSAGE_LOG_FD
--       $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
--       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
--       if diff conftest.exp conftest.er2 >/dev/null; then
--         $2=yes
--       fi
--     else
--       $2=yes
--     fi
--   fi
--   $RM -r conftest*
--   LDFLAGS="$save_LDFLAGS"
--])
--
--if test x"[$]$2" = xyes; then
--    m4_if([$4], , :, [$4])
--else
--    m4_if([$5], , :, [$5])
--fi
--])# _LT_LINKER_OPTION
--
--# Old name:
--AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION])
--dnl aclocal-1.4 backwards compatibility:
--dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], [])
--
--
--# LT_CMD_MAX_LEN
--#---------------
--AC_DEFUN([LT_CMD_MAX_LEN],
--[AC_REQUIRE([AC_CANONICAL_HOST])dnl
--# find the maximum length of command line arguments
--AC_MSG_CHECKING([the maximum length of command line arguments])
--AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
--  i=0
--  teststring="ABCD"
--
--  case $build_os in
--  msdosdjgpp*)
--    # On DJGPP, this test can blow up pretty badly due to problems in libc
--    # (any single argument exceeding 2000 bytes causes a buffer overrun
--    # during glob expansion).  Even if it were fixed, the result of this
--    # check would be larger than it should be.
--    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
--    ;;
--
--  gnu*)
--    # Under GNU Hurd, this test is not required because there is
--    # no limit to the length of command line arguments.
--    # Libtool will interpret -1 as no limit whatsoever
--    lt_cv_sys_max_cmd_len=-1;
--    ;;
--
--  cygwin* | mingw* | cegcc*)
--    # On Win9x/ME, this test blows up -- it succeeds, but takes
--    # about 5 minutes as the teststring grows exponentially.
--    # Worse, since 9x/ME are not pre-emptively multitasking,
--    # you end up with a "frozen" computer, even though with patience
--    # the test eventually succeeds (with a max line length of 256k).
--    # Instead, let's just punt: use the minimum linelength reported by
--    # all of the supported platforms: 8192 (on NT/2K/XP).
--    lt_cv_sys_max_cmd_len=8192;
--    ;;
--
--  amigaos*)
--    # On AmigaOS with pdksh, this test takes hours, literally.
--    # So we just punt and use a minimum line length of 8192.
--    lt_cv_sys_max_cmd_len=8192;
--    ;;
--
--  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
--    # This has been around since 386BSD, at least.  Likely further.
--    if test -x /sbin/sysctl; then
--      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
--    elif test -x /usr/sbin/sysctl; then
--      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
--    else
--      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
--    fi
--    # And add a safety zone
--    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
--    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
--    ;;
--
--  interix*)
--    # We know the value 262144 and hardcode it with a safety zone (like BSD)
--    lt_cv_sys_max_cmd_len=196608
--    ;;
--
--  osf*)
--    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
--    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
--    # nice to cause kernel panics so lets avoid the loop below.
--    # First set a reasonable default.
--    lt_cv_sys_max_cmd_len=16384
--    #
--    if test -x /sbin/sysconfig; then
--      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
--        *1*) lt_cv_sys_max_cmd_len=-1 ;;
--      esac
--    fi
--    ;;
--  sco3.2v5*)
--    lt_cv_sys_max_cmd_len=102400
--    ;;
--  sysv5* | sco5v6* | sysv4.2uw2*)
--    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
--    if test -n "$kargmax"; then
--      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[	 ]]//'`
--    else
--      lt_cv_sys_max_cmd_len=32768
--    fi
--    ;;
--  *)
--    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
--    if test -n "$lt_cv_sys_max_cmd_len"; then
--      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
--      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
--    else
--      # Make teststring a little bigger before we do anything with it.
--      # a 1K string should be a reasonable start.
--      for i in 1 2 3 4 5 6 7 8 ; do
--        teststring=$teststring$teststring
--      done
--      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
--      # If test is not a shell built-in, we'll probably end up computing a
--      # maximum length that is only half of the actual maximum length, but
--      # we can't tell.
--      while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
--	         = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
--	      test $i != 17 # 1/2 MB should be enough
--      do
--        i=`expr $i + 1`
--        teststring=$teststring$teststring
--      done
--      # Only check the string length outside the loop.
--      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
--      teststring=
--      # Add a significant safety factor because C++ compilers can tack on
--      # massive amounts of additional arguments before passing them to the
--      # linker.  It appears as though 1/2 is a usable value.
--      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
--    fi
--    ;;
--  esac
--])
--if test -n $lt_cv_sys_max_cmd_len ; then
--  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
--else
--  AC_MSG_RESULT(none)
--fi
--max_cmd_len=$lt_cv_sys_max_cmd_len
--_LT_DECL([], [max_cmd_len], [0],
--    [What is the maximum length of a command?])
--])# LT_CMD_MAX_LEN
--
--# Old name:
--AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN])
--dnl aclocal-1.4 backwards compatibility:
--dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], [])
--
--
--# _LT_HEADER_DLFCN
--# ----------------
--m4_defun([_LT_HEADER_DLFCN],
--[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl
--])# _LT_HEADER_DLFCN
--
--
--# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
--#                      ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
--# ----------------------------------------------------------------
--m4_defun([_LT_TRY_DLOPEN_SELF],
--[m4_require([_LT_HEADER_DLFCN])dnl
--if test "$cross_compiling" = yes; then :
--  [$4]
--else
--  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
--  lt_status=$lt_dlunknown
--  cat > conftest.$ac_ext <<_LT_EOF
--[#line __oline__ "configure"
--#include "confdefs.h"
--
--#if HAVE_DLFCN_H
--#include <dlfcn.h>
--#endif
--
--#include <stdio.h>
--
--#ifdef RTLD_GLOBAL
--#  define LT_DLGLOBAL		RTLD_GLOBAL
--#else
--#  ifdef DL_GLOBAL
--#    define LT_DLGLOBAL		DL_GLOBAL
--#  else
--#    define LT_DLGLOBAL		0
--#  endif
--#endif
--
--/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
--   find out it does not work in some platform. */
--#ifndef LT_DLLAZY_OR_NOW
--#  ifdef RTLD_LAZY
--#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
--#  else
--#    ifdef DL_LAZY
--#      define LT_DLLAZY_OR_NOW		DL_LAZY
--#    else
--#      ifdef RTLD_NOW
--#        define LT_DLLAZY_OR_NOW	RTLD_NOW
--#      else
--#        ifdef DL_NOW
--#          define LT_DLLAZY_OR_NOW	DL_NOW
--#        else
--#          define LT_DLLAZY_OR_NOW	0
--#        endif
--#      endif
--#    endif
--#  endif
--#endif
--
--void fnord() { int i=42;}
--int main ()
--{
--  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
--  int status = $lt_dlunknown;
--
--  if (self)
--    {
--      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
--      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
--      /* dlclose (self); */
--    }
--  else
--    puts (dlerror ());
--
--  return status;
--}]
--_LT_EOF
--  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
--    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
--    lt_status=$?
--    case x$lt_status in
--      x$lt_dlno_uscore) $1 ;;
--      x$lt_dlneed_uscore) $2 ;;
--      x$lt_dlunknown|x*) $3 ;;
--    esac
--  else :
--    # compilation failed
--    $3
--  fi
--fi
--rm -fr conftest*
--])# _LT_TRY_DLOPEN_SELF
--
--
--# LT_SYS_DLOPEN_SELF
--# ------------------
--AC_DEFUN([LT_SYS_DLOPEN_SELF],
--[m4_require([_LT_HEADER_DLFCN])dnl
--if test "x$enable_dlopen" != xyes; then
--  enable_dlopen=unknown
--  enable_dlopen_self=unknown
--  enable_dlopen_self_static=unknown
--else
--  lt_cv_dlopen=no
--  lt_cv_dlopen_libs=
--
--  case $host_os in
--  beos*)
--    lt_cv_dlopen="load_add_on"
--    lt_cv_dlopen_libs=
--    lt_cv_dlopen_self=yes
--    ;;
--
--  mingw* | pw32* | cegcc*)
--    lt_cv_dlopen="LoadLibrary"
--    lt_cv_dlopen_libs=
--    ;;
--
--  cygwin*)
--    lt_cv_dlopen="dlopen"
--    lt_cv_dlopen_libs=
--    ;;
--
--  darwin*)
--  # if libdl is installed we need to link against it
--    AC_CHECK_LIB([dl], [dlopen],
--		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
--    lt_cv_dlopen="dyld"
--    lt_cv_dlopen_libs=
--    lt_cv_dlopen_self=yes
--    ])
--    ;;
--
--  *)
--    AC_CHECK_FUNC([shl_load],
--	  [lt_cv_dlopen="shl_load"],
--      [AC_CHECK_LIB([dld], [shl_load],
--	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
--	[AC_CHECK_FUNC([dlopen],
--	      [lt_cv_dlopen="dlopen"],
--	  [AC_CHECK_LIB([dl], [dlopen],
--		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
--	    [AC_CHECK_LIB([svld], [dlopen],
--		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
--	      [AC_CHECK_LIB([dld], [dld_link],
--		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
--	      ])
--	    ])
--	  ])
--	])
--      ])
--    ;;
--  esac
--
--  if test "x$lt_cv_dlopen" != xno; then
--    enable_dlopen=yes
--  else
--    enable_dlopen=no
--  fi
--
--  case $lt_cv_dlopen in
--  dlopen)
--    save_CPPFLAGS="$CPPFLAGS"
--    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
--
--    save_LDFLAGS="$LDFLAGS"
--    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
--
--    save_LIBS="$LIBS"
--    LIBS="$lt_cv_dlopen_libs $LIBS"
--
--    AC_CACHE_CHECK([whether a program can dlopen itself],
--	  lt_cv_dlopen_self, [dnl
--	  _LT_TRY_DLOPEN_SELF(
--	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
--	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
--    ])
--
--    if test "x$lt_cv_dlopen_self" = xyes; then
--      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
--      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
--	  lt_cv_dlopen_self_static, [dnl
--	  _LT_TRY_DLOPEN_SELF(
--	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
--	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
--      ])
--    fi
--
--    CPPFLAGS="$save_CPPFLAGS"
--    LDFLAGS="$save_LDFLAGS"
--    LIBS="$save_LIBS"
--    ;;
--  esac
--
--  case $lt_cv_dlopen_self in
--  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
--  *) enable_dlopen_self=unknown ;;
--  esac
--
--  case $lt_cv_dlopen_self_static in
--  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
--  *) enable_dlopen_self_static=unknown ;;
--  esac
--fi
--_LT_DECL([dlopen_support], [enable_dlopen], [0],
--	 [Whether dlopen is supported])
--_LT_DECL([dlopen_self], [enable_dlopen_self], [0],
--	 [Whether dlopen of programs is supported])
--_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0],
--	 [Whether dlopen of statically linked programs is supported])
--])# LT_SYS_DLOPEN_SELF
--
--# Old name:
--AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF])
--dnl aclocal-1.4 backwards compatibility:
--dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [])
--
--
--# _LT_COMPILER_C_O([TAGNAME])
--# ---------------------------
--# Check to see if options -c and -o are simultaneously supported by compiler.
--# This macro does not hard code the compiler like AC_PROG_CC_C_O.
--m4_defun([_LT_COMPILER_C_O],
--[m4_require([_LT_DECL_SED])dnl
--m4_require([_LT_FILEUTILS_DEFAULTS])dnl
--m4_require([_LT_TAG_COMPILER])dnl
--AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
--  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
--  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
--   $RM -r conftest 2>/dev/null
--   mkdir conftest
--   cd conftest
--   mkdir out
--   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
--
--   lt_compiler_flag="-o out/conftest2.$ac_objext"
--   # Insert the option either (1) after the last *FLAGS variable, or
--   # (2) before a word containing "conftest.", or (3) at the end.
--   # Note that $ac_compile itself does not contain backslashes and begins
--   # with a dollar sign (not a hyphen), so the echo should work correctly.
--   lt_compile=`echo "$ac_compile" | $SED \
--   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
--   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
--   -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
--   (eval "$lt_compile" 2>out/conftest.err)
--   ac_status=$?
--   cat out/conftest.err >&AS_MESSAGE_LOG_FD
--   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
--   if (exit $ac_status) && test -s out/conftest2.$ac_objext
--   then
--     # The compiler can only warn and ignore the option if not recognized
--     # So say no if there are warnings
--     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
--     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
--     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
--       _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
--     fi
--   fi
--   chmod u+w . 2>&AS_MESSAGE_LOG_FD
--   $RM conftest*
--   # SGI C++ compiler will create directory out/ii_files/ for
--   # template instantiation
--   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
--   $RM out/* && rmdir out
--   cd ..
--   $RM -r conftest
--   $RM conftest*
--])
--_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1],
--	[Does compiler simultaneously support -c and -o options?])
--])# _LT_COMPILER_C_O
--
--
--# _LT_COMPILER_FILE_LOCKS([TAGNAME])
--# ----------------------------------
--# Check to see if we can do hard links to lock some files if needed
--m4_defun([_LT_COMPILER_FILE_LOCKS],
--[m4_require([_LT_ENABLE_LOCK])dnl
--m4_require([_LT_FILEUTILS_DEFAULTS])dnl
--_LT_COMPILER_C_O([$1])
--
--hard_links="nottested"
--if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
--  # do not overwrite the value of need_locks provided by the user
--  AC_MSG_CHECKING([if we can lock with hard links])
--  hard_links=yes
--  $RM conftest*
--  ln conftest.a conftest.b 2>/dev/null && hard_links=no
--  touch conftest.a
--  ln conftest.a conftest.b 2>&5 || hard_links=no
--  ln conftest.a conftest.b 2>/dev/null && hard_links=no
--  AC_MSG_RESULT([$hard_links])
--  if test "$hard_links" = no; then
--    AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
--    need_locks=warn
--  fi
--else
--  need_locks=no
--fi
--_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?])
--])# _LT_COMPILER_FILE_LOCKS
--
--
--# _LT_CHECK_OBJDIR
--# ----------------
--m4_defun([_LT_CHECK_OBJDIR],
--[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
--[rm -f .libs 2>/dev/null
--mkdir .libs 2>/dev/null
--if test -d .libs; then
--  lt_cv_objdir=.libs
--else
--  # MS-DOS does not allow filenames that begin with a dot.
--  lt_cv_objdir=_libs
--fi
--rmdir .libs 2>/dev/null])
--objdir=$lt_cv_objdir
--_LT_DECL([], [objdir], [0],
--         [The name of the directory that contains temporary libtool files])dnl
--m4_pattern_allow([LT_OBJDIR])dnl
--AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/",
--  [Define to the sub-directory in which libtool stores uninstalled libraries.])
--])# _LT_CHECK_OBJDIR
--
--
--# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME])
--# --------------------------------------
--# Check hardcoding attributes.
--m4_defun([_LT_LINKER_HARDCODE_LIBPATH],
--[AC_MSG_CHECKING([how to hardcode library paths into programs])
--_LT_TAGVAR(hardcode_action, $1)=
--if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" ||
--   test -n "$_LT_TAGVAR(runpath_var, $1)" ||
--   test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
--
--  # We can hardcode non-existent directories.
--  if test "$_LT_TAGVAR(hardcode_direct, $1)" != no &&
--     # If the only mechanism to avoid hardcoding is shlibpath_var, we
--     # have to relink, otherwise we might link with an installed library
--     # when we should be linking with a yet-to-be-installed one
--     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
--     test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then
--    # Linking always hardcodes the temporary library directory.
--    _LT_TAGVAR(hardcode_action, $1)=relink
--  else
--    # We can link without hardcoding, and we can hardcode nonexisting dirs.
--    _LT_TAGVAR(hardcode_action, $1)=immediate
--  fi
--else
--  # We cannot hardcode anything, or else we can only hardcode existing
--  # directories.
--  _LT_TAGVAR(hardcode_action, $1)=unsupported
--fi
--AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)])
--
--if test "$_LT_TAGVAR(hardcode_action, $1)" = relink ||
--   test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then
--  # Fast installation is not supported
--  enable_fast_install=no
--elif test "$shlibpath_overrides_runpath" = yes ||
--     test "$enable_shared" = no; then
--  # Fast installation is not necessary
--  enable_fast_install=needless
--fi
--_LT_TAGDECL([], [hardcode_action], [0],
--    [How to hardcode a shared library path into an executable])
--])# _LT_LINKER_HARDCODE_LIBPATH
--
--
--# _LT_CMD_STRIPLIB
--# ----------------
--m4_defun([_LT_CMD_STRIPLIB],
--[m4_require([_LT_DECL_EGREP])
--striplib=
--old_striplib=
--AC_MSG_CHECKING([whether stripping libraries is possible])
--if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
--  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
--  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
--  AC_MSG_RESULT([yes])
--else
--# FIXME - insert some real tests, host_os isn't really good enough
--  case $host_os in
--  darwin*)
--    if test -n "$STRIP" ; then
--      striplib="$STRIP -x"
--      old_striplib="$STRIP -S"
--      AC_MSG_RESULT([yes])
--    else
--      AC_MSG_RESULT([no])
--    fi
--    ;;
--  *)
--    AC_MSG_RESULT([no])
--    ;;
--  esac
--fi
--_LT_DECL([], [old_striplib], [1], [Commands to strip libraries])
--_LT_DECL([], [striplib], [1])
--])# _LT_CMD_STRIPLIB
-+_LT_DECL([], [old_striplib], [1], [Commands to strip libraries])
-+_LT_DECL([], [striplib], [1])
-+])# _LT_CMD_STRIPLIB
- 
- 
- # _LT_SYS_DYNAMIC_LINKER([TAG])
-@@ -3442,7 +2460,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
-@@ -3482,6 +2500,18 @@
-   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
-@@ -4069,11 +3099,11 @@
-   ;;
- 
- # This must be Linux ELF.
--linux* | k*bsd*-gnu)
-+linux* | k*bsd*-gnu | kopensolaris*-gnu)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
--netbsd*)
-+netbsd* | netbsdelf*-gnu)
-   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-     lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-   else
-@@ -4690,7 +3720,7 @@
- 	    ;;
- 	esac
- 	;;
--      linux* | k*bsd*-gnu)
-+      linux* | k*bsd*-gnu | kopensolaris*-gnu)
- 	case $cc_basename in
- 	  KCC*)
- 	    # KAI C++ Compiler
-@@ -4754,7 +3784,7 @@
- 	    ;;
- 	esac
- 	;;
--      netbsd*)
-+      netbsd* | netbsdelf*-gnu)
- 	;;
-       *qnx* | *nto*)
-         # QNX uses GNU C++, but need to define -shared option too, otherwise
-@@ -4974,7 +4004,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*)
-@@ -5179,6 +4209,9 @@
-   cygwin* | mingw* | cegcc*)
-     _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
-   ;;
-+  linux* | k*bsd*-gnu)
-+    _LT_TAGVAR(link_all_deplibs, $1)=no
-+  ;;
-   *)
-     _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-   ;;
-@@ -5227,65 +4260,432 @@
- dnl Note also adjust exclude_expsyms for C++ above.
-   extract_expsyms_cmds=
- 
--  case $host_os in
--  cygwin* | mingw* | pw32* | cegcc*)
--    # FIXME: the MSVC++ port hasn't been tested in a loooong time
--    # When not using gcc, we currently assume that we are using
--    # Microsoft Visual C++.
--    if test "$GCC" != yes; then
--      with_gnu_ld=no
--    fi
--    ;;
--  interix*)
--    # we just hope/assume this is gcc and not c89 (= MSVC++)
--    with_gnu_ld=yes
--    ;;
--  openbsd*)
--    with_gnu_ld=no
--    ;;
--  esac
-+  case $host_os in
-+  cygwin* | mingw* | pw32* | cegcc*)
-+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-+    # When not using gcc, we currently assume that we are using
-+    # Microsoft Visual C++.
-+    if test "$GCC" != yes; then
-+      with_gnu_ld=no
-+    fi
-+    ;;
-+  interix*)
-+    # we just hope/assume this is gcc and not c89 (= MSVC++)
-+    with_gnu_ld=yes
-+    ;;
-+  openbsd*)
-+    with_gnu_ld=no
-+    ;;
-+  linux* | k*bsd*-gnu)
-+    _LT_TAGVAR(link_all_deplibs, $1)=no
-+    ;;
-+  esac
-+
-+  _LT_TAGVAR(ld_shlibs, $1)=yes
-+  if test "$with_gnu_ld" = yes; then
-+    # If archive_cmds runs LD, not CC, wlarc should be empty
-+    wlarc='${wl}'
-+
-+    # Set some defaults for GNU ld with shared library support. These
-+    # are reset later if shared libraries are not supported. Putting them
-+    # here allows them to be overridden if necessary.
-+    runpath_var=LD_RUN_PATH
-+    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-+    # ancient GNU ld didn't support --whole-archive et. al.
-+    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
-+      _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+    else
-+      _LT_TAGVAR(whole_archive_flag_spec, $1)=
-+    fi
-+    supports_anon_versioning=no
-+    case `$LD -v 2>&1` in
-+      *GNU\ gold*) supports_anon_versioning=yes ;;
-+      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
-+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-+      *\ 2.11.*) ;; # other 2.11 versions
-+      *) supports_anon_versioning=yes ;;
-+    esac
-+
-+    # See if GNU ld supports shared libraries.
-+    case $host_os in
-+    aix[[3-9]]*)
-+      # On AIX/PPC, the GNU linker is very broken
-+      if test "$host_cpu" != ia64; then
-+	_LT_TAGVAR(ld_shlibs, $1)=no
-+	cat <<_LT_EOF 1>&2
-+
-+*** Warning: the GNU linker, at least up to release 2.9.1, is reported
-+*** to be unable to reliably create shared libraries on AIX.
-+*** Therefore, libtool is disabling shared libraries support.  If you
-+*** really care for shared libraries, you may want to modify your PATH
-+*** so that a non-GNU linker is found, and then restart.
-+
-+_LT_EOF
-+      fi
-+      ;;
-+
-+    amigaos*)
-+      case $host_cpu in
-+      powerpc)
-+            # see comment about AmigaOS4 .so support
-+            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+            _LT_TAGVAR(archive_expsym_cmds, $1)=''
-+        ;;
-+      m68k)
-+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-+            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+            _LT_TAGVAR(hardcode_minus_L, $1)=yes
-+        ;;
-+      esac
-+      ;;
-+
-+    beos*)
-+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-+	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
-+	# support --undefined.  This deserves some investigation.  FIXME
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+      else
-+	_LT_TAGVAR(ld_shlibs, $1)=no
-+      fi
-+      ;;
-+
-+    cygwin* | mingw* | pw32* | cegcc*)
-+      # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-+      # as there is no search path for DLLs.
-+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-+      _LT_TAGVAR(always_export_symbols, $1)=no
-+      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
-+
-+      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-+	# If the export-symbols file already is a .def file (1st line
-+	# is EXPORTS), use it as is; otherwise, prepend...
-+	_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-+	  cp $export_symbols $output_objdir/$soname.def;
-+	else
-+	  echo EXPORTS > $output_objdir/$soname.def;
-+	  cat $export_symbols >> $output_objdir/$soname.def;
-+	fi~
-+	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-+      else
-+	_LT_TAGVAR(ld_shlibs, $1)=no
-+      fi
-+      ;;
-+
-+    interix[[3-9]]*)
-+      _LT_TAGVAR(hardcode_direct, $1)=no
-+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-+      # Instead, shared libraries are loaded at an image base (0x10000000 by
-+      # default) and relocated if they conflict, which is a slow very memory
-+      # consuming and fragmenting process.  To avoid this, we pick a random,
-+      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-+      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-+      _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-+      ;;
-+
-+    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
-+      tmp_diet=no
-+      if test "$host_os" = linux-dietlibc; then
-+	case $cc_basename in
-+	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
-+	esac
-+      fi
-+      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
-+	 && test "$tmp_diet" = no
-+      then
-+	tmp_addflag=
-+	tmp_sharedflag='-shared'
-+	case $cc_basename,$host_cpu in
-+        pgcc*)				# Portland Group C compiler
-+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-+	  tmp_addflag=' $pic_flag'
-+	  ;;
-+	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
-+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-+	  tmp_addflag=' $pic_flag -Mnomain' ;;
-+	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
-+	  tmp_addflag=' -i_dynamic' ;;
-+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
-+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-+	ifc* | ifort*)			# Intel Fortran compiler
-+	  tmp_addflag=' -nofor_main' ;;
-+	lf95*)				# Lahey Fortran 8.1
-+	  _LT_TAGVAR(whole_archive_flag_spec, $1)=
-+	  tmp_sharedflag='--shared' ;;
-+	xl[[cC]]*)			# IBM XL C 8.0 on PPC (deal with xlf below)
-+	  tmp_sharedflag='-qmkshrobj'
-+	  tmp_addflag= ;;
-+	esac
-+	case `$CC -V 2>&1 | sed 5q` in
-+	*Sun\ C*)			# Sun C 5.9
-+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-+	  _LT_TAGVAR(compiler_needs_object, $1)=yes
-+	  tmp_sharedflag='-G' ;;
-+	*Sun\ F*)			# Sun Fortran 8.3
-+	  tmp_sharedflag='-G' ;;
-+	esac
-+	_LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+
-+        if test "x$supports_anon_versioning" = xyes; then
-+          _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-+	    cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-+	    echo "local: *; };" >> $output_objdir/$libname.ver~
-+	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+        fi
-+
-+	case $cc_basename in
-+	xlf*)
-+	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
-+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
-+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-+	  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
-+	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
-+	  if test "x$supports_anon_versioning" = xyes; then
-+	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-+	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-+	      echo "local: *; };" >> $output_objdir/$libname.ver~
-+	      $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
-+	  fi
-+	  ;;
-+	esac
-+      else
-+        _LT_TAGVAR(ld_shlibs, $1)=no
-+      fi
-+      ;;
- 
--  _LT_TAGVAR(ld_shlibs, $1)=yes
--  if test "$with_gnu_ld" = yes; then
--    # If archive_cmds runs LD, not CC, wlarc should be empty
--    wlarc='${wl}'
-+    netbsd* | netbsdelf*-gnu)
-+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-+	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-+	wlarc=
-+      else
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+      fi
-+      ;;
- 
--    # Set some defaults for GNU ld with shared library support. These
--    # are reset later if shared libraries are not supported. Putting them
--    # here allows them to be overridden if necessary.
--    runpath_var=LD_RUN_PATH
--    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
--    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
--    # ancient GNU ld didn't support --whole-archive et. al.
--    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
--      _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
--    else
--      _LT_TAGVAR(whole_archive_flag_spec, $1)=
--    fi
--    supports_anon_versioning=no
--    case `$LD -v 2>&1` in
--      *\ [[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
-+    solaris*)
-+      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
-+	_LT_TAGVAR(ld_shlibs, $1)=no
-+	cat <<_LT_EOF 1>&2
- 
--    # 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
-+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-+*** create shared libraries on Solaris systems.  Therefore, libtool
-+*** is disabling shared libraries support.  We urge you to upgrade GNU
-+*** binutils to release 2.9.1 or newer.  Another option is to modify
-+*** your PATH or compiler configuration so that the native linker is
-+*** used, and then restart.
-+
-+_LT_EOF
-+      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+      else
-+	_LT_TAGVAR(ld_shlibs, $1)=no
-+      fi
-+      ;;
-+
-+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-+      case `$LD -v 2>&1` in
-+        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
- 	_LT_TAGVAR(ld_shlibs, $1)=no
- 	cat <<_LT_EOF 1>&2
- 
--*** Warning: 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.
-+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
-+*** reliably create shared libraries on SCO systems.  Therefore, libtool
-+*** is disabling shared libraries support.  We urge you to upgrade GNU
-+*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
-+*** your PATH or compiler configuration so that the native linker is
-+*** used, and then restart.
- 
- _LT_EOF
-+	;;
-+	*)
-+	  # For security reasons, it is highly recommended that you always
-+	  # use absolute paths for naming shared libraries, and exclude the
-+	  # DT_RUNPATH tag from executables and libraries.  But doing so
-+	  # requires that you compile everything twice, which is a pain.
-+	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+	  else
-+	    _LT_TAGVAR(ld_shlibs, $1)=no
-+	  fi
-+	;;
-+      esac
-+      ;;
-+
-+    sunos4*)
-+      _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+      wlarc=
-+      _LT_TAGVAR(hardcode_direct, $1)=yes
-+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      ;;
-+
-+    *)
-+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+      else
-+	_LT_TAGVAR(ld_shlibs, $1)=no
-+      fi
-+      ;;
-+    esac
-+
-+    if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then
-+      runpath_var=
-+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-+      _LT_TAGVAR(export_dynamic_flag_spec, $1)=
-+      _LT_TAGVAR(whole_archive_flag_spec, $1)=
-+    fi
-+  else
-+    # PORTME fill in a description of your system's linker (not GNU ld)
-+    case $host_os in
-+    aix3*)
-+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-+      _LT_TAGVAR(always_export_symbols, $1)=yes
-+      _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-+      # Note: this linker hardcodes the directories in LIBPATH if there
-+      # are no directories specified by -L.
-+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-+      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
-+	# Neither direct hardcoding nor static linking is supported with a
-+	# broken collect2.
-+	_LT_TAGVAR(hardcode_direct, $1)=unsupported
-+      fi
-+      ;;
-+
-+    aix[[4-9]]*)
-+      if test "$host_cpu" = ia64; then
-+	# On IA64, the linker does run time linking by default, so we don't
-+	# have to do anything special.
-+	aix_use_runtimelinking=no
-+	exp_sym_flag='-Bexport'
-+	no_entry_flag=""
-+      else
-+	# If we're using GNU nm, then we don't want the "-C" option.
-+	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-+	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-+	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-+	else
-+	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-+	fi
-+	aix_use_runtimelinking=no
-+
-+	# Test if we are trying to use run time linking or normal
-+	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-+	# need to do runtime linking.
-+	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
-+	  for ld_flag in $LDFLAGS; do
-+	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-+	    aix_use_runtimelinking=yes
-+	    break
-+	  fi
-+	  done
-+	  ;;
-+	esac
-+
-+	exp_sym_flag='-bexport'
-+	no_entry_flag='-bnoentry'
-+      fi
-+
-+      # When large executables or shared objects are built, AIX ld can
-+      # have problems creating the table of contents.  If linking a library
-+      # or program results in "error TOC overflow" add -mminimal-toc to
-+      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-+      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-+
-+      _LT_TAGVAR(archive_cmds, $1)=''
-+      _LT_TAGVAR(hardcode_direct, $1)=yes
-+      _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-+      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-+      _LT_TAGVAR(link_all_deplibs, $1)=yes
-+      _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
-+
-+      if test "$GCC" = yes; then
-+	case $host_os in aix4.[[012]]|aix4.[[012]].*)
-+	# We only want to do this on AIX 4.2 and lower, the check
-+	# below for broken collect2 doesn't work under 4.3+
-+	  collect2name=`${CC} -print-prog-name=collect2`
-+	  if test -f "$collect2name" &&
-+	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
-+	  then
-+	  # We have reworked collect2
-+	  :
-+	  else
-+	  # We have old collect2
-+	  _LT_TAGVAR(hardcode_direct, $1)=unsupported
-+	  # It fails to find uninstalled libraries when the uninstalled
-+	  # path is not listed in the libpath.  Setting hardcode_minus_L
-+	  # to unsupported forces relinking
-+	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
-+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+	  _LT_TAGVAR(hardcode_libdir_separator, $1)=
-+	  fi
-+	  ;;
-+	esac
-+	shared_flag='-shared'
-+	if test "$aix_use_runtimelinking" = yes; then
-+	  shared_flag="$shared_flag "'${wl}-G'
-+	fi
-+	_LT_TAGVAR(link_all_deplibs, $1)=no
-+      else
-+	# not using gcc
-+	if test "$host_cpu" = ia64; then
-+	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-+	# chokes on -Wl,-G. The following line is correct:
-+	  shared_flag='-G'
-+	else
-+	  if test "$aix_use_runtimelinking" = yes; then
-+	    shared_flag='${wl}-G'
-+	  else
-+	    shared_flag='${wl}-bM:SRE'
-+	  fi
-+	fi
-+      fi
-+
-+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
-+      # It seems that -bexpall does not export symbols beginning with
-+      # underscore (_), so it is better to generate a list of symbols to export.
-+      _LT_TAGVAR(always_export_symbols, $1)=yes
-+      if test "$aix_use_runtimelinking" = yes; then
-+	# Warning - without using the other runtime loading flags (-brtl),
-+	# -berok will link without error, but may produce a broken library.
-+	_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
-+        # Determine the default libpath from the value encoded in an
-+        # empty executable.
-+        _LT_SYS_MODULE_PATH_AIX
-+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-+        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-+      else
-+	if test "$host_cpu" = ia64; then
-+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-+	  _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-+	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-+	else
-+	 # Determine the default libpath from the value encoded in an
-+	 # empty executable.
-+	 _LT_SYS_MODULE_PATH_AIX
-+	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-+	  # Warning - without using the other run time loading flags,
-+	  # -berok will link without error, but may produce a broken library.
-+	  _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-+	  _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-+	  # Exported symbols can be pulled into shared objects from archives
-+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-+	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-+	  # This is similar to how AIX traditionally builds its shared libraries.
-+	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-+	fi
-       fi
-       ;;
- 
-@@ -5304,1351 +4704,1612 @@
-       esac
-       ;;
- 
--    beos*)
--      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
--	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
--	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
--	# support --undefined.  This deserves some investigation.  FIXME
--	_LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--      else
--	_LT_TAGVAR(ld_shlibs, $1)=no
--      fi
-+    bsdi[[45]]*)
-+      _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
-       ;;
- 
-     cygwin* | mingw* | pw32* | cegcc*)
--      # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
--      # as there is no search path for DLLs.
--      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+      # When not using gcc, we currently assume that we are using
-+      # Microsoft Visual C++.
-+      # hardcode_libdir_flag_spec is actually meaningless, as there is
-+      # no search path for DLLs.
-+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-       _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
--      _LT_TAGVAR(always_export_symbols, $1)=no
-+      # Tell ltmain to make .lib files, not .a files.
-+      libext=lib
-+      # Tell ltmain to make .dll files, not .so files.
-+      shrext_cmds=".dll"
-+      # FIXME: Setting linknames here is a bad hack.
-+      _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
-+      # The linker will automatically build a .lib file if we build a DLL.
-+      _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
-+      # FIXME: Should let the user specify the lib program.
-+      _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
-+      _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
-       _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
--      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
-+      ;;
- 
--      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
--        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
--	# If the export-symbols file already is a .def file (1st line
--	# is EXPORTS), use it as is; otherwise, prepend...
--	_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
--	  cp $export_symbols $output_objdir/$soname.def;
--	else
--	  echo EXPORTS > $output_objdir/$soname.def;
--	  cat $export_symbols >> $output_objdir/$soname.def;
--	fi~
--	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
--      else
--	_LT_TAGVAR(ld_shlibs, $1)=no
--      fi
-+    darwin* | rhapsody*)
-+      _LT_DARWIN_LINKER_FEATURES($1)
-       ;;
- 
--    interix[[3-9]]*)
--      _LT_TAGVAR(hardcode_direct, $1)=no
-+    dgux*)
-+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
--      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+      ;;
-+
-+    freebsd1*)
-+      _LT_TAGVAR(ld_shlibs, $1)=no
-+      ;;
-+
-+    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-+    # support.  Future versions do this automatically, but an explicit c++rt0.o
-+    # does not break anything, and helps significantly (at the cost of a little
-+    # extra space).
-+    freebsd2.2*)
-+      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+      _LT_TAGVAR(hardcode_direct, $1)=yes
-+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      ;;
-+
-+    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-+    freebsd2*)
-+      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+      _LT_TAGVAR(hardcode_direct, $1)=yes
-+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      ;;
-+
-+    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-+    freebsd* | dragonfly*)
-+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+      _LT_TAGVAR(hardcode_direct, $1)=yes
-+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      ;;
-+
-+    hpux9*)
-+      if test "$GCC" = yes; then
-+	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-+      else
-+	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-+      fi
-+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+      _LT_TAGVAR(hardcode_direct, $1)=yes
-+
-+      # hardcode_minus_L: Not really in the search PATH,
-+      # but as the default location of the library.
-+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-       _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
--      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
--      # Instead, shared libraries are loaded at an image base (0x10000000 by
--      # default) and relocated if they conflict, which is a slow very memory
--      # consuming and fragmenting process.  To avoid this, we pick a random,
--      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
--      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
--      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
--      _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-       ;;
- 
--    gnu* | linux* | tpf* | k*bsd*-gnu)
--      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
-+    hpux10*)
-+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-+      else
-+	_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-       fi
--      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
--	 && test "$tmp_diet" = no
--      then
--	tmp_addflag=
--	tmp_sharedflag='-shared'
--	case $cc_basename,$host_cpu in
--        pgcc*)				# Portland Group C compiler
--	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
--	  tmp_addflag=' $pic_flag'
-+      if test "$with_gnu_ld" = no; then
-+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-+	_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-+	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+	_LT_TAGVAR(hardcode_direct, $1)=yes
-+	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+	# hardcode_minus_L: Not really in the search PATH,
-+	# but as the default location of the library.
-+	_LT_TAGVAR(hardcode_minus_L, $1)=yes
-+      fi
-+      ;;
-+
-+    hpux11*)
-+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-+	case $host_cpu in
-+	hppa*64*)
-+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	  ;;
-+	ia64*)
-+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-+	  ;;
-+	*)
-+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
- 	  ;;
--	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
--	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
--	  tmp_addflag=' $pic_flag -Mnomain' ;;
--	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
--	  tmp_addflag=' -i_dynamic' ;;
--	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
--	  tmp_addflag=' -i_dynamic -nofor_main' ;;
--	ifc* | ifort*)			# Intel Fortran compiler
--	  tmp_addflag=' -nofor_main' ;;
--	lf95*)				# Lahey Fortran 8.1
--	  _LT_TAGVAR(whole_archive_flag_spec, $1)=
--	  tmp_sharedflag='--shared' ;;
--	xl[[cC]]*)			# IBM XL C 8.0 on PPC (deal with xlf below)
--	  tmp_sharedflag='-qmkshrobj'
--	  tmp_addflag= ;;
- 	esac
--	case `$CC -V 2>&1 | sed 5q` in
--	*Sun\ C*)			# Sun C 5.9
--	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
--	  _LT_TAGVAR(compiler_needs_object, $1)=yes
--	  tmp_sharedflag='-G' ;;
--	*Sun\ F*)			# Sun Fortran 8.3
--	  tmp_sharedflag='-G' ;;
-+      else
-+	case $host_cpu in
-+	hppa*64*)
-+	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	  ;;
-+	ia64*)
-+	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-+	  ;;
-+	*)
-+	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-+	  ;;
- 	esac
--	_LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+      fi
-+      if test "$with_gnu_ld" = no; then
-+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-+	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
- 
--        if test "x$supports_anon_versioning" = xyes; then
--          _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
--	    cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
--	    echo "local: *; };" >> $output_objdir/$libname.ver~
--	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
--        fi
-+	case $host_cpu in
-+	hppa*64*|ia64*)
-+	  _LT_TAGVAR(hardcode_direct, $1)=no
-+	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+	  ;;
-+	*)
-+	  _LT_TAGVAR(hardcode_direct, $1)=yes
-+	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
- 
--	case $cc_basename in
--	xlf*)
--	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
--	  _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
--	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
--	  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
--	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
--	  if test "x$supports_anon_versioning" = xyes; then
--	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
--	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
--	      echo "local: *; };" >> $output_objdir/$libname.ver~
--	      $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
--	  fi
-+	  # hardcode_minus_L: Not really in the search PATH,
-+	  # but as the default location of the library.
-+	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
- 	  ;;
- 	esac
-+      fi
-+      ;;
-+
-+    irix5* | irix6* | nonstopux*)
-+      if test "$GCC" = yes; then
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+	# Try to use the -exported_symbol ld option, if it does not
-+	# work, assume that -exports_file does not work either and
-+	# implicitly export all symbols.
-+        save_LDFLAGS="$LDFLAGS"
-+        LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
-+        AC_LINK_IFELSE(int foo(void) {},
-+          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
-+        )
-+        LDFLAGS="$save_LDFLAGS"
-       else
--        _LT_TAGVAR(ld_shlibs, $1)=no
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
-       fi
-+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+      _LT_TAGVAR(inherit_rpath, $1)=yes
-+      _LT_TAGVAR(link_all_deplibs, $1)=yes
-       ;;
- 
--    netbsd*)
-+    netbsd* | netbsdelf*-gnu)
-       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
--	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
--	wlarc=
-+	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-       else
--	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+	_LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-       fi
-+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+      _LT_TAGVAR(hardcode_direct, $1)=yes
-+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-       ;;
- 
--    solaris*)
--      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
--	_LT_TAGVAR(ld_shlibs, $1)=no
--	cat <<_LT_EOF 1>&2
-+    newsos6)
-+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+      _LT_TAGVAR(hardcode_direct, $1)=yes
-+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      ;;
- 
--*** 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.
-+    *nto* | *qnx*)
-+      ;;
- 
--_LT_EOF
--      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
--	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+    openbsd*)
-+      if test -f /usr/libexec/ld.so; then
-+	_LT_TAGVAR(hardcode_direct, $1)=yes
-+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-+	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+	else
-+	  case $host_os in
-+	   openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
-+	     _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+	     ;;
-+	   *)
-+	     _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+	     ;;
-+	  esac
-+	fi
-       else
- 	_LT_TAGVAR(ld_shlibs, $1)=no
-       fi
-       ;;
- 
--    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
--      case `$LD -v 2>&1` in
--        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
--	_LT_TAGVAR(ld_shlibs, $1)=no
--	cat <<_LT_EOF 1>&2
--
--*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
--*** reliably create shared libraries on SCO systems.  Therefore, libtool
--*** is disabling shared libraries support.  We urge you to upgrade GNU
--*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
--*** your PATH or compiler configuration so that the native linker is
--*** used, and then restart.
--
--_LT_EOF
--	;;
--	*)
--	  # For security reasons, it is highly recommended that you always
--	  # use absolute paths for naming shared libraries, and exclude the
--	  # DT_RUNPATH tag from executables and libraries.  But doing so
--	  # requires that you compile everything twice, which is a pain.
--	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
--	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
--	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
--	  else
--	    _LT_TAGVAR(ld_shlibs, $1)=no
--	  fi
--	;;
--      esac
--      ;;
--
--    sunos4*)
--      _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
--      wlarc=
--      _LT_TAGVAR(hardcode_direct, $1)=yes
--      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+    os2*)
-+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-+      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-+      _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-       ;;
- 
--    *)
--      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
--	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+    osf3*)
-+      if test "$GCC" = yes; then
-+	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-       else
--	_LT_TAGVAR(ld_shlibs, $1)=no
-+	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-       fi
-+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-       ;;
--    esac
- 
--    if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then
--      runpath_var=
--      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
--      _LT_TAGVAR(export_dynamic_flag_spec, $1)=
--      _LT_TAGVAR(whole_archive_flag_spec, $1)=
--    fi
--  else
--    # PORTME fill in a description of your system's linker (not GNU ld)
--    case $host_os in
--    aix3*)
--      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
--      _LT_TAGVAR(always_export_symbols, $1)=yes
--      _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
--      # Note: this linker hardcodes the directories in LIBPATH if there
--      # are no directories specified by -L.
--      _LT_TAGVAR(hardcode_minus_L, $1)=yes
--      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
--	# Neither direct hardcoding nor static linking is supported with a
--	# broken collect2.
--	_LT_TAGVAR(hardcode_direct, $1)=unsupported
-+    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-+      if test "$GCC" = yes; then
-+	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+      else
-+	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-+	_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-+	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
-+
-+	# Both c and cxx compiler support -rpath directly
-+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-       fi
-+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-       ;;
- 
--    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=""
-+    solaris*)
-+      _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
-+      if test "$GCC" = yes; then
-+	wlarc='${wl}'
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-+	  $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-       else
--	# If we're using GNU nm, then we don't want the "-C" option.
--	# -C means demangle to AIX nm, but means don't demangle with GNU nm
--	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
--	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-+	case `$CC -V 2>&1` in
-+	*"Compilers 5.0"*)
-+	  wlarc=''
-+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-+	  $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
-+	  ;;
-+	*)
-+	  wlarc='${wl}'
-+	  _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
-+	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-+	  $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-+	  ;;
-+	esac
-+      fi
-+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      case $host_os in
-+      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-+      *)
-+	# The compiler driver will combine and reorder linker options,
-+	# but understands `-z linker_flag'.  GCC discards it without `$wl',
-+	# but is careful enough not to reorder.
-+	# Supported since Solaris 2.6 (maybe 2.5.1?)
-+	if test "$GCC" = yes; then
-+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
- 	else
--	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
- 	fi
--	aix_use_runtimelinking=no
-+	;;
-+      esac
-+      _LT_TAGVAR(link_all_deplibs, $1)=yes
-+      ;;
- 
--	# 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
-+    sunos4*)
-+      if test "x$host_vendor" = xsequent; then
-+	# Use $CC to link under sequent, because it throws in some extra .o
-+	# files that make .init and .fini sections work.
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-+      else
-+	_LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-+      fi
-+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+      _LT_TAGVAR(hardcode_direct, $1)=yes
-+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      ;;
-+
-+    sysv4)
-+      case $host_vendor in
-+	sni)
-+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+	  _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true???
-+	;;
-+	siemens)
-+	  ## LD is ld it makes a PLAMLIB
-+	  ## CC just makes a GrossModule.
-+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-+	  _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
-+	  _LT_TAGVAR(hardcode_direct, $1)=no
-+        ;;
-+	motorola)
-+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+	  _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
-+	;;
-+      esac
-+      runpath_var='LD_RUN_PATH'
-+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      ;;
- 
--	exp_sym_flag='-bexport'
--	no_entry_flag='-bnoentry'
-+    sysv4.3*)
-+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
-+      ;;
-+
-+    sysv4*MP*)
-+      if test -d /usr/nec; then
-+	_LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+	runpath_var=LD_RUN_PATH
-+	hardcode_runpath_var=yes
-+	_LT_TAGVAR(ld_shlibs, $1)=yes
-       fi
-+      ;;
- 
--      # 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.
-+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
-+      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      runpath_var='LD_RUN_PATH'
- 
--      _LT_TAGVAR(archive_cmds, $1)=''
--      _LT_TAGVAR(hardcode_direct, $1)=yes
--      _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-+      if test "$GCC" = yes; then
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+      else
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+      fi
-+      ;;
-+
-+    sysv5* | sco3.2v5* | sco5v6*)
-+      # Note: We can NOT use -z defs as we might desire, because we do not
-+      # link with -lc, and that would cause any symbols used from libc to
-+      # always be unresolved, which means just about no library would
-+      # ever link correctly.  If we're not using GNU ld we use -z text
-+      # though, which does catch some bad symbols but isn't as heavy-handed
-+      # as -z defs.
-+      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-+      _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
-+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
-       _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-       _LT_TAGVAR(link_all_deplibs, $1)=yes
--      _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
-+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
-+      runpath_var='LD_RUN_PATH'
- 
-       if test "$GCC" = yes; then
--	case $host_os in aix4.[[012]]|aix4.[[012]].*)
--	# We only want to do this on AIX 4.2 and lower, the check
--	# below for broken collect2 doesn't work under 4.3+
--	  collect2name=`${CC} -print-prog-name=collect2`
--	  if test -f "$collect2name" &&
--	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
--	  then
--	  # We have reworked collect2
--	  :
--	  else
--	  # We have old collect2
--	  _LT_TAGVAR(hardcode_direct, $1)=unsupported
--	  # It fails to find uninstalled libraries when the uninstalled
--	  # path is not listed in the libpath.  Setting hardcode_minus_L
--	  # to unsupported forces relinking
--	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
--	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
--	  _LT_TAGVAR(hardcode_libdir_separator, $1)=
--	  fi
--	  ;;
--	esac
--	shared_flag='-shared'
--	if test "$aix_use_runtimelinking" = yes; then
--	  shared_flag="$shared_flag "'${wl}-G'
--	fi
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-       else
--	# 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
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-       fi
-+      ;;
- 
--      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
--      # It seems that -bexpall does not export symbols beginning with
--      # underscore (_), so it is better to generate a list of symbols to export.
--      _LT_TAGVAR(always_export_symbols, $1)=yes
--      if test "$aix_use_runtimelinking" = yes; then
--	# Warning - without using the other runtime loading flags (-brtl),
--	# -berok will link without error, but may produce a broken library.
--	_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
--        # Determine the default libpath from the value encoded in an
--        # empty executable.
--        _LT_SYS_MODULE_PATH_AIX
--        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
--        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
--      else
--	if test "$host_cpu" = ia64; then
--	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
--	  _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
--	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
--	else
--	 # Determine the default libpath from the value encoded in an
--	 # empty executable.
--	 _LT_SYS_MODULE_PATH_AIX
--	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
--	  # Warning - without using the other run time loading flags,
--	  # -berok will link without error, but may produce a broken library.
--	  _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
--	  _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
--	  # Exported symbols can be pulled into shared objects from archives
--	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
--	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
--	  # This is similar to how AIX traditionally builds its shared libraries.
--	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
--	fi
--      fi
-+    uts4*)
-+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-       ;;
- 
--    amigaos*)
--      case $host_cpu in
--      powerpc)
--            # see comment about AmigaOS4 .so support
--            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--            _LT_TAGVAR(archive_expsym_cmds, $1)=''
--        ;;
--      m68k)
--            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
--            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
--            _LT_TAGVAR(hardcode_minus_L, $1)=yes
--        ;;
--      esac
-+    *)
-+      _LT_TAGVAR(ld_shlibs, $1)=no
-       ;;
-+    esac
- 
--    bsdi[[45]]*)
--      _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
-+    if test x$host_vendor = xsni; then
-+      case $host in
-+      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym'
-+	;;
-+      esac
-+    fi
-+  fi
-+])
-+AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
-+test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-+
-+_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld
-+
-+_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl
-+_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl
-+_LT_DECL([], [extract_expsyms_cmds], [2],
-+    [The commands to extract the exported symbol list from a shared archive])
-+
-+#
-+# Do we need to explicitly link libc?
-+#
-+case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in
-+x|xyes)
-+  # Assume -lc should be added
-+  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-+
-+  if test "$enable_shared" = yes && test "$GCC" = yes; then
-+    case $_LT_TAGVAR(archive_cmds, $1) in
-+    *'~'*)
-+      # FIXME: we may have to deal with multi-command sequences.
-       ;;
-+    '$CC '*)
-+      # Test whether the compiler implicitly links with -lc since on some
-+      # systems, -lgcc has to come before -lc. If gcc already passes -lc
-+      # to ld, don't add -lc before -lgcc.
-+      AC_MSG_CHECKING([whether -lc should be explicitly linked in])
-+      $RM conftest*
-+      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- 
--    cygwin* | mingw* | pw32* | cegcc*)
--      # When not using gcc, we currently assume that we are using
--      # Microsoft Visual C++.
--      # hardcode_libdir_flag_spec is actually meaningless, as there is
--      # no search path for DLLs.
--      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
--      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
--      # Tell ltmain to make .lib files, not .a files.
--      libext=lib
--      # Tell ltmain to make .dll files, not .so files.
--      shrext_cmds=".dll"
--      # FIXME: Setting linknames here is a bad hack.
--      _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
--      # The linker will automatically build a .lib file if we build a DLL.
--      _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
--      # FIXME: Should let the user specify the lib program.
--      _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
--      _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
--      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-+      if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
-+        soname=conftest
-+        lib=conftest
-+        libobjs=conftest.$ac_objext
-+        deplibs=
-+        wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
-+	pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
-+        compiler_flags=-v
-+        linker_flags=-v
-+        verstring=
-+        output_objdir=.
-+        libname=conftest
-+        lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
-+        _LT_TAGVAR(allow_undefined_flag, $1)=
-+        if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
-+        then
-+	  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-+        else
-+	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-+        fi
-+        _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
-+      else
-+        cat conftest.err 1>&5
-+      fi
-+      $RM conftest*
-+      AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)])
-       ;;
-+    esac
-+  fi
-+  ;;
-+esac
-+
-+_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0],
-+    [Whether or not to add -lc for building shared libraries])
-+_LT_TAGDECL([allow_libtool_libs_with_static_runtimes],
-+    [enable_shared_with_static_runtimes], [0],
-+    [Whether or not to disallow shared libs when runtime libs are static])
-+_LT_TAGDECL([], [export_dynamic_flag_spec], [1],
-+    [Compiler flag to allow reflexive dlopens])
-+_LT_TAGDECL([], [whole_archive_flag_spec], [1],
-+    [Compiler flag to generate shared objects directly from archives])
-+_LT_TAGDECL([], [compiler_needs_object], [1],
-+    [Whether the compiler copes with passing no objects directly])
-+_LT_TAGDECL([], [old_archive_from_new_cmds], [2],
-+    [Create an old-style archive from a shared archive])
-+_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2],
-+    [Create a temporary old-style archive to link instead of a shared archive])
-+_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive])
-+_LT_TAGDECL([], [archive_expsym_cmds], [2])
-+_LT_TAGDECL([], [module_cmds], [2],
-+    [Commands used to build a loadable module if different from building
-+    a shared archive.])
-+_LT_TAGDECL([], [module_expsym_cmds], [2])
-+_LT_TAGDECL([], [with_gnu_ld], [1],
-+    [Whether we are building with GNU ld or not])
-+_LT_TAGDECL([], [allow_undefined_flag], [1],
-+    [Flag that allows shared libraries with undefined symbols to be built])
-+_LT_TAGDECL([], [no_undefined_flag], [1],
-+    [Flag that enforces no undefined symbols])
-+_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
-+    [Flag to hardcode $libdir into a binary during linking.
-+    This must work even if $libdir does not exist])
-+_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1],
-+    [[If ld is used when linking, flag to hardcode $libdir into a binary
-+    during linking.  This must work even if $libdir does not exist]])
-+_LT_TAGDECL([], [hardcode_libdir_separator], [1],
-+    [Whether we need a single "-rpath" flag with a separated argument])
-+_LT_TAGDECL([], [hardcode_direct], [0],
-+    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
-+    DIR into the resulting binary])
-+_LT_TAGDECL([], [hardcode_direct_absolute], [0],
-+    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
-+    DIR into the resulting binary and the resulting library dependency is
-+    "absolute", i.e impossible to change by setting ${shlibpath_var} if the
-+    library is relocated])
-+_LT_TAGDECL([], [hardcode_minus_L], [0],
-+    [Set to "yes" if using the -LDIR flag during linking hardcodes DIR
-+    into the resulting binary])
-+_LT_TAGDECL([], [hardcode_shlibpath_var], [0],
-+    [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
-+    into the resulting binary])
-+_LT_TAGDECL([], [hardcode_automatic], [0],
-+    [Set to "yes" if building a shared library automatically hardcodes DIR
-+    into the library and all subsequent libraries and executables linked
-+    against it])
-+_LT_TAGDECL([], [inherit_rpath], [0],
-+    [Set to yes if linker adds runtime paths of dependent libraries
-+    to runtime path list])
-+_LT_TAGDECL([], [link_all_deplibs], [0],
-+    [Whether libtool must link a program against all its dependency libraries])
-+_LT_TAGDECL([], [fix_srcfile_path], [1],
-+    [Fix the shell variable $srcfile for the compiler])
-+_LT_TAGDECL([], [always_export_symbols], [0],
-+    [Set to "yes" if exported symbols are required])
-+_LT_TAGDECL([], [export_symbols_cmds], [2],
-+    [The commands to list exported symbols])
-+_LT_TAGDECL([], [exclude_expsyms], [1],
-+    [Symbols that should not be listed in the preloaded symbols])
-+_LT_TAGDECL([], [include_expsyms], [1],
-+    [Symbols that must always be exported])
-+_LT_TAGDECL([], [prelink_cmds], [2],
-+    [Commands necessary for linking programs (against libraries) with templates])
-+_LT_TAGDECL([], [file_list_spec], [1],
-+    [Specify filename containing input files])
-+dnl FIXME: Not yet implemented
-+dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1],
-+dnl    [Compiler flag to generate thread safe objects])
-+])# _LT_LINKER_SHLIBS
- 
--    darwin* | rhapsody*)
--      _LT_DARWIN_LINKER_FEATURES($1)
--      ;;
- 
--    dgux*)
--      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
--      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
--      ;;
-+# _LT_LANG_C_CONFIG([TAG])
-+# ------------------------
-+# Ensure that the configuration variables for a C compiler are suitably
-+# defined.  These variables are subsequently used by _LT_CONFIG to write
-+# the compiler configuration to `libtool'.
-+m4_defun([_LT_LANG_C_CONFIG],
-+[m4_require([_LT_DECL_EGREP])dnl
-+lt_save_CC="$CC"
-+AC_LANG_PUSH(C)
- 
--    freebsd1*)
--      _LT_TAGVAR(ld_shlibs, $1)=no
--      ;;
-+# Source file extension for C test sources.
-+ac_ext=c
- 
--    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
--    # support.  Future versions do this automatically, but an explicit c++rt0.o
--    # does not break anything, and helps significantly (at the cost of a little
--    # extra space).
--    freebsd2.2*)
--      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
--      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
--      _LT_TAGVAR(hardcode_direct, $1)=yes
--      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
--      ;;
-+# Object file extension for compiled C test sources.
-+objext=o
-+_LT_TAGVAR(objext, $1)=$objext
- 
--    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
--    freebsd2*)
--      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
--      _LT_TAGVAR(hardcode_direct, $1)=yes
--      _LT_TAGVAR(hardcode_minus_L, $1)=yes
--      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
--      ;;
-+# Code to be used in simple compile tests
-+lt_simple_compile_test_code="int some_variable = 0;"
- 
--    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--    freebsd* | dragonfly*)
--      _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
--      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
--      _LT_TAGVAR(hardcode_direct, $1)=yes
--      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
--      ;;
-+# Code to be used in simple link tests
-+lt_simple_link_test_code='int main(){return(0);}'
- 
--    hpux9*)
--      if test "$GCC" = yes; then
--	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
--      else
--	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
--      fi
--      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
--      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
--      _LT_TAGVAR(hardcode_direct, $1)=yes
-+_LT_TAG_COMPILER
-+# Save the default compiler, since it gets overwritten when the other
-+# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
-+compiler_DEFAULT=$CC
- 
--      # hardcode_minus_L: Not really in the search PATH,
--      # but as the default location of the library.
--      _LT_TAGVAR(hardcode_minus_L, $1)=yes
--      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
--      ;;
-+# save warnings/boilerplate of simple test code
-+_LT_COMPILER_BOILERPLATE
-+_LT_LINKER_BOILERPLATE
- 
--    hpux10*)
--      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
--	_LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
--      else
--	_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
--      fi
--      if test "$with_gnu_ld" = no; then
--	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
--	_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
--	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
--	_LT_TAGVAR(hardcode_direct, $1)=yes
--	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
--	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
--	# hardcode_minus_L: Not really in the search PATH,
--	# but as the default location of the library.
--	_LT_TAGVAR(hardcode_minus_L, $1)=yes
--      fi
--      ;;
-+if test -n "$compiler"; then
-+  _LT_COMPILER_NO_RTTI($1)
-+  _LT_COMPILER_PIC($1)
-+  _LT_COMPILER_C_O($1)
-+  _LT_COMPILER_FILE_LOCKS($1)
-+  _LT_LINKER_SHLIBS($1)
-+  _LT_SYS_DYNAMIC_LINKER($1)
-+  _LT_LINKER_HARDCODE_LIBPATH($1)
-+  LT_SYS_DLOPEN_SELF
-+  _LT_CMD_STRIPLIB
- 
--    hpux11*)
--      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
--	case $host_cpu in
--	hppa*64*)
--	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
--	  ;;
--	ia64*)
--	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
--	  ;;
--	*)
--	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
--	  ;;
--	esac
--      else
--	case $host_cpu in
--	hppa*64*)
--	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
--	  ;;
--	ia64*)
--	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
--	  ;;
--	*)
--	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
--	  ;;
--	esac
--      fi
--      if test "$with_gnu_ld" = no; then
--	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
--	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+  # Report which library types will actually be built
-+  AC_MSG_CHECKING([if libtool supports shared libraries])
-+  AC_MSG_RESULT([$can_build_shared])
- 
--	case $host_cpu in
--	hppa*64*|ia64*)
--	  _LT_TAGVAR(hardcode_direct, $1)=no
--	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
--	  ;;
--	*)
--	  _LT_TAGVAR(hardcode_direct, $1)=yes
--	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
--	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+  AC_MSG_CHECKING([whether to build shared libraries])
-+  test "$can_build_shared" = "no" && enable_shared=no
- 
--	  # hardcode_minus_L: Not really in the search PATH,
--	  # but as the default location of the library.
--	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
--	  ;;
--	esac
--      fi
--      ;;
-+  # 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
-+    ;;
- 
--    irix5* | irix6* | nonstopux*)
--      if test "$GCC" = yes; then
--	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
--	# Try to use the -exported_symbol ld option, if it does not
--	# work, assume that -exports_file does not work either and
--	# implicitly export all symbols.
--        save_LDFLAGS="$LDFLAGS"
--        LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
--        AC_LINK_IFELSE(int foo(void) {},
--          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
--        )
--        LDFLAGS="$save_LDFLAGS"
--      else
--	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
--	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
--      fi
--      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
--      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
--      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
--      _LT_TAGVAR(inherit_rpath, $1)=yes
--      _LT_TAGVAR(link_all_deplibs, $1)=yes
--      ;;
-+  aix[[4-9]]*)
-+    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-+      test "$enable_shared" = yes && enable_static=no
-+    fi
-+    ;;
-+  esac
-+  AC_MSG_RESULT([$enable_shared])
- 
--    netbsd*)
--      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
--	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
--      else
--	_LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
--      fi
--      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
--      _LT_TAGVAR(hardcode_direct, $1)=yes
--      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
--      ;;
-+  AC_MSG_CHECKING([whether to build static libraries])
-+  # Make sure either enable_shared or enable_static is yes.
-+  test "$enable_shared" = yes || enable_static=yes
-+  AC_MSG_RESULT([$enable_static])
- 
--    newsos6)
--      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--      _LT_TAGVAR(hardcode_direct, $1)=yes
--      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
--      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
--      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
--      ;;
-+  _LT_CONFIG($1)
-+fi
-+AC_LANG_POP
-+CC="$lt_save_CC"
-+])# _LT_LANG_C_CONFIG
- 
--    *nto* | *qnx*)
--      ;;
- 
--    openbsd*)
--      if test -f /usr/libexec/ld.so; then
--	_LT_TAGVAR(hardcode_direct, $1)=yes
--	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
--	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
--	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
--	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
--	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
--	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
--	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
--	else
--	  case $host_os in
--	   openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
--	     _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
--	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
--	     ;;
--	   *)
--	     _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
--	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
--	     ;;
--	  esac
--	fi
--      else
--	_LT_TAGVAR(ld_shlibs, $1)=no
--      fi
--      ;;
-+# _LT_PROG_CXX
-+# ------------
-+# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++
-+# compiler, we have our own version here.
-+m4_defun([_LT_PROG_CXX],
-+[
-+pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes])
-+AC_PROG_CXX
-+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-+    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-+    (test "X$CXX" != "Xg++"))) ; then
-+  AC_PROG_CXXCPP
-+else
-+  _lt_caught_CXX_error=yes
-+fi
-+popdef([AC_MSG_ERROR])
-+])# _LT_PROG_CXX
- 
--    os2*)
--      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
--      _LT_TAGVAR(hardcode_minus_L, $1)=yes
--      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
--      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
--      _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
--      ;;
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([_LT_PROG_CXX], [])
- 
--    osf3*)
--      if test "$GCC" = yes; then
--	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
--	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
--      else
--	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
--	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
--      fi
--      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
--      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
--      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
--      ;;
- 
--    osf4* | osf5*)	# as osf3* with the addition of -msym flag
--      if test "$GCC" = yes; then
--	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
--	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
--	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
--      else
--	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
--	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
--	_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
--	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
-+# _LT_LANG_CXX_CONFIG([TAG])
-+# --------------------------
-+# Ensure that the configuration variables for a C++ compiler are suitably
-+# defined.  These variables are subsequently used by _LT_CONFIG to write
-+# the compiler configuration to `libtool'.
-+m4_defun([_LT_LANG_CXX_CONFIG],
-+[AC_REQUIRE([_LT_PROG_CXX])dnl
-+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-+m4_require([_LT_DECL_EGREP])dnl
- 
--	# Both c and cxx compiler support -rpath directly
--	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
--      fi
--      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
--      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
--      ;;
-+AC_LANG_PUSH(C++)
-+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-+_LT_TAGVAR(allow_undefined_flag, $1)=
-+_LT_TAGVAR(always_export_symbols, $1)=no
-+_LT_TAGVAR(archive_expsym_cmds, $1)=
-+_LT_TAGVAR(compiler_needs_object, $1)=no
-+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-+_LT_TAGVAR(hardcode_direct, $1)=no
-+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-+_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-+_LT_TAGVAR(hardcode_libdir_separator, $1)=
-+_LT_TAGVAR(hardcode_minus_L, $1)=no
-+_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-+_LT_TAGVAR(hardcode_automatic, $1)=no
-+_LT_TAGVAR(inherit_rpath, $1)=no
-+_LT_TAGVAR(module_cmds, $1)=
-+_LT_TAGVAR(module_expsym_cmds, $1)=
-+_LT_TAGVAR(link_all_deplibs, $1)=unknown
-+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-+_LT_TAGVAR(no_undefined_flag, $1)=
-+_LT_TAGVAR(whole_archive_flag_spec, $1)=
-+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
- 
--    solaris*)
--      _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
--      if test "$GCC" = yes; then
--	wlarc='${wl}'
--	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
--	_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
--	  $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
--      else
--	case `$CC -V 2>&1` in
--	*"Compilers 5.0"*)
--	  wlarc=''
--	  _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
--	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
--	  $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
--	  ;;
--	*)
--	  wlarc='${wl}'
--	  _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
--	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
--	  $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
--	  ;;
--	esac
--      fi
--      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
--      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
--      case $host_os in
--      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
--      *)
--	# The compiler driver will combine and reorder linker options,
--	# but understands `-z linker_flag'.  GCC discards it without `$wl',
--	# but is careful enough not to reorder.
--	# Supported since Solaris 2.6 (maybe 2.5.1?)
--	if test "$GCC" = yes; then
--	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
--	else
--	  _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
--	fi
--	;;
--      esac
--      _LT_TAGVAR(link_all_deplibs, $1)=yes
--      ;;
-+# Source file extension for C++ test sources.
-+ac_ext=cpp
- 
--    sunos4*)
--      if test "x$host_vendor" = xsequent; then
--	# Use $CC to link under sequent, because it throws in some extra .o
--	# files that make .init and .fini sections work.
--	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
--      else
--	_LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
--      fi
--      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
--      _LT_TAGVAR(hardcode_direct, $1)=yes
--      _LT_TAGVAR(hardcode_minus_L, $1)=yes
--      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
--      ;;
-+# Object file extension for compiled C++ test sources.
-+objext=o
-+_LT_TAGVAR(objext, $1)=$objext
- 
--    sysv4)
--      case $host_vendor in
--	sni)
--	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--	  _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true???
--	;;
--	siemens)
--	  ## LD is ld it makes a PLAMLIB
--	  ## CC just makes a GrossModule.
--	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
--	  _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
--	  _LT_TAGVAR(hardcode_direct, $1)=no
--        ;;
--	motorola)
--	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--	  _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
--	;;
--      esac
--      runpath_var='LD_RUN_PATH'
--      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
--      ;;
-+# No sense in running all these tests if we already determined that
-+# the CXX compiler isn't working.  Some variables (like enable_shared)
-+# are currently assumed to apply to all compilers on this platform,
-+# and will be corrupted by setting them based on a non-working compiler.
-+if test "$_lt_caught_CXX_error" != yes; then
-+  # Code to be used in simple compile tests
-+  lt_simple_compile_test_code="int some_variable = 0;"
-+
-+  # Code to be used in simple link tests
-+  lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
-+
-+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-+  _LT_TAG_COMPILER
-+
-+  # save warnings/boilerplate of simple test code
-+  _LT_COMPILER_BOILERPLATE
-+  _LT_LINKER_BOILERPLATE
-+
-+  # Allow CC to be a program name with arguments.
-+  lt_save_CC=$CC
-+  lt_save_LD=$LD
-+  lt_save_GCC=$GCC
-+  GCC=$GXX
-+  lt_save_with_gnu_ld=$with_gnu_ld
-+  lt_save_path_LD=$lt_cv_path_LD
-+  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
-+    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
-+  else
-+    $as_unset lt_cv_prog_gnu_ld
-+  fi
-+  if test -n "${lt_cv_path_LDCXX+set}"; then
-+    lt_cv_path_LD=$lt_cv_path_LDCXX
-+  else
-+    $as_unset lt_cv_path_LD
-+  fi
-+  test -z "${LDCXX+set}" || LD=$LDCXX
-+  CC=${CXX-"c++"}
-+  compiler=$CC
-+  _LT_TAGVAR(compiler, $1)=$CC
-+  _LT_CC_BASENAME([$compiler])
- 
--    sysv4.3*)
--      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
--      _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
--      ;;
-+  if test -n "$compiler"; then
-+    # We don't want -fno-exception when compiling C++ code, so set the
-+    # no_builtin_flag separately
-+    if test "$GXX" = yes; then
-+      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
-+    else
-+      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-+    fi
- 
--    sysv4*MP*)
--      if test -d /usr/nec; then
--	_LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
--	runpath_var=LD_RUN_PATH
--	hardcode_runpath_var=yes
--	_LT_TAGVAR(ld_shlibs, $1)=yes
--      fi
--      ;;
-+    if test "$GXX" = yes; then
-+      # Set up default GNU C++ configuration
- 
--    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
--      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
--      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
--      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
--      runpath_var='LD_RUN_PATH'
-+      LT_PATH_LD
- 
--      if test "$GCC" = yes; then
--	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
--	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
--      else
--	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
--	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
--      fi
--      ;;
-+      # Check if GNU C++ uses GNU ld as the underlying linker, since the
-+      # archiving commands below assume that GNU ld is being used.
-+      if test "$with_gnu_ld" = yes; then
-+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- 
--    sysv5* | sco3.2v5* | sco5v6*)
--      # Note: We can NOT use -z defs as we might desire, because we do not
--      # link with -lc, and that would cause any symbols used from libc to
--      # always be unresolved, which means just about no library would
--      # ever link correctly.  If we're not using GNU ld we use -z text
--      # though, which does catch some bad symbols but isn't as heavy-handed
--      # as -z defs.
--      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
--      _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
--      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
--      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
--      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
--      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
--      _LT_TAGVAR(link_all_deplibs, $1)=yes
--      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
--      runpath_var='LD_RUN_PATH'
-+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
- 
--      if test "$GCC" = yes; then
--	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
--	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+        # If archive_cmds runs LD, not CC, wlarc should be empty
-+        # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
-+        #     investigate it a little bit more. (MM)
-+        wlarc='${wl}'
-+
-+        # ancient GNU ld didn't support --whole-archive et. al.
-+        if eval "`$CC -print-prog-name=ld` --help 2>&1" |
-+	  $GREP 'no-whole-archive' > /dev/null; then
-+          _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+        else
-+          _LT_TAGVAR(whole_archive_flag_spec, $1)=
-+        fi
-       else
--	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
--	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
--      fi
--      ;;
-+        with_gnu_ld=no
-+        wlarc=
- 
--    uts4*)
--      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
--      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
--      ;;
-+        # A generic and very simple default shared library creation
-+        # command for GNU C++ for the case where it uses the native
-+        # linker, instead of GNU ld.  If possible, this setting should
-+        # overridden to take advantage of the native linker features on
-+        # the platform it is being used on.
-+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-+      fi
- 
--    *)
--      _LT_TAGVAR(ld_shlibs, $1)=no
--      ;;
--    esac
-+      # Commands to make compiler produce verbose output that lists
-+      # what "hidden" libraries, object files and flags are used when
-+      # linking a shared library.
-+      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
- 
--    if test x$host_vendor = xsni; then
--      case $host in
--      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
--	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym'
--	;;
--      esac
-+    else
-+      GXX=no
-+      with_gnu_ld=no
-+      wlarc=
-     fi
--  fi
--])
--AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
--test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
- 
--_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld
-+    # PORTME: fill in a description of your system's C++ link characteristics
-+    AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-+    _LT_TAGVAR(ld_shlibs, $1)=yes
-+    case $host_os in
-+      aix3*)
-+        # FIXME: insert proper C++ library support
-+        _LT_TAGVAR(ld_shlibs, $1)=no
-+        ;;
-+      aix[[4-9]]*)
-+        if test "$host_cpu" = ia64; then
-+          # On IA64, the linker does run time linking by default, so we don't
-+          # have to do anything special.
-+          aix_use_runtimelinking=no
-+          exp_sym_flag='-Bexport'
-+          no_entry_flag=""
-+        else
-+          aix_use_runtimelinking=no
- 
--_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl
--_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl
--_LT_DECL([], [extract_expsyms_cmds], [2],
--    [The commands to extract the exported symbol list from a shared archive])
-+          # Test if we are trying to use run time linking or normal
-+          # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-+          # need to do runtime linking.
-+          case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
-+	    for ld_flag in $LDFLAGS; do
-+	      case $ld_flag in
-+	      *-brtl*)
-+	        aix_use_runtimelinking=yes
-+	        break
-+	        ;;
-+	      esac
-+	    done
-+	    ;;
-+          esac
- 
--#
--# Do we need to explicitly link libc?
--#
--case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in
--x|xyes)
--  # Assume -lc should be added
--  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-+          exp_sym_flag='-bexport'
-+          no_entry_flag='-bnoentry'
-+        fi
- 
--  if test "$enable_shared" = yes && test "$GCC" = yes; then
--    case $_LT_TAGVAR(archive_cmds, $1) in
--    *'~'*)
--      # FIXME: we may have to deal with multi-command sequences.
--      ;;
--    '$CC '*)
--      # Test whether the compiler implicitly links with -lc since on some
--      # systems, -lgcc has to come before -lc. If gcc already passes -lc
--      # to ld, don't add -lc before -lgcc.
--      AC_MSG_CHECKING([whether -lc should be explicitly linked in])
--      $RM conftest*
--      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-+        # When large executables or shared objects are built, AIX ld can
-+        # have problems creating the table of contents.  If linking a library
-+        # or program results in "error TOC overflow" add -mminimal-toc to
-+        # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-+        # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
- 
--      if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
--        soname=conftest
--        lib=conftest
--        libobjs=conftest.$ac_objext
--        deplibs=
--        wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
--	pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
--        compiler_flags=-v
--        linker_flags=-v
--        verstring=
--        output_objdir=.
--        libname=conftest
--        lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
--        _LT_TAGVAR(allow_undefined_flag, $1)=
--        if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
--        then
--	  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-+        _LT_TAGVAR(archive_cmds, $1)=''
-+        _LT_TAGVAR(hardcode_direct, $1)=yes
-+        _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-+        _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-+        _LT_TAGVAR(link_all_deplibs, $1)=yes
-+        _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
-+
-+        if test "$GXX" = yes; then
-+          case $host_os in aix4.[[012]]|aix4.[[012]].*)
-+          # We only want to do this on AIX 4.2 and lower, the check
-+          # below for broken collect2 doesn't work under 4.3+
-+	  collect2name=`${CC} -print-prog-name=collect2`
-+	  if test -f "$collect2name" &&
-+	     strings "$collect2name" | $GREP resolve_lib_name >/dev/null
-+	  then
-+	    # We have reworked collect2
-+	    :
-+	  else
-+	    # We have old collect2
-+	    _LT_TAGVAR(hardcode_direct, $1)=unsupported
-+	    # It fails to find uninstalled libraries when the uninstalled
-+	    # path is not listed in the libpath.  Setting hardcode_minus_L
-+	    # to unsupported forces relinking
-+	    _LT_TAGVAR(hardcode_minus_L, $1)=yes
-+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=
-+	  fi
-+          esac
-+          shared_flag='-shared'
-+	  if test "$aix_use_runtimelinking" = yes; then
-+	    shared_flag="$shared_flag "'${wl}-G'
-+	  fi
-+        else
-+          # not using gcc
-+          if test "$host_cpu" = ia64; then
-+	  # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-+	  # chokes on -Wl,-G. The following line is correct:
-+	  shared_flag='-G'
-+          else
-+	    if test "$aix_use_runtimelinking" = yes; then
-+	      shared_flag='${wl}-G'
-+	    else
-+	      shared_flag='${wl}-bM:SRE'
-+	    fi
-+          fi
-+        fi
-+
-+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
-+        # It seems that -bexpall does not export symbols beginning with
-+        # underscore (_), so it is better to generate a list of symbols to
-+	# export.
-+        _LT_TAGVAR(always_export_symbols, $1)=yes
-+        if test "$aix_use_runtimelinking" = yes; then
-+          # Warning - without using the other runtime loading flags (-brtl),
-+          # -berok will link without error, but may produce a broken library.
-+          _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
-+          # Determine the default libpath from the value encoded in an empty
-+          # executable.
-+          _LT_SYS_MODULE_PATH_AIX
-+          _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-+
-+          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-         else
--	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-+          if test "$host_cpu" = ia64; then
-+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-+	    _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-+	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-+          else
-+	    # Determine the default libpath from the value encoded in an
-+	    # empty executable.
-+	    _LT_SYS_MODULE_PATH_AIX
-+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-+	    # Warning - without using the other run time loading flags,
-+	    # -berok will link without error, but may produce a broken library.
-+	    _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-+	    _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-+	    # Exported symbols can be pulled into shared objects from archives
-+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-+	    _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-+	    # This is similar to how AIX traditionally builds its shared
-+	    # libraries.
-+	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-+          fi
-         fi
--        _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
--      else
--        cat conftest.err 1>&5
--      fi
--      $RM conftest*
--      AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)])
--      ;;
--    esac
--  fi
--  ;;
--esac
-+        ;;
- 
--_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0],
--    [Whether or not to add -lc for building shared libraries])
--_LT_TAGDECL([allow_libtool_libs_with_static_runtimes],
--    [enable_shared_with_static_runtimes], [0],
--    [Whether or not to disallow shared libs when runtime libs are static])
--_LT_TAGDECL([], [export_dynamic_flag_spec], [1],
--    [Compiler flag to allow reflexive dlopens])
--_LT_TAGDECL([], [whole_archive_flag_spec], [1],
--    [Compiler flag to generate shared objects directly from archives])
--_LT_TAGDECL([], [compiler_needs_object], [1],
--    [Whether the compiler copes with passing no objects directly])
--_LT_TAGDECL([], [old_archive_from_new_cmds], [2],
--    [Create an old-style archive from a shared archive])
--_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2],
--    [Create a temporary old-style archive to link instead of a shared archive])
--_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive])
--_LT_TAGDECL([], [archive_expsym_cmds], [2])
--_LT_TAGDECL([], [module_cmds], [2],
--    [Commands used to build a loadable module if different from building
--    a shared archive.])
--_LT_TAGDECL([], [module_expsym_cmds], [2])
--_LT_TAGDECL([], [with_gnu_ld], [1],
--    [Whether we are building with GNU ld or not])
--_LT_TAGDECL([], [allow_undefined_flag], [1],
--    [Flag that allows shared libraries with undefined symbols to be built])
--_LT_TAGDECL([], [no_undefined_flag], [1],
--    [Flag that enforces no undefined symbols])
--_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
--    [Flag to hardcode $libdir into a binary during linking.
--    This must work even if $libdir does not exist])
--_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1],
--    [[If ld is used when linking, flag to hardcode $libdir into a binary
--    during linking.  This must work even if $libdir does not exist]])
--_LT_TAGDECL([], [hardcode_libdir_separator], [1],
--    [Whether we need a single "-rpath" flag with a separated argument])
--_LT_TAGDECL([], [hardcode_direct], [0],
--    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
--    DIR into the resulting binary])
--_LT_TAGDECL([], [hardcode_direct_absolute], [0],
--    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
--    DIR into the resulting binary and the resulting library dependency is
--    "absolute", i.e impossible to change by setting ${shlibpath_var} if the
--    library is relocated])
--_LT_TAGDECL([], [hardcode_minus_L], [0],
--    [Set to "yes" if using the -LDIR flag during linking hardcodes DIR
--    into the resulting binary])
--_LT_TAGDECL([], [hardcode_shlibpath_var], [0],
--    [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
--    into the resulting binary])
--_LT_TAGDECL([], [hardcode_automatic], [0],
--    [Set to "yes" if building a shared library automatically hardcodes DIR
--    into the library and all subsequent libraries and executables linked
--    against it])
--_LT_TAGDECL([], [inherit_rpath], [0],
--    [Set to yes if linker adds runtime paths of dependent libraries
--    to runtime path list])
--_LT_TAGDECL([], [link_all_deplibs], [0],
--    [Whether libtool must link a program against all its dependency libraries])
--_LT_TAGDECL([], [fix_srcfile_path], [1],
--    [Fix the shell variable $srcfile for the compiler])
--_LT_TAGDECL([], [always_export_symbols], [0],
--    [Set to "yes" if exported symbols are required])
--_LT_TAGDECL([], [export_symbols_cmds], [2],
--    [The commands to list exported symbols])
--_LT_TAGDECL([], [exclude_expsyms], [1],
--    [Symbols that should not be listed in the preloaded symbols])
--_LT_TAGDECL([], [include_expsyms], [1],
--    [Symbols that must always be exported])
--_LT_TAGDECL([], [prelink_cmds], [2],
--    [Commands necessary for linking programs (against libraries) with templates])
--_LT_TAGDECL([], [file_list_spec], [1],
--    [Specify filename containing input files])
--dnl FIXME: Not yet implemented
--dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1],
--dnl    [Compiler flag to generate thread safe objects])
--])# _LT_LINKER_SHLIBS
-+      beos*)
-+	if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-+	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-+	  # Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
-+	  # support --undefined.  This deserves some investigation.  FIXME
-+	  _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	else
-+	  _LT_TAGVAR(ld_shlibs, $1)=no
-+	fi
-+	;;
- 
-+      chorus*)
-+        case $cc_basename in
-+          *)
-+	  # FIXME: insert proper C++ library support
-+	  _LT_TAGVAR(ld_shlibs, $1)=no
-+	  ;;
-+        esac
-+        ;;
- 
--# _LT_LANG_C_CONFIG([TAG])
--# ------------------------
--# Ensure that the configuration variables for a C compiler are suitably
--# defined.  These variables are subsequently used by _LT_CONFIG to write
--# the compiler configuration to `libtool'.
--m4_defun([_LT_LANG_C_CONFIG],
--[m4_require([_LT_DECL_EGREP])dnl
--lt_save_CC="$CC"
--AC_LANG_PUSH(C)
-+      cygwin* | mingw* | pw32* | cegcc*)
-+        # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-+        # as there is no search path for DLLs.
-+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+        _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-+        _LT_TAGVAR(always_export_symbols, $1)=no
-+        _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
- 
--# Source file extension for C test sources.
--ac_ext=c
-+        if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-+          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-+          # If the export-symbols file already is a .def file (1st line
-+          # is EXPORTS), use it as is; otherwise, prepend...
-+          _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-+	    cp $export_symbols $output_objdir/$soname.def;
-+          else
-+	    echo EXPORTS > $output_objdir/$soname.def;
-+	    cat $export_symbols >> $output_objdir/$soname.def;
-+          fi~
-+          $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-+        else
-+          _LT_TAGVAR(ld_shlibs, $1)=no
-+        fi
-+        ;;
-+      darwin* | rhapsody*)
-+        _LT_DARWIN_LINKER_FEATURES($1)
-+	;;
- 
--# Object file extension for compiled C test sources.
--objext=o
--_LT_TAGVAR(objext, $1)=$objext
-+      dgux*)
-+        case $cc_basename in
-+          ec++*)
-+	    # FIXME: insert proper C++ library support
-+	    _LT_TAGVAR(ld_shlibs, $1)=no
-+	    ;;
-+          ghcx*)
-+	    # Green Hills C++ Compiler
-+	    # FIXME: insert proper C++ library support
-+	    _LT_TAGVAR(ld_shlibs, $1)=no
-+	    ;;
-+          *)
-+	    # FIXME: insert proper C++ library support
-+	    _LT_TAGVAR(ld_shlibs, $1)=no
-+	    ;;
-+        esac
-+        ;;
- 
--# Code to be used in simple compile tests
--lt_simple_compile_test_code="int some_variable = 0;"
-+      freebsd[[12]]*)
-+        # C++ shared libraries reported to be fairly broken before
-+	# switch to ELF
-+        _LT_TAGVAR(ld_shlibs, $1)=no
-+        ;;
- 
--# Code to be used in simple link tests
--lt_simple_link_test_code='int main(){return(0);}'
-+      freebsd-elf*)
-+        _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-+        ;;
- 
--_LT_TAG_COMPILER
--# Save the default compiler, since it gets overwritten when the other
--# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
--compiler_DEFAULT=$CC
-+      freebsd* | dragonfly*)
-+        # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-+        # conventions
-+        _LT_TAGVAR(ld_shlibs, $1)=yes
-+        ;;
- 
--# save warnings/boilerplate of simple test code
--_LT_COMPILER_BOILERPLATE
--_LT_LINKER_BOILERPLATE
-+      gnu*)
-+        ;;
- 
--if test -n "$compiler"; then
--  _LT_COMPILER_NO_RTTI($1)
--  _LT_COMPILER_PIC($1)
--  _LT_COMPILER_C_O($1)
--  _LT_COMPILER_FILE_LOCKS($1)
--  _LT_LINKER_SHLIBS($1)
--  _LT_SYS_DYNAMIC_LINKER($1)
--  _LT_LINKER_HARDCODE_LIBPATH($1)
--  LT_SYS_DLOPEN_SELF
--  _LT_CMD_STRIPLIB
-+      hpux9*)
-+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-+        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+        _LT_TAGVAR(hardcode_direct, $1)=yes
-+        _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-+				             # but as the default
-+				             # location of the library.
- 
--  # Report which library types will actually be built
--  AC_MSG_CHECKING([if libtool supports shared libraries])
--  AC_MSG_RESULT([$can_build_shared])
-+        case $cc_basename in
-+          CC*)
-+            # FIXME: insert proper C++ library support
-+            _LT_TAGVAR(ld_shlibs, $1)=no
-+            ;;
-+          aCC*)
-+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-+            # Commands to make compiler produce verbose output that lists
-+            # what "hidden" libraries, object files and flags are used when
-+            # linking a shared library.
-+            #
-+            # There doesn't appear to be a way to prevent this compiler from
-+            # explicitly linking system object files so we need to strip them
-+            # from the output so that they don't get included in the library
-+            # dependencies.
-+            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
-+            ;;
-+          *)
-+            if test "$GXX" = yes; then
-+              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-+            else
-+              # FIXME: insert proper C++ library support
-+              _LT_TAGVAR(ld_shlibs, $1)=no
-+            fi
-+            ;;
-+        esac
-+        ;;
- 
--  AC_MSG_CHECKING([whether to build shared libraries])
--  test "$can_build_shared" = "no" && enable_shared=no
-+      hpux10*|hpux11*)
-+        if test $with_gnu_ld = no; then
-+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-+	  _LT_TAGVAR(hardcode_libdir_separator, $1)=:
- 
--  # 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
--    ;;
-+          case $host_cpu in
-+            hppa*64*|ia64*)
-+              ;;
-+            *)
-+	      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+              ;;
-+          esac
-+        fi
-+        case $host_cpu in
-+          hppa*64*|ia64*)
-+            _LT_TAGVAR(hardcode_direct, $1)=no
-+            _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+            ;;
-+          *)
-+            _LT_TAGVAR(hardcode_direct, $1)=yes
-+            _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-+            _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-+					         # but as the default
-+					         # location of the library.
-+            ;;
-+        esac
- 
--  aix[[4-9]]*)
--    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
--      test "$enable_shared" = yes && enable_static=no
--    fi
--    ;;
--  esac
--  AC_MSG_RESULT([$enable_shared])
-+        case $cc_basename in
-+          CC*)
-+	    # FIXME: insert proper C++ library support
-+	    _LT_TAGVAR(ld_shlibs, $1)=no
-+	    ;;
-+          aCC*)
-+	    case $host_cpu in
-+	      hppa*64*)
-+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+	        ;;
-+	      ia64*)
-+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+	        ;;
-+	      *)
-+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+	        ;;
-+	    esac
-+	    # Commands to make compiler produce verbose output that lists
-+	    # what "hidden" libraries, object files and flags are used when
-+	    # linking a shared library.
-+	    #
-+	    # There doesn't appear to be a way to prevent this compiler from
-+	    # explicitly linking system object files so we need to strip them
-+	    # from the output so that they don't get included in the library
-+	    # dependencies.
-+	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
-+	    ;;
-+          *)
-+	    if test "$GXX" = yes; then
-+	      if test $with_gnu_ld = no; then
-+	        case $host_cpu in
-+	          hppa*64*)
-+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+	            ;;
-+	          ia64*)
-+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+	            ;;
-+	          *)
-+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+	            ;;
-+	        esac
-+	      fi
-+	    else
-+	      # FIXME: insert proper C++ library support
-+	      _LT_TAGVAR(ld_shlibs, $1)=no
-+	    fi
-+	    ;;
-+        esac
-+        ;;
- 
--  AC_MSG_CHECKING([whether to build static libraries])
--  # Make sure either enable_shared or enable_static is yes.
--  test "$enable_shared" = yes || enable_static=yes
--  AC_MSG_RESULT([$enable_static])
-+      interix[[3-9]]*)
-+	_LT_TAGVAR(hardcode_direct, $1)=no
-+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+	# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-+	# Instead, shared libraries are loaded at an image base (0x10000000 by
-+	# default) and relocated if they conflict, which is a slow very memory
-+	# consuming and fragmenting process.  To avoid this, we pick a random,
-+	# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-+	# time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-+	_LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-+	;;
-+      irix5* | irix6*)
-+        case $cc_basename in
-+          CC*)
-+	    # SGI C++
-+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
- 
--  _LT_CONFIG($1)
--fi
--AC_LANG_POP
--CC="$lt_save_CC"
--])# _LT_LANG_C_CONFIG
-+	    # Archives containing C++ object files must be created using
-+	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-+	    # necessary to make sure instantiated templates are included
-+	    # in the archive.
-+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
-+	    ;;
-+          *)
-+	    if test "$GXX" = yes; then
-+	      if test "$with_gnu_ld" = no; then
-+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+	      else
-+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib'
-+	      fi
-+	    fi
-+	    _LT_TAGVAR(link_all_deplibs, $1)=yes
-+	    ;;
-+        esac
-+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+        _LT_TAGVAR(inherit_rpath, $1)=yes
-+        ;;
- 
-+      linux* | k*bsd*-gnu | kopensolaris*-gnu)
-+        case $cc_basename in
-+          KCC*)
-+	    # Kuck and Associates, Inc. (KAI) C++ Compiler
- 
--# _LT_PROG_CXX
--# ------------
--# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++
--# compiler, we have our own version here.
--m4_defun([_LT_PROG_CXX],
--[
--pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes])
--AC_PROG_CXX
--if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
--    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
--    (test "X$CXX" != "Xg++"))) ; then
--  AC_PROG_CXXCPP
--else
--  _lt_caught_CXX_error=yes
--fi
--popdef([AC_MSG_ERROR])
--])# _LT_PROG_CXX
-+	    # KCC will only create a shared library if the output file
-+	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
-+	    # to its proper name (with version) after linking.
-+	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-+	    _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
-+	    # Commands to make compiler produce verbose output that lists
-+	    # what "hidden" libraries, object files and flags are used when
-+	    # linking a shared library.
-+	    #
-+	    # There doesn't appear to be a way to prevent this compiler from
-+	    # explicitly linking system object files so we need to strip them
-+	    # from the output so that they don't get included in the library
-+	    # dependencies.
-+	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
- 
--dnl aclocal-1.4 backwards compatibility:
--dnl AC_DEFUN([_LT_PROG_CXX], [])
-+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
- 
-+	    # Archives containing C++ object files must be created using
-+	    # "CC -Bstatic", where "CC" is the KAI C++ compiler.
-+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
-+	    ;;
-+	  icpc* | ecpc* )
-+	    # Intel C++
-+	    with_gnu_ld=yes
-+	    # version 8.0 and above of icpc choke on multiply defined symbols
-+	    # if we add $predep_objects and $postdep_objects, however 7.1 and
-+	    # earlier do not add the objects themselves.
-+	    case `$CC -V 2>&1` in
-+	      *"Version 7."*)
-+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+		;;
-+	      *)  # Version 8.0 or newer
-+	        tmp_idyn=
-+	        case $host_cpu in
-+		  ia64*) tmp_idyn=' -i_dynamic';;
-+		esac
-+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+		;;
-+	    esac
-+	    _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-+	    ;;
-+          pgCC* | pgcpp*)
-+            # Portland Group C++ compiler
-+	    case `$CC -V` in
-+	    *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*)
-+	      _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
-+		rm -rf $tpldir~
-+		$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
-+		compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
-+	      _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
-+		rm -rf $tpldir~
-+		$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
-+		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
-+		$RANLIB $oldlib'
-+	      _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
-+		rm -rf $tpldir~
-+		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-+	      _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
-+		rm -rf $tpldir~
-+		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-+	      ;;
-+	    *) # Version 6 will use weak symbols
-+	      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-+	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-+	      ;;
-+	    esac
- 
--# _LT_LANG_CXX_CONFIG([TAG])
--# --------------------------
--# Ensure that the configuration variables for a C++ compiler are suitably
--# defined.  These variables are subsequently used by _LT_CONFIG to write
--# the compiler configuration to `libtool'.
--m4_defun([_LT_LANG_CXX_CONFIG],
--[AC_REQUIRE([_LT_PROG_CXX])dnl
--m4_require([_LT_FILEUTILS_DEFAULTS])dnl
--m4_require([_LT_DECL_EGREP])dnl
-+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-+            ;;
-+	  cxx*)
-+	    # Compaq C++
-+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
- 
--AC_LANG_PUSH(C++)
--_LT_TAGVAR(archive_cmds_need_lc, $1)=no
--_LT_TAGVAR(allow_undefined_flag, $1)=
--_LT_TAGVAR(always_export_symbols, $1)=no
--_LT_TAGVAR(archive_expsym_cmds, $1)=
--_LT_TAGVAR(compiler_needs_object, $1)=no
--_LT_TAGVAR(export_dynamic_flag_spec, $1)=
--_LT_TAGVAR(hardcode_direct, $1)=no
--_LT_TAGVAR(hardcode_direct_absolute, $1)=no
--_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
--_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
--_LT_TAGVAR(hardcode_libdir_separator, $1)=
--_LT_TAGVAR(hardcode_minus_L, $1)=no
--_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
--_LT_TAGVAR(hardcode_automatic, $1)=no
--_LT_TAGVAR(inherit_rpath, $1)=no
--_LT_TAGVAR(module_cmds, $1)=
--_LT_TAGVAR(module_expsym_cmds, $1)=
--_LT_TAGVAR(link_all_deplibs, $1)=unknown
--_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
--_LT_TAGVAR(no_undefined_flag, $1)=
--_LT_TAGVAR(whole_archive_flag_spec, $1)=
--_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-+	    runpath_var=LD_RUN_PATH
-+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
- 
--# Source file extension for C++ test sources.
--ac_ext=cpp
-+	    # Commands to make compiler produce verbose output that lists
-+	    # what "hidden" libraries, object files and flags are used when
-+	    # linking a shared library.
-+	    #
-+	    # There doesn't appear to be a way to prevent this compiler from
-+	    # explicitly linking system object files so we need to strip them
-+	    # from the output so that they don't get included in the library
-+	    # dependencies.
-+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
-+	    ;;
-+	  xl*)
-+	    # IBM XL 8.0 on PPC, with GNU ld
-+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-+	    _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	    if test "x$supports_anon_versioning" = xyes; then
-+	      _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-+		cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-+		echo "local: *; };" >> $output_objdir/$libname.ver~
-+		$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+	    fi
-+	    ;;
-+	  *)
-+	    case `$CC -V 2>&1 | sed 5q` in
-+	    *Sun\ C*)
-+	      # Sun C++ 5.9
-+	      _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-+	      _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
-+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
-+	      _LT_TAGVAR(compiler_needs_object, $1)=yes
- 
--# Object file extension for compiled C++ test sources.
--objext=o
--_LT_TAGVAR(objext, $1)=$objext
-+	      # Not sure whether something based on
-+	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
-+	      # would be better.
-+	      output_verbose_link_cmd='echo'
- 
--# No sense in running all these tests if we already determined that
--# the CXX compiler isn't working.  Some variables (like enable_shared)
--# are currently assumed to apply to all compilers on this platform,
--# and will be corrupted by setting them based on a non-working compiler.
--if test "$_lt_caught_CXX_error" != yes; then
--  # Code to be used in simple compile tests
--  lt_simple_compile_test_code="int some_variable = 0;"
-+	      # Archives containing C++ object files must be created using
-+	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
-+	      # necessary to make sure instantiated templates are included
-+	      # in the archive.
-+	      _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
-+	      ;;
-+	    esac
-+	    ;;
-+	esac
-+	;;
- 
--  # Code to be used in simple link tests
--  lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
-+      lynxos*)
-+        # FIXME: insert proper C++ library support
-+	_LT_TAGVAR(ld_shlibs, $1)=no
-+	;;
- 
--  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
--  _LT_TAG_COMPILER
-+      m88k*)
-+        # FIXME: insert proper C++ library support
-+        _LT_TAGVAR(ld_shlibs, $1)=no
-+	;;
- 
--  # save warnings/boilerplate of simple test code
--  _LT_COMPILER_BOILERPLATE
--  _LT_LINKER_BOILERPLATE
-+      mvs*)
-+        case $cc_basename in
-+          cxx*)
-+	    # FIXME: insert proper C++ library support
-+	    _LT_TAGVAR(ld_shlibs, $1)=no
-+	    ;;
-+	  *)
-+	    # FIXME: insert proper C++ library support
-+	    _LT_TAGVAR(ld_shlibs, $1)=no
-+	    ;;
-+	esac
-+	;;
- 
--  # Allow CC to be a program name with arguments.
--  lt_save_CC=$CC
--  lt_save_LD=$LD
--  lt_save_GCC=$GCC
--  GCC=$GXX
--  lt_save_with_gnu_ld=$with_gnu_ld
--  lt_save_path_LD=$lt_cv_path_LD
--  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
--    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
--  else
--    $as_unset lt_cv_prog_gnu_ld
--  fi
--  if test -n "${lt_cv_path_LDCXX+set}"; then
--    lt_cv_path_LD=$lt_cv_path_LDCXX
--  else
--    $as_unset lt_cv_path_LD
--  fi
--  test -z "${LDCXX+set}" || LD=$LDCXX
--  CC=${CXX-"c++"}
--  compiler=$CC
--  _LT_TAGVAR(compiler, $1)=$CC
--  _LT_CC_BASENAME([$compiler])
-+      netbsd*)
-+        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-+	  _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
-+	  wlarc=
-+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+	  _LT_TAGVAR(hardcode_direct, $1)=yes
-+	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+	fi
-+	# Workaround some broken pre-1.5 toolchains
-+	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
-+	;;
- 
--  if test -n "$compiler"; then
--    # We don't want -fno-exception when compiling C++ code, so set the
--    # no_builtin_flag separately
--    if test "$GXX" = yes; then
--      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
--    else
--      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
--    fi
-+      *nto* | *qnx*)
-+        _LT_TAGVAR(ld_shlibs, $1)=yes
-+	;;
- 
--    if test "$GXX" = yes; then
--      # Set up default GNU C++ configuration
-+      openbsd2*)
-+        # C++ shared libraries are fairly broken
-+	_LT_TAGVAR(ld_shlibs, $1)=no
-+	;;
- 
--      LT_PATH_LD
-+      openbsd*)
-+	if test -f /usr/libexec/ld.so; then
-+	  _LT_TAGVAR(hardcode_direct, $1)=yes
-+	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+	    _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+	  fi
-+	  output_verbose_link_cmd=echo
-+	else
-+	  _LT_TAGVAR(ld_shlibs, $1)=no
-+	fi
-+	;;
- 
--      # Check if GNU C++ uses GNU ld as the underlying linker, since the
--      # archiving commands below assume that GNU ld is being used.
--      if test "$with_gnu_ld" = yes; then
--        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
--        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+      osf3* | osf4* | osf5*)
-+        case $cc_basename in
-+          KCC*)
-+	    # Kuck and Associates, Inc. (KAI) C++ Compiler
- 
--        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
--        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-+	    # KCC will only create a shared library if the output file
-+	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
-+	    # to its proper name (with version) after linking.
-+	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
- 
--        # 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}'
-+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
- 
--        # ancient GNU ld didn't support --whole-archive et. al.
--        if eval "`$CC -print-prog-name=ld` --help 2>&1" |
--	  $GREP 'no-whole-archive' > /dev/null; then
--          _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
--        else
--          _LT_TAGVAR(whole_archive_flag_spec, $1)=
--        fi
--      else
--        with_gnu_ld=no
--        wlarc=
-+	    # Archives containing C++ object files must be created using
-+	    # the KAI C++ compiler.
-+	    case $host in
-+	      osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;;
-+	      *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;;
-+	    esac
-+	    ;;
-+          RCC*)
-+	    # Rational C++ 2.4.1
-+	    # FIXME: insert proper C++ library support
-+	    _LT_TAGVAR(ld_shlibs, $1)=no
-+	    ;;
-+          cxx*)
-+	    case $host in
-+	      osf3*)
-+	        _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-+	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+		;;
-+	      *)
-+	        _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-+	        _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
-+	          echo "-hidden">> $lib.exp~
-+	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~
-+	          $RM $lib.exp'
-+	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-+		;;
-+	    esac
-+
-+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+
-+	    # Commands to make compiler produce verbose output that lists
-+	    # what "hidden" libraries, object files and flags are used when
-+	    # linking a shared library.
-+	    #
-+	    # There doesn't appear to be a way to prevent this compiler from
-+	    # explicitly linking system object files so we need to strip them
-+	    # from the output so that they don't get included in the library
-+	    # dependencies.
-+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
-+	    ;;
-+	  *)
-+	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-+	      _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-+	      case $host in
-+	        osf3*)
-+	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+		  ;;
-+	        *)
-+	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+		  ;;
-+	      esac
- 
--        # A generic and very simple default shared library creation
--        # command for GNU C++ for the case where it uses the native
--        # linker, instead of GNU ld.  If possible, this setting should
--        # overridden to take advantage of the native linker features on
--        # the platform it is being used on.
--        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
--      fi
-+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+	      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
- 
--      # Commands to make compiler produce verbose output that lists
--      # what "hidden" libraries, object files and flags are used when
--      # linking a shared library.
--      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
-+	      # 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
-+	    else
-+	      # FIXME: insert proper C++ library support
-+	      _LT_TAGVAR(ld_shlibs, $1)=no
-+	    fi
-+	    ;;
-+        esac
-+        ;;
- 
--    # PORTME: fill in a description of your system's C++ link characteristics
--    AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
--    _LT_TAGVAR(ld_shlibs, $1)=yes
--    case $host_os in
--      aix3*)
-+      psos*)
-         # FIXME: insert proper C++ library support
-         _LT_TAGVAR(ld_shlibs, $1)=no
-         ;;
--      aix[[4-9]]*)
--        if test "$host_cpu" = ia64; then
--          # On IA64, the linker does run time linking by default, so we don't
--          # have to do anything special.
--          aix_use_runtimelinking=no
--          exp_sym_flag='-Bexport'
--          no_entry_flag=""
--        else
--          aix_use_runtimelinking=no
- 
--          # Test if we are trying to use run time linking or normal
--          # AIX style linking. If -brtl is somewhere in LDFLAGS, we
--          # need to do runtime linking.
--          case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
--	    for ld_flag in $LDFLAGS; do
--	      case $ld_flag in
--	      *-brtl*)
--	        aix_use_runtimelinking=yes
--	        break
--	        ;;
--	      esac
--	    done
-+      sunos4*)
-+        case $cc_basename in
-+          CC*)
-+	    # Sun C++ 4.x
-+	    # FIXME: insert proper C++ library support
-+	    _LT_TAGVAR(ld_shlibs, $1)=no
- 	    ;;
--          esac
-+          lcc*)
-+	    # Lucid
-+	    # FIXME: insert proper C++ library support
-+	    _LT_TAGVAR(ld_shlibs, $1)=no
-+	    ;;
-+          *)
-+	    # FIXME: insert proper C++ library support
-+	    _LT_TAGVAR(ld_shlibs, $1)=no
-+	    ;;
-+        esac
-+        ;;
- 
--          exp_sym_flag='-bexport'
--          no_entry_flag='-bnoentry'
--        fi
-+      solaris*)
-+        case $cc_basename in
-+          CC*)
-+	    # Sun C++ 4.2, 5.x and Centerline C++
-+            _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
-+	    _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-+	    _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-+	      $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
- 
--        # When large executables or shared objects are built, AIX ld can
--        # have problems creating the table of contents.  If linking a library
--        # or program results in "error TOC overflow" add -mminimal-toc to
--        # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
--        # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+	    _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+	    case $host_os in
-+	      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-+	      *)
-+		# The compiler driver will combine and reorder linker options,
-+		# but understands `-z linker_flag'.
-+	        # Supported since Solaris 2.6 (maybe 2.5.1?)
-+		_LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
-+	        ;;
-+	    esac
-+	    _LT_TAGVAR(link_all_deplibs, $1)=yes
- 
--        _LT_TAGVAR(archive_cmds, $1)=''
--        _LT_TAGVAR(hardcode_direct, $1)=yes
--        _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
--        _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
--        _LT_TAGVAR(link_all_deplibs, $1)=yes
--        _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
-+	    output_verbose_link_cmd='echo'
- 
--        if test "$GXX" = yes; then
--          case $host_os in aix4.[[012]]|aix4.[[012]].*)
--          # We only want to do this on AIX 4.2 and lower, the check
--          # below for broken collect2 doesn't work under 4.3+
--	  collect2name=`${CC} -print-prog-name=collect2`
--	  if test -f "$collect2name" &&
--	     strings "$collect2name" | $GREP resolve_lib_name >/dev/null
--	  then
--	    # We have reworked collect2
--	    :
--	  else
--	    # We have old collect2
--	    _LT_TAGVAR(hardcode_direct, $1)=unsupported
--	    # It fails to find uninstalled libraries when the uninstalled
--	    # path is not listed in the libpath.  Setting hardcode_minus_L
--	    # to unsupported forces relinking
--	    _LT_TAGVAR(hardcode_minus_L, $1)=yes
--	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
--	    _LT_TAGVAR(hardcode_libdir_separator, $1)=
--	  fi
--          esac
--          shared_flag='-shared'
--	  if test "$aix_use_runtimelinking" = yes; then
--	    shared_flag="$shared_flag "'${wl}-G'
--	  fi
--        else
--          # not using gcc
--          if test "$host_cpu" = ia64; then
--	  # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
--	  # chokes on -Wl,-G. The following line is correct:
--	  shared_flag='-G'
--          else
--	    if test "$aix_use_runtimelinking" = yes; then
--	      shared_flag='${wl}-G'
--	    else
--	      shared_flag='${wl}-bM:SRE'
--	    fi
--          fi
--        fi
-+	    # Archives containing C++ object files must be created using
-+	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
-+	    # necessary to make sure instantiated templates are included
-+	    # in the archive.
-+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
-+	    ;;
-+          gcx*)
-+	    # Green Hills C++ Compiler
-+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
- 
--        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
--        # It seems that -bexpall does not export symbols beginning with
--        # underscore (_), so it is better to generate a list of symbols to
--	# export.
--        _LT_TAGVAR(always_export_symbols, $1)=yes
--        if test "$aix_use_runtimelinking" = yes; then
--          # Warning - without using the other runtime loading flags (-brtl),
--          # -berok will link without error, but may produce a broken library.
--          _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
--          # Determine the default libpath from the value encoded in an empty
--          # executable.
--          _LT_SYS_MODULE_PATH_AIX
--          _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-+	    # The C++ compiler must be used to create the archive.
-+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-+	    ;;
-+          *)
-+	    # GNU C++ compiler with Solaris linker
-+	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-+	      _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
-+	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
-+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-+	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-+		  $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
- 
--          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
--        else
--          if test "$host_cpu" = ia64; then
--	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
--	    _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
--	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
--          else
--	    # Determine the default libpath from the value encoded in an
--	    # empty executable.
--	    _LT_SYS_MODULE_PATH_AIX
--	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
--	    # Warning - without using the other run time loading flags,
--	    # -berok will link without error, but may produce a broken library.
--	    _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
--	    _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
--	    # Exported symbols can be pulled into shared objects from archives
--	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
--	    _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
--	    # This is similar to how AIX traditionally builds its shared
--	    # libraries.
--	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
--          fi
--        fi
--        ;;
-+	        # Commands to make compiler produce verbose output that lists
-+	        # what "hidden" libraries, object files and flags are used when
-+	        # linking a shared library.
-+	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
-+	      else
-+	        # g++ 2.7 appears to require `-G' NOT `-shared' on this
-+	        # platform.
-+	        _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-+	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-+		  $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
- 
--      beos*)
--	if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
--	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
--	  # Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
--	  # support --undefined.  This deserves some investigation.  FIXME
--	  _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--	else
--	  _LT_TAGVAR(ld_shlibs, $1)=no
--	fi
--	;;
-+	        # Commands to make compiler produce verbose output that lists
-+	        # what "hidden" libraries, object files and flags are used when
-+	        # linking a shared library.
-+	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
-+	      fi
- 
--      chorus*)
--        case $cc_basename in
--          *)
--	  # FIXME: insert proper C++ library support
--	  _LT_TAGVAR(ld_shlibs, $1)=no
--	  ;;
-+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
-+	      case $host_os in
-+		solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-+		*)
-+		  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-+		  ;;
-+	      esac
-+	    fi
-+	    ;;
-         esac
-         ;;
- 
--      cygwin* | mingw* | pw32* | cegcc*)
--        # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
--        # as there is no search path for DLLs.
--        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
--        _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
--        _LT_TAGVAR(always_export_symbols, $1)=no
--        _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
-+      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      runpath_var='LD_RUN_PATH'
- 
--        if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
--          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
--          # If the export-symbols file already is a .def file (1st line
--          # is EXPORTS), use it as is; otherwise, prepend...
--          _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
--	    cp $export_symbols $output_objdir/$soname.def;
--          else
--	    echo EXPORTS > $output_objdir/$soname.def;
--	    cat $export_symbols >> $output_objdir/$soname.def;
--          fi~
--          $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
--        else
--          _LT_TAGVAR(ld_shlibs, $1)=no
--        fi
--        ;;
--      darwin* | rhapsody*)
--        _LT_DARWIN_LINKER_FEATURES($1)
--	;;
-+      case $cc_basename in
-+        CC*)
-+	  _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	  ;;
-+	*)
-+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	  ;;
-+      esac
-+      ;;
- 
--      dgux*)
--        case $cc_basename in
--          ec++*)
--	    # FIXME: insert proper C++ library support
--	    _LT_TAGVAR(ld_shlibs, $1)=no
-+      sysv5* | sco3.2v5* | sco5v6*)
-+	# Note: We can NOT use -z defs as we might desire, because we do not
-+	# link with -lc, and that would cause any symbols used from libc to
-+	# always be unresolved, which means just about no library would
-+	# ever link correctly.  If we're not using GNU ld we use -z text
-+	# though, which does catch some bad symbols but isn't as heavy-handed
-+	# as -z defs.
-+	_LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-+	_LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
-+	_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
-+	_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-+	_LT_TAGVAR(link_all_deplibs, $1)=yes
-+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
-+	runpath_var='LD_RUN_PATH'
-+
-+	case $cc_basename in
-+          CC*)
-+	    _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- 	    ;;
--          ghcx*)
--	    # Green Hills C++ Compiler
-+	  *)
-+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	    ;;
-+	esac
-+      ;;
-+
-+      tandem*)
-+        case $cc_basename in
-+          NCC*)
-+	    # NonStop-UX NCC 3.20
- 	    # FIXME: insert proper C++ library support
- 	    _LT_TAGVAR(ld_shlibs, $1)=no
- 	    ;;
-@@ -6659,644 +6320,538 @@
-         esac
-         ;;
- 
--      freebsd[[12]]*)
--        # C++ shared libraries reported to be fairly broken before
--	# switch to ELF
-+      vxworks*)
-+        # FIXME: insert proper C++ library support
-         _LT_TAGVAR(ld_shlibs, $1)=no
-         ;;
- 
--      freebsd-elf*)
--        _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-+      *)
-+        # FIXME: insert proper C++ library support
-+        _LT_TAGVAR(ld_shlibs, $1)=no
-         ;;
-+    esac
- 
--      freebsd* | dragonfly*)
--        # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
--        # conventions
--        _LT_TAGVAR(ld_shlibs, $1)=yes
--        ;;
-+    AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
-+    test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
- 
--      gnu*)
--        ;;
-+    _LT_TAGVAR(GCC, $1)="$GXX"
-+    _LT_TAGVAR(LD, $1)="$LD"
- 
--      hpux9*)
--        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
--        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
--        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
--        _LT_TAGVAR(hardcode_direct, $1)=yes
--        _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
--				             # but as the default
--				             # location of the library.
-+    ## CAVEAT EMPTOR:
-+    ## There is no encapsulation within the following macros, do not change
-+    ## the running order or otherwise move them around unless you know exactly
-+    ## what you are doing...
-+    _LT_SYS_HIDDEN_LIBDEPS($1)
-+    _LT_COMPILER_PIC($1)
-+    _LT_COMPILER_C_O($1)
-+    _LT_COMPILER_FILE_LOCKS($1)
-+    _LT_LINKER_SHLIBS($1)
-+    _LT_SYS_DYNAMIC_LINKER($1)
-+    _LT_LINKER_HARDCODE_LIBPATH($1)
- 
--        case $cc_basename in
--          CC*)
--            # FIXME: insert proper C++ library support
--            _LT_TAGVAR(ld_shlibs, $1)=no
--            ;;
--          aCC*)
--            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
--            # Commands to make compiler produce verbose output that lists
--            # what "hidden" libraries, object files and flags are used when
--            # linking a shared library.
--            #
--            # There doesn't appear to be a way to prevent this compiler from
--            # explicitly linking system object files so we need to strip them
--            # from the output so that they don't get included in the library
--            # dependencies.
--            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
--            ;;
--          *)
--            if test "$GXX" = yes; then
--              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
--            else
--              # FIXME: insert proper C++ library support
--              _LT_TAGVAR(ld_shlibs, $1)=no
--            fi
--            ;;
--        esac
--        ;;
-+    _LT_CONFIG($1)
-+  fi # test -n "$compiler"
- 
--      hpux10*|hpux11*)
--        if test $with_gnu_ld = no; then
--	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
--	  _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+  CC=$lt_save_CC
-+  LDCXX=$LD
-+  LD=$lt_save_LD
-+  GCC=$lt_save_GCC
-+  with_gnu_ld=$lt_save_with_gnu_ld
-+  lt_cv_path_LDCXX=$lt_cv_path_LD
-+  lt_cv_path_LD=$lt_save_path_LD
-+  lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
-+  lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-+fi # test "$_lt_caught_CXX_error" != yes
- 
--          case $host_cpu in
--            hppa*64*|ia64*)
--              ;;
--            *)
--	      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
--              ;;
--          esac
--        fi
--        case $host_cpu in
--          hppa*64*|ia64*)
--            _LT_TAGVAR(hardcode_direct, $1)=no
--            _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
--            ;;
--          *)
--            _LT_TAGVAR(hardcode_direct, $1)=yes
--            _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
--            _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
--					         # but as the default
--					         # location of the library.
--            ;;
--        esac
-+AC_LANG_POP
-+])# _LT_LANG_CXX_CONFIG
-+
-+
-+# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
-+# ---------------------------------
-+# Figure out "hidden" library dependencies from verbose
-+# compiler output when linking a shared library.
-+# Parse the compiler output and extract the necessary
-+# objects, libraries and library flags.
-+m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
-+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-+# Dependencies to place before and after the object being linked:
-+_LT_TAGVAR(predep_objects, $1)=
-+_LT_TAGVAR(postdep_objects, $1)=
-+_LT_TAGVAR(predeps, $1)=
-+_LT_TAGVAR(postdeps, $1)=
-+_LT_TAGVAR(compiler_lib_search_path, $1)=
-+
-+dnl we can't use the lt_simple_compile_test_code here,
-+dnl because it contains code intended for an executable,
-+dnl not a library.  It's possible we should let each
-+dnl tag define a new lt_????_link_test_code variable,
-+dnl but it's only used here...
-+m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF
-+int a;
-+void foo (void) { a = 0; }
-+_LT_EOF
-+], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF
-+class Foo
-+{
-+public:
-+  Foo (void) { a = 0; }
-+private:
-+  int a;
-+};
-+_LT_EOF
-+], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF
-+      subroutine foo
-+      implicit none
-+      integer*4 a
-+      a=0
-+      return
-+      end
-+_LT_EOF
-+], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF
-+      subroutine foo
-+      implicit none
-+      integer a
-+      a=0
-+      return
-+      end
-+_LT_EOF
-+], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF
-+public class foo {
-+  private int a;
-+  public void bar (void) {
-+    a = 0;
-+  }
-+};
-+_LT_EOF
-+])
-+dnl Parse the compiler output and extract the necessary
-+dnl objects, libraries and library flags.
-+if AC_TRY_EVAL(ac_compile); then
-+  # Parse the compiler output and extract the necessary
-+  # objects, libraries and library flags.
-+
-+  # Sentinel used to keep track of whether or not we are before
-+  # the conftest object file.
-+  pre_test_object_deps_done=no
- 
--        case $cc_basename in
--          CC*)
--	    # FIXME: insert proper C++ library support
--	    _LT_TAGVAR(ld_shlibs, $1)=no
--	    ;;
--          aCC*)
--	    case $host_cpu in
--	      hppa*64*)
--	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
--	        ;;
--	      ia64*)
--	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
--	        ;;
--	      *)
--	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
--	        ;;
--	    esac
--	    # Commands to make compiler produce verbose output that lists
--	    # what "hidden" libraries, object files and flags are used when
--	    # linking a shared library.
--	    #
--	    # There doesn't appear to be a way to prevent this compiler from
--	    # explicitly linking system object files so we need to strip them
--	    # from the output so that they don't get included in the library
--	    # dependencies.
--	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
--	    ;;
--          *)
--	    if test "$GXX" = yes; then
--	      if test $with_gnu_ld = no; then
--	        case $host_cpu in
--	          hppa*64*)
--	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
--	            ;;
--	          ia64*)
--	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
--	            ;;
--	          *)
--	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
--	            ;;
--	        esac
--	      fi
--	    else
--	      # FIXME: insert proper C++ library support
--	      _LT_TAGVAR(ld_shlibs, $1)=no
--	    fi
--	    ;;
--        esac
--        ;;
-+  for p in `eval "$output_verbose_link_cmd"`; do
-+    case $p in
- 
--      interix[[3-9]]*)
--	_LT_TAGVAR(hardcode_direct, $1)=no
--	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
--	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
--	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
--	# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
--	# Instead, shared libraries are loaded at an image base (0x10000000 by
--	# default) and relocated if they conflict, which is a slow very memory
--	# consuming and fragmenting process.  To avoid this, we pick a random,
--	# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
--	# time.  Moving up from 0x10000000 also allows more sbrk(2) space.
--	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
--	_LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
--	;;
--      irix5* | irix6*)
--        case $cc_basename in
--          CC*)
--	    # SGI C++
--	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-+    -L* | -R* | -l*)
-+       # Some compilers place space between "-{L,R}" and the path.
-+       # Remove the space.
-+       if test $p = "-L" ||
-+          test $p = "-R"; then
-+	 prev=$p
-+	 continue
-+       else
-+	 prev=
-+       fi
- 
--	    # Archives containing C++ object files must be created using
--	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
--	    # necessary to make sure instantiated templates are included
--	    # in the archive.
--	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
--	    ;;
--          *)
--	    if test "$GXX" = yes; then
--	      if test "$with_gnu_ld" = no; then
--	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
--	      else
--	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib'
--	      fi
--	    fi
--	    _LT_TAGVAR(link_all_deplibs, $1)=yes
--	    ;;
--        esac
--        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
--        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
--        _LT_TAGVAR(inherit_rpath, $1)=yes
--        ;;
-+       if test "$pre_test_object_deps_done" = no; then
-+	 case $p in
-+	 -L* | -R*)
-+	   # Internal compiler library paths should come after those
-+	   # provided the user.  The postdeps already come after the
-+	   # user supplied libs so there is no need to process them.
-+	   if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then
-+	     _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
-+	   else
-+	     _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
-+	   fi
-+	   ;;
-+	 # The "-l" case would never come before the object being
-+	 # linked, so don't bother handling this case.
-+	 esac
-+       else
-+	 if test -z "$_LT_TAGVAR(postdeps, $1)"; then
-+	   _LT_TAGVAR(postdeps, $1)="${prev}${p}"
-+	 else
-+	   _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
-+	 fi
-+       fi
-+       ;;
- 
--      linux* | k*bsd*-gnu)
--        case $cc_basename in
--          KCC*)
--	    # Kuck and Associates, Inc. (KAI) C++ Compiler
-+    *.$objext)
-+       # This assumes that the test object file only shows up
-+       # once in the compiler output.
-+       if test "$p" = "conftest.$objext"; then
-+	 pre_test_object_deps_done=yes
-+	 continue
-+       fi
- 
--	    # KCC will only create a shared library if the output file
--	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
--	    # to its proper name (with version) after linking.
--	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
--	    _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
--	    # Commands to make compiler produce verbose output that lists
--	    # what "hidden" libraries, object files and flags are used when
--	    # linking a shared library.
--	    #
--	    # There doesn't appear to be a way to prevent this compiler from
--	    # explicitly linking system object files so we need to strip them
--	    # from the output so that they don't get included in the library
--	    # dependencies.
--	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
-+       if test "$pre_test_object_deps_done" = no; then
-+	 if test -z "$_LT_TAGVAR(predep_objects, $1)"; then
-+	   _LT_TAGVAR(predep_objects, $1)="$p"
-+	 else
-+	   _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p"
-+	 fi
-+       else
-+	 if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then
-+	   _LT_TAGVAR(postdep_objects, $1)="$p"
-+	 else
-+	   _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p"
-+	 fi
-+       fi
-+       ;;
- 
--	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
--	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-+    *) ;; # Ignore the rest.
- 
--	    # Archives containing C++ object files must be created using
--	    # "CC -Bstatic", where "CC" is the KAI C++ compiler.
--	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
--	    ;;
--	  icpc* | ecpc* )
--	    # Intel C++
--	    with_gnu_ld=yes
--	    # version 8.0 and above of icpc choke on multiply defined symbols
--	    # if we add $predep_objects and $postdep_objects, however 7.1 and
--	    # earlier do not add the objects themselves.
--	    case `$CC -V 2>&1` in
--	      *"Version 7."*)
--	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
--		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
--		;;
--	      *)  # Version 8.0 or newer
--	        tmp_idyn=
--	        case $host_cpu in
--		  ia64*) tmp_idyn=' -i_dynamic';;
--		esac
--	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
--		;;
--	    esac
--	    _LT_TAGVAR(archive_cmds_need_lc, $1)=no
--	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
--	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
--	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
--	    ;;
--          pgCC* | pgcpp*)
--            # Portland Group C++ compiler
--	    case `$CC -V` in
--	    *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*)
--	      _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
--		rm -rf $tpldir~
--		$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
--		compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
--	      _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
--		rm -rf $tpldir~
--		$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
--		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
--		$RANLIB $oldlib'
--	      _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
--		rm -rf $tpldir~
--		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
--		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
--	      _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
--		rm -rf $tpldir~
--		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
--		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
--	      ;;
--	    *) # Version 6 will use weak symbols
--	      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
--	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
--	      ;;
--	    esac
-+    esac
-+  done
- 
--	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
--	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
--	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
--            ;;
--	  cxx*)
--	    # Compaq C++
--	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
--	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
-+  # Clean up.
-+  rm -f a.out a.exe
-+else
-+  echo "libtool.m4: error: problem compiling $1 test program"
-+fi
- 
--	    runpath_var=LD_RUN_PATH
--	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
--	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+$RM -f confest.$objext
-+
-+# PORTME: override above test on systems where it is broken
-+m4_if([$1], [CXX],
-+[case $host_os in
-+interix[[3-9]]*)
-+  # Interix 3.5 installs completely hosed .la files for C++, so rather than
-+  # hack all around it, let's just trust "g++" to DTRT.
-+  _LT_TAGVAR(predep_objects,$1)=
-+  _LT_TAGVAR(postdep_objects,$1)=
-+  _LT_TAGVAR(postdeps,$1)=
-+  ;;
-+
-+linux*)
-+  case `$CC -V 2>&1 | sed 5q` in
-+  *Sun\ C*)
-+    # Sun C++ 5.9
- 
--	    # Commands to make compiler produce verbose output that lists
--	    # what "hidden" libraries, object files and flags are used when
--	    # linking a shared library.
--	    #
--	    # There doesn't appear to be a way to prevent this compiler from
--	    # explicitly linking system object files so we need to strip them
--	    # from the output so that they don't get included in the library
--	    # dependencies.
--	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
--	    ;;
--	  xl*)
--	    # IBM XL 8.0 on PPC, with GNU ld
--	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
--	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
--	    _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--	    if test "x$supports_anon_versioning" = xyes; then
--	      _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
--		cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
--		echo "local: *; };" >> $output_objdir/$libname.ver~
--		$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
--	    fi
--	    ;;
--	  *)
--	    case `$CC -V 2>&1 | sed 5q` in
--	    *Sun\ C*)
--	      # Sun C++ 5.9
--	      _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
--	      _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
--	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
--	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
--	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
--	      _LT_TAGVAR(compiler_needs_object, $1)=yes
-+    # The more standards-conforming stlport4 library is
-+    # incompatible with the Cstd library. Avoid specifying
-+    # it if it's in CXXFLAGS. Ignore libCrun as
-+    # -library=stlport4 depends on it.
-+    case " $CXX $CXXFLAGS " in
-+    *" -library=stlport4 "*)
-+      solaris_use_stlport4=yes
-+      ;;
-+    esac
- 
--	      # Not sure whether something based on
--	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
--	      # would be better.
--	      output_verbose_link_cmd='echo'
-+    if test "$solaris_use_stlport4" != yes; then
-+      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
-+    fi
-+    ;;
-+  esac
-+  ;;
- 
--	      # Archives containing C++ object files must be created using
--	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
--	      # necessary to make sure instantiated templates are included
--	      # in the archive.
--	      _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
--	      ;;
--	    esac
--	    ;;
--	esac
--	;;
-+solaris*)
-+  case $cc_basename in
-+  CC*)
-+    # The more standards-conforming stlport4 library is
-+    # incompatible with the Cstd library. Avoid specifying
-+    # it if it's in CXXFLAGS. Ignore libCrun as
-+    # -library=stlport4 depends on it.
-+    case " $CXX $CXXFLAGS " in
-+    *" -library=stlport4 "*)
-+      solaris_use_stlport4=yes
-+      ;;
-+    esac
- 
--      lynxos*)
--        # FIXME: insert proper C++ library support
--	_LT_TAGVAR(ld_shlibs, $1)=no
--	;;
-+    # Adding this requires a known-good setup of shared libraries for
-+    # Sun compiler versions before 5.6, else PIC objects from an old
-+    # archive will be linked into the output, leading to subtle bugs.
-+    if test "$solaris_use_stlport4" != yes; then
-+      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
-+    fi
-+    ;;
-+  esac
-+  ;;
-+esac
-+])
- 
--      m88k*)
--        # FIXME: insert proper C++ library support
--        _LT_TAGVAR(ld_shlibs, $1)=no
--	;;
-+case " $_LT_TAGVAR(postdeps, $1) " in
-+*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;;
-+esac
-+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=
-+if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then
-+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
-+fi
-+_LT_TAGDECL([], [compiler_lib_search_dirs], [1],
-+    [The directories searched by this compiler when creating a shared library])
-+_LT_TAGDECL([], [predep_objects], [1],
-+    [Dependencies to place before and after the objects being linked to
-+    create a shared library])
-+_LT_TAGDECL([], [postdep_objects], [1])
-+_LT_TAGDECL([], [predeps], [1])
-+_LT_TAGDECL([], [postdeps], [1])
-+_LT_TAGDECL([], [compiler_lib_search_path], [1],
-+    [The library search path used internally by the compiler when linking
-+    a shared library])
-+])# _LT_SYS_HIDDEN_LIBDEPS
- 
--      mvs*)
--        case $cc_basename in
--          cxx*)
--	    # FIXME: insert proper C++ library support
--	    _LT_TAGVAR(ld_shlibs, $1)=no
--	    ;;
--	  *)
--	    # FIXME: insert proper C++ library support
--	    _LT_TAGVAR(ld_shlibs, $1)=no
--	    ;;
--	esac
--	;;
- 
--      netbsd*)
--        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
--	  _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
--	  wlarc=
--	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
--	  _LT_TAGVAR(hardcode_direct, $1)=yes
--	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
--	fi
--	# Workaround some broken pre-1.5 toolchains
--	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
--	;;
-+# _LT_PROG_F77
-+# ------------
-+# Since AC_PROG_F77 is broken, in that it returns the empty string
-+# if there is no fortran compiler, we have our own version here.
-+m4_defun([_LT_PROG_F77],
-+[
-+pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes])
-+AC_PROG_F77
-+if test -z "$F77" || test "X$F77" = "Xno"; then
-+  _lt_disable_F77=yes
-+fi
-+popdef([AC_MSG_ERROR])
-+])# _LT_PROG_F77
- 
--      *nto* | *qnx*)
--        _LT_TAGVAR(ld_shlibs, $1)=yes
--	;;
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([_LT_PROG_F77], [])
- 
--      openbsd2*)
--        # C++ shared libraries are fairly broken
--	_LT_TAGVAR(ld_shlibs, $1)=no
--	;;
- 
--      openbsd*)
--	if test -f /usr/libexec/ld.so; then
--	  _LT_TAGVAR(hardcode_direct, $1)=yes
--	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
--	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
--	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
--	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
--	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
--	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
--	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
--	    _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
--	  fi
--	  output_verbose_link_cmd=echo
--	else
--	  _LT_TAGVAR(ld_shlibs, $1)=no
--	fi
--	;;
-+# _LT_LANG_F77_CONFIG([TAG])
-+# --------------------------
-+# Ensure that the configuration variables for a Fortran 77 compiler are
-+# suitably defined.  These variables are subsequently used by _LT_CONFIG
-+# to write the compiler configuration to `libtool'.
-+m4_defun([_LT_LANG_F77_CONFIG],
-+[AC_REQUIRE([_LT_PROG_F77])dnl
-+AC_LANG_PUSH(Fortran 77)
- 
--      osf3* | osf4* | osf5*)
--        case $cc_basename in
--          KCC*)
--	    # Kuck and Associates, Inc. (KAI) C++ Compiler
-+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-+_LT_TAGVAR(allow_undefined_flag, $1)=
-+_LT_TAGVAR(always_export_symbols, $1)=no
-+_LT_TAGVAR(archive_expsym_cmds, $1)=
-+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-+_LT_TAGVAR(hardcode_direct, $1)=no
-+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-+_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-+_LT_TAGVAR(hardcode_libdir_separator, $1)=
-+_LT_TAGVAR(hardcode_minus_L, $1)=no
-+_LT_TAGVAR(hardcode_automatic, $1)=no
-+_LT_TAGVAR(inherit_rpath, $1)=no
-+_LT_TAGVAR(module_cmds, $1)=
-+_LT_TAGVAR(module_expsym_cmds, $1)=
-+_LT_TAGVAR(link_all_deplibs, $1)=unknown
-+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-+_LT_TAGVAR(no_undefined_flag, $1)=
-+_LT_TAGVAR(whole_archive_flag_spec, $1)=
-+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
- 
--	    # KCC will only create a shared library if the output file
--	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
--	    # to its proper name (with version) after linking.
--	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-+# Source file extension for f77 test sources.
-+ac_ext=f
- 
--	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
--	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+# Object file extension for compiled f77 test sources.
-+objext=o
-+_LT_TAGVAR(objext, $1)=$objext
- 
--	    # Archives containing C++ object files must be created using
--	    # the KAI C++ compiler.
--	    case $host in
--	      osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;;
--	      *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;;
--	    esac
--	    ;;
--          RCC*)
--	    # Rational C++ 2.4.1
--	    # FIXME: insert proper C++ library support
--	    _LT_TAGVAR(ld_shlibs, $1)=no
--	    ;;
--          cxx*)
--	    case $host in
--	      osf3*)
--	        _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
--	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
--	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
--		;;
--	      *)
--	        _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
--	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
--	        _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
--	          echo "-hidden">> $lib.exp~
--	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~
--	          $RM $lib.exp'
--	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
--		;;
--	    esac
-+# No sense in running all these tests if we already determined that
-+# the F77 compiler isn't working.  Some variables (like enable_shared)
-+# are currently assumed to apply to all compilers on this platform,
-+# and will be corrupted by setting them based on a non-working compiler.
-+if test "$_lt_disable_F77" != yes; then
-+  # Code to be used in simple compile tests
-+  lt_simple_compile_test_code="\
-+      subroutine t
-+      return
-+      end
-+"
- 
--	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+  # Code to be used in simple link tests
-+  lt_simple_link_test_code="\
-+      program t
-+      end
-+"
- 
--	    # Commands to make compiler produce verbose output that lists
--	    # what "hidden" libraries, object files and flags are used when
--	    # linking a shared library.
--	    #
--	    # There doesn't appear to be a way to prevent this compiler from
--	    # explicitly linking system object files so we need to strip them
--	    # from the output so that they don't get included in the library
--	    # dependencies.
--	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
--	    ;;
--	  *)
--	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
--	      _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
--	      case $host in
--	        osf3*)
--	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
--		  ;;
--	        *)
--	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
--		  ;;
--	      esac
-+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-+  _LT_TAG_COMPILER
- 
--	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
--	      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-+  # save warnings/boilerplate of simple test code
-+  _LT_COMPILER_BOILERPLATE
-+  _LT_LINKER_BOILERPLATE
- 
--	      # 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"'
-+  # Allow CC to be a program name with arguments.
-+  lt_save_CC="$CC"
-+  lt_save_GCC=$GCC
-+  CC=${F77-"f77"}
-+  compiler=$CC
-+  _LT_TAGVAR(compiler, $1)=$CC
-+  _LT_CC_BASENAME([$compiler])
-+  GCC=$G77
-+  if test -n "$compiler"; then
-+    AC_MSG_CHECKING([if libtool supports shared libraries])
-+    AC_MSG_RESULT([$can_build_shared])
- 
--	    else
--	      # FIXME: insert proper C++ library support
--	      _LT_TAGVAR(ld_shlibs, $1)=no
--	    fi
--	    ;;
--        esac
--        ;;
-+    AC_MSG_CHECKING([whether to build shared libraries])
-+    test "$can_build_shared" = "no" && enable_shared=no
- 
--      psos*)
--        # FIXME: insert proper C++ library support
--        _LT_TAGVAR(ld_shlibs, $1)=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
-         ;;
--
--      sunos4*)
--        case $cc_basename in
--          CC*)
--	    # Sun C++ 4.x
--	    # FIXME: insert proper C++ library support
--	    _LT_TAGVAR(ld_shlibs, $1)=no
--	    ;;
--          lcc*)
--	    # Lucid
--	    # FIXME: insert proper C++ library support
--	    _LT_TAGVAR(ld_shlibs, $1)=no
--	    ;;
--          *)
--	    # FIXME: insert proper C++ library support
--	    _LT_TAGVAR(ld_shlibs, $1)=no
--	    ;;
--        esac
-+      aix[[4-9]]*)
-+	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-+	  test "$enable_shared" = yes && enable_static=no
-+	fi
-         ;;
-+    esac
-+    AC_MSG_RESULT([$enable_shared])
- 
--      solaris*)
--        case $cc_basename in
--          CC*)
--	    # Sun C++ 4.2, 5.x and Centerline C++
--            _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
--	    _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
--	    _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
--	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
--	      $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-+    AC_MSG_CHECKING([whether to build static libraries])
-+    # Make sure either enable_shared or enable_static is yes.
-+    test "$enable_shared" = yes || enable_static=yes
-+    AC_MSG_RESULT([$enable_static])
- 
--	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
--	    _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
--	    case $host_os in
--	      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
--	      *)
--		# The compiler driver will combine and reorder linker options,
--		# but understands `-z linker_flag'.
--	        # Supported since Solaris 2.6 (maybe 2.5.1?)
--		_LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
--	        ;;
--	    esac
--	    _LT_TAGVAR(link_all_deplibs, $1)=yes
-+    _LT_TAGVAR(GCC, $1)="$G77"
-+    _LT_TAGVAR(LD, $1)="$LD"
- 
--	    output_verbose_link_cmd='echo'
-+    ## CAVEAT EMPTOR:
-+    ## There is no encapsulation within the following macros, do not change
-+    ## the running order or otherwise move them around unless you know exactly
-+    ## what you are doing...
-+    _LT_COMPILER_PIC($1)
-+    _LT_COMPILER_C_O($1)
-+    _LT_COMPILER_FILE_LOCKS($1)
-+    _LT_LINKER_SHLIBS($1)
-+    _LT_SYS_DYNAMIC_LINKER($1)
-+    _LT_LINKER_HARDCODE_LIBPATH($1)
- 
--	    # Archives containing C++ object files must be created using
--	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
--	    # necessary to make sure instantiated templates are included
--	    # in the archive.
--	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
--	    ;;
--          gcx*)
--	    # Green Hills C++ Compiler
--	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-+    _LT_CONFIG($1)
-+  fi # test -n "$compiler"
- 
--	    # The C++ compiler must be used to create the archive.
--	    _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
--	    ;;
--          *)
--	    # GNU C++ compiler with Solaris linker
--	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
--	      _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
--	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
--	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
--	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
--		  $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-+  GCC=$lt_save_GCC
-+  CC="$lt_save_CC"
-+fi # test "$_lt_disable_F77" != yes
- 
--	        # Commands to make compiler produce verbose output that lists
--	        # what "hidden" libraries, object files and flags are used when
--	        # linking a shared library.
--	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
--	      else
--	        # g++ 2.7 appears to require `-G' NOT `-shared' on this
--	        # platform.
--	        _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
--	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
--		  $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-+AC_LANG_POP
-+])# _LT_LANG_F77_CONFIG
- 
--	        # Commands to make compiler produce verbose output that lists
--	        # what "hidden" libraries, object files and flags are used when
--	        # linking a shared library.
--	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
--	      fi
- 
--	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
--	      case $host_os in
--		solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
--		*)
--		  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
--		  ;;
--	      esac
--	    fi
--	    ;;
--        esac
--        ;;
-+# _LT_PROG_FC
-+# -----------
-+# Since AC_PROG_FC is broken, in that it returns the empty string
-+# if there is no fortran compiler, we have our own version here.
-+m4_defun([_LT_PROG_FC],
-+[
-+pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes])
-+AC_PROG_FC
-+if test -z "$FC" || test "X$FC" = "Xno"; then
-+  _lt_disable_FC=yes
-+fi
-+popdef([AC_MSG_ERROR])
-+])# _LT_PROG_FC
-+
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([_LT_PROG_FC], [])
-+
-+
-+# _LT_LANG_FC_CONFIG([TAG])
-+# -------------------------
-+# Ensure that the configuration variables for a Fortran compiler are
-+# suitably defined.  These variables are subsequently used by _LT_CONFIG
-+# to write the compiler configuration to `libtool'.
-+m4_defun([_LT_LANG_FC_CONFIG],
-+[AC_REQUIRE([_LT_PROG_FC])dnl
-+AC_LANG_PUSH(Fortran)
-+
-+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-+_LT_TAGVAR(allow_undefined_flag, $1)=
-+_LT_TAGVAR(always_export_symbols, $1)=no
-+_LT_TAGVAR(archive_expsym_cmds, $1)=
-+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-+_LT_TAGVAR(hardcode_direct, $1)=no
-+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-+_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-+_LT_TAGVAR(hardcode_libdir_separator, $1)=
-+_LT_TAGVAR(hardcode_minus_L, $1)=no
-+_LT_TAGVAR(hardcode_automatic, $1)=no
-+_LT_TAGVAR(inherit_rpath, $1)=no
-+_LT_TAGVAR(module_cmds, $1)=
-+_LT_TAGVAR(module_expsym_cmds, $1)=
-+_LT_TAGVAR(link_all_deplibs, $1)=unknown
-+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-+_LT_TAGVAR(no_undefined_flag, $1)=
-+_LT_TAGVAR(whole_archive_flag_spec, $1)=
-+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-+
-+# Source file extension for fc test sources.
-+ac_ext=${ac_fc_srcext-f}
-+
-+# Object file extension for compiled fc test sources.
-+objext=o
-+_LT_TAGVAR(objext, $1)=$objext
-+
-+# No sense in running all these tests if we already determined that
-+# the FC compiler isn't working.  Some variables (like enable_shared)
-+# are currently assumed to apply to all compilers on this platform,
-+# and will be corrupted by setting them based on a non-working compiler.
-+if test "$_lt_disable_FC" != yes; then
-+  # Code to be used in simple compile tests
-+  lt_simple_compile_test_code="\
-+      subroutine t
-+      return
-+      end
-+"
-+
-+  # Code to be used in simple link tests
-+  lt_simple_link_test_code="\
-+      program t
-+      end
-+"
- 
--    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
--      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
--      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
--      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
--      runpath_var='LD_RUN_PATH'
-+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-+  _LT_TAG_COMPILER
- 
--      case $cc_basename in
--        CC*)
--	  _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
--	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
--	  ;;
--	*)
--	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
--	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
--	  ;;
--      esac
--      ;;
-+  # save warnings/boilerplate of simple test code
-+  _LT_COMPILER_BOILERPLATE
-+  _LT_LINKER_BOILERPLATE
- 
--      sysv5* | sco3.2v5* | sco5v6*)
--	# Note: We can NOT use -z defs as we might desire, because we do not
--	# link with -lc, and that would cause any symbols used from libc to
--	# always be unresolved, which means just about no library would
--	# ever link correctly.  If we're not using GNU ld we use -z text
--	# though, which does catch some bad symbols but isn't as heavy-handed
--	# as -z defs.
--	_LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
--	_LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
--	_LT_TAGVAR(archive_cmds_need_lc, $1)=no
--	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
--	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
--	_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
--	_LT_TAGVAR(link_all_deplibs, $1)=yes
--	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
--	runpath_var='LD_RUN_PATH'
-+  # Allow CC to be a program name with arguments.
-+  lt_save_CC="$CC"
-+  lt_save_GCC=$GCC
-+  CC=${FC-"f95"}
-+  compiler=$CC
-+  GCC=$ac_cv_fc_compiler_gnu
- 
--	case $cc_basename in
--          CC*)
--	    _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
--	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
--	    ;;
--	  *)
--	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
--	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
--	    ;;
--	esac
--      ;;
-+  _LT_TAGVAR(compiler, $1)=$CC
-+  _LT_CC_BASENAME([$compiler])
- 
--      tandem*)
--        case $cc_basename in
--          NCC*)
--	    # NonStop-UX NCC 3.20
--	    # FIXME: insert proper C++ library support
--	    _LT_TAGVAR(ld_shlibs, $1)=no
--	    ;;
--          *)
--	    # FIXME: insert proper C++ library support
--	    _LT_TAGVAR(ld_shlibs, $1)=no
--	    ;;
--        esac
--        ;;
-+  if test -n "$compiler"; then
-+    AC_MSG_CHECKING([if libtool supports shared libraries])
-+    AC_MSG_RESULT([$can_build_shared])
- 
--      vxworks*)
--        # FIXME: insert proper C++ library support
--        _LT_TAGVAR(ld_shlibs, $1)=no
--        ;;
-+    AC_MSG_CHECKING([whether to build shared libraries])
-+    test "$can_build_shared" = "no" && enable_shared=no
- 
--      *)
--        # FIXME: insert proper C++ library support
--        _LT_TAGVAR(ld_shlibs, $1)=no
-+    # On AIX, shared libraries and static libraries use the same namespace, and
-+    # are all built from PIC.
-+    case $host_os in
-+      aix3*)
-+        test "$enable_shared" = yes && enable_static=no
-+        if test -n "$RANLIB"; then
-+          archive_cmds="$archive_cmds~\$RANLIB \$lib"
-+          postinstall_cmds='$RANLIB $lib'
-+        fi
-+        ;;
-+      aix[[4-9]]*)
-+	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-+	  test "$enable_shared" = yes && enable_static=no
-+	fi
-         ;;
-     esac
-+    AC_MSG_RESULT([$enable_shared])
- 
--    AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
--    test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-+    AC_MSG_CHECKING([whether to build static libraries])
-+    # Make sure either enable_shared or enable_static is yes.
-+    test "$enable_shared" = yes || enable_static=yes
-+    AC_MSG_RESULT([$enable_static])
- 
--    _LT_TAGVAR(GCC, $1)="$GXX"
-+    _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu"
-     _LT_TAGVAR(LD, $1)="$LD"
- 
-     ## CAVEAT EMPTOR:
-@@ -7314,1636 +6869,2101 @@
-     _LT_CONFIG($1)
-   fi # test -n "$compiler"
- 
--  CC=$lt_save_CC
--  LDCXX=$LD
--  LD=$lt_save_LD
-   GCC=$lt_save_GCC
--  with_gnu_ld=$lt_save_with_gnu_ld
--  lt_cv_path_LDCXX=$lt_cv_path_LD
--  lt_cv_path_LD=$lt_save_path_LD
--  lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
--  lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
--fi # test "$_lt_caught_CXX_error" != yes
-+  CC="$lt_save_CC"
-+fi # test "$_lt_disable_FC" != yes
-+
-+AC_LANG_POP
-+])# _LT_LANG_FC_CONFIG
-+
-+
-+# _LT_LANG_GCJ_CONFIG([TAG])
-+# --------------------------
-+# Ensure that the configuration variables for the GNU Java Compiler compiler
-+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
-+# to write the compiler configuration to `libtool'.
-+m4_defun([_LT_LANG_GCJ_CONFIG],
-+[AC_REQUIRE([LT_PROG_GCJ])dnl
-+AC_LANG_SAVE
-+
-+# Source file extension for Java test sources.
-+ac_ext=java
-+
-+# Object file extension for compiled Java test sources.
-+objext=o
-+_LT_TAGVAR(objext, $1)=$objext
-+
-+# Code to be used in simple compile tests
-+lt_simple_compile_test_code="class foo {}"
-+
-+# Code to be used in simple link tests
-+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
-+
-+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-+_LT_TAG_COMPILER
-+
-+# save warnings/boilerplate of simple test code
-+_LT_COMPILER_BOILERPLATE
-+_LT_LINKER_BOILERPLATE
-+
-+# Allow CC to be a program name with arguments.
-+lt_save_CC="$CC"
-+lt_save_GCC=$GCC
-+GCC=yes
-+CC=${GCJ-"gcj"}
-+compiler=$CC
-+_LT_TAGVAR(compiler, $1)=$CC
-+_LT_TAGVAR(LD, $1)="$LD"
-+_LT_CC_BASENAME([$compiler])
-+
-+# GCJ did not exist at the time GCC didn't implicitly link libc in.
-+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-+
-+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-+
-+if test -n "$compiler"; then
-+  _LT_COMPILER_NO_RTTI($1)
-+  _LT_COMPILER_PIC($1)
-+  _LT_COMPILER_C_O($1)
-+  _LT_COMPILER_FILE_LOCKS($1)
-+  _LT_LINKER_SHLIBS($1)
-+  _LT_LINKER_HARDCODE_LIBPATH($1)
-+
-+  _LT_CONFIG($1)
-+fi
-+
-+AC_LANG_RESTORE
-+
-+GCC=$lt_save_GCC
-+CC="$lt_save_CC"
-+])# _LT_LANG_GCJ_CONFIG
-+
-+
-+# _LT_LANG_RC_CONFIG([TAG])
-+# -------------------------
-+# Ensure that the configuration variables for the Windows resource compiler
-+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
-+# to write the compiler configuration to `libtool'.
-+m4_defun([_LT_LANG_RC_CONFIG],
-+[AC_REQUIRE([LT_PROG_RC])dnl
-+AC_LANG_SAVE
-+
-+# Source file extension for RC test sources.
-+ac_ext=rc
-+
-+# Object file extension for compiled RC test sources.
-+objext=o
-+_LT_TAGVAR(objext, $1)=$objext
-+
-+# Code to be used in simple compile tests
-+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
-+
-+# Code to be used in simple link tests
-+lt_simple_link_test_code="$lt_simple_compile_test_code"
-+
-+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-+_LT_TAG_COMPILER
-+
-+# save warnings/boilerplate of simple test code
-+_LT_COMPILER_BOILERPLATE
-+_LT_LINKER_BOILERPLATE
-+
-+# Allow CC to be a program name with arguments.
-+lt_save_CC="$CC"
-+lt_save_GCC=$GCC
-+GCC=
-+CC=${RC-"windres"}
-+compiler=$CC
-+_LT_TAGVAR(compiler, $1)=$CC
-+_LT_CC_BASENAME([$compiler])
-+_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-+
-+if test -n "$compiler"; then
-+  :
-+  _LT_CONFIG($1)
-+fi
-+
-+GCC=$lt_save_GCC
-+AC_LANG_RESTORE
-+CC="$lt_save_CC"
-+])# _LT_LANG_RC_CONFIG
-+
-+
-+# LT_PROG_GCJ
-+# -----------
-+AC_DEFUN([LT_PROG_GCJ],
-+[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ],
-+  [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ],
-+    [AC_CHECK_TOOL(GCJ, gcj,)
-+      test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
-+      AC_SUBST(GCJFLAGS)])])[]dnl
-+])
-+
-+# Old name:
-+AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ])
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
-+
-+
-+# LT_PROG_RC
-+# ----------
-+AC_DEFUN([LT_PROG_RC],
-+[AC_CHECK_TOOL(RC, windres,)
-+])
-+
-+# Old name:
-+AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC])
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([LT_AC_PROG_RC], [])
- 
--AC_LANG_POP
--])# _LT_LANG_CXX_CONFIG
- 
-+# _LT_DECL_EGREP
-+# --------------
-+# If we don't have a new enough Autoconf to choose the best grep
-+# available, choose the one first in the user's PATH.
-+m4_defun([_LT_DECL_EGREP],
-+[AC_REQUIRE([AC_PROG_EGREP])dnl
-+AC_REQUIRE([AC_PROG_FGREP])dnl
-+test -z "$GREP" && GREP=grep
-+_LT_DECL([], [GREP], [1], [A grep program that handles long lines])
-+_LT_DECL([], [EGREP], [1], [An ERE matcher])
-+_LT_DECL([], [FGREP], [1], [A literal string matcher])
-+dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too
-+AC_SUBST([GREP])
-+])
- 
--# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
--# ---------------------------------
--# Figure out "hidden" library dependencies from verbose
--# compiler output when linking a shared library.
--# Parse the compiler output and extract the necessary
--# objects, libraries and library flags.
--m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
--[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
--# Dependencies to place before and after the object being linked:
--_LT_TAGVAR(predep_objects, $1)=
--_LT_TAGVAR(postdep_objects, $1)=
--_LT_TAGVAR(predeps, $1)=
--_LT_TAGVAR(postdeps, $1)=
--_LT_TAGVAR(compiler_lib_search_path, $1)=
- 
--dnl we can't use the lt_simple_compile_test_code here,
--dnl because it contains code intended for an executable,
--dnl not a library.  It's possible we should let each
--dnl tag define a new lt_????_link_test_code variable,
--dnl but it's only used here...
--m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF
--int a;
--void foo (void) { a = 0; }
--_LT_EOF
--], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF
--class Foo
--{
--public:
--  Foo (void) { a = 0; }
--private:
--  int a;
--};
--_LT_EOF
--], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF
--      subroutine foo
--      implicit none
--      integer*4 a
--      a=0
--      return
--      end
--_LT_EOF
--], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF
--      subroutine foo
--      implicit none
--      integer a
--      a=0
--      return
--      end
--_LT_EOF
--], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF
--public class foo {
--  private int a;
--  public void bar (void) {
--    a = 0;
--  }
--};
--_LT_EOF
-+# _LT_DECL_OBJDUMP
-+# --------------
-+# If we don't have a new enough Autoconf to choose the best objdump
-+# available, choose the one first in the user's PATH.
-+m4_defun([_LT_DECL_OBJDUMP],
-+[AC_CHECK_TOOL(OBJDUMP, objdump, false)
-+test -z "$OBJDUMP" && OBJDUMP=objdump
-+_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
-+AC_SUBST([OBJDUMP])
- ])
--dnl Parse the compiler output and extract the necessary
--dnl objects, libraries and library flags.
--if AC_TRY_EVAL(ac_compile); then
--  # Parse the compiler output and extract the necessary
--  # objects, libraries and library flags.
- 
--  # Sentinel used to keep track of whether or not we are before
--  # the conftest object file.
--  pre_test_object_deps_done=no
- 
--  for p in `eval "$output_verbose_link_cmd"`; do
--    case $p in
-+# _LT_DECL_SED
-+# ------------
-+# Check for a fully-functional sed program, that truncates
-+# as few characters as possible.  Prefer GNU sed if found.
-+m4_defun([_LT_DECL_SED],
-+[AC_PROG_SED
-+test -z "$SED" && SED=sed
-+Xsed="$SED -e 1s/^X//"
-+_LT_DECL([], [SED], [1], [A sed program that does not truncate output])
-+_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"],
-+    [Sed that helps us avoid accidentally triggering echo(1) options like -n])
-+])# _LT_DECL_SED
- 
--    -L* | -R* | -l*)
--       # Some compilers place space between "-{L,R}" and the path.
--       # Remove the space.
--       if test $p = "-L" ||
--          test $p = "-R"; then
--	 prev=$p
--	 continue
--       else
--	 prev=
--       fi
-+m4_ifndef([AC_PROG_SED], [
-+# NOTE: This macro has been submitted for inclusion into   #
-+#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
-+#  a released version of Autoconf we should remove this    #
-+#  macro and use it instead.                               #
- 
--       if test "$pre_test_object_deps_done" = no; then
--	 case $p in
--	 -L* | -R*)
--	   # Internal compiler library paths should come after those
--	   # provided the user.  The postdeps already come after the
--	   # user supplied libs so there is no need to process them.
--	   if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then
--	     _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
--	   else
--	     _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
--	   fi
--	   ;;
--	 # The "-l" case would never come before the object being
--	 # linked, so don't bother handling this case.
--	 esac
--       else
--	 if test -z "$_LT_TAGVAR(postdeps, $1)"; then
--	   _LT_TAGVAR(postdeps, $1)="${prev}${p}"
--	 else
--	   _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
--	 fi
--       fi
--       ;;
-+m4_defun([AC_PROG_SED],
-+[AC_MSG_CHECKING([for a sed that does not truncate output])
-+AC_CACHE_VAL(lt_cv_path_SED,
-+[# Loop through the user's path and test for sed and gsed.
-+# Then use that list of sed's as ones to test for truncation.
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for lt_ac_prog in sed gsed; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
-+        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
-+      fi
-+    done
-+  done
-+done
-+IFS=$as_save_IFS
-+lt_ac_max=0
-+lt_ac_count=0
-+# Add /usr/xpg4/bin/sed as it is typically found on Solaris
-+# along with /bin/sed that truncates output.
-+for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
-+  test ! -f $lt_ac_sed && continue
-+  cat /dev/null > conftest.in
-+  lt_ac_count=0
-+  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-+  # Check for GNU sed and select it if it is found.
-+  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
-+    lt_cv_path_SED=$lt_ac_sed
-+    break
-+  fi
-+  while true; do
-+    cat conftest.in conftest.in >conftest.tmp
-+    mv conftest.tmp conftest.in
-+    cp conftest.in conftest.nl
-+    echo >>conftest.nl
-+    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
-+    cmp -s conftest.out conftest.nl || break
-+    # 10000 chars as input seems more than enough
-+    test $lt_ac_count -gt 10 && break
-+    lt_ac_count=`expr $lt_ac_count + 1`
-+    if test $lt_ac_count -gt $lt_ac_max; then
-+      lt_ac_max=$lt_ac_count
-+      lt_cv_path_SED=$lt_ac_sed
-+    fi
-+  done
-+done
-+])
-+SED=$lt_cv_path_SED
-+AC_SUBST([SED])
-+AC_MSG_RESULT([$SED])
-+])#AC_PROG_SED
-+])#m4_ifndef
- 
--    *.$objext)
--       # This assumes that the test object file only shows up
--       # once in the compiler output.
--       if test "$p" = "conftest.$objext"; then
--	 pre_test_object_deps_done=yes
--	 continue
--       fi
-+# Old name:
-+AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED])
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([LT_AC_PROG_SED], [])
- 
--       if test "$pre_test_object_deps_done" = no; then
--	 if test -z "$_LT_TAGVAR(predep_objects, $1)"; then
--	   _LT_TAGVAR(predep_objects, $1)="$p"
--	 else
--	   _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p"
--	 fi
--       else
--	 if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then
--	   _LT_TAGVAR(postdep_objects, $1)="$p"
--	 else
--	   _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p"
--	 fi
--       fi
--       ;;
- 
--    *) ;; # Ignore the rest.
-+# _LT_CHECK_SHELL_FEATURES
-+# ------------------------
-+# Find out whether the shell is Bourne or XSI compatible,
-+# or has some other useful features.
-+m4_defun([_LT_CHECK_SHELL_FEATURES],
-+[AC_MSG_CHECKING([whether the shell understands some XSI constructs])
-+# Try some XSI features
-+xsi_shell=no
-+( _lt_dummy="a/b/c"
-+  test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
-+      = c,a/b,, \
-+    && eval 'test $(( 1 + 1 )) -eq 2 \
-+    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
-+  && xsi_shell=yes
-+AC_MSG_RESULT([$xsi_shell])
-+_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell'])
- 
--    esac
--  done
-+AC_MSG_CHECKING([whether the shell understands "+="])
-+lt_shell_append=no
-+( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \
-+    >/dev/null 2>&1 \
-+  && lt_shell_append=yes
-+AC_MSG_RESULT([$lt_shell_append])
-+_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append'])
- 
--  # Clean up.
--  rm -f a.out a.exe
-+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-+  lt_unset=unset
- else
--  echo "libtool.m4: error: problem compiling $1 test program"
-+  lt_unset=false
- fi
-+_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl
- 
--$RM -f confest.$objext
--
--# PORTME: override above test on systems where it is broken
--m4_if([$1], [CXX],
--[case $host_os in
--interix[[3-9]]*)
--  # Interix 3.5 installs completely hosed .la files for C++, so rather than
--  # hack all around it, let's just trust "g++" to DTRT.
--  _LT_TAGVAR(predep_objects,$1)=
--  _LT_TAGVAR(postdep_objects,$1)=
--  _LT_TAGVAR(postdeps,$1)=
-+# test EBCDIC or ASCII
-+case `echo X|tr X '\101'` in
-+ A) # ASCII based system
-+    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
-+  lt_SP2NL='tr \040 \012'
-+  lt_NL2SP='tr \015\012 \040\040'
-+  ;;
-+ *) # EBCDIC based system
-+  lt_SP2NL='tr \100 \n'
-+  lt_NL2SP='tr \r\n \100\100'
-   ;;
-+esac
-+_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl
-+_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
-+])# _LT_CHECK_SHELL_FEATURES
- 
--linux*)
--  case `$CC -V 2>&1 | sed 5q` in
--  *Sun\ C*)
--    # Sun C++ 5.9
- 
--    # The more standards-conforming stlport4 library is
--    # incompatible with the Cstd library. Avoid specifying
--    # it if it's in CXXFLAGS. Ignore libCrun as
--    # -library=stlport4 depends on it.
--    case " $CXX $CXXFLAGS " in
--    *" -library=stlport4 "*)
--      solaris_use_stlport4=yes
--      ;;
--    esac
-+# _LT_PROG_XSI_SHELLFNS
-+# ---------------------
-+# Bourne and XSI compatible variants of some useful shell functions.
-+m4_defun([_LT_PROG_XSI_SHELLFNS],
-+[case $xsi_shell in
-+  yes)
-+    cat << \_LT_EOF >> "$cfgfile"
- 
--    if test "$solaris_use_stlport4" != yes; then
--      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
--    fi
--    ;;
-+# func_dirname file append nondir_replacement
-+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-+# otherwise set result to NONDIR_REPLACEMENT.
-+func_dirname ()
-+{
-+  case ${1} in
-+    */*) func_dirname_result="${1%/*}${2}" ;;
-+    *  ) func_dirname_result="${3}" ;;
-   esac
--  ;;
-+}
- 
--solaris*)
--  case $cc_basename in
--  CC*)
--    # The more standards-conforming stlport4 library is
--    # incompatible with the Cstd library. Avoid specifying
--    # it if it's in CXXFLAGS. Ignore libCrun as
--    # -library=stlport4 depends on it.
--    case " $CXX $CXXFLAGS " in
--    *" -library=stlport4 "*)
--      solaris_use_stlport4=yes
--      ;;
--    esac
-+# func_basename file
-+func_basename ()
-+{
-+  func_basename_result="${1##*/}"
-+}
- 
--    # Adding this requires a known-good setup of shared libraries for
--    # Sun compiler versions before 5.6, else PIC objects from an old
--    # archive will be linked into the output, leading to subtle bugs.
--    if test "$solaris_use_stlport4" != yes; then
--      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
--    fi
--    ;;
-+# func_dirname_and_basename file append nondir_replacement
-+# perform func_basename and func_dirname in a single function
-+# call:
-+#   dirname:  Compute the dirname of FILE.  If nonempty,
-+#             add APPEND to the result, otherwise set result
-+#             to NONDIR_REPLACEMENT.
-+#             value returned in "$func_dirname_result"
-+#   basename: Compute filename of FILE.
-+#             value retuned in "$func_basename_result"
-+# Implementation must be kept synchronized with func_dirname
-+# and func_basename. For efficiency, we do not delegate to
-+# those functions but instead duplicate the functionality here.
-+func_dirname_and_basename ()
-+{
-+  case ${1} in
-+    */*) func_dirname_result="${1%/*}${2}" ;;
-+    *  ) func_dirname_result="${3}" ;;
-   esac
--  ;;
--esac
--])
-+  func_basename_result="${1##*/}"
-+}
- 
--case " $_LT_TAGVAR(postdeps, $1) " in
--*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;;
--esac
-- _LT_TAGVAR(compiler_lib_search_dirs, $1)=
--if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then
-- _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
--fi
--_LT_TAGDECL([], [compiler_lib_search_dirs], [1],
--    [The directories searched by this compiler when creating a shared library])
--_LT_TAGDECL([], [predep_objects], [1],
--    [Dependencies to place before and after the objects being linked to
--    create a shared library])
--_LT_TAGDECL([], [postdep_objects], [1])
--_LT_TAGDECL([], [predeps], [1])
--_LT_TAGDECL([], [postdeps], [1])
--_LT_TAGDECL([], [compiler_lib_search_path], [1],
--    [The library search path used internally by the compiler when linking
--    a shared library])
--])# _LT_SYS_HIDDEN_LIBDEPS
-+# func_stripname prefix suffix name
-+# strip PREFIX and SUFFIX off of NAME.
-+# PREFIX and SUFFIX must not contain globbing or regex special
-+# characters, hashes, percent signs, but SUFFIX may contain a leading
-+# dot (in which case that matches only a dot).
-+func_stripname ()
-+{
-+  # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
-+  # positional parameters, so assign one to ordinary parameter first.
-+  func_stripname_result=${3}
-+  func_stripname_result=${func_stripname_result#"${1}"}
-+  func_stripname_result=${func_stripname_result%"${2}"}
-+}
- 
-+# func_opt_split
-+func_opt_split ()
-+{
-+  func_opt_split_opt=${1%%=*}
-+  func_opt_split_arg=${1#*=}
-+}
- 
--# _LT_PROG_F77
--# ------------
--# Since AC_PROG_F77 is broken, in that it returns the empty string
--# if there is no fortran compiler, we have our own version here.
--m4_defun([_LT_PROG_F77],
--[
--pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes])
--AC_PROG_F77
--if test -z "$F77" || test "X$F77" = "Xno"; then
--  _lt_disable_F77=yes
--fi
--popdef([AC_MSG_ERROR])
--])# _LT_PROG_F77
-+# func_lo2o object
-+func_lo2o ()
-+{
-+  case ${1} in
-+    *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
-+    *)    func_lo2o_result=${1} ;;
-+  esac
-+}
- 
--dnl aclocal-1.4 backwards compatibility:
--dnl AC_DEFUN([_LT_PROG_F77], [])
-+# func_xform libobj-or-source
-+func_xform ()
-+{
-+  func_xform_result=${1%.*}.lo
-+}
- 
-+# func_arith arithmetic-term...
-+func_arith ()
-+{
-+  func_arith_result=$(( $[*] ))
-+}
- 
--# _LT_LANG_F77_CONFIG([TAG])
--# --------------------------
--# Ensure that the configuration variables for a Fortran 77 compiler are
--# suitably defined.  These variables are subsequently used by _LT_CONFIG
--# to write the compiler configuration to `libtool'.
--m4_defun([_LT_LANG_F77_CONFIG],
--[AC_REQUIRE([_LT_PROG_F77])dnl
--AC_LANG_PUSH(Fortran 77)
-+# func_len string
-+# STRING may not start with a hyphen.
-+func_len ()
-+{
-+  func_len_result=${#1}
-+}
- 
--_LT_TAGVAR(archive_cmds_need_lc, $1)=no
--_LT_TAGVAR(allow_undefined_flag, $1)=
--_LT_TAGVAR(always_export_symbols, $1)=no
--_LT_TAGVAR(archive_expsym_cmds, $1)=
--_LT_TAGVAR(export_dynamic_flag_spec, $1)=
--_LT_TAGVAR(hardcode_direct, $1)=no
--_LT_TAGVAR(hardcode_direct_absolute, $1)=no
--_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
--_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
--_LT_TAGVAR(hardcode_libdir_separator, $1)=
--_LT_TAGVAR(hardcode_minus_L, $1)=no
--_LT_TAGVAR(hardcode_automatic, $1)=no
--_LT_TAGVAR(inherit_rpath, $1)=no
--_LT_TAGVAR(module_cmds, $1)=
--_LT_TAGVAR(module_expsym_cmds, $1)=
--_LT_TAGVAR(link_all_deplibs, $1)=unknown
--_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
--_LT_TAGVAR(no_undefined_flag, $1)=
--_LT_TAGVAR(whole_archive_flag_spec, $1)=
--_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-+_LT_EOF
-+    ;;
-+  *) # Bourne compatible functions.
-+    cat << \_LT_EOF >> "$cfgfile"
- 
--# Source file extension for f77 test sources.
--ac_ext=f
-+# func_dirname file append nondir_replacement
-+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-+# otherwise set result to NONDIR_REPLACEMENT.
-+func_dirname ()
-+{
-+  # Extract subdirectory from the argument.
-+  func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
-+  if test "X$func_dirname_result" = "X${1}"; then
-+    func_dirname_result="${3}"
-+  else
-+    func_dirname_result="$func_dirname_result${2}"
-+  fi
-+}
-+
-+# func_basename file
-+func_basename ()
-+{
-+  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
-+}
-+
-+dnl func_dirname_and_basename
-+dnl A portable version of this function is already defined in general.m4sh
-+dnl so there is no need for it here.
-+
-+# func_stripname prefix suffix name
-+# strip PREFIX and SUFFIX off of NAME.
-+# PREFIX and SUFFIX must not contain globbing or regex special
-+# characters, hashes, percent signs, but SUFFIX may contain a leading
-+# dot (in which case that matches only a dot).
-+# func_strip_suffix prefix name
-+func_stripname ()
-+{
-+  case ${2} in
-+    .*) func_stripname_result=`$ECHO "X${3}" \
-+           | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
-+    *)  func_stripname_result=`$ECHO "X${3}" \
-+           | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
-+  esac
-+}
- 
--# Object file extension for compiled f77 test sources.
--objext=o
--_LT_TAGVAR(objext, $1)=$objext
-+# sed scripts:
-+my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q'
-+my_sed_long_arg='1s/^-[[^=]]*=//'
- 
--# No sense in running all these tests if we already determined that
--# the F77 compiler isn't working.  Some variables (like enable_shared)
--# are currently assumed to apply to all compilers on this platform,
--# and will be corrupted by setting them based on a non-working compiler.
--if test "$_lt_disable_F77" != yes; then
--  # Code to be used in simple compile tests
--  lt_simple_compile_test_code="\
--      subroutine t
--      return
--      end
--"
-+# func_opt_split
-+func_opt_split ()
-+{
-+  func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
-+  func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
-+}
- 
--  # Code to be used in simple link tests
--  lt_simple_link_test_code="\
--      program t
--      end
--"
-+# func_lo2o object
-+func_lo2o ()
-+{
-+  func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
-+}
- 
--  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
--  _LT_TAG_COMPILER
-+# func_xform libobj-or-source
-+func_xform ()
-+{
-+  func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'`
-+}
- 
--  # save warnings/boilerplate of simple test code
--  _LT_COMPILER_BOILERPLATE
--  _LT_LINKER_BOILERPLATE
-+# func_arith arithmetic-term...
-+func_arith ()
-+{
-+  func_arith_result=`expr "$[@]"`
-+}
- 
--  # Allow CC to be a program name with arguments.
--  lt_save_CC="$CC"
--  lt_save_GCC=$GCC
--  CC=${F77-"f77"}
--  compiler=$CC
--  _LT_TAGVAR(compiler, $1)=$CC
--  _LT_CC_BASENAME([$compiler])
--  GCC=$G77
--  if test -n "$compiler"; then
--    AC_MSG_CHECKING([if libtool supports shared libraries])
--    AC_MSG_RESULT([$can_build_shared])
-+# func_len string
-+# STRING may not start with a hyphen.
-+func_len ()
-+{
-+  func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len`
-+}
- 
--    AC_MSG_CHECKING([whether to build shared libraries])
--    test "$can_build_shared" = "no" && enable_shared=no
-+_LT_EOF
-+esac
- 
--    # On AIX, shared libraries and static libraries use the same namespace, and
--    # are all built from PIC.
--    case $host_os in
--      aix3*)
--        test "$enable_shared" = yes && enable_static=no
--        if test -n "$RANLIB"; then
--          archive_cmds="$archive_cmds~\$RANLIB \$lib"
--          postinstall_cmds='$RANLIB $lib'
--        fi
--        ;;
--      aix[[4-9]]*)
--	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
--	  test "$enable_shared" = yes && enable_static=no
--	fi
--        ;;
--    esac
--    AC_MSG_RESULT([$enable_shared])
-+case $lt_shell_append in
-+  yes)
-+    cat << \_LT_EOF >> "$cfgfile"
- 
--    AC_MSG_CHECKING([whether to build static libraries])
--    # Make sure either enable_shared or enable_static is yes.
--    test "$enable_shared" = yes || enable_static=yes
--    AC_MSG_RESULT([$enable_static])
-+# func_append var value
-+# Append VALUE to the end of shell variable VAR.
-+func_append ()
-+{
-+  eval "$[1]+=\$[2]"
-+}
-+_LT_EOF
-+    ;;
-+  *)
-+    cat << \_LT_EOF >> "$cfgfile"
- 
--    _LT_TAGVAR(GCC, $1)="$G77"
--    _LT_TAGVAR(LD, $1)="$LD"
-+# func_append var value
-+# Append VALUE to the end of shell variable VAR.
-+func_append ()
-+{
-+  eval "$[1]=\$$[1]\$[2]"
-+}
- 
--    ## CAVEAT EMPTOR:
--    ## There is no encapsulation within the following macros, do not change
--    ## the running order or otherwise move them around unless you know exactly
--    ## what you are doing...
--    _LT_COMPILER_PIC($1)
--    _LT_COMPILER_C_O($1)
--    _LT_COMPILER_FILE_LOCKS($1)
--    _LT_LINKER_SHLIBS($1)
--    _LT_SYS_DYNAMIC_LINKER($1)
--    _LT_LINKER_HARDCODE_LIBPATH($1)
-+_LT_EOF
-+    ;;
-+  esac
-+])
- 
--    _LT_CONFIG($1)
--  fi # test -n "$compiler"
-+# Helper functions for option handling.                    -*- Autoconf -*-
-+#
-+#   Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
-+#   Written by Gary V. Vaughan, 2004
-+#
-+# This file is free software; the Free Software Foundation gives
-+# unlimited permission to copy and/or distribute it, with or without
-+# modifications, as long as this notice is preserved.
- 
--  GCC=$lt_save_GCC
--  CC="$lt_save_CC"
--fi # test "$_lt_disable_F77" != yes
-+# serial 6 ltoptions.m4
- 
--AC_LANG_POP
--])# _LT_LANG_F77_CONFIG
-+# This is to help aclocal find these macros, as it can't see m4_define.
-+AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
- 
- 
--# _LT_PROG_FC
--# -----------
--# Since AC_PROG_FC is broken, in that it returns the empty string
--# if there is no fortran compiler, we have our own version here.
--m4_defun([_LT_PROG_FC],
--[
--pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes])
--AC_PROG_FC
--if test -z "$FC" || test "X$FC" = "Xno"; then
--  _lt_disable_FC=yes
--fi
--popdef([AC_MSG_ERROR])
--])# _LT_PROG_FC
-+# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME)
-+# ------------------------------------------
-+m4_define([_LT_MANGLE_OPTION],
-+[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])])
- 
--dnl aclocal-1.4 backwards compatibility:
--dnl AC_DEFUN([_LT_PROG_FC], [])
- 
-+# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME)
-+# ---------------------------------------
-+# Set option OPTION-NAME for macro MACRO-NAME, and if there is a
-+# matching handler defined, dispatch to it.  Other OPTION-NAMEs are
-+# saved as a flag.
-+m4_define([_LT_SET_OPTION],
-+[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
-+m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
-+        _LT_MANGLE_DEFUN([$1], [$2]),
-+    [m4_warning([Unknown $1 option `$2'])])[]dnl
-+])
- 
--# _LT_LANG_FC_CONFIG([TAG])
--# -------------------------
--# Ensure that the configuration variables for a Fortran compiler are
--# suitably defined.  These variables are subsequently used by _LT_CONFIG
--# to write the compiler configuration to `libtool'.
--m4_defun([_LT_LANG_FC_CONFIG],
--[AC_REQUIRE([_LT_PROG_FC])dnl
--AC_LANG_PUSH(Fortran)
- 
--_LT_TAGVAR(archive_cmds_need_lc, $1)=no
--_LT_TAGVAR(allow_undefined_flag, $1)=
--_LT_TAGVAR(always_export_symbols, $1)=no
--_LT_TAGVAR(archive_expsym_cmds, $1)=
--_LT_TAGVAR(export_dynamic_flag_spec, $1)=
--_LT_TAGVAR(hardcode_direct, $1)=no
--_LT_TAGVAR(hardcode_direct_absolute, $1)=no
--_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
--_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
--_LT_TAGVAR(hardcode_libdir_separator, $1)=
--_LT_TAGVAR(hardcode_minus_L, $1)=no
--_LT_TAGVAR(hardcode_automatic, $1)=no
--_LT_TAGVAR(inherit_rpath, $1)=no
--_LT_TAGVAR(module_cmds, $1)=
--_LT_TAGVAR(module_expsym_cmds, $1)=
--_LT_TAGVAR(link_all_deplibs, $1)=unknown
--_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
--_LT_TAGVAR(no_undefined_flag, $1)=
--_LT_TAGVAR(whole_archive_flag_spec, $1)=
--_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-+# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET])
-+# ------------------------------------------------------------
-+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-+m4_define([_LT_IF_OPTION],
-+[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])])
- 
--# Source file extension for fc test sources.
--ac_ext=${ac_fc_srcext-f}
- 
--# Object file extension for compiled fc test sources.
--objext=o
--_LT_TAGVAR(objext, $1)=$objext
-+# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET)
-+# -------------------------------------------------------
-+# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME
-+# are set.
-+m4_define([_LT_UNLESS_OPTIONS],
-+[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
-+	    [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option),
-+		      [m4_define([$0_found])])])[]dnl
-+m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3
-+])[]dnl
-+])
- 
--# No sense in running all these tests if we already determined that
--# the FC compiler isn't working.  Some variables (like enable_shared)
--# are currently assumed to apply to all compilers on this platform,
--# and will be corrupted by setting them based on a non-working compiler.
--if test "$_lt_disable_FC" != yes; then
--  # Code to be used in simple compile tests
--  lt_simple_compile_test_code="\
--      subroutine t
--      return
--      end
--"
- 
--  # Code to be used in simple link tests
--  lt_simple_link_test_code="\
--      program t
--      end
--"
-+# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST)
-+# ----------------------------------------
-+# OPTION-LIST is a space-separated list of Libtool options associated
-+# with MACRO-NAME.  If any OPTION has a matching handler declared with
-+# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about
-+# the unknown option and exit.
-+m4_defun([_LT_SET_OPTIONS],
-+[# Set options
-+m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
-+    [_LT_SET_OPTION([$1], _LT_Option)])
-+
-+m4_if([$1],[LT_INIT],[
-+  dnl
-+  dnl Simply set some default values (i.e off) if boolean options were not
-+  dnl specified:
-+  _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no
-+  ])
-+  _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no
-+  ])
-+  dnl
-+  dnl If no reference was made to various pairs of opposing options, then
-+  dnl we run the default mode handler for the pair.  For example, if neither
-+  dnl `shared' nor `disable-shared' was passed, we enable building of shared
-+  dnl archives by default:
-+  _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
-+  _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
-+  _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
-+  _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
-+  		   [_LT_ENABLE_FAST_INSTALL])
-+  ])
-+])# _LT_SET_OPTIONS
- 
--  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
--  _LT_TAG_COMPILER
- 
--  # save warnings/boilerplate of simple test code
--  _LT_COMPILER_BOILERPLATE
--  _LT_LINKER_BOILERPLATE
- 
--  # Allow CC to be a program name with arguments.
--  lt_save_CC="$CC"
--  lt_save_GCC=$GCC
--  CC=${FC-"f95"}
--  compiler=$CC
--  GCC=$ac_cv_fc_compiler_gnu
-+# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME)
-+# -----------------------------------------
-+m4_define([_LT_MANGLE_DEFUN],
-+[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])])
- 
--  _LT_TAGVAR(compiler, $1)=$CC
--  _LT_CC_BASENAME([$compiler])
- 
--  if test -n "$compiler"; then
--    AC_MSG_CHECKING([if libtool supports shared libraries])
--    AC_MSG_RESULT([$can_build_shared])
-+# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE)
-+# -----------------------------------------------
-+m4_define([LT_OPTION_DEFINE],
-+[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl
-+])# LT_OPTION_DEFINE
- 
--    AC_MSG_CHECKING([whether to build shared libraries])
--    test "$can_build_shared" = "no" && enable_shared=no
- 
--    # On AIX, shared libraries and static libraries use the same namespace, and
--    # are all built from PIC.
--    case $host_os in
--      aix3*)
--        test "$enable_shared" = yes && enable_static=no
--        if test -n "$RANLIB"; then
--          archive_cmds="$archive_cmds~\$RANLIB \$lib"
--          postinstall_cmds='$RANLIB $lib'
--        fi
--        ;;
--      aix[[4-9]]*)
--	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
--	  test "$enable_shared" = yes && enable_static=no
--	fi
--        ;;
--    esac
--    AC_MSG_RESULT([$enable_shared])
-+# dlopen
-+# ------
-+LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes
-+])
- 
--    AC_MSG_CHECKING([whether to build static libraries])
--    # Make sure either enable_shared or enable_static is yes.
--    test "$enable_shared" = yes || enable_static=yes
--    AC_MSG_RESULT([$enable_static])
-+AU_DEFUN([AC_LIBTOOL_DLOPEN],
-+[_LT_SET_OPTION([LT_INIT], [dlopen])
-+AC_DIAGNOSE([obsolete],
-+[$0: Remove this warning and the call to _LT_SET_OPTION when you
-+put the `dlopen' option into LT_INIT's first parameter.])
-+])
- 
--    _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu"
--    _LT_TAGVAR(LD, $1)="$LD"
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], [])
- 
--    ## CAVEAT EMPTOR:
--    ## There is no encapsulation within the following macros, do not change
--    ## the running order or otherwise move them around unless you know exactly
--    ## what you are doing...
--    _LT_SYS_HIDDEN_LIBDEPS($1)
--    _LT_COMPILER_PIC($1)
--    _LT_COMPILER_C_O($1)
--    _LT_COMPILER_FILE_LOCKS($1)
--    _LT_LINKER_SHLIBS($1)
--    _LT_SYS_DYNAMIC_LINKER($1)
--    _LT_LINKER_HARDCODE_LIBPATH($1)
- 
--    _LT_CONFIG($1)
--  fi # test -n "$compiler"
-+# win32-dll
-+# ---------
-+# Declare package support for building win32 dll's.
-+LT_OPTION_DEFINE([LT_INIT], [win32-dll],
-+[enable_win32_dll=yes
- 
--  GCC=$lt_save_GCC
--  CC="$lt_save_CC"
--fi # test "$_lt_disable_FC" != yes
-+case $host in
-+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
-+  AC_CHECK_TOOL(AS, as, false)
-+  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-+  AC_CHECK_TOOL(OBJDUMP, objdump, false)
-+  ;;
-+esac
- 
--AC_LANG_POP
--])# _LT_LANG_FC_CONFIG
-+test -z "$AS" && AS=as
-+_LT_DECL([], [AS],      [0], [Assembler program])dnl
- 
-+test -z "$DLLTOOL" && DLLTOOL=dlltool
-+_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl
- 
--# _LT_LANG_GCJ_CONFIG([TAG])
--# --------------------------
--# Ensure that the configuration variables for the GNU Java Compiler compiler
--# are suitably defined.  These variables are subsequently used by _LT_CONFIG
--# to write the compiler configuration to `libtool'.
--m4_defun([_LT_LANG_GCJ_CONFIG],
--[AC_REQUIRE([LT_PROG_GCJ])dnl
--AC_LANG_SAVE
-+test -z "$OBJDUMP" && OBJDUMP=objdump
-+_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl
-+])# win32-dll
- 
--# Source file extension for Java test sources.
--ac_ext=java
-+AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
-+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+_LT_SET_OPTION([LT_INIT], [win32-dll])
-+AC_DIAGNOSE([obsolete],
-+[$0: Remove this warning and the call to _LT_SET_OPTION when you
-+put the `win32-dll' option into LT_INIT's first parameter.])
-+])
- 
--# Object file extension for compiled Java test sources.
--objext=o
--_LT_TAGVAR(objext, $1)=$objext
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
- 
--# Code to be used in simple compile tests
--lt_simple_compile_test_code="class foo {}"
- 
--# Code to be used in simple link tests
--lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
-+# _LT_ENABLE_SHARED([DEFAULT])
-+# ----------------------------
-+# implement the --enable-shared flag, and supports the `shared' and
-+# `disable-shared' LT_INIT options.
-+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-+m4_define([_LT_ENABLE_SHARED],
-+[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
-+AC_ARG_ENABLE([shared],
-+    [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
-+	[build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])],
-+    [p=${PACKAGE-default}
-+    case $enableval in
-+    yes) enable_shared=yes ;;
-+    no) enable_shared=no ;;
-+    *)
-+      enable_shared=no
-+      # Look at the argument we got.  We use all the common list separators.
-+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-+      for pkg in $enableval; do
-+	IFS="$lt_save_ifs"
-+	if test "X$pkg" = "X$p"; then
-+	  enable_shared=yes
-+	fi
-+      done
-+      IFS="$lt_save_ifs"
-+      ;;
-+    esac],
-+    [enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
- 
--# ltmain only uses $CC for tagged configurations so make sure $CC is set.
--_LT_TAG_COMPILER
-+    _LT_DECL([build_libtool_libs], [enable_shared], [0],
-+	[Whether or not to build shared libraries])
-+])# _LT_ENABLE_SHARED
- 
--# save warnings/boilerplate of simple test code
--_LT_COMPILER_BOILERPLATE
--_LT_LINKER_BOILERPLATE
-+LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])])
-+LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])])
- 
--# Allow CC to be a program name with arguments.
--lt_save_CC="$CC"
--lt_save_GCC=$GCC
--GCC=yes
--CC=${GCJ-"gcj"}
--compiler=$CC
--_LT_TAGVAR(compiler, $1)=$CC
--_LT_TAGVAR(LD, $1)="$LD"
--_LT_CC_BASENAME([$compiler])
-+# Old names:
-+AC_DEFUN([AC_ENABLE_SHARED],
-+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared])
-+])
- 
--# GCJ did not exist at the time GCC didn't implicitly link libc in.
--_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-+AC_DEFUN([AC_DISABLE_SHARED],
-+[_LT_SET_OPTION([LT_INIT], [disable-shared])
-+])
- 
--_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-+AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
-+AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
- 
--if test -n "$compiler"; then
--  _LT_COMPILER_NO_RTTI($1)
--  _LT_COMPILER_PIC($1)
--  _LT_COMPILER_C_O($1)
--  _LT_COMPILER_FILE_LOCKS($1)
--  _LT_LINKER_SHLIBS($1)
--  _LT_LINKER_HARDCODE_LIBPATH($1)
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AM_ENABLE_SHARED], [])
-+dnl AC_DEFUN([AM_DISABLE_SHARED], [])
- 
--  _LT_CONFIG($1)
--fi
- 
--AC_LANG_RESTORE
- 
--GCC=$lt_save_GCC
--CC="$lt_save_CC"
--])# _LT_LANG_GCJ_CONFIG
-+# _LT_ENABLE_STATIC([DEFAULT])
-+# ----------------------------
-+# implement the --enable-static flag, and support the `static' and
-+# `disable-static' LT_INIT options.
-+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-+m4_define([_LT_ENABLE_STATIC],
-+[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
-+AC_ARG_ENABLE([static],
-+    [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@],
-+	[build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])],
-+    [p=${PACKAGE-default}
-+    case $enableval in
-+    yes) enable_static=yes ;;
-+    no) enable_static=no ;;
-+    *)
-+     enable_static=no
-+      # Look at the argument we got.  We use all the common list separators.
-+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-+      for pkg in $enableval; do
-+	IFS="$lt_save_ifs"
-+	if test "X$pkg" = "X$p"; then
-+	  enable_static=yes
-+	fi
-+      done
-+      IFS="$lt_save_ifs"
-+      ;;
-+    esac],
-+    [enable_static=]_LT_ENABLE_STATIC_DEFAULT)
- 
-+    _LT_DECL([build_old_libs], [enable_static], [0],
-+	[Whether or not to build static libraries])
-+])# _LT_ENABLE_STATIC
- 
--# _LT_LANG_RC_CONFIG([TAG])
--# -------------------------
--# Ensure that the configuration variables for the Windows resource compiler
--# are suitably defined.  These variables are subsequently used by _LT_CONFIG
--# to write the compiler configuration to `libtool'.
--m4_defun([_LT_LANG_RC_CONFIG],
--[AC_REQUIRE([LT_PROG_RC])dnl
--AC_LANG_SAVE
-+LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])])
-+LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])])
- 
--# Source file extension for RC test sources.
--ac_ext=rc
-+# Old names:
-+AC_DEFUN([AC_ENABLE_STATIC],
-+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static])
-+])
- 
--# Object file extension for compiled RC test sources.
--objext=o
--_LT_TAGVAR(objext, $1)=$objext
-+AC_DEFUN([AC_DISABLE_STATIC],
-+[_LT_SET_OPTION([LT_INIT], [disable-static])
-+])
- 
--# Code to be used in simple compile tests
--lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
-+AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
-+AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
- 
--# Code to be used in simple link tests
--lt_simple_link_test_code="$lt_simple_compile_test_code"
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AM_ENABLE_STATIC], [])
-+dnl AC_DEFUN([AM_DISABLE_STATIC], [])
- 
--# ltmain only uses $CC for tagged configurations so make sure $CC is set.
--_LT_TAG_COMPILER
- 
--# save warnings/boilerplate of simple test code
--_LT_COMPILER_BOILERPLATE
--_LT_LINKER_BOILERPLATE
- 
--# Allow CC to be a program name with arguments.
--lt_save_CC="$CC"
--lt_save_GCC=$GCC
--GCC=
--CC=${RC-"windres"}
--compiler=$CC
--_LT_TAGVAR(compiler, $1)=$CC
--_LT_CC_BASENAME([$compiler])
--_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-+# _LT_ENABLE_FAST_INSTALL([DEFAULT])
-+# ----------------------------------
-+# implement the --enable-fast-install flag, and support the `fast-install'
-+# and `disable-fast-install' LT_INIT options.
-+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-+m4_define([_LT_ENABLE_FAST_INSTALL],
-+[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
-+AC_ARG_ENABLE([fast-install],
-+    [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
-+    [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
-+    [p=${PACKAGE-default}
-+    case $enableval in
-+    yes) enable_fast_install=yes ;;
-+    no) enable_fast_install=no ;;
-+    *)
-+      enable_fast_install=no
-+      # Look at the argument we got.  We use all the common list separators.
-+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-+      for pkg in $enableval; do
-+	IFS="$lt_save_ifs"
-+	if test "X$pkg" = "X$p"; then
-+	  enable_fast_install=yes
-+	fi
-+      done
-+      IFS="$lt_save_ifs"
-+      ;;
-+    esac],
-+    [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
- 
--if test -n "$compiler"; then
--  :
--  _LT_CONFIG($1)
--fi
-+_LT_DECL([fast_install], [enable_fast_install], [0],
-+	 [Whether or not to optimize for fast installation])dnl
-+])# _LT_ENABLE_FAST_INSTALL
- 
--GCC=$lt_save_GCC
--AC_LANG_RESTORE
--CC="$lt_save_CC"
--])# _LT_LANG_RC_CONFIG
-+LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])])
-+LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])])
- 
-+# Old names:
-+AU_DEFUN([AC_ENABLE_FAST_INSTALL],
-+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
-+AC_DIAGNOSE([obsolete],
-+[$0: Remove this warning and the call to _LT_SET_OPTION when you put
-+the `fast-install' option into LT_INIT's first parameter.])
-+])
- 
--# LT_PROG_GCJ
--# -----------
--AC_DEFUN([LT_PROG_GCJ],
--[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ],
--  [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ],
--    [AC_CHECK_TOOL(GCJ, gcj,)
--      test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
--      AC_SUBST(GCJFLAGS)])])[]dnl
-+AU_DEFUN([AC_DISABLE_FAST_INSTALL],
-+[_LT_SET_OPTION([LT_INIT], [disable-fast-install])
-+AC_DIAGNOSE([obsolete],
-+[$0: Remove this warning and the call to _LT_SET_OPTION when you put
-+the `disable-fast-install' option into LT_INIT's first parameter.])
- ])
- 
--# Old name:
--AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ])
- dnl aclocal-1.4 backwards compatibility:
--dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
-+dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
-+dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
- 
- 
--# LT_PROG_RC
--# ----------
--AC_DEFUN([LT_PROG_RC],
--[AC_CHECK_TOOL(RC, windres,)
--])
-+# _LT_WITH_PIC([MODE])
-+# --------------------
-+# implement the --with-pic flag, and support the `pic-only' and `no-pic'
-+# LT_INIT options.
-+# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
-+m4_define([_LT_WITH_PIC],
-+[AC_ARG_WITH([pic],
-+    [AS_HELP_STRING([--with-pic],
-+	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
-+    [pic_mode="$withval"],
-+    [pic_mode=default])
-+
-+test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
-+
-+_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
-+])# _LT_WITH_PIC
-+
-+LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])])
-+LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])])
- 
- # Old name:
--AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC])
-+AU_DEFUN([AC_LIBTOOL_PICMODE],
-+[_LT_SET_OPTION([LT_INIT], [pic-only])
-+AC_DIAGNOSE([obsolete],
-+[$0: Remove this warning and the call to _LT_SET_OPTION when you
-+put the `pic-only' option into LT_INIT's first parameter.])
-+])
-+
- dnl aclocal-1.4 backwards compatibility:
--dnl AC_DEFUN([LT_AC_PROG_RC], [])
-+dnl AC_DEFUN([AC_LIBTOOL_PICMODE], [])
- 
- 
--# _LT_DECL_EGREP
--# --------------
--# If we don't have a new enough Autoconf to choose the best grep
--# available, choose the one first in the user's PATH.
--m4_defun([_LT_DECL_EGREP],
--[AC_REQUIRE([AC_PROG_EGREP])dnl
--AC_REQUIRE([AC_PROG_FGREP])dnl
--test -z "$GREP" && GREP=grep
--_LT_DECL([], [GREP], [1], [A grep program that handles long lines])
--_LT_DECL([], [EGREP], [1], [An ERE matcher])
--_LT_DECL([], [FGREP], [1], [A literal string matcher])
--dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too
--AC_SUBST([GREP])
--])
-+m4_define([_LTDL_MODE], [])
-+LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive],
-+		 [m4_define([_LTDL_MODE], [nonrecursive])])
-+LT_OPTION_DEFINE([LTDL_INIT], [recursive],
-+		 [m4_define([_LTDL_MODE], [recursive])])
-+LT_OPTION_DEFINE([LTDL_INIT], [subproject],
-+		 [m4_define([_LTDL_MODE], [subproject])])
- 
-+m4_define([_LTDL_TYPE], [])
-+LT_OPTION_DEFINE([LTDL_INIT], [installable],
-+		 [m4_define([_LTDL_TYPE], [installable])])
-+LT_OPTION_DEFINE([LTDL_INIT], [convenience],
-+		 [m4_define([_LTDL_TYPE], [convenience])])
- 
--# _LT_DECL_OBJDUMP
--# --------------
--# If we don't have a new enough Autoconf to choose the best objdump
--# available, choose the one first in the user's PATH.
--m4_defun([_LT_DECL_OBJDUMP],
--[AC_CHECK_TOOL(OBJDUMP, objdump, false)
--test -z "$OBJDUMP" && OBJDUMP=objdump
--_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
--AC_SUBST([OBJDUMP])
--])
-+# ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
-+#
-+# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
-+# Written by Gary V. Vaughan, 2004
-+#
-+# This file is free software; the Free Software Foundation gives
-+# unlimited permission to copy and/or distribute it, with or without
-+# modifications, as long as this notice is preserved.
- 
-+# serial 6 ltsugar.m4
- 
--# _LT_DECL_SED
--# ------------
--# Check for a fully-functional sed program, that truncates
--# as few characters as possible.  Prefer GNU sed if found.
--m4_defun([_LT_DECL_SED],
--[AC_PROG_SED
--test -z "$SED" && SED=sed
--Xsed="$SED -e 1s/^X//"
--_LT_DECL([], [SED], [1], [A sed program that does not truncate output])
--_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"],
--    [Sed that helps us avoid accidentally triggering echo(1) options like -n])
--])# _LT_DECL_SED
-+# This is to help aclocal find these macros, as it can't see m4_define.
-+AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
- 
--m4_ifndef([AC_PROG_SED], [
--# NOTE: This macro has been submitted for inclusion into   #
--#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
--#  a released version of Autoconf we should remove this    #
--#  macro and use it instead.                               #
- 
--m4_defun([AC_PROG_SED],
--[AC_MSG_CHECKING([for a sed that does not truncate output])
--AC_CACHE_VAL(lt_cv_path_SED,
--[# Loop through the user's path and test for sed and gsed.
--# Then use that list of sed's as ones to test for truncation.
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  for lt_ac_prog in sed gsed; do
--    for ac_exec_ext in '' $ac_executable_extensions; do
--      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
--        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
--      fi
--    done
--  done
--done
--IFS=$as_save_IFS
--lt_ac_max=0
--lt_ac_count=0
--# Add /usr/xpg4/bin/sed as it is typically found on Solaris
--# along with /bin/sed that truncates output.
--for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
--  test ! -f $lt_ac_sed && continue
--  cat /dev/null > conftest.in
--  lt_ac_count=0
--  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
--  # Check for GNU sed and select it if it is found.
--  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
--    lt_cv_path_SED=$lt_ac_sed
--    break
--  fi
--  while true; do
--    cat conftest.in conftest.in >conftest.tmp
--    mv conftest.tmp conftest.in
--    cp conftest.in conftest.nl
--    echo >>conftest.nl
--    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
--    cmp -s conftest.out conftest.nl || break
--    # 10000 chars as input seems more than enough
--    test $lt_ac_count -gt 10 && break
--    lt_ac_count=`expr $lt_ac_count + 1`
--    if test $lt_ac_count -gt $lt_ac_max; then
--      lt_ac_max=$lt_ac_count
--      lt_cv_path_SED=$lt_ac_sed
--    fi
--  done
--done
--])
--SED=$lt_cv_path_SED
--AC_SUBST([SED])
--AC_MSG_RESULT([$SED])
--])#AC_PROG_SED
--])#m4_ifndef
-+# lt_join(SEP, ARG1, [ARG2...])
-+# -----------------------------
-+# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their
-+# associated separator.
-+# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier
-+# versions in m4sugar had bugs.
-+m4_define([lt_join],
-+[m4_if([$#], [1], [],
-+       [$#], [2], [[$2]],
-+       [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])])
-+m4_define([_lt_join],
-+[m4_if([$#$2], [2], [],
-+       [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])])
- 
--# Old name:
--AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED])
--dnl aclocal-1.4 backwards compatibility:
--dnl AC_DEFUN([LT_AC_PROG_SED], [])
- 
-+# lt_car(LIST)
-+# lt_cdr(LIST)
-+# ------------
-+# Manipulate m4 lists.
-+# These macros are necessary as long as will still need to support
-+# Autoconf-2.59 which quotes differently.
-+m4_define([lt_car], [[$1]])
-+m4_define([lt_cdr],
-+[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
-+       [$#], 1, [],
-+       [m4_dquote(m4_shift($@))])])
-+m4_define([lt_unquote], $1)
- 
--# _LT_CHECK_SHELL_FEATURES
--# ------------------------
--# Find out whether the shell is Bourne or XSI compatible,
--# or has some other useful features.
--m4_defun([_LT_CHECK_SHELL_FEATURES],
--[AC_MSG_CHECKING([whether the shell understands some XSI constructs])
--# Try some XSI features
--xsi_shell=no
--( _lt_dummy="a/b/c"
--  test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
--      = c,a/b,, \
--    && eval 'test $(( 1 + 1 )) -eq 2 \
--    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
--  && xsi_shell=yes
--AC_MSG_RESULT([$xsi_shell])
--_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell'])
- 
--AC_MSG_CHECKING([whether the shell understands "+="])
--lt_shell_append=no
--( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \
--    >/dev/null 2>&1 \
--  && lt_shell_append=yes
--AC_MSG_RESULT([$lt_shell_append])
--_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append'])
-+# lt_append(MACRO-NAME, STRING, [SEPARATOR])
-+# ------------------------------------------
-+# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
-+# Note that neither SEPARATOR nor STRING are expanded; they are appended
-+# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
-+# No SEPARATOR is output if MACRO-NAME was previously undefined (different
-+# than defined and empty).
-+#
-+# This macro is needed until we can rely on Autoconf 2.62, since earlier
-+# versions of m4sugar mistakenly expanded SEPARATOR but not STRING.
-+m4_define([lt_append],
-+[m4_define([$1],
-+	   m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])])
- 
--if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
--  lt_unset=unset
--else
--  lt_unset=false
--fi
--_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl
- 
--# test EBCDIC or ASCII
--case `echo X|tr X '\101'` in
-- A) # ASCII based system
--    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
--  lt_SP2NL='tr \040 \012'
--  lt_NL2SP='tr \015\012 \040\040'
--  ;;
-- *) # EBCDIC based system
--  lt_SP2NL='tr \100 \n'
--  lt_NL2SP='tr \r\n \100\100'
--  ;;
--esac
--_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl
--_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
--])# _LT_CHECK_SHELL_FEATURES
- 
-+# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...])
-+# ----------------------------------------------------------
-+# Produce a SEP delimited list of all paired combinations of elements of
-+# PREFIX-LIST with SUFFIX1 through SUFFIXn.  Each element of the list
-+# has the form PREFIXmINFIXSUFFIXn.
-+# Needed until we can rely on m4_combine added in Autoconf 2.62.
-+m4_define([lt_combine],
-+[m4_if(m4_eval([$# > 3]), [1],
-+       [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl
-+[[m4_foreach([_Lt_prefix], [$2],
-+	     [m4_foreach([_Lt_suffix],
-+		]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[,
-+	[_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])])
- 
--# _LT_PROG_XSI_SHELLFNS
--# ---------------------
--# Bourne and XSI compatible variants of some useful shell functions.
--m4_defun([_LT_PROG_XSI_SHELLFNS],
--[case $xsi_shell in
--  yes)
--    cat << \_LT_EOF >> "$cfgfile"
- 
--# func_dirname file append nondir_replacement
--# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
--# otherwise set result to NONDIR_REPLACEMENT.
--func_dirname ()
--{
--  case ${1} in
--    */*) func_dirname_result="${1%/*}${2}" ;;
--    *  ) func_dirname_result="${3}" ;;
--  esac
--}
-+# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])
-+# -----------------------------------------------------------------------
-+# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited
-+# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ.
-+m4_define([lt_if_append_uniq],
-+[m4_ifdef([$1],
-+	  [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1],
-+		 [lt_append([$1], [$2], [$3])$4],
-+		 [$5])],
-+	  [lt_append([$1], [$2], [$3])$4])])
- 
--# func_basename file
--func_basename ()
--{
--  func_basename_result="${1##*/}"
--}
- 
--# func_dirname_and_basename file append nondir_replacement
--# perform func_basename and func_dirname in a single function
--# call:
--#   dirname:  Compute the dirname of FILE.  If nonempty,
--#             add APPEND to the result, otherwise set result
--#             to NONDIR_REPLACEMENT.
--#             value returned in "$func_dirname_result"
--#   basename: Compute filename of FILE.
--#             value retuned in "$func_basename_result"
--# Implementation must be kept synchronized with func_dirname
--# and func_basename. For efficiency, we do not delegate to
--# those functions but instead duplicate the functionality here.
--func_dirname_and_basename ()
--{
--  case ${1} in
--    */*) func_dirname_result="${1%/*}${2}" ;;
--    *  ) func_dirname_result="${3}" ;;
--  esac
--  func_basename_result="${1##*/}"
--}
-+# lt_dict_add(DICT, KEY, VALUE)
-+# -----------------------------
-+m4_define([lt_dict_add],
-+[m4_define([$1($2)], [$3])])
- 
--# func_stripname prefix suffix name
--# strip PREFIX and SUFFIX off of NAME.
--# PREFIX and SUFFIX must not contain globbing or regex special
--# characters, hashes, percent signs, but SUFFIX may contain a leading
--# dot (in which case that matches only a dot).
--func_stripname ()
--{
--  # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
--  # positional parameters, so assign one to ordinary parameter first.
--  func_stripname_result=${3}
--  func_stripname_result=${func_stripname_result#"${1}"}
--  func_stripname_result=${func_stripname_result%"${2}"}
--}
- 
--# func_opt_split
--func_opt_split ()
--{
--  func_opt_split_opt=${1%%=*}
--  func_opt_split_arg=${1#*=}
--}
-+# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE)
-+# --------------------------------------------
-+m4_define([lt_dict_add_subkey],
-+[m4_define([$1($2:$3)], [$4])])
- 
--# func_lo2o object
--func_lo2o ()
--{
--  case ${1} in
--    *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
--    *)    func_lo2o_result=${1} ;;
--  esac
--}
- 
--# func_xform libobj-or-source
--func_xform ()
--{
--  func_xform_result=${1%.*}.lo
--}
-+# lt_dict_fetch(DICT, KEY, [SUBKEY])
-+# ----------------------------------
-+m4_define([lt_dict_fetch],
-+[m4_ifval([$3],
-+	m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]),
-+    m4_ifdef([$1($2)], [m4_defn([$1($2)])]))])
- 
--# func_arith arithmetic-term...
--func_arith ()
--{
--  func_arith_result=$(( $[*] ))
--}
- 
--# func_len string
--# STRING may not start with a hyphen.
--func_len ()
--{
--  func_len_result=${#1}
--}
-+# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE])
-+# -----------------------------------------------------------------
-+m4_define([lt_if_dict_fetch],
-+[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4],
-+	[$5],
-+    [$6])])
- 
--_LT_EOF
--    ;;
--  *) # Bourne compatible functions.
--    cat << \_LT_EOF >> "$cfgfile"
- 
--# func_dirname file append nondir_replacement
--# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
--# otherwise set result to NONDIR_REPLACEMENT.
--func_dirname ()
--{
--  # Extract subdirectory from the argument.
--  func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
--  if test "X$func_dirname_result" = "X${1}"; then
--    func_dirname_result="${3}"
--  else
--    func_dirname_result="$func_dirname_result${2}"
--  fi
--}
-+# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...])
-+# --------------------------------------------------------------
-+m4_define([lt_dict_filter],
-+[m4_if([$5], [], [],
-+  [lt_join(m4_quote(m4_default([$4], [[, ]])),
-+           lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]),
-+		      [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl
-+])
- 
--# func_basename file
--func_basename ()
--{
--  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
--}
-+# ltversion.m4 -- version numbers			-*- Autoconf -*-
-+#
-+#   Copyright (C) 2004 Free Software Foundation, Inc.
-+#   Written by Scott James Remnant, 2004
-+#
-+# This file is free software; the Free Software Foundation gives
-+# unlimited permission to copy and/or distribute it, with or without
-+# modifications, as long as this notice is preserved.
-+
-+# Generated from ltversion.in.
-+
-+# serial 3017 ltversion.m4
-+# This file is part of GNU Libtool
-+
-+m4_define([LT_PACKAGE_VERSION], [2.2.6b])
-+m4_define([LT_PACKAGE_REVISION], [1.3017])
-+
-+AC_DEFUN([LTVERSION_VERSION],
-+[macro_version='2.2.6b'
-+macro_revision='1.3017'
-+_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
-+_LT_DECL(, macro_revision, 0)
-+])
- 
--dnl func_dirname_and_basename
--dnl A portable version of this function is already defined in general.m4sh
--dnl so there is no need for it here.
-+# lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
-+#
-+#   Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
-+#   Written by Scott James Remnant, 2004.
-+#
-+# This file is free software; the Free Software Foundation gives
-+# unlimited permission to copy and/or distribute it, with or without
-+# modifications, as long as this notice is preserved.
- 
--# func_stripname prefix suffix name
--# strip PREFIX and SUFFIX off of NAME.
--# PREFIX and SUFFIX must not contain globbing or regex special
--# characters, hashes, percent signs, but SUFFIX may contain a leading
--# dot (in which case that matches only a dot).
--# func_strip_suffix prefix name
--func_stripname ()
--{
--  case ${2} in
--    .*) func_stripname_result=`$ECHO "X${3}" \
--           | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
--    *)  func_stripname_result=`$ECHO "X${3}" \
--           | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
--  esac
--}
-+# serial 4 lt~obsolete.m4
- 
--# sed scripts:
--my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q'
--my_sed_long_arg='1s/^-[[^=]]*=//'
-+# These exist entirely to fool aclocal when bootstrapping libtool.
-+#
-+# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
-+# which have later been changed to m4_define as they aren't part of the
-+# exported API, or moved to Autoconf or Automake where they belong.
-+#
-+# The trouble is, aclocal is a bit thick.  It'll see the old AC_DEFUN
-+# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us
-+# using a macro with the same name in our local m4/libtool.m4 it'll
-+# pull the old libtool.m4 in (it doesn't see our shiny new m4_define
-+# and doesn't know about Autoconf macros at all.)
-+#
-+# So we provide this file, which has a silly filename so it's always
-+# included after everything else.  This provides aclocal with the
-+# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
-+# because those macros already exist, or will be overwritten later.
-+# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. 
-+#
-+# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
-+# Yes, that means every name once taken will need to remain here until
-+# we give up compatibility with versions before 1.7, at which point
-+# we need to keep only those names which we still refer to.
- 
--# func_opt_split
--func_opt_split ()
--{
--  func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
--  func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
--}
-+# This is to help aclocal find these macros, as it can't see m4_define.
-+AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])])
- 
--# func_lo2o object
--func_lo2o ()
--{
--  func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
--}
-+m4_ifndef([AC_LIBTOOL_LINKER_OPTION],	[AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])])
-+m4_ifndef([AC_PROG_EGREP],		[AC_DEFUN([AC_PROG_EGREP])])
-+m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])])
-+m4_ifndef([_LT_AC_SHELL_INIT],		[AC_DEFUN([_LT_AC_SHELL_INIT])])
-+m4_ifndef([_LT_AC_SYS_LIBPATH_AIX],	[AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])])
-+m4_ifndef([_LT_PROG_LTMAIN],		[AC_DEFUN([_LT_PROG_LTMAIN])])
-+m4_ifndef([_LT_AC_TAGVAR],		[AC_DEFUN([_LT_AC_TAGVAR])])
-+m4_ifndef([AC_LTDL_ENABLE_INSTALL],	[AC_DEFUN([AC_LTDL_ENABLE_INSTALL])])
-+m4_ifndef([AC_LTDL_PREOPEN],		[AC_DEFUN([AC_LTDL_PREOPEN])])
-+m4_ifndef([_LT_AC_SYS_COMPILER],	[AC_DEFUN([_LT_AC_SYS_COMPILER])])
-+m4_ifndef([_LT_AC_LOCK],		[AC_DEFUN([_LT_AC_LOCK])])
-+m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE],	[AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])])
-+m4_ifndef([_LT_AC_TRY_DLOPEN_SELF],	[AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])])
-+m4_ifndef([AC_LIBTOOL_PROG_CC_C_O],	[AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])])
-+m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])])
-+m4_ifndef([AC_LIBTOOL_OBJDIR],		[AC_DEFUN([AC_LIBTOOL_OBJDIR])])
-+m4_ifndef([AC_LTDL_OBJDIR],		[AC_DEFUN([AC_LTDL_OBJDIR])])
-+m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])])
-+m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP],	[AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])])
-+m4_ifndef([AC_PATH_MAGIC],		[AC_DEFUN([AC_PATH_MAGIC])])
-+m4_ifndef([AC_PROG_LD_GNU],		[AC_DEFUN([AC_PROG_LD_GNU])])
-+m4_ifndef([AC_PROG_LD_RELOAD_FLAG],	[AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])])
-+m4_ifndef([AC_DEPLIBS_CHECK_METHOD],	[AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])])
-+m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])])
-+m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])])
-+m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])])
-+m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS],	[AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])])
-+m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP],	[AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])])
-+m4_ifndef([LT_AC_PROG_EGREP],		[AC_DEFUN([LT_AC_PROG_EGREP])])
-+m4_ifndef([LT_AC_PROG_SED],		[AC_DEFUN([LT_AC_PROG_SED])])
-+m4_ifndef([_LT_CC_BASENAME],		[AC_DEFUN([_LT_CC_BASENAME])])
-+m4_ifndef([_LT_COMPILER_BOILERPLATE],	[AC_DEFUN([_LT_COMPILER_BOILERPLATE])])
-+m4_ifndef([_LT_LINKER_BOILERPLATE],	[AC_DEFUN([_LT_LINKER_BOILERPLATE])])
-+m4_ifndef([_AC_PROG_LIBTOOL],		[AC_DEFUN([_AC_PROG_LIBTOOL])])
-+m4_ifndef([AC_LIBTOOL_SETUP],		[AC_DEFUN([AC_LIBTOOL_SETUP])])
-+m4_ifndef([_LT_AC_CHECK_DLFCN],		[AC_DEFUN([_LT_AC_CHECK_DLFCN])])
-+m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER],	[AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])])
-+m4_ifndef([_LT_AC_TAGCONFIG],		[AC_DEFUN([_LT_AC_TAGCONFIG])])
-+m4_ifndef([AC_DISABLE_FAST_INSTALL],	[AC_DEFUN([AC_DISABLE_FAST_INSTALL])])
-+m4_ifndef([_LT_AC_LANG_CXX],		[AC_DEFUN([_LT_AC_LANG_CXX])])
-+m4_ifndef([_LT_AC_LANG_F77],		[AC_DEFUN([_LT_AC_LANG_F77])])
-+m4_ifndef([_LT_AC_LANG_GCJ],		[AC_DEFUN([_LT_AC_LANG_GCJ])])
-+m4_ifndef([AC_LIBTOOL_RC],		[AC_DEFUN([AC_LIBTOOL_RC])])
-+m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
-+m4_ifndef([_LT_AC_LANG_C_CONFIG],	[AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
-+m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
-+m4_ifndef([_LT_AC_LANG_CXX_CONFIG],	[AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])])
-+m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])])
-+m4_ifndef([_LT_AC_LANG_F77_CONFIG],	[AC_DEFUN([_LT_AC_LANG_F77_CONFIG])])
-+m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])])
-+m4_ifndef([_LT_AC_LANG_GCJ_CONFIG],	[AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])])
-+m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])])
-+m4_ifndef([_LT_AC_LANG_RC_CONFIG],	[AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
-+m4_ifndef([AC_LIBTOOL_CONFIG],		[AC_DEFUN([AC_LIBTOOL_CONFIG])])
-+m4_ifndef([_LT_AC_FILE_LTDLL_C],	[AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
- 
--# func_xform libobj-or-source
--func_xform ()
--{
--  func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'`
--}
-+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- 
--# func_arith arithmetic-term...
--func_arith ()
--{
--  func_arith_result=`expr "$[@]"`
--}
-+# AM_AUTOMAKE_VERSION(VERSION)
-+# ----------------------------
-+# Automake X.Y traces this macro to ensure aclocal.m4 has been
-+# generated from the m4 files accompanying Automake X.Y.
-+# (This private macro should not be called outside this file.)
-+AC_DEFUN([AM_AUTOMAKE_VERSION],
-+[am__api_version='1.11'
-+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
-+dnl require some minimum version.  Point them to the right macro.
-+m4_if([$1], [1.11.1], [],
-+      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
-+])
- 
--# func_len string
--# STRING may not start with a hyphen.
--func_len ()
--{
--  func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len`
--}
-+# _AM_AUTOCONF_VERSION(VERSION)
-+# -----------------------------
-+# aclocal traces this macro to find the Autoconf version.
-+# This is a private macro too.  Using m4_define simplifies
-+# the logic in aclocal, which can simply ignore this definition.
-+m4_define([_AM_AUTOCONF_VERSION], [])
- 
--_LT_EOF
--esac
-+# AM_SET_CURRENT_AUTOMAKE_VERSION
-+# -------------------------------
-+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
-+# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
-+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-+[AM_AUTOMAKE_VERSION([1.11.1])dnl
-+m4_ifndef([AC_AUTOCONF_VERSION],
-+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-+_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
- 
--case $lt_shell_append in
--  yes)
--    cat << \_LT_EOF >> "$cfgfile"
-+# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
- 
--# func_append var value
--# Append VALUE to the end of shell variable VAR.
--func_append ()
--{
--  eval "$[1]+=\$[2]"
--}
--_LT_EOF
--    ;;
--  *)
--    cat << \_LT_EOF >> "$cfgfile"
-+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- 
--# func_append var value
--# Append VALUE to the end of shell variable VAR.
--func_append ()
--{
--  eval "$[1]=\$$[1]\$[2]"
--}
-+# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-+# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
-+# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
-+#
-+# Of course, Automake must honor this variable whenever it calls a
-+# tool from the auxiliary directory.  The problem is that $srcdir (and
-+# therefore $ac_aux_dir as well) can be either absolute or relative,
-+# depending on how configure is run.  This is pretty annoying, since
-+# it makes $ac_aux_dir quite unusable in subdirectories: in the top
-+# source directory, any form will work fine, but in subdirectories a
-+# relative path needs to be adjusted first.
-+#
-+# $ac_aux_dir/missing
-+#    fails when called from a subdirectory if $ac_aux_dir is relative
-+# $top_srcdir/$ac_aux_dir/missing
-+#    fails if $ac_aux_dir is absolute,
-+#    fails when called from a subdirectory in a VPATH build with
-+#          a relative $ac_aux_dir
-+#
-+# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
-+# are both prefixed by $srcdir.  In an in-source build this is usually
-+# harmless because $srcdir is `.', but things will broke when you
-+# start a VPATH build or use an absolute $srcdir.
-+#
-+# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
-+# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
-+#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
-+# and then we would define $MISSING as
-+#   MISSING="\${SHELL} $am_aux_dir/missing"
-+# This will work as long as MISSING is not called from configure, because
-+# unfortunately $(top_srcdir) has no meaning in configure.
-+# However there are other variables, like CC, which are often used in
-+# configure, and could therefore not use this "fixed" $ac_aux_dir.
-+#
-+# Another solution, used here, is to always expand $ac_aux_dir to an
-+# absolute PATH.  The drawback is that using absolute paths prevent a
-+# configured tree to be moved without reconfiguration.
- 
--_LT_EOF
--    ;;
--  esac
-+AC_DEFUN([AM_AUX_DIR_EXPAND],
-+[dnl Rely on autoconf to set up CDPATH properly.
-+AC_PREREQ([2.50])dnl
-+# expand $ac_aux_dir to an absolute path
-+am_aux_dir=`cd $ac_aux_dir && pwd`
- ])
- 
--# Helper functions for option handling.                    -*- Autoconf -*-
--#
--#   Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
--#   Written by Gary V. Vaughan, 2004
-+# AM_CONDITIONAL                                            -*- Autoconf -*-
-+
-+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 9
-+
-+# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-+# -------------------------------------
-+# Define a conditional.
-+AC_DEFUN([AM_CONDITIONAL],
-+[AC_PREREQ(2.52)dnl
-+ ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
-+	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-+AC_SUBST([$1_TRUE])dnl
-+AC_SUBST([$1_FALSE])dnl
-+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
-+_AM_SUBST_NOTMAKE([$1_FALSE])dnl
-+m4_define([_AM_COND_VALUE_$1], [$2])dnl
-+if $2; then
-+  $1_TRUE=
-+  $1_FALSE='#'
-+else
-+  $1_TRUE='#'
-+  $1_FALSE=
-+fi
-+AC_CONFIG_COMMANDS_PRE(
-+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
-+  AC_MSG_ERROR([[conditional "$1" was never defined.
-+Usually this means the macro was only invoked conditionally.]])
-+fi])])
-+
-+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
-+# Free Software Foundation, Inc.
- #
--# This file is free software; the Free Software Foundation gives
--# unlimited permission to copy and/or distribute it, with or without
--# modifications, as long as this notice is preserved.
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- 
--# serial 6 ltoptions.m4
-+# serial 10
- 
--# This is to help aclocal find these macros, as it can't see m4_define.
--AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
-+# 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,
-+# will think it sees a *use*, and therefore will trigger all it's
-+# C support machinery.  Also note that it means that autoscan, seeing
-+# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
- 
- 
--# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME)
--# ------------------------------------------
--m4_define([_LT_MANGLE_OPTION],
--[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])])
-+# _AM_DEPENDENCIES(NAME)
-+# ----------------------
-+# See how the compiler implements dependency checking.
-+# NAME is "CC", "CXX", "GCJ", or "OBJC".
-+# We try a few techniques and use that to set a single cache variable.
-+#
-+# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
-+# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
-+# dependency, and given that the user is not expected to run this macro,
-+# just rely on AC_PROG_CC.
-+AC_DEFUN([_AM_DEPENDENCIES],
-+[AC_REQUIRE([AM_SET_DEPDIR])dnl
-+AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-+AC_REQUIRE([AM_MAKE_INCLUDE])dnl
-+AC_REQUIRE([AM_DEP_TRACK])dnl
- 
-+ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
-+       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
-+       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-+       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
-+       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
-+                   [depcc="$$1"   am_compiler_list=])
- 
--# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME)
--# ---------------------------------------
--# Set option OPTION-NAME for macro MACRO-NAME, and if there is a
--# matching handler defined, dispatch to it.  Other OPTION-NAMEs are
--# saved as a flag.
--m4_define([_LT_SET_OPTION],
--[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
--m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
--        _LT_MANGLE_DEFUN([$1], [$2]),
--    [m4_warning([Unknown $1 option `$2'])])[]dnl
--])
-+AC_CACHE_CHECK([dependency style of $depcc],
-+               [am_cv_$1_dependencies_compiler_type],
-+[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-+  # We make a subdir and do the tests there.  Otherwise we can end up
-+  # making bogus files that we don't know about and never remove.  For
-+  # instance it was reported that on HP-UX the gcc test will end up
-+  # making a dummy file named `D' -- because `-MD' means `put the output
-+  # in D'.
-+  mkdir conftest.dir
-+  # Copy depcomp to subdir because otherwise we won't find it if we're
-+  # using a relative directory.
-+  cp "$am_depcomp" conftest.dir
-+  cd conftest.dir
-+  # We will build objects and dependencies in a subdirectory because
-+  # it helps to detect inapplicable dependency modes.  For instance
-+  # both Tru64's cc and ICC support -MD to output dependencies as a
-+  # side effect of compilation, but ICC will put the dependencies in
-+  # the current directory while Tru64 will put them in the object
-+  # directory.
-+  mkdir sub
- 
-+  am_cv_$1_dependencies_compiler_type=none
-+  if test "$am_compiler_list" = ""; then
-+     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
-+  fi
-+  am__universal=false
-+  m4_case([$1], [CC],
-+    [case " $depcc " in #(
-+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-+     esac],
-+    [CXX],
-+    [case " $depcc " in #(
-+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-+     esac])
- 
--# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET])
--# ------------------------------------------------------------
--# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
--m4_define([_LT_IF_OPTION],
--[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])])
-+  for depmode in $am_compiler_list; do
-+    # Setup a source with many dependencies, because some compilers
-+    # like to wrap large dependency lists on column 80 (with \), and
-+    # we should not choose a depcomp mode which is confused by this.
-+    #
-+    # We need to recreate these files for each test, as the compiler may
-+    # overwrite some of them when testing with obscure command lines.
-+    # This happens at least with the AIX C compiler.
-+    : > sub/conftest.c
-+    for i in 1 2 3 4 5 6; do
-+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-+      # Solaris 8's {/usr,}/bin/sh.
-+      touch sub/conftst$i.h
-+    done
-+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
- 
-+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-+    # mode.  It turns out that the SunPro C++ compiler does not properly
-+    # handle `-M -o', and we need to detect this.  Also, some Intel
-+    # versions had trouble with output in subdirs
-+    am__obj=sub/conftest.${OBJEXT-o}
-+    am__minus_obj="-o $am__obj"
-+    case $depmode in
-+    gcc)
-+      # This depmode causes a compiler race in universal mode.
-+      test "$am__universal" = false || continue
-+      ;;
-+    nosideeffect)
-+      # after this tag, mechanisms are not by side-effect, so they'll
-+      # only be used when explicitly requested
-+      if test "x$enable_dependency_tracking" = xyes; then
-+	continue
-+      else
-+	break
-+      fi
-+      ;;
-+    msvisualcpp | msvcmsys)
-+      # This compiler won't grok `-c -o', but also, the minuso test has
-+      # not run yet.  These depmodes are late enough in the game, and
-+      # so weak that their functioning should not be impacted.
-+      am__obj=conftest.${OBJEXT-o}
-+      am__minus_obj=
-+      ;;
-+    none) break ;;
-+    esac
-+    if depmode=$depmode \
-+       source=sub/conftest.c object=$am__obj \
-+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
-+         >/dev/null 2>conftest.err &&
-+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-+       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
-+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-+      # icc doesn't choke on unknown options, it will just issue warnings
-+      # or remarks (even with -Werror).  So we grep stderr for any message
-+      # that says an option was ignored or not supported.
-+      # When given -MP, icc 7.0 and 7.1 complain thusly:
-+      #   icc: Command line warning: ignoring option '-M'; no argument required
-+      # The diagnosis changed in icc 8.0:
-+      #   icc: Command line remark: option '-MP' not supported
-+      if (grep 'ignoring option' conftest.err ||
-+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-+        am_cv_$1_dependencies_compiler_type=$depmode
-+        break
-+      fi
-+    fi
-+  done
- 
--# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET)
--# -------------------------------------------------------
--# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME
--# are set.
--m4_define([_LT_UNLESS_OPTIONS],
--[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
--	    [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option),
--		      [m4_define([$0_found])])])[]dnl
--m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3
--])[]dnl
-+  cd ..
-+  rm -rf conftest.dir
-+else
-+  am_cv_$1_dependencies_compiler_type=none
-+fi
-+])
-+AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
-+AM_CONDITIONAL([am__fastdep$1], [
-+  test "x$enable_dependency_tracking" != xno \
-+  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
- ])
- 
- 
--# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST)
--# ----------------------------------------
--# OPTION-LIST is a space-separated list of Libtool options associated
--# with MACRO-NAME.  If any OPTION has a matching handler declared with
--# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about
--# the unknown option and exit.
--m4_defun([_LT_SET_OPTIONS],
--[# Set options
--m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
--    [_LT_SET_OPTION([$1], _LT_Option)])
--
--m4_if([$1],[LT_INIT],[
--  dnl
--  dnl Simply set some default values (i.e off) if boolean options were not
--  dnl specified:
--  _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no
--  ])
--  _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no
--  ])
--  dnl
--  dnl If no reference was made to various pairs of opposing options, then
--  dnl we run the default mode handler for the pair.  For example, if neither
--  dnl `shared' nor `disable-shared' was passed, we enable building of shared
--  dnl archives by default:
--  _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
--  _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
--  _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
--  _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
--  		   [_LT_ENABLE_FAST_INSTALL])
--  ])
--])# _LT_SET_OPTIONS
-+# AM_SET_DEPDIR
-+# -------------
-+# Choose a directory name for dependency files.
-+# This macro is AC_REQUIREd in _AM_DEPENDENCIES
-+AC_DEFUN([AM_SET_DEPDIR],
-+[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-+AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
-+])
- 
- 
-+# AM_DEP_TRACK
-+# ------------
-+AC_DEFUN([AM_DEP_TRACK],
-+[AC_ARG_ENABLE(dependency-tracking,
-+[  --disable-dependency-tracking  speeds up one-time build
-+  --enable-dependency-tracking   do not reject slow dependency extractors])
-+if test "x$enable_dependency_tracking" != xno; then
-+  am_depcomp="$ac_aux_dir/depcomp"
-+  AMDEPBACKSLASH='\'
-+fi
-+AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-+AC_SUBST([AMDEPBACKSLASH])dnl
-+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
-+])
- 
--# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME)
--# -----------------------------------------
--m4_define([_LT_MANGLE_DEFUN],
--[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])])
-+# Generate code to set up dependency tracking.              -*- Autoconf -*-
- 
-+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- 
--# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE)
--# -----------------------------------------------
--m4_define([LT_OPTION_DEFINE],
--[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl
--])# LT_OPTION_DEFINE
-+#serial 5
- 
-+# _AM_OUTPUT_DEPENDENCY_COMMANDS
-+# ------------------------------
-+AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-+[{
-+  # Autoconf 2.62 quotes --file arguments for eval, but not when files
-+  # are listed without --file.  Let's play safe and only enable the eval
-+  # if we detect the quoting.
-+  case $CONFIG_FILES in
-+  *\'*) eval set x "$CONFIG_FILES" ;;
-+  *)   set x $CONFIG_FILES ;;
-+  esac
-+  shift
-+  for mf
-+  do
-+    # Strip MF so we end up with the name of the file.
-+    mf=`echo "$mf" | sed -e 's/:.*$//'`
-+    # Check whether this is an Automake generated Makefile or not.
-+    # We used to match only the files named `Makefile.in', but
-+    # some people rename them; so instead we look at the file content.
-+    # Grep'ing the first line is not enough: some people post-process
-+    # each Makefile.in and add a new line on top of each file to say so.
-+    # Grep'ing the whole file is not good either: AIX grep has a line
-+    # limit of 2048, but all sed's we know have understand at least 4000.
-+    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-+      dirpart=`AS_DIRNAME("$mf")`
-+    else
-+      continue
-+    fi
-+    # Extract the definition of DEPDIR, am__include, and am__quote
-+    # from the Makefile without running `make'.
-+    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-+    test -z "$DEPDIR" && continue
-+    am__include=`sed -n 's/^am__include = //p' < "$mf"`
-+    test -z "am__include" && continue
-+    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-+    # When using ansi2knr, U may be empty or an underscore; expand it
-+    U=`sed -n 's/^U = //p' < "$mf"`
-+    # Find all dependency output files, they are included files with
-+    # $(DEPDIR) in their names.  We invoke sed twice because it is the
-+    # simplest approach to changing $(DEPDIR) to its actual value in the
-+    # expansion.
-+    for file in `sed -n "
-+      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-+      # Make sure the directory exists.
-+      test -f "$dirpart/$file" && continue
-+      fdir=`AS_DIRNAME(["$file"])`
-+      AS_MKDIR_P([$dirpart/$fdir])
-+      # echo "creating $dirpart/$file"
-+      echo '# dummy' > "$dirpart/$file"
-+    done
-+  done
-+}
-+])# _AM_OUTPUT_DEPENDENCY_COMMANDS
- 
--# dlopen
--# ------
--LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes
--])
- 
--AU_DEFUN([AC_LIBTOOL_DLOPEN],
--[_LT_SET_OPTION([LT_INIT], [dlopen])
--AC_DIAGNOSE([obsolete],
--[$0: Remove this warning and the call to _LT_SET_OPTION when you
--put the `dlopen' option into LT_INIT's first parameter.])
-+# AM_OUTPUT_DEPENDENCY_COMMANDS
-+# -----------------------------
-+# This macro should only be invoked once -- use via AC_REQUIRE.
-+#
-+# This code is only required when automatic dependency tracking
-+# is enabled.  FIXME.  This creates each `.P' file that we will
-+# need in order to bootstrap the dependency handling code.
-+AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
-+[AC_CONFIG_COMMANDS([depfiles],
-+     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
-+     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
- ])
- 
--dnl aclocal-1.4 backwards compatibility:
--dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], [])
--
--
--# win32-dll
--# ---------
--# Declare package support for building win32 dll's.
--LT_OPTION_DEFINE([LT_INIT], [win32-dll],
--[enable_win32_dll=yes
-+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- 
--case $host in
--*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
--  AC_CHECK_TOOL(AS, as, false)
--  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
--  AC_CHECK_TOOL(OBJDUMP, objdump, false)
--  ;;
--esac
-+# serial 8
- 
--test -z "$AS" && AS=as
--_LT_DECL([], [AS],      [0], [Assembler program])dnl
-+# AM_CONFIG_HEADER is obsolete.  It has been replaced by AC_CONFIG_HEADERS.
-+AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
- 
--test -z "$DLLTOOL" && DLLTOOL=dlltool
--_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl
-+# Do all the work for Automake.                             -*- Autoconf -*-
- 
--test -z "$OBJDUMP" && OBJDUMP=objdump
--_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl
--])# win32-dll
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-+# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- 
--AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
--[AC_REQUIRE([AC_CANONICAL_HOST])dnl
--_LT_SET_OPTION([LT_INIT], [win32-dll])
--AC_DIAGNOSE([obsolete],
--[$0: Remove this warning and the call to _LT_SET_OPTION when you
--put the `win32-dll' option into LT_INIT's first parameter.])
--])
-+# serial 16
- 
--dnl aclocal-1.4 backwards compatibility:
--dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
-+# 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.
- 
-+# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
-+# AM_INIT_AUTOMAKE([OPTIONS])
-+# -----------------------------------------------
-+# The call with PACKAGE and VERSION arguments is the old style
-+# call (pre autoconf-2.50), which is being phased out.  PACKAGE
-+# and VERSION should now be passed to AC_INIT and removed from
-+# the call to AM_INIT_AUTOMAKE.
-+# We support both call styles for the transition.  After
-+# the next Automake release, Autoconf can make the AC_INIT
-+# arguments mandatory, and then we can depend on a new Autoconf
-+# release and drop the old call support.
-+AC_DEFUN([AM_INIT_AUTOMAKE],
-+[AC_PREREQ([2.62])dnl
-+dnl Autoconf wants to disallow AM_ names.  We explicitly allow
-+dnl the ones we care about.
-+m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-+AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-+AC_REQUIRE([AC_PROG_INSTALL])dnl
-+if test "`cd $srcdir && pwd`" != "`pwd`"; then
-+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-+  # is not polluted with repeated "-I."
-+  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
-+  # test to see if srcdir already configured
-+  if test -f $srcdir/config.status; then
-+    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-+  fi
-+fi
- 
--# _LT_ENABLE_SHARED([DEFAULT])
--# ----------------------------
--# implement the --enable-shared flag, and supports the `shared' and
--# `disable-shared' LT_INIT options.
--# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
--m4_define([_LT_ENABLE_SHARED],
--[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
--AC_ARG_ENABLE([shared],
--    [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
--	[build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])],
--    [p=${PACKAGE-default}
--    case $enableval in
--    yes) enable_shared=yes ;;
--    no) enable_shared=no ;;
--    *)
--      enable_shared=no
--      # Look at the argument we got.  We use all the common list separators.
--      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
--      for pkg in $enableval; do
--	IFS="$lt_save_ifs"
--	if test "X$pkg" = "X$p"; then
--	  enable_shared=yes
--	fi
--      done
--      IFS="$lt_save_ifs"
--      ;;
--    esac],
--    [enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
-+# test whether we have cygpath
-+if test -z "$CYGPATH_W"; then
-+  if (cygpath --version) >/dev/null 2>/dev/null; then
-+    CYGPATH_W='cygpath -w'
-+  else
-+    CYGPATH_W=echo
-+  fi
-+fi
-+AC_SUBST([CYGPATH_W])
- 
--    _LT_DECL([build_libtool_libs], [enable_shared], [0],
--	[Whether or not to build shared libraries])
--])# _LT_ENABLE_SHARED
-+# Define the identity of the package.
-+dnl Distinguish between old-style and new-style calls.
-+m4_ifval([$2],
-+[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
-+ AC_SUBST([PACKAGE], [$1])dnl
-+ AC_SUBST([VERSION], [$2])],
-+[_AM_SET_OPTIONS([$1])dnl
-+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-+m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
-+  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
-+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
-+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
- 
--LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])])
--LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])])
-+_AM_IF_OPTION([no-define],,
-+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
- 
--# Old names:
--AC_DEFUN([AC_ENABLE_SHARED],
--[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared])
-+# Some tools Automake needs.
-+AC_REQUIRE([AM_SANITY_CHECK])dnl
-+AC_REQUIRE([AC_ARG_PROGRAM])dnl
-+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-+AM_MISSING_PROG(AUTOCONF, autoconf)
-+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-+AM_MISSING_PROG(AUTOHEADER, autoheader)
-+AM_MISSING_PROG(MAKEINFO, makeinfo)
-+AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-+AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
-+AC_REQUIRE([AM_PROG_MKDIR_P])dnl
-+# We need awk for the "check" target.  The system "awk" is bad on
-+# some platforms.
-+AC_REQUIRE([AC_PROG_AWK])dnl
-+AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-+AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-+_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
-+	      [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
-+			     [_AM_PROG_TAR([v7])])])
-+_AM_IF_OPTION([no-dependencies],,
-+[AC_PROVIDE_IFELSE([AC_PROG_CC],
-+		  [_AM_DEPENDENCIES(CC)],
-+		  [define([AC_PROG_CC],
-+			  defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
-+AC_PROVIDE_IFELSE([AC_PROG_CXX],
-+		  [_AM_DEPENDENCIES(CXX)],
-+		  [define([AC_PROG_CXX],
-+			  defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-+AC_PROVIDE_IFELSE([AC_PROG_OBJC],
-+		  [_AM_DEPENDENCIES(OBJC)],
-+		  [define([AC_PROG_OBJC],
-+			  defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
- ])
--
--AC_DEFUN([AC_DISABLE_SHARED],
--[_LT_SET_OPTION([LT_INIT], [disable-shared])
-+_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
-+dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
-+dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This macro
-+dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
-+AC_CONFIG_COMMANDS_PRE(dnl
-+[m4_provide_if([_AM_COMPILER_EXEEXT],
-+  [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
- ])
- 
--AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
--AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
--
--dnl aclocal-1.4 backwards compatibility:
--dnl AC_DEFUN([AM_ENABLE_SHARED], [])
--dnl AC_DEFUN([AM_DISABLE_SHARED], [])
-+dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
-+dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
-+dnl mangled by Autoconf and run in a shell conditional statement.
-+m4_define([_AC_COMPILER_EXEEXT],
-+m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
- 
- 
-+# When config.status generates a header, we must update the stamp-h file.
-+# This file resides in the same directory as the config header
-+# that is generated.  The stamp files are numbered to have different names.
- 
--# _LT_ENABLE_STATIC([DEFAULT])
--# ----------------------------
--# implement the --enable-static flag, and support the `static' and
--# `disable-static' LT_INIT options.
--# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
--m4_define([_LT_ENABLE_STATIC],
--[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
--AC_ARG_ENABLE([static],
--    [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@],
--	[build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])],
--    [p=${PACKAGE-default}
--    case $enableval in
--    yes) enable_static=yes ;;
--    no) enable_static=no ;;
--    *)
--     enable_static=no
--      # Look at the argument we got.  We use all the common list separators.
--      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
--      for pkg in $enableval; do
--	IFS="$lt_save_ifs"
--	if test "X$pkg" = "X$p"; then
--	  enable_static=yes
--	fi
--      done
--      IFS="$lt_save_ifs"
--      ;;
--    esac],
--    [enable_static=]_LT_ENABLE_STATIC_DEFAULT)
-+# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
-+# loop where config.status creates the headers, so we can generate
-+# our stamp files there.
-+AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
-+[# Compute $1's index in $config_headers.
-+_am_arg=$1
-+_am_stamp_count=1
-+for _am_header in $config_headers :; do
-+  case $_am_header in
-+    $_am_arg | $_am_arg:* )
-+      break ;;
-+    * )
-+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-+  esac
-+done
-+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
- 
--    _LT_DECL([build_old_libs], [enable_static], [0],
--	[Whether or not to build static libraries])
--])# _LT_ENABLE_STATIC
-+# Copyright (C) 2001, 2003, 2005, 2008  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- 
--LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])])
--LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])])
-+# AM_PROG_INSTALL_SH
-+# ------------------
-+# Define $install_sh.
-+AC_DEFUN([AM_PROG_INSTALL_SH],
-+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-+if test x"${install_sh}" != xset; then
-+  case $am_aux_dir in
-+  *\ * | *\	*)
-+    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
-+  *)
-+    install_sh="\${SHELL} $am_aux_dir/install-sh"
-+  esac
-+fi
-+AC_SUBST(install_sh)])
- 
--# Old names:
--AC_DEFUN([AC_ENABLE_STATIC],
--[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static])
--])
-+# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- 
--AC_DEFUN([AC_DISABLE_STATIC],
--[_LT_SET_OPTION([LT_INIT], [disable-static])
--])
-+# serial 2
- 
--AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
--AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
-+# Check whether the underlying file-system supports filenames
-+# with a leading dot.  For instance MS-DOS doesn't.
-+AC_DEFUN([AM_SET_LEADING_DOT],
-+[rm -rf .tst 2>/dev/null
-+mkdir .tst 2>/dev/null
-+if test -d .tst; then
-+  am__leading_dot=.
-+else
-+  am__leading_dot=_
-+fi
-+rmdir .tst 2>/dev/null
-+AC_SUBST([am__leading_dot])])
- 
--dnl aclocal-1.4 backwards compatibility:
--dnl AC_DEFUN([AM_ENABLE_STATIC], [])
--dnl AC_DEFUN([AM_DISABLE_STATIC], [])
-+# Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
-+# From Jim Meyering
- 
-+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- 
-+# serial 5
- 
--# _LT_ENABLE_FAST_INSTALL([DEFAULT])
-+# AM_MAINTAINER_MODE([DEFAULT-MODE])
- # ----------------------------------
--# implement the --enable-fast-install flag, and support the `fast-install'
--# and `disable-fast-install' LT_INIT options.
--# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
--m4_define([_LT_ENABLE_FAST_INSTALL],
--[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
--AC_ARG_ENABLE([fast-install],
--    [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
--    [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
--    [p=${PACKAGE-default}
--    case $enableval in
--    yes) enable_fast_install=yes ;;
--    no) enable_fast_install=no ;;
--    *)
--      enable_fast_install=no
--      # Look at the argument we got.  We use all the common list separators.
--      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
--      for pkg in $enableval; do
--	IFS="$lt_save_ifs"
--	if test "X$pkg" = "X$p"; then
--	  enable_fast_install=yes
--	fi
--      done
--      IFS="$lt_save_ifs"
--      ;;
--    esac],
--    [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
--
--_LT_DECL([fast_install], [enable_fast_install], [0],
--	 [Whether or not to optimize for fast installation])dnl
--])# _LT_ENABLE_FAST_INSTALL
--
--LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])])
--LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])])
--
--# Old names:
--AU_DEFUN([AC_ENABLE_FAST_INSTALL],
--[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
--AC_DIAGNOSE([obsolete],
--[$0: Remove this warning and the call to _LT_SET_OPTION when you put
--the `fast-install' option into LT_INIT's first parameter.])
--])
--
--AU_DEFUN([AC_DISABLE_FAST_INSTALL],
--[_LT_SET_OPTION([LT_INIT], [disable-fast-install])
--AC_DIAGNOSE([obsolete],
--[$0: Remove this warning and the call to _LT_SET_OPTION when you put
--the `disable-fast-install' option into LT_INIT's first parameter.])
--])
--
--dnl aclocal-1.4 backwards compatibility:
--dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
--dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
--
-+# Control maintainer-specific portions of Makefiles.
-+# Default is to disable them, unless `enable' is passed literally.
-+# For symmetry, `disable' may be passed as well.  Anyway, the user
-+# can override the default with the --enable/--disable switch.
-+AC_DEFUN([AM_MAINTAINER_MODE],
-+[m4_case(m4_default([$1], [disable]),
-+       [enable], [m4_define([am_maintainer_other], [disable])],
-+       [disable], [m4_define([am_maintainer_other], [enable])],
-+       [m4_define([am_maintainer_other], [enable])
-+        m4_warn([syntax], [unexpected argument to AM@&t at _MAINTAINER_MODE: $1])])
-+AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles])
-+  dnl maintainer-mode's default is 'disable' unless 'enable' is passed
-+  AC_ARG_ENABLE([maintainer-mode],
-+[  --][am_maintainer_other][-maintainer-mode  am_maintainer_other make rules and dependencies not useful
-+			  (and sometimes confusing) to the casual installer],
-+      [USE_MAINTAINER_MODE=$enableval],
-+      [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
-+  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
-+  AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
-+  MAINT=$MAINTAINER_MODE_TRUE
-+  AC_SUBST([MAINT])dnl
-+]
-+)
- 
--# _LT_WITH_PIC([MODE])
--# --------------------
--# implement the --with-pic flag, and support the `pic-only' and `no-pic'
--# LT_INIT options.
--# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
--m4_define([_LT_WITH_PIC],
--[AC_ARG_WITH([pic],
--    [AS_HELP_STRING([--with-pic],
--	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
--    [pic_mode="$withval"],
--    [pic_mode=default])
-+AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
- 
--test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
-+# Check to see how 'make' treats includes.	            -*- Autoconf -*-
- 
--_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
--])# _LT_WITH_PIC
-+# Copyright (C) 2001, 2002, 2003, 2005, 2009  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- 
--LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])])
--LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])])
-+# serial 4
- 
--# Old name:
--AU_DEFUN([AC_LIBTOOL_PICMODE],
--[_LT_SET_OPTION([LT_INIT], [pic-only])
--AC_DIAGNOSE([obsolete],
--[$0: Remove this warning and the call to _LT_SET_OPTION when you
--put the `pic-only' option into LT_INIT's first parameter.])
-+# AM_MAKE_INCLUDE()
-+# -----------------
-+# Check to see how make treats includes.
-+AC_DEFUN([AM_MAKE_INCLUDE],
-+[am_make=${MAKE-make}
-+cat > confinc << 'END'
-+am__doit:
-+	@echo this is the am__doit target
-+.PHONY: am__doit
-+END
-+# If we don't find an include directive, just comment out the code.
-+AC_MSG_CHECKING([for style of include used by $am_make])
-+am__include="#"
-+am__quote=
-+_am_result=none
-+# First try GNU make style include.
-+echo "include confinc" > confmf
-+# Ignore all kinds of additional output from `make'.
-+case `$am_make -s -f confmf 2> /dev/null` in #(
-+*the\ am__doit\ target*)
-+  am__include=include
-+  am__quote=
-+  _am_result=GNU
-+  ;;
-+esac
-+# Now try BSD make style include.
-+if test "$am__include" = "#"; then
-+   echo '.include "confinc"' > confmf
-+   case `$am_make -s -f confmf 2> /dev/null` in #(
-+   *the\ am__doit\ target*)
-+     am__include=.include
-+     am__quote="\""
-+     _am_result=BSD
-+     ;;
-+   esac
-+fi
-+AC_SUBST([am__include])
-+AC_SUBST([am__quote])
-+AC_MSG_RESULT([$_am_result])
-+rm -f confinc confmf
- ])
- 
--dnl aclocal-1.4 backwards compatibility:
--dnl AC_DEFUN([AC_LIBTOOL_PICMODE], [])
--
--
--m4_define([_LTDL_MODE], [])
--LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive],
--		 [m4_define([_LTDL_MODE], [nonrecursive])])
--LT_OPTION_DEFINE([LTDL_INIT], [recursive],
--		 [m4_define([_LTDL_MODE], [recursive])])
--LT_OPTION_DEFINE([LTDL_INIT], [subproject],
--		 [m4_define([_LTDL_MODE], [subproject])])
--
--m4_define([_LTDL_TYPE], [])
--LT_OPTION_DEFINE([LTDL_INIT], [installable],
--		 [m4_define([_LTDL_TYPE], [installable])])
--LT_OPTION_DEFINE([LTDL_INIT], [convenience],
--		 [m4_define([_LTDL_TYPE], [convenience])])
-+# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
- 
--# ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
--#
--# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
--# Written by Gary V. Vaughan, 2004
-+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
-+# Free Software Foundation, Inc.
- #
--# This file is free software; the Free Software Foundation gives
--# unlimited permission to copy and/or distribute it, with or without
--# modifications, as long as this notice is preserved.
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- 
--# serial 6 ltsugar.m4
-+# serial 6
- 
--# This is to help aclocal find these macros, as it can't see m4_define.
--AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
-+# AM_MISSING_PROG(NAME, PROGRAM)
-+# ------------------------------
-+AC_DEFUN([AM_MISSING_PROG],
-+[AC_REQUIRE([AM_MISSING_HAS_RUN])
-+$1=${$1-"${am_missing_run}$2"}
-+AC_SUBST($1)])
- 
- 
--# lt_join(SEP, ARG1, [ARG2...])
--# -----------------------------
--# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their
--# associated separator.
--# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier
--# versions in m4sugar had bugs.
--m4_define([lt_join],
--[m4_if([$#], [1], [],
--       [$#], [2], [[$2]],
--       [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])])
--m4_define([_lt_join],
--[m4_if([$#$2], [2], [],
--       [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])])
-+# AM_MISSING_HAS_RUN
-+# ------------------
-+# Define MISSING if not defined so far and test if it supports --run.
-+# If it does, set am_missing_run to use it, otherwise, to nothing.
-+AC_DEFUN([AM_MISSING_HAS_RUN],
-+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-+AC_REQUIRE_AUX_FILE([missing])dnl
-+if test x"${MISSING+set}" != xset; then
-+  case $am_aux_dir in
-+  *\ * | *\	*)
-+    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
-+  *)
-+    MISSING="\${SHELL} $am_aux_dir/missing" ;;
-+  esac
-+fi
-+# Use eval to expand $SHELL
-+if eval "$MISSING --run true"; then
-+  am_missing_run="$MISSING --run "
-+else
-+  am_missing_run=
-+  AC_MSG_WARN([`missing' script is too old or missing])
-+fi
-+])
- 
-+# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- 
--# lt_car(LIST)
--# lt_cdr(LIST)
--# ------------
--# Manipulate m4 lists.
--# These macros are necessary as long as will still need to support
--# Autoconf-2.59 which quotes differently.
--m4_define([lt_car], [[$1]])
--m4_define([lt_cdr],
--[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
--       [$#], 1, [],
--       [m4_dquote(m4_shift($@))])])
--m4_define([lt_unquote], $1)
-+# AM_PROG_MKDIR_P
-+# ---------------
-+# Check for `mkdir -p'.
-+AC_DEFUN([AM_PROG_MKDIR_P],
-+[AC_PREREQ([2.60])dnl
-+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-+dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
-+dnl while keeping a definition of mkdir_p for backward compatibility.
-+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
-+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
-+dnl Makefile.ins that do not define MKDIR_P, so we do our own
-+dnl adjustment using top_builddir (which is defined more often than
-+dnl MKDIR_P).
-+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
-+case $mkdir_p in
-+  [[\\/$]]* | ?:[[\\/]]*) ;;
-+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-+esac
-+])
- 
-+# Helper functions for option handling.                     -*- Autoconf -*-
- 
--# lt_append(MACRO-NAME, STRING, [SEPARATOR])
--# ------------------------------------------
--# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
--# Note that neither SEPARATOR nor STRING are expanded; they are appended
--# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
--# No SEPARATOR is output if MACRO-NAME was previously undefined (different
--# than defined and empty).
-+# Copyright (C) 2001, 2002, 2003, 2005, 2008  Free Software Foundation, Inc.
- #
--# This macro is needed until we can rely on Autoconf 2.62, since earlier
--# versions of m4sugar mistakenly expanded SEPARATOR but not STRING.
--m4_define([lt_append],
--[m4_define([$1],
--	   m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])])
--
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- 
-+# serial 4
- 
--# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...])
--# ----------------------------------------------------------
--# Produce a SEP delimited list of all paired combinations of elements of
--# PREFIX-LIST with SUFFIX1 through SUFFIXn.  Each element of the list
--# has the form PREFIXmINFIXSUFFIXn.
--# Needed until we can rely on m4_combine added in Autoconf 2.62.
--m4_define([lt_combine],
--[m4_if(m4_eval([$# > 3]), [1],
--       [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl
--[[m4_foreach([_Lt_prefix], [$2],
--	     [m4_foreach([_Lt_suffix],
--		]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[,
--	[_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])])
-+# _AM_MANGLE_OPTION(NAME)
-+# -----------------------
-+AC_DEFUN([_AM_MANGLE_OPTION],
-+[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
- 
-+# _AM_SET_OPTION(NAME)
-+# ------------------------------
-+# Set option NAME.  Presently that only means defining a flag for this option.
-+AC_DEFUN([_AM_SET_OPTION],
-+[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
- 
--# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])
--# -----------------------------------------------------------------------
--# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited
--# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ.
--m4_define([lt_if_append_uniq],
--[m4_ifdef([$1],
--	  [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1],
--		 [lt_append([$1], [$2], [$3])$4],
--		 [$5])],
--	  [lt_append([$1], [$2], [$3])$4])])
-+# _AM_SET_OPTIONS(OPTIONS)
-+# ----------------------------------
-+# OPTIONS is a space-separated list of Automake options.
-+AC_DEFUN([_AM_SET_OPTIONS],
-+[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
- 
-+# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
-+# -------------------------------------------
-+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-+AC_DEFUN([_AM_IF_OPTION],
-+[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
- 
--# lt_dict_add(DICT, KEY, VALUE)
--# -----------------------------
--m4_define([lt_dict_add],
--[m4_define([$1($2)], [$3])])
-+# Check to make sure that the build environment is sane.    -*- Autoconf -*-
- 
-+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- 
--# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE)
--# --------------------------------------------
--m4_define([lt_dict_add_subkey],
--[m4_define([$1($2:$3)], [$4])])
-+# serial 5
- 
-+# AM_SANITY_CHECK
-+# ---------------
-+AC_DEFUN([AM_SANITY_CHECK],
-+[AC_MSG_CHECKING([whether build environment is sane])
-+# Just in case
-+sleep 1
-+echo timestamp > conftest.file
-+# Reject unsafe characters in $srcdir or the absolute working directory
-+# name.  Accept space and tab only in the latter.
-+am_lf='
-+'
-+case `pwd` in
-+  *[[\\\"\#\$\&\'\`$am_lf]]*)
-+    AC_MSG_ERROR([unsafe absolute working directory name]);;
-+esac
-+case $srcdir in
-+  *[[\\\"\#\$\&\'\`$am_lf\ \	]]*)
-+    AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
-+esac
- 
--# lt_dict_fetch(DICT, KEY, [SUBKEY])
--# ----------------------------------
--m4_define([lt_dict_fetch],
--[m4_ifval([$3],
--	m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]),
--    m4_ifdef([$1($2)], [m4_defn([$1($2)])]))])
-+# Do `set' in a subshell so we don't clobber the current shell's
-+# arguments.  Must try -L first in case configure is actually a
-+# symlink; some systems play weird games with the mod time of symlinks
-+# (eg FreeBSD returns the mod time of the symlink's containing
-+# directory).
-+if (
-+   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-+   if test "$[*]" = "X"; then
-+      # -L didn't work.
-+      set X `ls -t "$srcdir/configure" conftest.file`
-+   fi
-+   rm -f conftest.file
-+   if test "$[*]" != "X $srcdir/configure conftest.file" \
-+      && test "$[*]" != "X conftest.file $srcdir/configure"; then
- 
-+      # If neither matched, then we have a broken ls.  This can happen
-+      # 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".
-+      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-+alias in your environment])
-+   fi
- 
--# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE])
--# -----------------------------------------------------------------
--m4_define([lt_if_dict_fetch],
--[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4],
--	[$5],
--    [$6])])
-+   test "$[2]" = conftest.file
-+   )
-+then
-+   # Ok.
-+   :
-+else
-+   AC_MSG_ERROR([newly created file is older than distributed files!
-+Check your system clock])
-+fi
-+AC_MSG_RESULT(yes)])
- 
-+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- 
--# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...])
--# --------------------------------------------------------------
--m4_define([lt_dict_filter],
--[m4_if([$5], [], [],
--  [lt_join(m4_quote(m4_default([$4], [[, ]])),
--           lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]),
--		      [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl
--])
-+# AM_PROG_INSTALL_STRIP
-+# ---------------------
-+# One issue with vendor `install' (even GNU) is that you can't
-+# specify the program used to strip binaries.  This is especially
-+# annoying in cross-compiling environments, where the build's strip
-+# is unlikely to handle the host's binaries.
-+# Fortunately install-sh will honor a STRIPPROG variable, so we
-+# always use install-sh in `make install-strip', and initialize
-+# STRIPPROG with the value of the STRIP variable (set by the user).
-+AC_DEFUN([AM_PROG_INSTALL_STRIP],
-+[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-+# Installed binaries are usually stripped using `strip' when the user
-+# run `make install-strip'.  However `strip' might not be the right
-+# tool to use in cross-compilation environments, therefore Automake
-+# will honor the `STRIP' environment variable to overrule this program.
-+dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
-+if test "$cross_compiling" != no; then
-+  AC_CHECK_TOOL([STRIP], [strip], :)
-+fi
-+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-+AC_SUBST([INSTALL_STRIP_PROGRAM])])
- 
--# ltversion.m4 -- version numbers			-*- Autoconf -*-
--#
--#   Copyright (C) 2004 Free Software Foundation, Inc.
--#   Written by Scott James Remnant, 2004
-+# Copyright (C) 2006, 2008  Free Software Foundation, Inc.
- #
--# This file is free software; the Free Software Foundation gives
--# unlimited permission to copy and/or distribute it, with or without
--# modifications, as long as this notice is preserved.
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- 
--# Generated from ltversion.in.
-+# serial 2
- 
--# serial 3012 ltversion.m4
--# This file is part of GNU Libtool
-+# _AM_SUBST_NOTMAKE(VARIABLE)
-+# ---------------------------
-+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
-+# This macro is traced by Automake.
-+AC_DEFUN([_AM_SUBST_NOTMAKE])
- 
--m4_define([LT_PACKAGE_VERSION], [2.2.6])
--m4_define([LT_PACKAGE_REVISION], [1.3012])
-+# AM_SUBST_NOTMAKE(VARIABLE)
-+# ---------------------------
-+# Public sister of _AM_SUBST_NOTMAKE.
-+AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
- 
--AC_DEFUN([LTVERSION_VERSION],
--[macro_version='2.2.6'
--macro_revision='1.3012'
--_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
--_LT_DECL(, macro_revision, 0)
--])
-+# Check how to create a tarball.                            -*- Autoconf -*-
- 
--# lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
--#
--#   Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
--#   Written by Scott James Remnant, 2004.
-+# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
- #
--# This file is free software; the Free Software Foundation gives
--# unlimited permission to copy and/or distribute it, with or without
--# modifications, as long as this notice is preserved.
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- 
--# serial 4 lt~obsolete.m4
-+# serial 2
- 
--# These exist entirely to fool aclocal when bootstrapping libtool.
--#
--# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
--# which have later been changed to m4_define as they aren't part of the
--# exported API, or moved to Autoconf or Automake where they belong.
--#
--# The trouble is, aclocal is a bit thick.  It'll see the old AC_DEFUN
--# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us
--# using a macro with the same name in our local m4/libtool.m4 it'll
--# pull the old libtool.m4 in (it doesn't see our shiny new m4_define
--# and doesn't know about Autoconf macros at all.)
-+# _AM_PROG_TAR(FORMAT)
-+# --------------------
-+# Check how to create a tarball in format FORMAT.
-+# FORMAT should be one of `v7', `ustar', or `pax'.
- #
--# So we provide this file, which has a silly filename so it's always
--# included after everything else.  This provides aclocal with the
--# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
--# because those macros already exist, or will be overwritten later.
--# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. 
-+# Substitute a variable $(am__tar) that is a command
-+# writing to stdout a FORMAT-tarball containing the directory
-+# $tardir.
-+#     tardir=directory && $(am__tar) > result.tar
- #
--# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
--# Yes, that means every name once taken will need to remain here until
--# we give up compatibility with versions before 1.7, at which point
--# we need to keep only those names which we still refer to.
-+# Substitute a variable $(am__untar) that extract such
-+# a tarball read from stdin.
-+#     $(am__untar) < result.tar
-+AC_DEFUN([_AM_PROG_TAR],
-+[# Always define AMTAR for backward compatibility.
-+AM_MISSING_PROG([AMTAR], [tar])
-+m4_if([$1], [v7],
-+     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
-+     [m4_case([$1], [ustar],, [pax],,
-+              [m4_fatal([Unknown tar format])])
-+AC_MSG_CHECKING([how to create a $1 tar archive])
-+# Loop over all known methods to create a tar archive until one works.
-+_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-+_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-+# Do not fold the above two line into one, because Tru64 sh and
-+# Solaris sh will not grok spaces in the rhs of `-'.
-+for _am_tool in $_am_tools
-+do
-+  case $_am_tool in
-+  gnutar)
-+    for _am_tar in tar gnutar gtar;
-+    do
-+      AM_RUN_LOG([$_am_tar --version]) && break
-+    done
-+    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
-+    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
-+    am__untar="$_am_tar -xf -"
-+    ;;
-+  plaintar)
-+    # Must skip GNU tar: if it does not support --format= it doesn't create
-+    # ustar tarball either.
-+    (tar --version) >/dev/null 2>&1 && continue
-+    am__tar='tar chf - "$$tardir"'
-+    am__tar_='tar chf - "$tardir"'
-+    am__untar='tar xf -'
-+    ;;
-+  pax)
-+    am__tar='pax -L -x $1 -w "$$tardir"'
-+    am__tar_='pax -L -x $1 -w "$tardir"'
-+    am__untar='pax -r'
-+    ;;
-+  cpio)
-+    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-+    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-+    am__untar='cpio -i -H $1 -d'
-+    ;;
-+  none)
-+    am__tar=false
-+    am__tar_=false
-+    am__untar=false
-+    ;;
-+  esac
- 
--# This is to help aclocal find these macros, as it can't see m4_define.
--AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])])
-+  # If the value was cached, stop now.  We just wanted to have am__tar
-+  # and am__untar set.
-+  test -n "${am_cv_prog_tar_$1}" && break
- 
--m4_ifndef([AC_LIBTOOL_LINKER_OPTION],	[AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])])
--m4_ifndef([AC_PROG_EGREP],		[AC_DEFUN([AC_PROG_EGREP])])
--m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])])
--m4_ifndef([_LT_AC_SHELL_INIT],		[AC_DEFUN([_LT_AC_SHELL_INIT])])
--m4_ifndef([_LT_AC_SYS_LIBPATH_AIX],	[AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])])
--m4_ifndef([_LT_PROG_LTMAIN],		[AC_DEFUN([_LT_PROG_LTMAIN])])
--m4_ifndef([_LT_AC_TAGVAR],		[AC_DEFUN([_LT_AC_TAGVAR])])
--m4_ifndef([AC_LTDL_ENABLE_INSTALL],	[AC_DEFUN([AC_LTDL_ENABLE_INSTALL])])
--m4_ifndef([AC_LTDL_PREOPEN],		[AC_DEFUN([AC_LTDL_PREOPEN])])
--m4_ifndef([_LT_AC_SYS_COMPILER],	[AC_DEFUN([_LT_AC_SYS_COMPILER])])
--m4_ifndef([_LT_AC_LOCK],		[AC_DEFUN([_LT_AC_LOCK])])
--m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE],	[AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])])
--m4_ifndef([_LT_AC_TRY_DLOPEN_SELF],	[AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])])
--m4_ifndef([AC_LIBTOOL_PROG_CC_C_O],	[AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])])
--m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])])
--m4_ifndef([AC_LIBTOOL_OBJDIR],		[AC_DEFUN([AC_LIBTOOL_OBJDIR])])
--m4_ifndef([AC_LTDL_OBJDIR],		[AC_DEFUN([AC_LTDL_OBJDIR])])
--m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])])
--m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP],	[AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])])
--m4_ifndef([AC_PATH_MAGIC],		[AC_DEFUN([AC_PATH_MAGIC])])
--m4_ifndef([AC_PROG_LD_GNU],		[AC_DEFUN([AC_PROG_LD_GNU])])
--m4_ifndef([AC_PROG_LD_RELOAD_FLAG],	[AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])])
--m4_ifndef([AC_DEPLIBS_CHECK_METHOD],	[AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])])
--m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])])
--m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])])
--m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])])
--m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS],	[AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])])
--m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP],	[AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])])
--m4_ifndef([LT_AC_PROG_EGREP],		[AC_DEFUN([LT_AC_PROG_EGREP])])
--m4_ifndef([LT_AC_PROG_SED],		[AC_DEFUN([LT_AC_PROG_SED])])
--m4_ifndef([_LT_CC_BASENAME],		[AC_DEFUN([_LT_CC_BASENAME])])
--m4_ifndef([_LT_COMPILER_BOILERPLATE],	[AC_DEFUN([_LT_COMPILER_BOILERPLATE])])
--m4_ifndef([_LT_LINKER_BOILERPLATE],	[AC_DEFUN([_LT_LINKER_BOILERPLATE])])
--m4_ifndef([_AC_PROG_LIBTOOL],		[AC_DEFUN([_AC_PROG_LIBTOOL])])
--m4_ifndef([AC_LIBTOOL_SETUP],		[AC_DEFUN([AC_LIBTOOL_SETUP])])
--m4_ifndef([_LT_AC_CHECK_DLFCN],		[AC_DEFUN([_LT_AC_CHECK_DLFCN])])
--m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER],	[AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])])
--m4_ifndef([_LT_AC_TAGCONFIG],		[AC_DEFUN([_LT_AC_TAGCONFIG])])
--m4_ifndef([AC_DISABLE_FAST_INSTALL],	[AC_DEFUN([AC_DISABLE_FAST_INSTALL])])
--m4_ifndef([_LT_AC_LANG_CXX],		[AC_DEFUN([_LT_AC_LANG_CXX])])
--m4_ifndef([_LT_AC_LANG_F77],		[AC_DEFUN([_LT_AC_LANG_F77])])
--m4_ifndef([_LT_AC_LANG_GCJ],		[AC_DEFUN([_LT_AC_LANG_GCJ])])
--m4_ifndef([AC_LIBTOOL_RC],		[AC_DEFUN([AC_LIBTOOL_RC])])
--m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
--m4_ifndef([_LT_AC_LANG_C_CONFIG],	[AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
--m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
--m4_ifndef([_LT_AC_LANG_CXX_CONFIG],	[AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])])
--m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])])
--m4_ifndef([_LT_AC_LANG_F77_CONFIG],	[AC_DEFUN([_LT_AC_LANG_F77_CONFIG])])
--m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])])
--m4_ifndef([_LT_AC_LANG_GCJ_CONFIG],	[AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])])
--m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])])
--m4_ifndef([_LT_AC_LANG_RC_CONFIG],	[AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
--m4_ifndef([AC_LIBTOOL_CONFIG],		[AC_DEFUN([AC_LIBTOOL_CONFIG])])
--m4_ifndef([_LT_AC_FILE_LTDLL_C],	[AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
-+  # tar/untar a dummy directory, and stop if the command works
-+  rm -rf conftest.dir
-+  mkdir conftest.dir
-+  echo GrepMe > conftest.dir/file
-+  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
-+  rm -rf conftest.dir
-+  if test -s conftest.tar; then
-+    AM_RUN_LOG([$am__untar <conftest.tar])
-+    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-+  fi
-+done
-+rm -rf conftest.dir
-+
-+AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-+AC_MSG_RESULT([$am_cv_prog_tar_$1])])
-+AC_SUBST([am__tar])
-+AC_SUBST([am__untar])
-+]) # _AM_PROG_TAR
- 
-diff -urN hdf5-1.8.4-patch1.orig/bin/config.guess hdf5-1.8.4-patch1/bin/config.guess
---- hdf5-1.8.4-patch1.orig/bin/config.guess	2010-02-22 22:32:03.000000000 +0100
-+++ hdf5-1.8.4-patch1/bin/config.guess	2010-03-11 15:57:58.000000000 +0100
-@@ -1,9 +1,10 @@
- #! /bin/sh
- # Attempt to guess a canonical system name.
- #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-+#   Free Software Foundation, Inc.
- 
--timestamp='2005-12-13'
-+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
-@@ -26,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,.*/,,'`
- 
-@@ -55,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
--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."
-@@ -106,7 +108,7 @@
- trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
- trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
- : ${TMPDIR=/tmp} ;
-- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
-+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
-  { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
-  { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
-  { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-@@ -160,6 +162,7 @@
- 	    arm*) machine=arm-unknown ;;
- 	    sh3el) machine=shl-unknown ;;
- 	    sh3eb) machine=sh-unknown ;;
-+	    sh5el) machine=sh5le-unknown ;;
- 	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
- 	esac
- 	# The Operating System including object format, if it has switched
-@@ -168,7 +171,7 @@
- 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
- 		eval $set_cc_for_build
- 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
--			| grep __ELF__ >/dev/null
-+			| grep -q __ELF__
- 		then
- 		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
- 		    # Return netbsd for either.  FIX?
-@@ -206,8 +209,11 @@
-     *:ekkoBSD:*:*)
- 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
- 	exit ;;
-+    *:SolidBSD:*:*)
-+	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
-+	exit ;;
-     macppc:MirBSD:*:*)
--	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
-+	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
- 	exit ;;
-     *:MirBSD:*:*)
- 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-@@ -319,14 +325,33 @@
- 	case `/usr/bin/uname -p` in
- 	    sparc) echo sparc-icl-nx7; exit ;;
- 	esac ;;
-+    s390x:SunOS:*:*)
-+	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+	exit ;;
-     sun4H:SunOS:5.*:*)
- 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- 	exit ;;
-     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
- 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- 	exit ;;
--    i86pc:SunOS:5.*:*)
--	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
-+	echo i386-pc-auroraux${UNAME_RELEASE}
-+	exit ;;
-+    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-+	eval $set_cc_for_build
-+	SUN_ARCH="i386"
-+	# If there is a compiler, see if it is configured for 64-bit objects.
-+	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
-+	# This test works for both compilers.
-+	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-+	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
-+		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-+		grep IS_64BIT_ARCH >/dev/null
-+	    then
-+		SUN_ARCH="x86_64"
-+	    fi
-+	fi
-+	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- 	exit ;;
-     sun4*:SunOS:6*:*)
- 	# According to config.sub, this is the proper way to canonicalize
-@@ -527,7 +552,7 @@
- 		echo rs6000-ibm-aix3.2
- 	fi
- 	exit ;;
--    *:AIX:*:[45])
-+    *:AIX:*:[456])
- 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
- 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
- 		IBM_ARCH=rs6000
-@@ -635,7 +660,7 @@
- 	    # => hppa64-hp-hpux11.23
- 
- 	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
--		grep __LP64__ >/dev/null
-+		grep -q __LP64__
- 	    then
- 		HP_ARCH="hppa2.0w"
- 	    else
-@@ -764,12 +789,19 @@
- 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
- 	exit ;;
-     *:FreeBSD:*:*)
--	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-+	case ${UNAME_MACHINE} in
-+	    pc98)
-+		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-+	    amd64)
-+		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-+	    *)
-+		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-+	esac
- 	exit ;;
-     i*:CYGWIN*:*)
- 	echo ${UNAME_MACHINE}-pc-cygwin
- 	exit ;;
--    i*:MINGW*:*)
-+    *:MINGW*:*)
- 	echo ${UNAME_MACHINE}-pc-mingw32
- 	exit ;;
-     i*:windows32*:*)
-@@ -779,12 +811,24 @@
-     i*:PW*:*)
- 	echo ${UNAME_MACHINE}-pc-pw32
- 	exit ;;
--    x86:Interix*:[345]*)
--	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
--	exit ;;
-+    *:Interix*:*)
-+    	case ${UNAME_MACHINE} in
-+	    x86)
-+		echo i586-pc-interix${UNAME_RELEASE}
-+		exit ;;
-+	    authenticamd | genuineintel | EM64T)
-+		echo x86_64-unknown-interix${UNAME_RELEASE}
-+		exit ;;
-+	    IA64)
-+		echo ia64-unknown-interix${UNAME_RELEASE}
-+		exit ;;
-+	esac ;;
-     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
- 	echo i${UNAME_MACHINE}-pc-mks
- 	exit ;;
-+    8664:Windows_NT:*)
-+	echo x86_64-pc-mks
-+	exit ;;
-     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
-@@ -814,7 +858,31 @@
-     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 \
-+	    | grep -q __ARM_EABI__
-+	then
-+	    echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	else
-+	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
-+	fi
-+	exit ;;
-+    avr32*:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
- 	exit ;;
-     cris:Linux:*:*)
-@@ -826,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 ;;
-@@ -835,66 +914,33 @@
-     m68*:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
- 	exit ;;
--    mips:Linux:*:*)
--	eval $set_cc_for_build
--	sed 's/^	//' << EOF >$dummy.c
--	#undef CPU
--	#undef mips
--	#undef mipsel
--	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
--	CPU=mipsel
--	#else
--	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
--	CPU=mips
--	#else
--	CPU=
--	#endif
--	#endif
--EOF
--	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`"
--	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
--	;;
--    mips64:Linux:*:*)
-+    mips:Linux:*:* | mips64:Linux:*:*)
- 	eval $set_cc_for_build
- 	sed 's/^	//' << EOF >$dummy.c
- 	#undef CPU
--	#undef mips64
--	#undef mips64el
-+	#undef ${UNAME_MACHINE}
-+	#undef ${UNAME_MACHINE}el
- 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
--	CPU=mips64el
-+	CPU=${UNAME_MACHINE}el
- 	#else
- 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
--	CPU=mips64
-+	CPU=${UNAME_MACHINE}
- 	#else
- 	CPU=
- 	#endif
- 	#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
-+    padre:Linux:*:*)
-+	echo sparc-unknown-linux-gnu
- 	exit ;;
--    ppc64:Linux:*:*)
--	echo powerpc64-unknown-linux-gnu
--	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
-@@ -904,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
-@@ -925,65 +974,9 @@
-     x86_64:Linux:*:*)
- 	echo x86_64-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 ;;
--	  coff-i386)
--		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
--		exit ;;
--	  "")
--		# Either a pre-BFD a.out linker (linux-gnuoldld) or
--		# 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
--	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)
--	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; }
--	;;
-+    xtensa*:Linux:*:*)
-+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	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
-@@ -1012,7 +1005,7 @@
-     i*86:syllable:*:*)
- 	echo ${UNAME_MACHINE}-pc-syllable
- 	exit ;;
--    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
-+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
- 	echo i386-unknown-lynxos${UNAME_RELEASE}
- 	exit ;;
-     i*86:*DOS:*:*)
-@@ -1056,8 +1049,11 @@
-     pc:*:*:*)
- 	# Left here for compatibility:
-         # uname -m prints for DJGPP always 'pc', but it prints nothing about
--        # the processor, so we play safe by assuming i386.
--	echo i386-pc-msdosdjgpp
-+        # the processor, so we play safe by assuming i586.
-+	# Note: whatever this is, it MUST be the same as what config.sub
-+	# prints for the "djgpp" host, or else GDB configury will decide that
-+	# this is a cross-build.
-+	echo i586-pc-msdosdjgpp
-         exit ;;
-     Intel:Mach:3*:*)
- 	echo i386-pc-mach3
-@@ -1095,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; } ;;
-+    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
-+	OS_REL='.3'
-+	test -r /etc/.relid \
-+	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-+	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
-+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
-+	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
-+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
-     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
- 	echo m68k-unknown-lynxos${UNAME_RELEASE}
- 	exit ;;
-@@ -1107,7 +1113,7 @@
-     rs6000:LynxOS:2.*:*)
- 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
- 	exit ;;
--    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
-+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
- 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
- 	exit ;;
-     SM[BE]S:UNIX_SV:*:*)
-@@ -1170,6 +1176,9 @@
-     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
- 	echo i586-pc-beos
- 	exit ;;
-+    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
-+	echo i586-pc-haiku
-+	exit ;;
-     SX-4:SUPER-UX:*:*)
- 	echo sx4-nec-superux${UNAME_RELEASE}
- 	exit ;;
-@@ -1179,6 +1188,15 @@
-     SX-6:SUPER-UX:*:*)
- 	echo sx6-nec-superux${UNAME_RELEASE}
- 	exit ;;
-+    SX-7:SUPER-UX:*:*)
-+	echo sx7-nec-superux${UNAME_RELEASE}
-+	exit ;;
-+    SX-8:SUPER-UX:*:*)
-+	echo sx8-nec-superux${UNAME_RELEASE}
-+	exit ;;
-+    SX-8R:SUPER-UX:*:*)
-+	echo sx8r-nec-superux${UNAME_RELEASE}
-+	exit ;;
-     Power*:Rhapsody:*:*)
- 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
- 	exit ;;
-@@ -1188,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}
-@@ -1269,6 +1297,9 @@
-     i*86:rdos:*:*)
- 	echo ${UNAME_MACHINE}-pc-rdos
- 	exit ;;
-+    i*86:AROS:*:*)
-+	echo ${UNAME_MACHINE}-pc-aros
-+	exit ;;
- esac
- 
- #echo '(No uname command or uname output not recognized.)' 1>&2
-@@ -1429,9 +1460,9 @@
- the operating system you are using. It is advised that you
- download the most up to date version of the config scripts from
- 
--  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
-+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
- and
--  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
-+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
- 
- If the version you run ($0) is already up to date, please
- send the following data and any information you think might be
-diff -urN hdf5-1.8.4-patch1.orig/bin/config.sub hdf5-1.8.4-patch1/bin/config.sub
---- hdf5-1.8.4-patch1.orig/bin/config.sub	2010-02-22 22:32:03.000000000 +0100
-+++ hdf5-1.8.4-patch1/bin/config.sub	2010-03-11 15:57:58.000000000 +0100
-@@ -1,9 +1,10 @@
- #! /bin/sh
- # Configuration validation subroutine script.
- #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-+#   Free Software Foundation, Inc.
- 
--timestamp='2005-12-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
-@@ -31,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.
-@@ -71,8 +75,9 @@
- version="\
- GNU config.sub ($timestamp)
- 
--Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
--Free Software Foundation, Inc.
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 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."
-@@ -121,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* | \
-+  kopensolaris*-gnu* | \
-   storm-chaos* | os2-emx* | rtmk-nova*)
-     os=-$maybe_os
-     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-@@ -147,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
- 		;;
-+        -bluegene*)
-+	        os=-cnk
-+		;;
- 	-sim | -cisco | -oki | -wec | -winbond)
- 		os=
- 		basic_machine=$1
-@@ -240,20 +249,24 @@
- 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
- 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
- 	| am33_2.0 \
--	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
-+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
- 	| bfin \
- 	| c4x | clipper \
- 	| d10v | d30v | dlx | dsp16xx \
--	| fr30 | frv \
-+	| fido | fr30 | frv \
- 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
- 	| i370 | i860 | i960 | ia64 \
- 	| ip2k | iq2000 \
--	| m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
-+	| lm32 \
-+	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-+	| maxq | mb | microblaze | mcore | mep | metag \
- 	| mips | mipsbe | mipseb | mipsel | mipsle \
- 	| mips16 \
- 	| mips64 | mips64el \
--	| mips64vr | mips64vrel \
-+	| mips64octeon | mips64octeonel \
- 	| mips64orion | mips64orionel \
-+	| mips64r5900 | mips64r5900el \
-+	| mips64vr | mips64vrel \
- 	| mips64vr4100 | mips64vr4100el \
- 	| mips64vr4300 | mips64vr4300el \
- 	| mips64vr5000 | mips64vr5000el \
-@@ -266,29 +279,31 @@
- 	| mipsisa64sr71k | mipsisa64sr71kel \
- 	| mipstx39 | mipstx39el \
- 	| mn10200 | mn10300 \
-+	| moxie \
- 	| mt \
- 	| msp430 \
-+	| nios | nios2 \
- 	| ns16k | ns32k \
- 	| or32 \
- 	| pdp10 | pdp11 | pj | pjl \
- 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
- 	| pyramid \
--	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
-+	| rx \
-+	| score \
-+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
- 	| sh64 | sh64le \
--	| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
--	| sparcv8 | sparcv9 | sparcv9b \
--	| strongarm \
-+	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
-+	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-+	| spu | strongarm \
- 	| tahoe | thumb | tic4x | tic80 | tron \
-+	| ubicom32 \
- 	| v850 | v850e \
- 	| we32k \
--	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
--	| z8k)
-+	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
-+	| z8k | z80)
- 		basic_machine=$basic_machine-unknown
- 		;;
--	m32c)
--		basic_machine=$basic_machine-unknown
--		;;
--	m6811 | m68hc11 | m6812 | m68hc12)
-+	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
- 		# Motorola 68HC11/12.
- 		basic_machine=$basic_machine-unknown
- 		os=-none
-@@ -317,25 +332,28 @@
- 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
- 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
- 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
--	| avr-* \
-+	| avr-* | avr32-* \
- 	| bfin-* | bs2000-* \
- 	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
- 	| clipper-* | craynv-* | cydra-* \
- 	| d10v-* | d30v-* | dlx-* \
- 	| elxsi-* \
--	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
-+	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
- 	| h8300-* | h8500-* \
- 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
- 	| i*86-* | i860-* | i960-* | ia64-* \
- 	| ip2k-* | iq2000-* \
--	| m32r-* | m32rle-* \
-+	| lm32-* \
-+	| m32c-* | m32r-* | m32rle-* \
- 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
--	| m88110-* | m88k-* | maxq-* | mcore-* \
-+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
- 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
- 	| mips16-* \
- 	| mips64-* | mips64el-* \
--	| mips64vr-* | mips64vrel-* \
-+	| mips64octeon-* | mips64octeonel-* \
- 	| mips64orion-* | mips64orionel-* \
-+	| mips64r5900-* | mips64r5900el-* \
-+	| mips64vr-* | mips64vrel-* \
- 	| mips64vr4100-* | mips64vr4100el-* \
- 	| mips64vr4300-* | mips64vr4300el-* \
- 	| mips64vr5000-* | mips64vr5000el-* \
-@@ -350,28 +368,33 @@
- 	| mmix-* \
- 	| mt-* \
- 	| msp430-* \
-+	| nios-* | nios2-* \
- 	| none-* | np1-* | ns16k-* | ns32k-* \
- 	| orion-* \
- 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
- 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
- 	| pyramid-* \
--	| romp-* | rs6000-* \
--	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | 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-* | sparc86x-* | sparclet-* \
-+	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
- 	| sparclite-* \
--	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
-+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
- 	| tahoe-* | thumb-* \
- 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-+	| tile-* | tilegx-* \
- 	| tron-* \
-+	| ubicom32-* \
- 	| v850-* | v850e-* | vax-* \
- 	| we32k-* \
--	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
--	| xstormy16-* | xtensa-* \
-+	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
-+	| xstormy16-* | xtensa*-* \
- 	| ymp-* \
--	| z8k-*)
-+	| z8k-* | z80-*)
- 		;;
--	m32c-*)
-+	# Recognize the basic CPU types without company name, with glob match.
-+	xtensa*)
-+		basic_machine=$basic_machine-unknown
- 		;;
- 	# Recognize the various machine names and aliases which stand
- 	# for a CPU type and a company and sometimes even an OS.
-@@ -435,6 +458,10 @@
- 		basic_machine=m68k-apollo
- 		os=-bsd
- 		;;
-+	aros)
-+		basic_machine=i386-pc
-+		os=-aros
-+		;;
- 	aux)
- 		basic_machine=m68k-apple
- 		os=-aux
-@@ -443,10 +470,26 @@
- 		basic_machine=ns32k-sequent
- 		os=-dynix
- 		;;
-+	blackfin)
-+		basic_machine=bfin-unknown
-+		os=-linux
-+		;;
-+	blackfin-*)
-+		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		os=-linux
-+		;;
-+	bluegene*)
-+		basic_machine=powerpc-ibm
-+		os=-cnk
-+		;;
- 	c90)
- 		basic_machine=c90-cray
- 		os=-unicos
- 		;;
-+        cegcc)
-+		basic_machine=arm-unknown
-+		os=-cegcc
-+		;;
- 	convex-c1)
- 		basic_machine=c1-convex
- 		os=-bsd
-@@ -475,8 +518,8 @@
- 		basic_machine=craynv-cray
- 		os=-unicosmp
- 		;;
--	cr16c)
--		basic_machine=cr16c-unknown
-+	cr16)
-+		basic_machine=cr16-unknown
- 		os=-elf
- 		;;
- 	crds | unos)
-@@ -514,6 +557,10 @@
- 		basic_machine=m88k-motorola
- 		os=-sysv3
- 		;;
-+	dicos)
-+		basic_machine=i686-pc
-+		os=-dicos
-+		;;
- 	djgpp)
- 		basic_machine=i586-pc
- 		os=-msdosdjgpp
-@@ -668,6 +715,14 @@
- 		basic_machine=m68k-isi
- 		os=-sysv
- 		;;
-+	m68knommu)
-+		basic_machine=m68k-unknown
-+		os=-linux
-+		;;
-+	m68knommu-*)
-+		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		os=-linux
-+		;;
- 	m88k-omron*)
- 		basic_machine=m88k-omron
- 		;;
-@@ -679,10 +734,17 @@
- 		basic_machine=ns32k-utek
- 		os=-sysv
- 		;;
-+        microblaze)
-+		basic_machine=microblaze-xilinx
-+		;;
- 	mingw32)
- 		basic_machine=i386-pc
- 		os=-mingw32
- 		;;
-+	mingw32ce)
-+		basic_machine=arm-unknown
-+		os=-mingw32ce
-+		;;
- 	miniframe)
- 		basic_machine=m68000-convergent
- 		;;
-@@ -809,6 +871,14 @@
- 		basic_machine=i860-intel
- 		os=-osf
- 		;;
-+	parisc)
-+		basic_machine=hppa-unknown
-+		os=-linux
-+		;;
-+	parisc-*)
-+		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		os=-linux
-+		;;
- 	pbd)
- 		basic_machine=sparc-tti
- 		;;
-@@ -818,6 +888,12 @@
- 	pc532 | pc532-*)
- 		basic_machine=ns32k-pc532
- 		;;
-+	pc98)
-+		basic_machine=i386-pc
-+		;;
-+	pc98-*)
-+		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
- 	pentium | p5 | k5 | k6 | nexgen | viac3)
- 		basic_machine=i586-pc
- 		;;
-@@ -904,6 +980,10 @@
- 	sb1el)
- 		basic_machine=mipsisa64sb1el-unknown
- 		;;
-+	sde)
-+		basic_machine=mipsisa32-sde
-+		os=-elf
-+		;;
- 	sei)
- 		basic_machine=mips-sei
- 		os=-seiux
-@@ -915,6 +995,9 @@
- 		basic_machine=sh-hitachi
- 		os=-hms
- 		;;
-+	sh5el)
-+		basic_machine=sh5le-unknown
-+		;;
- 	sh64)
- 		basic_machine=sh64-unknown
- 		;;
-@@ -1004,6 +1087,15 @@
- 		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
-+		;;
- 	tx39)
- 		basic_machine=mipstx39-unknown
- 		;;
-@@ -1079,6 +1171,10 @@
- 		basic_machine=z8k-unknown
- 		os=-sim
- 		;;
-+	z80-*-coff)
-+		basic_machine=z80-unknown
-+		os=-sim
-+		;;
- 	none)
- 		basic_machine=none-none
- 		os=-none
-@@ -1117,10 +1213,10 @@
- 	we32k)
- 		basic_machine=we32k-att
- 		;;
--	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
-+	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
- 		basic_machine=sh-unknown
- 		;;
--	sparc | sparcv8 | sparcv9 | sparcv9b)
-+	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
- 		basic_machine=sparc-sun
- 		;;
- 	cydra)
-@@ -1167,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|'`
- 		;;
-@@ -1187,18 +1286,20 @@
- 	# 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* | -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* | -openbsd* \
-+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-+	      | -openbsd* | -solidbsd* \
- 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
- 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
- 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
- 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
--	      | -chorusos* | -chorusrdb* \
-+	      | -chorusos* | -chorusrdb* | -cegcc* \
- 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- 	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
- 	      | -uxpv* | -beos* | -mpeix* | -udk* \
-@@ -1208,7 +1309,7 @@
- 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
- 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
- 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
--	      | -skyos* | -haiku* | -rdos*)
-+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
- 	# Remember, each alternative MUST END IN *, to match a version number.
- 		;;
- 	-qnx*)
-@@ -1338,6 +1439,11 @@
- 	-zvmoe)
- 		os=-zvmoe
- 		;;
-+	-dicos*)
-+		os=-dicos
-+		;;
-+        -nacl*)
-+	        ;;
- 	-none)
- 		;;
- 	*)
-@@ -1360,6 +1466,12 @@
- # system, and we'll never get to this point.
- 
- case $basic_machine in
-+        score-*)
-+		os=-elf
-+		;;
-+        spu-*)
-+		os=-elf
-+		;;
- 	*-acorn)
- 		os=-riscix1.2
- 		;;
-@@ -1369,9 +1481,9 @@
- 	arm*-semi)
- 		os=-aout
- 		;;
--    c4x-* | tic4x-*)
--        os=-coff
--        ;;
-+        c4x-* | tic4x-*)
-+        	os=-coff
-+		;;
- 	# This must come before the *-dec entry.
- 	pdp10-*)
- 		os=-tops20
-@@ -1397,6 +1509,9 @@
- 	m68*-cisco)
- 		os=-aout
- 		;;
-+        mep-*)
-+		os=-elf
-+		;;
- 	mips*-cisco)
- 		os=-elf
- 		;;
-@@ -1526,7 +1641,7 @@
- 			-sunos*)
- 				vendor=sun
- 				;;
--			-aix*)
-+			-cnk*|-aix*)
- 				vendor=ibm
- 				;;
- 			-beos*)
-diff -urN hdf5-1.8.4-patch1.orig/bin/depcomp hdf5-1.8.4-patch1/bin/depcomp
---- hdf5-1.8.4-patch1.orig/bin/depcomp	2010-02-22 22:32:03.000000000 +0100
-+++ hdf5-1.8.4-patch1/bin/depcomp	2010-03-11 15:58:10.000000000 +0100
-@@ -1,9 +1,10 @@
- #! /bin/sh
- # depcomp - compile a program generating dependencies as side-effects
- 
--scriptversion=2005-02-09.22
-+scriptversion=2009-04-28.21; # UTC
- 
--# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
-+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free
-+# Software Foundation, Inc.
- 
- # This program is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License as published by
-@@ -16,9 +17,7 @@
- # GNU General Public License for more details.
- 
- # You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
- 
- # As a special exception to the GNU General Public License, if you
- # distribute this file as part of a program that contains a
-@@ -86,12 +85,34 @@
-    depmode=dashmstdout
- fi
- 
-+cygpath_u="cygpath -u -f -"
-+if test "$depmode" = msvcmsys; then
-+   # This is just like msvisualcpp but w/o cygpath translation.
-+   # Just convert the backslash-escaped backslashes to single forward
-+   # slashes to satisfy depend.m4
-+   cygpath_u="sed s,\\\\\\\\,/,g"
-+   depmode=msvisualcpp
-+fi
-+
- case "$depmode" in
- gcc3)
- ## gcc 3 implements dependency tracking that does exactly what
- ## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
- ## it if -MD -MP comes after the -MF stuff.  Hmm.
--  "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
-+## Unfortunately, FreeBSD c89 acceptance of flags depends upon
-+## the command line argument order; so add the flags where they
-+## appear in depend2.am.  Note that the slowdown incurred here
-+## affects only configure: in makefiles, %FASTDEP% shortcuts this.
-+  for arg
-+  do
-+    case $arg in
-+    -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
-+    *)  set fnord "$@" "$arg" ;;
-+    esac
-+    shift # fnord
-+    shift # $arg
-+  done
-+  "$@"
-   stat=$?
-   if test $stat -eq 0; then :
-   else
-@@ -178,14 +199,14 @@
- ' < "$tmpdepfile" \
-     | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
-     tr '
--' ' ' >> $depfile
--    echo >> $depfile
-+' ' ' >> "$depfile"
-+    echo >> "$depfile"
- 
-     # The second pass generates a dummy entry for each header file.
-     tr ' ' '
- ' < "$tmpdepfile" \
-    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
--   >> $depfile
-+   >> "$depfile"
-   else
-     # The sourcefile does not contain any dependencies, so just
-     # store a dummy comment line, to avoid errors with the Makefile
-@@ -201,34 +222,39 @@
-   # current directory.  Also, the AIX compiler puts `$object:' at the
-   # start of each line; $object doesn't have directory information.
-   # Version 6 uses the directory in both cases.
--  stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
--  tmpdepfile="$stripped.u"
-+  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-+  test "x$dir" = "x$object" && dir=
-+  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-   if test "$libtool" = yes; then
-+    tmpdepfile1=$dir$base.u
-+    tmpdepfile2=$base.u
-+    tmpdepfile3=$dir.libs/$base.u
-     "$@" -Wc,-M
-   else
-+    tmpdepfile1=$dir$base.u
-+    tmpdepfile2=$dir$base.u
-+    tmpdepfile3=$dir$base.u
-     "$@" -M
-   fi
-   stat=$?
- 
--  if test -f "$tmpdepfile"; then :
--  else
--    stripped=`echo "$stripped" | sed 's,^.*/,,'`
--    tmpdepfile="$stripped.u"
--  fi
--
-   if test $stat -eq 0; then :
-   else
--    rm -f "$tmpdepfile"
-+    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
-     exit $stat
-   fi
- 
-+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
-+  do
-+    test -f "$tmpdepfile" && break
-+  done
-   if test -f "$tmpdepfile"; then
--    outname="$stripped.o"
-     # Each line is of the form `foo.o: dependent.h'.
-     # Do two passes, one to just change these to
-     # `$object: dependent.h' and one to simply `dependent.h:'.
--    sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
--    sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
-+    sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-+    # That's a tab and a space in the [].
-+    sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-   else
-     # The sourcefile does not contain any dependencies, so just
-     # store a dummy comment line, to avoid errors with the Makefile
-@@ -276,6 +302,51 @@
-   rm -f "$tmpdepfile"
-   ;;
- 
-+hp2)
-+  # The "hp" stanza above does not work with aCC (C++) and HP's ia64
-+  # compilers, which have integrated preprocessors.  The correct option
-+  # to use with these is +Maked; it writes dependencies to a file named
-+  # 'foo.d', which lands next to the object file, wherever that
-+  # happens to be.
-+  # Much of this is similar to the tru64 case; see comments there.
-+  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-+  test "x$dir" = "x$object" && dir=
-+  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-+  if test "$libtool" = yes; then
-+    tmpdepfile1=$dir$base.d
-+    tmpdepfile2=$dir.libs/$base.d
-+    "$@" -Wc,+Maked
-+  else
-+    tmpdepfile1=$dir$base.d
-+    tmpdepfile2=$dir$base.d
-+    "$@" +Maked
-+  fi
-+  stat=$?
-+  if test $stat -eq 0; then :
-+  else
-+     rm -f "$tmpdepfile1" "$tmpdepfile2"
-+     exit $stat
-+  fi
-+
-+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
-+  do
-+    test -f "$tmpdepfile" && break
-+  done
-+  if test -f "$tmpdepfile"; then
-+    sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
-+    # Add `dependent.h:' lines.
-+    sed -ne '2,${
-+	       s/^ *//
-+	       s/ \\*$//
-+	       s/$/:/
-+	       p
-+	     }' "$tmpdepfile" >> "$depfile"
-+  else
-+    echo "#dummy" > "$depfile"
-+  fi
-+  rm -f "$tmpdepfile" "$tmpdepfile2"
-+  ;;
-+
- tru64)
-    # The Tru64 compiler uses -MD to generate dependencies as a side
-    # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
-@@ -288,13 +359,13 @@
- 
-    if test "$libtool" = yes; then
-       # With Tru64 cc, shared objects can also be used to make a
--      # static library.  This mecanism is used in libtool 1.4 series to
-+      # static library.  This mechanism is used in libtool 1.4 series to
-       # handle both shared and static libraries in a single compilation.
-       # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
-       #
-       # With libtool 1.5 this exception was removed, and libtool now
-       # generates 2 separate objects for the 2 libraries.  These two
--      # compilations output dependencies in in $dir.libs/$base.o.d and
-+      # compilations output dependencies in $dir.libs/$base.o.d and
-       # in $dir$base.o.d.  We have to check for both files, because
-       # one of the two compilations can be disabled.  We should prefer
-       # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
-@@ -345,7 +416,7 @@
- 
-   # Remove the call to Libtool.
-   if test "$libtool" = yes; then
--    while test $1 != '--mode=compile'; do
-+    while test "X$1" != 'X--mode=compile'; do
-       shift
-     done
-     shift
-@@ -396,32 +467,39 @@
-   "$@" || exit $?
-   # Remove any Libtool call
-   if test "$libtool" = yes; then
--    while test $1 != '--mode=compile'; do
-+    while test "X$1" != 'X--mode=compile'; do
-       shift
-     done
-     shift
-   fi
-   # X makedepend
-   shift
--  cleared=no
--  for arg in "$@"; do
-+  cleared=no eat=no
-+  for arg
-+  do
-     case $cleared in
-     no)
-       set ""; shift
-       cleared=yes ;;
-     esac
-+    if test $eat = yes; then
-+      eat=no
-+      continue
-+    fi
-     case "$arg" in
-     -D*|-I*)
-       set fnord "$@" "$arg"; shift ;;
-     # Strip any option that makedepend may not understand.  Remove
-     # the object too, otherwise makedepend will parse it as a source file.
-+    -arch)
-+      eat=yes ;;
-     -*|$object)
-       ;;
-     *)
-       set fnord "$@" "$arg"; shift ;;
-     esac
-   done
--  obj_suffix="`echo $object | sed 's/^.*\././'`"
-+  obj_suffix=`echo "$object" | sed 's/^.*\././'`
-   touch "$tmpdepfile"
-   ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
-   rm -f "$depfile"
-@@ -441,7 +519,7 @@
- 
-   # Remove the call to Libtool.
-   if test "$libtool" = yes; then
--    while test $1 != '--mode=compile'; do
-+    while test "X$1" != 'X--mode=compile'; do
-       shift
-     done
-     shift
-@@ -467,7 +545,8 @@
-   done
- 
-   "$@" -E |
--    sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
-+    sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
-+       -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
-     sed '$ s: \\$::' > "$tmpdepfile"
-   rm -f "$depfile"
-   echo "$object : \\" > "$depfile"
-@@ -478,13 +557,27 @@
- 
- msvisualcpp)
-   # Important note: in order to support this mode, a compiler *must*
--  # always write the preprocessed file to stdout, regardless of -o,
--  # because we must use -o when running libtool.
-+  # always write the preprocessed file to stdout.
-   "$@" || exit $?
-+
-+  # Remove the call to Libtool.
-+  if test "$libtool" = yes; then
-+    while test "X$1" != 'X--mode=compile'; do
-+      shift
-+    done
-+    shift
-+  fi
-+
-   IFS=" "
-   for arg
-   do
-     case "$arg" in
-+    -o)
-+      shift
-+      ;;
-+    $object)
-+      shift
-+      ;;
-     "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
- 	set fnord "$@"
- 	shift
-@@ -497,16 +590,23 @@
- 	;;
-     esac
-   done
--  "$@" -E |
--  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
-+  "$@" -E 2>/dev/null |
-+  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
-   rm -f "$depfile"
-   echo "$object : \\" > "$depfile"
--  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
-+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
-   echo "	" >> "$depfile"
--  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
-+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
-   rm -f "$tmpdepfile"
-   ;;
- 
-+msvcmsys)
-+  # This case exists only to let depend.m4 do its work.  It works by
-+  # looking at the text of this script.  This case will never be run,
-+  # since it is checked for above.
-+  exit 1
-+  ;;
-+
- none)
-   exec "$@"
-   ;;
-@@ -525,5 +625,6 @@
- # eval: (add-hook 'write-file-hooks 'time-stamp)
- # time-stamp-start: "scriptversion="
- # time-stamp-format: "%:y-%02m-%02d.%02H"
--# time-stamp-end: "$"
-+# time-stamp-time-zone: "UTC"
-+# time-stamp-end: "; # UTC"
- # End:
-diff -urN hdf5-1.8.4-patch1.orig/bin/ltmain.sh hdf5-1.8.4-patch1/bin/ltmain.sh
---- hdf5-1.8.4-patch1.orig/bin/ltmain.sh	2010-02-22 22:32:03.000000000 +0100
-+++ hdf5-1.8.4-patch1/bin/ltmain.sh	2010-03-11 15:57:38.000000000 +0100
-@@ -1,6 +1,6 @@
- # Generated from ltmain.m4sh.
- 
--# ltmain.sh (GNU libtool) 2.2.6
-+# ltmain.sh (GNU libtool) 2.2.6b
- # Written by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
- 
- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
-@@ -65,7 +65,7 @@
- #       compiler:		$LTCC
- #       compiler flags:		$LTCFLAGS
- #       linker:		$LD (gnu? $with_gnu_ld)
--#       $progname:		(GNU libtool) 2.2.6
-+#       $progname:		(GNU libtool) 2.2.6b Debian-2.2.6b-2
- #       automake:		$automake_version
- #       autoconf:		$autoconf_version
- #
-@@ -73,9 +73,9 @@
- 
- PROGRAM=ltmain.sh
- PACKAGE=libtool
--VERSION=2.2.6
-+VERSION="2.2.6b Debian-2.2.6b-2"
- TIMESTAMP=""
--package_revision=1.3012
-+package_revision=1.3017
- 
- # Be Bourne compatible
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-@@ -116,15 +116,15 @@
- 
- : ${CP="cp -f"}
- : ${ECHO="echo"}
--: ${EGREP="/usr/bin/grep -E"}
--: ${FGREP="/usr/bin/grep -F"}
--: ${GREP="/usr/bin/grep"}
-+: ${EGREP="/bin/grep -E"}
-+: ${FGREP="/bin/grep -F"}
-+: ${GREP="/bin/grep"}
- : ${LN_S="ln -s"}
- : ${MAKE="make"}
- : ${MKDIR="mkdir"}
- : ${MV="mv -f"}
- : ${RM="rm -f"}
--: ${SED="/opt/local/bin/gsed"}
-+: ${SED="/bin/sed"}
- : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
- : ${Xsed="$SED -e 1s/^X//"}
- 
-@@ -5033,7 +5033,10 @@
- 	case $pass in
- 	dlopen) libs="$dlfiles" ;;
- 	dlpreopen) libs="$dlprefiles" ;;
--	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
-+	link)
-+	  libs="$deplibs %DEPLIBS%"
-+	  test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
-+	  ;;
- 	esac
-       fi
-       if test "$linkmode,$pass" = "lib,dlpreopen"; then
-@@ -5344,19 +5347,19 @@
- 	    # It is a libtool convenience library, so add in its objects.
- 	    convenience="$convenience $ladir/$objdir/$old_library"
- 	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
-+	    tmp_libs=
-+	    for deplib in $dependency_libs; do
-+	      deplibs="$deplib $deplibs"
-+	      if $opt_duplicate_deps ; then
-+		case "$tmp_libs " in
-+		*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-+		esac
-+	      fi
-+	      tmp_libs="$tmp_libs $deplib"
-+	    done
- 	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
- 	    func_fatal_error "\`$lib' is not a convenience library"
- 	  fi
--	  tmp_libs=
--	  for deplib in $dependency_libs; do
--	    deplibs="$deplib $deplibs"
--	    if $opt_duplicate_deps ; then
--	      case "$tmp_libs " in
--	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
--	      esac
--	    fi
--	    tmp_libs="$tmp_libs $deplib"
--	  done
- 	  continue
- 	fi # $pass = conv
- 
-@@ -5893,6 +5896,7 @@
- 	  if test "$link_all_deplibs" != no; then
- 	    # Add the search paths of all dependency libraries
- 	    for deplib in $dependency_libs; do
-+	      path=
- 	      case $deplib in
- 	      -L*) path="$deplib" ;;
- 	      *.la)
-@@ -6206,6 +6210,9 @@
- 	    revision="$number_minor"
- 	    lt_irix_increment=no
- 	    ;;
-+	  *)
-+	    func_fatal_configuration "$modename: unknown library version type \`$version_type'"
-+	    ;;
- 	  esac
- 	  ;;
- 	no)
-diff -urN hdf5-1.8.4-patch1.orig/bin/missing hdf5-1.8.4-patch1/bin/missing
---- hdf5-1.8.4-patch1.orig/bin/missing	2010-02-22 22:32:03.000000000 +0100
-+++ hdf5-1.8.4-patch1/bin/missing	2010-03-11 15:57:58.000000000 +0100
-@@ -1,10 +1,10 @@
- #! /bin/sh
- # Common stub for a few missing GNU programs while installing.
- 
--scriptversion=2005-02-08.22
-+scriptversion=2009-04-28.21; # UTC
- 
--# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
--#   Free Software Foundation, Inc.
-+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-+# 2008, 2009 Free Software Foundation, Inc.
- # 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 @@
- # GNU General Public License for more details.
- 
- # You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
- 
- # As a special exception to the GNU General Public License, if you
- # distribute this file as part of a program that contains a
-@@ -33,6 +31,8 @@
- fi
- 
- run=:
-+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
-+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
- 
- # In the cases where this matters, `missing' is being run in the
- # srcdir already.
-@@ -44,7 +44,7 @@
- 
- msg="missing on your system"
- 
--case "$1" in
-+case $1 in
- --run)
-   # Try to run requested program, and just exit if it succeeds.
-   run=
-@@ -77,6 +77,7 @@
-   aclocal      touch file \`aclocal.m4'
-   autoconf     touch file \`configure'
-   autoheader   touch file \`config.h.in'
-+  autom4te     touch the output file, or create a stub one
-   automake     touch all \`Makefile.in' files
-   bison        create \`y.tab.[ch]', if possible, from existing .[ch]
-   flex         create \`lex.yy.c', if possible, from existing .c
-@@ -86,6 +87,9 @@
-   tar          try tar, gnutar, gtar, then tar without non-portable flags
-   yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
- 
-+Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
-+\`g' are ignored when checking the name.
-+
- Send bug reports to <bug-automake at gnu.org>."
-     exit $?
-     ;;
-@@ -103,15 +107,22 @@
- 
- esac
- 
-+# normalize program name to check for.
-+program=`echo "$1" | sed '
-+  s/^gnu-//; t
-+  s/^gnu//; t
-+  s/^g//; t'`
-+
- # Now exit if we have it, but it failed.  Also exit now if we
- # don't have it and --version was passed (most likely to detect
--# the program).
--case "$1" in
--  lex|yacc)
-+# the program).  This is about non-GNU programs, so use $1 not
-+# $program.
-+case $1 in
-+  lex*|yacc*)
-     # Not GNU programs, they don't have --version.
-     ;;
- 
--  tar)
-+  tar*)
-     if test -n "$run"; then
-        echo 1>&2 "ERROR: \`tar' requires --run"
-        exit 1
-@@ -135,7 +146,7 @@
- 
- # If it does not exist, or fails to run (possibly an outdated version),
- # try to emulate it.
--case "$1" in
-+case $program in
-   aclocal*)
-     echo 1>&2 "\
- WARNING: \`$1' is $msg.  You should only need it if
-@@ -145,7 +156,7 @@
-     touch aclocal.m4
-     ;;
- 
--  autoconf)
-+  autoconf*)
-     echo 1>&2 "\
- WARNING: \`$1' is $msg.  You should only need it if
-          you modified \`${configure_ac}'.  You might want to install the
-@@ -154,7 +165,7 @@
-     touch configure
-     ;;
- 
--  autoheader)
-+  autoheader*)
-     echo 1>&2 "\
- WARNING: \`$1' is $msg.  You should only need it if
-          you modified \`acconfig.h' or \`${configure_ac}'.  You might want
-@@ -164,7 +175,7 @@
-     test -z "$files" && files="config.h"
-     touch_files=
-     for f in $files; do
--      case "$f" in
-+      case $f in
-       *:*) touch_files="$touch_files "`echo "$f" |
- 				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
-       *) touch_files="$touch_files $f.in";;
-@@ -184,7 +195,7 @@
- 	   while read f; do touch "$f"; done
-     ;;
- 
--  autom4te)
-+  autom4te*)
-     echo 1>&2 "\
- WARNING: \`$1' is needed, but is $msg.
-          You might have modified some files without having the
-@@ -192,8 +203,8 @@
-          You can get \`$1' as part of \`Autoconf' from any GNU
-          archive site."
- 
--    file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
--    test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
-+    file=`echo "$*" | sed -n "$sed_output"`
-+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-     if test -f "$file"; then
- 	touch $file
-     else
-@@ -207,80 +218,78 @@
-     fi
-     ;;
- 
--  bison|yacc)
-+  bison*|yacc*)
-     echo 1>&2 "\
- WARNING: \`$1' $msg.  You should only need it if
-          you modified a \`.y' file.  You may need the \`Bison' package
-          in order for those modifications to take effect.  You can get
-          \`Bison' from any GNU archive site."
-     rm -f y.tab.c y.tab.h
--    if [ $# -ne 1 ]; then
-+    if test $# -ne 1; then
-         eval LASTARG="\${$#}"
--	case "$LASTARG" in
-+	case $LASTARG in
- 	*.y)
- 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
--	    if [ -f "$SRCFILE" ]; then
-+	    if test -f "$SRCFILE"; then
- 	         cp "$SRCFILE" y.tab.c
- 	    fi
- 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
--	    if [ -f "$SRCFILE" ]; then
-+	    if test -f "$SRCFILE"; then
- 	         cp "$SRCFILE" y.tab.h
- 	    fi
- 	  ;;
- 	esac
-     fi
--    if [ ! -f y.tab.h ]; then
-+    if test ! -f y.tab.h; then
- 	echo >y.tab.h
-     fi
--    if [ ! -f y.tab.c ]; then
-+    if test ! -f y.tab.c; then
- 	echo 'main() { return 0; }' >y.tab.c
-     fi
-     ;;
- 
--  lex|flex)
-+  lex*|flex*)
-     echo 1>&2 "\
- WARNING: \`$1' is $msg.  You should only need it if
-          you modified a \`.l' file.  You may need the \`Flex' package
-          in order for those modifications to take effect.  You can get
-          \`Flex' from any GNU archive site."
-     rm -f lex.yy.c
--    if [ $# -ne 1 ]; then
-+    if test $# -ne 1; then
-         eval LASTARG="\${$#}"
--	case "$LASTARG" in
-+	case $LASTARG in
- 	*.l)
- 	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
--	    if [ -f "$SRCFILE" ]; then
-+	    if test -f "$SRCFILE"; then
- 	         cp "$SRCFILE" lex.yy.c
- 	    fi
- 	  ;;
- 	esac
-     fi
--    if [ ! -f lex.yy.c ]; then
-+    if test ! -f lex.yy.c; then
- 	echo 'main() { return 0; }' >lex.yy.c
-     fi
-     ;;
- 
--  help2man)
-+  help2man*)
-     echo 1>&2 "\
- WARNING: \`$1' is $msg.  You should only need it if
- 	 you modified a dependency of a manual page.  You may need the
- 	 \`Help2man' package in order for those modifications to take
- 	 effect.  You can get \`Help2man' from any GNU archive site."
- 
--    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
--    if test -z "$file"; then
--	file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
--    fi
--    if [ -f "$file" ]; then
-+    file=`echo "$*" | sed -n "$sed_output"`
-+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-+    if test -f "$file"; then
- 	touch $file
-     else
- 	test -z "$file" || exec >$file
- 	echo ".ab help2man is required to generate this page"
--	exit 1
-+	exit $?
-     fi
-     ;;
- 
--  makeinfo)
-+  makeinfo*)
-     echo 1>&2 "\
- WARNING: \`$1' is $msg.  You should only need it if
-          you modified a \`.texi' or \`.texinfo' file, or any other file
-@@ -289,18 +298,27 @@
-          DU, IRIX).  You might want to install the \`Texinfo' package or
-          the \`GNU make' package.  Grab either from any GNU archive site."
-     # The file to touch is that specified with -o ...
--    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-+    file=`echo "$*" | sed -n "$sed_output"`
-+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-     if test -z "$file"; then
-       # ... or it is the one specified with @setfilename ...
-       infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
--      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
-+      file=`sed -n '
-+	/^@setfilename/{
-+	  s/.* \([^ ]*\) *$/\1/
-+	  p
-+	  q
-+	}' $infile`
-       # ... or it is derived from the source name (dir/f.texi becomes f.info)
-       test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
-     fi
-+    # If the file does not exist, the user really needs makeinfo;
-+    # let's fail without touching anything.
-+    test -f $file || exit 1
-     touch $file
-     ;;
- 
--  tar)
-+  tar*)
-     shift
- 
-     # We have already tried tar in the generic part.
-@@ -314,13 +332,13 @@
-     fi
-     firstarg="$1"
-     if shift; then
--	case "$firstarg" in
-+	case $firstarg in
- 	*o*)
- 	    firstarg=`echo "$firstarg" | sed s/o//`
- 	    tar "$firstarg" "$@" && exit 0
- 	    ;;
- 	esac
--	case "$firstarg" in
-+	case $firstarg in
- 	*h*)
- 	    firstarg=`echo "$firstarg" | sed s/h//`
- 	    tar "$firstarg" "$@" && exit 0
-@@ -353,5 +371,6 @@
- # eval: (add-hook 'write-file-hooks 'time-stamp)
- # time-stamp-start: "scriptversion="
- # time-stamp-format: "%:y-%02m-%02d.%02H"
--# time-stamp-end: "$"
-+# time-stamp-time-zone: "UTC"
-+# time-stamp-end: "; # UTC"
- # End:
-diff -urN hdf5-1.8.4-patch1.orig/bin/mkinstalldirs hdf5-1.8.4-patch1/bin/mkinstalldirs
---- hdf5-1.8.4-patch1.orig/bin/mkinstalldirs	2010-02-22 22:32:03.000000000 +0100
-+++ hdf5-1.8.4-patch1/bin/mkinstalldirs	2010-03-11 15:58:11.000000000 +0100
-@@ -1,31 +1,59 @@
- #! /bin/sh
- # mkinstalldirs --- make directory hierarchy
--# Author: Noah Friedman <friedman at prep.ai.mit.edu>
--# Created: 1993-05-16
--# Public domain
- 
--# $Id: mkinstalldirs 9902 2005-02-01 04:17:02Z jlaird $
-+scriptversion=2009-04-28.21; # UTC
- 
-+# Original author: Noah Friedman <friedman at prep.ai.mit.edu>
-+# Created: 1993-05-16
-+# Public domain.
-+#
-+# This file is maintained in Automake, please report
-+# bugs to <bug-automake at gnu.org> or send patches to
-+# <automake-patches at gnu.org>.
-+
-+nl='
-+'
-+IFS=" ""	$nl"
- errstatus=0
--dirmode=""
-+dirmode=
- 
- usage="\
--Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
-+Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
-+
-+Create each directory DIR (with mode MODE, if specified), including all
-+leading file name components.
-+
-+Report bugs to <bug-automake at gnu.org>."
- 
- # process command line arguments
- while test $# -gt 0 ; do
--   case "${1}" in
--     -h | --help | --h* )			# -h for help
--	echo "${usage}" 1>&2; exit 0 ;;
--     -m )					# -m PERM arg
--	shift
--	test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; }
--	dirmode="${1}"
--	shift ;;
--     -- ) shift; break ;;			# stop option processing
--     -* ) echo "${usage}" 1>&2; exit 1 ;;	# unknown option
--     * )  break ;;				# first non-opt arg
--   esac
-+  case $1 in
-+    -h | --help | --h*)         # -h for help
-+      echo "$usage"
-+      exit $?
-+      ;;
-+    -m)                         # -m PERM arg
-+      shift
-+      test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
-+      dirmode=$1
-+      shift
-+      ;;
-+    --version)
-+      echo "$0 $scriptversion"
-+      exit $?
-+      ;;
-+    --)                         # stop option processing
-+      shift
-+      break
-+      ;;
-+    -*)                         # unknown option
-+      echo "$usage" 1>&2
-+      exit 1
-+      ;;
-+    *)                          # first non-opt arg
-+      break
-+      ;;
-+  esac
- done
- 
- for file
-@@ -38,64 +66,97 @@
- done
- 
- case $# in
--0) exit 0 ;;
-+  0) exit 0 ;;
- esac
- 
-+# Solaris 8's mkdir -p isn't thread-safe.  If you mkdir -p a/b and
-+# mkdir -p a/c at the same time, both will detect that a is missing,
-+# one will create a, then the other will try to create a and die with
-+# a "File exists" error.  This is a problem when calling mkinstalldirs
-+# from a parallel make.  We use --version in the probe to restrict
-+# ourselves to GNU mkdir, which is thread-safe.
- case $dirmode in
--'')
--  if mkdir -p -- . 2>/dev/null; then
--    echo "mkdir -p -- $*"
--    exec mkdir -p -- "$@"
--  fi ;;
--*)
--  if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
--    echo "mkdir -m $dirmode -p -- $*"
--    exec mkdir -m "$dirmode" -p -- "$@"
--  fi ;;
-+  '')
-+    if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-+      echo "mkdir -p -- $*"
-+      exec mkdir -p -- "$@"
-+    else
-+      # On NextStep and OpenStep, the `mkdir' command does not
-+      # recognize any option.  It will interpret all options as
-+      # directories to create, and then abort because `.' already
-+      # exists.
-+      test -d ./-p && rmdir ./-p
-+      test -d ./--version && rmdir ./--version
-+    fi
-+    ;;
-+  *)
-+    if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
-+       test ! -d ./--version; then
-+      echo "mkdir -m $dirmode -p -- $*"
-+      exec mkdir -m "$dirmode" -p -- "$@"
-+    else
-+      # Clean up after NextStep and OpenStep mkdir.
-+      for d in ./-m ./-p ./--version "./$dirmode";
-+      do
-+        test -d $d && rmdir $d
-+      done
-+    fi
-+    ;;
- esac
- 
- for file
- do
--   set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
--   shift
-+  case $file in
-+    /*) pathcomp=/ ;;
-+    *)  pathcomp= ;;
-+  esac
-+  oIFS=$IFS
-+  IFS=/
-+  set fnord $file
-+  shift
-+  IFS=$oIFS
-+
-+  for d
-+  do
-+    test "x$d" = x && continue
-+
-+    pathcomp=$pathcomp$d
-+    case $pathcomp in
-+      -*) pathcomp=./$pathcomp ;;
-+    esac
-+
-+    if test ! -d "$pathcomp"; then
-+      echo "mkdir $pathcomp"
-+
-+      mkdir "$pathcomp" || lasterr=$?
-+
-+      if test ! -d "$pathcomp"; then
-+	errstatus=$lasterr
-+      else
-+	if test ! -z "$dirmode"; then
-+	  echo "chmod $dirmode $pathcomp"
-+	  lasterr=
-+	  chmod "$dirmode" "$pathcomp" || lasterr=$?
- 
--   pathcomp=
--   for d
--   do
--     pathcomp="$pathcomp$d"
--     case "$pathcomp" in
--       -* ) pathcomp=./$pathcomp ;;
--     esac
--
--     if test ! -d "$pathcomp"; then
--	echo "mkdir $pathcomp"
--
--	mkdir "$pathcomp" || lasterr=$?
--
--	if test ! -d "$pathcomp"; then
--	  errstatus=$lasterr
--	else
--	  if test ! -z "$dirmode"; then
--	     echo "chmod $dirmode $pathcomp"
--
--	     lasterr=""
--	     chmod "$dirmode" "$pathcomp" || lasterr=$?
--
--	     if test ! -z "$lasterr"; then
--	       errstatus=$lasterr
--	     fi
-+	  if test ! -z "$lasterr"; then
-+	    errstatus=$lasterr
- 	  fi
- 	fi
--     fi
-+      fi
-+    fi
- 
--     pathcomp="$pathcomp/"
--   done
-+    pathcomp=$pathcomp/
-+  done
- done
- 
- exit $errstatus
- 
- # Local Variables:
- # mode: shell-script
--# sh-indentation: 3
-+# sh-indentation: 2
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# time-stamp-start: "scriptversion="
-+# time-stamp-format: "%:y-%02m-%02d.%02H"
-+# time-stamp-time-zone: "UTC"
-+# time-stamp-end: "; # UTC"
- # End:
--# mkinstalldirs ends here
-diff -urN hdf5-1.8.4-patch1.orig/c++/examples/Makefile.in hdf5-1.8.4-patch1/c++/examples/Makefile.in
---- hdf5-1.8.4-patch1.orig/c++/examples/Makefile.in	2010-02-22 22:32:53.000000000 +0100
-+++ hdf5-1.8.4-patch1/c++/examples/Makefile.in	2010-03-11 15:57:59.000000000 +0100
-@@ -1,4 +1,4 @@
--# 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,
-diff -urN hdf5-1.8.4-patch1.orig/c++/Makefile.in hdf5-1.8.4-patch1/c++/Makefile.in
---- hdf5-1.8.4-patch1.orig/c++/Makefile.in	2010-02-22 22:32:53.000000000 +0100
-+++ hdf5-1.8.4-patch1/c++/Makefile.in	2010-03-11 15:57:59.000000000 +0100
-@@ -1,4 +1,4 @@
--# 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,
-@@ -429,7 +429,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]*);; \
-@@ -454,7 +454,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]*);; \
-diff -urN hdf5-1.8.4-patch1.orig/c++/src/Makefile.in hdf5-1.8.4-patch1/c++/src/Makefile.in
---- hdf5-1.8.4-patch1.orig/c++/src/Makefile.in	2010-02-22 22:32:54.000000000 +0100
-+++ hdf5-1.8.4-patch1/c++/src/Makefile.in	2010-03-11 15:57:59.000000000 +0100
-@@ -1,4 +1,4 @@
--# 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,
-diff -urN hdf5-1.8.4-patch1.orig/c++/test/Makefile.in hdf5-1.8.4-patch1/c++/test/Makefile.in
---- hdf5-1.8.4-patch1.orig/c++/test/Makefile.in	2010-02-22 22:32:54.000000000 +0100
-+++ hdf5-1.8.4-patch1/c++/test/Makefile.in	2010-03-11 15:57:59.000000000 +0100
-@@ -1,4 +1,4 @@
--# 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,
-diff -urN hdf5-1.8.4-patch1.orig/configure hdf5-1.8.4-patch1/configure
---- hdf5-1.8.4-patch1.orig/configure	2010-02-22 22:32:59.000000000 +0100
-+++ hdf5-1.8.4-patch1/configure	2010-03-11 15:57:52.000000000 +0100
-@@ -1,13 +1,15 @@
- #! /bin/sh
--# From configure.in Id: configure.in 17851 2009-11-09 16:28:35Z epourmal .
-+# From configure.in Id: configure.in 18305 2010-02-22 21:45:48Z mamcgree .
- # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.64 for HDF5 1.8.4-patch1.
-+# Generated by GNU Autoconf 2.65 for HDF5 1.8.4-patch1.
- #
- # Report bugs to <help at hdfgroup.org>.
- #
-+#
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
--# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
--# Foundation, Inc.
-+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-+# Inc.
-+#
- #
- # This configure script is free software; the Free Software Foundation
- # gives unlimited permission to copy, distribute and modify it.
-@@ -677,7 +679,8 @@
- 
- 
- 
--exec 7<&0 </dev/null 6>&1
-+test -n "$DJDIR" || exec 7<&0 </dev/null
-+exec 6>&1
- 
- # Name of the host.
- # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-@@ -1753,7 +1756,7 @@
-   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>
-   FC          Fortran compiler command
-   FCFLAGS     Fortran compiler flags
-@@ -1829,7 +1832,7 @@
- if $ac_init_version; then
-   cat <<\_ACEOF
- HDF5 configure 1.8.4-patch1
--generated by GNU Autoconf 2.64
-+generated by GNU Autoconf 2.65
- 
- Copyright (C) 2009 Free Software Foundation, Inc.
- This configure script is free software; the Free Software Foundation
-@@ -1876,7 +1879,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
- 
-@@ -1914,7 +1917,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_fc_try_compile
- 
-@@ -1960,7 +1963,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
- 
-@@ -2002,7 +2005,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_fc_try_run
- 
-@@ -2040,7 +2043,7 @@
- 	ac_retval=1
- fi
-   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
--  return $ac_retval
-+  as_fn_set_status $ac_retval
- 
- } # ac_fn_cxx_try_compile
- 
-@@ -2077,7 +2080,7 @@
-     ac_retval=1
- fi
-   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
--  return $ac_retval
-+  as_fn_set_status $ac_retval
- 
- } # ac_fn_cxx_try_cpp
- 
-@@ -2119,7 +2122,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_cxx_try_run
- 
-@@ -2187,7 +2190,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
- 
-@@ -2229,7 +2232,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
- 
-@@ -2350,7 +2353,7 @@
-   # left behind by Apple's compiler.  We do this before executing the actions.
-   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-   eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
--  return $ac_retval
-+  as_fn_set_status $ac_retval
- 
- } # ac_fn_cxx_try_link
- 
-@@ -2396,7 +2399,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_fc_try_link
- 
-@@ -2785,7 +2788,7 @@
- 
-   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_compute_int
- 
-@@ -2913,7 +2916,7 @@
- running configure, to aid debugging if configure makes a mistake.
- 
- It was created by HDF5 $as_me 1.8.4-patch1, which was
--generated by GNU Autoconf 2.64.  Invocation command line was
-+generated by GNU Autoconf 2.65.  Invocation command line was
- 
-   $ $0 $@
- 
-@@ -3166,7 +3169,7 @@
- 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 /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
-@@ -3175,9 +3178,9 @@
- 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
-+  # 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
-@@ -3601,6 +3604,7 @@
- 
- fi
- 
-+  test -d ./--version && rmdir ./--version
-   if test "${ac_cv_path_mkdir+set}" = set; then
-     MKDIR_P="$ac_cv_path_mkdir -p"
-   else
-@@ -3608,7 +3612,6 @@
-     # 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
-@@ -4382,32 +4385,30 @@
- ... 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
- 
- 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 conftest.out"
-+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
- # Try to create an executable without -o first, disregard a.out.
- # It will help us diagnose broken compilers, and finding out an intuition
- # of exeext.
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
--$as_echo_n "checking for C compiler default output file name... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-+$as_echo_n "checking whether the C compiler works... " >&6; }
- ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
- 
- # The possible output files:
-@@ -4469,10 +4470,10 @@
- else
-   ac_file=''
- fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
--$as_echo "$ac_file" >&6; }
- if test -z "$ac_file"; then :
--  $as_echo "$as_me: failed program was:" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+$as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-@@ -4480,51 +4481,18 @@
- { 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.
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
--$as_echo_n "checking whether the C compiler works... " >&6; }
--# If not cross compiling, check that we can run a simple program.
--if test "$cross_compiling" != yes; then
--  if { ac_try='./$ac_file'
--  { { 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: yes" >&5
--$as_echo "yes" >&6; }
--
--rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out
-+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
- ac_clean_files=$ac_clean_files_save
--# Check 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; }
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
--$as_echo "$cross_compiling" >&6; }
--
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
- $as_echo_n "checking for suffix of executables... " >&6; }
- if { { ac_try="$ac_link"
-@@ -4557,13 +4525,72 @@
- as_fn_error "cannot compute suffix of executables: cannot compile and link
- See \`config.log' for more details." "$LINENO" 5; }
- fi
--rm -f conftest$ac_cv_exeext
-+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; }
- 
- rm -f conftest.$ac_ext
- EXEEXT=$ac_cv_exeext
- ac_exeext=$EXEEXT
-+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 :
-@@ -5172,8 +5199,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
-@@ -5433,8 +5460,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
-@@ -6494,8 +6521,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
-@@ -7617,8 +7644,8 @@
- 
- 
- 
--macro_version='2.2.6'
--macro_revision='1.3012'
-+macro_version='2.2.6b'
-+macro_revision='1.3017'
- 
- 
- 
-@@ -8218,13 +8245,13 @@
- else
-   lt_cv_nm_interface="BSD nm"
-   echo "int some_variable = 0;" > conftest.$ac_ext
--  (eval echo "\"\$as_me:8221: $ac_compile\"" >&5)
-+  (eval echo "\"\$as_me:8248: $ac_compile\"" >&5)
-   (eval "$ac_compile" 2>conftest.err)
-   cat conftest.err >&5
--  (eval echo "\"\$as_me:8224: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+  (eval echo "\"\$as_me:8251: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
-   cat conftest.err >&5
--  (eval echo "\"\$as_me:8227: output\"" >&5)
-+  (eval echo "\"\$as_me:8254: output\"" >&5)
-   cat conftest.out >&5
-   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
-     lt_cv_nm_interface="MS dumpbin"
-@@ -8690,11 +8717,11 @@
-   ;;
- 
- # This must be Linux ELF.
--linux* | k*bsd*-gnu)
-+linux* | k*bsd*-gnu | kopensolaris*-gnu)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
--netbsd*)
-+netbsd* | netbsdelf*-gnu)
-   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
-   else
-@@ -9429,7 +9456,7 @@
-   ;;
- *-*-irix6*)
-   # Find out which ABI we are using.
--  echo '#line 9432 "configure"' > conftest.$ac_ext
-+  echo '#line 9459 "configure"' > conftest.$ac_ext
-   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
-@@ -10613,8 +10640,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
-@@ -11165,8 +11192,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
-@@ -11749,11 +11776,11 @@
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:11752: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:11779: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:11756: \$? = $ac_status" >&5
-+   echo "$as_me:11783: \$? = $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.
-@@ -11918,7 +11945,7 @@
-       lt_prog_compiler_static='-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*)
-@@ -12088,11 +12115,11 @@
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:12091: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:12118: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:12095: \$? = $ac_status" >&5
-+   echo "$as_me:12122: \$? = $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.
-@@ -12193,11 +12220,11 @@
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:12196: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:12223: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:12200: \$? = $ac_status" >&5
-+   echo "$as_me:12227: \$? = $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
-@@ -12248,11 +12275,11 @@
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:12251: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:12278: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:12255: \$? = $ac_status" >&5
-+   echo "$as_me:12282: \$? = $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
-@@ -12367,6 +12394,9 @@
-   openbsd*)
-     with_gnu_ld=no
-     ;;
-+  linux* | k*bsd*-gnu)
-+    link_all_deplibs=no
-+    ;;
-   esac
- 
-   ld_shlibs=yes
-@@ -12388,6 +12418,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 ...
-@@ -12479,7 +12510,7 @@
-       archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-       ;;
- 
--    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
-@@ -12549,7 +12580,7 @@
-       fi
-       ;;
- 
--    netbsd*)
-+    netbsd* | netbsdelf*-gnu)
-       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- 	wlarc=
-@@ -12724,6 +12755,7 @@
- 	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
-@@ -13066,7 +13098,7 @@
-       link_all_deplibs=yes
-       ;;
- 
--    netbsd*)
-+    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
-@@ -13956,7 +13988,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
-@@ -14019,6 +14051,18 @@
-   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
-@@ -14679,7 +14723,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
--#line 14682 "configure"
-+#line 14726 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -14775,7 +14819,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
--#line 14778 "configure"
-+#line 14822 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -15731,7 +15775,7 @@
-         inherit_rpath_CXX=yes
-         ;;
- 
--      linux* | k*bsd*-gnu)
-+      linux* | k*bsd*-gnu | kopensolaris*-gnu)
-         case $cc_basename in
-           KCC*)
- 	    # Kuck and Associates, Inc. (KAI) C++ Compiler
-@@ -16559,7 +16603,7 @@
- 	    ;;
- 	esac
- 	;;
--      linux* | k*bsd*-gnu)
-+      linux* | k*bsd*-gnu | kopensolaris*-gnu)
- 	case $cc_basename in
- 	  KCC*)
- 	    # KAI C++ Compiler
-@@ -16623,7 +16667,7 @@
- 	    ;;
- 	esac
- 	;;
--      netbsd*)
-+      netbsd* | netbsdelf*-gnu)
- 	;;
-       *qnx* | *nto*)
-         # QNX uses GNU C++, but need to define -shared option too, otherwise
-@@ -16747,11 +16791,11 @@
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:16750: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16794: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:16754: \$? = $ac_status" >&5
-+   echo "$as_me:16798: \$? = $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.
-@@ -16846,11 +16890,11 @@
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:16849: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16893: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:16853: \$? = $ac_status" >&5
-+   echo "$as_me:16897: \$? = $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
-@@ -16898,11 +16942,11 @@
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:16901: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16945: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:16905: \$? = $ac_status" >&5
-+   echo "$as_me:16949: \$? = $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
-@@ -16974,6 +17018,9 @@
-   cygwin* | mingw* | cegcc*)
-     export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
-   ;;
-+  linux* | k*bsd*-gnu)
-+    link_all_deplibs_CXX=no
-+  ;;
-   *)
-     export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-   ;;
-@@ -17473,7 +17520,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
-@@ -17536,6 +17583,18 @@
-   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
-@@ -18248,7 +18307,7 @@
-       lt_prog_compiler_static_FC='-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*)
-@@ -18415,11 +18474,11 @@
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:18418: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:18477: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:18422: \$? = $ac_status" >&5
-+   echo "$as_me:18481: \$? = $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.
-@@ -18514,11 +18573,11 @@
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:18517: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:18576: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:18521: \$? = $ac_status" >&5
-+   echo "$as_me:18580: \$? = $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
-@@ -18566,11 +18625,11 @@
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:18569: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:18628: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:18573: \$? = $ac_status" >&5
-+   echo "$as_me:18632: \$? = $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
-@@ -18682,6 +18741,9 @@
-   openbsd*)
-     with_gnu_ld=no
-     ;;
-+  linux* | k*bsd*-gnu)
-+    link_all_deplibs_FC=no
-+    ;;
-   esac
- 
-   ld_shlibs_FC=yes
-@@ -18703,6 +18765,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 ...
-@@ -18794,7 +18857,7 @@
-       archive_expsym_cmds_FC='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
-@@ -18864,7 +18927,7 @@
-       fi
-       ;;
- 
--    netbsd*)
-+    netbsd* | netbsdelf*-gnu)
-       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- 	archive_cmds_FC='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- 	wlarc=
-@@ -19039,6 +19102,7 @@
- 	if test "$aix_use_runtimelinking" = yes; then
- 	  shared_flag="$shared_flag "'${wl}-G'
- 	fi
-+	link_all_deplibs_FC=no
-       else
- 	# not using gcc
- 	if test "$host_cpu" = ia64; then
-@@ -19352,7 +19416,7 @@
-       link_all_deplibs_FC=yes
-       ;;
- 
--    netbsd*)
-+    netbsd* | netbsdelf*-gnu)
-       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- 	archive_cmds_FC='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-       else
-@@ -20088,7 +20152,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
-@@ -20137,6 +20201,18 @@
-   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
-@@ -24171,14 +24247,6 @@
- fi
- 
- 
--if test "X${HDF_CXX}" = "Xyes" -a "X${enable_threadsafe}" = "Xyes"; then
--  as_fn_error "--enable-cxx and --enable-threadsafe flags are incompatible" "$LINENO" 5
--fi
--
--if test "X${HDF_FORTRAN}" = "Xyes" -a "X${enable_threadsafe}" = "Xyes"; then
--  as_fn_error "--enable-fortran and --enable-threadsafe flags are incompatible" "$LINENO" 5
--fi
--
- case "X-$THREADSAFE" in
-   X-|X-no)
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-@@ -28847,7 +28915,7 @@
- # values after options handling.
- ac_log="
- This file was extended by HDF5 $as_me 1.8.4-patch1, 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
-@@ -28887,6 +28955,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
-@@ -28909,10 +28978,11 @@
- 
- _ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
- ac_cs_version="\\
- HDF5 config.status 1.8.4-patch1
--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\\"
- 
- Copyright (C) 2009 Free Software Foundation, Inc.
- This config.status script is free software; the Free Software Foundation
-@@ -28950,6 +29020,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 )
-@@ -29632,7 +29704,7 @@
- t delim
- :nl
- h
--s/\(.\{148\}\).*/\1/
-+s/\(.\{148\}\)..*/\1/
- t more1
- s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
- p
-@@ -29646,7 +29718,7 @@
- t nl
- :delim
- h
--s/\(.\{148\}\).*/\1/
-+s/\(.\{148\}\)..*/\1/
- t more2
- s/["\\]/\\&/g; s/^/"/; s/$/"/
- p
-diff -urN hdf5-1.8.4-patch1.orig/configure.in hdf5-1.8.4-patch1/configure.in
---- hdf5-1.8.4-patch1.orig/configure.in	2010-02-22 22:48:15.000000000 +0100
-+++ hdf5-1.8.4-patch1/configure.in	2010-03-11 15:56:12.000000000 +0100
-@@ -1820,17 +1820,6 @@
-                               [Enable thread safe capability])],
-               THREADSAFE=$enableval)
- 
--dnl The --enable-threadsafe flag is not compatible with --enable-cxx.
--dnl If the user tried to specify both flags, throw an error.
--if test "X${HDF_CXX}" = "Xyes" -a "X${enable_threadsafe}" = "Xyes"; then
--  AC_MSG_ERROR([--enable-cxx and --enable-threadsafe flags are incompatible])
--fi
--
--dnl --enable-threadsafe is also incompatible with --enable-fortran.
--if test "X${HDF_FORTRAN}" = "Xyes" -a "X${enable_threadsafe}" = "Xyes"; then
--  AC_MSG_ERROR([--enable-fortran and --enable-threadsafe flags are incompatible])
--fi
--
- case "X-$THREADSAFE" in
-   X-|X-no)
-     AC_MSG_RESULT([no])
-diff -urN hdf5-1.8.4-patch1.orig/examples/Makefile.in hdf5-1.8.4-patch1/examples/Makefile.in
---- hdf5-1.8.4-patch1.orig/examples/Makefile.in	2010-02-22 22:32:54.000000000 +0100
-+++ hdf5-1.8.4-patch1/examples/Makefile.in	2010-03-11 15:58:00.000000000 +0100
-@@ -1,4 +1,4 @@
--# 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,
-diff -urN hdf5-1.8.4-patch1.orig/fortran/examples/Makefile.in hdf5-1.8.4-patch1/fortran/examples/Makefile.in
---- hdf5-1.8.4-patch1.orig/fortran/examples/Makefile.in	2010-02-22 22:32:54.000000000 +0100
-+++ hdf5-1.8.4-patch1/fortran/examples/Makefile.in	2010-03-11 15:58:00.000000000 +0100
-@@ -1,4 +1,4 @@
--# 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,
-diff -urN hdf5-1.8.4-patch1.orig/fortran/Makefile.in hdf5-1.8.4-patch1/fortran/Makefile.in
---- hdf5-1.8.4-patch1.orig/fortran/Makefile.in	2010-02-22 22:32:54.000000000 +0100
-+++ hdf5-1.8.4-patch1/fortran/Makefile.in	2010-03-11 15:58:00.000000000 +0100
-@@ -1,4 +1,4 @@
--# 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,
-@@ -438,7 +438,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]*);; \
-@@ -463,7 +463,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]*);; \
-diff -urN hdf5-1.8.4-patch1.orig/fortran/src/Makefile.in hdf5-1.8.4-patch1/fortran/src/Makefile.in
---- hdf5-1.8.4-patch1.orig/fortran/src/Makefile.in	2010-02-22 22:32:54.000000000 +0100
-+++ hdf5-1.8.4-patch1/fortran/src/Makefile.in	2010-03-11 15:58:00.000000000 +0100
-@@ -1,4 +1,4 @@
--# 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,
-diff -urN hdf5-1.8.4-patch1.orig/fortran/test/Makefile.in hdf5-1.8.4-patch1/fortran/test/Makefile.in
---- hdf5-1.8.4-patch1.orig/fortran/test/Makefile.in	2010-02-22 22:32:54.000000000 +0100
-+++ hdf5-1.8.4-patch1/fortran/test/Makefile.in	2010-03-11 15:58:01.000000000 +0100
-@@ -1,4 +1,4 @@
--# 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,
-diff -urN hdf5-1.8.4-patch1.orig/fortran/testpar/Makefile.in hdf5-1.8.4-patch1/fortran/testpar/Makefile.in
---- hdf5-1.8.4-patch1.orig/fortran/testpar/Makefile.in	2010-02-22 22:32:54.000000000 +0100
-+++ hdf5-1.8.4-patch1/fortran/testpar/Makefile.in	2010-03-11 15:58:01.000000000 +0100
-@@ -1,4 +1,4 @@
--# 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,
-diff -urN hdf5-1.8.4-patch1.orig/hl/c++/examples/Makefile.in hdf5-1.8.4-patch1/hl/c++/examples/Makefile.in
---- hdf5-1.8.4-patch1.orig/hl/c++/examples/Makefile.in	2010-02-22 22:32:54.000000000 +0100
-+++ hdf5-1.8.4-patch1/hl/c++/examples/Makefile.in	2010-03-11 15:58:02.000000000 +0100
-@@ -1,4 +1,4 @@
--# 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,
-diff -urN hdf5-1.8.4-patch1.orig/hl/c++/Makefile.in hdf5-1.8.4-patch1/hl/c++/Makefile.in
---- hdf5-1.8.4-patch1.orig/hl/c++/Makefile.in	2010-02-22 22:32:54.000000000 +0100
-+++ hdf5-1.8.4-patch1/hl/c++/Makefile.in	2010-03-11 15:58:02.000000000 +0100
-@@ -1,4 +1,4 @@
--# 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,
-@@ -429,7 +429,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]*);; \
-@@ -454,7 +454,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]*);; \
-diff -urN hdf5-1.8.4-patch1.orig/hl/c++/src/Makefile.in hdf5-1.8.4-patch1/hl/c++/src/Makefile.in
---- hdf5-1.8.4-patch1.orig/hl/c++/src/Makefile.in	2010-02-22 22:32:55.000000000 +0100
-+++ hdf5-1.8.4-patch1/hl/c++/src/Makefile.in	2010-03-11 15:58:02.000000000 +0100
-@@ -1,4 +1,4 @@
--# 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,
-diff -urN hdf5-1.8.4-patch1.orig/hl/c++/test/Makefile.in hdf5-1.8.4-patch1/hl/c++/test/Makefile.in
---- hdf5-1.8.4-patch1.orig/hl/c++/test/Makefile.in	2010-02-22 22:32:55.000000000 +0100
-+++ hdf5-1.8.4-patch1/hl/c++/test/Makefile.in	2010-03-11 15:58:02.000000000 +0100
-@@ -1,4 +1,4 @@
--# 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,
-diff -urN hdf5-1.8.4-patch1.orig/hl/examples/Makefile.in hdf5-1.8.4-patch1/hl/examples/Makefile.in
---- hdf5-1.8.4-patch1.orig/hl/examples/Makefile.in	2010-02-22 22:32:55.000000000 +0100
-+++ hdf5-1.8.4-patch1/hl/examples/Makefile.in	2010-03-11 15:58:03.000000000 +0100
-@@ -1,4 +1,4 @@
--# 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,
-diff -urN hdf5-1.8.4-patch1.orig/hl/fortran/examples/Makefile.in hdf5-1.8.4-patch1/hl/fortran/examples/Makefile.in
---- hdf5-1.8.4-patch1.orig/hl/fortran/examples/Makefile.in	2010-02-22 22:32:55.000000000 +0100
-+++ hdf5-1.8.4-patch1/hl/fortran/examples/Makefile.in	2010-03-11 15:58:03.000000000 +0100
-@@ -1,4 +1,4 @@
--# 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,
-diff -urN hdf5-1.8.4-patch1.orig/hl/fortran/Makefile.in hdf5-1.8.4-patch1/hl/fortran/Makefile.in
---- hdf5-1.8.4-patch1.orig/hl/fortran/Makefile.in	2010-02-22 22:32:55.000000000 +0100
-+++ hdf5-1.8.4-patch1/hl/fortran/Makefile.in	2010-03-11 15:58:03.000000000 +0100
-@@ -1,4 +1,4 @@
--# 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,
-@@ -433,7 +433,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]*);; \
-@@ -458,7 +458,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]*);; \
-diff -urN hdf5-1.8.4-patch1.orig/hl/fortran/src/Makefile.in hdf5-1.8.4-patch1/hl/fortran/src/Makefile.in
---- hdf5-1.8.4-patch1.orig/hl/fortran/src/Makefile.in	2010-02-22 22:32:55.000000000 +0100
-+++ hdf5-1.8.4-patch1/hl/fortran/src/Makefile.in	2010-03-11 15:58:04.000000000 +0100
-@@ -1,4 +1,4 @@
--# 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,
-diff -urN hdf5-1.8.4-patch1.orig/hl/fortran/test/Makefile.in hdf5-1.8.4-patch1/hl/fortran/test/Makefile.in
---- hdf5-1.8.4-patch1.orig/hl/fortran/test/Makefile.in	2010-02-22 22:32:55.000000000 +0100
-+++ hdf5-1.8.4-patch1/hl/fortran/test/Makefile.in	2010-03-11 15:58:04.000000000 +0100
-@@ -1,4 +1,4 @@
--# 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,
-diff -urN hdf5-1.8.4-patch1.orig/hl/Makefile.in hdf5-1.8.4-patch1/hl/Makefile.in
---- hdf5-1.8.4-patch1.orig/hl/Makefile.in	2010-02-22 22:32:54.000000000 +0100
-+++ hdf5-1.8.4-patch1/hl/Makefile.in	2010-03-11 15:58:02.000000000 +0100
-@@ -1,4 +1,4 @@
--# 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,
-@@ -435,7 +435,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]*);; \
-@@ -460,7 +460,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]*);; \
-diff -urN hdf5-1.8.4-patch1.orig/hl/src/Makefile.in hdf5-1.8.4-patch1/hl/src/Makefile.in
---- hdf5-1.8.4-patch1.orig/hl/src/Makefile.in	2010-02-22 22:32:55.000000000 +0100
-+++ hdf5-1.8.4-patch1/hl/src/Makefile.in	2010-03-11 15:58:04.000000000 +0100
-@@ -1,4 +1,4 @@
--# 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,
-diff -urN hdf5-1.8.4-patch1.orig/hl/test/Makefile.in hdf5-1.8.4-patch1/hl/test/Makefile.in
---- hdf5-1.8.4-patch1.orig/hl/test/Makefile.in	2010-02-22 22:32:55.000000000 +0100
-+++ hdf5-1.8.4-patch1/hl/test/Makefile.in	2010-03-11 15:58:04.000000000 +0100
-@@ -1,4 +1,4 @@
--# 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,
-diff -urN hdf5-1.8.4-patch1.orig/hl/tools/gif2h5/Makefile.in hdf5-1.8.4-patch1/hl/tools/gif2h5/Makefile.in
---- hdf5-1.8.4-patch1.orig/hl/tools/gif2h5/Makefile.in	2010-02-22 22:32:55.000000000 +0100
-+++ hdf5-1.8.4-patch1/hl/tools/gif2h5/Makefile.in	2010-03-11 15:58:05.000000000 +0100
-@@ -1,4 +1,4 @@
--# 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,
-diff -urN hdf5-1.8.4-patch1.orig/hl/tools/Makefile.in hdf5-1.8.4-patch1/hl/tools/Makefile.in
---- hdf5-1.8.4-patch1.orig/hl/tools/Makefile.in	2010-02-22 22:32:55.000000000 +0100
-+++ hdf5-1.8.4-patch1/hl/tools/Makefile.in	2010-03-11 15:58:05.000000000 +0100
-@@ -1,4 +1,4 @@
--# 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,
-@@ -431,7 +431,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]*);; \
-@@ -456,7 +456,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]*);; \
-diff -urN hdf5-1.8.4-patch1.orig/Makefile.in hdf5-1.8.4-patch1/Makefile.in
---- hdf5-1.8.4-patch1.orig/Makefile.in	2010-02-22 22:32:59.000000000 +0100
-+++ hdf5-1.8.4-patch1/Makefile.in	2010-03-11 15:58:11.000000000 +0100
-@@ -1,4 +1,4 @@
--# 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,
-@@ -44,9 +44,9 @@
- # Configure should set AM_MAKEFLAGS to -V to solve this problem in
- # subdirectories.
- # NOTE: This means that invoking pmake in a subdirectory will not work.
--.MAKEFLAGS:@AM_MAKEFLAGS@
--	$(MAKE) all
--
-+#xxx.MAKEFLAGS:@AM_MAKEFLAGS@
-+#xxx	$(MAKE) all
-+#xxx
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-@@ -470,7 +470,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]*);; \
-@@ -495,7 +495,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]*);; \
-@@ -659,7 +659,8 @@
- 	  fi; \
- 	done
- 	-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 {} {} \; \
-@@ -703,17 +704,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) ;;\
-+	  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*) \
--	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
-+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
- 	*.zip*) \
- 	  unzip $(distdir).zip ;;\
- 	esac
-diff -urN hdf5-1.8.4-patch1.orig/perform/Makefile.in hdf5-1.8.4-patch1/perform/Makefile.in
---- hdf5-1.8.4-patch1.orig/perform/Makefile.in	2010-02-22 22:32:56.000000000 +0100
-+++ hdf5-1.8.4-patch1/perform/Makefile.in	2010-03-11 15:58:05.000000000 +0100
-@@ -1,4 +1,4 @@
--# 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,
-diff -urN hdf5-1.8.4-patch1.orig/src/H5config.h.in hdf5-1.8.4-patch1/src/H5config.h.in
---- hdf5-1.8.4-patch1.orig/src/H5config.h.in	2010-02-22 22:31:54.000000000 +0100
-+++ hdf5-1.8.4-patch1/src/H5config.h.in	2010-03-11 15:57:56.000000000 +0100
-@@ -301,7 +301,7 @@
- /* Define if `struct timezone' is defined */
- #undef HAVE_STRUCT_TIMEZONE
- 
--/* Define to 1 if `struct tm' is a member of `tm_zone'. */
-+/* Define to 1 if `tm_zone' is a member of `struct tm'. */
- #undef HAVE_STRUCT_TM_TM_ZONE
- 
- /* Define if `struct videoconfig' is defined */
-diff -urN hdf5-1.8.4-patch1.orig/src/H5config.h.in~ hdf5-1.8.4-patch1/src/H5config.h.in~
---- hdf5-1.8.4-patch1.orig/src/H5config.h.in~	1970-01-01 01:00:00.000000000 +0100
-+++ hdf5-1.8.4-patch1/src/H5config.h.in~	2010-02-22 22:31:54.000000000 +0100
-@@ -0,0 +1,680 @@
-+/* src/H5config.h.in.  Generated from configure.in by autoheader.  */
-+
-+/* Define if building universal (internal helper macro) */
-+#undef AC_APPLE_UNIVERSAL_BUILD
-+
-+/* Define if your system generates wrong code for log2 routine. */
-+#undef BAD_LOG2_CODE_GENERATED
-+
-+/* Define if the memory buffers being written to disk should be cleared before
-+   writing. */
-+#undef CLEAR_MEMORY
-+
-+/* Define if your system can handle converting denormalized floating-point
-+   values. */
-+#undef CONVERT_DENORMAL_FLOAT
-+
-+/* Define if C++ compiler recognizes offsetof */
-+#undef CXX_HAVE_OFFSETOF
-+
-+/* Define the default virtual file driver to compile */
-+#undef DEFAULT_VFD
-+
-+/* Define if `dev_t' is a scalar */
-+#undef DEV_T_IS_SCALAR
-+
-+/* Define to dummy `main' function (if any) required to link to the Fortran
-+   libraries. */
-+#undef FC_DUMMY_MAIN
-+
-+/* Define if F77 and FC dummy `main' functions are identical. */
-+#undef FC_DUMMY_MAIN_EQ_F77
-+
-+/* Define to a macro mangling the given C identifier (in lower and upper
-+   case), which must not contain underscores, for linking with Fortran. */
-+#undef FC_FUNC
-+
-+/* As FC_FUNC, but for C identifiers containing underscores. */
-+#undef FC_FUNC_
-+
-+/* Define if your system can handle overflow converting floating-point to
-+   integer values. */
-+#undef FP_TO_INTEGER_OVERFLOW_WORKS
-+
-+/* Define if your system roundup accurately converting floating-point to
-+   unsigned long long values. */
-+#undef FP_TO_ULLONG_ACCURATE
-+
-+/* Define if your system has right maximum convert floating-point to unsigned
-+   long long values. */
-+#undef FP_TO_ULLONG_RIGHT_MAXIMUM
-+
-+/* Define if gettimeofday() populates the tz pointer passed in */
-+#undef GETTIMEOFDAY_GIVES_TZ
-+
-+/* Define to 1 if you have the `alarm' function. */
-+#undef HAVE_ALARM
-+
-+/* Define if the __attribute__(()) extension is present */
-+#undef HAVE_ATTRIBUTE
-+
-+/* Define to 1 if you have the `BSDgettimeofday' function. */
-+#undef HAVE_BSDGETTIMEOFDAY
-+
-+/* Define if the compiler understands C99 designated initialization of structs
-+   and unions */
-+#undef HAVE_C99_DESIGNATED_INITIALIZER
-+
-+/* Define if the compiler understands the __func__ keyword */
-+#undef HAVE_C99_FUNC
-+
-+/* Define if the function stack tracing code is to be compiled in */
-+#undef HAVE_CODESTACK
-+
-+/* Define to 1 if you have the declaration of `tzname', and to 0 if you don't.
-+   */
-+#undef HAVE_DECL_TZNAME
-+
-+/* Define to 1 if you have the `difftime' function. */
-+#undef HAVE_DIFFTIME
-+
-+/* Define if the direct I/O virtual file driver should be compiled */
-+#undef HAVE_DIRECT
-+
-+/* Define to 1 if you have the <dlfcn.h> header file. */
-+#undef HAVE_DLFCN_H
-+
-+/* Define to 1 if you have the <dmalloc.h> header file. */
-+#undef HAVE_DMALLOC_H
-+
-+/* Define if library information should be embedded in the executables */
-+#undef HAVE_EMBEDDED_LIBINFO
-+
-+/* Define to 1 if you have the <features.h> header file. */
-+#undef HAVE_FEATURES_H
-+
-+/* Define if support for deflate (zlib) filter is enabled */
-+#undef HAVE_FILTER_DEFLATE
-+
-+/* Define if support for Fletcher32 checksum is enabled */
-+#undef HAVE_FILTER_FLETCHER32
-+
-+/* Define if support for nbit filter is enabled */
-+#undef HAVE_FILTER_NBIT
-+
-+/* Define if support for scaleoffset filter is enabled */
-+#undef HAVE_FILTER_SCALEOFFSET
-+
-+/* Define if support for shuffle filter is enabled */
-+#undef HAVE_FILTER_SHUFFLE
-+
-+/* Define if support for szip filter is enabled */
-+#undef HAVE_FILTER_SZIP
-+
-+/* Define to 1 if you have the `fork' function. */
-+#undef HAVE_FORK
-+
-+/* Define to 1 if you have the `frexpf' function. */
-+#undef HAVE_FREXPF
-+
-+/* Define to 1 if you have the `frexpl' function. */
-+#undef HAVE_FREXPL
-+
-+/* Define to 1 if you have the `fseek64' function. */
-+#undef HAVE_FSEEK64
-+
-+/* Define to 1 if you have the `fseeko' function. */
-+#undef HAVE_FSEEKO
-+
-+/* Define to 1 if you have the `fstat64' function. */
-+#undef HAVE_FSTAT64
-+
-+/* Define to 1 if you have the `ftello' function. */
-+#undef HAVE_FTELLO
-+
-+/* Define to 1 if you have the `ftruncate64' function. */
-+#undef HAVE_FTRUNCATE64
-+
-+/* Define if the compiler understands the __FUNCTION__ keyword */
-+#undef HAVE_FUNCTION
-+
-+/* Define to 1 if you have the `GetConsoleScreenBufferInfo' function. */
-+#undef HAVE_GETCONSOLESCREENBUFFERINFO
-+
-+/* Define to 1 if you have the `gethostname' function. */
-+#undef HAVE_GETHOSTNAME
-+
-+/* Define to 1 if you have the `getpwuid' function. */
-+#undef HAVE_GETPWUID
-+
-+/* Define to 1 if you have the `getrusage' function. */
-+#undef HAVE_GETRUSAGE
-+
-+/* Define to 1 if you have the `gettextinfo' function. */
-+#undef HAVE_GETTEXTINFO
-+
-+/* Define to 1 if you have the `gettimeofday' function. */
-+#undef HAVE_GETTIMEOFDAY
-+
-+/* Define to 1 if you have the `get_fpc_csr' function. */
-+#undef HAVE_GET_FPC_CSR
-+
-+/* Define if we have GPFS support */
-+#undef HAVE_GPFS
-+
-+/* Define to 1 if you have the <gpfs.h> header file. */
-+#undef HAVE_GPFS_H
-+
-+/* Define if library will contain instrumentation to detect correct
-+   optimization operation */
-+#undef HAVE_INSTRUMENTED_LIBRARY
-+
-+/* Define to 1 if you have the <inttypes.h> header file. */
-+#undef HAVE_INTTYPES_H
-+
-+/* Define to 1 if you have the `ioctl' function. */
-+#undef HAVE_IOCTL
-+
-+/* Define to 1 if you have the <io.h> header file. */
-+#undef HAVE_IO_H
-+
-+/* Define to 1 if you have the `dmalloc' library (-ldmalloc). */
-+#undef HAVE_LIBDMALLOC
-+
-+/* Define to 1 if you have the `lmpe' library (-llmpe). */
-+#undef HAVE_LIBLMPE
-+
-+/* Define to 1 if you have the `m' library (-lm). */
-+#undef HAVE_LIBM
-+
-+/* Define to 1 if you have the `mpe' library (-lmpe). */
-+#undef HAVE_LIBMPE
-+
-+/* Define to 1 if you have the `mpi' library (-lmpi). */
-+#undef HAVE_LIBMPI
-+
-+/* Define to 1 if you have the `mpich' library (-lmpich). */
-+#undef HAVE_LIBMPICH
-+
-+/* Define to 1 if you have the `mpio' library (-lmpio). */
-+#undef HAVE_LIBMPIO
-+
-+/* Define to 1 if you have the `nsl' library (-lnsl). */
-+#undef HAVE_LIBNSL
-+
-+/* Define to 1 if you have the `pthread' library (-lpthread). */
-+#undef HAVE_LIBPTHREAD
-+
-+/* Define to 1 if you have the `socket' library (-lsocket). */
-+#undef HAVE_LIBSOCKET
-+
-+/* Define to 1 if you have the `sz' library (-lsz). */
-+#undef HAVE_LIBSZ
-+
-+/* Define to 1 if you have the `z' library (-lz). */
-+#undef HAVE_LIBZ
-+
-+/* Define to 1 if you have the `longjmp' function. */
-+#undef HAVE_LONGJMP
-+
-+/* Define to 1 if you have the `lseek64' function. */
-+#undef HAVE_LSEEK64
-+
-+/* Define to 1 if you have the <memory.h> header file. */
-+#undef HAVE_MEMORY_H
-+
-+/* Define if we have MPE support */
-+#undef HAVE_MPE
-+
-+/* Define to 1 if you have the <mpe.h> header file. */
-+#undef HAVE_MPE_H
-+
-+/* Define if MPI_File_get_size works correctly */
-+#undef HAVE_MPI_GET_SIZE
-+
-+/* Define if `MPI_Comm_c2f' and `MPI_Comm_f2c' exists */
-+#undef HAVE_MPI_MULTI_LANG_Comm
-+
-+/* Define if `MPI_Info_c2f' and `MPI_Info_f2c' exists */
-+#undef HAVE_MPI_MULTI_LANG_Info
-+
-+/* Define if we have parallel support */
-+#undef HAVE_PARALLEL
-+
-+/* Define to 1 if you have the <pthread.h> header file. */
-+#undef HAVE_PTHREAD_H
-+
-+/* Define to 1 if you have the `random' function. */
-+#undef HAVE_RANDOM
-+
-+/* Define to 1 if you have the `rand_r' function. */
-+#undef HAVE_RAND_R
-+
-+/* Define to 1 if you have the <setjmp.h> header file. */
-+#undef HAVE_SETJMP_H
-+
-+/* Define to 1 if you have the `setsysinfo' function. */
-+#undef HAVE_SETSYSINFO
-+
-+/* Define to 1 if you have the `sigaction' function. */
-+#undef HAVE_SIGACTION
-+
-+/* Define to 1 if you have the `siglongjmp' function. */
-+#undef HAVE_SIGLONGJMP
-+
-+/* Define to 1 if you have the `signal' function. */
-+#undef HAVE_SIGNAL
-+
-+/* Define to 1 if you have the `snprintf' function. */
-+#undef HAVE_SNPRINTF
-+
-+/* Define to 1 if you have the `srandom' function. */
-+#undef HAVE_SRANDOM
-+
-+/* Define to 1 if you have the `stat64' function. */
-+#undef HAVE_STAT64
-+
-+/* Define if `struct stat' has the `st_blocks' field */
-+#undef HAVE_STAT_ST_BLOCKS
-+
-+/* Define to 1 if you have the <stddef.h> header file. */
-+#undef HAVE_STDDEF_H
-+
-+/* Define to 1 if you have the <stdint.h> header file. */
-+#undef HAVE_STDINT_H
-+
-+/* Define to 1 if you have the <stdlib.h> header file. */
-+#undef HAVE_STDLIB_H
-+
-+/* Define to 1 if you have the `strdup' function. */
-+#undef HAVE_STRDUP
-+
-+/* Define to 1 if you have the <strings.h> header file. */
-+#undef HAVE_STRINGS_H
-+
-+/* Define to 1 if you have the <string.h> header file. */
-+#undef HAVE_STRING_H
-+
-+/* Define if `struct text_info' is defined */
-+#undef HAVE_STRUCT_TEXT_INFO
-+
-+/* Define if `struct timezone' is defined */
-+#undef HAVE_STRUCT_TIMEZONE
-+
-+/* Define to 1 if `struct tm' is a member of `tm_zone'. */
-+#undef HAVE_STRUCT_TM_TM_ZONE
-+
-+/* Define if `struct videoconfig' is defined */
-+#undef HAVE_STRUCT_VIDEOCONFIG
-+
-+/* Define to 1 if you have the `system' function. */
-+#undef HAVE_SYSTEM
-+
-+/* Define to 1 if you have the <sys/fpu.h> header file. */
-+#undef HAVE_SYS_FPU_H
-+
-+/* Define to 1 if you have the <sys/ioctl.h> header file. */
-+#undef HAVE_SYS_IOCTL_H
-+
-+/* Define to 1 if you have the <sys/proc.h> header file. */
-+#undef HAVE_SYS_PROC_H
-+
-+/* Define to 1 if you have the <sys/resource.h> header file. */
-+#undef HAVE_SYS_RESOURCE_H
-+
-+/* Define to 1 if you have the <sys/socket.h> header file. */
-+#undef HAVE_SYS_SOCKET_H
-+
-+/* Define to 1 if you have the <sys/stat.h> header file. */
-+#undef HAVE_SYS_STAT_H
-+
-+/* Define to 1 if you have the <sys/sysinfo.h> header file. */
-+#undef HAVE_SYS_SYSINFO_H
-+
-+/* Define to 1 if you have the <sys/timeb.h> header file. */
-+#undef HAVE_SYS_TIMEB_H
-+
-+/* Define to 1 if you have the <sys/time.h> header file. */
-+#undef HAVE_SYS_TIME_H
-+
-+/* Define to 1 if you have the <sys/types.h> header file. */
-+#undef HAVE_SYS_TYPES_H
-+
-+/* Define to 1 if you have the <szlib.h> header file. */
-+#undef HAVE_SZLIB_H
-+
-+/* Define if we have thread safe support */
-+#undef HAVE_THREADSAFE
-+
-+/* Define if `timezone' is a global variable */
-+#undef HAVE_TIMEZONE
-+
-+/* Define if the ioctl TIOCGETD is defined */
-+#undef HAVE_TIOCGETD
-+
-+/* Define if the ioctl TIOGWINSZ is defined */
-+#undef HAVE_TIOCGWINSZ
-+
-+/* Define to 1 if you have the `tmpfile' function. */
-+#undef HAVE_TMPFILE
-+
-+/* Define if `tm_gmtoff' is a member of `struct tm' */
-+#undef HAVE_TM_GMTOFF
-+
-+/* Define to 1 if your `struct tm' has `tm_zone'. Deprecated, use
-+   `HAVE_STRUCT_TM_TM_ZONE' instead. */
-+#undef HAVE_TM_ZONE
-+
-+/* Define to 1 if you don't have `tm_zone' but do have the external array
-+   `tzname'. */
-+#undef HAVE_TZNAME
-+
-+/* Define to 1 if you have the <unistd.h> header file. */
-+#undef HAVE_UNISTD_H
-+
-+/* Define to 1 if you have the `vasprintf' function. */
-+#undef HAVE_VASPRINTF
-+
-+/* Define to 1 if you have the `vsnprintf' function. */
-+#undef HAVE_VSNPRINTF
-+
-+/* Define to 1 if you have the `waitpid' function. */
-+#undef HAVE_WAITPID
-+
-+/* Define if your system has window style path name. */
-+#undef HAVE_WINDOW_PATH
-+
-+/* Define to 1 if you have the <winsock.h> header file. */
-+#undef HAVE_WINSOCK_H
-+
-+/* Define to 1 if you have the <zlib.h> header file. */
-+#undef HAVE_ZLIB_H
-+
-+/* Define to 1 if you have the `_getvideoconfig' function. */
-+#undef HAVE__GETVIDEOCONFIG
-+
-+/* Define to 1 if you have the `_scrsize' function. */
-+#undef HAVE__SCRSIZE
-+
-+/* Define if `__tm_gmtoff' is a member of `struct tm' */
-+#undef HAVE___TM_GMTOFF
-+
-+/* Define if your system can't handle converting floating-point values to long
-+   long. */
-+#undef HW_FP_TO_LLONG_NOT_WORKS
-+
-+/* Define if HDF5's high-level library headers should be included in hdf5.h */
-+#undef INCLUDE_HL
-+
-+/* Define if your system can accurately convert from integers to long double
-+   values. */
-+#undef INTEGER_TO_LDOUBLE_ACCURATE
-+
-+/* Define if your system can convert long double to integers accurately. */
-+#undef LDOUBLE_TO_INTEGER_ACCURATE
-+
-+/* Define if your system can convert from long double to integer values. */
-+#undef LDOUBLE_TO_INTEGER_WORKS
-+
-+/* Define if your system can convert long double to (unsigned) long long
-+   values correctly. */
-+#undef LDOUBLE_TO_LLONG_ACCURATE
-+
-+/* Define if your system can convert long double to unsigned int values
-+   correctly. */
-+#undef LDOUBLE_TO_UINT_ACCURATE
-+
-+/* Define if your system can compile long long to floating-point casts. */
-+#undef LLONG_TO_FP_CAST_WORKS
-+
-+/* Define if your system can convert (unsigned) long long to long double
-+   values correctly. */
-+#undef LLONG_TO_LDOUBLE_CORRECT
-+
-+/* Define to the sub-directory in which libtool stores uninstalled libraries.
-+   */
-+#undef LT_OBJDIR
-+
-+/* Define if the metadata trace file code is to be compiled in */
-+#undef METADATA_TRACE_FILE
-+
-+/* Define if your system can handle complicated MPI derived datatype
-+   correctly. */
-+#undef MPI_COMPLEX_DERIVED_DATATYPE_WORKS
-+
-+/* Define if your system's `MPI_File_set_size' function works for files over
-+   2GB. */
-+#undef MPI_FILE_SET_SIZE_BIG
-+
-+/* Define if your system can handle special collective IO properly. */
-+#undef MPI_SPECIAL_COLLECTIVE_IO_WORKS
-+
-+/* Define if we can violate pointer alignment restrictions */
-+#undef NO_ALIGNMENT_RESTRICTIONS
-+
-+/* Define if deprecated public API symbols are disabled */
-+#undef NO_DEPRECATED_SYMBOLS
-+
-+/* Define if shared writing must be disabled (CodeWarrior only) */
-+#undef NO_SHARED_WRITING
-+
-+/* Name of package */
-+#undef PACKAGE
-+
-+/* Define to the address where bug reports for this package should be sent. */
-+#undef PACKAGE_BUGREPORT
-+
-+/* Define to the full name of this package. */
-+#undef PACKAGE_NAME
-+
-+/* Define to the full name and version of this package. */
-+#undef PACKAGE_STRING
-+
-+/* Define to the one symbol short name of this package. */
-+#undef PACKAGE_TARNAME
-+
-+/* Define to the home page for this package. */
-+#undef PACKAGE_URL
-+
-+/* Define to the version of this package. */
-+#undef PACKAGE_VERSION
-+
-+/* Width for printf() for type `long long' or `__int64', use `ll' */
-+#undef PRINTF_LL_WIDTH
-+
-+/* The size of `char', as computed by sizeof. */
-+#undef SIZEOF_CHAR
-+
-+/* The size of `double', as computed by sizeof. */
-+#undef SIZEOF_DOUBLE
-+
-+/* The size of `float', as computed by sizeof. */
-+#undef SIZEOF_FLOAT
-+
-+/* The size of `int', as computed by sizeof. */
-+#undef SIZEOF_INT
-+
-+/* The size of `int16_t', as computed by sizeof. */
-+#undef SIZEOF_INT16_T
-+
-+/* The size of `int32_t', as computed by sizeof. */
-+#undef SIZEOF_INT32_T
-+
-+/* The size of `int64_t', as computed by sizeof. */
-+#undef SIZEOF_INT64_T
-+
-+/* The size of `int8_t', as computed by sizeof. */
-+#undef SIZEOF_INT8_T
-+
-+/* The size of `int_fast16_t', as computed by sizeof. */
-+#undef SIZEOF_INT_FAST16_T
-+
-+/* The size of `int_fast32_t', as computed by sizeof. */
-+#undef SIZEOF_INT_FAST32_T
-+
-+/* The size of `int_fast64_t', as computed by sizeof. */
-+#undef SIZEOF_INT_FAST64_T
-+
-+/* The size of `int_fast8_t', as computed by sizeof. */
-+#undef SIZEOF_INT_FAST8_T
-+
-+/* The size of `int_least16_t', as computed by sizeof. */
-+#undef SIZEOF_INT_LEAST16_T
-+
-+/* The size of `int_least32_t', as computed by sizeof. */
-+#undef SIZEOF_INT_LEAST32_T
-+
-+/* The size of `int_least64_t', as computed by sizeof. */
-+#undef SIZEOF_INT_LEAST64_T
-+
-+/* The size of `int_least8_t', as computed by sizeof. */
-+#undef SIZEOF_INT_LEAST8_T
-+
-+/* The size of `long', as computed by sizeof. */
-+#undef SIZEOF_LONG
-+
-+/* The size of `long double', as computed by sizeof. */
-+#undef SIZEOF_LONG_DOUBLE
-+
-+/* The size of `long long', as computed by sizeof. */
-+#undef SIZEOF_LONG_LONG
-+
-+/* The size of `off64_t', as computed by sizeof. */
-+#undef SIZEOF_OFF64_T
-+
-+/* The size of `off_t', as computed by sizeof. */
-+#undef SIZEOF_OFF_T
-+
-+/* The size of `short', as computed by sizeof. */
-+#undef SIZEOF_SHORT
-+
-+/* The size of `size_t', as computed by sizeof. */
-+#undef SIZEOF_SIZE_T
-+
-+/* The size of `ssize_t', as computed by sizeof. */
-+#undef SIZEOF_SSIZE_T
-+
-+/* The size of `uint16_t', as computed by sizeof. */
-+#undef SIZEOF_UINT16_T
-+
-+/* The size of `uint32_t', as computed by sizeof. */
-+#undef SIZEOF_UINT32_T
-+
-+/* The size of `uint64_t', as computed by sizeof. */
-+#undef SIZEOF_UINT64_T
-+
-+/* The size of `uint8_t', as computed by sizeof. */
-+#undef SIZEOF_UINT8_T
-+
-+/* The size of `uint_fast16_t', as computed by sizeof. */
-+#undef SIZEOF_UINT_FAST16_T
-+
-+/* The size of `uint_fast32_t', as computed by sizeof. */
-+#undef SIZEOF_UINT_FAST32_T
-+
-+/* The size of `uint_fast64_t', as computed by sizeof. */
-+#undef SIZEOF_UINT_FAST64_T
-+
-+/* The size of `uint_fast8_t', as computed by sizeof. */
-+#undef SIZEOF_UINT_FAST8_T
-+
-+/* The size of `uint_least16_t', as computed by sizeof. */
-+#undef SIZEOF_UINT_LEAST16_T
-+
-+/* The size of `uint_least32_t', as computed by sizeof. */
-+#undef SIZEOF_UINT_LEAST32_T
-+
-+/* The size of `uint_least64_t', as computed by sizeof. */
-+#undef SIZEOF_UINT_LEAST64_T
-+
-+/* The size of `uint_least8_t', as computed by sizeof. */
-+#undef SIZEOF_UINT_LEAST8_T
-+
-+/* The size of `unsigned', as computed by sizeof. */
-+#undef SIZEOF_UNSIGNED
-+
-+/* The size of `__int64', as computed by sizeof. */
-+#undef SIZEOF___INT64
-+
-+/* Define to 1 if you have the ANSI C header files. */
-+#undef STDC_HEADERS
-+
-+/* Define if strict file format checks are enabled */
-+#undef STRICT_FORMAT_CHECKS
-+
-+/* Define if your system supports pthread_attr_setscope(&attribute,
-+   PTHREAD_SCOPE_SYSTEM) call. */
-+#undef SYSTEM_SCOPE_THREADS
-+
-+/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
-+#undef TIME_WITH_SYS_TIME
-+
-+/* Define to 1 if your <sys/time.h> declares `struct tm'. */
-+#undef TM_IN_SYS_TIME
-+
-+/* Define if your system can compile unsigned long long to floating-point
-+   casts. */
-+#undef ULLONG_TO_FP_CAST_WORKS
-+
-+/* Define if your system can convert unsigned long long to long double with
-+   correct precision. */
-+#undef ULLONG_TO_LDOUBLE_PRECISION
-+
-+/* Define if your system accurately converting unsigned long to float values.
-+   */
-+#undef ULONG_TO_FLOAT_ACCURATE
-+
-+/* Define if your system can accurately convert unsigned (long) long values to
-+   floating-point values. */
-+#undef ULONG_TO_FP_BOTTOM_BIT_ACCURATE
-+
-+/* Define using v1.6 public API symbols by default */
-+#undef USE_16_API_DEFAULT
-+
-+/* Define if a memory checking tool will be used on the library, to cause
-+   library to be very picky about memory operations and also disable the
-+   internal free list manager code. */
-+#undef USING_MEMCHECKER
-+
-+/* Version number of package */
-+#undef VERSION
-+
-+/* Define if vsnprintf() returns the correct value for formatted strings that
-+   don't fit into size allowed */
-+#undef VSNPRINTF_WORKS
-+
-+/* Data accuracy is prefered to speed during data conversions */
-+#undef WANT_DATA_ACCURACY
-+
-+/* Check exception handling functions during data conversions */
-+#undef WANT_DCONV_EXCEPTION
-+
-+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
-+   significant byte first (like Motorola and SPARC, unlike Intel). */
-+#if defined AC_APPLE_UNIVERSAL_BUILD
-+# if defined __BIG_ENDIAN__
-+#  define WORDS_BIGENDIAN 1
-+# endif
-+#else
-+# ifndef WORDS_BIGENDIAN
-+#  undef WORDS_BIGENDIAN
-+# endif
-+#endif
-+
-+/* Define to empty if `const' does not conform to ANSI C. */
-+#undef const
-+
-+/* Define to `__inline__' or `__inline' if that's what the C compiler
-+   calls it, or to nothing if 'inline' is not supported under any name.  */
-+#ifndef __cplusplus
-+#undef inline
-+#endif
-+
-+/* Define to `long int' if <sys/types.h> does not define. */
-+#undef off_t
-+
-+/* Define to `unsigned long' if <sys/types.h> does not define. */
-+#undef size_t
-+
-+/* Define to `long' if <sys/types.h> does not define. */
-+#undef ssize_t
-diff -urN hdf5-1.8.4-patch1.orig/src/Makefile.in hdf5-1.8.4-patch1/src/Makefile.in
---- hdf5-1.8.4-patch1.orig/src/Makefile.in	2010-02-22 22:32:56.000000000 +0100
-+++ hdf5-1.8.4-patch1/src/Makefile.in	2010-03-11 15:58:06.000000000 +0100
-@@ -1,4 +1,4 @@
--# 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,
-diff -urN hdf5-1.8.4-patch1.orig/test/Makefile.in hdf5-1.8.4-patch1/test/Makefile.in
---- hdf5-1.8.4-patch1.orig/test/Makefile.in	2010-02-22 22:32:56.000000000 +0100
-+++ hdf5-1.8.4-patch1/test/Makefile.in	2010-03-11 15:58:06.000000000 +0100
-@@ -1,4 +1,4 @@
--# 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,
-diff -urN hdf5-1.8.4-patch1.orig/testpar/Makefile.in hdf5-1.8.4-patch1/testpar/Makefile.in
---- hdf5-1.8.4-patch1.orig/testpar/Makefile.in	2010-02-22 22:32:56.000000000 +0100
-+++ hdf5-1.8.4-patch1/testpar/Makefile.in	2010-03-11 15:58:07.000000000 +0100
-@@ -1,4 +1,4 @@
--# 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,
-diff -urN hdf5-1.8.4-patch1.orig/tools/h5copy/Makefile.in hdf5-1.8.4-patch1/tools/h5copy/Makefile.in
---- hdf5-1.8.4-patch1.orig/tools/h5copy/Makefile.in	2010-02-22 22:32:56.000000000 +0100
-+++ hdf5-1.8.4-patch1/tools/h5copy/Makefile.in	2010-03-11 15:58:08.000000000 +0100
-@@ -1,4 +1,4 @@
--# 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,
-diff -urN hdf5-1.8.4-patch1.orig/tools/h5diff/Makefile.in hdf5-1.8.4-patch1/tools/h5diff/Makefile.in
---- hdf5-1.8.4-patch1.orig/tools/h5diff/Makefile.in	2010-02-22 22:32:56.000000000 +0100
-+++ hdf5-1.8.4-patch1/tools/h5diff/Makefile.in	2010-03-11 15:58:08.000000000 +0100
-@@ -1,4 +1,4 @@
--# 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,
-diff -urN hdf5-1.8.4-patch1.orig/tools/h5dump/Makefile.in hdf5-1.8.4-patch1/tools/h5dump/Makefile.in
---- hdf5-1.8.4-patch1.orig/tools/h5dump/Makefile.in	2010-02-22 22:32:56.000000000 +0100
-+++ hdf5-1.8.4-patch1/tools/h5dump/Makefile.in	2010-03-11 15:58:08.000000000 +0100
-@@ -1,4 +1,4 @@
--# 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,
-diff -urN hdf5-1.8.4-patch1.orig/tools/h5import/Makefile.in hdf5-1.8.4-patch1/tools/h5import/Makefile.in
---- hdf5-1.8.4-patch1.orig/tools/h5import/Makefile.in	2010-02-22 22:32:56.000000000 +0100
-+++ hdf5-1.8.4-patch1/tools/h5import/Makefile.in	2010-03-11 15:58:09.000000000 +0100
-@@ -1,4 +1,4 @@
--# 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,
-diff -urN hdf5-1.8.4-patch1.orig/tools/h5jam/Makefile.in hdf5-1.8.4-patch1/tools/h5jam/Makefile.in
---- hdf5-1.8.4-patch1.orig/tools/h5jam/Makefile.in	2010-02-22 22:32:57.000000000 +0100
-+++ hdf5-1.8.4-patch1/tools/h5jam/Makefile.in	2010-03-11 15:58:09.000000000 +0100
-@@ -1,4 +1,4 @@
--# 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,
-diff -urN hdf5-1.8.4-patch1.orig/tools/h5ls/Makefile.in hdf5-1.8.4-patch1/tools/h5ls/Makefile.in
---- hdf5-1.8.4-patch1.orig/tools/h5ls/Makefile.in	2010-02-22 22:32:57.000000000 +0100
-+++ hdf5-1.8.4-patch1/tools/h5ls/Makefile.in	2010-03-11 15:58:09.000000000 +0100
-@@ -1,4 +1,4 @@
--# 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,
-diff -urN hdf5-1.8.4-patch1.orig/tools/h5repack/Makefile.in hdf5-1.8.4-patch1/tools/h5repack/Makefile.in
---- hdf5-1.8.4-patch1.orig/tools/h5repack/Makefile.in	2010-02-22 22:32:57.000000000 +0100
-+++ hdf5-1.8.4-patch1/tools/h5repack/Makefile.in	2010-03-11 15:58:10.000000000 +0100
-@@ -1,4 +1,4 @@
--# 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,
-diff -urN hdf5-1.8.4-patch1.orig/tools/h5stat/Makefile.in hdf5-1.8.4-patch1/tools/h5stat/Makefile.in
---- hdf5-1.8.4-patch1.orig/tools/h5stat/Makefile.in	2010-02-22 22:32:57.000000000 +0100
-+++ hdf5-1.8.4-patch1/tools/h5stat/Makefile.in	2010-03-11 15:58:10.000000000 +0100
-@@ -1,4 +1,4 @@
--# 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,
-diff -urN hdf5-1.8.4-patch1.orig/tools/lib/Makefile.in hdf5-1.8.4-patch1/tools/lib/Makefile.in
---- hdf5-1.8.4-patch1.orig/tools/lib/Makefile.in	2010-02-22 22:32:57.000000000 +0100
-+++ hdf5-1.8.4-patch1/tools/lib/Makefile.in	2010-03-11 15:58:10.000000000 +0100
-@@ -1,4 +1,4 @@
--# 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,
-diff -urN hdf5-1.8.4-patch1.orig/tools/Makefile.in hdf5-1.8.4-patch1/tools/Makefile.in
---- hdf5-1.8.4-patch1.orig/tools/Makefile.in	2010-02-22 22:32:56.000000000 +0100
-+++ hdf5-1.8.4-patch1/tools/Makefile.in	2010-03-11 15:58:07.000000000 +0100
-@@ -1,4 +1,4 @@
--# 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,
-@@ -432,7 +432,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]*);; \
-@@ -457,7 +457,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]*);; \
-diff -urN hdf5-1.8.4-patch1.orig/tools/misc/Makefile.in hdf5-1.8.4-patch1/tools/misc/Makefile.in
---- hdf5-1.8.4-patch1.orig/tools/misc/Makefile.in	2010-02-22 22:32:57.000000000 +0100
-+++ hdf5-1.8.4-patch1/tools/misc/Makefile.in	2010-03-11 15:58:11.000000000 +0100
-@@ -1,4 +1,4 @@
--# 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,
diff --git a/debian/patches/series b/debian/patches/series
index b41f792..bf701a0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
-autotools.diff -p1
 mpi.diff
-sigbus.diff
+sscanf.diff
+allowthreadsafe.diff
diff --git a/debian/patches/sigbus.diff b/debian/patches/sigbus.diff
index e209b8d..e69de29 100644
--- a/debian/patches/sigbus.diff
+++ b/debian/patches/sigbus.diff
@@ -1,30 +0,0 @@
-Index: hdf5-1.8.4/src/H5detect.c
-===================================================================
---- hdf5-1.8.4.orig/src/H5detect.c	2010-01-29 12:21:36.000000000 +0100
-+++ hdf5-1.8.4/src/H5detect.c	2010-01-29 12:21:52.000000000 +0100
-@@ -470,6 +470,12 @@
- static void
- sigsegv_handler(int UNUSED signo)
- {
-+    sigset_t set;
-+
-+    sigemptyset(&set);
-+    sigaddset(&set,SIGSEGV);
-+    sigprocmask(SIG_UNBLOCK,&set,NULL);
-+    
-     signal(SIGSEGV, sigsegv_handler);
-     longjmp(jbuf_g, 1);
- }
-@@ -495,6 +501,12 @@
- static void
- sigbus_handler(int UNUSED signo)
- {
-+    sigset_t set;
-+
-+    sigemptyset(&set);
-+    sigaddset(&set,SIGBUS);
-+    sigprocmask(SIG_UNBLOCK,&set,NULL);
-+    
-     signal(SIGBUS, sigbus_handler);
-     longjmp(jbuf_g, 1);
- #ifdef H5_HAVE_SIGLONGJMP
diff --git a/debian/rules b/debian/rules
index 6cba9ba..23d80ce 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,16 +13,15 @@ pkgversion ?= $(shell dpkg-parsechangelog | awk '/^Version:/ {print $$2}')
 version ?= $(shell echo $(pkgversion) | sed 's/\([0-9\.]\)-.*$$/\1/')
 major_version = $(shell echo $(version) | cut -d. -f1,2)
 serpack = $(package)-serial-$(version)
-lampack = $(package)-lam-$(version)
 openmpipack = $(package)-openmpi-$(version)
-mpichpack = $(package)-mpich-$(version)
+mpich2pack = $(package)-mpich2-$(version)
 virtpack = $(package)-$(version)
 
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 DEB_BUILD_ARCH      ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
-DEFAULT_MPI=$(shell readlink /etc/alternatives/mpi | sed s/usr//g | sed s/include//g | sed s/lib//g | sed s/\\///g)
+DEFAULT_MPI=$(shell dpkg -s mpi-default-dev | grep Depends | sed "s/Depends: lib//" | sed "s/Depends: //" | sed "s/-dev//" | sed "s/lam4/lam/")
 
 # To be used if binary packages were buildable on any arch
 #ARCH_FLAG=-a
@@ -73,40 +72,39 @@ endif
     DEBCXX=g++
     DEBFORTRAN=gfortran
 # With gcc 4.3+ force optimization off, else some tests fail...
-    DEBOPT=-O0
+#    DEBOPT=-O0
 # endif
 ###
 
-export MPICH_CC=$(DEBCC)
-export MPICH_CLINKER=$(DEBCC)
-export MPICH_CCC=$(DEBCXX)
-export MPICH_CCLINKER=$(DEBCXX)
-export LAMMPICC=$(DEBCC)
-export LAMMPICXX=$(DEBCXX)
+export MPICH2_CC=$(DEBCC)
+export MPICH2_CLINKER=$(DEBCC)
+export MPICH2_CCC=$(DEBCXX)
+export MPICH2_CCLINKER=$(DEBCXX)
 
 CONFIGURE_FLAGS = --prefix=/usr --host=$(DEB_HOST_GNU_TYPE) \
 		  --build=$(DEB_BUILD_GNU_TYPE) \
 		  --mandir=\$${prefix}/share/man \
 		  --with-pthread --enable-linux-lfs \
 		  --enable-shared --enable-production=$(USE_PROD) \
-		  --disable-sharedlib-rpath --with-zlib --with-default-api-version=v16
+		  --disable-sharedlib-rpath --with-zlib --with-default-api-version=v18
 SERIAL_ONLY_FLAGS = --enable-cxx --enable-fortran --enable-threadsafe 
 
 configure: configure-stamp-debian configure-stamp-serial configure-stamp-lam \
-	   $(configure_stamp_openmpi) configure-stamp-mpich
+	   $(configure_stamp_openmpi) configure-stamp-mpich2
 
 configure-stamp-debian: debian/control.in
+	autoreconf
 	cd debian && for i in *_devlib; do j=`basename $$i _devlib`; \
 		ln -sf $$i $(package)-serial-dev.$$j ; \
 		ln -sf $$i $(package)-lam-dev.$$j ; \
 		ln -sf $$i $(package)-openmpi-dev.$$j ; \
-		ln -sf $$i $(package)-mpich-dev.$$j ; \
+		ln -sf $$i $(package)-mpich2-dev.$$j ; \
 		done
 	cd debian && for i in *_shlib; do j=`basename $$i _shlib`; \
 		ln -sf $$i $(serpack).$$j ; \
 		ln -sf $$i $(lampack).$$j ; \
 		ln -sf $$i $(openmpipack).$$j ; \
-		ln -sf $$i $(mpichpack).$$j ; \
+		ln -sf $$i $(mpich2pack).$$j ; \
 		done
 	sed -e "s/@VERSION@/$(version)/g" debian/shlibs.in > debian/$(serpack).shlibs
 	touch $@
@@ -119,16 +117,6 @@ configure-stamp-serial: configure-stamp-debian
 		../../configure $(CONFIGURE_FLAGS) $(SERIAL_ONLY_FLAGS) 
 	touch $@
 
-configure-stamp-lam: configure-stamp-debian
-	dh_testdir
-	-mkdir debian/build-lam
-# configure version with lam
-	cd debian/build-lam && CPPFLAGS=-I/usr/include/lam CFLAGS="$(DEBOPT)" CXXFLAGS="$(DEBOPT)" FFLAGS="$(DEBOPT)" \
-		CC=mpicc.lam RUNPARALLEL=/usr/bin/mpirun.lam \
-		../../configure $(CONFIGURE_FLAGS) \
-		--enable-parallel=yes
-	touch $@
-
 configure-stamp-openmpi: configure-stamp-debian
 	dh_testdir
 	-mkdir debian/build-openmpi
@@ -139,13 +127,13 @@ configure-stamp-openmpi: configure-stamp-debian
 		--enable-parallel=yes
 	touch $@
 
-configure-stamp-mpich: configure-stamp-debian
+configure-stamp-mpich2: configure-stamp-debian
 	dh_testdir
-	-mkdir debian/build-mpich
-# configure version with mpich
-	cd debian/build-mpich && FCFLAGS=-I/usr/lib/mpich/include/ CFLAGS="$(DEBOPT)" CXXFLAGS="$(DEBOPT)" FFLAGS="$(DEBOPT)" \
-		LDFLAGS=-L/usr/lib/mpich/lib/ CC=mpicc.mpich \
-		CXX=mpiCC.mpich F9X=mpif90.mpich RUNPARALLEL=/usr/bin/mpirun.mpich \
+	-mkdir debian/build-mpich2
+# configure version with mpich2
+	cd debian/build-mpich2 && FCFLAGS=-I/usr/lib/mpich2/include/ CFLAGS="$(DEBOPT)" CXXFLAGS="$(DEBOPT)" FFLAGS="$(DEBOPT)" \
+		LDFLAGS=-L/usr/lib/mpich2/lib/ CC=mpicc.mpich2 \
+		CXX=mpiCC.mpich2 F9X=mpif90.mpich2 RUNPARALLEL=/usr/bin/mpirun.mpich2 \
 		../../configure $(CONFIGURE_FLAGS) --enable-fortran \
 		--enable-parallel=yes
 	touch $@
@@ -153,26 +141,21 @@ configure-stamp-mpich: configure-stamp-debian
 prep: 
 	dh_prep
 
-build: build-stamp-serial build-stamp-lam $(build_stamp_openmpi) build-stamp-mpich
+build: build-stamp-serial $(build_stamp_openmpi) build-stamp-mpich2
 
 build-stamp-serial: configure-stamp-serial
 	dh_testdir
 	$(MAKE) -C debian/build-serial/
 	touch $@
 
-build-stamp-lam: configure-stamp-lam 
-	dh_testdir
-	$(MAKE) -C debian/build-lam/
-	touch $@
-
 build-stamp-openmpi: configure-stamp-openmpi 
 	dh_testdir
 	$(MAKE)  -C debian/build-openmpi/ OMPI_MCA_disable_memory_allocator=1
 	touch $@
 
-build-stamp-mpich: configure-stamp-mpich 
+build-stamp-mpich2: configure-stamp-mpich2 
 	dh_testdir
-	$(MAKE) -C debian/build-mpich/
+	$(MAKE) -C debian/build-mpich2/
 	touch $@
 
 #
@@ -187,14 +170,13 @@ clean:
 	dh_testroot
 	-rm -rf html
 	-rm -rf debian/build-serial
-	-rm -rf debian/build-lam
 	-rm -rf debian/build-openmpi
-	-rm -rf debian/build-mpich
+	-rm -rf debian/build-mpich2
 	-find debian -type l | xargs rm -f
 	grep -v ^\% debian/control.in | sed -e "s/@VERSION@/$(version)/g" -e "s/@ARCHS@/$(ARCHS)/" -e "s/@MAJOR_VERSION@/$(major_version)/" > debian/control
 	dh_clean configure-stamp* build-stamp* install-stamp* debian/*.shlibs
 
-install: build prep install-serial install-lam $(install_openmpi) install-mpich install-doc
+install: build prep install-serial $(install_openmpi) install-mpich2 install-doc
 
 install-serial: build-stamp-serial 
 	dh_testdir
@@ -204,14 +186,6 @@ install-serial: build-stamp-serial
 	dh_install -p$(serpack) -p$(package)-serial-dev -phdf5-tools \
 		--sourcedir=debian/build-serial/tmpinst
 
-install-lam: build-stamp-lam
-	dh_testdir
-	dh_testroot
-	-mkdir debian/build-lam/tmpinst
-	$(MAKE) -C debian/build-lam/ install prefix=$(CURDIR)/debian/build-lam/tmpinst/usr
-	dh_install -p$(lampack) -p$(package)-lam-dev \
-		--sourcedir=debian/build-lam/tmpinst
-
 install-openmpi: build-stamp-openmpi
 	dh_testdir
 	dh_testroot
@@ -220,13 +194,13 @@ install-openmpi: build-stamp-openmpi
 	dh_install -p$(openmpipack) -p$(package)-openmpi-dev \
 		--sourcedir=debian/build-openmpi/tmpinst
 
-install-mpich: build-stamp-mpich
+install-mpich2: build-stamp-mpich2
 	dh_testdir
 	dh_testroot
-	-mkdir debian/build-mpich/tmpinst
-	$(MAKE) -C debian/build-mpich/ install prefix=$(CURDIR)/debian/build-mpich/tmpinst/usr
-	dh_install -p$(mpichpack) -p$(package)-mpich-dev \
-		--sourcedir=debian/build-mpich/tmpinst
+	-mkdir debian/build-mpich2/tmpinst
+	$(MAKE) -C debian/build-mpich2/ install prefix=$(CURDIR)/debian/build-mpich2/tmpinst/usr
+	dh_install -p$(mpich2pack) -p$(package)-mpich2-dev \
+		--sourcedir=debian/build-mpich2/tmpinst
 
 install-doc:
 	dh_testdir
@@ -247,7 +221,7 @@ binary-indep: install-doc
 	dh_md5sums -i
 	dh_builddeb -i
 
-binary-arch: prep install-serial install-lam $(install_openmpi) install-mpich
+binary-arch: prep install-serial $(install_openmpi) install-mpich2
 	dh_testdir
 	dh_testroot 
 	echo "hdf5-mpi-dev=libhdf5-$(DEFAULT_MPI)-dev" > debian/libhdf5-mpi-dev.substvars
@@ -258,20 +232,18 @@ binary-arch: prep install-serial install-lam $(install_openmpi) install-mpich
 	dh_strip $(ARCH_FLAG)
 	dh_compress $(ARCH_FLAG)
 	dh_fixperms $(ARCH_FLAG)
-	dh_makeshlibs -p$(lampack) -V $(lampack)
 ifeq ($(build_openmpi),yes)
 	dh_makeshlibs -p$(openmpipack) -V $(openmpipack)
 endif
-	dh_makeshlibs -p$(mpichpack) -V $(mpichpack)
+	dh_makeshlibs -p$(mpich2pack) -V $(mpich2pack)
 	dh_makeshlibs -p$(serpack) -V "$(serpack) | $(virtpack)"
 	dh_installdeb $(ARCH_FLAG)
 	dh_shlibdeps -p$(serpack) -L$(serpack) -ldebian/$(serpack)/usr/lib:debian/build-serial/test/.libs
 	dh_shlibdeps -phdf5-tools -L$(serpack) -ldebian/$(serpack)/usr/lib:debian/build-serial/test/.libs 
-	dh_shlibdeps -p$(lampack) -L$(lampack) -ldebian/$(lampack)/usr/lib
 ifeq ($(build_openmpi),yes)
 	dh_shlibdeps -p$(openmpipack) -L$(openmpipack) -ldebian/$(openmpipack)/usr/lib
 endif
-	dh_shlibdeps -p$(mpichpack) -L$(mpichpack) -ldebian/$(mpichpack)/usr/lib
+	dh_shlibdeps -p$(mpich2pack) -L$(mpich2pack) -ldebian/$(mpich2pack)/usr/lib
 	dh_gencontrol $(ARCH_FLAG)
 	dh_md5sums $(ARCH_FLAG)
 	dh_builddeb $(ARCH_FLAG)
@@ -279,4 +251,4 @@ endif
 binary: binary-indep binary-arch
 
 .PHONY: build clean binary-indep binary-arch binary install configure \
-		install-serial install-doc install-lam install-openmpi install-mpich prep
+		install-serial install-doc install-openmpi install-mpich2 prep
diff --git a/debian/source/format b/debian/source/format
index 163aaf8..af2a83f 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1,2 @@
 3.0 (quilt)
+3.0 (quilt)

-- 
Hierarchical Data Format 5 (HDF5)



More information about the Pkg-grass-devel mailing list