Merge lp:~chrisccoulson/totem/ubuntu into lp:~ubuntu-desktop/totem/ubuntu

[Chris Coulson]

=== modified file 'debian/changelog'
--- debian/changelog	2009-03-12 23:04:47 +0000
+++ debian/changelog	2009-03-16 19:39:22 +0000
@@ -1,3 +1,13 @@
+totem (2.26.0-0ubuntu1) jaunty; urgency=low
+
+  * New upstream release (LP: #343843):
+    - Make sure all the Python plugins are translated.
+    - Fix the language selection in the OpenSubtitles plugin.
+  * debian/patches/70_autotools.patch:
+    - New version update.
+
+ -- Chris Coulson <[e-mail]>  Mon, 16 Mar 2009 17:25:46 +0000
+
 totem (2.25.92-0ubuntu2) jaunty; urgency=low
 
   * Reapply revisions dropped by error
 
=== modified file 'debian/control'
--- debian/control	2009-03-09 17:02:51 +0000
+++ debian/control	2009-03-16 19:39:22 +0000
@@ -211,6 +211,7 @@
          python-apt,
          python-gdbm,
          python-gobject (>= 2.15.3),
+         python-gconf,
          python-gtk2 (>= 2.13.0),
          python-gst0.10 (>= 0.10.12)
 Replaces: totem-xine (<< 2.20.0-3), totem-gstreamer (<< 2.20.0-3)
 
=== modified file 'debian/patches/70_autotools.patch'
--- debian/patches/70_autotools.patch	2009-03-09 17:02:51 +0000
+++ debian/patches/70_autotools.patch	2009-03-16 19:39:22 +0000
@@ -1,30 +1,190 @@
-Index: totem-2.25.92/INSTALL
+Index: totem-2.26.0/INSTALL
 ===================================================================
---- totem-2.25.92.orig/INSTALL	2008-01-21 16:06:23.000000000 +0100
-+++ totem-2.25.92/INSTALL	2009-03-09 17:29:29.000000000 +0100
-@@ -2,7 +2,7 @@
+--- totem-2.26.0.orig/INSTALL	2009-03-16 10:43:33.000000000 +0000
++++ totem-2.26.0/INSTALL	2009-03-16 19:11:41.000000000 +0000
+@@ -2,15 +2,15 @@
  *************************
  
  Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
--2006 Free Software Foundation, Inc.
-+2006, 2007 Free Software Foundation, Inc.
+-2006, 2007 Free Software Foundation, Inc.
++2006, 2007, 2008 Free Software Foundation, Inc.
  
- This file is free documentation; the Free Software Foundation gives
+-This file is free documentation; the Free Software Foundation gives
++   This file is free documentation; the Free Software Foundation gives
  unlimited permission to copy, distribute and modify it.
-@@ -67,6 +67,9 @@
-      all sorts of other programs in order to regenerate files that came
-      with the distribution.
- 
-+  6. Often, you can also type `make uninstall' to remove the installed
-+     files again.
-+
+ 
+ Basic Installation
+ ==================
+ 
+-Briefly, the shell commands `./configure; make; make install' should
++   Briefly, the shell commands `./configure; make; make install' should
+ configure, build, and install this package.  The following
+ more-detailed instructions are generic; see the `README' file for
+ instructions specific to this package.
+@@ -73,9 +73,9 @@
  Compilers and Options
  =====================
  
-Index: totem-2.25.92/Makefile.in
+-Some systems require unusual options for compilation or linking that the
+-`configure' script does not know about.  Run `./configure --help' for
+-details on some of the pertinent environment variables.
++   Some systems require unusual options for compilation or linking that
++the `configure' script does not know about.  Run `./configure --help'
++for details on some of the pertinent environment variables.
+ 
+    You can give `configure' initial values for configuration parameters
+ by setting variables in the command line or in the environment.  Here
+@@ -88,7 +88,7 @@
+ Compiling For Multiple Architectures
+ ====================================
+ 
+-You can compile the package for more than one kind of computer at the
++   You can compile the package for more than one kind of computer at the
+ same time, by placing the object files for each architecture in their
+ own directory.  To do this, you can use GNU `make'.  `cd' to the
+ directory where you want the object files and executables to go and run
+@@ -100,10 +100,24 @@
+ installed the package for one architecture, use `make distclean' before
+ reconfiguring for another architecture.
+ 
++   On MacOS X 10.5 and later systems, you can create libraries and
++executables that work on multiple system types--known as "fat" or
++"universal" binaries--by specifying multiple `-arch' options to the
++compiler but only a single `-arch' option to the preprocessor.  Like
++this:
++
++     ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
++                 CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
++                 CPP="gcc -E" CXXCPP="g++ -E"
++
++   This is not guaranteed to produce working output in all cases, you
++may have to build one architecture at a time and combine the results
++using the `lipo' tool if you have problems.
++
+ Installation Names
+ ==================
+ 
+-By default, `make install' installs the package's commands under
++   By default, `make install' installs the package's commands under
+ `/usr/local/bin', include files under `/usr/local/include', etc.  You
+ can specify an installation prefix other than `/usr/local' by giving
+ `configure' the option `--prefix=PREFIX'.
+@@ -126,7 +140,7 @@
+ Optional Features
+ =================
+ 
+-Some packages pay attention to `--enable-FEATURE' options to
++   Some packages pay attention to `--enable-FEATURE' options to
+ `configure', where FEATURE indicates an optional part of the package.
+ They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+ is something like `gnu-as' or `x' (for the X Window System).  The
+@@ -138,14 +152,36 @@
+ you can use the `configure' options `--x-includes=DIR' and
+ `--x-libraries=DIR' to specify their locations.
+ 
++Particular systems
++==================
++
++   On HP-UX, the default C compiler is not ANSI C compatible.  If GNU
++CC is not installed, it is recommended to use the following options in
++order to use an ANSI C compiler:
++
++     ./configure CC="cc -Ae"
++
++and if that doesn't work, install pre-built binaries of GCC for HP-UX.
++
++   On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
++parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
++a workaround.  If GNU CC is not installed, it is therefore recommended
++to try
++
++     ./configure CC="cc"
++
++and if that doesn't work, try
++
++     ./configure CC="cc -nodtk"
++
+ Specifying the System Type
+ ==========================
+ 
+-There may be some features `configure' cannot figure out automatically,
+-but needs to determine by the type of machine the package will run on.
+-Usually, assuming the package is built to be run on the _same_
+-architectures, `configure' can figure that out, but if it prints a
+-message saying it cannot guess the machine type, give it the
++   There may be some features `configure' cannot figure out
++automatically, but needs to determine by the type of machine the package
++will run on.  Usually, assuming the package is built to be run on the
++_same_ architectures, `configure' can figure that out, but if it prints
++a message saying it cannot guess the machine type, give it the
+ `--build=TYPE' option.  TYPE can either be a short name for the system
+ type, such as `sun4', or a canonical name which has the form:
+ 
+@@ -171,9 +207,9 @@
+ Sharing Defaults
+ ================
+ 
+-If you want to set default values for `configure' scripts to share, you
+-can create a site shell script called `config.site' that gives default
+-values for variables like `CC', `cache_file', and `prefix'.
++   If you want to set default values for `configure' scripts to share,
++you can create a site shell script called `config.site' that gives
++default values for variables like `CC', `cache_file', and `prefix'.
+ `configure' looks for `PREFIX/share/config.site' if it exists, then
+ `PREFIX/etc/config.site' if it exists.  Or, you can set the
+ `CONFIG_SITE' environment variable to the location of the site script.
+@@ -182,7 +218,7 @@
+ Defining Variables
+ ==================
+ 
+-Variables not defined in a site shell script can be set in the
++   Variables not defined in a site shell script can be set in the
+ environment passed to `configure'.  However, some packages may run
+ configure again during the build, and the customized values of these
+ variables may be lost.  In order to avoid this problem, you should set
+@@ -201,11 +237,19 @@
+ `configure' Invocation
+ ======================
+ 
+-`configure' recognizes the following options to control how it operates.
++   `configure' recognizes the following options to control how it
++operates.
+ 
+ `--help'
+ `-h'
+-     Print a summary of the options to `configure', and exit.
++     Print a summary of all of the options to `configure', and exit.
++
++`--help=short'
++`--help=recursive'
++     Print a summary of the options unique to this package's
++     `configure', and exit.  The `short' variant lists options used
++     only in the top level, while the `recursive' variant lists options
++     also present in any nested packages.
+ 
+ `--version'
+ `-V'
+@@ -232,6 +276,16 @@
+      Look for the package's source code in directory DIR.  Usually
+      `configure' can determine that directory automatically.
+ 
++`--prefix=DIR'
++     Use DIR as the installation prefix.  *Note Installation Names::
++     for more details, including other options available for fine-tuning
++     the installation locations.
++
++`--no-create'
++`-n'
++     Run the configure checks, but stop before creating any output
++     files.
++
+ `configure' also accepts some other, not widely useful, options.  Run
+ `configure --help' for more details.
+ 
+Index: totem-2.26.0/Makefile.in
 ===================================================================
---- totem-2.25.92.orig/Makefile.in	2009-03-03 13:02:19.000000000 +0100
-+++ totem-2.25.92/Makefile.in	2009-03-09 17:29:49.000000000 +0100
+--- totem-2.26.0.orig/Makefile.in	2009-03-16 10:43:33.000000000 +0000
++++ totem-2.26.0/Makefile.in	2009-03-16 19:11:41.000000000 +0000
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.10.1 from Makefile.am.
 +# Makefile.in generated by automake 1.10.2 from Makefile.am.
@@ -66,15 +226,38 @@
  GTK_CFLAGS = @GTK_CFLAGS@
  GTK_LIBS = @GTK_LIBS@
  HELP_DIR = @HELP_DIR@
-@@ -178,6 +178,7 @@
- INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
- INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
- INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+@@ -155,29 +155,11 @@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INSTOBJEXT = @INSTOBJEXT@
+ INTLLIBS = @INTLLIBS@
+-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+ INTLTOOL_MERGE = @INTLTOOL_MERGE@
+-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+ INTLTOOL_PERL = @INTLTOOL_PERL@
+-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
+-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
 +LD = @LD@
  LDFLAGS = @LDFLAGS@
  LIBEPC_CFLAGS = @LIBEPC_CFLAGS@
  LIBEPC_LIBS = @LIBEPC_LIBS@
-@@ -186,6 +187,7 @@
+@@ -186,6 +168,7 @@
  LIBOBJS = @LIBOBJS@
  LIBS = @LIBS@
  LIBTOOL = @LIBTOOL@
@@ -82,7 +265,7 @@
  LIRC_LIBS = @LIRC_LIBS@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
-@@ -205,10 +207,14 @@
+@@ -205,10 +188,14 @@
  NAUTILUSDIR = @NAUTILUSDIR@
  NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
  NAUTILUS_LIBS = @NAUTILUS_LIBS@
@@ -97,7 +280,7 @@
  PACKAGE = @PACKAGE@
  PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
  PACKAGE_NAME = @PACKAGE_NAME@
-@@ -272,7 +278,7 @@
+@@ -272,7 +259,7 @@
  abs_top_srcdir = @abs_top_srcdir@
  ac_ct_CC = @ac_ct_CC@
  ac_ct_CXX = @ac_ct_CXX@
@@ -106,7 +289,7 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
-@@ -303,6 +309,7 @@
+@@ -303,6 +290,7 @@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -114,7 +297,7 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  oldincludedir = @oldincludedir@
-@@ -405,7 +412,7 @@
+@@ -405,7 +393,7 @@
  	-rm -rf .libs _libs
  
  distclean-libtool:
@@ -123,7 +306,7 @@
  
  # This directory's subdirectories are mostly independent; you can cd
  # into them and run `make' without going through this Makefile.
-@@ -482,7 +489,7 @@
+@@ -482,7 +470,7 @@
  	unique=`for i in $$list; do \
  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
  	  done | \
@@ -132,10 +315,10 @@
  	      END { if (nonempty) { for (i in files) print i; }; }'`; \
  	mkid -fID $$unique
  tags: TAGS
-Index: totem-2.25.92/aclocal.m4
+Index: totem-2.26.0/aclocal.m4
 ===================================================================
---- totem-2.25.92.orig/aclocal.m4	2009-03-03 12:55:11.000000000 +0100
-+++ totem-2.25.92/aclocal.m4	2009-03-09 17:29:39.000000000 +0100
+--- totem-2.26.0.orig/aclocal.m4	2009-03-16 10:43:18.000000000 +0000
++++ totem-2.26.0/aclocal.m4	2009-03-16 19:11:29.000000000 +0000
 @@ -1,4 +1,4 @@
 -# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
 +# generated automatically by aclocal 1.10.2 -*- Autoconf -*-
@@ -200,7 +383,101 @@
  ])
  
  
-@@ -962,101 +959,187 @@
+@@ -837,25 +834,25 @@
+     INTLTOOL_SERVICE_RULE='%.service: %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+    INTLTOOL_POLICY_RULE='%.policy:    %.policy.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ 
+-AC_SUBST(INTLTOOL_DESKTOP_RULE)
+-AC_SUBST(INTLTOOL_DIRECTORY_RULE)
+-AC_SUBST(INTLTOOL_KEYS_RULE)
+-AC_SUBST(INTLTOOL_PROP_RULE)
+-AC_SUBST(INTLTOOL_OAF_RULE)
+-AC_SUBST(INTLTOOL_PONG_RULE)
+-AC_SUBST(INTLTOOL_SERVER_RULE)
+-AC_SUBST(INTLTOOL_SHEET_RULE)
+-AC_SUBST(INTLTOOL_SOUNDLIST_RULE)
+-AC_SUBST(INTLTOOL_UI_RULE)
+-AC_SUBST(INTLTOOL_XAM_RULE)
+-AC_SUBST(INTLTOOL_KBD_RULE)
+-AC_SUBST(INTLTOOL_XML_RULE)
+-AC_SUBST(INTLTOOL_XML_NOMERGE_RULE)
+-AC_SUBST(INTLTOOL_CAVES_RULE)
+-AC_SUBST(INTLTOOL_SCHEMAS_RULE)
+-AC_SUBST(INTLTOOL_THEME_RULE)
+-AC_SUBST(INTLTOOL_SERVICE_RULE)
+-AC_SUBST(INTLTOOL_POLICY_RULE)
++_IT_SUBST(INTLTOOL_DESKTOP_RULE)
++_IT_SUBST(INTLTOOL_DIRECTORY_RULE)
++_IT_SUBST(INTLTOOL_KEYS_RULE)
++_IT_SUBST(INTLTOOL_PROP_RULE)
++_IT_SUBST(INTLTOOL_OAF_RULE)
++_IT_SUBST(INTLTOOL_PONG_RULE)
++_IT_SUBST(INTLTOOL_SERVER_RULE)
++_IT_SUBST(INTLTOOL_SHEET_RULE)
++_IT_SUBST(INTLTOOL_SOUNDLIST_RULE)
++_IT_SUBST(INTLTOOL_UI_RULE)
++_IT_SUBST(INTLTOOL_XAM_RULE)
++_IT_SUBST(INTLTOOL_KBD_RULE)
++_IT_SUBST(INTLTOOL_XML_RULE)
++_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE)
++_IT_SUBST(INTLTOOL_CAVES_RULE)
++_IT_SUBST(INTLTOOL_SCHEMAS_RULE)
++_IT_SUBST(INTLTOOL_THEME_RULE)
++_IT_SUBST(INTLTOOL_SERVICE_RULE)
++_IT_SUBST(INTLTOOL_POLICY_RULE)
+ 
+ # Check the gettext tools to make sure they are GNU
+ AC_PATH_PROG(XGETTEXT, xgettext)
+@@ -872,12 +869,17 @@
+     AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
+ fi
+ 
+-AC_PATH_PROG(INTLTOOL_PERL, [perl])
++AC_PATH_PROG(INTLTOOL_PERL, perl)
+ if test -z "$INTLTOOL_PERL"; then
+-   AC_MSG_ERROR([perl not found; required for intltool])
++   AC_MSG_ERROR([perl not found])
+ fi
+-if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then
+-   AC_MSG_ERROR([perl 5.x required for intltool])
++AC_MSG_CHECKING([for perl >= 5.8.1])
++$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
++if test $? -ne 0; then
++   AC_MSG_ERROR([perl 5.8.1 is required for intltool])
++else
++   IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
++   AC_MSG_RESULT([$IT_PERL_VERSION])
+ fi
+ if test "x$2" != "xno-xml"; then
+    AC_MSG_CHECKING([for XML::Parser])
+@@ -933,7 +935,7 @@
+ dnl of config.status.
+ AC_CONFIG_COMMANDS_PRE([
+   AC_CONFIG_COMMANDS([$1/stamp-it], [
+-    if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" ]; then
++    if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then
+        AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.])
+     fi
+     rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
+@@ -955,6 +957,17 @@
+ ])dnl
+ ])
+ 
++# _IT_SUBST(VARIABLE)
++# -------------------
++# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
++#
++AC_DEFUN([_IT_SUBST],
++[
++AC_SUBST([$1])
++m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
++]
++)
++
+ # deprecated macros
+ AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
+ # A hint is needed for aclocal from Automake <= 1.9.4:
+@@ -962,101 +975,187 @@
  
  
  # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
@@ -241,11 +518,19 @@
 +# obtained by writing to the Free Software Foundation, Inc.,
 +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 +])
-+
+ 
+-# serial 52 AC_PROG_LIBTOOL
 +# serial 56 LT_INIT
  
--# serial 52 AC_PROG_LIBTOOL
  
+-# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
+-# -----------------------------------------------------------
+-# If this macro is not defined by Autoconf, define it here.
+-m4_ifdef([AC_PROVIDE_IFELSE],
+-         [],
+-         [m4_define([AC_PROVIDE_IFELSE],
+-	         [m4_ifdef([AC_PROVIDE_$1],
+-		           [$2], [$3])])])
 +# LT_PREREQ(VERSION)
 +# ------------------
 +# Complain and exit if this libtool version is less that VERSION.
