Attachment 152586 Details for Bug 236059 – cvs diffs (derived files)

[patch] cvs diffs (derived files)

setuputil.derived.diffs (text/plain), 650.05 KB, created by Noriko Hosoi on 2007-04-13 20:39:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Noriko Hosoi

Created: 2007-04-13 20:39:44 UTC

Size: 650.05 KB

patch

obsolete

>Index: Makefile.in
>===================================================================
>RCS file: /cvs/dirsec/setuputil/Makefile.in,v
>retrieving revision 1.1
>diff -t -w -U4 -r1.1 Makefile.in
>--- Makefile.in	5 Apr 2007 01:53:36 -0000	1.1
>+++ Makefile.in	13 Apr 2007 20:24:16 -0000
>@@ -1,9 +1,9 @@
>-# Makefile.in generated by automake 1.9.2 from Makefile.am.
>+# Makefile.in generated by automake 1.9.6 from Makefile.am.
> # @configure_input@
> 
> # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
>-# 2003, 2004  Free Software Foundation, Inc.
>+# 2003, 2004, 2005  Free Software Foundation, Inc.
> # This Makefile.in is free software; the Free Software Foundation
> # gives unlimited permission to copy and/or distribute it,
> # with or without modifications, as long as this notice is preserved.
> 
>@@ -16,10 +16,8 @@
> 
> 
> 
> 
>-SOURCES = $(libdsinstall_la_SOURCES) $(dssetup_bin_SOURCES) $(dsuninstall_bin_SOURCES)
>-
> srcdir = @srcdir@
> top_srcdir = @top_srcdir@
> VPATH = @srcdir@
> pkgdatadir = $(datadir)/@PACKAGE@
>@@ -69,9 +67,10 @@
>         "$(DESTDIR)$(dssetupincludedir)" "$(DESTDIR)$(pkgconfigdir)"
> dssetuplibLTLIBRARIES_INSTALL = $(INSTALL)
> LTLIBRARIES = $(dssetuplib_LTLIBRARIES)
> am__DEPENDENCIES_1 =
>-libdsinstall_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
>+libdsinstall_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
>+        $(am__DEPENDENCIES_1)
> am__dirstamp = $(am__leading_dot)dirstamp
> am_libdsinstall_la_OBJECTS = installer/lib/libdsinstall_la-code.lo \
>         installer/lib/libdsinstall_la-schema.lo \
>         installer/lib/libdsinstall_la-global.lo \
>@@ -127,21 +126,21 @@
> depcomp = $(SHELL) $(top_srcdir)/depcomp
> am__depfiles_maybe = depfiles
> COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
>         $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
>-LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) \
>+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
>         $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
>         $(AM_CFLAGS) $(CFLAGS)
> CCLD = $(CC)
>-LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
>+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
>         $(AM_LDFLAGS) $(LDFLAGS) -o $@
> CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
>         $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
>-LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
>+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
>         $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
>         $(AM_CXXFLAGS) $(CXXFLAGS)
> CXXLD = $(CXX)
>-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
>+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
>         $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
> SOURCES = $(libdsinstall_la_SOURCES) $(dssetup_bin_SOURCES) \
>         $(dsuninstall_bin_SOURCES)
> DIST_SOURCES = $(libdsinstall_la_SOURCES) $(dssetup_bin_SOURCES) \
>@@ -381,10 +380,11 @@
>     installer/unix/lib/dialog.cc \
>     installer/unix/lib/ux-wrapper.cc
> 
> libdsinstall_la_CPPFLAGS = $(SETUPUTIL_CPPFLAGS) @ldapsdk_inc@ @nss_inc@ @nspr_inc@
>-libdsinstall_la_LIBADD = $(LDAPSDK_LINK) 
>+libdsinstall_la_LIBADD = $(LDAPSDK_LINK) $(SASL_LINK)
> libdsinstall_la_LDFLAGS = -version-info 1:0:0
>+libdsinstall_la_LINK = $(CXXLINK)
> 
> #////////////////////////////////////////////////////////////////
> #
> #   Programs
>@@ -563,9 +563,9 @@
> installer/unix/lib/libdsinstall_la-ux-wrapper.lo:  \
>         installer/unix/lib/$(am__dirstamp) \
>         installer/unix/lib/$(DEPDIR)/$(am__dirstamp)
> libdsinstall.la: $(libdsinstall_la_OBJECTS) $(libdsinstall_la_DEPENDENCIES) 
>-        $(CXXLINK) -rpath $(dssetuplibdir) $(libdsinstall_la_LDFLAGS) $(libdsinstall_la_OBJECTS) $(libdsinstall_la_LIBADD) $(LIBS)
>+        $(libdsinstall_la_LINK) -rpath $(dssetuplibdir) $(libdsinstall_la_LDFLAGS) $(libdsinstall_la_OBJECTS) $(libdsinstall_la_LIBADD) $(LIBS)
> install-dssetupsbinPROGRAMS: $(dssetupsbin_PROGRAMS)
>         @$(NORMAL_INSTALL)
>         test -z "$(dssetupsbindir)" || $(mkdir_p) "$(DESTDIR)$(dssetupsbindir)"
>         @list='$(dssetupsbin_PROGRAMS)'; for p in $$list; do \
>@@ -805,13 +805,13 @@
> @AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
> @am__fastdepCC_FALSE@   $(LTCOMPILE) -c -o $@ $<
> 
> installer/unix/lib/libdsinstall_la-ux-curse.lo: installer/unix/lib/ux-curse.c
>-@am__fastdepCC_TRUE@    if $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsinstall_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT installer/unix/lib/libdsinstall_la-ux-curse.lo -MD -MP -MF "installer/unix/lib/$(DEPDIR)/libdsinstall_la-ux-curse.Tpo" -c -o installer/unix/lib/libdsinstall_la-ux-curse.lo `test -f 'installer/unix/lib/ux-curse.c' || echo '$(srcdir)/'`installer/unix/lib/ux-curse.c; \
>+@am__fastdepCC_TRUE@    if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsinstall_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT installer/unix/lib/libdsinstall_la-ux-curse.lo -MD -MP -MF "installer/unix/lib/$(DEPDIR)/libdsinstall_la-ux-curse.Tpo" -c -o installer/unix/lib/libdsinstall_la-ux-curse.lo `test -f 'installer/unix/lib/ux-curse.c' || echo '$(srcdir)/'`installer/unix/lib/ux-curse.c; \
> @am__fastdepCC_TRUE@    then mv -f "installer/unix/lib/$(DEPDIR)/libdsinstall_la-ux-curse.Tpo" "installer/unix/lib/$(DEPDIR)/libdsinstall_la-ux-curse.Plo"; else rm -f "installer/unix/lib/$(DEPDIR)/libdsinstall_la-ux-curse.Tpo"; exit 1; fi
> @AMDEP_TRUE@@am__fastdepCC_FALSE@       source='installer/unix/lib/ux-curse.c' object='installer/unix/lib/libdsinstall_la-ux-curse.lo' libtool=yes @AMDEPBACKSLASH@
> @AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
>-@am__fastdepCC_FALSE@   $(LIBTOOL) --mode=compile --tag=CC $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsinstall_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o installer/unix/lib/libdsinstall_la-ux-curse.lo `test -f 'installer/unix/lib/ux-curse.c' || echo '$(srcdir)/'`installer/unix/lib/ux-curse.c
>+@am__fastdepCC_FALSE@   $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsinstall_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o installer/unix/lib/libdsinstall_la-ux-curse.lo `test -f 'installer/unix/lib/ux-curse.c' || echo '$(srcdir)/'`installer/unix/lib/ux-curse.c
> 
> .cc.o:
> @am__fastdepCXX_TRUE@   depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`; \
> @am__fastdepCXX_TRUE@   if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$$depbase.Tpo" -c -o $@ $<; \
>@@ -836,125 +836,125 @@
> @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
> @am__fastdepCXX_FALSE@  $(LTCXXCOMPILE) -c -o $@ $<
> 
> installer/lib/libdsinstall_la-code.lo: installer/lib/code.cpp
>-@am__fastdepCXX_TRUE@   if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsinstall_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT installer/lib/libdsinstall_la-code.lo -MD -MP -MF "installer/lib/$(DEPDIR)/libdsinstall_la-code.Tpo" -c -o installer/lib/libdsinstall_la-code.lo `test -f 'installer/lib/code.cpp' || echo '$(srcdir)/'`installer/lib/code.cpp; \
>+@am__fastdepCXX_TRUE@   if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsinstall_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT installer/lib/libdsinstall_la-code.lo -MD -MP -MF "installer/lib/$(DEPDIR)/libdsinstall_la-code.Tpo" -c -o installer/lib/libdsinstall_la-code.lo `test -f 'installer/lib/code.cpp' || echo '$(srcdir)/'`installer/lib/code.cpp; \
> @am__fastdepCXX_TRUE@   then mv -f "installer/lib/$(DEPDIR)/libdsinstall_la-code.Tpo" "installer/lib/$(DEPDIR)/libdsinstall_la-code.Plo"; else rm -f "installer/lib/$(DEPDIR)/libdsinstall_la-code.Tpo"; exit 1; fi
> @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='installer/lib/code.cpp' object='installer/lib/libdsinstall_la-code.lo' libtool=yes @AMDEPBACKSLASH@
> @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
>-@am__fastdepCXX_FALSE@  $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsinstall_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o installer/lib/libdsinstall_la-code.lo `test -f 'installer/lib/code.cpp' || echo '$(srcdir)/'`installer/lib/code.cpp
>+@am__fastdepCXX_FALSE@  $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsinstall_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o installer/lib/libdsinstall_la-code.lo `test -f 'installer/lib/code.cpp' || echo '$(srcdir)/'`installer/lib/code.cpp
> 
> installer/lib/libdsinstall_la-schema.lo: installer/lib/schema.cpp
>-@am__fastdepCXX_TRUE@   if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsinstall_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT installer/lib/libdsinstall_la-schema.lo -MD -MP -MF "installer/lib/$(DEPDIR)/libdsinstall_la-schema.Tpo" -c -o installer/lib/libdsinstall_la-schema.lo `test -f 'installer/lib/schema.cpp' || echo '$(srcdir)/'`installer/lib/schema.cpp; \
>+@am__fastdepCXX_TRUE@   if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsinstall_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT installer/lib/libdsinstall_la-schema.lo -MD -MP -MF "installer/lib/$(DEPDIR)/libdsinstall_la-schema.Tpo" -c -o installer/lib/libdsinstall_la-schema.lo `test -f 'installer/lib/schema.cpp' || echo '$(srcdir)/'`installer/lib/schema.cpp; \
> @am__fastdepCXX_TRUE@   then mv -f "installer/lib/$(DEPDIR)/libdsinstall_la-schema.Tpo" "installer/lib/$(DEPDIR)/libdsinstall_la-schema.Plo"; else rm -f "installer/lib/$(DEPDIR)/libdsinstall_la-schema.Tpo"; exit 1; fi
> @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='installer/lib/schema.cpp' object='installer/lib/libdsinstall_la-schema.lo' libtool=yes @AMDEPBACKSLASH@
> @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
>-@am__fastdepCXX_FALSE@  $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsinstall_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o installer/lib/libdsinstall_la-schema.lo `test -f 'installer/lib/schema.cpp' || echo '$(srcdir)/'`installer/lib/schema.cpp
>+@am__fastdepCXX_FALSE@  $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsinstall_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o installer/lib/libdsinstall_la-schema.lo `test -f 'installer/lib/schema.cpp' || echo '$(srcdir)/'`installer/lib/schema.cpp
> 
> installer/lib/libdsinstall_la-global.lo: installer/lib/global.cpp
>-@am__fastdepCXX_TRUE@   if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsinstall_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT installer/lib/libdsinstall_la-global.lo -MD -MP -MF "installer/lib/$(DEPDIR)/libdsinstall_la-global.Tpo" -c -o installer/lib/libdsinstall_la-global.lo `test -f 'installer/lib/global.cpp' || echo '$(srcdir)/'`installer/lib/global.cpp; \
>+@am__fastdepCXX_TRUE@   if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsinstall_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT installer/lib/libdsinstall_la-global.lo -MD -MP -MF "installer/lib/$(DEPDIR)/libdsinstall_la-global.Tpo" -c -o installer/lib/libdsinstall_la-global.lo `test -f 'installer/lib/global.cpp' || echo '$(srcdir)/'`installer/lib/global.cpp; \
> @am__fastdepCXX_TRUE@   then mv -f "installer/lib/$(DEPDIR)/libdsinstall_la-global.Tpo" "installer/lib/$(DEPDIR)/libdsinstall_la-global.Plo"; else rm -f "installer/lib/$(DEPDIR)/libdsinstall_la-global.Tpo"; exit 1; fi
> @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='installer/lib/global.cpp' object='installer/lib/libdsinstall_la-global.lo' libtool=yes @AMDEPBACKSLASH@
> @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
>-@am__fastdepCXX_FALSE@  $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsinstall_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o installer/lib/libdsinstall_la-global.lo `test -f 'installer/lib/global.cpp' || echo '$(srcdir)/'`installer/lib/global.cpp
>+@am__fastdepCXX_FALSE@  $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsinstall_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o installer/lib/libdsinstall_la-global.lo `test -f 'installer/lib/global.cpp' || echo '$(srcdir)/'`installer/lib/global.cpp
> 
> installer/lib/libdsinstall_la-setupapi.lo: installer/lib/setupapi.cpp
>-@am__fastdepCXX_TRUE@   if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsinstall_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT installer/lib/libdsinstall_la-setupapi.lo -MD -MP -MF "installer/lib/$(DEPDIR)/libdsinstall_la-setupapi.Tpo" -c -o installer/lib/libdsinstall_la-setupapi.lo `test -f 'installer/lib/setupapi.cpp' || echo '$(srcdir)/'`installer/lib/setupapi.cpp; \
>+@am__fastdepCXX_TRUE@   if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsinstall_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT installer/lib/libdsinstall_la-setupapi.lo -MD -MP -MF "installer/lib/$(DEPDIR)/libdsinstall_la-setupapi.Tpo" -c -o installer/lib/libdsinstall_la-setupapi.lo `test -f 'installer/lib/setupapi.cpp' || echo '$(srcdir)/'`installer/lib/setupapi.cpp; \
> @am__fastdepCXX_TRUE@   then mv -f "installer/lib/$(DEPDIR)/libdsinstall_la-setupapi.Tpo" "installer/lib/$(DEPDIR)/libdsinstall_la-setupapi.Plo"; else rm -f "installer/lib/$(DEPDIR)/libdsinstall_la-setupapi.Tpo"; exit 1; fi
> @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='installer/lib/setupapi.cpp' object='installer/lib/libdsinstall_la-setupapi.lo' libtool=yes @AMDEPBACKSLASH@
> @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
>-@am__fastdepCXX_FALSE@  $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsinstall_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o installer/lib/libdsinstall_la-setupapi.lo `test -f 'installer/lib/setupapi.cpp' || echo '$(srcdir)/'`installer/lib/setupapi.cpp
>+@am__fastdepCXX_FALSE@  $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsinstall_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o installer/lib/libdsinstall_la-setupapi.lo `test -f 'installer/lib/setupapi.cpp' || echo '$(srcdir)/'`installer/lib/setupapi.cpp
> 
> installer/lib/libdsinstall_la-ldapu.lo: installer/lib/ldapu.cpp
>-@am__fastdepCXX_TRUE@   if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsinstall_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT installer/lib/libdsinstall_la-ldapu.lo -MD -MP -MF "installer/lib/$(DEPDIR)/libdsinstall_la-ldapu.Tpo" -c -o installer/lib/libdsinstall_la-ldapu.lo `test -f 'installer/lib/ldapu.cpp' || echo '$(srcdir)/'`installer/lib/ldapu.cpp; \
>+@am__fastdepCXX_TRUE@   if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsinstall_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT installer/lib/libdsinstall_la-ldapu.lo -MD -MP -MF "installer/lib/$(DEPDIR)/libdsinstall_la-ldapu.Tpo" -c -o installer/lib/libdsinstall_la-ldapu.lo `test -f 'installer/lib/ldapu.cpp' || echo '$(srcdir)/'`installer/lib/ldapu.cpp; \
> @am__fastdepCXX_TRUE@   then mv -f "installer/lib/$(DEPDIR)/libdsinstall_la-ldapu.Tpo" "installer/lib/$(DEPDIR)/libdsinstall_la-ldapu.Plo"; else rm -f "installer/lib/$(DEPDIR)/libdsinstall_la-ldapu.Tpo"; exit 1; fi
> @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='installer/lib/ldapu.cpp' object='installer/lib/libdsinstall_la-ldapu.lo' libtool=yes @AMDEPBACKSLASH@
> @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
>-@am__fastdepCXX_FALSE@  $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsinstall_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o installer/lib/libdsinstall_la-ldapu.lo `test -f 'installer/lib/ldapu.cpp' || echo '$(srcdir)/'`installer/lib/ldapu.cpp
>+@am__fastdepCXX_FALSE@  $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsinstall_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o installer/lib/libdsinstall_la-ldapu.lo `test -f 'installer/lib/ldapu.cpp' || echo '$(srcdir)/'`installer/lib/ldapu.cpp
> 
> installer/lib/libdsinstall_la-setupinst.lo: installer/lib/setupinst.cpp
>-@am__fastdepCXX_TRUE@   if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsinstall_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT installer/lib/libdsinstall_la-setupinst.lo -MD -MP -MF "installer/lib/$(DEPDIR)/libdsinstall_la-setupinst.Tpo" -c -o installer/lib/libdsinstall_la-setupinst.lo `test -f 'installer/lib/setupinst.cpp' || echo '$(srcdir)/'`installer/lib/setupinst.cpp; \
>+@am__fastdepCXX_TRUE@   if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsinstall_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT installer/lib/libdsinstall_la-setupinst.lo -MD -MP -MF "installer/lib/$(DEPDIR)/libdsinstall_la-setupinst.Tpo" -c -o installer/lib/libdsinstall_la-setupinst.lo `test -f 'installer/lib/setupinst.cpp' || echo '$(srcdir)/'`installer/lib/setupinst.cpp; \
> @am__fastdepCXX_TRUE@   then mv -f "installer/lib/$(DEPDIR)/libdsinstall_la-setupinst.Tpo" "installer/lib/$(DEPDIR)/libdsinstall_la-setupinst.Plo"; else rm -f "installer/lib/$(DEPDIR)/libdsinstall_la-setupinst.Tpo"; exit 1; fi
> @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='installer/lib/setupinst.cpp' object='installer/lib/libdsinstall_la-setupinst.lo' libtool=yes @AMDEPBACKSLASH@
> @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
>-@am__fastdepCXX_FALSE@  $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsinstall_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o installer/lib/libdsinstall_la-setupinst.lo `test -f 'installer/lib/setupinst.cpp' || echo '$(srcdir)/'`installer/lib/setupinst.cpp
>+@am__fastdepCXX_FALSE@  $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsinstall_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o installer/lib/libdsinstall_la-setupinst.lo `test -f 'installer/lib/setupinst.cpp' || echo '$(srcdir)/'`installer/lib/setupinst.cpp
> 
> installer/lib/libdsinstall_la-misc.lo: installer/lib/misc.cpp
>-@am__fastdepCXX_TRUE@   if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsinstall_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT installer/lib/libdsinstall_la-misc.lo -MD -MP -MF "installer/lib/$(DEPDIR)/libdsinstall_la-misc.Tpo" -c -o installer/lib/libdsinstall_la-misc.lo `test -f 'installer/lib/misc.cpp' || echo '$(srcdir)/'`installer/lib/misc.cpp; \
>+@am__fastdepCXX_TRUE@   if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsinstall_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT installer/lib/libdsinstall_la-misc.lo -MD -MP -MF "installer/lib/$(DEPDIR)/libdsinstall_la-misc.Tpo" -c -o installer/lib/libdsinstall_la-misc.lo `test -f 'installer/lib/misc.cpp' || echo '$(srcdir)/'`installer/lib/misc.cpp; \
> @am__fastdepCXX_TRUE@   then mv -f "installer/lib/$(DEPDIR)/libdsinstall_la-misc.Tpo" "installer/lib/$(DEPDIR)/libdsinstall_la-misc.Plo"; else rm -f "installer/lib/$(DEPDIR)/libdsinstall_la-misc.Tpo"; exit 1; fi
> @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='installer/lib/misc.cpp' object='installer/lib/libdsinstall_la-misc.lo' libtool=yes @AMDEPBACKSLASH@
> @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
>-@am__fastdepCXX_FALSE@  $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsinstall_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o installer/lib/libdsinstall_la-misc.lo `test -f 'installer/lib/misc.cpp' || echo '$(srcdir)/'`installer/lib/misc.cpp
>+@am__fastdepCXX_FALSE@  $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsinstall_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o installer/lib/libdsinstall_la-misc.lo `test -f 'installer/lib/misc.cpp' || echo '$(srcdir)/'`installer/lib/misc.cpp
> 
> installer/lib/libdsinstall_la-setupldap.lo: installer/lib/setupldap.cpp
>-@am__fastdepCXX_TRUE@   if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsinstall_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT installer/lib/libdsinstall_la-setupldap.lo -MD -MP -MF "installer/lib/$(DEPDIR)/libdsinstall_la-setupldap.Tpo" -c -o installer/lib/libdsinstall_la-setupldap.lo `test -f 'installer/lib/setupldap.cpp' || echo '$(srcdir)/'`installer/lib/setupldap.cpp; \
>+@am__fastdepCXX_TRUE@   if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsinstall_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT installer/lib/libdsinstall_la-setupldap.lo -MD -MP -MF "installer/lib/$(DEPDIR)/libdsinstall_la-setupldap.Tpo" -c -o installer/lib/libdsinstall_la-setupldap.lo `test -f 'installer/lib/setupldap.cpp' || echo '$(srcdir)/'`installer/lib/setupldap.cpp; \
> @am__fastdepCXX_TRUE@   then mv -f "installer/lib/$(DEPDIR)/libdsinstall_la-setupldap.Tpo" "installer/lib/$(DEPDIR)/libdsinstall_la-setupldap.Plo"; else rm -f "installer/lib/$(DEPDIR)/libdsinstall_la-setupldap.Tpo"; exit 1; fi
> @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='installer/lib/setupldap.cpp' object='installer/lib/libdsinstall_la-setupldap.lo' libtool=yes @AMDEPBACKSLASH@
> @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
>-@am__fastdepCXX_FALSE@  $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsinstall_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o installer/lib/libdsinstall_la-setupldap.lo `test -f 'installer/lib/setupldap.cpp' || echo '$(srcdir)/'`installer/lib/setupldap.cpp
>+@am__fastdepCXX_FALSE@  $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsinstall_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o installer/lib/libdsinstall_la-setupldap.lo `test -f 'installer/lib/setupldap.cpp' || echo '$(srcdir)/'`installer/lib/setupldap.cpp
> 
> installer/lib/libdsinstall_la-nsdefs.lo: installer/lib/nsdefs.cpp
>-@am__fastdepCXX_TRUE@   if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsinstall_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT installer/lib/libdsinstall_la-nsdefs.lo -MD -MP -MF "installer/lib/$(DEPDIR)/libdsinstall_la-nsdefs.Tpo" -c -o installer/lib/libdsinstall_la-nsdefs.lo `test -f 'installer/lib/nsdefs.cpp' || echo '$(srcdir)/'`installer/lib/nsdefs.cpp; \
>+@am__fastdepCXX_TRUE@   if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsinstall_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT installer/lib/libdsinstall_la-nsdefs.lo -MD -MP -MF "installer/lib/$(DEPDIR)/libdsinstall_la-nsdefs.Tpo" -c -o installer/lib/libdsinstall_la-nsdefs.lo `test -f 'installer/lib/nsdefs.cpp' || echo '$(srcdir)/'`installer/lib/nsdefs.cpp; \
> @am__fastdepCXX_TRUE@   then mv -f "installer/lib/$(DEPDIR)/libdsinstall_la-nsdefs.Tpo" "installer/lib/$(DEPDIR)/libdsinstall_la-nsdefs.Plo"; else rm -f "installer/lib/$(DEPDIR)/libdsinstall_la-nsdefs.Tpo"; exit 1; fi
> @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='installer/lib/nsdefs.cpp' object='installer/lib/libdsinstall_la-nsdefs.lo' libtool=yes @AMDEPBACKSLASH@
> @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
>-@am__fastdepCXX_FALSE@  $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsinstall_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o installer/lib/libdsinstall_la-nsdefs.lo `test -f 'installer/lib/nsdefs.cpp' || echo '$(srcdir)/'`installer/lib/nsdefs.cpp
>+@am__fastdepCXX_FALSE@  $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsinstall_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o installer/lib/libdsinstall_la-nsdefs.lo `test -f 'installer/lib/nsdefs.cpp' || echo '$(srcdir)/'`installer/lib/nsdefs.cpp
> 
> installer/lib/libdsinstall_la-setupnvpair.lo: installer/lib/setupnvpair.cpp
>-@am__fastdepCXX_TRUE@   if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsinstall_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT installer/lib/libdsinstall_la-setupnvpair.lo -MD -MP -MF "installer/lib/$(DEPDIR)/libdsinstall_la-setupnvpair.Tpo" -c -o installer/lib/libdsinstall_la-setupnvpair.lo `test -f 'installer/lib/setupnvpair.cpp' || echo '$(srcdir)/'`installer/lib/setupnvpair.cpp; \
>+@am__fastdepCXX_TRUE@   if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsinstall_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT installer/lib/libdsinstall_la-setupnvpair.lo -MD -MP -MF "installer/lib/$(DEPDIR)/libdsinstall_la-setupnvpair.Tpo" -c -o installer/lib/libdsinstall_la-setupnvpair.lo `test -f 'installer/lib/setupnvpair.cpp' || echo '$(srcdir)/'`installer/lib/setupnvpair.cpp; \
> @am__fastdepCXX_TRUE@   then mv -f "installer/lib/$(DEPDIR)/libdsinstall_la-setupnvpair.Tpo" "installer/lib/$(DEPDIR)/libdsinstall_la-setupnvpair.Plo"; else rm -f "installer/lib/$(DEPDIR)/libdsinstall_la-setupnvpair.Tpo"; exit 1; fi
> @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='installer/lib/setupnvpair.cpp' object='installer/lib/libdsinstall_la-setupnvpair.lo' libtool=yes @AMDEPBACKSLASH@
> @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
>-@am__fastdepCXX_FALSE@  $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsinstall_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o installer/lib/libdsinstall_la-setupnvpair.lo `test -f 'installer/lib/setupnvpair.cpp' || echo '$(srcdir)/'`installer/lib/setupnvpair.cpp
>+@am__fastdepCXX_FALSE@  $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsinstall_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o installer/lib/libdsinstall_la-setupnvpair.lo `test -f 'installer/lib/setupnvpair.cpp' || echo '$(srcdir)/'`installer/lib/setupnvpair.cpp
> 
> installer/lib/libdsinstall_la-nsutils.lo: installer/lib/nsutils.cpp
>-@am__fastdepCXX_TRUE@   if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsinstall_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT installer/lib/libdsinstall_la-nsutils.lo -MD -MP -MF "installer/lib/$(DEPDIR)/libdsinstall_la-nsutils.Tpo" -c -o installer/lib/libdsinstall_la-nsutils.lo `test -f 'installer/lib/nsutils.cpp' || echo '$(srcdir)/'`installer/lib/nsutils.cpp; \
>+@am__fastdepCXX_TRUE@   if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsinstall_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT installer/lib/libdsinstall_la-nsutils.lo -MD -MP -MF "installer/lib/$(DEPDIR)/libdsinstall_la-nsutils.Tpo" -c -o installer/lib/libdsinstall_la-nsutils.lo `test -f 'installer/lib/nsutils.cpp' || echo '$(srcdir)/'`installer/lib/nsutils.cpp; \
> @am__fastdepCXX_TRUE@   then mv -f "installer/lib/$(DEPDIR)/libdsinstall_la-nsutils.Tpo" "installer/lib/$(DEPDIR)/libdsinstall_la-nsutils.Plo"; else rm -f "installer/lib/$(DEPDIR)/libdsinstall_la-nsutils.Tpo"; exit 1; fi
> @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='installer/lib/nsutils.cpp' object='installer/lib/libdsinstall_la-nsutils.lo' libtool=yes @AMDEPBACKSLASH@
> @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
>-@am__fastdepCXX_FALSE@  $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsinstall_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o installer/lib/libdsinstall_la-nsutils.lo `test -f 'installer/lib/nsutils.cpp' || echo '$(srcdir)/'`installer/lib/nsutils.cpp
>+@am__fastdepCXX_FALSE@  $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsinstall_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o installer/lib/libdsinstall_la-nsutils.lo `test -f 'installer/lib/nsutils.cpp' || echo '$(srcdir)/'`installer/lib/nsutils.cpp
> 
> installer/lib/libdsinstall_la-uninstall.lo: installer/lib/uninstall.cpp
>-@am__fastdepCXX_TRUE@   if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsinstall_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT installer/lib/libdsinstall_la-uninstall.lo -MD -MP -MF "installer/lib/$(DEPDIR)/libdsinstall_la-uninstall.Tpo" -c -o installer/lib/libdsinstall_la-uninstall.lo `test -f 'installer/lib/uninstall.cpp' || echo '$(srcdir)/'`installer/lib/uninstall.cpp; \
>+@am__fastdepCXX_TRUE@   if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsinstall_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT installer/lib/libdsinstall_la-uninstall.lo -MD -MP -MF "installer/lib/$(DEPDIR)/libdsinstall_la-uninstall.Tpo" -c -o installer/lib/libdsinstall_la-uninstall.lo `test -f 'installer/lib/uninstall.cpp' || echo '$(srcdir)/'`installer/lib/uninstall.cpp; \
> @am__fastdepCXX_TRUE@   then mv -f "installer/lib/$(DEPDIR)/libdsinstall_la-uninstall.Tpo" "installer/lib/$(DEPDIR)/libdsinstall_la-uninstall.Plo"; else rm -f "installer/lib/$(DEPDIR)/libdsinstall_la-uninstall.Tpo"; exit 1; fi
> @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='installer/lib/uninstall.cpp' object='installer/lib/libdsinstall_la-uninstall.lo' libtool=yes @AMDEPBACKSLASH@
> @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
>-@am__fastdepCXX_FALSE@  $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsinstall_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o installer/lib/libdsinstall_la-uninstall.lo `test -f 'installer/lib/uninstall.cpp' || echo '$(srcdir)/'`installer/lib/uninstall.cpp
>+@am__fastdepCXX_FALSE@  $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsinstall_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o installer/lib/libdsinstall_la-uninstall.lo `test -f 'installer/lib/uninstall.cpp' || echo '$(srcdir)/'`installer/lib/uninstall.cpp
> 
> installer/lib/libdsinstall_la-prodinfo.lo: installer/lib/prodinfo.cpp
>-@am__fastdepCXX_TRUE@   if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsinstall_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT installer/lib/libdsinstall_la-prodinfo.lo -MD -MP -MF "installer/lib/$(DEPDIR)/libdsinstall_la-prodinfo.Tpo" -c -o installer/lib/libdsinstall_la-prodinfo.lo `test -f 'installer/lib/prodinfo.cpp' || echo '$(srcdir)/'`installer/lib/prodinfo.cpp; \
>+@am__fastdepCXX_TRUE@   if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsinstall_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT installer/lib/libdsinstall_la-prodinfo.lo -MD -MP -MF "installer/lib/$(DEPDIR)/libdsinstall_la-prodinfo.Tpo" -c -o installer/lib/libdsinstall_la-prodinfo.lo `test -f 'installer/lib/prodinfo.cpp' || echo '$(srcdir)/'`installer/lib/prodinfo.cpp; \
> @am__fastdepCXX_TRUE@   then mv -f "installer/lib/$(DEPDIR)/libdsinstall_la-prodinfo.Tpo" "installer/lib/$(DEPDIR)/libdsinstall_la-prodinfo.Plo"; else rm -f "installer/lib/$(DEPDIR)/libdsinstall_la-prodinfo.Tpo"; exit 1; fi
> @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='installer/lib/prodinfo.cpp' object='installer/lib/libdsinstall_la-prodinfo.lo' libtool=yes @AMDEPBACKSLASH@
> @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
>-@am__fastdepCXX_FALSE@  $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsinstall_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o installer/lib/libdsinstall_la-prodinfo.lo `test -f 'installer/lib/prodinfo.cpp' || echo '$(srcdir)/'`installer/lib/prodinfo.cpp
>+@am__fastdepCXX_FALSE@  $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsinstall_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o installer/lib/libdsinstall_la-prodinfo.lo `test -f 'installer/lib/prodinfo.cpp' || echo '$(srcdir)/'`installer/lib/prodinfo.cpp
> 
> installer/lib/libdsinstall_la-utf8.lo: installer/lib/utf8.cpp
>-@am__fastdepCXX_TRUE@   if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsinstall_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT installer/lib/libdsinstall_la-utf8.lo -MD -MP -MF "installer/lib/$(DEPDIR)/libdsinstall_la-utf8.Tpo" -c -o installer/lib/libdsinstall_la-utf8.lo `test -f 'installer/lib/utf8.cpp' || echo '$(srcdir)/'`installer/lib/utf8.cpp; \
>+@am__fastdepCXX_TRUE@   if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsinstall_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT installer/lib/libdsinstall_la-utf8.lo -MD -MP -MF "installer/lib/$(DEPDIR)/libdsinstall_la-utf8.Tpo" -c -o installer/lib/libdsinstall_la-utf8.lo `test -f 'installer/lib/utf8.cpp' || echo '$(srcdir)/'`installer/lib/utf8.cpp; \
> @am__fastdepCXX_TRUE@   then mv -f "installer/lib/$(DEPDIR)/libdsinstall_la-utf8.Tpo" "installer/lib/$(DEPDIR)/libdsinstall_la-utf8.Plo"; else rm -f "installer/lib/$(DEPDIR)/libdsinstall_la-utf8.Tpo"; exit 1; fi
> @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='installer/lib/utf8.cpp' object='installer/lib/libdsinstall_la-utf8.lo' libtool=yes @AMDEPBACKSLASH@
> @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
>-@am__fastdepCXX_FALSE@  $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsinstall_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o installer/lib/libdsinstall_la-utf8.lo `test -f 'installer/lib/utf8.cpp' || echo '$(srcdir)/'`installer/lib/utf8.cpp
>+@am__fastdepCXX_FALSE@  $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsinstall_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o installer/lib/libdsinstall_la-utf8.lo `test -f 'installer/lib/utf8.cpp' || echo '$(srcdir)/'`installer/lib/utf8.cpp
> 
> installer/unix/lib/libdsinstall_la-ux-util.lo: installer/unix/lib/ux-util.cc
>-@am__fastdepCXX_TRUE@   if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsinstall_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT installer/unix/lib/libdsinstall_la-ux-util.lo -MD -MP -MF "installer/unix/lib/$(DEPDIR)/libdsinstall_la-ux-util.Tpo" -c -o installer/unix/lib/libdsinstall_la-ux-util.lo `test -f 'installer/unix/lib/ux-util.cc' || echo '$(srcdir)/'`installer/unix/lib/ux-util.cc; \
>+@am__fastdepCXX_TRUE@   if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsinstall_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT installer/unix/lib/libdsinstall_la-ux-util.lo -MD -MP -MF "installer/unix/lib/$(DEPDIR)/libdsinstall_la-ux-util.Tpo" -c -o installer/unix/lib/libdsinstall_la-ux-util.lo `test -f 'installer/unix/lib/ux-util.cc' || echo '$(srcdir)/'`installer/unix/lib/ux-util.cc; \
> @am__fastdepCXX_TRUE@   then mv -f "installer/unix/lib/$(DEPDIR)/libdsinstall_la-ux-util.Tpo" "installer/unix/lib/$(DEPDIR)/libdsinstall_la-ux-util.Plo"; else rm -f "installer/unix/lib/$(DEPDIR)/libdsinstall_la-ux-util.Tpo"; exit 1; fi
> @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='installer/unix/lib/ux-util.cc' object='installer/unix/lib/libdsinstall_la-ux-util.lo' libtool=yes @AMDEPBACKSLASH@
> @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
>-@am__fastdepCXX_FALSE@  $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsinstall_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o installer/unix/lib/libdsinstall_la-ux-util.lo `test -f 'installer/unix/lib/ux-util.cc' || echo '$(srcdir)/'`installer/unix/lib/ux-util.cc
>+@am__fastdepCXX_FALSE@  $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsinstall_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o installer/unix/lib/libdsinstall_la-ux-util.lo `test -f 'installer/unix/lib/ux-util.cc' || echo '$(srcdir)/'`installer/unix/lib/ux-util.cc
> 
> installer/unix/lib/libdsinstall_la-dialog.lo: installer/unix/lib/dialog.cc
>-@am__fastdepCXX_TRUE@   if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsinstall_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT installer/unix/lib/libdsinstall_la-dialog.lo -MD -MP -MF "installer/unix/lib/$(DEPDIR)/libdsinstall_la-dialog.Tpo" -c -o installer/unix/lib/libdsinstall_la-dialog.lo `test -f 'installer/unix/lib/dialog.cc' || echo '$(srcdir)/'`installer/unix/lib/dialog.cc; \
>+@am__fastdepCXX_TRUE@   if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsinstall_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT installer/unix/lib/libdsinstall_la-dialog.lo -MD -MP -MF "installer/unix/lib/$(DEPDIR)/libdsinstall_la-dialog.Tpo" -c -o installer/unix/lib/libdsinstall_la-dialog.lo `test -f 'installer/unix/lib/dialog.cc' || echo '$(srcdir)/'`installer/unix/lib/dialog.cc; \
> @am__fastdepCXX_TRUE@   then mv -f "installer/unix/lib/$(DEPDIR)/libdsinstall_la-dialog.Tpo" "installer/unix/lib/$(DEPDIR)/libdsinstall_la-dialog.Plo"; else rm -f "installer/unix/lib/$(DEPDIR)/libdsinstall_la-dialog.Tpo"; exit 1; fi
> @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='installer/unix/lib/dialog.cc' object='installer/unix/lib/libdsinstall_la-dialog.lo' libtool=yes @AMDEPBACKSLASH@
> @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
>-@am__fastdepCXX_FALSE@  $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsinstall_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o installer/unix/lib/libdsinstall_la-dialog.lo `test -f 'installer/unix/lib/dialog.cc' || echo '$(srcdir)/'`installer/unix/lib/dialog.cc
>+@am__fastdepCXX_FALSE@  $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsinstall_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o installer/unix/lib/libdsinstall_la-dialog.lo `test -f 'installer/unix/lib/dialog.cc' || echo '$(srcdir)/'`installer/unix/lib/dialog.cc
> 
> installer/unix/lib/libdsinstall_la-ux-wrapper.lo: installer/unix/lib/ux-wrapper.cc
>-@am__fastdepCXX_TRUE@   if $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsinstall_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT installer/unix/lib/libdsinstall_la-ux-wrapper.lo -MD -MP -MF "installer/unix/lib/$(DEPDIR)/libdsinstall_la-ux-wrapper.Tpo" -c -o installer/unix/lib/libdsinstall_la-ux-wrapper.lo `test -f 'installer/unix/lib/ux-wrapper.cc' || echo '$(srcdir)/'`installer/unix/lib/ux-wrapper.cc; \
>+@am__fastdepCXX_TRUE@   if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsinstall_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT installer/unix/lib/libdsinstall_la-ux-wrapper.lo -MD -MP -MF "installer/unix/lib/$(DEPDIR)/libdsinstall_la-ux-wrapper.Tpo" -c -o installer/unix/lib/libdsinstall_la-ux-wrapper.lo `test -f 'installer/unix/lib/ux-wrapper.cc' || echo '$(srcdir)/'`installer/unix/lib/ux-wrapper.cc; \
> @am__fastdepCXX_TRUE@   then mv -f "installer/unix/lib/$(DEPDIR)/libdsinstall_la-ux-wrapper.Tpo" "installer/unix/lib/$(DEPDIR)/libdsinstall_la-ux-wrapper.Plo"; else rm -f "installer/unix/lib/$(DEPDIR)/libdsinstall_la-ux-wrapper.Tpo"; exit 1; fi
> @AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='installer/unix/lib/ux-wrapper.cc' object='installer/unix/lib/libdsinstall_la-ux-wrapper.lo' libtool=yes @AMDEPBACKSLASH@
> @AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
>-@am__fastdepCXX_FALSE@  $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsinstall_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o installer/unix/lib/libdsinstall_la-ux-wrapper.lo `test -f 'installer/unix/lib/ux-wrapper.cc' || echo '$(srcdir)/'`installer/unix/lib/ux-wrapper.cc
>+@am__fastdepCXX_FALSE@  $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libdsinstall_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o installer/unix/lib/libdsinstall_la-ux-wrapper.lo `test -f 'installer/unix/lib/ux-wrapper.cc' || echo '$(srcdir)/'`installer/unix/lib/ux-wrapper.cc
> 
> installer/unix/dssetup_bin-setup.o: installer/unix/setup.cc
> @am__fastdepCXX_TRUE@   if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(dssetup_bin_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT installer/unix/dssetup_bin-setup.o -MD -MP -MF "installer/unix/$(DEPDIR)/dssetup_bin-setup.Tpo" -c -o installer/unix/dssetup_bin-setup.o `test -f 'installer/unix/setup.cc' || echo '$(srcdir)/'`installer/unix/setup.cc; \
> @am__fastdepCXX_TRUE@   then mv -f "installer/unix/$(DEPDIR)/dssetup_bin-setup.Tpo" "installer/unix/$(DEPDIR)/dssetup_bin-setup.Po"; else rm -f "installer/unix/$(DEPDIR)/dssetup_bin-setup.Tpo"; exit 1; fi
>Index: aclocal.m4
>===================================================================
>RCS file: /cvs/dirsec/setuputil/aclocal.m4,v
>retrieving revision 1.1
>diff -t -w -U4 -r1.1 aclocal.m4
>--- aclocal.m4	5 Apr 2007 01:53:36 -0000	1.1
>+++ aclocal.m4	13 Apr 2007 20:24:17 -0000
>@@ -1,8 +1,8 @@
>-# generated automatically by aclocal 1.9.2 -*- Autoconf -*-
>+# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
> 
>-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
>-# Free Software Foundation, Inc.
>+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
>+# 2005  Free Software Foundation, Inc.
> # This file is free software; the Free Software Foundation
> # gives unlimited permission to copy and/or distribute it,
> # with or without modifications, as long as this notice is preserved.
> 
>@@ -12,9 +12,9 @@
> # PARTICULAR PURPOSE.
> 
> # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
> 
>-# serial 47 AC_PROG_LIBTOOL
>+# serial 48 AC_PROG_LIBTOOL
> 
> 
> # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
> # -----------------------------------------------------------
>@@ -122,9 +122,9 @@
> esac
> 
> # Sed substitution that helps us do robust quoting.  It backslashifies
> # metacharacters that are still active within double-quoted strings.
>-Xsed='sed -e s/^X//'
>+Xsed='sed -e 1s/^X//'
> [sed_quote_subst='s/$[\\"\\`$\\\\]$/\\\1/g']
> 
> # Same as above, but do not quote variable references.
> [double_quote_subst='s/$[\\"\\`\\\\]$/\\\1/g']
>@@ -142,9 +142,9 @@
> # Global variables:
> default_ofile=libtool
> can_build_shared=yes
> 
>-# All known linkers require a `.a' archive for static linking (except M$VC,
>+# All known linkers require a `.a' archive for static linking (except MSVC,
> # which needs '.lib').
> libext=a
> ltmain="$ac_aux_dir/ltmain.sh"
> ofile="$default_ofile"
>@@ -162,8 +162,9 @@
> test -z "$AR_FLAGS" && AR_FLAGS=cru
> test -z "$AS" && AS=as
> test -z "$CC" && CC=cc
> test -z "$LTCC" && LTCC=$CC
>+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
> test -z "$DLLTOOL" && DLLTOOL=dlltool
> test -z "$LD" && LD=ld
> test -z "$LN_S" && LN_S="ln -s"
> test -z "$MAGIC_CMD" && MAGIC_CMD=file
>@@ -181,17 +182,19 @@
> 
> if test -n "$RANLIB"; then
>   case $host_os in
>   openbsd*)
>-    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
>+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
>     ;;
>   *)
>-    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
>+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
>     ;;
>   esac
>   old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
> fi
> 
>+_LT_CC_BASENAME([$compiler])
>+
> # Only perform the check for file, if the check method requires it
> case $deplibs_check_method in
> file_magic*)
>   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
>@@ -230,13 +233,58 @@
> 
> # If no C compiler was specified, use CC.
> LTCC=${LTCC-"$CC"}
> 
>+# If no C compiler flags were specified, use CFLAGS.
>+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
>+
> # Allow CC to be a program name with arguments.
> compiler=$CC
> ])# _LT_AC_SYS_COMPILER
> 
> 
>+# _LT_CC_BASENAME(CC)
>+# -------------------
>+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
>+AC_DEFUN([_LT_CC_BASENAME],
>+[for cc_temp in $1""; do
>+  case $cc_temp in
>+    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
>+    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
>+    \-*) ;;
>+    *) break;;
>+  esac
>+done
>+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
>+])
>+
>+
>+# _LT_COMPILER_BOILERPLATE
>+# ------------------------
>+# Check for compiler boilerplate output or warnings with
>+# the simple compiler test code.
>+AC_DEFUN([_LT_COMPILER_BOILERPLATE],
>+[ac_outfile=conftest.$ac_objext
>+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
>+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
>+_lt_compiler_boilerplate=`cat conftest.err`
>+$rm conftest*
>+])# _LT_COMPILER_BOILERPLATE
>+
>+
>+# _LT_LINKER_BOILERPLATE
>+# ----------------------
>+# Check for linker boilerplate output or warnings with
>+# the simple link test code.
>+AC_DEFUN([_LT_LINKER_BOILERPLATE],
>+[ac_outfile=conftest.$ac_objext
>+printf "$lt_simple_link_test_code" >conftest.$ac_ext
>+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
>+_lt_linker_boilerplate=`cat conftest.err`
>+$rm conftest*
>+])# _LT_LINKER_BOILERPLATE
>+
>+
> # _LT_AC_SYS_LIBPATH_AIX
> # ----------------------
> # Links a minimal program and checks the executable
> # for the system default hardcoded library path. In most cases,
>@@ -307,17 +355,17 @@
> fi
> 
> # The HP-UX ksh and POSIX shell print the target directory to stdout
> # if CDPATH is set.
>-if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
>+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
> 
> if test -z "$ECHO"; then
> if test "X${echo_test_string+set}" != Xset; then
> # find a string as large as possible, as long as the shell can cope with it
>   for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
>     # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
>-    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
>-       echo_test_string="`eval $cmd`" &&
>+    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
>+       echo_test_string=`eval $cmd` &&
>        (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
>     then
>       break
>     fi
>@@ -484,9 +532,9 @@
> 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
>+    case `/usr/bin/file conftest.o` in
>     *32-bit*)
>       case $host in
>         x86_64-*linux*)
>           LD="${LD-ld} -m elf_i386"
>@@ -535,8 +583,24 @@
>     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
>     CFLAGS="$SAVE_CFLAGS"
>   fi
>   ;;
>+sparc*-*solaris*)
>+  # Find out which ABI we are using.
>+  echo 'int i;' > conftest.$ac_ext
>+  if AC_TRY_EVAL(ac_compile); then
>+    case `/usr/bin/file conftest.o` in
>+    *64-bit*)
>+      case $lt_cv_prog_gnu_ld in
>+      yes*) LD="${LD-ld} -m elf64_sparc" ;;
>+      *)    LD="${LD-ld} -64" ;;
>+      esac
>+      ;;
>+    esac
>+  fi
>+  rm -rf conftest*
>+  ;;
>+
> AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
> [*-*-cygwin* | *-*-mingw* | *-*-pw32*)
>   AC_CHECK_TOOL(DLLTOOL, dlltool, false)
>   AC_CHECK_TOOL(AS, as, false)
>@@ -566,9 +630,9 @@
>    # Note that $ac_compile itself does not contain backslashes and begins
>    # with a dollar sign (not a hyphen), so the echo should work correctly.
>    # The option is referenced via a variable to avoid confusing sed.
>    lt_compile=`echo "$ac_compile" | $SED \
>-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
>+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
>    -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
>    -e 's:$: $lt_compiler_flag:'`
>    (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
>    (eval "$lt_compile" 2>conftest.err)
>@@ -576,10 +640,12 @@
>    cat conftest.err >&AS_MESSAGE_LOG_FD
>    echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
>    if (exit $ac_status) && test -s "$ac_outfile"; then
>      # The compiler can only warn and ignore the option if not recognized
>-     # So say no if there are warnings
>-     if test ! -s conftest.err; then
>+     # So say no if there are warnings other than the usual output.
>+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
>+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
>+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
>        $2=yes
>      fi
>    fi
>    $rm conftest*
>@@ -603,13 +669,18 @@
>    save_LDFLAGS="$LDFLAGS"
>    LDFLAGS="$LDFLAGS $3"
>    printf "$lt_simple_link_test_code" > conftest.$ac_ext
>    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
>-     # The compiler can only warn and ignore the option if not recognized
>+     # The linker can only warn and ignore the option if not recognized
>      # So say no if there are warnings
>      if test -s conftest.err; then
>        # Append any errors to the config.log.
>        cat conftest.err 1>&AS_MESSAGE_LOG_FD
>+       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
>+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
>+       if diff conftest.exp conftest.er2 >/dev/null; then
>+         $2=yes
>+       fi
>      else
>        $2=yes
>      fi
>    fi
>@@ -666,13 +737,57 @@
>     # So we just punt and use a minimum line length of 8192.
>     lt_cv_sys_max_cmd_len=8192;
>     ;;
> 
>+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
>+    # This has been around since 386BSD, at least.  Likely further.
>+    if test -x /sbin/sysctl; then
>+      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
>+    elif test -x /usr/sbin/sysctl; then
>+      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
>+    else
>+      lt_cv_sys_max_cmd_len=65536       # usable default for all BSDs
>+    fi
>+    # And add a safety zone
>+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
>+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
>+    ;;
>+
>+  interix*)
>+    # We know the value 262144 and hardcode it with a safety zone (like BSD)
>+    lt_cv_sys_max_cmd_len=196608
>+    ;;
>+
>+  osf*)
>+    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
>+    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
>+    # nice to cause kernel panics so lets avoid the loop below.
>+    # First set a reasonable default.
>+    lt_cv_sys_max_cmd_len=16384
>+    #
>+    if test -x /sbin/sysconfig; then
>+      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
>+        *1*) lt_cv_sys_max_cmd_len=-1 ;;
>+      esac
>+    fi
>+    ;;
>+  sco3.2v5*)
>+    lt_cv_sys_max_cmd_len=102400
>+    ;;
>+  sysv5* | sco5v6* | sysv4.2uw2*)
>+    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
>+    if test -n "$kargmax"; then
>+      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[        ]]//'`
>+    else
>+      lt_cv_sys_max_cmd_len=32768
>+    fi
>+    ;;
>  *)
>     # If test is not a shell built-in, we'll probably end up computing a
>     # maximum length that is only half of the actual maximum length, but
>     # we can't tell.
>-    while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
>+    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
>+    while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
>                = "XX$teststring") >/dev/null 2>&1 &&
>             new_result=`expr "X$teststring" : ".*" 2>&1` &&
>             lt_cv_sys_max_cmd_len=$new_result &&
>             test $i != 17 # 1/2 MB should be enough
>@@ -696,17 +811,17 @@
> ])# AC_LIBTOOL_SYS_MAX_CMD_LEN
> 
> 
> # _LT_AC_CHECK_DLFCN
>-# --------------------
>+# ------------------
> AC_DEFUN([_LT_AC_CHECK_DLFCN],
> [AC_CHECK_HEADERS(dlfcn.h)dnl
> ])# _LT_AC_CHECK_DLFCN
> 
> 
> # _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
> #                           ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
>-# ------------------------------------------------------------------
>+# ---------------------------------------------------------------------
> AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
> [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
> if test "$cross_compiling" = yes; then :
>   [$4]
>@@ -770,19 +885,21 @@
>       if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
>       else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
>       /* dlclose (self); */
>     }
>+  else
>+    puts (dlerror ());
> 
>     exit (status);
> }]
> EOF
>   if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
>-    (./conftest; exit; ) 2>/dev/null
>+    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
>     lt_status=$?
>     case x$lt_status in
>       x$lt_dlno_uscore) $1 ;;
>       x$lt_dlneed_uscore) $2 ;;
>-      x$lt_unknown|x*) $3 ;;
>+      x$lt_dlunknown|x*) $3 ;;
>     esac
>   else :
>     # compilation failed
>     $3
>@@ -792,9 +909,9 @@
> ])# _LT_AC_TRY_DLOPEN_SELF
> 
> 
> # AC_LIBTOOL_DLOPEN_SELF
>-# -------------------
>+# ----------------------
> AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
> [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
> if test "x$enable_dlopen" != xyes; then
>   enable_dlopen=unknown
>@@ -863,9 +980,9 @@
>     save_CPPFLAGS="$CPPFLAGS"
>     test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
> 
>     save_LDFLAGS="$LDFLAGS"
>-    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
>+    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
> 
>     save_LIBS="$LIBS"
>     LIBS="$lt_cv_dlopen_libs $LIBS"
> 
>@@ -876,9 +993,9 @@
>             lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
>     ])
> 
>     if test "x$lt_cv_dlopen_self" = xyes; then
>-      LDFLAGS="$LDFLAGS $link_static_flag"
>+      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,
>@@ -924,9 +1041,9 @@
>    # (2) before a word containing "conftest.", or (3) at the end.
>    # Note that $ac_compile itself does not contain backslashes and begins
>    # with a dollar sign (not a hyphen), so the echo should work correctly.
>    lt_compile=`echo "$ac_compile" | $SED \
>-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
>+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
>    -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
>    -e 's:$: $lt_compiler_flag:'`
>    (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
>    (eval "$lt_compile" 2>out/conftest.err)
>@@ -936,13 +1053,15 @@
>    if (exit $ac_status) && test -s out/conftest2.$ac_objext
>    then
>      # The compiler can only warn and ignore the option if not recognized
>      # So say no if there are warnings
>-     if test ! -s out/conftest.err; then
>+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
>+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
>+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
>        _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
>      fi
>    fi
>-   chmod u+w .
>+   chmod u+w . 2>&AS_MESSAGE_LOG_FD
>    $rm conftest*
>    # SGI C++ compiler will create directory out/ii_files/ for
>    # template instantiation
>    test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
>@@ -1004,9 +1123,9 @@
> AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH],
> [AC_MSG_CHECKING([how to hardcode library paths into programs])
> _LT_AC_TAGVAR(hardcode_action, $1)=
> if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
>-   test -n "$_LT_AC_TAGVAR(runpath_var $1)" || \
>+   test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
>    test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)"="Xyes" ; then
> 
>   # We can hardcode non-existant directories.
>   if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
>@@ -1172,9 +1291,9 @@
>   dynamic_linker="$host_os ld.so"
>   shlibpath_var=LIBRARY_PATH
>   ;;
> 
>-bsdi4*)
>+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'
>@@ -1200,9 +1319,10 @@
>     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'
>+      $install_prog $dir/$dlname \$dldir/$dlname~
>+      chmod a+x \$dldir/$dlname'
>     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
>       dlpath=$dir/\$dldll~
>        $rm \$dlpath'
>     shlibpath_overrides_runpath=yes
>@@ -1230,9 +1350,9 @@
>       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}'
>+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
>       ;;
>     esac
>     ;;
> 
>@@ -1253,9 +1373,9 @@
>   library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
>   soname_spec='${libname}${release}${major}$shared_ext'
>   shlibpath_overrides_runpath=yes
>   shlibpath_var=DYLD_LIBRARY_PATH
>-  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
>+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
>   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
>   if test "$GCC" = yes; then
>     sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
>   else
>@@ -1288,10 +1408,19 @@
>   hardcode_into_libs=yes
>   dynamic_linker='GNU ld.so'
>   ;;
> 
>-freebsd*)
>-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
>+freebsd* | dragonfly*)
>+  # DragonFly does not have aout.  When/if they implement a new
>+  # versioning mechanism, adjust this.
>+  if test -x /usr/bin/objformat; then
>+    objformat=`/usr/bin/objformat`
>+  else
>+    case $host_os in
>+    freebsd[[123]]*) objformat=aout ;;
>+    *) objformat=elf ;;
>+    esac
>+  fi
>   version_type=freebsd-$objformat
>   case $version_type in
>     freebsd-elf*)
>       library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
>@@ -1307,16 +1436,21 @@
>   case $host_os in
>   freebsd2*)
>     shlibpath_overrides_runpath=yes
>     ;;
>-  freebsd3.[01]* | freebsdelf3.[01]*)
>+  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
>     shlibpath_overrides_runpath=yes
>     hardcode_into_libs=yes
>     ;;
>-  *) # from 3.2 on
>+  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
>+  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
>     shlibpath_overrides_runpath=no
>     hardcode_into_libs=yes
>     ;;
>+  freebsd*) # from 4.6 on
>+    shlibpath_overrides_runpath=yes
>+    hardcode_into_libs=yes
>+    ;;
>   esac
>   ;;
> 
> gnu*)
>@@ -1334,9 +1468,9 @@
>   # link against other versions.
>   version_type=sunos
>   need_lib_prefix=no
>   need_version=no
>-  case "$host_cpu" in
>+  case $host_cpu in
>   ia64*)
>     shrext_cmds='.so'
>     hardcode_into_libs=yes
>     dynamic_linker="$host_os dld.so"
>@@ -1374,8 +1508,20 @@
>   # HP-UX runs *really* slowly unless shared libraries are mode 555.
>   postinstall_cmds='chmod 555 $lib'
>   ;;
> 
>+interix3*)
>+  version_type=linux
>+  need_lib_prefix=no
>+  need_version=no
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  shlibpath_overrides_runpath=no
>+  hardcode_into_libs=yes
>+  ;;
>+
> irix5* | irix6* | nonstopux*)
>   case $host_os in
>     nonstopux*) version_type=nonstopux ;;
>     *)
>@@ -1431,29 +1577,12 @@
>   # Some rework will be needed to allow for fast_install
>   # before this can be enabled.
>   hardcode_into_libs=yes
> 
>-  # find out which ABI we are using
>-  libsuff=
>-  case "$host_cpu" in
>-  x86_64*|s390x*|powerpc64*)
>-    echo '[#]line __oline__ "configure"' > conftest.$ac_ext
>-    if AC_TRY_EVAL(ac_compile); then
>-      case `/usr/bin/file conftest.$ac_objext` in
>-      *64-bit*)
>-        libsuff=64
>-        sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
>-        ;;
>-      esac
>-    fi
>-    rm -rf conftest*
>-    ;;
>-  esac
>-
>   # Append ld.so.conf contents to the search path
>   if test -f /etc/ld.so.conf; then
>-    lt_ld_extra=`$SED -e 's/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g' /etc/ld.so.conf | tr '\n' ' '`
>-    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
>+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,    ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
>+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
>   fi
> 
>   # We used to test for /lib/ld.so.1 and disable shared libraries on
>   # powerpc, because MkLinux only supported shared libraries with the
>@@ -1512,10 +1641,15 @@
>   ;;
> 
> openbsd*)
>   version_type=sunos
>+  sys_lib_dlsearch_path_spec="/usr/lib"
>   need_lib_prefix=no
>-  need_version=yes
>+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
>+  case $host_os in
>+    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
>+    *)                         need_version=no  ;;
>+  esac
>   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
>   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
>   shlibpath_var=LD_LIBRARY_PATH
>   if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
>@@ -1551,15 +1685,8 @@
>   sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
>   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
>   ;;
> 
>-sco3.2v5*)
>-  version_type=osf
>-  soname_spec='${libname}${release}${shared_ext}$major'
>-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>-  shlibpath_var=LD_LIBRARY_PATH
>-  ;;
>-
> solaris*)
>   version_type=linux
>   need_lib_prefix=no
>   need_version=no
>@@ -1583,9 +1710,9 @@
>   fi
>   need_version=yes
>   ;;
> 
>-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
>+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
>@@ -1616,8 +1743,31 @@
>     shlibpath_var=LD_LIBRARY_PATH
>   fi
>   ;;
> 
>+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
>+  version_type=freebsd-elf
>+  need_lib_prefix=no
>+  need_version=no
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  hardcode_into_libs=yes
>+  if test "$with_gnu_ld" = yes; then
>+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
>+    shlibpath_overrides_runpath=no
>+  else
>+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
>+    shlibpath_overrides_runpath=yes
>+    case $host_os in
>+      sco3.2v5*)
>+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
>+        ;;
>+    esac
>+  fi
>+  sys_lib_dlsearch_path_spec='/usr/lib'
>+  ;;
>+
> uts4*)
>   version_type=linux
>   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>   soname_spec='${libname}${release}${shared_ext}$major'
>@@ -1629,8 +1779,13 @@
>   ;;
> esac
> AC_MSG_RESULT([$dynamic_linker])
> test "$dynamic_linker" = no && can_build_shared=no
>+
>+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
>+if test "$GCC" = yes; then
>+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
>+fi
> ])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
> 
> 
> # _LT_AC_TAGCONFIG
>@@ -1653,8 +1808,11 @@
>     else
>       AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
>     fi
>   fi
>+  if test -z "$LTCFLAGS"; then
>+    eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
>+  fi
> 
>   # Extract list of available tagged configurations in $ofile.
>   # Note that this assumes the entire list is on one line.
>   available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=$.*$$/\1/' -e 's/\"//g'`
>@@ -1679,9 +1837,11 @@
>       echo appending configuration tag \"$tagname\" to $ofile
> 
>       case $tagname in
>       CXX)
>-        if test -n "$CXX" && test "X$CXX" != "Xno"; then
>+        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
>@@ -1741,9 +1901,9 @@
> 
> 
> # AC_LIBTOOL_WIN32_DLL
> # --------------------
>-# declare package support for building win32 dll's
>+# declare package support for building win32 DLLs
> AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
> [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
> ])# AC_LIBTOOL_WIN32_DLL
> 
>@@ -1779,9 +1939,9 @@
> 
> 
> # AC_DISABLE_SHARED
> # -----------------
>-#- set the default shared flag to --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
>@@ -1915,9 +2075,9 @@
>       lt_cv_path_MAGIC_CMD="$ac_dir/$1"
>       if test -n "$file_magic_test_file"; then
>         case $deplibs_check_method in
>         "file_magic "*)
>-          file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic $.*$\"`"
>+          file_magic_regex=`expr "$deplibs_check_method" : "file_magic $.*$"`
>           MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
>           if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
>             $EGREP "$file_magic_regex" > /dev/null; then
>             :
>@@ -2025,9 +2185,9 @@
>     test -z "$ac_dir" && ac_dir=.
>     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
>       lt_cv_path_LD="$ac_dir/$ac_prog"
>       # Check to see if the program is GNU ld.  I'd rather use --version,
>-      # but apparently some GNU ld's only accept -v.
>+      # but apparently some variants of GNU ld only accept -v.
>       # Break only if it was the GNU/non-GNU ld that we prefer.
>       case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
>       *GNU* | *'with BFD'*)
>         test "$with_gnu_ld" != no && break
>@@ -2057,9 +2217,9 @@
> # --------------
> AC_DEFUN([AC_PROG_LD_GNU],
> [AC_REQUIRE([AC_PROG_EGREP])dnl
> AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
>-[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
>+[# I'd rather use --version here, but apparently some GNU lds only accept -v.
> case `$LD -v 2>&1 </dev/null` in
> *GNU* | *'with BFD'*)
>   lt_cv_prog_gnu_ld=yes
>   ;;
>@@ -2084,8 +2244,17 @@
> "" | " "*) ;;
> *) reload_flag=" $reload_flag" ;;
> esac
> reload_cmds='$LD$reload_flag -o $output$reload_objs'
>+case $host_os in
>+  darwin*)
>+    if test "$GCC" = yes; then
>+      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
>+    else
>+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
>+    fi
>+    ;;
>+esac
> ])# AC_PROG_LD_RELOAD_FLAG
> 
> 
> # AC_DEPLIBS_CHECK_METHOD
>@@ -2117,9 +2286,9 @@
> beos*)
>   lt_cv_deplibs_check_method=pass_all
>   ;;
> 
>-bsdi4*)
>+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
>   ;;
>@@ -2140,15 +2309,15 @@
> darwin* | rhapsody*)
>   lt_cv_deplibs_check_method=pass_all
>   ;;
> 
>-freebsd* | kfreebsd*-gnu)
>+freebsd* | kfreebsd*-gnu | dragonfly*)
>   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
>     case $host_cpu in
>     i*86 )
>       # Not sure whether the presence of OpenBSD here was a mistake.
>       # Let's accept both of them until this is cleared up.
>-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library'
>+      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
>@@ -2162,9 +2331,9 @@
>   ;;
> 
> hpux10.20* | hpux11*)
>   lt_cv_file_magic_cmd=/usr/bin/file
>-  case "$host_cpu" in
>+  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
>     ;;
>@@ -2178,8 +2347,13 @@
>     ;;
>   esac
>   ;;
> 
>+interix3*)
>+  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
>+  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
>+  ;;
>+
> irix5* | irix6* | nonstopux*)
>   case $LD in
>   *-32|*"-32 ") libmagic=32-bit;;
>   *-n32|*"-n32 ") libmagic=N32;;
>@@ -2190,17 +2364,8 @@
>   ;;
> 
> # This must be Linux ELF.
> linux*)
>-  case $host_cpu in
>-  alpha*|hppa*|i*86|ia64*|m68*|mips*|powerpc*|sparc*|s390*|sh*|x86_64*)
>-    lt_cv_deplibs_check_method=pass_all ;;
>-  *)
>-    # glibc up to 2.1.1 does not perform some relocations on ARM
>-    # this will be overridden with pass_all, but let us keep it just in case
>-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;;
>-  esac
>-  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
>   lt_cv_deplibs_check_method=pass_all
>   ;;
> 
> netbsd*)
>@@ -2221,30 +2386,24 @@
>   lt_cv_deplibs_check_method=unknown
>   ;;
> 
> openbsd*)
>-  lt_cv_file_magic_cmd=/usr/bin/file
>-  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
>   if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
>-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object'
>+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
>   else
>-    lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
>+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
>   fi
>   ;;
> 
> osf3* | osf4* | osf5*)
>   lt_cv_deplibs_check_method=pass_all
>   ;;
> 
>-sco3.2v5*)
>-  lt_cv_deplibs_check_method=pass_all
>-  ;;
>-
> solaris*)
>   lt_cv_deplibs_check_method=pass_all
>   ;;
> 
>-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
>+sysv4 | sysv4.3*)
>   case $host_vendor in
>   motorola)
>     lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
>     lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
>@@ -2263,12 +2422,15 @@
>     ;;
>   siemens)
>     lt_cv_deplibs_check_method=pass_all
>     ;;
>+  pc)
>+    lt_cv_deplibs_check_method=pass_all
>+    ;;
>   esac
>   ;;
> 
>-sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7* | sysv4*uw2*)
>+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
>   lt_cv_deplibs_check_method=pass_all
>   ;;
> esac
> ])
>@@ -2286,13 +2448,18 @@
> [if test -n "$NM"; then
>   # Let the user override the test.
>   lt_cv_path_NM="$NM"
> else
>+  lt_nm_to_check="${ac_tool_prefix}nm"
>+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then 
>+    lt_nm_to_check="$lt_nm_to_check nm"
>+  fi
>+  for lt_tmp_nm in $lt_nm_to_check; do
>   lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
>-  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
>+    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
>     IFS="$lt_save_ifs"
>     test -z "$ac_dir" && ac_dir=.
>-    tmp_nm="$ac_dir/${ac_tool_prefix}nm"
>+      tmp_nm="$ac_dir/$lt_tmp_nm"
>     if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
>       # Check to see if the nm accepts a BSD-compat flag.
>       # Adding the `sed 1q' prevents false positives on HP-UX, which says:
>       #   nm: unknown option "B" ignored
>@@ -2312,12 +2479,14 @@
>           lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
>           continue # so that we can try to find one that supports BSD flags
>           ;;
>         esac
>+          ;;
>       esac
>     fi
>   done
>   IFS="$lt_save_ifs"
>+  done
>   test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
> fi])
> NM="$lt_cv_path_NM"
> ])# AC_PROG_NM
>@@ -2347,15 +2516,15 @@
> # AC_LIBLTDL_CONVENIENCE([DIRECTORY])
> # -----------------------------------
> # sets LIBLTDL to the link flags for the libltdl convenience library and
> # LTDLINCL to the include flags for the libltdl header and adds
>-# --enable-ltdl-convenience to the configure arguments.  Note that LIBLTDL
>-# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If
>-# DIRECTORY is not provided, it is assumed to be `libltdl'.  LIBLTDL will
>-# be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed with
>-# '${top_srcdir}/' (note the single quotes!).  If your package is not
>-# flat and you're not using automake, define top_builddir and
>-# top_srcdir appropriately in the Makefiles.
>+# --enable-ltdl-convenience to the configure arguments.  Note that
>+# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
>+# it is assumed to be `libltdl'.  LIBLTDL will be prefixed with
>+# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/'
>+# (note the single quotes!).  If your package is not flat and you're not
>+# using automake, define top_builddir and top_srcdir appropriately in
>+# the Makefiles.
> AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
> [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
>   case $enable_ltdl_convenience in
>   no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
>@@ -2372,15 +2541,15 @@
> # AC_LIBLTDL_INSTALLABLE([DIRECTORY])
> # -----------------------------------
> # sets LIBLTDL to the link flags for the libltdl installable library and
> # LTDLINCL to the include flags for the libltdl header and adds
>-# --enable-ltdl-install to the configure arguments.  Note that LIBLTDL
>-# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If
>-# DIRECTORY is not provided and an installed libltdl is not found, it is
>-# assumed to be `libltdl'.  LIBLTDL will be prefixed with '${top_builddir}/'
>-# and LTDLINCL will be prefixed with '${top_srcdir}/' (note the single
>-# quotes!).  If your package is not flat and you're not using automake,
>-# define top_builddir and top_srcdir appropriately in the Makefiles.
>+# --enable-ltdl-install to the configure arguments.  Note that
>+# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
>+# and an installed libltdl is not found, it is assumed to be `libltdl'.
>+# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with
>+# '${top_srcdir}/' (note the single quotes!).  If your package is not
>+# flat and you're not using automake, define top_builddir and top_srcdir
>+# appropriately in the Makefiles.
> # In the future, this macro may have to be called after AC_PROG_LIBTOOL.
> AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
> [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
>   AC_CHECK_LIB(ltdl, lt_dlinit,
>@@ -2416,12 +2585,23 @@
> # _LT_AC_LANG_CXX
> # ---------------
> AC_DEFUN([_LT_AC_LANG_CXX],
> [AC_REQUIRE([AC_PROG_CXX])
>-AC_REQUIRE([AC_PROG_CXXCPP])
>+AC_REQUIRE([_LT_AC_PROG_CXXCPP])
> _LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
> ])# _LT_AC_LANG_CXX
> 
>+# _LT_AC_PROG_CXXCPP
>+# ------------------
>+AC_DEFUN([_LT_AC_PROG_CXXCPP],
>+[
>+AC_REQUIRE([AC_PROG_CXX])
>+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
>+    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
>+    (test "X$CXX" != "Xg++"))) ; then
>+  AC_PROG_CXXCPP
>+fi
>+])# _LT_AC_PROG_CXXCPP
> 
> # AC_LIBTOOL_F77
> # --------------
> # enable support for Fortran 77 libraries
>@@ -2459,9 +2639,9 @@
> ])# _LT_AC_LANG_GCJ
> 
> 
> # AC_LIBTOOL_RC
>-# --------------
>+# -------------
> # enable support for Windows resource files
> AC_DEFUN([AC_LIBTOOL_RC],
> [AC_REQUIRE([LT_AC_PROG_RC])
> _LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC])
>@@ -2492,38 +2672,11 @@
> lt_simple_link_test_code='int main(){return(0);}\n'
> 
> _LT_AC_SYS_COMPILER
> 
>-#
>-# Check for any special shared library compilation flags.
>-#
>-_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)=
>-if test "$GCC" = no; then
>-  case $host_os in
>-  sco3.2v5*)
>-    _LT_AC_TAGVAR(lt_prog_cc_shlib, $1)='-belf'
>-    ;;
>-  esac
>-fi
>-if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then
>-  AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries])
>-  if echo "$old_CC $old_CFLAGS " | grep "[[     ]]$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[        ]]" >/dev/null; then :
>-  else
>-    AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure])
>-    _LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no
>-  fi
>-fi
>-
>-
>-#
>-# Check to make sure the static flag actually works.
>-#
>-AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $_LT_AC_TAGVAR(lt_prog_compiler_static, $1) works],
>-  _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
>-  $_LT_AC_TAGVAR(lt_prog_compiler_static, $1),
>-  [],
>-  [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
>-
>+# save warnings/boilerplate of simple test code
>+_LT_COMPILER_BOILERPLATE
>+_LT_LINKER_BOILERPLATE
> 
> AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
> AC_LIBTOOL_PROG_COMPILER_PIC($1)
> AC_LIBTOOL_PROG_CC_C_O($1)
>@@ -2531,20 +2684,20 @@
> AC_LIBTOOL_PROG_LD_SHLIBS($1)
> AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
> AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
> AC_LIBTOOL_SYS_LIB_STRIP
>-AC_LIBTOOL_DLOPEN_SELF($1)
>+AC_LIBTOOL_DLOPEN_SELF
> 
>-# Report which librarie types wil actually be built
>+# Report which library types will actually be built
> AC_MSG_CHECKING([if libtool supports shared libraries])
> AC_MSG_RESULT([$can_build_shared])
> 
> AC_MSG_CHECKING([whether to build shared libraries])
> test "$can_build_shared" = "no" && enable_shared=no
> 
> # On AIX, shared libraries and static libraries use the same namespace, and
> # are all built from PIC.
>-case "$host_os" in
>+case $host_os in
> aix3*)
>   test "$enable_shared" = yes && enable_static=no
>   if test -n "$RANLIB"; then
>     archive_cmds="$archive_cmds~\$RANLIB \$lib"
>@@ -2556,45 +2709,8 @@
>   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
>     test "$enable_shared" = yes && enable_static=no
>   fi
>   ;;
>-  darwin* | rhapsody*)
>-  if test "$GCC" = yes; then
>-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
>-    case "$host_os" in
>-    rhapsody* | darwin1.[[012]])
>-      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
>-      ;;
>-    *) # Darwin 1.3 on
>-      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
>-        _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
>-      else
>-        case ${MACOSX_DEPLOYMENT_TARGET} in
>-          10.[[012]])
>-            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
>-            ;;
>-          10.*)
>-            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
>-            ;;
>-        esac
>-      fi
>-      ;;
>-    esac
>-    output_verbose_link_cmd='echo'
>-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring'
>-    _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
>-    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
>-    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag  -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
>-    _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
>-    _LT_AC_TAGVAR(hardcode_direct, $1)=no
>-    _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
>-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
>-    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
>-    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
>-  else
>-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
>-  fi
>-    ;;
> esac
> AC_MSG_RESULT([$enable_shared])
> 
> AC_MSG_CHECKING([whether to build static libraries])
>@@ -2617,9 +2733,9 @@
> AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)])
> AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
> [AC_LANG_PUSH(C++)
> AC_REQUIRE([AC_PROG_CXX])
>-AC_REQUIRE([AC_PROG_CXXCPP])
>+AC_REQUIRE([_LT_AC_PROG_CXXCPP])
> 
> _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
> _LT_AC_TAGVAR(allow_undefined_flag, $1)=
> _LT_AC_TAGVAR(always_export_symbols, $1)=no
>@@ -2629,8 +2745,9 @@
> _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
> _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
> _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
> _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
>+_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
> _LT_AC_TAGVAR(hardcode_automatic, $1)=no
> _LT_AC_TAGVAR(module_cmds, $1)=
> _LT_AC_TAGVAR(module_expsym_cmds, $1)=
> _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
>@@ -2646,9 +2763,9 @@
> _LT_AC_TAGVAR(postdeps, $1)=
> _LT_AC_TAGVAR(compiler_lib_search_path, $1)=
> 
> # Source file extension for C++ test sources.
>-ac_ext=cc
>+ac_ext=cpp
> 
> # Object file extension for compiled C++ test sources.
> objext=o
> _LT_AC_TAGVAR(objext, $1)=$objext
>@@ -2656,13 +2773,17 @@
> # Code to be used in simple compile tests
> lt_simple_compile_test_code="int some_variable = 0;\n"
> 
> # Code to be used in simple link tests
>-lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n'
>+lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n'
> 
> # ltmain only uses $CC for tagged configurations so make sure $CC is set.
> _LT_AC_SYS_COMPILER
> 
>+# save warnings/boilerplate of simple test code
>+_LT_COMPILER_BOILERPLATE
>+_LT_LINKER_BOILERPLATE
>+
> # Allow CC to be a program name with arguments.
> lt_save_CC=$CC
> lt_save_LD=$LD
> lt_save_GCC=$GCC
>@@ -2671,20 +2792,20 @@
> 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
>-  unset lt_cv_prog_gnu_ld
>+  $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
>-  unset lt_cv_path_LD
>+  $as_unset lt_cv_path_LD
> fi
> test -z "${LDCXX+set}" || LD=$LDCXX
> CC=${CXX-"c++"}
> compiler=$CC
> _LT_AC_TAGVAR(compiler, $1)=$CC
>-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
>+_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
>@@ -2771,8 +2892,9 @@
>             break
>             ;;
>           esac
>         done
>+        ;;
>       esac
> 
>       exp_sym_flag='-bexport'
>       no_entry_flag='-bnoentry'
>@@ -2789,9 +2911,9 @@
>     _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
>     _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
> 
>     if test "$GXX" = yes; then
>-      case $host_os in aix4.[012]|aix4.[012].*)
>+      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" && \
>@@ -2808,10 +2930,14 @@
>           _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
>@@ -2836,32 +2962,42 @@
>       # Determine the default libpath from the value encoded in an empty executable.
>       _LT_AC_SYS_LIBPATH_AIX
>       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
> 
>-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
>+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
>      else
>       if test "$host_cpu" = ia64; then
>         _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
>         _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
>-        _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
>+        _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
>       else
>         # Determine the default libpath from the value encoded in an empty executable.
>         _LT_AC_SYS_LIBPATH_AIX
>         _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
>         # Warning - without using the other run time loading flags,
>         # -berok will link without error, but may produce a broken library.
>         _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
>         _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
>-        # -bexpall does not export symbols beginning with underscore (_)
>-        _LT_AC_TAGVAR(always_export_symbols, $1)=yes
>         # Exported symbols can be pulled into shared objects from archives
>-        _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
>+        _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
>         _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
>-        # This is similar to how AIX traditionally builds it's shared libraries.
>-        _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
>+        # This is similar to how AIX traditionally builds its shared libraries.
>+        _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
>+      fi
>       fi
>+    ;;
>+
>+  beos*)
>+    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
>+      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
>+      # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
>+      # support --undefined.  This deserves some investigation.  FIXME
>+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
>+    else
>+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
>     fi
>     ;;
>+
>   chorus*)
>     case $cc_basename in
>       *)
>         # FIXME: insert proper C++ library support
>@@ -2878,81 +3014,92 @@
>     _LT_AC_TAGVAR(always_export_symbols, $1)=no
>     _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
> 
>     if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
>-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
>+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
>       # If the export-symbols file already is a .def file (1st line
>       # is EXPORTS), use it as is; otherwise, prepend...
>       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
>         cp $export_symbols $output_objdir/$soname.def;
>       else
>         echo EXPORTS > $output_objdir/$soname.def;
>         cat $export_symbols >> $output_objdir/$soname.def;
>       fi~
>-      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
>+      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
>     else
>       _LT_AC_TAGVAR(ld_shlibs, $1)=no
>     fi
>   ;;
>-
>   darwin* | rhapsody*)
>-  if test "$GXX" = yes; then
>-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
>-    case "$host_os" in
>+        case $host_os in
>     rhapsody* | darwin1.[[012]])
>-      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
>+         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
>       ;;
>     *) # Darwin 1.3 on
>       if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
>-        _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
>+           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
>       else
>         case ${MACOSX_DEPLOYMENT_TARGET} in
>           10.[[012]])
>-            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
>+               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
>             ;;
>           10.*)
>-            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
>+               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
>             ;;
>         esac
>       fi
>       ;;
>     esac
>+      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
>+      _LT_AC_TAGVAR(hardcode_direct, $1)=no
>+      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
>+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
>+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
>+      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
>+
>+    if test "$GXX" = yes ; then
>     lt_int_apple_cc_single_mod=no
>     output_verbose_link_cmd='echo'
>-    if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
>+      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
>       lt_int_apple_cc_single_mod=yes
>     fi
>     if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
>       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
>     else
>-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
>+          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
>     fi
>-    _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
>-
>-    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
>+        _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
>+        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
>     if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
>       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
>     else
>-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
>+            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
>     fi
>     _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
>-    _LT_AC_TAGVAR(hardcode_direct, $1)=no
>-    _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
>-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
>-    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
>-    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
>   else
>+      case $cc_basename in
>+        xlc*)
>+         output_verbose_link_cmd='echo'
>+          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
>+          _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
>+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
>+          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
>+          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
>+          ;;
>+       *)
>     _LT_AC_TAGVAR(ld_shlibs, $1)=no
>+          ;;
>+      esac
>   fi
>     ;;
> 
>   dgux*)
>     case $cc_basename in
>-      ec++)
>+      ec++*)
>         # FIXME: insert proper C++ library support
>         _LT_AC_TAGVAR(ld_shlibs, $1)=no
>         ;;
>-      ghcx)
>+      ghcx*)
>         # Green Hills C++ Compiler
>         # FIXME: insert proper C++ library support
>         _LT_AC_TAGVAR(ld_shlibs, $1)=no
>         ;;
>@@ -2961,16 +3108,16 @@
>         _LT_AC_TAGVAR(ld_shlibs, $1)=no
>         ;;
>     esac
>     ;;
>-  freebsd[12]*)
>+  freebsd[[12]]*)
>     # C++ shared libraries reported to be fairly broken before switch to ELF
>     _LT_AC_TAGVAR(ld_shlibs, $1)=no
>     ;;
>   freebsd-elf*)
>     _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
>     ;;
>-  freebsd* | kfreebsd*-gnu)
>+  freebsd* | kfreebsd*-gnu | dragonfly*)
>     # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
>     # conventions
>     _LT_AC_TAGVAR(ld_shlibs, $1)=yes
>     ;;
>@@ -2985,13 +3132,13 @@
>                                 # but as the default
>                                 # location of the library.
> 
>     case $cc_basename in
>-    CC)
>+    CC*)
>       # FIXME: insert proper C++ library support
>       _LT_AC_TAGVAR(ld_shlibs, $1)=no
>       ;;
>-    aCC)
>+    aCC*)
>       _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
>       # Commands to make compiler produce verbose output that lists
>       # what "hidden" libraries, object files and flags are used when
>       # linking a shared library.
>@@ -2999,9 +3146,9 @@
>       # There doesn't appear to be a way to prevent this compiler from
>       # explicitly linking system object files so we need to strip them
>       # from the output so that they don't get included in the library
>       # dependencies.
>-      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
>+      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
>       ;;
>     *)
>       if test "$GXX" = yes; then
>         _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
>@@ -3013,35 +3160,24 @@
>     esac
>     ;;
>   hpux10*|hpux11*)
>     if test $with_gnu_ld = no; then
>-      case "$host_cpu" in
>-      hppa*64*)
>         _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
>-        _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
>         _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
>-        ;;
>-      ia64*)
>-        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
>+
>+      case $host_cpu in
>+      hppa*64*|ia64*)
>+        _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
>         ;;
>       *)
>-        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
>-        _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
>         _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
>         ;;
>       esac
>     fi
>-    case "$host_cpu" in
>-    hppa*64*)
>-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
>-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
>-      ;;
>-    ia64*)
>+    case $host_cpu in
>+    hppa*64*|ia64*)
>       _LT_AC_TAGVAR(hardcode_direct, $1)=no
>       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
>-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
>-                                              # but as the default
>-                                              # location of the library.
>       ;;
>     *)
>       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
>       _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
>@@ -3050,16 +3186,19 @@
>       ;;
>     esac
> 
>     case $cc_basename in
>-      CC)
>+      CC*)
>         # FIXME: insert proper C++ library support
>         _LT_AC_TAGVAR(ld_shlibs, $1)=no
>         ;;
>-      aCC)
>-        case "$host_cpu" in
>-        hppa*64*|ia64*)
>-          _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
>+      aCC*)
>+        case $host_cpu in
>+        hppa*64*)
>+          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
>+          ;;
>+        ia64*)
>+          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
>           ;;
>         *)
>           _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
>           ;;
>@@ -3076,11 +3215,14 @@
>         ;;
>       *)
>         if test "$GXX" = yes; then
>           if test $with_gnu_ld = no; then
>-            case "$host_cpu" in
>-            ia64*|hppa*64*)
>-              _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
>+            case $host_cpu in
>+            hppa*64*)
>+              _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
>+              ;;
>+            ia64*)
>+              _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
>               ;;
>             *)
>               _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
>               ;;
>@@ -3092,13 +3234,27 @@
>         fi
>         ;;
>     esac
>     ;;
>+  interix3*)
>+    _LT_AC_TAGVAR(hardcode_direct, $1)=no
>+    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
>+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
>+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
>+    # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
>+    # Instead, shared libraries are loaded at an image base (0x10000000 by
>+    # default) and relocated if they conflict, which is a slow very memory
>+    # consuming and fragmenting process.  To avoid this, we pick a random,
>+    # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
>+    # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
>+    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
>+    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
>+    ;;
>   irix5* | irix6*)
>     case $cc_basename in
>-      CC)
>+      CC*)
>         # SGI C++
>-        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
>+        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
> 
>         # Archives containing C++ object files must be created using
>         # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
>         # necessary to make sure instantiated templates are included
>@@ -3107,9 +3263,9 @@
>         ;;
>       *)
>         if test "$GXX" = yes; then
>           if test "$with_gnu_ld" = no; then
>-            _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
>+            _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
>           else
>             _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
>           fi
>         fi
>@@ -3120,9 +3276,9 @@
>     _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
>     ;;
>   linux*)
>     case $cc_basename in
>-      KCC)
>+      KCC*)
>         # Kuck and Associates, Inc. (KAI) C++ Compiler
> 
>         # KCC will only create a shared library if the output file
>         # ends with ".so" (or ".sl" for HP-UX), so rename the library
>@@ -3145,19 +3301,43 @@
>         # Archives containing C++ object files must be created using
>         # "CC -Bstatic", where "CC" is the KAI C++ compiler.
>         _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
>         ;;
>-      icpc)
>+      icpc*)
>         # Intel C++
>         with_gnu_ld=yes
>-        _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
>+        # version 8.0 and above of icpc choke on multiply defined symbols
>+        # if we add $predep_objects and $postdep_objects, however 7.1 and
>+        # earlier do not add the objects themselves.
>+        case `$CC -V 2>&1` in
>+        *"Version 7."*)
>         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
>         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
>+          ;;
>+        *)  # Version 8.0 or newer
>+          tmp_idyn=
>+          case $host_cpu in
>+            ia64*) tmp_idyn=' -i_dynamic';;
>+          esac
>+          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
>+          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
>+          ;;
>+        esac
>+        _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
>         _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
>         _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
>         _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
>         ;;
>-      cxx)
>+      pgCC*)
>+        # Portland Group C++ compiler
>+        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
>+        _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
>+
>+        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
>+        _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
>+        _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
>+        ;;
>+      cxx*)
>         # Compaq C++
>         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
>         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
> 
>@@ -3186,9 +3366,9 @@
>     _LT_AC_TAGVAR(ld_shlibs, $1)=no
>     ;;
>   mvs*)
>     case $cc_basename in
>-      cxx)
>+      cxx*)
>         # FIXME: insert proper C++ library support
>         _LT_AC_TAGVAR(ld_shlibs, $1)=no
>         ;;
>       *)
>@@ -3207,11 +3387,27 @@
>     fi
>     # Workaround some broken pre-1.5 toolchains
>     output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
>     ;;
>+  openbsd2*)
>+    # C++ shared libraries are fairly broken
>+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
>+    ;;
>+  openbsd*)
>+    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
>+    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
>+    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
>+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
>+    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
>+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
>+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
>+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
>+    fi
>+    output_verbose_link_cmd='echo'
>+    ;;
>   osf3*)
>     case $cc_basename in
>-      KCC)
>+      KCC*)
>         # Kuck and Associates, Inc. (KAI) C++ Compiler
> 
>         # KCC will only create a shared library if the output file
>         # ends with ".so" (or ".sl" for HP-UX), so rename the library
>@@ -3225,16 +3421,16 @@
>         # "CC -Bstatic", where "CC" is the KAI C++ compiler.
>         _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
> 
>         ;;
>-      RCC)
>+      RCC*)
>         # Rational C++ 2.4.1
>         # FIXME: insert proper C++ library support
>         _LT_AC_TAGVAR(ld_shlibs, $1)=no
>         ;;
>-      cxx)
>+      cxx*)
>         _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
>-        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
>+        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
> 
>         _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
>         _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
> 
>@@ -3250,9 +3446,9 @@
>         ;;
>       *)
>         if test "$GXX" = yes && test "$with_gnu_ld" = no; then
>           _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
>-          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
>+          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
> 
>           _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
>           _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
> 
>@@ -3269,9 +3465,9 @@
>     esac
>     ;;
>   osf4* | osf5*)
>     case $cc_basename in
>-      KCC)
>+      KCC*)
>         # Kuck and Associates, Inc. (KAI) C++ Compiler
> 
>         # KCC will only create a shared library if the output file
>         # ends with ".so" (or ".sl" for HP-UX), so rename the library
>@@ -3284,19 +3480,19 @@
>         # Archives containing C++ object files must be created using
>         # the KAI C++ compiler.
>         _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
>         ;;
>-      RCC)
>+      RCC*)
>         # Rational C++ 2.4.1
>         # FIXME: insert proper C++ library support
>         _LT_AC_TAGVAR(ld_shlibs, $1)=no
>         ;;
>-      cxx)
>+      cxx*)
>         _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
>-        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
>+        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
>         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
>           echo "-hidden">> $lib.exp~
>-          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version $verstring` -update_registry $objdir/so_locations -o $lib~
>+          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~
>           $rm $lib.exp'
> 
>         _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
>         _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
>@@ -3313,9 +3509,9 @@
>         ;;
>       *)
>         if test "$GXX" = yes && test "$with_gnu_ld" = no; then
>           _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
>-         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
>+         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
> 
>           _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
>           _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
> 
>@@ -3334,29 +3530,16 @@
>   psos*)
>     # FIXME: insert proper C++ library support
>     _LT_AC_TAGVAR(ld_shlibs, $1)=no
>     ;;
>-  sco*)
>-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
>-    case $cc_basename in
>-      CC)
>-        # FIXME: insert proper C++ library support
>-        _LT_AC_TAGVAR(ld_shlibs, $1)=no
>-        ;;
>-      *)
>-        # FIXME: insert proper C++ library support
>-        _LT_AC_TAGVAR(ld_shlibs, $1)=no
>-        ;;
>-    esac
>-    ;;
>   sunos4*)
>     case $cc_basename in
>-      CC)
>+      CC*)
>         # Sun C++ 4.x
>         # FIXME: insert proper C++ library support
>         _LT_AC_TAGVAR(ld_shlibs, $1)=no
>         ;;
>-      lcc)
>+      lcc*)
>         # Lucid
>         # FIXME: insert proper C++ library support
>         _LT_AC_TAGVAR(ld_shlibs, $1)=no
>         ;;
>@@ -3367,46 +3550,43 @@
>     esac
>     ;;
>   solaris*)
>     case $cc_basename in
>-      CC)
>+      CC*)
>         # Sun C++ 4.2, 5.x and Centerline C++
>+        _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes
>         _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
>-        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
>+        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
>         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
>-        $CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
>+        $CC -G${allow_undefined_flag}  ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
> 
>         _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
>         _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
>         case $host_os in
>-          solaris2.[0-5] | solaris2.[0-5].*) ;;
>+          solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
>           *)
>             # The C++ compiler is used as linker so we must use $wl
>             # flag to pass the commands to the underlying system
>-            # linker.
>+            # linker. We must also pass each convience library through
>+            # to the system linker between allextract/defaultextract.
>+            # The C++ compiler will combine linker options so we
>+            # cannot just pass the convience library names through
>+            # without $wl.
>             # Supported since Solaris 2.6 (maybe 2.5.1?)
>-            _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
>+            _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
>             ;;
>         esac
>         _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
> 
>-        # Commands to make compiler produce verbose output that lists
>-        # what "hidden" libraries, object files and flags are used when
>-        # linking a shared library.
>-        #
>-        # There doesn't appear to be a way to prevent this compiler from
>-        # explicitly linking system object files so we need to strip them
>-        # from the output so that they don't get included in the library
>-        # dependencies.
>-        output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[[LR]]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
>+        output_verbose_link_cmd='echo'
> 
>         # Archives containing C++ object files must be created using
>         # "CC -xar", where "CC" is the Sun C++ compiler.  This is
>         # necessary to make sure instantiated templates are included
>         # in the archive.
>         _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
>         ;;
>-      gcx)
>+      gcx*)
>         # Green Hills C++ Compiler
>         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
> 
>         # The C++ compiler must be used to create the archive.
>@@ -3442,14 +3622,65 @@
>         fi
>         ;;
>     esac
>     ;;
>-  sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
>+  sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
>+    _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
>+    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
>+    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
>+    runpath_var='LD_RUN_PATH'
>+
>+    case $cc_basename in
>+      CC*)
>+        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
>+        _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
>+        ;;
>+      *)
>+        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
>+        _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
>+        ;;
>+    esac
>+    ;;
>+  sysv5* | sco3.2v5* | sco5v6*)
>+    # Note: We can NOT use -z defs as we might desire, because we do not
>+    # link with -lc, and that would cause any symbols used from libc to
>+    # always be unresolved, which means just about no library would
>+    # ever link correctly.  If we're not using GNU ld we use -z text
>+    # though, which does catch some bad symbols but isn't as heavy-handed
>+    # as -z defs.
>+    # For security reasons, it is highly recommended that you always
>+    # use absolute paths for naming shared libraries, and exclude the
>+    # DT_RUNPATH tag from executables and libraries.  But doing so
>+    # requires that you compile everything twice, which is a pain.
>+    # So that behaviour is only enabled if SCOABSPATH is set to a
>+    # non-empty value in the environment.  Most likely only useful for
>+    # creating official distributions of packages.
>+    # This is a hack until libtool officially supports absolute path
>+    # names for shared libraries.
>+    _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
>+    _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
>     _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
>+    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
>+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
>+    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
>+    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
>+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
>+    runpath_var='LD_RUN_PATH'
>+
>+    case $cc_basename in
>+      CC*)
>+        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
>+        _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
>+        ;;
>+      *)
>+        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
>+        _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
>+        ;;
>+    esac
>     ;;
>   tandem*)
>     case $cc_basename in
>-      NCC)
>+      NCC*)
>         # NonStop-UX NCC 3.20
>         # FIXME: insert proper C++ library support
>         _LT_AC_TAGVAR(ld_shlibs, $1)=no
>         ;;
>@@ -3480,10 +3711,8 @@
> AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
> AC_LIBTOOL_PROG_LD_SHLIBS($1)
> AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
> AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
>-AC_LIBTOOL_SYS_LIB_STRIP
>-AC_LIBTOOL_DLOPEN_SELF($1)
> 
> AC_LIBTOOL_CONFIG($1)
> 
> AC_LANG_POP
>@@ -3499,9 +3728,9 @@
> lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
> ])# AC_LIBTOOL_LANG_CXX_CONFIG
> 
> # AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
>-# ------------------------
>+# ------------------------------------
> # Figure out "hidden" library dependencies from verbose
> # compiler output when linking a shared library.
> # Parse the compiler output and extract the necessary
> # objects, libraries and library flags.
>@@ -3553,9 +3782,9 @@
> 
>   # 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\"`"
>+  output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
> 
>   for p in `eval $output_verbose_link_cmd`; do
>     case $p in
> 
>@@ -3629,15 +3858,39 @@
> fi
> 
> $rm -f confest.$objext
> 
>+# PORTME: override above test on systems where it is broken
>+ifelse([$1],[CXX],
>+[case $host_os in
>+interix3*)
>+  # Interix 3.5 installs completely hosed .la files for C++, so rather than
>+  # hack all around it, let's just trust "g++" to DTRT.
>+  _LT_AC_TAGVAR(predep_objects,$1)=
>+  _LT_AC_TAGVAR(postdep_objects,$1)=
>+  _LT_AC_TAGVAR(postdeps,$1)=
>+  ;;
>+
>+solaris*)
>+  case $cc_basename in
>+  CC*)
>+    # Adding this requires a known-good setup of shared libraries for
>+    # Sun compiler versions before 5.6, else PIC objects from an old
>+    # archive will be linked into the output, leading to subtle bugs.
>+    _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun'
>+    ;;
>+  esac
>+  ;;
>+esac
>+])
>+
> case " $_LT_AC_TAGVAR(postdeps, $1) " in
> *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
> esac
> ])# AC_LIBTOOL_POSTDEP_PREDEP
> 
> # AC_LIBTOOL_LANG_F77_CONFIG
>-# ------------------------
>+# --------------------------
> # Ensure that the configuration vars for the C compiler are
> # suitably defined.  Those variables are subsequently used by
> # AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
> AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)])
>@@ -3679,14 +3932,18 @@
> 
> # 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
>-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
>+_LT_CC_BASENAME([$compiler])
> 
> AC_MSG_CHECKING([if libtool supports shared libraries])
> AC_MSG_RESULT([$can_build_shared])
> 
>@@ -3694,18 +3951,20 @@
> 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
>+case $host_os in
> aix3*)
>   test "$enable_shared" = yes && enable_static=no
>   if test -n "$RANLIB"; then
>     archive_cmds="$archive_cmds~\$RANLIB \$lib"
>     postinstall_cmds='$RANLIB $lib'
>   fi
>   ;;
> aix4* | aix5*)
>+  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
>   test "$enable_shared" = yes && enable_static=no
>+  fi
>   ;;
> esac
> AC_MSG_RESULT([$enable_shared])
> 
>@@ -3713,10 +3972,8 @@
> # Make sure either enable_shared or enable_static is yes.
> test "$enable_shared" = yes || enable_static=yes
> AC_MSG_RESULT([$enable_static])
> 
>-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
>-
> _LT_AC_TAGVAR(GCC, $1)="$G77"
> _LT_AC_TAGVAR(LD, $1)="$LD"
> 
> AC_LIBTOOL_PROG_COMPILER_PIC($1)
>@@ -3724,10 +3981,8 @@
> AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
> AC_LIBTOOL_PROG_LD_SHLIBS($1)
> AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
> AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
>-AC_LIBTOOL_SYS_LIB_STRIP
>-
> 
> AC_LIBTOOL_CONFIG($1)
> 
> AC_LANG_POP
>@@ -3754,31 +4009,36 @@
> # Code to be used in simple compile tests
> lt_simple_compile_test_code="class foo {}\n"
> 
> # Code to be used in simple link tests
>-lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
>+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n'
> 
> # ltmain only uses $CC for tagged configurations so make sure $CC is set.
> _LT_AC_SYS_COMPILER
> 
>+# save warnings/boilerplate of simple test code
>+_LT_COMPILER_BOILERPLATE
>+_LT_LINKER_BOILERPLATE
>+
> # Allow CC to be a program name with arguments.
> lt_save_CC="$CC"
> CC=${GCJ-"gcj"}
> compiler=$CC
> _LT_AC_TAGVAR(compiler, $1)=$CC
>+_LT_CC_BASENAME([$compiler])
> 
> # GCJ did not exist at the time GCC didn't implicitly link libc in.
> _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
> 
>+_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
>+
> AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
> AC_LIBTOOL_PROG_COMPILER_PIC($1)
> AC_LIBTOOL_PROG_CC_C_O($1)
> AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
> AC_LIBTOOL_PROG_LD_SHLIBS($1)
> AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
> AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
>-AC_LIBTOOL_SYS_LIB_STRIP
>-AC_LIBTOOL_DLOPEN_SELF($1)
> 
> AC_LIBTOOL_CONFIG($1)
> 
> AC_LANG_RESTORE
>@@ -3786,9 +4046,9 @@
> ])# 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)])
>@@ -3810,13 +4070,18 @@
> 
> # ltmain only uses $CC for tagged configurations so make sure $CC is set.
> _LT_AC_SYS_COMPILER
> 
>+# save warnings/boilerplate of simple test code
>+_LT_COMPILER_BOILERPLATE
>+_LT_LINKER_BOILERPLATE
>+
> # Allow CC to be a program name with arguments.
> lt_save_CC="$CC"
> CC=${RC-"windres"}
> compiler=$CC
> _LT_AC_TAGVAR(compiler, $1)=$CC
>+_LT_CC_BASENAME([$compiler])
> _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
> 
> AC_LIBTOOL_CONFIG($1)
> 
>@@ -3844,9 +4109,9 @@
>   fi
>   # Now quote all the things that may contain metacharacters while being
>   # careful not to overquote the AC_SUBSTed values.  We take copies of the
>   # variables and quote the copies for generation of the libtool script.
>-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
>+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
>     SED SHELL STRIP \
>     libname_spec library_names_spec soname_spec extract_expsyms_cmds \
>     old_striplib striplib file_magic_cmd finish_cmds finish_eval \
>     deplibs_check_method reload_flag reload_cmds need_locks \
>@@ -3950,9 +4215,9 @@
> # General Public License for more details.
> #
> # You should have received a copy of the GNU General Public License
> # along with this program; if not, write to the Free Software
>-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
>+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
> #
> # As a special exception to the GNU General Public License, if you
> # distribute this file as part of a program that contains a
> # configuration script generated by Autoconf, you may include it under
>@@ -3961,13 +4226,13 @@
> # A sed program that does not truncate output.
> SED=$lt_SED
> 
> # Sed that helps us avoid accidentally triggering echo(1) options like -n.
>-Xsed="$SED -e s/^X//"
>+Xsed="$SED -e 1s/^X//"
> 
> # The HP-UX ksh and POSIX shell print the target directory to stdout
> # if CDPATH is set.
>-if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
>+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
> 
> # The names of the tagged configurations supported by this script.
> available_tags=
> 
>@@ -3996,8 +4261,14 @@
> 
> # The host system.
> host_alias=$host_alias
> host=$host
>+host_os=$host_os
>+
>+# The build system.
>+build_alias=$build_alias
>+build=$build
>+build_os=$build_os
> 
> # An echo program that does not interpret backslashes.
> echo=$lt_echo
> 
>@@ -4007,8 +4278,11 @@
> 
> # A C compiler.
> LTCC=$lt_LTCC
> 
>+# LTCC compiler flags.
>+LTCFLAGS=$lt_LTCFLAGS
>+
> # A language-specific compiler.
> CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
> 
> # Is the compiler the GNU C compiler?
>@@ -4346,11 +4620,8 @@
> 
> # Regexp to match symbols that can be accessed directly from C.
> sympat='$[[_A-Za-z]][[_A-Za-z0-9]]*$'
> 
>-# Transform the above into a raw symbol and a C symbol.
>-symxfrm='\1 \2\3 \3'
>-
> # Transform an extracted symbol line into a proper C declaration
> lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* $.*$$/extern int \1;/p'"
> 
> # Transform an extracted symbol line into symbol name and symbol address
>@@ -4370,17 +4641,33 @@
>   fi
>   lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* $.*$$/extern int \1();/p' -e 's/^$symcode* .* $.*$$/extern char \1;/p'"
>   lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: $[[^ ]]*$ $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* $[[^ ]]*$ $[[^ ]]*$$/  {\"\2\", (lt_ptr) \&\2},/p'"
>   ;;
>+linux*)
>+  if test "$host_cpu" = ia64; then
>+    symcode='[[ABCDGIRSTW]]'
>+    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* $.*$$/extern int \1();/p' -e 's/^$symcode* .* $.*$$/extern char \1;/p'"
>+    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: $[[^ ]]*$ $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* $[[^ ]]*$ $[[^ ]]*$$/  {\"\2\", (lt_ptr) \&\2},/p'"
>+  fi
>+  ;;
> irix* | nonstopux*)
>   symcode='[[BCDEGRST]]'
>   ;;
> osf*)
>   symcode='[[BCDEGQRST]]'
>   ;;
>-solaris* | sysv5*)
>+solaris*)
>   symcode='[[BDRT]]'
>   ;;
>+sco3.2v5*)
>+  symcode='[[DT]]'
>+  ;;
>+sysv4.2uw2*)
>+  symcode='[[DT]]'
>+  ;;
>+sysv5* | sco5v6* | unixware* | OpenUNIX*)
>+  symcode='[[ABDT]]'
>+  ;;
> sysv4)
>   symcode='[[DFNSTU]]'
>   ;;
> esac
>@@ -4401,10 +4688,13 @@
> 
> # Try without a prefix undercore, then with it.
> for ac_symprfx in "" "_"; do
> 
>+  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
>+  symxfrm="\\1 $ac_symprfx\\2 \\2"
>+
>   # Write the raw and C identifiers.
>-  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[      ]]$$symcode$symcode*$[[       ]][[    ]]*$$ac_symprfx$$sympat$opt_cr$/$symxfrm/p'"
>+  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[      ]]$$symcode$symcode*$[[       ]][[    ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
> 
>   # Check to see that the pipe works correctly.
>   pipe_works=no
> 
>@@ -4558,17 +4848,21 @@
>     *djgpp*)
>       # DJGPP does not support shared libraries at all
>       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
>       ;;
>+    interix3*)
>+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
>+      # Instead, we relocate shared libraries at runtime.
>+      ;;
>     sysv4*MP*)
>       if test -d /usr/nec; then
>         _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
>       fi
>       ;;
>     hpux*)
>       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
>       # not for PA HP-UX.
>-      case "$host_cpu" in
>+      case $host_cpu in
>       hppa*64*|ia64*)
>         ;;
>       *)
>         _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
>@@ -4591,43 +4885,53 @@
>         fi
>         ;;
>       chorus*)
>         case $cc_basename in
>-        cxch68)
>+        cxch68*)
>           # Green Hills C++ Compiler
>           # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
>           ;;
>         esac
>         ;;
>+       darwin*)
>+         # PIC is the default on this platform
>+         # Common symbols not allowed in MH_DYLIB files
>+         case $cc_basename in
>+           xlc*)
>+           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
>+           _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
>+           ;;
>+         esac
>+       ;;
>       dgux*)
>         case $cc_basename in
>-          ec++)
>+          ec++*)
>             _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
>             ;;
>-          ghcx)
>+          ghcx*)
>             # Green Hills C++ Compiler
>             _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
>             ;;
>           *)
>             ;;
>         esac
>         ;;
>-      freebsd* | kfreebsd*-gnu)
>+      freebsd* | kfreebsd*-gnu | dragonfly*)
>         # FreeBSD uses GNU C++
>         ;;
>       hpux9* | hpux10* | hpux11*)
>         case $cc_basename in
>-          CC)
>+          CC*)
>             _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
>-            _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
>+            _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
>             if test "$host_cpu" != ia64; then
>               _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
>             fi
>             ;;
>-          aCC)
>+          aCC*)
>             _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
>-            _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
>-            case "$host_cpu" in
>+            _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
>+            case $host_cpu in
>             hppa*64*|ia64*)
>               # +Z the default
>               ;;
>             *)
>@@ -4638,11 +4942,15 @@
>           *)
>             ;;
>         esac
>         ;;
>+      interix*)
>+        # This is c89, which is MS Visual C++ (no shared libs)
>+        # Anyone wants to do a port?
>+        ;;
>       irix5* | irix6* | nonstopux*)
>         case $cc_basename in
>-          CC)
>+          CC*)
>             _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
>             _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
>             # CC pic flag -KPIC is the default.
>             ;;
>@@ -4651,20 +4959,26 @@
>         esac
>         ;;
>       linux*)
>         case $cc_basename in
>-          KCC)
>+          KCC*)
>             # KAI C++ Compiler
>             _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
>             _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
>             ;;
>-          icpc)
>+          icpc* | ecpc*)
>             # Intel C++
>             _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
>             _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
>             _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
>             ;;
>-          cxx)
>+          pgCC*)
>+            # Portland Group C++ compiler.
>+            _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
>+            _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
>+            _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
>+            ;;
>+          cxx*)
>             # Compaq C++
>             # Make sure the PIC flag is empty.  It appears that all Alpha
>             # Linux and Compaq Tru64 Unix objects are PIC.
>             _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
>@@ -4679,9 +4993,9 @@
>       m88k*)
>         ;;
>       mvs*)
>         case $cc_basename in
>-          cxx)
>+          cxx*)
>             _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
>             ;;
>           *)
>             ;;
>@@ -4690,16 +5004,16 @@
>       netbsd*)
>         ;;
>       osf3* | osf4* | osf5*)
>         case $cc_basename in
>-          KCC)
>+          KCC*)
>             _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
>             ;;
>-          RCC)
>+          RCC*)
>             # Rational C++ 2.4.1
>             _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
>             ;;
>-          cxx)
>+          cxx*)
>             # Digital/Compaq C++
>             _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
>             # Make sure the PIC flag is empty.  It appears that all Alpha
>             # Linux and Compaq Tru64 Unix objects are PIC.
>@@ -4711,26 +5025,17 @@
>         esac
>         ;;
>       psos*)
>         ;;
>-      sco*)
>-        case $cc_basename in
>-          CC)
>-            _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
>-            ;;
>-          *)
>-            ;;
>-        esac
>-        ;;
>       solaris*)
>         case $cc_basename in
>-          CC)
>+          CC*)
>             # Sun C++ 4.2, 5.x and Centerline C++
>             _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
>             _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
>             _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
>             ;;
>-          gcx)
>+          gcx*)
>             # Green Hills C++ Compiler
>             _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
>             ;;
>           *)
>@@ -4738,14 +5043,14 @@
>         esac
>         ;;
>       sunos4*)
>         case $cc_basename in
>-          CC)
>+          CC*)
>             # Sun C++ 4.x
>             _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
>             _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
>             ;;
>-          lcc)
>+          lcc*)
>             # Lucid
>             _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
>             ;;
>           *)
>@@ -4753,17 +5058,24 @@
>         esac
>         ;;
>       tandem*)
>         case $cc_basename in
>-          NCC)
>+          NCC*)
>             # NonStop-UX NCC 3.20
>             _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
>             ;;
>           *)
>             ;;
>         esac
>         ;;
>-      unixware*)
>+      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
>+        case $cc_basename in
>+          CC*)
>+            _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
>+            _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
>+            _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
>+            ;;
>+        esac
>         ;;
>       vxworks*)
>         ;;
>       *)
>@@ -4808,8 +5120,13 @@
>       # Common symbols not allowed in MH_DYLIB files
>       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
>       ;;
> 
>+    interix3*)
>+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
>+      # Instead, we relocate shared libraries at runtime.
>+      ;;
>+
>     msdosdjgpp*)
>       # Just because we use GCC doesn't mean we suddenly get shared libraries
>       # on systems that don't support them.
>       _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
>@@ -4824,9 +5141,9 @@
> 
>     hpux*)
>       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
>       # not for PA HP-UX.
>-      case "$host_cpu" in
>+      case $host_cpu in
>       hppa*64*|ia64*)
>         # +Z the default
>         ;;
>       *)
>@@ -4850,8 +5167,18 @@
>       else
>         _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
>       fi
>       ;;
>+      darwin*)
>+        # PIC is the default on this platform
>+        # Common symbols not allowed in MH_DYLIB files
>+       case $cc_basename in
>+         xlc*)
>+         _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
>+         _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
>+         ;;
>+       esac
>+       ;;
> 
>     mingw* | pw32* | os2*)
>       # This hack is so that the source file can tell whether it is being
>       # built for inclusion in a dll (and should export symbols for example).
>@@ -4861,9 +5188,9 @@
>     hpux9* | hpux10* | hpux11*)
>       _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
>       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
>       # not for PA HP-UX.
>-      case "$host_cpu" in
>+      case $host_cpu in
>       hppa*64*|ia64*)
>         # +Z the default
>         ;;
>       *)
>@@ -4885,14 +5212,21 @@
>       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
>       ;;
> 
>     linux*)
>-      case $CC in
>+      case $cc_basename in
>       icc* | ecc*)
>         _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
>         _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
>         _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
>         ;;
>+      pgcc* | pgf77* | pgf90* | pgf95*)
>+        # Portland Group compilers (*not* the Pentium gcc compiler,
>+        # which looks to be a dead project)
>+        _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
>+        _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
>+        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
>+        ;;
>       ccc*)
>         _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
>         # All Alpha code is PIC.
>         _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
>@@ -4905,26 +5239,26 @@
>       # All OSF/1 code is PIC.
>       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
>       ;;
> 
>-    sco3.2v5*)
>-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kpic'
>-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-dn'
>-      ;;
>-
>     solaris*)
>-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
>       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
>       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
>+      case $cc_basename in
>+      f77* | f90* | f95*)
>+        _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
>+      *)
>+        _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
>+      esac
>       ;;
> 
>     sunos4*)
>       _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
>       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
>       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
>       ;;
> 
>-    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
>+    sysv4 | sysv4.2uw2* | sysv4.3*)
>       _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
>       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
>       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
>       ;;
>@@ -4935,8 +5269,19 @@
>         _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
>       fi
>       ;;
> 
>+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
>+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
>+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
>+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
>+      ;;
>+
>+    unicos*)
>+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
>+      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
>+      ;;
>+
>     uts4*)
>       _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
>       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
>       ;;
>@@ -4962,17 +5307,27 @@
>      esac],
>     [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
>      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
> fi
>-case "$host_os" in
>+case $host_os in
>   # For platforms which do not support PIC, -DPIC is meaningless:
>   *djgpp*)
>     _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
>     ;;
>   *)
>     _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
>     ;;
> esac
>+
>+#
>+# Check to make sure the static flag actually works.
>+#
>+wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
>+AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
>+  _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
>+  $lt_tmp_static_flag,
>+  [],
>+  [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
> ])
> 
> 
> # AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME])
>@@ -4995,9 +5350,9 @@
>   pw32*)
>     _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
>   ;;
>   cygwin* | mingw*)
>-    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* $[[^ ]]*$/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
>+    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* $[[^ ]]*$/\1 DATA/;/^.* __nm__/s/^.* __nm__$[[^ ]]*$ [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
>   ;;
>   *)
>     _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
>   ;;
>@@ -5038,9 +5393,10 @@
>   # the symbol is explicitly referenced.  Since portable code cannot
>   # rely on this symbol name, it's probably fine to never include it in
>   # preloaded symbol tables.
>   extract_expsyms_cmds=
>-
>+  # Just being paranoid about ensuring that cc_basename is set.
>+  _LT_CC_BASENAME([$compiler])
>   case $host_os in
>   cygwin* | mingw* | pw32*)
>     # FIXME: the MSVC++ port hasn't been tested in a loooong time
>     # When not using gcc, we currently assume that we are using
>@@ -5048,8 +5404,12 @@
>     if test "$GCC" != yes; then
>       with_gnu_ld=no
>     fi
>     ;;
>+  interix*)
>+    # we just hope/assume this is gcc and not c89 (= MSVC++)
>+    with_gnu_ld=yes
>+    ;;
>   openbsd*)
>     with_gnu_ld=no
>     ;;
>   esac
>@@ -5058,8 +5418,29 @@
>   if test "$with_gnu_ld" = yes; then
>     # If archive_cmds runs LD, not CC, wlarc should be empty
>     wlarc='${wl}'
> 
>+    # Set some defaults for GNU ld with shared library support. These
>+    # are reset later if shared libraries are not supported. Putting them
>+    # here allows them to be overridden if necessary.
>+    runpath_var=LD_RUN_PATH
>+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
>+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
>+    # ancient GNU ld didn't support --whole-archive et. al.
>+    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
>+        _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
>+      else
>+        _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
>+    fi
>+    supports_anon_versioning=no
>+    case `$LD -v 2>/dev/null` in
>+      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
>+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
>+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
>+      *\ 2.11.*) ;; # other 2.11 versions
>+      *) supports_anon_versioning=yes ;;
>+    esac
>+
>     # See if GNU ld supports shared libraries.
>     case $host_os in
>     aix3* | aix4* | aix5*)
>       # On AIX/PPC, the GNU linker is very broken
>@@ -5108,23 +5489,69 @@
>       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
>       _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
>       _LT_AC_TAGVAR(always_export_symbols, $1)=no
>       _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
>-      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* $[[^ ]]*$/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
>+      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* $[[^ ]]*$/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
> 
>       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
>-        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
>+        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
>         # If the export-symbols file already is a .def file (1st line
>         # is EXPORTS), use it as is; otherwise, prepend...
>         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
>           cp $export_symbols $output_objdir/$soname.def;
>         else
>           echo EXPORTS > $output_objdir/$soname.def;
>           cat $export_symbols >> $output_objdir/$soname.def;
>         fi~
>-        $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
>+        $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
>       else
>-        ld_shlibs=no
>+        _LT_AC_TAGVAR(ld_shlibs, $1)=no
>+      fi
>+      ;;
>+
>+    interix3*)
>+      _LT_AC_TAGVAR(hardcode_direct, $1)=no
>+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
>+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
>+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
>+      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
>+      # Instead, shared libraries are loaded at an image base (0x10000000 by
>+      # default) and relocated if they conflict, which is a slow very memory
>+      # consuming and fragmenting process.  To avoid this, we pick a random,
>+      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
>+      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
>+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
>+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
>+      ;;
>+
>+    linux*)
>+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
>+        tmp_addflag=
>+        case $cc_basename,$host_cpu in
>+        pgcc*)                          # Portland Group C compiler
>+          _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
>+          tmp_addflag=' $pic_flag'
>+          ;;
>+        pgf77* | pgf90* | pgf95*)       # Portland Group f77 and f90 compilers
>+          _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
>+          tmp_addflag=' $pic_flag -Mnomain' ;;
>+        ecc*,ia64* | icc*,ia64*)                # Intel C compiler on ia64
>+          tmp_addflag=' -i_dynamic' ;;
>+        efc*,ia64* | ifort*,ia64*)      # Intel Fortran compiler on ia64
>+          tmp_addflag=' -i_dynamic -nofor_main' ;;
>+        ifc* | ifort*)                  # Intel Fortran compiler
>+          tmp_addflag=' -nofor_main' ;;
>+        esac
>+        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
>+
>+        if test $supports_anon_versioning = yes; then
>+          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
>+  cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
>+  $echo "local: *; };" >> $output_objdir/$libname.ver~
>+          $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
>+        fi
>+      else
>+        _LT_AC_TAGVAR(ld_shlibs, $1)=no
>       fi
>       ;;
> 
>     netbsd*)
>@@ -5136,9 +5563,9 @@
>         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
>       fi
>       ;;
> 
>-    solaris* | sysv5*)
>+    solaris*)
>       if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
>         _LT_AC_TAGVAR(ld_shlibs, $1)=no
>         cat <<EOF 1>&2
> 
>@@ -5157,39 +5584,41 @@
>         _LT_AC_TAGVAR(ld_shlibs, $1)=no
>       fi
>       ;;
> 
>-    sunos4*)
>-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
>-      wlarc=
>-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
>-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
>-      ;;
>+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
>+      case `$LD -v 2>&1` in
>+        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) 
>+        _LT_AC_TAGVAR(ld_shlibs, $1)=no
>+        cat <<_LT_EOF 1>&2
> 
>-  linux*)
>-    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
>-        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
>-        _LT_AC_TAGVAR(archive_cmds, $1)="$tmp_archive_cmds"
>-      supports_anon_versioning=no
>-      case `$LD -v 2>/dev/null` in
>-        *\ [01].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
>-        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
>-        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
>-        *\ 2.11.*) ;; # other 2.11 versions
>-        *) supports_anon_versioning=yes ;;
>-      esac
>-      if test $supports_anon_versioning = yes; then
>-        _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
>-cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
>-$echo "local: *; };" >> $output_objdir/$libname.ver~
>-        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
>-      else
>-        _LT_AC_TAGVAR(archive_expsym_cmds, $1)="$tmp_archive_cmds"
>-      fi
>+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
>+*** reliably create shared libraries on SCO systems.  Therefore, libtool
>+*** is disabling shared libraries support.  We urge you to upgrade GNU
>+*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
>+*** your PATH or compiler configuration so that the native linker is
>+*** used, and then restart.
>+
>+_LT_EOF
>+        ;;
>+        *)
>+          if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
>+            _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
>+            _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
>+            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
>     else
>       _LT_AC_TAGVAR(ld_shlibs, $1)=no
>     fi
>     ;;
>+      esac
>+      ;;
>+
>+    sunos4*)
>+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
>+      wlarc=
>+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
>+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
>+      ;;
> 
>     *)
>       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
>         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
>@@ -5199,19 +5628,14 @@
>       fi
>       ;;
>     esac
> 
>-    if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = yes; then
>-      runpath_var=LD_RUN_PATH
>-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
>-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
>-      # ancient GNU ld didn't support --whole-archive et. al.
>-      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
>-        _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
>-      else
>+    if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then
>+      runpath_var=
>+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
>+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
>         _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
>       fi
>-    fi
>   else
>     # PORTME fill in a description of your system's linker (not GNU ld)
>     case $host_os in
>     aix3*)
>@@ -5220,9 +5644,9 @@
>       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
>       # Note: this linker hardcodes the directories in LIBPATH if there
>       # are no directories specified by -L.
>       _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
>-      if test "$GCC" = yes && test -z "$link_static_flag"; then
>+      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
>         # Neither direct hardcoding nor static linking is supported with a
>         # broken collect2.
>         _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
>       fi
>@@ -5254,8 +5678,9 @@
>             aix_use_runtimelinking=yes
>             break
>           fi
>           done
>+          ;;
>         esac
> 
>         exp_sym_flag='-bexport'
>         no_entry_flag='-bnoentry'
>@@ -5272,9 +5697,9 @@
>       _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
>       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
> 
>       if test "$GCC" = yes; then
>-        case $host_os in aix4.[012]|aix4.[012].*)
>+        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" && \
>@@ -5291,10 +5716,14 @@
>           _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
>@@ -5318,29 +5747,27 @@
>         _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
>        # Determine the default libpath from the value encoded in an empty executable.
>        _LT_AC_SYS_LIBPATH_AIX
>        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
>-        _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
>+        _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
>        else
>         if test "$host_cpu" = ia64; then
>           _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
>           _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
>-          _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
>+          _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
>         else
>          # Determine the default libpath from the value encoded in an empty executable.
>          _LT_AC_SYS_LIBPATH_AIX
>          _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
>           # Warning - without using the other run time loading flags,
>           # -berok will link without error, but may produce a broken library.
>           _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
>           _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
>-          # -bexpall does not export symbols beginning with underscore (_)
>-          _LT_AC_TAGVAR(always_export_symbols, $1)=yes
>           # Exported symbols can be pulled into shared objects from archives
>-          _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
>+          _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
>           _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
>-          # This is similar to how AIX traditionally builds it's shared libraries.
>-          _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
>+          # This is similar to how AIX traditionally builds its shared libraries.
>+          _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
>         fi
>       fi
>       ;;
> 
>@@ -5351,9 +5778,9 @@
>       # see comment about different semantics on the GNU ld section
>       _LT_AC_TAGVAR(ld_shlibs, $1)=no
>       ;;
> 
>-    bsdi4*)
>+    bsdi[[45]]*)
>       _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
>       ;;
> 
>     cygwin* | mingw* | pw32*)
>@@ -5372,59 +5799,59 @@
>       # The linker will automatically build a .lib file if we build a DLL.
>       _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
>       # FIXME: Should let the user specify the lib program.
>       _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
>-      fix_srcfile_path='`cygpath -w "$srcfile"`'
>+      _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
>       _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
>       ;;
> 
>     darwin* | rhapsody*)
>-    if test "$GXX" = yes ; then
>-      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
>-      case "$host_os" in
>+      case $host_os in
>       rhapsody* | darwin1.[[012]])
>-        _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
>+         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
>         ;;
>       *) # Darwin 1.3 on
>       if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
>-        _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
>+           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
>       else
>         case ${MACOSX_DEPLOYMENT_TARGET} in
>           10.[[012]])
>-            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
>+               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
>             ;;
>           10.*)
>-            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
>+               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
>             ;;
>         esac
>       fi
>         ;;
>       esac
>-        lt_int_apple_cc_single_mod=no
>-        output_verbose_link_cmd='echo'
>-        if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
>-          lt_int_apple_cc_single_mod=yes
>-        fi
>-        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
>-          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
>-        else
>-        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
>-      fi
>-      _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
>-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
>-        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
>-          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
>-        else
>-          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
>-        fi
>-          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
>+      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
>       _LT_AC_TAGVAR(hardcode_direct, $1)=no
>       _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
>       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
>-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
>+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
>       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
>+    if test "$GCC" = yes ; then
>+        output_verbose_link_cmd='echo'
>+        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
>+      _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
>+      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
>+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
>+      _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
>     else
>+      case $cc_basename in
>+        xlc*)
>+         output_verbose_link_cmd='echo'
>+         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
>+         _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
>+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
>+         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
>+          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
>+          ;;
>+       *)
>       _LT_AC_TAGVAR(ld_shlibs, $1)=no
>+          ;;
>+      esac
>     fi
>       ;;
> 
>     dgux*)
>@@ -5456,9 +5883,9 @@
>       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
>       ;;
> 
>     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
>-    freebsd* | kfreebsd*-gnu)
>+    freebsd* | kfreebsd*-gnu | dragonfly*)
>       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
>       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
>       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
>       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
>@@ -5479,49 +5906,64 @@
>       _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
>       _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
>       ;;
> 
>-    hpux10* | hpux11*)
>+    hpux10*)
>       if test "$GCC" = yes -a "$with_gnu_ld" = no; then
>-        case "$host_cpu" in
>-        hppa*64*|ia64*)
>+        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
>+      else
>+        _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
>+      fi
>+      if test "$with_gnu_ld" = no; then
>+        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
>+        _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
>+
>+        _LT_AC_TAGVAR(hardcode_direct, $1)=yes
>+        _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
>+
>+        # hardcode_minus_L: Not really in the search PATH,
>+        # but as the default location of the library.
>+        _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
>+      fi
>+      ;;
>+
>+    hpux11*)
>+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
>+        case $host_cpu in
>+        hppa*64*)
>           _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
>           ;;
>+        ia64*)
>+          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
>+          ;;
>         *)
>           _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
>           ;;
>         esac
>       else
>-        case "$host_cpu" in
>-        hppa*64*|ia64*)
>-          _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
>+        case $host_cpu in
>+        hppa*64*)
>+          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
>+          ;;
>+        ia64*)
>+          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
>           ;;
>         *)
>-          _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
>+          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
>           ;;
>         esac
>       fi
>       if test "$with_gnu_ld" = no; then
>-        case "$host_cpu" in
>-        hppa*64*)
>           _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
>-          _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
>           _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
>+
>+        case $host_cpu in
>+        hppa*64*|ia64*)
>+          _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
>           _LT_AC_TAGVAR(hardcode_direct, $1)=no
>           _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
>           ;;
>-        ia64*)
>-          _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
>-          _LT_AC_TAGVAR(hardcode_direct, $1)=no
>-          _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
>-
>-          # hardcode_minus_L: Not really in the search PATH,
>-          # but as the default location of the library.
>-          _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
>-          ;;
>         *)
>-          _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
>-          _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
>           _LT_AC_TAGVAR(hardcode_direct, $1)=yes
>           _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
> 
>           # hardcode_minus_L: Not really in the search PATH,
>@@ -5567,8 +6009,9 @@
>       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
>       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
>       if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
>         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
>+        _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
>         _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
>         _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
>       else
>        case $host_os in
>@@ -5612,41 +6055,45 @@
>       else
>         _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
>         _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
>         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
>-        $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
>+        $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
> 
>         # Both c and cxx compiler support -rpath directly
>         _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
>       fi
>       _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
>       ;;
> 
>-    sco3.2v5*)
>-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
>-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
>-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
>-      runpath_var=LD_RUN_PATH
>-      hardcode_runpath_var=yes
>-      ;;
>-
>     solaris*)
>       _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
>       if test "$GCC" = yes; then
>+        wlarc='${wl}'
>         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
>         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
>           $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
>       else
>+        wlarc=''
>         _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
>         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
>         $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
>       fi
>       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
>       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
>       case $host_os in
>       solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
>-      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
>+      *)
>+        # The compiler driver will combine linker options so we
>+        # cannot just pass the convience library names through
>+        # without $wl, iff we do not link with $LD.
>+        # Luckily, gcc supports the same syntax we need for Sun Studio.
>+        # Supported since Solaris 2.6 (maybe 2.5.1?)
>+        case $wlarc in
>+        '')
>         _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
>+        *)
>+          _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
>+        esac ;;
>       esac
>       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
>       ;;
> 
>@@ -5701,38 +6148,47 @@
>         _LT_AC_TAGVAR(ld_shlibs, $1)=yes
>       fi
>       ;;
> 
>-    sysv4.2uw2*)
>-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
>-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
>-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
>+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*)
>+      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
>+      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
>       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
>-      hardcode_runpath_var=yes
>-      runpath_var=LD_RUN_PATH
>-      ;;
>+      runpath_var='LD_RUN_PATH'
> 
>-   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[[78]]* | unixware7*)
>-      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
>       if test "$GCC" = yes; then
>-        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
>+        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
>+        _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
>       else
>-        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
>+        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
>+        _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
>       fi
>-      runpath_var='LD_RUN_PATH'
>-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
>       ;;
> 
>-    sysv5*)
>-      _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
>-      # $CC -shared without GNU ld will not create a library from C++
>-      # object files and a static libstdc++, better avoid it by now
>-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
>-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
>-                $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
>-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
>+    sysv5* | sco3.2v5* | sco5v6*)
>+      # Note: We can NOT use -z defs as we might desire, because we do not
>+      # link with -lc, and that would cause any symbols used from libc to
>+      # always be unresolved, which means just about no library would
>+      # ever link correctly.  If we're not using GNU ld we use -z text
>+      # though, which does catch some bad symbols but isn't as heavy-handed
>+      # as -z defs.
>+      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
>+      _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
>+      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
>       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
>+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
>+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
>+      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
>+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
>       runpath_var='LD_RUN_PATH'
>+
>+      if test "$GCC" = yes; then
>+        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
>+        _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
>+      else
>+        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
>+        _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
>+      fi
>       ;;
> 
>     uts4*)
>       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
>@@ -5748,13 +6204,8 @@
> ])
> AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
> test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
> 
>-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
>-if test "$GCC" = yes; then
>-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
>-fi
>-
> #
> # Do we need to explicitly link libc?
> #
> case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in
>@@ -5780,8 +6231,9 @@
>         lib=conftest
>         libobjs=conftest.$ac_objext
>         deplibs=
>         wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
>+        pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
>         compiler_flags=-v
>         linker_flags=-v
>         verstring=
>         output_objdir=.
>@@ -5905,9 +6357,9 @@
> lt_ac_count=0
> # Add /usr/xpg4/bin/sed as it is typically found on Solaris
> # along with /bin/sed that truncates output.
> for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
>-  test ! -f $lt_ac_sed && break
>+  test ! -f $lt_ac_sed && continue
>   cat /dev/null > conftest.in
>   lt_ac_count=0
>   echo $ECHO_N "0123456789$ECHO_C" >conftest.in
>   # Check for GNU sed and select it if it is found.
>@@ -5930,30 +6382,18 @@
>       lt_cv_path_SED=$lt_ac_sed
>     fi
>   done
> done
>-SED=$lt_cv_path_SED
> ])
>+SED=$lt_cv_path_SED
> AC_MSG_RESULT([$SED])
> ])
> 
>-#                                                        -*- Autoconf -*-
>-# Copyright (C) 2002, 2003  Free Software Foundation, Inc.
>-# Generated from amversion.in; do not edit by hand.
>-
>-# This program is free software; you can redistribute it and/or modify
>-# it under the terms of the GNU General Public License as published by
>-# the Free Software Foundation; either version 2, or (at your option)
>-# any later version.
>-
>-# This program is distributed in the hope that it will be useful,
>-# but WITHOUT ANY WARRANTY; without even the implied warranty of
>-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>-# GNU General Public License for more details.
>-
>-# You should have received a copy of the GNU General Public License
>-# along with this program; if not, write to the Free Software
>-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
>+# Copyright (C) 2002, 2003, 2005  Free Software Foundation, Inc.
>+#
>+# This file is free software; the Free Software Foundation
>+# gives unlimited permission to copy and/or distribute it,
>+# with or without modifications, as long as this notice is preserved.
> 
> # AM_AUTOMAKE_VERSION(VERSION)
> # ----------------------------
> # Automake X.Y traces this macro to ensure aclocal.m4 has been
>@@ -5964,28 +6404,17 @@
> # -------------------------------
> # Call AM_AUTOMAKE_VERSION so it can be traced.
> # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
> AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
>-         [AM_AUTOMAKE_VERSION([1.9.2])])
>-
>-# AM_AUX_DIR_EXPAND
>+         [AM_AUTOMAKE_VERSION([1.9.6])])
> 
>-# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
>-
>-# This program is free software; you can redistribute it and/or modify
>-# it under the terms of the GNU General Public License as published by
>-# the Free Software Foundation; either version 2, or (at your option)
>-# any later version.
>-
>-# This program is distributed in the hope that it will be useful,
>-# but WITHOUT ANY WARRANTY; without even the implied warranty of
>-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>-# GNU General Public License for more details.
>+# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
> 
>-# You should have received a copy of the GNU General Public License
>-# along with this program; if not, write to the Free Software
>-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
>-# 02111-1307, USA.
>+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
>+#
>+# This file is free software; the Free Software Foundation
>+# gives unlimited permission to copy and/or distribute it,
>+# with or without modifications, as long as this notice is preserved.
> 
> # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
> # $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
> # `$srcdir', `$srcdir/..', or `$srcdir/../..'.
>@@ -6032,26 +6461,16 @@
> ])
> 
> # AM_CONDITIONAL                                              -*- Autoconf -*-
> 
>-# Copyright (C) 1997, 2000, 2001, 2003, 2004 Free Software Foundation, Inc.
>-
>-# This program is free software; you can redistribute it and/or modify
>-# it under the terms of the GNU General Public License as published by
>-# the Free Software Foundation; either version 2, or (at your option)
>-# any later version.
>-
>-# This program is distributed in the hope that it will be useful,
>-# but WITHOUT ANY WARRANTY; without even the implied warranty of
>-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>-# GNU General Public License for more details.
>-
>-# You should have received a copy of the GNU General Public License
>-# along with this program; if not, write to the Free Software
>-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
>-# 02111-1307, USA.
>+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
>+# Free Software Foundation, Inc.
>+#
>+# This file is free software; the Free Software Foundation
>+# gives unlimited permission to copy and/or distribute it,
>+# with or without modifications, as long as this notice is preserved.
> 
>-# serial 6
>+# serial 7
> 
> # AM_CONDITIONAL(NAME, SHELL-CONDITION)
> # -------------------------------------
> # Define a conditional.
>@@ -6073,37 +6492,25 @@
>   AC_MSG_ERROR([[conditional "$1" was never defined.
> Usually this means the macro was only invoked conditionally.]])
> fi])])
> 
>-# serial 7                                              -*- Autoconf -*-
> 
>-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
>+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
> # Free Software Foundation, Inc.
>+#
>+# This file is free software; the Free Software Foundation
>+# gives unlimited permission to copy and/or distribute it,
>+# with or without modifications, as long as this notice is preserved.
> 
>-# This program is free software; you can redistribute it and/or modify
>-# it under the terms of the GNU General Public License as published by
>-# the Free Software Foundation; either version 2, or (at your option)
>-# any later version.
>-
>-# This program is distributed in the hope that it will be useful,
>-# but WITHOUT ANY WARRANTY; without even the implied warranty of
>-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>-# GNU General Public License for more details.
>-
>-# You should have received a copy of the GNU General Public License
>-# along with this program; if not, write to the Free Software
>-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
>-# 02111-1307, USA.
>-
>+# serial 8
> 
> # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
> # written in clear, in which case automake, when reading aclocal.m4,
> # will think it sees a *use*, and therefore will trigger all it's
> # C support machinery.  Also note that it means that autoscan, seeing
> # CC etc. in the Makefile, will ask for an AC_PROG_CC use...
> 
> 
>-
> # _AM_DEPENDENCIES(NAME)
> # ----------------------
> # See how the compiler implements dependency checking.
> # NAME is "CC", "CXX", "GCJ", or "OBJC".
>@@ -6243,27 +6650,16 @@
> ])
> 
> # Generate code to set up dependency tracking.   -*- Autoconf -*-
> 
>-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
>+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
> #   Free Software Foundation, Inc.
>+#
>+# This file is free software; the Free Software Foundation
>+# gives unlimited permission to copy and/or distribute it,
>+# with or without modifications, as long as this notice is preserved.
> 
>-# This program is free software; you can redistribute it and/or modify
>-# it under the terms of the GNU General Public License as published by
>-# the Free Software Foundation; either version 2, or (at your option)
>-# any later version.
>-
>-# This program is distributed in the hope that it will be useful,
>-# but WITHOUT ANY WARRANTY; without even the implied warranty of
>-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>-# GNU General Public License for more details.
>-
>-# You should have received a copy of the GNU General Public License
>-# along with this program; if not, write to the Free Software
>-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
>-# 02111-1307, USA.
>-
>-#serial 2
>+#serial 3
> 
> # _AM_OUTPUT_DEPENDENCY_COMMANDS
> # ------------------------------
> AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
>@@ -6322,30 +6718,19 @@
> ])
> 
> # Do all the work for Automake.                            -*- Autoconf -*-
> 
>-# This macro actually does too much some checks are only needed if
>-# your package does certain things.  But this isn't really a big deal.
>-
>-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
>+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
> # Free Software Foundation, Inc.
>+#
>+# This file is free software; the Free Software Foundation
>+# gives unlimited permission to copy and/or distribute it,
>+# with or without modifications, as long as this notice is preserved.
> 
>-# This program is free software; you can redistribute it and/or modify
>-# it under the terms of the GNU General Public License as published by
>-# the Free Software Foundation; either version 2, or (at your option)
>-# any later version.
>-
>-# This program is distributed in the hope that it will be useful,
>-# but WITHOUT ANY WARRANTY; without even the implied warranty of
>-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>-# GNU General Public License for more details.
>+# serial 12
> 
>-# You should have received a copy of the GNU General Public License
>-# along with this program; if not, write to the Free Software
>-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
>-# 02111-1307, USA.
>-
>-# serial 11
>+# This macro actually does too much.  Some checks are only needed if
>+# your package does certain things.  But this isn't really a big deal.
> 
> # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
> # AM_INIT_AUTOMAKE([OPTIONS])
> # -----------------------------------------------
>@@ -6445,53 +6830,29 @@
>   esac
> done
> echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
> 
>+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
>+#
>+# This file is free software; the Free Software Foundation
>+# gives unlimited permission to copy and/or distribute it,
>+# with or without modifications, as long as this notice is preserved.
>+
> # AM_PROG_INSTALL_SH
> # ------------------
> # Define $install_sh.
>-
>-# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
>-
>-# This program is free software; you can redistribute it and/or modify
>-# it under the terms of the GNU General Public License as published by
>-# the Free Software Foundation; either version 2, or (at your option)
>-# any later version.
>-
>-# This program is distributed in the hope that it will be useful,
>-# but WITHOUT ANY WARRANTY; without even the implied warranty of
>-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>-# GNU General Public License for more details.
>-
>-# You should have received a copy of the GNU General Public License
>-# along with this program; if not, write to the Free Software
>-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
>-# 02111-1307, USA.
>-
> AC_DEFUN([AM_PROG_INSTALL_SH],
> [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
> install_sh=${install_sh-"$am_aux_dir/install-sh"}
> AC_SUBST(install_sh)])
> 
>-#                                                          -*- Autoconf -*-
>-# Copyright (C) 2003  Free Software Foundation, Inc.
>-
>-# This program is free software; you can redistribute it and/or modify
>-# it under the terms of the GNU General Public License as published by
>-# the Free Software Foundation; either version 2, or (at your option)
>-# any later version.
>-
>-# This program is distributed in the hope that it will be useful,
>-# but WITHOUT ANY WARRANTY; without even the implied warranty of
>-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>-# GNU General Public License for more details.
>-
>-# You should have received a copy of the GNU General Public License
>-# along with this program; if not, write to the Free Software
>-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
>-# 02111-1307, USA.
>+# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
>+#
>+# This file is free software; the Free Software Foundation
>+# gives unlimited permission to copy and/or distribute it,
>+# with or without modifications, as long as this notice is preserved.
> 
>-# serial 1
>+# serial 2
> 
> # Check whether the underlying file-system supports filenames
> # with a leading dot.  For instance MS-DOS doesn't.
> AC_DEFUN([AM_SET_LEADING_DOT],
>@@ -6504,30 +6865,19 @@
> fi
> rmdir .tst 2>/dev/null
> AC_SUBST([am__leading_dot])])
> 
>-# Add --enable-maintainer-mode option to configure.
>+# Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
> # From Jim Meyering
> 
>-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004
>+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
> # Free Software Foundation, Inc.
>+#
>+# This file is free software; the Free Software Foundation
>+# gives unlimited permission to copy and/or distribute it,
>+# with or without modifications, as long as this notice is preserved.
> 
>-# This program is free software; you can redistribute it and/or modify
>-# it under the terms of the GNU General Public License as published by
>-# the Free Software Foundation; either version 2, or (at your option)
>-# any later version.
>-
>-# This program is distributed in the hope that it will be useful,
>-# but WITHOUT ANY WARRANTY; without even the implied warranty of
>-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>-# GNU General Public License for more details.
>-
>-# You should have received a copy of the GNU General Public License
>-# along with this program; if not, write to the Free Software
>-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
>-# 02111-1307, USA.
>-
>-# serial 3
>+# serial 4
> 
> AC_DEFUN([AM_MAINTAINER_MODE],
> [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
>   dnl maintainer-mode is disabled by default
>@@ -6546,26 +6896,15 @@
> AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
> 
> # Check to see how 'make' treats includes.      -*- Autoconf -*-
> 
>-# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
>-
>-# This program is free software; you can redistribute it and/or modify
>-# it under the terms of the GNU General Public License as published by
>-# the Free Software Foundation; either version 2, or (at your option)
>-# any later version.
>-
>-# This program is distributed in the hope that it will be useful,
>-# but WITHOUT ANY WARRANTY; without even the implied warranty of
>-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>-# GNU General Public License for more details.
>-
>-# You should have received a copy of the GNU General Public License
>-# along with this program; if not, write to the Free Software
>-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
>-# 02111-1307, USA.
>+# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
>+#
>+# This file is free software; the Free Software Foundation
>+# gives unlimited permission to copy and/or distribute it,
>+# with or without modifications, as long as this notice is preserved.
> 
>-# serial 2
>+# serial 3
> 
> # AM_MAKE_INCLUDE()
> # -----------------
> # Check to see how make treats includes.
>@@ -6607,31 +6946,19 @@
> AC_MSG_RESULT([$_am_result])
> rm -f confinc confmf
> ])
> 
>-# serial 2
>+# Copyright (C) 1999, 2000, 2001, 2003, 2005  Free Software Foundation, Inc.
>+#
>+# This file is free software; the Free Software Foundation
>+# gives unlimited permission to copy and/or distribute it,
>+# with or without modifications, as long as this notice is preserved.
>+
>+# serial 3
> 
> # AM_PROG_CC_C_O
> # --------------
> # Like AC_PROG_CC_C_O, but changed for automake.
>-
>-# Copyright (C) 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
>-
>-# This program is free software; you can redistribute it and/or modify
>-# it under the terms of the GNU General Public License as published by
>-# the Free Software Foundation; either version 2, or (at your option)
>-# any later version.
>-
>-# This program is distributed in the hope that it will be useful,
>-# but WITHOUT ANY WARRANTY; without even the implied warranty of
>-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>-# GNU General Public License for more details.
>-
>-# You should have received a copy of the GNU General Public License
>-# along with this program; if not, write to the Free Software
>-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
>-# 02111-1307, USA.
>-
> AC_DEFUN([AM_PROG_CC_C_O],
> [AC_REQUIRE([AC_PROG_CC_C_O])dnl
> AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
> # FIXME: we rely on the cache variable name because
>@@ -6647,29 +6974,18 @@
>    CC="$am_aux_dir/compile $CC"
> fi
> ])
> 
>-#  -*- Autoconf -*-
>-
>+# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
> 
>-# Copyright (C) 1997, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
>-
>-# This program is free software; you can redistribute it and/or modify
>-# it under the terms of the GNU General Public License as published by
>-# the Free Software Foundation; either version 2, or (at your option)
>-# any later version.
>-
>-# This program is distributed in the hope that it will be useful,
>-# but WITHOUT ANY WARRANTY; without even the implied warranty of
>-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>-# GNU General Public License for more details.
>+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
>+# Free Software Foundation, Inc.
>+#
>+# This file is free software; the Free Software Foundation
>+# gives unlimited permission to copy and/or distribute it,
>+# with or without modifications, as long as this notice is preserved.
> 
>-# You should have received a copy of the GNU General Public License
>-# along with this program; if not, write to the Free Software
>-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
>-# 02111-1307, USA.
>-
>-# serial 3
>+# serial 4
> 
> # AM_MISSING_PROG(NAME, PROGRAM)
> # ------------------------------
> AC_DEFUN([AM_MISSING_PROG],
>@@ -6693,29 +7009,18 @@
>   AC_MSG_WARN([`missing' script is too old or missing])
> fi
> ])
> 
>+# Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
>+#
>+# This file is free software; the Free Software Foundation
>+# gives unlimited permission to copy and/or distribute it,
>+# with or without modifications, as long as this notice is preserved.
>+
> # AM_PROG_MKDIR_P
> # ---------------
> # Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
>-
>-# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
>-
>-# This program is free software; you can redistribute it and/or modify
>-# it under the terms of the GNU General Public License as published by
>-# the Free Software Foundation; either version 2, or (at your option)
>-# any later version.
>-
>-# This program is distributed in the hope that it will be useful,
>-# but WITHOUT ANY WARRANTY; without even the implied warranty of
>-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>-# GNU General Public License for more details.
>-
>-# You should have received a copy of the GNU General Public License
>-# along with this program; if not, write to the Free Software
>-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
>-# 02111-1307, USA.
>-
>+#
> # Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
> # created by `make install' are always world readable, even if the
> # installer happens to have an overly restrictive umask (e.g. 077).
> # This was a mistake.  There are at least two reasons why we must not
>@@ -6769,26 +7074,15 @@
> AC_SUBST([mkdir_p])])
> 
> # Helper functions for option handling.                    -*- Autoconf -*-
> 
>-# Copyright (C) 2001, 2002, 2003  Free Software Foundation, Inc.
>-
>-# This program is free software; you can redistribute it and/or modify
>-# it under the terms of the GNU General Public License as published by
>-# the Free Software Foundation; either version 2, or (at your option)
>-# any later version.
>-
>-# This program is distributed in the hope that it will be useful,
>-# but WITHOUT ANY WARRANTY; without even the implied warranty of
>-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>-# GNU General Public License for more details.
>-
>-# You should have received a copy of the GNU General Public License
>-# along with this program; if not, write to the Free Software
>-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
>-# 02111-1307, USA.
>+# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
>+#
>+# This file is free software; the Free Software Foundation
>+# gives unlimited permission to copy and/or distribute it,
>+# with or without modifications, as long as this notice is preserved.
> 
>-# serial 2
>+# serial 3
> 
> # _AM_MANGLE_OPTION(NAME)
> # -----------------------
> AC_DEFUN([_AM_MANGLE_OPTION],
>@@ -6811,30 +7105,18 @@
> # Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
> AC_DEFUN([_AM_IF_OPTION],
> [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
> 
>-#
>-# Check to make sure that the build environment is sane.
>-#
>-
>-# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
>-
>-# This program is free software; you can redistribute it and/or modify
>-# it under the terms of the GNU General Public License as published by
>-# the Free Software Foundation; either version 2, or (at your option)
>-# any later version.
>-
>-# This program is distributed in the hope that it will be useful,
>-# but WITHOUT ANY WARRANTY; without even the implied warranty of
>-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>-# GNU General Public License for more details.
>+# Check to make sure that the build environment is sane.    -*- Autoconf -*-
> 
>-# You should have received a copy of the GNU General Public License
>-# along with this program; if not, write to the Free Software
>-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
>-# 02111-1307, USA.
>+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
>+# Free Software Foundation, Inc.
>+#
>+# This file is free software; the Free Software Foundation
>+# gives unlimited permission to copy and/or distribute it,
>+# with or without modifications, as long as this notice is preserved.
> 
>-# serial 3
>+# serial 4
> 
> # AM_SANITY_CHECK
> # ---------------
> AC_DEFUN([AM_SANITY_CHECK],
>@@ -6875,27 +7157,16 @@
> Check your system clock])
> fi
> AC_MSG_RESULT(yes)])
> 
>-# AM_PROG_INSTALL_STRIP
>-
>-# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
>-
>-# This program is free software; you can redistribute it and/or modify
>-# it under the terms of the GNU General Public License as published by
>-# the Free Software Foundation; either version 2, or (at your option)
>-# any later version.
>-
>-# This program is distributed in the hope that it will be useful,
>-# but WITHOUT ANY WARRANTY; without even the implied warranty of
>-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>-# GNU General Public License for more details.
>-
>-# You should have received a copy of the GNU General Public License
>-# along with this program; if not, write to the Free Software
>-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
>-# 02111-1307, USA.
>+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
>+#
>+# This file is free software; the Free Software Foundation
>+# gives unlimited permission to copy and/or distribute it,
>+# with or without modifications, as long as this notice is preserved.
> 
>+# AM_PROG_INSTALL_STRIP
>+# ---------------------
> # One issue with vendor `install' (even GNU) is that you can't
> # specify the program used to strip binaries.  This is especially
> # annoying in cross-compiling environments, where the build's strip
> # is unlikely to handle the host's binaries.
>@@ -6916,27 +7187,15 @@
> AC_SUBST([INSTALL_STRIP_PROGRAM])])
> 
> # Check how to create a tarball.                            -*- Autoconf -*-
> 
>-# Copyright (C) 2004  Free Software Foundation, Inc.
>-
>-# This program is free software; you can redistribute it and/or modify
>-# it under the terms of the GNU General Public License as published by
>-# the Free Software Foundation; either version 2, or (at your option)
>-# any later version.
>-
>-# This program is distributed in the hope that it will be useful,
>-# but WITHOUT ANY WARRANTY; without even the implied warranty of
>-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>-# GNU General Public License for more details.
>-
>-# You should have received a copy of the GNU General Public License
>-# along with this program; if not, write to the Free Software
>-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
>-# 02111-1307, USA.
>-
>-# serial 1
>+# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
>+#
>+# This file is free software; the Free Software Foundation
>+# gives unlimited permission to copy and/or distribute it,
>+# with or without modifications, as long as this notice is preserved.
> 
>+# serial 2
> 
> # _AM_PROG_TAR(FORMAT)
> # --------------------
> # Check how to create a tarball in format FORMAT.
>Index: compile
>===================================================================
>RCS file: /cvs/dirsec/setuputil/compile,v
>retrieving revision 1.1
>diff -t -w -U4 -r1.1 compile
>--- compile	5 Apr 2007 01:53:36 -0000	1.1
>+++ compile	13 Apr 2007 20:24:17 -0000
>@@ -1,10 +1,10 @@
> #! /bin/sh
> # Wrapper for compilers which do not understand `-c -o'.
> 
>-scriptversion=2004-09-10.20
>+scriptversion=2005-05-14.22
> 
>-# Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc.
>+# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
> # Written by Tom Tromey <tromey@cygnus.com>.
> #
> # This program is free software; you can redistribute it and/or modify
> # it under the terms of the GNU General Public License as published by
>@@ -17,9 +17,9 @@
> # GNU General Public License for more details.
> #
> # You should have received a copy of the GNU General Public License
> # along with this program; if not, write to the Free Software
>-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
>+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
> 
> # As a special exception to the GNU General Public License, if you
> # distribute this file as part of a program that contains a
> # configuration script generated by Autoconf, you may include it under
>@@ -46,13 +46,13 @@
> right script to run: please start by reading the file `INSTALL'.
> 
> Report bugs to <bug-automake@gnu.org>.
> EOF
>-    exit 0
>+    exit $?
>     ;;
>   -v | --v*)
>     echo "compile $scriptversion"
>-    exit 0
>+    exit $?
>     ;;
> esac
> 
> ofile=
>@@ -124,8 +124,10 @@
> ret=$?
> 
> if test -f "$cofile"; then
>   mv "$cofile" "$ofile"
>+elif test -f "${cofile}bj"; then
>+  mv "${cofile}bj" "$ofile"
> fi
> 
> rmdir "$lockdir"
> exit $ret
>Index: config.guess
>===================================================================
>RCS file: /cvs/dirsec/setuputil/config.guess,v
>retrieving revision 1.1
>diff -t -w -U4 -r1.1 config.guess
>--- config.guess	5 Apr 2007 01:53:36 -0000	1.1
>+++ config.guess	13 Apr 2007 20:24:18 -0000
>@@ -1,10 +1,10 @@
> #! /bin/sh
> # Attempt to guess a canonical system name.
> #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
>-#   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
>+#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
> 
>-timestamp='2004-09-07'
>+timestamp='2005-07-08'
> 
> # This file is free software; you can redistribute it and/or modify it
> # under the terms of the GNU General Public License as published by
> # the Free Software Foundation; either version 2 of the License, or
>@@ -16,15 +16,17 @@
> # General Public License for more details.
> #
> # You should have received a copy of the GNU General Public License
> # along with this program; if not, write to the Free Software
>-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
>+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
>+# 02110-1301, USA.
> #
> # As a special exception to the GNU General Public License, if you
> # distribute this file as part of a program that contains a
> # configuration script generated by Autoconf, you may include it under
> # the same distribution terms that you use for the rest of that program.
> 
>+
> # Originally written by Per Bothner <per@bothner.com>.
> # Please send patches to <config-patches@gnu.org>.  Submit a context
> # diff and a properly formatted ChangeLog entry.
> #
>@@ -52,9 +54,9 @@
> version="\
> GNU config.guess ($timestamp)
> 
> Originally written by Per Bothner.
>-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
>+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
> Free Software Foundation, Inc.
> 
> This is free software; see the source for copying conditions.  There is NO
> warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
>@@ -65,13 +67,13 @@
> # Parse command line
> while test $# -gt 0 ; do
>   case $1 in
>     --time-stamp | --time* | -t )
>-       echo "$timestamp" ; exit 0 ;;
>+       echo "$timestamp" ; exit ;;
>     --version | -v )
>-       echo "$version" ; exit 0 ;;
>+       echo "$version" ; exit ;;
>     --help | --h* | -h )
>-       echo "$usage"; exit 0 ;;
>+       echo "$usage"; exit ;;
>     -- )     # Stop option processing
>        shift; break ;;
>     - ) # Use stdin as input.
>        break ;;
>@@ -122,9 +124,9 @@
>         fi
>         ;;
>  ,,*)   CC_FOR_BUILD=$CC ;;
>  ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
>-esac ;'
>+esac ; set_cc_for_build= ;'
> 
> # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
> # (ghazi@noc.rutgers.edu 1994-08-24)
> if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
>@@ -195,57 +197,22 @@
>         # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
>         # contains redundant information, the shorter form:
>         # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
>         echo "${machine}-${os}${release}"
>-        exit 0 ;;
>-    amd64:OpenBSD:*:*)
>-        echo x86_64-unknown-openbsd${UNAME_RELEASE}
>-        exit 0 ;;
>-    amiga:OpenBSD:*:*)
>-        echo m68k-unknown-openbsd${UNAME_RELEASE}
>-        exit 0 ;;
>-    cats:OpenBSD:*:*)
>-        echo arm-unknown-openbsd${UNAME_RELEASE}
>-        exit 0 ;;
>-    hp300:OpenBSD:*:*)
>-        echo m68k-unknown-openbsd${UNAME_RELEASE}
>-        exit 0 ;;
>-    luna88k:OpenBSD:*:*)
>-        echo m88k-unknown-openbsd${UNAME_RELEASE}
>-        exit 0 ;;
>-    mac68k:OpenBSD:*:*)
>-        echo m68k-unknown-openbsd${UNAME_RELEASE}
>-        exit 0 ;;
>-    macppc:OpenBSD:*:*)
>-        echo powerpc-unknown-openbsd${UNAME_RELEASE}
>-        exit 0 ;;
>-    mvme68k:OpenBSD:*:*)
>-        echo m68k-unknown-openbsd${UNAME_RELEASE}
>-        exit 0 ;;
>-    mvme88k:OpenBSD:*:*)
>-        echo m88k-unknown-openbsd${UNAME_RELEASE}
>-        exit 0 ;;
>-    mvmeppc:OpenBSD:*:*)
>-        echo powerpc-unknown-openbsd${UNAME_RELEASE}
>-        exit 0 ;;
>-    sgi:OpenBSD:*:*)
>-        echo mips64-unknown-openbsd${UNAME_RELEASE}
>-        exit 0 ;;
>-    sun3:OpenBSD:*:*)
>-        echo m68k-unknown-openbsd${UNAME_RELEASE}
>-        exit 0 ;;
>+        exit ;;
>     *:OpenBSD:*:*)
>-        echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
>-        exit 0 ;;
>+        UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
>+        echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
>+        exit ;;
>     *:ekkoBSD:*:*)
>         echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
>-        exit 0 ;;
>+        exit ;;
>     macppc:MirBSD:*:*)
>         echo powerppc-unknown-mirbsd${UNAME_RELEASE}
>-        exit 0 ;;
>+        exit ;;
>     *:MirBSD:*:*)
>         echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
>-        exit 0 ;;
>+        exit ;;
>     alpha:OSF1:*:*)
>         case $UNAME_RELEASE in
>         *4.0)
>                 UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
>@@ -296,84 +263,90 @@
>         # A Tn.n version is a released field test version.
>         # A Xn.n version is an unreleased experimental baselevel.
>         # 1.2 uses "1.2" for uname -r.
>         echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
>-        exit 0 ;;
>+        exit ;;
>     Alpha\ *:Windows_NT*:*)
>         # How do we know it's Interix rather than the generic POSIX subsystem?
>         # Should we change UNAME_MACHINE based on the output of uname instead
>         # of the specific Alpha model?
>         echo alpha-pc-interix
>-        exit 0 ;;
>+        exit ;;
>     21064:Windows_NT:50:3)
>         echo alpha-dec-winnt3.5
>-        exit 0 ;;
>+        exit ;;
>     Amiga*:UNIX_System_V:4.0:*)
>         echo m68k-unknown-sysv4
>-        exit 0;;
>+        exit ;;
>     *:[Aa]miga[Oo][Ss]:*:*)
>         echo ${UNAME_MACHINE}-unknown-amigaos
>-        exit 0 ;;
>+        exit ;;
>     *:[Mm]orph[Oo][Ss]:*:*)
>         echo ${UNAME_MACHINE}-unknown-morphos
>-        exit 0 ;;
>+        exit ;;
>     *:OS/390:*:*)
>         echo i370-ibm-openedition
>-        exit 0 ;;
>+        exit ;;
>+    *:z/VM:*:*)
>+        echo s390-ibm-zvmoe
>+        exit ;;
>     *:OS400:*:*)
>         echo powerpc-ibm-os400
>-        exit 0 ;;
>+        exit ;;
>     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
>         echo arm-acorn-riscix${UNAME_RELEASE}
>-        exit 0;;
>+        exit ;;
>+    arm:riscos:*:*|arm:RISCOS:*:*)
>+        echo arm-unknown-riscos
>+        exit ;;
>     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
>         echo hppa1.1-hitachi-hiuxmpp
>-        exit 0;;
>+        exit ;;
>     Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
>         # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
>         if test "`(/bin/universe) 2>/dev/null`" = att ; then
>                 echo pyramid-pyramid-sysv3
>         else
>                 echo pyramid-pyramid-bsd
>         fi
>-        exit 0 ;;
>+        exit ;;
>     NILE*:*:*:dcosx)
>         echo pyramid-pyramid-svr4
>-        exit 0 ;;
>+        exit ;;
>     DRS?6000:unix:4.0:6*)
>         echo sparc-icl-nx6
>-        exit 0 ;;
>-    DRS?6000:UNIX_SV:4.2*:7*)
>+        exit ;;
>+    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
>         case `/usr/bin/uname -p` in
>-            sparc) echo sparc-icl-nx7 && exit 0 ;;
>+            sparc) echo sparc-icl-nx7; exit ;;
>         esac ;;
>     sun4H:SunOS:5.*:*)
>         echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
>-        exit 0 ;;
>+        exit ;;
>     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
>         echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
>-        exit 0 ;;
>+        exit ;;
>     i86pc:SunOS:5.*:*)
>         echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
>-        exit 0 ;;
>+        exit ;;
>     sun4*:SunOS:6*:*)
>         # According to config.sub, this is the proper way to canonicalize
>         # SunOS6.  Hard to guess exactly what SunOS6 will be like, but
>         # it's likely to be more like Solaris than SunOS4.
>         echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
>-        exit 0 ;;
>+        exit ;;
>     sun4*:SunOS:*:*)
>         case "`/usr/bin/arch -k`" in
>             Series*|S4*)
>                 UNAME_RELEASE=`uname -v`
>                 ;;
>         esac
>         # Japanese Language versions have a version number like `4.1.3-JL'.
>         echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
>-        exit 0 ;;
>+        exit ;;
>     sun3*:SunOS:*:*)
>         echo m68k-sun-sunos${UNAME_RELEASE}
>-        exit 0 ;;
>+        exit ;;
>     sun*:*:4.2BSD:*)
>         UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
>         test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
>         case "`/bin/arch`" in
>@@ -383,12 +356,12 @@
>             sun4)
>                 echo sparc-sun-sunos${UNAME_RELEASE}
>                 ;;
>         esac
>-        exit 0 ;;
>+        exit ;;
>     aushp:SunOS:*:*)
>         echo sparc-auspex-sunos${UNAME_RELEASE}
>-        exit 0 ;;
>+        exit ;;
>     # The situation for MiNT is a little confusing.  The machine name
>     # can be virtually everything (everything which is not
>     # "atarist" or "atariste" at least should have a processor
>     # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
>@@ -397,42 +370,42 @@
>     # MiNT.  But MiNT is downward compatible to TOS, so this should
>     # be no problem.
>     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
>         echo m68k-atari-mint${UNAME_RELEASE}
>-        exit 0 ;;
>+        exit ;;
>     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
>         echo m68k-atari-mint${UNAME_RELEASE}
>-        exit 0 ;;
>+        exit ;;
>     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
>         echo m68k-atari-mint${UNAME_RELEASE}
>-        exit 0 ;;
>+        exit ;;
>     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
>         echo m68k-milan-mint${UNAME_RELEASE}
>-        exit 0 ;;
>+        exit ;;
>     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
>         echo m68k-hades-mint${UNAME_RELEASE}
>-        exit 0 ;;
>+        exit ;;
>     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
>         echo m68k-unknown-mint${UNAME_RELEASE}
>-        exit 0 ;;
>+        exit ;;
>     m68k:machten:*:*)
>         echo m68k-apple-machten${UNAME_RELEASE}
>-        exit 0 ;;
>+        exit ;;
>     powerpc:machten:*:*)
>         echo powerpc-apple-machten${UNAME_RELEASE}
>-        exit 0 ;;
>+        exit ;;
>     RISC*:Mach:*:*)
>         echo mips-dec-mach_bsd4.3
>-        exit 0 ;;
>+        exit ;;
>     RISC*:ULTRIX:*:*)
>         echo mips-dec-ultrix${UNAME_RELEASE}
>-        exit 0 ;;
>+        exit ;;
>     VAX*:ULTRIX*:*:*)
>         echo vax-dec-ultrix${UNAME_RELEASE}
>-        exit 0 ;;
>+        exit ;;
>     2020:CLIX:*:* | 2430:CLIX:*:*)
>         echo clipper-intergraph-clix${UNAME_RELEASE}
>-        exit 0 ;;
>+        exit ;;
>     mips:*:*:UMIPS | mips:*:*:RISCos)
>         eval $set_cc_for_build
>         sed 's/^        //' << EOF >$dummy.c
> #ifdef __cplusplus
>@@ -454,34 +427,35 @@
>         #endif
>           exit (-1);
>         }
> EOF
>-        $CC_FOR_BUILD -o $dummy $dummy.c \
>-          && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/$[0-9]*$.*/\1/p'` \
>-          && exit 0
>+        $CC_FOR_BUILD -o $dummy $dummy.c &&
>+          dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/$[0-9]*$.*/\1/p'` &&
>+          SYSTEM_NAME=`$dummy $dummyarg` &&
>+            { echo "$SYSTEM_NAME"; exit; }
>         echo mips-mips-riscos${UNAME_RELEASE}
>-        exit 0 ;;
>+        exit ;;
>     Motorola:PowerMAX_OS:*:*)
>         echo powerpc-motorola-powermax
>-        exit 0 ;;
>+        exit ;;
>     Motorola:*:4.3:PL8-*)
>         echo powerpc-harris-powermax
>-        exit 0 ;;
>+        exit ;;
>     Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
>         echo powerpc-harris-powermax
>-        exit 0 ;;
>+        exit ;;
>     Night_Hawk:Power_UNIX:*:*)
>         echo powerpc-harris-powerunix
>-        exit 0 ;;
>+        exit ;;
>     m88k:CX/UX:7*:*)
>         echo m88k-harris-cxux7
>-        exit 0 ;;
>+        exit ;;
>     m88k:*:4*:R4*)
>         echo m88k-motorola-sysv4
>-        exit 0 ;;
>+        exit ;;
>     m88k:*:3*:R3*)
>         echo m88k-motorola-sysv3
>-        exit 0 ;;
>+        exit ;;
>     AViiON:dgux:*:*)
>         # DG/UX returns AViiON for all architectures
>         UNAME_PROCESSOR=`/usr/bin/uname -p`
>         if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
>@@ -495,39 +469,39 @@
>             fi
>         else
>             echo i586-dg-dgux${UNAME_RELEASE}
>         fi
>-        exit 0 ;;
>+        exit ;;
>     M88*:DolphinOS:*:*) # DolphinOS (SVR3)
>         echo m88k-dolphin-sysv3
>-        exit 0 ;;
>+        exit ;;
>     M88*:*:R3*:*)
>         # Delta 88k system running SVR3
>         echo m88k-motorola-sysv3
>-        exit 0 ;;
>+        exit ;;
>     XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
>         echo m88k-tektronix-sysv3
>-        exit 0 ;;
>+        exit ;;
>     Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
>         echo m68k-tektronix-bsd
>-        exit 0 ;;
>+        exit ;;
>     *:IRIX*:*:*)
>         echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
>-        exit 0 ;;
>+        exit ;;
>     ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
>         echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
>-        exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
>+        exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
>     i*86:AIX:*:*)
>         echo i386-ibm-aix
>-        exit 0 ;;
>+        exit ;;
>     ia64:AIX:*:*)
>         if [ -x /usr/bin/oslevel ] ; then
>                 IBM_REV=`/usr/bin/oslevel`
>         else
>                 IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
>         fi
>         echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
>-        exit 0 ;;
>+        exit ;;
>     *:AIX:2:3)
>         if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
>                 eval $set_cc_for_build
>                 sed 's/^                //' << EOF >$dummy.c
>@@ -540,16 +514,20 @@
>                         puts("powerpc-ibm-aix3.2.5");
>                         exit(0);
>                         }
> EOF
>-                $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
>+                if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
>+                then
>+                        echo "$SYSTEM_NAME"
>+                else
>                 echo rs6000-ibm-aix3.2.5
>+                fi
>         elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
>                 echo rs6000-ibm-aix3.2.4
>         else
>                 echo rs6000-ibm-aix3.2
>         fi
>-        exit 0 ;;
>+        exit ;;
>     *:AIX:*:[45])
>         IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
>         if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
>                 IBM_ARCH=rs6000
>@@ -561,30 +539,30 @@
>         else
>                 IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
>         fi
>         echo ${IBM_ARCH}-ibm-aix${IBM_REV}
>-        exit 0 ;;
>+        exit ;;
>     *:AIX:*:*)
>         echo rs6000-ibm-aix
>-        exit 0 ;;
>+        exit ;;
>     ibmrt:4.4BSD:*|romp-ibm:BSD:*)
>         echo romp-ibm-bsd4.4
>-        exit 0 ;;
>+        exit ;;
>     ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
>         echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
>-        exit 0 ;;                           # report: romp-ibm BSD 4.3
>+        exit ;;                             # report: romp-ibm BSD 4.3
>     *:BOSX:*:*)
>         echo rs6000-bull-bosx
>-        exit 0 ;;
>+        exit ;;
>     DPX/2?00:B.O.S.:*:*)
>         echo m68k-bull-sysv3
>-        exit 0 ;;
>+        exit ;;
>     9000/[34]??:4.3bsd:1.*:*)
>         echo m68k-hp-bsd
>-        exit 0 ;;
>+        exit ;;
>     hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
>         echo m68k-hp-bsd4.4
>-        exit 0 ;;
>+        exit ;;
>     9000/[34678]??:HP-UX:*:*)
>         HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
>         case "${UNAME_MACHINE}" in
>             9000/31? )            HP_ARCH=m68000 ;;
>@@ -644,23 +622,33 @@
>                 fi ;;
>         esac
>         if [ ${HP_ARCH} = "hppa2.0w" ]
>         then
>-            # avoid double evaluation of $set_cc_for_build
>-            test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
>-            if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
>+            eval $set_cc_for_build
>+
>+            # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
>+            # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
>+            # generating 64-bit code.  GNU and HP use different nomenclature:
>+            #
>+            # $ CC_FOR_BUILD=cc ./config.guess
>+            # => hppa2.0w-hp-hpux11.23
>+            # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
>+            # => hppa64-hp-hpux11.23
>+
>+            if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
>+                grep __LP64__ >/dev/null
>             then
>                 HP_ARCH="hppa2.0w"
>             else
>                 HP_ARCH="hppa64"
>             fi
>         fi
>         echo ${HP_ARCH}-hp-hpux${HPUX_REV}
>-        exit 0 ;;
>+        exit ;;
>     ia64:HP-UX:*:*)
>         HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
>         echo ia64-hp-hpux${HPUX_REV}
>-        exit 0 ;;
>+        exit ;;
>     3050*:HI-UX:*:*)
>         eval $set_cc_for_build
>         sed 's/^        //' << EOF >$dummy.c
>         #include <unistd.h>
>@@ -686,160 +674,168 @@
>           else puts ("unknown-hitachi-hiuxwe2");
>           exit (0);
>         }
> EOF
>-        $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
>+        $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
>+                { echo "$SYSTEM_NAME"; exit; }
>         echo unknown-hitachi-hiuxwe2
>-        exit 0 ;;
>+        exit ;;
>     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
>         echo hppa1.1-hp-bsd
>-        exit 0 ;;
>+        exit ;;
>     9000/8??:4.3bsd:*:*)
>         echo hppa1.0-hp-bsd
>-        exit 0 ;;
>+        exit ;;
>     *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
>         echo hppa1.0-hp-mpeix
>-        exit 0 ;;
>+        exit ;;
>     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
>         echo hppa1.1-hp-osf
>-        exit 0 ;;
>+        exit ;;
>     hp8??:OSF1:*:*)
>         echo hppa1.0-hp-osf
>-        exit 0 ;;
>+        exit ;;
>     i*86:OSF1:*:*)
>         if [ -x /usr/sbin/sysversion ] ; then
>             echo ${UNAME_MACHINE}-unknown-osf1mk
>         else
>             echo ${UNAME_MACHINE}-unknown-osf1
>         fi
>-        exit 0 ;;
>+        exit ;;
>     parisc*:Lites*:*:*)
>         echo hppa1.1-hp-lites
>-        exit 0 ;;
>+        exit ;;
>     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
>         echo c1-convex-bsd
>-        exit 0 ;;
>+        exit ;;
>     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
>         if getsysinfo -f scalar_acc
>         then echo c32-convex-bsd
>         else echo c2-convex-bsd
>         fi
>-        exit 0 ;;
>+        exit ;;
>     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
>         echo c34-convex-bsd
>-        exit 0 ;;
>+        exit ;;
>     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
>         echo c38-convex-bsd
>-        exit 0 ;;
>+        exit ;;
>     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
>         echo c4-convex-bsd
>-        exit 0 ;;
>+        exit ;;
>     CRAY*Y-MP:*:*:*)
>         echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
>-        exit 0 ;;
>+        exit ;;
>     CRAY*[A-Z]90:*:*:*)
>         echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
>         | sed -e 's/CRAY.*$[A-Z]90$/\1/' \
>               -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
>               -e 's/\.[^.]*$/.X/'
>-        exit 0 ;;
>+        exit ;;
>     CRAY*TS:*:*:*)
>         echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
>-        exit 0 ;;
>+        exit ;;
>     CRAY*T3E:*:*:*)
>         echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
>-        exit 0 ;;
>+        exit ;;
>     CRAY*SV1:*:*:*)
>         echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
>-        exit 0 ;;
>+        exit ;;
>     *:UNICOS/mp:*:*)
>         echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
>-        exit 0 ;;
>+        exit ;;
>     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
>         FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
>         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
>         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
>         echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
>-        exit 0 ;;
>+        exit ;;
>     5000:UNIX_System_V:4.*:*)
>         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
>         FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
>         echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
>-        exit 0 ;;
>+        exit ;;
>     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
>         echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
>-        exit 0 ;;
>+        exit ;;
>     sparc*:BSD/OS:*:*)
>         echo sparc-unknown-bsdi${UNAME_RELEASE}
>-        exit 0 ;;
>+        exit ;;
>     *:BSD/OS:*:*)
>         echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
>-        exit 0 ;;
>+        exit ;;
>     *:FreeBSD:*:*)
>         echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
>-        exit 0 ;;
>+        exit ;;
>     i*:CYGWIN*:*)
>         echo ${UNAME_MACHINE}-pc-cygwin
>-        exit 0 ;;
>+        exit ;;
>     i*:MINGW*:*)
>         echo ${UNAME_MACHINE}-pc-mingw32
>-        exit 0 ;;
>+        exit ;;
>+    i*:windows32*:*)
>+        # uname -m includes "-pc" on this system.
>+        echo ${UNAME_MACHINE}-mingw32
>+        exit ;;
>     i*:PW*:*)
>         echo ${UNAME_MACHINE}-pc-pw32
>-        exit 0 ;;
>+        exit ;;
>     x86:Interix*:[34]*)
>         echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
>-        exit 0 ;;
>+        exit ;;
>     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
>         echo i${UNAME_MACHINE}-pc-mks
>-        exit 0 ;;
>+        exit ;;
>     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
>         # How do we know it's Interix rather than the generic POSIX subsystem?
>         # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
>         # UNAME_MACHINE based on the output of uname instead of i386?
>         echo i586-pc-interix
>-        exit 0 ;;
>+        exit ;;
>     i*:UWIN*:*)
>         echo ${UNAME_MACHINE}-pc-uwin
>-        exit 0 ;;
>+        exit ;;
>+    amd64:CYGWIN*:*:*)
>+        echo x86_64-unknown-cygwin
>+        exit ;;
>     p*:CYGWIN*:*)
>         echo powerpcle-unknown-cygwin
>-        exit 0 ;;
>+        exit ;;
>     prep*:SunOS:5.*:*)
>         echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
>-        exit 0 ;;
>+        exit ;;
>     *:GNU:*:*)
>         # the GNU system
>         echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
>-        exit 0 ;;
>+        exit ;;
>     *:GNU/*:*:*)
>         # other systems with GNU libc and userland
>         echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
>-        exit 0 ;;
>+        exit ;;
>     i*86:Minix:*:*)
>         echo ${UNAME_MACHINE}-pc-minix
>-        exit 0 ;;
>+        exit ;;
>     arm*:Linux:*:*)
>         echo ${UNAME_MACHINE}-unknown-linux-gnu
>-        exit 0 ;;
>+        exit ;;
>     cris:Linux:*:*)
>         echo cris-axis-linux-gnu
>-        exit 0 ;;
>+        exit ;;
>     crisv32:Linux:*:*)
>         echo crisv32-axis-linux-gnu
>-        exit 0 ;;
>+        exit ;;
>     frv:Linux:*:*)
>         echo frv-unknown-linux-gnu
>-        exit 0 ;;
>+        exit ;;
>     ia64:Linux:*:*)
>         echo ${UNAME_MACHINE}-unknown-linux-gnu
>-        exit 0 ;;
>+        exit ;;
>     m32r*:Linux:*:*)
>         echo ${UNAME_MACHINE}-unknown-linux-gnu
>-        exit 0 ;;
>+        exit ;;
>     m68*:Linux:*:*)
>         echo ${UNAME_MACHINE}-unknown-linux-gnu
>-        exit 0 ;;
>+        exit ;;
>     mips:Linux:*:*)
>         eval $set_cc_for_build
>         sed 's/^        //' << EOF >$dummy.c
>         #undef CPU
>@@ -855,9 +851,9 @@
>         #endif
>         #endif
> EOF
>         eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
>-        test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
>+        test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
>         ;;
>     mips64:Linux:*:*)
>         eval $set_cc_for_build
>         sed 's/^        //' << EOF >$dummy.c
>@@ -874,16 +870,16 @@
>         #endif
>         #endif
> EOF
>         eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
>-        test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
>+        test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
>         ;;
>     ppc:Linux:*:*)
>         echo powerpc-unknown-linux-gnu
>-        exit 0 ;;
>+        exit ;;
>     ppc64:Linux:*:*)
>         echo powerpc64-unknown-linux-gnu
>-        exit 0 ;;
>+        exit ;;
>     alpha:Linux:*:*)
>         case `sed -n '/^cpu model/s/^.*: $.*$/\1/p' < /proc/cpuinfo` in
>           EV5)   UNAME_MACHINE=alphaev5 ;;
>           EV56)  UNAME_MACHINE=alphaev56 ;;
>@@ -895,35 +891,35 @@
>         esac
>         objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
>         if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
>         echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
>-        exit 0 ;;
>+        exit ;;
>     parisc:Linux:*:* | hppa:Linux:*:*)
>         # Look for CPU level
>         case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
>           PA7*) echo hppa1.1-unknown-linux-gnu ;;
>           PA8*) echo hppa2.0-unknown-linux-gnu ;;
>           *)    echo hppa-unknown-linux-gnu ;;
>         esac
>-        exit 0 ;;
>+        exit ;;
>     parisc64:Linux:*:* | hppa64:Linux:*:*)
>         echo hppa64-unknown-linux-gnu
>-        exit 0 ;;
>+        exit ;;
>     s390:Linux:*:* | s390x:Linux:*:*)
>         echo ${UNAME_MACHINE}-ibm-linux
>-        exit 0 ;;
>+        exit ;;
>     sh64*:Linux:*:*)
>         echo ${UNAME_MACHINE}-unknown-linux-gnu
>-        exit 0 ;;
>+        exit ;;
>     sh*:Linux:*:*)
>         echo ${UNAME_MACHINE}-unknown-linux-gnu
>-        exit 0 ;;
>+        exit ;;
>     sparc:Linux:*:* | sparc64:Linux:*:*)
>         echo ${UNAME_MACHINE}-unknown-linux-gnu
>-        exit 0 ;;
>+        exit ;;
>     x86_64:Linux:*:*)
>         echo x86_64-unknown-linux-gnu
>-        exit 0 ;;
>+        exit ;;
>     i*86:Linux:*:*)
>         # The BFD linker knows what the default object file format is, so
>         # first see if it will tell us. cd to the root directory to prevent
>         # problems with other programs or directories called `ld' in the path.
>@@ -939,17 +935,17 @@
>                 TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
>                 ;;
>           a.out-i386-linux)
>                 echo "${UNAME_MACHINE}-pc-linux-gnuaout"
>-                exit 0 ;;
>+                exit ;;
>           coff-i386)
>                 echo "${UNAME_MACHINE}-pc-linux-gnucoff"
>-                exit 0 ;;
>+                exit ;;
>           "")
>                 # Either a pre-BFD a.out linker (linux-gnuoldld) or
>                 # one that does not give us useful --help.
>                 echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
>-                exit 0 ;;
>+                exit ;;
>         esac
>         # Determine whether the default compiler is a.out or elf
>         eval $set_cc_for_build
>         sed 's/^        //' << EOF >$dummy.c
>@@ -975,61 +971,65 @@
>         LIBC=dietlibc
>         #endif
> EOF
>         eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
>-        test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
>-        test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
>+        test x"${LIBC}" != x && {
>+                echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
>+                exit
>+        }
>+        test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
>         ;;
>     i*86:DYNIX/ptx:4*:*)
>         # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
>         # earlier versions are messed up and put the nodename in both
>         # sysname and nodename.
>         echo i386-sequent-sysv4
>-        exit 0 ;;
>+        exit ;;
>     i*86:UNIX_SV:4.2MP:2.*)
>         # Unixware is an offshoot of SVR4, but it has its own version
>         # number series starting with 2...
>         # I am not positive that other SVR4 systems won't match this,
>         # I just have to hope.  -- rms.
>         # Use sysv4.2uw... so that sysv4* matches it.
>         echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
>-        exit 0 ;;
>+        exit ;;
>     i*86:OS/2:*:*)
>         # If we were able to find `uname', then EMX Unix compatibility
>         # is probably installed.
>         echo ${UNAME_MACHINE}-pc-os2-emx
>-        exit 0 ;;
>+        exit ;;
>     i*86:XTS-300:*:STOP)
>         echo ${UNAME_MACHINE}-unknown-stop
>-        exit 0 ;;
>+        exit ;;
>     i*86:atheos:*:*)
>         echo ${UNAME_MACHINE}-unknown-atheos
>-        exit 0 ;;
>+        exit ;;
>         i*86:syllable:*:*)
>         echo ${UNAME_MACHINE}-pc-syllable
>-        exit 0 ;;
>+        exit ;;
>     i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
>         echo i386-unknown-lynxos${UNAME_RELEASE}
>-        exit 0 ;;
>+        exit ;;
>     i*86:*DOS:*:*)
>         echo ${UNAME_MACHINE}-pc-msdosdjgpp
>-        exit 0 ;;
>+        exit ;;
>     i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
>         UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
>         if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
>                 echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
>         else
>                 echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
>         fi
>-        exit 0 ;;
>-    i*86:*:5:[78]*)
>+        exit ;;
>+    i*86:*:5:[678]*)
>+        # UnixWare 7.x, OpenUNIX and OpenServer 6.
>         case `/bin/uname -X | grep "^Machine"` in
>             *486*)           UNAME_MACHINE=i486 ;;
>             *Pentium)        UNAME_MACHINE=i586 ;;
>             *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
>         esac
>         echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
>-        exit 0 ;;
>+        exit ;;
>     i*86:*:3.2:*)
>         if test -f /usr/options/cb.name; then
>                 UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
>                 echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
>@@ -1045,168 +1045,175 @@
>                 echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
>         else
>                 echo ${UNAME_MACHINE}-pc-sysv32
>         fi
>-        exit 0 ;;
>+        exit ;;
>     pc:*:*:*)
>         # Left here for compatibility:
>         # uname -m prints for DJGPP always 'pc', but it prints nothing about
>         # the processor, so we play safe by assuming i386.
>         echo i386-pc-msdosdjgpp
>-        exit 0 ;;
>+        exit ;;
>     Intel:Mach:3*:*)
>         echo i386-pc-mach3
>-        exit 0 ;;
>+        exit ;;
>     paragon:*:*:*)
>         echo i860-intel-osf1
>-        exit 0 ;;
>+        exit ;;
>     i860:*:4.*:*) # i860-SVR4
>         if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
>           echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
>         else # Add other i860-SVR4 vendors below as they are discovered.
>           echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
>         fi
>-        exit 0 ;;
>+        exit ;;
>     mini*:CTIX:SYS*5:*)
>         # "miniframe"
>         echo m68010-convergent-sysv
>-        exit 0 ;;
>+        exit ;;
>     mc68k:UNIX:SYSTEM5:3.51m)
>         echo m68k-convergent-sysv
>-        exit 0 ;;
>+        exit ;;
>     M680?0:D-NIX:5.3:*)
>         echo m68k-diab-dnix
>-        exit 0 ;;
>+        exit ;;
>     M68*:*:R3V[5678]*:*)
>-        test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
>+        test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
>     3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
>         OS_REL=''
>         test -r /etc/.relid \
>         && OS_REL=.`sed -n 's/[^ ]* [^ ]* $[0-9][0-9]$.*/\1/p' < /etc/.relid`
>         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
>-          && echo i486-ncr-sysv4.3${OS_REL} && exit 0
>+          && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
>         /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
>-          && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
>+          && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
>     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
>         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
>-          && echo i486-ncr-sysv4 && exit 0 ;;
>+          && { echo i486-ncr-sysv4; exit; } ;;
>     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
>         echo m68k-unknown-lynxos${UNAME_RELEASE}
>-        exit 0 ;;
>+        exit ;;
>     mc68030:UNIX_System_V:4.*:*)
>         echo m68k-atari-sysv4
>-        exit 0 ;;
>+        exit ;;
>     TSUNAMI:LynxOS:2.*:*)
>         echo sparc-unknown-lynxos${UNAME_RELEASE}
>-        exit 0 ;;
>+        exit ;;
>     rs6000:LynxOS:2.*:*)
>         echo rs6000-unknown-lynxos${UNAME_RELEASE}
>-        exit 0 ;;
>+        exit ;;
>     PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
>         echo powerpc-unknown-lynxos${UNAME_RELEASE}
>-        exit 0 ;;
>+        exit ;;
>     SM[BE]S:UNIX_SV:*:*)
>         echo mips-dde-sysv${UNAME_RELEASE}
>-        exit 0 ;;
>+        exit ;;
>     RM*:ReliantUNIX-*:*:*)
>         echo mips-sni-sysv4
>-        exit 0 ;;
>+        exit ;;
>     RM*:SINIX-*:*:*)
>         echo mips-sni-sysv4
>-        exit 0 ;;
>+        exit ;;
>     *:SINIX-*:*:*)
>         if uname -p 2>/dev/null >/dev/null ; then
>                 UNAME_MACHINE=`(uname -p) 2>/dev/null`
>                 echo ${UNAME_MACHINE}-sni-sysv4
>         else
>                 echo ns32k-sni-sysv
>         fi
>-        exit 0 ;;
>+        exit ;;
>     PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
>                       # says <Richard.M.Bartel@ccMail.Census.GOV>
>         echo i586-unisys-sysv4
>-        exit 0 ;;
>+        exit ;;
>     *:UNIX_System_V:4*:FTX*)
>         # From Gerald Hewes <hewes@openmarket.com>.
>         # How about differentiating between stratus architectures? -djm
>         echo hppa1.1-stratus-sysv4
>-        exit 0 ;;
>+        exit ;;
>     *:*:*:FTX*)
>         # From seanf@swdc.stratus.com.
>         echo i860-stratus-sysv4
>-        exit 0 ;;
>+        exit ;;
>+    i*86:VOS:*:*)
>+        # From Paul.Green@stratus.com.
>+        echo ${UNAME_MACHINE}-stratus-vos
>+        exit ;;
>     *:VOS:*:*)
>         # From Paul.Green@stratus.com.
>         echo hppa1.1-stratus-vos
>-        exit 0 ;;
>+        exit ;;
>     mc68*:A/UX:*:*)
>         echo m68k-apple-aux${UNAME_RELEASE}
>-        exit 0 ;;
>+        exit ;;
>     news*:NEWS-OS:6*:*)
>         echo mips-sony-newsos6
>-        exit 0 ;;
>+        exit ;;
>     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
>         if [ -d /usr/nec ]; then
>                 echo mips-nec-sysv${UNAME_RELEASE}
>         else
>                 echo mips-unknown-sysv${UNAME_RELEASE}
>         fi
>-        exit 0 ;;
>+        exit ;;
>     BeBox:BeOS:*:*)     # BeOS running on hardware made by Be, PPC only.
>         echo powerpc-be-beos
>-        exit 0 ;;
>+        exit ;;
>     BeMac:BeOS:*:*)     # BeOS running on Mac or Mac clone, PPC only.
>         echo powerpc-apple-beos
>-        exit 0 ;;
>+        exit ;;
>     BePC:BeOS:*:*)      # BeOS running on Intel PC compatible.
>         echo i586-pc-beos
>-        exit 0 ;;
>+        exit ;;
>     SX-4:SUPER-UX:*:*)
>         echo sx4-nec-superux${UNAME_RELEASE}
>-        exit 0 ;;
>+        exit ;;
>     SX-5:SUPER-UX:*:*)
>         echo sx5-nec-superux${UNAME_RELEASE}
>-        exit 0 ;;
>+        exit ;;
>     SX-6:SUPER-UX:*:*)
>         echo sx6-nec-superux${UNAME_RELEASE}
>-        exit 0 ;;
>+        exit ;;
>     Power*:Rhapsody:*:*)
>         echo powerpc-apple-rhapsody${UNAME_RELEASE}
>-        exit 0 ;;
>+        exit ;;
>     *:Rhapsody:*:*)
>         echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
>-        exit 0 ;;
>+        exit ;;
>     *:Darwin:*:*)
>         UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
>         case $UNAME_PROCESSOR in
>             *86) UNAME_PROCESSOR=i686 ;;
>             unknown) UNAME_PROCESSOR=powerpc ;;
>         esac
>         echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
>-        exit 0 ;;
>+        exit ;;
>     *:procnto*:*:* | *:QNX:[0123456789]*:*)
>         UNAME_PROCESSOR=`uname -p`
>         if test "$UNAME_PROCESSOR" = "x86"; then
>                 UNAME_PROCESSOR=i386
>                 UNAME_MACHINE=pc
>         fi
>         echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
>-        exit 0 ;;
>+        exit ;;
>     *:QNX:*:4*)
>         echo i386-pc-qnx
>-        exit 0 ;;
>+        exit ;;
>+    NSE-?:NONSTOP_KERNEL:*:*)
>+        echo nse-tandem-nsk${UNAME_RELEASE}
>+        exit ;;
>     NSR-?:NONSTOP_KERNEL:*:*)
>         echo nsr-tandem-nsk${UNAME_RELEASE}
>-        exit 0 ;;
>+        exit ;;
>     *:NonStop-UX:*:*)
>         echo mips-compaq-nonstopux
>-        exit 0 ;;
>+        exit ;;
>     BS2000:POSIX*:*:*)
>         echo bs2000-siemens-sysv
>-        exit 0 ;;
>+        exit ;;
>     DS/*:UNIX_System_V:*:*)
>         echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
>-        exit 0 ;;
>+        exit ;;
>     *:Plan9:*:*)
>         # "uname -m" is not consistent, so use $cputype instead. 386
>         # is converted to i386 for consistency with other x86
>         # operating systems.
>@@ -1215,40 +1222,46 @@
>         else
>             UNAME_MACHINE="$cputype"
>         fi
>         echo ${UNAME_MACHINE}-unknown-plan9
>-        exit 0 ;;
>+        exit ;;
>     *:TOPS-10:*:*)
>         echo pdp10-unknown-tops10
>-        exit 0 ;;
>+        exit ;;
>     *:TENEX:*:*)
>         echo pdp10-unknown-tenex
>-        exit 0 ;;
>+        exit ;;
>     KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
>         echo pdp10-dec-tops20
>-        exit 0 ;;
>+        exit ;;
>     XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
>         echo pdp10-xkl-tops20
>-        exit 0 ;;
>+        exit ;;
>     *:TOPS-20:*:*)
>         echo pdp10-unknown-tops20
>-        exit 0 ;;
>+        exit ;;
>     *:ITS:*:*)
>         echo pdp10-unknown-its
>-        exit 0 ;;
>+        exit ;;
>     SEI:*:*:SEIUX)
>         echo mips-sei-seiux${UNAME_RELEASE}
>-        exit 0 ;;
>+        exit ;;
>     *:DragonFly:*:*)
>         echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
>-        exit 0 ;;
>+        exit ;;
>     *:*VMS:*:*)
>         UNAME_MACHINE=`(uname -p) 2>/dev/null`
>         case "${UNAME_MACHINE}" in
>-            A*) echo alpha-dec-vms && exit 0 ;;
>-            I*) echo ia64-dec-vms && exit 0 ;;
>-            V*) echo vax-dec-vms && exit 0 ;;
>-        esac
>+            A*) echo alpha-dec-vms ; exit ;;
>+            I*) echo ia64-dec-vms ; exit ;;
>+            V*) echo vax-dec-vms ; exit ;;
>+        esac ;;
>+    *:XENIX:*:SysV)
>+        echo i386-pc-xenix
>+        exit ;;
>+    i*86:skyos:*:*)
>+        echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
>+        exit ;;
> esac
> 
> #echo '(No uname command or uname output not recognized.)' 1>&2
> #echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
>@@ -1278,9 +1291,9 @@
> #endif
> #endif
> 
> #if defined (__arm) && defined (__acorn) && defined (__unix)
>-  printf ("arm-acorn-riscix"); exit (0);
>+  printf ("arm-acorn-riscix\n"); exit (0);
> #endif
> 
> #if defined (hp300) && !defined (hpux)
>   printf ("m68k-hp-bsd\n"); exit (0);
>@@ -1367,37 +1380,38 @@
>   exit (1);
> }
> EOF
> 
>-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
>+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
>+        { echo "$SYSTEM_NAME"; exit; }
> 
> # Apollos put the system type in the environment.
> 
>-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
>+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
> 
> # Convex versions that predate uname can use getsysinfo(1)
> 
> if [ -x /usr/convex/getsysinfo ]
> then
>     case `getsysinfo -f cpu_type` in
>     c1*)
>         echo c1-convex-bsd
>-        exit 0 ;;
>+        exit ;;
>     c2*)
>         if getsysinfo -f scalar_acc
>         then echo c32-convex-bsd
>         else echo c2-convex-bsd
>         fi
>-        exit 0 ;;
>+        exit ;;
>     c34*)
>         echo c34-convex-bsd
>-        exit 0 ;;
>+        exit ;;
>     c38*)
>         echo c38-convex-bsd
>-        exit 0 ;;
>+        exit ;;
>     c4*)
>         echo c4-convex-bsd
>-        exit 0 ;;
>+        exit ;;
>     esac
> fi
> 
> cat >&2 <<EOF
>@@ -1406,9 +1420,11 @@
> This script, last modified $timestamp, has failed to recognize
> the operating system you are using. It is advised that you
> download the most up to date version of the config scripts from
> 
>-    ftp://ftp.gnu.org/pub/gnu/config/
>+  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
>+and
>+  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
> 
> If the version you run ($0) is already up to date, please
> send the following data and any information you think might be
> pertinent to <config-patches@gnu.org> in order to provide the needed
>Index: config.sub
>===================================================================
>RCS file: /cvs/dirsec/setuputil/config.sub,v
>retrieving revision 1.1
>diff -t -w -U4 -r1.1 config.sub
>--- config.sub	5 Apr 2007 01:53:36 -0000	1.1
>+++ config.sub	13 Apr 2007 20:24:18 -0000
>@@ -1,10 +1,10 @@
> #! /bin/sh
> # Configuration validation subroutine script.
> #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
>-#   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
>+#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
> 
>-timestamp='2004-08-29'
>+timestamp='2005-07-08'
> 
> # This file is (in principle) common to ALL GNU software.
> # The presence of a machine in this file suggests that SOME GNU software
> # can handle that machine.  It does not imply ALL GNU software can.
>@@ -20,16 +20,17 @@
> # GNU General Public License for more details.
> #
> # You should have received a copy of the GNU General Public License
> # along with this program; if not, write to the Free Software
>-# Foundation, Inc., 59 Temple Place - Suite 330,
>-# Boston, MA 02111-1307, USA.
>-
>+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
>+# 02110-1301, USA.
>+#
> # As a special exception to the GNU General Public License, if you
> # distribute this file as part of a program that contains a
> # configuration script generated by Autoconf, you may include it under
> # the same distribution terms that you use for the rest of that program.
> 
>+
> # Please send patches to <config-patches@gnu.org>.  Submit a context
> # diff and a properly formatted ChangeLog entry.
> #
> # Configuration subroutine to validate and canonicalize a configuration type.
>@@ -69,9 +70,9 @@
> 
> version="\
> GNU config.sub ($timestamp)
> 
>-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
>+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
> Free Software Foundation, Inc.
> 
> This is free software; see the source for copying conditions.  There is NO
> warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
>@@ -82,13 +83,13 @@
> # Parse command line
> while test $# -gt 0 ; do
>   case $1 in
>     --time-stamp | --time* | -t )
>-       echo "$timestamp" ; exit 0 ;;
>+       echo "$timestamp" ; exit ;;
>     --version | -v )
>-       echo "$version" ; exit 0 ;;
>+       echo "$version" ; exit ;;
>     --help | --h* | -h )
>-       echo "$usage"; exit 0 ;;
>+       echo "$usage"; exit ;;
>     -- )     # Stop option processing
>        shift; break ;;
>     - ) # Use stdin as input.
>        break ;;
>@@ -98,9 +99,9 @@
> 
>     *local*)
>        # First pass through any local machine types.
>        echo $1
>-       exit 0;;
>+       exit ;;
> 
>     * )
>        break ;;
>   esac
>@@ -230,48 +231,55 @@
>         | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
>         | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
>         | am33_2.0 \
>         | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
>+        | bfin \
>         | c4x | clipper \
>         | d10v | d30v | dlx | dsp16xx \
>         | fr30 | frv \
>         | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
>         | i370 | i860 | i960 | ia64 \
>         | ip2k | iq2000 \
>-        | m32r | m32rle | m68000 | m68k | m88k | mcore \
>+        | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
>         | mips | mipsbe | mipseb | mipsel | mipsle \
>         | mips16 \
>         | mips64 | mips64el \
>         | mips64vr | mips64vrel \
>         | mips64orion | mips64orionel \
>         | mips64vr4100 | mips64vr4100el \
>         | mips64vr4300 | mips64vr4300el \
>         | mips64vr5000 | mips64vr5000el \
>+        | mips64vr5900 | mips64vr5900el \
>         | mipsisa32 | mipsisa32el \
>         | mipsisa32r2 | mipsisa32r2el \
>         | mipsisa64 | mipsisa64el \
>         | mipsisa64r2 | mipsisa64r2el \
>         | mipsisa64sb1 | mipsisa64sb1el \
>         | mipsisa64sr71k | mipsisa64sr71kel \
>         | mipstx39 | mipstx39el \
>         | mn10200 | mn10300 \
>+        | ms1 \
>         | msp430 \
>         | ns16k | ns32k \
>-        | openrisc | or32 \
>+        | or32 \
>         | pdp10 | pdp11 | pj | pjl \
>         | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
>         | pyramid \
>-        | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
>+        | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
>         | sh64 | sh64le \
>-        | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
>+        | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
>+        | sparcv8 | sparcv9 | sparcv9b \
>         | strongarm \
>         | tahoe | thumb | tic4x | tic80 | tron \
>         | v850 | v850e \
>         | we32k \
>-        | x86 | xscale | xstormy16 | xtensa \
>+        | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
>         | z8k)
>                 basic_machine=$basic_machine-unknown
>                 ;;
>+        m32c)
>+                basic_machine=$basic_machine-unknown
>+                ;;
>         m6811 | m68hc11 | m6812 | m68hc12)
>                 # Motorola 68HC11/12.
>                 basic_machine=$basic_machine-unknown
>                 os=-none
>@@ -297,9 +305,9 @@
>         | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
>         | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
>         | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
>         | avr-* \
>-        | bs2000-* \
>+        | bfin-* | bs2000-* \
>         | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
>         | clipper-* | craynv-* | cydra-* \
>         | d10v-* | d30v-* | dlx-* \
>         | elxsi-* \
>@@ -309,46 +317,51 @@
>         | i*86-* | i860-* | i960-* | ia64-* \
>         | ip2k-* | iq2000-* \
>         | m32r-* | m32rle-* \
>         | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
>-        | m88110-* | m88k-* | mcore-* \
>+        | m88110-* | m88k-* | maxq-* | mcore-* \
>         | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
>         | mips16-* \
>         | mips64-* | mips64el-* \
>         | mips64vr-* | mips64vrel-* \
>         | mips64orion-* | mips64orionel-* \
>         | mips64vr4100-* | mips64vr4100el-* \
>         | mips64vr4300-* | mips64vr4300el-* \
>         | mips64vr5000-* | mips64vr5000el-* \
>+        | mips64vr5900-* | mips64vr5900el-* \
>         | mipsisa32-* | mipsisa32el-* \
>         | mipsisa32r2-* | mipsisa32r2el-* \
>         | mipsisa64-* | mipsisa64el-* \
>         | mipsisa64r2-* | mipsisa64r2el-* \
>         | mipsisa64sb1-* | mipsisa64sb1el-* \
>         | mipsisa64sr71k-* | mipsisa64sr71kel-* \
>         | mipstx39-* | mipstx39el-* \
>         | mmix-* \
>+        | ms1-* \
>         | msp430-* \
>         | none-* | np1-* | ns16k-* | ns32k-* \
>         | orion-* \
>         | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
>         | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
>         | pyramid-* \
>         | romp-* | rs6000-* \
>-        | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
>+        | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
>         | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
>-        | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
>+        | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
>+        | sparclite-* \
>         | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
>         | tahoe-* | thumb-* \
>         | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
>         | tron-* \
>         | v850-* | v850e-* | vax-* \
>         | we32k-* \
>-        | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
>-        | xtensa-* \
>+        | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
>+        | xstormy16-* | xtensa-* \
>         | ymp-* \
>         | z8k-*)
>                 ;;
>+        m32c-*)
>+                ;;
>         # Recognize the various machine names and aliases which stand
>         # for a CPU type and a company and sometimes even an OS.
>         386bsd)
>                 basic_machine=i386-unknown
>@@ -488,8 +501,12 @@
>         delta88)
>                 basic_machine=m88k-motorola
>                 os=-sysv3
>                 ;;
>+        djgpp)
>+                basic_machine=i586-pc
>+                os=-msdosdjgpp
>+                ;;
>         dpx20 | dpx20-*)
>                 basic_machine=rs6000-bull
>                 os=-bosx
>                 ;;
>@@ -753,11 +770,10 @@
>         op50n-* | op60c-*)
>                 basic_machine=hppa1.1-oki
>                 os=-proelf
>                 ;;
>-        or32 | or32-*)
>+        openrisc | openrisc-*)
>                 basic_machine=or32-unknown
>-                os=-coff
>                 ;;
>         os400)
>                 basic_machine=powerpc-ibm
>                 os=-os400
>@@ -1028,8 +1044,12 @@
>         w89k-*)
>                 basic_machine=hppa1.1-winbond
>                 os=-proelf
>                 ;;
>+        xbox)
>+                basic_machine=i686-pc
>+                os=-mingw32
>+                ;;
>         xps | xps100)
>                 basic_machine=xps100-honeywell
>                 ;;
>         ymp)
>@@ -1077,14 +1097,11 @@
>                 ;;
>         we32k)
>                 basic_machine=we32k-att
>                 ;;
>-        sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
>+        sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
>                 basic_machine=sh-unknown
>                 ;;
>-        sh64)
>-                basic_machine=sh64-unknown
>-                ;;
>         sparc | sparcv8 | sparcv9 | sparcv9b)
>                 basic_machine=sparc-sun
>                 ;;
>         cydra)
>@@ -1169,9 +1186,10 @@
>               | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
>               | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
>               | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
>               | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
>-              | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
>+              | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
>+              | -skyos* | -haiku*)
>         # Remember, each alternative MUST END IN *, to match a version number.
>                 ;;
>         -qnx*)
>                 case $basic_machine in
>@@ -1187,9 +1205,9 @@
>         -nto*)
>                 os=`echo $os | sed -e 's|nto|nto-qnx|'`
>                 ;;
>         -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
>-              | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
>+              | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
>               | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
>                 ;;
>         -mac*)
>                 os=`echo $os | sed -e 's|mac|macos|'`
>@@ -1296,8 +1314,11 @@
>                 ;;
>         -kaos*)
>                 os=-kaos
>                 ;;
>+        -zvmoe)
>+                os=-zvmoe
>+                ;;
>         -none)
>                 ;;
>         *)
>                 # Get rid of the `-' at the beginning of $os.
>@@ -1373,8 +1394,11 @@
>                 ;;
>         *-be)
>                 os=-beos
>                 ;;
>+        *-haiku)
>+                os=-haiku
>+                ;;
>         *-ibm)
>                 os=-aix
>                 ;;
>         *-knuth)
>@@ -1544,9 +1568,9 @@
>                 ;;
> esac
> 
> echo $basic_machine$os
>-exit 0
>+exit
> 
> # Local variables:
> # eval: (add-hook 'write-file-hooks 'time-stamp)
> # time-stamp-start: "timestamp='"
>Index: configure
>===================================================================
>RCS file: /cvs/dirsec/setuputil/configure,v
>retrieving revision 1.2
>diff -t -w -U4 -r1.2 configure
>--- configure	9 Apr 2007 22:14:55 -0000	1.2
>+++ configure	13 Apr 2007 20:24:20 -0000
>@@ -279,17 +279,17 @@
> fi
> 
> # The HP-UX ksh and POSIX shell print the target directory to stdout
> # if CDPATH is set.
>-if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
>+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
> 
> if test -z "$ECHO"; then
> if test "X${echo_test_string+set}" != Xset; then
> # find a string as large as possible, as long as the shell can cope with it
>   for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
>     # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
>-    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
>-       echo_test_string="`eval $cmd`" &&
>+    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
>+       echo_test_string=`eval $cmd` &&
>        (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
>     then
>       break
>     fi
>@@ -1038,8 +1038,10 @@
>   --enable-fast-install[=PKGS]
>                           optimize for fast installation [default=yes]
>   --disable-libtool-lock  avoid locking (might break parallel builds)
>   --enable-debug          Enable debug features (default: no)
>+  --enable-64bit          Enable 64-bit flag (effective on HP-UX only)
>+                          (default: no)
> 
> Optional Packages:
>   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
>   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
>@@ -3809,9 +3811,9 @@
> lt_ac_count=0
> # Add /usr/xpg4/bin/sed as it is typically found on Solaris
> # along with /bin/sed that truncates output.
> for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
>-  test ! -f $lt_ac_sed && break
>+  test ! -f $lt_ac_sed && continue
>   cat /dev/null > conftest.in
>   lt_ac_count=0
>   echo $ECHO_N "0123456789$ECHO_C" >conftest.in
>   # Check for GNU sed and select it if it is found.
>@@ -3834,12 +3836,12 @@
>       lt_cv_path_SED=$lt_ac_sed
>     fi
>   done
> done
>-SED=$lt_cv_path_SED
> 
> fi
> 
>+SED=$lt_cv_path_SED
> echo "$as_me:$LINENO: result: $SED" >&5
> echo "${ECHO_T}$SED" >&6
> 
> echo "$as_me:$LINENO: checking for egrep" >&5
>@@ -3914,9 +3916,9 @@
>     test -z "$ac_dir" && ac_dir=.
>     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
>       lt_cv_path_LD="$ac_dir/$ac_prog"
>       # Check to see if the program is GNU ld.  I'd rather use --version,
>-      # but apparently some GNU ld's only accept -v.
>+      # but apparently some variants of GNU ld only accept -v.
>       # Break only if it was the GNU/non-GNU ld that we prefer.
>       case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
>       *GNU* | *'with BFD'*)
>         test "$with_gnu_ld" != no && break
>@@ -3948,9 +3950,9 @@
> echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
> if test "${lt_cv_prog_gnu_ld+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>-  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
>+  # I'd rather use --version here, but apparently some GNU lds only accept -v.
> case `$LD -v 2>&1 </dev/null` in
> *GNU* | *'with BFD'*)
>   lt_cv_prog_gnu_ld=yes
>   ;;
>@@ -3978,8 +3980,17 @@
> "" | " "*) ;;
> *) reload_flag=" $reload_flag" ;;
> esac
> reload_cmds='$LD$reload_flag -o $output$reload_objs'
>+case $host_os in
>+  darwin*)
>+    if test "$GCC" = yes; then
>+      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
>+    else
>+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
>+    fi
>+    ;;
>+esac
> 
> echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
> echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
> if test "${lt_cv_path_NM+set}" = set; then
>@@ -3988,13 +3999,18 @@
>   if test -n "$NM"; then
>   # Let the user override the test.
>   lt_cv_path_NM="$NM"
> else
>+  lt_nm_to_check="${ac_tool_prefix}nm"
>+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
>+    lt_nm_to_check="$lt_nm_to_check nm"
>+  fi
>+  for lt_tmp_nm in $lt_nm_to_check; do
>   lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
>-  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
>+    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
>     IFS="$lt_save_ifs"
>     test -z "$ac_dir" && ac_dir=.
>-    tmp_nm="$ac_dir/${ac_tool_prefix}nm"
>+      tmp_nm="$ac_dir/$lt_tmp_nm"
>     if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
>       # Check to see if the nm accepts a BSD-compat flag.
>       # Adding the `sed 1q' prevents false positives on HP-UX, which says:
>       #   nm: unknown option "B" ignored
>@@ -4014,12 +4030,14 @@
>           lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
>           continue # so that we can try to find one that supports BSD flags
>           ;;
>         esac
>+          ;;
>       esac
>     fi
>   done
>   IFS="$lt_save_ifs"
>+  done
>   test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
> fi
> fi
> echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
>@@ -4064,9 +4082,9 @@
> beos*)
>   lt_cv_deplibs_check_method=pass_all
>   ;;
> 
>-bsdi4*)
>+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
>   ;;
>@@ -4087,15 +4105,15 @@
> darwin* | rhapsody*)
>   lt_cv_deplibs_check_method=pass_all
>   ;;
> 
>-freebsd* | kfreebsd*-gnu)
>+freebsd* | kfreebsd*-gnu | dragonfly*)
>   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
>     case $host_cpu in
>     i*86 )
>       # Not sure whether the presence of OpenBSD here was a mistake.
>       # Let's accept both of them until this is cleared up.
>-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
>+      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
>@@ -4109,9 +4127,9 @@
>   ;;
> 
> hpux10.20* | hpux11*)
>   lt_cv_file_magic_cmd=/usr/bin/file
>-  case "$host_cpu" in
>+  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
>     ;;
>@@ -4125,8 +4143,13 @@
>     ;;
>   esac
>   ;;
> 
>+interix3*)
>+  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
>+  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
>+  ;;
>+
> irix5* | irix6* | nonstopux*)
>   case $LD in
>   *-32|*"-32 ") libmagic=32-bit;;
>   *-n32|*"-n32 ") libmagic=N32;;
>@@ -4137,17 +4160,8 @@
>   ;;
> 
> # This must be Linux ELF.
> linux*)
>-  case $host_cpu in
>-  alpha*|hppa*|i*86|ia64*|m68*|mips*|powerpc*|sparc*|s390*|sh*|x86_64*)
>-    lt_cv_deplibs_check_method=pass_all ;;
>-  *)
>-    # glibc up to 2.1.1 does not perform some relocations on ARM
>-    # this will be overridden with pass_all, but let us keep it just in case
>-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;;
>-  esac
>-  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
>   lt_cv_deplibs_check_method=pass_all
>   ;;
> 
> netbsd*)
>@@ -4168,30 +4182,24 @@
>   lt_cv_deplibs_check_method=unknown
>   ;;
> 
> openbsd*)
>-  lt_cv_file_magic_cmd=/usr/bin/file
>-  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
>   if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
>-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
>+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
>   else
>-    lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
>+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
>   fi
>   ;;
> 
> osf3* | osf4* | osf5*)
>   lt_cv_deplibs_check_method=pass_all
>   ;;
> 
>-sco3.2v5*)
>-  lt_cv_deplibs_check_method=pass_all
>-  ;;
>-
> solaris*)
>   lt_cv_deplibs_check_method=pass_all
>   ;;
> 
>-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
>+sysv4 | sysv4.3*)
>   case $host_vendor in
>   motorola)
>     lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
>     lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
>@@ -4210,12 +4218,15 @@
>     ;;
>   siemens)
>     lt_cv_deplibs_check_method=pass_all
>     ;;
>+  pc)
>+    lt_cv_deplibs_check_method=pass_all
>+    ;;
>   esac
>   ;;
> 
>-sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7* | sysv4*uw2*)
>+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
>   lt_cv_deplibs_check_method=pass_all
>   ;;
> esac
> 
>@@ -4231,8 +4242,11 @@
> 
> # If no C compiler was specified, use CC.
> LTCC=${LTCC-"$CC"}
> 
>+# If no C compiler flags were specified, use CFLAGS.
>+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
>+
> # Allow CC to be a program name with arguments.
> compiler=$CC
> 
> 
>@@ -4266,9 +4280,9 @@
>   rm -rf conftest*
>   ;;
> *-*-irix6*)
>   # Find out which ABI we are using.
>-  echo '#line 4270 "configure"' > conftest.$ac_ext
>+  echo '#line 4284 "configure"' > conftest.$ac_ext
>   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
>   (eval $ac_compile) 2>&5
>   ac_status=$?
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>@@ -4309,9 +4323,9 @@
>   (eval $ac_compile) 2>&5
>   ac_status=$?
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>   (exit $ac_status); }; then
>-    case "`/usr/bin/file conftest.o`" in
>+    case `/usr/bin/file conftest.o` in
>     *32-bit*)
>       case $host in
>         x86_64-*linux*)
>           LD="${LD-ld} -m elf_i386"
>@@ -4422,8 +4436,28 @@
>     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
>     CFLAGS="$SAVE_CFLAGS"
>   fi
>   ;;
>+sparc*-*solaris*)
>+  # Find out which ABI we are using.
>+  echo 'int i;' > conftest.$ac_ext
>+  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
>+  (eval $ac_compile) 2>&5
>+  ac_status=$?
>+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>+  (exit $ac_status); }; then
>+    case `/usr/bin/file conftest.o` in
>+    *64-bit*)
>+      case $lt_cv_prog_gnu_ld in
>+      yes*) LD="${LD-ld} -m elf64_sparc" ;;
>+      *)    LD="${LD-ld} -64" ;;
>+      esac
>+      ;;
>+    esac
>+  fi
>+  rm -rf conftest*
>+  ;;
>+
> 
> esac
> 
> need_locks="$enable_libtool_lock"
>@@ -5051,8 +5085,13 @@
> fi
> 
> done
> 
>+
>+
>+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
>+    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
>+    (test "X$CXX" != "Xg++"))) ; then
> ac_ext=cc
> ac_cpp='$CXXCPP $CPPFLAGS'
> ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
> ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
>@@ -5281,8 +5320,10 @@
> ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
> ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
> ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
> 
>+fi
>+
> 
> ac_ext=f
> ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
> ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
>@@ -5374,9 +5415,9 @@
> fi
> 
> 
> # Provide some information about the compiler.
>-echo "$as_me:5378:" \
>+echo "$as_me:5419:" \
>      "checking for Fortran 77 compiler version" >&5
> ac_compiler=`set X $ac_compile; echo $2`
> { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
>   (eval $ac_compiler --version </dev/null >&5) 2>&5
>@@ -5564,13 +5605,57 @@
>     # So we just punt and use a minimum line length of 8192.
>     lt_cv_sys_max_cmd_len=8192;
>     ;;
> 
>+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
>+    # This has been around since 386BSD, at least.  Likely further.
>+    if test -x /sbin/sysctl; then
>+      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
>+    elif test -x /usr/sbin/sysctl; then
>+      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
>+    else
>+      lt_cv_sys_max_cmd_len=65536       # usable default for all BSDs
>+    fi
>+    # And add a safety zone
>+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
>+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
>+    ;;
>+
>+  interix*)
>+    # We know the value 262144 and hardcode it with a safety zone (like BSD)
>+    lt_cv_sys_max_cmd_len=196608
>+    ;;
>+
>+  osf*)
>+    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
>+    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
>+    # nice to cause kernel panics so lets avoid the loop below.
>+    # First set a reasonable default.
>+    lt_cv_sys_max_cmd_len=16384
>+    #
>+    if test -x /sbin/sysconfig; then
>+      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
>+        *1*) lt_cv_sys_max_cmd_len=-1 ;;
>+      esac
>+    fi
>+    ;;
>+  sco3.2v5*)
>+    lt_cv_sys_max_cmd_len=102400
>+    ;;
>+  sysv5* | sco5v6* | sysv4.2uw2*)
>+    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
>+    if test -n "$kargmax"; then
>+      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[         ]//'`
>+    else
>+      lt_cv_sys_max_cmd_len=32768
>+    fi
>+    ;;
>  *)
>     # If test is not a shell built-in, we'll probably end up computing a
>     # maximum length that is only half of the actual maximum length, but
>     # we can't tell.
>-    while (test "X"`$CONFIG_SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
>+    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
>+    while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
>                = "XX$teststring") >/dev/null 2>&1 &&
>             new_result=`expr "X$teststring" : ".*" 2>&1` &&
>             lt_cv_sys_max_cmd_len=$new_result &&
>             test $i != 17 # 1/2 MB should be enough
>@@ -5614,11 +5699,8 @@
> 
> # Regexp to match symbols that can be accessed directly from C.
> sympat='$[_A-Za-z][_A-Za-z0-9]*$'
> 
>-# Transform the above into a raw symbol and a C symbol.
>-symxfrm='\1 \2\3 \3'
>-
> # Transform an extracted symbol line into a proper C declaration
> lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* $.*$$/extern int \1;/p'"
> 
> # Transform an extracted symbol line into symbol name and symbol address
>@@ -5638,17 +5720,33 @@
>   fi
>   lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* $.*$$/extern int \1();/p' -e 's/^$symcode* .* $.*$$/extern char \1;/p'"
>   lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: $[^ ]*$ $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* $[^ ]*$ $[^ ]*$$/  {\"\2\", (lt_ptr) \&\2},/p'"
>   ;;
>+linux*)
>+  if test "$host_cpu" = ia64; then
>+    symcode='[ABCDGIRSTW]'
>+    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* $.*$$/extern int \1();/p' -e 's/^$symcode* .* $.*$$/extern char \1;/p'"
>+    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: $[^ ]*$ $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* $[^ ]*$ $[^ ]*$$/  {\"\2\", (lt_ptr) \&\2},/p'"
>+  fi
>+  ;;
> irix* | nonstopux*)
>   symcode='[BCDEGRST]'
>   ;;
> osf*)
>   symcode='[BCDEGQRST]'
>   ;;
>-solaris* | sysv5*)
>+solaris*)
>   symcode='[BDRT]'
>   ;;
>+sco3.2v5*)
>+  symcode='[DT]'
>+  ;;
>+sysv4.2uw2*)
>+  symcode='[DT]'
>+  ;;
>+sysv5* | sco5v6* | unixware* | OpenUNIX*)
>+  symcode='[ABDT]'
>+  ;;
> sysv4)
>   symcode='[DFNSTU]'
>   ;;
> esac
>@@ -5669,10 +5767,13 @@
> 
> # Try without a prefix undercore, then with it.
> for ac_symprfx in "" "_"; do
> 
>+  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
>+  symxfrm="\\1 $ac_symprfx\\2 \\2"
>+
>   # Write the raw and C identifiers.
>-  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[       ]$$symcode$symcode*$[         ][      ]*$$ac_symprfx$$sympat$opt_cr$/$symxfrm/p'"
>+  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[       ]$$symcode$symcode*$[         ][      ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
> 
>   # Check to see that the pipe works correctly.
>   pipe_works=no
> 
>@@ -5832,9 +5933,9 @@
> esac
> 
> # Sed substitution that helps us do robust quoting.  It backslashifies
> # metacharacters that are still active within double-quoted strings.
>-Xsed='sed -e s/^X//'
>+Xsed='sed -e 1s/^X//'
> sed_quote_subst='s/$[\\"\\`$\\\\]$/\\\1/g'
> 
> # Same as above, but do not quote variable references.
> double_quote_subst='s/$[\\"\\`\\\\]$/\\\1/g'
>@@ -5852,9 +5953,9 @@
> # Global variables:
> default_ofile=libtool
> can_build_shared=yes
> 
>-# All known linkers require a `.a' archive for static linking (except M$VC,
>+# All known linkers require a `.a' archive for static linking (except MSVC,
> # which needs '.lib').
> libext=a
> ltmain="$ac_aux_dir/ltmain.sh"
> ofile="$default_ofile"
>@@ -6109,8 +6210,9 @@
> test -z "$AR_FLAGS" && AR_FLAGS=cru
> test -z "$AS" && AS=as
> test -z "$CC" && CC=cc
> test -z "$LTCC" && LTCC=$CC
>+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
> test -z "$DLLTOOL" && DLLTOOL=dlltool
> test -z "$LD" && LD=ld
> test -z "$LN_S" && LN_S="ln -s"
> test -z "$MAGIC_CMD" && MAGIC_CMD=file
>@@ -6128,17 +6230,28 @@
> 
> if test -n "$RANLIB"; then
>   case $host_os in
>   openbsd*)
>-    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
>+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
>     ;;
>   *)
>-    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
>+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
>     ;;
>   esac
>   old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
> fi
> 
>+for cc_temp in $compiler""; do
>+  case $cc_temp in
>+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
>+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
>+    \-*) ;;
>+    *) break;;
>+  esac
>+done
>+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
>+
>+
> # Only perform the check for file, if the check method requires it
> case $deplibs_check_method in
> file_magic*)
>   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
>@@ -6162,9 +6275,9 @@
>       lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
>       if test -n "$file_magic_test_file"; then
>         case $deplibs_check_method in
>         "file_magic "*)
>-          file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic $.*$\"`"
>+          file_magic_regex=`expr "$deplibs_check_method" : "file_magic $.*$"`
>           MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
>           if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
>             $EGREP "$file_magic_regex" > /dev/null; then
>             :
>@@ -6224,9 +6337,9 @@
>       lt_cv_path_MAGIC_CMD="$ac_dir/file"
>       if test -n "$file_magic_test_file"; then
>         case $deplibs_check_method in
>         "file_magic "*)
>-          file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic $.*$\"`"
>+          file_magic_regex=`expr "$deplibs_check_method" : "file_magic $.*$"`
>           MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
>           if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
>             $EGREP "$file_magic_regex" > /dev/null; then
>             :
>@@ -6319,70 +6432,27 @@
> 
> # If no C compiler was specified, use CC.
> LTCC=${LTCC-"$CC"}
> 
>+# If no C compiler flags were specified, use CFLAGS.
>+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
>+
> # Allow CC to be a program name with arguments.
> compiler=$CC
> 
> 
>-#
>-# Check for any special shared library compilation flags.
>-#
>-lt_prog_cc_shlib=
>-if test "$GCC" = no; then
>-  case $host_os in
>-  sco3.2v5*)
>-    lt_prog_cc_shlib='-belf'
>-    ;;
>-  esac
>-fi
>-if test -n "$lt_prog_cc_shlib"; then
>-  { echo "$as_me:$LINENO: WARNING: \`$CC' requires \`$lt_prog_cc_shlib' to build shared libraries" >&5
>-echo "$as_me: WARNING: \`$CC' requires \`$lt_prog_cc_shlib' to build shared libraries" >&2;}
>-  if echo "$old_CC $old_CFLAGS " | grep "[      ]$lt_prog_cc_shlib[     ]" >/dev/null; then :
>-  else
>-    { echo "$as_me:$LINENO: WARNING: add \`$lt_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&5
>-echo "$as_me: WARNING: add \`$lt_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&2;}
>-    lt_cv_prog_cc_can_build_shared=no
>-  fi
>-fi
>-
>+# save warnings/boilerplate of simple test code
>+ac_outfile=conftest.$ac_objext
>+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
>+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
>+_lt_compiler_boilerplate=`cat conftest.err`
>+$rm conftest*
> 
>-#
>-# Check to make sure the static flag actually works.
>-#
>-echo "$as_me:$LINENO: checking if $compiler static flag $lt_prog_compiler_static works" >&5
>-echo $ECHO_N "checking if $compiler static flag $lt_prog_compiler_static works... $ECHO_C" >&6
>-if test "${lt_prog_compiler_static_works+set}" = set; then
>-  echo $ECHO_N "(cached) $ECHO_C" >&6
>-else
>-  lt_prog_compiler_static_works=no
>-   save_LDFLAGS="$LDFLAGS"
>-   LDFLAGS="$LDFLAGS $lt_prog_compiler_static"
>+ac_outfile=conftest.$ac_objext
>    printf "$lt_simple_link_test_code" > conftest.$ac_ext
>-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
>-     # The compiler can only warn and ignore the option if not recognized
>-     # So say no if there are warnings
>-     if test -s conftest.err; then
>-       # Append any errors to the config.log.
>-       cat conftest.err 1>&5
>-     else
>-       lt_prog_compiler_static_works=yes
>-     fi
>-   fi
>+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
>+_lt_linker_boilerplate=`cat conftest.err`
>    $rm conftest*
>-   LDFLAGS="$save_LDFLAGS"
>-
>-fi
>-echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
>-echo "${ECHO_T}$lt_prog_compiler_static_works" >&6
>-
>-if test x"$lt_prog_compiler_static_works" = xyes; then
>-    :
>-else
>-    lt_prog_compiler_static=
>-fi
>-
> 
> 
> 
> lt_prog_compiler_no_builtin_flag=
>@@ -6405,20 +6475,22 @@
>    # Note that $ac_compile itself does not contain backslashes and begins
>    # with a dollar sign (not a hyphen), so the echo should work correctly.
>    # The option is referenced via a variable to avoid confusing sed.
>    lt_compile=`echo "$ac_compile" | $SED \
>-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
>+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
>    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
>    -e 's:$: $lt_compiler_flag:'`
>-   (eval echo "\"\$as_me:6412: $lt_compile\"" >&5)
>+   (eval echo "\"\$as_me:6482: $lt_compile\"" >&5)
>    (eval "$lt_compile" 2>conftest.err)
>    ac_status=$?
>    cat conftest.err >&5
>-   echo "$as_me:6416: \$? = $ac_status" >&5
>+   echo "$as_me:6486: \$? = $ac_status" >&5
>    if (exit $ac_status) && test -s "$ac_outfile"; then
>      # The compiler can only warn and ignore the option if not recognized
>-     # So say no if there are warnings
>-     if test ! -s conftest.err; then
>+     # So say no if there are warnings other than the usual output.
>+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
>+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
>+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
>        lt_cv_prog_compiler_rtti_exceptions=yes
>      fi
>    fi
>    $rm conftest*
>@@ -6477,8 +6549,13 @@
>       # Common symbols not allowed in MH_DYLIB files
>       lt_prog_compiler_pic='-fno-common'
>       ;;
> 
>+    interix3*)
>+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
>+      # Instead, we relocate shared libraries at runtime.
>+      ;;
>+
>     msdosdjgpp*)
>       # Just because we use GCC doesn't mean we suddenly get shared libraries
>       # on systems that don't support them.
>       lt_prog_compiler_can_build_shared=no
>@@ -6493,9 +6570,9 @@
> 
>     hpux*)
>       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
>       # not for PA HP-UX.
>-      case "$host_cpu" in
>+      case $host_cpu in
>       hppa*64*|ia64*)
>         # +Z the default
>         ;;
>       *)
>@@ -6519,8 +6596,18 @@
>       else
>         lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
>       fi
>       ;;
>+      darwin*)
>+        # PIC is the default on this platform
>+        # Common symbols not allowed in MH_DYLIB files
>+       case $cc_basename in
>+         xlc*)
>+         lt_prog_compiler_pic='-qnocommon'
>+         lt_prog_compiler_wl='-Wl,'
>+         ;;
>+       esac
>+       ;;
> 
>     mingw* | pw32* | os2*)
>       # This hack is so that the source file can tell whether it is being
>       # built for inclusion in a dll (and should export symbols for example).
>@@ -6530,9 +6617,9 @@
>     hpux9* | hpux10* | hpux11*)
>       lt_prog_compiler_wl='-Wl,'
>       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
>       # not for PA HP-UX.
>-      case "$host_cpu" in
>+      case $host_cpu in
>       hppa*64*|ia64*)
>         # +Z the default
>         ;;
>       *)
>@@ -6554,14 +6641,21 @@
>       lt_prog_compiler_static='-Bstatic'
>       ;;
> 
>     linux*)
>-      case $CC in
>+      case $cc_basename in
>       icc* | ecc*)
>         lt_prog_compiler_wl='-Wl,'
>         lt_prog_compiler_pic='-KPIC'
>         lt_prog_compiler_static='-static'
>         ;;
>+      pgcc* | pgf77* | pgf90* | pgf95*)
>+        # Portland Group compilers (*not* the Pentium gcc compiler,
>+        # which looks to be a dead project)
>+        lt_prog_compiler_wl='-Wl,'
>+        lt_prog_compiler_pic='-fpic'
>+        lt_prog_compiler_static='-Bstatic'
>+        ;;
>       ccc*)
>         lt_prog_compiler_wl='-Wl,'
>         # All Alpha code is PIC.
>         lt_prog_compiler_static='-non_shared'
>@@ -6574,26 +6668,26 @@
>       # All OSF/1 code is PIC.
>       lt_prog_compiler_static='-non_shared'
>       ;;
> 
>-    sco3.2v5*)
>-      lt_prog_compiler_pic='-Kpic'
>-      lt_prog_compiler_static='-dn'
>-      ;;
>-
>     solaris*)
>-      lt_prog_compiler_wl='-Wl,'
>       lt_prog_compiler_pic='-KPIC'
>       lt_prog_compiler_static='-Bstatic'
>+      case $cc_basename in
>+      f77* | f90* | f95*)
>+        lt_prog_compiler_wl='-Qoption ld ';;
>+      *)
>+        lt_prog_compiler_wl='-Wl,';;
>+      esac
>       ;;
> 
>     sunos4*)
>       lt_prog_compiler_wl='-Qoption ld '
>       lt_prog_compiler_pic='-PIC'
>       lt_prog_compiler_static='-Bstatic'
>       ;;
> 
>-    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
>+    sysv4 | sysv4.2uw2* | sysv4.3*)
>       lt_prog_compiler_wl='-Wl,'
>       lt_prog_compiler_pic='-KPIC'
>       lt_prog_compiler_static='-Bstatic'
>       ;;
>@@ -6604,8 +6698,19 @@
>         lt_prog_compiler_static='-Bstatic'
>       fi
>       ;;
> 
>+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
>+      lt_prog_compiler_wl='-Wl,'
>+      lt_prog_compiler_pic='-KPIC'
>+      lt_prog_compiler_static='-Bstatic'
>+      ;;
>+
>+    unicos*)
>+      lt_prog_compiler_wl='-Wl,'
>+      lt_prog_compiler_can_build_shared=no
>+      ;;
>+
>     uts4*)
>       lt_prog_compiler_pic='-pic'
>       lt_prog_compiler_static='-Bstatic'
>       ;;
>@@ -6638,20 +6743,22 @@
>    # Note that $ac_compile itself does not contain backslashes and begins
>    # with a dollar sign (not a hyphen), so the echo should work correctly.
>    # The option is referenced via a variable to avoid confusing sed.
>    lt_compile=`echo "$ac_compile" | $SED \
>-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
>+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
>    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
>    -e 's:$: $lt_compiler_flag:'`
>-   (eval echo "\"\$as_me:6645: $lt_compile\"" >&5)
>+   (eval echo "\"\$as_me:6750: $lt_compile\"" >&5)
>    (eval "$lt_compile" 2>conftest.err)
>    ac_status=$?
>    cat conftest.err >&5
>-   echo "$as_me:6649: \$? = $ac_status" >&5
>+   echo "$as_me:6754: \$? = $ac_status" >&5
>    if (exit $ac_status) && test -s "$ac_outfile"; then
>      # The compiler can only warn and ignore the option if not recognized
>-     # So say no if there are warnings
>-     if test ! -s conftest.err; then
>+     # So say no if there are warnings other than the usual output.
>+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
>+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
>+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
>        lt_prog_compiler_pic_works=yes
>      fi
>    fi
>    $rm conftest*
>@@ -6670,9 +6777,9 @@
>      lt_prog_compiler_can_build_shared=no
> fi
> 
> fi
>-case "$host_os" in
>+case $host_os in
>   # For platforms which do not support PIC, -DPIC is meaningless:
>   *djgpp*)
>     lt_prog_compiler_pic=
>     ;;
>@@ -6680,8 +6787,50 @@
>     lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
>     ;;
> esac
> 
>+#
>+# Check to make sure the static flag actually works.
>+#
>+wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
>+echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
>+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
>+if test "${lt_prog_compiler_static_works+set}" = set; then
>+  echo $ECHO_N "(cached) $ECHO_C" >&6
>+else
>+  lt_prog_compiler_static_works=no
>+   save_LDFLAGS="$LDFLAGS"
>+   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
>+   printf "$lt_simple_link_test_code" > conftest.$ac_ext
>+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
>+     # The linker can only warn and ignore the option if not recognized
>+     # So say no if there are warnings
>+     if test -s conftest.err; then
>+       # Append any errors to the config.log.
>+       cat conftest.err 1>&5
>+       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
>+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
>+       if diff conftest.exp conftest.er2 >/dev/null; then
>+         lt_prog_compiler_static_works=yes
>+       fi
>+     else
>+       lt_prog_compiler_static_works=yes
>+     fi
>+   fi
>+   $rm conftest*
>+   LDFLAGS="$save_LDFLAGS"
>+
>+fi
>+echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
>+echo "${ECHO_T}$lt_prog_compiler_static_works" >&6
>+
>+if test x"$lt_prog_compiler_static_works" = xyes; then
>+    :
>+else
>+    lt_prog_compiler_static=
>+fi
>+
>+
> echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
> echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
> if test "${lt_cv_prog_compiler_c_o+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
>@@ -6698,25 +6847,27 @@
>    # (2) before a word containing "conftest.", or (3) at the end.
>    # Note that $ac_compile itself does not contain backslashes and begins
>    # with a dollar sign (not a hyphen), so the echo should work correctly.
>    lt_compile=`echo "$ac_compile" | $SED \
>-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
>+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
>    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
>    -e 's:$: $lt_compiler_flag:'`
>-   (eval echo "\"\$as_me:6705: $lt_compile\"" >&5)
>+   (eval echo "\"\$as_me:6854: $lt_compile\"" >&5)
>    (eval "$lt_compile" 2>out/conftest.err)
>    ac_status=$?
>    cat out/conftest.err >&5
>-   echo "$as_me:6709: \$? = $ac_status" >&5
>+   echo "$as_me:6858: \$? = $ac_status" >&5
>    if (exit $ac_status) && test -s out/conftest2.$ac_objext
>    then
>      # The compiler can only warn and ignore the option if not recognized
>      # So say no if there are warnings
>-     if test ! -s out/conftest.err; then
>+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
>+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
>+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
>        lt_cv_prog_compiler_c_o=yes
>      fi
>    fi
>-   chmod u+w .
>+   chmod u+w . 2>&5
>    $rm conftest*
>    # SGI C++ compiler will create directory out/ii_files/ for
>    # template instantiation
>    test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
>@@ -6790,8 +6941,18 @@
>   # the symbol is explicitly referenced.  Since portable code cannot
>   # rely on this symbol name, it's probably fine to never include it in
>   # preloaded symbol tables.
>   extract_expsyms_cmds=
>+  # Just being paranoid about ensuring that cc_basename is set.
>+  for cc_temp in $compiler""; do
>+  case $cc_temp in
>+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
>+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
>+    \-*) ;;
>+    *) break;;
>+  esac
>+done
>+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
> 
>   case $host_os in
>   cygwin* | mingw* | pw32*)
>     # FIXME: the MSVC++ port hasn't been tested in a loooong time
>@@ -6800,8 +6961,12 @@
>     if test "$GCC" != yes; then
>       with_gnu_ld=no
>     fi
>     ;;
>+  interix*)
>+    # we just hope/assume this is gcc and not c89 (= MSVC++)
>+    with_gnu_ld=yes
>+    ;;
>   openbsd*)
>     with_gnu_ld=no
>     ;;
>   esac
>@@ -6810,8 +6975,29 @@
>   if test "$with_gnu_ld" = yes; then
>     # If archive_cmds runs LD, not CC, wlarc should be empty
>     wlarc='${wl}'
> 
>+    # Set some defaults for GNU ld with shared library support. These
>+    # are reset later if shared libraries are not supported. Putting them
>+    # here allows them to be overridden if necessary.
>+    runpath_var=LD_RUN_PATH
>+    hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
>+    export_dynamic_flag_spec='${wl}--export-dynamic'
>+    # ancient GNU ld didn't support --whole-archive et. al.
>+    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
>+        whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
>+      else
>+        whole_archive_flag_spec=
>+    fi
>+    supports_anon_versioning=no
>+    case `$LD -v 2>/dev/null` in
>+      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
>+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
>+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
>+      *\ 2.11.*) ;; # other 2.11 versions
>+      *) supports_anon_versioning=yes ;;
>+    esac
>+
>     # See if GNU ld supports shared libraries.
>     case $host_os in
>     aix3* | aix4* | aix5*)
>       # On AIX/PPC, the GNU linker is very broken
>@@ -6860,21 +7046,67 @@
>       hardcode_libdir_flag_spec='-L$libdir'
>       allow_undefined_flag=unsupported
>       always_export_symbols=no
>       enable_shared_with_static_runtimes=yes
>-      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* $[^ ]*$/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
>+      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* $[^ ]*$/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
> 
>       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
>-        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
>+        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
>         # If the export-symbols file already is a .def file (1st line
>         # is EXPORTS), use it as is; otherwise, prepend...
>         archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
>           cp $export_symbols $output_objdir/$soname.def;
>         else
>           echo EXPORTS > $output_objdir/$soname.def;
>           cat $export_symbols >> $output_objdir/$soname.def;
>         fi~
>-        $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
>+        $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
>+      else
>+        ld_shlibs=no
>+      fi
>+      ;;
>+
>+    interix3*)
>+      hardcode_direct=no
>+      hardcode_shlibpath_var=no
>+      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
>+      export_dynamic_flag_spec='${wl}-E'
>+      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
>+      # Instead, shared libraries are loaded at an image base (0x10000000 by
>+      # default) and relocated if they conflict, which is a slow very memory
>+      # consuming and fragmenting process.  To avoid this, we pick a random,
>+      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
>+      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
>+      archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
>+      archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
>+      ;;
>+
>+    linux*)
>+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
>+        tmp_addflag=
>+        case $cc_basename,$host_cpu in
>+        pgcc*)                          # Portland Group C compiler
>+          whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
>+          tmp_addflag=' $pic_flag'
>+          ;;
>+        pgf77* | pgf90* | pgf95*)       # Portland Group f77 and f90 compilers
>+          whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
>+          tmp_addflag=' $pic_flag -Mnomain' ;;
>+        ecc*,ia64* | icc*,ia64*)                # Intel C compiler on ia64
>+          tmp_addflag=' -i_dynamic' ;;
>+        efc*,ia64* | ifort*,ia64*)      # Intel Fortran compiler on ia64
>+          tmp_addflag=' -i_dynamic -nofor_main' ;;
>+        ifc* | ifort*)                  # Intel Fortran compiler
>+          tmp_addflag=' -nofor_main' ;;
>+        esac
>+        archive_cmds='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
>+
>+        if test $supports_anon_versioning = yes; then
>+          archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
>+  cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
>+  $echo "local: *; };" >> $output_objdir/$libname.ver~
>+          $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
>+        fi
>       else
>         ld_shlibs=no
>       fi
>       ;;
>@@ -6888,9 +7120,9 @@
>         archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
>       fi
>       ;;
> 
>-    solaris* | sysv5*)
>+    solaris*)
>       if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
>         ld_shlibs=no
>         cat <<EOF 1>&2
> 
>@@ -6909,41 +7141,43 @@
>         ld_shlibs=no
>       fi
>       ;;
> 
>+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
>+      case `$LD -v 2>&1` in
>+        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
>+        ld_shlibs=no
>+        cat <<_LT_EOF 1>&2
>+
>+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
>+*** reliably create shared libraries on SCO systems.  Therefore, libtool
>+*** is disabling shared libraries support.  We urge you to upgrade GNU
>+*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
>+*** your PATH or compiler configuration so that the native linker is
>+*** used, and then restart.
>+
>+_LT_EOF
>+        ;;
>+        *)
>+          if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
>+            hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
>+            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
>+            archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
>+          else
>+            ld_shlibs=no
>+          fi
>+        ;;
>+      esac
>+      ;;
>+
>     sunos4*)
>       archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
>       wlarc=
>       hardcode_direct=yes
>       hardcode_shlibpath_var=no
>       ;;
> 
>-  linux*)
>-    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
>-        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
>-        archive_cmds="$tmp_archive_cmds"
>-      supports_anon_versioning=no
>-      case `$LD -v 2>/dev/null` in
>-        *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
>-        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
>-        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
>-        *\ 2.11.*) ;; # other 2.11 versions
>-        *) supports_anon_versioning=yes ;;
>-      esac
>-      if test $supports_anon_versioning = yes; then
>-        archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
>-cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
>-$echo "local: *; };" >> $output_objdir/$libname.ver~
>-        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
>-      else
>-        archive_expsym_cmds="$tmp_archive_cmds"
>-      fi
>-    else
>-      ld_shlibs=no
>-    fi
>-    ;;
>-
>-    *)
>+    *)
>       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
>         archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
>         archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
>       else
>@@ -6951,19 +7185,14 @@
>       fi
>       ;;
>     esac
> 
>-    if test "$ld_shlibs" = yes; then
>-      runpath_var=LD_RUN_PATH
>-      hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
>-      export_dynamic_flag_spec='${wl}--export-dynamic'
>-      # ancient GNU ld didn't support --whole-archive et. al.
>-      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
>-        whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
>-      else
>+    if test "$ld_shlibs" = no; then
>+      runpath_var=
>+      hardcode_libdir_flag_spec=
>+      export_dynamic_flag_spec=
>         whole_archive_flag_spec=
>       fi
>-    fi
>   else
>     # PORTME fill in a description of your system's linker (not GNU ld)
>     case $host_os in
>     aix3*)
>@@ -6972,9 +7201,9 @@
>       archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
>       # Note: this linker hardcodes the directories in LIBPATH if there
>       # are no directories specified by -L.
>       hardcode_minus_L=yes
>-      if test "$GCC" = yes && test -z "$link_static_flag"; then
>+      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
>         # Neither direct hardcoding nor static linking is supported with a
>         # broken collect2.
>         hardcode_direct=unsupported
>       fi
>@@ -7006,8 +7235,9 @@
>             aix_use_runtimelinking=yes
>             break
>           fi
>           done
>+          ;;
>         esac
> 
>         exp_sym_flag='-bexport'
>         no_entry_flag='-bnoentry'
>@@ -7024,9 +7254,9 @@
>       hardcode_libdir_separator=':'
>       link_all_deplibs=yes
> 
>       if test "$GCC" = yes; then
>-        case $host_os in aix4.012|aix4.012.*)
>+        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" && \
>@@ -7043,10 +7273,14 @@
>           hardcode_minus_L=yes
>           hardcode_libdir_flag_spec='-L$libdir'
>           hardcode_libdir_separator=
>           fi
>+          ;;
>         esac
>         shared_flag='-shared'
>+        if test "$aix_use_runtimelinking" = yes; then
>+          shared_flag="$shared_flag "'${wl}-G'
>+        fi
>       else
>         # not using gcc
>         if test "$host_cpu" = ia64; then
>         # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
>@@ -7121,14 +7355,14 @@
>       conftest$ac_exeext conftest.$ac_ext
> if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
> 
>        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
>-        archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
>+        archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
>        else
>         if test "$host_cpu" = ia64; then
>           hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
>           allow_undefined_flag="-z nodefs"
>-          archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
>+          archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
>         else
>          # Determine the default libpath from the value encoded in an empty executable.
>          cat >conftest.$ac_ext <<_ACEOF
> /* confdefs.h.  */
>@@ -7186,15 +7420,13 @@
>           # Warning - without using the other run time loading flags,
>           # -berok will link without error, but may produce a broken library.
>           no_undefined_flag=' ${wl}-bernotok'
>           allow_undefined_flag=' ${wl}-berok'
>-          # -bexpall does not export symbols beginning with underscore (_)
>-          always_export_symbols=yes
>           # Exported symbols can be pulled into shared objects from archives
>-          whole_archive_flag_spec=' '
>+          whole_archive_flag_spec='$convenience'
>           archive_cmds_need_lc=yes
>-          # This is similar to how AIX traditionally builds it's shared libraries.
>-          archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
>+          # This is similar to how AIX traditionally builds its shared libraries.
>+          archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
>         fi
>       fi
>       ;;
> 
>@@ -7205,9 +7437,9 @@
>       # see comment about different semantics on the GNU ld section
>       ld_shlibs=no
>       ;;
> 
>-    bsdi4*)
>+    bsdi[45]*)
>       export_dynamic_flag_spec=-rdynamic
>       ;;
> 
>     cygwin* | mingw* | pw32*)
>@@ -7231,54 +7463,54 @@
>       enable_shared_with_static_runtimes=yes
>       ;;
> 
>     darwin* | rhapsody*)
>-    if test "$GXX" = yes ; then
>-      archive_cmds_need_lc=no
>-      case "$host_os" in
>+      case $host_os in
>       rhapsody* | darwin1.[012])
>-        allow_undefined_flag='-undefined suppress'
>+         allow_undefined_flag='${wl}-undefined ${wl}suppress'
>         ;;
>       *) # Darwin 1.3 on
>       if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
>-        allow_undefined_flag='-flat_namespace -undefined suppress'
>+           allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
>       else
>         case ${MACOSX_DEPLOYMENT_TARGET} in
>           10.[012])
>-            allow_undefined_flag='-flat_namespace -undefined suppress'
>+               allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
>             ;;
>           10.*)
>-            allow_undefined_flag='-undefined dynamic_lookup'
>+               allow_undefined_flag='${wl}-undefined ${wl}dynamic_lookup'
>             ;;
>         esac
>       fi
>         ;;
>       esac
>-        lt_int_apple_cc_single_mod=no
>-        output_verbose_link_cmd='echo'
>-        if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
>-          lt_int_apple_cc_single_mod=yes
>-        fi
>-        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
>-          archive_cmds='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
>-        else
>-        archive_cmds='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
>-      fi
>-      module_cmds='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
>-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
>-        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
>-          archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
>-        else
>-          archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
>-        fi
>-          module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
>+      archive_cmds_need_lc=no
>       hardcode_direct=no
>       hardcode_automatic=yes
>       hardcode_shlibpath_var=unsupported
>-      whole_archive_flag_spec='-all_load $convenience'
>+      whole_archive_flag_spec=''
>       link_all_deplibs=yes
>+    if test "$GCC" = yes ; then
>+        output_verbose_link_cmd='echo'
>+        archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
>+      module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
>+      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
>+      archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
>+      module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
>     else
>+      case $cc_basename in
>+        xlc*)
>+         output_verbose_link_cmd='echo'
>+         archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
>+         module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
>+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
>+         archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
>+          module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
>+          ;;
>+       *)
>       ld_shlibs=no
>+          ;;
>+      esac
>     fi
>       ;;
> 
>     dgux*)
>@@ -7310,9 +7542,9 @@
>       hardcode_shlibpath_var=no
>       ;;
> 
>     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
>-    freebsd* | kfreebsd*-gnu)
>+    freebsd* | kfreebsd*-gnu | dragonfly*)
>       archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
>       hardcode_libdir_flag_spec='-R$libdir'
>       hardcode_direct=yes
>       hardcode_shlibpath_var=no
>@@ -7333,49 +7565,64 @@
>       hardcode_minus_L=yes
>       export_dynamic_flag_spec='${wl}-E'
>       ;;
> 
>-    hpux10* | hpux11*)
>+    hpux10*)
>       if test "$GCC" = yes -a "$with_gnu_ld" = no; then
>-        case "$host_cpu" in
>-        hppa*64*|ia64*)
>+        archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
>+      else
>+        archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
>+      fi
>+      if test "$with_gnu_ld" = no; then
>+        hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
>+        hardcode_libdir_separator=:
>+
>+        hardcode_direct=yes
>+        export_dynamic_flag_spec='${wl}-E'
>+
>+        # hardcode_minus_L: Not really in the search PATH,
>+        # but as the default location of the library.
>+        hardcode_minus_L=yes
>+      fi
>+      ;;
>+
>+    hpux11*)
>+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
>+        case $host_cpu in
>+        hppa*64*)
>           archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
>           ;;
>+        ia64*)
>+          archive_cmds='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
>+          ;;
>         *)
>           archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
>           ;;
>         esac
>       else
>-        case "$host_cpu" in
>-        hppa*64*|ia64*)
>-          archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
>+        case $host_cpu in
>+        hppa*64*)
>+          archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
>+          ;;
>+        ia64*)
>+          archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
>           ;;
>         *)
>-          archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
>+          archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
>           ;;
>         esac
>       fi
>       if test "$with_gnu_ld" = no; then
>-        case "$host_cpu" in
>-        hppa*64*)
>           hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
>-          hardcode_libdir_flag_spec_ld='+b $libdir'
>           hardcode_libdir_separator=:
>+
>+        case $host_cpu in
>+        hppa*64*|ia64*)
>+          hardcode_libdir_flag_spec_ld='+b $libdir'
>           hardcode_direct=no
>           hardcode_shlibpath_var=no
>           ;;
>-        ia64*)
>-          hardcode_libdir_flag_spec='-L$libdir'
>-          hardcode_direct=no
>-          hardcode_shlibpath_var=no
>-
>-          # hardcode_minus_L: Not really in the search PATH,
>-          # but as the default location of the library.
>-          hardcode_minus_L=yes
>-          ;;
>         *)
>-          hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
>-          hardcode_libdir_separator=:
>           hardcode_direct=yes
>           export_dynamic_flag_spec='${wl}-E'
> 
>           # hardcode_minus_L: Not really in the search PATH,
>@@ -7421,8 +7668,9 @@
>       hardcode_direct=yes
>       hardcode_shlibpath_var=no
>       if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
>         archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
>+        archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
>         hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
>         export_dynamic_flag_spec='${wl}-E'
>       else
>        case $host_os in
>@@ -7466,41 +7714,45 @@
>       else
>         allow_undefined_flag=' -expect_unresolved \*'
>         archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
>         archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
>-        $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
>+        $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
> 
>         # Both c and cxx compiler support -rpath directly
>         hardcode_libdir_flag_spec='-rpath $libdir'
>       fi
>       hardcode_libdir_separator=:
>       ;;
> 
>-    sco3.2v5*)
>-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
>-      hardcode_shlibpath_var=no
>-      export_dynamic_flag_spec='${wl}-Bexport'
>-      runpath_var=LD_RUN_PATH
>-      hardcode_runpath_var=yes
>-      ;;
>-
>     solaris*)
>       no_undefined_flag=' -z text'
>       if test "$GCC" = yes; then
>+        wlarc='${wl}'
>         archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
>         archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
>           $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
>       else
>+        wlarc=''
>         archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
>         archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
>         $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
>       fi
>       hardcode_libdir_flag_spec='-R$libdir'
>       hardcode_shlibpath_var=no
>       case $host_os in
>       solaris2.[0-5] | solaris2.[0-5].*) ;;
>-      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
>+      *)
>+        # The compiler driver will combine linker options so we
>+        # cannot just pass the convience library names through
>+        # without $wl, iff we do not link with $LD.
>+        # Luckily, gcc supports the same syntax we need for Sun Studio.
>+        # Supported since Solaris 2.6 (maybe 2.5.1?)
>+        case $wlarc in
>+        '')
>         whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
>+        *)
>+          whole_archive_flag_spec='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
>+        esac ;;
>       esac
>       link_all_deplibs=yes
>       ;;
> 
>@@ -7555,38 +7807,47 @@
>         ld_shlibs=yes
>       fi
>       ;;
> 
>-    sysv4.2uw2*)
>-      archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
>-      hardcode_direct=yes
>-      hardcode_minus_L=no
>+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
>+      no_undefined_flag='${wl}-z,text'
>+      archive_cmds_need_lc=no
>       hardcode_shlibpath_var=no
>-      hardcode_runpath_var=yes
>-      runpath_var=LD_RUN_PATH
>-      ;;
>+      runpath_var='LD_RUN_PATH'
> 
>-   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
>-      no_undefined_flag='${wl}-z ${wl}text'
>       if test "$GCC" = yes; then
>-        archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
>+        archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
>+        archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
>       else
>-        archive_cmds='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
>+        archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
>+        archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
>       fi
>-      runpath_var='LD_RUN_PATH'
>-      hardcode_shlibpath_var=no
>       ;;
> 
>-    sysv5*)
>-      no_undefined_flag=' -z text'
>-      # $CC -shared without GNU ld will not create a library from C++
>-      # object files and a static libstdc++, better avoid it by now
>-      archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
>-      archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
>-                $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
>-      hardcode_libdir_flag_spec=
>+    sysv5* | sco3.2v5* | sco5v6*)
>+      # Note: We can NOT use -z defs as we might desire, because we do not
>+      # link with -lc, and that would cause any symbols used from libc to
>+      # always be unresolved, which means just about no library would
>+      # ever link correctly.  If we're not using GNU ld we use -z text
>+      # though, which does catch some bad symbols but isn't as heavy-handed
>+      # as -z defs.
>+      no_undefined_flag='${wl}-z,text'
>+      allow_undefined_flag='${wl}-z,nodefs'
>+      archive_cmds_need_lc=no
>       hardcode_shlibpath_var=no
>+      hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
>+      hardcode_libdir_separator=':'
>+      link_all_deplibs=yes
>+      export_dynamic_flag_spec='${wl}-Bexport'
>       runpath_var='LD_RUN_PATH'
>+
>+      if test "$GCC" = yes; then
>+        archive_cmds='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
>+        archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
>+      else
>+        archive_cmds='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
>+        archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
>+      fi
>       ;;
> 
>     uts4*)
>       archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
>@@ -7603,13 +7864,8 @@
> echo "$as_me:$LINENO: result: $ld_shlibs" >&5
> echo "${ECHO_T}$ld_shlibs" >&6
> test "$ld_shlibs" = no && can_build_shared=no
> 
>-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
>-if test "$GCC" = yes; then
>-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
>-fi
>-
> #
> # Do we need to explicitly link libc?
> #
> case "x$archive_cmds_need_lc" in
>@@ -7640,8 +7896,9 @@
>         lib=conftest
>         libobjs=conftest.$ac_objext
>         deplibs=
>         wl=$lt_prog_compiler_wl
>+        pic_flag=$lt_prog_compiler_pic
>         compiler_flags=-v
>         linker_flags=-v
>         verstring=
>         output_objdir=.
>@@ -7772,9 +8029,9 @@
>   dynamic_linker="$host_os ld.so"
>   shlibpath_var=LIBRARY_PATH
>   ;;
> 
>-bsdi4*)
>+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'
>@@ -7800,9 +8057,10 @@
>     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'
>+      $install_prog $dir/$dlname \$dldir/$dlname~
>+      chmod a+x \$dldir/$dlname'
>     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
>       dlpath=$dir/\$dldll~
>        $rm \$dlpath'
>     shlibpath_overrides_runpath=yes
>@@ -7830,9 +8088,9 @@
>       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}'
>+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
>       ;;
>     esac
>     ;;
> 
>@@ -7853,9 +8111,9 @@
>   library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
>   soname_spec='${libname}${release}${major}$shared_ext'
>   shlibpath_overrides_runpath=yes
>   shlibpath_var=DYLD_LIBRARY_PATH
>-  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
>+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
>   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
>   if test "$GCC" = yes; then
>     sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
>   else
>@@ -7888,10 +8146,19 @@
>   hardcode_into_libs=yes
>   dynamic_linker='GNU ld.so'
>   ;;
> 
>-freebsd*)
>-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
>+freebsd* | dragonfly*)
>+  # DragonFly does not have aout.  When/if they implement a new
>+  # versioning mechanism, adjust this.
>+  if test -x /usr/bin/objformat; then
>+    objformat=`/usr/bin/objformat`
>+  else
>+    case $host_os in
>+    freebsd[123]*) objformat=aout ;;
>+    *) objformat=elf ;;
>+    esac
>+  fi
>   version_type=freebsd-$objformat
>   case $version_type in
>     freebsd-elf*)
>       library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
>@@ -7907,16 +8174,21 @@
>   case $host_os in
>   freebsd2*)
>     shlibpath_overrides_runpath=yes
>     ;;
>-  freebsd3.01* | freebsdelf3.01*)
>+  freebsd3.[01]* | freebsdelf3.[01]*)
>     shlibpath_overrides_runpath=yes
>     hardcode_into_libs=yes
>     ;;
>-  *) # from 3.2 on
>+  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
>+  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
>     shlibpath_overrides_runpath=no
>     hardcode_into_libs=yes
>     ;;
>+  freebsd*) # from 4.6 on
>+    shlibpath_overrides_runpath=yes
>+    hardcode_into_libs=yes
>+    ;;
>   esac
>   ;;
> 
> gnu*)
>@@ -7934,9 +8206,9 @@
>   # link against other versions.
>   version_type=sunos
>   need_lib_prefix=no
>   need_version=no
>-  case "$host_cpu" in
>+  case $host_cpu in
>   ia64*)
>     shrext_cmds='.so'
>     hardcode_into_libs=yes
>     dynamic_linker="$host_os dld.so"
>@@ -7974,8 +8246,20 @@
>   # HP-UX runs *really* slowly unless shared libraries are mode 555.
>   postinstall_cmds='chmod 555 $lib'
>   ;;
> 
>+interix3*)
>+  version_type=linux
>+  need_lib_prefix=no
>+  need_version=no
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  shlibpath_overrides_runpath=no
>+  hardcode_into_libs=yes
>+  ;;
>+
> irix5* | irix6* | nonstopux*)
>   case $host_os in
>     nonstopux*) version_type=nonstopux ;;
>     *)
>@@ -8031,33 +8315,12 @@
>   # Some rework will be needed to allow for fast_install
>   # before this can be enabled.
>   hardcode_into_libs=yes
> 
>-  # find out which ABI we are using
>-  libsuff=
>-  case "$host_cpu" in
>-  x86_64*|s390x*|powerpc64*)
>-    echo '#line 8039 "configure"' > conftest.$ac_ext
>-    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
>-  (eval $ac_compile) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; then
>-      case `/usr/bin/file conftest.$ac_objext` in
>-      *64-bit*)
>-        libsuff=64
>-        sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
>-        ;;
>-      esac
>-    fi
>-    rm -rf conftest*
>-    ;;
>-  esac
>-
>   # Append ld.so.conf contents to the search path
>   if test -f /etc/ld.so.conf; then
>-    lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
>-    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
>+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,        ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
>+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
>   fi
> 
>   # We used to test for /lib/ld.so.1 and disable shared libraries on
>   # powerpc, because MkLinux only supported shared libraries with the
>@@ -8116,10 +8379,15 @@
>   ;;
> 
> openbsd*)
>   version_type=sunos
>+  sys_lib_dlsearch_path_spec="/usr/lib"
>   need_lib_prefix=no
>-  need_version=yes
>+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
>+  case $host_os in
>+    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
>+    *)                         need_version=no  ;;
>+  esac
>   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
>   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
>   shlibpath_var=LD_LIBRARY_PATH
>   if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
>@@ -8155,15 +8423,8 @@
>   sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
>   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
>   ;;
> 
>-sco3.2v5*)
>-  version_type=osf
>-  soname_spec='${libname}${release}${shared_ext}$major'
>-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>-  shlibpath_var=LD_LIBRARY_PATH
>-  ;;
>-
> solaris*)
>   version_type=linux
>   need_lib_prefix=no
>   need_version=no
>@@ -8187,9 +8448,9 @@
>   fi
>   need_version=yes
>   ;;
> 
>-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
>+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
>@@ -8220,8 +8481,31 @@
>     shlibpath_var=LD_LIBRARY_PATH
>   fi
>   ;;
> 
>+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
>+  version_type=freebsd-elf
>+  need_lib_prefix=no
>+  need_version=no
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  hardcode_into_libs=yes
>+  if test "$with_gnu_ld" = yes; then
>+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
>+    shlibpath_overrides_runpath=no
>+  else
>+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
>+    shlibpath_overrides_runpath=yes
>+    case $host_os in
>+      sco3.2v5*)
>+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
>+        ;;
>+    esac
>+  fi
>+  sys_lib_dlsearch_path_spec='/usr/lib'
>+  ;;
>+
> uts4*)
>   version_type=linux
>   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>   soname_spec='${libname}${release}${shared_ext}$major'
>@@ -8235,8 +8519,13 @@
> echo "$as_me:$LINENO: result: $dynamic_linker" >&5
> echo "${ECHO_T}$dynamic_linker" >&6
> test "$dynamic_linker" = no && can_build_shared=no
> 
>+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
>+if test "$GCC" = yes; then
>+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
>+fi
>+
> echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
> echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
> hardcode_action=
> if test -n "$hardcode_libdir_flag_spec" || \
>@@ -8890,9 +9179,9 @@
>     save_CPPFLAGS="$CPPFLAGS"
>     test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
> 
>     save_LDFLAGS="$LDFLAGS"
>-    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
>+    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
> 
>     save_LIBS="$LIBS"
>     LIBS="$lt_cv_dlopen_libs $LIBS"
> 
>@@ -8906,9 +9195,9 @@
> else
>   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
>   lt_status=$lt_dlunknown
>   cat > conftest.$ac_ext <<EOF
>-#line 8910 "configure"
>+#line 9199 "configure"
> #include "confdefs.h"
> 
> #if HAVE_DLFCN_H
> #include <dlfcn.h>
>@@ -8963,8 +9252,10 @@
>       if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
>       else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
>       /* dlclose (self); */
>     }
>+  else
>+    puts (dlerror ());
> 
>     exit (status);
> }
> EOF
>@@ -8972,14 +9263,14 @@
>   (eval $ac_link) 2>&5
>   ac_status=$?
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
>-    (./conftest; exit; ) 2>/dev/null
>+    (./conftest; exit; ) >&5 2>/dev/null
>     lt_status=$?
>     case x$lt_status in
>       x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
>       x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
>-      x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
>+      x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;;
>     esac
>   else :
>     # compilation failed
>     lt_cv_dlopen_self=no
>@@ -8992,9 +9283,9 @@
> echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
> echo "${ECHO_T}$lt_cv_dlopen_self" >&6
> 
>     if test "x$lt_cv_dlopen_self" = xyes; then
>-      LDFLAGS="$LDFLAGS $link_static_flag"
>+      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
>       echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
> echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
> if test "${lt_cv_dlopen_self_static+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
>@@ -9004,9 +9295,9 @@
> else
>   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
>   lt_status=$lt_dlunknown
>   cat > conftest.$ac_ext <<EOF
>-#line 9008 "configure"
>+#line 9299 "configure"
> #include "confdefs.h"
> 
> #if HAVE_DLFCN_H
> #include <dlfcn.h>
>@@ -9061,8 +9352,10 @@
>       if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
>       else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
>       /* dlclose (self); */
>     }
>+  else
>+    puts (dlerror ());
> 
>     exit (status);
> }
> EOF
>@@ -9070,14 +9363,14 @@
>   (eval $ac_link) 2>&5
>   ac_status=$?
>   echo "$as_me:$LINENO: \$? = $ac_status" >&5
>   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
>-    (./conftest; exit; ) 2>/dev/null
>+    (./conftest; exit; ) >&5 2>/dev/null
>     lt_status=$?
>     case x$lt_status in
>       x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
>       x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
>-      x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
>+      x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;;
>     esac
>   else :
>     # compilation failed
>     lt_cv_dlopen_self_static=no
>@@ -9108,9 +9401,9 @@
>   esac
> fi
> 
> 
>-# Report which librarie types wil actually be built
>+# Report which library types will actually be built
> echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
> echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
> echo "$as_me:$LINENO: result: $can_build_shared" >&5
> echo "${ECHO_T}$can_build_shared" >&6
>@@ -9120,9 +9413,9 @@
> 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
>+case $host_os in
> aix3*)
>   test "$enable_shared" = yes && enable_static=no
>   if test -n "$RANLIB"; then
>     archive_cmds="$archive_cmds~\$RANLIB \$lib"
>@@ -9134,45 +9427,8 @@
>   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
>     test "$enable_shared" = yes && enable_static=no
>   fi
>   ;;
>-  darwin* | rhapsody*)
>-  if test "$GCC" = yes; then
>-    archive_cmds_need_lc=no
>-    case "$host_os" in
>-    rhapsody* | darwin1.[012])
>-      allow_undefined_flag='-undefined suppress'
>-      ;;
>-    *) # Darwin 1.3 on
>-      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
>-        allow_undefined_flag='-flat_namespace -undefined suppress'
>-      else
>-        case ${MACOSX_DEPLOYMENT_TARGET} in
>-          10.[012])
>-            allow_undefined_flag='-flat_namespace -undefined suppress'
>-            ;;
>-          10.*)
>-            allow_undefined_flag='-undefined dynamic_lookup'
>-            ;;
>-        esac
>-      fi
>-      ;;
>-    esac
>-    output_verbose_link_cmd='echo'
>-    archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring'
>-    module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
>-    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
>-    archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag  -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
>-    module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
>-    hardcode_direct=no
>-    hardcode_automatic=yes
>-    hardcode_shlibpath_var=unsupported
>-    whole_archive_flag_spec='-all_load $convenience'
>-    link_all_deplibs=yes
>-  else
>-    ld_shlibs=no
>-  fi
>-    ;;
> esac
> echo "$as_me:$LINENO: result: $enable_shared" >&5
> echo "${ECHO_T}$enable_shared" >&6
> 
>@@ -9195,9 +9451,9 @@
>   fi
>   # Now quote all the things that may contain metacharacters while being
>   # careful not to overquote the AC_SUBSTed values.  We take copies of the
>   # variables and quote the copies for generation of the libtool script.
>-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
>+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
>     SED SHELL STRIP \
>     libname_spec library_names_spec soname_spec extract_expsyms_cmds \
>     old_striplib striplib file_magic_cmd finish_cmds finish_eval \
>     deplibs_check_method reload_flag reload_cmds need_locks \
>@@ -9299,9 +9555,9 @@
> # General Public License for more details.
> #
> # You should have received a copy of the GNU General Public License
> # along with this program; if not, write to the Free Software
>-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
>+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
> #
> # As a special exception to the GNU General Public License, if you
> # distribute this file as part of a program that contains a
> # configuration script generated by Autoconf, you may include it under
>@@ -9310,13 +9566,13 @@
> # A sed program that does not truncate output.
> SED=$lt_SED
> 
> # Sed that helps us avoid accidentally triggering echo(1) options like -n.
>-Xsed="$SED -e s/^X//"
>+Xsed="$SED -e 1s/^X//"
> 
> # The HP-UX ksh and POSIX shell print the target directory to stdout
> # if CDPATH is set.
>-if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
>+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
> 
> # The names of the tagged configurations supported by this script.
> available_tags=
> 
>@@ -9344,8 +9600,14 @@
> 
> # The host system.
> host_alias=$host_alias
> host=$host
>+host_os=$host_os
>+
>+# The build system.
>+build_alias=$build_alias
>+build=$build
>+build_os=$build_os
> 
> # An echo program that does not interpret backslashes.
> echo=$lt_echo
> 
>@@ -9355,8 +9617,11 @@
> 
> # A C compiler.
> LTCC=$lt_LTCC
> 
>+# LTCC compiler flags.
>+LTCFLAGS=$lt_LTCFLAGS
>+
> # A language-specific compiler.
> CC=$lt_compiler
> 
> # Is the compiler the GNU C compiler?
>@@ -9685,8 +9950,11 @@
>       { echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5
> echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
>     fi
>   fi
>+  if test -z "$LTCFLAGS"; then
>+    eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
>+  fi
> 
>   # 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'`
>@@ -9715,9 +9983,11 @@
>       echo appending configuration tag \"$tagname\" to $ofile
> 
>       case $tagname in
>       CXX)
>-        if test -n "$CXX" && test "X$CXX" != "Xno"; then
>+        if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
>+            ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
>+            (test "X$CXX" != "Xg++"))) ; then
>           ac_ext=cc
> ac_cpp='$CXXCPP $CPPFLAGS'
> ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
> ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
>@@ -9735,8 +10005,9 @@
> hardcode_libdir_flag_spec_CXX=
> hardcode_libdir_flag_spec_ld_CXX=
> hardcode_libdir_separator_CXX=
> hardcode_minus_L_CXX=no
>+hardcode_shlibpath_var_CXX=unsupported
> hardcode_automatic_CXX=no
> module_cmds_CXX=
> module_expsym_cmds_CXX=
> link_all_deplibs_CXX=unknown
>@@ -9752,9 +10023,9 @@
> postdeps_CXX=
> compiler_lib_search_path_CXX=
> 
> # Source file extension for C++ test sources.
>-ac_ext=cc
>+ac_ext=cpp
> 
> # Object file extension for compiled C++ test sources.
> objext=o
> objext_CXX=$objext
>@@ -9762,19 +10033,36 @@
> # Code to be used in simple compile tests
> lt_simple_compile_test_code="int some_variable = 0;\n"
> 
> # Code to be used in simple link tests
>-lt_simple_link_test_code='int main(int, char *) { return(0); }\n'
>+lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n'
> 
> # ltmain only uses $CC for tagged configurations so make sure $CC is set.
> 
> # If no C compiler was specified, use CC.
> LTCC=${LTCC-"$CC"}
> 
>+# If no C compiler flags were specified, use CFLAGS.
>+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
>+
> # Allow CC to be a program name with arguments.
> compiler=$CC
> 
> 
>+# save warnings/boilerplate of simple test code
>+ac_outfile=conftest.$ac_objext
>+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
>+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
>+_lt_compiler_boilerplate=`cat conftest.err`
>+$rm conftest*
>+
>+ac_outfile=conftest.$ac_objext
>+printf "$lt_simple_link_test_code" >conftest.$ac_ext
>+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
>+_lt_linker_boilerplate=`cat conftest.err`
>+$rm conftest*
>+
>+
> # Allow CC to be a program name with arguments.
> lt_save_CC=$CC
> lt_save_LD=$LD
> lt_save_GCC=$GCC
>@@ -9783,20 +10071,29 @@
> 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
>-  unset lt_cv_prog_gnu_ld
>+  $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
>-  unset lt_cv_path_LD
>+  $as_unset lt_cv_path_LD
> fi
> test -z "${LDCXX+set}" || LD=$LDCXX
> CC=${CXX-"c++"}
> compiler=$CC
> compiler_CXX=$CC
>-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
>+for cc_temp in $compiler""; do
>+  case $cc_temp in
>+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
>+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
>+    \-*) ;;
>+    *) break;;
>+  esac
>+done
>+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
>+
> 
> # We don't want -fno-exception wen compiling C++ code, so set the
> # no_builtin_flag separately
> if test "$GXX" = yes; then
>@@ -9865,9 +10162,9 @@
>     test -z "$ac_dir" && ac_dir=.
>     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
>       lt_cv_path_LD="$ac_dir/$ac_prog"
>       # Check to see if the program is GNU ld.  I'd rather use --version,
>-      # but apparently some GNU ld's only accept -v.
>+      # but apparently some variants of GNU ld only accept -v.
>       # Break only if it was the GNU/non-GNU ld that we prefer.
>       case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
>       *GNU* | *'with BFD'*)
>         test "$with_gnu_ld" != no && break
>@@ -9899,9 +10196,9 @@
> echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
> if test "${lt_cv_prog_gnu_ld+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>-  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
>+  # I'd rather use --version here, but apparently some GNU lds only accept -v.
> case `$LD -v 2>&1 </dev/null` in
> *GNU* | *'with BFD'*)
>   lt_cv_prog_gnu_ld=yes
>   ;;
>@@ -9990,8 +10287,9 @@
>             break
>             ;;
>           esac
>         done
>+        ;;
>       esac
> 
>       exp_sym_flag='-bexport'
>       no_entry_flag='-bnoentry'
>@@ -10008,9 +10306,9 @@
>     hardcode_libdir_separator_CXX=':'
>     link_all_deplibs_CXX=yes
> 
>     if test "$GXX" = yes; then
>-      case $host_os in aix4.012|aix4.012.*)
>+      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" && \
>@@ -10027,10 +10325,14 @@
>           hardcode_minus_L_CXX=yes
>           hardcode_libdir_flag_spec_CXX='-L$libdir'
>           hardcode_libdir_separator_CXX=
>         fi
>+        ;;
>       esac
>       shared_flag='-shared'
>+      if test "$aix_use_runtimelinking" = yes; then
>+        shared_flag="$shared_flag "'${wl}-G'
>+      fi
>     else
>       # not using gcc
>       if test "$host_cpu" = ia64; then
>         # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
>@@ -10106,14 +10408,14 @@
> if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
> 
>       hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
> 
>-      archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
>+      archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
>      else
>       if test "$host_cpu" = ia64; then
>         hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
>         allow_undefined_flag_CXX="-z nodefs"
>-        archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
>+        archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
>       else
>         # Determine the default libpath from the value encoded in an empty executable.
>         cat >conftest.$ac_ext <<_ACEOF
> /* confdefs.h.  */
>@@ -10171,18 +10473,28 @@
>         # Warning - without using the other run time loading flags,
>         # -berok will link without error, but may produce a broken library.
>         no_undefined_flag_CXX=' ${wl}-bernotok'
>         allow_undefined_flag_CXX=' ${wl}-berok'
>-        # -bexpall does not export symbols beginning with underscore (_)
>-        always_export_symbols_CXX=yes
>         # Exported symbols can be pulled into shared objects from archives
>-        whole_archive_flag_spec_CXX=' '
>+        whole_archive_flag_spec_CXX='$convenience'
>         archive_cmds_need_lc_CXX=yes
>-        # This is similar to how AIX traditionally builds it's shared libraries.
>-        archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
>+        # This is similar to how AIX traditionally builds its shared libraries.
>+        archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
>       fi
>     fi
>     ;;
>+
>+  beos*)
>+    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
>+      allow_undefined_flag_CXX=unsupported
>+      # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
>+      # support --undefined.  This deserves some investigation.  FIXME
>+      archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
>+    else
>+      ld_shlibs_CXX=no
>+    fi
>+    ;;
>+
>   chorus*)
>     case $cc_basename in
>       *)
>         # FIXME: insert proper C++ library support
>@@ -10199,81 +10511,92 @@
>     always_export_symbols_CXX=no
>     enable_shared_with_static_runtimes_CXX=yes
> 
>     if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
>-      archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
>+      archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
>       # If the export-symbols file already is a .def file (1st line
>       # is EXPORTS), use it as is; otherwise, prepend...
>       archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
>         cp $export_symbols $output_objdir/$soname.def;
>       else
>         echo EXPORTS > $output_objdir/$soname.def;
>         cat $export_symbols >> $output_objdir/$soname.def;
>       fi~
>-      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
>+      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
>     else
>       ld_shlibs_CXX=no
>     fi
>   ;;
>-
>   darwin* | rhapsody*)
>-  if test "$GXX" = yes; then
>-    archive_cmds_need_lc_CXX=no
>-    case "$host_os" in
>+        case $host_os in
>     rhapsody* | darwin1.[012])
>-      allow_undefined_flag_CXX='-undefined suppress'
>+         allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress'
>       ;;
>     *) # Darwin 1.3 on
>       if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
>-        allow_undefined_flag_CXX='-flat_namespace -undefined suppress'
>+           allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
>       else
>         case ${MACOSX_DEPLOYMENT_TARGET} in
>           10.[012])
>-            allow_undefined_flag_CXX='-flat_namespace -undefined suppress'
>+               allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
>             ;;
>           10.*)
>-            allow_undefined_flag_CXX='-undefined dynamic_lookup'
>+               allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup'
>             ;;
>         esac
>       fi
>       ;;
>     esac
>+      archive_cmds_need_lc_CXX=no
>+      hardcode_direct_CXX=no
>+      hardcode_automatic_CXX=yes
>+      hardcode_shlibpath_var_CXX=unsupported
>+      whole_archive_flag_spec_CXX=''
>+      link_all_deplibs_CXX=yes
>+
>+    if test "$GXX" = yes ; then
>     lt_int_apple_cc_single_mod=no
>     output_verbose_link_cmd='echo'
>-    if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
>+      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
>       lt_int_apple_cc_single_mod=yes
>     fi
>     if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
>       archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
>     else
>-      archive_cmds_CXX='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
>+          archive_cmds_CXX='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
>     fi
>-    module_cmds_CXX='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
>-
>-    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
>+        module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
>+        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
>     if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
>       archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
>     else
>-      archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
>+            archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
>     fi
>     module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
>-    hardcode_direct_CXX=no
>-    hardcode_automatic_CXX=yes
>-    hardcode_shlibpath_var_CXX=unsupported
>-    whole_archive_flag_spec_CXX='-all_load $convenience'
>-    link_all_deplibs_CXX=yes
>   else
>+      case $cc_basename in
>+        xlc*)
>+         output_verbose_link_cmd='echo'
>+          archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
>+          module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
>+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
>+          archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
>+          module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
>+          ;;
>+       *)
>     ld_shlibs_CXX=no
>+          ;;
>+      esac
>   fi
>     ;;
> 
>   dgux*)
>     case $cc_basename in
>-      ec++)
>+      ec++*)
>         # FIXME: insert proper C++ library support
>         ld_shlibs_CXX=no
>         ;;
>-      ghcx)
>+      ghcx*)
>         # Green Hills C++ Compiler
>         # FIXME: insert proper C++ library support
>         ld_shlibs_CXX=no
>         ;;
>@@ -10282,16 +10605,16 @@
>         ld_shlibs_CXX=no
>         ;;
>     esac
>     ;;
>-  freebsd12*)
>+  freebsd[12]*)
>     # C++ shared libraries reported to be fairly broken before switch to ELF
>     ld_shlibs_CXX=no
>     ;;
>   freebsd-elf*)
>     archive_cmds_need_lc_CXX=no
>     ;;
>-  freebsd* | kfreebsd*-gnu)
>+  freebsd* | kfreebsd*-gnu | dragonfly*)
>     # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
>     # conventions
>     ld_shlibs_CXX=yes
>     ;;
>@@ -10306,13 +10629,13 @@
>                                 # but as the default
>                                 # location of the library.
> 
>     case $cc_basename in
>-    CC)
>+    CC*)
>       # FIXME: insert proper C++ library support
>       ld_shlibs_CXX=no
>       ;;
>-    aCC)
>+    aCC*)
>       archive_cmds_CXX='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
>       # Commands to make compiler produce verbose output that lists
>       # what "hidden" libraries, object files and flags are used when
>       # linking a shared library.
>@@ -10320,9 +10643,9 @@
>       # There doesn't appear to be a way to prevent this compiler from
>       # explicitly linking system object files so we need to strip them
>       # from the output so that they don't get included in the library
>       # dependencies.
>-      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
>+      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
>         archive_cmds_CXX='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
>@@ -10334,35 +10657,24 @@
>     esac
>     ;;
>   hpux10*|hpux11*)
>     if test $with_gnu_ld = no; then
>-      case "$host_cpu" in
>-      hppa*64*)
>         hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
>-        hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
>         hardcode_libdir_separator_CXX=:
>-        ;;
>-      ia64*)
>-        hardcode_libdir_flag_spec_CXX='-L$libdir'
>+
>+      case $host_cpu in
>+      hppa*64*|ia64*)
>+        hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
>         ;;
>       *)
>-        hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
>-        hardcode_libdir_separator_CXX=:
>         export_dynamic_flag_spec_CXX='${wl}-E'
>         ;;
>       esac
>     fi
>-    case "$host_cpu" in
>-    hppa*64*)
>-      hardcode_direct_CXX=no
>-      hardcode_shlibpath_var_CXX=no
>-      ;;
>-    ia64*)
>+    case $host_cpu in
>+    hppa*64*|ia64*)
>       hardcode_direct_CXX=no
>       hardcode_shlibpath_var_CXX=no
>-      hardcode_minus_L_CXX=yes # Not in the search PATH,
>-                                              # but as the default
>-                                              # location of the library.
>       ;;
>     *)
>       hardcode_direct_CXX=yes
>       hardcode_minus_L_CXX=yes # Not in the search PATH,
>@@ -10371,16 +10683,19 @@
>       ;;
>     esac
> 
>     case $cc_basename in
>-      CC)
>+      CC*)
>         # FIXME: insert proper C++ library support
>         ld_shlibs_CXX=no
>         ;;
>-      aCC)
>-        case "$host_cpu" in
>-        hppa*64*|ia64*)
>-          archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
>+      aCC*)
>+        case $host_cpu in
>+        hppa*64*)
>+          archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
>+          ;;
>+        ia64*)
>+          archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
>           ;;
>         *)
>           archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
>           ;;
>@@ -10397,11 +10712,14 @@
>         ;;
>       *)
>         if test "$GXX" = yes; then
>           if test $with_gnu_ld = no; then
>-            case "$host_cpu" in
>-            ia64*|hppa*64*)
>-              archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
>+            case $host_cpu in
>+            hppa*64*)
>+              archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
>+              ;;
>+            ia64*)
>+              archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
>               ;;
>             *)
>               archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
>               ;;
>@@ -10413,13 +10731,27 @@
>         fi
>         ;;
>     esac
>     ;;
>+  interix3*)
>+    hardcode_direct_CXX=no
>+    hardcode_shlibpath_var_CXX=no
>+    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
>+    export_dynamic_flag_spec_CXX='${wl}-E'
>+    # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
>+    # Instead, shared libraries are loaded at an image base (0x10000000 by
>+    # default) and relocated if they conflict, which is a slow very memory
>+    # consuming and fragmenting process.  To avoid this, we pick a random,
>+    # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
>+    # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
>+    archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
>+    archive_expsym_cmds_CXX='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
>+    ;;
>   irix5* | irix6*)
>     case $cc_basename in
>-      CC)
>+      CC*)
>         # SGI C++
>-        archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
>+        archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
> 
>         # Archives containing C++ object files must be created using
>         # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
>         # necessary to make sure instantiated templates are included
>@@ -10428,9 +10760,9 @@
>         ;;
>       *)
>         if test "$GXX" = yes; then
>           if test "$with_gnu_ld" = no; then
>-            archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
>+            archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
>           else
>             archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
>           fi
>         fi
>@@ -10441,9 +10773,9 @@
>     hardcode_libdir_separator_CXX=:
>     ;;
>   linux*)
>     case $cc_basename in
>-      KCC)
>+      KCC*)
>         # Kuck and Associates, Inc. (KAI) C++ Compiler
> 
>         # KCC will only create a shared library if the output file
>         # ends with ".so" (or ".sl" for HP-UX), so rename the library
>@@ -10466,19 +10798,43 @@
>         # Archives containing C++ object files must be created using
>         # "CC -Bstatic", where "CC" is the KAI C++ compiler.
>         old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
>         ;;
>-      icpc)
>+      icpc*)
>         # Intel C++
>         with_gnu_ld=yes
>-        archive_cmds_need_lc_CXX=no
>+        # version 8.0 and above of icpc choke on multiply defined symbols
>+        # if we add $predep_objects and $postdep_objects, however 7.1 and
>+        # earlier do not add the objects themselves.
>+        case `$CC -V 2>&1` in
>+        *"Version 7."*)
>         archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
>         archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
>+          ;;
>+        *)  # Version 8.0 or newer
>+          tmp_idyn=
>+          case $host_cpu in
>+            ia64*) tmp_idyn=' -i_dynamic';;
>+          esac
>+          archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
>+          archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
>+          ;;
>+        esac
>+        archive_cmds_need_lc_CXX=no
>         hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
>         export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
>         whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
>         ;;
>-      cxx)
>+      pgCC*)
>+        # Portland Group C++ compiler
>+        archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
>+        archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
>+
>+        hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
>+        export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
>+        whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
>+        ;;
>+      cxx*)
>         # Compaq C++
>         archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
>         archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
> 
>@@ -10507,9 +10863,9 @@
>     ld_shlibs_CXX=no
>     ;;
>   mvs*)
>     case $cc_basename in
>-      cxx)
>+      cxx*)
>         # FIXME: insert proper C++ library support
>         ld_shlibs_CXX=no
>         ;;
>       *)
>@@ -10528,11 +10884,27 @@
>     fi
>     # Workaround some broken pre-1.5 toolchains
>     output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
>     ;;
>+  openbsd2*)
>+    # C++ shared libraries are fairly broken
>+    ld_shlibs_CXX=no
>+    ;;
>+  openbsd*)
>+    hardcode_direct_CXX=yes
>+    hardcode_shlibpath_var_CXX=no
>+    archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
>+    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
>+    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
>+      archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
>+      export_dynamic_flag_spec_CXX='${wl}-E'
>+      whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
>+    fi
>+    output_verbose_link_cmd='echo'
>+    ;;
>   osf3*)
>     case $cc_basename in
>-      KCC)
>+      KCC*)
>         # Kuck and Associates, Inc. (KAI) C++ Compiler
> 
>         # KCC will only create a shared library if the output file
>         # ends with ".so" (or ".sl" for HP-UX), so rename the library
>@@ -10546,16 +10918,16 @@
>         # "CC -Bstatic", where "CC" is the KAI C++ compiler.
>         old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
> 
>         ;;
>-      RCC)
>+      RCC*)
>         # Rational C++ 2.4.1
>         # FIXME: insert proper C++ library support
>         ld_shlibs_CXX=no
>         ;;
>-      cxx)
>+      cxx*)
>         allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
>-        archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
>+        archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
> 
>         hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
>         hardcode_libdir_separator_CXX=:
> 
>@@ -10571,9 +10943,9 @@
>         ;;
>       *)
>         if test "$GXX" = yes && test "$with_gnu_ld" = no; then
>           allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
>-          archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
>+          archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
> 
>           hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
>           hardcode_libdir_separator_CXX=:
> 
>@@ -10590,9 +10962,9 @@
>     esac
>     ;;
>   osf4* | osf5*)
>     case $cc_basename in
>-      KCC)
>+      KCC*)
>         # Kuck and Associates, Inc. (KAI) C++ Compiler
> 
>         # KCC will only create a shared library if the output file
>         # ends with ".so" (or ".sl" for HP-UX), so rename the library
>@@ -10605,19 +10977,19 @@
>         # Archives containing C++ object files must be created using
>         # the KAI C++ compiler.
>         old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
>         ;;
>-      RCC)
>+      RCC*)
>         # Rational C++ 2.4.1
>         # FIXME: insert proper C++ library support
>         ld_shlibs_CXX=no
>         ;;
>-      cxx)
>+      cxx*)
>         allow_undefined_flag_CXX=' -expect_unresolved \*'
>-        archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
>+        archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
>         archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
>           echo "-hidden">> $lib.exp~
>-          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version $verstring` -update_registry $objdir/so_locations -o $lib~
>+          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~
>           $rm $lib.exp'
> 
>         hardcode_libdir_flag_spec_CXX='-rpath $libdir'
>         hardcode_libdir_separator_CXX=:
>@@ -10634,9 +11006,9 @@
>         ;;
>       *)
>         if test "$GXX" = yes && test "$with_gnu_ld" = no; then
>           allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
>-         archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
>+         archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
> 
>           hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
>           hardcode_libdir_separator_CXX=:
> 
>@@ -10655,29 +11027,16 @@
>   psos*)
>     # FIXME: insert proper C++ library support
>     ld_shlibs_CXX=no
>     ;;
>-  sco*)
>-    archive_cmds_need_lc_CXX=no
>-    case $cc_basename in
>-      CC)
>-        # FIXME: insert proper C++ library support
>-        ld_shlibs_CXX=no
>-        ;;
>-      *)
>-        # FIXME: insert proper C++ library support
>-        ld_shlibs_CXX=no
>-        ;;
>-    esac
>-    ;;
>   sunos4*)
>     case $cc_basename in
>-      CC)
>+      CC*)
>         # Sun C++ 4.x
>         # FIXME: insert proper C++ library support
>         ld_shlibs_CXX=no
>         ;;
>-      lcc)
>+      lcc*)
>         # Lucid
>         # FIXME: insert proper C++ library support
>         ld_shlibs_CXX=no
>         ;;
>@@ -10688,46 +11047,43 @@
>     esac
>     ;;
>   solaris*)
>     case $cc_basename in
>-      CC)
>+      CC*)
>         # Sun C++ 4.2, 5.x and Centerline C++
>+        archive_cmds_need_lc_CXX=yes
>         no_undefined_flag_CXX=' -zdefs'
>-        archive_cmds_CXX='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
>+        archive_cmds_CXX='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
>         archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
>-        $CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
>+        $CC -G${allow_undefined_flag}  ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
> 
>         hardcode_libdir_flag_spec_CXX='-R$libdir'
>         hardcode_shlibpath_var_CXX=no
>         case $host_os in
>-          solaris2.0-5 | solaris2.0-5.*) ;;
>+          solaris2.[0-5] | solaris2.[0-5].*) ;;
>           *)
>             # The C++ compiler is used as linker so we must use $wl
>             # flag to pass the commands to the underlying system
>-            # linker.
>+            # linker. We must also pass each convience library through
>+            # to the system linker between allextract/defaultextract.
>+            # The C++ compiler will combine linker options so we
>+            # cannot just pass the convience library names through
>+            # without $wl.
>             # Supported since Solaris 2.6 (maybe 2.5.1?)
>-            whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
>+            whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
>             ;;
>         esac
>         link_all_deplibs_CXX=yes
> 
>-        # Commands to make compiler produce verbose output that lists
>-        # what "hidden" libraries, object files and flags are used when
>-        # linking a shared library.
>-        #
>-        # There doesn't appear to be a way to prevent this compiler from
>-        # explicitly linking system object files so we need to strip them
>-        # from the output so that they don't get included in the library
>-        # dependencies.
>-        output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[LR]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
>+        output_verbose_link_cmd='echo'
> 
>         # Archives containing C++ object files must be created using
>         # "CC -xar", where "CC" is the Sun C++ compiler.  This is
>         # necessary to make sure instantiated templates are included
>         # in the archive.
>         old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
>         ;;
>-      gcx)
>+      gcx*)
>         # Green Hills C++ Compiler
>         archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
> 
>         # The C++ compiler must be used to create the archive.
>@@ -10763,14 +11119,65 @@
>         fi
>         ;;
>     esac
>     ;;
>-  sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
>+  sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
>+    no_undefined_flag_CXX='${wl}-z,text'
>+    archive_cmds_need_lc_CXX=no
>+    hardcode_shlibpath_var_CXX=no
>+    runpath_var='LD_RUN_PATH'
>+
>+    case $cc_basename in
>+      CC*)
>+        archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
>+        archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
>+        ;;
>+      *)
>+        archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
>+        archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
>+        ;;
>+    esac
>+    ;;
>+  sysv5* | sco3.2v5* | sco5v6*)
>+    # Note: We can NOT use -z defs as we might desire, because we do not
>+    # link with -lc, and that would cause any symbols used from libc to
>+    # always be unresolved, which means just about no library would
>+    # ever link correctly.  If we're not using GNU ld we use -z text
>+    # though, which does catch some bad symbols but isn't as heavy-handed
>+    # as -z defs.
>+    # For security reasons, it is highly recommended that you always
>+    # use absolute paths for naming shared libraries, and exclude the
>+    # DT_RUNPATH tag from executables and libraries.  But doing so
>+    # requires that you compile everything twice, which is a pain.
>+    # So that behaviour is only enabled if SCOABSPATH is set to a
>+    # non-empty value in the environment.  Most likely only useful for
>+    # creating official distributions of packages.
>+    # This is a hack until libtool officially supports absolute path
>+    # names for shared libraries.
>+    no_undefined_flag_CXX='${wl}-z,text'
>+    allow_undefined_flag_CXX='${wl}-z,nodefs'
>     archive_cmds_need_lc_CXX=no
>+    hardcode_shlibpath_var_CXX=no
>+    hardcode_libdir_flag_spec_CXX='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
>+    hardcode_libdir_separator_CXX=':'
>+    link_all_deplibs_CXX=yes
>+    export_dynamic_flag_spec_CXX='${wl}-Bexport'
>+    runpath_var='LD_RUN_PATH'
>+
>+    case $cc_basename in
>+      CC*)
>+        archive_cmds_CXX='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
>+        archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
>+        ;;
>+      *)
>+        archive_cmds_CXX='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
>+        archive_expsym_cmds_CXX='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
>+        ;;
>+    esac
>     ;;
>   tandem*)
>     case $cc_basename in
>-      NCC)
>+      NCC*)
>         # NonStop-UX NCC 3.20
>         # FIXME: insert proper C++ library support
>         ld_shlibs_CXX=no
>         ;;
>@@ -10821,9 +11228,9 @@
> 
>   # 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\"`"
>+  output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
> 
>   for p in `eval $output_verbose_link_cmd`; do
>     case $p in
> 
>@@ -10897,8 +11304,31 @@
> fi
> 
> $rm -f confest.$objext
> 
>+# PORTME: override above test on systems where it is broken
>+case $host_os in
>+interix3*)
>+  # Interix 3.5 installs completely hosed .la files for C++, so rather than
>+  # hack all around it, let's just trust "g++" to DTRT.
>+  predep_objects_CXX=
>+  postdep_objects_CXX=
>+  postdeps_CXX=
>+  ;;
>+
>+solaris*)
>+  case $cc_basename in
>+  CC*)
>+    # Adding this requires a known-good setup of shared libraries for
>+    # Sun compiler versions before 5.6, else PIC objects from an old
>+    # archive will be linked into the output, leading to subtle bugs.
>+    postdeps_CXX='-lCstd -lCrun'
>+    ;;
>+  esac
>+  ;;
>+esac
>+
>+
> case " $postdeps_CXX " in
> *" -lc "*) archive_cmds_need_lc_CXX=no ;;
> esac
> 
>@@ -10944,17 +11374,21 @@
>     *djgpp*)
>       # DJGPP does not support shared libraries at all
>       lt_prog_compiler_pic_CXX=
>       ;;
>+    interix3*)
>+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
>+      # Instead, we relocate shared libraries at runtime.
>+      ;;
>     sysv4*MP*)
>       if test -d /usr/nec; then
>         lt_prog_compiler_pic_CXX=-Kconform_pic
>       fi
>       ;;
>     hpux*)
>       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
>       # not for PA HP-UX.
>-      case "$host_cpu" in
>+      case $host_cpu in
>       hppa*64*|ia64*)
>         ;;
>       *)
>         lt_prog_compiler_pic_CXX='-fPIC'
>@@ -10977,43 +11411,53 @@
>         fi
>         ;;
>       chorus*)
>         case $cc_basename in
>-        cxch68)
>+        cxch68*)
>           # Green Hills C++ Compiler
>           # _LT_AC_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
>           ;;
>         esac
>         ;;
>+       darwin*)
>+         # PIC is the default on this platform
>+         # Common symbols not allowed in MH_DYLIB files
>+         case $cc_basename in
>+           xlc*)
>+           lt_prog_compiler_pic_CXX='-qnocommon'
>+           lt_prog_compiler_wl_CXX='-Wl,'
>+           ;;
>+         esac
>+       ;;
>       dgux*)
>         case $cc_basename in
>-          ec++)
>+          ec++*)
>             lt_prog_compiler_pic_CXX='-KPIC'
>             ;;
>-          ghcx)
>+          ghcx*)
>             # Green Hills C++ Compiler
>             lt_prog_compiler_pic_CXX='-pic'
>             ;;
>           *)
>             ;;
>         esac
>         ;;
>-      freebsd* | kfreebsd*-gnu)
>+      freebsd* | kfreebsd*-gnu | dragonfly*)
>         # FreeBSD uses GNU C++
>         ;;
>       hpux9* | hpux10* | hpux11*)
>         case $cc_basename in
>-          CC)
>+          CC*)
>             lt_prog_compiler_wl_CXX='-Wl,'
>-            lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
>+            lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
>             if test "$host_cpu" != ia64; then
>               lt_prog_compiler_pic_CXX='+Z'
>             fi
>             ;;
>-          aCC)
>+          aCC*)
>             lt_prog_compiler_wl_CXX='-Wl,'
>-            lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
>-            case "$host_cpu" in
>+            lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
>+            case $host_cpu in
>             hppa*64*|ia64*)
>               # +Z the default
>               ;;
>             *)
>@@ -11024,11 +11468,15 @@
>           *)
>             ;;
>         esac
>         ;;
>+      interix*)
>+        # This is c89, which is MS Visual C++ (no shared libs)
>+        # Anyone wants to do a port?
>+        ;;
>       irix5* | irix6* | nonstopux*)
>         case $cc_basename in
>-          CC)
>+          CC*)
>             lt_prog_compiler_wl_CXX='-Wl,'
>             lt_prog_compiler_static_CXX='-non_shared'
>             # CC pic flag -KPIC is the default.
>             ;;
>@@ -11037,20 +11485,26 @@
>         esac
>         ;;
>       linux*)
>         case $cc_basename in
>-          KCC)
>+          KCC*)
>             # KAI C++ Compiler
>             lt_prog_compiler_wl_CXX='--backend -Wl,'
>             lt_prog_compiler_pic_CXX='-fPIC'
>             ;;
>-          icpc)
>+          icpc* | ecpc*)
>             # Intel C++
>             lt_prog_compiler_wl_CXX='-Wl,'
>             lt_prog_compiler_pic_CXX='-KPIC'
>             lt_prog_compiler_static_CXX='-static'
>             ;;
>-          cxx)
>+          pgCC*)
>+            # Portland Group C++ compiler.
>+            lt_prog_compiler_wl_CXX='-Wl,'
>+            lt_prog_compiler_pic_CXX='-fpic'
>+            lt_prog_compiler_static_CXX='-Bstatic'
>+            ;;
>+          cxx*)
>             # Compaq C++
>             # Make sure the PIC flag is empty.  It appears that all Alpha
>             # Linux and Compaq Tru64 Unix objects are PIC.
>             lt_prog_compiler_pic_CXX=
>@@ -11065,9 +11519,9 @@
>       m88k*)
>         ;;
>       mvs*)
>         case $cc_basename in
>-          cxx)
>+          cxx*)
>             lt_prog_compiler_pic_CXX='-W c,exportall'
>             ;;
>           *)
>             ;;
>@@ -11076,16 +11530,16 @@
>       netbsd*)
>         ;;
>       osf3* | osf4* | osf5*)
>         case $cc_basename in
>-          KCC)
>+          KCC*)
>             lt_prog_compiler_wl_CXX='--backend -Wl,'
>             ;;
>-          RCC)
>+          RCC*)
>             # Rational C++ 2.4.1
>             lt_prog_compiler_pic_CXX='-pic'
>             ;;
>-          cxx)
>+          cxx*)
>             # Digital/Compaq C++
>             lt_prog_compiler_wl_CXX='-Wl,'
>             # Make sure the PIC flag is empty.  It appears that all Alpha
>             # Linux and Compaq Tru64 Unix objects are PIC.
>@@ -11097,26 +11551,17 @@
>         esac
>         ;;
>       psos*)
>         ;;
>-      sco*)
>-        case $cc_basename in
>-          CC)
>-            lt_prog_compiler_pic_CXX='-fPIC'
>-            ;;
>-          *)
>-            ;;
>-        esac
>-        ;;
>       solaris*)
>         case $cc_basename in
>-          CC)
>+          CC*)
>             # Sun C++ 4.2, 5.x and Centerline C++
>             lt_prog_compiler_pic_CXX='-KPIC'
>             lt_prog_compiler_static_CXX='-Bstatic'
>             lt_prog_compiler_wl_CXX='-Qoption ld '
>             ;;
>-          gcx)
>+          gcx*)
>             # Green Hills C++ Compiler
>             lt_prog_compiler_pic_CXX='-PIC'
>             ;;
>           *)
>@@ -11124,14 +11569,14 @@
>         esac
>         ;;
>       sunos4*)
>         case $cc_basename in
>-          CC)
>+          CC*)
>             # Sun C++ 4.x
>             lt_prog_compiler_pic_CXX='-pic'
>             lt_prog_compiler_static_CXX='-Bstatic'
>             ;;
>-          lcc)
>+          lcc*)
>             # Lucid
>             lt_prog_compiler_pic_CXX='-pic'
>             ;;
>           *)
>@@ -11139,17 +11584,24 @@
>         esac
>         ;;
>       tandem*)
>         case $cc_basename in
>-          NCC)
>+          NCC*)
>             # NonStop-UX NCC 3.20
>             lt_prog_compiler_pic_CXX='-KPIC'
>             ;;
>           *)
>             ;;
>         esac
>         ;;
>-      unixware*)
>+      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
>+        case $cc_basename in
>+          CC*)
>+            lt_prog_compiler_wl_CXX='-Wl,'
>+            lt_prog_compiler_pic_CXX='-KPIC'
>+            lt_prog_compiler_static_CXX='-Bstatic'
>+            ;;
>+        esac
>         ;;
>       vxworks*)
>         ;;
>       *)
>@@ -11180,20 +11632,22 @@
>    # Note that $ac_compile itself does not contain backslashes and begins
>    # with a dollar sign (not a hyphen), so the echo should work correctly.
>    # The option is referenced via a variable to avoid confusing sed.
>    lt_compile=`echo "$ac_compile" | $SED \
>-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
>+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
>    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
>    -e 's:$: $lt_compiler_flag:'`
>-   (eval echo "\"\$as_me:11187: $lt_compile\"" >&5)
>+   (eval echo "\"\$as_me:11639: $lt_compile\"" >&5)
>    (eval "$lt_compile" 2>conftest.err)
>    ac_status=$?
>    cat conftest.err >&5
>-   echo "$as_me:11191: \$? = $ac_status" >&5
>+   echo "$as_me:11643: \$? = $ac_status" >&5
>    if (exit $ac_status) && test -s "$ac_outfile"; then
>      # The compiler can only warn and ignore the option if not recognized
>-     # So say no if there are warnings
>-     if test ! -s conftest.err; then
>+     # So say no if there are warnings other than the usual output.
>+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
>+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
>+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
>        lt_prog_compiler_pic_works_CXX=yes
>      fi
>    fi
>    $rm conftest*
>@@ -11212,9 +11666,9 @@
>      lt_prog_compiler_can_build_shared_CXX=no
> fi
> 
> fi
>-case "$host_os" in
>+case $host_os in
>   # For platforms which do not support PIC, -DPIC is meaningless:
>   *djgpp*)
>     lt_prog_compiler_pic_CXX=
>     ;;
>@@ -11222,8 +11676,50 @@
>     lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
>     ;;
> esac
> 
>+#
>+# Check to make sure the static flag actually works.
>+#
>+wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
>+echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
>+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
>+if test "${lt_prog_compiler_static_works_CXX+set}" = set; then
>+  echo $ECHO_N "(cached) $ECHO_C" >&6
>+else
>+  lt_prog_compiler_static_works_CXX=no
>+   save_LDFLAGS="$LDFLAGS"
>+   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
>+   printf "$lt_simple_link_test_code" > conftest.$ac_ext
>+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
>+     # The linker can only warn and ignore the option if not recognized
>+     # So say no if there are warnings
>+     if test -s conftest.err; then
>+       # Append any errors to the config.log.
>+       cat conftest.err 1>&5
>+       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
>+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
>+       if diff conftest.exp conftest.er2 >/dev/null; then
>+         lt_prog_compiler_static_works_CXX=yes
>+       fi
>+     else
>+       lt_prog_compiler_static_works_CXX=yes
>+     fi
>+   fi
>+   $rm conftest*
>+   LDFLAGS="$save_LDFLAGS"
>+
>+fi
>+echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5
>+echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6
>+
>+if test x"$lt_prog_compiler_static_works_CXX" = xyes; then
>+    :
>+else
>+    lt_prog_compiler_static_CXX=
>+fi
>+
>+
> echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
> echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
> if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
>@@ -11240,25 +11736,27 @@
>    # (2) before a word containing "conftest.", or (3) at the end.
>    # Note that $ac_compile itself does not contain backslashes and begins
>    # with a dollar sign (not a hyphen), so the echo should work correctly.
>    lt_compile=`echo "$ac_compile" | $SED \
>-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
>+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
>    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
>    -e 's:$: $lt_compiler_flag:'`
>-   (eval echo "\"\$as_me:11247: $lt_compile\"" >&5)
>+   (eval echo "\"\$as_me:11743: $lt_compile\"" >&5)
>    (eval "$lt_compile" 2>out/conftest.err)
>    ac_status=$?
>    cat out/conftest.err >&5
>-   echo "$as_me:11251: \$? = $ac_status" >&5
>+   echo "$as_me:11747: \$? = $ac_status" >&5
>    if (exit $ac_status) && test -s out/conftest2.$ac_objext
>    then
>      # The compiler can only warn and ignore the option if not recognized
>      # So say no if there are warnings
>-     if test ! -s out/conftest.err; then
>+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
>+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
>+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
>        lt_cv_prog_compiler_c_o_CXX=yes
>      fi
>    fi
>-   chmod u+w .
>+   chmod u+w . 2>&5
>    $rm conftest*
>    # SGI C++ compiler will create directory out/ii_files/ for
>    # template instantiation
>    test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
>@@ -11311,9 +11809,9 @@
>   pw32*)
>     export_symbols_cmds_CXX="$ltdll_cmds"
>   ;;
>   cygwin* | mingw*)
>-    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* $[^ ]*$/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
>+    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* $[^ ]*$/\1 DATA/;/^.* __nm__/s/^.* __nm__$[^ ]*$ [^ ]*/\1 DATA/;/^I /d;/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
>   ;;
>   *)
>     export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
>   ;;
>@@ -11322,13 +11820,8 @@
> echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
> echo "${ECHO_T}$ld_shlibs_CXX" >&6
> test "$ld_shlibs_CXX" = no && can_build_shared=no
> 
>-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
>-if test "$GCC" = yes; then
>-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
>-fi
>-
> #
> # Do we need to explicitly link libc?
> #
> case "x$archive_cmds_need_lc_CXX" in
>@@ -11359,8 +11852,9 @@
>         lib=conftest
>         libobjs=conftest.$ac_objext
>         deplibs=
>         wl=$lt_prog_compiler_wl_CXX
>+        pic_flag=$lt_prog_compiler_pic_CXX
>         compiler_flags=-v
>         linker_flags=-v
>         verstring=
>         output_objdir=.
>@@ -11491,9 +11985,9 @@
>   dynamic_linker="$host_os ld.so"
>   shlibpath_var=LIBRARY_PATH
>   ;;
> 
>-bsdi4*)
>+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'
>@@ -11519,9 +12013,10 @@
>     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'
>+      $install_prog $dir/$dlname \$dldir/$dlname~
>+      chmod a+x \$dldir/$dlname'
>     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
>       dlpath=$dir/\$dldll~
>        $rm \$dlpath'
>     shlibpath_overrides_runpath=yes
>@@ -11549,9 +12044,9 @@
>       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}'
>+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
>       ;;
>     esac
>     ;;
> 
>@@ -11572,9 +12067,9 @@
>   library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
>   soname_spec='${libname}${release}${major}$shared_ext'
>   shlibpath_overrides_runpath=yes
>   shlibpath_var=DYLD_LIBRARY_PATH
>-  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
>+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
>   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
>   if test "$GCC" = yes; then
>     sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
>   else
>@@ -11607,10 +12102,19 @@
>   hardcode_into_libs=yes
>   dynamic_linker='GNU ld.so'
>   ;;
> 
>-freebsd*)
>-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
>+freebsd* | dragonfly*)
>+  # DragonFly does not have aout.  When/if they implement a new
>+  # versioning mechanism, adjust this.
>+  if test -x /usr/bin/objformat; then
>+    objformat=`/usr/bin/objformat`
>+  else
>+    case $host_os in
>+    freebsd[123]*) objformat=aout ;;
>+    *) objformat=elf ;;
>+    esac
>+  fi
>   version_type=freebsd-$objformat
>   case $version_type in
>     freebsd-elf*)
>       library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
>@@ -11626,16 +12130,21 @@
>   case $host_os in
>   freebsd2*)
>     shlibpath_overrides_runpath=yes
>     ;;
>-  freebsd3.01* | freebsdelf3.01*)
>+  freebsd3.[01]* | freebsdelf3.[01]*)
>     shlibpath_overrides_runpath=yes
>     hardcode_into_libs=yes
>     ;;
>-  *) # from 3.2 on
>+  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
>+  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
>     shlibpath_overrides_runpath=no
>     hardcode_into_libs=yes
>     ;;
>+  freebsd*) # from 4.6 on
>+    shlibpath_overrides_runpath=yes
>+    hardcode_into_libs=yes
>+    ;;
>   esac
>   ;;
> 
> gnu*)
>@@ -11653,9 +12162,9 @@
>   # link against other versions.
>   version_type=sunos
>   need_lib_prefix=no
>   need_version=no
>-  case "$host_cpu" in
>+  case $host_cpu in
>   ia64*)
>     shrext_cmds='.so'
>     hardcode_into_libs=yes
>     dynamic_linker="$host_os dld.so"
>@@ -11693,8 +12202,20 @@
>   # HP-UX runs *really* slowly unless shared libraries are mode 555.
>   postinstall_cmds='chmod 555 $lib'
>   ;;
> 
>+interix3*)
>+  version_type=linux
>+  need_lib_prefix=no
>+  need_version=no
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  shlibpath_overrides_runpath=no
>+  hardcode_into_libs=yes
>+  ;;
>+
> irix5* | irix6* | nonstopux*)
>   case $host_os in
>     nonstopux*) version_type=nonstopux ;;
>     *)
>@@ -11750,33 +12271,12 @@
>   # Some rework will be needed to allow for fast_install
>   # before this can be enabled.
>   hardcode_into_libs=yes
> 
>-  # find out which ABI we are using
>-  libsuff=
>-  case "$host_cpu" in
>-  x86_64*|s390x*|powerpc64*)
>-    echo '#line 11758 "configure"' > conftest.$ac_ext
>-    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
>-  (eval $ac_compile) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; then
>-      case `/usr/bin/file conftest.$ac_objext` in
>-      *64-bit*)
>-        libsuff=64
>-        sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
>-        ;;
>-      esac
>-    fi
>-    rm -rf conftest*
>-    ;;
>-  esac
>-
>   # Append ld.so.conf contents to the search path
>   if test -f /etc/ld.so.conf; then
>-    lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
>-    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
>+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,        ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
>+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
>   fi
> 
>   # We used to test for /lib/ld.so.1 and disable shared libraries on
>   # powerpc, because MkLinux only supported shared libraries with the
>@@ -11835,10 +12335,15 @@
>   ;;
> 
> openbsd*)
>   version_type=sunos
>+  sys_lib_dlsearch_path_spec="/usr/lib"
>   need_lib_prefix=no
>-  need_version=yes
>+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
>+  case $host_os in
>+    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
>+    *)                         need_version=no  ;;
>+  esac
>   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
>   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
>   shlibpath_var=LD_LIBRARY_PATH
>   if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
>@@ -11874,15 +12379,8 @@
>   sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
>   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
>   ;;
> 
>-sco3.2v5*)
>-  version_type=osf
>-  soname_spec='${libname}${release}${shared_ext}$major'
>-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>-  shlibpath_var=LD_LIBRARY_PATH
>-  ;;
>-
> solaris*)
>   version_type=linux
>   need_lib_prefix=no
>   need_version=no
>@@ -11906,9 +12404,9 @@
>   fi
>   need_version=yes
>   ;;
> 
>-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
>+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
>@@ -11939,8 +12437,31 @@
>     shlibpath_var=LD_LIBRARY_PATH
>   fi
>   ;;
> 
>+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
>+  version_type=freebsd-elf
>+  need_lib_prefix=no
>+  need_version=no
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  hardcode_into_libs=yes
>+  if test "$with_gnu_ld" = yes; then
>+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
>+    shlibpath_overrides_runpath=no
>+  else
>+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
>+    shlibpath_overrides_runpath=yes
>+    case $host_os in
>+      sco3.2v5*)
>+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
>+        ;;
>+    esac
>+  fi
>+  sys_lib_dlsearch_path_spec='/usr/lib'
>+  ;;
>+
> uts4*)
>   version_type=linux
>   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>   soname_spec='${libname}${release}${shared_ext}$major'
>@@ -11954,13 +12475,18 @@
> echo "$as_me:$LINENO: result: $dynamic_linker" >&5
> echo "${ECHO_T}$dynamic_linker" >&6
> test "$dynamic_linker" = no && can_build_shared=no
> 
>+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
>+if test "$GCC" = yes; then
>+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
>+fi
>+
> echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
> echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
> hardcode_action_CXX=
> if test -n "$hardcode_libdir_flag_spec_CXX" || \
>-   test -n "$runpath_var CXX" || \
>+   test -n "$runpath_var_CXX" || \
>    test "X$hardcode_automatic_CXX"="Xyes" ; then
> 
>   # We can hardcode non-existant directories.
>   if test "$hardcode_direct_CXX" != no &&
>@@ -11991,1996 +12517,1358 @@
>   # Fast installation is not necessary
>   enable_fast_install=needless
> fi
> 
>-striplib=
>-old_striplib=
>-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
>-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
>-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
>-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
>-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
>-  echo "$as_me:$LINENO: result: yes" >&5
>-echo "${ECHO_T}yes" >&6
>-else
>-# FIXME - insert some real tests, host_os isn't really good enough
>-  case $host_os in
>-   darwin*)
>-       if test -n "$STRIP" ; then
>-         striplib="$STRIP -x"
>-         echo "$as_me:$LINENO: result: yes" >&5
>-echo "${ECHO_T}yes" >&6
>-       else
>-  echo "$as_me:$LINENO: result: no" >&5
>-echo "${ECHO_T}no" >&6
>+
>+# The else clause should only fire when bootstrapping the
>+# libtool distribution, otherwise you forgot to ship ltmain.sh
>+# with your package, and you will get complaints that there are
>+# no rules to generate ltmain.sh.
>+if test -f "$ltmain"; then
>+  # See if we are running on zsh, and set the options which allow our commands through
>+  # without removal of \ escapes.
>+  if test -n "${ZSH_VERSION+set}" ; then
>+    setopt NO_GLOB_SUBST
> fi
>+  # Now quote all the things that may contain metacharacters while being
>+  # careful not to overquote the AC_SUBSTed values.  We take copies of the
>+  # variables and quote the copies for generation of the libtool script.
>+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
>+    SED SHELL STRIP \
>+    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
>+    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
>+    deplibs_check_method reload_flag reload_cmds need_locks \
>+    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
>+    lt_cv_sys_global_symbol_to_c_name_address \
>+    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
>+    old_postinstall_cmds old_postuninstall_cmds \
>+    compiler_CXX \
>+    CC_CXX \
>+    LD_CXX \
>+    lt_prog_compiler_wl_CXX \
>+    lt_prog_compiler_pic_CXX \
>+    lt_prog_compiler_static_CXX \
>+    lt_prog_compiler_no_builtin_flag_CXX \
>+    export_dynamic_flag_spec_CXX \
>+    thread_safe_flag_spec_CXX \
>+    whole_archive_flag_spec_CXX \
>+    enable_shared_with_static_runtimes_CXX \
>+    old_archive_cmds_CXX \
>+    old_archive_from_new_cmds_CXX \
>+    predep_objects_CXX \
>+    postdep_objects_CXX \
>+    predeps_CXX \
>+    postdeps_CXX \
>+    compiler_lib_search_path_CXX \
>+    archive_cmds_CXX \
>+    archive_expsym_cmds_CXX \
>+    postinstall_cmds_CXX \
>+    postuninstall_cmds_CXX \
>+    old_archive_from_expsyms_cmds_CXX \
>+    allow_undefined_flag_CXX \
>+    no_undefined_flag_CXX \
>+    export_symbols_cmds_CXX \
>+    hardcode_libdir_flag_spec_CXX \
>+    hardcode_libdir_flag_spec_ld_CXX \
>+    hardcode_libdir_separator_CXX \
>+    hardcode_automatic_CXX \
>+    module_cmds_CXX \
>+    module_expsym_cmds_CXX \
>+    lt_cv_prog_compiler_c_o_CXX \
>+    exclude_expsyms_CXX \
>+    include_expsyms_CXX; do
>+
>+    case $var in
>+    old_archive_cmds_CXX | \
>+    old_archive_from_new_cmds_CXX | \
>+    archive_cmds_CXX | \
>+    archive_expsym_cmds_CXX | \
>+    module_cmds_CXX | \
>+    module_expsym_cmds_CXX | \
>+    old_archive_from_expsyms_cmds_CXX | \
>+    export_symbols_cmds_CXX | \
>+    extract_expsyms_cmds | reload_cmds | finish_cmds | \
>+    postinstall_cmds | postuninstall_cmds | \
>+    old_postinstall_cmds | old_postuninstall_cmds | \
>+    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
>+      # Double-quote double-evaled strings.
>+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
>        ;;
>    *)
>-  echo "$as_me:$LINENO: result: no" >&5
>-echo "${ECHO_T}no" >&6
>+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
>     ;;
>   esac
>-fi
>-
>-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=
>+  done
> 
>-  case $host_os in
>-  beos*)
>-    lt_cv_dlopen="load_add_on"
>-    lt_cv_dlopen_libs=
>-    lt_cv_dlopen_self=yes
>+  case $lt_echo in
>+  *'\$0 --fallback-echo"')
>+    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
>     ;;
>+  esac
> 
>-  mingw* | pw32*)
>-    lt_cv_dlopen="LoadLibrary"
>-    lt_cv_dlopen_libs=
>-   ;;
>+cfgfile="$ofile"
> 
>-  cygwin*)
>-    lt_cv_dlopen="dlopen"
>-    lt_cv_dlopen_libs=
>-   ;;
>+  cat <<__EOF__ >> "$cfgfile"
>+# ### BEGIN LIBTOOL TAG CONFIG: $tagname
> 
>-  darwin*)
>-  # if libdl is installed we need to link against it
>-    echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
>-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
>-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
>-  echo $ECHO_N "(cached) $ECHO_C" >&6
>-else
>-  ac_check_lib_save_LIBS=$LIBS
>-LIBS="-ldl  $LIBS"
>-cat >conftest.$ac_ext <<_ACEOF
>-/* confdefs.h.  */
>-_ACEOF
>-cat confdefs.h >>conftest.$ac_ext
>-cat >>conftest.$ac_ext <<_ACEOF
>-/* end confdefs.h.  */
>+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
> 
>-/* Override any gcc2 internal prototype to avoid an error.  */
>-#ifdef __cplusplus
>-extern "C"
>-#endif
>-/* We use char because int might match the return type of a gcc2
>-   builtin and then its argument prototype would still apply.  */
>-char dlopen ();
>-int
>-main ()
>-{
>-dlopen ();
>-  ;
>-  return 0;
>-}
>-_ACEOF
>-rm -f conftest.$ac_objext conftest$ac_exeext
>-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
>-  (eval $ac_link) 2>conftest.er1
>-  ac_status=$?
>-  grep -v '^ *+' conftest.er1 >conftest.err
>-  rm -f conftest.er1
>-  cat conftest.err >&5
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } &&
>-         { ac_try='test -z "$ac_cxx_werror_flag"
>-                         || test ! -s conftest.err'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; } &&
>-         { ac_try='test -s conftest$ac_exeext'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; }; then
>-  ac_cv_lib_dl_dlopen=yes
>-else
>-  echo "$as_me: failed program was:" >&5
>-sed 's/^/| /' conftest.$ac_ext >&5
>+# Shell to use when invoking shell scripts.
>+SHELL=$lt_SHELL
> 
>-ac_cv_lib_dl_dlopen=no
>-fi
>-rm -f conftest.err conftest.$ac_objext \
>-      conftest$ac_exeext conftest.$ac_ext
>-LIBS=$ac_check_lib_save_LIBS
>-fi
>-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
>-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
>-if test $ac_cv_lib_dl_dlopen = yes; then
>-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
>-else
>+# Whether or not to build shared libraries.
>+build_libtool_libs=$enable_shared
> 
>-    lt_cv_dlopen="dyld"
>-    lt_cv_dlopen_libs=
>-    lt_cv_dlopen_self=yes
>+# Whether or not to build static libraries.
>+build_old_libs=$enable_static
> 
>-fi
>+# Whether or not to add -lc for building shared libraries.
>+build_libtool_need_lc=$archive_cmds_need_lc_CXX
> 
>-   ;;
>+# Whether or not to disallow shared libs when runtime libs are static
>+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
> 
>-  *)
>-    echo "$as_me:$LINENO: checking for shl_load" >&5
>-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
>-if test "${ac_cv_func_shl_load+set}" = set; then
>-  echo $ECHO_N "(cached) $ECHO_C" >&6
>-else
>-  cat >conftest.$ac_ext <<_ACEOF
>-/* confdefs.h.  */
>-_ACEOF
>-cat confdefs.h >>conftest.$ac_ext
>-cat >>conftest.$ac_ext <<_ACEOF
>-/* end confdefs.h.  */
>-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
>-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
>-#define shl_load innocuous_shl_load
>+# Whether or not to optimize for fast installation.
>+fast_install=$enable_fast_install
> 
>-/* System header to define __stub macros and hopefully few prototypes,
>-    which can conflict with char shl_load (); below.
>-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
>-    <limits.h> exists even on freestanding compilers.  */
>+# The host system.
>+host_alias=$host_alias
>+host=$host
>+host_os=$host_os
> 
>-#ifdef __STDC__
>-# include <limits.h>
>-#else
>-# include <assert.h>
>-#endif
>+# The build system.
>+build_alias=$build_alias
>+build=$build
>+build_os=$build_os
> 
>-#undef shl_load
>+# An echo program that does not interpret backslashes.
>+echo=$lt_echo
> 
>-/* Override any gcc2 internal prototype to avoid an error.  */
>-#ifdef __cplusplus
>-extern "C"
>-{
>-#endif
>-/* We use char because int might match the return type of a gcc2
>-   builtin and then its argument prototype would still apply.  */
>-char shl_load ();
>-/* The GNU C library defines this for functions which it implements
>-    to always fail with ENOSYS.  Some functions are actually named
>-    something starting with __ and the normal name is an alias.  */
>-#if defined (__stub_shl_load) || defined (__stub___shl_load)
>-choke me
>-#else
>-char (*f) () = shl_load;
>-#endif
>-#ifdef __cplusplus
>-}
>-#endif
>+# The archiver.
>+AR=$lt_AR
>+AR_FLAGS=$lt_AR_FLAGS
> 
>-int
>-main ()
>-{
>-return f != shl_load;
>-  ;
>-  return 0;
>-}
>-_ACEOF
>-rm -f conftest.$ac_objext conftest$ac_exeext
>-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
>-  (eval $ac_link) 2>conftest.er1
>-  ac_status=$?
>-  grep -v '^ *+' conftest.er1 >conftest.err
>-  rm -f conftest.er1
>-  cat conftest.err >&5
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } &&
>-         { ac_try='test -z "$ac_cxx_werror_flag"
>-                         || test ! -s conftest.err'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; } &&
>-         { ac_try='test -s conftest$ac_exeext'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; }; then
>-  ac_cv_func_shl_load=yes
>-else
>-  echo "$as_me: failed program was:" >&5
>-sed 's/^/| /' conftest.$ac_ext >&5
>+# A C compiler.
>+LTCC=$lt_LTCC
> 
>-ac_cv_func_shl_load=no
>-fi
>-rm -f conftest.err conftest.$ac_objext \
>-      conftest$ac_exeext conftest.$ac_ext
>-fi
>-echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
>-echo "${ECHO_T}$ac_cv_func_shl_load" >&6
>-if test $ac_cv_func_shl_load = yes; then
>-  lt_cv_dlopen="shl_load"
>-else
>-  echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
>-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
>-if test "${ac_cv_lib_dld_shl_load+set}" = set; then
>-  echo $ECHO_N "(cached) $ECHO_C" >&6
>-else
>-  ac_check_lib_save_LIBS=$LIBS
>-LIBS="-ldld  $LIBS"
>-cat >conftest.$ac_ext <<_ACEOF
>-/* confdefs.h.  */
>-_ACEOF
>-cat confdefs.h >>conftest.$ac_ext
>-cat >>conftest.$ac_ext <<_ACEOF
>-/* end confdefs.h.  */
>+# LTCC compiler flags.
>+LTCFLAGS=$lt_LTCFLAGS
> 
>-/* Override any gcc2 internal prototype to avoid an error.  */
>-#ifdef __cplusplus
>-extern "C"
>-#endif
>-/* We use char because int might match the return type of a gcc2
>-   builtin and then its argument prototype would still apply.  */
>-char shl_load ();
>-int
>-main ()
>-{
>-shl_load ();
>-  ;
>-  return 0;
>-}
>-_ACEOF
>-rm -f conftest.$ac_objext conftest$ac_exeext
>-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
>-  (eval $ac_link) 2>conftest.er1
>-  ac_status=$?
>-  grep -v '^ *+' conftest.er1 >conftest.err
>-  rm -f conftest.er1
>-  cat conftest.err >&5
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } &&
>-         { ac_try='test -z "$ac_cxx_werror_flag"
>-                         || test ! -s conftest.err'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; } &&
>-         { ac_try='test -s conftest$ac_exeext'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; }; then
>-  ac_cv_lib_dld_shl_load=yes
>-else
>-  echo "$as_me: failed program was:" >&5
>-sed 's/^/| /' conftest.$ac_ext >&5
>+# A language-specific compiler.
>+CC=$lt_compiler_CXX
> 
>-ac_cv_lib_dld_shl_load=no
>-fi
>-rm -f conftest.err conftest.$ac_objext \
>-      conftest$ac_exeext conftest.$ac_ext
>-LIBS=$ac_check_lib_save_LIBS
>-fi
>-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
>-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
>-if test $ac_cv_lib_dld_shl_load = yes; then
>-  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
>-else
>-  echo "$as_me:$LINENO: checking for dlopen" >&5
>-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
>-if test "${ac_cv_func_dlopen+set}" = set; then
>-  echo $ECHO_N "(cached) $ECHO_C" >&6
>-else
>-  cat >conftest.$ac_ext <<_ACEOF
>-/* confdefs.h.  */
>-_ACEOF
>-cat confdefs.h >>conftest.$ac_ext
>-cat >>conftest.$ac_ext <<_ACEOF
>-/* end confdefs.h.  */
>-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
>-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
>-#define dlopen innocuous_dlopen
>+# Is the compiler the GNU C compiler?
>+with_gcc=$GCC_CXX
> 
>-/* System header to define __stub macros and hopefully few prototypes,
>-    which can conflict with char dlopen (); below.
>-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
>-    <limits.h> exists even on freestanding compilers.  */
>+# An ERE matcher.
>+EGREP=$lt_EGREP
> 
>-#ifdef __STDC__
>-# include <limits.h>
>-#else
>-# include <assert.h>
>-#endif
>+# The linker used to build libraries.
>+LD=$lt_LD_CXX
> 
>-#undef dlopen
>+# Whether we need hard or soft links.
>+LN_S=$lt_LN_S
> 
>-/* Override any gcc2 internal prototype to avoid an error.  */
>-#ifdef __cplusplus
>-extern "C"
>-{
>-#endif
>-/* We use char because int might match the return type of a gcc2
>-   builtin and then its argument prototype would still apply.  */
>-char dlopen ();
>-/* The GNU C library defines this for functions which it implements
>-    to always fail with ENOSYS.  Some functions are actually named
>-    something starting with __ and the normal name is an alias.  */
>-#if defined (__stub_dlopen) || defined (__stub___dlopen)
>-choke me
>-#else
>-char (*f) () = dlopen;
>-#endif
>-#ifdef __cplusplus
>-}
>-#endif
>+# A BSD-compatible nm program.
>+NM=$lt_NM
> 
>-int
>-main ()
>-{
>-return f != dlopen;
>-  ;
>-  return 0;
>-}
>-_ACEOF
>-rm -f conftest.$ac_objext conftest$ac_exeext
>-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
>-  (eval $ac_link) 2>conftest.er1
>-  ac_status=$?
>-  grep -v '^ *+' conftest.er1 >conftest.err
>-  rm -f conftest.er1
>-  cat conftest.err >&5
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } &&
>-         { ac_try='test -z "$ac_cxx_werror_flag"
>-                         || test ! -s conftest.err'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; } &&
>-         { ac_try='test -s conftest$ac_exeext'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; }; then
>-  ac_cv_func_dlopen=yes
>-else
>-  echo "$as_me: failed program was:" >&5
>-sed 's/^/| /' conftest.$ac_ext >&5
>+# A symbol stripping program
>+STRIP=$lt_STRIP
> 
>-ac_cv_func_dlopen=no
>-fi
>-rm -f conftest.err conftest.$ac_objext \
>-      conftest$ac_exeext conftest.$ac_ext
>-fi
>-echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
>-echo "${ECHO_T}$ac_cv_func_dlopen" >&6
>-if test $ac_cv_func_dlopen = yes; then
>-  lt_cv_dlopen="dlopen"
>-else
>-  echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
>-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
>-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
>-  echo $ECHO_N "(cached) $ECHO_C" >&6
>-else
>-  ac_check_lib_save_LIBS=$LIBS
>-LIBS="-ldl  $LIBS"
>-cat >conftest.$ac_ext <<_ACEOF
>-/* confdefs.h.  */
>-_ACEOF
>-cat confdefs.h >>conftest.$ac_ext
>-cat >>conftest.$ac_ext <<_ACEOF
>-/* end confdefs.h.  */
>+# Used to examine libraries when file_magic_cmd begins "file"
>+MAGIC_CMD=$MAGIC_CMD
> 
>-/* Override any gcc2 internal prototype to avoid an error.  */
>-#ifdef __cplusplus
>-extern "C"
>-#endif
>-/* We use char because int might match the return type of a gcc2
>-   builtin and then its argument prototype would still apply.  */
>-char dlopen ();
>-int
>-main ()
>-{
>-dlopen ();
>-  ;
>-  return 0;
>-}
>-_ACEOF
>-rm -f conftest.$ac_objext conftest$ac_exeext
>-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
>-  (eval $ac_link) 2>conftest.er1
>-  ac_status=$?
>-  grep -v '^ *+' conftest.er1 >conftest.err
>-  rm -f conftest.er1
>-  cat conftest.err >&5
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } &&
>-         { ac_try='test -z "$ac_cxx_werror_flag"
>-                         || test ! -s conftest.err'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; } &&
>-         { ac_try='test -s conftest$ac_exeext'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; }; then
>-  ac_cv_lib_dl_dlopen=yes
>-else
>-  echo "$as_me: failed program was:" >&5
>-sed 's/^/| /' conftest.$ac_ext >&5
>+# Used on cygwin: DLL creation program.
>+DLLTOOL="$DLLTOOL"
> 
>-ac_cv_lib_dl_dlopen=no
>-fi
>-rm -f conftest.err conftest.$ac_objext \
>-      conftest$ac_exeext conftest.$ac_ext
>-LIBS=$ac_check_lib_save_LIBS
>-fi
>-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
>-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
>-if test $ac_cv_lib_dl_dlopen = yes; then
>-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
>-else
>-  echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
>-echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
>-if test "${ac_cv_lib_svld_dlopen+set}" = set; then
>-  echo $ECHO_N "(cached) $ECHO_C" >&6
>-else
>-  ac_check_lib_save_LIBS=$LIBS
>-LIBS="-lsvld  $LIBS"
>-cat >conftest.$ac_ext <<_ACEOF
>-/* confdefs.h.  */
>-_ACEOF
>-cat confdefs.h >>conftest.$ac_ext
>-cat >>conftest.$ac_ext <<_ACEOF
>-/* end confdefs.h.  */
>+# Used on cygwin: object dumper.
>+OBJDUMP="$OBJDUMP"
> 
>-/* Override any gcc2 internal prototype to avoid an error.  */
>-#ifdef __cplusplus
>-extern "C"
>-#endif
>-/* We use char because int might match the return type of a gcc2
>-   builtin and then its argument prototype would still apply.  */
>-char dlopen ();
>-int
>-main ()
>-{
>-dlopen ();
>-  ;
>-  return 0;
>-}
>-_ACEOF
>-rm -f conftest.$ac_objext conftest$ac_exeext
>-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
>-  (eval $ac_link) 2>conftest.er1
>-  ac_status=$?
>-  grep -v '^ *+' conftest.er1 >conftest.err
>-  rm -f conftest.er1
>-  cat conftest.err >&5
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } &&
>-         { ac_try='test -z "$ac_cxx_werror_flag"
>-                         || test ! -s conftest.err'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; } &&
>-         { ac_try='test -s conftest$ac_exeext'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; }; then
>-  ac_cv_lib_svld_dlopen=yes
>-else
>-  echo "$as_me: failed program was:" >&5
>-sed 's/^/| /' conftest.$ac_ext >&5
>+# Used on cygwin: assembler.
>+AS="$AS"
> 
>-ac_cv_lib_svld_dlopen=no
>-fi
>-rm -f conftest.err conftest.$ac_objext \
>-      conftest$ac_exeext conftest.$ac_ext
>-LIBS=$ac_check_lib_save_LIBS
>-fi
>-echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
>-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
>-if test $ac_cv_lib_svld_dlopen = yes; then
>-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
>-else
>-  echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
>-echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
>-if test "${ac_cv_lib_dld_dld_link+set}" = set; then
>-  echo $ECHO_N "(cached) $ECHO_C" >&6
>-else
>-  ac_check_lib_save_LIBS=$LIBS
>-LIBS="-ldld  $LIBS"
>-cat >conftest.$ac_ext <<_ACEOF
>-/* confdefs.h.  */
>-_ACEOF
>-cat confdefs.h >>conftest.$ac_ext
>-cat >>conftest.$ac_ext <<_ACEOF
>-/* end confdefs.h.  */
>+# The name of the directory that contains temporary libtool files.
>+objdir=$objdir
> 
>-/* Override any gcc2 internal prototype to avoid an error.  */
>-#ifdef __cplusplus
>-extern "C"
>-#endif
>-/* We use char because int might match the return type of a gcc2
>-   builtin and then its argument prototype would still apply.  */
>-char dld_link ();
>-int
>-main ()
>-{
>-dld_link ();
>-  ;
>-  return 0;
>-}
>-_ACEOF
>-rm -f conftest.$ac_objext conftest$ac_exeext
>-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
>-  (eval $ac_link) 2>conftest.er1
>-  ac_status=$?
>-  grep -v '^ *+' conftest.er1 >conftest.err
>-  rm -f conftest.er1
>-  cat conftest.err >&5
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } &&
>-         { ac_try='test -z "$ac_cxx_werror_flag"
>-                         || test ! -s conftest.err'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; } &&
>-         { ac_try='test -s conftest$ac_exeext'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; }; then
>-  ac_cv_lib_dld_dld_link=yes
>-else
>-  echo "$as_me: failed program was:" >&5
>-sed 's/^/| /' conftest.$ac_ext >&5
>+# How to create reloadable object files.
>+reload_flag=$lt_reload_flag
>+reload_cmds=$lt_reload_cmds
> 
>-ac_cv_lib_dld_dld_link=no
>-fi
>-rm -f conftest.err conftest.$ac_objext \
>-      conftest$ac_exeext conftest.$ac_ext
>-LIBS=$ac_check_lib_save_LIBS
>-fi
>-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
>-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
>-if test $ac_cv_lib_dld_dld_link = yes; then
>-  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
>-fi
>+# How to pass a linker flag through the compiler.
>+wl=$lt_lt_prog_compiler_wl_CXX
> 
>+# Object file suffix (normally "o").
>+objext="$ac_objext"
> 
>-fi
>+# Old archive suffix (normally "a").
>+libext="$libext"
> 
>+# Shared library suffix (normally ".so").
>+shrext_cmds='$shrext_cmds'
> 
>-fi
>+# Executable file suffix (normally "").
>+exeext="$exeext"
> 
>+# Additional compiler flags for building library objects.
>+pic_flag=$lt_lt_prog_compiler_pic_CXX
>+pic_mode=$pic_mode
> 
>-fi
>+# What is the maximum length of a command?
>+max_cmd_len=$lt_cv_sys_max_cmd_len
> 
>+# Does compiler simultaneously support -c and -o options?
>+compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
> 
>-fi
>+# Must we lock files when doing compilation?
>+need_locks=$lt_need_locks
> 
>+# Do we need the lib prefix for modules?
>+need_lib_prefix=$need_lib_prefix
> 
>-fi
>+# Do we need a version for libraries?
>+need_version=$need_version
> 
>-    ;;
>-  esac
>+# Whether dlopen is supported.
>+dlopen_support=$enable_dlopen
> 
>-  if test "x$lt_cv_dlopen" != xno; then
>-    enable_dlopen=yes
>-  else
>-    enable_dlopen=no
>-  fi
>+# Whether dlopen of programs is supported.
>+dlopen_self=$enable_dlopen_self
> 
>-  case $lt_cv_dlopen in
>-  dlopen)
>-    save_CPPFLAGS="$CPPFLAGS"
>-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
>+# Whether dlopen of statically linked programs is supported.
>+dlopen_self_static=$enable_dlopen_self_static
> 
>-    save_LDFLAGS="$LDFLAGS"
>-    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
>+# Compiler flag to prevent dynamic linking.
>+link_static_flag=$lt_lt_prog_compiler_static_CXX
> 
>-    save_LIBS="$LIBS"
>-    LIBS="$lt_cv_dlopen_libs $LIBS"
>+# Compiler flag to turn off builtin functions.
>+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
> 
>-    echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
>-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
>-if test "${lt_cv_dlopen_self+set}" = set; then
>-  echo $ECHO_N "(cached) $ECHO_C" >&6
>-else
>-          if test "$cross_compiling" = yes; then :
>-  lt_cv_dlopen_self=cross
>-else
>-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
>-  lt_status=$lt_dlunknown
>-  cat > conftest.$ac_ext <<EOF
>-#line 12629 "configure"
>-#include "confdefs.h"
>+# Compiler flag to allow reflexive dlopens.
>+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
> 
>-#if HAVE_DLFCN_H
>-#include <dlfcn.h>
>-#endif
>+# Compiler flag to generate shared objects directly from archives.
>+whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
> 
>-#include <stdio.h>
>+# Compiler flag to generate thread-safe objects.
>+thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
> 
>-#ifdef RTLD_GLOBAL
>-#  define LT_DLGLOBAL           RTLD_GLOBAL
>-#else
>-#  ifdef DL_GLOBAL
>-#    define LT_DLGLOBAL         DL_GLOBAL
>-#  else
>-#    define LT_DLGLOBAL         0
>-#  endif
>-#endif
>+# Library versioning type.
>+version_type=$version_type
> 
>-/* 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
>+# Format of library name prefix.
>+libname_spec=$lt_libname_spec
> 
>-#ifdef __cplusplus
>-extern "C" void exit (int);
>-#endif
>+# List of archive names.  First name is the real one, the rest are links.
>+# The last name is the one that the linker finds with -lNAME.
>+library_names_spec=$lt_library_names_spec
> 
>-void fnord() { int i=42;}
>-int main ()
>-{
>-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
>-  int status = $lt_dlunknown;
>+# The coded name of the library, if different from the real name.
>+soname_spec=$lt_soname_spec
> 
>-  if (self)
>-    {
>-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
>-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
>-      /* dlclose (self); */
>-    }
>+# Commands used to build and install an old-style archive.
>+RANLIB=$lt_RANLIB
>+old_archive_cmds=$lt_old_archive_cmds_CXX
>+old_postinstall_cmds=$lt_old_postinstall_cmds
>+old_postuninstall_cmds=$lt_old_postuninstall_cmds
> 
>-    exit (status);
>-}
>-EOF
>-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
>-  (eval $ac_link) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
>-    (./conftest; exit; ) 2>/dev/null
>-    lt_status=$?
>-    case x$lt_status in
>-      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
>-      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
>-      x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
>-    esac
>-  else :
>-    # compilation failed
>-    lt_cv_dlopen_self=no
>-  fi
>-fi
>-rm -fr conftest*
>+# Create an old-style archive from a shared archive.
>+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
> 
>+# Create a temporary old-style archive to link instead of a shared archive.
>+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
> 
>-fi
>-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
>-echo "${ECHO_T}$lt_cv_dlopen_self" >&6
>+# Commands used to build and install a shared archive.
>+archive_cmds=$lt_archive_cmds_CXX
>+archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
>+postinstall_cmds=$lt_postinstall_cmds
>+postuninstall_cmds=$lt_postuninstall_cmds
> 
>-    if test "x$lt_cv_dlopen_self" = xyes; then
>-      LDFLAGS="$LDFLAGS $link_static_flag"
>-      echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
>-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
>-if test "${lt_cv_dlopen_self_static+set}" = set; then
>-  echo $ECHO_N "(cached) $ECHO_C" >&6
>-else
>-          if test "$cross_compiling" = yes; then :
>-  lt_cv_dlopen_self_static=cross
>-else
>-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
>-  lt_status=$lt_dlunknown
>-  cat > conftest.$ac_ext <<EOF
>-#line 12727 "configure"
>-#include "confdefs.h"
>+# Commands used to build a loadable module (assumed same as above if empty)
>+module_cmds=$lt_module_cmds_CXX
>+module_expsym_cmds=$lt_module_expsym_cmds_CXX
> 
>-#if HAVE_DLFCN_H
>-#include <dlfcn.h>
>-#endif
>+# Commands to strip libraries.
>+old_striplib=$lt_old_striplib
>+striplib=$lt_striplib
> 
>-#include <stdio.h>
>+# Dependencies to place before the objects being linked to create a
>+# shared library.
>+predep_objects=$lt_predep_objects_CXX
> 
>-#ifdef RTLD_GLOBAL
>-#  define LT_DLGLOBAL           RTLD_GLOBAL
>-#else
>-#  ifdef DL_GLOBAL
>-#    define LT_DLGLOBAL         DL_GLOBAL
>-#  else
>-#    define LT_DLGLOBAL         0
>-#  endif
>-#endif
>+# Dependencies to place after the objects being linked to create a
>+# shared library.
>+postdep_objects=$lt_postdep_objects_CXX
> 
>-/* 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
>+# Dependencies to place before the objects being linked to create a
>+# shared library.
>+predeps=$lt_predeps_CXX
> 
>-#ifdef __cplusplus
>-extern "C" void exit (int);
>-#endif
>+# Dependencies to place after the objects being linked to create a
>+# shared library.
>+postdeps=$lt_postdeps_CXX
> 
>-void fnord() { int i=42;}
>-int main ()
>-{
>-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
>-  int status = $lt_dlunknown;
>+# The library search path used internally by the compiler when linking
>+# a shared library.
>+compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
> 
>-  if (self)
>-    {
>-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
>-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
>-      /* dlclose (self); */
>-    }
>+# Method to check whether dependent libraries are shared objects.
>+deplibs_check_method=$lt_deplibs_check_method
> 
>-    exit (status);
>-}
>-EOF
>-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
>-  (eval $ac_link) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
>-    (./conftest; exit; ) 2>/dev/null
>-    lt_status=$?
>-    case x$lt_status in
>-      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
>-      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
>-      x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
>-    esac
>-  else :
>-    # compilation failed
>-    lt_cv_dlopen_self_static=no
>-  fi
>-fi
>-rm -fr conftest*
>+# Command to use when deplibs_check_method == file_magic.
>+file_magic_cmd=$lt_file_magic_cmd
> 
>+# Flag that allows shared libraries with undefined symbols to be built.
>+allow_undefined_flag=$lt_allow_undefined_flag_CXX
> 
>-fi
>-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
>-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
>-    fi
>+# Flag that forces no undefined symbols.
>+no_undefined_flag=$lt_no_undefined_flag_CXX
> 
>-    CPPFLAGS="$save_CPPFLAGS"
>-    LDFLAGS="$save_LDFLAGS"
>-    LIBS="$save_LIBS"
>-    ;;
>-  esac
>+# Commands used to finish a libtool library installation in a directory.
>+finish_cmds=$lt_finish_cmds
> 
>-  case $lt_cv_dlopen_self in
>-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
>-  *) enable_dlopen_self=unknown ;;
>-  esac
>+# Same as above, but a single script fragment to be evaled but not shown.
>+finish_eval=$lt_finish_eval
> 
>-  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
>+# Take the output of nm and produce a listing of raw symbols and C names.
>+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
> 
>+# Transform the output of nm in a proper C declaration
>+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
> 
>-# The else clause should only fire when bootstrapping the
>-# libtool distribution, otherwise you forgot to ship ltmain.sh
>-# with your package, and you will get complaints that there are
>-# no rules to generate ltmain.sh.
>-if test -f "$ltmain"; then
>-  # See if we are running on zsh, and set the options which allow our commands through
>-  # without removal of \ escapes.
>-  if test -n "${ZSH_VERSION+set}" ; then
>-    setopt NO_GLOB_SUBST
>-  fi
>-  # Now quote all the things that may contain metacharacters while being
>-  # careful not to overquote the AC_SUBSTed values.  We take copies of the
>-  # variables and quote the copies for generation of the libtool script.
>-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
>-    SED SHELL STRIP \
>-    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
>-    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
>-    deplibs_check_method reload_flag reload_cmds need_locks \
>-    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
>-    lt_cv_sys_global_symbol_to_c_name_address \
>-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
>-    old_postinstall_cmds old_postuninstall_cmds \
>-    compiler_CXX \
>-    CC_CXX \
>-    LD_CXX \
>-    lt_prog_compiler_wl_CXX \
>-    lt_prog_compiler_pic_CXX \
>-    lt_prog_compiler_static_CXX \
>-    lt_prog_compiler_no_builtin_flag_CXX \
>-    export_dynamic_flag_spec_CXX \
>-    thread_safe_flag_spec_CXX \
>-    whole_archive_flag_spec_CXX \
>-    enable_shared_with_static_runtimes_CXX \
>-    old_archive_cmds_CXX \
>-    old_archive_from_new_cmds_CXX \
>-    predep_objects_CXX \
>-    postdep_objects_CXX \
>-    predeps_CXX \
>-    postdeps_CXX \
>-    compiler_lib_search_path_CXX \
>-    archive_cmds_CXX \
>-    archive_expsym_cmds_CXX \
>-    postinstall_cmds_CXX \
>-    postuninstall_cmds_CXX \
>-    old_archive_from_expsyms_cmds_CXX \
>-    allow_undefined_flag_CXX \
>-    no_undefined_flag_CXX \
>-    export_symbols_cmds_CXX \
>-    hardcode_libdir_flag_spec_CXX \
>-    hardcode_libdir_flag_spec_ld_CXX \
>-    hardcode_libdir_separator_CXX \
>-    hardcode_automatic_CXX \
>-    module_cmds_CXX \
>-    module_expsym_cmds_CXX \
>-    lt_cv_prog_compiler_c_o_CXX \
>-    exclude_expsyms_CXX \
>-    include_expsyms_CXX; do
>-
>-    case $var in
>-    old_archive_cmds_CXX | \
>-    old_archive_from_new_cmds_CXX | \
>-    archive_cmds_CXX | \
>-    archive_expsym_cmds_CXX | \
>-    module_cmds_CXX | \
>-    module_expsym_cmds_CXX | \
>-    old_archive_from_expsyms_cmds_CXX | \
>-    export_symbols_cmds_CXX | \
>-    extract_expsyms_cmds | reload_cmds | finish_cmds | \
>-    postinstall_cmds | postuninstall_cmds | \
>-    old_postinstall_cmds | old_postuninstall_cmds | \
>-    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
>-      # Double-quote double-evaled strings.
>-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
>-      ;;
>-    *)
>-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
>-      ;;
>-    esac
>-  done
>+# Transform the output of nm in a C name address pair
>+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
> 
>-  case $lt_echo in
>-  *'\$0 --fallback-echo"')
>-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
>-    ;;
>-  esac
>+# This is the shared library runtime path variable.
>+runpath_var=$runpath_var
> 
>-cfgfile="$ofile"
>+# This is the shared library path variable.
>+shlibpath_var=$shlibpath_var
> 
>-  cat <<__EOF__ >> "$cfgfile"
>-# ### BEGIN LIBTOOL TAG CONFIG: $tagname
>+# Is shlibpath searched before the hard-coded library search path?
>+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
> 
>-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
>+# How to hardcode a shared library path into an executable.
>+hardcode_action=$hardcode_action_CXX
> 
>-# Shell to use when invoking shell scripts.
>-SHELL=$lt_SHELL
>+# Whether we should hardcode library paths into libraries.
>+hardcode_into_libs=$hardcode_into_libs
> 
>-# Whether or not to build shared libraries.
>-build_libtool_libs=$enable_shared
>+# Flag to hardcode \$libdir into a binary during linking.
>+# This must work even if \$libdir does not exist.
>+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
> 
>-# Whether or not to build static libraries.
>-build_old_libs=$enable_static
>+# If ld is used when linking, flag to hardcode \$libdir into
>+# a binary during linking. This must work even if \$libdir does
>+# not exist.
>+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX
> 
>-# Whether or not to add -lc for building shared libraries.
>-build_libtool_need_lc=$archive_cmds_need_lc_CXX
>+# Whether we need a single -rpath flag with a separated argument.
>+hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
> 
>-# Whether or not to disallow shared libs when runtime libs are static
>-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
>+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
>+# resulting binary.
>+hardcode_direct=$hardcode_direct_CXX
> 
>-# Whether or not to optimize for fast installation.
>-fast_install=$enable_fast_install
>+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
>+# resulting binary.
>+hardcode_minus_L=$hardcode_minus_L_CXX
> 
>-# The host system.
>-host_alias=$host_alias
>-host=$host
>+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
>+# the resulting binary.
>+hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX
> 
>-# An echo program that does not interpret backslashes.
>-echo=$lt_echo
>+# Set to yes if building a shared library automatically hardcodes DIR into the library
>+# and all subsequent libraries and executables linked against it.
>+hardcode_automatic=$hardcode_automatic_CXX
> 
>-# The archiver.
>-AR=$lt_AR
>-AR_FLAGS=$lt_AR_FLAGS
>+# Variables whose values should be saved in libtool wrapper scripts and
>+# restored at relink time.
>+variables_saved_for_relink="$variables_saved_for_relink"
> 
>-# A C compiler.
>-LTCC=$lt_LTCC
>+# Whether libtool must link a program against all its dependency libraries.
>+link_all_deplibs=$link_all_deplibs_CXX
> 
>-# A language-specific compiler.
>-CC=$lt_compiler_CXX
>+# Compile-time system search path for libraries
>+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
> 
>-# Is the compiler the GNU C compiler?
>-with_gcc=$GCC_CXX
>+# Run-time system search path for libraries
>+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
> 
>-# An ERE matcher.
>-EGREP=$lt_EGREP
>+# Fix the shell variable \$srcfile for the compiler.
>+fix_srcfile_path="$fix_srcfile_path_CXX"
> 
>-# The linker used to build libraries.
>-LD=$lt_LD_CXX
>+# Set to yes if exported symbols are required.
>+always_export_symbols=$always_export_symbols_CXX
> 
>-# Whether we need hard or soft links.
>-LN_S=$lt_LN_S
>+# The commands to list exported symbols.
>+export_symbols_cmds=$lt_export_symbols_cmds_CXX
> 
>-# A BSD-compatible nm program.
>-NM=$lt_NM
>+# The commands to extract the exported symbol list from a shared archive.
>+extract_expsyms_cmds=$lt_extract_expsyms_cmds
> 
>-# A symbol stripping program
>-STRIP=$lt_STRIP
>+# Symbols that should not be listed in the preloaded symbols.
>+exclude_expsyms=$lt_exclude_expsyms_CXX
> 
>-# Used to examine libraries when file_magic_cmd begins "file"
>-MAGIC_CMD=$MAGIC_CMD
>+# Symbols that must always be exported.
>+include_expsyms=$lt_include_expsyms_CXX
> 
>-# Used on cygwin: DLL creation program.
>-DLLTOOL="$DLLTOOL"
>+# ### END LIBTOOL TAG CONFIG: $tagname
> 
>-# Used on cygwin: object dumper.
>-OBJDUMP="$OBJDUMP"
>+__EOF__
> 
>-# Used on cygwin: assembler.
>-AS="$AS"
> 
>-# The name of the directory that contains temporary libtool files.
>-objdir=$objdir
>+else
>+  # If there is no Makefile yet, we rely on a make rule to execute
>+  # `config.status --recheck' to rerun these tests and create the
>+  # libtool script then.
>+  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
>+  if test -f "$ltmain_in"; then
>+    test -f Makefile && make "$ltmain"
>+  fi
>+fi
> 
>-# How to create reloadable object files.
>-reload_flag=$lt_reload_flag
>-reload_cmds=$lt_reload_cmds
> 
>-# How to pass a linker flag through the compiler.
>-wl=$lt_lt_prog_compiler_wl_CXX
>+ac_ext=c
>+ac_cpp='$CPP $CPPFLAGS'
>+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
>+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
>+ac_compiler_gnu=$ac_cv_c_compiler_gnu
> 
>-# Object file suffix (normally "o").
>-objext="$ac_objext"
>+CC=$lt_save_CC
>+LDCXX=$LD
>+LD=$lt_save_LD
>+GCC=$lt_save_GCC
>+with_gnu_ldcxx=$with_gnu_ld
>+with_gnu_ld=$lt_save_with_gnu_ld
>+lt_cv_path_LDCXX=$lt_cv_path_LD
>+lt_cv_path_LD=$lt_save_path_LD
>+lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
>+lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
> 
>-# Old archive suffix (normally "a").
>-libext="$libext"
>+        else
>+          tagname=""
>+        fi
>+        ;;
> 
>-# Shared library suffix (normally ".so").
>-shrext_cmds='$shrext_cmds'
>+      F77)
>+        if test -n "$F77" && test "X$F77" != "Xno"; then
> 
>-# Executable file suffix (normally "").
>-exeext="$exeext"
>+ac_ext=f
>+ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
>+ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
>+ac_compiler_gnu=$ac_cv_f77_compiler_gnu
> 
>-# Additional compiler flags for building library objects.
>-pic_flag=$lt_lt_prog_compiler_pic_CXX
>-pic_mode=$pic_mode
> 
>-# What is the maximum length of a command?
>-max_cmd_len=$lt_cv_sys_max_cmd_len
>+archive_cmds_need_lc_F77=no
>+allow_undefined_flag_F77=
>+always_export_symbols_F77=no
>+archive_expsym_cmds_F77=
>+export_dynamic_flag_spec_F77=
>+hardcode_direct_F77=no
>+hardcode_libdir_flag_spec_F77=
>+hardcode_libdir_flag_spec_ld_F77=
>+hardcode_libdir_separator_F77=
>+hardcode_minus_L_F77=no
>+hardcode_automatic_F77=no
>+module_cmds_F77=
>+module_expsym_cmds_F77=
>+link_all_deplibs_F77=unknown
>+old_archive_cmds_F77=$old_archive_cmds
>+no_undefined_flag_F77=
>+whole_archive_flag_spec_F77=
>+enable_shared_with_static_runtimes_F77=no
> 
>-# Does compiler simultaneously support -c and -o options?
>-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
>-
>-# Must we lock files when doing compilation ?
>-need_locks=$lt_need_locks
>+# Source file extension for f77 test sources.
>+ac_ext=f
> 
>-# Do we need the lib prefix for modules?
>-need_lib_prefix=$need_lib_prefix
>+# Object file extension for compiled f77 test sources.
>+objext=o
>+objext_F77=$objext
> 
>-# Do we need a version for libraries?
>-need_version=$need_version
>+# Code to be used in simple compile tests
>+lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
> 
>-# Whether dlopen is supported.
>-dlopen_support=$enable_dlopen
>+# Code to be used in simple link tests
>+lt_simple_link_test_code="      program t\n      end\n"
> 
>-# Whether dlopen of programs is supported.
>-dlopen_self=$enable_dlopen_self
>+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
> 
>-# Whether dlopen of statically linked programs is supported.
>-dlopen_self_static=$enable_dlopen_self_static
>+# If no C compiler was specified, use CC.
>+LTCC=${LTCC-"$CC"}
> 
>-# Compiler flag to prevent dynamic linking.
>-link_static_flag=$lt_lt_prog_compiler_static_CXX
>+# If no C compiler flags were specified, use CFLAGS.
>+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
> 
>-# Compiler flag to turn off builtin functions.
>-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
>+# Allow CC to be a program name with arguments.
>+compiler=$CC
> 
>-# Compiler flag to allow reflexive dlopens.
>-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
> 
>-# Compiler flag to generate shared objects directly from archives.
>-whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
>+# save warnings/boilerplate of simple test code
>+ac_outfile=conftest.$ac_objext
>+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
>+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
>+_lt_compiler_boilerplate=`cat conftest.err`
>+$rm conftest*
> 
>-# Compiler flag to generate thread-safe objects.
>-thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
>+ac_outfile=conftest.$ac_objext
>+printf "$lt_simple_link_test_code" >conftest.$ac_ext
>+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
>+_lt_linker_boilerplate=`cat conftest.err`
>+$rm conftest*
> 
>-# Library versioning type.
>-version_type=$version_type
> 
>-# Format of library name prefix.
>-libname_spec=$lt_libname_spec
>+# Allow CC to be a program name with arguments.
>+lt_save_CC="$CC"
>+CC=${F77-"f77"}
>+compiler=$CC
>+compiler_F77=$CC
>+for cc_temp in $compiler""; do
>+  case $cc_temp in
>+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
>+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
>+    \-*) ;;
>+    *) break;;
>+  esac
>+done
>+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
> 
>-# List of archive names.  First name is the real one, the rest are links.
>-# The last name is the one that the linker finds with -lNAME.
>-library_names_spec=$lt_library_names_spec
> 
>-# The coded name of the library, if different from the real name.
>-soname_spec=$lt_soname_spec
>+echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
>+echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
>+echo "$as_me:$LINENO: result: $can_build_shared" >&5
>+echo "${ECHO_T}$can_build_shared" >&6
> 
>-# Commands used to build and install an old-style archive.
>-RANLIB=$lt_RANLIB
>-old_archive_cmds=$lt_old_archive_cmds_CXX
>-old_postinstall_cmds=$lt_old_postinstall_cmds
>-old_postuninstall_cmds=$lt_old_postuninstall_cmds
>+echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
>+echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
>+test "$can_build_shared" = "no" && enable_shared=no
> 
>-# Create an old-style archive from a shared archive.
>-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
>+# On AIX, shared libraries and static libraries use the same namespace, and
>+# are all built from PIC.
>+case $host_os in
>+aix3*)
>+  test "$enable_shared" = yes && enable_static=no
>+  if test -n "$RANLIB"; then
>+    archive_cmds="$archive_cmds~\$RANLIB \$lib"
>+    postinstall_cmds='$RANLIB $lib'
>+  fi
>+  ;;
>+aix4* | aix5*)
>+  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
>+    test "$enable_shared" = yes && enable_static=no
>+  fi
>+  ;;
>+esac
>+echo "$as_me:$LINENO: result: $enable_shared" >&5
>+echo "${ECHO_T}$enable_shared" >&6
> 
>-# Create a temporary old-style archive to link instead of a shared archive.
>-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
>+echo "$as_me:$LINENO: checking whether to build static libraries" >&5
>+echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6
>+# Make sure either enable_shared or enable_static is yes.
>+test "$enable_shared" = yes || enable_static=yes
>+echo "$as_me:$LINENO: result: $enable_static" >&5
>+echo "${ECHO_T}$enable_static" >&6
> 
>-# Commands used to build and install a shared archive.
>-archive_cmds=$lt_archive_cmds_CXX
>-archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
>-postinstall_cmds=$lt_postinstall_cmds
>-postuninstall_cmds=$lt_postuninstall_cmds
>+GCC_F77="$G77"
>+LD_F77="$LD"
> 
>-# Commands used to build a loadable module (assumed same as above if empty)
>-module_cmds=$lt_module_cmds_CXX
>-module_expsym_cmds=$lt_module_expsym_cmds_CXX
>+lt_prog_compiler_wl_F77=
>+lt_prog_compiler_pic_F77=
>+lt_prog_compiler_static_F77=
> 
>-# Commands to strip libraries.
>-old_striplib=$lt_old_striplib
>-striplib=$lt_striplib
>+echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
>+echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
> 
>-# Dependencies to place before the objects being linked to create a
>-# shared library.
>-predep_objects=$lt_predep_objects_CXX
>+  if test "$GCC" = yes; then
>+    lt_prog_compiler_wl_F77='-Wl,'
>+    lt_prog_compiler_static_F77='-static'
> 
>-# Dependencies to place after the objects being linked to create a
>-# shared library.
>-postdep_objects=$lt_postdep_objects_CXX
>+    case $host_os in
>+      aix*)
>+      # All AIX code is PIC.
>+      if test "$host_cpu" = ia64; then
>+        # AIX 5 now supports IA64 processor
>+        lt_prog_compiler_static_F77='-Bstatic'
>+      fi
>+      ;;
> 
>-# Dependencies to place before the objects being linked to create a
>-# shared library.
>-predeps=$lt_predeps_CXX
>+    amigaos*)
>+      # FIXME: we need at least 68020 code to build shared libraries, but
>+      # adding the `-m68020' flag to GCC prevents building anything better,
>+      # like `-m68040'.
>+      lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
>+      ;;
> 
>-# Dependencies to place after the objects being linked to create a
>-# shared library.
>-postdeps=$lt_postdeps_CXX
>+    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
>+      # PIC is the default for these OSes.
>+      ;;
> 
>-# The library search path used internally by the compiler when linking
>-# a shared library.
>-compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
>+    mingw* | pw32* | os2*)
>+      # This hack is so that the source file can tell whether it is being
>+      # built for inclusion in a dll (and should export symbols for example).
>+      lt_prog_compiler_pic_F77='-DDLL_EXPORT'
>+      ;;
> 
>-# Method to check whether dependent libraries are shared objects.
>-deplibs_check_method=$lt_deplibs_check_method
>+    darwin* | rhapsody*)
>+      # PIC is the default on this platform
>+      # Common symbols not allowed in MH_DYLIB files
>+      lt_prog_compiler_pic_F77='-fno-common'
>+      ;;
> 
>-# Command to use when deplibs_check_method == file_magic.
>-file_magic_cmd=$lt_file_magic_cmd
>+    interix3*)
>+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
>+      # Instead, we relocate shared libraries at runtime.
>+      ;;
> 
>-# Flag that allows shared libraries with undefined symbols to be built.
>-allow_undefined_flag=$lt_allow_undefined_flag_CXX
>+    msdosdjgpp*)
>+      # Just because we use GCC doesn't mean we suddenly get shared libraries
>+      # on systems that don't support them.
>+      lt_prog_compiler_can_build_shared_F77=no
>+      enable_shared=no
>+      ;;
> 
>-# Flag that forces no undefined symbols.
>-no_undefined_flag=$lt_no_undefined_flag_CXX
>+    sysv4*MP*)
>+      if test -d /usr/nec; then
>+        lt_prog_compiler_pic_F77=-Kconform_pic
>+      fi
>+      ;;
> 
>-# Commands used to finish a libtool library installation in a directory.
>-finish_cmds=$lt_finish_cmds
>+    hpux*)
>+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
>+      # not for PA HP-UX.
>+      case $host_cpu in
>+      hppa*64*|ia64*)
>+        # +Z the default
>+        ;;
>+      *)
>+        lt_prog_compiler_pic_F77='-fPIC'
>+        ;;
>+      esac
>+      ;;
> 
>-# Same as above, but a single script fragment to be evaled but not shown.
>-finish_eval=$lt_finish_eval
>+    *)
>+      lt_prog_compiler_pic_F77='-fPIC'
>+      ;;
>+    esac
>+  else
>+    # PORTME Check for flag to pass linker flags through the system compiler.
>+    case $host_os in
>+    aix*)
>+      lt_prog_compiler_wl_F77='-Wl,'
>+      if test "$host_cpu" = ia64; then
>+        # AIX 5 now supports IA64 processor
>+        lt_prog_compiler_static_F77='-Bstatic'
>+      else
>+        lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
>+      fi
>+      ;;
>+      darwin*)
>+        # PIC is the default on this platform
>+        # Common symbols not allowed in MH_DYLIB files
>+       case $cc_basename in
>+         xlc*)
>+         lt_prog_compiler_pic_F77='-qnocommon'
>+         lt_prog_compiler_wl_F77='-Wl,'
>+         ;;
>+       esac
>+       ;;
> 
>-# Take the output of nm and produce a listing of raw symbols and C names.
>-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
>+    mingw* | pw32* | os2*)
>+      # This hack is so that the source file can tell whether it is being
>+      # built for inclusion in a dll (and should export symbols for example).
>+      lt_prog_compiler_pic_F77='-DDLL_EXPORT'
>+      ;;
> 
>-# Transform the output of nm in a proper C declaration
>-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
>+    hpux9* | hpux10* | hpux11*)
>+      lt_prog_compiler_wl_F77='-Wl,'
>+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
>+      # not for PA HP-UX.
>+      case $host_cpu in
>+      hppa*64*|ia64*)
>+        # +Z the default
>+        ;;
>+      *)
>+        lt_prog_compiler_pic_F77='+Z'
>+        ;;
>+      esac
>+      # Is there a better lt_prog_compiler_static that works with the bundled CC?
>+      lt_prog_compiler_static_F77='${wl}-a ${wl}archive'
>+      ;;
> 
>-# Transform the output of nm in a C name address pair
>-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
>+    irix5* | irix6* | nonstopux*)
>+      lt_prog_compiler_wl_F77='-Wl,'
>+      # PIC (with -KPIC) is the default.
>+      lt_prog_compiler_static_F77='-non_shared'
>+      ;;
> 
>-# This is the shared library runtime path variable.
>-runpath_var=$runpath_var
>-
>-# This is the shared library path variable.
>-shlibpath_var=$shlibpath_var
>-
>-# Is shlibpath searched before the hard-coded library search path?
>-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
>-
>-# How to hardcode a shared library path into an executable.
>-hardcode_action=$hardcode_action_CXX
>-
>-# Whether we should hardcode library paths into libraries.
>-hardcode_into_libs=$hardcode_into_libs
>-
>-# Flag to hardcode \$libdir into a binary during linking.
>-# This must work even if \$libdir does not exist.
>-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
>-
>-# If ld is used when linking, flag to hardcode \$libdir into
>-# a binary during linking. This must work even if \$libdir does
>-# not exist.
>-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX
>-
>-# Whether we need a single -rpath flag with a separated argument.
>-hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
>-
>-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
>-# resulting binary.
>-hardcode_direct=$hardcode_direct_CXX
>+    newsos6)
>+      lt_prog_compiler_pic_F77='-KPIC'
>+      lt_prog_compiler_static_F77='-Bstatic'
>+      ;;
> 
>-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
>-# resulting binary.
>-hardcode_minus_L=$hardcode_minus_L_CXX
>+    linux*)
>+      case $cc_basename in
>+      icc* | ecc*)
>+        lt_prog_compiler_wl_F77='-Wl,'
>+        lt_prog_compiler_pic_F77='-KPIC'
>+        lt_prog_compiler_static_F77='-static'
>+        ;;
>+      pgcc* | pgf77* | pgf90* | pgf95*)
>+        # Portland Group compilers (*not* the Pentium gcc compiler,
>+        # which looks to be a dead project)
>+        lt_prog_compiler_wl_F77='-Wl,'
>+        lt_prog_compiler_pic_F77='-fpic'
>+        lt_prog_compiler_static_F77='-Bstatic'
>+        ;;
>+      ccc*)
>+        lt_prog_compiler_wl_F77='-Wl,'
>+        # All Alpha code is PIC.
>+        lt_prog_compiler_static_F77='-non_shared'
>+        ;;
>+      esac
>+      ;;
> 
>-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
>-# the resulting binary.
>-hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX
>+    osf3* | osf4* | osf5*)
>+      lt_prog_compiler_wl_F77='-Wl,'
>+      # All OSF/1 code is PIC.
>+      lt_prog_compiler_static_F77='-non_shared'
>+      ;;
> 
>-# Set to yes if building a shared library automatically hardcodes DIR into the library
>-# and all subsequent libraries and executables linked against it.
>-hardcode_automatic=$hardcode_automatic_CXX
>+    solaris*)
>+      lt_prog_compiler_pic_F77='-KPIC'
>+      lt_prog_compiler_static_F77='-Bstatic'
>+      case $cc_basename in
>+      f77* | f90* | f95*)
>+        lt_prog_compiler_wl_F77='-Qoption ld ';;
>+      *)
>+        lt_prog_compiler_wl_F77='-Wl,';;
>+      esac
>+      ;;
> 
>-# Variables whose values should be saved in libtool wrapper scripts and
>-# restored at relink time.
>-variables_saved_for_relink="$variables_saved_for_relink"
>+    sunos4*)
>+      lt_prog_compiler_wl_F77='-Qoption ld '
>+      lt_prog_compiler_pic_F77='-PIC'
>+      lt_prog_compiler_static_F77='-Bstatic'
>+      ;;
> 
>-# Whether libtool must link a program against all its dependency libraries.
>-link_all_deplibs=$link_all_deplibs_CXX
>+    sysv4 | sysv4.2uw2* | sysv4.3*)
>+      lt_prog_compiler_wl_F77='-Wl,'
>+      lt_prog_compiler_pic_F77='-KPIC'
>+      lt_prog_compiler_static_F77='-Bstatic'
>+      ;;
> 
>-# Compile-time system search path for libraries
>-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
>+    sysv4*MP*)
>+      if test -d /usr/nec ;then
>+        lt_prog_compiler_pic_F77='-Kconform_pic'
>+        lt_prog_compiler_static_F77='-Bstatic'
>+      fi
>+      ;;
> 
>-# Run-time system search path for libraries
>-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
>+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
>+      lt_prog_compiler_wl_F77='-Wl,'
>+      lt_prog_compiler_pic_F77='-KPIC'
>+      lt_prog_compiler_static_F77='-Bstatic'
>+      ;;
> 
>-# Fix the shell variable \$srcfile for the compiler.
>-fix_srcfile_path="$fix_srcfile_path_CXX"
>+    unicos*)
>+      lt_prog_compiler_wl_F77='-Wl,'
>+      lt_prog_compiler_can_build_shared_F77=no
>+      ;;
> 
>-# Set to yes if exported symbols are required.
>-always_export_symbols=$always_export_symbols_CXX
>+    uts4*)
>+      lt_prog_compiler_pic_F77='-pic'
>+      lt_prog_compiler_static_F77='-Bstatic'
>+      ;;
> 
>-# The commands to list exported symbols.
>-export_symbols_cmds=$lt_export_symbols_cmds_CXX
>+    *)
>+      lt_prog_compiler_can_build_shared_F77=no
>+      ;;
>+    esac
>+  fi
> 
>-# The commands to extract the exported symbol list from a shared archive.
>-extract_expsyms_cmds=$lt_extract_expsyms_cmds
>+echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
>+echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6
> 
>-# Symbols that should not be listed in the preloaded symbols.
>-exclude_expsyms=$lt_exclude_expsyms_CXX
>+#
>+# Check to make sure the PIC flag actually works.
>+#
>+if test -n "$lt_prog_compiler_pic_F77"; then
> 
>-# Symbols that must always be exported.
>-include_expsyms=$lt_include_expsyms_CXX
>+echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
>+echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6
>+if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
>+  echo $ECHO_N "(cached) $ECHO_C" >&6
>+else
>+  lt_prog_compiler_pic_works_F77=no
>+  ac_outfile=conftest.$ac_objext
>+   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
>+   lt_compiler_flag="$lt_prog_compiler_pic_F77"
>+   # Insert the option either (1) after the last *FLAGS variable, or
>+   # (2) before a word containing "conftest.", or (3) at the end.
>+   # Note that $ac_compile itself does not contain backslashes and begins
>+   # with a dollar sign (not a hyphen), so the echo should work correctly.
>+   # The option is referenced via a variable to avoid confusing sed.
>+   lt_compile=`echo "$ac_compile" | $SED \
>+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
>+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
>+   -e 's:$: $lt_compiler_flag:'`
>+   (eval echo "\"\$as_me:13313: $lt_compile\"" >&5)
>+   (eval "$lt_compile" 2>conftest.err)
>+   ac_status=$?
>+   cat conftest.err >&5
>+   echo "$as_me:13317: \$? = $ac_status" >&5
>+   if (exit $ac_status) && test -s "$ac_outfile"; then
>+     # The compiler can only warn and ignore the option if not recognized
>+     # So say no if there are warnings other than the usual output.
>+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
>+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
>+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
>+       lt_prog_compiler_pic_works_F77=yes
>+     fi
>+   fi
>+   $rm conftest*
> 
>-# ### END LIBTOOL TAG CONFIG: $tagname
>+fi
>+echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
>+echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6
> 
>-__EOF__
>+if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
>+    case $lt_prog_compiler_pic_F77 in
>+     "" | " "*) ;;
>+     *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;;
>+     esac
>+else
>+    lt_prog_compiler_pic_F77=
>+     lt_prog_compiler_can_build_shared_F77=no
>+fi
> 
>+fi
>+case $host_os in
>+  # For platforms which do not support PIC, -DPIC is meaningless:
>+  *djgpp*)
>+    lt_prog_compiler_pic_F77=
>+    ;;
>+  *)
>+    lt_prog_compiler_pic_F77="$lt_prog_compiler_pic_F77"
>+    ;;
>+esac
> 
>+#
>+# Check to make sure the static flag actually works.
>+#
>+wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"
>+echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
>+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
>+if test "${lt_prog_compiler_static_works_F77+set}" = set; then
>+  echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>-  # If there is no Makefile yet, we rely on a make rule to execute
>-  # `config.status --recheck' to rerun these tests and create the
>-  # libtool script then.
>-  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
>-  if test -f "$ltmain_in"; then
>-    test -f Makefile && make "$ltmain"
>+  lt_prog_compiler_static_works_F77=no
>+   save_LDFLAGS="$LDFLAGS"
>+   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
>+   printf "$lt_simple_link_test_code" > conftest.$ac_ext
>+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
>+     # The linker can only warn and ignore the option if not recognized
>+     # So say no if there are warnings
>+     if test -s conftest.err; then
>+       # Append any errors to the config.log.
>+       cat conftest.err 1>&5
>+       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
>+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
>+       if diff conftest.exp conftest.er2 >/dev/null; then
>+         lt_prog_compiler_static_works_F77=yes
>   fi
>+     else
>+       lt_prog_compiler_static_works_F77=yes
> fi
>+   fi
>+   $rm conftest*
>+   LDFLAGS="$save_LDFLAGS"
> 
>+fi
>+echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5
>+echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6
> 
>-ac_ext=c
>-ac_cpp='$CPP $CPPFLAGS'
>-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
>-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
>-ac_compiler_gnu=$ac_cv_c_compiler_gnu
>-
>-CC=$lt_save_CC
>-LDCXX=$LD
>-LD=$lt_save_LD
>-GCC=$lt_save_GCC
>-with_gnu_ldcxx=$with_gnu_ld
>-with_gnu_ld=$lt_save_with_gnu_ld
>-lt_cv_path_LDCXX=$lt_cv_path_LD
>-lt_cv_path_LD=$lt_save_path_LD
>-lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
>-lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
>-
>+if test x"$lt_prog_compiler_static_works_F77" = xyes; then
>+    :
>         else
>-          tagname=""
>+    lt_prog_compiler_static_F77=
>         fi
>-        ;;
>-
>-      F77)
>-        if test -n "$F77" && test "X$F77" != "Xno"; then
> 
>-ac_ext=f
>-ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
>-ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
>-ac_compiler_gnu=$ac_cv_f77_compiler_gnu
> 
>+echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
>+echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
>+if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
>+  echo $ECHO_N "(cached) $ECHO_C" >&6
>+else
>+  lt_cv_prog_compiler_c_o_F77=no
>+   $rm -r conftest 2>/dev/null
>+   mkdir conftest
>+   cd conftest
>+   mkdir out
>+   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
> 
>-archive_cmds_need_lc_F77=no
>-allow_undefined_flag_F77=
>-always_export_symbols_F77=no
>-archive_expsym_cmds_F77=
>-export_dynamic_flag_spec_F77=
>-hardcode_direct_F77=no
>-hardcode_libdir_flag_spec_F77=
>-hardcode_libdir_flag_spec_ld_F77=
>-hardcode_libdir_separator_F77=
>-hardcode_minus_L_F77=no
>-hardcode_automatic_F77=no
>-module_cmds_F77=
>-module_expsym_cmds_F77=
>-link_all_deplibs_F77=unknown
>-old_archive_cmds_F77=$old_archive_cmds
>-no_undefined_flag_F77=
>-whole_archive_flag_spec_F77=
>-enable_shared_with_static_runtimes_F77=no
>-
>-# Source file extension for f77 test sources.
>-ac_ext=f
>-
>-# Object file extension for compiled f77 test sources.
>-objext=o
>-objext_F77=$objext
>-
>-# Code to be used in simple compile tests
>-lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
>-
>-# Code to be used in simple link tests
>-lt_simple_link_test_code="      program t\n      end\n"
>-
>-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
>-
>-# If no C compiler was specified, use CC.
>-LTCC=${LTCC-"$CC"}
>+   lt_compiler_flag="-o out/conftest2.$ac_objext"
>+   # Insert the option either (1) after the last *FLAGS variable, or
>+   # (2) before a word containing "conftest.", or (3) at the end.
>+   # Note that $ac_compile itself does not contain backslashes and begins
>+   # with a dollar sign (not a hyphen), so the echo should work correctly.
>+   lt_compile=`echo "$ac_compile" | $SED \
>+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
>+   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
>+   -e 's:$: $lt_compiler_flag:'`
>+   (eval echo "\"\$as_me:13417: $lt_compile\"" >&5)
>+   (eval "$lt_compile" 2>out/conftest.err)
>+   ac_status=$?
>+   cat out/conftest.err >&5
>+   echo "$as_me:13421: \$? = $ac_status" >&5
>+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
>+   then
>+     # The compiler can only warn and ignore the option if not recognized
>+     # So say no if there are warnings
>+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
>+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
>+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
>+       lt_cv_prog_compiler_c_o_F77=yes
>+     fi
>+   fi
>+   chmod u+w . 2>&5
>+   $rm conftest*
>+   # SGI C++ compiler will create directory out/ii_files/ for
>+   # template instantiation
>+   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
>+   $rm out/* && rmdir out
>+   cd ..
>+   rmdir conftest
>+   $rm conftest*
> 
>-# Allow CC to be a program name with arguments.
>-compiler=$CC
>+fi
>+echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
>+echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6
> 
> 
>-# Allow CC to be a program name with arguments.
>-lt_save_CC="$CC"
>-CC=${F77-"f77"}
>-compiler=$CC
>-compiler_F77=$CC
>-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
>+hard_links="nottested"
>+if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then
>+  # do not overwrite the value of need_locks provided by the user
>+  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
>+echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
>+  hard_links=yes
>+  $rm conftest*
>+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
>+  touch conftest.a
>+  ln conftest.a conftest.b 2>&5 || hard_links=no
>+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
>+  echo "$as_me:$LINENO: result: $hard_links" >&5
>+echo "${ECHO_T}$hard_links" >&6
>+  if test "$hard_links" = no; then
>+    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
>+echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
>+    need_locks=warn
>+  fi
>+else
>+  need_locks=no
>+fi
> 
>-echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
>-echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
>-echo "$as_me:$LINENO: result: $can_build_shared" >&5
>-echo "${ECHO_T}$can_build_shared" >&6
>+echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
>+echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
> 
>-echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
>-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
>-test "$can_build_shared" = "no" && enable_shared=no
>+  runpath_var=
>+  allow_undefined_flag_F77=
>+  enable_shared_with_static_runtimes_F77=no
>+  archive_cmds_F77=
>+  archive_expsym_cmds_F77=
>+  old_archive_From_new_cmds_F77=
>+  old_archive_from_expsyms_cmds_F77=
>+  export_dynamic_flag_spec_F77=
>+  whole_archive_flag_spec_F77=
>+  thread_safe_flag_spec_F77=
>+  hardcode_libdir_flag_spec_F77=
>+  hardcode_libdir_flag_spec_ld_F77=
>+  hardcode_libdir_separator_F77=
>+  hardcode_direct_F77=no
>+  hardcode_minus_L_F77=no
>+  hardcode_shlibpath_var_F77=unsupported
>+  link_all_deplibs_F77=unknown
>+  hardcode_automatic_F77=no
>+  module_cmds_F77=
>+  module_expsym_cmds_F77=
>+  always_export_symbols_F77=no
>+  export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
>+  # include_expsyms should be a list of space-separated symbols to be *always*
>+  # included in the symbol list
>+  include_expsyms_F77=
>+  # exclude_expsyms can be an extended regexp of symbols to exclude
>+  # it will be wrapped by ` (' and `)$', so one must not match beginning or
>+  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
>+  # as well as any symbol that contains `d'.
>+  exclude_expsyms_F77="_GLOBAL_OFFSET_TABLE_"
>+  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
>+  # platforms (ab)use it in PIC code, but their linkers get confused if
>+  # the symbol is explicitly referenced.  Since portable code cannot
>+  # rely on this symbol name, it's probably fine to never include it in
>+  # preloaded symbol tables.
>+  extract_expsyms_cmds=
>+  # Just being paranoid about ensuring that cc_basename is set.
>+  for cc_temp in $compiler""; do
>+  case $cc_temp in
>+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
>+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
>+    \-*) ;;
>+    *) break;;
>+  esac
>+done
>+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
> 
>-# 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'
>+  case $host_os in
>+  cygwin* | mingw* | pw32*)
>+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
>+    # When not using gcc, we currently assume that we are using
>+    # Microsoft Visual C++.
>+    if test "$GCC" != yes; then
>+      with_gnu_ld=no
>   fi
>   ;;
>-aix4* | aix5*)
>-  test "$enable_shared" = yes && enable_static=no
>+  interix*)
>+    # we just hope/assume this is gcc and not c89 (= MSVC++)
>+    with_gnu_ld=yes
>+    ;;
>+  openbsd*)
>+    with_gnu_ld=no
>   ;;
> esac
>-echo "$as_me:$LINENO: result: $enable_shared" >&5
>-echo "${ECHO_T}$enable_shared" >&6
>-
>-echo "$as_me:$LINENO: checking whether to build static libraries" >&5
>-echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6
>-# Make sure either enable_shared or enable_static is yes.
>-test "$enable_shared" = yes || enable_static=yes
>-echo "$as_me:$LINENO: result: $enable_static" >&5
>-echo "${ECHO_T}$enable_static" >&6
>-
>-test "$ld_shlibs_F77" = no && can_build_shared=no
> 
>-GCC_F77="$G77"
>-LD_F77="$LD"
>+  ld_shlibs_F77=yes
>+  if test "$with_gnu_ld" = yes; then
>+    # If archive_cmds runs LD, not CC, wlarc should be empty
>+    wlarc='${wl}'
> 
>-lt_prog_compiler_wl_F77=
>-lt_prog_compiler_pic_F77=
>-lt_prog_compiler_static_F77=
>+    # Set some defaults for GNU ld with shared library support. These
>+    # are reset later if shared libraries are not supported. Putting them
>+    # here allows them to be overridden if necessary.
>+    runpath_var=LD_RUN_PATH
>+    hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir'
>+    export_dynamic_flag_spec_F77='${wl}--export-dynamic'
>+    # ancient GNU ld didn't support --whole-archive et. al.
>+    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
>+        whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
>+      else
>+        whole_archive_flag_spec_F77=
>+    fi
>+    supports_anon_versioning=no
>+    case `$LD -v 2>/dev/null` in
>+      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
>+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
>+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
>+      *\ 2.11.*) ;; # other 2.11 versions
>+      *) supports_anon_versioning=yes ;;
>+    esac
> 
>-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
>-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
>+    # See if GNU ld supports shared libraries.
>+    case $host_os in
>+    aix3* | aix4* | aix5*)
>+      # On AIX/PPC, the GNU linker is very broken
>+      if test "$host_cpu" != ia64; then
>+        ld_shlibs_F77=no
>+        cat <<EOF 1>&2
> 
>-  if test "$GCC" = yes; then
>-    lt_prog_compiler_wl_F77='-Wl,'
>-    lt_prog_compiler_static_F77='-static'
>+*** Warning: the GNU linker, at least up to release 2.9.1, is reported
>+*** to be unable to reliably create shared libraries on AIX.
>+*** Therefore, libtool is disabling shared libraries support.  If you
>+*** really care for shared libraries, you may want to modify your PATH
>+*** so that a non-GNU linker is found, and then restart.
> 
>-    case $host_os in
>-      aix*)
>-      # All AIX code is PIC.
>-      if test "$host_cpu" = ia64; then
>-        # AIX 5 now supports IA64 processor
>-        lt_prog_compiler_static_F77='-Bstatic'
>+EOF
>       fi
>       ;;
> 
>     amigaos*)
>-      # FIXME: we need at least 68020 code to build shared libraries, but
>-      # adding the `-m68020' flag to GCC prevents building anything better,
>-      # like `-m68040'.
>-      lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
>-      ;;
>-
>-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
>-      # PIC is the default for these OSes.
>-      ;;
>-
>-    mingw* | pw32* | os2*)
>-      # This hack is so that the source file can tell whether it is being
>-      # built for inclusion in a dll (and should export symbols for example).
>-      lt_prog_compiler_pic_F77='-DDLL_EXPORT'
>-      ;;
>-
>-    darwin* | rhapsody*)
>-      # PIC is the default on this platform
>-      # Common symbols not allowed in MH_DYLIB files
>-      lt_prog_compiler_pic_F77='-fno-common'
>-      ;;
>+      archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
>+      hardcode_libdir_flag_spec_F77='-L$libdir'
>+      hardcode_minus_L_F77=yes
> 
>-    msdosdjgpp*)
>-      # Just because we use GCC doesn't mean we suddenly get shared libraries
>-      # on systems that don't support them.
>-      lt_prog_compiler_can_build_shared_F77=no
>-      enable_shared=no
>+      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
>+      # that the semantics of dynamic libraries on AmigaOS, at least up
>+      # to version 4, is to share data among multiple programs linked
>+      # with the same dynamic library.  Since this doesn't match the
>+      # behavior of shared libraries on other platforms, we can't use
>+      # them.
>+      ld_shlibs_F77=no
>       ;;
> 
>-    sysv4*MP*)
>-      if test -d /usr/nec; then
>-        lt_prog_compiler_pic_F77=-Kconform_pic
>+    beos*)
>+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
>+        allow_undefined_flag_F77=unsupported
>+        # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
>+        # support --undefined.  This deserves some investigation.  FIXME
>+        archive_cmds_F77='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
>+      else
>+        ld_shlibs_F77=no
>       fi
>       ;;
> 
>-    hpux*)
>-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
>-      # not for PA HP-UX.
>-      case "$host_cpu" in
>-      hppa*64*|ia64*)
>-        # +Z the default
>-        ;;
>-      *)
>-        lt_prog_compiler_pic_F77='-fPIC'
>-        ;;
>-      esac
>-      ;;
>+    cygwin* | mingw* | pw32*)
>+      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless,
>+      # as there is no search path for DLLs.
>+      hardcode_libdir_flag_spec_F77='-L$libdir'
>+      allow_undefined_flag_F77=unsupported
>+      always_export_symbols_F77=no
>+      enable_shared_with_static_runtimes_F77=yes
>+      export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* $[^ ]*$/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
> 
>-    *)
>-      lt_prog_compiler_pic_F77='-fPIC'
>-      ;;
>-    esac
>+      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
>+        archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
>+        # If the export-symbols file already is a .def file (1st line
>+        # is EXPORTS), use it as is; otherwise, prepend...
>+        archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
>+          cp $export_symbols $output_objdir/$soname.def;
>   else
>-    # PORTME Check for flag to pass linker flags through the system compiler.
>-    case $host_os in
>-    aix*)
>-      lt_prog_compiler_wl_F77='-Wl,'
>-      if test "$host_cpu" = ia64; then
>-        # AIX 5 now supports IA64 processor
>-        lt_prog_compiler_static_F77='-Bstatic'
>+          echo EXPORTS > $output_objdir/$soname.def;
>+          cat $export_symbols >> $output_objdir/$soname.def;
>+        fi~
>+        $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
>       else
>-        lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
>+        ld_shlibs_F77=no
>       fi
>       ;;
> 
>-    mingw* | pw32* | os2*)
>-      # This hack is so that the source file can tell whether it is being
>-      # built for inclusion in a dll (and should export symbols for example).
>-      lt_prog_compiler_pic_F77='-DDLL_EXPORT'
>+    interix3*)
>+      hardcode_direct_F77=no
>+      hardcode_shlibpath_var_F77=no
>+      hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
>+      export_dynamic_flag_spec_F77='${wl}-E'
>+      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
>+      # Instead, shared libraries are loaded at an image base (0x10000000 by
>+      # default) and relocated if they conflict, which is a slow very memory
>+      # consuming and fragmenting process.  To avoid this, we pick a random,
>+      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
>+      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
>+      archive_cmds_F77='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
>+      archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
>       ;;
> 
>-    hpux9* | hpux10* | hpux11*)
>-      lt_prog_compiler_wl_F77='-Wl,'
>-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
>-      # not for PA HP-UX.
>-      case "$host_cpu" in
>-      hppa*64*|ia64*)
>-        # +Z the default
>-        ;;
>-      *)
>-        lt_prog_compiler_pic_F77='+Z'
>-        ;;
>+    linux*)
>+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
>+        tmp_addflag=
>+        case $cc_basename,$host_cpu in
>+        pgcc*)                          # Portland Group C compiler
>+          whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
>+          tmp_addflag=' $pic_flag'
>+          ;;
>+        pgf77* | pgf90* | pgf95*)       # Portland Group f77 and f90 compilers
>+          whole_archive_flag_spec_F77='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
>+          tmp_addflag=' $pic_flag -Mnomain' ;;
>+        ecc*,ia64* | icc*,ia64*)                # Intel C compiler on ia64
>+          tmp_addflag=' -i_dynamic' ;;
>+        efc*,ia64* | ifort*,ia64*)      # Intel Fortran compiler on ia64
>+          tmp_addflag=' -i_dynamic -nofor_main' ;;
>+        ifc* | ifort*)                  # Intel Fortran compiler
>+          tmp_addflag=' -nofor_main' ;;
>       esac
>-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
>-      lt_prog_compiler_static_F77='${wl}-a ${wl}archive'
>-      ;;
>+        archive_cmds_F77='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
> 
>-    irix5* | irix6* | nonstopux*)
>-      lt_prog_compiler_wl_F77='-Wl,'
>-      # PIC (with -KPIC) is the default.
>-      lt_prog_compiler_static_F77='-non_shared'
>+        if test $supports_anon_versioning = yes; then
>+          archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
>+  cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
>+  $echo "local: *; };" >> $output_objdir/$libname.ver~
>+          $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
>+        fi
>+      else
>+        ld_shlibs_F77=no
>+      fi
>       ;;
> 
>-    newsos6)
>-      lt_prog_compiler_pic_F77='-KPIC'
>-      lt_prog_compiler_static_F77='-Bstatic'
>+    netbsd*)
>+      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
>+        archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
>+        wlarc=
>+      else
>+        archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
>+        archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
>+      fi
>       ;;
> 
>-    linux*)
>-      case $CC in
>-      icc* | ecc*)
>-        lt_prog_compiler_wl_F77='-Wl,'
>-        lt_prog_compiler_pic_F77='-KPIC'
>-        lt_prog_compiler_static_F77='-static'
>-        ;;
>-      ccc*)
>-        lt_prog_compiler_wl_F77='-Wl,'
>-        # All Alpha code is PIC.
>-        lt_prog_compiler_static_F77='-non_shared'
>-        ;;
>-      esac
>-      ;;
>+    solaris*)
>+      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
>+        ld_shlibs_F77=no
>+        cat <<EOF 1>&2
> 
>-    osf3* | osf4* | osf5*)
>-      lt_prog_compiler_wl_F77='-Wl,'
>-      # All OSF/1 code is PIC.
>-      lt_prog_compiler_static_F77='-non_shared'
>-      ;;
>+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
>+*** create shared libraries on Solaris systems.  Therefore, libtool
>+*** is disabling shared libraries support.  We urge you to upgrade GNU
>+*** binutils to release 2.9.1 or newer.  Another option is to modify
>+*** your PATH or compiler configuration so that the native linker is
>+*** used, and then restart.
> 
>-    sco3.2v5*)
>-      lt_prog_compiler_pic_F77='-Kpic'
>-      lt_prog_compiler_static_F77='-dn'
>+EOF
>+      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
>+        archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
>+        archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
>+      else
>+        ld_shlibs_F77=no
>+      fi
>       ;;
> 
>-    solaris*)
>-      lt_prog_compiler_wl_F77='-Wl,'
>-      lt_prog_compiler_pic_F77='-KPIC'
>-      lt_prog_compiler_static_F77='-Bstatic'
>-      ;;
>+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
>+      case `$LD -v 2>&1` in
>+        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
>+        ld_shlibs_F77=no
>+        cat <<_LT_EOF 1>&2
> 
>-    sunos4*)
>-      lt_prog_compiler_wl_F77='-Qoption ld '
>-      lt_prog_compiler_pic_F77='-PIC'
>-      lt_prog_compiler_static_F77='-Bstatic'
>-      ;;
>+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
>+*** reliably create shared libraries on SCO systems.  Therefore, libtool
>+*** is disabling shared libraries support.  We urge you to upgrade GNU
>+*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
>+*** your PATH or compiler configuration so that the native linker is
>+*** used, and then restart.
> 
>-    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
>-      lt_prog_compiler_wl_F77='-Wl,'
>-      lt_prog_compiler_pic_F77='-KPIC'
>-      lt_prog_compiler_static_F77='-Bstatic'
>+_LT_EOF
>       ;;
>-
>-    sysv4*MP*)
>-      if test -d /usr/nec ;then
>-        lt_prog_compiler_pic_F77='-Kconform_pic'
>-        lt_prog_compiler_static_F77='-Bstatic'
>+        *)
>+          if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
>+            hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
>+            archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
>+            archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
>+          else
>+            ld_shlibs_F77=no
>       fi
>       ;;
>+      esac
>+      ;;
> 
>-    uts4*)
>-      lt_prog_compiler_pic_F77='-pic'
>-      lt_prog_compiler_static_F77='-Bstatic'
>+    sunos4*)
>+      archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
>+      wlarc=
>+      hardcode_direct_F77=yes
>+      hardcode_shlibpath_var_F77=no
>       ;;
> 
>     *)
>-      lt_prog_compiler_can_build_shared_F77=no
>+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
>+        archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
>+        archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
>+      else
>+        ld_shlibs_F77=no
>+      fi
>       ;;
>     esac
>-  fi
>-
>-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
>-echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6
>-
>-#
>-# Check to make sure the PIC flag actually works.
>-#
>-if test -n "$lt_prog_compiler_pic_F77"; then
> 
>-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
>-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6
>-if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
>-  echo $ECHO_N "(cached) $ECHO_C" >&6
>-else
>-  lt_prog_compiler_pic_works_F77=no
>-  ac_outfile=conftest.$ac_objext
>-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
>-   lt_compiler_flag="$lt_prog_compiler_pic_F77"
>-   # Insert the option either (1) after the last *FLAGS variable, or
>-   # (2) before a word containing "conftest.", or (3) at the end.
>-   # Note that $ac_compile itself does not contain backslashes and begins
>-   # with a dollar sign (not a hyphen), so the echo should work correctly.
>-   # The option is referenced via a variable to avoid confusing sed.
>-   lt_compile=`echo "$ac_compile" | $SED \
>-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
>-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
>-   -e 's:$: $lt_compiler_flag:'`
>-   (eval echo "\"\$as_me:13554: $lt_compile\"" >&5)
>-   (eval "$lt_compile" 2>conftest.err)
>-   ac_status=$?
>-   cat conftest.err >&5
>-   echo "$as_me:13558: \$? = $ac_status" >&5
>-   if (exit $ac_status) && test -s "$ac_outfile"; then
>-     # The compiler can only warn and ignore the option if not recognized
>-     # So say no if there are warnings
>-     if test ! -s conftest.err; then
>-       lt_prog_compiler_pic_works_F77=yes
>-     fi
>+    if test "$ld_shlibs_F77" = no; then
>+      runpath_var=
>+      hardcode_libdir_flag_spec_F77=
>+      export_dynamic_flag_spec_F77=
>+      whole_archive_flag_spec_F77=
>    fi
>-   $rm conftest*
>-
>+  else
>+    # PORTME fill in a description of your system's linker (not GNU ld)
>+    case $host_os in
>+    aix3*)
>+      allow_undefined_flag_F77=unsupported
>+      always_export_symbols_F77=yes
>+      archive_expsym_cmds_F77='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
>+      # Note: this linker hardcodes the directories in LIBPATH if there
>+      # are no directories specified by -L.
>+      hardcode_minus_L_F77=yes
>+      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
>+        # Neither direct hardcoding nor static linking is supported with a
>+        # broken collect2.
>+        hardcode_direct_F77=unsupported
> fi
>-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
>-echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6
>+      ;;
> 
>-if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
>-    case $lt_prog_compiler_pic_F77 in
>-     "" | " "*) ;;
>-     *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;;
>-     esac
>+    aix4* | aix5*)
>+      if test "$host_cpu" = ia64; then
>+        # On IA64, the linker does run time linking by default, so we don't
>+        # have to do anything special.
>+        aix_use_runtimelinking=no
>+        exp_sym_flag='-Bexport'
>+        no_entry_flag=""
> else
>-    lt_prog_compiler_pic_F77=
>-     lt_prog_compiler_can_build_shared_F77=no
>+        # If we're using GNU nm, then we don't want the "-C" option.
>+        # -C means demangle to AIX nm, but means don't demangle with GNU nm
>+        if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
>+          export_symbols_cmds_F77='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
>+        else
>+          export_symbols_cmds_F77='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
> fi
>+        aix_use_runtimelinking=no
> 
>+        # Test if we are trying to use run time linking or normal
>+        # AIX style linking. If -brtl is somewhere in LDFLAGS, we
>+        # need to do runtime linking.
>+        case $host_os in aix4.[23]|aix4.[23].*|aix5*)
>+          for ld_flag in $LDFLAGS; do
>+          if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
>+            aix_use_runtimelinking=yes
>+            break
> fi
>-case "$host_os" in
>-  # For platforms which do not support PIC, -DPIC is meaningless:
>-  *djgpp*)
>-    lt_prog_compiler_pic_F77=
>-    ;;
>-  *)
>-    lt_prog_compiler_pic_F77="$lt_prog_compiler_pic_F77"
>+          done
>     ;;
> esac
> 
>-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
>-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
>-if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
>-  echo $ECHO_N "(cached) $ECHO_C" >&6
>-else
>-  lt_cv_prog_compiler_c_o_F77=no
>-   $rm -r conftest 2>/dev/null
>-   mkdir conftest
>-   cd conftest
>-   mkdir out
>-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
>-
>-   lt_compiler_flag="-o out/conftest2.$ac_objext"
>-   # Insert the option either (1) after the last *FLAGS variable, or
>-   # (2) before a word containing "conftest.", or (3) at the end.
>-   # Note that $ac_compile itself does not contain backslashes and begins
>-   # with a dollar sign (not a hyphen), so the echo should work correctly.
>-   lt_compile=`echo "$ac_compile" | $SED \
>-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
>-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
>-   -e 's:$: $lt_compiler_flag:'`
>-   (eval echo "\"\$as_me:13614: $lt_compile\"" >&5)
>-   (eval "$lt_compile" 2>out/conftest.err)
>-   ac_status=$?
>-   cat out/conftest.err >&5
>-   echo "$as_me:13618: \$? = $ac_status" >&5
>-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
>-   then
>-     # The compiler can only warn and ignore the option if not recognized
>-     # So say no if there are warnings
>-     if test ! -s out/conftest.err; then
>-       lt_cv_prog_compiler_c_o_F77=yes
>-     fi
>+        exp_sym_flag='-bexport'
>+        no_entry_flag='-bnoentry'
>    fi
>-   chmod u+w .
>-   $rm conftest*
>-   # SGI C++ compiler will create directory out/ii_files/ for
>-   # template instantiation
>-   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
>-   $rm out/* && rmdir out
>-   cd ..
>-   rmdir conftest
>-   $rm conftest*
> 
>-fi
>-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
>-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6
>+      # When large executables or shared objects are built, AIX ld can
>+      # have problems creating the table of contents.  If linking a library
>+      # or program results in "error TOC overflow" add -mminimal-toc to
>+      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
>+      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
> 
>+      archive_cmds_F77=''
>+      hardcode_direct_F77=yes
>+      hardcode_libdir_separator_F77=':'
>+      link_all_deplibs_F77=yes
> 
>-hard_links="nottested"
>-if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then
>-  # do not overwrite the value of need_locks provided by the user
>-  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
>-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
>-  hard_links=yes
>-  $rm conftest*
>-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
>-  touch conftest.a
>-  ln conftest.a conftest.b 2>&5 || hard_links=no
>-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
>-  echo "$as_me:$LINENO: result: $hard_links" >&5
>-echo "${ECHO_T}$hard_links" >&6
>-  if test "$hard_links" = no; then
>-    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
>-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
>-    need_locks=warn
>-  fi
>+      if test "$GCC" = yes; then
>+        case $host_os in aix4.[012]|aix4.[012].*)
>+        # We only want to do this on AIX 4.2 and lower, the check
>+        # below for broken collect2 doesn't work under 4.3+
>+          collect2name=`${CC} -print-prog-name=collect2`
>+          if test -f "$collect2name" && \
>+           strings "$collect2name" | grep resolve_lib_name >/dev/null
>+          then
>+          # We have reworked collect2
>+          hardcode_direct_F77=yes
> else
>-  need_locks=no
>-fi
>-
>-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
>-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
>-
>-  runpath_var=
>-  allow_undefined_flag_F77=
>-  enable_shared_with_static_runtimes_F77=no
>-  archive_cmds_F77=
>-  archive_expsym_cmds_F77=
>-  old_archive_From_new_cmds_F77=
>-  old_archive_from_expsyms_cmds_F77=
>-  export_dynamic_flag_spec_F77=
>-  whole_archive_flag_spec_F77=
>-  thread_safe_flag_spec_F77=
>-  hardcode_libdir_flag_spec_F77=
>-  hardcode_libdir_flag_spec_ld_F77=
>+          # We have old collect2
>+          hardcode_direct_F77=unsupported
>+          # It fails to find uninstalled libraries when the uninstalled
>+          # path is not listed in the libpath.  Setting hardcode_minus_L
>+          # to unsupported forces relinking
>+          hardcode_minus_L_F77=yes
>+          hardcode_libdir_flag_spec_F77='-L$libdir'
>   hardcode_libdir_separator_F77=
>-  hardcode_direct_F77=no
>-  hardcode_minus_L_F77=no
>-  hardcode_shlibpath_var_F77=unsupported
>-  link_all_deplibs_F77=unknown
>-  hardcode_automatic_F77=no
>-  module_cmds_F77=
>-  module_expsym_cmds_F77=
>-  always_export_symbols_F77=no
>-  export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
>-  # include_expsyms should be a list of space-separated symbols to be *always*
>-  # included in the symbol list
>-  include_expsyms_F77=
>-  # exclude_expsyms can be an extended regexp of symbols to exclude
>-  # it will be wrapped by ` (' and `)$', so one must not match beginning or
>-  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
>-  # as well as any symbol that contains `d'.
>-  exclude_expsyms_F77="_GLOBAL_OFFSET_TABLE_"
>-  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
>-  # platforms (ab)use it in PIC code, but their linkers get confused if
>-  # the symbol is explicitly referenced.  Since portable code cannot
>-  # rely on this symbol name, it's probably fine to never include it in
>-  # preloaded symbol tables.
>-  extract_expsyms_cmds=
>-
>-  case $host_os in
>-  cygwin* | mingw* | pw32*)
>-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
>-    # When not using gcc, we currently assume that we are using
>-    # Microsoft Visual C++.
>-    if test "$GCC" != yes; then
>-      with_gnu_ld=no
>     fi
>     ;;
>-  openbsd*)
>-    with_gnu_ld=no
>-    ;;
>   esac
>-
>-  ld_shlibs_F77=yes
>-  if test "$with_gnu_ld" = yes; then
>-    # If archive_cmds runs LD, not CC, wlarc should be empty
>-    wlarc='${wl}'
>-
>-    # See if GNU ld supports shared libraries.
>-    case $host_os in
>-    aix3* | aix4* | aix5*)
>-      # On AIX/PPC, the GNU linker is very broken
>-      if test "$host_cpu" != ia64; then
>-        ld_shlibs_F77=no
>-        cat <<EOF 1>&2
>-
>-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
>-*** to be unable to reliably create shared libraries on AIX.
>-*** Therefore, libtool is disabling shared libraries support.  If you
>-*** really care for shared libraries, you may want to modify your PATH
>-*** so that a non-GNU linker is found, and then restart.
>-
>-EOF
>+        shared_flag='-shared'
>+        if test "$aix_use_runtimelinking" = yes; then
>+          shared_flag="$shared_flag "'${wl}-G'
>       fi
>-      ;;
>-
>-    amigaos*)
>-      archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
>-      hardcode_libdir_flag_spec_F77='-L$libdir'
>-      hardcode_minus_L_F77=yes
>-
>-      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
>-      # that the semantics of dynamic libraries on AmigaOS, at least up
>-      # to version 4, is to share data among multiple programs linked
>-      # with the same dynamic library.  Since this doesn't match the
>-      # behavior of shared libraries on other platforms, we can't use
>-      # them.
>-      ld_shlibs_F77=no
>-      ;;
>-
>-    beos*)
>-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
>-        allow_undefined_flag_F77=unsupported
>-        # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
>-        # support --undefined.  This deserves some investigation.  FIXME
>-        archive_cmds_F77='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
>       else
>-        ld_shlibs_F77=no
>-      fi
>-      ;;
>-
>-    cygwin* | mingw* | pw32*)
>-      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless,
>-      # as there is no search path for DLLs.
>-      hardcode_libdir_flag_spec_F77='-L$libdir'
>-      allow_undefined_flag_F77=unsupported
>-      always_export_symbols_F77=no
>-      enable_shared_with_static_runtimes_F77=yes
>-      export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* $[^ ]*$/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
>-
>-      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
>-        archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
>-        # If the export-symbols file already is a .def file (1st line
>-        # is EXPORTS), use it as is; otherwise, prepend...
>-        archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
>-          cp $export_symbols $output_objdir/$soname.def;
>+        # 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
>-          echo EXPORTS > $output_objdir/$soname.def;
>-          cat $export_symbols >> $output_objdir/$soname.def;
>-        fi~
>-        $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
>+          if test "$aix_use_runtimelinking" = yes; then
>+            shared_flag='${wl}-G'
>       else
>-        ld_shlibs=no
>+            shared_flag='${wl}-bM:SRE'
>       fi
>-      ;;
>-
>-    netbsd*)
>-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
>-        archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
>-        wlarc=
>-      else
>-        archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
>-        archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
>       fi
>-      ;;
>-
>-    solaris* | sysv5*)
>-      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
>-        ld_shlibs_F77=no
>-        cat <<EOF 1>&2
>-
>-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
>-*** create shared libraries on Solaris systems.  Therefore, libtool
>-*** is disabling shared libraries support.  We urge you to upgrade GNU
>-*** binutils to release 2.9.1 or newer.  Another option is to modify
>-*** your PATH or compiler configuration so that the native linker is
>-*** used, and then restart.
>-
>-EOF
>-      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
>-        archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
>-        archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
>-      else
>-        ld_shlibs_F77=no
>       fi
>-      ;;
> 
>-    sunos4*)
>-      archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
>-      wlarc=
>-      hardcode_direct_F77=yes
>-      hardcode_shlibpath_var_F77=no
>-      ;;
>-
>-  linux*)
>-    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
>-        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
>-        archive_cmds_F77="$tmp_archive_cmds"
>-      supports_anon_versioning=no
>-      case `$LD -v 2>/dev/null` in
>-        *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
>-        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
>-        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
>-        *\ 2.11.*) ;; # other 2.11 versions
>-        *) supports_anon_versioning=yes ;;
>-      esac
>-      if test $supports_anon_versioning = yes; then
>-        archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
>-cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
>-$echo "local: *; };" >> $output_objdir/$libname.ver~
>-        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
>-      else
>-        archive_expsym_cmds_F77="$tmp_archive_cmds"
>-      fi
>-    else
>-      ld_shlibs_F77=no
>-    fi
>-    ;;
>-
>-    *)
>-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
>-        archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
>-        archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
>-      else
>-        ld_shlibs_F77=no
>-      fi
>-      ;;
>-    esac
>-
>-    if test "$ld_shlibs_F77" = yes; then
>-      runpath_var=LD_RUN_PATH
>-      hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir'
>-      export_dynamic_flag_spec_F77='${wl}--export-dynamic'
>-      # ancient GNU ld didn't support --whole-archive et. al.
>-      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
>-        whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
>-      else
>-        whole_archive_flag_spec_F77=
>-      fi
>-    fi
>-  else
>-    # PORTME fill in a description of your system's linker (not GNU ld)
>-    case $host_os in
>-    aix3*)
>-      allow_undefined_flag_F77=unsupported
>-      always_export_symbols_F77=yes
>-      archive_expsym_cmds_F77='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
>-      # Note: this linker hardcodes the directories in LIBPATH if there
>-      # are no directories specified by -L.
>-      hardcode_minus_L_F77=yes
>-      if test "$GCC" = yes && test -z "$link_static_flag"; then
>-        # Neither direct hardcoding nor static linking is supported with a
>-        # broken collect2.
>-        hardcode_direct_F77=unsupported
>-      fi
>-      ;;
>-
>-    aix4* | aix5*)
>-      if test "$host_cpu" = ia64; then
>-        # On IA64, the linker does run time linking by default, so we don't
>-        # have to do anything special.
>-        aix_use_runtimelinking=no
>-        exp_sym_flag='-Bexport'
>-        no_entry_flag=""
>-      else
>-        # If we're using GNU nm, then we don't want the "-C" option.
>-        # -C means demangle to AIX nm, but means don't demangle with GNU nm
>-        if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
>-          export_symbols_cmds_F77='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
>-        else
>-          export_symbols_cmds_F77='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
>-        fi
>-        aix_use_runtimelinking=no
>-
>-        # Test if we are trying to use run time linking or normal
>-        # AIX style linking. If -brtl is somewhere in LDFLAGS, we
>-        # need to do runtime linking.
>-        case $host_os in aix4.[23]|aix4.[23].*|aix5*)
>-          for ld_flag in $LDFLAGS; do
>-          if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
>-            aix_use_runtimelinking=yes
>-            break
>-          fi
>-          done
>-        esac
>-
>-        exp_sym_flag='-bexport'
>-        no_entry_flag='-bnoentry'
>-      fi
>-
>-      # When large executables or shared objects are built, AIX ld can
>-      # have problems creating the table of contents.  If linking a library
>-      # or program results in "error TOC overflow" add -mminimal-toc to
>-      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
>-      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
>-
>-      archive_cmds_F77=''
>-      hardcode_direct_F77=yes
>-      hardcode_libdir_separator_F77=':'
>-      link_all_deplibs_F77=yes
>-
>-      if test "$GCC" = yes; then
>-        case $host_os in aix4.012|aix4.012.*)
>-        # We only want to do this on AIX 4.2 and lower, the check
>-        # below for broken collect2 doesn't work under 4.3+
>-          collect2name=`${CC} -print-prog-name=collect2`
>-          if test -f "$collect2name" && \
>-           strings "$collect2name" | grep resolve_lib_name >/dev/null
>-          then
>-          # We have reworked collect2
>-          hardcode_direct_F77=yes
>-          else
>-          # We have old collect2
>-          hardcode_direct_F77=unsupported
>-          # It fails to find uninstalled libraries when the uninstalled
>-          # path is not listed in the libpath.  Setting hardcode_minus_L
>-          # to unsupported forces relinking
>-          hardcode_minus_L_F77=yes
>-          hardcode_libdir_flag_spec_F77='-L$libdir'
>-          hardcode_libdir_separator_F77=
>-          fi
>-        esac
>-        shared_flag='-shared'
>-      else
>-        # not using gcc
>-        if test "$host_cpu" = ia64; then
>-        # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
>-        # chokes on -Wl,-G. The following line is correct:
>-          shared_flag='-G'
>-        else
>-        if test "$aix_use_runtimelinking" = yes; then
>-            shared_flag='${wl}-G'
>-          else
>-            shared_flag='${wl}-bM:SRE'
>-        fi
>-        fi
>-      fi
>-
>-      # It seems that -bexpall does not export symbols beginning with
>-      # underscore (_), so it is better to generate a list of symbols to export.
>-      always_export_symbols_F77=yes
>-      if test "$aix_use_runtimelinking" = yes; then
>-        # Warning - without using the other runtime loading flags (-brtl),
>-        # -berok will link without error, but may produce a broken library.
>-        allow_undefined_flag_F77='-berok'
>-       # Determine the default libpath from the value encoded in an empty executable.
>-       cat >conftest.$ac_ext <<_ACEOF
>-      program main
>+      # It seems that -bexpall does not export symbols beginning with
>+      # underscore (_), so it is better to generate a list of symbols to export.
>+      always_export_symbols_F77=yes
>+      if test "$aix_use_runtimelinking" = yes; then
>+        # Warning - without using the other runtime loading flags (-brtl),
>+        # -berok will link without error, but may produce a broken library.
>+        allow_undefined_flag_F77='-berok'
>+       # Determine the default libpath from the value encoded in an empty executable.
>+       cat >conftest.$ac_ext <<_ACEOF
>+      program main
> 
>       end
> _ACEOF
> rm -f conftest.$ac_objext conftest$ac_exeext
>@@ -14020,14 +13908,14 @@
>       conftest$ac_exeext conftest.$ac_ext
> if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
> 
>        hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
>-        archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
>+        archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
>        else
>         if test "$host_cpu" = ia64; then
>           hardcode_libdir_flag_spec_F77='${wl}-R $libdir:/usr/lib:/lib'
>           allow_undefined_flag_F77="-z nodefs"
>-          archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
>+          archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
>         else
>          # Determine the default libpath from the value encoded in an empty executable.
>          cat >conftest.$ac_ext <<_ACEOF
>       program main
>@@ -14075,15 +13963,13 @@
>           # Warning - without using the other run time loading flags,
>           # -berok will link without error, but may produce a broken library.
>           no_undefined_flag_F77=' ${wl}-bernotok'
>           allow_undefined_flag_F77=' ${wl}-berok'
>-          # -bexpall does not export symbols beginning with underscore (_)
>-          always_export_symbols_F77=yes
>           # Exported symbols can be pulled into shared objects from archives
>-          whole_archive_flag_spec_F77=' '
>+          whole_archive_flag_spec_F77='$convenience'
>           archive_cmds_need_lc_F77=yes
>-          # This is similar to how AIX traditionally builds it's shared libraries.
>-          archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
>+          # This is similar to how AIX traditionally builds its shared libraries.
>+          archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
>         fi
>       fi
>       ;;
> 
>@@ -14094,9 +13980,9 @@
>       # see comment about different semantics on the GNU ld section
>       ld_shlibs_F77=no
>       ;;
> 
>-    bsdi4*)
>+    bsdi[45]*)
>       export_dynamic_flag_spec_F77=-rdynamic
>       ;;
> 
>     cygwin* | mingw* | pw32*)
>@@ -14115,59 +14001,59 @@
>       # The linker will automatically build a .lib file if we build a DLL.
>       old_archive_From_new_cmds_F77='true'
>       # FIXME: Should let the user specify the lib program.
>       old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs'
>-      fix_srcfile_path='`cygpath -w "$srcfile"`'
>+      fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
>       enable_shared_with_static_runtimes_F77=yes
>       ;;
> 
>     darwin* | rhapsody*)
>-    if test "$GXX" = yes ; then
>-      archive_cmds_need_lc_F77=no
>-      case "$host_os" in
>+      case $host_os in
>       rhapsody* | darwin1.[012])
>-        allow_undefined_flag_F77='-undefined suppress'
>+         allow_undefined_flag_F77='${wl}-undefined ${wl}suppress'
>         ;;
>       *) # Darwin 1.3 on
>       if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
>-        allow_undefined_flag_F77='-flat_namespace -undefined suppress'
>+           allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
>       else
>         case ${MACOSX_DEPLOYMENT_TARGET} in
>           10.[012])
>-            allow_undefined_flag_F77='-flat_namespace -undefined suppress'
>+               allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
>             ;;
>           10.*)
>-            allow_undefined_flag_F77='-undefined dynamic_lookup'
>+               allow_undefined_flag_F77='${wl}-undefined ${wl}dynamic_lookup'
>             ;;
>         esac
>       fi
>         ;;
>       esac
>-        lt_int_apple_cc_single_mod=no
>-        output_verbose_link_cmd='echo'
>-        if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
>-          lt_int_apple_cc_single_mod=yes
>-        fi
>-        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
>-          archive_cmds_F77='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
>-        else
>-        archive_cmds_F77='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
>-      fi
>-      module_cmds_F77='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
>-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
>-        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
>-          archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
>-        else
>-          archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
>-        fi
>-          module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
>+      archive_cmds_need_lc_F77=no
>       hardcode_direct_F77=no
>       hardcode_automatic_F77=yes
>       hardcode_shlibpath_var_F77=unsupported
>-      whole_archive_flag_spec_F77='-all_load $convenience'
>+      whole_archive_flag_spec_F77=''
>       link_all_deplibs_F77=yes
>+    if test "$GCC" = yes ; then
>+        output_verbose_link_cmd='echo'
>+        archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
>+      module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
>+      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
>+      archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
>+      module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
>     else
>+      case $cc_basename in
>+        xlc*)
>+         output_verbose_link_cmd='echo'
>+         archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
>+         module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
>+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
>+         archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
>+          module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
>+          ;;
>+       *)
>       ld_shlibs_F77=no
>+          ;;
>+      esac
>     fi
>       ;;
> 
>     dgux*)
>@@ -14199,9 +14085,9 @@
>       hardcode_shlibpath_var_F77=no
>       ;;
> 
>     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
>-    freebsd* | kfreebsd*-gnu)
>+    freebsd* | kfreebsd*-gnu | dragonfly*)
>       archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
>       hardcode_libdir_flag_spec_F77='-R$libdir'
>       hardcode_direct_F77=yes
>       hardcode_shlibpath_var_F77=no
>@@ -14222,49 +14108,64 @@
>       hardcode_minus_L_F77=yes
>       export_dynamic_flag_spec_F77='${wl}-E'
>       ;;
> 
>-    hpux10* | hpux11*)
>+    hpux10*)
>       if test "$GCC" = yes -a "$with_gnu_ld" = no; then
>-        case "$host_cpu" in
>-        hppa*64*|ia64*)
>+        archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
>+      else
>+        archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
>+      fi
>+      if test "$with_gnu_ld" = no; then
>+        hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
>+        hardcode_libdir_separator_F77=:
>+
>+        hardcode_direct_F77=yes
>+        export_dynamic_flag_spec_F77='${wl}-E'
>+
>+        # hardcode_minus_L: Not really in the search PATH,
>+        # but as the default location of the library.
>+        hardcode_minus_L_F77=yes
>+      fi
>+      ;;
>+
>+    hpux11*)
>+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
>+        case $host_cpu in
>+        hppa*64*)
>           archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
>           ;;
>+        ia64*)
>+          archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
>+          ;;
>         *)
>           archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
>           ;;
>         esac
>       else
>-        case "$host_cpu" in
>-        hppa*64*|ia64*)
>-          archive_cmds_F77='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
>+        case $host_cpu in
>+        hppa*64*)
>+          archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
>+          ;;
>+        ia64*)
>+          archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
>           ;;
>         *)
>-          archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
>+          archive_cmds_F77='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
>           ;;
>         esac
>       fi
>       if test "$with_gnu_ld" = no; then
>-        case "$host_cpu" in
>-        hppa*64*)
>           hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
>-          hardcode_libdir_flag_spec_ld_F77='+b $libdir'
>           hardcode_libdir_separator_F77=:
>+
>+        case $host_cpu in
>+        hppa*64*|ia64*)
>+          hardcode_libdir_flag_spec_ld_F77='+b $libdir'
>           hardcode_direct_F77=no
>           hardcode_shlibpath_var_F77=no
>           ;;
>-        ia64*)
>-          hardcode_libdir_flag_spec_F77='-L$libdir'
>-          hardcode_direct_F77=no
>-          hardcode_shlibpath_var_F77=no
>-
>-          # hardcode_minus_L: Not really in the search PATH,
>-          # but as the default location of the library.
>-          hardcode_minus_L_F77=yes
>-          ;;
>         *)
>-          hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
>-          hardcode_libdir_separator_F77=:
>           hardcode_direct_F77=yes
>           export_dynamic_flag_spec_F77='${wl}-E'
> 
>           # hardcode_minus_L: Not really in the search PATH,
>@@ -14310,8 +14211,9 @@
>       hardcode_direct_F77=yes
>       hardcode_shlibpath_var_F77=no
>       if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
>         archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
>+        archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
>         hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
>         export_dynamic_flag_spec_F77='${wl}-E'
>       else
>        case $host_os in
>@@ -14355,41 +14257,45 @@
>       else
>         allow_undefined_flag_F77=' -expect_unresolved \*'
>         archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
>         archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
>-        $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
>+        $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
> 
>         # Both c and cxx compiler support -rpath directly
>         hardcode_libdir_flag_spec_F77='-rpath $libdir'
>       fi
>       hardcode_libdir_separator_F77=:
>       ;;
> 
>-    sco3.2v5*)
>-      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
>-      hardcode_shlibpath_var_F77=no
>-      export_dynamic_flag_spec_F77='${wl}-Bexport'
>-      runpath_var=LD_RUN_PATH
>-      hardcode_runpath_var=yes
>-      ;;
>-
>     solaris*)
>       no_undefined_flag_F77=' -z text'
>       if test "$GCC" = yes; then
>+        wlarc='${wl}'
>         archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
>         archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
>           $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
>       else
>+        wlarc=''
>         archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
>         archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
>         $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
>       fi
>       hardcode_libdir_flag_spec_F77='-R$libdir'
>       hardcode_shlibpath_var_F77=no
>       case $host_os in
>       solaris2.[0-5] | solaris2.[0-5].*) ;;
>-      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
>+      *)
>+        # The compiler driver will combine linker options so we
>+        # cannot just pass the convience library names through
>+        # without $wl, iff we do not link with $LD.
>+        # Luckily, gcc supports the same syntax we need for Sun Studio.
>+        # Supported since Solaris 2.6 (maybe 2.5.1?)
>+        case $wlarc in
>+        '')
>         whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;;
>+        *)
>+          whole_archive_flag_spec_F77='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
>+        esac ;;
>       esac
>       link_all_deplibs_F77=yes
>       ;;
> 
>@@ -14444,39 +14350,48 @@
>         ld_shlibs_F77=yes
>       fi
>       ;;
> 
>-    sysv4.2uw2*)
>-      archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags'
>-      hardcode_direct_F77=yes
>-      hardcode_minus_L_F77=no
>+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
>+      no_undefined_flag_F77='${wl}-z,text'
>+      archive_cmds_need_lc_F77=no
>       hardcode_shlibpath_var_F77=no
>-      hardcode_runpath_var=yes
>-      runpath_var=LD_RUN_PATH
>-      ;;
>+      runpath_var='LD_RUN_PATH'
> 
>-   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
>-      no_undefined_flag_F77='${wl}-z ${wl}text'
>       if test "$GCC" = yes; then
>-        archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
>+        archive_cmds_F77='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
>+        archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
>       else
>-        archive_cmds_F77='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
>+        archive_cmds_F77='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
>+        archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
>       fi
>-      runpath_var='LD_RUN_PATH'
>-      hardcode_shlibpath_var_F77=no
>       ;;
> 
>-    sysv5*)
>-      no_undefined_flag_F77=' -z text'
>-      # $CC -shared without GNU ld will not create a library from C++
>-      # object files and a static libstdc++, better avoid it by now
>-      archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
>-      archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
>-                $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
>-      hardcode_libdir_flag_spec_F77=
>+    sysv5* | sco3.2v5* | sco5v6*)
>+      # Note: We can NOT use -z defs as we might desire, because we do not
>+      # link with -lc, and that would cause any symbols used from libc to
>+      # always be unresolved, which means just about no library would
>+      # ever link correctly.  If we're not using GNU ld we use -z text
>+      # though, which does catch some bad symbols but isn't as heavy-handed
>+      # as -z defs.
>+      no_undefined_flag_F77='${wl}-z,text'
>+      allow_undefined_flag_F77='${wl}-z,nodefs'
>+      archive_cmds_need_lc_F77=no
>       hardcode_shlibpath_var_F77=no
>+      hardcode_libdir_flag_spec_F77='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
>+      hardcode_libdir_separator_F77=':'
>+      link_all_deplibs_F77=yes
>+      export_dynamic_flag_spec_F77='${wl}-Bexport'
>       runpath_var='LD_RUN_PATH'
>-      ;;
>+
>+      if test "$GCC" = yes; then
>+        archive_cmds_F77='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
>+        archive_expsym_cmds_F77='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
>+      else
>+        archive_cmds_F77='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
>+        archive_expsym_cmds_F77='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
>+      fi
>+      ;;
> 
>     uts4*)
>       archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
>       hardcode_libdir_flag_spec_F77='-L$libdir'
>@@ -14492,13 +14407,8 @@
> echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
> echo "${ECHO_T}$ld_shlibs_F77" >&6
> test "$ld_shlibs_F77" = no && can_build_shared=no
> 
>-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
>-if test "$GCC" = yes; then
>-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
>-fi
>-
> #
> # Do we need to explicitly link libc?
> #
> case "x$archive_cmds_need_lc_F77" in
>@@ -14529,8 +14439,9 @@
>         lib=conftest
>         libobjs=conftest.$ac_objext
>         deplibs=
>         wl=$lt_prog_compiler_wl_F77
>+        pic_flag=$lt_prog_compiler_pic_F77
>         compiler_flags=-v
>         linker_flags=-v
>         verstring=
>         output_objdir=.
>@@ -14661,9 +14572,9 @@
>   dynamic_linker="$host_os ld.so"
>   shlibpath_var=LIBRARY_PATH
>   ;;
> 
>-bsdi4*)
>+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'
>@@ -14689,9 +14600,10 @@
>     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'
>+      $install_prog $dir/$dlname \$dldir/$dlname~
>+      chmod a+x \$dldir/$dlname'
>     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
>       dlpath=$dir/\$dldll~
>        $rm \$dlpath'
>     shlibpath_overrides_runpath=yes
>@@ -14719,9 +14631,9 @@
>       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}'
>+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
>       ;;
>     esac
>     ;;
> 
>@@ -14742,9 +14654,9 @@
>   library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
>   soname_spec='${libname}${release}${major}$shared_ext'
>   shlibpath_overrides_runpath=yes
>   shlibpath_var=DYLD_LIBRARY_PATH
>-  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
>+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
>   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
>   if test "$GCC" = yes; then
>     sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
>   else
>@@ -14777,10 +14689,19 @@
>   hardcode_into_libs=yes
>   dynamic_linker='GNU ld.so'
>   ;;
> 
>-freebsd*)
>-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
>+freebsd* | dragonfly*)
>+  # DragonFly does not have aout.  When/if they implement a new
>+  # versioning mechanism, adjust this.
>+  if test -x /usr/bin/objformat; then
>+    objformat=`/usr/bin/objformat`
>+  else
>+    case $host_os in
>+    freebsd[123]*) objformat=aout ;;
>+    *) objformat=elf ;;
>+    esac
>+  fi
>   version_type=freebsd-$objformat
>   case $version_type in
>     freebsd-elf*)
>       library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
>@@ -14796,16 +14717,21 @@
>   case $host_os in
>   freebsd2*)
>     shlibpath_overrides_runpath=yes
>     ;;
>-  freebsd3.01* | freebsdelf3.01*)
>+  freebsd3.[01]* | freebsdelf3.[01]*)
>     shlibpath_overrides_runpath=yes
>     hardcode_into_libs=yes
>     ;;
>-  *) # from 3.2 on
>+  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
>+  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
>     shlibpath_overrides_runpath=no
>     hardcode_into_libs=yes
>     ;;
>+  freebsd*) # from 4.6 on
>+    shlibpath_overrides_runpath=yes
>+    hardcode_into_libs=yes
>+    ;;
>   esac
>   ;;
> 
> gnu*)
>@@ -14823,9 +14749,9 @@
>   # link against other versions.
>   version_type=sunos
>   need_lib_prefix=no
>   need_version=no
>-  case "$host_cpu" in
>+  case $host_cpu in
>   ia64*)
>     shrext_cmds='.so'
>     hardcode_into_libs=yes
>     dynamic_linker="$host_os dld.so"
>@@ -14863,8 +14789,20 @@
>   # HP-UX runs *really* slowly unless shared libraries are mode 555.
>   postinstall_cmds='chmod 555 $lib'
>   ;;
> 
>+interix3*)
>+  version_type=linux
>+  need_lib_prefix=no
>+  need_version=no
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  shlibpath_overrides_runpath=no
>+  hardcode_into_libs=yes
>+  ;;
>+
> irix5* | irix6* | nonstopux*)
>   case $host_os in
>     nonstopux*) version_type=nonstopux ;;
>     *)
>@@ -14920,33 +14858,12 @@
>   # Some rework will be needed to allow for fast_install
>   # before this can be enabled.
>   hardcode_into_libs=yes
> 
>-  # find out which ABI we are using
>-  libsuff=
>-  case "$host_cpu" in
>-  x86_64*|s390x*|powerpc64*)
>-    echo '#line 14928 "configure"' > conftest.$ac_ext
>-    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
>-  (eval $ac_compile) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; then
>-      case `/usr/bin/file conftest.$ac_objext` in
>-      *64-bit*)
>-        libsuff=64
>-        sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
>-        ;;
>-      esac
>-    fi
>-    rm -rf conftest*
>-    ;;
>-  esac
>-
>   # Append ld.so.conf contents to the search path
>   if test -f /etc/ld.so.conf; then
>-    lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
>-    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
>+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,        ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
>+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
>   fi
> 
>   # We used to test for /lib/ld.so.1 and disable shared libraries on
>   # powerpc, because MkLinux only supported shared libraries with the
>@@ -15005,10 +14922,15 @@
>   ;;
> 
> openbsd*)
>   version_type=sunos
>+  sys_lib_dlsearch_path_spec="/usr/lib"
>   need_lib_prefix=no
>-  need_version=yes
>+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
>+  case $host_os in
>+    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
>+    *)                         need_version=no  ;;
>+  esac
>   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
>   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
>   shlibpath_var=LD_LIBRARY_PATH
>   if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
>@@ -15044,15 +14966,8 @@
>   sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
>   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
>   ;;
> 
>-sco3.2v5*)
>-  version_type=osf
>-  soname_spec='${libname}${release}${shared_ext}$major'
>-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>-  shlibpath_var=LD_LIBRARY_PATH
>-  ;;
>-
> solaris*)
>   version_type=linux
>   need_lib_prefix=no
>   need_version=no
>@@ -15076,9 +14991,9 @@
>   fi
>   need_version=yes
>   ;;
> 
>-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
>+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
>@@ -15109,8 +15024,31 @@
>     shlibpath_var=LD_LIBRARY_PATH
>   fi
>   ;;
> 
>+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
>+  version_type=freebsd-elf
>+  need_lib_prefix=no
>+  need_version=no
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  hardcode_into_libs=yes
>+  if test "$with_gnu_ld" = yes; then
>+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
>+    shlibpath_overrides_runpath=no
>+  else
>+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
>+    shlibpath_overrides_runpath=yes
>+    case $host_os in
>+      sco3.2v5*)
>+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
>+        ;;
>+    esac
>+  fi
>+  sys_lib_dlsearch_path_spec='/usr/lib'
>+  ;;
>+
> uts4*)
>   version_type=linux
>   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>   soname_spec='${libname}${release}${shared_ext}$major'
>@@ -15124,13 +15062,18 @@
> echo "$as_me:$LINENO: result: $dynamic_linker" >&5
> echo "${ECHO_T}$dynamic_linker" >&6
> test "$dynamic_linker" = no && can_build_shared=no
> 
>+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
>+if test "$GCC" = yes; then
>+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
>+fi
>+
> echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
> echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
> hardcode_action_F77=
> if test -n "$hardcode_libdir_flag_spec_F77" || \
>-   test -n "$runpath_var F77" || \
>+   test -n "$runpath_var_F77" || \
>    test "X$hardcode_automatic_F77"="Xyes" ; then
> 
>   # We can hardcode non-existant directories.
>   if test "$hardcode_direct_F77" != no &&
>@@ -15161,38 +15104,8 @@
>   # Fast installation is not necessary
>   enable_fast_install=needless
> fi
> 
>-striplib=
>-old_striplib=
>-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
>-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
>-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
>-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
>-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
>-  echo "$as_me:$LINENO: result: yes" >&5
>-echo "${ECHO_T}yes" >&6
>-else
>-# FIXME - insert some real tests, host_os isn't really good enough
>-  case $host_os in
>-   darwin*)
>-       if test -n "$STRIP" ; then
>-         striplib="$STRIP -x"
>-         echo "$as_me:$LINENO: result: yes" >&5
>-echo "${ECHO_T}yes" >&6
>-       else
>-  echo "$as_me:$LINENO: result: no" >&5
>-echo "${ECHO_T}no" >&6
>-fi
>-       ;;
>-   *)
>-  echo "$as_me:$LINENO: result: no" >&5
>-echo "${ECHO_T}no" >&6
>-    ;;
>-  esac
>-fi
>-
>-
> 
> # The else clause should only fire when bootstrapping the
> # libtool distribution, otherwise you forgot to ship ltmain.sh
> # with your package, and you will get complaints that there are
>@@ -15205,9 +15118,9 @@
>   fi
>   # Now quote all the things that may contain metacharacters while being
>   # careful not to overquote the AC_SUBSTed values.  We take copies of the
>   # variables and quote the copies for generation of the libtool script.
>-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
>+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
>     SED SHELL STRIP \
>     libname_spec library_names_spec soname_spec extract_expsyms_cmds \
>     old_striplib striplib file_magic_cmd finish_cmds finish_eval \
>     deplibs_check_method reload_flag reload_cmds need_locks \
>@@ -15306,8 +15219,14 @@
> 
> # The host system.
> host_alias=$host_alias
> host=$host
>+host_os=$host_os
>+
>+# The build system.
>+build_alias=$build_alias
>+build=$build
>+build_os=$build_os
> 
> # An echo program that does not interpret backslashes.
> echo=$lt_echo
> 
>@@ -15317,8 +15236,11 @@
> 
> # A C compiler.
> LTCC=$lt_LTCC
> 
>+# LTCC compiler flags.
>+LTCFLAGS=$lt_LTCFLAGS
>+
> # A language-specific compiler.
> CC=$lt_compiler_F77
> 
> # Is the compiler the GNU C compiler?
>@@ -15620,28 +15542,57 @@
> # Code to be used in simple compile tests
> lt_simple_compile_test_code="class foo {}\n"
> 
> # Code to be used in simple link tests
>-lt_simple_link_test_code='public class conftest { public static void main(String argv) {}; }\n'
>+lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
> 
> # ltmain only uses $CC for tagged configurations so make sure $CC is set.
> 
> # If no C compiler was specified, use CC.
> LTCC=${LTCC-"$CC"}
> 
>+# If no C compiler flags were specified, use CFLAGS.
>+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
>+
> # Allow CC to be a program name with arguments.
> compiler=$CC
> 
> 
>+# save warnings/boilerplate of simple test code
>+ac_outfile=conftest.$ac_objext
>+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
>+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
>+_lt_compiler_boilerplate=`cat conftest.err`
>+$rm conftest*
>+
>+ac_outfile=conftest.$ac_objext
>+printf "$lt_simple_link_test_code" >conftest.$ac_ext
>+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
>+_lt_linker_boilerplate=`cat conftest.err`
>+$rm conftest*
>+
>+
> # Allow CC to be a program name with arguments.
> lt_save_CC="$CC"
> CC=${GCJ-"gcj"}
> compiler=$CC
> compiler_GCJ=$CC
>+for cc_temp in $compiler""; do
>+  case $cc_temp in
>+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
>+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
>+    \-*) ;;
>+    *) break;;
>+  esac
>+done
>+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
>+
> 
> # GCJ did not exist at the time GCC didn't implicitly link libc in.
> archive_cmds_need_lc_GCJ=no
> 
>+old_archive_cmds_GCJ=$old_archive_cmds
>+
> 
> lt_prog_compiler_no_builtin_flag_GCJ=
> 
> if test "$GCC" = yes; then
>@@ -15662,20 +15613,22 @@
>    # Note that $ac_compile itself does not contain backslashes and begins
>    # with a dollar sign (not a hyphen), so the echo should work correctly.
>    # The option is referenced via a variable to avoid confusing sed.
>    lt_compile=`echo "$ac_compile" | $SED \
>-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
>+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
>    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
>    -e 's:$: $lt_compiler_flag:'`
>-   (eval echo "\"\$as_me:15669: $lt_compile\"" >&5)
>+   (eval echo "\"\$as_me:15620: $lt_compile\"" >&5)
>    (eval "$lt_compile" 2>conftest.err)
>    ac_status=$?
>    cat conftest.err >&5
>-   echo "$as_me:15673: \$? = $ac_status" >&5
>+   echo "$as_me:15624: \$? = $ac_status" >&5
>    if (exit $ac_status) && test -s "$ac_outfile"; then
>      # The compiler can only warn and ignore the option if not recognized
>-     # So say no if there are warnings
>-     if test ! -s conftest.err; then
>+     # So say no if there are warnings other than the usual output.
>+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
>+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
>+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
>        lt_cv_prog_compiler_rtti_exceptions=yes
>      fi
>    fi
>    $rm conftest*
>@@ -15734,8 +15687,13 @@
>       # Common symbols not allowed in MH_DYLIB files
>       lt_prog_compiler_pic_GCJ='-fno-common'
>       ;;
> 
>+    interix3*)
>+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
>+      # Instead, we relocate shared libraries at runtime.
>+      ;;
>+
>     msdosdjgpp*)
>       # Just because we use GCC doesn't mean we suddenly get shared libraries
>       # on systems that don't support them.
>       lt_prog_compiler_can_build_shared_GCJ=no
>@@ -15750,9 +15708,9 @@
> 
>     hpux*)
>       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
>       # not for PA HP-UX.
>-      case "$host_cpu" in
>+      case $host_cpu in
>       hppa*64*|ia64*)
>         # +Z the default
>         ;;
>       *)
>@@ -15776,8 +15734,18 @@
>       else
>         lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
>       fi
>       ;;
>+      darwin*)
>+        # PIC is the default on this platform
>+        # Common symbols not allowed in MH_DYLIB files
>+       case $cc_basename in
>+         xlc*)
>+         lt_prog_compiler_pic_GCJ='-qnocommon'
>+         lt_prog_compiler_wl_GCJ='-Wl,'
>+         ;;
>+       esac
>+       ;;
> 
>     mingw* | pw32* | os2*)
>       # This hack is so that the source file can tell whether it is being
>       # built for inclusion in a dll (and should export symbols for example).
>@@ -15787,9 +15755,9 @@
>     hpux9* | hpux10* | hpux11*)
>       lt_prog_compiler_wl_GCJ='-Wl,'
>       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
>       # not for PA HP-UX.
>-      case "$host_cpu" in
>+      case $host_cpu in
>       hppa*64*|ia64*)
>         # +Z the default
>         ;;
>       *)
>@@ -15811,14 +15779,21 @@
>       lt_prog_compiler_static_GCJ='-Bstatic'
>       ;;
> 
>     linux*)
>-      case $CC in
>+      case $cc_basename in
>       icc* | ecc*)
>         lt_prog_compiler_wl_GCJ='-Wl,'
>         lt_prog_compiler_pic_GCJ='-KPIC'
>         lt_prog_compiler_static_GCJ='-static'
>         ;;
>+      pgcc* | pgf77* | pgf90* | pgf95*)
>+        # Portland Group compilers (*not* the Pentium gcc compiler,
>+        # which looks to be a dead project)
>+        lt_prog_compiler_wl_GCJ='-Wl,'
>+        lt_prog_compiler_pic_GCJ='-fpic'
>+        lt_prog_compiler_static_GCJ='-Bstatic'
>+        ;;
>       ccc*)
>         lt_prog_compiler_wl_GCJ='-Wl,'
>         # All Alpha code is PIC.
>         lt_prog_compiler_static_GCJ='-non_shared'
>@@ -15831,26 +15806,26 @@
>       # All OSF/1 code is PIC.
>       lt_prog_compiler_static_GCJ='-non_shared'
>       ;;
> 
>-    sco3.2v5*)
>-      lt_prog_compiler_pic_GCJ='-Kpic'
>-      lt_prog_compiler_static_GCJ='-dn'
>-      ;;
>-
>     solaris*)
>-      lt_prog_compiler_wl_GCJ='-Wl,'
>       lt_prog_compiler_pic_GCJ='-KPIC'
>       lt_prog_compiler_static_GCJ='-Bstatic'
>+      case $cc_basename in
>+      f77* | f90* | f95*)
>+        lt_prog_compiler_wl_GCJ='-Qoption ld ';;
>+      *)
>+        lt_prog_compiler_wl_GCJ='-Wl,';;
>+      esac
>       ;;
> 
>     sunos4*)
>       lt_prog_compiler_wl_GCJ='-Qoption ld '
>       lt_prog_compiler_pic_GCJ='-PIC'
>       lt_prog_compiler_static_GCJ='-Bstatic'
>       ;;
> 
>-    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
>+    sysv4 | sysv4.2uw2* | sysv4.3*)
>       lt_prog_compiler_wl_GCJ='-Wl,'
>       lt_prog_compiler_pic_GCJ='-KPIC'
>       lt_prog_compiler_static_GCJ='-Bstatic'
>       ;;
>@@ -15861,8 +15836,19 @@
>         lt_prog_compiler_static_GCJ='-Bstatic'
>       fi
>       ;;
> 
>+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
>+      lt_prog_compiler_wl_GCJ='-Wl,'
>+      lt_prog_compiler_pic_GCJ='-KPIC'
>+      lt_prog_compiler_static_GCJ='-Bstatic'
>+      ;;
>+
>+    unicos*)
>+      lt_prog_compiler_wl_GCJ='-Wl,'
>+      lt_prog_compiler_can_build_shared_GCJ=no
>+      ;;
>+
>     uts4*)
>       lt_prog_compiler_pic_GCJ='-pic'
>       lt_prog_compiler_static_GCJ='-Bstatic'
>       ;;
>@@ -15895,20 +15881,22 @@
>    # Note that $ac_compile itself does not contain backslashes and begins
>    # with a dollar sign (not a hyphen), so the echo should work correctly.
>    # The option is referenced via a variable to avoid confusing sed.
>    lt_compile=`echo "$ac_compile" | $SED \
>-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
>+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
>    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
>    -e 's:$: $lt_compiler_flag:'`
>-   (eval echo "\"\$as_me:15902: $lt_compile\"" >&5)
>+   (eval echo "\"\$as_me:15888: $lt_compile\"" >&5)
>    (eval "$lt_compile" 2>conftest.err)
>    ac_status=$?
>    cat conftest.err >&5
>-   echo "$as_me:15906: \$? = $ac_status" >&5
>+   echo "$as_me:15892: \$? = $ac_status" >&5
>    if (exit $ac_status) && test -s "$ac_outfile"; then
>      # The compiler can only warn and ignore the option if not recognized
>-     # So say no if there are warnings
>-     if test ! -s conftest.err; then
>+     # So say no if there are warnings other than the usual output.
>+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
>+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
>+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
>        lt_prog_compiler_pic_works_GCJ=yes
>      fi
>    fi
>    $rm conftest*
>@@ -15927,9 +15915,9 @@
>      lt_prog_compiler_can_build_shared_GCJ=no
> fi
> 
> fi
>-case "$host_os" in
>+case $host_os in
>   # For platforms which do not support PIC, -DPIC is meaningless:
>   *djgpp*)
>     lt_prog_compiler_pic_GCJ=
>     ;;
>@@ -15937,8 +15925,50 @@
>     lt_prog_compiler_pic_GCJ="$lt_prog_compiler_pic_GCJ"
>     ;;
> esac
> 
>+#
>+# Check to make sure the static flag actually works.
>+#
>+wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
>+echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
>+echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6
>+if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then
>+  echo $ECHO_N "(cached) $ECHO_C" >&6
>+else
>+  lt_prog_compiler_static_works_GCJ=no
>+   save_LDFLAGS="$LDFLAGS"
>+   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
>+   printf "$lt_simple_link_test_code" > conftest.$ac_ext
>+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
>+     # The linker can only warn and ignore the option if not recognized
>+     # So say no if there are warnings
>+     if test -s conftest.err; then
>+       # Append any errors to the config.log.
>+       cat conftest.err 1>&5
>+       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
>+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
>+       if diff conftest.exp conftest.er2 >/dev/null; then
>+         lt_prog_compiler_static_works_GCJ=yes
>+       fi
>+     else
>+       lt_prog_compiler_static_works_GCJ=yes
>+     fi
>+   fi
>+   $rm conftest*
>+   LDFLAGS="$save_LDFLAGS"
>+
>+fi
>+echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5
>+echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6
>+
>+if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then
>+    :
>+else
>+    lt_prog_compiler_static_GCJ=
>+fi
>+
>+
> echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
> echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
> if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
>@@ -15955,25 +15985,27 @@
>    # (2) before a word containing "conftest.", or (3) at the end.
>    # Note that $ac_compile itself does not contain backslashes and begins
>    # with a dollar sign (not a hyphen), so the echo should work correctly.
>    lt_compile=`echo "$ac_compile" | $SED \
>-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
>+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
>    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
>    -e 's:$: $lt_compiler_flag:'`
>-   (eval echo "\"\$as_me:15962: $lt_compile\"" >&5)
>+   (eval echo "\"\$as_me:15992: $lt_compile\"" >&5)
>    (eval "$lt_compile" 2>out/conftest.err)
>    ac_status=$?
>    cat out/conftest.err >&5
>-   echo "$as_me:15966: \$? = $ac_status" >&5
>+   echo "$as_me:15996: \$? = $ac_status" >&5
>    if (exit $ac_status) && test -s out/conftest2.$ac_objext
>    then
>      # The compiler can only warn and ignore the option if not recognized
>      # So say no if there are warnings
>-     if test ! -s out/conftest.err; then
>+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
>+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
>+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
>        lt_cv_prog_compiler_c_o_GCJ=yes
>      fi
>    fi
>-   chmod u+w .
>+   chmod u+w . 2>&5
>    $rm conftest*
>    # SGI C++ compiler will create directory out/ii_files/ for
>    # template instantiation
>    test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
>@@ -16047,8 +16079,18 @@
>   # the symbol is explicitly referenced.  Since portable code cannot
>   # rely on this symbol name, it's probably fine to never include it in
>   # preloaded symbol tables.
>   extract_expsyms_cmds=
>+  # Just being paranoid about ensuring that cc_basename is set.
>+  for cc_temp in $compiler""; do
>+  case $cc_temp in
>+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
>+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
>+    \-*) ;;
>+    *) break;;
>+  esac
>+done
>+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
> 
>   case $host_os in
>   cygwin* | mingw* | pw32*)
>     # FIXME: the MSVC++ port hasn't been tested in a loooong time
>@@ -16057,8 +16099,12 @@
>     if test "$GCC" != yes; then
>       with_gnu_ld=no
>     fi
>     ;;
>+  interix*)
>+    # we just hope/assume this is gcc and not c89 (= MSVC++)
>+    with_gnu_ld=yes
>+    ;;
>   openbsd*)
>     with_gnu_ld=no
>     ;;
>   esac
>@@ -16067,8 +16113,29 @@
>   if test "$with_gnu_ld" = yes; then
>     # If archive_cmds runs LD, not CC, wlarc should be empty
>     wlarc='${wl}'
> 
>+    # Set some defaults for GNU ld with shared library support. These
>+    # are reset later if shared libraries are not supported. Putting them
>+    # here allows them to be overridden if necessary.
>+    runpath_var=LD_RUN_PATH
>+    hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir'
>+    export_dynamic_flag_spec_GCJ='${wl}--export-dynamic'
>+    # ancient GNU ld didn't support --whole-archive et. al.
>+    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
>+        whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
>+      else
>+        whole_archive_flag_spec_GCJ=
>+    fi
>+    supports_anon_versioning=no
>+    case `$LD -v 2>/dev/null` in
>+      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
>+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
>+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
>+      *\ 2.11.*) ;; # other 2.11 versions
>+      *) supports_anon_versioning=yes ;;
>+    esac
>+
>     # See if GNU ld supports shared libraries.
>     case $host_os in
>     aix3* | aix4* | aix5*)
>       # On AIX/PPC, the GNU linker is very broken
>@@ -16117,23 +16184,69 @@
>       hardcode_libdir_flag_spec_GCJ='-L$libdir'
>       allow_undefined_flag_GCJ=unsupported
>       always_export_symbols_GCJ=no
>       enable_shared_with_static_runtimes_GCJ=yes
>-      export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* $[^ ]*$/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
>+      export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* $[^ ]*$/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
> 
>       if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
>-        archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
>+        archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
>         # If the export-symbols file already is a .def file (1st line
>         # is EXPORTS), use it as is; otherwise, prepend...
>         archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
>           cp $export_symbols $output_objdir/$soname.def;
>         else
>           echo EXPORTS > $output_objdir/$soname.def;
>           cat $export_symbols >> $output_objdir/$soname.def;
>         fi~
>-        $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
>+        $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
>       else
>-        ld_shlibs=no
>+        ld_shlibs_GCJ=no
>+      fi
>+      ;;
>+
>+    interix3*)
>+      hardcode_direct_GCJ=no
>+      hardcode_shlibpath_var_GCJ=no
>+      hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
>+      export_dynamic_flag_spec_GCJ='${wl}-E'
>+      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
>+      # Instead, shared libraries are loaded at an image base (0x10000000 by
>+      # default) and relocated if they conflict, which is a slow very memory
>+      # consuming and fragmenting process.  To avoid this, we pick a random,
>+      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
>+      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
>+      archive_cmds_GCJ='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
>+      archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
>+      ;;
>+
>+    linux*)
>+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
>+        tmp_addflag=
>+        case $cc_basename,$host_cpu in
>+        pgcc*)                          # Portland Group C compiler
>+          whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
>+          tmp_addflag=' $pic_flag'
>+          ;;
>+        pgf77* | pgf90* | pgf95*)       # Portland Group f77 and f90 compilers
>+          whole_archive_flag_spec_GCJ='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
>+          tmp_addflag=' $pic_flag -Mnomain' ;;
>+        ecc*,ia64* | icc*,ia64*)                # Intel C compiler on ia64
>+          tmp_addflag=' -i_dynamic' ;;
>+        efc*,ia64* | ifort*,ia64*)      # Intel Fortran compiler on ia64
>+          tmp_addflag=' -i_dynamic -nofor_main' ;;
>+        ifc* | ifort*)                  # Intel Fortran compiler
>+          tmp_addflag=' -nofor_main' ;;
>+        esac
>+        archive_cmds_GCJ='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
>+
>+        if test $supports_anon_versioning = yes; then
>+          archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
>+  cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
>+  $echo "local: *; };" >> $output_objdir/$libname.ver~
>+          $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
>+        fi
>+      else
>+        ld_shlibs_GCJ=no
>       fi
>       ;;
> 
>     netbsd*)
>@@ -16145,9 +16258,9 @@
>         archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
>       fi
>       ;;
> 
>-    solaris* | sysv5*)
>+    solaris*)
>       if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
>         ld_shlibs_GCJ=no
>         cat <<EOF 1>&2
> 
>@@ -16166,41 +16279,43 @@
>         ld_shlibs_GCJ=no
>       fi
>       ;;
> 
>+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
>+      case `$LD -v 2>&1` in
>+        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
>+        ld_shlibs_GCJ=no
>+        cat <<_LT_EOF 1>&2
>+
>+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
>+*** reliably create shared libraries on SCO systems.  Therefore, libtool
>+*** is disabling shared libraries support.  We urge you to upgrade GNU
>+*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
>+*** your PATH or compiler configuration so that the native linker is
>+*** used, and then restart.
>+
>+_LT_EOF
>+        ;;
>+        *)
>+          if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
>+            hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
>+            archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
>+            archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
>+          else
>+            ld_shlibs_GCJ=no
>+          fi
>+        ;;
>+      esac
>+      ;;
>+
>     sunos4*)
>       archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
>       wlarc=
>       hardcode_direct_GCJ=yes
>       hardcode_shlibpath_var_GCJ=no
>       ;;
> 
>-  linux*)
>-    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
>-        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
>-        archive_cmds_GCJ="$tmp_archive_cmds"
>-      supports_anon_versioning=no
>-      case `$LD -v 2>/dev/null` in
>-        *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
>-        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
>-        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
>-        *\ 2.11.*) ;; # other 2.11 versions
>-        *) supports_anon_versioning=yes ;;
>-      esac
>-      if test $supports_anon_versioning = yes; then
>-        archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
>-cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~
>-$echo "local: *; };" >> $output_objdir/$libname.ver~
>-        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
>-      else
>-        archive_expsym_cmds_GCJ="$tmp_archive_cmds"
>-      fi
>-    else
>-      ld_shlibs_GCJ=no
>-    fi
>-    ;;
>-
>-    *)
>+    *)
>       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
>         archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
>         archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
>       else
>@@ -16208,19 +16323,14 @@
>       fi
>       ;;
>     esac
> 
>-    if test "$ld_shlibs_GCJ" = yes; then
>-      runpath_var=LD_RUN_PATH
>-      hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir'
>-      export_dynamic_flag_spec_GCJ='${wl}--export-dynamic'
>-      # ancient GNU ld didn't support --whole-archive et. al.
>-      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
>-        whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
>-      else
>+    if test "$ld_shlibs_GCJ" = no; then
>+      runpath_var=
>+      hardcode_libdir_flag_spec_GCJ=
>+      export_dynamic_flag_spec_GCJ=
>         whole_archive_flag_spec_GCJ=
>       fi
>-    fi
>   else
>     # PORTME fill in a description of your system's linker (not GNU ld)
>     case $host_os in
>     aix3*)
>@@ -16229,9 +16339,9 @@
>       archive_expsym_cmds_GCJ='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
>       # Note: this linker hardcodes the directories in LIBPATH if there
>       # are no directories specified by -L.
>       hardcode_minus_L_GCJ=yes
>-      if test "$GCC" = yes && test -z "$link_static_flag"; then
>+      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
>         # Neither direct hardcoding nor static linking is supported with a
>         # broken collect2.
>         hardcode_direct_GCJ=unsupported
>       fi
>@@ -16263,8 +16373,9 @@
>             aix_use_runtimelinking=yes
>             break
>           fi
>           done
>+          ;;
>         esac
> 
>         exp_sym_flag='-bexport'
>         no_entry_flag='-bnoentry'
>@@ -16281,9 +16392,9 @@
>       hardcode_libdir_separator_GCJ=':'
>       link_all_deplibs_GCJ=yes
> 
>       if test "$GCC" = yes; then
>-        case $host_os in aix4.012|aix4.012.*)
>+        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" && \
>@@ -16300,10 +16411,14 @@
>           hardcode_minus_L_GCJ=yes
>           hardcode_libdir_flag_spec_GCJ='-L$libdir'
>           hardcode_libdir_separator_GCJ=
>           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
>@@ -16378,14 +16493,14 @@
>       conftest$ac_exeext conftest.$ac_ext
> if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
> 
>        hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
>-        archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
>+        archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
>        else
>         if test "$host_cpu" = ia64; then
>           hardcode_libdir_flag_spec_GCJ='${wl}-R $libdir:/usr/lib:/lib'
>           allow_undefined_flag_GCJ="-z nodefs"
>-          archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
>+          archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
>         else
>          # Determine the default libpath from the value encoded in an empty executable.
>          cat >conftest.$ac_ext <<_ACEOF
> /* confdefs.h.  */
>@@ -16443,15 +16558,13 @@
>           # Warning - without using the other run time loading flags,
>           # -berok will link without error, but may produce a broken library.
>           no_undefined_flag_GCJ=' ${wl}-bernotok'
>           allow_undefined_flag_GCJ=' ${wl}-berok'
>-          # -bexpall does not export symbols beginning with underscore (_)
>-          always_export_symbols_GCJ=yes
>           # Exported symbols can be pulled into shared objects from archives
>-          whole_archive_flag_spec_GCJ=' '
>+          whole_archive_flag_spec_GCJ='$convenience'
>           archive_cmds_need_lc_GCJ=yes
>-          # This is similar to how AIX traditionally builds it's shared libraries.
>-          archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
>+          # This is similar to how AIX traditionally builds its shared libraries.
>+          archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
>         fi
>       fi
>       ;;
> 
>@@ -16462,9 +16575,9 @@
>       # see comment about different semantics on the GNU ld section
>       ld_shlibs_GCJ=no
>       ;;
> 
>-    bsdi4*)
>+    bsdi[45]*)
>       export_dynamic_flag_spec_GCJ=-rdynamic
>       ;;
> 
>     cygwin* | mingw* | pw32*)
>@@ -16483,59 +16596,59 @@
>       # The linker will automatically build a .lib file if we build a DLL.
>       old_archive_From_new_cmds_GCJ='true'
>       # FIXME: Should let the user specify the lib program.
>       old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs'
>-      fix_srcfile_path='`cygpath -w "$srcfile"`'
>+      fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`'
>       enable_shared_with_static_runtimes_GCJ=yes
>       ;;
> 
>     darwin* | rhapsody*)
>-    if test "$GXX" = yes ; then
>-      archive_cmds_need_lc_GCJ=no
>-      case "$host_os" in
>+      case $host_os in
>       rhapsody* | darwin1.[012])
>-        allow_undefined_flag_GCJ='-undefined suppress'
>+         allow_undefined_flag_GCJ='${wl}-undefined ${wl}suppress'
>         ;;
>       *) # Darwin 1.3 on
>       if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
>-        allow_undefined_flag_GCJ='-flat_namespace -undefined suppress'
>+           allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
>       else
>         case ${MACOSX_DEPLOYMENT_TARGET} in
>           10.[012])
>-            allow_undefined_flag_GCJ='-flat_namespace -undefined suppress'
>+               allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
>             ;;
>           10.*)
>-            allow_undefined_flag_GCJ='-undefined dynamic_lookup'
>+               allow_undefined_flag_GCJ='${wl}-undefined ${wl}dynamic_lookup'
>             ;;
>         esac
>       fi
>         ;;
>       esac
>-        lt_int_apple_cc_single_mod=no
>-        output_verbose_link_cmd='echo'
>-        if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
>-          lt_int_apple_cc_single_mod=yes
>-        fi
>-        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
>-          archive_cmds_GCJ='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
>-        else
>-        archive_cmds_GCJ='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
>-      fi
>-      module_cmds_GCJ='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
>-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
>-        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
>-          archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
>-        else
>-          archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
>-        fi
>-          module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
>+      archive_cmds_need_lc_GCJ=no
>       hardcode_direct_GCJ=no
>       hardcode_automatic_GCJ=yes
>       hardcode_shlibpath_var_GCJ=unsupported
>-      whole_archive_flag_spec_GCJ='-all_load $convenience'
>+      whole_archive_flag_spec_GCJ=''
>       link_all_deplibs_GCJ=yes
>+    if test "$GCC" = yes ; then
>+        output_verbose_link_cmd='echo'
>+        archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
>+      module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
>+      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
>+      archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
>+      module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
>     else
>+      case $cc_basename in
>+        xlc*)
>+         output_verbose_link_cmd='echo'
>+         archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
>+         module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
>+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
>+         archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
>+          module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^$..*$,_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
>+          ;;
>+       *)
>       ld_shlibs_GCJ=no
>+          ;;
>+      esac
>     fi
>       ;;
> 
>     dgux*)
>@@ -16567,9 +16680,9 @@
>       hardcode_shlibpath_var_GCJ=no
>       ;;
> 
>     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
>-    freebsd* | kfreebsd*-gnu)
>+    freebsd* | kfreebsd*-gnu | dragonfly*)
>       archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
>       hardcode_libdir_flag_spec_GCJ='-R$libdir'
>       hardcode_direct_GCJ=yes
>       hardcode_shlibpath_var_GCJ=no
>@@ -16590,49 +16703,64 @@
>       hardcode_minus_L_GCJ=yes
>       export_dynamic_flag_spec_GCJ='${wl}-E'
>       ;;
> 
>-    hpux10* | hpux11*)
>+    hpux10*)
>       if test "$GCC" = yes -a "$with_gnu_ld" = no; then
>-        case "$host_cpu" in
>-        hppa*64*|ia64*)
>+        archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
>+      else
>+        archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
>+      fi
>+      if test "$with_gnu_ld" = no; then
>+        hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
>+        hardcode_libdir_separator_GCJ=:
>+
>+        hardcode_direct_GCJ=yes
>+        export_dynamic_flag_spec_GCJ='${wl}-E'
>+
>+        # hardcode_minus_L: Not really in the search PATH,
>+        # but as the default location of the library.
>+        hardcode_minus_L_GCJ=yes
>+      fi
>+      ;;
>+
>+    hpux11*)
>+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
>+        case $host_cpu in
>+        hppa*64*)
>           archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
>           ;;
>+        ia64*)
>+          archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
>+          ;;
>         *)
>           archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
>           ;;
>         esac
>       else
>-        case "$host_cpu" in
>-        hppa*64*|ia64*)
>-          archive_cmds_GCJ='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
>+        case $host_cpu in
>+        hppa*64*)
>+          archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
>+          ;;
>+        ia64*)
>+          archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
>           ;;
>         *)
>-          archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
>+          archive_cmds_GCJ='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
>           ;;
>         esac
>       fi
>       if test "$with_gnu_ld" = no; then
>-        case "$host_cpu" in
>-        hppa*64*)
>           hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
>-          hardcode_libdir_flag_spec_ld_GCJ='+b $libdir'
>           hardcode_libdir_separator_GCJ=:
>+
>+        case $host_cpu in
>+        hppa*64*|ia64*)
>+          hardcode_libdir_flag_spec_ld_GCJ='+b $libdir'
>           hardcode_direct_GCJ=no
>           hardcode_shlibpath_var_GCJ=no
>           ;;
>-        ia64*)
>-          hardcode_libdir_flag_spec_GCJ='-L$libdir'
>-          hardcode_direct_GCJ=no
>-          hardcode_shlibpath_var_GCJ=no
>-
>-          # hardcode_minus_L: Not really in the search PATH,
>-          # but as the default location of the library.
>-          hardcode_minus_L_GCJ=yes
>-          ;;
>         *)
>-          hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
>-          hardcode_libdir_separator_GCJ=:
>           hardcode_direct_GCJ=yes
>           export_dynamic_flag_spec_GCJ='${wl}-E'
> 
>           # hardcode_minus_L: Not really in the search PATH,
>@@ -16678,8 +16806,9 @@
>       hardcode_direct_GCJ=yes
>       hardcode_shlibpath_var_GCJ=no
>       if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
>         archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
>+        archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
>         hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
>         export_dynamic_flag_spec_GCJ='${wl}-E'
>       else
>        case $host_os in
>@@ -16723,41 +16852,45 @@
>       else
>         allow_undefined_flag_GCJ=' -expect_unresolved \*'
>         archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
>         archive_expsym_cmds_GCJ='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
>-        $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
>+        $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
> 
>         # Both c and cxx compiler support -rpath directly
>         hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
>       fi
>       hardcode_libdir_separator_GCJ=:
>       ;;
> 
>-    sco3.2v5*)
>-      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
>-      hardcode_shlibpath_var_GCJ=no
>-      export_dynamic_flag_spec_GCJ='${wl}-Bexport'
>-      runpath_var=LD_RUN_PATH
>-      hardcode_runpath_var=yes
>-      ;;
>-
>     solaris*)
>       no_undefined_flag_GCJ=' -z text'
>       if test "$GCC" = yes; then
>+        wlarc='${wl}'
>         archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
>         archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
>           $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
>       else
>+        wlarc=''
>         archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
>         archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
>         $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
>       fi
>       hardcode_libdir_flag_spec_GCJ='-R$libdir'
>       hardcode_shlibpath_var_GCJ=no
>       case $host_os in
>       solaris2.[0-5] | solaris2.[0-5].*) ;;
>-      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
>+      *)
>+        # The compiler driver will combine linker options so we
>+        # cannot just pass the convience library names through
>+        # without $wl, iff we do not link with $LD.
>+        # Luckily, gcc supports the same syntax we need for Sun Studio.
>+        # Supported since Solaris 2.6 (maybe 2.5.1?)
>+        case $wlarc in
>+        '')
>         whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;;
>+        *)
>+          whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
>+        esac ;;
>       esac
>       link_all_deplibs_GCJ=yes
>       ;;
> 
>@@ -16812,38 +16945,47 @@
>         ld_shlibs_GCJ=yes
>       fi
>       ;;
> 
>-    sysv4.2uw2*)
>-      archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags'
>-      hardcode_direct_GCJ=yes
>-      hardcode_minus_L_GCJ=no
>+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
>+      no_undefined_flag_GCJ='${wl}-z,text'
>+      archive_cmds_need_lc_GCJ=no
>       hardcode_shlibpath_var_GCJ=no
>-      hardcode_runpath_var=yes
>-      runpath_var=LD_RUN_PATH
>-      ;;
>+      runpath_var='LD_RUN_PATH'
> 
>-   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
>-      no_undefined_flag_GCJ='${wl}-z ${wl}text'
>       if test "$GCC" = yes; then
>-        archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
>+        archive_cmds_GCJ='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
>+        archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
>       else
>-        archive_cmds_GCJ='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
>+        archive_cmds_GCJ='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
>+        archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
>       fi
>-      runpath_var='LD_RUN_PATH'
>-      hardcode_shlibpath_var_GCJ=no
>       ;;
> 
>-    sysv5*)
>-      no_undefined_flag_GCJ=' -z text'
>-      # $CC -shared without GNU ld will not create a library from C++
>-      # object files and a static libstdc++, better avoid it by now
>-      archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
>-      archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
>-                $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
>-      hardcode_libdir_flag_spec_GCJ=
>+    sysv5* | sco3.2v5* | sco5v6*)
>+      # Note: We can NOT use -z defs as we might desire, because we do not
>+      # link with -lc, and that would cause any symbols used from libc to
>+      # always be unresolved, which means just about no library would
>+      # ever link correctly.  If we're not using GNU ld we use -z text
>+      # though, which does catch some bad symbols but isn't as heavy-handed
>+      # as -z defs.
>+      no_undefined_flag_GCJ='${wl}-z,text'
>+      allow_undefined_flag_GCJ='${wl}-z,nodefs'
>+      archive_cmds_need_lc_GCJ=no
>       hardcode_shlibpath_var_GCJ=no
>+      hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
>+      hardcode_libdir_separator_GCJ=':'
>+      link_all_deplibs_GCJ=yes
>+      export_dynamic_flag_spec_GCJ='${wl}-Bexport'
>       runpath_var='LD_RUN_PATH'
>+
>+      if test "$GCC" = yes; then
>+        archive_cmds_GCJ='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
>+        archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
>+      else
>+        archive_cmds_GCJ='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
>+        archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
>+      fi
>       ;;
> 
>     uts4*)
>       archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
>@@ -16860,13 +17002,8 @@
> echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
> echo "${ECHO_T}$ld_shlibs_GCJ" >&6
> test "$ld_shlibs_GCJ" = no && can_build_shared=no
> 
>-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
>-if test "$GCC" = yes; then
>-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
>-fi
>-
> #
> # Do we need to explicitly link libc?
> #
> case "x$archive_cmds_need_lc_GCJ" in
>@@ -16897,8 +17034,9 @@
>         lib=conftest
>         libobjs=conftest.$ac_objext
>         deplibs=
>         wl=$lt_prog_compiler_wl_GCJ
>+        pic_flag=$lt_prog_compiler_pic_GCJ
>         compiler_flags=-v
>         linker_flags=-v
>         verstring=
>         output_objdir=.
>@@ -17029,9 +17167,9 @@
>   dynamic_linker="$host_os ld.so"
>   shlibpath_var=LIBRARY_PATH
>   ;;
> 
>-bsdi4*)
>+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'
>@@ -17057,9 +17195,10 @@
>     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'
>+      $install_prog $dir/$dlname \$dldir/$dlname~
>+      chmod a+x \$dldir/$dlname'
>     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
>       dlpath=$dir/\$dldll~
>        $rm \$dlpath'
>     shlibpath_overrides_runpath=yes
>@@ -17087,9 +17226,9 @@
>       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}'
>+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
>       ;;
>     esac
>     ;;
> 
>@@ -17110,9 +17249,9 @@
>   library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
>   soname_spec='${libname}${release}${major}$shared_ext'
>   shlibpath_overrides_runpath=yes
>   shlibpath_var=DYLD_LIBRARY_PATH
>-  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
>+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
>   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
>   if test "$GCC" = yes; then
>     sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
>   else
>@@ -17145,10 +17284,19 @@
>   hardcode_into_libs=yes
>   dynamic_linker='GNU ld.so'
>   ;;
> 
>-freebsd*)
>-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
>+freebsd* | dragonfly*)
>+  # DragonFly does not have aout.  When/if they implement a new
>+  # versioning mechanism, adjust this.
>+  if test -x /usr/bin/objformat; then
>+    objformat=`/usr/bin/objformat`
>+  else
>+    case $host_os in
>+    freebsd[123]*) objformat=aout ;;
>+    *) objformat=elf ;;
>+    esac
>+  fi
>   version_type=freebsd-$objformat
>   case $version_type in
>     freebsd-elf*)
>       library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
>@@ -17164,16 +17312,21 @@
>   case $host_os in
>   freebsd2*)
>     shlibpath_overrides_runpath=yes
>     ;;
>-  freebsd3.01* | freebsdelf3.01*)
>+  freebsd3.[01]* | freebsdelf3.[01]*)
>     shlibpath_overrides_runpath=yes
>     hardcode_into_libs=yes
>     ;;
>-  *) # from 3.2 on
>+  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
>+  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
>     shlibpath_overrides_runpath=no
>     hardcode_into_libs=yes
>     ;;
>+  freebsd*) # from 4.6 on
>+    shlibpath_overrides_runpath=yes
>+    hardcode_into_libs=yes
>+    ;;
>   esac
>   ;;
> 
> gnu*)
>@@ -17191,9 +17344,9 @@
>   # link against other versions.
>   version_type=sunos
>   need_lib_prefix=no
>   need_version=no
>-  case "$host_cpu" in
>+  case $host_cpu in
>   ia64*)
>     shrext_cmds='.so'
>     hardcode_into_libs=yes
>     dynamic_linker="$host_os dld.so"
>@@ -17219,1151 +17372,333 @@
>      sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
>      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
>      ;;
>    *)
>-    shrext_cmds='.sl'
>-    dynamic_linker="$host_os dld.sl"
>-    shlibpath_var=SHLIB_PATH
>-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
>-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>-    soname_spec='${libname}${release}${shared_ext}$major'
>-    ;;
>-  esac
>-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
>-  postinstall_cmds='chmod 555 $lib'
>-  ;;
>-
>-irix5* | irix6* | nonstopux*)
>-  case $host_os in
>-    nonstopux*) version_type=nonstopux ;;
>-    *)
>-        if test "$lt_cv_prog_gnu_ld" = yes; then
>-                version_type=linux
>-        else
>-                version_type=irix
>-        fi ;;
>-  esac
>-  need_lib_prefix=no
>-  need_version=no
>-  soname_spec='${libname}${release}${shared_ext}$major'
>-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
>-  case $host_os in
>-  irix5* | nonstopux*)
>-    libsuff= shlibsuff=
>-    ;;
>-  *)
>-    case $LD in # libtool.m4 will add one of these switches to LD
>-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
>-      libsuff= shlibsuff= libmagic=32-bit;;
>-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
>-      libsuff=32 shlibsuff=N32 libmagic=N32;;
>-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
>-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
>-    *) libsuff= shlibsuff= libmagic=never-match;;
>-    esac
>-    ;;
>-  esac
>-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
>-  shlibpath_overrides_runpath=no
>-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
>-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
>-  hardcode_into_libs=yes
>-  ;;
>-
>-# No shared lib support for Linux oldld, aout, or coff.
>-linux*oldld* | linux*aout* | linux*coff*)
>-  dynamic_linker=no
>-  ;;
>-
>-# This must be Linux ELF.
>-linux*)
>-  version_type=linux
>-  need_lib_prefix=no
>-  need_version=no
>-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>-  soname_spec='${libname}${release}${shared_ext}$major'
>-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
>-  shlibpath_var=LD_LIBRARY_PATH
>-  shlibpath_overrides_runpath=no
>-  # This implies no fast_install, which is unacceptable.
>-  # Some rework will be needed to allow for fast_install
>-  # before this can be enabled.
>-  hardcode_into_libs=yes
>-
>-  # find out which ABI we are using
>-  libsuff=
>-  case "$host_cpu" in
>-  x86_64*|s390x*|powerpc64*)
>-    echo '#line 17296 "configure"' > conftest.$ac_ext
>-    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
>-  (eval $ac_compile) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; then
>-      case `/usr/bin/file conftest.$ac_objext` in
>-      *64-bit*)
>-        libsuff=64
>-        sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
>-        ;;
>-      esac
>-    fi
>-    rm -rf conftest*
>-    ;;
>-  esac
>-
>-  # Append ld.so.conf contents to the search path
>-  if test -f /etc/ld.so.conf; then
>-    lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
>-    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
>-  fi
>-
>-  # We used to test for /lib/ld.so.1 and disable shared libraries on
>-  # powerpc, because MkLinux only supported shared libraries with the
>-  # GNU dynamic linker.  Since this was broken with cross compilers,
>-  # most powerpc-linux boxes support dynamic linking these days and
>-  # people can always --disable-shared, the test was removed, and we
>-  # assume the GNU/Linux dynamic linker is in use.
>-  dynamic_linker='GNU/Linux ld.so'
>-  ;;
>-
>-knetbsd*-gnu)
>-  version_type=linux
>-  need_lib_prefix=no
>-  need_version=no
>-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
>-  soname_spec='${libname}${release}${shared_ext}$major'
>-  shlibpath_var=LD_LIBRARY_PATH
>-  shlibpath_overrides_runpath=no
>-  hardcode_into_libs=yes
>-  dynamic_linker='GNU ld.so'
>-  ;;
>-
>-netbsd*)
>-  version_type=sunos
>-  need_lib_prefix=no
>-  need_version=no
>-  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
>-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
>-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
>-    dynamic_linker='NetBSD (a.out) ld.so'
>-  else
>-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
>-    soname_spec='${libname}${release}${shared_ext}$major'
>-    dynamic_linker='NetBSD ld.elf_so'
>-  fi
>-  shlibpath_var=LD_LIBRARY_PATH
>-  shlibpath_overrides_runpath=yes
>-  hardcode_into_libs=yes
>-  ;;
>-
>-newsos6)
>-  version_type=linux
>-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>-  shlibpath_var=LD_LIBRARY_PATH
>-  shlibpath_overrides_runpath=yes
>-  ;;
>-
>-nto-qnx*)
>-  version_type=linux
>-  need_lib_prefix=no
>-  need_version=no
>-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>-  soname_spec='${libname}${release}${shared_ext}$major'
>-  shlibpath_var=LD_LIBRARY_PATH
>-  shlibpath_overrides_runpath=yes
>-  ;;
>-
>-openbsd*)
>-  version_type=sunos
>-  need_lib_prefix=no
>-  need_version=yes
>-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
>-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
>-  shlibpath_var=LD_LIBRARY_PATH
>-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
>-    case $host_os in
>-      openbsd2.[89] | openbsd2.[89].*)
>-        shlibpath_overrides_runpath=no
>-        ;;
>-      *)
>-        shlibpath_overrides_runpath=yes
>-        ;;
>-      esac
>-  else
>-    shlibpath_overrides_runpath=yes
>-  fi
>-  ;;
>-
>-os2*)
>-  libname_spec='$name'
>-  shrext_cmds=".dll"
>-  need_lib_prefix=no
>-  library_names_spec='$libname${shared_ext} $libname.a'
>-  dynamic_linker='OS/2 ld.exe'
>-  shlibpath_var=LIBPATH
>-  ;;
>-
>-osf3* | osf4* | osf5*)
>-  version_type=osf
>-  need_lib_prefix=no
>-  need_version=no
>-  soname_spec='${libname}${release}${shared_ext}$major'
>-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>-  shlibpath_var=LD_LIBRARY_PATH
>-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
>-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
>-  ;;
>-
>-sco3.2v5*)
>-  version_type=osf
>-  soname_spec='${libname}${release}${shared_ext}$major'
>-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>-  shlibpath_var=LD_LIBRARY_PATH
>-  ;;
>-
>-solaris*)
>-  version_type=linux
>-  need_lib_prefix=no
>-  need_version=no
>-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>-  soname_spec='${libname}${release}${shared_ext}$major'
>-  shlibpath_var=LD_LIBRARY_PATH
>-  shlibpath_overrides_runpath=yes
>-  hardcode_into_libs=yes
>-  # ldd complains unless libraries are executable
>-  postinstall_cmds='chmod +x $lib'
>-  ;;
>-
>-sunos4*)
>-  version_type=sunos
>-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
>-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
>-  shlibpath_var=LD_LIBRARY_PATH
>-  shlibpath_overrides_runpath=yes
>-  if test "$with_gnu_ld" = yes; then
>-    need_lib_prefix=no
>-  fi
>-  need_version=yes
>-  ;;
>-
>-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
>-  version_type=linux
>-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>-  soname_spec='${libname}${release}${shared_ext}$major'
>-  shlibpath_var=LD_LIBRARY_PATH
>-  case $host_vendor in
>-    sni)
>-      shlibpath_overrides_runpath=no
>-      need_lib_prefix=no
>-      export_dynamic_flag_spec='${wl}-Blargedynsym'
>-      runpath_var=LD_RUN_PATH
>-      ;;
>-    siemens)
>-      need_lib_prefix=no
>-      ;;
>-    motorola)
>-      need_lib_prefix=no
>-      need_version=no
>-      shlibpath_overrides_runpath=no
>-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
>-      ;;
>-  esac
>-  ;;
>-
>-sysv4*MP*)
>-  if test -d /usr/nec ;then
>-    version_type=linux
>-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
>-    soname_spec='$libname${shared_ext}.$major'
>-    shlibpath_var=LD_LIBRARY_PATH
>-  fi
>-  ;;
>-
>-uts4*)
>-  version_type=linux
>-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>-  soname_spec='${libname}${release}${shared_ext}$major'
>-  shlibpath_var=LD_LIBRARY_PATH
>-  ;;
>-
>-*)
>-  dynamic_linker=no
>-  ;;
>-esac
>-echo "$as_me:$LINENO: result: $dynamic_linker" >&5
>-echo "${ECHO_T}$dynamic_linker" >&6
>-test "$dynamic_linker" = no && can_build_shared=no
>-
>-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
>-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
>-hardcode_action_GCJ=
>-if test -n "$hardcode_libdir_flag_spec_GCJ" || \
>-   test -n "$runpath_var GCJ" || \
>-   test "X$hardcode_automatic_GCJ"="Xyes" ; then
>-
>-  # We can hardcode non-existant directories.
>-  if test "$hardcode_direct_GCJ" != no &&
>-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
>-     # have to relink, otherwise we might link with an installed library
>-     # when we should be linking with a yet-to-be-installed one
>-     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no &&
>-     test "$hardcode_minus_L_GCJ" != no; then
>-    # Linking always hardcodes the temporary library directory.
>-    hardcode_action_GCJ=relink
>-  else
>-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
>-    hardcode_action_GCJ=immediate
>-  fi
>-else
>-  # We cannot hardcode anything, or else we can only hardcode existing
>-  # directories.
>-  hardcode_action_GCJ=unsupported
>-fi
>-echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
>-echo "${ECHO_T}$hardcode_action_GCJ" >&6
>-
>-if test "$hardcode_action_GCJ" = relink; then
>-  # Fast installation is not supported
>-  enable_fast_install=no
>-elif test "$shlibpath_overrides_runpath" = yes ||
>-     test "$enable_shared" = no; then
>-  # Fast installation is not necessary
>-  enable_fast_install=needless
>-fi
>-
>-striplib=
>-old_striplib=
>-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
>-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
>-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
>-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
>-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
>-  echo "$as_me:$LINENO: result: yes" >&5
>-echo "${ECHO_T}yes" >&6
>-else
>-# FIXME - insert some real tests, host_os isn't really good enough
>-  case $host_os in
>-   darwin*)
>-       if test -n "$STRIP" ; then
>-         striplib="$STRIP -x"
>-         echo "$as_me:$LINENO: result: yes" >&5
>-echo "${ECHO_T}yes" >&6
>-       else
>-  echo "$as_me:$LINENO: result: no" >&5
>-echo "${ECHO_T}no" >&6
>-fi
>-       ;;
>-   *)
>-  echo "$as_me:$LINENO: result: no" >&5
>-echo "${ECHO_T}no" >&6
>-    ;;
>-  esac
>-fi
>-
>-if test "x$enable_dlopen" != xyes; then
>-  enable_dlopen=unknown
>-  enable_dlopen_self=unknown
>-  enable_dlopen_self_static=unknown
>-else
>-  lt_cv_dlopen=no
>-  lt_cv_dlopen_libs=
>-
>-  case $host_os in
>-  beos*)
>-    lt_cv_dlopen="load_add_on"
>-    lt_cv_dlopen_libs=
>-    lt_cv_dlopen_self=yes
>-    ;;
>-
>-  mingw* | pw32*)
>-    lt_cv_dlopen="LoadLibrary"
>-    lt_cv_dlopen_libs=
>-   ;;
>-
>-  cygwin*)
>-    lt_cv_dlopen="dlopen"
>-    lt_cv_dlopen_libs=
>-   ;;
>-
>-  darwin*)
>-  # if libdl is installed we need to link against it
>-    echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
>-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
>-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
>-  echo $ECHO_N "(cached) $ECHO_C" >&6
>-else
>-  ac_check_lib_save_LIBS=$LIBS
>-LIBS="-ldl  $LIBS"
>-cat >conftest.$ac_ext <<_ACEOF
>-/* confdefs.h.  */
>-_ACEOF
>-cat confdefs.h >>conftest.$ac_ext
>-cat >>conftest.$ac_ext <<_ACEOF
>-/* end confdefs.h.  */
>-
>-/* Override any gcc2 internal prototype to avoid an error.  */
>-#ifdef __cplusplus
>-extern "C"
>-#endif
>-/* We use char because int might match the return type of a gcc2
>-   builtin and then its argument prototype would still apply.  */
>-char dlopen ();
>-int
>-main ()
>-{
>-dlopen ();
>-  ;
>-  return 0;
>-}
>-_ACEOF
>-rm -f conftest.$ac_objext conftest$ac_exeext
>-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
>-  (eval $ac_link) 2>conftest.er1
>-  ac_status=$?
>-  grep -v '^ *+' conftest.er1 >conftest.err
>-  rm -f conftest.er1
>-  cat conftest.err >&5
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } &&
>-         { ac_try='test -z "$ac_c_werror_flag"
>-                         || test ! -s conftest.err'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; } &&
>-         { ac_try='test -s conftest$ac_exeext'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; }; then
>-  ac_cv_lib_dl_dlopen=yes
>-else
>-  echo "$as_me: failed program was:" >&5
>-sed 's/^/| /' conftest.$ac_ext >&5
>-
>-ac_cv_lib_dl_dlopen=no
>-fi
>-rm -f conftest.err conftest.$ac_objext \
>-      conftest$ac_exeext conftest.$ac_ext
>-LIBS=$ac_check_lib_save_LIBS
>-fi
>-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
>-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
>-if test $ac_cv_lib_dl_dlopen = yes; then
>-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
>-else
>-
>-    lt_cv_dlopen="dyld"
>-    lt_cv_dlopen_libs=
>-    lt_cv_dlopen_self=yes
>-
>-fi
>-
>-   ;;
>-
>-  *)
>-    echo "$as_me:$LINENO: checking for shl_load" >&5
>-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
>-if test "${ac_cv_func_shl_load+set}" = set; then
>-  echo $ECHO_N "(cached) $ECHO_C" >&6
>-else
>-  cat >conftest.$ac_ext <<_ACEOF
>-/* confdefs.h.  */
>-_ACEOF
>-cat confdefs.h >>conftest.$ac_ext
>-cat >>conftest.$ac_ext <<_ACEOF
>-/* end confdefs.h.  */
>-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
>-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
>-#define shl_load innocuous_shl_load
>-
>-/* System header to define __stub macros and hopefully few prototypes,
>-    which can conflict with char shl_load (); below.
>-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
>-    <limits.h> exists even on freestanding compilers.  */
>-
>-#ifdef __STDC__
>-# include <limits.h>
>-#else
>-# include <assert.h>
>-#endif
>-
>-#undef shl_load
>-
>-/* Override any gcc2 internal prototype to avoid an error.  */
>-#ifdef __cplusplus
>-extern "C"
>-{
>-#endif
>-/* We use char because int might match the return type of a gcc2
>-   builtin and then its argument prototype would still apply.  */
>-char shl_load ();
>-/* The GNU C library defines this for functions which it implements
>-    to always fail with ENOSYS.  Some functions are actually named
>-    something starting with __ and the normal name is an alias.  */
>-#if defined (__stub_shl_load) || defined (__stub___shl_load)
>-choke me
>-#else
>-char (*f) () = shl_load;
>-#endif
>-#ifdef __cplusplus
>-}
>-#endif
>-
>-int
>-main ()
>-{
>-return f != shl_load;
>-  ;
>-  return 0;
>-}
>-_ACEOF
>-rm -f conftest.$ac_objext conftest$ac_exeext
>-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
>-  (eval $ac_link) 2>conftest.er1
>-  ac_status=$?
>-  grep -v '^ *+' conftest.er1 >conftest.err
>-  rm -f conftest.er1
>-  cat conftest.err >&5
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } &&
>-         { ac_try='test -z "$ac_c_werror_flag"
>-                         || test ! -s conftest.err'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; } &&
>-         { ac_try='test -s conftest$ac_exeext'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; }; then
>-  ac_cv_func_shl_load=yes
>-else
>-  echo "$as_me: failed program was:" >&5
>-sed 's/^/| /' conftest.$ac_ext >&5
>-
>-ac_cv_func_shl_load=no
>-fi
>-rm -f conftest.err conftest.$ac_objext \
>-      conftest$ac_exeext conftest.$ac_ext
>-fi
>-echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
>-echo "${ECHO_T}$ac_cv_func_shl_load" >&6
>-if test $ac_cv_func_shl_load = yes; then
>-  lt_cv_dlopen="shl_load"
>-else
>-  echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
>-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
>-if test "${ac_cv_lib_dld_shl_load+set}" = set; then
>-  echo $ECHO_N "(cached) $ECHO_C" >&6
>-else
>-  ac_check_lib_save_LIBS=$LIBS
>-LIBS="-ldld  $LIBS"
>-cat >conftest.$ac_ext <<_ACEOF
>-/* confdefs.h.  */
>-_ACEOF
>-cat confdefs.h >>conftest.$ac_ext
>-cat >>conftest.$ac_ext <<_ACEOF
>-/* end confdefs.h.  */
>-
>-/* Override any gcc2 internal prototype to avoid an error.  */
>-#ifdef __cplusplus
>-extern "C"
>-#endif
>-/* We use char because int might match the return type of a gcc2
>-   builtin and then its argument prototype would still apply.  */
>-char shl_load ();
>-int
>-main ()
>-{
>-shl_load ();
>-  ;
>-  return 0;
>-}
>-_ACEOF
>-rm -f conftest.$ac_objext conftest$ac_exeext
>-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
>-  (eval $ac_link) 2>conftest.er1
>-  ac_status=$?
>-  grep -v '^ *+' conftest.er1 >conftest.err
>-  rm -f conftest.er1
>-  cat conftest.err >&5
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } &&
>-         { ac_try='test -z "$ac_c_werror_flag"
>-                         || test ! -s conftest.err'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; } &&
>-         { ac_try='test -s conftest$ac_exeext'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; }; then
>-  ac_cv_lib_dld_shl_load=yes
>-else
>-  echo "$as_me: failed program was:" >&5
>-sed 's/^/| /' conftest.$ac_ext >&5
>-
>-ac_cv_lib_dld_shl_load=no
>-fi
>-rm -f conftest.err conftest.$ac_objext \
>-      conftest$ac_exeext conftest.$ac_ext
>-LIBS=$ac_check_lib_save_LIBS
>-fi
>-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
>-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
>-if test $ac_cv_lib_dld_shl_load = yes; then
>-  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
>-else
>-  echo "$as_me:$LINENO: checking for dlopen" >&5
>-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
>-if test "${ac_cv_func_dlopen+set}" = set; then
>-  echo $ECHO_N "(cached) $ECHO_C" >&6
>-else
>-  cat >conftest.$ac_ext <<_ACEOF
>-/* confdefs.h.  */
>-_ACEOF
>-cat confdefs.h >>conftest.$ac_ext
>-cat >>conftest.$ac_ext <<_ACEOF
>-/* end confdefs.h.  */
>-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
>-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
>-#define dlopen innocuous_dlopen
>-
>-/* System header to define __stub macros and hopefully few prototypes,
>-    which can conflict with char dlopen (); below.
>-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
>-    <limits.h> exists even on freestanding compilers.  */
>-
>-#ifdef __STDC__
>-# include <limits.h>
>-#else
>-# include <assert.h>
>-#endif
>-
>-#undef dlopen
>-
>-/* Override any gcc2 internal prototype to avoid an error.  */
>-#ifdef __cplusplus
>-extern "C"
>-{
>-#endif
>-/* We use char because int might match the return type of a gcc2
>-   builtin and then its argument prototype would still apply.  */
>-char dlopen ();
>-/* The GNU C library defines this for functions which it implements
>-    to always fail with ENOSYS.  Some functions are actually named
>-    something starting with __ and the normal name is an alias.  */
>-#if defined (__stub_dlopen) || defined (__stub___dlopen)
>-choke me
>-#else
>-char (*f) () = dlopen;
>-#endif
>-#ifdef __cplusplus
>-}
>-#endif
>-
>-int
>-main ()
>-{
>-return f != dlopen;
>-  ;
>-  return 0;
>-}
>-_ACEOF
>-rm -f conftest.$ac_objext conftest$ac_exeext
>-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
>-  (eval $ac_link) 2>conftest.er1
>-  ac_status=$?
>-  grep -v '^ *+' conftest.er1 >conftest.err
>-  rm -f conftest.er1
>-  cat conftest.err >&5
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } &&
>-         { ac_try='test -z "$ac_c_werror_flag"
>-                         || test ! -s conftest.err'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; } &&
>-         { ac_try='test -s conftest$ac_exeext'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; }; then
>-  ac_cv_func_dlopen=yes
>-else
>-  echo "$as_me: failed program was:" >&5
>-sed 's/^/| /' conftest.$ac_ext >&5
>-
>-ac_cv_func_dlopen=no
>-fi
>-rm -f conftest.err conftest.$ac_objext \
>-      conftest$ac_exeext conftest.$ac_ext
>-fi
>-echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
>-echo "${ECHO_T}$ac_cv_func_dlopen" >&6
>-if test $ac_cv_func_dlopen = yes; then
>-  lt_cv_dlopen="dlopen"
>-else
>-  echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
>-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
>-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
>-  echo $ECHO_N "(cached) $ECHO_C" >&6
>-else
>-  ac_check_lib_save_LIBS=$LIBS
>-LIBS="-ldl  $LIBS"
>-cat >conftest.$ac_ext <<_ACEOF
>-/* confdefs.h.  */
>-_ACEOF
>-cat confdefs.h >>conftest.$ac_ext
>-cat >>conftest.$ac_ext <<_ACEOF
>-/* end confdefs.h.  */
>-
>-/* Override any gcc2 internal prototype to avoid an error.  */
>-#ifdef __cplusplus
>-extern "C"
>-#endif
>-/* We use char because int might match the return type of a gcc2
>-   builtin and then its argument prototype would still apply.  */
>-char dlopen ();
>-int
>-main ()
>-{
>-dlopen ();
>-  ;
>-  return 0;
>-}
>-_ACEOF
>-rm -f conftest.$ac_objext conftest$ac_exeext
>-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
>-  (eval $ac_link) 2>conftest.er1
>-  ac_status=$?
>-  grep -v '^ *+' conftest.er1 >conftest.err
>-  rm -f conftest.er1
>-  cat conftest.err >&5
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } &&
>-         { ac_try='test -z "$ac_c_werror_flag"
>-                         || test ! -s conftest.err'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; } &&
>-         { ac_try='test -s conftest$ac_exeext'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; }; then
>-  ac_cv_lib_dl_dlopen=yes
>-else
>-  echo "$as_me: failed program was:" >&5
>-sed 's/^/| /' conftest.$ac_ext >&5
>-
>-ac_cv_lib_dl_dlopen=no
>-fi
>-rm -f conftest.err conftest.$ac_objext \
>-      conftest$ac_exeext conftest.$ac_ext
>-LIBS=$ac_check_lib_save_LIBS
>-fi
>-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
>-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
>-if test $ac_cv_lib_dl_dlopen = yes; then
>-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
>-else
>-  echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
>-echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
>-if test "${ac_cv_lib_svld_dlopen+set}" = set; then
>-  echo $ECHO_N "(cached) $ECHO_C" >&6
>-else
>-  ac_check_lib_save_LIBS=$LIBS
>-LIBS="-lsvld  $LIBS"
>-cat >conftest.$ac_ext <<_ACEOF
>-/* confdefs.h.  */
>-_ACEOF
>-cat confdefs.h >>conftest.$ac_ext
>-cat >>conftest.$ac_ext <<_ACEOF
>-/* end confdefs.h.  */
>-
>-/* Override any gcc2 internal prototype to avoid an error.  */
>-#ifdef __cplusplus
>-extern "C"
>-#endif
>-/* We use char because int might match the return type of a gcc2
>-   builtin and then its argument prototype would still apply.  */
>-char dlopen ();
>-int
>-main ()
>-{
>-dlopen ();
>-  ;
>-  return 0;
>-}
>-_ACEOF
>-rm -f conftest.$ac_objext conftest$ac_exeext
>-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
>-  (eval $ac_link) 2>conftest.er1
>-  ac_status=$?
>-  grep -v '^ *+' conftest.er1 >conftest.err
>-  rm -f conftest.er1
>-  cat conftest.err >&5
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } &&
>-         { ac_try='test -z "$ac_c_werror_flag"
>-                         || test ! -s conftest.err'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; } &&
>-         { ac_try='test -s conftest$ac_exeext'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; }; then
>-  ac_cv_lib_svld_dlopen=yes
>-else
>-  echo "$as_me: failed program was:" >&5
>-sed 's/^/| /' conftest.$ac_ext >&5
>-
>-ac_cv_lib_svld_dlopen=no
>-fi
>-rm -f conftest.err conftest.$ac_objext \
>-      conftest$ac_exeext conftest.$ac_ext
>-LIBS=$ac_check_lib_save_LIBS
>-fi
>-echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
>-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
>-if test $ac_cv_lib_svld_dlopen = yes; then
>-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
>-else
>-  echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
>-echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
>-if test "${ac_cv_lib_dld_dld_link+set}" = set; then
>-  echo $ECHO_N "(cached) $ECHO_C" >&6
>-else
>-  ac_check_lib_save_LIBS=$LIBS
>-LIBS="-ldld  $LIBS"
>-cat >conftest.$ac_ext <<_ACEOF
>-/* confdefs.h.  */
>-_ACEOF
>-cat confdefs.h >>conftest.$ac_ext
>-cat >>conftest.$ac_ext <<_ACEOF
>-/* end confdefs.h.  */
>-
>-/* Override any gcc2 internal prototype to avoid an error.  */
>-#ifdef __cplusplus
>-extern "C"
>-#endif
>-/* We use char because int might match the return type of a gcc2
>-   builtin and then its argument prototype would still apply.  */
>-char dld_link ();
>-int
>-main ()
>-{
>-dld_link ();
>-  ;
>-  return 0;
>-}
>-_ACEOF
>-rm -f conftest.$ac_objext conftest$ac_exeext
>-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
>-  (eval $ac_link) 2>conftest.er1
>-  ac_status=$?
>-  grep -v '^ *+' conftest.er1 >conftest.err
>-  rm -f conftest.er1
>-  cat conftest.err >&5
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } &&
>-         { ac_try='test -z "$ac_c_werror_flag"
>-                         || test ! -s conftest.err'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; } &&
>-         { ac_try='test -s conftest$ac_exeext'
>-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
>-  (eval $ac_try) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); }; }; then
>-  ac_cv_lib_dld_dld_link=yes
>-else
>-  echo "$as_me: failed program was:" >&5
>-sed 's/^/| /' conftest.$ac_ext >&5
>-
>-ac_cv_lib_dld_dld_link=no
>-fi
>-rm -f conftest.err conftest.$ac_objext \
>-      conftest$ac_exeext conftest.$ac_ext
>-LIBS=$ac_check_lib_save_LIBS
>-fi
>-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
>-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
>-if test $ac_cv_lib_dld_dld_link = yes; then
>-  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
>-fi
>-
>-
>-fi
>-
>+    shrext_cmds='.sl'
>+    dynamic_linker="$host_os dld.sl"
>+    shlibpath_var=SHLIB_PATH
>+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
>+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>+    soname_spec='${libname}${release}${shared_ext}$major'
>+    ;;
>+  esac
>+  # HP-UX runs *really* slowly unless shared libraries are mode 555.
>+  postinstall_cmds='chmod 555 $lib'
>+  ;;
> 
>-fi
>+interix3*)
>+  version_type=linux
>+  need_lib_prefix=no
>+  need_version=no
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  shlibpath_overrides_runpath=no
>+  hardcode_into_libs=yes
>+  ;;
> 
>+irix5* | irix6* | nonstopux*)
>+  case $host_os in
>+    nonstopux*) version_type=nonstopux ;;
>+    *)
>+        if test "$lt_cv_prog_gnu_ld" = yes; then
>+                version_type=linux
>+        else
>+                version_type=irix
>+        fi ;;
>+  esac
>+  need_lib_prefix=no
>+  need_version=no
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
>+  case $host_os in
>+  irix5* | nonstopux*)
>+    libsuff= shlibsuff=
>+    ;;
>+  *)
>+    case $LD in # libtool.m4 will add one of these switches to LD
>+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
>+      libsuff= shlibsuff= libmagic=32-bit;;
>+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
>+      libsuff=32 shlibsuff=N32 libmagic=N32;;
>+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
>+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
>+    *) libsuff= shlibsuff= libmagic=never-match;;
>+    esac
>+    ;;
>+  esac
>+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
>+  shlibpath_overrides_runpath=no
>+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
>+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
>+  hardcode_into_libs=yes
>+  ;;
> 
>-fi
>+# No shared lib support for Linux oldld, aout, or coff.
>+linux*oldld* | linux*aout* | linux*coff*)
>+  dynamic_linker=no
>+  ;;
> 
>+# This must be Linux ELF.
>+linux*)
>+  version_type=linux
>+  need_lib_prefix=no
>+  need_version=no
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  shlibpath_overrides_runpath=no
>+  # This implies no fast_install, which is unacceptable.
>+  # Some rework will be needed to allow for fast_install
>+  # before this can be enabled.
>+  hardcode_into_libs=yes
> 
>+  # Append ld.so.conf contents to the search path
>+  if test -f /etc/ld.so.conf; then
>+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,        ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
>+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
> fi
> 
>+  # We used to test for /lib/ld.so.1 and disable shared libraries on
>+  # powerpc, because MkLinux only supported shared libraries with the
>+  # GNU dynamic linker.  Since this was broken with cross compilers,
>+  # most powerpc-linux boxes support dynamic linking these days and
>+  # people can always --disable-shared, the test was removed, and we
>+  # assume the GNU/Linux dynamic linker is in use.
>+  dynamic_linker='GNU/Linux ld.so'
>+  ;;
> 
>-fi
>-
>+knetbsd*-gnu)
>+  version_type=linux
>+  need_lib_prefix=no
>+  need_version=no
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  shlibpath_overrides_runpath=no
>+  hardcode_into_libs=yes
>+  dynamic_linker='GNU ld.so'
>     ;;
>-  esac
> 
>-  if test "x$lt_cv_dlopen" != xno; then
>-    enable_dlopen=yes
>+netbsd*)
>+  version_type=sunos
>+  need_lib_prefix=no
>+  need_version=no
>+  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
>+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
>+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
>+    dynamic_linker='NetBSD (a.out) ld.so'
>   else
>-    enable_dlopen=no
>+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
>+    soname_spec='${libname}${release}${shared_ext}$major'
>+    dynamic_linker='NetBSD ld.elf_so'
>   fi
>+  shlibpath_var=LD_LIBRARY_PATH
>+  shlibpath_overrides_runpath=yes
>+  hardcode_into_libs=yes
>+  ;;
> 
>-  case $lt_cv_dlopen in
>-  dlopen)
>-    save_CPPFLAGS="$CPPFLAGS"
>-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
>-
>-    save_LDFLAGS="$LDFLAGS"
>-    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
>-
>-    save_LIBS="$LIBS"
>-    LIBS="$lt_cv_dlopen_libs $LIBS"
>-
>-    echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
>-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
>-if test "${lt_cv_dlopen_self+set}" = set; then
>-  echo $ECHO_N "(cached) $ECHO_C" >&6
>-else
>-          if test "$cross_compiling" = yes; then :
>-  lt_cv_dlopen_self=cross
>-else
>-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
>-  lt_status=$lt_dlunknown
>-  cat > conftest.$ac_ext <<EOF
>-#line 18167 "configure"
>-#include "confdefs.h"
>-
>-#if HAVE_DLFCN_H
>-#include <dlfcn.h>
>-#endif
>-
>-#include <stdio.h>
>-
>-#ifdef RTLD_GLOBAL
>-#  define LT_DLGLOBAL           RTLD_GLOBAL
>-#else
>-#  ifdef DL_GLOBAL
>-#    define LT_DLGLOBAL         DL_GLOBAL
>-#  else
>-#    define LT_DLGLOBAL         0
>-#  endif
>-#endif
>-
>-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
>-   find out it does not work in some platform. */
>-#ifndef LT_DLLAZY_OR_NOW
>-#  ifdef RTLD_LAZY
>-#    define LT_DLLAZY_OR_NOW            RTLD_LAZY
>-#  else
>-#    ifdef DL_LAZY
>-#      define LT_DLLAZY_OR_NOW          DL_LAZY
>-#    else
>-#      ifdef RTLD_NOW
>-#        define LT_DLLAZY_OR_NOW        RTLD_NOW
>-#      else
>-#        ifdef DL_NOW
>-#          define LT_DLLAZY_OR_NOW      DL_NOW
>-#        else
>-#          define LT_DLLAZY_OR_NOW      0
>-#        endif
>-#      endif
>-#    endif
>-#  endif
>-#endif
>-
>-#ifdef __cplusplus
>-extern "C" void exit (int);
>-#endif
>-
>-void fnord() { int i=42;}
>-int main ()
>-{
>-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
>-  int status = $lt_dlunknown;
>+newsos6)
>+  version_type=linux
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  shlibpath_overrides_runpath=yes
>+  ;;
> 
>-  if (self)
>-    {
>-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
>-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
>-      /* dlclose (self); */
>-    }
>+nto-qnx*)
>+  version_type=linux
>+  need_lib_prefix=no
>+  need_version=no
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  shlibpath_overrides_runpath=yes
>+  ;;
> 
>-    exit (status);
>-}
>-EOF
>-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
>-  (eval $ac_link) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
>-    (./conftest; exit; ) 2>/dev/null
>-    lt_status=$?
>-    case x$lt_status in
>-      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
>-      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
>-      x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
>+openbsd*)
>+  version_type=sunos
>+  sys_lib_dlsearch_path_spec="/usr/lib"
>+  need_lib_prefix=no
>+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
>+  case $host_os in
>+    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
>+    *)                         need_version=no  ;;
>+  esac
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
>+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
>+    case $host_os in
>+      openbsd2.[89] | openbsd2.[89].*)
>+        shlibpath_overrides_runpath=no
>+        ;;
>+      *)
>+        shlibpath_overrides_runpath=yes
>+        ;;
>     esac
>-  else :
>-    # compilation failed
>-    lt_cv_dlopen_self=no
>-  fi
>-fi
>-rm -fr conftest*
>-
>-
>-fi
>-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
>-echo "${ECHO_T}$lt_cv_dlopen_self" >&6
>-
>-    if test "x$lt_cv_dlopen_self" = xyes; then
>-      LDFLAGS="$LDFLAGS $link_static_flag"
>-      echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
>-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
>-if test "${lt_cv_dlopen_self_static+set}" = set; then
>-  echo $ECHO_N "(cached) $ECHO_C" >&6
>-else
>-          if test "$cross_compiling" = yes; then :
>-  lt_cv_dlopen_self_static=cross
> else
>-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
>-  lt_status=$lt_dlunknown
>-  cat > conftest.$ac_ext <<EOF
>-#line 18265 "configure"
>-#include "confdefs.h"
>-
>-#if HAVE_DLFCN_H
>-#include <dlfcn.h>
>-#endif
>+    shlibpath_overrides_runpath=yes
>+  fi
>+  ;;
> 
>-#include <stdio.h>
>+os2*)
>+  libname_spec='$name'
>+  shrext_cmds=".dll"
>+  need_lib_prefix=no
>+  library_names_spec='$libname${shared_ext} $libname.a'
>+  dynamic_linker='OS/2 ld.exe'
>+  shlibpath_var=LIBPATH
>+  ;;
> 
>-#ifdef RTLD_GLOBAL
>-#  define LT_DLGLOBAL           RTLD_GLOBAL
>-#else
>-#  ifdef DL_GLOBAL
>-#    define LT_DLGLOBAL         DL_GLOBAL
>-#  else
>-#    define LT_DLGLOBAL         0
>-#  endif
>-#endif
>+osf3* | osf4* | osf5*)
>+  version_type=osf
>+  need_lib_prefix=no
>+  need_version=no
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
>+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
>+  ;;
> 
>-/* 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
>+solaris*)
>+  version_type=linux
>+  need_lib_prefix=no
>+  need_version=no
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  shlibpath_overrides_runpath=yes
>+  hardcode_into_libs=yes
>+  # ldd complains unless libraries are executable
>+  postinstall_cmds='chmod +x $lib'
>+  ;;
> 
>-#ifdef __cplusplus
>-extern "C" void exit (int);
>-#endif
>+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
>+  ;;
> 
>-void fnord() { int i=42;}
>-int main ()
>-{
>-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
>-  int status = $lt_dlunknown;
>+sysv4 | sysv4.3*)
>+  version_type=linux
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  case $host_vendor in
>+    sni)
>+      shlibpath_overrides_runpath=no
>+      need_lib_prefix=no
>+      export_dynamic_flag_spec='${wl}-Blargedynsym'
>+      runpath_var=LD_RUN_PATH
>+      ;;
>+    siemens)
>+      need_lib_prefix=no
>+      ;;
>+    motorola)
>+      need_lib_prefix=no
>+      need_version=no
>+      shlibpath_overrides_runpath=no
>+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
>+      ;;
>+  esac
>+  ;;
> 
>-  if (self)
>-    {
>-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
>-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
>-      /* dlclose (self); */
>-    }
>+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
>+  ;;
> 
>-    exit (status);
>-}
>-EOF
>-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
>-  (eval $ac_link) 2>&5
>-  ac_status=$?
>-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
>-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
>-    (./conftest; exit; ) 2>/dev/null
>-    lt_status=$?
>-    case x$lt_status in
>-      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
>-      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
>-      x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
>+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
>+  version_type=freebsd-elf
>+  need_lib_prefix=no
>+  need_version=no
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  hardcode_into_libs=yes
>+  if test "$with_gnu_ld" = yes; then
>+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
>+    shlibpath_overrides_runpath=no
>+  else
>+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
>+    shlibpath_overrides_runpath=yes
>+    case $host_os in
>+      sco3.2v5*)
>+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
>+        ;;
>     esac
>-  else :
>-    # compilation failed
>-    lt_cv_dlopen_self_static=no
>-  fi
> fi
>-rm -fr conftest*
>-
>+  sys_lib_dlsearch_path_spec='/usr/lib'
>+  ;;
> 
>-fi
>-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
>-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
>-    fi
>+uts4*)
>+  version_type=linux
>+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
>+  soname_spec='${libname}${release}${shared_ext}$major'
>+  shlibpath_var=LD_LIBRARY_PATH
>+  ;;
> 
>-    CPPFLAGS="$save_CPPFLAGS"
>-    LDFLAGS="$save_LDFLAGS"
>-    LIBS="$save_LIBS"
>+*)
>+  dynamic_linker=no
>     ;;
>   esac
>+echo "$as_me:$LINENO: result: $dynamic_linker" >&5
>+echo "${ECHO_T}$dynamic_linker" >&6
>+test "$dynamic_linker" = no && can_build_shared=no
> 
>-  case $lt_cv_dlopen_self in
>-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
>-  *) enable_dlopen_self=unknown ;;
>-  esac
>+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
>+if test "$GCC" = yes; then
>+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
>+fi
> 
>-  case $lt_cv_dlopen_self_static in
>-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
>-  *) enable_dlopen_self_static=unknown ;;
>-  esac
>+echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
>+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
>+hardcode_action_GCJ=
>+if test -n "$hardcode_libdir_flag_spec_GCJ" || \
>+   test -n "$runpath_var_GCJ" || \
>+   test "X$hardcode_automatic_GCJ" = "Xyes" ; then
>+
>+  # We can hardcode non-existant directories.
>+  if test "$hardcode_direct_GCJ" != no &&
>+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
>+     # have to relink, otherwise we might link with an installed library
>+     # when we should be linking with a yet-to-be-installed one
>+     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no &&
>+     test "$hardcode_minus_L_GCJ" != no; then
>+    # Linking always hardcodes the temporary library directory.
>+    hardcode_action_GCJ=relink
>+  else
>+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
>+    hardcode_action_GCJ=immediate
>+  fi
>+else
>+  # We cannot hardcode anything, or else we can only hardcode existing
>+  # directories.
>+  hardcode_action_GCJ=unsupported
>+fi
>+echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
>+echo "${ECHO_T}$hardcode_action_GCJ" >&6
>+
>+if test "$hardcode_action_GCJ" = relink; then
>+  # Fast installation is not supported
>+  enable_fast_install=no
>+elif test "$shlibpath_overrides_runpath" = yes ||
>+     test "$enable_shared" = no; then
>+  # Fast installation is not necessary
>+  enable_fast_install=needless
> fi
> 
> 
> # The else clause should only fire when bootstrapping the
>@@ -18378,9 +17713,9 @@
>   fi
>   # Now quote all the things that may contain metacharacters while being
>   # careful not to overquote the AC_SUBSTed values.  We take copies of the
>   # variables and quote the copies for generation of the libtool script.
>-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
>+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
>     SED SHELL STRIP \
>     libname_spec library_names_spec soname_spec extract_expsyms_cmds \
>     old_striplib striplib file_magic_cmd finish_cmds finish_eval \
>     deplibs_check_method reload_flag reload_cmds need_locks \
>@@ -18479,8 +17814,14 @@
> 
> # The host system.
> host_alias=$host_alias
> host=$host
>+host_os=$host_os
>+
>+# The build system.
>+build_alias=$build_alias
>+build=$build
>+build_os=$build_os
> 
> # An echo program that does not interpret backslashes.
> echo=$lt_echo
> 
>@@ -18490,8 +17831,11 @@
> 
> # A C compiler.
> LTCC=$lt_LTCC
> 
>+# LTCC compiler flags.
>+LTCFLAGS=$lt_LTCFLAGS
>+
> # A language-specific compiler.
> CC=$lt_compiler_GCJ
> 
> # Is the compiler the GNU C compiler?
>@@ -18799,17 +18143,44 @@
> 
> # If no C compiler was specified, use CC.
> LTCC=${LTCC-"$CC"}
> 
>+# If no C compiler flags were specified, use CFLAGS.
>+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
>+
> # Allow CC to be a program name with arguments.
> compiler=$CC
> 
> 
>+# save warnings/boilerplate of simple test code
>+ac_outfile=conftest.$ac_objext
>+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
>+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
>+_lt_compiler_boilerplate=`cat conftest.err`
>+$rm conftest*
>+
>+ac_outfile=conftest.$ac_objext
>+printf "$lt_simple_link_test_code" >conftest.$ac_ext
>+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
>+_lt_linker_boilerplate=`cat conftest.err`
>+$rm conftest*
>+
>+
> # Allow CC to be a program name with arguments.
> lt_save_CC="$CC"
> CC=${RC-"windres"}
> compiler=$CC
> compiler_RC=$CC
>+for cc_temp in $compiler""; do
>+  case $cc_temp in
>+    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
>+    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
>+    \-*) ;;
>+    *) break;;
>+  esac
>+done
>+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
>+
> lt_cv_prog_compiler_c_o_RC=yes
> 
> # The else clause should only fire when bootstrapping the
> # libtool distribution, otherwise you forgot to ship ltmain.sh
>@@ -18823,9 +18194,9 @@
>   fi
>   # Now quote all the things that may contain metacharacters while being
>   # careful not to overquote the AC_SUBSTed values.  We take copies of the
>   # variables and quote the copies for generation of the libtool script.
>-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
>+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
>     SED SHELL STRIP \
>     libname_spec library_names_spec soname_spec extract_expsyms_cmds \
>     old_striplib striplib file_magic_cmd finish_cmds finish_eval \
>     deplibs_check_method reload_flag reload_cmds need_locks \
>@@ -18924,8 +18295,14 @@
> 
> # The host system.
> host_alias=$host_alias
> host=$host
>+host_os=$host_os
>+
>+# The build system.
>+build_alias=$build_alias
>+build=$build
>+build_os=$build_os
> 
> # An echo program that does not interpret backslashes.
> echo=$lt_echo
> 
>@@ -18935,8 +18312,11 @@
> 
> # A C compiler.
> LTCC=$lt_LTCC
> 
>+# LTCC compiler flags.
>+LTCFLAGS=$lt_LTCFLAGS
>+
> # A language-specific compiler.
> CC=$lt_compiler_RC
> 
> # Is the compiler the GNU C compiler?
>@@ -21899,8 +21279,24 @@
> 
> fi;
> 
> 
>+echo "$as_me:$LINENO: checking for --enable-64bit" >&5
>+echo $ECHO_N "checking for --enable-64bit... $ECHO_C" >&6
>+# Check whether --enable-64bit or --disable-64bit was given.
>+if test "${enable_64bit+set}" = set; then
>+  enableval="$enable_64bit"
>+
>+  echo "$as_me:$LINENO: result: yes" >&5
>+echo "${ECHO_T}yes" >&6
>+
>+else
>+
>+  echo "$as_me:$LINENO: result: no" >&5
>+echo "${ECHO_T}no" >&6
>+
>+fi;
>+
> # WINNT should be true if building on Windows system not using
> # cygnus, mingw, or the like and using cmd.exe as the shell
> 
> 
>@@ -21922,14 +21318,22 @@
>         platform_libs=""
>     # relative to sysconfdir
>     ;;
>   ia64-hp-hpux*)
>+    if test "$enable_64bit" = "yes"; then
>+      platform_defs="-DXP_UNIX -DHPUX -DHPUX_64"
>+        else
>     platform_defs="-DXP_UNIX -DHPUX"
>+        fi
>     platform="hpux"
>         platform_libs=""
>     ;;
>   hppa*-hp-hpux*)
>+    if test "$enable_64bit" = "yes"; then
>+      platform_defs="-DXP_UNIX -DHPUX -DHPUX_64"
>+    else
>     platform_defs="-DXP_UNIX -DHPUX"
>+    fi
>     platform="hpux"
>     ;;
>   sparc-sun-solaris*)
>     platform_defs="-DXP_UNIX -DSOLARIS"
>Index: depcomp
>===================================================================
>RCS file: /cvs/dirsec/setuputil/depcomp,v
>retrieving revision 1.1
>diff -t -w -U4 -r1.1 depcomp
>--- depcomp	5 Apr 2007 01:53:36 -0000	1.1
>+++ depcomp	13 Apr 2007 20:24:20 -0000
>@@ -1,10 +1,10 @@
> #! /bin/sh
> # depcomp - compile a program generating dependencies as side-effects
> 
>-scriptversion=2004-05-31.23
>+scriptversion=2005-07-09.11
> 
>-# Copyright (C) 1999, 2000, 2003, 2004 Free Software Foundation, Inc.
>+# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
> 
> # This program is free software; you can redistribute it and/or modify
> # it under the terms of the GNU General Public License as published by
> # the Free Software Foundation; either version 2, or (at your option)
>@@ -16,10 +16,10 @@
> # GNU General Public License for more details.
> 
> # You should have received a copy of the GNU General Public License
> # along with this program; if not, write to the Free Software
>-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
>-# 02111-1307, USA.
>+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
>+# 02110-1301, USA.
> 
> # As a special exception to the GNU General Public License, if you
> # distribute this file as part of a program that contains a
> # configuration script generated by Autoconf, you may include it under
>@@ -49,13 +49,13 @@
>   libtool     Whether libtool is used (yes/no).
> 
> Report bugs to <bug-automake@gnu.org>.
> EOF
>-    exit 0
>+    exit $?
>     ;;
>   -v | --v*)
>     echo "depcomp $scriptversion"
>-    exit 0
>+    exit $?
>     ;;
> esac
> 
> if test -z "$depmode" || test -z "$source" || test -z "$object"; then
>@@ -286,38 +286,45 @@
>    test "x$dir" = "x$object" && dir=
>    base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
> 
>    if test "$libtool" = yes; then
>-      # Dependencies are output in .lo.d with libtool 1.4.
>-      # With libtool 1.5 they are output both in $dir.libs/$base.o.d
>-      # and in $dir.libs/$base.o.d and $dir$base.o.d.  We process the
>-      # latter, because the former will be cleaned when $dir.libs is
>-      # erased.
>-      tmpdepfile1="$dir.libs/$base.lo.d"
>-      tmpdepfile2="$dir$base.o.d"
>-      tmpdepfile3="$dir.libs/$base.d"
>+      # With Tru64 cc, shared objects can also be used to make a
>+      # static library.  This mecanism is used in libtool 1.4 series to
>+      # handle both shared and static libraries in a single compilation.
>+      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
>+      #
>+      # With libtool 1.5 this exception was removed, and libtool now
>+      # generates 2 separate objects for the 2 libraries.  These two
>+      # compilations output dependencies in in $dir.libs/$base.o.d and
>+      # in $dir$base.o.d.  We have to check for both files, because
>+      # one of the two compilations can be disabled.  We should prefer
>+      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
>+      # automatically cleaned when .libs/ is deleted, while ignoring
>+      # the former would cause a distcleancheck panic.
>+      tmpdepfile1=$dir.libs/$base.lo.d   # libtool 1.4
>+      tmpdepfile2=$dir$base.o.d          # libtool 1.5
>+      tmpdepfile3=$dir.libs/$base.o.d    # libtool 1.5
>+      tmpdepfile4=$dir.libs/$base.d      # Compaq CCC V6.2-504
>       "$@" -Wc,-MD
>    else
>-      tmpdepfile1="$dir$base.o.d"
>-      tmpdepfile2="$dir$base.d"
>-      tmpdepfile3="$dir$base.d"
>+      tmpdepfile1=$dir$base.o.d
>+      tmpdepfile2=$dir$base.d
>+      tmpdepfile3=$dir$base.d
>+      tmpdepfile4=$dir$base.d
>       "$@" -MD
>    fi
> 
>    stat=$?
>    if test $stat -eq 0; then :
>    else
>-      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
>+      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
>       exit $stat
>    fi
> 
>-   if test -f "$tmpdepfile1"; then
>-      tmpdepfile="$tmpdepfile1"
>-   elif test -f "$tmpdepfile2"; then
>-      tmpdepfile="$tmpdepfile2"
>-   else
>-      tmpdepfile="$tmpdepfile3"
>-   fi
>+   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
>+   do
>+     test -f "$tmpdepfile" && break
>+   done
>    if test -f "$tmpdepfile"; then
>       sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
>       # That's a tab and a space in the [].
>       sed -e 's,^.*\.[a-z]*:[    ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
>@@ -459,9 +466,10 @@
>     esac
>   done
> 
>   "$@" -E |
>-    sed -n '/^# [0-9][0-9]* "$[^"]*$".*/ s:: \1 \\:p' |
>+    sed -n -e '/^# [0-9][0-9]* "$[^"]*$".*/ s:: \1 \\:p' \
>+       -e '/^#line [0-9][0-9]* "$[^"]*$".*/ s:: \1 \\:p' |
>     sed '$ s: \\$::' > "$tmpdepfile"
>   rm -f "$depfile"
>   echo "$object : \\" > "$depfile"
>   cat < "$tmpdepfile" >> "$depfile"
>Index: install-sh
>===================================================================
>RCS file: /cvs/dirsec/setuputil/install-sh,v
>retrieving revision 1.1
>diff -t -w -U4 -r1.1 install-sh
>--- install-sh	5 Apr 2007 01:53:36 -0000	1.1
>+++ install-sh	13 Apr 2007 20:24:20 -0000
>@@ -1,8 +1,8 @@
> #!/bin/sh
> # install - install a program, script, or datafile
> 
>-scriptversion=2004-09-10.20
>+scriptversion=2005-05-14.22
> 
> # This originates from X11R5 (mit/util/scripts/install.sh), which was
> # later released in X11R6 (xc/config/util/install.sh) with the
> # following copyright and license.
>@@ -108,9 +108,9 @@
>         shift
>         shift
>         continue;;
> 
>-    --help) echo "$usage"; exit 0;;
>+    --help) echo "$usage"; exit $?;;
> 
>     -m) chmodcmd="$chmodprog $2"
>         shift
>         shift
>@@ -133,9 +133,9 @@
>     -T) no_target_directory=true
>         shift
>         continue;;
> 
>-    --version) echo "$0 $scriptversion"; exit 0;;
>+    --version) echo "$0 $scriptversion"; exit $?;;
> 
>     *)  # When -d is used, all remaining arguments are directories to create.
>         # When -t is used, the destination is already specified.
>         test -n "$dir_arg$dstarg" && break
>@@ -212,9 +212,9 @@
>     fi
>   fi
> 
>   # This sed command emulates the dirname command.
>-  dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
>+  dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
> 
>   # Make sure that the destination directory exists.
> 
>   # Skip lots of stat calls in the usual case.
>@@ -225,9 +225,10 @@
> 
>     oIFS=$IFS
>     # Some sh's can't handle IFS=/ for some reason.
>     IFS='%'
>-    set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
>+    set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
>+    shift
>     IFS=$oIFS
> 
>     pathcomp=
> 
>@@ -294,9 +295,9 @@
>                $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
>                || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
>                || {
>                  echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
>-                 (exit 1); exit
>+                 (exit 1); exit 1
>                }
>              else
>                :
>              fi
>@@ -305,14 +306,14 @@
>            # Now rename the file to the real destination.
>            $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
>          }
>     }
>-  fi || { (exit 1); exit; }
>+  fi || { (exit 1); exit 1; }
> done
> 
> # The final little trick to "correctly" pass the exit status to the exit trap.
> {
>-  (exit 0); exit
>+  (exit 0); exit 0
> }
> 
> # Local variables:
> # eval: (add-hook 'write-file-hooks 'time-stamp)
>Index: missing
>===================================================================
>RCS file: /cvs/dirsec/setuputil/missing,v
>retrieving revision 1.1
>diff -t -w -U4 -r1.1 missing
>--- missing	5 Apr 2007 01:53:36 -0000	1.1
>+++ missing	13 Apr 2007 20:24:20 -0000
>@@ -1,10 +1,10 @@
> #! /bin/sh
> # Common stub for a few missing GNU programs while installing.
> 
>-scriptversion=2004-09-07.08
>+scriptversion=2005-06-08.21
> 
>-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004
>+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
> #   Free Software Foundation, Inc.
> # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
> 
> # This program is free software; you can redistribute it and/or modify
>@@ -18,10 +18,10 @@
> # GNU General Public License for more details.
> 
> # You should have received a copy of the GNU General Public License
> # along with this program; if not, write to the Free Software
>-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
>-# 02111-1307, USA.
>+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
>+# 02110-1301, USA.
> 
> # As a special exception to the GNU General Public License, if you
> # distribute this file as part of a program that contains a
> # configuration script generated by Autoconf, you may include it under
>@@ -86,14 +86,14 @@
>   tar          try tar, gnutar, gtar, then tar without non-portable flags
>   yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
> 
> Send bug reports to <bug-automake@gnu.org>."
>-    exit 0
>+    exit $?
>     ;;
> 
>   -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
>     echo "missing $scriptversion (GNU Automake)"
>-    exit 0
>+    exit $?
>     ;;
> 
>   -*)
>     echo 1>&2 "$0: Unknown \`$1' option"
>@@ -287,13 +287,20 @@
>          indirectly affecting the aspect of the manual.  The spurious
>          call might also be the consequence of using a buggy \`make' (AIX,
>          DU, IRIX).  You might want to install the \`Texinfo' package or
>          the \`GNU make' package.  Grab either from any GNU archive site."
>+    # The file to touch is that specified with -o ...
>     file=`echo "$*" | sed -n 's/.*-o $[^ ]*$.*/\1/p'`
>     if test -z "$file"; then
>-      file=`echo "$*" | sed 's/.* $[^ ]*$ *$/\1/'`
>-      file=`sed -n '/^@setfilename/ { s/.* $[^ ]*$ *$/\1/; p; q; }' $file`
>-    fi
>+      # ... or it is the one specified with @setfilename ...
>+      infile=`echo "$*" | sed 's/.* $[^ ]*$ *$/\1/'`
>+      file=`sed -n '/^@setfilename/ { s/.* $[^ ]*$ *$/\1/; p; q; }' $infile`
>+      # ... or it is derived from the source name (dir/f.texi becomes f.info)
>+      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
>+    fi
>+    # If the file does not exist, the user really needs makeinfo;
>+    # let's fail without touching anything.
>+    test -f $file || exit 1
>     touch $file
>     ;;
> 
>   tar)

Actions: View | Diff

Attachments on bug 236059: 152585 | 152586 | 152588 | 152728