@@ -256,24 +541,6 @@
 +		             63)])],
 +       [$2])])
  
--# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
--# -----------------------------------------------------------
--# If this macro is not defined by Autoconf, define it here.
--m4_ifdef([AC_PROVIDE_IFELSE],
--         [],
--         [m4_define([AC_PROVIDE_IFELSE],
--	         [m4_ifdef([AC_PROVIDE_$1],
--		           [$2], [$3])])])
- 
-+# _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
-+])
  
 -# AC_PROG_LIBTOOL
 -# ---------------
@@ -308,7 +575,24 @@
 -	     [define([LT_AC_PROG_GCJ],
 -		defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
 -])])# AC_PROG_LIBTOOL
- 
++# _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
++])
+ 
+ 
+-# _AC_PROG_LIBTOOL
+-# ----------------
+-AC_DEFUN([_AC_PROG_LIBTOOL],
+-[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
+-AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
+-AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
+-AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
 +# LT_INIT([OPTIONS])
 +# ------------------
 +AC_DEFUN([LT_INIT],
@@ -328,14 +612,7 @@
 +AC_REQUIRE([LTVERSION_VERSION])dnl
 +AC_REQUIRE([LTOBSOLETE_VERSION])dnl
 +m4_require([_LT_PROG_LTMAIN])dnl
- 
--# _AC_PROG_LIBTOOL
--# ----------------
--AC_DEFUN([_AC_PROG_LIBTOOL],
--[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
--AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
--AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
--AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
++
 +dnl Parse OPTIONS
 +_LT_SET_OPTIONS([$0], [$1])
  
@@ -427,14 +704,14 @@
 -AC_REQUIRE([AC_EXEEXT])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
 -AC_LIBTOOL_SYS_MAX_CMD_LEN
 -AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
 -AC_LIBTOOL_OBJDIR
++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
@@ -452,17 +729,17 @@
 +if test -n "${ZSH_VERSION+set}" ; then
 +   setopt NO_GLOB_SUBST
 +fi
++
++_LT_CHECK_OBJDIR
  
 -AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
 -_LT_AC_PROG_ECHO_BACKSLASH
-+_LT_CHECK_OBJDIR
-+
 +m4_require([_LT_TAG_COMPILER])dnl
 +_LT_PROG_ECHO_BACKSLASH
  
  case $host_os in
  aix3*)
-@@ -1072,6533 +1155,7770 @@
+@@ -1072,6533 +1171,7770 @@
  
  # Sed substitution that helps us do robust quoting.  It backslashifies
  # metacharacters that are still active within double-quoted strings.
@@ -767,33 +1044,7 @@
 -    fi
 -    ;;
 -  esac
--])
- 
--# _LT_AC_SYS_LIBPATH_AIX
--# ----------------------
--# Links a minimal program and checks the executable
--# for the system default hardcoded library path. In most cases,
--# this is /usr/lib:/lib, but when the MPI compilers are used
--# the location of the communication and MPI libs are included too.
--# If we don't find anything, use the default library path according
--# to the aix ld manual.
--AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
--[AC_REQUIRE([LT_AC_PROG_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_AC_SYS_LIBPATH_AIX
++
 +# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?])
 +# -------------------------------------------------------------------
 +# CONFIGNAME is the name given to the value in the libtool script.
@@ -809,8 +1060,37 @@
 +	[lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])])
 +    lt_dict_add_subkey([lt_decl_dict], [$2],
 +	[tagged?], [m4_ifval([$5], [yes], [no])])])
-+])
- 
+ ])
+ 
+-# _LT_AC_SYS_LIBPATH_AIX
+-# ----------------------
+-# Links a minimal program and checks the executable
+-# for the system default hardcoded library path. In most cases,
+-# this is /usr/lib:/lib, but when the MPI compilers are used
+-# the location of the communication and MPI libs are included too.
+-# If we don't find anything, use the default library path according
+-# to the aix ld manual.
+-AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
+-[AC_REQUIRE([LT_AC_PROG_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_AC_SYS_LIBPATH_AIX
+ 
++# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION])
++# --------------------------------------------------------
++m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])])
  
 -# _LT_AC_SHELL_INIT(ARG)
 -# ----------------------
@@ -821,10 +1101,11 @@
 -$1
 -AC_DIVERT_POP
 -])# _LT_AC_SHELL_INIT
-+# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION])
-+# --------------------------------------------------------
-+m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])])
  
++# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...])
++# ------------------------------------------------
++m4_define([lt_decl_tag_varnames],
++[_lt_decl_filter([tagged?], [yes], $@)])
  
 -# _LT_AC_PROG_ECHO_BACKSLASH
 -# --------------------------
@@ -834,10 +1115,6 @@
 -[_LT_AC_SHELL_INIT([
 -# Check that we are running under the correct shell.
 -SHELL=${CONFIG_SHELL-/bin/sh}
-+# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...])
-+# ------------------------------------------------
-+m4_define([lt_decl_tag_varnames],
-+[_lt_decl_filter([tagged?], [yes], $@)])
  
 -case X$ECHO in
 -X*--fallback-echo)
@@ -845,21 +1122,6 @@
 -  ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
 -  ;;
 -esac
- 
--echo=${ECHO-echo}
--if test "X[$]1" = X--no-reexec; then
--  # Discard the --no-reexec flag, and continue.
--  shift
--elif test "X[$]1" = X--fallback-echo; then
--  # Avoid inline document here, it may be left over
--  :
--elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
--  # Yippee, $echo works!
--  :
--else
--  # Restart under the correct shell.
--  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
--fi
 +# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..])
 +# ---------------------------------------------------------
 +m4_define([_lt_decl_filter],
@@ -871,6 +1133,21 @@
 +  [lt_dict_filter([lt_decl_dict], $@)])[]dnl
 +])
  
+-echo=${ECHO-echo}
+-if test "X[$]1" = X--no-reexec; then
+-  # Discard the --no-reexec flag, and continue.
+-  shift
+-elif test "X[$]1" = X--fallback-echo; then
+-  # Avoid inline document here, it may be left over
+-  :
+-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
+-  # Yippee, $echo works!
+-  :
+-else
+-  # Restart under the correct shell.
+-  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
+-fi
+ 
 -if test "X[$]1" = X--fallback-echo; then
 -  # used as fallback echo
 -  shift
@@ -879,15 +1156,15 @@
 -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
 +# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...])
 +# --------------------------------------------------
 +m4_define([lt_decl_quote_varnames],
 +[_lt_decl_filter([value], [1], $@)])
  
+-# The HP-UX ksh and POSIX shell print the target directory to stdout
+-# if CDPATH is set.
+-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+ 
 -if test -z "$ECHO"; then
 -if test "X${echo_test_string+set}" != Xset; then
 -# find a string as large as possible, as long as the shell can cope with it
@@ -901,22 +1178,22 @@
 -    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_decl_dquote_varnames([SEPARATOR], [VARNAME1...])
 +# ---------------------------------------------------
 +m4_define([lt_decl_dquote_varnames],
 +[_lt_decl_filter([value], [2], $@)])
  
+-if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
+-   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
+-   test "X$echo_testing_string" = "X$echo_test_string"; then
+-  :
+-else
+-  # The Solaris, AIX, and Digital Unix default echo programs unquote
+-  # backslashes.  This makes it impossible to quote backslashes using
+-  #   echo "$something" | sed 's/\\/\\\\/g'
+-  #
+-  # So, first we look for a working echo in the user's PATH.
+ 
 -  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
 -  for dir in $PATH /usr/ucb; do
 -    IFS="$lt_save_ifs"
@@ -929,47 +1206,6 @@
 -    fi
 -  done
 -  IFS="$lt_save_ifs"
- 
--  if test "X$echo" = Xecho; then
--    # We didn't find a better echo, so look for alternatives.
--    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
--       echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
--       test "X$echo_testing_string" = "X$echo_test_string"; then
--      # This shell has a builtin print -r that does the trick.
--      echo='print -r'
--    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
--	 test "X$CONFIG_SHELL" != X/bin/ksh; then
--      # If we have ksh, try running configure again with it.
--      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
--      export ORIGINAL_CONFIG_SHELL
--      CONFIG_SHELL=/bin/ksh
--      export CONFIG_SHELL
--      exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
--    else
--      # Try using printf.
--      echo='printf %s\n'
--      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
--	 echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
--	 test "X$echo_testing_string" = "X$echo_test_string"; then
--	# Cool, printf works
--	:
--      elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
--	   test "X$echo_testing_string" = 'X\t' &&
--	   echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
--	   test "X$echo_testing_string" = "X$echo_test_string"; then
--	CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
--	export CONFIG_SHELL
--	SHELL="$CONFIG_SHELL"
--	export SHELL
--	echo="$CONFIG_SHELL [$]0 --fallback-echo"
--      elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
--	   test "X$echo_testing_string" = 'X\t' &&
--	   echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
--	   test "X$echo_testing_string" = "X$echo_test_string"; then
--	echo="$CONFIG_SHELL [$]0 --fallback-echo"
--      else
--	# maybe with a smaller string...
--	prev=:
 +# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
 +# ---------------------------------------------------
 +m4_define([lt_decl_varnames_tagged],
@@ -980,6 +1216,47 @@
 +m4_define([_lt_decl_varnames_tagged],
 +[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])])
  
+-  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
@@ -987,20 +1264,6 @@
 -	  fi
 -	  prev="$cmd"
 -	done
- 
--	if test "$prev" != 'sed 50q "[$]0"'; then
--	  echo_test_string=`eval $prev`
--	  export echo_test_string
--	  exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
--	else
--	  # Oops.  We lost completely, so just stick with echo.
--	  echo=echo
--	fi
--      fi
--    fi
--  fi
--fi
--fi
 +# lt_decl_all_varnames([SEPARATOR], [VARNAME1...])
 +# ------------------------------------------------
 +m4_define([lt_decl_all_varnames],
@@ -1014,15 +1277,26 @@
 +			lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl
 +])
  
+-	if test "$prev" != 'sed 50q "[$]0"'; then
+-	  echo_test_string=`eval $prev`
+-	  export echo_test_string
+-	  exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
+-	else
+-	  # Oops.  We lost completely, so just stick with echo.
+-	  echo=echo
+-	fi
+-      fi
+-    fi
+-  fi
+-fi
+-fi
+ 
 -# Copy echo and quote the copy suitably for passing to libtool from
 -# the Makefile, instead of quoting the original, which is used later.
 -ECHO=$echo
 -if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
 -   ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
 -fi
- 
--AC_SUBST(ECHO)
--])])# _LT_AC_PROG_ECHO_BACKSLASH
 +# _LT_CONFIG_STATUS_DECLARE([VARNAME])
 +# ------------------------------------
 +# Quote a variable value, and forward it to `config.status' so that its
@@ -1031,14 +1305,9 @@
 +m4_define([_LT_CONFIG_STATUS_DECLARE],
 +[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`'])
  
+-AC_SUBST(ECHO)
+-])])# _LT_AC_PROG_ECHO_BACKSLASH
  
--# _LT_AC_LOCK
--# -----------
--AC_DEFUN([_LT_AC_LOCK],
--[AC_ARG_ENABLE([libtool-lock],
--    [AC_HELP_STRING([--disable-libtool-lock],
--	[avoid locking (might break parallel builds)])])
--test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
 +# _LT_CONFIG_STATUS_DECLARATIONS
 +# ------------------------------
 +# We delimit libtool config variables with single quotes, so when
@@ -1051,6 +1320,14 @@
 +[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
 +    [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
  
+-# _LT_AC_LOCK
+-# -----------
+-AC_DEFUN([_LT_AC_LOCK],
+-[AC_ARG_ENABLE([libtool-lock],
+-    [AC_HELP_STRING([--disable-libtool-lock],
+-	[avoid locking (might break parallel builds)])])
+-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+ 
 -# Some flags need to be propagated to the compiler or linker for good
 -# libtool support.
 -case $host in
@@ -1101,31 +1378,6 @@
 -  fi
 -  rm -rf conftest*
 -  ;;
- 
--x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
--s390*-*linux*|sparc*-*linux*)
--  # Find out which ABI we are using.
--  echo 'int i;' > conftest.$ac_ext
--  if AC_TRY_EVAL(ac_compile); then
--    case `/usr/bin/file conftest.o` in
--    *32-bit*)
--      case $host in
--        x86_64-*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
 +# _LT_LIBTOOL_TAGS
 +# ----------------
 +# Output comment and list of tags supported by the script
@@ -1133,7 +1385,31 @@
 +[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
 +available_tags="_LT_TAGS"dnl
 +])
-+
+ 
+-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+-s390*-*linux*|sparc*-*linux*)
+-  # Find out which ABI we are using.
+-  echo 'int i;' > conftest.$ac_ext
+-  if AC_TRY_EVAL(ac_compile); then
+-    case `/usr/bin/file conftest.o` in
+-    *32-bit*)
+-      case $host in
+-        x86_64-*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
 +
 +# _LT_LIBTOOL_DECLARE(VARNAME, [TAG])
 +# -----------------------------------
@@ -1467,8 +1743,17 @@
 +  exec AS_MESSAGE_FD>/dev/null
  fi
 -])# AC_LIBTOOL_LINKER_OPTION
+-
 +_LTEOF
  
+-# AC_LIBTOOL_SYS_MAX_CMD_LEN
+-# --------------------------
+-AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN],
+-[# find the maximum length of command line arguments
+-AC_MSG_CHECKING([the maximum length of command line arguments])
+-AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
+-  i=0
+-  teststring="ABCD"
 +cat >>"$CONFIG_LT" <<_LTEOF
 +_LT_OUTPUT_LIBTOOL_COMMANDS_INIT
 +_LTEOF
@@ -1495,15 +1780,6 @@
 +fi
 +])# LT_OUTPUT
  
--# AC_LIBTOOL_SYS_MAX_CMD_LEN
--# --------------------------
--AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN],
--[# find the maximum length of command line arguments
--AC_MSG_CHECKING([the maximum length of command line arguments])
--AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
--  i=0
--  teststring="ABCD"
--
 -  case $build_os in
 -  msdosdjgpp*)
 -    # On DJGPP, this test can blow up pretty badly due to problems in libc
@@ -1656,15 +1932,22 @@
 -  AC_MSG_RESULT(none)
 -fi
 -])# AC_LIBTOOL_SYS_MAX_CMD_LEN
--
--
+ 
++  _LT_PROG_LTMAIN
+ 
 -# _LT_AC_CHECK_DLFCN
 -# ------------------
 -AC_DEFUN([_LT_AC_CHECK_DLFCN],
 -[AC_CHECK_HEADERS(dlfcn.h)dnl
 -])# _LT_AC_CHECK_DLFCN
++  # 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_LTMAIN
++  _LT_PROG_XSI_SHELLFNS
  
 -# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
 -#                           ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
@@ -1679,58 +1962,19 @@
 -  cat > conftest.$ac_ext <<EOF
 -[#line __oline__ "configure"
 -#include "confdefs.h"
-+  # 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" \
++  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
 +    || (rm -f "$cfgfile"; exit 1)
  
 -#if HAVE_DLFCN_H
 -#include <dlfcn.h>
 -#endif
-+  _LT_PROG_XSI_SHELLFNS
- 
--#include <stdio.h>
-+  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
-+    || (rm -f "$cfgfile"; exit 1)
- 
--#ifdef RTLD_GLOBAL
--#  define LT_DLGLOBAL		RTLD_GLOBAL
--#else
--#  ifdef DL_GLOBAL
--#    define LT_DLGLOBAL		DL_GLOBAL
--#  else
--#    define LT_DLGLOBAL		0
--#  endif
--#endif
 +  mv -f "$cfgfile" "$ofile" ||
 +    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
 +  chmod +x "$ofile"
 +],
 +[cat <<_LT_EOF >> "$ofile"
  
--/* 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
+-#include <stdio.h>
 +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
@@ -1748,15 +1992,37 @@
 +])dnl /_LT_CONFIG_SAVE_COMMANDS
 +])# _LT_CONFIG
  
--#ifdef __cplusplus
--extern "C" void exit (int);
+-#ifdef RTLD_GLOBAL
+-#  define LT_DLGLOBAL		RTLD_GLOBAL
+-#else
+-#  ifdef DL_GLOBAL
+-#    define LT_DLGLOBAL		DL_GLOBAL
+-#  else
+-#    define LT_DLGLOBAL		0
+-#  endif
 -#endif
  
--void fnord() { int i=42;}
--int main ()
--{
--  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
--  int status = $lt_dlunknown;
+-/* 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_SUPPORTED_TAG(TAG)
 +# ---------------------
 +# Trace this macro to discover what tags are supported by the libtool
@@ -1764,6 +2030,19 @@
 +#    autoconf --trace 'LT_SUPPORTED_TAG:$1'
 +AC_DEFUN([LT_SUPPORTED_TAG], [])
  
+-#ifdef __cplusplus
+-extern "C" void exit (int);
+-#endif
+ 
+-void fnord() { int i=42;}
+-int main ()
+-{
+-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+-  int status = $lt_dlunknown;
++# C support is built-in for now
++m4_define([_LT_LANG_C_enabled], [])
++m4_define([_LT_TAGS], [])
+ 
 -  if (self)
 -    {
 -      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
@@ -1791,22 +2070,6 @@
 -fi
 -rm -fr conftest*
 -])# _LT_AC_TRY_DLOPEN_SELF
-+# C support is built-in for now
-+m4_define([_LT_LANG_C_enabled], [])
-+m4_define([_LT_TAGS], [])
- 
- 
--# AC_LIBTOOL_DLOPEN_SELF
--# ----------------------
--AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
--[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
--if test "x$enable_dlopen" != xyes; then
--  enable_dlopen=unknown
--  enable_dlopen_self=unknown
--  enable_dlopen_self_static=unknown
--else
--  lt_cv_dlopen=no
--  lt_cv_dlopen_libs=
 +# LT_LANG(LANG)
 +# -------------
 +# Enable libtool support for the given language if not already enabled.
@@ -1824,17 +2087,18 @@
 +    [m4_fatal([$0: unsupported language: "$1"])])])dnl
 +])# LT_LANG
  
--  case $host_os in
--  beos*)
--    lt_cv_dlopen="load_add_on"
--    lt_cv_dlopen_libs=
--    lt_cv_dlopen_self=yes
--    ;;
  
--  mingw* | pw32*)
--    lt_cv_dlopen="LoadLibrary"
--    lt_cv_dlopen_libs=
--   ;;
+-# AC_LIBTOOL_DLOPEN_SELF
+-# ----------------------
+-AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
+-[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
+-if test "x$enable_dlopen" != xyes; then
+-  enable_dlopen=unknown
+-  enable_dlopen_self=unknown
+-  enable_dlopen_self_static=unknown
+-else
+-  lt_cv_dlopen=no
+-  lt_cv_dlopen_libs=
 +# _LT_LANG(LANGNAME)
 +# ------------------
 +m4_defun([_LT_LANG],
@@ -1845,19 +2109,16 @@
 +  _LT_LANG_$1_CONFIG($1)])dnl
 +])# _LT_LANG
  
--  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"
+-  case $host_os in
+-  beos*)
+-    lt_cv_dlopen="load_add_on"
 -    lt_cv_dlopen_libs=
 -    lt_cv_dlopen_self=yes
--    ])
+-    ;;
+ 
+-  mingw* | pw32*)
+-    lt_cv_dlopen="LoadLibrary"
+-    lt_cv_dlopen_libs=
 -   ;;
 +# _LT_LANG_DEFAULT_CONFIG
 +# -----------------------
@@ -1905,6 +2166,25 @@
 +dnl AC_DEFUN([AC_LIBTOOL_FC], [])
 +dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
  
+-  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
+-    ])
+-   ;;
++# _LT_TAG_COMPILER
++# ----------------
++m4_defun([_LT_TAG_COMPILER],
++[AC_REQUIRE([AC_PROG_CC])dnl
+ 
 -  *)
 -    AC_CHECK_FUNC([shl_load],
 -	  [lt_cv_dlopen="shl_load"],
@@ -1925,35 +2205,34 @@
 -      ])
 -    ;;
 -  esac
- 
--  if test "x$lt_cv_dlopen" != xno; then
--    enable_dlopen=yes
--  else
--    enable_dlopen=no
--  fi
-+# _LT_TAG_COMPILER
-+# ----------------
-+m4_defun([_LT_TAG_COMPILER],
-+[AC_REQUIRE([AC_PROG_CC])dnl
- 
--  case $lt_cv_dlopen in
--  dlopen)
--    save_CPPFLAGS="$CPPFLAGS"
--    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
 +_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl
 +_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl
 +_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl
 +_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl
  
+-  if test "x$lt_cv_dlopen" != xno; then
+-    enable_dlopen=yes
+-  else
+-    enable_dlopen=no
+-  fi
++# If no C compiler was specified, use CC.
++LTCC=${LTCC-"$CC"}
+ 
+-  case $lt_cv_dlopen in
+-  dlopen)
+-    save_CPPFLAGS="$CPPFLAGS"
+-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
++# If no C compiler flags were specified, use CFLAGS.
++LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+ 
 -    save_LDFLAGS="$LDFLAGS"
 -    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-+# If no C compiler was specified, use CC.
-+LTCC=${LTCC-"$CC"}
++# Allow CC to be a program name with arguments.
++compiler=$CC
++])# _LT_TAG_COMPILER
  
 -    save_LIBS="$LIBS"
 -    LIBS="$lt_cv_dlopen_libs $LIBS"
-+# If no C compiler flags were specified, use CFLAGS.
-+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
  
 -    AC_CACHE_CHECK([whether a program can dlopen itself],
 -	  lt_cv_dlopen_self, [dnl
@@ -1961,25 +2240,6 @@
 -	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
 -	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
 -    ])
-+# Allow CC to be a program name with arguments.
-+compiler=$CC
-+])# _LT_TAG_COMPILER
- 
--    if test "x$lt_cv_dlopen_self" = xyes; then
--      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
--      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
--    	  lt_cv_dlopen_self_static, [dnl
--	  _LT_AC_TRY_DLOPEN_SELF(
--	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
--	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
--      ])
--    fi
- 
--    CPPFLAGS="$save_CPPFLAGS"
--    LDFLAGS="$save_LDFLAGS"
--    LIBS="$save_LIBS"
--    ;;
--  esac
 +# _LT_COMPILER_BOILERPLATE
 +# ------------------------
 +# Check for compiler boilerplate output or warnings with
@@ -1993,17 +2253,21 @@
 +$RM conftest*
 +])# _LT_COMPILER_BOILERPLATE
  
--  case $lt_cv_dlopen_self in
--  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
--  *) enable_dlopen_self=unknown ;;
--  esac
+-    if test "x$lt_cv_dlopen_self" = xyes; then
+-      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+-      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
+-    	  lt_cv_dlopen_self_static, [dnl
+-	  _LT_AC_TRY_DLOPEN_SELF(
+-	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
+-	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
+-      ])
+-    fi
  
--  case $lt_cv_dlopen_self_static in
--  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
--  *) enable_dlopen_self_static=unknown ;;
+-    CPPFLAGS="$save_CPPFLAGS"
+-    LDFLAGS="$save_LDFLAGS"
+-    LIBS="$save_LIBS"
+-    ;;
 -  esac
--fi
--])# AC_LIBTOOL_DLOPEN_SELF
 +# _LT_LINKER_BOILERPLATE
 +# ----------------------
 +# Check for linker boilerplate output or warnings with
@@ -2017,6 +2281,17 @@
 +$RM -r conftest*
 +])# _LT_LINKER_BOILERPLATE
  
+-  case $lt_cv_dlopen_self in
+-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+-  *) enable_dlopen_self=unknown ;;
+-  esac
+-
+-  case $lt_cv_dlopen_self_static in
+-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+-  *) enable_dlopen_self_static=unknown ;;
+-  esac
+-fi
+-])# AC_LIBTOOL_DLOPEN_SELF
 +# _LT_REQUIRED_DARWIN_CHECKS
 +# -------------------------
 +m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
@@ -2038,20 +2313,6 @@
 +    _LT_DECL([], [OTOOL64], [1],
 +      [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4])
  
--# AC_LIBTOOL_PROG_CC_C_O([TAGNAME])
--# ---------------------------------
--# Check to see if options -c and -o are simultaneously supported by compiler
--AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
--[AC_REQUIRE([LT_AC_PROG_SED])dnl
--AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
--AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
--  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
--  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
--   $rm -r conftest 2>/dev/null
--   mkdir conftest
--   cd conftest
--   mkdir out
--   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 +    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
@@ -2121,6 +2382,21 @@
 +  esac
 +])
  
+-# AC_LIBTOOL_PROG_CC_C_O([TAGNAME])
+-# ---------------------------------
+-# Check to see if options -c and -o are simultaneously supported by compiler
+-AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
+-[AC_REQUIRE([LT_AC_PROG_SED])dnl
+-AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+-AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
+-  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
+-  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
+-   $rm -r conftest 2>/dev/null
+-   mkdir conftest
+-   cd conftest
+-   mkdir out
+-   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.
@@ -2154,7 +2430,6 @@
 -   cd ..
 -   rmdir conftest
 -   $rm conftest*
-+
 +# _LT_DARWIN_LINKER_FEATURES
 +# --------------------------
 +# Checks for linker and compiler features on darwin
@@ -2291,11 +2566,8 @@
 -  lt_cv_objdir=_libs
 +  # Restart under the correct shell.
 +  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
- fi
--rmdir .libs 2>/dev/null])
--objdir=$lt_cv_objdir
--])# AC_LIBTOOL_OBJDIR
- 
++fi
++
 +if test "X[$]1" = X--fallback-echo; then
 +  # used as fallback echo
 +  shift
@@ -2303,7 +2575,14 @@
 +[$]*
 +_LT_EOF
 +  exit 0
-+fi
+ fi
+-rmdir .libs 2>/dev/null])
+-objdir=$lt_cv_objdir
+-])# AC_LIBTOOL_OBJDIR
+ 
++# 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
  
 -# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME])
 -# ----------------------------------------------
@@ -2314,9 +2593,18 @@
 -if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
 -   test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
 -   test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
-+# The HP-UX ksh and POSIX shell print the target directory to stdout
-+# if CDPATH is set.
-+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
++if test -z "$lt_ECHO"; then
++  if test "X${echo_test_string+set}" != Xset; then
++    # find a string as large as possible, as long as the shell can cope with it
++    for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
++      # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
++      if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
++	 { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
++      then
++        break
++      fi
++    done
++  fi
  
 -  # We can hardcode non-existant directories.
 -  if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
@@ -2327,19 +2615,6 @@
 -     test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then
 -    # Linking always hardcodes the temporary library directory.
 -    _LT_AC_TAGVAR(hardcode_action, $1)=relink
-+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
@@ -3677,10 +3952,15 @@
 -  if test -z "$LTCFLAGS"; then
 -    eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
 -  fi
--
+ 
 -  # Extract list of available tagged configurations in $ofile.
 -  # Note that this assumes the entire list is on one line.
 -  available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
++    CPPFLAGS="$save_CPPFLAGS"
++    LDFLAGS="$save_LDFLAGS"
++    LIBS="$save_LIBS"
++    ;;
++  esac
  
 -  lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
 -  for tagname in $tagnames; do
@@ -3691,35 +3971,15 @@
 -    *)  AC_MSG_ERROR([invalid tag name: $tagname])
 -	;;
 -    esac
-+    CPPFLAGS="$save_CPPFLAGS"
-+    LDFLAGS="$save_LDFLAGS"
-+    LIBS="$save_LIBS"
-+    ;;
++  case $lt_cv_dlopen_self in
++  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
++  *) enable_dlopen_self=unknown ;;
 +  esac
  
 -    if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
 -    then
 -      AC_MSG_ERROR([tag name \"$tagname\" already exists])
 -    fi
-+  case $lt_cv_dlopen_self in
-+  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-+  *) enable_dlopen_self=unknown ;;
-+  esac
- 
--    # Update the list of available tags.
--    if test -n "$tagname"; then
--      echo appending configuration tag \"$tagname\" to $ofile
--
--      case $tagname in
--      CXX)
--	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
--	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
--	    (test "X$CXX" != "Xg++"))) ; then
--	  AC_LIBTOOL_LANG_CXX_CONFIG
--	else
--	  tagname=""
--	fi
--	;;
 +  case $lt_cv_dlopen_self_static in
 +  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
 +  *) enable_dlopen_self_static=unknown ;;
@@ -3738,6 +3998,21 @@
 +dnl aclocal-1.4 backwards compatibility:
 +dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [])
  
+-    # Update the list of available tags.
+-    if test -n "$tagname"; then
+-      echo appending configuration tag \"$tagname\" to $ofile
+-
+-      case $tagname in
+-      CXX)
+-	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+-	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+-	    (test "X$CXX" != "Xg++"))) ; then
+-	  AC_LIBTOOL_LANG_CXX_CONFIG
+-	else
+-	  tagname=""
+-	fi
+-	;;
+ 
 -      F77)
 -	if test -n "$F77" && test "X$F77" != "Xno"; then
 -	  AC_LIBTOOL_LANG_F77_CONFIG
@@ -3745,14 +4020,6 @@
 -	  tagname=""
 -	fi
 -	;;
- 
--      GCJ)
--	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
--	  AC_LIBTOOL_LANG_GCJ_CONFIG
--	else
--	  tagname=""
--	fi
--	;;
 +# _LT_COMPILER_C_O([TAGNAME])
 +# ---------------------------
 +# Check to see if options -c and -o are simultaneously supported by compiler.
@@ -3770,8 +4037,12 @@
 +   mkdir out
 +   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
  
--      RC)
--	AC_LIBTOOL_LANG_RC_CONFIG
+-      GCJ)
+-	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
+-	  AC_LIBTOOL_LANG_GCJ_CONFIG
+-	else
+-	  tagname=""
+-	fi
 -	;;
 +   lt_compiler_flag="-o out/conftest2.$ac_objext"
 +   # Insert the option either (1) after the last *FLAGS variable, or
@@ -3811,18 +4082,14 @@
 +	[Does compiler simultaneously support -c and -o options?])
 +])# _LT_COMPILER_C_O
  
+-      RC)
+-	AC_LIBTOOL_LANG_RC_CONFIG
+-	;;
+ 
 -      *)
 -	AC_MSG_ERROR([Unsupported tag name: $tagname])
 -	;;
 -      esac
- 
--      # Append the new tag name to the list of available tags.
--      if test -n "$tagname" ; then
--      available_tags="$available_tags $tagname"
--    fi
--    fi
--  done
--  IFS="$lt_save_ifs"
 +# _LT_COMPILER_FILE_LOCKS([TAGNAME])
 +# ----------------------------------
 +# Check to see if we can do hard links to lock some files if needed
@@ -3831,13 +4098,13 @@
 +m4_require([_LT_FILEUTILS_DEFAULTS])dnl
 +_LT_COMPILER_C_O([$1])
  
--  # Now substitute the updated list of available tags.
--  if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
--    mv "${ofile}T" "$ofile"
--    chmod +x "$ofile"
--  else
--    rm -f "${ofile}T"
--    AC_MSG_ERROR([unable to update list of available tagged configurations.])
+-      # Append the new tag name to the list of available tags.
+-      if test -n "$tagname" ; then
+-      available_tags="$available_tags $tagname"
+-    fi
+-    fi
+-  done
+-  IFS="$lt_save_ifs"
 +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
@@ -3852,21 +4119,14 @@
 +  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
++  fi
 +else
 +  need_locks=no
- fi
--])# _LT_AC_TAGCONFIG
++fi
 +_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?])
 +])# _LT_COMPILER_FILE_LOCKS
- 
- 
--# AC_LIBTOOL_DLOPEN
--# -----------------
--# enable checks for dlopen support
--AC_DEFUN([AC_LIBTOOL_DLOPEN],
-- [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])
--])# AC_LIBTOOL_DLOPEN
++
++
 +# _LT_CHECK_OBJDIR
 +# ----------------
 +m4_defun([_LT_CHECK_OBJDIR],
@@ -3887,14 +4147,8 @@
 +AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/",
 +  [Define to the sub-directory in which libtool stores uninstalled libraries.])
 +])# _LT_CHECK_OBJDIR
- 
- 
--# AC_LIBTOOL_WIN32_DLL
--# --------------------
--# declare package support for building win32 DLLs
--AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
--[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
--])# AC_LIBTOOL_WIN32_DLL
++
++
 +# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME])
 +# --------------------------------------
 +# Check hardcoding attributes.
@@ -3905,6 +4159,10 @@
 +   test -n "$_LT_TAGVAR(runpath_var, $1)" ||
 +   test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
  
+-  # Now substitute the updated list of available tags.
+-  if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
+-    mv "${ofile}T" "$ofile"
+-    chmod +x "$ofile"
 +  # 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
@@ -3914,45 +4172,20 @@
 +     test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then
 +    # Linking always hardcodes the temporary library directory.
 +    _LT_TAGVAR(hardcode_action, $1)=relink
-+  else
+   else
+-    rm -f "${ofile}T"
+-    AC_MSG_ERROR([unable to update list of available tagged configurations.])
 +    # We can link without hardcoding, and we can hardcode nonexisting dirs.
 +    _LT_TAGVAR(hardcode_action, $1)=immediate
-+  fi
+   fi
 +else
 +  # We cannot hardcode anything, or else we can only hardcode existing
 +  # directories.
 +  _LT_TAGVAR(hardcode_action, $1)=unsupported
-+fi
+ fi
+-])# _LT_AC_TAGCONFIG
 +AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)])
  
--# AC_ENABLE_SHARED([DEFAULT])
--# ---------------------------
--# implement the --enable-shared flag
--# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
--AC_DEFUN([AC_ENABLE_SHARED],
--[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
--AC_ARG_ENABLE([shared],
--    [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
--	[build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])],
--    [p=${PACKAGE-default}
--    case $enableval in
--    yes) enable_shared=yes ;;
--    no) enable_shared=no ;;
--    *)
--      enable_shared=no
--      # Look at the argument we got.  We use all the common list separators.
--      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
--      for pkg in $enableval; do
--	IFS="$lt_save_ifs"
--	if test "X$pkg" = "X$p"; then
--	  enable_shared=yes
--	fi
--      done
--      IFS="$lt_save_ifs"
--      ;;
--    esac],
--    [enable_shared=]AC_ENABLE_SHARED_DEFAULT)
--])# AC_ENABLE_SHARED
 +if test "$_LT_TAGVAR(hardcode_action, $1)" = relink ||
 +   test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then
 +  # Fast installation is not supported
@@ -3966,14 +4199,13 @@
 +    [How to hardcode a shared library path into an executable])
 +])# _LT_LINKER_HARDCODE_LIBPATH
  
- 
--# AC_DISABLE_SHARED
+-# AC_LIBTOOL_DLOPEN
 -# -----------------
--# set the default shared flag to --disable-shared
--AC_DEFUN([AC_DISABLE_SHARED],
--[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
--AC_ENABLE_SHARED(no)
--])# AC_DISABLE_SHARED
+-# enable checks for dlopen support
+-AC_DEFUN([AC_LIBTOOL_DLOPEN],
+- [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])
+-])# AC_LIBTOOL_DLOPEN
+ 
 +# _LT_CMD_STRIPLIB
 +# ----------------
 +m4_defun([_LT_CMD_STRIPLIB],
@@ -4006,6 +4238,141 @@
 +_LT_DECL([], [striplib], [1])
 +])# _LT_CMD_STRIPLIB
  
+-# AC_LIBTOOL_WIN32_DLL
+-# --------------------
+-# declare package support for building win32 DLLs
+-AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
+-[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
+-])# AC_LIBTOOL_WIN32_DLL
+ 
++# _LT_SYS_DYNAMIC_LINKER([TAG])
++# -----------------------------
++# PORTME Fill in your ld.so characteristics
++m4_defun([_LT_SYS_DYNAMIC_LINKER],
++[AC_REQUIRE([AC_CANONICAL_HOST])dnl
++m4_require([_LT_DECL_EGREP])dnl
++m4_require([_LT_FILEUTILS_DEFAULTS])dnl
++m4_require([_LT_DECL_OBJDUMP])dnl
++m4_require([_LT_DECL_SED])dnl
++AC_MSG_CHECKING([dynamic linker characteristics])
++m4_if([$1],
++	[], [
++if test "$GCC" = yes; then
++  case $host_os in
++    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
++    *) lt_awk_arg="/^libraries:/" ;;
++  esac
++  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++  if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
++    # if the path contains ";" then we assume it to be the separator
++    # otherwise default to the standard path separator (i.e. ":") - it is
++    # assumed that no part of a normal pathname contains ";" but that should
++    # okay in the real world where ";" in dirpaths is itself problematic.
++    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
++  else
++    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++  fi
++  # Ok, now we have the path, separated by spaces, we can step through it
++  # and add multilib dir if necessary.
++  lt_tmp_lt_search_path_spec=
++  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
++  for lt_sys_path in $lt_search_path_spec; do
++    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
++      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
++    else
++      test -d "$lt_sys_path" && \
++	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
++    fi
++  done
++  lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
++BEGIN {RS=" "; FS="/|\n";} {
++  lt_foo="";
++  lt_count=0;
++  for (lt_i = NF; lt_i > 0; lt_i--) {
++    if ($lt_i != "" && $lt_i != ".") {
++      if ($lt_i == "..") {
++        lt_count++;
++      } else {
++        if (lt_count == 0) {
++          lt_foo="/" $lt_i lt_foo;
++        } else {
++          lt_count--;
++        }
++      }
++    }
++  }
++  if (lt_foo != "") { lt_freq[[lt_foo]]++; }
++  if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
++}'`
++  sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
++else
++  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++fi])
++library_names_spec=
++libname_spec='lib$name'
++soname_spec=
++shrext_cmds=".so"
++postinstall_cmds=
++postuninstall_cmds=
++finish_cmds=
++finish_eval=
++shlibpath_var=
++shlibpath_overrides_runpath=unknown
++version_type=none
++dynamic_linker="$host_os ld.so"
++sys_lib_dlsearch_path_spec="/lib /usr/lib"
++need_lib_prefix=unknown
++hardcode_into_libs=no
+ 
+-# AC_ENABLE_SHARED([DEFAULT])
+-# ---------------------------
+-# implement the --enable-shared flag
+-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
+-AC_DEFUN([AC_ENABLE_SHARED],
+-[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
+-AC_ARG_ENABLE([shared],
+-    [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
+-	[build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])],
+-    [p=${PACKAGE-default}
+-    case $enableval in
+-    yes) enable_shared=yes ;;
+-    no) enable_shared=no ;;
+-    *)
+-      enable_shared=no
+-      # Look at the argument we got.  We use all the common list separators.
+-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+-      for pkg in $enableval; do
+-	IFS="$lt_save_ifs"
+-	if test "X$pkg" = "X$p"; then
+-	  enable_shared=yes
+-	fi
+-      done
+-      IFS="$lt_save_ifs"
+-      ;;
+-    esac],
+-    [enable_shared=]AC_ENABLE_SHARED_DEFAULT)
+-])# AC_ENABLE_SHARED
+-
++# when you set need_version to no, make sure it does not cause -set_version
++# flags to be left without arguments
++need_version=unknown
+ 
+-# AC_DISABLE_SHARED
+-# -----------------
+-# set the default shared flag to --disable-shared
+-AC_DEFUN([AC_DISABLE_SHARED],
+-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+-AC_ENABLE_SHARED(no)
+-])# AC_DISABLE_SHARED
++case $host_os in
++aix3*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
++  shlibpath_var=LIBPATH
+ 
++  # AIX 3 has no versioning support, so we append a major version to the name.
++  soname_spec='${libname}${release}${shared_ext}$major'
++  ;;
  
 -# AC_ENABLE_STATIC([DEFAULT])
 -# ---------------------------
@@ -4031,92 +4398,67 @@
 -	fi
 -      done
 -      IFS="$lt_save_ifs"
--      ;;
++aix[[4-9]]*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  hardcode_into_libs=yes
++  if test "$host_cpu" = ia64; then
++    # AIX 5 supports IA64
++    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
++    shlibpath_var=LD_LIBRARY_PATH
++  else
++    # With GCC up to 2.95.x, collect2 would create an import file
++    # for dependence libraries.  The import file would start with
++    # the line `#! .'.  This would cause the generated library to
++    # depend on `.', always an invalid library.  This was fixed in
++    # development snapshots of GCC prior to 3.0.
++    case $host_os in
++      aix4 | aix4.[[01]] | aix4.[[01]].*)
++      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
++	   echo ' yes '
++	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
++	:
++      else
++	can_build_shared=no
++      fi
+       ;;
 -    esac],
 -    [enable_static=]AC_ENABLE_STATIC_DEFAULT)
 -])# AC_ENABLE_STATIC
-+# _LT_SYS_DYNAMIC_LINKER([TAG])
-+# -----------------------------
-+# PORTME Fill in your ld.so characteristics
-+m4_defun([_LT_SYS_DYNAMIC_LINKER],
-+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+m4_require([_LT_DECL_EGREP])dnl
-+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-+m4_require([_LT_DECL_OBJDUMP])dnl
-+m4_require([_LT_DECL_SED])dnl
-+AC_MSG_CHECKING([dynamic linker characteristics])
-+m4_if([$1],
-+	[], [
-+if test "$GCC" = yes; then
-+  case $host_os in
-+    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
-+    *) lt_awk_arg="/^libraries:/" ;;
-+  esac
-+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-+  if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
-+    # if the path contains ";" then we assume it to be the separator
-+    # otherwise default to the standard path separator (i.e. ":") - it is
-+    # assumed that no part of a normal pathname contains ";" but that should
-+    # okay in the real world where ";" in dirpaths is itself problematic.
-+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
-+  else
-+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-+  fi
-+  # Ok, now we have the path, separated by spaces, we can step through it
-+  # and add multilib dir if necessary.
-+  lt_tmp_lt_search_path_spec=
-+  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
-+  for lt_sys_path in $lt_search_path_spec; do
-+    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
-+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
++    esac
++    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
++    # soname into executable. Probably we can add versioning support to
++    # collect2, so additional links can be useful in future.
++    if test "$aix_use_runtimelinking" = yes; then
++      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
++      # instead of lib<name>.a to let people know that these are not
++      # typical AIX shared libraries.
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 +    else
-+      test -d "$lt_sys_path" && \
-+	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
++      # We preserve .a as extension for shared libraries through AIX4.2
++      # and later when we are not doing run time linking.
++      library_names_spec='${libname}${release}.a $libname.a'
++      soname_spec='${libname}${release}${shared_ext}$major'
 +    fi
-+  done
-+  lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
-+BEGIN {RS=" "; FS="/|\n";} {
-+  lt_foo="";
-+  lt_count=0;
-+  for (lt_i = NF; lt_i > 0; lt_i--) {
-+    if ($lt_i != "" && $lt_i != ".") {
-+      if ($lt_i == "..") {
-+        lt_count++;
-+      } else {
-+        if (lt_count == 0) {
-+          lt_foo="/" $lt_i lt_foo;
-+        } else {
-+          lt_count--;
-+        }
-+      }
-+    }
-+  }
-+  if (lt_foo != "") { lt_freq[[lt_foo]]++; }
-+  if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
-+}'`
-+  sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
-+else
-+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-+fi])
-+library_names_spec=
-+libname_spec='lib$name'
-+soname_spec=
-+shrext_cmds=".so"
-+postinstall_cmds=
-+postuninstall_cmds=
-+finish_cmds=
-+finish_eval=
-+shlibpath_var=
-+shlibpath_overrides_runpath=unknown
-+version_type=none
-+dynamic_linker="$host_os ld.so"
-+sys_lib_dlsearch_path_spec="/lib /usr/lib"
-+need_lib_prefix=unknown
-+hardcode_into_libs=no
++    shlibpath_var=LIBPATH
++  fi
++  ;;
  
-+# when you set need_version to no, make sure it does not cause -set_version
-+# flags to be left without arguments
-+need_version=unknown
++amigaos*)
++  case $host_cpu in
++  powerpc)
++    # Since July 2007 AmigaOS4 officially supports .so libraries.
++    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    ;;
++  m68k)
++    library_names_spec='$libname.ixlibrary $libname.a'
++    # Create ${libname}_ixlibrary.a entries in /sys/libs.
++    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
++    ;;
++  esac
++  ;;
  
 -# AC_DISABLE_STATIC
 -# -----------------
@@ -4125,14 +4467,24 @@
 -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
 -AC_ENABLE_STATIC(no)
 -])# AC_DISABLE_STATIC
-+case $host_os in
-+aix3*)
++beos*)
++  library_names_spec='${libname}${shared_ext}'
++  dynamic_linker="$host_os ld.so"
++  shlibpath_var=LIBRARY_PATH
++  ;;
+ 
++bsdi[[45]]*)
 +  version_type=linux
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-+  shlibpath_var=LIBPATH
- 
-+  # AIX 3 has no versioning support, so we append a major version to the name.
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 +  soname_spec='${libname}${release}${shared_ext}$major'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
++  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
++  # the default ld.so.conf also contains /usr/contrib/lib and
++  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
++  # libtool to hard-code these into programs
 +  ;;
  
 -# AC_ENABLE_FAST_INSTALL([DEFAULT])
@@ -4159,67 +4511,33 @@
 -	fi
 -      done
 -      IFS="$lt_save_ifs"
-+aix[[4-9]]*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  hardcode_into_libs=yes
-+  if test "$host_cpu" = ia64; then
-+    # AIX 5 supports IA64
-+    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-+    shlibpath_var=LD_LIBRARY_PATH
-+  else
-+    # With GCC up to 2.95.x, collect2 would create an import file
-+    # for dependence libraries.  The import file would start with
-+    # the line `#! .'.  This would cause the generated library to
-+    # depend on `.', always an invalid library.  This was fixed in
-+    # development snapshots of GCC prior to 3.0.
-+    case $host_os in
-+      aix4 | aix4.[[01]] | aix4.[[01]].*)
-+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-+	   echo ' yes '
-+	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
-+	:
-+      else
-+	can_build_shared=no
-+      fi
-       ;;
+-      ;;
 -    esac],
 -    [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT)
 -])# AC_ENABLE_FAST_INSTALL
-+    esac
-+    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-+    # soname into executable. Probably we can add versioning support to
-+    # collect2, so additional links can be useful in future.
-+    if test "$aix_use_runtimelinking" = yes; then
-+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-+      # instead of lib<name>.a to let people know that these are not
-+      # typical AIX shared libraries.
-+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+    else
-+      # We preserve .a as extension for shared libraries through AIX4.2
-+      # and later when we are not doing run time linking.
-+      library_names_spec='${libname}${release}.a $libname.a'
-+      soname_spec='${libname}${release}${shared_ext}$major'
-+    fi
-+    shlibpath_var=LIBPATH
-+  fi
-+  ;;
++cygwin* | mingw* | pw32* | cegcc*)
++  version_type=windows
++  shrext_cmds=".dll"
++  need_version=no
++  need_lib_prefix=no
  
-+amigaos*)
-+  case $host_cpu in
-+  powerpc)
-+    # Since July 2007 AmigaOS4 officially supports .so libraries.
-+    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+    ;;
-+  m68k)
-+    library_names_spec='$libname.ixlibrary $libname.a'
-+    # Create ${libname}_ixlibrary.a entries in /sys/libs.
-+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-+    ;;
-+  esac
-+  ;;
++  case $GCC,$host_os in
++  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
++    library_names_spec='$libname.dll.a'
++    # DLL is installed to $(libdir)/../bin by postinstall_cmds
++    postinstall_cmds='base_file=`basename \${file}`~
++      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
++      dldir=$destdir/`dirname \$dlpath`~
++      test -d \$dldir || mkdir -p \$dldir~
++      $install_prog $dir/$dlname \$dldir/$dlname~
++      chmod a+x \$dldir/$dlname~
++      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
++        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
++      fi'
++    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
++      dlpath=$dir/\$dldll~
++       $RM \$dlpath'
++    shlibpath_overrides_runpath=yes
  
 -# AC_DISABLE_FAST_INSTALL
 -# -----------------------
@@ -4228,24 +4546,42 @@
 -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
 -AC_ENABLE_FAST_INSTALL(no)
 -])# AC_DISABLE_FAST_INSTALL
-+beos*)
-+  library_names_spec='${libname}${shared_ext}'
-+  dynamic_linker="$host_os ld.so"
-+  shlibpath_var=LIBRARY_PATH
-+  ;;
++    case $host_os in
++    cygwin*)
++      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
++      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
++      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
++      ;;
++    mingw* | cegcc*)
++      # MinGW DLLs use traditional 'lib' prefix
++      soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
++      sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++      if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
++        # It is most probably a Windows format PATH printed by
++        # mingw gcc, but we are running on Cygwin. Gcc prints its search
++        # path with ; separators, and with drive letters. We can handle the
++        # drive letters (cygwin fileutils understands them), so leave them,
++        # especially as we might pass files found there to a mingw objdump,
++        # which wouldn't understand a cygwinified path. Ahh.
++        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++      else
++        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++      fi
++      ;;
++    pw32*)
++      # pw32 DLLs use 'pw' prefix rather than 'lib'
++      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
++      ;;
++    esac
++    ;;
  
-+bsdi[[45]]*)
-+  version_type=linux
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-+  # the default ld.so.conf also contains /usr/contrib/lib and
-+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-+  # libtool to hard-code these into programs
++  *)
++    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
++    ;;
++  esac
++  dynamic_linker='Win32 ld.exe'
++  # FIXME: first we should search . and the directory the executable is in
++  shlibpath_var=PATH
 +  ;;
  
 -# AC_LIBTOOL_PICMODE([MODE])
@@ -4256,30 +4592,8 @@
 -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
 -pic_mode=ifelse($#,1,$1,default)
 -])# AC_LIBTOOL_PICMODE
-+cygwin* | mingw* | pw32* | cegcc*)
-+  version_type=windows
-+  shrext_cmds=".dll"
-+  need_version=no
-+  need_lib_prefix=no
- 
-+  case $GCC,$host_os in
-+  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
-+    library_names_spec='$libname.dll.a'
-+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-+    postinstall_cmds='base_file=`basename \${file}`~
-+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
-+      dldir=$destdir/`dirname \$dlpath`~
-+      test -d \$dldir || mkdir -p \$dldir~
-+      $install_prog $dir/$dlname \$dldir/$dlname~
-+      chmod a+x \$dldir/$dlname~
-+      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
-+        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
-+      fi'
-+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-+      dlpath=$dir/\$dldll~
-+       $RM \$dlpath'
-+    shlibpath_overrides_runpath=yes
- 
+-
+-
 -# AC_PROG_EGREP
 -# -------------
 -# This is predefined starting with Autoconf 2.54, so this conditional
@@ -4293,44 +4607,8 @@
 - EGREP=$ac_cv_prog_egrep
 - AC_SUBST([EGREP])
 -])])
-+    case $host_os in
-+    cygwin*)
-+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-+      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-+      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-+      ;;
-+    mingw* | cegcc*)
-+      # MinGW DLLs use traditional 'lib' prefix
-+      soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-+      sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-+      if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
-+        # It is most probably a Windows format PATH printed by
-+        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-+        # path with ; separators, and with drive letters. We can handle the
-+        # drive letters (cygwin fileutils understands them), so leave them,
-+        # especially as we might pass files found there to a mingw objdump,
-+        # which wouldn't understand a cygwinified path. Ahh.
-+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-+      else
-+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-+      fi
-+      ;;
-+    pw32*)
-+      # pw32 DLLs use 'pw' prefix rather than 'lib'
-+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-+      ;;
-+    esac
-+    ;;
- 
-+  *)
-+    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
-+    ;;
-+  esac
-+  dynamic_linker='Win32 ld.exe'
-+  # FIXME: first we should search . and the directory the executable is in
-+  shlibpath_var=PATH
-+  ;;
- 
+-
+-
 -# AC_PATH_TOOL_PREFIX
 -# -------------------
 -# find a file program which can recognize shared library
@@ -4562,10 +4840,10 @@
 -case `$LD -v 2>&1 </dev/null` in
 -*GNU* | *'with BFD'*)
 -  lt_cv_prog_gnu_ld=yes
-   ;;
+-  ;;
 -*)
 -  lt_cv_prog_gnu_ld=no
--  ;;
+   ;;
 -esac])
 -with_gnu_ld=$lt_cv_prog_gnu_ld
 -])# AC_PROG_LD_GNU
@@ -4958,10 +5236,36 @@
  
  solaris*)
 -  lt_cv_deplibs_check_method=pass_all
--  ;;
--
--sysv4 | sysv4.3*)
--  case $host_vendor in
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  # ldd complains unless libraries are executable
++  postinstall_cmds='chmod +x $lib'
++  ;;
++
++sunos4*)
++  version_type=sunos
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  if test "$with_gnu_ld" = yes; then
++    need_lib_prefix=no
++  fi
++  need_version=yes
+   ;;
+ 
+ sysv4 | sysv4.3*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
+   case $host_vendor in
 -  motorola)
 -    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
 -    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
@@ -4984,31 +5288,32 @@
 -  pc)
 -    lt_cv_deplibs_check_method=pass_all
 -    ;;
--  esac
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  hardcode_into_libs=yes
-+  # ldd complains unless libraries are executable
-+  postinstall_cmds='chmod +x $lib'
++    sni)
++      shlibpath_overrides_runpath=no
++      need_lib_prefix=no
++      runpath_var=LD_RUN_PATH
++      ;;
++    siemens)
++      need_lib_prefix=no
++      ;;
++    motorola)
++      need_lib_prefix=no
++      need_version=no
++      shlibpath_overrides_runpath=no
++      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
++      ;;
+   esac
    ;;
  
 -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
 -  lt_cv_deplibs_check_method=pass_all
-+sunos4*)
-+  version_type=sunos
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  if test "$with_gnu_ld" = yes; then
-+    need_lib_prefix=no
++sysv4*MP*)
++  if test -d /usr/nec ;then
++    version_type=linux
++    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
++    soname_spec='$libname${shared_ext}.$major'
++    shlibpath_var=LD_LIBRARY_PATH
 +  fi
-+  need_version=yes
    ;;
 -esac
 -])
@@ -5016,29 +5321,7 @@
 -deplibs_check_method=$lt_cv_deplibs_check_method
 -test -z "$deplibs_check_method" && deplibs_check_method=unknown
 -])# AC_DEPLIBS_CHECK_METHOD
- 
-+sysv4 | sysv4.3*)
-+  version_type=linux
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  case $host_vendor in
-+    sni)
-+      shlibpath_overrides_runpath=no
-+      need_lib_prefix=no
-+      runpath_var=LD_RUN_PATH
-+      ;;
-+    siemens)
-+      need_lib_prefix=no
-+      ;;
-+    motorola)
-+      need_lib_prefix=no
-+      need_version=no
-+      shlibpath_overrides_runpath=no
-+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-+      ;;
-+  esac
-+  ;;
+-
  
 -# AC_PROG_NM
 -# ----------
@@ -5052,12 +5335,24 @@
 -  lt_nm_to_check="${ac_tool_prefix}nm"
 -  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
 -    lt_nm_to_check="$lt_nm_to_check nm"
-+sysv4*MP*)
-+  if test -d /usr/nec ;then
-+    version_type=linux
-+    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-+    soname_spec='$libname${shared_ext}.$major'
-+    shlibpath_var=LD_LIBRARY_PATH
++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
++  version_type=freebsd-elf
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  if test "$with_gnu_ld" = yes; then
++    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
++  else
++    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
++    case $host_os in
++      sco3.2v5*)
++        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
++	;;
++    esac
    fi
 -  for lt_tmp_nm in $lt_nm_to_check; do
 -    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
@@ -5096,27 +5391,7 @@
 -fi])
 -NM="$lt_cv_path_NM"
 -])# AC_PROG_NM
-+  ;;
- 
-+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-+  version_type=freebsd-elf
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  hardcode_into_libs=yes
-+  if test "$with_gnu_ld" = yes; then
-+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-+  else
-+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-+    case $host_os in
-+      sco3.2v5*)
-+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-+	;;
-+    esac
-+  fi
+-
 +  sys_lib_dlsearch_path_spec='/usr/lib'
 +  ;;
  
@@ -5355,11 +5630,11 @@
 -AC_DEFUN([AC_LIBTOOL_F77],
 -[AC_REQUIRE([_LT_AC_LANG_F77])
 -])# AC_LIBTOOL_F77
+-
 +_LT_DECL([], [MAGIC_CMD], [0],
 +	 [Used to examine libraries when file_magic_cmd begins with "file"])dnl
 +])# _LT_PATH_TOOL_PREFIX
  
--
 -# _LT_AC_LANG_F77
 -# ---------------
 -AC_DEFUN([_LT_AC_LANG_F77],
@@ -5379,8 +5654,19 @@
 -AC_DEFUN([AC_LIBTOOL_GCJ],
 -[AC_REQUIRE([_LT_AC_LANG_GCJ])
 -])# AC_LIBTOOL_GCJ
--
--
++# find a file program which can recognize a shared library
++m4_defun([_LT_PATH_MAGIC],
++[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
++if test -z "$lt_cv_path_MAGIC_CMD"; then
++  if test -n "$ac_tool_prefix"; then
++    _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
++  else
++    MAGIC_CMD=:
++  fi
++fi
++])# _LT_PATH_MAGIC
+ 
+ 
 -# _LT_AC_LANG_GCJ
 -# ---------------
 -AC_DEFUN([_LT_AC_LANG_GCJ],
@@ -5392,26 +5678,6 @@
 -	   [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
 -_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ])
 -])# _LT_AC_LANG_GCJ
-+# find a file program which can recognize a shared library
-+m4_defun([_LT_PATH_MAGIC],
-+[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
-+if test -z "$lt_cv_path_MAGIC_CMD"; then
-+  if test -n "$ac_tool_prefix"; then
-+    _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
-+  else
-+    MAGIC_CMD=:
-+  fi
-+fi
-+])# _LT_PATH_MAGIC
- 
- 
--# AC_LIBTOOL_RC
--# -------------
--# enable support for Windows resource files
--AC_DEFUN([AC_LIBTOOL_RC],
--[AC_REQUIRE([LT_AC_PROG_RC])
--_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC])
--])# AC_LIBTOOL_RC
 +# LT_PATH_LD
 +# ----------
 +# find the pathname to the GNU or non-GNU linker
@@ -5428,15 +5694,13 @@
 +    [test "$withval" = no || with_gnu_ld=yes],
 +    [with_gnu_ld=no])dnl
  
--# AC_LIBTOOL_LANG_C_CONFIG
--# ------------------------
--# Ensure that the configuration vars for the C compiler are
--# suitably defined.  Those variables are subsequently used by
--# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
--AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG])
--AC_DEFUN([_LT_AC_LANG_C_CONFIG],
--[lt_save_CC="$CC"
--AC_LANG_PUSH(C)
+-# AC_LIBTOOL_RC
+-# -------------
+-# enable support for Windows resource files
+-AC_DEFUN([AC_LIBTOOL_RC],
+-[AC_REQUIRE([LT_AC_PROG_RC])
+-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC])
+-])# AC_LIBTOOL_RC
 +ac_prog=ld
 +if test "$GCC" = yes; then
 +  # Check if gcc -print-prog-name=ld gives a path.
@@ -5508,14 +5772,18 @@
 +_LT_PATH_LD_GNU
 +AC_SUBST([LD])
  
--# Source file extension for C test sources.
--ac_ext=c
 +_LT_TAGDECL([], [LD], [1], [The linker used to build libraries])
 +])# LT_PATH_LD
  
--# Object file extension for compiled C test sources.
--objext=o
--_LT_AC_TAGVAR(objext, $1)=$objext
+-# AC_LIBTOOL_LANG_C_CONFIG
+-# ------------------------
+-# Ensure that the configuration vars for the C compiler are
+-# suitably defined.  Those variables are subsequently used by
+-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+-AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG])
+-AC_DEFUN([_LT_AC_LANG_C_CONFIG],
+-[lt_save_CC="$CC"
+-AC_LANG_PUSH(C)
 +# Old names:
 +AU_ALIAS([AM_PROG_LD], [LT_PATH_LD])
 +AU_ALIAS([AC_PROG_LD], [LT_PATH_LD])
@@ -5540,11 +5808,12 @@
 +with_gnu_ld=$lt_cv_prog_gnu_ld
 +])# _LT_PATH_LD_GNU
  
--# Code to be used in simple compile tests
--lt_simple_compile_test_code="int some_variable = 0;"
+-# Source file extension for C test sources.
+-ac_ext=c
  
--# Code to be used in simple link tests
--lt_simple_link_test_code='int main(){return(0);}'
+-# Object file extension for compiled C test sources.
+-objext=o
+-_LT_AC_TAGVAR(objext, $1)=$objext
 +# _LT_CMD_RELOAD
 +# --------------
 +# find reload flag for linker
@@ -5572,11 +5841,11 @@
 +_LT_DECL([], [reload_cmds], [2])dnl
 +])# _LT_CMD_RELOAD
  
--_LT_AC_SYS_COMPILER
+-# Code to be used in simple compile tests
+-lt_simple_compile_test_code="int some_variable = 0;"
  
--# save warnings/boilerplate of simple test code
--_LT_COMPILER_BOILERPLATE
--_LT_LINKER_BOILERPLATE
+-# Code to be used in simple link tests
+-lt_simple_link_test_code='int main(){return(0);}'
 +# _LT_CHECK_MAGIC_METHOD
 +# ----------------------
 +# how to check for library dependencies
@@ -5600,6 +5869,19 @@
 +# If you have `file' or equivalent on your system and you're not sure
 +# whether `pass_all' will *always* work, you probably want this one.
  
+-_LT_AC_SYS_COMPILER
++case $host_os in
++aix[[4-9]]*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
+ 
+-# save warnings/boilerplate of simple test code
+-_LT_COMPILER_BOILERPLATE
+-_LT_LINKER_BOILERPLATE
++beos*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
+ 
 -AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
 -AC_LIBTOOL_PROG_COMPILER_PIC($1)
 -AC_LIBTOOL_PROG_CC_C_O($1)
@@ -5613,49 +5895,28 @@
 -# Report which library types will actually be built
 -AC_MSG_CHECKING([if libtool supports shared libraries])
 -AC_MSG_RESULT([$can_build_shared])
-+case $host_os in
-+aix[[4-9]]*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
- 
--AC_MSG_CHECKING([whether to build shared libraries])
--test "$can_build_shared" = "no" && enable_shared=no
-+beos*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
- 
--# 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
 +bsdi[[45]]*)
 +  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
 +  lt_cv_file_magic_cmd='/usr/bin/file -L'
 +  lt_cv_file_magic_test_file=/shlib/libc.so
-   ;;
++  ;;
  
--aix[[4-9]]*)
--  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
--    test "$enable_shared" = yes && enable_static=no
--  fi
--    ;;
--esac
--AC_MSG_RESULT([$enable_shared])
+-AC_MSG_CHECKING([whether to build shared libraries])
+-test "$can_build_shared" = "no" && enable_shared=no
 +cygwin*)
 +  # func_win32_libid is a shell function defined in ltmain.sh
 +  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
 +  lt_cv_file_magic_cmd='func_win32_libid'
 +  ;;
  
--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])
+-# 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'
 +mingw* | pw32*)
 +  # Base MSYS/MinGW do not provide the 'file' command needed by
 +  # func_win32_libid shell function, so use a weaker test based on 'objdump',
@@ -5666,37 +5927,70 @@
 +  else
 +    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
 +    lt_cv_file_magic_cmd='$OBJDUMP -f'
-+  fi
-+  ;;
+   fi
+   ;;
  
--AC_LIBTOOL_CONFIG($1)
+-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])
 +cegcc)
 +  # use the weaker test based on 'objdump'. See mingw*.
 +  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
 +  lt_cv_file_magic_cmd='$OBJDUMP -f'
 +  ;;
  
+-AC_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])
++darwin* | rhapsody*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
+ 
+-AC_LIBTOOL_CONFIG($1)
++freebsd* | dragonfly*)
++  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
++    case $host_cpu in
++    i*86 )
++      # Not sure whether the presence of OpenBSD here was a mistake.
++      # Let's accept both of them until this is cleared up.
++      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
++      lt_cv_file_magic_cmd=/usr/bin/file
++      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
++      ;;
++    esac
++  else
++    lt_cv_deplibs_check_method=pass_all
++  fi
++  ;;
+ 
 -AC_LANG_POP
 -CC="$lt_save_CC"
 -])# AC_LIBTOOL_LANG_C_CONFIG
-+darwin* | rhapsody*)
++gnu*)
 +  lt_cv_deplibs_check_method=pass_all
 +  ;;
  
-+freebsd* | dragonfly*)
-+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-+    case $host_cpu in
-+    i*86 )
-+      # Not sure whether the presence of OpenBSD here was a mistake.
-+      # Let's accept both of them until this is cleared up.
-+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
-+      lt_cv_file_magic_cmd=/usr/bin/file
-+      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-+      ;;
-+    esac
-+  else
-+    lt_cv_deplibs_check_method=pass_all
-+  fi
++hpux10.20* | hpux11*)
++  lt_cv_file_magic_cmd=/usr/bin/file
++  case $host_cpu in
++  ia64*)
++    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
++    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
++    ;;
++  hppa*64*)
++    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
++    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
++    ;;
++  *)
++    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
++    lt_cv_file_magic_test_file=/usr/lib/libc.sl
++    ;;
++  esac
 +  ;;
  
 -# AC_LIBTOOL_LANG_CXX_CONFIG
@@ -5729,8 +6023,9 @@
 -_LT_AC_TAGVAR(no_undefined_flag, $1)=
 -_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
 -_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-+gnu*)
-+  lt_cv_deplibs_check_method=pass_all
++interix[[3-9]]*)
++  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
++  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
 +  ;;
  
 -# Dependencies to place before and after the object being linked:
@@ -5740,34 +6035,6 @@
 -_LT_AC_TAGVAR(postdeps, $1)=
 -_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
 -_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
-+hpux10.20* | hpux11*)
-+  lt_cv_file_magic_cmd=/usr/bin/file
-+  case $host_cpu in
-+  ia64*)
-+    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
-+    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-+    ;;
-+  hppa*64*)
-+    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
-+    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
-+    ;;
-+  *)
-+    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
-+    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-+    ;;
-+  esac
-+  ;;
- 
--# Source file extension for C++ test sources.
--ac_ext=cpp
-+interix[[3-9]]*)
-+  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
-+  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
-+  ;;
- 
--# Object file extension for compiled C++ test sources.
--objext=o
--_LT_AC_TAGVAR(objext, $1)=$objext
 +irix5* | irix6* | nonstopux*)
 +  case $LD in
 +  *-32|*"-32 ") libmagic=32-bit;;
@@ -5778,15 +6045,16 @@
 +  lt_cv_deplibs_check_method=pass_all
 +  ;;
  
--# Code to be used in simple compile tests
--lt_simple_compile_test_code="int some_variable = 0;"
+-# Source file extension for C++ test sources.
+-ac_ext=cpp
 +# This must be Linux ELF.
 +linux* | k*bsd*-gnu)
 +  lt_cv_deplibs_check_method=pass_all
 +  ;;
  
--# Code to be used in simple link tests
--lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
+-# Object file extension for compiled C++ test sources.
+-objext=o
+-_LT_AC_TAGVAR(objext, $1)=$objext
 +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)$'
@@ -5795,51 +6063,22 @@
 +  fi
 +  ;;
  
--# ltmain only uses $CC for tagged configurations so make sure $CC is set.
--_LT_AC_SYS_COMPILER
+-# Code to be used in simple compile tests
+-lt_simple_compile_test_code="int some_variable = 0;"
 +newos6*)
 +  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
 +  lt_cv_file_magic_cmd=/usr/bin/file
 +  lt_cv_file_magic_test_file=/usr/lib/libnls.so
 +  ;;
  
--# save warnings/boilerplate of simple test code
--_LT_COMPILER_BOILERPLATE
--_LT_LINKER_BOILERPLATE
+-# Code to be used in simple link tests
+-lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
 +*nto* | *qnx*)
 +  lt_cv_deplibs_check_method=pass_all
 +  ;;
  
--# Allow CC to be a program name with arguments.
--lt_save_CC=$CC
--lt_save_LD=$LD
--lt_save_GCC=$GCC
--GCC=$GXX
--lt_save_with_gnu_ld=$with_gnu_ld
--lt_save_path_LD=$lt_cv_path_LD
--if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
--  lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
--else
--  $as_unset lt_cv_prog_gnu_ld
--fi
--if test -n "${lt_cv_path_LDCXX+set}"; then
--  lt_cv_path_LD=$lt_cv_path_LDCXX
--else
--  $as_unset lt_cv_path_LD
--fi
--test -z "${LDCXX+set}" || LD=$LDCXX
--CC=${CXX-"c++"}
--compiler=$CC
--_LT_AC_TAGVAR(compiler, $1)=$CC
--_LT_CC_BASENAME([$compiler])
--
--# We don't want -fno-exception wen compiling C++ code, so set the
--# no_builtin_flag separately
--if test "$GXX" = yes; then
--  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
--else
--  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
--fi
+-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+-_LT_AC_SYS_COMPILER
 +openbsd*)
 +  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
 +    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
@@ -5848,36 +6087,25 @@
 +  fi
 +  ;;
  
--if test "$GXX" = yes; then
--  # Set up default GNU C++ configuration
+-# save warnings/boilerplate of simple test code
+-_LT_COMPILER_BOILERPLATE
+-_LT_LINKER_BOILERPLATE
 +osf3* | osf4* | osf5*)
 +  lt_cv_deplibs_check_method=pass_all
 +  ;;
- 
--  AC_PROG_LD
++
 +rdos*)
 +  lt_cv_deplibs_check_method=pass_all
 +  ;;
- 
--  # Check if GNU C++ uses GNU ld as the underlying linker, since the
--  # archiving commands below assume that GNU ld is being used.
--  if test "$with_gnu_ld" = yes; then
--    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
--    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++
 +solaris*)
 +  lt_cv_deplibs_check_method=pass_all
 +  ;;
- 
--    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
--    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++
 +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
 +  lt_cv_deplibs_check_method=pass_all
 +  ;;
- 
--    # If archive_cmds runs LD, not CC, wlarc should be empty
--    # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
--    #     investigate it a little bit more. (MM)
--    wlarc='${wl}'
++
 +sysv4 | sysv4.3*)
 +  case $host_vendor in
 +  motorola)
@@ -5904,17 +6132,7 @@
 +    ;;
 +  esac
 +  ;;
- 
--    # ancient GNU ld didn't support --whole-archive et. al.
--    if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
--	grep 'no-whole-archive' > /dev/null; then
--      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
--    else
--      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
--    fi
--  else
--    with_gnu_ld=no
--    wlarc=
++
 +tpf*)
 +  lt_cv_deplibs_check_method=pass_all
 +  ;;
@@ -5923,25 +6141,40 @@
 +file_magic_cmd=$lt_cv_file_magic_cmd
 +deplibs_check_method=$lt_cv_deplibs_check_method
 +test -z "$deplibs_check_method" && deplibs_check_method=unknown
- 
--    # A generic and very simple default shared library creation
--    # command for GNU C++ for the case where it uses the native
--    # linker, instead of GNU ld.  If possible, this setting should
--    # overridden to take advantage of the native linker features on
--    # the platform it is being used on.
--    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
--  fi
++
 +_LT_DECL([], [deplibs_check_method], [1],
 +    [Method to check whether dependent libraries are shared objects])
 +_LT_DECL([], [file_magic_cmd], [1],
 +    [Command to use when deplibs_check_method == "file_magic"])
 +])# _LT_CHECK_MAGIC_METHOD
  
--  # 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_LD=$LD
+-lt_save_GCC=$GCC
+-GCC=$GXX
+-lt_save_with_gnu_ld=$with_gnu_ld
+-lt_save_path_LD=$lt_cv_path_LD
+-if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
+-  lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
+-else
+-  $as_unset lt_cv_prog_gnu_ld
+-fi
+-if test -n "${lt_cv_path_LDCXX+set}"; then
+-  lt_cv_path_LD=$lt_cv_path_LDCXX
+-else
+-  $as_unset lt_cv_path_LD
+-fi
+-test -z "${LDCXX+set}" || LD=$LDCXX
+-CC=${CXX-"c++"}
+-compiler=$CC
+-_LT_AC_TAGVAR(compiler, $1)=$CC
+-_LT_CC_BASENAME([$compiler])
  
+-# We don't want -fno-exception wen compiling C++ code, so set the
+-# no_builtin_flag separately
+-if test "$GXX" = yes; then
+-  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
 +# LT_PATH_NM
 +# ----------
 +# find the pathname to a BSD- or MS-compatible name lister
@@ -5951,38 +6184,7 @@
 +[if test -n "$NM"; then
 +  # Let the user override the test.
 +  lt_cv_path_NM="$NM"
- else
--  GXX=no
--  with_gnu_ld=no
--  wlarc=
--fi
--
--# PORTME: fill in a description of your system's C++ link characteristics
--AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
--_LT_AC_TAGVAR(ld_shlibs, $1)=yes
--case $host_os in
--  aix3*)
--    # FIXME: insert proper C++ library support
--    _LT_AC_TAGVAR(ld_shlibs, $1)=no
--    ;;
--  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
++else
 +  lt_nm_to_check="${ac_tool_prefix}nm"
 +  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
 +    lt_nm_to_check="$lt_nm_to_check nm"
@@ -6007,16 +6209,13 @@
 +	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
 +	  */dev/null*)
 +	    lt_cv_path_NM="$tmp_nm -p"
- 	    break
- 	    ;;
++	    break
++	    ;;
 +	  *)
 +	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
 +	    continue # so that we can try to find one that supports BSD flags
 +	    ;;
- 	  esac
--	done
--	;;
--      esac
++	  esac
 +	  ;;
 +	esac
 +      fi
@@ -6027,21 +6226,21 @@
 +fi])
 +if test "$lt_cv_path_NM" != "no"; then
 +  NM="$lt_cv_path_NM"
-+else
+ else
+-  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
 +  # Didn't find any BSD compatible name lister, look for dumpbin.
 +  AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :)
 +  AC_SUBST([DUMPBIN])
 +  if test "$DUMPBIN" != ":"; then
 +    NM="$DUMPBIN"
 +  fi
-+fi
+ fi
 +test -z "$NM" && NM=nm
 +AC_SUBST([NM])
 +_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl
  
--      exp_sym_flag='-bexport'
--      no_entry_flag='-bnoentry'
--    fi
+-if test "$GXX" = yes; then
+-  # Set up default GNU C++ configuration
 +AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
 +  [lt_cv_nm_interface="BSD nm"
 +  echo "int some_variable = 0;" > conftest.$ac_ext
@@ -6066,57 +6265,13 @@
 +dnl AC_DEFUN([AM_PROG_NM], [])
 +dnl AC_DEFUN([AC_PROG_NM], [])
  
--    # When large executables or shared objects are built, AIX ld can
--    # have problems creating the table of contents.  If linking a library
--    # or program results in "error TOC overflow" add -mminimal-toc to
--    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
--    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
--
--    _LT_AC_TAGVAR(archive_cmds, $1)=''
--    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
--    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
--    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+-  AC_PROG_LD
  
--    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_AC_TAGVAR(hardcode_direct, $1)=unsupported
--	  # It fails to find uninstalled libraries when the uninstalled
--	  # path is not listed in the libpath.  Setting hardcode_minus_L
--	  # to unsupported forces relinking
--	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
--	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
--	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
--	fi
--	;;
--      esac
--      shared_flag='-shared'
--      if test "$aix_use_runtimelinking" = yes; then
--	shared_flag="$shared_flag "'${wl}-G'
--      fi
--    else
--      # not using gcc
--      if test "$host_cpu" = ia64; then
--	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
--	# chokes on -Wl,-G. The following line is correct:
--	shared_flag='-G'
--      else
--	if test "$aix_use_runtimelinking" = yes; then
--	  shared_flag='${wl}-G'
--	else
--	  shared_flag='${wl}-bM:SRE'
--	fi
--      fi
--    fi
+-  # Check if GNU C++ uses GNU ld as the underlying linker, since the
+-  # archiving commands below assume that GNU ld is being used.
+-  if test "$with_gnu_ld" = yes; then
+-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 +# LT_LIB_M
 +# --------
 +# check for math library
@@ -6138,6 +6293,171 @@
 +AC_SUBST([LIBM])
 +])# LT_LIB_M
  
+-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++# Old name:
++AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M])
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([AC_CHECK_LIBM], [])
+ 
+-    # If archive_cmds runs LD, not CC, wlarc should be empty
+-    # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
+-    #     investigate it a little bit more. (MM)
+-    wlarc='${wl}'
+ 
+-    # ancient GNU ld didn't support --whole-archive et. al.
+-    if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
+-	grep 'no-whole-archive' > /dev/null; then
+-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+-    else
+-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+-    fi
+-  else
+-    with_gnu_ld=no
+-    wlarc=
++# _LT_COMPILER_NO_RTTI([TAGNAME])
++# -------------------------------
++m4_defun([_LT_COMPILER_NO_RTTI],
++[m4_require([_LT_TAG_COMPILER])dnl
+ 
+-    # A generic and very simple default shared library creation
+-    # command for GNU C++ for the case where it uses the native
+-    # linker, instead of GNU ld.  If possible, this setting should
+-    # overridden to take advantage of the native linker features on
+-    # the platform it is being used on.
+-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+-  fi
++_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $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"'
++if test "$GCC" = yes; then
++  _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+ 
+-else
+-  GXX=no
+-  with_gnu_ld=no
+-  wlarc=
++  _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
++    lt_cv_prog_compiler_rtti_exceptions,
++    [-fno-rtti -fno-exceptions], [],
++    [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
+ fi
++_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1],
++	[Compiler flag to turn off builtin functions])
++])# _LT_COMPILER_NO_RTTI
+ 
+-# PORTME: fill in a description of your system's C++ link characteristics
+-AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+-_LT_AC_TAGVAR(ld_shlibs, $1)=yes
+-case $host_os in
+-  aix3*)
+-    # FIXME: insert proper C++ library support
+-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+-    ;;
+-  aix[[4-9]]*)
+-    if test "$host_cpu" = ia64; then
+-      # On IA64, the linker does run time linking by default, so we don't
+-      # have to do anything special.
+-      aix_use_runtimelinking=no
+-      exp_sym_flag='-Bexport'
+-      no_entry_flag=""
+-    else
+-      aix_use_runtimelinking=no
+ 
+-      # Test if we are trying to use run time linking or normal
+-      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+-      # need to do runtime linking.
+-      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+-	for ld_flag in $LDFLAGS; do
+-	  case $ld_flag in
+-	  *-brtl*)
+-	    aix_use_runtimelinking=yes
+-	    break
+-	    ;;
+-	  esac
+-	done
+-	;;
+-      esac
++# _LT_CMD_GLOBAL_SYMBOLS
++# ----------------------
++m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
++[AC_REQUIRE([AC_CANONICAL_HOST])dnl
++AC_REQUIRE([AC_PROG_CC])dnl
++AC_REQUIRE([LT_PATH_NM])dnl
++AC_REQUIRE([LT_PATH_LD])dnl
++m4_require([_LT_DECL_SED])dnl
++m4_require([_LT_DECL_EGREP])dnl
++m4_require([_LT_TAG_COMPILER])dnl
+ 
+-      exp_sym_flag='-bexport'
+-      no_entry_flag='-bnoentry'
+-    fi
++# Check for command to grab the raw symbol name followed by C symbol from nm.
++AC_MSG_CHECKING([command to parse $NM output from $compiler object])
++AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
++[
++# These are sane defaults that work on at least a few old systems.
++# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
+ 
+-    # When large executables or shared objects are built, AIX ld can
+-    # have problems creating the table of contents.  If linking a library
+-    # or program results in "error TOC overflow" add -mminimal-toc to
+-    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+-    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+-
+-    _LT_AC_TAGVAR(archive_cmds, $1)=''
+-    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
+-    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++# Character class describing NM global symbol codes.
++symcode='[[BCDEGRST]]'
+ 
+-    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_AC_TAGVAR(hardcode_direct, $1)=unsupported
+-	  # It fails to find uninstalled libraries when the uninstalled
+-	  # path is not listed in the libpath.  Setting hardcode_minus_L
+-	  # to unsupported forces relinking
+-	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+-	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+-	fi
+-	;;
+-      esac
+-      shared_flag='-shared'
+-      if test "$aix_use_runtimelinking" = yes; then
+-	shared_flag="$shared_flag "'${wl}-G'
+-      fi
+-    else
+-      # not using gcc
+-      if test "$host_cpu" = ia64; then
+-	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+-	# chokes on -Wl,-G. The following line is correct:
+-	shared_flag='-G'
+-      else
+-	if test "$aix_use_runtimelinking" = yes; then
+-	  shared_flag='${wl}-G'
+-	else
+-	  shared_flag='${wl}-bM:SRE'
+-	fi
+-      fi
+-    fi
++# Regexp to match symbols that can be accessed directly from C.
++sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
+ 
 -    # It seems that -bexpall does not export symbols beginning with
 -    # underscore (_), so it is better to generate a list of symbols to export.
 -    _LT_AC_TAGVAR(always_export_symbols, $1)=yes
@@ -6148,10 +6468,41 @@
 -      # Determine the default libpath from the value encoded in an empty executable.
 -      _LT_AC_SYS_LIBPATH_AIX
 -      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-+# Old name:
-+AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M])
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_CHECK_LIBM], [])
++# Define system-specific variables.
++case $host_os in
++aix*)
++  symcode='[[BCDT]]'
++  ;;
++cygwin* | mingw* | pw32* | cegcc*)
++  symcode='[[ABCDGISTW]]'
++  ;;
++hpux*)
++  if test "$host_cpu" = ia64; then
++    symcode='[[ABCDEGRST]]'
++  fi
++  ;;
++irix* | nonstopux*)
++  symcode='[[BCDEGRST]]'
++  ;;
++osf*)
++  symcode='[[BCDEGQRST]]'
++  ;;
++solaris*)
++  symcode='[[BDRT]]'
++  ;;
++sco3.2v5*)
++  symcode='[[DT]]'
++  ;;
++sysv4.2uw2*)
++  symcode='[[DT]]'
++  ;;
++sysv5* | sco5v6* | unixware* | OpenUNIX*)
++  symcode='[[ABDT]]'
++  ;;
++sysv4)
++  symcode='[[DFNSTU]]'
++  ;;
++esac
  
 -      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
 -     else
@@ -6175,6 +6526,11 @@
 -      fi
 -    fi
 -    ;;
++# If we're using GNU nm, then use its standard symbol codes.
++case `$NM -V 2>&1` in
++*GNU* | *'with BFD'*)
++  symcode='[[ABCDGIRSTW]]' ;;
++esac
  
 -  beos*)
 -    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -6186,10 +6542,10 @@
 -      _LT_AC_TAGVAR(ld_shlibs, $1)=no
 -    fi
 -    ;;
-+# _LT_COMPILER_NO_RTTI([TAGNAME])
-+# -------------------------------
-+m4_defun([_LT_COMPILER_NO_RTTI],
-+[m4_require([_LT_TAG_COMPILER])dnl
++# Transform an extracted symbol line into a proper C declaration.
++# Some systems (esp. on ia64) link data and code symbols differently,
++# so use this general approach.
++lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
  
 -  chorus*)
 -    case $cc_basename in
@@ -6199,7 +6555,9 @@
 -	;;
 -    esac
 -    ;;
-+_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
++# Transform an extracted symbol line into symbol name and symbol address
++lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p'"
++lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
  
 -  cygwin* | mingw* | pw32*)
 -    # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
@@ -6223,7 +6581,12 @@
 -    else
 -      _LT_AC_TAGVAR(ld_shlibs, $1)=no
 -    fi
--  ;;
++# Handle CRLF in mingw tool chain
++opt_cr=
++case $build_os in
++mingw*)
++  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
+   ;;
 -      darwin* | rhapsody*)
 -      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
 -      _LT_AC_TAGVAR(hardcode_direct, $1)=no
@@ -6258,8 +6621,7 @@
 -      esac
 -      fi
 -        ;;
-+if test "$GCC" = yes; then
-+  _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
++esac
  
 -  dgux*)
 -    case $cc_basename in
@@ -6321,51 +6683,281 @@
 -    *)
 -      if test "$GXX" = yes; then
 -        _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
--      else
++# Try without a prefix underscore, then with it.
++for ac_symprfx in "" "_"; do
++
++  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
++  symxfrm="\\1 $ac_symprfx\\2 \\2"
++
++  # Write the raw and C identifiers.
++  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
++    # Fake it for dumpbin and say T for any non-static function
++    # and D for any global variable.
++    # Also find C++ and __fastcall symbols from MSVC++,
++    # which start with @ or ?.
++    lt_cv_sys_global_symbol_pipe="$AWK ['"\
++"     {last_section=section; section=\$ 3};"\
++"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
++"     \$ 0!~/External *\|/{next};"\
++"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
++"     {if(hide[section]) next};"\
++"     {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
++"     {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
++"     s[1]~/^[@?]/{print s[1], s[1]; next};"\
++"     s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
++"     ' prfx=^$ac_symprfx]"
++  else
++    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[	 ]]\($symcode$symcode*\)[[	 ]][[	 ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
++  fi
++
++  # Check to see that the pipe works correctly.
++  pipe_works=no
++
++  rm -f conftest*
++  cat > conftest.$ac_ext <<_LT_EOF
++#ifdef __cplusplus
++extern "C" {
++#endif
++char nm_test_var;
++void nm_test_func(void);
++void nm_test_func(void){}
++#ifdef __cplusplus
++}
++#endif
++int main(){nm_test_var='a';nm_test_func();return(0);}
++_LT_EOF
++
++  if AC_TRY_EVAL(ac_compile); then
++    # Now try to grab the symbols.
++    nlist=conftest.nm
++    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
++      # Try sorting and uniquifying the output.
++      if sort "$nlist" | uniq > "$nlist"T; then
++	mv -f "$nlist"T "$nlist"
+       else
 -        # FIXME: insert proper C++ library support
 -        _LT_AC_TAGVAR(ld_shlibs, $1)=no
--      fi
--      ;;
++	rm -f "$nlist"T
++      fi
++
++      # Make sure that we snagged all the symbols we need.
++      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
++	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
++	  cat <<_LT_EOF > conftest.$ac_ext
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++_LT_EOF
++	  # Now generate the symbol file.
++	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
++
++	  cat <<_LT_EOF >> conftest.$ac_ext
++
++/* The mapping between symbol names and symbols.  */
++const struct {
++  const char *name;
++  void       *address;
++}
++lt__PROGRAM__LTX_preloaded_symbols[[]] =
++{
++  { "@PROGRAM@", (void *) 0 },
++_LT_EOF
++	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
++	  cat <<\_LT_EOF >> conftest.$ac_ext
++  {0, (void *) 0}
++};
++
++/* This works around a problem in FreeBSD linker */
++#ifdef FREEBSD_WORKAROUND
++static const void *lt_preloaded_setup() {
++  return lt__PROGRAM__LTX_preloaded_symbols;
++}
++#endif
++
++#ifdef __cplusplus
++}
++#endif
++_LT_EOF
++	  # Now try linking the two files.
++	  mv conftest.$ac_objext conftstm.$ac_objext
++	  lt_save_LIBS="$LIBS"
++	  lt_save_CFLAGS="$CFLAGS"
++	  LIBS="conftstm.$ac_objext"
++	  CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
++	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
++	    pipe_works=yes
++	  fi
++	  LIBS="$lt_save_LIBS"
++	  CFLAGS="$lt_save_CFLAGS"
++	else
++	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
++	fi
++      else
++	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
++      fi
++    else
++      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
++    fi
++  else
++    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
++    cat conftest.$ac_ext >&5
++  fi
++  rm -rf conftest* conftst*
++
++  # Do not use the global_symbol_pipe unless it works.
++  if test "$pipe_works" = yes; then
++    break
++  else
++    lt_cv_sys_global_symbol_pipe=
++  fi
++done
++])
++if test -z "$lt_cv_sys_global_symbol_pipe"; then
++  lt_cv_sys_global_symbol_to_cdecl=
++fi
++if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
++  AC_MSG_RESULT(failed)
++else
++  AC_MSG_RESULT(ok)
++fi
++
++_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
++    [Take the output of nm and produce a listing of raw symbols and C names])
++_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
++    [Transform the output of nm in a proper C declaration])
++_LT_DECL([global_symbol_to_c_name_address],
++    [lt_cv_sys_global_symbol_to_c_name_address], [1],
++    [Transform the output of nm in a C name address pair])
++_LT_DECL([global_symbol_to_c_name_address_lib_prefix],
++    [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
++    [Transform the output of nm in a C name address pair when lib prefix is needed])
++]) # _LT_CMD_GLOBAL_SYMBOLS
++
++
++# _LT_COMPILER_PIC([TAGNAME])
++# ---------------------------
++m4_defun([_LT_COMPILER_PIC],
++[m4_require([_LT_TAG_COMPILER])dnl
++_LT_TAGVAR(lt_prog_compiler_wl, $1)=
++_LT_TAGVAR(lt_prog_compiler_pic, $1)=
++_LT_TAGVAR(lt_prog_compiler_static, $1)=
++
++AC_MSG_CHECKING([for $compiler option to produce PIC])
++m4_if([$1], [CXX], [
++  # C++ specific cases for pic, static, wl, etc.
++  if test "$GXX" = yes; then
++    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
++
++    case $host_os in
++    aix*)
++      # All AIX code is PIC.
++      if test "$host_cpu" = ia64; then
++	# AIX 5 now supports IA64 processor
++	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+       fi
+       ;;
 -    esac
 -    ;;
 -  hpux10*|hpux11*)
 -    if test $with_gnu_ld = no; then
 -      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
 -      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+  _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
-+    lt_cv_prog_compiler_rtti_exceptions,
-+    [-fno-rtti -fno-exceptions], [],
-+    [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
-+fi
-+_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1],
-+	[Compiler flag to turn off builtin functions])
-+])# _LT_COMPILER_NO_RTTI
  
--      case $host_cpu in
++    amigaos*)
+       case $host_cpu in
 -      hppa*64*|ia64*) ;;
 -      *)
 -	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
--        ;;
--      esac
++      powerpc)
++            # see comment about AmigaOS4 .so support
++            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
++        ;;
++      m68k)
++            # FIXME: we need at least 68020 code to build shared libraries, but
++            # adding the `-m68020' flag to GCC prevents building anything better,
++            # like `-m68040'.
++            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+         ;;
+       esac
 -    fi
 -    case $host_cpu in
 -    hppa*64*|ia64*)
 -      _LT_AC_TAGVAR(hardcode_direct, $1)=no
 -      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
--      ;;
--    *)
++      ;;
++
++    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++      # PIC is the default for these OSes.
++      ;;
++    mingw* | cygwin* | os2* | pw32* | cegcc*)
++      # This hack is so that the source file can tell whether it is being
++      # built for inclusion in a dll (and should export symbols for example).
++      # Although the cygwin gcc ignores -fPIC, still need this for old-style
++      # (--disable-auto-import) libraries
++      m4_if([$1], [GCJ], [],
++	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
++      ;;
++    darwin* | rhapsody*)
++      # PIC is the default on this platform
++      # Common symbols not allowed in MH_DYLIB files
++      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
++      ;;
++    *djgpp*)
++      # DJGPP does not support shared libraries at all
++      _LT_TAGVAR(lt_prog_compiler_pic, $1)=
++      ;;
++    interix[[3-9]]*)
++      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
++      # Instead, we relocate shared libraries at runtime.
++      ;;
++    sysv4*MP*)
++      if test -d /usr/nec; then
++	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
++      fi
++      ;;
++    hpux*)
++      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
++      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
++      # sets the default TLS model and affects inlining.
++      case $host_cpu in
++      hppa*64*)
++	;;
++      *)
++	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
++	;;
++      esac
++      ;;
++    *qnx* | *nto*)
++      # QNX uses GNU C++, but need to define -shared option too, otherwise
++      # it will coredump.
++      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+       ;;
+     *)
 -      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
 -      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
 -					      # but as the default
 -					      # location of the library.
--      ;;
--    esac
- 
++      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+       ;;
+     esac
+-
 -    case $cc_basename in
 -      CC*)
 -	# FIXME: insert proper C++ library support
 -	_LT_AC_TAGVAR(ld_shlibs, $1)=no
--	;;
++  else
++    case $host_os in
++      aix[[4-9]]*)
++	# All AIX code is PIC.
++	if test "$host_cpu" = ia64; then
++	  # AIX 5 now supports IA64 processor
++	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++	else
++	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
++	fi
+ 	;;
 -      aCC*)
 -	case $host_cpu in
 -	hppa*64*)
@@ -6376,8 +6968,13 @@
 -	  ;;
 -	*)
 -	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
--	  ;;
--	esac
++      chorus*)
++	case $cc_basename in
++	cxch68*)
++	  # Green Hills C++ Compiler
++	  # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
+ 	  ;;
+ 	esac
 -	# Commands to make compiler produce verbose output that lists
 -	# what "hidden" libraries, object files and flags are used when
 -	# linking a shared library.
@@ -6387,21 +6984,52 @@
 -	# from the output so that they don't get included in the library
 -	# dependencies.
 -	output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
--	;;
+ 	;;
 -      *)
 -	if test "$GXX" = yes; then
 -	  if test $with_gnu_ld = no; then
--	    case $host_cpu in
++      dgux*)
++	case $cc_basename in
++	  ec++*)
++	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++	    ;;
++	  ghcx*)
++	    # Green Hills C++ Compiler
++	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      freebsd* | dragonfly*)
++	# FreeBSD uses GNU C++
++	;;
++      hpux9* | hpux10* | hpux11*)
++	case $cc_basename in
++	  CC*)
++	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
++	    if test "$host_cpu" != ia64; then
++	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
++	    fi
++	    ;;
++	  aCC*)
++	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+ 	    case $host_cpu in
 -	    hppa*64*)
 -	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 -	      ;;
 -	    ia64*)
 -	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
--	      ;;
--	    *)
++	    hppa*64*|ia64*)
++	      # +Z the default
+ 	      ;;
+ 	    *)
 -	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
--	      ;;
--	    esac
++	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+ 	      ;;
+ 	    esac
 -	  fi
 -	else
 -	  # FIXME: insert proper C++ library support
@@ -6496,7 +7124,10 @@
 -  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 -	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 -	  ;;
--	esac
++	    ;;
++	  *)
++	    ;;
+ 	esac
 -	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
 -	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
 -	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
@@ -6515,27 +7146,11 @@
 -	# Compaq C++
 -	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
 -	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
-+# _LT_CMD_GLOBAL_SYMBOLS
-+# ----------------------
-+m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
-+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+AC_REQUIRE([AC_PROG_CC])dnl
-+AC_REQUIRE([LT_PATH_NM])dnl
-+AC_REQUIRE([LT_PATH_LD])dnl
-+m4_require([_LT_DECL_SED])dnl
-+m4_require([_LT_DECL_EGREP])dnl
-+m4_require([_LT_TAG_COMPILER])dnl
- 
+-
 -	runpath_var=LD_RUN_PATH
 -	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
 -	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+# Check for command to grab the raw symbol name followed by C symbol from nm.
-+AC_MSG_CHECKING([command to parse $NM output from $compiler object])
-+AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
-+[
-+# These are sane defaults that work on at least a few old systems.
-+# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
- 
+-
 -	# Commands to make compiler produce verbose output that lists
 -	# what "hidden" libraries, object files and flags are used when
 -	# linking a shared library.
@@ -6545,7 +7160,7 @@
 -	# from the output so that they don't get included in the library
 -	# dependencies.
 -	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
--	;;
+ 	;;
 -      *)
 -	case `$CC -V 2>&1 | sed 5q` in
 -	*Sun\ C*)
@@ -6568,7 +7183,10 @@
 -	  _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
 -	  ;;
 -	esac
--	;;
++      interix*)
++	# This is c89, which is MS Visual C++ (no shared libs)
++	# Anyone wants to do a port?
+ 	;;
 -    esac
 -    ;;
 -  lynxos*)
@@ -6584,11 +7202,71 @@
 -      cxx*)
 -	# FIXME: insert proper C++ library support
 -	_LT_AC_TAGVAR(ld_shlibs, $1)=no
--	;;
++      irix5* | irix6* | nonstopux*)
++	case $cc_basename in
++	  CC*)
++	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
++	    # CC pic flag -KPIC is the default.
++	    ;;
++	  *)
++	    ;;
++	esac
+ 	;;
 -      *)
 -	# FIXME: insert proper C++ library support
 -	_LT_AC_TAGVAR(ld_shlibs, $1)=no
--	;;
++      linux* | k*bsd*-gnu)
++	case $cc_basename in
++	  KCC*)
++	    # KAI C++ Compiler
++	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
++	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
++	    ;;
++	  ecpc* )
++	    # old Intel C++ for x86_64 which still supported -KPIC.
++	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
++	    ;;
++	  icpc* )
++	    # Intel C++, used to be incompatible with GCC.
++	    # ICC 10 doesn't accept -KPIC any more.
++	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
++	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
++	    ;;
++	  pgCC* | pgcpp*)
++	    # Portland Group C++ compiler
++	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
++	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++	    ;;
++	  cxx*)
++	    # Compaq C++
++	    # Make sure the PIC flag is empty.  It appears that all Alpha
++	    # Linux and Compaq Tru64 Unix objects are PIC.
++	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
++	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
++	    ;;
++	  xlc* | xlC*)
++	    # IBM XL 8.0 on PPC
++	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
++	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
++	    ;;
++	  *)
++	    case `$CC -V 2>&1 | sed 5q` in
++	    *Sun\ C*)
++	      # Sun C++ 5.9
++	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++	      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++	      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
++	      ;;
++	    esac
++	    ;;
++	esac
+ 	;;
 -    esac
 -    ;;
 -  netbsd*)
@@ -6661,7 +7339,8 @@
 -	# from the output so that they don't get included in the library
 -	# dependencies.
 -	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
--	;;
++      lynxos*)
+ 	;;
 -      *)
 -	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
 -	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -6674,14 +7353,13 @@
 -	  # 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"'
-+# Character class describing NM global symbol codes.
-+symcode='[[BCDEGRST]]'
- 
+-
 -	else
 -	  # FIXME: insert proper C++ library support
 -	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
 -	fi
--	;;
++      m88k*)
+ 	;;
 -    esac
 -    ;;
 -  osf4* | osf5*)
@@ -6726,7 +7404,15 @@
 -	# from the output so that they don't get included in the library
 -	# dependencies.
 -	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
--	;;
++      mvs*)
++	case $cc_basename in
++	  cxx*)
++	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
++	    ;;
++	  *)
++	    ;;
++	esac
+ 	;;
 -      *)
 -	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
 -	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -6739,14 +7425,13 @@
 -	  # 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"'
-+# Regexp to match symbols that can be accessed directly from C.
-+sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
- 
+-
 -	else
 -	  # FIXME: insert proper C++ library support
 -	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
 -	fi
--	;;
++      netbsd* | netbsdelf*-gnu)
+ 	;;
 -    esac
 -    ;;
 -  psos*)
@@ -6764,11 +7449,37 @@
 -	# Lucid
 -	# FIXME: insert proper C++ library support
 -	_LT_AC_TAGVAR(ld_shlibs, $1)=no
--	;;
++      *qnx* | *nto*)
++        # QNX uses GNU C++, but need to define -shared option too, otherwise
++        # it will coredump.
++        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
++        ;;
++      osf3* | osf4* | osf5*)
++	case $cc_basename in
++	  KCC*)
++	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
++	    ;;
++	  RCC*)
++	    # Rational C++ 2.4.1
++	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
++	    ;;
++	  cxx*)
++	    # Digital/Compaq C++
++	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	    # Make sure the PIC flag is empty.  It appears that all Alpha
++	    # Linux and Compaq Tru64 Unix objects are PIC.
++	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
++	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
++	    ;;
++	  *)
++	    ;;
++	esac
+ 	;;
 -      *)
 -	# FIXME: insert proper C++ library support
 -	_LT_AC_TAGVAR(ld_shlibs, $1)=no
--	;;
++      psos*)
+ 	;;
 -    esac
 -    ;;
 -  solaris*)
@@ -6785,57 +7496,29 @@
 -	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
 -	case $host_os in
 -	  solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
--	  *)
++      solaris*)
++	case $cc_basename in
++	  CC*)
++	    # Sun C++ 4.2, 5.x and Centerline C++
++	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
++	    ;;
++	  gcx*)
++	    # Green Hills C++ Compiler
++	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
++	    ;;
+ 	  *)
 -	    # The compiler driver will combine and reorder linker options,
 -	    # but understands `-z linker_flag'.
 -	    # Supported since Solaris 2.6 (maybe 2.5.1?)
 -	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
--	    ;;
--	esac
+ 	    ;;
+ 	esac
 -	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-+# Define system-specific variables.
-+case $host_os in
-+aix*)
-+  symcode='[[BCDT]]'
-+  ;;
-+cygwin* | mingw* | pw32* | cegcc*)
-+  symcode='[[ABCDGISTW]]'
-+  ;;
-+hpux*)
-+  if test "$host_cpu" = ia64; then
-+    symcode='[[ABCDEGRST]]'
-+  fi
-+  ;;
-+irix* | nonstopux*)
-+  symcode='[[BCDEGRST]]'
-+  ;;
-+osf*)
-+  symcode='[[BCDEGQRST]]'
-+  ;;
-+solaris*)
-+  symcode='[[BDRT]]'
-+  ;;
-+sco3.2v5*)
-+  symcode='[[DT]]'
-+  ;;
-+sysv4.2uw2*)
-+  symcode='[[DT]]'
-+  ;;
-+sysv5* | sco5v6* | unixware* | OpenUNIX*)
-+  symcode='[[ABDT]]'
-+  ;;
-+sysv4)
-+  symcode='[[DFNSTU]]'
-+  ;;
-+esac
- 
+-
 -	output_verbose_link_cmd='echo'
-+# If we're using GNU nm, then use its standard symbol codes.
-+case `$NM -V 2>&1` in
-+*GNU* | *'with BFD'*)
-+  symcode='[[ABCDGIRSTW]]' ;;
-+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
@@ -6845,14 +7528,10 @@
 -      gcx*)
 -	# Green Hills C++ Compiler
 -	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-+# Transform an extracted symbol line into a proper C declaration.
-+# Some systems (esp. on ia64) link data and code symbols differently,
-+# so use this general approach.
-+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
- 
+-
 -	# The C++ compiler must be used to create the archive.
 -	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
--	;;
+ 	;;
 -      *)
 -	# GNU C++ compiler with Solaris linker
 -	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
@@ -6861,10 +7540,7 @@
 -	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
 -	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
 -		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-+# Transform an extracted symbol line into symbol name and symbol address
-+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p'"
-+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
- 
+-
 -	    # Commands to make compiler produce verbose output that lists
 -	    # what "hidden" libraries, object files and flags are used when
 -	    # linking a shared library.
@@ -6875,28 +7551,30 @@
 -	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
 -	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
 -		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-+# Handle CRLF in mingw tool chain
-+opt_cr=
-+case $build_os in
-+mingw*)
-+  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
-+  ;;
-+esac
- 
+-
 -	    # 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
-+# Try without a prefix underscore, then with it.
-+for ac_symprfx in "" "_"; do
- 
+-
 -	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
 -	  case $host_os in
 -	  solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
--	  *)
++      sunos4*)
++	case $cc_basename in
++	  CC*)
++	    # Sun C++ 4.x
++	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
++	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++	    ;;
++	  lcc*)
++	    # Lucid
++	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
++	    ;;
+ 	  *)
 -	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
--	    ;;
+ 	    ;;
 -	  esac
 -	fi
 -	;;
@@ -6916,7 +7594,8 @@
 -      *)
 -	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 -	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
--	;;
++	esac
+ 	;;
 -    esac
 -    ;;
 -  sysv5* | sco3.2v5* | sco5v6*)
@@ -6949,11 +7628,28 @@
 -      CC*)
 -	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
 -	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
--	;;
++      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
++	case $cc_basename in
++	  CC*)
++	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++	    ;;
++	esac
+ 	;;
 -      *)
 -	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
 -	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
--	;;
++      tandem*)
++	case $cc_basename in
++	  NCC*)
++	    # NonStop-UX NCC 3.20
++	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++	    ;;
++	  *)
++	    ;;
++	esac
+ 	;;
 -    esac
 -    ;;
 -  tandem*)
@@ -6962,12 +7658,14 @@
 -	# NonStop-UX NCC 3.20
 -	# FIXME: insert proper C++ library support
 -	_LT_AC_TAGVAR(ld_shlibs, $1)=no
--	;;
--      *)
++      vxworks*)
+ 	;;
+       *)
 -	# FIXME: insert proper C++ library support
 -	_LT_AC_TAGVAR(ld_shlibs, $1)=no
--	;;
--    esac
++	_LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+ 	;;
+     esac
 -    ;;
 -  vxworks*)
 -    # FIXME: insert proper C++ library support
@@ -6980,31 +7678,15 @@
 -esac
 -AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
 -test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-+  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
-+  symxfrm="\\1 $ac_symprfx\\2 \\2"
- 
+-
 -_LT_AC_TAGVAR(GCC, $1)="$GXX"
 -_LT_AC_TAGVAR(LD, $1)="$LD"
-+  # Write the raw and C identifiers.
-+  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-+    # Fake it for dumpbin and say T for any non-static function
-+    # and D for any global variable.
-+    # Also find C++ and __fastcall symbols from MSVC++,
-+    # which start with @ or ?.
-+    lt_cv_sys_global_symbol_pipe="$AWK ['"\
-+"     {last_section=section; section=\$ 3};"\
-+"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
-+"     \$ 0!~/External *\|/{next};"\
-+"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
-+"     {if(hide[section]) next};"\
-+"     {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
-+"     {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
-+"     s[1]~/^[@?]/{print s[1], s[1]; next};"\
-+"     s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
-+"     ' prfx=^$ac_symprfx]"
-+  else
-+    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[	 ]]\($symcode$symcode*\)[[	 ]][[	 ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
 +  fi
++],
++[
++  if test "$GCC" = yes; then
++    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
  
 -AC_LIBTOOL_POSTDEP_PREDEP($1)
 -AC_LIBTOOL_PROG_COMPILER_PIC($1)
@@ -7013,23 +7695,30 @@
 -AC_LIBTOOL_PROG_LD_SHLIBS($1)
 -AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
 -AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-+  # Check to see that the pipe works correctly.
-+  pipe_works=no
++    case $host_os in
++      aix*)
++      # All AIX code is PIC.
++      if test "$host_cpu" = ia64; then
++	# AIX 5 now supports IA64 processor
++	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      fi
++      ;;
  
 -AC_LIBTOOL_CONFIG($1)
-+  rm -f conftest*
-+  cat > conftest.$ac_ext <<_LT_EOF
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+char nm_test_var;
-+void nm_test_func(void);
-+void nm_test_func(void){}
-+#ifdef __cplusplus
-+}
-+#endif
-+int main(){nm_test_var='a';nm_test_func();return(0);}
-+_LT_EOF
++    amigaos*)
++      case $host_cpu in
++      powerpc)
++            # see comment about AmigaOS4 .so support
++            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
++        ;;
++      m68k)
++            # FIXME: we need at least 68020 code to build shared libraries, but
++            # adding the `-m68020' flag to GCC prevents building anything better,
++            # like `-m68040'.
++            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
++        ;;
++      esac
++      ;;
  
 -AC_LANG_POP
 -CC=$lt_save_CC
@@ -7043,16 +7732,9 @@
 -lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
 -lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
 -])# AC_LIBTOOL_LANG_CXX_CONFIG
-+  if AC_TRY_EVAL(ac_compile); then
-+    # Now try to grab the symbols.
-+    nlist=conftest.nm
-+    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
-+      # Try sorting and uniquifying the output.
-+      if sort "$nlist" | uniq > "$nlist"T; then
-+	mv -f "$nlist"T "$nlist"
-+      else
-+	rm -f "$nlist"T
-+      fi
++    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++      # PIC is the default for these OSes.
++      ;;
  
 -# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
 -# ------------------------------------
@@ -7102,42 +7784,48 @@
 -if AC_TRY_EVAL(ac_compile); then
 -  # Parse the compiler output and extract the necessary
 -  # objects, libraries and library flags.
-+      # Make sure that we snagged all the symbols we need.
-+      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
-+	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
-+	  cat <<_LT_EOF > conftest.$ac_ext
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
++    mingw* | cygwin* | pw32* | os2* | cegcc*)
++      # This hack is so that the source file can tell whether it is being
++      # built for inclusion in a dll (and should export symbols for example).
++      # Although the cygwin gcc ignores -fPIC, still need this for old-style
++      # (--disable-auto-import) libraries
++      m4_if([$1], [GCJ], [],
++	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
++      ;;
  
 -  # Sentinel used to keep track of whether or not we are before
 -  # the conftest object file.
 -  pre_test_object_deps_done=no
-+_LT_EOF
-+	  # Now generate the symbol file.
-+	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
++    darwin* | rhapsody*)
++      # PIC is the default on this platform
++      # Common symbols not allowed in MH_DYLIB files
++      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
++      ;;
  
 -  # The `*' in the case matches for architectures that use `case' in
 -  # $output_verbose_cmd can trigger glob expansion during the loop
 -  # eval without this substitution.
 -  output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
-+	  cat <<_LT_EOF >> conftest.$ac_ext
++    hpux*)
++      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
++      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
++      # sets the default TLS model and affects inlining.
++      case $host_cpu in
++      hppa*64*)
++	# +Z the default
++	;;
++      *)
++	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
++	;;
++      esac
++      ;;
  
 -  for p in `eval $output_verbose_link_cmd`; do
 -    case $p in
-+/* The mapping between symbol names and symbols.  */
-+const struct {
-+  const char *name;
-+  void       *address;
-+}
-+lt__PROGRAM__LTX_preloaded_symbols[[]] =
-+{
-+  { "@PROGRAM@", (void *) 0 },
-+_LT_EOF
-+	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
-+	  cat <<\_LT_EOF >> conftest.$ac_ext
-+  {0, (void *) 0}
-+};
++    interix[[3-9]]*)
++      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
++      # Instead, we relocate shared libraries at runtime.
++      ;;
  
 -    -L* | -R* | -l*)
 -       # Some compilers place space between "-{L,R}" and the path.
@@ -7149,12 +7837,12 @@
 -       else
 -	 prev=
 -       fi
-+/* This works around a problem in FreeBSD linker */
-+#ifdef FREEBSD_WORKAROUND
-+static const void *lt_preloaded_setup() {
-+  return lt__PROGRAM__LTX_preloaded_symbols;
-+}
-+#endif
++    msdosdjgpp*)
++      # Just because we use GCC doesn't mean we suddenly get shared libraries
++      # on systems that don't support them.
++      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
++      enable_shared=no
++      ;;
  
 -       if test "$pre_test_object_deps_done" = no; then
 -	 case $p in
@@ -7179,7 +7867,12 @@
 -	 fi
 -       fi
 -       ;;
--
++    *nto* | *qnx*)
++      # QNX uses GNU C++, but need to define -shared option too, otherwise
++      # it will coredump.
++      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
++      ;;
+ 
 -    *.$objext)
 -       # This assumes that the test object file only shows up
 -       # once in the compiler output.
@@ -7204,76 +7897,42 @@
 -       ;;
 -
 -    *) ;; # Ignore the rest.
--
--    esac
--  done
-+#ifdef __cplusplus
-+}
-+#endif
-+_LT_EOF
-+	  # Now try linking the two files.
-+	  mv conftest.$ac_objext conftstm.$ac_objext
-+	  lt_save_LIBS="$LIBS"
-+	  lt_save_CFLAGS="$CFLAGS"
-+	  LIBS="conftstm.$ac_objext"
-+	  CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
-+	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
-+	    pipe_works=yes
-+	  fi
-+	  LIBS="$lt_save_LIBS"
-+	  CFLAGS="$lt_save_CFLAGS"
-+	else
-+	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
-+	fi
-+      else
-+	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
++    sysv4*MP*)
++      if test -d /usr/nec; then
++	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
 +      fi
-+    else
-+      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
-+    fi
-+  else
-+    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
-+    cat conftest.$ac_ext >&5
-+  fi
-+  rm -rf conftest* conftst*
++      ;;
  
++    *)
++      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
++      ;;
+     esac
+-  done
+-
 -  # Clean up.
 -  rm -f a.out a.exe
-+  # Do not use the global_symbol_pipe unless it works.
-+  if test "$pipe_works" = yes; then
-+    break
-+  else
-+    lt_cv_sys_global_symbol_pipe=
-+  fi
-+done
-+])
-+if test -z "$lt_cv_sys_global_symbol_pipe"; then
-+  lt_cv_sys_global_symbol_to_cdecl=
-+fi
-+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-+  AC_MSG_RESULT(failed)
- else
+-else
 -  echo "libtool.m4: error: problem compiling $1 test program"
-+  AC_MSG_RESULT(ok)
- fi
- 
+-fi
+-
 -$rm -f confest.$objext
-+_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
-+    [Take the output of nm and produce a listing of raw symbols and C names])
-+_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
-+    [Transform the output of nm in a proper C declaration])
-+_LT_DECL([global_symbol_to_c_name_address],
-+    [lt_cv_sys_global_symbol_to_c_name_address], [1],
-+    [Transform the output of nm in a C name address pair])
-+_LT_DECL([global_symbol_to_c_name_address_lib_prefix],
-+    [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
-+    [Transform the output of nm in a C name address pair when lib prefix is needed])
-+]) # _LT_CMD_GLOBAL_SYMBOLS
- 
+-
 -_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
 -if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
 -  _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
 -fi
++  else
++    # PORTME Check for flag to pass linker flags through the system compiler.
++    case $host_os in
++    aix*)
++      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++      if test "$host_cpu" = ia64; then
++	# AIX 5 now supports IA64 processor
++	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      else
++	_LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
++      fi
++      ;;
  
 -# PORTME: override above test on systems where it is broken
 -ifelse([$1],[CXX],
@@ -7285,13 +7944,12 @@
 -  _LT_AC_TAGVAR(postdep_objects,$1)=
 -  _LT_AC_TAGVAR(postdeps,$1)=
 -  ;;
-+# _LT_COMPILER_PIC([TAGNAME])
-+# ---------------------------
-+m4_defun([_LT_COMPILER_PIC],
-+[m4_require([_LT_TAG_COMPILER])dnl
-+_LT_TAGVAR(lt_prog_compiler_wl, $1)=
-+_LT_TAGVAR(lt_prog_compiler_pic, $1)=
-+_LT_TAGVAR(lt_prog_compiler_static, $1)=
++    mingw* | cygwin* | pw32* | os2* | cegcc*)
++      # This hack is so that the source file can tell whether it is being
++      # built for inclusion in a dll (and should export symbols for example).
++      m4_if([$1], [GCJ], [],
++	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
++      ;;
  
 -linux*)
 -  case `$CC -V 2>&1 | sed 5q` in
@@ -7305,7 +7963,21 @@
 -    case " $CXX $CXXFLAGS " in
 -    *" -library=stlport4 "*)
 -      solaris_use_stlport4=yes
--      ;;
++    hpux9* | hpux10* | hpux11*)
++      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
++      # not for PA HP-UX.
++      case $host_cpu in
++      hppa*64*|ia64*)
++	# +Z the default
++	;;
++      *)
++	_LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
++	;;
++      esac
++      # Is there a better lt_prog_compiler_static that works with the bundled CC?
++      _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+       ;;
 -    esac
 -    if test "$solaris_use_stlport4" != yes; then
 -      _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
@@ -7313,12 +7985,6 @@
 -    ;;
 -  esac
 -  ;;
-+AC_MSG_CHECKING([for $compiler option to produce PIC])
-+m4_if([$1], [CXX], [
-+  # C++ specific cases for pic, static, wl, etc.
-+  if test "$GXX" = yes; then
-+    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
  
 -solaris*)
 -  case $cc_basename in
@@ -7330,16 +7996,13 @@
 -    case " $CXX $CXXFLAGS " in
 -    *" -library=stlport4 "*)
 -      solaris_use_stlport4=yes
-+    case $host_os in
-+    aix*)
-+      # All AIX code is PIC.
-+      if test "$host_cpu" = ia64; then
-+	# AIX 5 now supports IA64 processor
-+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+      fi
++    irix5* | irix6* | nonstopux*)
++      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++      # PIC (with -KPIC) is the default.
++      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
        ;;
 -    esac
--
+ 
 -    # Adding this requires a known-good setup of shared libraries for
 -    # Sun compiler versions before 5.6, else PIC objects from an old
 -    # archive will be linked into the output, leading to subtle bugs.
@@ -7355,730 +8018,6 @@
 -*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
 -esac
 -])# AC_LIBTOOL_POSTDEP_PREDEP
--
--# AC_LIBTOOL_LANG_F77_CONFIG
--# --------------------------
--# Ensure that the configuration vars for the C compiler are
--# suitably defined.  Those variables are subsequently used by
--# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
--AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)])
--AC_DEFUN([_LT_AC_LANG_F77_CONFIG],
--[AC_REQUIRE([AC_PROG_F77])
--AC_LANG_PUSH(Fortran 77)
--
--_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
--_LT_AC_TAGVAR(allow_undefined_flag, $1)=
--_LT_AC_TAGVAR(always_export_symbols, $1)=no
--_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
--_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
--_LT_AC_TAGVAR(hardcode_direct, $1)=no
--_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
--_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
--_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
--_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
--_LT_AC_TAGVAR(hardcode_automatic, $1)=no
--_LT_AC_TAGVAR(module_cmds, $1)=
--_LT_AC_TAGVAR(module_expsym_cmds, $1)=
--_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
--_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
--_LT_AC_TAGVAR(no_undefined_flag, $1)=
--_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
--_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
--
--# Source file extension for f77 test sources.
--ac_ext=f
--
--# Object file extension for compiled f77 test sources.
--objext=o
--_LT_AC_TAGVAR(objext, $1)=$objext
--
--# Code to be used in simple compile tests
--lt_simple_compile_test_code="\
--      subroutine t
--      return
--      end
--"
--
--# Code to be used in simple link tests
--lt_simple_link_test_code="\
--      program t
--      end
--"
--
--# ltmain only uses $CC for tagged configurations so make sure $CC is set.
--_LT_AC_SYS_COMPILER
--
--# save warnings/boilerplate of simple test code
--_LT_COMPILER_BOILERPLATE
--_LT_LINKER_BOILERPLATE
--
--# Allow CC to be a program name with arguments.
--lt_save_CC="$CC"
--CC=${F77-"f77"}
--compiler=$CC
--_LT_AC_TAGVAR(compiler, $1)=$CC
--_LT_CC_BASENAME([$compiler])
--
--AC_MSG_CHECKING([if libtool supports shared libraries])
--AC_MSG_RESULT([$can_build_shared])
--
--AC_MSG_CHECKING([whether to build shared libraries])
--test "$can_build_shared" = "no" && enable_shared=no
--
--# On AIX, shared libraries and static libraries use the same namespace, and
--# are all built from PIC.
--case $host_os in
--aix3*)
--  test "$enable_shared" = yes && enable_static=no
--  if test -n "$RANLIB"; then
--    archive_cmds="$archive_cmds~\$RANLIB \$lib"
--    postinstall_cmds='$RANLIB $lib'
--  fi
--  ;;
--aix[[4-9]]*)
--  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
--    test "$enable_shared" = yes && enable_static=no
--  fi
--  ;;
--esac
--AC_MSG_RESULT([$enable_shared])
--
--AC_MSG_CHECKING([whether to build static libraries])
--# Make sure either enable_shared or enable_static is yes.
--test "$enable_shared" = yes || enable_static=yes
--AC_MSG_RESULT([$enable_static])
--
--_LT_AC_TAGVAR(GCC, $1)="$G77"
--_LT_AC_TAGVAR(LD, $1)="$LD"
--
--AC_LIBTOOL_PROG_COMPILER_PIC($1)
--AC_LIBTOOL_PROG_CC_C_O($1)
--AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
--AC_LIBTOOL_PROG_LD_SHLIBS($1)
--AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
--AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
--
--AC_LIBTOOL_CONFIG($1)
--
--AC_LANG_POP
--CC="$lt_save_CC"
--])# AC_LIBTOOL_LANG_F77_CONFIG
--
--
--# AC_LIBTOOL_LANG_GCJ_CONFIG
--# --------------------------
--# Ensure that the configuration vars for the C compiler are
--# suitably defined.  Those variables are subsequently used by
--# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
--AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)])
--AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG],
--[AC_LANG_SAVE
--
--# Source file extension for Java test sources.
--ac_ext=java
--
--# Object file extension for compiled Java test sources.
--objext=o
--_LT_AC_TAGVAR(objext, $1)=$objext
--
--# Code to be used in simple compile tests
--lt_simple_compile_test_code="class foo {}"
--
--# 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_AC_SYS_COMPILER
--
--# save warnings/boilerplate of simple test code
--_LT_COMPILER_BOILERPLATE
--_LT_LINKER_BOILERPLATE
--
--# Allow CC to be a program name with arguments.
--lt_save_CC="$CC"
--CC=${GCJ-"gcj"}
--compiler=$CC
--_LT_AC_TAGVAR(compiler, $1)=$CC
--_LT_CC_BASENAME([$compiler])
--
--# GCJ did not exist at the time GCC didn't implicitly link libc in.
--_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
--
--_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
--
--AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
--AC_LIBTOOL_PROG_COMPILER_PIC($1)
--AC_LIBTOOL_PROG_CC_C_O($1)
--AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
--AC_LIBTOOL_PROG_LD_SHLIBS($1)
--AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
--AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
--
--AC_LIBTOOL_CONFIG($1)
--
--AC_LANG_RESTORE
--CC="$lt_save_CC"
--])# AC_LIBTOOL_LANG_GCJ_CONFIG
--
--
--# AC_LIBTOOL_LANG_RC_CONFIG
--# -------------------------
--# Ensure that the configuration vars for the Windows resource compiler are
--# suitably defined.  Those variables are subsequently used by
--# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
--AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)])
--AC_DEFUN([_LT_AC_LANG_RC_CONFIG],
--[AC_LANG_SAVE
--
--# Source file extension for RC test sources.
--ac_ext=rc
--
--# Object file extension for compiled RC test sources.
--objext=o
--_LT_AC_TAGVAR(objext, $1)=$objext
--
--# Code to be used in simple compile tests
--lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
--
--# Code to be used in simple link tests
--lt_simple_link_test_code="$lt_simple_compile_test_code"
--
--# ltmain only uses $CC for tagged configurations so make sure $CC is set.
--_LT_AC_SYS_COMPILER
--
--# save warnings/boilerplate of simple test code
--_LT_COMPILER_BOILERPLATE
--_LT_LINKER_BOILERPLATE
--
--# Allow CC to be a program name with arguments.
--lt_save_CC="$CC"
--CC=${RC-"windres"}
--compiler=$CC
--_LT_AC_TAGVAR(compiler, $1)=$CC
--_LT_CC_BASENAME([$compiler])
--_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
--