[opensaml2] 01/24: Imported Upstream version 2.6.0

Ferenc Wágner wferi at moszumanska.debian.org
Tue Aug 30 20:54:57 UTC 2016


This is an automated email from the git hooks/post-receive script.

wferi pushed a commit to branch debian/experimental
in repository opensaml2.

commit eb56bc06a272029ef32f4c54e8f8ec38d936ced1
Merge: bc33175 61193de
Author: Ferenc Wágner <wferi at niif.hu>
Date:   Fri Jul 1 19:57:50 2016 +0200

    Imported Upstream version 2.6.0

 Makefile.am                                        |    2 +-
 Makefile.in                                        |   64 +-
 Projects/vc10/cpp-opensaml2.sln                    |  129 +
 Projects/vc10/saml/saml.vcxproj                    |  346 ++
 {saml => Projects/vc10/saml}/saml.vcxproj.filters  |  273 +-
 .../vc10/samlsign}/samlsign.vcxproj                |   34 +-
 .../vc10/samltest}/samltest.vcxproj                |  398 +-
 .../vc10/samltest}/samltest.vcxproj.filters        |  190 +-
 .../vc14/cpp-opensaml2.sln                         |  254 +-
 Projects/vc14/saml/saml.vcxproj                    |  354 ++
 {saml => Projects/vc14/saml}/saml.vcxproj.filters  | 1073 ++--
 .../vc14/samlsign}/samlsign.vcxproj                |  396 +-
 .../vc14/samltest}/samltest.vcxproj                | 3040 +++++------
 Projects/vc14/samltest/samltest.vcxproj.filters    |  649 +++
 aclocal.m4                                         |  171 +-
 build-aux/compile                                  |  347 --
 build-aux/config.guess                             |   15 +-
 build-aux/config.sub                               |   10 +-
 build-aux/depcomp                                  |    2 +-
 build-aux/install-sh                               |  366 +-
 build-aux/ltmain.sh                                | 5530 +++++++-------------
 build-aux/missing                                  |    6 +-
 config.h.in                                        |    3 +-
 config_win32.h                                     |    6 +-
 configure                                          | 3373 +++++-------
 configure.ac                                       |   21 +-
 doc/LOG4CPP.LICENSE                                |   20 +-
 doc/Makefile.in                                    |   23 +-
 m4/boost.m4                                        |    4 +-
 m4/libtool.m4                                      | 2567 ++++-----
 m4/ltoptions.m4                                    |  127 +-
 m4/ltsugar.m4                                      |    7 +-
 m4/ltversion.m4                                    |   12 +-
 m4/lt~obsolete.m4                                  |    7 +-
 opensaml.spec                                      |   24 +-
 opensaml.spec.in                                   |   22 +-
 saml/Makefile.am                                   |    9 +-
 saml/Makefile.in                                   | 1278 ++---
 saml/saml.rc                                       |   20 +-
 saml/saml.vcxproj                                  |  345 --
 saml/saml1/core/impl/AssertionsImpl.cpp            |    2 +-
 saml/saml2/metadata/AbstractMetadataProvider.h     |   10 +
 saml/saml2/metadata/DynamicMetadataProvider.h      |   10 +
 saml/saml2/metadata/EntityMatcher.h                |    5 +-
 saml/saml2/metadata/Metadata.h                     |   46 +
 saml/saml2/metadata/MetadataFilter.h               |   35 +-
 saml/saml2/metadata/MetadataProvider.h             |   13 +
 .../metadata/impl/AbstractMetadataProvider.cpp     |   59 +-
 .../metadata/impl/DynamicMetadataProvider.cpp      |  122 +-
 saml/saml2/metadata/impl/MetadataImpl.cpp          |  329 +-
 saml/saml2/metadata/impl/MetadataProvider.cpp      |   39 +-
 .../metadata/impl/MetadataSchemaValidators.cpp     |   45 +
 saml/saml2/metadata/impl/NameEntityMatcher.cpp     |    2 +
 .../impl/RegistrationAuthorityEntityMatcher.cpp    |  131 +
 .../metadata/impl/SignatureMetadataFilter.cpp      |   16 +-
 saml/saml2/metadata/impl/XMLMetadataProvider.cpp   |   39 +-
 saml/util/SAMLConstants.cpp                        |   10 +
 saml/util/SAMLConstants.h                          |    6 +
 saml/version.h                                     |    4 +-
 samlsign/Makefile.am                               |    2 +-
 samlsign/Makefile.in                               |   27 +-
 samlsign/samlsign.rc                               |   12 +-
 samltest/Makefile.am                               |    4 +-
 samltest/Makefile.in                               | 2347 +++++----
 .../data/saml2/metadata/HTTPMetadataProvider.xml   |   10 +
 .../data/saml2/metadata/XMLMetadataProvider.xml    |    4 +-
 samltest/saml2/metadata/XMLMetadataProviderTest.h  |   44 +
 samltest/samltest.h                                |    2 +-
 schemas/Makefile.in                                |   23 +-
 69 files changed, 12001 insertions(+), 12914 deletions(-)

diff --cc Makefile.in
index dd349c2,0000000..8efca9a
mode 100644,000000..100644
--- a/Makefile.in
+++ b/Makefile.in
@@@ -1,1041 -1,0 +1,1021 @@@
- # Makefile.in generated by automake 1.15 from Makefile.am.
++# Makefile.in generated by automake 1.13.4 from Makefile.am.
 +# @configure_input@
 +
- # Copyright (C) 1994-2014 Free Software Foundation, Inc.
++# Copyright (C) 1994-2013 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.
 +
 +# This program is distributed in the hope that it will be useful,
 +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
 +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 +# PARTICULAR PURPOSE.
 +
 + at SET_MAKE@
 +
 +# Copyright (C) 2004 Oren Ben-Kiki
 +# This file is distributed under the same terms as the Automake macro files.
 +
 +# Generate automatic documentation using Doxygen. Goals and variables values
 +# are controlled by the various DX_COND_??? conditionals set by autoconf.
 +#
 +# The provided goals are:
 +# doxygen-doc: Generate all doxygen documentation.
 +# doxygen-run: Run doxygen, which will generate some of the documentation
 +#              (HTML, CHM, CHI, MAN, RTF, XML) but will not do the post
 +#              processing required for the rest of it (PS, PDF, and some MAN).
 +# doxygen-man: Rename some doxygen generated man pages.
 +# doxygen-ps: Generate doxygen PostScript documentation.
 +# doxygen-pdf: Generate doxygen PDF documentation.
 +#
 +# Note that by default these are not integrated into the automake goals. If
 +# doxygen is used to generate man pages, you can achieve this integration by
 +# setting man3_MANS to the list of man pages generated and then adding the
 +# dependency:
 +#
 +#   $(man3_MANS): doxygen-doc
 +#
 +# This will cause make to run doxygen and generate all the documentation.
 +#
 +# The following variable is intended for use in Makefile.am:
 +#
 +# DX_CLEANFILES = everything to clean.
 +#
 +# This is usually added to MOSTLYCLEANFILES.
 +
 +VPATH = @srcdir@
- am__is_gnu_make = { \
-   if test -z '$(MAKELEVEL)'; then \
-     false; \
-   elif test -n '$(MAKE_HOST)'; then \
-     true; \
-   elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-     true; \
-   else \
-     false; \
-   fi; \
- }
++am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
 +am__make_running_with_option = \
 +  case $${target_option-} in \
 +      ?) ;; \
 +      *) echo "am__make_running_with_option: internal error: invalid" \
 +              "target option '$${target_option-}' specified" >&2; \
 +         exit 1;; \
 +  esac; \
 +  has_opt=no; \
 +  sane_makeflags=$$MAKEFLAGS; \
 +  if $(am__is_gnu_make); then \
 +    sane_makeflags=$$MFLAGS; \
 +  else \
 +    case $$MAKEFLAGS in \
 +      *\\[\ \	]*) \
 +        bs=\\; \
 +        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
 +          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
 +    esac; \
 +  fi; \
 +  skip_next=no; \
 +  strip_trailopt () \
 +  { \
 +    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
 +  }; \
 +  for flg in $$sane_makeflags; do \
 +    test $$skip_next = yes && { skip_next=no; continue; }; \
 +    case $$flg in \
 +      *=*|--*) continue;; \
 +        -*I) strip_trailopt 'I'; skip_next=yes;; \
 +      -*I?*) strip_trailopt 'I';; \
 +        -*O) strip_trailopt 'O'; skip_next=yes;; \
 +      -*O?*) strip_trailopt 'O';; \
 +        -*l) strip_trailopt 'l'; skip_next=yes;; \
 +      -*l?*) strip_trailopt 'l';; \
 +      -[dEDm]) skip_next=yes;; \
 +      -[JT]) skip_next=yes;; \
 +    esac; \
 +    case $$flg in \
 +      *$$target_option*) has_opt=yes; break;; \
 +    esac; \
 +  done; \
 +  test $$has_opt = yes
 +am__make_dryrun = (target_option=n; $(am__make_running_with_option))
 +am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 +pkgdatadir = $(datadir)/@PACKAGE@
 +pkgincludedir = $(includedir)/@PACKAGE@
 +pkglibdir = $(libdir)/@PACKAGE@
 +pkglibexecdir = $(libexecdir)/@PACKAGE@
 +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 +install_sh_DATA = $(install_sh) -c -m 644
 +install_sh_PROGRAM = $(install_sh) -c
 +install_sh_SCRIPT = $(install_sh) -c
 +INSTALL_HEADER = $(INSTALL_DATA)
 +transform = $(program_transform_name)
 +NORMAL_INSTALL = :
 +PRE_INSTALL = :
 +POST_INSTALL = :
 +NORMAL_UNINSTALL = :
 +PRE_UNINSTALL = :
 +POST_UNINSTALL = :
 +build_triplet = @build@
 +host_triplet = @host@
++DIST_COMMON = $(srcdir)/doxygen.am $(srcdir)/Makefile.in \
++	$(srcdir)/Makefile.am $(top_srcdir)/configure \
++	$(am__configure_deps) $(srcdir)/config.h.in \
++	$(srcdir)/opensaml.spec.in build-aux/config.guess \
++	build-aux/config.sub build-aux/depcomp build-aux/install-sh \
++	build-aux/missing build-aux/ltmain.sh \
++	$(top_srcdir)/build-aux/config.guess \
++	$(top_srcdir)/build-aux/config.sub \
++	$(top_srcdir)/build-aux/install-sh \
++	$(top_srcdir)/build-aux/ltmain.sh \
++	$(top_srcdir)/build-aux/missing
 +subdir = .
 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 +am__aclocal_m4_deps = $(top_srcdir)/m4/acinclude.m4 \
 +	$(top_srcdir)/m4/acx_pthread.m4 \
 +	$(top_srcdir)/m4/ax_create_pkgconfig_info.m4 \
 +	$(top_srcdir)/m4/boost.m4 $(top_srcdir)/m4/doxygen.m4 \
 +	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
 +	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
 +	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
 +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 +	$(ACLOCAL_M4)
- DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
- 	$(am__configure_deps) $(am__DIST_COMMON)
 +am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
 + configure.lineno config.status.lineno
 +mkinstalldirs = $(install_sh) -d
 +CONFIG_HEADER = config.h
 +CONFIG_CLEAN_FILES = opensaml.spec
 +CONFIG_CLEAN_VPATH_FILES =
 +AM_V_P = $(am__v_P_ at AM_V@)
 +am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
 +am__v_P_0 = false
 +am__v_P_1 = :
 +AM_V_GEN = $(am__v_GEN_ at AM_V@)
 +am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
 +am__v_GEN_0 = @echo "  GEN     " $@;
 +am__v_GEN_1 = 
 +AM_V_at = $(am__v_at_ at AM_V@)
 +am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
 +am__v_at_0 = @
 +am__v_at_1 = 
 +SOURCES =
 +DIST_SOURCES =
 +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
 +	ctags-recursive dvi-recursive html-recursive info-recursive \
 +	install-data-recursive install-dvi-recursive \
 +	install-exec-recursive install-html-recursive \
 +	install-info-recursive install-pdf-recursive \
 +	install-ps-recursive install-recursive installcheck-recursive \
 +	installdirs-recursive pdf-recursive ps-recursive \
 +	tags-recursive uninstall-recursive
 +am__can_run_installinfo = \
 +  case $$AM_UPDATE_INFO_DIR in \
 +    n|no|NO) false;; \
 +    *) (install-info --version) >/dev/null 2>&1;; \
 +  esac
 +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 +am__vpath_adj = case $$p in \
 +    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
 +    *) f=$$p;; \
 +  esac;
 +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
 +am__install_max = 40
 +am__nobase_strip_setup = \
 +  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
 +am__nobase_strip = \
 +  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
 +am__nobase_list = $(am__nobase_strip_setup); \
 +  for p in $$list; do echo "$$p $$p"; done | \
 +  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
 +  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
 +    if (++n[$$2] == $(am__install_max)) \
 +      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
 +    END { for (dir in files) print dir, files[dir] }'
 +am__base_list = \
 +  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
 +  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 +am__uninstall_files_from_dir = { \
 +  test -z "$$files" \
 +    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
 +    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
 +         $(am__cd) "$$dir" && rm -f $$files; }; \
 +  }
 +am__installdirs = "$(DESTDIR)$(pkgconfigdir)"
 +DATA = $(pkgconfig_DATA)
 +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
 +  distclean-recursive maintainer-clean-recursive
 +am__recursive_targets = \
 +  $(RECURSIVE_TARGETS) \
 +  $(RECURSIVE_CLEAN_TARGETS) \
 +  $(am__extra_recursive_targets)
 +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
 +	cscope distdir dist dist-all distcheck
 +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
 +	$(LISP)config.h.in
 +# Read a list of newline-separated strings from the standard input,
 +# and print each of them once, without duplicates.  Input order is
 +# *not* preserved.
 +am__uniquify_input = $(AWK) '\
 +  BEGIN { nonempty = 0; } \
 +  { items[$$0] = 1; nonempty = 1; } \
 +  END { if (nonempty) { for (i in items) print i; }; } \
 +'
 +# Make sure the list of sources is unique.  This is necessary because,
 +# e.g., the same source file might be shared among _SOURCES variables
 +# for different programs/libraries.
 +am__define_uniq_tagged_files = \
 +  list='$(am__tagged_files)'; \
 +  unique=`for i in $$list; do \
 +    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 +  done | $(am__uniquify_input)`
 +ETAGS = etags
 +CTAGS = ctags
 +CSCOPE = cscope
 +DIST_SUBDIRS = $(SUBDIRS)
- am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
- 	$(srcdir)/doxygen.am $(srcdir)/opensaml.spec.in \
- 	$(top_srcdir)/build-aux/compile \
- 	$(top_srcdir)/build-aux/config.guess \
- 	$(top_srcdir)/build-aux/config.sub \
- 	$(top_srcdir)/build-aux/install-sh \
- 	$(top_srcdir)/build-aux/ltmain.sh \
- 	$(top_srcdir)/build-aux/missing build-aux/compile \
- 	build-aux/config.guess build-aux/config.sub build-aux/depcomp \
- 	build-aux/install-sh build-aux/ltmain.sh build-aux/missing
 +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 +distdir = $(PACKAGE)-$(VERSION)
 +top_distdir = $(distdir)
 +am__remove_distdir = \
 +  if test -d "$(distdir)"; then \
 +    find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
 +      && rm -rf "$(distdir)" \
 +      || { sleep 5 && rm -rf "$(distdir)"; }; \
 +  else :; fi
 +am__post_remove_distdir = $(am__remove_distdir)
 +am__relativize = \
 +  dir0=`pwd`; \
 +  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
 +  sed_rest='s,^[^/]*/*,,'; \
 +  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
 +  sed_butlast='s,/*[^/]*$$,,'; \
 +  while test -n "$$dir1"; do \
 +    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
 +    if test "$$first" != "."; then \
 +      if test "$$first" = ".."; then \
 +        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
 +        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
 +      else \
 +        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
 +        if test "$$first2" = "$$first"; then \
 +          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
 +        else \
 +          dir2="../$$dir2"; \
 +        fi; \
 +        dir0="$$dir0"/"$$first"; \
 +      fi; \
 +    fi; \
 +    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
 +  done; \
 +  reldir="$$dir2"
 +DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 $(distdir).zip
 +GZIP_ENV = --best
 +DIST_TARGETS = dist-bzip2 dist-gzip dist-zip
 +distuninstallcheck_listfiles = find . -type f -print
 +am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
 +  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
 +distcleancheck_listfiles = find . -type f -print
 +ACLOCAL = @ACLOCAL@
 +AMTAR = @AMTAR@
 +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 +AR = @AR@
 +AUTOCONF = @AUTOCONF@
 +AUTOHEADER = @AUTOHEADER@
 +AUTOMAKE = @AUTOMAKE@
 +AWK = @AWK@
 +BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
 +BOOST_ROOT = @BOOST_ROOT@
 +CC = @CC@
 +CCDEPMODE = @CCDEPMODE@
 +CFLAGS = @CFLAGS@
 +CPP = @CPP@
 +CPPFLAGS = @CPPFLAGS@
 +CXX = @CXX@
 +CXXCPP = @CXXCPP@
 +CXXDEPMODE = @CXXDEPMODE@
 +CXXFLAGS = @CXXFLAGS@
 +CXXTEST = @CXXTEST@
 +CXXTESTFLAGS = @CXXTESTFLAGS@
 +CYGPATH_W = @CYGPATH_W@
 +DEFS = @DEFS@
 +DEPDIR = @DEPDIR@
 +DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
 +DLLTOOL = @DLLTOOL@
 +DOXYGEN_PAPER_SIZE = @DOXYGEN_PAPER_SIZE@
 +DSYMUTIL = @DSYMUTIL@
 +DUMPBIN = @DUMPBIN@
 +DX_CONFIG = @DX_CONFIG@
 +DX_DOCDIR = @DX_DOCDIR@
 +DX_DOT = @DX_DOT@
 +DX_DOXYGEN = @DX_DOXYGEN@
 +DX_DVIPS = @DX_DVIPS@
 +DX_EGREP = @DX_EGREP@
 +DX_ENV = @DX_ENV@
 +DX_FLAG_chi = @DX_FLAG_chi@
 +DX_FLAG_chm = @DX_FLAG_chm@
 +DX_FLAG_doc = @DX_FLAG_doc@
 +DX_FLAG_dot = @DX_FLAG_dot@
 +DX_FLAG_html = @DX_FLAG_html@
 +DX_FLAG_man = @DX_FLAG_man@
 +DX_FLAG_pdf = @DX_FLAG_pdf@
 +DX_FLAG_ps = @DX_FLAG_ps@
 +DX_FLAG_rtf = @DX_FLAG_rtf@
 +DX_FLAG_xml = @DX_FLAG_xml@
 +DX_HHC = @DX_HHC@
 +DX_INCLUDE = @DX_INCLUDE@
 +DX_LATEX = @DX_LATEX@
 +DX_MAKEINDEX = @DX_MAKEINDEX@
 +DX_PDFLATEX = @DX_PDFLATEX@
 +DX_PERL = @DX_PERL@
 +DX_PROJECT = @DX_PROJECT@
 +ECHO_C = @ECHO_C@
 +ECHO_N = @ECHO_N@
 +ECHO_T = @ECHO_T@
 +EGREP = @EGREP@
 +EXEEXT = @EXEEXT@
 +FGREP = @FGREP@
 +GREP = @GREP@
 +INSTALL = @INSTALL@
 +INSTALL_DATA = @INSTALL_DATA@
 +INSTALL_PROGRAM = @INSTALL_PROGRAM@
 +INSTALL_SCRIPT = @INSTALL_SCRIPT@
 +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 +LD = @LD@
 +LDFLAGS = @LDFLAGS@
 +LIBOBJS = @LIBOBJS@
 +LIBS = @LIBS@
 +LIBTOOL = @LIBTOOL@
 +LIPO = @LIPO@
 +LN_S = @LN_S@
 +LOG4CPP_CONFIG = @LOG4CPP_CONFIG@
 +LOG4SHIB_CONFIG = @LOG4SHIB_CONFIG@
 +LTLIBOBJS = @LTLIBOBJS@
- LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 +MAKEINFO = @MAKEINFO@
 +MANIFEST_TOOL = @MANIFEST_TOOL@
 +MKDIR_P = @MKDIR_P@
 +NM = @NM@
 +NMEDIT = @NMEDIT@
 +OBJDUMP = @OBJDUMP@
 +OBJEXT = @OBJEXT@
 +OTOOL = @OTOOL@
 +OTOOL64 = @OTOOL64@
 +PACKAGE = @PACKAGE@
 +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 +PACKAGE_NAME = @PACKAGE_NAME@
 +PACKAGE_STRING = @PACKAGE_STRING@
 +PACKAGE_TARNAME = @PACKAGE_TARNAME@
 +PACKAGE_URL = @PACKAGE_URL@
 +PACKAGE_VERSION = @PACKAGE_VERSION@
 +PATH_SEPARATOR = @PATH_SEPARATOR@
 +PKG_CONFIG = @PKG_CONFIG@
 +PTHREAD_CC = @PTHREAD_CC@
 +PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
 +PTHREAD_LIBS = @PTHREAD_LIBS@
 +RANLIB = @RANLIB@
 +SED = @SED@
 +SET_MAKE = @SET_MAKE@
 +SHELL = @SHELL@
 +STRIP = @STRIP@
 +VERSION = @VERSION@
 +abs_builddir = @abs_builddir@
 +abs_srcdir = @abs_srcdir@
 +abs_top_builddir = @abs_top_builddir@
 +abs_top_srcdir = @abs_top_srcdir@
 +ac_ct_AR = @ac_ct_AR@
 +ac_ct_CC = @ac_ct_CC@
 +ac_ct_CXX = @ac_ct_CXX@
 +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 +acx_pthread_config = @acx_pthread_config@
 +am__include = @am__include@
 +am__leading_dot = @am__leading_dot@
 +am__quote = @am__quote@
 +am__tar = @am__tar@
 +am__untar = @am__untar@
 +bindir = @bindir@
 +build = @build@
 +build_alias = @build_alias@
 +build_cpu = @build_cpu@
 +build_os = @build_os@
 +build_vendor = @build_vendor@
 +builddir = @builddir@
 +datadir = @datadir@
 +datarootdir = @datarootdir@
 +docdir = @docdir@
 +dvidir = @dvidir@
 +exec_prefix = @exec_prefix@
 +host = @host@
 +host_alias = @host_alias@
 +host_cpu = @host_cpu@
 +host_os = @host_os@
 +host_vendor = @host_vendor@
 +htmldir = @htmldir@
 +includedir = @includedir@
 +infodir = @infodir@
 +install_sh = @install_sh@
 +libdir = @libdir@
 +libexecdir = @libexecdir@
 +localedir = @localedir@
 +localstatedir = @localstatedir@
 +mandir = @mandir@
 +mkdir_p = @mkdir_p@
 +oldincludedir = @oldincludedir@
 +pdfdir = @pdfdir@
 +pkgconfig_libdir = @pkgconfig_libdir@
 +pkgconfig_libfile = @pkgconfig_libfile@
 +prefix = @prefix@
 +program_transform_name = @program_transform_name@
 +psdir = @psdir@
 +sbindir = @sbindir@
 +sharedstatedir = @sharedstatedir@
 +srcdir = @srcdir@
 +sysconfdir = @sysconfdir@
 +target_alias = @target_alias@
 +top_build_prefix = @top_build_prefix@
 +top_builddir = @top_builddir@
 +top_srcdir = @top_srcdir@
 +AUTOMAKE_OPTIONS = foreign dist-zip dist-bzip2
 +ACLOCAL_AMFLAGS = -I m4
 + at DX_COND_doc_TRUE@@DX_COND_html_TRUE at DX_CLEAN_HTML = @DX_DOCDIR@/html
 + at DX_COND_chm_TRUE@@DX_COND_doc_TRUE at DX_CLEAN_CHM = @DX_DOCDIR@/chm
 + at DX_COND_chi_TRUE@@DX_COND_chm_TRUE@@DX_COND_doc_TRUE at DX_CLEAN_CHI = @DX_DOCDIR@/@PACKAGE at .chi
 + at DX_COND_doc_TRUE@@DX_COND_man_TRUE at DX_CLEAN_MAN = @DX_DOCDIR@/man
 + at DX_COND_doc_TRUE@@DX_COND_rtf_TRUE at DX_CLEAN_RTF = @DX_DOCDIR@/rtf
 + at DX_COND_doc_TRUE@@DX_COND_xml_TRUE at DX_CLEAN_XML = @DX_DOCDIR@/xml
 + at DX_COND_doc_TRUE@@DX_COND_ps_TRUE at DX_CLEAN_PS = @DX_DOCDIR@/@PACKAGE at .ps
 + at DX_COND_doc_TRUE@@DX_COND_ps_TRUE at DX_PS_GOAL = doxygen-ps
 + at DX_COND_doc_TRUE@@DX_COND_pdf_TRUE at DX_CLEAN_PDF = @DX_DOCDIR@/@PACKAGE at .pdf
 + at DX_COND_doc_TRUE@@DX_COND_pdf_TRUE at DX_PDF_GOAL = doxygen-pdf
 + at DX_COND_doc_TRUE@@DX_COND_latex_TRUE at DX_CLEAN_LATEX = @DX_DOCDIR@/latex
 + at DX_COND_doc_TRUE@DX_CLEANFILES = \
 + at DX_COND_doc_TRUE@    @DX_DOCDIR@/@PACKAGE at .tag \
 + at DX_COND_doc_TRUE@    -r \
 + at DX_COND_doc_TRUE@    $(DX_CLEAN_HTML) \
 + at DX_COND_doc_TRUE@    $(DX_CLEAN_CHM) \
 + at DX_COND_doc_TRUE@    $(DX_CLEAN_CHI) \
 + at DX_COND_doc_TRUE@    $(DX_CLEAN_MAN) \
 + at DX_COND_doc_TRUE@    $(DX_CLEAN_RTF) \
 + at DX_COND_doc_TRUE@    $(DX_CLEAN_XML) \
 + at DX_COND_doc_TRUE@    $(DX_CLEAN_PS) \
 + at DX_COND_doc_TRUE@    $(DX_CLEAN_PDF) \
 + at DX_COND_doc_TRUE@    $(DX_CLEAN_LATEX)
 +
 +MOSTLYCLEANFILES = $(DX_CLEANFILES)
 +DISTCLEANFILES = \
 +	@PACKAGE_NAME at .pc \
 +	@PACKAGE_NAME at .pc.in \
 +	@PACKAGE_NAME at -uninstalled.pc \
 +	@PACKAGE_NAME at -uninstalled.sh
 +
 +SUBDIRS = doc schemas saml samltest samlsign
 +pkgconfigdir = $(libdir)/pkgconfig
 +pkgconfig_DATA = @PACKAGE_NAME at .pc
 +GENFILES = @PACKAGE_NAME at .spec
 +EXTRA_DIST = $(DX_CONFIG) \
- 	cpp-opensaml2.sln \
++	Projects \
 +	config_win32.h \
 +	$(GENFILES) \
 +	$(GENFILES:%=%.in)
 +
 +all: config.h
 +	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 +
 +.SUFFIXES:
 +am--refresh: Makefile
 +	@:
 +$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/doxygen.am $(am__configure_deps)
 +	@for dep in $?; do \
 +	  case '$(am__configure_deps)' in \
 +	    *$$dep*) \
 +	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
 +	      $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
 +		&& exit 0; \
 +	      exit 1;; \
 +	  esac; \
 +	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
 +	$(am__cd) $(top_srcdir) && \
 +	  $(AUTOMAKE) --foreign Makefile
++.PRECIOUS: Makefile
 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 +	@case '$?' in \
 +	  *config.status*) \
 +	    echo ' $(SHELL) ./config.status'; \
 +	    $(SHELL) ./config.status;; \
 +	  *) \
 +	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
 +	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
 +	esac;
- $(srcdir)/doxygen.am $(am__empty):
++$(srcdir)/doxygen.am:
 +
 +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 +	$(SHELL) ./config.status --recheck
 +
 +$(top_srcdir)/configure:  $(am__configure_deps)
 +	$(am__cd) $(srcdir) && $(AUTOCONF)
 +$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 +	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 +$(am__aclocal_m4_deps):
 +
 +config.h: stamp-h1
- 	@test -f $@ || rm -f stamp-h1
- 	@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
++	@if test ! -f $@; then rm -f stamp-h1; else :; fi
++	@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
 +
 +stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
 +	@rm -f stamp-h1
 +	cd $(top_builddir) && $(SHELL) ./config.status config.h
 +$(srcdir)/config.h.in:  $(am__configure_deps) 
 +	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
 +	rm -f stamp-h1
 +	touch $@
 +
 +distclean-hdr:
 +	-rm -f config.h stamp-h1
 +opensaml.spec: $(top_builddir)/config.status $(srcdir)/opensaml.spec.in
 +	cd $(top_builddir) && $(SHELL) ./config.status $@
 +
 +mostlyclean-libtool:
 +	-rm -f *.lo
 +
 +clean-libtool:
 +	-rm -rf .libs _libs
 +
 +distclean-libtool:
 +	-rm -f libtool config.lt
 +install-pkgconfigDATA: $(pkgconfig_DATA)
 +	@$(NORMAL_INSTALL)
 +	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
 +	if test -n "$$list"; then \
 +	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \
 +	  $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \
 +	fi; \
 +	for p in $$list; do \
 +	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 +	  echo "$$d$$p"; \
 +	done | $(am__base_list) | \
 +	while read files; do \
 +	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \
 +	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \
 +	done
 +
 +uninstall-pkgconfigDATA:
 +	@$(NORMAL_UNINSTALL)
 +	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
 +	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 +	dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir)
 +
 +# This directory's subdirectories are mostly independent; you can cd
 +# into them and run 'make' without going through this Makefile.
 +# To change the values of 'make' variables: instead of editing Makefiles,
 +# (1) if the variable is set in 'config.status', edit 'config.status'
 +#     (which will cause the Makefiles to be regenerated when you run 'make');
 +# (2) otherwise, pass the desired values on the 'make' command line.
 +$(am__recursive_targets):
 +	@fail=; \
 +	if $(am__make_keepgoing); then \
 +	  failcom='fail=yes'; \
 +	else \
 +	  failcom='exit 1'; \
 +	fi; \
 +	dot_seen=no; \
 +	target=`echo $@ | sed s/-recursive//`; \
 +	case "$@" in \
 +	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
 +	  *) list='$(SUBDIRS)' ;; \
 +	esac; \
 +	for subdir in $$list; do \
 +	  echo "Making $$target in $$subdir"; \
 +	  if test "$$subdir" = "."; then \
 +	    dot_seen=yes; \
 +	    local_target="$$target-am"; \
 +	  else \
 +	    local_target="$$target"; \
 +	  fi; \
 +	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 +	  || eval $$failcom; \
 +	done; \
 +	if test "$$dot_seen" = "no"; then \
 +	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 +	fi; test -z "$$fail"
 +
 +ID: $(am__tagged_files)
 +	$(am__define_uniq_tagged_files); mkid -fID $$unique
 +tags: tags-recursive
 +TAGS: tags
 +
 +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 +	set x; \
 +	here=`pwd`; \
 +	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 +	  include_option=--etags-include; \
 +	  empty_fix=.; \
 +	else \
 +	  include_option=--include; \
 +	  empty_fix=; \
 +	fi; \
 +	list='$(SUBDIRS)'; for subdir in $$list; do \
 +	  if test "$$subdir" = .; then :; else \
 +	    test ! -f $$subdir/TAGS || \
 +	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 +	  fi; \
 +	done; \
 +	$(am__define_uniq_tagged_files); \
 +	shift; \
 +	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 +	  test -n "$$unique" || unique=$$empty_fix; \
 +	  if test $$# -gt 0; then \
 +	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 +	      "$$@" $$unique; \
 +	  else \
 +	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 +	      $$unique; \
 +	  fi; \
 +	fi
 +ctags: ctags-recursive
 +
 +CTAGS: ctags
 +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 +	$(am__define_uniq_tagged_files); \
 +	test -z "$(CTAGS_ARGS)$$unique" \
 +	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 +	     $$unique
 +
 +GTAGS:
 +	here=`$(am__cd) $(top_builddir) && pwd` \
 +	  && $(am__cd) $(top_srcdir) \
 +	  && gtags -i $(GTAGS_ARGS) "$$here"
 +cscope: cscope.files
 +	test ! -s cscope.files \
 +	  || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
 +clean-cscope:
 +	-rm -f cscope.files
 +cscope.files: clean-cscope cscopelist
 +cscopelist: cscopelist-recursive
 +
 +cscopelist-am: $(am__tagged_files)
 +	list='$(am__tagged_files)'; \
 +	case "$(srcdir)" in \
 +	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
 +	  *) sdir=$(subdir)/$(srcdir) ;; \
 +	esac; \
 +	for i in $$list; do \
 +	  if test -f "$$i"; then \
 +	    echo "$(subdir)/$$i"; \
 +	  else \
 +	    echo "$$sdir/$$i"; \
 +	  fi; \
 +	done >> $(top_builddir)/cscope.files
 +
 +distclean-tags:
 +	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 +	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
 +
 +distdir: $(DISTFILES)
 +	$(am__remove_distdir)
 +	test -d "$(distdir)" || mkdir "$(distdir)"
 +	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 +	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 +	list='$(DISTFILES)'; \
 +	  dist_files=`for file in $$list; do echo $$file; done | \
 +	  sed -e "s|^$$srcdirstrip/||;t" \
 +	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
 +	case $$dist_files in \
 +	  */*) $(MKDIR_P) `echo "$$dist_files" | \
 +			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
 +			   sort -u` ;; \
 +	esac; \
 +	for file in $$dist_files; do \
 +	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 +	  if test -d $$d/$$file; then \
 +	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 +	    if test -d "$(distdir)/$$file"; then \
 +	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 +	    fi; \
 +	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 +	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
 +	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 +	    fi; \
 +	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 +	  else \
 +	    test -f "$(distdir)/$$file" \
 +	    || cp -p $$d/$$file "$(distdir)/$$file" \
 +	    || exit 1; \
 +	  fi; \
 +	done
 +	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 +	  if test "$$subdir" = .; then :; else \
 +	    $(am__make_dryrun) \
 +	      || test -d "$(distdir)/$$subdir" \
 +	      || $(MKDIR_P) "$(distdir)/$$subdir" \
 +	      || exit 1; \
 +	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 +	    $(am__relativize); \
 +	    new_distdir=$$reldir; \
 +	    dir1=$$subdir; dir2="$(top_distdir)"; \
 +	    $(am__relativize); \
 +	    new_top_distdir=$$reldir; \
 +	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
 +	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
 +	    ($(am__cd) $$subdir && \
 +	      $(MAKE) $(AM_MAKEFLAGS) \
 +	        top_distdir="$$new_top_distdir" \
 +	        distdir="$$new_distdir" \
 +		am__remove_distdir=: \
 +		am__skip_length_check=: \
 +		am__skip_mode_fix=: \
 +	        distdir) \
 +	      || exit 1; \
 +	  fi; \
 +	done
 +	-test -n "$(am__skip_mode_fix)" \
 +	|| find "$(distdir)" -type d ! -perm -755 \
 +		-exec chmod u+rwx,go+rx {} \; -o \
 +	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
 +	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
 +	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
 +	|| chmod -R a+r "$(distdir)"
 +dist-gzip: distdir
 +	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
 +	$(am__post_remove_distdir)
 +dist-bzip2: distdir
 +	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
 +	$(am__post_remove_distdir)
 +
 +dist-lzip: distdir
 +	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
 +	$(am__post_remove_distdir)
 +
 +dist-xz: distdir
 +	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
 +	$(am__post_remove_distdir)
 +
 +dist-tarZ: distdir
- 	@echo WARNING: "Support for distribution archives compressed with" \
- 		       "legacy program 'compress' is deprecated." >&2
- 	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 +	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
 +	$(am__post_remove_distdir)
 +
 +dist-shar: distdir
- 	@echo WARNING: "Support for shar distribution archives is" \
- 	               "deprecated." >&2
- 	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 +	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
 +	$(am__post_remove_distdir)
 +dist-zip: distdir
 +	-rm -f $(distdir).zip
 +	zip -rq $(distdir).zip $(distdir)
 +	$(am__post_remove_distdir)
 +
 +dist dist-all:
 +	$(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
 +	$(am__post_remove_distdir)
 +
 +# This target untars the dist file and tries a VPATH configuration.  Then
 +# it guarantees that the distribution is self-contained by making another
 +# tarfile.
 +distcheck: dist
 +	case '$(DIST_ARCHIVES)' in \
 +	*.tar.gz*) \
 +	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
 +	*.tar.bz2*) \
 +	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
 +	*.tar.lz*) \
 +	  lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
 +	*.tar.xz*) \
 +	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
 +	*.tar.Z*) \
 +	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
 +	*.shar.gz*) \
 +	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
 +	*.zip*) \
 +	  unzip $(distdir).zip ;;\
 +	esac
 +	chmod -R a-w $(distdir)
 +	chmod u+w $(distdir)
- 	mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
++	mkdir $(distdir)/_build $(distdir)/_inst
 +	chmod a-w $(distdir)
 +	test -d $(distdir)/_build || exit 0; \
 +	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
 +	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
 +	  && am__cwd=`pwd` \
- 	  && $(am__cd) $(distdir)/_build/sub \
- 	  && ../../configure \
++	  && $(am__cd) $(distdir)/_build \
++	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
 +	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
 +	    $(DISTCHECK_CONFIGURE_FLAGS) \
- 	    --srcdir=../.. --prefix="$$dc_install_base" \
 +	  && $(MAKE) $(AM_MAKEFLAGS) \
 +	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
 +	  && $(MAKE) $(AM_MAKEFLAGS) check \
 +	  && $(MAKE) $(AM_MAKEFLAGS) install \
 +	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
 +	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
 +	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
 +	        distuninstallcheck \
 +	  && chmod -R a-w "$$dc_install_base" \
 +	  && ({ \
 +	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
 +	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
 +	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
 +	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
 +	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
 +	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
 +	  && rm -rf "$$dc_destdir" \
 +	  && $(MAKE) $(AM_MAKEFLAGS) dist \
 +	  && rm -rf $(DIST_ARCHIVES) \
 +	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
 +	  && cd "$$am__cwd" \
 +	  || exit 1
 +	$(am__post_remove_distdir)
 +	@(echo "$(distdir) archives ready for distribution: "; \
 +	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
 +	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
 +distuninstallcheck:
 +	@test -n '$(distuninstallcheck_dir)' || { \
 +	  echo 'ERROR: trying to run $@ with an empty' \
 +	       '$$(distuninstallcheck_dir)' >&2; \
 +	  exit 1; \
 +	}; \
 +	$(am__cd) '$(distuninstallcheck_dir)' || { \
 +	  echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
 +	  exit 1; \
 +	}; \
 +	test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
 +	   || { echo "ERROR: files left after uninstall:" ; \
 +	        if test -n "$(DESTDIR)"; then \
 +	          echo "  (check DESTDIR support)"; \
 +	        fi ; \
 +	        $(distuninstallcheck_listfiles) ; \
 +	        exit 1; } >&2
 +distcleancheck: distclean
 +	@if test '$(srcdir)' = . ; then \
 +	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
 +	  exit 1 ; \
 +	fi
 +	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
 +	  || { echo "ERROR: files left in build directory after distclean:" ; \
 +	       $(distcleancheck_listfiles) ; \
 +	       exit 1; } >&2
 +check-am: all-am
 +check: check-recursive
 +all-am: Makefile $(DATA) config.h all-local
 +installdirs: installdirs-recursive
 +installdirs-am:
 +	for dir in "$(DESTDIR)$(pkgconfigdir)"; do \
 +	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 +	done
 +install: install-recursive
 +install-exec: install-exec-recursive
 +install-data: install-data-recursive
 +uninstall: uninstall-recursive
 +
 +install-am: all-am
 +	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 +
 +installcheck: installcheck-recursive
 +install-strip:
 +	if test -z '$(STRIP)'; then \
 +	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 +	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 +	      install; \
 +	else \
 +	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 +	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 +	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
 +	fi
 +mostlyclean-generic:
 +	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 +
 +clean-generic:
 +
 +distclean-generic:
 +	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 +	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 +	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 +
 +maintainer-clean-generic:
 +	@echo "This command is intended for maintainers to use"
 +	@echo "it deletes files that may require special tools to rebuild."
 +clean: clean-recursive
 +
 +clean-am: clean-generic clean-libtool mostlyclean-am
 +
 +distclean: distclean-recursive
 +	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
 +	-rm -f Makefile
 +distclean-am: clean-am distclean-generic distclean-hdr \
 +	distclean-libtool distclean-tags
 +
 +dvi: dvi-recursive
 +
 +dvi-am:
 +
 +html: html-recursive
 +
 +html-am:
 +
 +info: info-recursive
 +
 +info-am:
 +
 +install-data-am: install-pkgconfigDATA
 +
 +install-dvi: install-dvi-recursive
 +
 +install-dvi-am:
 +
 +install-exec-am:
 +
 +install-html: install-html-recursive
 +
 +install-html-am:
 +
 +install-info: install-info-recursive
 +
 +install-info-am:
 +
 +install-man:
 +
 +install-pdf: install-pdf-recursive
 +
 +install-pdf-am:
 +
 +install-ps: install-ps-recursive
 +
 +install-ps-am:
 +
 +installcheck-am:
 +
 +maintainer-clean: maintainer-clean-recursive
 +	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
 +	-rm -rf $(top_srcdir)/autom4te.cache
 +	-rm -f Makefile
 +maintainer-clean-am: distclean-am maintainer-clean-generic
 +
 +mostlyclean: mostlyclean-recursive
 +
 +mostlyclean-am: mostlyclean-generic mostlyclean-libtool
 +
 +pdf: pdf-recursive
 +
 +pdf-am:
 +
 +ps: ps-recursive
 +
 +ps-am:
 +
 +uninstall-am: uninstall-pkgconfigDATA
 +
 +.MAKE: $(am__recursive_targets) all install-am install-strip
 +
 +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am all-local \
 +	am--refresh check check-am clean clean-cscope clean-generic \
 +	clean-libtool cscope cscopelist-am ctags ctags-am dist \
 +	dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \
 +	dist-xz dist-zip distcheck distclean distclean-generic \
 +	distclean-hdr distclean-libtool distclean-tags distcleancheck \
 +	distdir distuninstallcheck dvi dvi-am html html-am info \
 +	info-am install install-am install-data install-data-am \
 +	install-dvi install-dvi-am install-exec install-exec-am \
 +	install-html install-html-am install-info install-info-am \
 +	install-man install-pdf install-pdf-am install-pkgconfigDATA \
 +	install-ps install-ps-am install-strip installcheck \
 +	installcheck-am installdirs installdirs-am maintainer-clean \
 +	maintainer-clean-generic mostlyclean mostlyclean-generic \
 +	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
 +	uninstall-am uninstall-pkgconfigDATA
 +
- .PRECIOUS: Makefile
- 
 +
 + at DX_COND_doc_TRUE@@DX_COND_ps_TRUE at doxygen-ps: @DX_DOCDIR@/@PACKAGE at .ps
 +
 + at DX_COND_doc_TRUE@@DX_COND_ps_TRUE@@DX_DOCDIR@/@PACKAGE at .ps: @DX_DOCDIR@/@PACKAGE at .tag
 + at DX_COND_doc_TRUE@@DX_COND_ps_TRUE@	cd @DX_DOCDIR@/latex; \
 + at DX_COND_doc_TRUE@@DX_COND_ps_TRUE@	rm -f *.aux *.toc *.idx *.ind *.ilg *.log *.out; \
 + at DX_COND_doc_TRUE@@DX_COND_ps_TRUE@	$(DX_LATEX) refman.tex; \
 + at DX_COND_doc_TRUE@@DX_COND_ps_TRUE@	$(MAKEINDEX_PATH) refman.idx; \
 + at DX_COND_doc_TRUE@@DX_COND_ps_TRUE@	$(DX_LATEX) refman.tex; \
 + at DX_COND_doc_TRUE@@DX_COND_ps_TRUE@	countdown=5; \
 + at DX_COND_doc_TRUE@@DX_COND_ps_TRUE@	while $(DX_EGREP) 'Rerun (LaTeX|to get cross-references right)' \
 + at DX_COND_doc_TRUE@@DX_COND_ps_TRUE@	                  refman.log > /dev/null 2>&1 \
 + at DX_COND_doc_TRUE@@DX_COND_ps_TRUE@	   && test $$countdown -gt 0; do \
 + at DX_COND_doc_TRUE@@DX_COND_ps_TRUE@	    $(DX_LATEX) refman.tex; \
 + at DX_COND_doc_TRUE@@DX_COND_ps_TRUE@	    countdown=`expr $$countdown - 1`; \
 + at DX_COND_doc_TRUE@@DX_COND_ps_TRUE@	done; \
 + at DX_COND_doc_TRUE@@DX_COND_ps_TRUE@	$(DX_DVIPS) -o ../@PACKAGE at .ps refman.dvi
 +
 + at DX_COND_doc_TRUE@@DX_COND_pdf_TRUE at doxygen-pdf: @DX_DOCDIR@/@PACKAGE at .pdf
 +
 + at DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@@DX_DOCDIR@/@PACKAGE at .pdf: @DX_DOCDIR@/@PACKAGE at .tag
 + at DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@	cd @DX_DOCDIR@/latex; \
 + at DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@	rm -f *.aux *.toc *.idx *.ind *.ilg *.log *.out; \
 + at DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@	$(DX_PDFLATEX) refman.tex; \
 + at DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@	$(DX_MAKEINDEX) refman.idx; \
 + at DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@	$(DX_PDFLATEX) refman.tex; \
 + at DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@	countdown=5; \
 + at DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@	while $(DX_EGREP) 'Rerun (LaTeX|to get cross-references right)' \
 + at DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@	                  refman.log > /dev/null 2>&1 \
 + at DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@	   && test $$countdown -gt 0; do \
 + at DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@	    $(DX_PDFLATEX) refman.tex; \
 + at DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@	    countdown=`expr $$countdown - 1`; \
 + at DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@	done; \
 + at DX_COND_doc_TRUE@@DX_COND_pdf_TRUE@	mv refman.pdf ../@PACKAGE at .pdf
 +
 + at DX_COND_doc_TRUE@.PHONY: doxygen-run doxygen-doc $(DX_PS_GOAL) $(DX_PDF_GOAL)
 +
 + at DX_COND_doc_TRUE@.INTERMEDIATE: doxygen-run $(DX_PS_GOAL) $(DX_PDF_GOAL)
 +
 + at DX_COND_doc_TRUE@doxygen-run: @DX_DOCDIR@/@PACKAGE at .tag
 +
 + at DX_COND_doc_TRUE@doxygen-doc: doxygen-run $(DX_PS_GOAL) $(DX_PDF_GOAL)
 +
 + at DX_COND_doc_TRUE@@DX_DOCDIR@/@PACKAGE at .tag: $(DX_CONFIG) $(pkginclude_HEADERS)
 + at DX_COND_doc_TRUE@	rm -rf @DX_DOCDIR@
 + at DX_COND_doc_TRUE@	$(DX_ENV) DX_INCLUDE=$(DX_INCLUDE) $(DX_DOXYGEN) $(srcdir)/$(DX_CONFIG)
 +
 + at DX_COND_doc_TRUE@all-local: doxygen-doc
 + at DX_COND_doc_FALSE@all-local:
 +
 +# Tell versions [3.59,3.63) of GNU make to not export all variables.
 +# Otherwise a system limit (for SysV at least) may be exceeded.
 +.NOEXPORT:
diff --cc aclocal.m4
index a1bc4d5,0000000..cc0dd3d
mode 100644,000000..100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@@ -1,1162 -1,0 +1,1049 @@@
- # generated automatically by aclocal 1.15 -*- Autoconf -*-
++# generated automatically by aclocal 1.13.4 -*- Autoconf -*-
 +
- # Copyright (C) 1996-2014 Free Software Foundation, Inc.
++# Copyright (C) 1996-2013 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 distributed in the hope that it will be useful,
 +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
 +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 +# PARTICULAR PURPOSE.
 +
 +m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
 +m4_ifndef([AC_AUTOCONF_VERSION],
 +  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
 +[m4_warning([this file was generated for autoconf 2.69.
 +You have another version of autoconf.  It may work, but is not guaranteed to.
 +If you have problems, you may need to regenerate the build system entirely.
 +To do so, use the procedure documented by the package, typically 'autoreconf'.])])
 +
- # Copyright (C) 2002-2014 Free Software Foundation, Inc.
++# Copyright (C) 2002-2013 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
 +# generated from the m4 files accompanying Automake X.Y.
 +# (This private macro should not be called outside this file.)
 +AC_DEFUN([AM_AUTOMAKE_VERSION],
- [am__api_version='1.15'
++[am__api_version='1.13'
 +dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 +dnl require some minimum version.  Point them to the right macro.
- m4_if([$1], [1.15], [],
++m4_if([$1], [1.13.4], [],
 +      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 +])
 +
 +# _AM_AUTOCONF_VERSION(VERSION)
 +# -----------------------------
 +# aclocal traces this macro to find the Autoconf version.
 +# This is a private macro too.  Using m4_define simplifies
 +# the logic in aclocal, which can simply ignore this definition.
 +m4_define([_AM_AUTOCONF_VERSION], [])
 +
 +# AM_SET_CURRENT_AUTOMAKE_VERSION
 +# -------------------------------
 +# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 +# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 +AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
- [AM_AUTOMAKE_VERSION([1.15])dnl
++[AM_AUTOMAKE_VERSION([1.13.4])dnl
 +m4_ifndef([AC_AUTOCONF_VERSION],
 +  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 +_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 +
 +# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 +
- # Copyright (C) 2001-2014 Free Software Foundation, Inc.
++# Copyright (C) 2001-2013 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/../..'.
 +#
 +# Of course, Automake must honor this variable whenever it calls a
 +# tool from the auxiliary directory.  The problem is that $srcdir (and
 +# therefore $ac_aux_dir as well) can be either absolute or relative,
 +# depending on how configure is run.  This is pretty annoying, since
 +# it makes $ac_aux_dir quite unusable in subdirectories: in the top
 +# source directory, any form will work fine, but in subdirectories a
 +# relative path needs to be adjusted first.
 +#
 +# $ac_aux_dir/missing
 +#    fails when called from a subdirectory if $ac_aux_dir is relative
 +# $top_srcdir/$ac_aux_dir/missing
 +#    fails if $ac_aux_dir is absolute,
 +#    fails when called from a subdirectory in a VPATH build with
 +#          a relative $ac_aux_dir
 +#
 +# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
 +# are both prefixed by $srcdir.  In an in-source build this is usually
 +# harmless because $srcdir is '.', but things will broke when you
 +# start a VPATH build or use an absolute $srcdir.
 +#
 +# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
 +# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
 +#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
 +# and then we would define $MISSING as
 +#   MISSING="\${SHELL} $am_aux_dir/missing"
 +# This will work as long as MISSING is not called from configure, because
 +# unfortunately $(top_srcdir) has no meaning in configure.
 +# However there are other variables, like CC, which are often used in
 +# configure, and could therefore not use this "fixed" $ac_aux_dir.
 +#
 +# Another solution, used here, is to always expand $ac_aux_dir to an
 +# absolute PATH.  The drawback is that using absolute paths prevent a
 +# configured tree to be moved without reconfiguration.
 +
 +AC_DEFUN([AM_AUX_DIR_EXPAND],
- [AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
- # Expand $ac_aux_dir to an absolute path.
- am_aux_dir=`cd "$ac_aux_dir" && pwd`
++[dnl Rely on autoconf to set up CDPATH properly.
++AC_PREREQ([2.50])dnl
++# expand $ac_aux_dir to an absolute path
++am_aux_dir=`cd $ac_aux_dir && pwd`
 +])
 +
 +# AM_CONDITIONAL                                            -*- Autoconf -*-
 +
- # Copyright (C) 1997-2014 Free Software Foundation, Inc.
++# Copyright (C) 1997-2013 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_CONDITIONAL(NAME, SHELL-CONDITION)
 +# -------------------------------------
 +# Define a conditional.
 +AC_DEFUN([AM_CONDITIONAL],
 +[AC_PREREQ([2.52])dnl
 + m4_if([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
 +       [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
 +AC_SUBST([$1_TRUE])dnl
 +AC_SUBST([$1_FALSE])dnl
 +_AM_SUBST_NOTMAKE([$1_TRUE])dnl
 +_AM_SUBST_NOTMAKE([$1_FALSE])dnl
 +m4_define([_AM_COND_VALUE_$1], [$2])dnl
 +if $2; then
 +  $1_TRUE=
 +  $1_FALSE='#'
 +else
 +  $1_TRUE='#'
 +  $1_FALSE=
 +fi
 +AC_CONFIG_COMMANDS_PRE(
 +[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
 +  AC_MSG_ERROR([[conditional "$1" was never defined.
 +Usually this means the macro was only invoked conditionally.]])
 +fi])])
 +
- # Copyright (C) 1999-2014 Free Software Foundation, Inc.
++# Copyright (C) 1999-2013 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.
 +
 +
 +# 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", "OBJC", "OBJCXX", "UPC", or "GJC".
 +# We try a few techniques and use that to set a single cache variable.
 +#
 +# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
 +# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
 +# dependency, and given that the user is not expected to run this macro,
 +# just rely on AC_PROG_CC.
 +AC_DEFUN([_AM_DEPENDENCIES],
 +[AC_REQUIRE([AM_SET_DEPDIR])dnl
 +AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
 +AC_REQUIRE([AM_MAKE_INCLUDE])dnl
 +AC_REQUIRE([AM_DEP_TRACK])dnl
 +
 +m4_if([$1], [CC],   [depcc="$CC"   am_compiler_list=],
 +      [$1], [CXX],  [depcc="$CXX"  am_compiler_list=],
 +      [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
 +      [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'],
 +      [$1], [UPC],  [depcc="$UPC"  am_compiler_list=],
 +      [$1], [GCJ],  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
 +                    [depcc="$$1"   am_compiler_list=])
 +
 +AC_CACHE_CHECK([dependency style of $depcc],
 +               [am_cv_$1_dependencies_compiler_type],
 +[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
 +  # We make a subdir and do the tests there.  Otherwise we can end up
 +  # making bogus files that we don't know about and never remove.  For
 +  # instance it was reported that on HP-UX the gcc test will end up
 +  # making a dummy file named 'D' -- because '-MD' means "put the output
 +  # in D".
 +  rm -rf conftest.dir
 +  mkdir conftest.dir
 +  # Copy depcomp to subdir because otherwise we won't find it if we're
 +  # using a relative directory.
 +  cp "$am_depcomp" conftest.dir
 +  cd conftest.dir
 +  # We will build objects and dependencies in a subdirectory because
 +  # it helps to detect inapplicable dependency modes.  For instance
 +  # both Tru64's cc and ICC support -MD to output dependencies as a
 +  # side effect of compilation, but ICC will put the dependencies in
 +  # the current directory while Tru64 will put them in the object
 +  # directory.
 +  mkdir sub
 +
 +  am_cv_$1_dependencies_compiler_type=none
 +  if test "$am_compiler_list" = ""; then
 +     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
 +  fi
 +  am__universal=false
 +  m4_case([$1], [CC],
 +    [case " $depcc " in #(
 +     *\ -arch\ *\ -arch\ *) am__universal=true ;;
 +     esac],
 +    [CXX],
 +    [case " $depcc " in #(
 +     *\ -arch\ *\ -arch\ *) am__universal=true ;;
 +     esac])
 +
 +  for depmode in $am_compiler_list; do
 +    # Setup a source with many dependencies, because some compilers
 +    # like to wrap large dependency lists on column 80 (with \), and
 +    # we should not choose a depcomp mode which is confused by this.
 +    #
 +    # We need to recreate these files for each test, as the compiler may
 +    # overwrite some of them when testing with obscure command lines.
 +    # This happens at least with the AIX C compiler.
 +    : > sub/conftest.c
 +    for i in 1 2 3 4 5 6; do
 +      echo '#include "conftst'$i'.h"' >> sub/conftest.c
 +      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
 +      # Solaris 10 /bin/sh.
 +      echo '/* dummy */' > sub/conftst$i.h
 +    done
 +    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 +
 +    # We check with '-c' and '-o' for the sake of the "dashmstdout"
 +    # mode.  It turns out that the SunPro C++ compiler does not properly
 +    # handle '-M -o', and we need to detect this.  Also, some Intel
 +    # versions had trouble with output in subdirs.
 +    am__obj=sub/conftest.${OBJEXT-o}
 +    am__minus_obj="-o $am__obj"
 +    case $depmode in
 +    gcc)
 +      # This depmode causes a compiler race in universal mode.
 +      test "$am__universal" = false || continue
 +      ;;
 +    nosideeffect)
 +      # After this tag, mechanisms are not by side-effect, so they'll
 +      # only be used when explicitly requested.
 +      if test "x$enable_dependency_tracking" = xyes; then
 +	continue
 +      else
 +	break
 +      fi
 +      ;;
 +    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
 +      # This compiler won't grok '-c -o', but also, the minuso test has
 +      # not run yet.  These depmodes are late enough in the game, and
 +      # so weak that their functioning should not be impacted.
 +      am__obj=conftest.${OBJEXT-o}
 +      am__minus_obj=
 +      ;;
 +    none) break ;;
 +    esac
 +    if depmode=$depmode \
 +       source=sub/conftest.c object=$am__obj \
 +       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
 +       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
 +         >/dev/null 2>conftest.err &&
 +       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
 +       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
 +       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
 +       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
 +      # icc doesn't choke on unknown options, it will just issue warnings
 +      # or remarks (even with -Werror).  So we grep stderr for any message
 +      # that says an option was ignored or not supported.
 +      # When given -MP, icc 7.0 and 7.1 complain thusly:
 +      #   icc: Command line warning: ignoring option '-M'; no argument required
 +      # The diagnosis changed in icc 8.0:
 +      #   icc: Command line remark: option '-MP' not supported
 +      if (grep 'ignoring option' conftest.err ||
 +          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
 +        am_cv_$1_dependencies_compiler_type=$depmode
 +        break
 +      fi
 +    fi
 +  done
 +
 +  cd ..
 +  rm -rf conftest.dir
 +else
 +  am_cv_$1_dependencies_compiler_type=none
 +fi
 +])
 +AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
 +AM_CONDITIONAL([am__fastdep$1], [
 +  test "x$enable_dependency_tracking" != xno \
 +  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
 +])
 +
 +
 +# AM_SET_DEPDIR
 +# -------------
 +# Choose a directory name for dependency files.
 +# This macro is AC_REQUIREd in _AM_DEPENDENCIES.
 +AC_DEFUN([AM_SET_DEPDIR],
 +[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
 +AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
 +])
 +
 +
 +# AM_DEP_TRACK
 +# ------------
 +AC_DEFUN([AM_DEP_TRACK],
 +[AC_ARG_ENABLE([dependency-tracking], [dnl
 +AS_HELP_STRING(
 +  [--enable-dependency-tracking],
 +  [do not reject slow dependency extractors])
 +AS_HELP_STRING(
 +  [--disable-dependency-tracking],
 +  [speeds up one-time build])])
 +if test "x$enable_dependency_tracking" != xno; then
 +  am_depcomp="$ac_aux_dir/depcomp"
 +  AMDEPBACKSLASH='\'
 +  am__nodep='_no'
 +fi
 +AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
 +AC_SUBST([AMDEPBACKSLASH])dnl
 +_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
 +AC_SUBST([am__nodep])dnl
 +_AM_SUBST_NOTMAKE([am__nodep])dnl
 +])
 +
 +# Generate code to set up dependency tracking.              -*- Autoconf -*-
 +
- # Copyright (C) 1999-2014 Free Software Foundation, Inc.
++# Copyright (C) 1999-2013 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_OUTPUT_DEPENDENCY_COMMANDS
 +# ------------------------------
 +AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
 +[{
 +  # Older Autoconf quotes --file arguments for eval, but not when files
 +  # are listed without --file.  Let's play safe and only enable the eval
 +  # if we detect the quoting.
 +  case $CONFIG_FILES in
 +  *\'*) eval set x "$CONFIG_FILES" ;;
 +  *)   set x $CONFIG_FILES ;;
 +  esac
 +  shift
 +  for mf
 +  do
 +    # Strip MF so we end up with the name of the file.
 +    mf=`echo "$mf" | sed -e 's/:.*$//'`
 +    # Check whether this is an Automake generated Makefile or not.
 +    # We used to match only the files named 'Makefile.in', but
 +    # some people rename them; so instead we look at the file content.
 +    # Grep'ing the first line is not enough: some people post-process
 +    # each Makefile.in and add a new line on top of each file to say so.
 +    # Grep'ing the whole file is not good either: AIX grep has a line
 +    # limit of 2048, but all sed's we know have understand at least 4000.
 +    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
 +      dirpart=`AS_DIRNAME("$mf")`
 +    else
 +      continue
 +    fi
 +    # Extract the definition of DEPDIR, am__include, and am__quote
 +    # from the Makefile without running 'make'.
 +    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
 +    test -z "$DEPDIR" && continue
 +    am__include=`sed -n 's/^am__include = //p' < "$mf"`
 +    test -z "$am__include" && continue
 +    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
 +    # Find all dependency output files, they are included files with
 +    # $(DEPDIR) in their names.  We invoke sed twice because it is the
 +    # simplest approach to changing $(DEPDIR) to its actual value in the
 +    # expansion.
 +    for file in `sed -n "
 +      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
 +	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
 +      # Make sure the directory exists.
 +      test -f "$dirpart/$file" && continue
 +      fdir=`AS_DIRNAME(["$file"])`
 +      AS_MKDIR_P([$dirpart/$fdir])
 +      # echo "creating $dirpart/$file"
 +      echo '# dummy' > "$dirpart/$file"
 +    done
 +  done
 +}
 +])# _AM_OUTPUT_DEPENDENCY_COMMANDS
 +
 +
 +# AM_OUTPUT_DEPENDENCY_COMMANDS
 +# -----------------------------
 +# This macro should only be invoked once -- use via AC_REQUIRE.
 +#
 +# This code is only required when automatic dependency tracking
 +# is enabled.  FIXME.  This creates each '.P' file that we will
 +# need in order to bootstrap the dependency handling code.
 +AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 +[AC_CONFIG_COMMANDS([depfiles],
 +     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
 +     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
 +])
 +
 +# Do all the work for Automake.                             -*- Autoconf -*-
 +
- # Copyright (C) 1996-2014 Free Software Foundation, Inc.
++# Copyright (C) 1996-2013 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 macro actually does too much.  Some checks are only needed if
 +# your package does certain things.  But this isn't really a big deal.
 +
- dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
- m4_define([AC_PROG_CC],
- m4_defn([AC_PROG_CC])
- [_AM_PROG_CC_C_O
- ])
- 
 +# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
 +# AM_INIT_AUTOMAKE([OPTIONS])
 +# -----------------------------------------------
 +# The call with PACKAGE and VERSION arguments is the old style
 +# call (pre autoconf-2.50), which is being phased out.  PACKAGE
 +# and VERSION should now be passed to AC_INIT and removed from
 +# the call to AM_INIT_AUTOMAKE.
 +# We support both call styles for the transition.  After
 +# the next Automake release, Autoconf can make the AC_INIT
 +# arguments mandatory, and then we can depend on a new Autoconf
 +# release and drop the old call support.
 +AC_DEFUN([AM_INIT_AUTOMAKE],
 +[AC_PREREQ([2.65])dnl
 +dnl Autoconf wants to disallow AM_ names.  We explicitly allow
 +dnl the ones we care about.
 +m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
 +AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
 +AC_REQUIRE([AC_PROG_INSTALL])dnl
 +if test "`cd $srcdir && pwd`" != "`pwd`"; then
 +  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
 +  # is not polluted with repeated "-I."
 +  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
 +  # test to see if srcdir already configured
 +  if test -f $srcdir/config.status; then
 +    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
 +  fi
 +fi
 +
 +# test whether we have cygpath
 +if test -z "$CYGPATH_W"; then
 +  if (cygpath --version) >/dev/null 2>/dev/null; then
 +    CYGPATH_W='cygpath -w'
 +  else
 +    CYGPATH_W=echo
 +  fi
 +fi
 +AC_SUBST([CYGPATH_W])
 +
 +# Define the identity of the package.
 +dnl Distinguish between old-style and new-style calls.
 +m4_ifval([$2],
 +[AC_DIAGNOSE([obsolete],
 +             [$0: two- and three-arguments forms are deprecated.])
 +m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
 + AC_SUBST([PACKAGE], [$1])dnl
 + AC_SUBST([VERSION], [$2])],
 +[_AM_SET_OPTIONS([$1])dnl
 +dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
 +m4_if(
 +  m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
 +  [ok:ok],,
 +  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
 + AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
 + AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
 +
 +_AM_IF_OPTION([no-define],,
 +[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
 + AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl
 +
 +# Some tools Automake needs.
 +AC_REQUIRE([AM_SANITY_CHECK])dnl
 +AC_REQUIRE([AC_ARG_PROGRAM])dnl
 +AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
 +AM_MISSING_PROG([AUTOCONF], [autoconf])
 +AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
 +AM_MISSING_PROG([AUTOHEADER], [autoheader])
 +AM_MISSING_PROG([MAKEINFO], [makeinfo])
 +AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
 +AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
 +AC_REQUIRE([AC_PROG_MKDIR_P])dnl
 +# For better backward compatibility.  To be removed once Automake 1.9.x
 +# dies out for good.  For more background, see:
 +# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
 +# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
 +AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
- # We need awk for the "check" target (and possibly the TAP driver).  The
- # system "awk" is bad on some platforms.
++# We need awk for the "check" target.  The system "awk" is bad on
++# some platforms.
 +AC_REQUIRE([AC_PROG_AWK])dnl
 +AC_REQUIRE([AC_PROG_MAKE_SET])dnl
 +AC_REQUIRE([AM_SET_LEADING_DOT])dnl
 +_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
 +	      [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
 +			     [_AM_PROG_TAR([v7])])])
 +_AM_IF_OPTION([no-dependencies],,
 +[AC_PROVIDE_IFELSE([AC_PROG_CC],
 +		  [_AM_DEPENDENCIES([CC])],
 +		  [m4_define([AC_PROG_CC],
 +			     m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
 +AC_PROVIDE_IFELSE([AC_PROG_CXX],
 +		  [_AM_DEPENDENCIES([CXX])],
 +		  [m4_define([AC_PROG_CXX],
 +			     m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
 +AC_PROVIDE_IFELSE([AC_PROG_OBJC],
 +		  [_AM_DEPENDENCIES([OBJC])],
 +		  [m4_define([AC_PROG_OBJC],
 +			     m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
 +AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
 +		  [_AM_DEPENDENCIES([OBJCXX])],
 +		  [m4_define([AC_PROG_OBJCXX],
 +			     m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
 +])
 +AC_REQUIRE([AM_SILENT_RULES])dnl
 +dnl The testsuite driver may need to know about EXEEXT, so add the
 +dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This
 +dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
 +AC_CONFIG_COMMANDS_PRE(dnl
 +[m4_provide_if([_AM_COMPILER_EXEEXT],
 +  [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
- 
- # POSIX will say in a future version that running "rm -f" with no argument
- # is OK; and we want to be able to make that assumption in our Makefile
- # recipes.  So use an aggressive probe to check that the usage we want is
- # actually supported "in the wild" to an acceptable degree.
- # See automake bug#10828.
- # To make any issue more visible, cause the running configure to be aborted
- # by default if the 'rm' program in use doesn't match our expectations; the
- # user can still override this though.
- if rm -f && rm -fr && rm -rf; then : OK; else
-   cat >&2 <<'END'
- Oops!
- 
- Your 'rm' program seems unable to run without file operands specified
- on the command line, even when the '-f' option is present.  This is contrary
- to the behaviour of most rm programs out there, and not conforming with
- the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
- 
- Please tell bug-automake at gnu.org about your system, including the value
- of your $PATH and any error possibly output before this message.  This
- can help us improve future automake versions.
- 
- END
-   if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
-     echo 'Configuration will proceed anyway, since you have set the' >&2
-     echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
-     echo >&2
-   else
-     cat >&2 <<'END'
- Aborting the configuration process, to ensure you take notice of the issue.
- 
- You can download and install GNU coreutils to get an 'rm' implementation
- that behaves properly: <http://www.gnu.org/software/coreutils/>.
- 
- If you want to complete the configuration process using your problematic
- 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
- to "yes", and re-run configure.
- 
- END
-     AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
-   fi
- fi
- dnl The trailing newline in this macro's definition is deliberate, for
- dnl backward compatibility and to allow trailing 'dnl'-style comments
- dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
 +])
 +
 +dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
 +dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
 +dnl mangled by Autoconf and run in a shell conditional statement.
 +m4_define([_AC_COMPILER_EXEEXT],
 +m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
 +
++
 +# When config.status generates a header, we must update the stamp-h file.
 +# This file resides in the same directory as the config header
 +# that is generated.  The stamp files are numbered to have different names.
 +
 +# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
 +# loop where config.status creates the headers, so we can generate
 +# our stamp files there.
 +AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
 +[# Compute $1's index in $config_headers.
 +_am_arg=$1
 +_am_stamp_count=1
 +for _am_header in $config_headers :; do
 +  case $_am_header in
 +    $_am_arg | $_am_arg:* )
 +      break ;;
 +    * )
 +      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
 +  esac
 +done
 +echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 +
- # Copyright (C) 2001-2014 Free Software Foundation, Inc.
++# Copyright (C) 2001-2013 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.
 +AC_DEFUN([AM_PROG_INSTALL_SH],
 +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
- if test x"${install_sh+set}" != xset; then
++if test x"${install_sh}" != xset; then
 +  case $am_aux_dir in
 +  *\ * | *\	*)
 +    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
 +  *)
 +    install_sh="\${SHELL} $am_aux_dir/install-sh"
 +  esac
 +fi
 +AC_SUBST([install_sh])])
 +
- # Copyright (C) 2003-2014 Free Software Foundation, Inc.
++# Copyright (C) 2003-2013 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.
 +
 +# Check whether the underlying file-system supports filenames
 +# with a leading dot.  For instance MS-DOS doesn't.
 +AC_DEFUN([AM_SET_LEADING_DOT],
 +[rm -rf .tst 2>/dev/null
 +mkdir .tst 2>/dev/null
 +if test -d .tst; then
 +  am__leading_dot=.
 +else
 +  am__leading_dot=_
 +fi
 +rmdir .tst 2>/dev/null
 +AC_SUBST([am__leading_dot])])
 +
 +# Check to see how 'make' treats includes.	            -*- Autoconf -*-
 +
- # Copyright (C) 2001-2014 Free Software Foundation, Inc.
++# Copyright (C) 2001-2013 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_MAKE_INCLUDE()
 +# -----------------
 +# Check to see how make treats includes.
 +AC_DEFUN([AM_MAKE_INCLUDE],
 +[am_make=${MAKE-make}
 +cat > confinc << 'END'
 +am__doit:
 +	@echo this is the am__doit target
 +.PHONY: am__doit
 +END
 +# If we don't find an include directive, just comment out the code.
 +AC_MSG_CHECKING([for style of include used by $am_make])
 +am__include="#"
 +am__quote=
 +_am_result=none
 +# First try GNU make style include.
 +echo "include confinc" > confmf
 +# Ignore all kinds of additional output from 'make'.
 +case `$am_make -s -f confmf 2> /dev/null` in #(
 +*the\ am__doit\ target*)
 +  am__include=include
 +  am__quote=
 +  _am_result=GNU
 +  ;;
 +esac
 +# Now try BSD make style include.
 +if test "$am__include" = "#"; then
 +   echo '.include "confinc"' > confmf
 +   case `$am_make -s -f confmf 2> /dev/null` in #(
 +   *the\ am__doit\ target*)
 +     am__include=.include
 +     am__quote="\""
 +     _am_result=BSD
 +     ;;
 +   esac
 +fi
 +AC_SUBST([am__include])
 +AC_SUBST([am__quote])
 +AC_MSG_RESULT([$_am_result])
 +rm -f confinc confmf
 +])
 +
 +# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 +
- # Copyright (C) 1997-2014 Free Software Foundation, Inc.
++# Copyright (C) 1997-2013 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_MISSING_PROG(NAME, PROGRAM)
 +# ------------------------------
 +AC_DEFUN([AM_MISSING_PROG],
 +[AC_REQUIRE([AM_MISSING_HAS_RUN])
 +$1=${$1-"${am_missing_run}$2"}
 +AC_SUBST($1)])
 +
 +# AM_MISSING_HAS_RUN
 +# ------------------
 +# Define MISSING if not defined so far and test if it is modern enough.
 +# If it is, set am_missing_run to use it, otherwise, to nothing.
 +AC_DEFUN([AM_MISSING_HAS_RUN],
 +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
 +AC_REQUIRE_AUX_FILE([missing])dnl
 +if test x"${MISSING+set}" != xset; then
 +  case $am_aux_dir in
 +  *\ * | *\	*)
 +    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
 +  *)
 +    MISSING="\${SHELL} $am_aux_dir/missing" ;;
 +  esac
 +fi
 +# Use eval to expand $SHELL
 +if eval "$MISSING --is-lightweight"; then
 +  am_missing_run="$MISSING "
 +else
 +  am_missing_run=
 +  AC_MSG_WARN(['missing' script is too old or missing])
 +fi
 +])
 +
 +# Helper functions for option handling.                     -*- Autoconf -*-
 +
- # Copyright (C) 2001-2014 Free Software Foundation, Inc.
++# Copyright (C) 2001-2013 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_MANGLE_OPTION(NAME)
 +# -----------------------
 +AC_DEFUN([_AM_MANGLE_OPTION],
 +[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
 +
 +# _AM_SET_OPTION(NAME)
 +# --------------------
 +# Set option NAME.  Presently that only means defining a flag for this option.
 +AC_DEFUN([_AM_SET_OPTION],
 +[m4_define(_AM_MANGLE_OPTION([$1]), [1])])
 +
 +# _AM_SET_OPTIONS(OPTIONS)
 +# ------------------------
 +# OPTIONS is a space-separated list of Automake options.
 +AC_DEFUN([_AM_SET_OPTIONS],
 +[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
 +
 +# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
 +# -------------------------------------------
 +# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
 +AC_DEFUN([_AM_IF_OPTION],
 +[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 +
- # Copyright (C) 1999-2014 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_CC_C_O
- # ---------------
- # Like AC_PROG_CC_C_O, but changed for automake.  We rewrite AC_PROG_CC
- # to automatically call this.
- AC_DEFUN([_AM_PROG_CC_C_O],
- [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
- AC_REQUIRE_AUX_FILE([compile])dnl
- AC_LANG_PUSH([C])dnl
- AC_CACHE_CHECK(
-   [whether $CC understands -c and -o together],
-   [am_cv_prog_cc_c_o],
-   [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
-   # Make sure it works both with $CC and with simple cc.
-   # Following AC_PROG_CC_C_O, we do the test twice because some
-   # compilers refuse to overwrite an existing .o file with -o,
-   # though they will create one.
-   am_cv_prog_cc_c_o=yes
-   for am_i in 1 2; do
-     if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \
-          && test -f conftest2.$ac_objext; then
-       : OK
-     else
-       am_cv_prog_cc_c_o=no
-       break
-     fi
-   done
-   rm -f core conftest*
-   unset am_i])
- if test "$am_cv_prog_cc_c_o" != yes; then
-    # Losing compiler, so override with the script.
-    # FIXME: It is wrong to rewrite CC.
-    # But if we don't then we get into trouble of one sort or another.
-    # A longer-term fix would be to have automake use am__CC in this case,
-    # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-    CC="$am_aux_dir/compile $CC"
- fi
- AC_LANG_POP([C])])
- 
- # For backward compatibility.
- AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
- 
- # Copyright (C) 2001-2014 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_RUN_LOG(COMMAND)
- # -------------------
- # Run COMMAND, save the exit status in ac_status, and log it.
- # (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
- AC_DEFUN([AM_RUN_LOG],
- [{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
-    ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
-    ac_status=$?
-    echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-    (exit $ac_status); }])
- 
 +# Check to make sure that the build environment is sane.    -*- Autoconf -*-
 +
- # Copyright (C) 1996-2014 Free Software Foundation, Inc.
++# Copyright (C) 1996-2013 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_SANITY_CHECK
 +# ---------------
 +AC_DEFUN([AM_SANITY_CHECK],
 +[AC_MSG_CHECKING([whether build environment is sane])
 +# Reject unsafe characters in $srcdir or the absolute working directory
 +# name.  Accept space and tab only in the latter.
 +am_lf='
 +'
 +case `pwd` in
 +  *[[\\\"\#\$\&\'\`$am_lf]]*)
 +    AC_MSG_ERROR([unsafe absolute working directory name]);;
 +esac
 +case $srcdir in
 +  *[[\\\"\#\$\&\'\`$am_lf\ \	]]*)
 +    AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
 +esac
 +
 +# Do 'set' in a subshell so we don't clobber the current shell's
 +# arguments.  Must try -L first in case configure is actually a
 +# symlink; some systems play weird games with the mod time of symlinks
 +# (eg FreeBSD returns the mod time of the symlink's containing
 +# directory).
 +if (
 +   am_has_slept=no
 +   for am_try in 1 2; do
 +     echo "timestamp, slept: $am_has_slept" > conftest.file
 +     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
 +     if test "$[*]" = "X"; then
 +	# -L didn't work.
 +	set X `ls -t "$srcdir/configure" conftest.file`
 +     fi
 +     if test "$[*]" != "X $srcdir/configure conftest.file" \
 +	&& test "$[*]" != "X conftest.file $srcdir/configure"; then
 +
 +	# If neither matched, then we have a broken ls.  This can happen
 +	# if, for instance, CONFIG_SHELL is bash and it inherits a
 +	# broken ls alias from the environment.  This has actually
 +	# happened.  Such a system could not be considered "sane".
 +	AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
 +  alias in your environment])
 +     fi
 +     if test "$[2]" = conftest.file || test $am_try -eq 2; then
 +       break
 +     fi
 +     # Just in case.
 +     sleep 1
 +     am_has_slept=yes
 +   done
 +   test "$[2]" = conftest.file
 +   )
 +then
 +   # Ok.
 +   :
 +else
 +   AC_MSG_ERROR([newly created file is older than distributed files!
 +Check your system clock])
 +fi
 +AC_MSG_RESULT([yes])
 +# If we didn't sleep, we still need to ensure time stamps of config.status and
 +# generated files are strictly newer.
 +am_sleep_pid=
 +if grep 'slept: no' conftest.file >/dev/null 2>&1; then
 +  ( sleep 1 ) &
 +  am_sleep_pid=$!
 +fi
 +AC_CONFIG_COMMANDS_PRE(
 +  [AC_MSG_CHECKING([that generated files are newer than configure])
 +   if test -n "$am_sleep_pid"; then
 +     # Hide warnings about reused PIDs.
 +     wait $am_sleep_pid 2>/dev/null
 +   fi
 +   AC_MSG_RESULT([done])])
 +rm -f conftest.file
 +])
 +
- # Copyright (C) 2009-2014 Free Software Foundation, Inc.
++# Copyright (C) 2009-2013 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_SILENT_RULES([DEFAULT])
 +# --------------------------
 +# Enable less verbose build rules; with the default set to DEFAULT
 +# ("yes" being less verbose, "no" or empty being verbose).
 +AC_DEFUN([AM_SILENT_RULES],
 +[AC_ARG_ENABLE([silent-rules], [dnl
 +AS_HELP_STRING(
 +  [--enable-silent-rules],
 +  [less verbose build output (undo: "make V=1")])
 +AS_HELP_STRING(
 +  [--disable-silent-rules],
 +  [verbose build output (undo: "make V=0")])dnl
 +])
 +case $enable_silent_rules in @%:@ (((
 +  yes) AM_DEFAULT_VERBOSITY=0;;
 +   no) AM_DEFAULT_VERBOSITY=1;;
 +    *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
 +esac
 +dnl
 +dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
 +dnl do not support nested variable expansions.
 +dnl See automake bug#9928 and bug#10237.
 +am_make=${MAKE-make}
 +AC_CACHE_CHECK([whether $am_make supports nested variables],
 +   [am_cv_make_support_nested_variables],
 +   [if AS_ECHO([['TRUE=$(BAR$(V))
 +BAR0=false
 +BAR1=true
 +V=1
 +am__doit:
 +	@$(TRUE)
 +.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then
 +  am_cv_make_support_nested_variables=yes
 +else
 +  am_cv_make_support_nested_variables=no
 +fi])
 +if test $am_cv_make_support_nested_variables = yes; then
 +  dnl Using '$V' instead of '$(V)' breaks IRIX make.
 +  AM_V='$(V)'
 +  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
 +else
 +  AM_V=$AM_DEFAULT_VERBOSITY
 +  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
 +fi
 +AC_SUBST([AM_V])dnl
 +AM_SUBST_NOTMAKE([AM_V])dnl
 +AC_SUBST([AM_DEFAULT_V])dnl
 +AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
 +AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
 +AM_BACKSLASH='\'
 +AC_SUBST([AM_BACKSLASH])dnl
 +_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
 +])
 +
- # Copyright (C) 2001-2014 Free Software Foundation, Inc.
++# Copyright (C) 2001-2013 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.
 +# Fortunately install-sh will honor a STRIPPROG variable, so we
 +# always use install-sh in "make install-strip", and initialize
 +# STRIPPROG with the value of the STRIP variable (set by the user).
 +AC_DEFUN([AM_PROG_INSTALL_STRIP],
 +[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
 +# Installed binaries are usually stripped using 'strip' when the user
 +# run "make install-strip".  However 'strip' might not be the right
 +# tool to use in cross-compilation environments, therefore Automake
 +# will honor the 'STRIP' environment variable to overrule this program.
 +dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
 +if test "$cross_compiling" != no; then
 +  AC_CHECK_TOOL([STRIP], [strip], :)
 +fi
 +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 +AC_SUBST([INSTALL_STRIP_PROGRAM])])
 +
- # Copyright (C) 2006-2014 Free Software Foundation, Inc.
++# Copyright (C) 2006-2013 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_SUBST_NOTMAKE(VARIABLE)
 +# ---------------------------
 +# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
 +# This macro is traced by Automake.
 +AC_DEFUN([_AM_SUBST_NOTMAKE])
 +
 +# AM_SUBST_NOTMAKE(VARIABLE)
 +# --------------------------
 +# Public sister of _AM_SUBST_NOTMAKE.
 +AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 +
 +# Check how to create a tarball.                            -*- Autoconf -*-
 +
- # Copyright (C) 2004-2014 Free Software Foundation, Inc.
++# Copyright (C) 2004-2013 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_TAR(FORMAT)
 +# --------------------
 +# Check how to create a tarball in format FORMAT.
 +# FORMAT should be one of 'v7', 'ustar', or 'pax'.
 +#
 +# Substitute a variable $(am__tar) that is a command
 +# writing to stdout a FORMAT-tarball containing the directory
 +# $tardir.
 +#     tardir=directory && $(am__tar) > result.tar
 +#
 +# Substitute a variable $(am__untar) that extract such
 +# a tarball read from stdin.
 +#     $(am__untar) < result.tar
 +#
 +AC_DEFUN([_AM_PROG_TAR],
 +[# Always define AMTAR for backward compatibility.  Yes, it's still used
 +# in the wild :-(  We should find a proper way to deprecate it ...
 +AC_SUBST([AMTAR], ['$${TAR-tar}'])
 +
 +# We'll loop over all known methods to create a tar archive until one works.
 +_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
 +
 +m4_if([$1], [v7],
 +  [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
 +
 +  [m4_case([$1],
 +    [ustar],
 +     [# The POSIX 1988 'ustar' format is defined with fixed-size fields.
 +      # There is notably a 21 bits limit for the UID and the GID.  In fact,
 +      # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
 +      # and bug#13588).
 +      am_max_uid=2097151 # 2^21 - 1
 +      am_max_gid=$am_max_uid
 +      # The $UID and $GID variables are not portable, so we need to resort
 +      # to the POSIX-mandated id(1) utility.  Errors in the 'id' calls
 +      # below are definitely unexpected, so allow the users to see them
 +      # (that is, avoid stderr redirection).
 +      am_uid=`id -u || echo unknown`
 +      am_gid=`id -g || echo unknown`
 +      AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
 +      if test $am_uid -le $am_max_uid; then
 +         AC_MSG_RESULT([yes])
 +      else
 +         AC_MSG_RESULT([no])
 +         _am_tools=none
 +      fi
 +      AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
 +      if test $am_gid -le $am_max_gid; then
 +         AC_MSG_RESULT([yes])
 +      else
 +        AC_MSG_RESULT([no])
 +        _am_tools=none
 +      fi],
 +
 +  [pax],
 +    [],
 +
 +  [m4_fatal([Unknown tar format])])
 +
 +  AC_MSG_CHECKING([how to create a $1 tar archive])
 +
 +  # Go ahead even if we have the value already cached.  We do so because we
 +  # need to set the values for the 'am__tar' and 'am__untar' variables.
 +  _am_tools=${am_cv_prog_tar_$1-$_am_tools}
 +
 +  for _am_tool in $_am_tools; do
 +    case $_am_tool in
 +    gnutar)
 +      for _am_tar in tar gnutar gtar; do
 +        AM_RUN_LOG([$_am_tar --version]) && break
 +      done
 +      am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
 +      am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
 +      am__untar="$_am_tar -xf -"
 +      ;;
 +    plaintar)
 +      # Must skip GNU tar: if it does not support --format= it doesn't create
 +      # ustar tarball either.
 +      (tar --version) >/dev/null 2>&1 && continue
 +      am__tar='tar chf - "$$tardir"'
 +      am__tar_='tar chf - "$tardir"'
 +      am__untar='tar xf -'
 +      ;;
 +    pax)
 +      am__tar='pax -L -x $1 -w "$$tardir"'
 +      am__tar_='pax -L -x $1 -w "$tardir"'
 +      am__untar='pax -r'
 +      ;;
 +    cpio)
 +      am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
 +      am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
 +      am__untar='cpio -i -H $1 -d'
 +      ;;
 +    none)
 +      am__tar=false
 +      am__tar_=false
 +      am__untar=false
 +      ;;
 +    esac
 +
 +    # If the value was cached, stop now.  We just wanted to have am__tar
 +    # and am__untar set.
 +    test -n "${am_cv_prog_tar_$1}" && break
 +
 +    # tar/untar a dummy directory, and stop if the command works.
 +    rm -rf conftest.dir
 +    mkdir conftest.dir
 +    echo GrepMe > conftest.dir/file
 +    AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
 +    rm -rf conftest.dir
 +    if test -s conftest.tar; then
 +      AM_RUN_LOG([$am__untar <conftest.tar])
 +      AM_RUN_LOG([cat conftest.dir/file])
 +      grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
 +    fi
 +  done
 +  rm -rf conftest.dir
 +
 +  AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
 +  AC_MSG_RESULT([$am_cv_prog_tar_$1])])
 +
 +AC_SUBST([am__tar])
 +AC_SUBST([am__untar])
 +]) # _AM_PROG_TAR
 +
 +m4_include([m4/acinclude.m4])
 +m4_include([m4/acx_pthread.m4])
 +m4_include([m4/ax_create_pkgconfig_info.m4])
 +m4_include([m4/boost.m4])
 +m4_include([m4/doxygen.m4])
 +m4_include([m4/libtool.m4])
 +m4_include([m4/ltoptions.m4])
 +m4_include([m4/ltsugar.m4])
 +m4_include([m4/ltversion.m4])
 +m4_include([m4/lt~obsolete.m4])
diff --cc build-aux/config.guess
index 5a328aa,0000000..b79252d
mode 100755,000000..100755
--- a/build-aux/config.guess
+++ b/build-aux/config.guess
@@@ -1,1547 -1,0 +1,1558 @@@
 +#! /bin/sh
 +# Attempt to guess a canonical system name.
 +#   Copyright 1992-2013 Free Software Foundation, Inc.
 +
- timestamp='2013-05-16'
++timestamp='2013-06-10'
 +
 +# 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 3 of the License, 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, see <http://www.gnu.org/licenses/>.
 +#
 +# As a special exception to the GNU General Public License, if you
 +# distribute this file as part of a program that contains a
 +# configuration script generated by Autoconf, you may include it under
 +# the same distribution terms that you use for the rest of that
 +# program.  This Exception is an additional permission under section 7
 +# of the GNU General Public License, version 3 ("GPLv3").
 +#
 +# Originally written by Per Bothner.
 +#
 +# You can get the latest version of this script from:
 +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
 +#
 +# Please send patches with a ChangeLog entry to config-patches at gnu.org.
 +
 +
 +me=`echo "$0" | sed -e 's,.*/,,'`
 +
 +usage="\
 +Usage: $0 [OPTION]
 +
 +Output the configuration name of the system \`$me' is run on.
 +
 +Operation modes:
 +  -h, --help         print this help, then exit
 +  -t, --time-stamp   print date of last modification, then exit
 +  -v, --version      print version number, then exit
 +
 +Report bugs and patches to <config-patches at gnu.org>."
 +
 +version="\
 +GNU config.guess ($timestamp)
 +
 +Originally written by Per Bothner.
 +Copyright 1992-2013 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."
 +
 +help="
 +Try \`$me --help' for more information."
 +
 +# Parse command line
 +while test $# -gt 0 ; do
 +  case $1 in
 +    --time-stamp | --time* | -t )
 +       echo "$timestamp" ; exit ;;
 +    --version | -v )
 +       echo "$version" ; exit ;;
 +    --help | --h* | -h )
 +       echo "$usage"; exit ;;
 +    -- )     # Stop option processing
 +       shift; break ;;
 +    - )	# Use stdin as input.
 +       break ;;
 +    -* )
 +       echo "$me: invalid option $1$help" >&2
 +       exit 1 ;;
 +    * )
 +       break ;;
 +  esac
 +done
 +
 +if test $# != 0; then
 +  echo "$me: too many arguments$help" >&2
 +  exit 1
 +fi
 +
 +trap 'exit 1' 1 2 15
 +
 +# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
 +# compiler to aid in system detection is discouraged as it requires
 +# temporary files to be created and, as you can see below, it is a
 +# headache to deal with in a portable fashion.
 +
 +# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
 +# use `HOST_CC' if defined, but it is deprecated.
 +
 +# Portable tmp directory creation inspired by the Autoconf team.
 +
 +set_cc_for_build='
 +trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
 +trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
 +: ${TMPDIR=/tmp} ;
 + { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
 + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
 + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
 + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
 +dummy=$tmp/dummy ;
 +tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
 +case $CC_FOR_BUILD,$HOST_CC,$CC in
 + ,,)    echo "int x;" > $dummy.c ;
 +	for c in cc gcc c89 c99 ; do
 +	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
 +	     CC_FOR_BUILD="$c"; break ;
 +	  fi ;
 +	done ;
 +	if test x"$CC_FOR_BUILD" = x ; then
 +	  CC_FOR_BUILD=no_compiler_found ;
 +	fi
 +	;;
 + ,,*)   CC_FOR_BUILD=$CC ;;
 + ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
 +esac ; set_cc_for_build= ;'
 +
 +# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
 +# (ghazi at noc.rutgers.edu 1994-08-24)
 +if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
 +	PATH=$PATH:/.attbin ; export PATH
 +fi
 +
 +UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
 +UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
 +UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
 +UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 +
 +case "${UNAME_SYSTEM}" in
 +Linux|GNU|GNU/*)
 +	# If the system lacks a compiler, then just pick glibc.
 +	# We could probably try harder.
 +	LIBC=gnu
 +
 +	eval $set_cc_for_build
 +	cat <<-EOF > $dummy.c
 +	#include <features.h>
 +	#if defined(__UCLIBC__)
 +	LIBC=uclibc
 +	#elif defined(__dietlibc__)
 +	LIBC=dietlibc
 +	#else
 +	LIBC=gnu
 +	#endif
 +	EOF
 +	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
 +	;;
 +esac
 +
 +# Note: order is significant - the case branches are not exclusive.
 +
 +case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 +    *:NetBSD:*:*)
 +	# NetBSD (nbsd) targets should (where applicable) match one or
 +	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
 +	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
 +	# switched to ELF, *-*-netbsd* would select the old
 +	# object file format.  This provides both forward
 +	# compatibility and a consistent mechanism for selecting the
 +	# object file format.
 +	#
 +	# Note: NetBSD doesn't particularly care about the vendor
 +	# portion of the name.  We always set it to "unknown".
 +	sysctl="sysctl -n hw.machine_arch"
 +	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
 +	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
 +	case "${UNAME_MACHINE_ARCH}" in
 +	    armeb) machine=armeb-unknown ;;
 +	    arm*) machine=arm-unknown ;;
 +	    sh3el) machine=shl-unknown ;;
 +	    sh3eb) machine=sh-unknown ;;
 +	    sh5el) machine=sh5le-unknown ;;
 +	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
 +	esac
 +	# The Operating System including object format, if it has switched
 +	# to ELF recently, or will in the future.
 +	case "${UNAME_MACHINE_ARCH}" in
 +	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
 +		eval $set_cc_for_build
 +		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
 +			| grep -q __ELF__
 +		then
 +		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
 +		    # Return netbsd for either.  FIX?
 +		    os=netbsd
 +		else
 +		    os=netbsdelf
 +		fi
 +		;;
 +	    *)
 +		os=netbsd
 +		;;
 +	esac
 +	# The OS release
 +	# Debian GNU/NetBSD machines have a different userland, and
 +	# thus, need a distinct triplet. However, they do not need
 +	# kernel version information, so it can be replaced with a
 +	# suitable tag, in the style of linux-gnu.
 +	case "${UNAME_VERSION}" in
 +	    Debian*)
 +		release='-gnu'
 +		;;
 +	    *)
 +		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
 +		;;
 +	esac
 +	# 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 ;;
 +    *:Bitrig:*:*)
 +	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
 +	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
 +	exit ;;
 +    *:OpenBSD:*:*)
 +	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 ;;
 +    *:SolidBSD:*:*)
 +	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
 +	exit ;;
 +    macppc:MirBSD:*:*)
 +	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
 +	exit ;;
 +    *:MirBSD:*:*)
 +	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
 +	exit ;;
 +    alpha:OSF1:*:*)
 +	case $UNAME_RELEASE in
 +	*4.0)
 +		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
 +		;;
 +	*5.*)
 +		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
 +		;;
 +	esac
 +	# According to Compaq, /usr/sbin/psrinfo has been available on
 +	# OSF/1 and Tru64 systems produced since 1995.  I hope that
 +	# covers most systems running today.  This code pipes the CPU
 +	# types through head -n 1, so we only detect the type of CPU 0.
 +	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
 +	case "$ALPHA_CPU_TYPE" in
 +	    "EV4 (21064)")
 +		UNAME_MACHINE="alpha" ;;
 +	    "EV4.5 (21064)")
 +		UNAME_MACHINE="alpha" ;;
 +	    "LCA4 (21066/21068)")
 +		UNAME_MACHINE="alpha" ;;
 +	    "EV5 (21164)")
 +		UNAME_MACHINE="alphaev5" ;;
 +	    "EV5.6 (21164A)")
 +		UNAME_MACHINE="alphaev56" ;;
 +	    "EV5.6 (21164PC)")
 +		UNAME_MACHINE="alphapca56" ;;
 +	    "EV5.7 (21164PC)")
 +		UNAME_MACHINE="alphapca57" ;;
 +	    "EV6 (21264)")
 +		UNAME_MACHINE="alphaev6" ;;
 +	    "EV6.7 (21264A)")
 +		UNAME_MACHINE="alphaev67" ;;
 +	    "EV6.8CB (21264C)")
 +		UNAME_MACHINE="alphaev68" ;;
 +	    "EV6.8AL (21264B)")
 +		UNAME_MACHINE="alphaev68" ;;
 +	    "EV6.8CX (21264D)")
 +		UNAME_MACHINE="alphaev68" ;;
 +	    "EV6.9A (21264/EV69A)")
 +		UNAME_MACHINE="alphaev69" ;;
 +	    "EV7 (21364)")
 +		UNAME_MACHINE="alphaev7" ;;
 +	    "EV7.9 (21364A)")
 +		UNAME_MACHINE="alphaev79" ;;
 +	esac
 +	# A Pn.n version is a patched version.
 +	# A Vn.n version is a released version.
 +	# 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'`
 +	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
 +	exitcode=$?
 +	trap '' 0
 +	exit $exitcode ;;
 +    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 ;;
 +    21064:Windows_NT:50:3)
 +	echo alpha-dec-winnt3.5
 +	exit ;;
 +    Amiga*:UNIX_System_V:4.0:*)
 +	echo m68k-unknown-sysv4
 +	exit ;;
 +    *:[Aa]miga[Oo][Ss]:*:*)
 +	echo ${UNAME_MACHINE}-unknown-amigaos
 +	exit ;;
 +    *:[Mm]orph[Oo][Ss]:*:*)
 +	echo ${UNAME_MACHINE}-unknown-morphos
 +	exit ;;
 +    *:OS/390:*:*)
 +	echo i370-ibm-openedition
 +	exit ;;
 +    *:z/VM:*:*)
 +	echo s390-ibm-zvmoe
 +	exit ;;
 +    *:OS400:*:*)
 +	echo powerpc-ibm-os400
 +	exit ;;
 +    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 +	echo arm-acorn-riscix${UNAME_RELEASE}
 +	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 ;;
 +    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
 +	# akee at 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 ;;
 +    NILE*:*:*:dcosx)
 +	echo pyramid-pyramid-svr4
 +	exit ;;
 +    DRS?6000:unix:4.0:6*)
 +	echo sparc-icl-nx6
 +	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 ;;
 +	esac ;;
 +    s390x:SunOS:*:*)
 +	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 +	exit ;;
 +    sun4H:SunOS:5.*:*)
 +	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 +	exit ;;
 +    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 +	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 +	exit ;;
 +    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
 +	echo i386-pc-auroraux${UNAME_RELEASE}
 +	exit ;;
 +    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
 +	eval $set_cc_for_build
 +	SUN_ARCH="i386"
 +	# If there is a compiler, see if it is configured for 64-bit objects.
 +	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
 +	# This test works for both compilers.
 +	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
 +	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
 +		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
 +		grep IS_64BIT_ARCH >/dev/null
 +	    then
 +		SUN_ARCH="x86_64"
 +	    fi
 +	fi
 +	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 +	exit ;;
 +    sun4*:SunOS:6*:*)
 +	# According to config.sub, this is the proper way to canonicalize
 +	# 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 ;;
 +    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 ;;
 +    sun3*:SunOS:*:*)
 +	echo m68k-sun-sunos${UNAME_RELEASE}
 +	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
 +	    sun3)
 +		echo m68k-sun-sunos${UNAME_RELEASE}
 +		;;
 +	    sun4)
 +		echo sparc-sun-sunos${UNAME_RELEASE}
 +		;;
 +	esac
 +	exit ;;
 +    aushp:SunOS:*:*)
 +	echo sparc-auspex-sunos${UNAME_RELEASE}
 +	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"
 +    # to the lowercase version "mint" (or "freemint").  Finally
 +    # the system name "TOS" denotes a system which is actually not
 +    # 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 ;;
 +    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
 +	echo m68k-atari-mint${UNAME_RELEASE}
 +	exit ;;
 +    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
 +	echo m68k-atari-mint${UNAME_RELEASE}
 +	exit ;;
 +    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
 +	echo m68k-milan-mint${UNAME_RELEASE}
 +	exit ;;
 +    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
 +	echo m68k-hades-mint${UNAME_RELEASE}
 +	exit ;;
 +    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
 +	echo m68k-unknown-mint${UNAME_RELEASE}
 +	exit ;;
 +    m68k:machten:*:*)
 +	echo m68k-apple-machten${UNAME_RELEASE}
 +	exit ;;
 +    powerpc:machten:*:*)
 +	echo powerpc-apple-machten${UNAME_RELEASE}
 +	exit ;;
 +    RISC*:Mach:*:*)
 +	echo mips-dec-mach_bsd4.3
 +	exit ;;
 +    RISC*:ULTRIX:*:*)
 +	echo mips-dec-ultrix${UNAME_RELEASE}
 +	exit ;;
 +    VAX*:ULTRIX*:*:*)
 +	echo vax-dec-ultrix${UNAME_RELEASE}
 +	exit ;;
 +    2020:CLIX:*:* | 2430:CLIX:*:*)
 +	echo clipper-intergraph-clix${UNAME_RELEASE}
 +	exit ;;
 +    mips:*:*:UMIPS | mips:*:*:RISCos)
 +	eval $set_cc_for_build
 +	sed 's/^	//' << EOF >$dummy.c
 +#ifdef __cplusplus
 +#include <stdio.h>  /* for printf() prototype */
 +	int main (int argc, char *argv[]) {
 +#else
 +	int main (argc, argv) int argc; char *argv[]; {
 +#endif
 +	#if defined (host_mips) && defined (MIPSEB)
 +	#if defined (SYSTYPE_SYSV)
 +	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
 +	#endif
 +	#if defined (SYSTYPE_SVR4)
 +	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
 +	#endif
 +	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
 +	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
 +	#endif
 +	#endif
 +	  exit (-1);
 +	}
 +EOF
 +	$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 ;;
 +    Motorola:PowerMAX_OS:*:*)
 +	echo powerpc-motorola-powermax
 +	exit ;;
 +    Motorola:*:4.3:PL8-*)
 +	echo powerpc-harris-powermax
 +	exit ;;
 +    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
 +	echo powerpc-harris-powermax
 +	exit ;;
 +    Night_Hawk:Power_UNIX:*:*)
 +	echo powerpc-harris-powerunix
 +	exit ;;
 +    m88k:CX/UX:7*:*)
 +	echo m88k-harris-cxux7
 +	exit ;;
 +    m88k:*:4*:R4*)
 +	echo m88k-motorola-sysv4
 +	exit ;;
 +    m88k:*:3*:R3*)
 +	echo m88k-motorola-sysv3
 +	exit ;;
 +    AViiON:dgux:*:*)
 +	# DG/UX returns AViiON for all architectures
 +	UNAME_PROCESSOR=`/usr/bin/uname -p`
 +	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
 +	then
 +	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
 +	       [ ${TARGET_BINARY_INTERFACE}x = x ]
 +	    then
 +		echo m88k-dg-dgux${UNAME_RELEASE}
 +	    else
 +		echo m88k-dg-dguxbcs${UNAME_RELEASE}
 +	    fi
 +	else
 +	    echo i586-dg-dgux${UNAME_RELEASE}
 +	fi
 +	exit ;;
 +    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
 +	echo m88k-dolphin-sysv3
 +	exit ;;
 +    M88*:*:R3*:*)
 +	# Delta 88k system running SVR3
 +	echo m88k-motorola-sysv3
 +	exit ;;
 +    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
 +	echo m88k-tektronix-sysv3
 +	exit ;;
 +    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
 +	echo m68k-tektronix-bsd
 +	exit ;;
 +    *:IRIX*:*:*)
 +	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
 +	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 ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
 +    i*86:AIX:*:*)
 +	echo i386-ibm-aix
 +	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 ;;
 +    *: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
 +		#include <sys/systemcfg.h>
 +
 +		main()
 +			{
 +			if (!__power_pc())
 +				exit(1);
 +			puts("powerpc-ibm-aix3.2.5");
 +			exit(0);
 +			}
 +EOF
 +		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 ;;
 +    *:AIX:*:[4567])
 +	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
 +	else
 +		IBM_ARCH=powerpc
 +	fi
 +	if [ -x /usr/bin/oslevel ] ; then
 +		IBM_REV=`/usr/bin/oslevel`
 +	else
 +		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
 +	fi
 +	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
 +	exit ;;
 +    *:AIX:*:*)
 +	echo rs6000-ibm-aix
 +	exit ;;
 +    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
 +	echo romp-ibm-bsd4.4
 +	exit ;;
 +    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
 +	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
 +	exit ;;                             # report: romp-ibm BSD 4.3
 +    *:BOSX:*:*)
 +	echo rs6000-bull-bosx
 +	exit ;;
 +    DPX/2?00:B.O.S.:*:*)
 +	echo m68k-bull-sysv3
 +	exit ;;
 +    9000/[34]??:4.3bsd:1.*:*)
 +	echo m68k-hp-bsd
 +	exit ;;
 +    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
 +	echo m68k-hp-bsd4.4
 +	exit ;;
 +    9000/[34678]??:HP-UX:*:*)
 +	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
 +	case "${UNAME_MACHINE}" in
 +	    9000/31? )            HP_ARCH=m68000 ;;
 +	    9000/[34]?? )         HP_ARCH=m68k ;;
 +	    9000/[678][0-9][0-9])
 +		if [ -x /usr/bin/getconf ]; then
 +		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
 +		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
 +		    case "${sc_cpu_version}" in
 +		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
 +		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
 +		      532)                      # CPU_PA_RISC2_0
 +			case "${sc_kernel_bits}" in
 +			  32) HP_ARCH="hppa2.0n" ;;
 +			  64) HP_ARCH="hppa2.0w" ;;
 +			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
 +			esac ;;
 +		    esac
 +		fi
 +		if [ "${HP_ARCH}" = "" ]; then
 +		    eval $set_cc_for_build
 +		    sed 's/^		//' << EOF >$dummy.c
 +
 +		#define _HPUX_SOURCE
 +		#include <stdlib.h>
 +		#include <unistd.h>
 +
 +		int main ()
 +		{
 +		#if defined(_SC_KERNEL_BITS)
 +		    long bits = sysconf(_SC_KERNEL_BITS);
 +		#endif
 +		    long cpu  = sysconf (_SC_CPU_VERSION);
 +
 +		    switch (cpu)
 +			{
 +			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
 +			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
 +			case CPU_PA_RISC2_0:
 +		#if defined(_SC_KERNEL_BITS)
 +			    switch (bits)
 +				{
 +				case 64: puts ("hppa2.0w"); break;
 +				case 32: puts ("hppa2.0n"); break;
 +				default: puts ("hppa2.0"); break;
 +				} break;
 +		#else  /* !defined(_SC_KERNEL_BITS) */
 +			    puts ("hppa2.0"); break;
 +		#endif
 +			default: puts ("hppa1.0"); break;
 +			}
 +		    exit (0);
 +		}
 +EOF
 +		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
 +		    test -z "$HP_ARCH" && HP_ARCH=hppa
 +		fi ;;
 +	esac
 +	if [ ${HP_ARCH} = "hppa2.0w" ]
 +	then
 +	    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 -q __LP64__
 +	    then
 +		HP_ARCH="hppa2.0w"
 +	    else
 +		HP_ARCH="hppa64"
 +	    fi
 +	fi
 +	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
 +	exit ;;
 +    ia64:HP-UX:*:*)
 +	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
 +	echo ia64-hp-hpux${HPUX_REV}
 +	exit ;;
 +    3050*:HI-UX:*:*)
 +	eval $set_cc_for_build
 +	sed 's/^	//' << EOF >$dummy.c
 +	#include <unistd.h>
 +	int
 +	main ()
 +	{
 +	  long cpu = sysconf (_SC_CPU_VERSION);
 +	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
 +	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
 +	     results, however.  */
 +	  if (CPU_IS_PA_RISC (cpu))
 +	    {
 +	      switch (cpu)
 +		{
 +		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
 +		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
 +		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
 +		  default: puts ("hppa-hitachi-hiuxwe2"); break;
 +		}
 +	    }
 +	  else if (CPU_IS_HP_MC68K (cpu))
 +	    puts ("m68k-hitachi-hiuxwe2");
 +	  else puts ("unknown-hitachi-hiuxwe2");
 +	  exit (0);
 +	}
 +EOF
 +	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
 +		{ echo "$SYSTEM_NAME"; exit; }
 +	echo unknown-hitachi-hiuxwe2
 +	exit ;;
 +    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
 +	echo hppa1.1-hp-bsd
 +	exit ;;
 +    9000/8??:4.3bsd:*:*)
 +	echo hppa1.0-hp-bsd
 +	exit ;;
 +    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
 +	echo hppa1.0-hp-mpeix
 +	exit ;;
 +    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
 +	echo hppa1.1-hp-osf
 +	exit ;;
 +    hp8??:OSF1:*:*)
 +	echo hppa1.0-hp-osf
 +	exit ;;
 +    i*86:OSF1:*:*)
 +	if [ -x /usr/sbin/sysversion ] ; then
 +	    echo ${UNAME_MACHINE}-unknown-osf1mk
 +	else
 +	    echo ${UNAME_MACHINE}-unknown-osf1
 +	fi
 +	exit ;;
 +    parisc*:Lites*:*:*)
 +	echo hppa1.1-hp-lites
 +	exit ;;
 +    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
 +	echo c1-convex-bsd
 +	exit ;;
 +    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
 +	if getsysinfo -f scalar_acc
 +	then echo c32-convex-bsd
 +	else echo c2-convex-bsd
 +	fi
 +	exit ;;
 +    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
 +	echo c34-convex-bsd
 +	exit ;;
 +    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
 +	echo c38-convex-bsd
 +	exit ;;
 +    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
 +	echo c4-convex-bsd
 +	exit ;;
 +    CRAY*Y-MP:*:*:*)
 +	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 +	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 ;;
 +    CRAY*TS:*:*:*)
 +	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 +	exit ;;
 +    CRAY*T3E:*:*:*)
 +	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 +	exit ;;
 +    CRAY*SV1:*:*:*)
 +	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 +	exit ;;
 +    *:UNICOS/mp:*:*)
 +	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 +	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 ;;
 +    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 ;;
 +    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 +	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
 +	exit ;;
 +    sparc*:BSD/OS:*:*)
 +	echo sparc-unknown-bsdi${UNAME_RELEASE}
 +	exit ;;
 +    *:BSD/OS:*:*)
 +	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 +	exit ;;
 +    *:FreeBSD:*:*)
 +	UNAME_PROCESSOR=`/usr/bin/uname -p`
- 	echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
++	case ${UNAME_PROCESSOR} in
++	    amd64)
++		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
++	    *)
++		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
++	esac
 +	exit ;;
 +    i*:CYGWIN*:*)
 +	echo ${UNAME_MACHINE}-pc-cygwin
 +	exit ;;
 +    *:MINGW64*:*)
 +	echo ${UNAME_MACHINE}-pc-mingw64
 +	exit ;;
 +    *:MINGW*:*)
 +	echo ${UNAME_MACHINE}-pc-mingw32
 +	exit ;;
 +    i*:MSYS*:*)
 +	echo ${UNAME_MACHINE}-pc-msys
 +	exit ;;
 +    i*:windows32*:*)
 +	# uname -m includes "-pc" on this system.
 +	echo ${UNAME_MACHINE}-mingw32
 +	exit ;;
 +    i*:PW*:*)
 +	echo ${UNAME_MACHINE}-pc-pw32
 +	exit ;;
 +    *:Interix*:*)
 +	case ${UNAME_MACHINE} in
 +	    x86)
 +		echo i586-pc-interix${UNAME_RELEASE}
 +		exit ;;
 +	    authenticamd | genuineintel | EM64T)
 +		echo x86_64-unknown-interix${UNAME_RELEASE}
 +		exit ;;
 +	    IA64)
 +		echo ia64-unknown-interix${UNAME_RELEASE}
 +		exit ;;
 +	esac ;;
 +    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 +	echo i${UNAME_MACHINE}-pc-mks
 +	exit ;;
 +    8664:Windows_NT:*)
 +	echo x86_64-pc-mks
 +	exit ;;
 +    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
 +	# How do we know it's Interix rather than the generic POSIX subsystem?
 +	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
 +	# UNAME_MACHINE based on the output of uname instead of i386?
 +	echo i586-pc-interix
 +	exit ;;
 +    i*:UWIN*:*)
 +	echo ${UNAME_MACHINE}-pc-uwin
 +	exit ;;
 +    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
 +	echo x86_64-unknown-cygwin
 +	exit ;;
 +    p*:CYGWIN*:*)
 +	echo powerpcle-unknown-cygwin
 +	exit ;;
 +    prep*:SunOS:5.*:*)
 +	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 +	exit ;;
 +    *:GNU:*:*)
 +	# the GNU system
 +	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
 +	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/[-(].*//'`-${LIBC}
 +	exit ;;
 +    i*86:Minix:*:*)
 +	echo ${UNAME_MACHINE}-pc-minix
 +	exit ;;
 +    aarch64:Linux:*:*)
 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 +	exit ;;
 +    aarch64_be:Linux:*:*)
 +	UNAME_MACHINE=aarch64_be
 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 +	exit ;;
 +    alpha:Linux:*:*)
 +	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
 +	  EV5)   UNAME_MACHINE=alphaev5 ;;
 +	  EV56)  UNAME_MACHINE=alphaev56 ;;
 +	  PCA56) UNAME_MACHINE=alphapca56 ;;
 +	  PCA57) UNAME_MACHINE=alphapca56 ;;
 +	  EV6)   UNAME_MACHINE=alphaev6 ;;
 +	  EV67)  UNAME_MACHINE=alphaev67 ;;
 +	  EV68*) UNAME_MACHINE=alphaev68 ;;
 +	esac
 +	objdump --private-headers /bin/sh | grep -q ld.so.1
 +	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 +	exit ;;
 +    arc:Linux:*:* | arceb:Linux:*:*)
 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 +	exit ;;
 +    arm*:Linux:*:*)
 +	eval $set_cc_for_build
 +	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
 +	    | grep -q __ARM_EABI__
 +	then
 +	    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 +	else
 +	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
 +		| grep -q __ARM_PCS_VFP
 +	    then
 +		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
 +	    else
 +		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
 +	    fi
 +	fi
 +	exit ;;
 +    avr32*:Linux:*:*)
 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 +	exit ;;
 +    cris:Linux:*:*)
 +	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
 +	exit ;;
 +    crisv32:Linux:*:*)
 +	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
 +	exit ;;
 +    frv:Linux:*:*)
 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 +	exit ;;
 +    hexagon:Linux:*:*)
 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 +	exit ;;
 +    i*86:Linux:*:*)
 +	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
 +	exit ;;
 +    ia64:Linux:*:*)
 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 +	exit ;;
 +    m32r*:Linux:*:*)
 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 +	exit ;;
 +    m68*:Linux:*:*)
 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 +	exit ;;
 +    mips:Linux:*:* | mips64:Linux:*:*)
 +	eval $set_cc_for_build
 +	sed 's/^	//' << EOF >$dummy.c
 +	#undef CPU
 +	#undef ${UNAME_MACHINE}
 +	#undef ${UNAME_MACHINE}el
 +	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
 +	CPU=${UNAME_MACHINE}el
 +	#else
 +	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
 +	CPU=${UNAME_MACHINE}
 +	#else
 +	CPU=
 +	#endif
 +	#endif
 +EOF
 +	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
 +	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
 +	;;
 +    or1k:Linux:*:*)
 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 +	exit ;;
 +    or32:Linux:*:*)
 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 +	exit ;;
 +    padre:Linux:*:*)
 +	echo sparc-unknown-linux-${LIBC}
 +	exit ;;
 +    parisc64:Linux:*:* | hppa64:Linux:*:*)
 +	echo hppa64-unknown-linux-${LIBC}
 +	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-${LIBC} ;;
 +	  PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
 +	  *)    echo hppa-unknown-linux-${LIBC} ;;
 +	esac
 +	exit ;;
 +    ppc64:Linux:*:*)
 +	echo powerpc64-unknown-linux-${LIBC}
 +	exit ;;
 +    ppc:Linux:*:*)
 +	echo powerpc-unknown-linux-${LIBC}
 +	exit ;;
++    ppc64le:Linux:*:*)
++	echo powerpc64le-unknown-linux-${LIBC}
++	exit ;;
++    ppcle:Linux:*:*)
++	echo powerpcle-unknown-linux-${LIBC}
++	exit ;;
 +    s390:Linux:*:* | s390x:Linux:*:*)
 +	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
 +	exit ;;
 +    sh64*:Linux:*:*)
 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 +	exit ;;
 +    sh*:Linux:*:*)
 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 +	exit ;;
 +    sparc:Linux:*:* | sparc64:Linux:*:*)
 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 +	exit ;;
 +    tile*:Linux:*:*)
 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 +	exit ;;
 +    vax:Linux:*:*)
 +	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
 +	exit ;;
 +    x86_64:Linux:*:*)
 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 +	exit ;;
 +    xtensa*:Linux:*:*)
 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 +	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 ;;
 +    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 ;;
 +    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 ;;
 +    i*86:XTS-300:*:STOP)
 +	echo ${UNAME_MACHINE}-unknown-stop
 +	exit ;;
 +    i*86:atheos:*:*)
 +	echo ${UNAME_MACHINE}-unknown-atheos
 +	exit ;;
 +    i*86:syllable:*:*)
 +	echo ${UNAME_MACHINE}-pc-syllable
 +	exit ;;
 +    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
 +	echo i386-unknown-lynxos${UNAME_RELEASE}
 +	exit ;;
 +    i*86:*DOS:*:*)
 +	echo ${UNAME_MACHINE}-pc-msdosdjgpp
 +	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 ;;
 +    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 ;;
 +    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
 +	elif /bin/uname -X 2>/dev/null >/dev/null ; then
 +		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
 +		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
 +		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
 +			&& UNAME_MACHINE=i586
 +		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
 +			&& UNAME_MACHINE=i686
 +		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
 +			&& UNAME_MACHINE=i686
 +		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
 +	else
 +		echo ${UNAME_MACHINE}-pc-sysv32
 +	fi
 +	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 i586.
 +	# Note: whatever this is, it MUST be the same as what config.sub
 +	# prints for the "djgpp" host, or else GDB configury will decide that
 +	# this is a cross-build.
 +	echo i586-pc-msdosdjgpp
 +	exit ;;
 +    Intel:Mach:3*:*)
 +	echo i386-pc-mach3
 +	exit ;;
 +    paragon:*:*:*)
 +	echo i860-intel-osf1
 +	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 ;;
 +    mini*:CTIX:SYS*5:*)
 +	# "miniframe"
 +	echo m68010-convergent-sysv
 +	exit ;;
 +    mc68k:UNIX:SYSTEM5:3.51m)
 +	echo m68k-convergent-sysv
 +	exit ;;
 +    M680?0:D-NIX:5.3:*)
 +	echo m68k-diab-dnix
 +	exit ;;
 +    M68*:*:R3V[5678]*:*)
 +	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; }
 +	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
 +	  && { 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; } ;;
 +    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
 +	OS_REL='.3'
 +	test -r /etc/.relid \
 +	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
 +	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
 +	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
 +	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
 +	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
 +	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
 +	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
 +    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
 +	echo m68k-unknown-lynxos${UNAME_RELEASE}
 +	exit ;;
 +    mc68030:UNIX_System_V:4.*:*)
 +	echo m68k-atari-sysv4
 +	exit ;;
 +    TSUNAMI:LynxOS:2.*:*)
 +	echo sparc-unknown-lynxos${UNAME_RELEASE}
 +	exit ;;
 +    rs6000:LynxOS:2.*:*)
 +	echo rs6000-unknown-lynxos${UNAME_RELEASE}
 +	exit ;;
 +    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
 +	echo powerpc-unknown-lynxos${UNAME_RELEASE}
 +	exit ;;
 +    SM[BE]S:UNIX_SV:*:*)
 +	echo mips-dde-sysv${UNAME_RELEASE}
 +	exit ;;
 +    RM*:ReliantUNIX-*:*:*)
 +	echo mips-sni-sysv4
 +	exit ;;
 +    RM*:SINIX-*:*:*)
 +	echo mips-sni-sysv4
 +	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 ;;
 +    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
 +			# says <Richard.M.Bartel at ccMail.Census.GOV>
 +	echo i586-unisys-sysv4
 +	exit ;;
 +    *:UNIX_System_V:4*:FTX*)
 +	# From Gerald Hewes <hewes at openmarket.com>.
 +	# How about differentiating between stratus architectures? -djm
 +	echo hppa1.1-stratus-sysv4
 +	exit ;;
 +    *:*:*:FTX*)
 +	# From seanf at swdc.stratus.com.
 +	echo i860-stratus-sysv4
 +	exit ;;
 +    i*86:VOS:*:*)
 +	# From Paul.Green at stratus.com.
 +	echo ${UNAME_MACHINE}-stratus-vos
 +	exit ;;
 +    *:VOS:*:*)
 +	# From Paul.Green at stratus.com.
 +	echo hppa1.1-stratus-vos
 +	exit ;;
 +    mc68*:A/UX:*:*)
 +	echo m68k-apple-aux${UNAME_RELEASE}
 +	exit ;;
 +    news*:NEWS-OS:6*:*)
 +	echo mips-sony-newsos6
 +	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 ;;
 +    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
 +	echo powerpc-be-beos
 +	exit ;;
 +    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
 +	echo powerpc-apple-beos
 +	exit ;;
 +    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
 +	echo i586-pc-beos
 +	exit ;;
 +    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
 +	echo i586-pc-haiku
 +	exit ;;
 +    x86_64:Haiku:*:*)
 +	echo x86_64-unknown-haiku
 +	exit ;;
 +    SX-4:SUPER-UX:*:*)
 +	echo sx4-nec-superux${UNAME_RELEASE}
 +	exit ;;
 +    SX-5:SUPER-UX:*:*)
 +	echo sx5-nec-superux${UNAME_RELEASE}
 +	exit ;;
 +    SX-6:SUPER-UX:*:*)
 +	echo sx6-nec-superux${UNAME_RELEASE}
 +	exit ;;
 +    SX-7:SUPER-UX:*:*)
 +	echo sx7-nec-superux${UNAME_RELEASE}
 +	exit ;;
 +    SX-8:SUPER-UX:*:*)
 +	echo sx8-nec-superux${UNAME_RELEASE}
 +	exit ;;
 +    SX-8R:SUPER-UX:*:*)
 +	echo sx8r-nec-superux${UNAME_RELEASE}
 +	exit ;;
 +    Power*:Rhapsody:*:*)
 +	echo powerpc-apple-rhapsody${UNAME_RELEASE}
 +	exit ;;
 +    *:Rhapsody:*:*)
 +	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
 +	exit ;;
 +    *:Darwin:*:*)
 +	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
 +	eval $set_cc_for_build
 +	if test "$UNAME_PROCESSOR" = unknown ; then
 +	    UNAME_PROCESSOR=powerpc
 +	fi
 +	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
 +	    if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
 +		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
 +		grep IS_64BIT_ARCH >/dev/null
 +	    then
 +		case $UNAME_PROCESSOR in
 +		    i386) UNAME_PROCESSOR=x86_64 ;;
 +		    powerpc) UNAME_PROCESSOR=powerpc64 ;;
 +		esac
 +	    fi
 +	fi
 +	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
 +	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 ;;
 +    *:QNX:*:4*)
 +	echo i386-pc-qnx
 +	exit ;;
 +    NEO-?:NONSTOP_KERNEL:*:*)
 +	echo neo-tandem-nsk${UNAME_RELEASE}
 +	exit ;;
 +    NSE-*:NONSTOP_KERNEL:*:*)
 +	echo nse-tandem-nsk${UNAME_RELEASE}
 +	exit ;;
 +    NSR-?:NONSTOP_KERNEL:*:*)
 +	echo nsr-tandem-nsk${UNAME_RELEASE}
 +	exit ;;
 +    *:NonStop-UX:*:*)
 +	echo mips-compaq-nonstopux
 +	exit ;;
 +    BS2000:POSIX*:*:*)
 +	echo bs2000-siemens-sysv
 +	exit ;;
 +    DS/*:UNIX_System_V:*:*)
 +	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
 +	exit ;;
 +    *:Plan9:*:*)
 +	# "uname -m" is not consistent, so use $cputype instead. 386
 +	# is converted to i386 for consistency with other x86
 +	# operating systems.
 +	if test "$cputype" = "386"; then
 +	    UNAME_MACHINE=i386
 +	else
 +	    UNAME_MACHINE="$cputype"
 +	fi
 +	echo ${UNAME_MACHINE}-unknown-plan9
 +	exit ;;
 +    *:TOPS-10:*:*)
 +	echo pdp10-unknown-tops10
 +	exit ;;
 +    *:TENEX:*:*)
 +	echo pdp10-unknown-tenex
 +	exit ;;
 +    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
 +	echo pdp10-dec-tops20
 +	exit ;;
 +    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
 +	echo pdp10-xkl-tops20
 +	exit ;;
 +    *:TOPS-20:*:*)
 +	echo pdp10-unknown-tops20
 +	exit ;;
 +    *:ITS:*:*)
 +	echo pdp10-unknown-its
 +	exit ;;
 +    SEI:*:*:SEIUX)
 +	echo mips-sei-seiux${UNAME_RELEASE}
 +	exit ;;
 +    *:DragonFly:*:*)
 +	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 +	exit ;;
 +    *:*VMS:*:*)
 +	UNAME_MACHINE=`(uname -p) 2>/dev/null`
 +	case "${UNAME_MACHINE}" in
 +	    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 ;;
 +    i*86:rdos:*:*)
 +	echo ${UNAME_MACHINE}-pc-rdos
 +	exit ;;
 +    i*86:AROS:*:*)
 +	echo ${UNAME_MACHINE}-pc-aros
 +	exit ;;
 +    x86_64:VMkernel:*:*)
 +	echo ${UNAME_MACHINE}-unknown-esx
 +	exit ;;
 +esac
 +
 +eval $set_cc_for_build
 +cat >$dummy.c <<EOF
 +#ifdef _SEQUENT_
 +# include <sys/types.h>
 +# include <sys/utsname.h>
 +#endif
 +main ()
 +{
 +#if defined (sony)
 +#if defined (MIPSEB)
 +  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
 +     I don't know....  */
 +  printf ("mips-sony-bsd\n"); exit (0);
 +#else
 +#include <sys/param.h>
 +  printf ("m68k-sony-newsos%s\n",
 +#ifdef NEWSOS4
 +	"4"
 +#else
 +	""
 +#endif
 +	); exit (0);
 +#endif
 +#endif
 +
 +#if defined (__arm) && defined (__acorn) && defined (__unix)
 +  printf ("arm-acorn-riscix\n"); exit (0);
 +#endif
 +
 +#if defined (hp300) && !defined (hpux)
 +  printf ("m68k-hp-bsd\n"); exit (0);
 +#endif
 +
 +#if defined (NeXT)
 +#if !defined (__ARCHITECTURE__)
 +#define __ARCHITECTURE__ "m68k"
 +#endif
 +  int version;
 +  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
 +  if (version < 4)
 +    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
 +  else
 +    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
 +  exit (0);
 +#endif
 +
 +#if defined (MULTIMAX) || defined (n16)
 +#if defined (UMAXV)
 +  printf ("ns32k-encore-sysv\n"); exit (0);
 +#else
 +#if defined (CMU)
 +  printf ("ns32k-encore-mach\n"); exit (0);
 +#else
 +  printf ("ns32k-encore-bsd\n"); exit (0);
 +#endif
 +#endif
 +#endif
 +
 +#if defined (__386BSD__)
 +  printf ("i386-pc-bsd\n"); exit (0);
 +#endif
 +
 +#if defined (sequent)
 +#if defined (i386)
 +  printf ("i386-sequent-dynix\n"); exit (0);
 +#endif
 +#if defined (ns32000)
 +  printf ("ns32k-sequent-dynix\n"); exit (0);
 +#endif
 +#endif
 +
 +#if defined (_SEQUENT_)
 +    struct utsname un;
 +
 +    uname(&un);
 +
 +    if (strncmp(un.version, "V2", 2) == 0) {
 +	printf ("i386-sequent-ptx2\n"); exit (0);
 +    }
 +    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
 +	printf ("i386-sequent-ptx1\n"); exit (0);
 +    }
 +    printf ("i386-sequent-ptx\n"); exit (0);
 +
 +#endif
 +
 +#if defined (vax)
 +# if !defined (ultrix)
 +#  include <sys/param.h>
 +#  if defined (BSD)
 +#   if BSD == 43
 +      printf ("vax-dec-bsd4.3\n"); exit (0);
 +#   else
 +#    if BSD == 199006
 +      printf ("vax-dec-bsd4.3reno\n"); exit (0);
 +#    else
 +      printf ("vax-dec-bsd\n"); exit (0);
 +#    endif
 +#   endif
 +#  else
 +    printf ("vax-dec-bsd\n"); exit (0);
 +#  endif
 +# else
 +    printf ("vax-dec-ultrix\n"); exit (0);
 +# endif
 +#endif
 +
 +#if defined (alliant) && defined (i860)
 +  printf ("i860-alliant-bsd\n"); exit (0);
 +#endif
 +
 +  exit (1);
 +}
 +EOF
 +
 +$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; }
 +
 +# 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 ;;
 +    c2*)
 +	if getsysinfo -f scalar_acc
 +	then echo c32-convex-bsd
 +	else echo c2-convex-bsd
 +	fi
 +	exit ;;
 +    c34*)
 +	echo c34-convex-bsd
 +	exit ;;
 +    c38*)
 +	echo c38-convex-bsd
 +	exit ;;
 +    c4*)
 +	echo c4-convex-bsd
 +	exit ;;
 +    esac
 +fi
 +
 +cat >&2 <<EOF
 +$0: unable to guess system type
 +
 +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
 +
 +  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
 +and
 +  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
 +
 +If the version you run ($0) is already up to date, please
 +send the following data and any information you think might be
 +pertinent to <config-patches at gnu.org> in order to provide the needed
 +information to handle your system.
 +
 +config.guess timestamp = $timestamp
 +
 +uname -m = `(uname -m) 2>/dev/null || echo unknown`
 +uname -r = `(uname -r) 2>/dev/null || echo unknown`
 +uname -s = `(uname -s) 2>/dev/null || echo unknown`
 +uname -v = `(uname -v) 2>/dev/null || echo unknown`
 +
 +/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
 +/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
 +
 +hostinfo               = `(hostinfo) 2>/dev/null`
 +/bin/universe          = `(/bin/universe) 2>/dev/null`
 +/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
 +/bin/arch              = `(/bin/arch) 2>/dev/null`
 +/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
 +/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
 +
 +UNAME_MACHINE = ${UNAME_MACHINE}
 +UNAME_RELEASE = ${UNAME_RELEASE}
 +UNAME_SYSTEM  = ${UNAME_SYSTEM}
 +UNAME_VERSION = ${UNAME_VERSION}
 +EOF
 +
 +exit 1
 +
 +# Local variables:
 +# eval: (add-hook 'write-file-hooks 'time-stamp)
 +# time-stamp-start: "timestamp='"
 +# time-stamp-format: "%:y-%02m-%02d"
 +# time-stamp-end: "'"
 +# End:
diff --cc build-aux/config.sub
index 68e6582,0000000..c765b34
mode 100755,000000..100755
--- a/build-aux/config.sub
+++ b/build-aux/config.sub
@@@ -1,1782 -1,0 +1,1788 @@@
 +#! /bin/sh
 +# Configuration validation subroutine script.
 +#   Copyright 1992-2013 Free Software Foundation, Inc.
 +
 +timestamp='2013-04-24'
 +
 +# 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 3 of the License, 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, see <http://www.gnu.org/licenses/>.
 +#
 +# As a special exception to the GNU General Public License, if you
 +# distribute this file as part of a program that contains a
 +# configuration script generated by Autoconf, you may include it under
 +# the same distribution terms that you use for the rest of that
 +# program.  This Exception is an additional permission under section 7
 +# of the GNU General Public License, version 3 ("GPLv3").
 +
 +
 +# Please send patches with a ChangeLog entry to config-patches at gnu.org.
 +#
 +# Configuration subroutine to validate and canonicalize a configuration type.
 +# Supply the specified configuration type as an argument.
 +# If it is invalid, we print an error message on stderr and exit with code 1.
 +# Otherwise, we print the canonical config type on stdout and succeed.
 +
 +# You can get the latest version of this script from:
 +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
 +
 +# This file is supposed to be the same for all GNU packages
 +# and recognize all the CPU types, system types and aliases
 +# that are meaningful with *any* GNU software.
 +# Each package is responsible for reporting which valid configurations
 +# it does not support.  The user should be able to distinguish
 +# a failure to support a valid configuration from a meaningless
 +# configuration.
 +
 +# The goal of this file is to map all the various variations of a given
 +# machine specification into a single specification in the form:
 +#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
 +# or in some cases, the newer four-part form:
 +#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
 +# It is wrong to echo any other type of specification.
 +
 +me=`echo "$0" | sed -e 's,.*/,,'`
 +
 +usage="\
 +Usage: $0 [OPTION] CPU-MFR-OPSYS
 +       $0 [OPTION] ALIAS
 +
 +Canonicalize a configuration name.
 +
 +Operation modes:
 +  -h, --help         print this help, then exit
 +  -t, --time-stamp   print date of last modification, then exit
 +  -v, --version      print version number, then exit
 +
 +Report bugs and patches to <config-patches at gnu.org>."
 +
 +version="\
 +GNU config.sub ($timestamp)
 +
 +Copyright 1992-2013 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."
 +
 +help="
 +Try \`$me --help' for more information."
 +
 +# Parse command line
 +while test $# -gt 0 ; do
 +  case $1 in
 +    --time-stamp | --time* | -t )
 +       echo "$timestamp" ; exit ;;
 +    --version | -v )
 +       echo "$version" ; exit ;;
 +    --help | --h* | -h )
 +       echo "$usage"; exit ;;
 +    -- )     # Stop option processing
 +       shift; break ;;
 +    - )	# Use stdin as input.
 +       break ;;
 +    -* )
 +       echo "$me: invalid option $1$help"
 +       exit 1 ;;
 +
 +    *local*)
 +       # First pass through any local machine types.
 +       echo $1
 +       exit ;;
 +
 +    * )
 +       break ;;
 +  esac
 +done
 +
 +case $# in
 + 0) echo "$me: missing argument$help" >&2
 +    exit 1;;
 + 1) ;;
 + *) echo "$me: too many arguments$help" >&2
 +    exit 1;;
 +esac
 +
 +# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
 +# Here we must recognize all the valid KERNEL-OS combinations.
 +maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 +case $maybe_os in
 +  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
 +  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
 +  knetbsd*-gnu* | netbsd*-gnu* | \
 +  kopensolaris*-gnu* | \
 +  storm-chaos* | os2-emx* | rtmk-nova*)
 +    os=-$maybe_os
 +    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
 +    ;;
 +  android-linux)
 +    os=-linux-android
 +    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
 +    ;;
 +  *)
 +    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
 +    if [ $basic_machine != $1 ]
 +    then os=`echo $1 | sed 's/.*-/-/'`
 +    else os=; fi
 +    ;;
 +esac
 +
 +### Let's recognize common machines as not being operating systems so
 +### that things like config.sub decstation-3100 work.  We also
 +### recognize some manufacturers as not being operating systems, so we
 +### can provide default operating systems below.
 +case $os in
 +	-sun*os*)
 +		# Prevent following clause from handling this invalid input.
 +		;;
 +	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
 +	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
 +	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
 +	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 +	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 +	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
 +	-apple | -axis | -knuth | -cray | -microblaze*)
 +		os=
 +		basic_machine=$1
 +		;;
 +	-bluegene*)
 +		os=-cnk
 +		;;
 +	-sim | -cisco | -oki | -wec | -winbond)
 +		os=
 +		basic_machine=$1
 +		;;
 +	-scout)
 +		;;
 +	-wrs)
 +		os=-vxworks
 +		basic_machine=$1
 +		;;
 +	-chorusos*)
 +		os=-chorusos
 +		basic_machine=$1
 +		;;
 +	-chorusrdb)
 +		os=-chorusrdb
 +		basic_machine=$1
 +		;;
 +	-hiux*)
 +		os=-hiuxwe2
 +		;;
 +	-sco6)
 +		os=-sco5v6
 +		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 +		;;
 +	-sco5)
 +		os=-sco3.2v5
 +		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 +		;;
 +	-sco4)
 +		os=-sco3.2v4
 +		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 +		;;
 +	-sco3.2.[4-9]*)
 +		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
 +		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 +		;;
 +	-sco3.2v[4-9]*)
 +		# Don't forget version if it is 3.2v4 or newer.
 +		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 +		;;
 +	-sco5v6*)
 +		# Don't forget version if it is 3.2v4 or newer.
 +		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 +		;;
 +	-sco*)
 +		os=-sco3.2v2
 +		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 +		;;
 +	-udk*)
 +		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 +		;;
 +	-isc)
 +		os=-isc2.2
 +		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 +		;;
 +	-clix*)
 +		basic_machine=clipper-intergraph
 +		;;
 +	-isc*)
 +		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 +		;;
 +	-lynx*178)
 +		os=-lynxos178
 +		;;
 +	-lynx*5)
 +		os=-lynxos5
 +		;;
 +	-lynx*)
 +		os=-lynxos
 +		;;
 +	-ptx*)
 +		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
 +		;;
 +	-windowsnt*)
 +		os=`echo $os | sed -e 's/windowsnt/winnt/'`
 +		;;
 +	-psos*)
 +		os=-psos
 +		;;
 +	-mint | -mint[0-9]*)
 +		basic_machine=m68k-atari
 +		os=-mint
 +		;;
 +esac
 +
 +# Decode aliases for certain CPU-COMPANY combinations.
 +case $basic_machine in
 +	# Recognize the basic CPU types without company name.
 +	# Some are omitted here because they have special meanings below.
 +	1750a | 580 \
 +	| a29k \
 +	| aarch64 | aarch64_be \
 +	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 +	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 +	| am33_2.0 \
 +	| arc | arceb \
 +	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
 +	| avr | avr32 \
 +	| be32 | be64 \
 +	| bfin \
 +	| c4x | clipper \
 +	| d10v | d30v | dlx | dsp16xx \
 +	| epiphany \
 +	| fido | fr30 | frv \
 +	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 +	| hexagon \
 +	| i370 | i860 | i960 | ia64 \
 +	| ip2k | iq2000 \
 +	| le32 | le64 \
 +	| lm32 \
 +	| m32c | m32r | m32rle | m68000 | m68k | m88k \
 +	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
 +	| mips | mipsbe | mipseb | mipsel | mipsle \
 +	| mips16 \
 +	| mips64 | mips64el \
 +	| mips64octeon | mips64octeonel \
 +	| mips64orion | mips64orionel \
 +	| mips64r5900 | mips64r5900el \
 +	| mips64vr | mips64vrel \
 +	| mips64vr4100 | mips64vr4100el \
 +	| mips64vr4300 | mips64vr4300el \
 +	| mips64vr5000 | mips64vr5000el \
 +	| mips64vr5900 | mips64vr5900el \
 +	| mipsisa32 | mipsisa32el \
 +	| mipsisa32r2 | mipsisa32r2el \
 +	| mipsisa64 | mipsisa64el \
 +	| mipsisa64r2 | mipsisa64r2el \
 +	| mipsisa64sb1 | mipsisa64sb1el \
 +	| mipsisa64sr71k | mipsisa64sr71kel \
 +	| mipsr5900 | mipsr5900el \
 +	| mipstx39 | mipstx39el \
 +	| mn10200 | mn10300 \
 +	| moxie \
 +	| mt \
 +	| msp430 \
 +	| nds32 | nds32le | nds32be \
 +	| nios | nios2 | nios2eb | nios2el \
 +	| ns16k | ns32k \
 +	| open8 \
 +	| or1k | or32 \
 +	| pdp10 | pdp11 | pj | pjl \
 +	| powerpc | powerpc64 | powerpc64le | powerpcle \
 +	| pyramid \
 +	| rl78 | rx \
 +	| score \
 +	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 +	| sh64 | sh64le \
 +	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
 +	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
 +	| spu \
 +	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
 +	| ubicom32 \
 +	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
 +	| we32k \
 +	| x86 | xc16x | xstormy16 | xtensa \
 +	| z8k | z80)
 +		basic_machine=$basic_machine-unknown
 +		;;
 +	c54x)
 +		basic_machine=tic54x-unknown
 +		;;
 +	c55x)
 +		basic_machine=tic55x-unknown
 +		;;
 +	c6x)
 +		basic_machine=tic6x-unknown
 +		;;
 +	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
 +		basic_machine=$basic_machine-unknown
 +		os=-none
 +		;;
 +	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
 +		;;
 +	ms1)
 +		basic_machine=mt-unknown
 +		;;
 +
 +	strongarm | thumb | xscale)
 +		basic_machine=arm-unknown
 +		;;
 +	xgate)
 +		basic_machine=$basic_machine-unknown
 +		os=-none
 +		;;
 +	xscaleeb)
 +		basic_machine=armeb-unknown
 +		;;
 +
 +	xscaleel)
 +		basic_machine=armel-unknown
 +		;;
 +
 +	# We use `pc' rather than `unknown'
 +	# because (1) that's what they normally are, and
 +	# (2) the word "unknown" tends to confuse beginning users.
 +	i*86 | x86_64)
 +	  basic_machine=$basic_machine-pc
 +	  ;;
 +	# Object if more than one company name word.
 +	*-*-*)
 +		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
 +		exit 1
 +		;;
 +	# Recognize the basic CPU types with company name.
 +	580-* \
 +	| a29k-* \
 +	| aarch64-* | aarch64_be-* \
 +	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
 +	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
- 	| alphapca5[67]-* | alpha64pca5[67]-* | amd64-* | arc-* | arceb-* \
++	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
 +	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 +	| avr-* | avr32-* \
 +	| be32-* | be64-* \
 +	| bfin-* | bs2000-* \
 +	| c[123]* | c30-* | [cjt]90-* | c4x-* \
 +	| clipper-* | craynv-* | cydra-* \
 +	| d10v-* | d30v-* | dlx-* \
 +	| elxsi-* \
 +	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
 +	| h8300-* | h8500-* \
 +	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 +	| hexagon-* \
 +	| i*86-* | i860-* | i960-* | ia64-* \
 +	| ip2k-* | iq2000-* \
 +	| le32-* | le64-* \
 +	| lm32-* \
 +	| m32c-* | m32r-* | m32rle-* \
 +	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
 +	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
 +	| microblaze-* | microblazeel-* \
 +	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 +	| mips16-* \
 +	| mips64-* | mips64el-* \
 +	| mips64octeon-* | mips64octeonel-* \
 +	| mips64orion-* | mips64orionel-* \
 +	| mips64r5900-* | mips64r5900el-* \
 +	| mips64vr-* | mips64vrel-* \
 +	| mips64vr4100-* | mips64vr4100el-* \
 +	| mips64vr4300-* | mips64vr4300el-* \
 +	| mips64vr5000-* | mips64vr5000el-* \
 +	| mips64vr5900-* | mips64vr5900el-* \
 +	| mipsisa32-* | mipsisa32el-* \
 +	| mipsisa32r2-* | mipsisa32r2el-* \
 +	| mipsisa64-* | mipsisa64el-* \
 +	| mipsisa64r2-* | mipsisa64r2el-* \
 +	| mipsisa64sb1-* | mipsisa64sb1el-* \
 +	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
 +	| mipsr5900-* | mipsr5900el-* \
 +	| mipstx39-* | mipstx39el-* \
 +	| mmix-* \
 +	| mt-* \
 +	| msp430-* \
 +	| nds32-* | nds32le-* | nds32be-* \
 +	| nios-* | nios2-* | nios2eb-* | nios2el-* \
 +	| none-* | np1-* | ns16k-* | ns32k-* \
 +	| open8-* \
 +	| orion-* \
 +	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 +	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
 +	| pyramid-* \
 +	| rl78-* | romp-* | rs6000-* | rx-* \
 +	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 +	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 +	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 +	| sparclite-* \
 +	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
 +	| tahoe-* \
 +	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
 +	| tile*-* \
 +	| tron-* \
 +	| ubicom32-* \
 +	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
 +	| vax-* \
 +	| we32k-* \
 +	| x86-* | x86_64-* | xc16x-* | xps100-* \
 +	| xstormy16-* | xtensa*-* \
 +	| ymp-* \
 +	| z8k-* | z80-*)
 +		;;
 +	# Recognize the basic CPU types without company name, with glob match.
 +	xtensa*)
 +		basic_machine=$basic_machine-unknown
 +		;;
 +	# Recognize the various machine names and aliases which stand
 +	# for a CPU type and a company and sometimes even an OS.
 +	386bsd)
 +		basic_machine=i386-unknown
 +		os=-bsd
 +		;;
 +	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
 +		basic_machine=m68000-att
 +		;;
 +	3b*)
 +		basic_machine=we32k-att
 +		;;
 +	a29khif)
 +		basic_machine=a29k-amd
 +		os=-udi
 +		;;
 +	abacus)
 +		basic_machine=abacus-unknown
 +		;;
 +	adobe68k)
 +		basic_machine=m68010-adobe
 +		os=-scout
 +		;;
 +	alliant | fx80)
 +		basic_machine=fx80-alliant
 +		;;
 +	altos | altos3068)
 +		basic_machine=m68k-altos
 +		;;
 +	am29k)
 +		basic_machine=a29k-none
 +		os=-bsd
 +		;;
++	amd64)
++		basic_machine=x86_64-pc
++		;;
++	amd64-*)
++		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
 +	amdahl)
 +		basic_machine=580-amdahl
 +		os=-sysv
 +		;;
 +	amiga | amiga-*)
 +		basic_machine=m68k-unknown
 +		;;
 +	amigaos | amigados)
 +		basic_machine=m68k-unknown
 +		os=-amigaos
 +		;;
 +	amigaunix | amix)
 +		basic_machine=m68k-unknown
 +		os=-sysv4
 +		;;
 +	apollo68)
 +		basic_machine=m68k-apollo
 +		os=-sysv
 +		;;
 +	apollo68bsd)
 +		basic_machine=m68k-apollo
 +		os=-bsd
 +		;;
 +	aros)
 +		basic_machine=i386-pc
 +		os=-aros
 +		;;
 +	aux)
 +		basic_machine=m68k-apple
 +		os=-aux
 +		;;
 +	balance)
 +		basic_machine=ns32k-sequent
 +		os=-dynix
 +		;;
 +	blackfin)
 +		basic_machine=bfin-unknown
 +		os=-linux
 +		;;
 +	blackfin-*)
 +		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
 +		os=-linux
 +		;;
 +	bluegene*)
 +		basic_machine=powerpc-ibm
 +		os=-cnk
 +		;;
 +	c54x-*)
 +		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
 +		;;
 +	c55x-*)
 +		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
 +		;;
 +	c6x-*)
 +		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
 +		;;
 +	c90)
 +		basic_machine=c90-cray
 +		os=-unicos
 +		;;
 +	cegcc)
 +		basic_machine=arm-unknown
 +		os=-cegcc
 +		;;
 +	convex-c1)
 +		basic_machine=c1-convex
 +		os=-bsd
 +		;;
 +	convex-c2)
 +		basic_machine=c2-convex
 +		os=-bsd
 +		;;
 +	convex-c32)
 +		basic_machine=c32-convex
 +		os=-bsd
 +		;;
 +	convex-c34)
 +		basic_machine=c34-convex
 +		os=-bsd
 +		;;
 +	convex-c38)
 +		basic_machine=c38-convex
 +		os=-bsd
 +		;;
 +	cray | j90)
 +		basic_machine=j90-cray
 +		os=-unicos
 +		;;
 +	craynv)
 +		basic_machine=craynv-cray
 +		os=-unicosmp
 +		;;
 +	cr16 | cr16-*)
 +		basic_machine=cr16-unknown
 +		os=-elf
 +		;;
 +	crds | unos)
 +		basic_machine=m68k-crds
 +		;;
 +	crisv32 | crisv32-* | etraxfs*)
 +		basic_machine=crisv32-axis
 +		;;
 +	cris | cris-* | etrax*)
 +		basic_machine=cris-axis
 +		;;
 +	crx)
 +		basic_machine=crx-unknown
 +		os=-elf
 +		;;
 +	da30 | da30-*)
 +		basic_machine=m68k-da30
 +		;;
 +	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
 +		basic_machine=mips-dec
 +		;;
 +	decsystem10* | dec10*)
 +		basic_machine=pdp10-dec
 +		os=-tops10
 +		;;
 +	decsystem20* | dec20*)
 +		basic_machine=pdp10-dec
 +		os=-tops20
 +		;;
 +	delta | 3300 | motorola-3300 | motorola-delta \
 +	      | 3300-motorola | delta-motorola)
 +		basic_machine=m68k-motorola
 +		;;
 +	delta88)
 +		basic_machine=m88k-motorola
 +		os=-sysv3
 +		;;
 +	dicos)
 +		basic_machine=i686-pc
 +		os=-dicos
 +		;;
 +	djgpp)
 +		basic_machine=i586-pc
 +		os=-msdosdjgpp
 +		;;
 +	dpx20 | dpx20-*)
 +		basic_machine=rs6000-bull
 +		os=-bosx
 +		;;
 +	dpx2* | dpx2*-bull)
 +		basic_machine=m68k-bull
 +		os=-sysv3
 +		;;
 +	ebmon29k)
 +		basic_machine=a29k-amd
 +		os=-ebmon
 +		;;
 +	elxsi)
 +		basic_machine=elxsi-elxsi
 +		os=-bsd
 +		;;
 +	encore | umax | mmax)
 +		basic_machine=ns32k-encore
 +		;;
 +	es1800 | OSE68k | ose68k | ose | OSE)
 +		basic_machine=m68k-ericsson
 +		os=-ose
 +		;;
 +	fx2800)
 +		basic_machine=i860-alliant
 +		;;
 +	genix)
 +		basic_machine=ns32k-ns
 +		;;
 +	gmicro)
 +		basic_machine=tron-gmicro
 +		os=-sysv
 +		;;
 +	go32)
 +		basic_machine=i386-pc
 +		os=-go32
 +		;;
 +	h3050r* | hiux*)
 +		basic_machine=hppa1.1-hitachi
 +		os=-hiuxwe2
 +		;;
 +	h8300hms)
 +		basic_machine=h8300-hitachi
 +		os=-hms
 +		;;
 +	h8300xray)
 +		basic_machine=h8300-hitachi
 +		os=-xray
 +		;;
 +	h8500hms)
 +		basic_machine=h8500-hitachi
 +		os=-hms
 +		;;
 +	harris)
 +		basic_machine=m88k-harris
 +		os=-sysv3
 +		;;
 +	hp300-*)
 +		basic_machine=m68k-hp
 +		;;
 +	hp300bsd)
 +		basic_machine=m68k-hp
 +		os=-bsd
 +		;;
 +	hp300hpux)
 +		basic_machine=m68k-hp
 +		os=-hpux
 +		;;
 +	hp3k9[0-9][0-9] | hp9[0-9][0-9])
 +		basic_machine=hppa1.0-hp
 +		;;
 +	hp9k2[0-9][0-9] | hp9k31[0-9])
 +		basic_machine=m68000-hp
 +		;;
 +	hp9k3[2-9][0-9])
 +		basic_machine=m68k-hp
 +		;;
 +	hp9k6[0-9][0-9] | hp6[0-9][0-9])
 +		basic_machine=hppa1.0-hp
 +		;;
 +	hp9k7[0-79][0-9] | hp7[0-79][0-9])
 +		basic_machine=hppa1.1-hp
 +		;;
 +	hp9k78[0-9] | hp78[0-9])
 +		# FIXME: really hppa2.0-hp
 +		basic_machine=hppa1.1-hp
 +		;;
 +	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
 +		# FIXME: really hppa2.0-hp
 +		basic_machine=hppa1.1-hp
 +		;;
 +	hp9k8[0-9][13679] | hp8[0-9][13679])
 +		basic_machine=hppa1.1-hp
 +		;;
 +	hp9k8[0-9][0-9] | hp8[0-9][0-9])
 +		basic_machine=hppa1.0-hp
 +		;;
 +	hppa-next)
 +		os=-nextstep3
 +		;;
 +	hppaosf)
 +		basic_machine=hppa1.1-hp
 +		os=-osf
 +		;;
 +	hppro)
 +		basic_machine=hppa1.1-hp
 +		os=-proelf
 +		;;
 +	i370-ibm* | ibm*)
 +		basic_machine=i370-ibm
 +		;;
 +	i*86v32)
 +		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 +		os=-sysv32
 +		;;
 +	i*86v4*)
 +		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 +		os=-sysv4
 +		;;
 +	i*86v)
 +		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 +		os=-sysv
 +		;;
 +	i*86sol2)
 +		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 +		os=-solaris2
 +		;;
 +	i386mach)
 +		basic_machine=i386-mach
 +		os=-mach
 +		;;
 +	i386-vsta | vsta)
 +		basic_machine=i386-unknown
 +		os=-vsta
 +		;;
 +	iris | iris4d)
 +		basic_machine=mips-sgi
 +		case $os in
 +		    -irix*)
 +			;;
 +		    *)
 +			os=-irix4
 +			;;
 +		esac
 +		;;
 +	isi68 | isi)
 +		basic_machine=m68k-isi
 +		os=-sysv
 +		;;
 +	m68knommu)
 +		basic_machine=m68k-unknown
 +		os=-linux
 +		;;
 +	m68knommu-*)
 +		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
 +		os=-linux
 +		;;
 +	m88k-omron*)
 +		basic_machine=m88k-omron
 +		;;
 +	magnum | m3230)
 +		basic_machine=mips-mips
 +		os=-sysv
 +		;;
 +	merlin)
 +		basic_machine=ns32k-utek
 +		os=-sysv
 +		;;
 +	microblaze*)
 +		basic_machine=microblaze-xilinx
 +		;;
 +	mingw64)
 +		basic_machine=x86_64-pc
 +		os=-mingw64
 +		;;
 +	mingw32)
 +		basic_machine=i386-pc
 +		os=-mingw32
 +		;;
 +	mingw32ce)
 +		basic_machine=arm-unknown
 +		os=-mingw32ce
 +		;;
 +	miniframe)
 +		basic_machine=m68000-convergent
 +		;;
 +	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
 +		basic_machine=m68k-atari
 +		os=-mint
 +		;;
 +	mips3*-*)
 +		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
 +		;;
 +	mips3*)
 +		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
 +		;;
 +	monitor)
 +		basic_machine=m68k-rom68k
 +		os=-coff
 +		;;
 +	morphos)
 +		basic_machine=powerpc-unknown
 +		os=-morphos
 +		;;
 +	msdos)
 +		basic_machine=i386-pc
 +		os=-msdos
 +		;;
 +	ms1-*)
 +		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
 +		;;
 +	msys)
 +		basic_machine=i386-pc
 +		os=-msys
 +		;;
 +	mvs)
 +		basic_machine=i370-ibm
 +		os=-mvs
 +		;;
 +	nacl)
 +		basic_machine=le32-unknown
 +		os=-nacl
 +		;;
 +	ncr3000)
 +		basic_machine=i486-ncr
 +		os=-sysv4
 +		;;
 +	netbsd386)
 +		basic_machine=i386-unknown
 +		os=-netbsd
 +		;;
 +	netwinder)
 +		basic_machine=armv4l-rebel
 +		os=-linux
 +		;;
 +	news | news700 | news800 | news900)
 +		basic_machine=m68k-sony
 +		os=-newsos
 +		;;
 +	news1000)
 +		basic_machine=m68030-sony
 +		os=-newsos
 +		;;
 +	news-3600 | risc-news)
 +		basic_machine=mips-sony
 +		os=-newsos
 +		;;
 +	necv70)
 +		basic_machine=v70-nec
 +		os=-sysv
 +		;;
 +	next | m*-next )
 +		basic_machine=m68k-next
 +		case $os in
 +		    -nextstep* )
 +			;;
 +		    -ns2*)
 +		      os=-nextstep2
 +			;;
 +		    *)
 +		      os=-nextstep3
 +			;;
 +		esac
 +		;;
 +	nh3000)
 +		basic_machine=m68k-harris
 +		os=-cxux
 +		;;
 +	nh[45]000)
 +		basic_machine=m88k-harris
 +		os=-cxux
 +		;;
 +	nindy960)
 +		basic_machine=i960-intel
 +		os=-nindy
 +		;;
 +	mon960)
 +		basic_machine=i960-intel
 +		os=-mon960
 +		;;
 +	nonstopux)
 +		basic_machine=mips-compaq
 +		os=-nonstopux
 +		;;
 +	np1)
 +		basic_machine=np1-gould
 +		;;
 +	neo-tandem)
 +		basic_machine=neo-tandem
 +		;;
 +	nse-tandem)
 +		basic_machine=nse-tandem
 +		;;
 +	nsr-tandem)
 +		basic_machine=nsr-tandem
 +		;;
 +	op50n-* | op60c-*)
 +		basic_machine=hppa1.1-oki
 +		os=-proelf
 +		;;
 +	openrisc | openrisc-*)
 +		basic_machine=or32-unknown
 +		;;
 +	os400)
 +		basic_machine=powerpc-ibm
 +		os=-os400
 +		;;
 +	OSE68000 | ose68000)
 +		basic_machine=m68000-ericsson
 +		os=-ose
 +		;;
 +	os68k)
 +		basic_machine=m68k-none
 +		os=-os68k
 +		;;
 +	pa-hitachi)
 +		basic_machine=hppa1.1-hitachi
 +		os=-hiuxwe2
 +		;;
 +	paragon)
 +		basic_machine=i860-intel
 +		os=-osf
 +		;;
 +	parisc)
 +		basic_machine=hppa-unknown
 +		os=-linux
 +		;;
 +	parisc-*)
 +		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
 +		os=-linux
 +		;;
 +	pbd)
 +		basic_machine=sparc-tti
 +		;;
 +	pbb)
 +		basic_machine=m68k-tti
 +		;;
 +	pc532 | pc532-*)
 +		basic_machine=ns32k-pc532
 +		;;
 +	pc98)
 +		basic_machine=i386-pc
 +		;;
 +	pc98-*)
 +		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
 +		;;
 +	pentium | p5 | k5 | k6 | nexgen | viac3)
 +		basic_machine=i586-pc
 +		;;
 +	pentiumpro | p6 | 6x86 | athlon | athlon_*)
 +		basic_machine=i686-pc
 +		;;
 +	pentiumii | pentium2 | pentiumiii | pentium3)
 +		basic_machine=i686-pc
 +		;;
 +	pentium4)
 +		basic_machine=i786-pc
 +		;;
 +	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
 +		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
 +		;;
 +	pentiumpro-* | p6-* | 6x86-* | athlon-*)
 +		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 +		;;
 +	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
 +		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 +		;;
 +	pentium4-*)
 +		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
 +		;;
 +	pn)
 +		basic_machine=pn-gould
 +		;;
 +	power)	basic_machine=power-ibm
 +		;;
 +	ppc | ppcbe)	basic_machine=powerpc-unknown
 +		;;
 +	ppc-* | ppcbe-*)
 +		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
 +		;;
 +	ppcle | powerpclittle | ppc-le | powerpc-little)
 +		basic_machine=powerpcle-unknown
 +		;;
 +	ppcle-* | powerpclittle-*)
 +		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
 +		;;
 +	ppc64)	basic_machine=powerpc64-unknown
 +		;;
- 	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
++	ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
 +		;;
 +	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
 +		basic_machine=powerpc64le-unknown
 +		;;
 +	ppc64le-* | powerpc64little-*)
 +		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
 +		;;
 +	ps2)
 +		basic_machine=i386-ibm
 +		;;
 +	pw32)
 +		basic_machine=i586-unknown
 +		os=-pw32
 +		;;
 +	rdos | rdos64)
 +		basic_machine=x86_64-pc
 +		os=-rdos
 +		;;
 +	rdos32)
 +		basic_machine=i386-pc
 +		os=-rdos
 +		;;
 +	rom68k)
 +		basic_machine=m68k-rom68k
 +		os=-coff
 +		;;
 +	rm[46]00)
 +		basic_machine=mips-siemens
 +		;;
 +	rtpc | rtpc-*)
 +		basic_machine=romp-ibm
 +		;;
 +	s390 | s390-*)
 +		basic_machine=s390-ibm
 +		;;
 +	s390x | s390x-*)
 +		basic_machine=s390x-ibm
 +		;;
 +	sa29200)
 +		basic_machine=a29k-amd
 +		os=-udi
 +		;;
 +	sb1)
 +		basic_machine=mipsisa64sb1-unknown
 +		;;
 +	sb1el)
 +		basic_machine=mipsisa64sb1el-unknown
 +		;;
 +	sde)
 +		basic_machine=mipsisa32-sde
 +		os=-elf
 +		;;
 +	sei)
 +		basic_machine=mips-sei
 +		os=-seiux
 +		;;
 +	sequent)
 +		basic_machine=i386-sequent
 +		;;
 +	sh)
 +		basic_machine=sh-hitachi
 +		os=-hms
 +		;;
 +	sh5el)
 +		basic_machine=sh5le-unknown
 +		;;
 +	sh64)
 +		basic_machine=sh64-unknown
 +		;;
 +	sparclite-wrs | simso-wrs)
 +		basic_machine=sparclite-wrs
 +		os=-vxworks
 +		;;
 +	sps7)
 +		basic_machine=m68k-bull
 +		os=-sysv2
 +		;;
 +	spur)
 +		basic_machine=spur-unknown
 +		;;
 +	st2000)
 +		basic_machine=m68k-tandem
 +		;;
 +	stratus)
 +		basic_machine=i860-stratus
 +		os=-sysv4
 +		;;
 +	strongarm-* | thumb-*)
 +		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
 +		;;
 +	sun2)
 +		basic_machine=m68000-sun
 +		;;
 +	sun2os3)
 +		basic_machine=m68000-sun
 +		os=-sunos3
 +		;;
 +	sun2os4)
 +		basic_machine=m68000-sun
 +		os=-sunos4
 +		;;
 +	sun3os3)
 +		basic_machine=m68k-sun
 +		os=-sunos3
 +		;;
 +	sun3os4)
 +		basic_machine=m68k-sun
 +		os=-sunos4
 +		;;
 +	sun4os3)
 +		basic_machine=sparc-sun
 +		os=-sunos3
 +		;;
 +	sun4os4)
 +		basic_machine=sparc-sun
 +		os=-sunos4
 +		;;
 +	sun4sol2)
 +		basic_machine=sparc-sun
 +		os=-solaris2
 +		;;
 +	sun3 | sun3-*)
 +		basic_machine=m68k-sun
 +		;;
 +	sun4)
 +		basic_machine=sparc-sun
 +		;;
 +	sun386 | sun386i | roadrunner)
 +		basic_machine=i386-sun
 +		;;
 +	sv1)
 +		basic_machine=sv1-cray
 +		os=-unicos
 +		;;
 +	symmetry)
 +		basic_machine=i386-sequent
 +		os=-dynix
 +		;;
 +	t3e)
 +		basic_machine=alphaev5-cray
 +		os=-unicos
 +		;;
 +	t90)
 +		basic_machine=t90-cray
 +		os=-unicos
 +		;;
 +	tile*)
 +		basic_machine=$basic_machine-unknown
 +		os=-linux-gnu
 +		;;
 +	tx39)
 +		basic_machine=mipstx39-unknown
 +		;;
 +	tx39el)
 +		basic_machine=mipstx39el-unknown
 +		;;
 +	toad1)
 +		basic_machine=pdp10-xkl
 +		os=-tops20
 +		;;
 +	tower | tower-32)
 +		basic_machine=m68k-ncr
 +		;;
 +	tpf)
 +		basic_machine=s390x-ibm
 +		os=-tpf
 +		;;
 +	udi29k)
 +		basic_machine=a29k-amd
 +		os=-udi
 +		;;
 +	ultra3)
 +		basic_machine=a29k-nyu
 +		os=-sym1
 +		;;
 +	v810 | necv810)
 +		basic_machine=v810-nec
 +		os=-none
 +		;;
 +	vaxv)
 +		basic_machine=vax-dec
 +		os=-sysv
 +		;;
 +	vms)
 +		basic_machine=vax-dec
 +		os=-vms
 +		;;
 +	vpp*|vx|vx-*)
 +		basic_machine=f301-fujitsu
 +		;;
 +	vxworks960)
 +		basic_machine=i960-wrs
 +		os=-vxworks
 +		;;
 +	vxworks68)
 +		basic_machine=m68k-wrs
 +		os=-vxworks
 +		;;
 +	vxworks29k)
 +		basic_machine=a29k-wrs
 +		os=-vxworks
 +		;;
 +	w65*)
 +		basic_machine=w65-wdc
 +		os=-none
 +		;;
 +	w89k-*)
 +		basic_machine=hppa1.1-winbond
 +		os=-proelf
 +		;;
 +	xbox)
 +		basic_machine=i686-pc
 +		os=-mingw32
 +		;;
 +	xps | xps100)
 +		basic_machine=xps100-honeywell
 +		;;
 +	xscale-* | xscalee[bl]-*)
 +		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
 +		;;
 +	ymp)
 +		basic_machine=ymp-cray
 +		os=-unicos
 +		;;
 +	z8k-*-coff)
 +		basic_machine=z8k-unknown
 +		os=-sim
 +		;;
 +	z80-*-coff)
 +		basic_machine=z80-unknown
 +		os=-sim
 +		;;
 +	none)
 +		basic_machine=none-none
 +		os=-none
 +		;;
 +
 +# Here we handle the default manufacturer of certain CPU types.  It is in
 +# some cases the only manufacturer, in others, it is the most popular.
 +	w89k)
 +		basic_machine=hppa1.1-winbond
 +		;;
 +	op50n)
 +		basic_machine=hppa1.1-oki
 +		;;
 +	op60c)
 +		basic_machine=hppa1.1-oki
 +		;;
 +	romp)
 +		basic_machine=romp-ibm
 +		;;
 +	mmix)
 +		basic_machine=mmix-knuth
 +		;;
 +	rs6000)
 +		basic_machine=rs6000-ibm
 +		;;
 +	vax)
 +		basic_machine=vax-dec
 +		;;
 +	pdp10)
 +		# there are many clones, so DEC is not a safe bet
 +		basic_machine=pdp10-unknown
 +		;;
 +	pdp11)
 +		basic_machine=pdp11-dec
 +		;;
 +	we32k)
 +		basic_machine=we32k-att
 +		;;
 +	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
 +		basic_machine=sh-unknown
 +		;;
 +	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
 +		basic_machine=sparc-sun
 +		;;
 +	cydra)
 +		basic_machine=cydra-cydrome
 +		;;
 +	orion)
 +		basic_machine=orion-highlevel
 +		;;
 +	orion105)
 +		basic_machine=clipper-highlevel
 +		;;
 +	mac | mpw | mac-mpw)
 +		basic_machine=m68k-apple
 +		;;
 +	pmac | pmac-mpw)
 +		basic_machine=powerpc-apple
 +		;;
 +	*-unknown)
 +		# Make sure to match an already-canonicalized machine name.
 +		;;
 +	*)
 +		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
 +		exit 1
 +		;;
 +esac
 +
 +# Here we canonicalize certain aliases for manufacturers.
 +case $basic_machine in
 +	*-digital*)
 +		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
 +		;;
 +	*-commodore*)
 +		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
 +		;;
 +	*)
 +		;;
 +esac
 +
 +# Decode manufacturer-specific aliases for certain operating systems.
 +
 +if [ x"$os" != x"" ]
 +then
 +case $os in
 +	# First match some system type aliases
 +	# that might get confused with valid system types.
 +	# -solaris* is a basic system type, with this one exception.
 +	-auroraux)
 +		os=-auroraux
 +		;;
 +	-solaris1 | -solaris1.*)
 +		os=`echo $os | sed -e 's|solaris1|sunos4|'`
 +		;;
 +	-solaris)
 +		os=-solaris2
 +		;;
 +	-svr4*)
 +		os=-sysv4
 +		;;
 +	-unixware*)
 +		os=-sysv4.2uw
 +		;;
 +	-gnu/linux*)
 +		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
 +		;;
 +	# First accept the basic system types.
 +	# The portable systems comes first.
 +	# Each alternative MUST END IN A *, to match a version number.
 +	# -sysv* is not here because it comes later, after sysvr4.
 +	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
 +	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
 +	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
 +	      | -sym* | -kopensolaris* | -plan9* \
 +	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
 +	      | -aos* | -aros* \
 +	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 +	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
 +	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
 +	      | -bitrig* | -openbsd* | -solidbsd* \
 +	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
 +	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 +	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 +	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 +	      | -chorusos* | -chorusrdb* | -cegcc* \
 +	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
 +	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
 +	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
 +	      | -uxpv* | -beos* | -mpeix* | -udk* \
 +	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 +	      | -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* \
 +	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
 +	# Remember, each alternative MUST END IN *, to match a version number.
 +		;;
 +	-qnx*)
 +		case $basic_machine in
 +		    x86-* | i*86-*)
 +			;;
 +		    *)
 +			os=-nto$os
 +			;;
 +		esac
 +		;;
 +	-nto-qnx*)
 +		;;
 +	-nto*)
 +		os=`echo $os | sed -e 's|nto|nto-qnx|'`
 +		;;
 +	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
 +	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
 +	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
 +		;;
 +	-mac*)
 +		os=`echo $os | sed -e 's|mac|macos|'`
 +		;;
 +	-linux-dietlibc)
 +		os=-linux-dietlibc
 +		;;
 +	-linux*)
 +		os=`echo $os | sed -e 's|linux|linux-gnu|'`
 +		;;
 +	-sunos5*)
 +		os=`echo $os | sed -e 's|sunos5|solaris2|'`
 +		;;
 +	-sunos6*)
 +		os=`echo $os | sed -e 's|sunos6|solaris3|'`
 +		;;
 +	-opened*)
 +		os=-openedition
 +		;;
 +	-os400*)
 +		os=-os400
 +		;;
 +	-wince*)
 +		os=-wince
 +		;;
 +	-osfrose*)
 +		os=-osfrose
 +		;;
 +	-osf*)
 +		os=-osf
 +		;;
 +	-utek*)
 +		os=-bsd
 +		;;
 +	-dynix*)
 +		os=-bsd
 +		;;
 +	-acis*)
 +		os=-aos
 +		;;
 +	-atheos*)
 +		os=-atheos
 +		;;
 +	-syllable*)
 +		os=-syllable
 +		;;
 +	-386bsd)
 +		os=-bsd
 +		;;
 +	-ctix* | -uts*)
 +		os=-sysv
 +		;;
 +	-nova*)
 +		os=-rtmk-nova
 +		;;
 +	-ns2 )
 +		os=-nextstep2
 +		;;
 +	-nsk*)
 +		os=-nsk
 +		;;
 +	# Preserve the version number of sinix5.
 +	-sinix5.*)
 +		os=`echo $os | sed -e 's|sinix|sysv|'`
 +		;;
 +	-sinix*)
 +		os=-sysv4
 +		;;
 +	-tpf*)
 +		os=-tpf
 +		;;
 +	-triton*)
 +		os=-sysv3
 +		;;
 +	-oss*)
 +		os=-sysv3
 +		;;
 +	-svr4)
 +		os=-sysv4
 +		;;
 +	-svr3)
 +		os=-sysv3
 +		;;
 +	-sysvr4)
 +		os=-sysv4
 +		;;
 +	# This must come after -sysvr4.
 +	-sysv*)
 +		;;
 +	-ose*)
 +		os=-ose
 +		;;
 +	-es1800*)
 +		os=-ose
 +		;;
 +	-xenix)
 +		os=-xenix
 +		;;
 +	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
 +		os=-mint
 +		;;
 +	-aros*)
 +		os=-aros
 +		;;
 +	-zvmoe)
 +		os=-zvmoe
 +		;;
 +	-dicos*)
 +		os=-dicos
 +		;;
 +	-nacl*)
 +		;;
 +	-none)
 +		;;
 +	*)
 +		# Get rid of the `-' at the beginning of $os.
 +		os=`echo $os | sed 's/[^-]*-//'`
 +		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
 +		exit 1
 +		;;
 +esac
 +else
 +
 +# Here we handle the default operating systems that come with various machines.
 +# The value should be what the vendor currently ships out the door with their
 +# machine or put another way, the most popular os provided with the machine.
 +
 +# Note that if you're going to try to match "-MANUFACTURER" here (say,
 +# "-sun"), then you have to tell the case statement up towards the top
 +# that MANUFACTURER isn't an operating system.  Otherwise, code above
 +# will signal an error saying that MANUFACTURER isn't an operating
 +# system, and we'll never get to this point.
 +
 +case $basic_machine in
 +	score-*)
 +		os=-elf
 +		;;
 +	spu-*)
 +		os=-elf
 +		;;
 +	*-acorn)
 +		os=-riscix1.2
 +		;;
 +	arm*-rebel)
 +		os=-linux
 +		;;
 +	arm*-semi)
 +		os=-aout
 +		;;
 +	c4x-* | tic4x-*)
 +		os=-coff
 +		;;
 +	hexagon-*)
 +		os=-elf
 +		;;
 +	tic54x-*)
 +		os=-coff
 +		;;
 +	tic55x-*)
 +		os=-coff
 +		;;
 +	tic6x-*)
 +		os=-coff
 +		;;
 +	# This must come before the *-dec entry.
 +	pdp10-*)
 +		os=-tops20
 +		;;
 +	pdp11-*)
 +		os=-none
 +		;;
 +	*-dec | vax-*)
 +		os=-ultrix4.2
 +		;;
 +	m68*-apollo)
 +		os=-domain
 +		;;
 +	i386-sun)
 +		os=-sunos4.0.2
 +		;;
 +	m68000-sun)
 +		os=-sunos3
 +		;;
 +	m68*-cisco)
 +		os=-aout
 +		;;
 +	mep-*)
 +		os=-elf
 +		;;
 +	mips*-cisco)
 +		os=-elf
 +		;;
 +	mips*-*)
 +		os=-elf
 +		;;
 +	or1k-*)
 +		os=-elf
 +		;;
 +	or32-*)
 +		os=-coff
 +		;;
 +	*-tti)	# must be before sparc entry or we get the wrong os.
 +		os=-sysv3
 +		;;
 +	sparc-* | *-sun)
 +		os=-sunos4.1.1
 +		;;
 +	*-be)
 +		os=-beos
 +		;;
 +	*-haiku)
 +		os=-haiku
 +		;;
 +	*-ibm)
 +		os=-aix
 +		;;
 +	*-knuth)
 +		os=-mmixware
 +		;;
 +	*-wec)
 +		os=-proelf
 +		;;
 +	*-winbond)
 +		os=-proelf
 +		;;
 +	*-oki)
 +		os=-proelf
 +		;;
 +	*-hp)
 +		os=-hpux
 +		;;
 +	*-hitachi)
 +		os=-hiux
 +		;;
 +	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
 +		os=-sysv
 +		;;
 +	*-cbm)
 +		os=-amigaos
 +		;;
 +	*-dg)
 +		os=-dgux
 +		;;
 +	*-dolphin)
 +		os=-sysv3
 +		;;
 +	m68k-ccur)
 +		os=-rtu
 +		;;
 +	m88k-omron*)
 +		os=-luna
 +		;;
 +	*-next )
 +		os=-nextstep
 +		;;
 +	*-sequent)
 +		os=-ptx
 +		;;
 +	*-crds)
 +		os=-unos
 +		;;
 +	*-ns)
 +		os=-genix
 +		;;
 +	i370-*)
 +		os=-mvs
 +		;;
 +	*-next)
 +		os=-nextstep3
 +		;;
 +	*-gould)
 +		os=-sysv
 +		;;
 +	*-highlevel)
 +		os=-bsd
 +		;;
 +	*-encore)
 +		os=-bsd
 +		;;
 +	*-sgi)
 +		os=-irix
 +		;;
 +	*-siemens)
 +		os=-sysv4
 +		;;
 +	*-masscomp)
 +		os=-rtu
 +		;;
 +	f30[01]-fujitsu | f700-fujitsu)
 +		os=-uxpv
 +		;;
 +	*-rom68k)
 +		os=-coff
 +		;;
 +	*-*bug)
 +		os=-coff
 +		;;
 +	*-apple)
 +		os=-macos
 +		;;
 +	*-atari*)
 +		os=-mint
 +		;;
 +	*)
 +		os=-none
 +		;;
 +esac
 +fi
 +
 +# Here we handle the case where we know the os, and the CPU type, but not the
 +# manufacturer.  We pick the logical manufacturer.
 +vendor=unknown
 +case $basic_machine in
 +	*-unknown)
 +		case $os in
 +			-riscix*)
 +				vendor=acorn
 +				;;
 +			-sunos*)
 +				vendor=sun
 +				;;
 +			-cnk*|-aix*)
 +				vendor=ibm
 +				;;
 +			-beos*)
 +				vendor=be
 +				;;
 +			-hpux*)
 +				vendor=hp
 +				;;
 +			-mpeix*)
 +				vendor=hp
 +				;;
 +			-hiux*)
 +				vendor=hitachi
 +				;;
 +			-unos*)
 +				vendor=crds
 +				;;
 +			-dgux*)
 +				vendor=dg
 +				;;
 +			-luna*)
 +				vendor=omron
 +				;;
 +			-genix*)
 +				vendor=ns
 +				;;
 +			-mvs* | -opened*)
 +				vendor=ibm
 +				;;
 +			-os400*)
 +				vendor=ibm
 +				;;
 +			-ptx*)
 +				vendor=sequent
 +				;;
 +			-tpf*)
 +				vendor=ibm
 +				;;
 +			-vxsim* | -vxworks* | -windiss*)
 +				vendor=wrs
 +				;;
 +			-aux*)
 +				vendor=apple
 +				;;
 +			-hms*)
 +				vendor=hitachi
 +				;;
 +			-mpw* | -macos*)
 +				vendor=apple
 +				;;
 +			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
 +				vendor=atari
 +				;;
 +			-vos*)
 +				vendor=stratus
 +				;;
 +		esac
 +		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
 +		;;
 +esac
 +
 +echo $basic_machine$os
 +exit
 +
 +# Local variables:
 +# eval: (add-hook 'write-file-hooks 'time-stamp)
 +# time-stamp-start: "timestamp='"
 +# time-stamp-format: "%:y-%02m-%02d"
 +# time-stamp-end: "'"
 +# End:
diff --cc build-aux/depcomp
index fc98710,0000000..4ebd5b3
mode 100755,000000..100755
--- a/build-aux/depcomp
+++ b/build-aux/depcomp
@@@ -1,791 -1,0 +1,791 @@@
 +#! /bin/sh
 +# depcomp - compile a program generating dependencies as side-effects
 +
 +scriptversion=2013-05-30.07; # UTC
 +
- # Copyright (C) 1999-2014 Free Software Foundation, Inc.
++# Copyright (C) 1999-2013 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, see <http://www.gnu.org/licenses/>.
 +
 +# As a special exception to the GNU General Public License, if you
 +# distribute this file as part of a program that contains a
 +# 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 Alexandre Oliva <oliva at dcc.unicamp.br>.
 +
 +case $1 in
 +  '')
 +    echo "$0: No command.  Try '$0 --help' for more information." 1>&2
 +    exit 1;
 +    ;;
 +  -h | --h*)
 +    cat <<\EOF
 +Usage: depcomp [--help] [--version] PROGRAM [ARGS]
 +
 +Run PROGRAMS ARGS to compile a file, generating dependencies
 +as side-effects.
 +
 +Environment variables:
 +  depmode     Dependency tracking mode.
 +  source      Source file read by 'PROGRAMS ARGS'.
 +  object      Object file output by 'PROGRAMS ARGS'.
 +  DEPDIR      directory where to store dependencies.
 +  depfile     Dependency file to output.
 +  tmpdepfile  Temporary file to use when outputting dependencies.
 +  libtool     Whether libtool is used (yes/no).
 +
 +Report bugs to <bug-automake at gnu.org>.
 +EOF
 +    exit $?
 +    ;;
 +  -v | --v*)
 +    echo "depcomp $scriptversion"
 +    exit $?
 +    ;;
 +esac
 +
 +# Get the directory component of the given path, and save it in the
 +# global variables '$dir'.  Note that this directory component will
 +# be either empty or ending with a '/' character.  This is deliberate.
 +set_dir_from ()
 +{
 +  case $1 in
 +    */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;;
 +      *) dir=;;
 +  esac
 +}
 +
 +# Get the suffix-stripped basename of the given path, and save it the
 +# global variable '$base'.
 +set_base_from ()
 +{
 +  base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'`
 +}
 +
 +# If no dependency file was actually created by the compiler invocation,
 +# we still have to create a dummy depfile, to avoid errors with the
 +# Makefile "include basename.Plo" scheme.
 +make_dummy_depfile ()
 +{
 +  echo "#dummy" > "$depfile"
 +}
 +
 +# Factor out some common post-processing of the generated depfile.
 +# Requires the auxiliary global variable '$tmpdepfile' to be set.
 +aix_post_process_depfile ()
 +{
 +  # If the compiler actually managed to produce a dependency file,
 +  # post-process it.
 +  if test -f "$tmpdepfile"; then
 +    # Each line is of the form 'foo.o: dependency.h'.
 +    # Do two passes, one to just change these to
 +    #   $object: dependency.h
 +    # and one to simply output
 +    #   dependency.h:
 +    # which is needed to avoid the deleted-header problem.
 +    { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile"
 +      sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile"
 +    } > "$depfile"
 +    rm -f "$tmpdepfile"
 +  else
 +    make_dummy_depfile
 +  fi
 +}
 +
 +# A tabulation character.
 +tab='	'
 +# A newline character.
 +nl='
 +'
 +# Character ranges might be problematic outside the C locale.
 +# These definitions help.
 +upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ
 +lower=abcdefghijklmnopqrstuvwxyz
 +digits=0123456789
 +alpha=${upper}${lower}
 +
 +if test -z "$depmode" || test -z "$source" || test -z "$object"; then
 +  echo "depcomp: Variables source, object and depmode must be set" 1>&2
 +  exit 1
 +fi
 +
 +# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
 +depfile=${depfile-`echo "$object" |
 +  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
 +tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
 +
 +rm -f "$tmpdepfile"
 +
 +# Avoid interferences from the environment.
 +gccflag= dashmflag=
 +
 +# Some modes work just like other modes, but use different flags.  We
 +# parameterize here, but still list the modes in the big case below,
 +# to make depend.m4 easier to write.  Note that we *cannot* use a case
 +# here, because this file can only contain one case statement.
 +if test "$depmode" = hp; then
 +  # HP compiler uses -M and no extra arg.
 +  gccflag=-M
 +  depmode=gcc
 +fi
 +
 +if test "$depmode" = dashXmstdout; then
 +  # This is just like dashmstdout with a different argument.
 +  dashmflag=-xM
 +  depmode=dashmstdout
 +fi
 +
 +cygpath_u="cygpath -u -f -"
 +if test "$depmode" = msvcmsys; then
 +  # This is just like msvisualcpp but w/o cygpath translation.
 +  # Just convert the backslash-escaped backslashes to single forward
 +  # slashes to satisfy depend.m4
 +  cygpath_u='sed s,\\\\,/,g'
 +  depmode=msvisualcpp
 +fi
 +
 +if test "$depmode" = msvc7msys; then
 +  # This is just like msvc7 but w/o cygpath translation.
 +  # Just convert the backslash-escaped backslashes to single forward
 +  # slashes to satisfy depend.m4
 +  cygpath_u='sed s,\\\\,/,g'
 +  depmode=msvc7
 +fi
 +
 +if test "$depmode" = xlc; then
 +  # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information.
 +  gccflag=-qmakedep=gcc,-MF
 +  depmode=gcc
 +fi
 +
 +case "$depmode" in
 +gcc3)
 +## gcc 3 implements dependency tracking that does exactly what
 +## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
 +## it if -MD -MP comes after the -MF stuff.  Hmm.
 +## Unfortunately, FreeBSD c89 acceptance of flags depends upon
 +## the command line argument order; so add the flags where they
 +## appear in depend2.am.  Note that the slowdown incurred here
 +## affects only configure: in makefiles, %FASTDEP% shortcuts this.
 +  for arg
 +  do
 +    case $arg in
 +    -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
 +    *)  set fnord "$@" "$arg" ;;
 +    esac
 +    shift # fnord
 +    shift # $arg
 +  done
 +  "$@"
 +  stat=$?
 +  if test $stat -ne 0; then
 +    rm -f "$tmpdepfile"
 +    exit $stat
 +  fi
 +  mv "$tmpdepfile" "$depfile"
 +  ;;
 +
 +gcc)
 +## Note that this doesn't just cater to obsosete pre-3.x GCC compilers.
 +## but also to in-use compilers like IMB xlc/xlC and the HP C compiler.
 +## (see the conditional assignment to $gccflag above).
 +## There are various ways to get dependency output from gcc.  Here's
 +## why we pick this rather obscure method:
 +## - Don't want to use -MD because we'd like the dependencies to end
 +##   up in a subdir.  Having to rename by hand is ugly.
 +##   (We might end up doing this anyway to support other compilers.)
 +## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
 +##   -MM, not -M (despite what the docs say).  Also, it might not be
 +##   supported by the other compilers which use the 'gcc' depmode.
 +## - Using -M directly means running the compiler twice (even worse
 +##   than renaming).
 +  if test -z "$gccflag"; then
 +    gccflag=-MD,
 +  fi
 +  "$@" -Wp,"$gccflag$tmpdepfile"
 +  stat=$?
 +  if test $stat -ne 0; then
 +    rm -f "$tmpdepfile"
 +    exit $stat
 +  fi
 +  rm -f "$depfile"
 +  echo "$object : \\" > "$depfile"
 +  # The second -e expression handles DOS-style file names with drive
 +  # letters.
 +  sed -e 's/^[^:]*: / /' \
 +      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
 +## This next piece of magic avoids the "deleted header file" problem.
 +## The problem is that when a header file which appears in a .P file
 +## is deleted, the dependency causes make to die (because there is
 +## typically no way to rebuild the header).  We avoid this by adding
 +## dummy dependencies for each header file.  Too bad gcc doesn't do
 +## this for us directly.
 +## Some versions of gcc put a space before the ':'.  On the theory
 +## that the space means something, we add a space to the output as
 +## well.  hp depmode also adds that space, but also prefixes the VPATH
 +## to the object.  Take care to not repeat it in the output.
 +## Some versions of the HPUX 10.20 sed can't process this invocation
 +## correctly.  Breaking it into two sed invocations is a workaround.
 +  tr ' ' "$nl" < "$tmpdepfile" \
 +    | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
 +    | sed -e 's/$/ :/' >> "$depfile"
 +  rm -f "$tmpdepfile"
 +  ;;
 +
 +hp)
 +  # This case exists only to let depend.m4 do its work.  It works by
 +  # looking at the text of this script.  This case will never be run,
 +  # since it is checked for above.
 +  exit 1
 +  ;;
 +
 +sgi)
 +  if test "$libtool" = yes; then
 +    "$@" "-Wp,-MDupdate,$tmpdepfile"
 +  else
 +    "$@" -MDupdate "$tmpdepfile"
 +  fi
 +  stat=$?
 +  if test $stat -ne 0; then
 +    rm -f "$tmpdepfile"
 +    exit $stat
 +  fi
 +  rm -f "$depfile"
 +
 +  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
 +    echo "$object : \\" > "$depfile"
 +    # Clip off the initial element (the dependent).  Don't try to be
 +    # clever and replace this with sed code, as IRIX sed won't handle
 +    # lines with more than a fixed number of characters (4096 in
 +    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
 +    # the IRIX cc adds comments like '#:fec' to the end of the
 +    # dependency line.
 +    tr ' ' "$nl" < "$tmpdepfile" \
 +      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \
 +      | tr "$nl" ' ' >> "$depfile"
 +    echo >> "$depfile"
 +    # The second pass generates a dummy entry for each header file.
 +    tr ' ' "$nl" < "$tmpdepfile" \
 +      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
 +      >> "$depfile"
 +  else
 +    make_dummy_depfile
 +  fi
 +  rm -f "$tmpdepfile"
 +  ;;
 +
 +xlc)
 +  # This case exists only to let depend.m4 do its work.  It works by
 +  # looking at the text of this script.  This case will never be run,
 +  # since it is checked for above.
 +  exit 1
 +  ;;
 +
 +aix)
 +  # The C for AIX Compiler uses -M and outputs the dependencies
 +  # in a .u file.  In older versions, this file always lives in the
 +  # current directory.  Also, the AIX compiler puts '$object:' at the
 +  # start of each line; $object doesn't have directory information.
 +  # Version 6 uses the directory in both cases.
 +  set_dir_from "$object"
 +  set_base_from "$object"
 +  if test "$libtool" = yes; then
 +    tmpdepfile1=$dir$base.u
 +    tmpdepfile2=$base.u
 +    tmpdepfile3=$dir.libs/$base.u
 +    "$@" -Wc,-M
 +  else
 +    tmpdepfile1=$dir$base.u
 +    tmpdepfile2=$dir$base.u
 +    tmpdepfile3=$dir$base.u
 +    "$@" -M
 +  fi
 +  stat=$?
 +  if test $stat -ne 0; then
 +    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
 +    exit $stat
 +  fi
 +
 +  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
 +  do
 +    test -f "$tmpdepfile" && break
 +  done
 +  aix_post_process_depfile
 +  ;;
 +
 +tcc)
 +  # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26
 +  # FIXME: That version still under development at the moment of writing.
 +  #        Make that this statement remains true also for stable, released
 +  #        versions.
 +  # It will wrap lines (doesn't matter whether long or short) with a
 +  # trailing '\', as in:
 +  #
 +  #   foo.o : \
 +  #    foo.c \
 +  #    foo.h \
 +  #
 +  # It will put a trailing '\' even on the last line, and will use leading
 +  # spaces rather than leading tabs (at least since its commit 0394caf7
 +  # "Emit spaces for -MD").
 +  "$@" -MD -MF "$tmpdepfile"
 +  stat=$?
 +  if test $stat -ne 0; then
 +    rm -f "$tmpdepfile"
 +    exit $stat
 +  fi
 +  rm -f "$depfile"
 +  # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'.
 +  # We have to change lines of the first kind to '$object: \'.
 +  sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile"
 +  # And for each line of the second kind, we have to emit a 'dep.h:'
 +  # dummy dependency, to avoid the deleted-header problem.
 +  sed -n -e 's|^  *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile"
 +  rm -f "$tmpdepfile"
 +  ;;
 +
 +## The order of this option in the case statement is important, since the
 +## shell code in configure will try each of these formats in the order
 +## listed in this file.  A plain '-MD' option would be understood by many
 +## compilers, so we must ensure this comes after the gcc and icc options.
 +pgcc)
 +  # Portland's C compiler understands '-MD'.
 +  # Will always output deps to 'file.d' where file is the root name of the
 +  # source file under compilation, even if file resides in a subdirectory.
 +  # The object file name does not affect the name of the '.d' file.
 +  # pgcc 10.2 will output
 +  #    foo.o: sub/foo.c sub/foo.h
 +  # and will wrap long lines using '\' :
 +  #    foo.o: sub/foo.c ... \
 +  #     sub/foo.h ... \
 +  #     ...
 +  set_dir_from "$object"
 +  # Use the source, not the object, to determine the base name, since
 +  # that's sadly what pgcc will do too.
 +  set_base_from "$source"
 +  tmpdepfile=$base.d
 +
 +  # For projects that build the same source file twice into different object
 +  # files, the pgcc approach of using the *source* file root name can cause
 +  # problems in parallel builds.  Use a locking strategy to avoid stomping on
 +  # the same $tmpdepfile.
 +  lockdir=$base.d-lock
 +  trap "
 +    echo '$0: caught signal, cleaning up...' >&2
 +    rmdir '$lockdir'
 +    exit 1
 +  " 1 2 13 15
 +  numtries=100
 +  i=$numtries
 +  while test $i -gt 0; do
 +    # mkdir is a portable test-and-set.
 +    if mkdir "$lockdir" 2>/dev/null; then
 +      # This process acquired the lock.
 +      "$@" -MD
 +      stat=$?
 +      # Release the lock.
 +      rmdir "$lockdir"
 +      break
 +    else
 +      # If the lock is being held by a different process, wait
 +      # until the winning process is done or we timeout.
 +      while test -d "$lockdir" && test $i -gt 0; do
 +        sleep 1
 +        i=`expr $i - 1`
 +      done
 +    fi
 +    i=`expr $i - 1`
 +  done
 +  trap - 1 2 13 15
 +  if test $i -le 0; then
 +    echo "$0: failed to acquire lock after $numtries attempts" >&2
 +    echo "$0: check lockdir '$lockdir'" >&2
 +    exit 1
 +  fi
 +
 +  if test $stat -ne 0; then
 +    rm -f "$tmpdepfile"
 +    exit $stat
 +  fi
 +  rm -f "$depfile"
 +  # Each line is of the form `foo.o: dependent.h',
 +  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
 +  # Do two passes, one to just change these to
 +  # `$object: dependent.h' and one to simply `dependent.h:'.
 +  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
 +  # Some versions of the HPUX 10.20 sed can't process this invocation
 +  # correctly.  Breaking it into two sed invocations is a workaround.
 +  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \
 +    | sed -e 's/$/ :/' >> "$depfile"
 +  rm -f "$tmpdepfile"
 +  ;;
 +
 +hp2)
 +  # The "hp" stanza above does not work with aCC (C++) and HP's ia64
 +  # compilers, which have integrated preprocessors.  The correct option
 +  # to use with these is +Maked; it writes dependencies to a file named
 +  # 'foo.d', which lands next to the object file, wherever that
 +  # happens to be.
 +  # Much of this is similar to the tru64 case; see comments there.
 +  set_dir_from  "$object"
 +  set_base_from "$object"
 +  if test "$libtool" = yes; then
 +    tmpdepfile1=$dir$base.d
 +    tmpdepfile2=$dir.libs/$base.d
 +    "$@" -Wc,+Maked
 +  else
 +    tmpdepfile1=$dir$base.d
 +    tmpdepfile2=$dir$base.d
 +    "$@" +Maked
 +  fi
 +  stat=$?
 +  if test $stat -ne 0; then
 +     rm -f "$tmpdepfile1" "$tmpdepfile2"
 +     exit $stat
 +  fi
 +
 +  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
 +  do
 +    test -f "$tmpdepfile" && break
 +  done
 +  if test -f "$tmpdepfile"; then
 +    sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile"
 +    # Add 'dependent.h:' lines.
 +    sed -ne '2,${
 +               s/^ *//
 +               s/ \\*$//
 +               s/$/:/
 +               p
 +             }' "$tmpdepfile" >> "$depfile"
 +  else
 +    make_dummy_depfile
 +  fi
 +  rm -f "$tmpdepfile" "$tmpdepfile2"
 +  ;;
 +
 +tru64)
 +  # The Tru64 compiler uses -MD to generate dependencies as a side
 +  # effect.  'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
 +  # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
 +  # dependencies in 'foo.d' instead, so we check for that too.
 +  # Subdirectories are respected.
 +  set_dir_from  "$object"
 +  set_base_from "$object"
 +
 +  if test "$libtool" = yes; then
 +    # Libtool generates 2 separate objects for the 2 libraries.  These
 +    # two compilations output dependencies in $dir.libs/$base.o.d and
 +    # in $dir$base.o.d.  We have to check for both files, because
 +    # one of the two compilations can be disabled.  We should prefer
 +    # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
 +    # automatically cleaned when .libs/ is deleted, while ignoring
 +    # the former would cause a distcleancheck panic.
 +    tmpdepfile1=$dir$base.o.d          # libtool 1.5
 +    tmpdepfile2=$dir.libs/$base.o.d    # Likewise.
 +    tmpdepfile3=$dir.libs/$base.d      # Compaq CCC V6.2-504
 +    "$@" -Wc,-MD
 +  else
 +    tmpdepfile1=$dir$base.d
 +    tmpdepfile2=$dir$base.d
 +    tmpdepfile3=$dir$base.d
 +    "$@" -MD
 +  fi
 +
 +  stat=$?
 +  if test $stat -ne 0; then
 +    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
 +    exit $stat
 +  fi
 +
 +  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
 +  do
 +    test -f "$tmpdepfile" && break
 +  done
 +  # Same post-processing that is required for AIX mode.
 +  aix_post_process_depfile
 +  ;;
 +
 +msvc7)
 +  if test "$libtool" = yes; then
 +    showIncludes=-Wc,-showIncludes
 +  else
 +    showIncludes=-showIncludes
 +  fi
 +  "$@" $showIncludes > "$tmpdepfile"
 +  stat=$?
 +  grep -v '^Note: including file: ' "$tmpdepfile"
 +  if test $stat -ne 0; then
 +    rm -f "$tmpdepfile"
 +    exit $stat
 +  fi
 +  rm -f "$depfile"
 +  echo "$object : \\" > "$depfile"
 +  # The first sed program below extracts the file names and escapes
 +  # backslashes for cygpath.  The second sed program outputs the file
 +  # name when reading, but also accumulates all include files in the
 +  # hold buffer in order to output them again at the end.  This only
 +  # works with sed implementations that can handle large buffers.
 +  sed < "$tmpdepfile" -n '
 +/^Note: including file:  *\(.*\)/ {
 +  s//\1/
 +  s/\\/\\\\/g
 +  p
 +}' | $cygpath_u | sort -u | sed -n '
 +s/ /\\ /g
 +s/\(.*\)/'"$tab"'\1 \\/p
 +s/.\(.*\) \\/\1:/
 +H
 +$ {
 +  s/.*/'"$tab"'/
 +  G
 +  p
 +}' >> "$depfile"
 +  echo >> "$depfile" # make sure the fragment doesn't end with a backslash
 +  rm -f "$tmpdepfile"
 +  ;;
 +
 +msvc7msys)
 +  # This case exists only to let depend.m4 do its work.  It works by
 +  # looking at the text of this script.  This case will never be run,
 +  # since it is checked for above.
 +  exit 1
 +  ;;
 +
 +#nosideeffect)
 +  # This comment above is used by automake to tell side-effect
 +  # dependency tracking mechanisms from slower ones.
 +
 +dashmstdout)
 +  # Important note: in order to support this mode, a compiler *must*
 +  # always write the preprocessed file to stdout, regardless of -o.
 +  "$@" || exit $?
 +
 +  # Remove the call to Libtool.
 +  if test "$libtool" = yes; then
 +    while test "X$1" != 'X--mode=compile'; do
 +      shift
 +    done
 +    shift
 +  fi
 +
 +  # Remove '-o $object'.
 +  IFS=" "
 +  for arg
 +  do
 +    case $arg in
 +    -o)
 +      shift
 +      ;;
 +    $object)
 +      shift
 +      ;;
 +    *)
 +      set fnord "$@" "$arg"
 +      shift # fnord
 +      shift # $arg
 +      ;;
 +    esac
 +  done
 +
 +  test -z "$dashmflag" && dashmflag=-M
 +  # Require at least two characters before searching for ':'
 +  # in the target name.  This is to cope with DOS-style filenames:
 +  # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise.
 +  "$@" $dashmflag |
 +    sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile"
 +  rm -f "$depfile"
 +  cat < "$tmpdepfile" > "$depfile"
 +  # Some versions of the HPUX 10.20 sed can't process this sed invocation
 +  # correctly.  Breaking it into two sed invocations is a workaround.
 +  tr ' ' "$nl" < "$tmpdepfile" \
 +    | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
 +    | sed -e 's/$/ :/' >> "$depfile"
 +  rm -f "$tmpdepfile"
 +  ;;
 +
 +dashXmstdout)
 +  # This case only exists to satisfy depend.m4.  It is never actually
 +  # run, as this mode is specially recognized in the preamble.
 +  exit 1
 +  ;;
 +
 +makedepend)
 +  "$@" || exit $?
 +  # Remove any Libtool call
 +  if test "$libtool" = yes; then
 +    while test "X$1" != 'X--mode=compile'; do
 +      shift
 +    done
 +    shift
 +  fi
 +  # X makedepend
 +  shift
 +  cleared=no eat=no
 +  for arg
 +  do
 +    case $cleared in
 +    no)
 +      set ""; shift
 +      cleared=yes ;;
 +    esac
 +    if test $eat = yes; then
 +      eat=no
 +      continue
 +    fi
 +    case "$arg" in
 +    -D*|-I*)
 +      set fnord "$@" "$arg"; shift ;;
 +    # Strip any option that makedepend may not understand.  Remove
 +    # the object too, otherwise makedepend will parse it as a source file.
 +    -arch)
 +      eat=yes ;;
 +    -*|$object)
 +      ;;
 +    *)
 +      set fnord "$@" "$arg"; shift ;;
 +    esac
 +  done
 +  obj_suffix=`echo "$object" | sed 's/^.*\././'`
 +  touch "$tmpdepfile"
 +  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
 +  rm -f "$depfile"
 +  # makedepend may prepend the VPATH from the source file name to the object.
 +  # No need to regex-escape $object, excess matching of '.' is harmless.
 +  sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
 +  # Some versions of the HPUX 10.20 sed can't process the last invocation
 +  # correctly.  Breaking it into two sed invocations is a workaround.
 +  sed '1,2d' "$tmpdepfile" \
 +    | tr ' ' "$nl" \
 +    | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
 +    | sed -e 's/$/ :/' >> "$depfile"
 +  rm -f "$tmpdepfile" "$tmpdepfile".bak
 +  ;;
 +
 +cpp)
 +  # Important note: in order to support this mode, a compiler *must*
 +  # always write the preprocessed file to stdout.
 +  "$@" || exit $?
 +
 +  # Remove the call to Libtool.
 +  if test "$libtool" = yes; then
 +    while test "X$1" != 'X--mode=compile'; do
 +      shift
 +    done
 +    shift
 +  fi
 +
 +  # Remove '-o $object'.
 +  IFS=" "
 +  for arg
 +  do
 +    case $arg in
 +    -o)
 +      shift
 +      ;;
 +    $object)
 +      shift
 +      ;;
 +    *)
 +      set fnord "$@" "$arg"
 +      shift # fnord
 +      shift # $arg
 +      ;;
 +    esac
 +  done
 +
 +  "$@" -E \
 +    | 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"
 +  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
 +  rm -f "$tmpdepfile"
 +  ;;
 +
 +msvisualcpp)
 +  # Important note: in order to support this mode, a compiler *must*
 +  # always write the preprocessed file to stdout.
 +  "$@" || exit $?
 +
 +  # Remove the call to Libtool.
 +  if test "$libtool" = yes; then
 +    while test "X$1" != 'X--mode=compile'; do
 +      shift
 +    done
 +    shift
 +  fi
 +
 +  IFS=" "
 +  for arg
 +  do
 +    case "$arg" in
 +    -o)
 +      shift
 +      ;;
 +    $object)
 +      shift
 +      ;;
 +    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
 +        set fnord "$@"
 +        shift
 +        shift
 +        ;;
 +    *)
 +        set fnord "$@" "$arg"
 +        shift
 +        shift
 +        ;;
 +    esac
 +  done
 +  "$@" -E 2>/dev/null |
 +  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
 +  rm -f "$depfile"
 +  echo "$object : \\" > "$depfile"
 +  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile"
 +  echo "$tab" >> "$depfile"
 +  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
 +  rm -f "$tmpdepfile"
 +  ;;
 +
 +msvcmsys)
 +  # This case exists only to let depend.m4 do its work.  It works by
 +  # looking at the text of this script.  This case will never be run,
 +  # since it is checked for above.
 +  exit 1
 +  ;;
 +
 +none)
 +  exec "$@"
 +  ;;
 +
 +*)
 +  echo "Unknown depmode $depmode" 1>&2
 +  exit 1
 +  ;;
 +esac
 +
 +exit 0
 +
 +# Local Variables:
 +# mode: shell-script
 +# sh-indentation: 2
 +# eval: (add-hook 'write-file-hooks 'time-stamp)
 +# time-stamp-start: "scriptversion="
 +# time-stamp-format: "%:y-%02m-%02d.%02H"
 +# time-stamp-time-zone: "UTC"
 +# time-stamp-end: "; # UTC"
 +# End:
diff --cc build-aux/install-sh
index 0b0fdcb,0000000..377bb86
mode 100755,000000..100755
--- a/build-aux/install-sh
+++ b/build-aux/install-sh
@@@ -1,501 -1,0 +1,527 @@@
 +#!/bin/sh
 +# install - install a program, script, or datafile
 +
- scriptversion=2013-12-25.23; # UTC
++scriptversion=2011-11-20.07; # UTC
 +
 +# 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.
 +#
 +# Copyright (C) 1994 X Consortium
 +#
 +# Permission is hereby granted, free of charge, to any person obtaining a copy
 +# of this software and associated documentation files (the "Software"), to
 +# deal in the Software without restriction, including without limitation the
 +# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
 +# sell copies of the Software, and to permit persons to whom the Software is
 +# furnished to do so, subject to the following conditions:
 +#
 +# The above copyright notice and this permission notice shall be included in
 +# all copies or substantial portions of the Software.
 +#
 +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
 +# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
 +# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
 +# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 +#
 +# Except as contained in this notice, the name of the X Consortium shall not
 +# be used in advertising or otherwise to promote the sale, use or other deal-
 +# ings in this Software without prior written authorization from the X Consor-
 +# tium.
 +#
 +#
 +# FSF changes to this file are in the public domain.
 +#
 +# Calling this script install-sh is preferred over install.sh, to prevent
 +# 'make' implicit rules from creating a file called install from it
 +# when there is no Makefile.
 +#
 +# This script is compatible with the BSD install script, but was written
 +# from scratch.
 +
- tab='	'
 +nl='
 +'
- IFS=" $tab$nl"
++IFS=" ""	$nl"
 +
- # Set DOITPROG to "echo" to test this script.
++# set DOITPROG to echo to test this script
 +
++# Don't use :- since 4.3BSD and earlier shells don't like it.
 +doit=${DOITPROG-}
- doit_exec=${doit:-exec}
++if test -z "$doit"; then
++  doit_exec=exec
++else
++  doit_exec=$doit
++fi
 +
 +# Put in absolute file names if you don't have them in your path;
 +# or use environment vars.
 +
 +chgrpprog=${CHGRPPROG-chgrp}
 +chmodprog=${CHMODPROG-chmod}
 +chownprog=${CHOWNPROG-chown}
 +cmpprog=${CMPPROG-cmp}
 +cpprog=${CPPROG-cp}
 +mkdirprog=${MKDIRPROG-mkdir}
 +mvprog=${MVPROG-mv}
 +rmprog=${RMPROG-rm}
 +stripprog=${STRIPPROG-strip}
 +
++posix_glob='?'
++initialize_posix_glob='
++  test "$posix_glob" != "?" || {
++    if (set -f) 2>/dev/null; then
++      posix_glob=
++    else
++      posix_glob=:
++    fi
++  }
++'
++
 +posix_mkdir=
 +
 +# Desired mode of installed file.
 +mode=0755
 +
 +chgrpcmd=
 +chmodcmd=$chmodprog
 +chowncmd=
 +mvcmd=$mvprog
 +rmcmd="$rmprog -f"
 +stripcmd=
 +
 +src=
 +dst=
 +dir_arg=
 +dst_arg=
 +
 +copy_on_change=false
- is_target_a_directory=possibly
++no_target_directory=
 +
 +usage="\
 +Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
 +   or: $0 [OPTION]... SRCFILES... DIRECTORY
 +   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
 +   or: $0 [OPTION]... -d DIRECTORIES...
 +
 +In the 1st form, copy SRCFILE to DSTFILE.
 +In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
 +In the 4th, create DIRECTORIES.
 +
 +Options:
 +     --help     display this help and exit.
 +     --version  display version info and exit.
 +
 +  -c            (ignored)
 +  -C            install only if different (preserve the last data modification time)
 +  -d            create directories instead of installing files.
 +  -g GROUP      $chgrpprog installed files to GROUP.
 +  -m MODE       $chmodprog installed files to MODE.
 +  -o USER       $chownprog installed files to USER.
 +  -s            $stripprog installed files.
 +  -t DIRECTORY  install into DIRECTORY.
 +  -T            report an error if DSTFILE is a directory.
 +
 +Environment variables override the default commands:
 +  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
 +  RMPROG STRIPPROG
 +"
 +
 +while test $# -ne 0; do
 +  case $1 in
 +    -c) ;;
 +
 +    -C) copy_on_change=true;;
 +
 +    -d) dir_arg=true;;
 +
 +    -g) chgrpcmd="$chgrpprog $2"
-         shift;;
++	shift;;
 +
 +    --help) echo "$usage"; exit $?;;
 +
 +    -m) mode=$2
-         case $mode in
-           *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*)
-             echo "$0: invalid mode: $mode" >&2
-             exit 1;;
-         esac
-         shift;;
++	case $mode in
++	  *' '* | *'	'* | *'
++'*	  | *'*'* | *'?'* | *'['*)
++	    echo "$0: invalid mode: $mode" >&2
++	    exit 1;;
++	esac
++	shift;;
 +
 +    -o) chowncmd="$chownprog $2"
-         shift;;
++	shift;;
 +
 +    -s) stripcmd=$stripprog;;
 +
-     -t)
-         is_target_a_directory=always
-         dst_arg=$2
-         # Protect names problematic for 'test' and other utilities.
-         case $dst_arg in
-           -* | [=\(\)!]) dst_arg=./$dst_arg;;
-         esac
-         shift;;
++    -t) dst_arg=$2
++	# Protect names problematic for 'test' and other utilities.
++	case $dst_arg in
++	  -* | [=\(\)!]) dst_arg=./$dst_arg;;
++	esac
++	shift;;
 +
-     -T) is_target_a_directory=never;;
++    -T) no_target_directory=true;;
 +
 +    --version) echo "$0 $scriptversion"; exit $?;;
 +
-     --) shift
-         break;;
++    --)	shift
++	break;;
 +
-     -*) echo "$0: invalid option: $1" >&2
-         exit 1;;
++    -*)	echo "$0: invalid option: $1" >&2
++	exit 1;;
 +
 +    *)  break;;
 +  esac
 +  shift
 +done
 +
- # We allow the use of options -d and -T together, by making -d
- # take the precedence; this is for compatibility with GNU install.
- 
- if test -n "$dir_arg"; then
-   if test -n "$dst_arg"; then
-     echo "$0: target directory not allowed when installing a directory." >&2
-     exit 1
-   fi
- fi
- 
 +if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
 +  # When -d is used, all remaining arguments are directories to create.
 +  # When -t is used, the destination is already specified.
 +  # Otherwise, the last argument is the destination.  Remove it from $@.
 +  for arg
 +  do
 +    if test -n "$dst_arg"; then
 +      # $@ is not empty: it contains at least $arg.
 +      set fnord "$@" "$dst_arg"
 +      shift # fnord
 +    fi
 +    shift # arg
 +    dst_arg=$arg
 +    # Protect names problematic for 'test' and other utilities.
 +    case $dst_arg in
 +      -* | [=\(\)!]) dst_arg=./$dst_arg;;
 +    esac
 +  done
 +fi
 +
 +if test $# -eq 0; then
 +  if test -z "$dir_arg"; then
 +    echo "$0: no input file specified." >&2
 +    exit 1
 +  fi
 +  # It's OK to call 'install-sh -d' without argument.
 +  # This can happen when creating conditional directories.
 +  exit 0
 +fi
 +
 +if test -z "$dir_arg"; then
-   if test $# -gt 1 || test "$is_target_a_directory" = always; then
-     if test ! -d "$dst_arg"; then
-       echo "$0: $dst_arg: Is not a directory." >&2
-       exit 1
-     fi
-   fi
- fi
- 
- if test -z "$dir_arg"; then
 +  do_exit='(exit $ret); exit $ret'
 +  trap "ret=129; $do_exit" 1
 +  trap "ret=130; $do_exit" 2
 +  trap "ret=141; $do_exit" 13
 +  trap "ret=143; $do_exit" 15
 +
 +  # Set umask so as not to create temps with too-generous modes.
 +  # However, 'strip' requires both read and write access to temps.
 +  case $mode in
 +    # Optimize common cases.
 +    *644) cp_umask=133;;
 +    *755) cp_umask=22;;
 +
 +    *[0-7])
 +      if test -z "$stripcmd"; then
-         u_plus_rw=
++	u_plus_rw=
 +      else
-         u_plus_rw='% 200'
++	u_plus_rw='% 200'
 +      fi
 +      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
 +    *)
 +      if test -z "$stripcmd"; then
-         u_plus_rw=
++	u_plus_rw=
 +      else
-         u_plus_rw=,u+rw
++	u_plus_rw=,u+rw
 +      fi
 +      cp_umask=$mode$u_plus_rw;;
 +  esac
 +fi
 +
 +for src
 +do
 +  # Protect names problematic for 'test' and other utilities.
 +  case $src in
 +    -* | [=\(\)!]) src=./$src;;
 +  esac
 +
 +  if test -n "$dir_arg"; then
 +    dst=$src
 +    dstdir=$dst
 +    test -d "$dstdir"
 +    dstdir_status=$?
 +  else
 +
 +    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
 +    # might cause directories to be created, which would be especially bad
 +    # if $src (and thus $dsttmp) contains '*'.
 +    if test ! -f "$src" && test ! -d "$src"; then
 +      echo "$0: $src does not exist." >&2
 +      exit 1
 +    fi
 +
 +    if test -z "$dst_arg"; then
 +      echo "$0: no destination specified." >&2
 +      exit 1
 +    fi
 +    dst=$dst_arg
 +
 +    # If destination is a directory, append the input filename; won't work
 +    # if double slashes aren't ignored.
 +    if test -d "$dst"; then
-       if test "$is_target_a_directory" = never; then
-         echo "$0: $dst_arg: Is a directory" >&2
-         exit 1
++      if test -n "$no_target_directory"; then
++	echo "$0: $dst_arg: Is a directory" >&2
++	exit 1
 +      fi
 +      dstdir=$dst
 +      dst=$dstdir/`basename "$src"`
 +      dstdir_status=0
 +    else
-       dstdir=`dirname "$dst"`
++      # Prefer dirname, but fall back on a substitute if dirname fails.
++      dstdir=`
++	(dirname "$dst") 2>/dev/null ||
++	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++	     X"$dst" : 'X\(//\)[^/]' \| \
++	     X"$dst" : 'X\(//\)$' \| \
++	     X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
++	echo X"$dst" |
++	    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
++		   s//\1/
++		   q
++		 }
++		 /^X\(\/\/\)[^/].*/{
++		   s//\1/
++		   q
++		 }
++		 /^X\(\/\/\)$/{
++		   s//\1/
++		   q
++		 }
++		 /^X\(\/\).*/{
++		   s//\1/
++		   q
++		 }
++		 s/.*/./; q'
++      `
++
 +      test -d "$dstdir"
 +      dstdir_status=$?
 +    fi
 +  fi
 +
 +  obsolete_mkdir_used=false
 +
 +  if test $dstdir_status != 0; then
 +    case $posix_mkdir in
 +      '')
-         # Create intermediate dirs using mode 755 as modified by the umask.
-         # This is like FreeBSD 'install' as of 1997-10-28.
-         umask=`umask`
-         case $stripcmd.$umask in
-           # Optimize common cases.
-           *[2367][2367]) mkdir_umask=$umask;;
-           .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
- 
-           *[0-7])
-             mkdir_umask=`expr $umask + 22 \
-               - $umask % 100 % 40 + $umask % 20 \
-               - $umask % 10 % 4 + $umask % 2
-             `;;
-           *) mkdir_umask=$umask,go-w;;
-         esac
- 
-         # With -d, create the new directory with the user-specified mode.
-         # Otherwise, rely on $mkdir_umask.
-         if test -n "$dir_arg"; then
-           mkdir_mode=-m$mode
-         else
-           mkdir_mode=
-         fi
- 
-         posix_mkdir=false
-         case $umask in
-           *[123567][0-7][0-7])
-             # POSIX mkdir -p sets u+wx bits regardless of umask, which
-             # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
-             ;;
-           *)
-             tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
-             trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
- 
-             if (umask $mkdir_umask &&
-                 exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
-             then
-               if test -z "$dir_arg" || {
-                    # Check for POSIX incompatibilities with -m.
-                    # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-                    # other-writable bit of parent directory when it shouldn't.
-                    # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
-                    ls_ld_tmpdir=`ls -ld "$tmpdir"`
-                    case $ls_ld_tmpdir in
-                      d????-?r-*) different_mode=700;;
-                      d????-?--*) different_mode=755;;
-                      *) false;;
-                    esac &&
-                    $mkdirprog -m$different_mode -p -- "$tmpdir" && {
-                      ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
-                      test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
-                    }
-                  }
-               then posix_mkdir=:
-               fi
-               rmdir "$tmpdir/d" "$tmpdir"
-             else
-               # Remove any dirs left behind by ancient mkdir implementations.
-               rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
-             fi
-             trap '' 0;;
-         esac;;
++	# Create intermediate dirs using mode 755 as modified by the umask.
++	# This is like FreeBSD 'install' as of 1997-10-28.
++	umask=`umask`
++	case $stripcmd.$umask in
++	  # Optimize common cases.
++	  *[2367][2367]) mkdir_umask=$umask;;
++	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
++
++	  *[0-7])
++	    mkdir_umask=`expr $umask + 22 \
++	      - $umask % 100 % 40 + $umask % 20 \
++	      - $umask % 10 % 4 + $umask % 2
++	    `;;
++	  *) mkdir_umask=$umask,go-w;;
++	esac
++
++	# With -d, create the new directory with the user-specified mode.
++	# Otherwise, rely on $mkdir_umask.
++	if test -n "$dir_arg"; then
++	  mkdir_mode=-m$mode
++	else
++	  mkdir_mode=
++	fi
++
++	posix_mkdir=false
++	case $umask in
++	  *[123567][0-7][0-7])
++	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
++	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
++	    ;;
++	  *)
++	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
++	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
++
++	    if (umask $mkdir_umask &&
++		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
++	    then
++	      if test -z "$dir_arg" || {
++		   # Check for POSIX incompatibilities with -m.
++		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
++		   # other-writable bit of parent directory when it shouldn't.
++		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
++		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
++		   case $ls_ld_tmpdir in
++		     d????-?r-*) different_mode=700;;
++		     d????-?--*) different_mode=755;;
++		     *) false;;
++		   esac &&
++		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
++		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
++		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
++		   }
++		 }
++	      then posix_mkdir=:
++	      fi
++	      rmdir "$tmpdir/d" "$tmpdir"
++	    else
++	      # Remove any dirs left behind by ancient mkdir implementations.
++	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
++	    fi
++	    trap '' 0;;
++	esac;;
 +    esac
 +
 +    if
 +      $posix_mkdir && (
-         umask $mkdir_umask &&
-         $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
++	umask $mkdir_umask &&
++	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
 +      )
 +    then :
 +    else
 +
 +      # The umask is ridiculous, or mkdir does not conform to POSIX,
 +      # or it failed possibly due to a race condition.  Create the
 +      # directory the slow way, step by step, checking for races as we go.
 +
 +      case $dstdir in
-         /*) prefix='/';;
-         [-=\(\)!]*) prefix='./';;
-         *)  prefix='';;
++	/*) prefix='/';;
++	[-=\(\)!]*) prefix='./';;
++	*)  prefix='';;
 +      esac
 +
++      eval "$initialize_posix_glob"
++
 +      oIFS=$IFS
 +      IFS=/
-       set -f
++      $posix_glob set -f
 +      set fnord $dstdir
 +      shift
-       set +f
++      $posix_glob set +f
 +      IFS=$oIFS
 +
 +      prefixes=
 +
 +      for d
 +      do
-         test X"$d" = X && continue
- 
-         prefix=$prefix$d
-         if test -d "$prefix"; then
-           prefixes=
-         else
-           if $posix_mkdir; then
-             (umask=$mkdir_umask &&
-              $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
-             # Don't fail if two instances are running concurrently.
-             test -d "$prefix" || exit 1
-           else
-             case $prefix in
-               *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
-               *) qprefix=$prefix;;
-             esac
-             prefixes="$prefixes '$qprefix'"
-           fi
-         fi
-         prefix=$prefix/
++	test X"$d" = X && continue
++
++	prefix=$prefix$d
++	if test -d "$prefix"; then
++	  prefixes=
++	else
++	  if $posix_mkdir; then
++	    (umask=$mkdir_umask &&
++	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
++	    # Don't fail if two instances are running concurrently.
++	    test -d "$prefix" || exit 1
++	  else
++	    case $prefix in
++	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
++	      *) qprefix=$prefix;;
++	    esac
++	    prefixes="$prefixes '$qprefix'"
++	  fi
++	fi
++	prefix=$prefix/
 +      done
 +
 +      if test -n "$prefixes"; then
-         # Don't fail if two instances are running concurrently.
-         (umask $mkdir_umask &&
-          eval "\$doit_exec \$mkdirprog $prefixes") ||
-           test -d "$dstdir" || exit 1
-         obsolete_mkdir_used=true
++	# Don't fail if two instances are running concurrently.
++	(umask $mkdir_umask &&
++	 eval "\$doit_exec \$mkdirprog $prefixes") ||
++	  test -d "$dstdir" || exit 1
++	obsolete_mkdir_used=true
 +      fi
 +    fi
 +  fi
 +
 +  if test -n "$dir_arg"; then
 +    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
 +    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
 +    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
 +      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
 +  else
 +
 +    # Make a couple of temp file names in the proper directory.
 +    dsttmp=$dstdir/_inst.$$_
 +    rmtmp=$dstdir/_rm.$$_
 +
 +    # Trap to clean up those temp files at exit.
 +    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
 +
 +    # Copy the file name to the temp name.
 +    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
 +
 +    # and set any options; do chmod last to preserve setuid bits.
 +    #
 +    # If any of these fail, we abort the whole thing.  If we want to
 +    # ignore errors from any of these, just make sure not to ignore
 +    # errors from the above "$doit $cpprog $src $dsttmp" command.
 +    #
 +    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
 +    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
 +    { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
 +    { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
 +
 +    # If -C, don't bother to copy if it wouldn't change the file.
 +    if $copy_on_change &&
-        old=`LC_ALL=C ls -dlL "$dst"     2>/dev/null` &&
-        new=`LC_ALL=C ls -dlL "$dsttmp"  2>/dev/null` &&
-        set -f &&
++       old=`LC_ALL=C ls -dlL "$dst"	2>/dev/null` &&
++       new=`LC_ALL=C ls -dlL "$dsttmp"	2>/dev/null` &&
++
++       eval "$initialize_posix_glob" &&
++       $posix_glob set -f &&
 +       set X $old && old=:$2:$4:$5:$6 &&
 +       set X $new && new=:$2:$4:$5:$6 &&
-        set +f &&
++       $posix_glob set +f &&
++
 +       test "$old" = "$new" &&
 +       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
 +    then
 +      rm -f "$dsttmp"
 +    else
 +      # Rename the file to the real destination.
 +      $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
 +
 +      # The rename failed, perhaps because mv can't rename something else
 +      # to itself, or perhaps because mv is so ancient that it does not
 +      # support -f.
 +      {
-         # Now remove or move aside any old file at destination location.
-         # We try this two ways since rm can't unlink itself on some
-         # systems and the destination file might be busy for other
-         # reasons.  In this case, the final cleanup might fail but the new
-         # file should still install successfully.
-         {
-           test ! -f "$dst" ||
-           $doit $rmcmd -f "$dst" 2>/dev/null ||
-           { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
-             { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
-           } ||
-           { echo "$0: cannot unlink or rename $dst" >&2
-             (exit 1); exit 1
-           }
-         } &&
- 
-         # Now rename the file to the real destination.
-         $doit $mvcmd "$dsttmp" "$dst"
++	# Now remove or move aside any old file at destination location.
++	# We try this two ways since rm can't unlink itself on some
++	# systems and the destination file might be busy for other
++	# reasons.  In this case, the final cleanup might fail but the new
++	# file should still install successfully.
++	{
++	  test ! -f "$dst" ||
++	  $doit $rmcmd -f "$dst" 2>/dev/null ||
++	  { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
++	    { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
++	  } ||
++	  { echo "$0: cannot unlink or rename $dst" >&2
++	    (exit 1); exit 1
++	  }
++	} &&
++
++	# Now rename the file to the real destination.
++	$doit $mvcmd "$dsttmp" "$dst"
 +      }
 +    fi || exit 1
 +
 +    trap '' 0
 +  fi
 +done
 +
 +# Local variables:
 +# eval: (add-hook 'write-file-hooks 'time-stamp)
 +# time-stamp-start: "scriptversion="
 +# time-stamp-format: "%:y-%02m-%02d.%02H"
 +# time-stamp-time-zone: "UTC"
 +# time-stamp-end: "; # UTC"
 +# End:
diff --cc build-aux/ltmain.sh
index 0f0a2da,0000000..63ae69d
mode 100644,000000..100644
--- a/build-aux/ltmain.sh
+++ b/build-aux/ltmain.sh
@@@ -1,11147 -1,0 +1,9655 @@@
- #! /bin/sh
- ## DO NOT EDIT - This file generated from ./build-aux/ltmain.in
- ##               by inline-source v2014-01-03.01
 +
- # libtool (GNU libtool) 2.4.6
- # Provide generalized library-building support services.
++# libtool (GNU libtool) 2.4.2
 +# Written by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
 +
- # Copyright (C) 1996-2015 Free Software Foundation, Inc.
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
++# 2007, 2008, 2009, 2010, 2011 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.
 +
 +# GNU Libtool is free software; you can redistribute it and/or modify
 +# it under the terms of the GNU General Public License as published by
 +# the Free Software Foundation; either version 2 of the License, or
 +# (at your option) any later version.
 +#
 +# As a special exception to the GNU General Public License,
 +# if you distribute this file as part of a program or library that
 +# is built using GNU Libtool, you may include this file under the
 +# same distribution terms that you use for the rest of that program.
 +#
 +# GNU Libtool is distributed in the hope that it will be useful, but
 +# WITHOUT ANY WARRANTY; without even the implied warranty of
 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 +# General Public License for more details.
 +#
 +# You should have received a copy of the GNU General Public License
- # along with this program.  If not, see <http://www.gnu.org/licenses/>.
- 
- 
- PROGRAM=libtool
- PACKAGE=libtool
- VERSION=2.4.6
- package_revision=2.4.6
- 
- 
- ## ------ ##
- ## Usage. ##
- ## ------ ##
- 
- # Run './libtool --help' for help with using this script from the
- # command line.
- 
- 
- ## ------------------------------- ##
- ## User overridable command paths. ##
- ## ------------------------------- ##
- 
- # After configure completes, it has a better idea of some of the
- # shell tools we need than the defaults used by the functions shared
- # with bootstrap, so set those here where they can still be over-
- # ridden by the user, but otherwise take precedence.
- 
- : ${AUTOCONF="autoconf"}
- : ${AUTOMAKE="automake"}
- 
- 
- ## -------------------------- ##
- ## Source external libraries. ##
- ## -------------------------- ##
- 
- # Much of our low-level functionality needs to be sourced from external
- # libraries, which are installed to $pkgauxdir.
- 
- # Set a version string for this script.
- scriptversion=2015-01-20.17; # UTC
- 
- # General shell script boiler plate, and helper functions.
- # Written by Gary V. Vaughan, 2004
- 
- # Copyright (C) 2004-2015 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.
- 
- # 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 3 of the License, or
- # (at your option) any later version.
- 
- # As a special exception to the GNU General Public License, if you distribute
- # this file as part of a program or library that is built using GNU Libtool,
- # you may include this file under the same distribution terms that you use
- # for the rest of that program.
- 
- # This program is distributed in the hope that it will be useful,
- # but WITHOUT ANY WARRANTY; without even the implied warranty of
- # MERCHANTABILITY or FITNES 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, see <http://www.gnu.org/licenses/>.
++# along with GNU Libtool; see the file COPYING.  If not, a copy
++# can be downloaded from http://www.gnu.org/licenses/gpl.html,
++# or obtained by writing to the Free Software Foundation, Inc.,
++# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 +
- # Please report bugs or propose patches to gary at gnu.org.
- 
- 
- ## ------ ##
- ## Usage. ##
- ## ------ ##
- 
- # Evaluate this file near the top of your script to gain access to
- # the functions and variables defined here:
++# Usage: $progname [OPTION]... [MODE-ARG]...
++#
++# Provide generalized library-building support services.
 +#
- #   . `echo "$0" | ${SED-sed} 's|[^/]*$||'`/build-aux/funclib.sh
++#       --config             show all configuration variables
++#       --debug              enable verbose shell tracing
++#   -n, --dry-run            display commands without modifying any files
++#       --features           display basic configuration information and exit
++#       --mode=MODE          use operation mode MODE
++#       --preserve-dup-deps  don't remove duplicate dependency libraries
++#       --quiet, --silent    don't print informational messages
++#       --no-quiet, --no-silent
++#                            print informational messages (default)
++#       --no-warn            don't display warning messages
++#       --tag=TAG            use configuration variables from tag TAG
++#   -v, --verbose            print more informational messages than default
++#       --no-verbose         don't print the extra informational messages
++#       --version            print version information
++#   -h, --help, --help-all   print short, long, or detailed help message
 +#
- # If you need to override any of the default environment variable
- # settings, do that before evaluating this file.
- 
- 
- ## -------------------- ##
- ## Shell normalisation. ##
- ## -------------------- ##
++# MODE must be one of the following:
++#
++#         clean              remove files from the build directory
++#         compile            compile a source file into a libtool object
++#         execute            automatically set library path, then run a program
++#         finish             complete the installation of libtool libraries
++#         install            install libraries or executables
++#         link               create a library or an executable
++#         uninstall          remove libraries from an installed directory
++#
++# MODE-ARGS vary depending on the MODE.  When passed as first option,
++# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that.
++# Try `$progname --help --mode=MODE' for a more detailed description of MODE.
++#
++# When reporting a bug, please describe a test case to reproduce it and
++# include the following information:
++#
++#         host-triplet:	$host
++#         shell:		$SHELL
++#         compiler:		$LTCC
++#         compiler flags:		$LTCFLAGS
++#         linker:		$LD (gnu? $with_gnu_ld)
++#         $progname:	(GNU libtool) 2.4.2
++#         automake:	$automake_version
++#         autoconf:	$autoconf_version
++#
++# Report bugs to <bug-libtool at gnu.org>.
++# GNU libtool home page: <http://www.gnu.org/software/libtool/>.
++# General help using GNU software: <http://www.gnu.org/gethelp/>.
 +
- # Some shells need a little help to be as Bourne compatible as possible.
- # Before doing anything else, make sure all that help has been provided!
++PROGRAM=libtool
++PACKAGE=libtool
++VERSION=2.4.2
++TIMESTAMP=""
++package_revision=1.3337
 +
- DUALCASE=1; export DUALCASE # for MKS sh
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
++# Be Bourne compatible
++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
 +  emulate sh
 +  NULLCMD=:
-   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
++  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
 +  # is contrary to our usage.  Disable this feature.
 +  alias -g '${1+"$@"}'='"$@"'
 +  setopt NO_GLOB_SUBST
 +else
-   case `(set -o) 2>/dev/null` in *posix*) set -o posix ;; esac
- fi
- 
- # NLS nuisances: We save the old values in case they are required later.
- _G_user_locale=
- _G_safe_locale=
- for _G_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
- do
-   eval "if test set = \"\${$_G_var+set}\"; then
-           save_$_G_var=\$$_G_var
-           $_G_var=C
- 	  export $_G_var
- 	  _G_user_locale=\"$_G_var=\\\$save_\$_G_var; \$_G_user_locale\"
- 	  _G_safe_locale=\"$_G_var=C; \$_G_safe_locale\"
- 	fi"
- done
- 
- # CDPATH.
- (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
- 
- # Make sure IFS has a sensible default
- sp=' '
- nl='
- '
- IFS="$sp	$nl"
- 
- # There are apparently some retarded systems that use ';' as a PATH separator!
- if test "${PATH_SEPARATOR+set}" != set; then
-   PATH_SEPARATOR=:
-   (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-     (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-       PATH_SEPARATOR=';'
-   }
++  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
 +fi
++BIN_SH=xpg4; export BIN_SH # for Tru64
++DUALCASE=1; export DUALCASE # for MKS sh
 +
- 
- 
- ## ------------------------- ##
- ## Locate command utilities. ##
- ## ------------------------- ##
- 
- 
- # func_executable_p FILE
- # ----------------------
- # Check that FILE is an executable regular file.
- func_executable_p ()
- {
-     test -f "$1" && test -x "$1"
- }
- 
- 
- # func_path_progs PROGS_LIST CHECK_FUNC [PATH]
- # --------------------------------------------
- # Search for either a program that responds to --version with output
- # containing "GNU", or else returned by CHECK_FUNC otherwise, by
- # trying all the directories in PATH with each of the elements of
- # PROGS_LIST.
- #
- # CHECK_FUNC should accept the path to a candidate program, and
- # set $func_check_prog_result if it truncates its output less than
- # $_G_path_prog_max characters.
- func_path_progs ()
++# A function that is used when there is no print builtin or printf.
++func_fallback_echo ()
 +{
-     _G_progs_list=$1
-     _G_check_func=$2
-     _G_PATH=${3-"$PATH"}
- 
-     _G_path_prog_max=0
-     _G_path_prog_found=false
-     _G_save_IFS=$IFS; IFS=${PATH_SEPARATOR-:}
-     for _G_dir in $_G_PATH; do
-       IFS=$_G_save_IFS
-       test -z "$_G_dir" && _G_dir=.
-       for _G_prog_name in $_G_progs_list; do
-         for _exeext in '' .EXE; do
-           _G_path_prog=$_G_dir/$_G_prog_name$_exeext
-           func_executable_p "$_G_path_prog" || continue
-           case `"$_G_path_prog" --version 2>&1` in
-             *GNU*) func_path_progs_result=$_G_path_prog _G_path_prog_found=: ;;
-             *)     $_G_check_func $_G_path_prog
- 		   func_path_progs_result=$func_check_prog_result
- 		   ;;
-           esac
-           $_G_path_prog_found && break 3
-         done
-       done
-     done
-     IFS=$_G_save_IFS
-     test -z "$func_path_progs_result" && {
-       echo "no acceptable sed could be found in \$PATH" >&2
-       exit 1
-     }
- }
- 
- 
- # We want to be able to use the functions in this file before configure
- # has figured out where the best binaries are kept, which means we have
- # to search for them ourselves - except when the results are already set
- # where we skip the searches.
- 
- # Unless the user overrides by setting SED, search the path for either GNU
- # sed, or the sed that truncates its output the least.
- test -z "$SED" && {
-   _G_sed_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-   for _G_i in 1 2 3 4 5 6 7; do
-     _G_sed_script=$_G_sed_script$nl$_G_sed_script
-   done
-   echo "$_G_sed_script" 2>/dev/null | sed 99q >conftest.sed
-   _G_sed_script=
- 
-   func_check_prog_sed ()
-   {
-     _G_path_prog=$1
- 
-     _G_count=0
-     printf 0123456789 >conftest.in
-     while :
-     do
-       cat conftest.in conftest.in >conftest.tmp
-       mv conftest.tmp conftest.in
-       cp conftest.in conftest.nl
-       echo '' >> conftest.nl
-       "$_G_path_prog" -f conftest.sed <conftest.nl >conftest.out 2>/dev/null || break
-       diff conftest.out conftest.nl >/dev/null 2>&1 || break
-       _G_count=`expr $_G_count + 1`
-       if test "$_G_count" -gt "$_G_path_prog_max"; then
-         # Best one so far, save it but keep looking for a better one
-         func_check_prog_result=$_G_path_prog
-         _G_path_prog_max=$_G_count
-       fi
-       # 10*(2^10) chars as input seems more than enough
-       test 10 -lt "$_G_count" && break
-     done
-     rm -f conftest.in conftest.tmp conftest.nl conftest.out
-   }
- 
-   func_path_progs "sed gsed" func_check_prog_sed $PATH:/usr/xpg4/bin
-   rm -f conftest.sed
-   SED=$func_path_progs_result
++  eval 'cat <<_LTECHO_EOF
++$1
++_LTECHO_EOF'
 +}
 +
++# NLS nuisances: We save the old values to restore during execute mode.
++lt_user_locale=
++lt_safe_locale=
++for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
++do
++  eval "if test \"\${$lt_var+set}\" = set; then
++          save_$lt_var=\$$lt_var
++          $lt_var=C
++	  export $lt_var
++	  lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\"
++	  lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
++	fi"
++done
++LC_ALL=C
++LANGUAGE=C
++export LANGUAGE LC_ALL
 +
- # Unless the user overrides by setting GREP, search the path for either GNU
- # grep, or the grep that truncates its output the least.
- test -z "$GREP" && {
-   func_check_prog_grep ()
-   {
-     _G_path_prog=$1
- 
-     _G_count=0
-     _G_path_prog_max=0
-     printf 0123456789 >conftest.in
-     while :
-     do
-       cat conftest.in conftest.in >conftest.tmp
-       mv conftest.tmp conftest.in
-       cp conftest.in conftest.nl
-       echo 'GREP' >> conftest.nl
-       "$_G_path_prog" -e 'GREP$' -e '-(cannot match)-' <conftest.nl >conftest.out 2>/dev/null || break
-       diff conftest.out conftest.nl >/dev/null 2>&1 || break
-       _G_count=`expr $_G_count + 1`
-       if test "$_G_count" -gt "$_G_path_prog_max"; then
-         # Best one so far, save it but keep looking for a better one
-         func_check_prog_result=$_G_path_prog
-         _G_path_prog_max=$_G_count
-       fi
-       # 10*(2^10) chars as input seems more than enough
-       test 10 -lt "$_G_count" && break
-     done
-     rm -f conftest.in conftest.tmp conftest.nl conftest.out
-   }
++$lt_unset CDPATH
 +
-   func_path_progs "grep ggrep" func_check_prog_grep $PATH:/usr/xpg4/bin
-   GREP=$func_path_progs_result
- }
 +
++# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
++# is ksh but when the shell is invoked as "sh" and the current value of
++# the _XPG environment variable is not equal to 1 (one), the special
++# positional parameter $0, within a function call, is the name of the
++# function.
++progpath="$0"
 +
- ## ------------------------------- ##
- ## User overridable command paths. ##
- ## ------------------------------- ##
 +
- # All uppercase variable names are used for environment variables.  These
- # variables can be overridden by the user before calling a script that
- # uses them if a suitable command of that name is not already available
- # in the command search PATH.
 +
 +: ${CP="cp -f"}
- : ${ECHO="printf %s\n"}
- : ${EGREP="$GREP -E"}
- : ${FGREP="$GREP -F"}
- : ${LN_S="ln -s"}
++test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
 +: ${MAKE="make"}
 +: ${MKDIR="mkdir"}
 +: ${MV="mv -f"}
 +: ${RM="rm -f"}
 +: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
++: ${Xsed="$SED -e 1s/^X//"}
 +
++# Global variables:
++EXIT_SUCCESS=0
++EXIT_FAILURE=1
++EXIT_MISMATCH=63  # $? = 63 is used to indicate version mismatch to missing.
++EXIT_SKIP=77	  # $? = 77 is used to indicate a skipped test to automake.
 +
- ## -------------------- ##
- ## Useful sed snippets. ##
- ## -------------------- ##
++exit_status=$EXIT_SUCCESS
 +
- sed_dirname='s|/[^/]*$||'
- sed_basename='s|^.*/||'
++# Make sure IFS has a sensible default
++lt_nl='
++'
++IFS=" 	$lt_nl"
 +
- # Sed substitution that helps us do robust quoting.  It backslashifies
- # metacharacters that are still active within double-quoted strings.
- sed_quote_subst='s|\([`"$\\]\)|\\\1|g'
++dirname="s,/[^/]*$,,"
++basename="s,^.*/,,"
 +
- # Same as above, but do not quote variable references.
- sed_double_quote_subst='s/\(["`\\]\)/\\\1/g'
++# func_dirname file append nondir_replacement
++# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
++# otherwise set result to NONDIR_REPLACEMENT.
++func_dirname ()
++{
++    func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
++    if test "X$func_dirname_result" = "X${1}"; then
++      func_dirname_result="${3}"
++    else
++      func_dirname_result="$func_dirname_result${2}"
++    fi
++} # func_dirname may be replaced by extended shell implementation
 +
- # Sed substitution that turns a string into a regex matching for the
- # string literally.
- sed_make_literal_regex='s|[].[^$\\*\/]|\\&|g'
 +
- # Sed substitution that converts a w32 file name or path
- # that contains forward slashes, into one that contains
- # (escaped) backslashes.  A very naive implementation.
- sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
- 
- # Re-'\' parameter expansions in output of sed_double_quote_subst that
- # were '\'-ed in input to the same.  If an odd number of '\' preceded a
- # '$' in input to sed_double_quote_subst, that '$' was protected from
- # expansion.  Since each input '\' is now two '\'s, look for any number
- # of runs of four '\'s followed by two '\'s and then a '$'.  '\' that '$'.
- _G_bs='\\'
- _G_bs2='\\\\'
- _G_bs4='\\\\\\\\'
- _G_dollar='\$'
- sed_double_backslash="\
-   s/$_G_bs4/&\\
- /g
-   s/^$_G_bs2$_G_dollar/$_G_bs&/
-   s/\\([^$_G_bs]\\)$_G_bs2$_G_dollar/\\1$_G_bs2$_G_bs$_G_dollar/g
-   s/\n//g"
++# func_basename file
++func_basename ()
++{
++    func_basename_result=`$ECHO "${1}" | $SED "$basename"`
++} # func_basename may be replaced by extended shell implementation
 +
 +
- ## ----------------- ##
- ## Global variables. ##
- ## ----------------- ##
++# func_dirname_and_basename file append nondir_replacement
++# perform func_basename and func_dirname in a single function
++# call:
++#   dirname:  Compute the dirname of FILE.  If nonempty,
++#             add APPEND to the result, otherwise set result
++#             to NONDIR_REPLACEMENT.
++#             value returned in "$func_dirname_result"
++#   basename: Compute filename of FILE.
++#             value retuned in "$func_basename_result"
++# Implementation must be kept synchronized with func_dirname
++# and func_basename. For efficiency, we do not delegate to
++# those functions but instead duplicate the functionality here.
++func_dirname_and_basename ()
++{
++    # Extract subdirectory from the argument.
++    func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
++    if test "X$func_dirname_result" = "X${1}"; then
++      func_dirname_result="${3}"
++    else
++      func_dirname_result="$func_dirname_result${2}"
++    fi
++    func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
++} # func_dirname_and_basename may be replaced by extended shell implementation
 +
- # Except for the global variables explicitly listed below, the following
- # functions in the '^func_' namespace, and the '^require_' namespace
- # variables initialised in the 'Resource management' section, sourcing
- # this file will not pollute your global namespace with anything
- # else. There's no portable way to scope variables in Bourne shell
- # though, so actually running these functions will sometimes place
- # results into a variable named after the function, and often use
- # temporary variables in the '^_G_' namespace. If you are careful to
- # avoid using those namespaces casually in your sourcing script, things
- # should continue to work as you expect. And, of course, you can freely
- # overwrite any of the functions or variables defined here before
- # calling anything to customize them.
 +
- EXIT_SUCCESS=0
- EXIT_FAILURE=1
- EXIT_MISMATCH=63  # $? = 63 is used to indicate version mismatch to missing.
- EXIT_SKIP=77	  # $? = 77 is used to indicate a skipped test to automake.
++# func_stripname prefix suffix name
++# strip PREFIX and SUFFIX off of NAME.
++# PREFIX and SUFFIX must not contain globbing or regex special
++# characters, hashes, percent signs, but SUFFIX may contain a leading
++# dot (in which case that matches only a dot).
++# func_strip_suffix prefix name
++func_stripname ()
++{
++    case ${2} in
++      .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
++      *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
++    esac
++} # func_stripname may be replaced by extended shell implementation
 +
- # Allow overriding, eg assuming that you follow the convention of
- # putting '$debug_cmd' at the start of all your functions, you can get
- # bash to show function call trace with:
- #
- #    debug_cmd='eval echo "${FUNCNAME[0]} $*" >&2' bash your-script-name
- debug_cmd=${debug_cmd-":"}
- exit_cmd=:
 +
- # By convention, finish your script with:
- #
- #    exit $exit_status
- #
- # so that you can set exit_status to non-zero if you want to indicate
- # something went wrong during execution without actually bailing out at
- # the point of failure.
- exit_status=$EXIT_SUCCESS
++# These SED scripts presuppose an absolute path with a trailing slash.
++pathcar='s,^/\([^/]*\).*$,\1,'
++pathcdr='s,^/[^/]*,,'
++removedotparts=':dotsl
++		s@/\./@/@g
++		t dotsl
++		s,/\.$,/,'
++collapseslashes='s@/\{1,\}@/@g'
++finalslash='s,/*$,/,'
 +
- # Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
- # is ksh but when the shell is invoked as "sh" and the current value of
- # the _XPG environment variable is not equal to 1 (one), the special
- # positional parameter $0, within a function call, is the name of the
- # function.
- progpath=$0
++# func_normal_abspath PATH
++# Remove doubled-up and trailing slashes, "." path components,
++# and cancel out any ".." path components in PATH after making
++# it an absolute path.
++#             value returned in "$func_normal_abspath_result"
++func_normal_abspath ()
++{
++  # Start from root dir and reassemble the path.
++  func_normal_abspath_result=
++  func_normal_abspath_tpath=$1
++  func_normal_abspath_altnamespace=
++  case $func_normal_abspath_tpath in
++    "")
++      # Empty path, that just means $cwd.
++      func_stripname '' '/' "`pwd`"
++      func_normal_abspath_result=$func_stripname_result
++      return
++    ;;
++    # The next three entries are used to spot a run of precisely
++    # two leading slashes without using negated character classes;
++    # we take advantage of case's first-match behaviour.
++    ///*)
++      # Unusual form of absolute path, do nothing.
++    ;;
++    //*)
++      # Not necessarily an ordinary path; POSIX reserves leading '//'
++      # and for example Cygwin uses it to access remote file shares
++      # over CIFS/SMB, so we conserve a leading double slash if found.
++      func_normal_abspath_altnamespace=/
++    ;;
++    /*)
++      # Absolute path, do nothing.
++    ;;
++    *)
++      # Relative path, prepend $cwd.
++      func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
++    ;;
++  esac
++  # Cancel out all the simple stuff to save iterations.  We also want
++  # the path to end with a slash for ease of parsing, so make sure
++  # there is one (and only one) here.
++  func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
++        -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"`
++  while :; do
++    # Processed it all yet?
++    if test "$func_normal_abspath_tpath" = / ; then
++      # If we ascended to the root using ".." the result may be empty now.
++      if test -z "$func_normal_abspath_result" ; then
++        func_normal_abspath_result=/
++      fi
++      break
++    fi
++    func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
++        -e "$pathcar"`
++    func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
++        -e "$pathcdr"`
++    # Figure out what to do with it
++    case $func_normal_abspath_tcomponent in
++      "")
++        # Trailing empty path component, ignore it.
++      ;;
++      ..)
++        # Parent dir; strip last assembled component from result.
++        func_dirname "$func_normal_abspath_result"
++        func_normal_abspath_result=$func_dirname_result
++      ;;
++      *)
++        # Actual path component, append it.
++        func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent
++      ;;
++    esac
++  done
++  # Restore leading double-slash if one was found on entry.
++  func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
++}
++
++# func_relative_path SRCDIR DSTDIR
++# generates a relative path from SRCDIR to DSTDIR, with a trailing
++# slash if non-empty, suitable for immediately appending a filename
++# without needing to append a separator.
++#             value returned in "$func_relative_path_result"
++func_relative_path ()
++{
++  func_relative_path_result=
++  func_normal_abspath "$1"
++  func_relative_path_tlibdir=$func_normal_abspath_result
++  func_normal_abspath "$2"
++  func_relative_path_tbindir=$func_normal_abspath_result
++
++  # Ascend the tree starting from libdir
++  while :; do
++    # check if we have found a prefix of bindir
++    case $func_relative_path_tbindir in
++      $func_relative_path_tlibdir)
++        # found an exact match
++        func_relative_path_tcancelled=
++        break
++        ;;
++      $func_relative_path_tlibdir*)
++        # found a matching prefix
++        func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"
++        func_relative_path_tcancelled=$func_stripname_result
++        if test -z "$func_relative_path_result"; then
++          func_relative_path_result=.
++        fi
++        break
++        ;;
++      *)
++        func_dirname $func_relative_path_tlibdir
++        func_relative_path_tlibdir=${func_dirname_result}
++        if test "x$func_relative_path_tlibdir" = x ; then
++          # Have to descend all the way to the root!
++          func_relative_path_result=../$func_relative_path_result
++          func_relative_path_tcancelled=$func_relative_path_tbindir
++          break
++        fi
++        func_relative_path_result=../$func_relative_path_result
++        ;;
++    esac
++  done
++
++  # Now calculate path; take care to avoid doubling-up slashes.
++  func_stripname '' '/' "$func_relative_path_result"
++  func_relative_path_result=$func_stripname_result
++  func_stripname '/' '/' "$func_relative_path_tcancelled"
++  if test "x$func_stripname_result" != x ; then
++    func_relative_path_result=${func_relative_path_result}/${func_stripname_result}
++  fi
++
++  # Normalisation. If bindir is libdir, return empty string,
++  # else relative path ending with a slash; either way, target
++  # file name can be directly appended.
++  if test ! -z "$func_relative_path_result"; then
++    func_stripname './' '' "$func_relative_path_result/"
++    func_relative_path_result=$func_stripname_result
++  fi
++}
 +
- # The name of this program.
- progname=`$ECHO "$progpath" |$SED "$sed_basename"`
++# The name of this program:
++func_dirname_and_basename "$progpath"
++progname=$func_basename_result
 +
- # Make sure we have an absolute progpath for reexecution:
++# Make sure we have an absolute path for reexecution:
 +case $progpath in
 +  [\\/]*|[A-Za-z]:\\*) ;;
 +  *[\\/]*)
-      progdir=`$ECHO "$progpath" |$SED "$sed_dirname"`
++     progdir=$func_dirname_result
 +     progdir=`cd "$progdir" && pwd`
-      progpath=$progdir/$progname
++     progpath="$progdir/$progname"
 +     ;;
 +  *)
-      _G_IFS=$IFS
++     save_IFS="$IFS"
 +     IFS=${PATH_SEPARATOR-:}
 +     for progdir in $PATH; do
-        IFS=$_G_IFS
++       IFS="$save_IFS"
 +       test -x "$progdir/$progname" && break
 +     done
-      IFS=$_G_IFS
++     IFS="$save_IFS"
 +     test -n "$progdir" || progdir=`pwd`
-      progpath=$progdir/$progname
++     progpath="$progdir/$progname"
 +     ;;
 +esac
 +
++# Sed substitution that helps us do robust quoting.  It backslashifies
++# metacharacters that are still active within double-quoted strings.
++Xsed="${SED}"' -e 1s/^X//'
++sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
++
++# Same as above, but do not quote variable references.
++double_quote_subst='s/\(["`\\]\)/\\\1/g'
 +
- ## ----------------- ##
- ## Standard options. ##
- ## ----------------- ##
++# Sed substitution that turns a string into a regex matching for the
++# string literally.
++sed_make_literal_regex='s,[].[^$\\*\/],\\&,g'
 +
- # The following options affect the operation of the functions defined
- # below, and should be set appropriately depending on run-time para-
- # meters passed on the command line.
++# Sed substitution that converts a w32 file name or path
++# which contains forward slashes, into one that contains
++# (escaped) backslashes.  A very naive implementation.
++lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
++
++# Re-`\' parameter expansions in output of double_quote_subst that were
++# `\'-ed in input to the same.  If an odd number of `\' preceded a '$'
++# in input to double_quote_subst, that '$' was protected from expansion.
++# Since each input `\' is now two `\'s, look for any number of runs of
++# four `\'s followed by two `\'s and then a '$'.  `\' that '$'.
++bs='\\'
++bs2='\\\\'
++bs4='\\\\\\\\'
++dollar='\$'
++sed_double_backslash="\
++  s/$bs4/&\\
++/g
++  s/^$bs2$dollar/$bs&/
++  s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g
++  s/\n//g"
 +
++# Standard options:
 +opt_dry_run=false
++opt_help=false
 +opt_quiet=false
 +opt_verbose=false
++opt_warning=:
 +
- # Categories 'all' and 'none' are always available.  Append any others
- # you will pass as the first argument to func_warning from your own
- # code.
- warning_categories=
++# func_echo arg...
++# Echo program name prefixed message, along with the current mode
++# name if it has been set yet.
++func_echo ()
++{
++    $ECHO "$progname: ${opt_mode+$opt_mode: }$*"
++}
 +
- # By default, display warnings according to 'opt_warning_types'.  Set
- # 'warning_func'  to ':' to elide all warnings, or func_fatal_error to
- # treat the next displayed warning as a fatal error.
- warning_func=func_warn_and_continue
++# func_verbose arg...
++# Echo program name prefixed message in verbose mode only.
++func_verbose ()
++{
++    $opt_verbose && func_echo ${1+"$@"}
 +
- # Set to 'all' to display all warnings, 'none' to suppress all
- # warnings, or a space delimited list of some subset of
- # 'warning_categories' to display only the listed warnings.
- opt_warning_types=all
++    # A bug in bash halts the script if the last line of a function
++    # fails when set -e is in force, so we need another command to
++    # work around that:
++    :
++}
 +
++# func_echo_all arg...
++# Invoke $ECHO with all args, space-separated.
++func_echo_all ()
++{
++    $ECHO "$*"
++}
 +
- ## -------------------- ##
- ## Resource management. ##
- ## -------------------- ##
++# func_error arg...
++# Echo program name prefixed message to standard error.
++func_error ()
++{
++    $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
++}
 +
- # This section contains definitions for functions that each ensure a
- # particular resource (a file, or a non-empty configuration variable for
- # example) is available, and if appropriate to extract default values
- # from pertinent package files. Call them using their associated
- # 'require_*' variable to ensure that they are executed, at most, once.
- #
- # It's entirely deliberate that calling these functions can set
- # variables that don't obey the namespace limitations obeyed by the rest
- # of this file, in order that that they be as useful as possible to
- # callers.
++# func_warning arg...
++# Echo program name prefixed warning message to standard error.
++func_warning ()
++{
++    $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
 +
++    # bash bug again:
++    :
++}
 +
- # require_term_colors
- # -------------------
- # Allow display of bold text on terminals that support it.
- require_term_colors=func_require_term_colors
- func_require_term_colors ()
++# func_fatal_error arg...
++# Echo program name prefixed message to standard error, and exit.
++func_fatal_error ()
 +{
-     $debug_cmd
- 
-     test -t 1 && {
-       # COLORTERM and USE_ANSI_COLORS environment variables take
-       # precedence, because most terminfo databases neglect to describe
-       # whether color sequences are supported.
-       test -n "${COLORTERM+set}" && : ${USE_ANSI_COLORS="1"}
- 
-       if test 1 = "$USE_ANSI_COLORS"; then
-         # Standard ANSI escape sequences
-         tc_reset=''
-         tc_bold='';   tc_standout=''
-         tc_red='';   tc_green=''
-         tc_blue='';  tc_cyan=''
-       else
-         # Otherwise trust the terminfo database after all.
-         test -n "`tput sgr0 2>/dev/null`" && {
-           tc_reset=`tput sgr0`
-           test -n "`tput bold 2>/dev/null`" && tc_bold=`tput bold`
-           tc_standout=$tc_bold
-           test -n "`tput smso 2>/dev/null`" && tc_standout=`tput smso`
-           test -n "`tput setaf 1 2>/dev/null`" && tc_red=`tput setaf 1`
-           test -n "`tput setaf 2 2>/dev/null`" && tc_green=`tput setaf 2`
-           test -n "`tput setaf 4 2>/dev/null`" && tc_blue=`tput setaf 4`
-           test -n "`tput setaf 5 2>/dev/null`" && tc_cyan=`tput setaf 5`
-         }
-       fi
-     }
++    func_error ${1+"$@"}
++    exit $EXIT_FAILURE
++}
 +
-     require_term_colors=:
++# func_fatal_help arg...
++# Echo program name prefixed message to standard error, followed by
++# a help hint, and exit.
++func_fatal_help ()
++{
++    func_error ${1+"$@"}
++    func_fatal_error "$help"
 +}
++help="Try \`$progname --help' for more information."  ## default
 +
 +
- ## ----------------- ##
- ## Function library. ##
- ## ----------------- ##
- 
- # This section contains a variety of useful functions to call in your
- # scripts. Take note of the portable wrappers for features provided by
- # some modern shells, which will fall back to slower equivalents on
- # less featureful shells.
- 
- 
- # func_append VAR VALUE
- # ---------------------
- # Append VALUE onto the existing contents of VAR.
- 
-   # We should try to minimise forks, especially on Windows where they are
-   # unreasonably slow, so skip the feature probes when bash or zsh are
-   # being used:
-   if test set = "${BASH_VERSION+set}${ZSH_VERSION+set}"; then
-     : ${_G_HAVE_ARITH_OP="yes"}
-     : ${_G_HAVE_XSI_OPS="yes"}
-     # The += operator was introduced in bash 3.1
-     case $BASH_VERSION in
-       [12].* | 3.0 | 3.0*) ;;
-       *)
-         : ${_G_HAVE_PLUSEQ_OP="yes"}
-         ;;
-     esac
-   fi
- 
-   # _G_HAVE_PLUSEQ_OP
-   # Can be empty, in which case the shell is probed, "yes" if += is
-   # useable or anything else if it does not work.
-   test -z "$_G_HAVE_PLUSEQ_OP" \
-     && (eval 'x=a; x+=" b"; test "a b" = "$x"') 2>/dev/null \
-     && _G_HAVE_PLUSEQ_OP=yes
- 
- if test yes = "$_G_HAVE_PLUSEQ_OP"
- then
-   # This is an XSI compatible shell, allowing a faster implementation...
-   eval 'func_append ()
-   {
-     $debug_cmd
- 
-     eval "$1+=\$2"
-   }'
- else
-   # ...otherwise fall back to using expr, which is often a shell builtin.
-   func_append ()
-   {
-     $debug_cmd
- 
-     eval "$1=\$$1\$2"
-   }
- fi
- 
- 
- # func_append_quoted VAR VALUE
- # ----------------------------
- # Quote VALUE and append to the end of shell variable VAR, separated
- # by a space.
- if test yes = "$_G_HAVE_PLUSEQ_OP"; then
-   eval 'func_append_quoted ()
-   {
-     $debug_cmd
- 
-     func_quote_for_eval "$2"
-     eval "$1+=\\ \$func_quote_for_eval_result"
-   }'
- else
-   func_append_quoted ()
-   {
-     $debug_cmd
- 
-     func_quote_for_eval "$2"
-     eval "$1=\$$1\\ \$func_quote_for_eval_result"
-   }
- fi
- 
- 
- # func_append_uniq VAR VALUE
- # --------------------------
- # Append unique VALUE onto the existing contents of VAR, assuming
- # entries are delimited by the first character of VALUE.  For example:
- #
- #   func_append_uniq options " --another-option option-argument"
- #
- # will only append to $options if " --another-option option-argument "
- # is not already present somewhere in $options already (note spaces at
- # each end implied by leading space in second argument).
- func_append_uniq ()
- {
-     $debug_cmd
- 
-     eval _G_current_value='`$ECHO $'$1'`'
-     _G_delim=`expr "$2" : '\(.\)'`
- 
-     case $_G_delim$_G_current_value$_G_delim in
-       *"$2$_G_delim"*) ;;
-       *) func_append "$@" ;;
-     esac
- }
- 
- 
- # func_arith TERM...
- # ------------------
- # Set func_arith_result to the result of evaluating TERMs.
-   test -z "$_G_HAVE_ARITH_OP" \
-     && (eval 'test 2 = $(( 1 + 1 ))') 2>/dev/null \
-     && _G_HAVE_ARITH_OP=yes
- 
- if test yes = "$_G_HAVE_ARITH_OP"; then
-   eval 'func_arith ()
-   {
-     $debug_cmd
- 
-     func_arith_result=$(( $* ))
-   }'
- else
-   func_arith ()
-   {
-     $debug_cmd
- 
-     func_arith_result=`expr "$@"`
-   }
- fi
- 
- 
- # func_basename FILE
- # ------------------
- # Set func_basename_result to FILE with everything up to and including
- # the last / stripped.
- if test yes = "$_G_HAVE_XSI_OPS"; then
-   # If this shell supports suffix pattern removal, then use it to avoid
-   # forking. Hide the definitions single quotes in case the shell chokes
-   # on unsupported syntax...
-   _b='func_basename_result=${1##*/}'
-   _d='case $1 in
-         */*) func_dirname_result=${1%/*}$2 ;;
-         *  ) func_dirname_result=$3        ;;
-       esac'
- 
- else
-   # ...otherwise fall back to using sed.
-   _b='func_basename_result=`$ECHO "$1" |$SED "$sed_basename"`'
-   _d='func_dirname_result=`$ECHO "$1"  |$SED "$sed_dirname"`
-       if test "X$func_dirname_result" = "X$1"; then
-         func_dirname_result=$3
-       else
-         func_append func_dirname_result "$2"
-       fi'
- fi
- 
- eval 'func_basename ()
- {
-     $debug_cmd
- 
-     '"$_b"'
- }'
- 
- 
- # func_dirname FILE APPEND NONDIR_REPLACEMENT
- # -------------------------------------------
- # Compute the dirname of FILE.  If nonempty, add APPEND to the result,
- # otherwise set result to NONDIR_REPLACEMENT.
- eval 'func_dirname ()
- {
-     $debug_cmd
- 
-     '"$_d"'
- }'
- 
- 
- # func_dirname_and_basename FILE APPEND NONDIR_REPLACEMENT
- # --------------------------------------------------------
- # Perform func_basename and func_dirname in a single function
- # call:
- #   dirname:  Compute the dirname of FILE.  If nonempty,
- #             add APPEND to the result, otherwise set result
- #             to NONDIR_REPLACEMENT.
- #             value returned in "$func_dirname_result"
- #   basename: Compute filename of FILE.
- #             value retuned in "$func_basename_result"
- # For efficiency, we do not delegate to the functions above but instead
- # duplicate the functionality here.
- eval 'func_dirname_and_basename ()
- {
-     $debug_cmd
- 
-     '"$_b"'
-     '"$_d"'
- }'
- 
- 
- # func_echo ARG...
- # ----------------
- # Echo program name prefixed message.
- func_echo ()
- {
-     $debug_cmd
- 
-     _G_message=$*
- 
-     func_echo_IFS=$IFS
-     IFS=$nl
-     for _G_line in $_G_message; do
-       IFS=$func_echo_IFS
-       $ECHO "$progname: $_G_line"
-     done
-     IFS=$func_echo_IFS
- }
- 
- 
- # func_echo_all ARG...
- # --------------------
- # Invoke $ECHO with all args, space-separated.
- func_echo_all ()
- {
-     $ECHO "$*"
- }
- 
- 
- # func_echo_infix_1 INFIX ARG...
- # ------------------------------
- # Echo program name, followed by INFIX on the first line, with any
- # additional lines not showing INFIX.
- func_echo_infix_1 ()
- {
-     $debug_cmd
- 
-     $require_term_colors
- 
-     _G_infix=$1; shift
-     _G_indent=$_G_infix
-     _G_prefix="$progname: $_G_infix: "
-     _G_message=$*
- 
-     # Strip color escape sequences before counting printable length
-     for _G_tc in "$tc_reset" "$tc_bold" "$tc_standout" "$tc_red" "$tc_green" "$tc_blue" "$tc_cyan"
-     do
-       test -n "$_G_tc" && {
-         _G_esc_tc=`$ECHO "$_G_tc" | $SED "$sed_make_literal_regex"`
-         _G_indent=`$ECHO "$_G_indent" | $SED "s|$_G_esc_tc||g"`
-       }
-     done
-     _G_indent="$progname: "`echo "$_G_indent" | $SED 's|.| |g'`"  " ## exclude from sc_prohibit_nested_quotes
- 
-     func_echo_infix_1_IFS=$IFS
-     IFS=$nl
-     for _G_line in $_G_message; do
-       IFS=$func_echo_infix_1_IFS
-       $ECHO "$_G_prefix$tc_bold$_G_line$tc_reset" >&2
-       _G_prefix=$_G_indent
-     done
-     IFS=$func_echo_infix_1_IFS
- }
- 
- 
- # func_error ARG...
- # -----------------
- # Echo program name prefixed message to standard error.
- func_error ()
- {
-     $debug_cmd
- 
-     $require_term_colors
- 
-     func_echo_infix_1 "  $tc_standout${tc_red}error$tc_reset" "$*" >&2
- }
- 
- 
- # func_fatal_error ARG...
- # -----------------------
- # Echo program name prefixed message to standard error, and exit.
- func_fatal_error ()
- {
-     $debug_cmd
- 
-     func_error "$*"
-     exit $EXIT_FAILURE
- }
- 
- 
- # func_grep EXPRESSION FILENAME
- # -----------------------------
++# func_grep expression filename
 +# Check whether EXPRESSION matches any line of FILENAME, without output.
 +func_grep ()
 +{
-     $debug_cmd
- 
 +    $GREP "$1" "$2" >/dev/null 2>&1
 +}
 +
 +
- # func_len STRING
- # ---------------
- # Set func_len_result to the length of STRING. STRING may not
- # start with a hyphen.
-   test -z "$_G_HAVE_XSI_OPS" \
-     && (eval 'x=a/b/c;
-       test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \
-     && _G_HAVE_XSI_OPS=yes
- 
- if test yes = "$_G_HAVE_XSI_OPS"; then
-   eval 'func_len ()
-   {
-     $debug_cmd
- 
-     func_len_result=${#1}
-   }'
- else
-   func_len ()
-   {
-     $debug_cmd
- 
-     func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
-   }
- fi
- 
- 
- # func_mkdir_p DIRECTORY-PATH
- # ---------------------------
++# func_mkdir_p directory-path
 +# Make sure the entire path to DIRECTORY-PATH is available.
 +func_mkdir_p ()
 +{
-     $debug_cmd
- 
-     _G_directory_path=$1
-     _G_dir_list=
++    my_directory_path="$1"
++    my_dir_list=
 +
-     if test -n "$_G_directory_path" && test : != "$opt_dry_run"; then
++    if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then
 +
-       # Protect directory names starting with '-'
-       case $_G_directory_path in
-         -*) _G_directory_path=./$_G_directory_path ;;
++      # Protect directory names starting with `-'
++      case $my_directory_path in
++        -*) my_directory_path="./$my_directory_path" ;;
 +      esac
 +
 +      # While some portion of DIR does not yet exist...
-       while test ! -d "$_G_directory_path"; do
++      while test ! -d "$my_directory_path"; do
 +        # ...make a list in topmost first order.  Use a colon delimited
 +	# list incase some portion of path contains whitespace.
-         _G_dir_list=$_G_directory_path:$_G_dir_list
++        my_dir_list="$my_directory_path:$my_dir_list"
 +
 +        # If the last portion added has no slash in it, the list is done
-         case $_G_directory_path in */*) ;; *) break ;; esac
++        case $my_directory_path in */*) ;; *) break ;; esac
 +
 +        # ...otherwise throw away the child directory and loop
-         _G_directory_path=`$ECHO "$_G_directory_path" | $SED -e "$sed_dirname"`
++        my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"`
 +      done
-       _G_dir_list=`$ECHO "$_G_dir_list" | $SED 's|:*$||'`
++      my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'`
 +
-       func_mkdir_p_IFS=$IFS; IFS=:
-       for _G_dir in $_G_dir_list; do
- 	IFS=$func_mkdir_p_IFS
-         # mkdir can fail with a 'File exist' error if two processes
++      save_mkdir_p_IFS="$IFS"; IFS=':'
++      for my_dir in $my_dir_list; do
++	IFS="$save_mkdir_p_IFS"
++        # mkdir can fail with a `File exist' error if two processes
 +        # try to create one of the directories concurrently.  Don't
 +        # stop in that case!
-         $MKDIR "$_G_dir" 2>/dev/null || :
++        $MKDIR "$my_dir" 2>/dev/null || :
 +      done
-       IFS=$func_mkdir_p_IFS
++      IFS="$save_mkdir_p_IFS"
 +
 +      # Bail out if we (or some other process) failed to create a directory.
-       test -d "$_G_directory_path" || \
-         func_fatal_error "Failed to create '$1'"
++      test -d "$my_directory_path" || \
++        func_fatal_error "Failed to create \`$1'"
 +    fi
 +}
 +
 +
- # func_mktempdir [BASENAME]
- # -------------------------
++# func_mktempdir [string]
 +# Make a temporary directory that won't clash with other running
 +# libtool processes, and avoids race conditions if possible.  If
- # given, BASENAME is the basename for that directory.
++# given, STRING is the basename for that directory.
 +func_mktempdir ()
 +{
-     $debug_cmd
++    my_template="${TMPDIR-/tmp}/${1-$progname}"
 +
-     _G_template=${TMPDIR-/tmp}/${1-$progname}
- 
-     if test : = "$opt_dry_run"; then
++    if test "$opt_dry_run" = ":"; then
 +      # Return a directory name, but don't create it in dry-run mode
-       _G_tmpdir=$_G_template-$$
++      my_tmpdir="${my_template}-$$"
 +    else
 +
 +      # If mktemp works, use that first and foremost
-       _G_tmpdir=`mktemp -d "$_G_template-XXXXXXXX" 2>/dev/null`
++      my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
 +
-       if test ! -d "$_G_tmpdir"; then
++      if test ! -d "$my_tmpdir"; then
 +        # Failing that, at least try and use $RANDOM to avoid a race
-         _G_tmpdir=$_G_template-${RANDOM-0}$$
++        my_tmpdir="${my_template}-${RANDOM-0}$$"
 +
-         func_mktempdir_umask=`umask`
++        save_mktempdir_umask=`umask`
 +        umask 0077
-         $MKDIR "$_G_tmpdir"
-         umask $func_mktempdir_umask
++        $MKDIR "$my_tmpdir"
++        umask $save_mktempdir_umask
 +      fi
 +
 +      # If we're not in dry-run mode, bomb out on failure
-       test -d "$_G_tmpdir" || \
-         func_fatal_error "cannot create temporary directory '$_G_tmpdir'"
-     fi
- 
-     $ECHO "$_G_tmpdir"
- }
- 
- 
- # func_normal_abspath PATH
- # ------------------------
- # Remove doubled-up and trailing slashes, "." path components,
- # and cancel out any ".." path components in PATH after making
- # it an absolute path.
- func_normal_abspath ()
- {
-     $debug_cmd
- 
-     # These SED scripts presuppose an absolute path with a trailing slash.
-     _G_pathcar='s|^/\([^/]*\).*$|\1|'
-     _G_pathcdr='s|^/[^/]*||'
-     _G_removedotparts=':dotsl
- 		s|/\./|/|g
- 		t dotsl
- 		s|/\.$|/|'
-     _G_collapseslashes='s|/\{1,\}|/|g'
-     _G_finalslash='s|/*$|/|'
- 
-     # Start from root dir and reassemble the path.
-     func_normal_abspath_result=
-     func_normal_abspath_tpath=$1
-     func_normal_abspath_altnamespace=
-     case $func_normal_abspath_tpath in
-       "")
-         # Empty path, that just means $cwd.
-         func_stripname '' '/' "`pwd`"
-         func_normal_abspath_result=$func_stripname_result
-         return
-         ;;
-       # The next three entries are used to spot a run of precisely
-       # two leading slashes without using negated character classes;
-       # we take advantage of case's first-match behaviour.
-       ///*)
-         # Unusual form of absolute path, do nothing.
-         ;;
-       //*)
-         # Not necessarily an ordinary path; POSIX reserves leading '//'
-         # and for example Cygwin uses it to access remote file shares
-         # over CIFS/SMB, so we conserve a leading double slash if found.
-         func_normal_abspath_altnamespace=/
-         ;;
-       /*)
-         # Absolute path, do nothing.
-         ;;
-       *)
-         # Relative path, prepend $cwd.
-         func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
-         ;;
-     esac
- 
-     # Cancel out all the simple stuff to save iterations.  We also want
-     # the path to end with a slash for ease of parsing, so make sure
-     # there is one (and only one) here.
-     func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
-           -e "$_G_removedotparts" -e "$_G_collapseslashes" -e "$_G_finalslash"`
-     while :; do
-       # Processed it all yet?
-       if test / = "$func_normal_abspath_tpath"; then
-         # If we ascended to the root using ".." the result may be empty now.
-         if test -z "$func_normal_abspath_result"; then
-           func_normal_abspath_result=/
-         fi
-         break
-       fi
-       func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
-           -e "$_G_pathcar"`
-       func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
-           -e "$_G_pathcdr"`
-       # Figure out what to do with it
-       case $func_normal_abspath_tcomponent in
-         "")
-           # Trailing empty path component, ignore it.
-           ;;
-         ..)
-           # Parent dir; strip last assembled component from result.
-           func_dirname "$func_normal_abspath_result"
-           func_normal_abspath_result=$func_dirname_result
-           ;;
-         *)
-           # Actual path component, append it.
-           func_append func_normal_abspath_result "/$func_normal_abspath_tcomponent"
-           ;;
-       esac
-     done
-     # Restore leading double-slash if one was found on entry.
-     func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
- }
- 
- 
- # func_notquiet ARG...
- # --------------------
- # Echo program name prefixed message only when not in quiet mode.
- func_notquiet ()
- {
-     $debug_cmd
- 
-     $opt_quiet || func_echo ${1+"$@"}
- 
-     # A bug in bash halts the script if the last line of a function
-     # fails when set -e is in force, so we need another command to
-     # work around that:
-     :
- }
- 
- 
- # func_relative_path SRCDIR DSTDIR
- # --------------------------------
- # Set func_relative_path_result to the relative path from SRCDIR to DSTDIR.
- func_relative_path ()
- {
-     $debug_cmd
- 
-     func_relative_path_result=
-     func_normal_abspath "$1"
-     func_relative_path_tlibdir=$func_normal_abspath_result
-     func_normal_abspath "$2"
-     func_relative_path_tbindir=$func_normal_abspath_result
- 
-     # Ascend the tree starting from libdir
-     while :; do
-       # check if we have found a prefix of bindir
-       case $func_relative_path_tbindir in
-         $func_relative_path_tlibdir)
-           # found an exact match
-           func_relative_path_tcancelled=
-           break
-           ;;
-         $func_relative_path_tlibdir*)
-           # found a matching prefix
-           func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"
-           func_relative_path_tcancelled=$func_stripname_result
-           if test -z "$func_relative_path_result"; then
-             func_relative_path_result=.
-           fi
-           break
-           ;;
-         *)
-           func_dirname $func_relative_path_tlibdir
-           func_relative_path_tlibdir=$func_dirname_result
-           if test -z "$func_relative_path_tlibdir"; then
-             # Have to descend all the way to the root!
-             func_relative_path_result=../$func_relative_path_result
-             func_relative_path_tcancelled=$func_relative_path_tbindir
-             break
-           fi
-           func_relative_path_result=../$func_relative_path_result
-           ;;
-       esac
-     done
- 
-     # Now calculate path; take care to avoid doubling-up slashes.
-     func_stripname '' '/' "$func_relative_path_result"
-     func_relative_path_result=$func_stripname_result
-     func_stripname '/' '/' "$func_relative_path_tcancelled"
-     if test -n "$func_stripname_result"; then
-       func_append func_relative_path_result "/$func_stripname_result"
-     fi
- 
-     # Normalisation. If bindir is libdir, return '.' else relative path.
-     if test -n "$func_relative_path_result"; then
-       func_stripname './' '' "$func_relative_path_result"
-       func_relative_path_result=$func_stripname_result
-     fi
- 
-     test -n "$func_relative_path_result" || func_relative_path_result=.
- 
-     :
- }
- 
- 
- # func_quote_for_eval ARG...
- # --------------------------
- # Aesthetically quote ARGs to be evaled later.
- # This function returns two values:
- #   i) func_quote_for_eval_result
- #      double-quoted, suitable for a subsequent eval
- #  ii) func_quote_for_eval_unquoted_result
- #      has all characters that are still active within double
- #      quotes backslashified.
- func_quote_for_eval ()
- {
-     $debug_cmd
- 
-     func_quote_for_eval_unquoted_result=
-     func_quote_for_eval_result=
-     while test 0 -lt $#; do
-       case $1 in
-         *[\\\`\"\$]*)
- 	  _G_unquoted_arg=`printf '%s\n' "$1" |$SED "$sed_quote_subst"` ;;
-         *)
-           _G_unquoted_arg=$1 ;;
-       esac
-       if test -n "$func_quote_for_eval_unquoted_result"; then
- 	func_append func_quote_for_eval_unquoted_result " $_G_unquoted_arg"
-       else
-         func_append func_quote_for_eval_unquoted_result "$_G_unquoted_arg"
-       fi
- 
-       case $_G_unquoted_arg in
-         # Double-quote args containing shell metacharacters to delay
-         # word splitting, command substitution and variable expansion
-         # for a subsequent eval.
-         # Many Bourne shells cannot handle close brackets correctly
-         # in scan sets, so we specify it separately.
-         *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-           _G_quoted_arg=\"$_G_unquoted_arg\"
-           ;;
-         *)
-           _G_quoted_arg=$_G_unquoted_arg
- 	  ;;
-       esac
- 
-       if test -n "$func_quote_for_eval_result"; then
- 	func_append func_quote_for_eval_result " $_G_quoted_arg"
-       else
-         func_append func_quote_for_eval_result "$_G_quoted_arg"
-       fi
-       shift
-     done
- }
- 
- 
- # func_quote_for_expand ARG
- # -------------------------
- # Aesthetically quote ARG to be evaled later; same as above,
- # but do not quote variable references.
- func_quote_for_expand ()
- {
-     $debug_cmd
- 
-     case $1 in
-       *[\\\`\"]*)
- 	_G_arg=`$ECHO "$1" | $SED \
- 	    -e "$sed_double_quote_subst" -e "$sed_double_backslash"` ;;
-       *)
-         _G_arg=$1 ;;
-     esac
- 
-     case $_G_arg in
-       # Double-quote args containing shell metacharacters to delay
-       # word splitting and command substitution for a subsequent eval.
-       # Many Bourne shells cannot handle close brackets correctly
-       # in scan sets, so we specify it separately.
-       *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-         _G_arg=\"$_G_arg\"
-         ;;
-     esac
- 
-     func_quote_for_expand_result=$_G_arg
- }
- 
- 
- # func_stripname PREFIX SUFFIX NAME
- # ---------------------------------
- # strip PREFIX and SUFFIX from NAME, and store in func_stripname_result.
- # PREFIX and SUFFIX must not contain globbing or regex special
- # characters, hashes, percent signs, but SUFFIX may contain a leading
- # dot (in which case that matches only a dot).
- if test yes = "$_G_HAVE_XSI_OPS"; then
-   eval 'func_stripname ()
-   {
-     $debug_cmd
- 
-     # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
-     # positional parameters, so assign one to ordinary variable first.
-     func_stripname_result=$3
-     func_stripname_result=${func_stripname_result#"$1"}
-     func_stripname_result=${func_stripname_result%"$2"}
-   }'
- else
-   func_stripname ()
-   {
-     $debug_cmd
- 
-     case $2 in
-       .*) func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%\\\\$2\$%%"`;;
-       *)  func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%$2\$%%"`;;
-     esac
-   }
- fi
- 
- 
- # func_show_eval CMD [FAIL_EXP]
- # -----------------------------
- # Unless opt_quiet is true, then output CMD.  Then, if opt_dryrun is
- # not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
- # is given, then evaluate it.
- func_show_eval ()
- {
-     $debug_cmd
- 
-     _G_cmd=$1
-     _G_fail_exp=${2-':'}
- 
-     func_quote_for_expand "$_G_cmd"
-     eval "func_notquiet $func_quote_for_expand_result"
- 
-     $opt_dry_run || {
-       eval "$_G_cmd"
-       _G_status=$?
-       if test 0 -ne "$_G_status"; then
- 	eval "(exit $_G_status); $_G_fail_exp"
-       fi
-     }
- }
- 
- 
- # func_show_eval_locale CMD [FAIL_EXP]
- # ------------------------------------
- # Unless opt_quiet is true, then output CMD.  Then, if opt_dryrun is
- # not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
- # is given, then evaluate it.  Use the saved locale for evaluation.
- func_show_eval_locale ()
- {
-     $debug_cmd
- 
-     _G_cmd=$1
-     _G_fail_exp=${2-':'}
- 
-     $opt_quiet || {
-       func_quote_for_expand "$_G_cmd"
-       eval "func_echo $func_quote_for_expand_result"
-     }
- 
-     $opt_dry_run || {
-       eval "$_G_user_locale
- 	    $_G_cmd"
-       _G_status=$?
-       eval "$_G_safe_locale"
-       if test 0 -ne "$_G_status"; then
- 	eval "(exit $_G_status); $_G_fail_exp"
-       fi
-     }
- }
- 
- 
- # func_tr_sh
- # ----------
- # Turn $1 into a string suitable for a shell variable name.
- # Result is stored in $func_tr_sh_result.  All characters
- # not in the set a-zA-Z0-9_ are replaced with '_'. Further,
- # if $1 begins with a digit, a '_' is prepended as well.
- func_tr_sh ()
- {
-     $debug_cmd
- 
-     case $1 in
-     [0-9]* | *[!a-zA-Z0-9_]*)
-       func_tr_sh_result=`$ECHO "$1" | $SED -e 's/^\([0-9]\)/_\1/' -e 's/[^a-zA-Z0-9_]/_/g'`
-       ;;
-     * )
-       func_tr_sh_result=$1
-       ;;
-     esac
- }
- 
- 
- # func_verbose ARG...
- # -------------------
- # Echo program name prefixed message in verbose mode only.
- func_verbose ()
- {
-     $debug_cmd
- 
-     $opt_verbose && func_echo "$*"
- 
-     :
- }
- 
- 
- # func_warn_and_continue ARG...
- # -----------------------------
- # Echo program name prefixed warning message to standard error.
- func_warn_and_continue ()
- {
-     $debug_cmd
- 
-     $require_term_colors
- 
-     func_echo_infix_1 "${tc_red}warning$tc_reset" "$*" >&2
- }
- 
- 
- # func_warning CATEGORY ARG...
- # ----------------------------
- # Echo program name prefixed warning message to standard error. Warning
- # messages can be filtered according to CATEGORY, where this function
- # elides messages where CATEGORY is not listed in the global variable
- # 'opt_warning_types'.
- func_warning ()
- {
-     $debug_cmd
- 
-     # CATEGORY must be in the warning_categories list!
-     case " $warning_categories " in
-       *" $1 "*) ;;
-       *) func_internal_error "invalid warning category '$1'" ;;
-     esac
- 
-     _G_category=$1
-     shift
- 
-     case " $opt_warning_types " in
-       *" $_G_category "*) $warning_func ${1+"$@"} ;;
-     esac
- }
- 
- 
- # func_sort_ver VER1 VER2
- # -----------------------
- # 'sort -V' is not generally available.
- # Note this deviates from the version comparison in automake
- # in that it treats 1.5 < 1.5.0, and treats 1.4.4a < 1.4-p3a
- # but this should suffice as we won't be specifying old
- # version formats or redundant trailing .0 in bootstrap.conf.
- # If we did want full compatibility then we should probably
- # use m4_version_compare from autoconf.
- func_sort_ver ()
- {
-     $debug_cmd
- 
-     printf '%s\n%s\n' "$1" "$2" \
-       | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n -k 5,5n -k 6,6n -k 7,7n -k 8,8n -k 9,9n
- }
- 
- # func_lt_ver PREV CURR
- # ---------------------
- # Return true if PREV and CURR are in the correct order according to
- # func_sort_ver, otherwise false.  Use it like this:
- #
- #  func_lt_ver "$prev_ver" "$proposed_ver" || func_fatal_error "..."
- func_lt_ver ()
- {
-     $debug_cmd
- 
-     test "x$1" = x`func_sort_ver "$1" "$2" | $SED 1q`
- }
- 
- 
- # Local variables:
- # mode: shell-script
- # sh-indentation: 2
- # eval: (add-hook 'before-save-hook 'time-stamp)
- # time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC"
- # time-stamp-time-zone: "UTC"
- # End:
- #! /bin/sh
- 
- # Set a version string for this script.
- scriptversion=2014-01-07.03; # UTC
- 
- # A portable, pluggable option parser for Bourne shell.
- # Written by Gary V. Vaughan, 2010
- 
- # Copyright (C) 2010-2015 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.
- 
- # 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 3 of the License, 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, see <http://www.gnu.org/licenses/>.
- 
- # Please report bugs or propose patches to gary at gnu.org.
- 
- 
- ## ------ ##
- ## Usage. ##
- ## ------ ##
- 
- # This file is a library for parsing options in your shell scripts along
- # with assorted other useful supporting features that you can make use
- # of too.
- #
- # For the simplest scripts you might need only:
- #
- #   #!/bin/sh
- #   . relative/path/to/funclib.sh
- #   . relative/path/to/options-parser
- #   scriptversion=1.0
- #   func_options ${1+"$@"}
- #   eval set dummy "$func_options_result"; shift
- #   ...rest of your script...
- #
- # In order for the '--version' option to work, you will need to have a
- # suitably formatted comment like the one at the top of this file
- # starting with '# Written by ' and ending with '# warranty; '.
- #
- # For '-h' and '--help' to work, you will also need a one line
- # description of your script's purpose in a comment directly above the
- # '# Written by ' line, like the one at the top of this file.
- #
- # The default options also support '--debug', which will turn on shell
- # execution tracing (see the comment above debug_cmd below for another
- # use), and '--verbose' and the func_verbose function to allow your script
- # to display verbose messages only when your user has specified
- # '--verbose'.
- #
- # After sourcing this file, you can plug processing for additional
- # options by amending the variables from the 'Configuration' section
- # below, and following the instructions in the 'Option parsing'
- # section further down.
- 
- ## -------------- ##
- ## Configuration. ##
- ## -------------- ##
- 
- # You should override these variables in your script after sourcing this
- # file so that they reflect the customisations you have added to the
- # option parser.
- 
- # The usage line for option parsing errors and the start of '-h' and
- # '--help' output messages. You can embed shell variables for delayed
- # expansion at the time the message is displayed, but you will need to
- # quote other shell meta-characters carefully to prevent them being
- # expanded when the contents are evaled.
- usage='$progpath [OPTION]...'
- 
- # Short help message in response to '-h' and '--help'.  Add to this or
- # override it after sourcing this library to reflect the full set of
- # options your script accepts.
- usage_message="\
-        --debug        enable verbose shell tracing
-    -W, --warnings=CATEGORY
-                       report the warnings falling in CATEGORY [all]
-    -v, --verbose      verbosely report processing
-        --version      print version information and exit
-    -h, --help         print short or long help message and exit
- "
- 
- # Additional text appended to 'usage_message' in response to '--help'.
- long_help_message="
- Warning categories include:
-        'all'          show all warnings
-        'none'         turn off all the warnings
-        'error'        warnings are treated as fatal errors"
- 
- # Help message printed before fatal option parsing errors.
- fatal_help="Try '\$progname --help' for more information."
- 
- 
- 
- ## ------------------------- ##
- ## Hook function management. ##
- ## ------------------------- ##
- 
- # This section contains functions for adding, removing, and running hooks
- # to the main code.  A hook is just a named list of of function, that can
- # be run in order later on.
- 
- # func_hookable FUNC_NAME
- # -----------------------
- # Declare that FUNC_NAME will run hooks added with
- # 'func_add_hook FUNC_NAME ...'.
- func_hookable ()
- {
-     $debug_cmd
- 
-     func_append hookable_fns " $1"
- }
- 
- 
- # func_add_hook FUNC_NAME HOOK_FUNC
- # ---------------------------------
- # Request that FUNC_NAME call HOOK_FUNC before it returns.  FUNC_NAME must
- # first have been declared "hookable" by a call to 'func_hookable'.
- func_add_hook ()
- {
-     $debug_cmd
- 
-     case " $hookable_fns " in
-       *" $1 "*) ;;
-       *) func_fatal_error "'$1' does not accept hook functions." ;;
-     esac
- 
-     eval func_append ${1}_hooks '" $2"'
- }
- 
- 
- # func_remove_hook FUNC_NAME HOOK_FUNC
- # ------------------------------------
- # Remove HOOK_FUNC from the list of functions called by FUNC_NAME.
- func_remove_hook ()
- {
-     $debug_cmd
- 
-     eval ${1}_hooks='`$ECHO "\$'$1'_hooks" |$SED "s| '$2'||"`'
- }
- 
- 
- # func_run_hooks FUNC_NAME [ARG]...
- # ---------------------------------
- # Run all hook functions registered to FUNC_NAME.
- # It is assumed that the list of hook functions contains nothing more
- # than a whitespace-delimited list of legal shell function names, and
- # no effort is wasted trying to catch shell meta-characters or preserve
- # whitespace.
- func_run_hooks ()
- {
-     $debug_cmd
- 
-     case " $hookable_fns " in
-       *" $1 "*) ;;
-       *) func_fatal_error "'$1' does not support hook funcions.n" ;;
-     esac
- 
-     eval _G_hook_fns=\$$1_hooks; shift
- 
-     for _G_hook in $_G_hook_fns; do
-       eval $_G_hook '"$@"'
- 
-       # store returned options list back into positional
-       # parameters for next 'cmd' execution.
-       eval _G_hook_result=\$${_G_hook}_result
-       eval set dummy "$_G_hook_result"; shift
-     done
- 
-     func_quote_for_eval ${1+"$@"}
-     func_run_hooks_result=$func_quote_for_eval_result
- }
- 
- 
- 
- ## --------------- ##
- ## Option parsing. ##
- ## --------------- ##
- 
- # In order to add your own option parsing hooks, you must accept the
- # full positional parameter list in your hook function, remove any
- # options that you action, and then pass back the remaining unprocessed
- # options in '<hooked_function_name>_result', escaped suitably for
- # 'eval'.  Like this:
- #
- #    my_options_prep ()
- #    {
- #        $debug_cmd
- #
- #        # Extend the existing usage message.
- #        usage_message=$usage_message'
- #      -s, --silent       don'\''t print informational messages
- #    '
- #
- #        func_quote_for_eval ${1+"$@"}
- #        my_options_prep_result=$func_quote_for_eval_result
- #    }
- #    func_add_hook func_options_prep my_options_prep
- #
- #
- #    my_silent_option ()
- #    {
- #        $debug_cmd
- #
- #        # Note that for efficiency, we parse as many options as we can
- #        # recognise in a loop before passing the remainder back to the
- #        # caller on the first unrecognised argument we encounter.
- #        while test $# -gt 0; do
- #          opt=$1; shift
- #          case $opt in
- #            --silent|-s) opt_silent=: ;;
- #            # Separate non-argument short options:
- #            -s*)         func_split_short_opt "$_G_opt"
- #                         set dummy "$func_split_short_opt_name" \
- #                             "-$func_split_short_opt_arg" ${1+"$@"}
- #                         shift
- #                         ;;
- #            *)            set dummy "$_G_opt" "$*"; shift; break ;;
- #          esac
- #        done
- #
- #        func_quote_for_eval ${1+"$@"}
- #        my_silent_option_result=$func_quote_for_eval_result
- #    }
- #    func_add_hook func_parse_options my_silent_option
- #
- #
- #    my_option_validation ()
- #    {
- #        $debug_cmd
- #
- #        $opt_silent && $opt_verbose && func_fatal_help "\
- #    '--silent' and '--verbose' options are mutually exclusive."
- #
- #        func_quote_for_eval ${1+"$@"}
- #        my_option_validation_result=$func_quote_for_eval_result
- #    }
- #    func_add_hook func_validate_options my_option_validation
- #
- # You'll alse need to manually amend $usage_message to reflect the extra
- # options you parse.  It's preferable to append if you can, so that
- # multiple option parsing hooks can be added safely.
- 
- 
- # func_options [ARG]...
- # ---------------------
- # All the functions called inside func_options are hookable. See the
- # individual implementations for details.
- func_hookable func_options
- func_options ()
- {
-     $debug_cmd
- 
-     func_options_prep ${1+"$@"}
-     eval func_parse_options \
-         ${func_options_prep_result+"$func_options_prep_result"}
-     eval func_validate_options \
-         ${func_parse_options_result+"$func_parse_options_result"}
- 
-     eval func_run_hooks func_options \
-         ${func_validate_options_result+"$func_validate_options_result"}
++      test -d "$my_tmpdir" || \
++        func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
++    fi
 +
-     # save modified positional parameters for caller
-     func_options_result=$func_run_hooks_result
++    $ECHO "$my_tmpdir"
 +}
 +
 +
- # func_options_prep [ARG]...
- # --------------------------
- # All initialisations required before starting the option parse loop.
- # Note that when calling hook functions, we pass through the list of
- # positional parameters.  If a hook function modifies that list, and
- # needs to propogate that back to rest of this script, then the complete
- # modified list must be put in 'func_run_hooks_result' before
- # returning.
- func_hookable func_options_prep
- func_options_prep ()
++# func_quote_for_eval arg
++# Aesthetically quote ARG to be evaled later.
++# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT
++# is double-quoted, suitable for a subsequent eval, whereas
++# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters
++# which are still active within double quotes backslashified.
++func_quote_for_eval ()
 +{
-     $debug_cmd
- 
-     # Option defaults:
-     opt_verbose=false
-     opt_warning_types=
- 
-     func_run_hooks func_options_prep ${1+"$@"}
++    case $1 in
++      *[\\\`\"\$]*)
++	func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;;
++      *)
++        func_quote_for_eval_unquoted_result="$1" ;;
++    esac
 +
-     # save modified positional parameters for caller
-     func_options_prep_result=$func_run_hooks_result
++    case $func_quote_for_eval_unquoted_result in
++      # Double-quote args containing shell metacharacters to delay
++      # word splitting, command substitution and and variable
++      # expansion for a subsequent eval.
++      # Many Bourne shells cannot handle close brackets correctly
++      # in scan sets, so we specify it separately.
++      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
++        func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\""
++        ;;
++      *)
++        func_quote_for_eval_result="$func_quote_for_eval_unquoted_result"
++    esac
 +}
 +
 +
- # func_parse_options [ARG]...
- # ---------------------------
- # The main option parsing loop.
- func_hookable func_parse_options
- func_parse_options ()
++# func_quote_for_expand arg
++# Aesthetically quote ARG to be evaled later; same as above,
++# but do not quote variable references.
++func_quote_for_expand ()
 +{
-     $debug_cmd
- 
-     func_parse_options_result=
++    case $1 in
++      *[\\\`\"]*)
++	my_arg=`$ECHO "$1" | $SED \
++	    -e "$double_quote_subst" -e "$sed_double_backslash"` ;;
++      *)
++        my_arg="$1" ;;
++    esac
 +
-     # this just eases exit handling
-     while test $# -gt 0; do
-       # Defer to hook functions for initial option parsing, so they
-       # get priority in the event of reusing an option name.
-       func_run_hooks func_parse_options ${1+"$@"}
++    case $my_arg in
++      # Double-quote args containing shell metacharacters to delay
++      # word splitting and command substitution for a subsequent eval.
++      # Many Bourne shells cannot handle close brackets correctly
++      # in scan sets, so we specify it separately.
++      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
++        my_arg="\"$my_arg\""
++        ;;
++    esac
 +
-       # Adjust func_parse_options positional parameters to match
-       eval set dummy "$func_run_hooks_result"; shift
++    func_quote_for_expand_result="$my_arg"
++}
 +
-       # Break out of the loop if we already parsed every option.
-       test $# -gt 0 || break
 +
-       _G_opt=$1
-       shift
-       case $_G_opt in
-         --debug|-x)   debug_cmd='set -x'
-                       func_echo "enabling shell trace mode"
-                       $debug_cmd
-                       ;;
- 
-         --no-warnings|--no-warning|--no-warn)
-                       set dummy --warnings none ${1+"$@"}
-                       shift
- 		      ;;
++# func_show_eval cmd [fail_exp]
++# Unless opt_silent is true, then output CMD.  Then, if opt_dryrun is
++# not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
++# is given, then evaluate it.
++func_show_eval ()
++{
++    my_cmd="$1"
++    my_fail_exp="${2-:}"
 +
-         --warnings|--warning|-W)
-                       test $# = 0 && func_missing_arg $_G_opt && break
-                       case " $warning_categories $1" in
-                         *" $1 "*)
-                           # trailing space prevents matching last $1 above
-                           func_append_uniq opt_warning_types " $1"
-                           ;;
-                         *all)
-                           opt_warning_types=$warning_categories
-                           ;;
-                         *none)
-                           opt_warning_types=none
-                           warning_func=:
-                           ;;
-                         *error)
-                           opt_warning_types=$warning_categories
-                           warning_func=func_fatal_error
-                           ;;
-                         *)
-                           func_fatal_error \
-                              "unsupported warning category: '$1'"
-                           ;;
-                       esac
-                       shift
-                       ;;
- 
-         --verbose|-v) opt_verbose=: ;;
-         --version)    func_version ;;
-         -\?|-h)       func_usage ;;
-         --help)       func_help ;;
- 
- 	# Separate optargs to long options (plugins may need this):
- 	--*=*)        func_split_equals "$_G_opt"
- 	              set dummy "$func_split_equals_lhs" \
-                           "$func_split_equals_rhs" ${1+"$@"}
-                       shift
-                       ;;
- 
-        # Separate optargs to short options:
-         -W*)
-                       func_split_short_opt "$_G_opt"
-                       set dummy "$func_split_short_opt_name" \
-                           "$func_split_short_opt_arg" ${1+"$@"}
-                       shift
-                       ;;
- 
-         # Separate non-argument short options:
-         -\?*|-h*|-v*|-x*)
-                       func_split_short_opt "$_G_opt"
-                       set dummy "$func_split_short_opt_name" \
-                           "-$func_split_short_opt_arg" ${1+"$@"}
-                       shift
-                       ;;
- 
-         --)           break ;;
-         -*)           func_fatal_help "unrecognised option: '$_G_opt'" ;;
-         *)            set dummy "$_G_opt" ${1+"$@"}; shift; break ;;
-       esac
-     done
++    ${opt_silent-false} || {
++      func_quote_for_expand "$my_cmd"
++      eval "func_echo $func_quote_for_expand_result"
++    }
 +
-     # save modified positional parameters for caller
-     func_quote_for_eval ${1+"$@"}
-     func_parse_options_result=$func_quote_for_eval_result
++    if ${opt_dry_run-false}; then :; else
++      eval "$my_cmd"
++      my_status=$?
++      if test "$my_status" -eq 0; then :; else
++	eval "(exit $my_status); $my_fail_exp"
++      fi
++    fi
 +}
 +
 +
- # func_validate_options [ARG]...
- # ------------------------------
- # Perform any sanity checks on option settings and/or unconsumed
- # arguments.
- func_hookable func_validate_options
- func_validate_options ()
++# func_show_eval_locale cmd [fail_exp]
++# Unless opt_silent is true, then output CMD.  Then, if opt_dryrun is
++# not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
++# is given, then evaluate it.  Use the saved locale for evaluation.
++func_show_eval_locale ()
 +{
-     $debug_cmd
- 
-     # Display all warnings if -W was not given.
-     test -n "$opt_warning_types" || opt_warning_types=" $warning_categories"
++    my_cmd="$1"
++    my_fail_exp="${2-:}"
 +
-     func_run_hooks func_validate_options ${1+"$@"}
- 
-     # Bail if the options were screwed!
-     $exit_cmd $EXIT_FAILURE
++    ${opt_silent-false} || {
++      func_quote_for_expand "$my_cmd"
++      eval "func_echo $func_quote_for_expand_result"
++    }
 +
-     # save modified positional parameters for caller
-     func_validate_options_result=$func_run_hooks_result
++    if ${opt_dry_run-false}; then :; else
++      eval "$lt_user_locale
++	    $my_cmd"
++      my_status=$?
++      eval "$lt_safe_locale"
++      if test "$my_status" -eq 0; then :; else
++	eval "(exit $my_status); $my_fail_exp"
++      fi
++    fi
 +}
 +
++# func_tr_sh
++# Turn $1 into a string suitable for a shell variable name.
++# Result is stored in $func_tr_sh_result.  All characters
++# not in the set a-zA-Z0-9_ are replaced with '_'. Further,
++# if $1 begins with a digit, a '_' is prepended as well.
++func_tr_sh ()
++{
++  case $1 in
++  [0-9]* | *[!a-zA-Z0-9_]*)
++    func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'`
++    ;;
++  * )
++    func_tr_sh_result=$1
++    ;;
++  esac
++}
 +
 +
- ## ----------------- ##
- ## Helper functions. ##
- ## ----------------- ##
- 
- # This section contains the helper functions used by the rest of the
- # hookable option parser framework in ascii-betical order.
++# func_version
++# Echo version message to standard output and exit.
++func_version ()
++{
++    $opt_debug
 +
++    $SED -n '/(C)/!b go
++	:more
++	/\./!{
++	  N
++	  s/\n# / /
++	  b more
++	}
++	:go
++	/^# '$PROGRAM' (GNU /,/# warranty; / {
++        s/^# //
++	s/^# *$//
++        s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
++        p
++     }' < "$progpath"
++     exit $?
++}
 +
- # func_fatal_help ARG...
- # ----------------------
- # Echo program name prefixed message to standard error, followed by
- # a help hint, and exit.
- func_fatal_help ()
++# func_usage
++# Echo short help message to standard output and exit.
++func_usage ()
 +{
-     $debug_cmd
++    $opt_debug
 +
-     eval \$ECHO \""Usage: $usage"\"
-     eval \$ECHO \""$fatal_help"\"
-     func_error ${1+"$@"}
-     exit $EXIT_FAILURE
++    $SED -n '/^# Usage:/,/^#  *.*--help/ {
++        s/^# //
++	s/^# *$//
++	s/\$progname/'$progname'/
++	p
++    }' < "$progpath"
++    echo
++    $ECHO "run \`$progname --help | more' for full usage"
++    exit $?
 +}
 +
- 
- # func_help
- # ---------
- # Echo long help message to standard output and exit.
++# func_help [NOEXIT]
++# Echo long help message to standard output and exit,
++# unless 'noexit' is passed as argument.
 +func_help ()
 +{
-     $debug_cmd
- 
-     func_usage_message
-     $ECHO "$long_help_message"
-     exit 0
++    $opt_debug
++
++    $SED -n '/^# Usage:/,/# Report bugs to/ {
++	:print
++        s/^# //
++	s/^# *$//
++	s*\$progname*'$progname'*
++	s*\$host*'"$host"'*
++	s*\$SHELL*'"$SHELL"'*
++	s*\$LTCC*'"$LTCC"'*
++	s*\$LTCFLAGS*'"$LTCFLAGS"'*
++	s*\$LD*'"$LD"'*
++	s/\$with_gnu_ld/'"$with_gnu_ld"'/
++	s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/
++	s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/
++	p
++	d
++     }
++     /^# .* home page:/b print
++     /^# General help using/b print
++     ' < "$progpath"
++    ret=$?
++    if test -z "$1"; then
++      exit $ret
++    fi
 +}
 +
- 
- # func_missing_arg ARGNAME
- # ------------------------
++# func_missing_arg argname
 +# Echo program name prefixed message to standard error and set global
 +# exit_cmd.
 +func_missing_arg ()
 +{
-     $debug_cmd
++    $opt_debug
 +
-     func_error "Missing argument for '$1'."
++    func_error "missing argument for $1."
 +    exit_cmd=exit
 +}
 +
 +
- # func_split_equals STRING
- # ------------------------
- # Set func_split_equals_lhs and func_split_equals_rhs shell variables after
- # splitting STRING at the '=' sign.
- test -z "$_G_HAVE_XSI_OPS" \
-     && (eval 'x=a/b/c;
-       test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \
-     && _G_HAVE_XSI_OPS=yes
- 
- if test yes = "$_G_HAVE_XSI_OPS"
- then
-   # This is an XSI compatible shell, allowing a faster implementation...
-   eval 'func_split_equals ()
-   {
-       $debug_cmd
- 
-       func_split_equals_lhs=${1%%=*}
-       func_split_equals_rhs=${1#*=}
-       test "x$func_split_equals_lhs" = "x$1" \
-         && func_split_equals_rhs=
-   }'
- else
-   # ...otherwise fall back to using expr, which is often a shell builtin.
-   func_split_equals ()
-   {
-       $debug_cmd
- 
-       func_split_equals_lhs=`expr "x$1" : 'x\([^=]*\)'`
-       func_split_equals_rhs=
-       test "x$func_split_equals_lhs" = "x$1" \
-         || func_split_equals_rhs=`expr "x$1" : 'x[^=]*=\(.*\)$'`
-   }
- fi #func_split_equals
- 
- 
- # func_split_short_opt SHORTOPT
- # -----------------------------
++# func_split_short_opt shortopt
 +# Set func_split_short_opt_name and func_split_short_opt_arg shell
 +# variables after splitting SHORTOPT after the 2nd character.
- if test yes = "$_G_HAVE_XSI_OPS"
- then
-   # This is an XSI compatible shell, allowing a faster implementation...
-   eval 'func_split_short_opt ()
-   {
-       $debug_cmd
- 
-       func_split_short_opt_arg=${1#??}
-       func_split_short_opt_name=${1%"$func_split_short_opt_arg"}
-   }'
- else
-   # ...otherwise fall back to using expr, which is often a shell builtin.
-   func_split_short_opt ()
-   {
-       $debug_cmd
- 
-       func_split_short_opt_name=`expr "x$1" : 'x-\(.\)'`
-       func_split_short_opt_arg=`expr "x$1" : 'x-.\(.*\)$'`
-   }
- fi #func_split_short_opt
- 
- 
- # func_usage
- # ----------
- # Echo short help message to standard output and exit.
- func_usage ()
++func_split_short_opt ()
 +{
-     $debug_cmd
++    my_sed_short_opt='1s/^\(..\).*$/\1/;q'
++    my_sed_short_rest='1s/^..\(.*\)$/\1/;q'
 +
-     func_usage_message
-     $ECHO "Run '$progname --help |${PAGER-more}' for full usage"
-     exit 0
- }
++    func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"`
++    func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"`
++} # func_split_short_opt may be replaced by extended shell implementation
 +
 +
- # func_usage_message
- # ------------------
- # Echo short help message to standard output.
- func_usage_message ()
++# func_split_long_opt longopt
++# Set func_split_long_opt_name and func_split_long_opt_arg shell
++# variables after splitting LONGOPT at the `=' sign.
++func_split_long_opt ()
 +{
-     $debug_cmd
++    my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q'
++    my_sed_long_arg='1s/^--[^=]*=//'
 +
-     eval \$ECHO \""Usage: $usage"\"
-     echo
-     $SED -n 's|^# ||
-         /^Written by/{
-           x;p;x
-         }
- 	h
- 	/^Written by/q' < "$progpath"
-     echo
-     eval \$ECHO \""$usage_message"\"
- }
++    func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"`
++    func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"`
++} # func_split_long_opt may be replaced by extended shell implementation
 +
++exit_cmd=:
 +
- # func_version
- # ------------
- # Echo version message to standard output and exit.
- func_version ()
- {
-     $debug_cmd
 +
-     printf '%s\n' "$progname $scriptversion"
-     $SED -n '
-         /(C)/!b go
-         :more
-         /\./!{
-           N
-           s|\n# | |
-           b more
-         }
-         :go
-         /^# Written by /,/# warranty; / {
-           s|^# ||
-           s|^# *$||
-           s|\((C)\)[ 0-9,-]*[ ,-]\([1-9][0-9]* \)|\1 \2|
-           p
-         }
-         /^# Written by / {
-           s|^# ||
-           p
-         }
-         /^warranty; /q' < "$progpath"
 +
-     exit $?
- }
 +
 +
- # Local variables:
- # mode: shell-script
- # sh-indentation: 2
- # eval: (add-hook 'before-save-hook 'time-stamp)
- # time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC"
- # time-stamp-time-zone: "UTC"
- # End:
++magic="%%%MAGIC variable%%%"
++magic_exe="%%%MAGIC EXE variable%%%"
 +
- # Set a version string.
- scriptversion='(GNU libtool) 2.4.6'
++# Global variables.
++nonopt=
++preserve_args=
++lo2o="s/\\.lo\$/.${objext}/"
++o2lo="s/\\.${objext}\$/.lo/"
++extracted_archives=
++extracted_serial=0
 +
++# If this variable is set in any of the actions, the command in it
++# will be execed at the end.  This prevents here-documents from being
++# left over by shells.
++exec_cmd=
 +
- # func_echo ARG...
- # ----------------
- # Libtool also displays the current mode in messages, so override
- # funclib.sh func_echo with this custom definition.
- func_echo ()
++# func_append var value
++# Append VALUE to the end of shell variable VAR.
++func_append ()
 +{
-     $debug_cmd
- 
-     _G_message=$*
- 
-     func_echo_IFS=$IFS
-     IFS=$nl
-     for _G_line in $_G_message; do
-       IFS=$func_echo_IFS
-       $ECHO "$progname${opt_mode+: $opt_mode}: $_G_line"
-     done
-     IFS=$func_echo_IFS
- }
- 
++    eval "${1}=\$${1}\${2}"
++} # func_append may be replaced by extended shell implementation
 +
- # func_warning ARG...
- # -------------------
- # Libtool warnings are not categorized, so override funclib.sh
- # func_warning with this simpler definition.
- func_warning ()
++# func_append_quoted var value
++# Quote VALUE and append to the end of shell variable VAR, separated
++# by a space.
++func_append_quoted ()
 +{
-     $debug_cmd
- 
-     $warning_func ${1+"$@"}
- }
- 
++    func_quote_for_eval "${2}"
++    eval "${1}=\$${1}\\ \$func_quote_for_eval_result"
++} # func_append_quoted may be replaced by extended shell implementation
 +
- ## ---------------- ##
- ## Options parsing. ##
- ## ---------------- ##
- 
- # Hook in the functions to make sure our own options are parsed during
- # the option parsing loop.
- 
- usage='$progpath [OPTION]... [MODE-ARG]...'
- 
- # Short help message in response to '-h'.
- usage_message="Options:
-        --config             show all configuration variables
-        --debug              enable verbose shell tracing
-    -n, --dry-run            display commands without modifying any files
-        --features           display basic configuration information and exit
-        --mode=MODE          use operation mode MODE
-        --no-warnings        equivalent to '-Wnone'
-        --preserve-dup-deps  don't remove duplicate dependency libraries
-        --quiet, --silent    don't print informational messages
-        --tag=TAG            use configuration variables from tag TAG
-    -v, --verbose            print more informational messages than default
-        --version            print version information
-    -W, --warnings=CATEGORY  report the warnings falling in CATEGORY [all]
-    -h, --help, --help-all   print short, long, or detailed help message
- "
 +
- # Additional text appended to 'usage_message' in response to '--help'.
- func_help ()
++# func_arith arithmetic-term...
++func_arith ()
 +{
-     $debug_cmd
- 
-     func_usage_message
-     $ECHO "$long_help_message
- 
- MODE must be one of the following:
- 
-        clean           remove files from the build directory
-        compile         compile a source file into a libtool object
-        execute         automatically set library path, then run a program
-        finish          complete the installation of libtool libraries
-        install         install libraries or executables
-        link            create a library or an executable
-        uninstall       remove libraries from an installed directory
- 
- MODE-ARGS vary depending on the MODE.  When passed as first option,
- '--mode=MODE' may be abbreviated as 'MODE' or a unique abbreviation of that.
- Try '$progname --help --mode=MODE' for a more detailed description of MODE.
- 
- When reporting a bug, please describe a test case to reproduce it and
- include the following information:
- 
-        host-triplet:   $host
-        shell:          $SHELL
-        compiler:       $LTCC
-        compiler flags: $LTCFLAGS
-        linker:         $LD (gnu? $with_gnu_ld)
-        version:        $progname (GNU libtool) 2.4.6
-        automake:       `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
-        autoconf:       `($AUTOCONF --version) 2>/dev/null |$SED 1q`
- 
- Report bugs to <bug-libtool at gnu.org>.
- GNU libtool home page: <http://www.gnu.org/software/libtool/>.
- General help using GNU software: <http://www.gnu.org/gethelp/>."
-     exit 0
- }
++    func_arith_result=`expr "${@}"`
++} # func_arith may be replaced by extended shell implementation
 +
 +
- # func_lo2o OBJECT-NAME
- # ---------------------
- # Transform OBJECT-NAME from a '.lo' suffix to the platform specific
- # object suffix.
++# func_len string
++# STRING may not start with a hyphen.
++func_len ()
++{
++    func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len`
++} # func_len may be replaced by extended shell implementation
 +
- lo2o=s/\\.lo\$/.$objext/
- o2lo=s/\\.$objext\$/.lo/
 +
- if test yes = "$_G_HAVE_XSI_OPS"; then
-   eval 'func_lo2o ()
-   {
-     case $1 in
-       *.lo) func_lo2o_result=${1%.lo}.$objext ;;
-       *   ) func_lo2o_result=$1               ;;
-     esac
-   }'
++# func_lo2o object
++func_lo2o ()
++{
++    func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
++} # func_lo2o may be replaced by extended shell implementation
 +
-   # func_xform LIBOBJ-OR-SOURCE
-   # ---------------------------
-   # Transform LIBOBJ-OR-SOURCE from a '.o' or '.c' (or otherwise)
-   # suffix to a '.lo' libtool-object suffix.
-   eval 'func_xform ()
-   {
-     func_xform_result=${1%.*}.lo
-   }'
- else
-   # ...otherwise fall back to using sed.
-   func_lo2o ()
-   {
-     func_lo2o_result=`$ECHO "$1" | $SED "$lo2o"`
-   }
 +
-   func_xform ()
-   {
-     func_xform_result=`$ECHO "$1" | $SED 's|\.[^.]*$|.lo|'`
-   }
- fi
++# func_xform libobj-or-source
++func_xform ()
++{
++    func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
++} # func_xform may be replaced by extended shell implementation
 +
 +
- # func_fatal_configuration ARG...
- # -------------------------------
++# func_fatal_configuration arg...
 +# Echo program name prefixed message to standard error, followed by
 +# a configuration failure hint, and exit.
 +func_fatal_configuration ()
 +{
-     func__fatal_error ${1+"$@"} \
-       "See the $PACKAGE documentation for more information." \
-       "Fatal configuration error."
++    func_error ${1+"$@"}
++    func_error "See the $PACKAGE documentation for more information."
++    func_fatal_error "Fatal configuration error."
 +}
 +
 +
 +# func_config
- # -----------
 +# Display the configuration for all the tags in this script.
 +func_config ()
 +{
 +    re_begincf='^# ### BEGIN LIBTOOL'
 +    re_endcf='^# ### END LIBTOOL'
 +
 +    # Default configuration.
 +    $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" < "$progpath"
 +
 +    # Now print the configurations for the tags.
 +    for tagname in $taglist; do
 +      $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$progpath"
 +    done
 +
 +    exit $?
 +}
 +
- 
 +# func_features
- # -------------
 +# Display the features supported by this script.
 +func_features ()
 +{
 +    echo "host: $host"
-     if test yes = "$build_libtool_libs"; then
++    if test "$build_libtool_libs" = yes; then
 +      echo "enable shared libraries"
 +    else
 +      echo "disable shared libraries"
 +    fi
-     if test yes = "$build_old_libs"; then
++    if test "$build_old_libs" = yes; then
 +      echo "enable static libraries"
 +    else
 +      echo "disable static libraries"
 +    fi
 +
 +    exit $?
 +}
 +
- 
- # func_enable_tag TAGNAME
- # -----------------------
++# func_enable_tag tagname
 +# Verify that TAGNAME is valid, and either flag an error and exit, or
 +# enable the TAGNAME tag.  We also add TAGNAME to the global $taglist
 +# variable here.
 +func_enable_tag ()
 +{
-     # Global variable:
-     tagname=$1
++  # Global variable:
++  tagname="$1"
 +
-     re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$"
-     re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$"
-     sed_extractcf=/$re_begincf/,/$re_endcf/p
++  re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$"
++  re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$"
++  sed_extractcf="/$re_begincf/,/$re_endcf/p"
 +
-     # Validate tagname.
-     case $tagname in
-       *[!-_A-Za-z0-9,/]*)
-         func_fatal_error "invalid tag name: $tagname"
-         ;;
-     esac
++  # Validate tagname.
++  case $tagname in
++    *[!-_A-Za-z0-9,/]*)
++      func_fatal_error "invalid tag name: $tagname"
++      ;;
++  esac
 +
-     # Don't test for the "default" C tag, as we know it's
-     # there but not specially marked.
-     case $tagname in
-         CC) ;;
++  # Don't test for the "default" C tag, as we know it's
++  # there but not specially marked.
++  case $tagname in
++    CC) ;;
 +    *)
-         if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then
- 	  taglist="$taglist $tagname"
- 
- 	  # Evaluate the configuration.  Be careful to quote the path
- 	  # and the sed script, to avoid splitting on whitespace, but
- 	  # also don't use non-portable quotes within backquotes within
- 	  # quotes we have to do it in 2 steps:
- 	  extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"`
- 	  eval "$extractedcf"
-         else
- 	  func_error "ignoring unknown tag $tagname"
-         fi
-         ;;
-     esac
++      if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then
++	taglist="$taglist $tagname"
++
++	# Evaluate the configuration.  Be careful to quote the path
++	# and the sed script, to avoid splitting on whitespace, but
++	# also don't use non-portable quotes within backquotes within
++	# quotes we have to do it in 2 steps:
++	extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"`
++	eval "$extractedcf"
++      else
++	func_error "ignoring unknown tag $tagname"
++      fi
++      ;;
++  esac
 +}
 +
- 
 +# func_check_version_match
- # ------------------------
 +# Ensure that we are using m4 macros, and libtool script from the same
 +# release of libtool.
 +func_check_version_match ()
 +{
-     if test "$package_revision" != "$macro_revision"; then
-       if test "$VERSION" != "$macro_version"; then
-         if test -z "$macro_version"; then
-           cat >&2 <<_LT_EOF
++  if test "$package_revision" != "$macro_revision"; then
++    if test "$VERSION" != "$macro_version"; then
++      if test -z "$macro_version"; then
++        cat >&2 <<_LT_EOF
 +$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
 +$progname: definition of this LT_INIT comes from an older release.
 +$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
 +$progname: and run autoconf again.
 +_LT_EOF
-         else
-           cat >&2 <<_LT_EOF
++      else
++        cat >&2 <<_LT_EOF
 +$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
 +$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
 +$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
 +$progname: and run autoconf again.
 +_LT_EOF
-         fi
-       else
-         cat >&2 <<_LT_EOF
++      fi
++    else
++      cat >&2 <<_LT_EOF
 +$progname: Version mismatch error.  This is $PACKAGE $VERSION, revision $package_revision,
 +$progname: but the definition of this LT_INIT comes from revision $macro_revision.
 +$progname: You should recreate aclocal.m4 with macros from revision $package_revision
 +$progname: of $PACKAGE $VERSION and run autoconf again.
 +_LT_EOF
-       fi
- 
-       exit $EXIT_MISMATCH
 +    fi
- }
 +
++    exit $EXIT_MISMATCH
++  fi
++}
 +
- # libtool_options_prep [ARG]...
- # -----------------------------
- # Preparation for options parsed by libtool.
- libtool_options_prep ()
- {
-     $debug_mode
 +
-     # Option defaults:
-     opt_config=false
-     opt_dlopen=
-     opt_dry_run=false
-     opt_help=false
-     opt_mode=
-     opt_preserve_dup_deps=false
-     opt_quiet=false
++# Shorthand for --mode=foo, only valid as the first argument
++case $1 in
++clean|clea|cle|cl)
++  shift; set dummy --mode clean ${1+"$@"}; shift
++  ;;
++compile|compil|compi|comp|com|co|c)
++  shift; set dummy --mode compile ${1+"$@"}; shift
++  ;;
++execute|execut|execu|exec|exe|ex|e)
++  shift; set dummy --mode execute ${1+"$@"}; shift
++  ;;
++finish|finis|fini|fin|fi|f)
++  shift; set dummy --mode finish ${1+"$@"}; shift
++  ;;
++install|instal|insta|inst|ins|in|i)
++  shift; set dummy --mode install ${1+"$@"}; shift
++  ;;
++link|lin|li|l)
++  shift; set dummy --mode link ${1+"$@"}; shift
++  ;;
++uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
++  shift; set dummy --mode uninstall ${1+"$@"}; shift
++  ;;
++esac
 +
-     nonopt=
-     preserve_args=
 +
-     # Shorthand for --mode=foo, only valid as the first argument
-     case $1 in
-     clean|clea|cle|cl)
-       shift; set dummy --mode clean ${1+"$@"}; shift
-       ;;
-     compile|compil|compi|comp|com|co|c)
-       shift; set dummy --mode compile ${1+"$@"}; shift
-       ;;
-     execute|execut|execu|exec|exe|ex|e)
-       shift; set dummy --mode execute ${1+"$@"}; shift
-       ;;
-     finish|finis|fini|fin|fi|f)
-       shift; set dummy --mode finish ${1+"$@"}; shift
-       ;;
-     install|instal|insta|inst|ins|in|i)
-       shift; set dummy --mode install ${1+"$@"}; shift
-       ;;
-     link|lin|li|l)
-       shift; set dummy --mode link ${1+"$@"}; shift
-       ;;
-     uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
-       shift; set dummy --mode uninstall ${1+"$@"}; shift
-       ;;
-     esac
 +
-     # Pass back the list of options.
-     func_quote_for_eval ${1+"$@"}
-     libtool_options_prep_result=$func_quote_for_eval_result
- }
- func_add_hook func_options_prep libtool_options_prep
++# Option defaults:
++opt_debug=:
++opt_dry_run=false
++opt_config=false
++opt_preserve_dup_deps=false
++opt_features=false
++opt_finish=false
++opt_help=false
++opt_help_all=false
++opt_silent=:
++opt_warning=:
++opt_verbose=:
++opt_silent=false
++opt_verbose=false
 +
 +
- # libtool_parse_options [ARG]...
- # ---------------------------------
- # Provide handling for libtool specific options.
- libtool_parse_options ()
++# Parse options once, thoroughly.  This comes as soon as possible in the
++# script to make things like `--version' happen as quickly as we can.
 +{
-     $debug_cmd
++  # this just eases exit handling
++  while test $# -gt 0; do
++    opt="$1"
++    shift
++    case $opt in
++      --debug|-x)	opt_debug='set -x'
++			func_echo "enabling shell trace mode"
++			$opt_debug
++			;;
++      --dry-run|--dryrun|-n)
++			opt_dry_run=:
++			;;
++      --config)
++			opt_config=:
++func_config
++			;;
++      --dlopen|-dlopen)
++			optarg="$1"
++			opt_dlopen="${opt_dlopen+$opt_dlopen
++}$optarg"
++			shift
++			;;
++      --preserve-dup-deps)
++			opt_preserve_dup_deps=:
++			;;
++      --features)
++			opt_features=:
++func_features
++			;;
++      --finish)
++			opt_finish=:
++set dummy --mode finish ${1+"$@"}; shift
++			;;
++      --help)
++			opt_help=:
++			;;
++      --help-all)
++			opt_help_all=:
++opt_help=': help-all'
++			;;
++      --mode)
++			test $# = 0 && func_missing_arg $opt && break
++			optarg="$1"
++			opt_mode="$optarg"
++case $optarg in
++  # Valid mode arguments:
++  clean|compile|execute|finish|install|link|relink|uninstall) ;;
++
++  # Catch anything else as an error
++  *) func_error "invalid argument for $opt"
++     exit_cmd=exit
++     break
++     ;;
++esac
++			shift
++			;;
++      --no-silent|--no-quiet)
++			opt_silent=false
++func_append preserve_args " $opt"
++			;;
++      --no-warning|--no-warn)
++			opt_warning=false
++func_append preserve_args " $opt"
++			;;
++      --no-verbose)
++			opt_verbose=false
++func_append preserve_args " $opt"
++			;;
++      --silent|--quiet)
++			opt_silent=:
++func_append preserve_args " $opt"
++        opt_verbose=false
++			;;
++      --verbose|-v)
++			opt_verbose=:
++func_append preserve_args " $opt"
++opt_silent=false
++			;;
++      --tag)
++			test $# = 0 && func_missing_arg $opt && break
++			optarg="$1"
++			opt_tag="$optarg"
++func_append preserve_args " $opt $optarg"
++func_enable_tag "$optarg"
++			shift
++			;;
++
++      -\?|-h)		func_usage				;;
++      --help)		func_help				;;
++      --version)	func_version				;;
++
++      # Separate optargs to long options:
++      --*=*)
++			func_split_long_opt "$opt"
++			set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"}
++			shift
++			;;
++
++      # Separate non-argument short options:
++      -\?*|-h*|-n*|-v*)
++			func_split_short_opt "$opt"
++			set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"}
++			shift
++			;;
++
++      --)		break					;;
++      -*)		func_fatal_help "unrecognized option \`$opt'" ;;
++      *)		set dummy "$opt" ${1+"$@"};	shift; break  ;;
++    esac
++  done
 +
-     # Perform our own loop to consume as many options as possible in
-     # each iteration.
-     while test $# -gt 0; do
-       _G_opt=$1
-       shift
-       case $_G_opt in
-         --dry-run|--dryrun|-n)
-                         opt_dry_run=:
-                         ;;
- 
-         --config)       func_config ;;
- 
-         --dlopen|-dlopen)
-                         opt_dlopen="${opt_dlopen+$opt_dlopen
- }$1"
-                         shift
-                         ;;
- 
-         --preserve-dup-deps)
-                         opt_preserve_dup_deps=: ;;
- 
-         --features)     func_features ;;
- 
-         --finish)       set dummy --mode finish ${1+"$@"}; shift ;;
- 
-         --help)         opt_help=: ;;
- 
-         --help-all)     opt_help=': help-all' ;;
- 
-         --mode)         test $# = 0 && func_missing_arg $_G_opt && break
-                         opt_mode=$1
-                         case $1 in
-                           # Valid mode arguments:
-                           clean|compile|execute|finish|install|link|relink|uninstall) ;;
- 
-                           # Catch anything else as an error
-                           *) func_error "invalid argument for $_G_opt"
-                              exit_cmd=exit
-                              break
-                              ;;
-                         esac
-                         shift
-                         ;;
- 
-         --no-silent|--no-quiet)
-                         opt_quiet=false
-                         func_append preserve_args " $_G_opt"
-                         ;;
- 
-         --no-warnings|--no-warning|--no-warn)
-                         opt_warning=false
-                         func_append preserve_args " $_G_opt"
-                         ;;
- 
-         --no-verbose)
-                         opt_verbose=false
-                         func_append preserve_args " $_G_opt"
-                         ;;
- 
-         --silent|--quiet)
-                         opt_quiet=:
-                         opt_verbose=false
-                         func_append preserve_args " $_G_opt"
-                         ;;
- 
-         --tag)          test $# = 0 && func_missing_arg $_G_opt && break
-                         opt_tag=$1
-                         func_append preserve_args " $_G_opt $1"
-                         func_enable_tag "$1"
-                         shift
-                         ;;
- 
-         --verbose|-v)   opt_quiet=false
-                         opt_verbose=:
-                         func_append preserve_args " $_G_opt"
-                         ;;
- 
- 	# An option not handled by this hook function:
-         *)		set dummy "$_G_opt" ${1+"$@"};	shift; break  ;;
-       esac
-     done
++  # Validate options:
 +
++  # save first non-option argument
++  if test "$#" -gt 0; then
++    nonopt="$opt"
++    shift
++  fi
 +
-     # save modified positional parameters for caller
-     func_quote_for_eval ${1+"$@"}
-     libtool_parse_options_result=$func_quote_for_eval_result
- }
- func_add_hook func_parse_options libtool_parse_options
++  # preserve --debug
++  test "$opt_debug" = : || func_append preserve_args " --debug"
 +
++  case $host in
++    *cygwin* | *mingw* | *pw32* | *cegcc*)
++      # don't eliminate duplications in $postdeps and $predeps
++      opt_duplicate_compiler_generated_deps=:
++      ;;
++    *)
++      opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
++      ;;
++  esac
 +
++  $opt_help || {
++    # Sanity checks first:
++    func_check_version_match
 +
- # libtool_validate_options [ARG]...
- # ---------------------------------
- # Perform any sanity checks on option settings and/or unconsumed
- # arguments.
- libtool_validate_options ()
- {
-     # save first non-option argument
-     if test 0 -lt $#; then
-       nonopt=$1
-       shift
++    if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
++      func_fatal_configuration "not configured to build any kind of library"
 +    fi
 +
-     # preserve --debug
-     test : = "$debug_cmd" || func_append preserve_args " --debug"
- 
-     case $host in
-       # Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452
-       # see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788
-       *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*)
-         # don't eliminate duplications in $postdeps and $predeps
-         opt_duplicate_compiler_generated_deps=:
-         ;;
-       *)
-         opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
-         ;;
-     esac
- 
-     $opt_help || {
-       # Sanity checks first:
-       func_check_version_match
- 
-       test yes != "$build_libtool_libs" \
-         && test yes != "$build_old_libs" \
-         && func_fatal_configuration "not configured to build any kind of library"
++    # Darwin sucks
++    eval std_shrext=\"$shrext_cmds\"
 +
-       # Darwin sucks
-       eval std_shrext=\"$shrext_cmds\"
++    # Only execute mode is allowed to have -dlopen flags.
++    if test -n "$opt_dlopen" && test "$opt_mode" != execute; then
++      func_error "unrecognized option \`-dlopen'"
++      $ECHO "$help" 1>&2
++      exit $EXIT_FAILURE
++    fi
 +
-       # Only execute mode is allowed to have -dlopen flags.
-       if test -n "$opt_dlopen" && test execute != "$opt_mode"; then
-         func_error "unrecognized option '-dlopen'"
-         $ECHO "$help" 1>&2
-         exit $EXIT_FAILURE
-       fi
++    # Change the help message to a mode-specific one.
++    generic_help="$help"
++    help="Try \`$progname --help --mode=$opt_mode' for more information."
++  }
 +
-       # Change the help message to a mode-specific one.
-       generic_help=$help
-       help="Try '$progname --help --mode=$opt_mode' for more information."
-     }
 +
-     # Pass back the unparsed argument list
-     func_quote_for_eval ${1+"$@"}
-     libtool_validate_options_result=$func_quote_for_eval_result
++  # Bail if the options were screwed
++  $exit_cmd $EXIT_FAILURE
 +}
- func_add_hook func_validate_options libtool_validate_options
 +
 +
- # Process options as early as possible so that --help and --version
- # can return quickly.
- func_options ${1+"$@"}
- eval set dummy "$func_options_result"; shift
- 
 +
 +
 +## ----------- ##
 +##    Main.    ##
 +## ----------- ##
 +
- magic='%%%MAGIC variable%%%'
- magic_exe='%%%MAGIC EXE variable%%%'
- 
- # Global variables.
- extracted_archives=
- extracted_serial=0
- 
- # If this variable is set in any of the actions, the command in it
- # will be execed at the end.  This prevents here-documents from being
- # left over by shells.
- exec_cmd=
- 
- 
- # A function that is used when there is no print builtin or printf.
- func_fallback_echo ()
- {
-   eval 'cat <<_LTECHO_EOF
- $1
- _LTECHO_EOF'
- }
- 
- # func_generated_by_libtool
- # True iff stdin has been generated by Libtool. This function is only
- # a basic sanity check; it will hardly flush out determined imposters.
- func_generated_by_libtool_p ()
- {
-   $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
- }
- 
 +# func_lalib_p file
- # True iff FILE is a libtool '.la' library or '.lo' object file.
++# True iff FILE is a libtool `.la' library or `.lo' object file.
 +# This function is only a basic sanity check; it will hardly flush out
 +# determined imposters.
 +func_lalib_p ()
 +{
 +    test -f "$1" &&
-       $SED -e 4q "$1" 2>/dev/null | func_generated_by_libtool_p
++      $SED -e 4q "$1" 2>/dev/null \
++        | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
 +}
 +
 +# func_lalib_unsafe_p file
- # True iff FILE is a libtool '.la' library or '.lo' object file.
++# True iff FILE is a libtool `.la' library or `.lo' object file.
 +# This function implements the same check as func_lalib_p without
 +# resorting to external programs.  To this end, it redirects stdin and
 +# closes it afterwards, without saving the original file descriptor.
 +# As a safety measure, use it only where a negative result would be
- # fatal anyway.  Works if 'file' does not exist.
++# fatal anyway.  Works if `file' does not exist.
 +func_lalib_unsafe_p ()
 +{
 +    lalib_p=no
 +    if test -f "$1" && test -r "$1" && exec 5<&0 <"$1"; then
 +	for lalib_p_l in 1 2 3 4
 +	do
 +	    read lalib_p_line
- 	    case $lalib_p_line in
++	    case "$lalib_p_line" in
 +		\#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;;
 +	    esac
 +	done
 +	exec 0<&5 5<&-
 +    fi
-     test yes = "$lalib_p"
++    test "$lalib_p" = yes
 +}
 +
 +# func_ltwrapper_script_p file
 +# True iff FILE is a libtool wrapper script
 +# This function is only a basic sanity check; it will hardly flush out
 +# determined imposters.
 +func_ltwrapper_script_p ()
 +{
-     test -f "$1" &&
-       $lt_truncate_bin < "$1" 2>/dev/null | func_generated_by_libtool_p
++    func_lalib_p "$1"
 +}
 +
 +# func_ltwrapper_executable_p file
 +# True iff FILE is a libtool wrapper executable
 +# This function is only a basic sanity check; it will hardly flush out
 +# determined imposters.
 +func_ltwrapper_executable_p ()
 +{
 +    func_ltwrapper_exec_suffix=
 +    case $1 in
 +    *.exe) ;;
 +    *) func_ltwrapper_exec_suffix=.exe ;;
 +    esac
 +    $GREP "$magic_exe" "$1$func_ltwrapper_exec_suffix" >/dev/null 2>&1
 +}
 +
 +# func_ltwrapper_scriptname file
 +# Assumes file is an ltwrapper_executable
 +# uses $file to determine the appropriate filename for a
 +# temporary ltwrapper_script.
 +func_ltwrapper_scriptname ()
 +{
 +    func_dirname_and_basename "$1" "" "."
 +    func_stripname '' '.exe' "$func_basename_result"
-     func_ltwrapper_scriptname_result=$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper
++    func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
 +}
 +
 +# func_ltwrapper_p file
 +# True iff FILE is a libtool wrapper script or wrapper executable
 +# This function is only a basic sanity check; it will hardly flush out
 +# determined imposters.
 +func_ltwrapper_p ()
 +{
 +    func_ltwrapper_script_p "$1" || func_ltwrapper_executable_p "$1"
 +}
 +
 +
 +# func_execute_cmds commands fail_cmd
 +# Execute tilde-delimited COMMANDS.
 +# If FAIL_CMD is given, eval that upon failure.
 +# FAIL_CMD may read-access the current command in variable CMD!
 +func_execute_cmds ()
 +{
-     $debug_cmd
- 
++    $opt_debug
 +    save_ifs=$IFS; IFS='~'
 +    for cmd in $1; do
-       IFS=$sp$nl
-       eval cmd=\"$cmd\"
 +      IFS=$save_ifs
++      eval cmd=\"$cmd\"
 +      func_show_eval "$cmd" "${2-:}"
 +    done
 +    IFS=$save_ifs
 +}
 +
 +
 +# func_source file
 +# Source FILE, adding directory component if necessary.
 +# Note that it is not necessary on cygwin/mingw to append a dot to
 +# FILE even if both FILE and FILE.exe exist: automatic-append-.exe
 +# behavior happens only for exec(3), not for open(2)!  Also, sourcing
- # 'FILE.' does not work on cygwin managed mounts.
++# `FILE.' does not work on cygwin managed mounts.
 +func_source ()
 +{
-     $debug_cmd
- 
++    $opt_debug
 +    case $1 in
 +    */* | *\\*)	. "$1" ;;
 +    *)		. "./$1" ;;
 +    esac
 +}
 +
 +
 +# func_resolve_sysroot PATH
 +# Replace a leading = in PATH with a sysroot.  Store the result into
 +# func_resolve_sysroot_result
 +func_resolve_sysroot ()
 +{
 +  func_resolve_sysroot_result=$1
 +  case $func_resolve_sysroot_result in
 +  =*)
 +    func_stripname '=' '' "$func_resolve_sysroot_result"
 +    func_resolve_sysroot_result=$lt_sysroot$func_stripname_result
 +    ;;
 +  esac
 +}
 +
 +# func_replace_sysroot PATH
 +# If PATH begins with the sysroot, replace it with = and
 +# store the result into func_replace_sysroot_result.
 +func_replace_sysroot ()
 +{
-   case $lt_sysroot:$1 in
++  case "$lt_sysroot:$1" in
 +  ?*:"$lt_sysroot"*)
 +    func_stripname "$lt_sysroot" '' "$1"
-     func_replace_sysroot_result='='$func_stripname_result
++    func_replace_sysroot_result="=$func_stripname_result"
 +    ;;
 +  *)
 +    # Including no sysroot.
 +    func_replace_sysroot_result=$1
 +    ;;
 +  esac
 +}
 +
 +# func_infer_tag arg
 +# Infer tagged configuration to use if any are available and
 +# if one wasn't chosen via the "--tag" command line option.
 +# Only attempt this if the compiler in the base compile
 +# command doesn't match the default compiler.
 +# arg is usually of the form 'gcc ...'
 +func_infer_tag ()
 +{
-     $debug_cmd
- 
++    $opt_debug
 +    if test -n "$available_tags" && test -z "$tagname"; then
 +      CC_quoted=
 +      for arg in $CC; do
 +	func_append_quoted CC_quoted "$arg"
 +      done
 +      CC_expanded=`func_echo_all $CC`
 +      CC_quoted_expanded=`func_echo_all $CC_quoted`
 +      case $@ in
 +      # Blanks in the command may have been stripped by the calling shell,
 +      # but not from the CC environment variable when configure was run.
 +      " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
 +      " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;;
 +      # Blanks at the start of $base_compile will cause this to fail
 +      # if we don't check for them as well.
 +      *)
 +	for z in $available_tags; do
 +	  if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
 +	    # Evaluate the configuration.
- 	    eval "`$SED -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
++	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
 +	    CC_quoted=
 +	    for arg in $CC; do
 +	      # Double-quote args containing other shell metacharacters.
 +	      func_append_quoted CC_quoted "$arg"
 +	    done
 +	    CC_expanded=`func_echo_all $CC`
 +	    CC_quoted_expanded=`func_echo_all $CC_quoted`
 +	    case "$@ " in
 +	    " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
 +	    " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*)
 +	      # The compiler in the base compile command matches
 +	      # the one in the tagged configuration.
 +	      # Assume this is the tagged configuration we want.
 +	      tagname=$z
 +	      break
 +	      ;;
 +	    esac
 +	  fi
 +	done
 +	# If $tagname still isn't set, then no tagged configuration
 +	# was found and let the user know that the "--tag" command
 +	# line option must be used.
 +	if test -z "$tagname"; then
 +	  func_echo "unable to infer tagged configuration"
- 	  func_fatal_error "specify a tag with '--tag'"
++	  func_fatal_error "specify a tag with \`--tag'"
 +#	else
 +#	  func_verbose "using $tagname tagged configuration"
 +	fi
 +	;;
 +      esac
 +    fi
 +}
 +
 +
 +
 +# func_write_libtool_object output_name pic_name nonpic_name
 +# Create a libtool object file (analogous to a ".la" file),
 +# but don't create it if we're doing a dry run.
 +func_write_libtool_object ()
 +{
-     write_libobj=$1
-     if test yes = "$build_libtool_libs"; then
-       write_lobj=\'$2\'
++    write_libobj=${1}
++    if test "$build_libtool_libs" = yes; then
++      write_lobj=\'${2}\'
 +    else
 +      write_lobj=none
 +    fi
 +
-     if test yes = "$build_old_libs"; then
-       write_oldobj=\'$3\'
++    if test "$build_old_libs" = yes; then
++      write_oldobj=\'${3}\'
 +    else
 +      write_oldobj=none
 +    fi
 +
 +    $opt_dry_run || {
 +      cat >${write_libobj}T <<EOF
 +# $write_libobj - a libtool object file
- # Generated by $PROGRAM (GNU $PACKAGE) $VERSION
++# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
 +#
 +# Please DO NOT delete this file!
 +# It is necessary for linking the library.
 +
 +# Name of the PIC object.
 +pic_object=$write_lobj
 +
 +# Name of the non-PIC object
 +non_pic_object=$write_oldobj
 +
 +EOF
-       $MV "${write_libobj}T" "$write_libobj"
++      $MV "${write_libobj}T" "${write_libobj}"
 +    }
 +}
 +
 +
 +##################################################
 +# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS #
 +##################################################
 +
 +# func_convert_core_file_wine_to_w32 ARG
 +# Helper function used by file name conversion functions when $build is *nix,
 +# and $host is mingw, cygwin, or some other w32 environment. Relies on a
 +# correctly configured wine environment available, with the winepath program
 +# in $build's $PATH.
 +#
 +# ARG is the $build file name to be converted to w32 format.
 +# Result is available in $func_convert_core_file_wine_to_w32_result, and will
 +# be empty on error (or when ARG is empty)
 +func_convert_core_file_wine_to_w32 ()
 +{
-   $debug_cmd
- 
-   func_convert_core_file_wine_to_w32_result=$1
++  $opt_debug
++  func_convert_core_file_wine_to_w32_result="$1"
 +  if test -n "$1"; then
 +    # Unfortunately, winepath does not exit with a non-zero error code, so we
 +    # are forced to check the contents of stdout. On the other hand, if the
 +    # command is not found, the shell will set an exit code of 127 and print
 +    # *an error message* to stdout. So we must check for both error code of
 +    # zero AND non-empty stdout, which explains the odd construction:
 +    func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null`
-     if test "$?" -eq 0 && test -n "$func_convert_core_file_wine_to_w32_tmp"; then
++    if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then
 +      func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |
-         $SED -e "$sed_naive_backslashify"`
++        $SED -e "$lt_sed_naive_backslashify"`
 +    else
 +      func_convert_core_file_wine_to_w32_result=
 +    fi
 +  fi
 +}
 +# end: func_convert_core_file_wine_to_w32
 +
 +
 +# func_convert_core_path_wine_to_w32 ARG
 +# Helper function used by path conversion functions when $build is *nix, and
 +# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly
 +# configured wine environment available, with the winepath program in $build's
 +# $PATH. Assumes ARG has no leading or trailing path separator characters.
 +#
 +# ARG is path to be converted from $build format to win32.
 +# Result is available in $func_convert_core_path_wine_to_w32_result.
 +# Unconvertible file (directory) names in ARG are skipped; if no directory names
 +# are convertible, then the result may be empty.
 +func_convert_core_path_wine_to_w32 ()
 +{
-   $debug_cmd
- 
++  $opt_debug
 +  # unfortunately, winepath doesn't convert paths, only file names
-   func_convert_core_path_wine_to_w32_result=
++  func_convert_core_path_wine_to_w32_result=""
 +  if test -n "$1"; then
 +    oldIFS=$IFS
 +    IFS=:
 +    for func_convert_core_path_wine_to_w32_f in $1; do
 +      IFS=$oldIFS
 +      func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f"
-       if test -n "$func_convert_core_file_wine_to_w32_result"; then
++      if test -n "$func_convert_core_file_wine_to_w32_result" ; then
 +        if test -z "$func_convert_core_path_wine_to_w32_result"; then
-           func_convert_core_path_wine_to_w32_result=$func_convert_core_file_wine_to_w32_result
++          func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result"
 +        else
 +          func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result"
 +        fi
 +      fi
 +    done
 +    IFS=$oldIFS
 +  fi
 +}
 +# end: func_convert_core_path_wine_to_w32
 +
 +
 +# func_cygpath ARGS...
 +# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when
 +# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2)
 +# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or
 +# (2), returns the Cygwin file name or path in func_cygpath_result (input
 +# file name or path is assumed to be in w32 format, as previously converted
 +# from $build's *nix or MSYS format). In case (3), returns the w32 file name
 +# or path in func_cygpath_result (input file name or path is assumed to be in
 +# Cygwin format). Returns an empty string on error.
 +#
 +# ARGS are passed to cygpath, with the last one being the file name or path to
 +# be converted.
 +#
 +# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH
 +# environment variable; do not put it in $PATH.
 +func_cygpath ()
 +{
-   $debug_cmd
- 
++  $opt_debug
 +  if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then
 +    func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`
 +    if test "$?" -ne 0; then
 +      # on failure, ensure result is empty
 +      func_cygpath_result=
 +    fi
 +  else
 +    func_cygpath_result=
-     func_error "LT_CYGPATH is empty or specifies non-existent file: '$LT_CYGPATH'"
++    func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'"
 +  fi
 +}
 +#end: func_cygpath
 +
 +
 +# func_convert_core_msys_to_w32 ARG
 +# Convert file name or path ARG from MSYS format to w32 format.  Return
 +# result in func_convert_core_msys_to_w32_result.
 +func_convert_core_msys_to_w32 ()
 +{
-   $debug_cmd
- 
++  $opt_debug
 +  # awkward: cmd appends spaces to result
 +  func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |
-     $SED -e 's/[ ]*$//' -e "$sed_naive_backslashify"`
++    $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
 +}
 +#end: func_convert_core_msys_to_w32
 +
 +
 +# func_convert_file_check ARG1 ARG2
 +# Verify that ARG1 (a file name in $build format) was converted to $host
 +# format in ARG2. Otherwise, emit an error message, but continue (resetting
 +# func_to_host_file_result to ARG1).
 +func_convert_file_check ()
 +{
-   $debug_cmd
- 
-   if test -z "$2" && test -n "$1"; then
++  $opt_debug
++  if test -z "$2" && test -n "$1" ; then
 +    func_error "Could not determine host file name corresponding to"
-     func_error "  '$1'"
++    func_error "  \`$1'"
 +    func_error "Continuing, but uninstalled executables may not work."
 +    # Fallback:
-     func_to_host_file_result=$1
++    func_to_host_file_result="$1"
 +  fi
 +}
 +# end func_convert_file_check
 +
 +
 +# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH
 +# Verify that FROM_PATH (a path in $build format) was converted to $host
 +# format in TO_PATH. Otherwise, emit an error message, but continue, resetting
 +# func_to_host_file_result to a simplistic fallback value (see below).
 +func_convert_path_check ()
 +{
-   $debug_cmd
- 
++  $opt_debug
 +  if test -z "$4" && test -n "$3"; then
 +    func_error "Could not determine the host path corresponding to"
-     func_error "  '$3'"
++    func_error "  \`$3'"
 +    func_error "Continuing, but uninstalled executables may not work."
 +    # Fallback.  This is a deliberately simplistic "conversion" and
 +    # should not be "improved".  See libtool.info.
 +    if test "x$1" != "x$2"; then
 +      lt_replace_pathsep_chars="s|$1|$2|g"
 +      func_to_host_path_result=`echo "$3" |
 +        $SED -e "$lt_replace_pathsep_chars"`
 +    else
-       func_to_host_path_result=$3
++      func_to_host_path_result="$3"
 +    fi
 +  fi
 +}
 +# end func_convert_path_check
 +
 +
 +# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG
 +# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT
 +# and appending REPL if ORIG matches BACKPAT.
 +func_convert_path_front_back_pathsep ()
 +{
-   $debug_cmd
- 
++  $opt_debug
 +  case $4 in
-   $1 ) func_to_host_path_result=$3$func_to_host_path_result
++  $1 ) func_to_host_path_result="$3$func_to_host_path_result"
 +    ;;
 +  esac
 +  case $4 in
 +  $2 ) func_append func_to_host_path_result "$3"
 +    ;;
 +  esac
 +}
 +# end func_convert_path_front_back_pathsep
 +
 +
 +##################################################
 +# $build to $host FILE NAME CONVERSION FUNCTIONS #
 +##################################################
- # invoked via '$to_host_file_cmd ARG'
++# invoked via `$to_host_file_cmd ARG'
 +#
 +# In each case, ARG is the path to be converted from $build to $host format.
 +# Result will be available in $func_to_host_file_result.
 +
 +
 +# func_to_host_file ARG
 +# Converts the file name ARG from $build format to $host format. Return result
 +# in func_to_host_file_result.
 +func_to_host_file ()
 +{
-   $debug_cmd
- 
++  $opt_debug
 +  $to_host_file_cmd "$1"
 +}
 +# end func_to_host_file
 +
 +
 +# func_to_tool_file ARG LAZY
 +# converts the file name ARG from $build format to toolchain format. Return
 +# result in func_to_tool_file_result.  If the conversion in use is listed
 +# in (the comma separated) LAZY, no conversion takes place.
 +func_to_tool_file ()
 +{
-   $debug_cmd
- 
++  $opt_debug
 +  case ,$2, in
 +    *,"$to_tool_file_cmd",*)
 +      func_to_tool_file_result=$1
 +      ;;
 +    *)
 +      $to_tool_file_cmd "$1"
 +      func_to_tool_file_result=$func_to_host_file_result
 +      ;;
 +  esac
 +}
 +# end func_to_tool_file
 +
 +
 +# func_convert_file_noop ARG
 +# Copy ARG to func_to_host_file_result.
 +func_convert_file_noop ()
 +{
-   func_to_host_file_result=$1
++  func_to_host_file_result="$1"
 +}
 +# end func_convert_file_noop
 +
 +
 +# func_convert_file_msys_to_w32 ARG
 +# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic
 +# conversion to w32 is not available inside the cwrapper.  Returns result in
 +# func_to_host_file_result.
 +func_convert_file_msys_to_w32 ()
 +{
-   $debug_cmd
- 
-   func_to_host_file_result=$1
++  $opt_debug
++  func_to_host_file_result="$1"
 +  if test -n "$1"; then
 +    func_convert_core_msys_to_w32 "$1"
-     func_to_host_file_result=$func_convert_core_msys_to_w32_result
++    func_to_host_file_result="$func_convert_core_msys_to_w32_result"
 +  fi
 +  func_convert_file_check "$1" "$func_to_host_file_result"
 +}
 +# end func_convert_file_msys_to_w32
 +
 +
 +# func_convert_file_cygwin_to_w32 ARG
 +# Convert file name ARG from Cygwin to w32 format.  Returns result in
 +# func_to_host_file_result.
 +func_convert_file_cygwin_to_w32 ()
 +{
-   $debug_cmd
- 
-   func_to_host_file_result=$1
++  $opt_debug
++  func_to_host_file_result="$1"
 +  if test -n "$1"; then
 +    # because $build is cygwin, we call "the" cygpath in $PATH; no need to use
 +    # LT_CYGPATH in this case.
 +    func_to_host_file_result=`cygpath -m "$1"`
 +  fi
 +  func_convert_file_check "$1" "$func_to_host_file_result"
 +}
 +# end func_convert_file_cygwin_to_w32
 +
 +
 +# func_convert_file_nix_to_w32 ARG
 +# Convert file name ARG from *nix to w32 format.  Requires a wine environment
 +# and a working winepath. Returns result in func_to_host_file_result.
 +func_convert_file_nix_to_w32 ()
 +{
-   $debug_cmd
- 
-   func_to_host_file_result=$1
++  $opt_debug
++  func_to_host_file_result="$1"
 +  if test -n "$1"; then
 +    func_convert_core_file_wine_to_w32 "$1"
-     func_to_host_file_result=$func_convert_core_file_wine_to_w32_result
++    func_to_host_file_result="$func_convert_core_file_wine_to_w32_result"
 +  fi
 +  func_convert_file_check "$1" "$func_to_host_file_result"
 +}
 +# end func_convert_file_nix_to_w32
 +
 +
 +# func_convert_file_msys_to_cygwin ARG
 +# Convert file name ARG from MSYS to Cygwin format.  Requires LT_CYGPATH set.
 +# Returns result in func_to_host_file_result.
 +func_convert_file_msys_to_cygwin ()
 +{
-   $debug_cmd
- 
-   func_to_host_file_result=$1
++  $opt_debug
++  func_to_host_file_result="$1"
 +  if test -n "$1"; then
 +    func_convert_core_msys_to_w32 "$1"
 +    func_cygpath -u "$func_convert_core_msys_to_w32_result"
-     func_to_host_file_result=$func_cygpath_result
++    func_to_host_file_result="$func_cygpath_result"
 +  fi
 +  func_convert_file_check "$1" "$func_to_host_file_result"
 +}
 +# end func_convert_file_msys_to_cygwin
 +
 +
 +# func_convert_file_nix_to_cygwin ARG
 +# Convert file name ARG from *nix to Cygwin format.  Requires Cygwin installed
 +# in a wine environment, working winepath, and LT_CYGPATH set.  Returns result
 +# in func_to_host_file_result.
 +func_convert_file_nix_to_cygwin ()
 +{
-   $debug_cmd
- 
-   func_to_host_file_result=$1
++  $opt_debug
++  func_to_host_file_result="$1"
 +  if test -n "$1"; then
 +    # convert from *nix to w32, then use cygpath to convert from w32 to cygwin.
 +    func_convert_core_file_wine_to_w32 "$1"
 +    func_cygpath -u "$func_convert_core_file_wine_to_w32_result"
-     func_to_host_file_result=$func_cygpath_result
++    func_to_host_file_result="$func_cygpath_result"
 +  fi
 +  func_convert_file_check "$1" "$func_to_host_file_result"
 +}
 +# end func_convert_file_nix_to_cygwin
 +
 +
 +#############################################
 +# $build to $host PATH CONVERSION FUNCTIONS #
 +#############################################
- # invoked via '$to_host_path_cmd ARG'
++# invoked via `$to_host_path_cmd ARG'
 +#
 +# In each case, ARG is the path to be converted from $build to $host format.
 +# The result will be available in $func_to_host_path_result.
 +#
 +# Path separators are also converted from $build format to $host format.  If
 +# ARG begins or ends with a path separator character, it is preserved (but
 +# converted to $host format) on output.
 +#
 +# All path conversion functions are named using the following convention:
 +#   file name conversion function    : func_convert_file_X_to_Y ()
 +#   path conversion function         : func_convert_path_X_to_Y ()
 +# where, for any given $build/$host combination the 'X_to_Y' value is the
 +# same.  If conversion functions are added for new $build/$host combinations,
 +# the two new functions must follow this pattern, or func_init_to_host_path_cmd
 +# will break.
 +
 +
 +# func_init_to_host_path_cmd
 +# Ensures that function "pointer" variable $to_host_path_cmd is set to the
 +# appropriate value, based on the value of $to_host_file_cmd.
 +to_host_path_cmd=
 +func_init_to_host_path_cmd ()
 +{
-   $debug_cmd
- 
++  $opt_debug
 +  if test -z "$to_host_path_cmd"; then
 +    func_stripname 'func_convert_file_' '' "$to_host_file_cmd"
-     to_host_path_cmd=func_convert_path_$func_stripname_result
++    to_host_path_cmd="func_convert_path_${func_stripname_result}"
 +  fi
 +}
 +
 +
 +# func_to_host_path ARG
 +# Converts the path ARG from $build format to $host format. Return result
 +# in func_to_host_path_result.
 +func_to_host_path ()
 +{
-   $debug_cmd
- 
++  $opt_debug
 +  func_init_to_host_path_cmd
 +  $to_host_path_cmd "$1"
 +}
 +# end func_to_host_path
 +
 +
 +# func_convert_path_noop ARG
 +# Copy ARG to func_to_host_path_result.
 +func_convert_path_noop ()
 +{
-   func_to_host_path_result=$1
++  func_to_host_path_result="$1"
 +}
 +# end func_convert_path_noop
 +
 +
 +# func_convert_path_msys_to_w32 ARG
 +# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic
 +# conversion to w32 is not available inside the cwrapper.  Returns result in
 +# func_to_host_path_result.
 +func_convert_path_msys_to_w32 ()
 +{
-   $debug_cmd
- 
-   func_to_host_path_result=$1
++  $opt_debug
++  func_to_host_path_result="$1"
 +  if test -n "$1"; then
 +    # Remove leading and trailing path separator characters from ARG.  MSYS
 +    # behavior is inconsistent here; cygpath turns them into '.;' and ';.';
 +    # and winepath ignores them completely.
 +    func_stripname : : "$1"
 +    func_to_host_path_tmp1=$func_stripname_result
 +    func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
-     func_to_host_path_result=$func_convert_core_msys_to_w32_result
++    func_to_host_path_result="$func_convert_core_msys_to_w32_result"
 +    func_convert_path_check : ";" \
 +      "$func_to_host_path_tmp1" "$func_to_host_path_result"
 +    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
 +  fi
 +}
 +# end func_convert_path_msys_to_w32
 +
 +
 +# func_convert_path_cygwin_to_w32 ARG
 +# Convert path ARG from Cygwin to w32 format.  Returns result in
 +# func_to_host_file_result.
 +func_convert_path_cygwin_to_w32 ()
 +{
-   $debug_cmd
- 
-   func_to_host_path_result=$1
++  $opt_debug
++  func_to_host_path_result="$1"
 +  if test -n "$1"; then
 +    # See func_convert_path_msys_to_w32:
 +    func_stripname : : "$1"
 +    func_to_host_path_tmp1=$func_stripname_result
 +    func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"`
 +    func_convert_path_check : ";" \
 +      "$func_to_host_path_tmp1" "$func_to_host_path_result"
 +    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
 +  fi
 +}
 +# end func_convert_path_cygwin_to_w32
 +
 +
 +# func_convert_path_nix_to_w32 ARG
 +# Convert path ARG from *nix to w32 format.  Requires a wine environment and
 +# a working winepath.  Returns result in func_to_host_file_result.
 +func_convert_path_nix_to_w32 ()
 +{
-   $debug_cmd
- 
-   func_to_host_path_result=$1
++  $opt_debug
++  func_to_host_path_result="$1"
 +  if test -n "$1"; then
 +    # See func_convert_path_msys_to_w32:
 +    func_stripname : : "$1"
 +    func_to_host_path_tmp1=$func_stripname_result
 +    func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
-     func_to_host_path_result=$func_convert_core_path_wine_to_w32_result
++    func_to_host_path_result="$func_convert_core_path_wine_to_w32_result"
 +    func_convert_path_check : ";" \
 +      "$func_to_host_path_tmp1" "$func_to_host_path_result"
 +    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
 +  fi
 +}
 +# end func_convert_path_nix_to_w32
 +
 +
 +# func_convert_path_msys_to_cygwin ARG
 +# Convert path ARG from MSYS to Cygwin format.  Requires LT_CYGPATH set.
 +# Returns result in func_to_host_file_result.
 +func_convert_path_msys_to_cygwin ()
 +{
-   $debug_cmd
- 
-   func_to_host_path_result=$1
++  $opt_debug
++  func_to_host_path_result="$1"
 +  if test -n "$1"; then
 +    # See func_convert_path_msys_to_w32:
 +    func_stripname : : "$1"
 +    func_to_host_path_tmp1=$func_stripname_result
 +    func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
 +    func_cygpath -u -p "$func_convert_core_msys_to_w32_result"
-     func_to_host_path_result=$func_cygpath_result
++    func_to_host_path_result="$func_cygpath_result"
 +    func_convert_path_check : : \
 +      "$func_to_host_path_tmp1" "$func_to_host_path_result"
 +    func_convert_path_front_back_pathsep ":*" "*:" : "$1"
 +  fi
 +}
 +# end func_convert_path_msys_to_cygwin
 +
 +
 +# func_convert_path_nix_to_cygwin ARG
 +# Convert path ARG from *nix to Cygwin format.  Requires Cygwin installed in a
 +# a wine environment, working winepath, and LT_CYGPATH set.  Returns result in
 +# func_to_host_file_result.
 +func_convert_path_nix_to_cygwin ()
 +{
-   $debug_cmd
- 
-   func_to_host_path_result=$1
++  $opt_debug
++  func_to_host_path_result="$1"
 +  if test -n "$1"; then
 +    # Remove leading and trailing path separator characters from
 +    # ARG. msys behavior is inconsistent here, cygpath turns them
 +    # into '.;' and ';.', and winepath ignores them completely.
 +    func_stripname : : "$1"
 +    func_to_host_path_tmp1=$func_stripname_result
 +    func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
 +    func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result"
-     func_to_host_path_result=$func_cygpath_result
++    func_to_host_path_result="$func_cygpath_result"
 +    func_convert_path_check : : \
 +      "$func_to_host_path_tmp1" "$func_to_host_path_result"
 +    func_convert_path_front_back_pathsep ":*" "*:" : "$1"
 +  fi
 +}
 +# end func_convert_path_nix_to_cygwin
 +
 +
- # func_dll_def_p FILE
- # True iff FILE is a Windows DLL '.def' file.
- # Keep in sync with _LT_DLL_DEF_P in libtool.m4
- func_dll_def_p ()
- {
-   $debug_cmd
- 
-   func_dll_def_p_tmp=`$SED -n \
-     -e 's/^[	 ]*//' \
-     -e '/^\(;.*\)*$/d' \
-     -e 's/^\(EXPORTS\|LIBRARY\)\([	 ].*\)*$/DEF/p' \
-     -e q \
-     "$1"`
-   test DEF = "$func_dll_def_p_tmp"
- }
- 
- 
 +# func_mode_compile arg...
 +func_mode_compile ()
 +{
-     $debug_cmd
- 
++    $opt_debug
 +    # Get the compilation command and the source file.
 +    base_compile=
-     srcfile=$nonopt  #  always keep a non-empty value in "srcfile"
++    srcfile="$nonopt"  #  always keep a non-empty value in "srcfile"
 +    suppress_opt=yes
 +    suppress_output=
 +    arg_mode=normal
 +    libobj=
 +    later=
 +    pie_flag=
 +
 +    for arg
 +    do
 +      case $arg_mode in
 +      arg  )
 +	# do not "continue".  Instead, add this to base_compile
- 	lastarg=$arg
++	lastarg="$arg"
 +	arg_mode=normal
 +	;;
 +
 +      target )
- 	libobj=$arg
++	libobj="$arg"
 +	arg_mode=normal
 +	continue
 +	;;
 +
 +      normal )
 +	# Accept any command-line options.
 +	case $arg in
 +	-o)
 +	  test -n "$libobj" && \
- 	    func_fatal_error "you cannot specify '-o' more than once"
++	    func_fatal_error "you cannot specify \`-o' more than once"
 +	  arg_mode=target
 +	  continue
 +	  ;;
 +
 +	-pie | -fpie | -fPIE)
 +          func_append pie_flag " $arg"
 +	  continue
 +	  ;;
 +
 +	-shared | -static | -prefer-pic | -prefer-non-pic)
 +	  func_append later " $arg"
 +	  continue
 +	  ;;
 +
 +	-no-suppress)
 +	  suppress_opt=no
 +	  continue
 +	  ;;
 +
 +	-Xcompiler)
 +	  arg_mode=arg  #  the next one goes into the "base_compile" arg list
 +	  continue      #  The current "srcfile" will either be retained or
 +	  ;;            #  replaced later.  I would guess that would be a bug.
 +
 +	-Wc,*)
 +	  func_stripname '-Wc,' '' "$arg"
 +	  args=$func_stripname_result
 +	  lastarg=
- 	  save_ifs=$IFS; IFS=,
++	  save_ifs="$IFS"; IFS=','
 +	  for arg in $args; do
- 	    IFS=$save_ifs
++	    IFS="$save_ifs"
 +	    func_append_quoted lastarg "$arg"
 +	  done
- 	  IFS=$save_ifs
++	  IFS="$save_ifs"
 +	  func_stripname ' ' '' "$lastarg"
 +	  lastarg=$func_stripname_result
 +
 +	  # Add the arguments to base_compile.
 +	  func_append base_compile " $lastarg"
 +	  continue
 +	  ;;
 +
 +	*)
 +	  # Accept the current argument as the source file.
 +	  # The previous "srcfile" becomes the current argument.
 +	  #
- 	  lastarg=$srcfile
- 	  srcfile=$arg
++	  lastarg="$srcfile"
++	  srcfile="$arg"
 +	  ;;
 +	esac  #  case $arg
 +	;;
 +      esac    #  case $arg_mode
 +
 +      # Aesthetically quote the previous argument.
 +      func_append_quoted base_compile "$lastarg"
 +    done # for arg
 +
 +    case $arg_mode in
 +    arg)
 +      func_fatal_error "you must specify an argument for -Xcompile"
 +      ;;
 +    target)
-       func_fatal_error "you must specify a target with '-o'"
++      func_fatal_error "you must specify a target with \`-o'"
 +      ;;
 +    *)
 +      # Get the name of the library object.
 +      test -z "$libobj" && {
 +	func_basename "$srcfile"
- 	libobj=$func_basename_result
++	libobj="$func_basename_result"
 +      }
 +      ;;
 +    esac
 +
 +    # Recognize several different file suffixes.
 +    # If the user specifies -o file.o, it is replaced with file.lo
 +    case $libobj in
 +    *.[cCFSifmso] | \
 +    *.ada | *.adb | *.ads | *.asm | \
 +    *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
 +    *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup)
 +      func_xform "$libobj"
 +      libobj=$func_xform_result
 +      ;;
 +    esac
 +
 +    case $libobj in
 +    *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;;
 +    *)
-       func_fatal_error "cannot determine name of library object from '$libobj'"
++      func_fatal_error "cannot determine name of library object from \`$libobj'"
 +      ;;
 +    esac
 +
 +    func_infer_tag $base_compile
 +
 +    for arg in $later; do
 +      case $arg in
 +      -shared)
- 	test yes = "$build_libtool_libs" \
- 	  || func_fatal_configuration "cannot build a shared library"
++	test "$build_libtool_libs" != yes && \
++	  func_fatal_configuration "can not build a shared library"
 +	build_old_libs=no
 +	continue
 +	;;
 +
 +      -static)
 +	build_libtool_libs=no
 +	build_old_libs=yes
 +	continue
 +	;;
 +
 +      -prefer-pic)
 +	pic_mode=yes
 +	continue
 +	;;
 +
 +      -prefer-non-pic)
 +	pic_mode=no
 +	continue
 +	;;
 +      esac
 +    done
 +
 +    func_quote_for_eval "$libobj"
 +    test "X$libobj" != "X$func_quote_for_eval_result" \
 +      && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"'	 &()|`$[]' \
-       && func_warning "libobj name '$libobj' may not contain shell special characters."
++      && func_warning "libobj name \`$libobj' may not contain shell special characters."
 +    func_dirname_and_basename "$obj" "/" ""
-     objname=$func_basename_result
-     xdir=$func_dirname_result
-     lobj=$xdir$objdir/$objname
++    objname="$func_basename_result"
++    xdir="$func_dirname_result"
++    lobj=${xdir}$objdir/$objname
 +
 +    test -z "$base_compile" && \
 +      func_fatal_help "you must specify a compilation command"
 +
 +    # Delete any leftover library objects.
-     if test yes = "$build_old_libs"; then
++    if test "$build_old_libs" = yes; then
 +      removelist="$obj $lobj $libobj ${libobj}T"
 +    else
 +      removelist="$lobj $libobj ${libobj}T"
 +    fi
 +
 +    # On Cygwin there's no "real" PIC flag so we must build both object types
 +    case $host_os in
 +    cygwin* | mingw* | pw32* | os2* | cegcc*)
 +      pic_mode=default
 +      ;;
 +    esac
-     if test no = "$pic_mode" && test pass_all != "$deplibs_check_method"; then
++    if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
 +      # non-PIC code in shared libraries is not supported
 +      pic_mode=default
 +    fi
 +
 +    # Calculate the filename of the output object if compiler does
 +    # not support -o with -c
-     if test no = "$compiler_c_o"; then
-       output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.$objext
-       lockfile=$output_obj.lock
++    if test "$compiler_c_o" = no; then
++      output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext}
++      lockfile="$output_obj.lock"
 +    else
 +      output_obj=
 +      need_locks=no
 +      lockfile=
 +    fi
 +
 +    # Lock this critical section if it is needed
 +    # We use this script file to make the link, it avoids creating a new file
-     if test yes = "$need_locks"; then
++    if test "$need_locks" = yes; then
 +      until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
 +	func_echo "Waiting for $lockfile to be removed"
 +	sleep 2
 +      done
-     elif test warn = "$need_locks"; then
++    elif test "$need_locks" = warn; then
 +      if test -f "$lockfile"; then
 +	$ECHO "\
 +*** ERROR, $lockfile exists and contains:
 +`cat $lockfile 2>/dev/null`
 +
 +This indicates that another process is trying to use the same
 +temporary object file, and libtool could not work around it because
- your compiler does not support '-c' and '-o' together.  If you
++your compiler does not support \`-c' and \`-o' together.  If you
 +repeat this compilation, it may succeed, by chance, but you had better
 +avoid parallel builds (make -j) in this platform, or get a better
 +compiler."
 +
 +	$opt_dry_run || $RM $removelist
 +	exit $EXIT_FAILURE
 +      fi
 +      func_append removelist " $output_obj"
 +      $ECHO "$srcfile" > "$lockfile"
 +    fi
 +
 +    $opt_dry_run || $RM $removelist
 +    func_append removelist " $lockfile"
 +    trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
 +
 +    func_to_tool_file "$srcfile" func_convert_file_msys_to_w32
 +    srcfile=$func_to_tool_file_result
 +    func_quote_for_eval "$srcfile"
 +    qsrcfile=$func_quote_for_eval_result
 +
 +    # Only build a PIC object if we are building libtool libraries.
-     if test yes = "$build_libtool_libs"; then
++    if test "$build_libtool_libs" = yes; then
 +      # Without this assignment, base_compile gets emptied.
 +      fbsd_hideous_sh_bug=$base_compile
 +
-       if test no != "$pic_mode"; then
++      if test "$pic_mode" != no; then
 +	command="$base_compile $qsrcfile $pic_flag"
 +      else
 +	# Don't build PIC code
 +	command="$base_compile $qsrcfile"
 +      fi
 +
 +      func_mkdir_p "$xdir$objdir"
 +
 +      if test -z "$output_obj"; then
 +	# Place PIC objects in $objdir
 +	func_append command " -o $lobj"
 +      fi
 +
 +      func_show_eval_locale "$command"	\
 +          'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE'
 +
-       if test warn = "$need_locks" &&
++      if test "$need_locks" = warn &&
 +	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
 +	$ECHO "\
 +*** ERROR, $lockfile contains:
 +`cat $lockfile 2>/dev/null`
 +
 +but it should contain:
 +$srcfile
 +
 +This indicates that another process is trying to use the same
 +temporary object file, and libtool could not work around it because
- your compiler does not support '-c' and '-o' together.  If you
++your compiler does not support \`-c' and \`-o' together.  If you
 +repeat this compilation, it may succeed, by chance, but you had better
 +avoid parallel builds (make -j) in this platform, or get a better
 +compiler."
 +
 +	$opt_dry_run || $RM $removelist
 +	exit $EXIT_FAILURE
 +      fi
 +
 +      # Just move the object if needed, then go on to compile the next one
 +      if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then
 +	func_show_eval '$MV "$output_obj" "$lobj"' \
 +	  'error=$?; $opt_dry_run || $RM $removelist; exit $error'
 +      fi
 +
 +      # Allow error messages only from the first compilation.
-       if test yes = "$suppress_opt"; then
++      if test "$suppress_opt" = yes; then
 +	suppress_output=' >/dev/null 2>&1'
 +      fi
 +    fi
 +
 +    # Only build a position-dependent object if we build old libraries.
-     if test yes = "$build_old_libs"; then
-       if test yes != "$pic_mode"; then
++    if test "$build_old_libs" = yes; then
++      if test "$pic_mode" != yes; then
 +	# Don't build PIC code
 +	command="$base_compile $qsrcfile$pie_flag"
 +      else
 +	command="$base_compile $qsrcfile $pic_flag"
 +      fi
-       if test yes = "$compiler_c_o"; then
++      if test "$compiler_c_o" = yes; then
 +	func_append command " -o $obj"
 +      fi
 +
 +      # Suppress compiler output if we already did a PIC compilation.
 +      func_append command "$suppress_output"
 +      func_show_eval_locale "$command" \
 +        '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
 +
-       if test warn = "$need_locks" &&
++      if test "$need_locks" = warn &&
 +	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
 +	$ECHO "\
 +*** ERROR, $lockfile contains:
 +`cat $lockfile 2>/dev/null`
 +
 +but it should contain:
 +$srcfile
 +
 +This indicates that another process is trying to use the same
 +temporary object file, and libtool could not work around it because
- your compiler does not support '-c' and '-o' together.  If you
++your compiler does not support \`-c' and \`-o' together.  If you
 +repeat this compilation, it may succeed, by chance, but you had better
 +avoid parallel builds (make -j) in this platform, or get a better
 +compiler."
 +
 +	$opt_dry_run || $RM $removelist
 +	exit $EXIT_FAILURE
 +      fi
 +
 +      # Just move the object if needed
 +      if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then
 +	func_show_eval '$MV "$output_obj" "$obj"' \
 +	  'error=$?; $opt_dry_run || $RM $removelist; exit $error'
 +      fi
 +    fi
 +
 +    $opt_dry_run || {
 +      func_write_libtool_object "$libobj" "$objdir/$objname" "$objname"
 +
 +      # Unlock the critical section if it was locked
-       if test no != "$need_locks"; then
++      if test "$need_locks" != no; then
 +	removelist=$lockfile
 +        $RM "$lockfile"
 +      fi
 +    }
 +
 +    exit $EXIT_SUCCESS
 +}
 +
 +$opt_help || {
-   test compile = "$opt_mode" && func_mode_compile ${1+"$@"}
++  test "$opt_mode" = compile && func_mode_compile ${1+"$@"}
 +}
 +
 +func_mode_help ()
 +{
 +    # We need to display help for each of the modes.
 +    case $opt_mode in
 +      "")
 +        # Generic help is extracted from the usage comments
 +        # at the start of this file.
 +        func_help
 +        ;;
 +
 +      clean)
 +        $ECHO \
 +"Usage: $progname [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
 +
 +Remove files from the build directory.
 +
 +RM is the name of the program to use to delete files associated with each FILE
- (typically '/bin/rm').  RM-OPTIONS are options (such as '-f') to be passed
++(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
 +to RM.
 +
 +If FILE is a libtool library, object or program, all the files associated
 +with it are deleted. Otherwise, only FILE itself is deleted using RM."
 +        ;;
 +
 +      compile)
 +      $ECHO \
 +"Usage: $progname [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
 +
 +Compile a source file into a libtool library object.
 +
 +This mode accepts the following additional options:
 +
 +  -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
 +  -no-suppress      do not suppress compiler output for multiple passes
 +  -prefer-pic       try to build PIC objects only
 +  -prefer-non-pic   try to build non-PIC objects only
-   -shared           do not build a '.o' file suitable for static linking
-   -static           only build a '.o' file suitable for static linking
++  -shared           do not build a \`.o' file suitable for static linking
++  -static           only build a \`.o' file suitable for static linking
 +  -Wc,FLAG          pass FLAG directly to the compiler
 +
- COMPILE-COMMAND is a command to be used in creating a 'standard' object file
++COMPILE-COMMAND is a command to be used in creating a \`standard' object file
 +from the given SOURCEFILE.
 +
 +The output file name is determined by removing the directory component from
- SOURCEFILE, then substituting the C source code suffix '.c' with the
- library object suffix, '.lo'."
++SOURCEFILE, then substituting the C source code suffix \`.c' with the
++library object suffix, \`.lo'."
 +        ;;
 +
 +      execute)
 +        $ECHO \
 +"Usage: $progname [OPTION]... --mode=execute COMMAND [ARGS]...
 +
 +Automatically set library path, then run a program.
 +
 +This mode accepts the following additional options:
 +
 +  -dlopen FILE      add the directory containing FILE to the library path
 +
- This mode sets the library path environment variable according to '-dlopen'
++This mode sets the library path environment variable according to \`-dlopen'
 +flags.
 +
 +If any of the ARGS are libtool executable wrappers, then they are translated
 +into their corresponding uninstalled binary, and any of their required library
 +directories are added to the library path.
 +
 +Then, COMMAND is executed, with ARGS as arguments."
 +        ;;
 +
 +      finish)
 +        $ECHO \
 +"Usage: $progname [OPTION]... --mode=finish [LIBDIR]...
 +
 +Complete the installation of libtool libraries.
 +
 +Each LIBDIR is a directory that contains libtool libraries.
 +
 +The commands that this mode executes may require superuser privileges.  Use
- the '--dry-run' option if you just want to see what would be executed."
++the \`--dry-run' option if you just want to see what would be executed."
 +        ;;
 +
 +      install)
 +        $ECHO \
 +"Usage: $progname [OPTION]... --mode=install INSTALL-COMMAND...
 +
 +Install executables or libraries.
 +
 +INSTALL-COMMAND is the installation command.  The first component should be
- either the 'install' or 'cp' program.
++either the \`install' or \`cp' program.
 +
 +The following components of INSTALL-COMMAND are treated specially:
 +
 +  -inst-prefix-dir PREFIX-DIR  Use PREFIX-DIR as a staging area for installation
 +
 +The rest of the components are interpreted as arguments to that command (only
 +BSD-compatible install options are recognized)."
 +        ;;
 +
 +      link)
 +        $ECHO \
 +"Usage: $progname [OPTION]... --mode=link LINK-COMMAND...
 +
 +Link object files or libraries together to form another library, or to
 +create an executable program.
 +
 +LINK-COMMAND is a command using the C compiler that you would use to create
 +a program from several object files.
 +
 +The following components of LINK-COMMAND are treated specially:
 +
 +  -all-static       do not do any dynamic linking at all
 +  -avoid-version    do not add a version suffix if possible
 +  -bindir BINDIR    specify path to binaries directory (for systems where
 +                    libraries must be found in the PATH setting at runtime)
-   -dlopen FILE      '-dlpreopen' FILE if it cannot be dlopened at runtime
++  -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
 +  -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
 +  -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
 +  -export-symbols SYMFILE
 +                    try to export only the symbols listed in SYMFILE
 +  -export-symbols-regex REGEX
 +                    try to export only the symbols matching REGEX
 +  -LLIBDIR          search LIBDIR for required installed libraries
 +  -lNAME            OUTPUT-FILE requires the installed library libNAME
 +  -module           build a library that can dlopened
 +  -no-fast-install  disable the fast-install mode
 +  -no-install       link a not-installable executable
 +  -no-undefined     declare that a library does not refer to external symbols
 +  -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
-   -objectlist FILE  use a list of object files found in FILE to specify objects
-   -os2dllname NAME  force a short DLL name on OS/2 (no effect on other OSes)
++  -objectlist FILE  Use a list of object files found in FILE to specify objects
 +  -precious-files-regex REGEX
 +                    don't remove output files matching REGEX
 +  -release RELEASE  specify package release information
 +  -rpath LIBDIR     the created library will eventually be installed in LIBDIR
 +  -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
 +  -shared           only do dynamic linking of libtool libraries
 +  -shrext SUFFIX    override the standard shared library file extension
 +  -static           do not do any dynamic linking of uninstalled libtool libraries
 +  -static-libtool-libs
 +                    do not do any dynamic linking of libtool libraries
 +  -version-info CURRENT[:REVISION[:AGE]]
 +                    specify library version info [each variable defaults to 0]
 +  -weak LIBNAME     declare that the target provides the LIBNAME interface
 +  -Wc,FLAG
 +  -Xcompiler FLAG   pass linker-specific FLAG directly to the compiler
 +  -Wl,FLAG
 +  -Xlinker FLAG     pass linker-specific FLAG directly to the linker
 +  -XCClinker FLAG   pass link-specific FLAG to the compiler driver (CC)
 +
- All other options (arguments beginning with '-') are ignored.
++All other options (arguments beginning with \`-') are ignored.
 +
- Every other argument is treated as a filename.  Files ending in '.la' are
++Every other argument is treated as a filename.  Files ending in \`.la' are
 +treated as uninstalled libtool libraries, other files are standard or library
 +object files.
 +
- If the OUTPUT-FILE ends in '.la', then a libtool library is created,
- only library objects ('.lo' files) may be specified, and '-rpath' is
++If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
++only library objects (\`.lo' files) may be specified, and \`-rpath' is
 +required, except when creating a convenience library.
 +
- If OUTPUT-FILE ends in '.a' or '.lib', then a standard library is created
- using 'ar' and 'ranlib', or on Windows using 'lib'.
++If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
++using \`ar' and \`ranlib', or on Windows using \`lib'.
 +
- If OUTPUT-FILE ends in '.lo' or '.$objext', then a reloadable object file
++If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
 +is created, otherwise an executable program is created."
 +        ;;
 +
 +      uninstall)
 +        $ECHO \
 +"Usage: $progname [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
 +
 +Remove libraries from an installation directory.
 +
 +RM is the name of the program to use to delete files associated with each FILE
- (typically '/bin/rm').  RM-OPTIONS are options (such as '-f') to be passed
++(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
 +to RM.
 +
 +If FILE is a libtool library, all the files associated with it are deleted.
 +Otherwise, only FILE itself is deleted using RM."
 +        ;;
 +
 +      *)
-         func_fatal_help "invalid operation mode '$opt_mode'"
++        func_fatal_help "invalid operation mode \`$opt_mode'"
 +        ;;
 +    esac
 +
 +    echo
-     $ECHO "Try '$progname --help' for more information about other modes."
++    $ECHO "Try \`$progname --help' for more information about other modes."
 +}
 +
 +# Now that we've collected a possible --mode arg, show help if necessary
 +if $opt_help; then
-   if test : = "$opt_help"; then
++  if test "$opt_help" = :; then
 +    func_mode_help
 +  else
 +    {
 +      func_help noexit
 +      for opt_mode in compile link execute install finish uninstall clean; do
 +	func_mode_help
 +      done
-     } | $SED -n '1p; 2,$s/^Usage:/  or: /p'
++    } | sed -n '1p; 2,$s/^Usage:/  or: /p'
 +    {
 +      func_help noexit
 +      for opt_mode in compile link execute install finish uninstall clean; do
 +	echo
 +	func_mode_help
 +      done
 +    } |
-     $SED '1d
++    sed '1d
 +      /^When reporting/,/^Report/{
 +	H
 +	d
 +      }
 +      $x
 +      /information about other modes/d
 +      /more detailed .*MODE/d
 +      s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/'
 +  fi
 +  exit $?
 +fi
 +
 +
 +# func_mode_execute arg...
 +func_mode_execute ()
 +{
-     $debug_cmd
- 
++    $opt_debug
 +    # The first argument is the command name.
-     cmd=$nonopt
++    cmd="$nonopt"
 +    test -z "$cmd" && \
 +      func_fatal_help "you must specify a COMMAND"
 +
 +    # Handle -dlopen flags immediately.
 +    for file in $opt_dlopen; do
 +      test -f "$file" \
- 	|| func_fatal_help "'$file' is not a file"
++	|| func_fatal_help "\`$file' is not a file"
 +
 +      dir=
 +      case $file in
 +      *.la)
 +	func_resolve_sysroot "$file"
 +	file=$func_resolve_sysroot_result
 +
 +	# Check to see that this really is a libtool archive.
 +	func_lalib_unsafe_p "$file" \
- 	  || func_fatal_help "'$lib' is not a valid libtool archive"
++	  || func_fatal_help "\`$lib' is not a valid libtool archive"
 +
 +	# Read the libtool library.
 +	dlname=
 +	library_names=
 +	func_source "$file"
 +
 +	# Skip this library if it cannot be dlopened.
 +	if test -z "$dlname"; then
 +	  # Warn if it was a shared library.
 +	  test -n "$library_names" && \
- 	    func_warning "'$file' was not linked with '-export-dynamic'"
++	    func_warning "\`$file' was not linked with \`-export-dynamic'"
 +	  continue
 +	fi
 +
 +	func_dirname "$file" "" "."
- 	dir=$func_dirname_result
++	dir="$func_dirname_result"
 +
 +	if test -f "$dir/$objdir/$dlname"; then
 +	  func_append dir "/$objdir"
 +	else
 +	  if test ! -f "$dir/$dlname"; then
- 	    func_fatal_error "cannot find '$dlname' in '$dir' or '$dir/$objdir'"
++	    func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
 +	  fi
 +	fi
 +	;;
 +
 +      *.lo)
 +	# Just add the directory containing the .lo file.
 +	func_dirname "$file" "" "."
- 	dir=$func_dirname_result
++	dir="$func_dirname_result"
 +	;;
 +
 +      *)
- 	func_warning "'-dlopen' is ignored for non-libtool libraries and objects"
++	func_warning "\`-dlopen' is ignored for non-libtool libraries and objects"
 +	continue
 +	;;
 +      esac
 +
 +      # Get the absolute pathname.
 +      absdir=`cd "$dir" && pwd`
-       test -n "$absdir" && dir=$absdir
++      test -n "$absdir" && dir="$absdir"
 +
 +      # Now add the directory to shlibpath_var.
 +      if eval "test -z \"\$$shlibpath_var\""; then
 +	eval "$shlibpath_var=\"\$dir\""
 +      else
 +	eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
 +      fi
 +    done
 +
 +    # This variable tells wrapper scripts just to set shlibpath_var
 +    # rather than running their programs.
-     libtool_execute_magic=$magic
++    libtool_execute_magic="$magic"
 +
 +    # Check if any of the arguments is a wrapper script.
 +    args=
 +    for file
 +    do
 +      case $file in
 +      -* | *.la | *.lo ) ;;
 +      *)
 +	# Do a test to see if this is really a libtool program.
 +	if func_ltwrapper_script_p "$file"; then
 +	  func_source "$file"
 +	  # Transform arg to wrapped name.
- 	  file=$progdir/$program
++	  file="$progdir/$program"
 +	elif func_ltwrapper_executable_p "$file"; then
 +	  func_ltwrapper_scriptname "$file"
 +	  func_source "$func_ltwrapper_scriptname_result"
 +	  # Transform arg to wrapped name.
- 	  file=$progdir/$program
++	  file="$progdir/$program"
 +	fi
 +	;;
 +      esac
 +      # Quote arguments (to preserve shell metacharacters).
 +      func_append_quoted args "$file"
 +    done
 +
-     if $opt_dry_run; then
-       # Display what would be done.
-       if test -n "$shlibpath_var"; then
- 	eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
- 	echo "export $shlibpath_var"
-       fi
-       $ECHO "$cmd$args"
-       exit $EXIT_SUCCESS
-     else
++    if test "X$opt_dry_run" = Xfalse; then
 +      if test -n "$shlibpath_var"; then
 +	# Export the shlibpath_var.
 +	eval "export $shlibpath_var"
 +      fi
 +
 +      # Restore saved environment variables
 +      for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
 +      do
 +	eval "if test \"\${save_$lt_var+set}\" = set; then
 +                $lt_var=\$save_$lt_var; export $lt_var
 +	      else
 +		$lt_unset $lt_var
 +	      fi"
 +      done
 +
 +      # Now prepare to actually exec the command.
-       exec_cmd=\$cmd$args
++      exec_cmd="\$cmd$args"
++    else
++      # Display what would be done.
++      if test -n "$shlibpath_var"; then
++	eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
++	echo "export $shlibpath_var"
++      fi
++      $ECHO "$cmd$args"
++      exit $EXIT_SUCCESS
 +    fi
 +}
 +
- test execute = "$opt_mode" && func_mode_execute ${1+"$@"}
++test "$opt_mode" = execute && func_mode_execute ${1+"$@"}
 +
 +
 +# func_mode_finish arg...
 +func_mode_finish ()
 +{
-     $debug_cmd
- 
++    $opt_debug
 +    libs=
 +    libdirs=
 +    admincmds=
 +
 +    for opt in "$nonopt" ${1+"$@"}
 +    do
 +      if test -d "$opt"; then
 +	func_append libdirs " $opt"
 +
 +      elif test -f "$opt"; then
 +	if func_lalib_unsafe_p "$opt"; then
 +	  func_append libs " $opt"
 +	else
- 	  func_warning "'$opt' is not a valid libtool archive"
++	  func_warning "\`$opt' is not a valid libtool archive"
 +	fi
 +
 +      else
- 	func_fatal_error "invalid argument '$opt'"
++	func_fatal_error "invalid argument \`$opt'"
 +      fi
 +    done
 +
 +    if test -n "$libs"; then
 +      if test -n "$lt_sysroot"; then
 +        sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"`
 +        sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;"
 +      else
 +        sysroot_cmd=
 +      fi
 +
 +      # Remove sysroot references
 +      if $opt_dry_run; then
 +        for lib in $libs; do
-           echo "removing references to $lt_sysroot and '=' prefixes from $lib"
++          echo "removing references to $lt_sysroot and \`=' prefixes from $lib"
 +        done
 +      else
 +        tmpdir=`func_mktempdir`
 +        for lib in $libs; do
- 	  $SED -e "$sysroot_cmd s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
++	  sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
 +	    > $tmpdir/tmp-la
 +	  mv -f $tmpdir/tmp-la $lib
 +	done
 +        ${RM}r "$tmpdir"
 +      fi
 +    fi
 +
 +    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
 +      for libdir in $libdirs; do
 +	if test -n "$finish_cmds"; then
 +	  # Do each command in the finish commands.
 +	  func_execute_cmds "$finish_cmds" 'admincmds="$admincmds
 +'"$cmd"'"'
 +	fi
 +	if test -n "$finish_eval"; then
 +	  # Do the single finish_eval.
 +	  eval cmds=\"$finish_eval\"
 +	  $opt_dry_run || eval "$cmds" || func_append admincmds "
 +       $cmds"
 +	fi
 +      done
 +    fi
 +
 +    # Exit here if they wanted silent mode.
-     $opt_quiet && exit $EXIT_SUCCESS
++    $opt_silent && exit $EXIT_SUCCESS
 +
 +    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
 +      echo "----------------------------------------------------------------------"
 +      echo "Libraries have been installed in:"
 +      for libdir in $libdirs; do
 +	$ECHO "   $libdir"
 +      done
 +      echo
 +      echo "If you ever happen to want to link against installed libraries"
 +      echo "in a given directory, LIBDIR, you must either use libtool, and"
-       echo "specify the full pathname of the library, or use the '-LLIBDIR'"
++      echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
 +      echo "flag during linking and do at least one of the following:"
 +      if test -n "$shlibpath_var"; then
- 	echo "   - add LIBDIR to the '$shlibpath_var' environment variable"
++	echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
 +	echo "     during execution"
 +      fi
 +      if test -n "$runpath_var"; then
- 	echo "   - add LIBDIR to the '$runpath_var' environment variable"
++	echo "   - add LIBDIR to the \`$runpath_var' environment variable"
 +	echo "     during linking"
 +      fi
 +      if test -n "$hardcode_libdir_flag_spec"; then
 +	libdir=LIBDIR
 +	eval flag=\"$hardcode_libdir_flag_spec\"
 +
- 	$ECHO "   - use the '$flag' linker flag"
++	$ECHO "   - use the \`$flag' linker flag"
 +      fi
 +      if test -n "$admincmds"; then
 +	$ECHO "   - have your system administrator run these commands:$admincmds"
 +      fi
 +      if test -f /etc/ld.so.conf; then
- 	echo "   - have your system administrator add LIBDIR to '/etc/ld.so.conf'"
++	echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
 +      fi
 +      echo
 +
 +      echo "See any operating system documentation about shared libraries for"
 +      case $host in
 +	solaris2.[6789]|solaris2.1[0-9])
 +	  echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
 +	  echo "pages."
 +	  ;;
 +	*)
 +	  echo "more information, such as the ld(1) and ld.so(8) manual pages."
 +	  ;;
 +      esac
 +      echo "----------------------------------------------------------------------"
 +    fi
 +    exit $EXIT_SUCCESS
 +}
 +
- test finish = "$opt_mode" && func_mode_finish ${1+"$@"}
++test "$opt_mode" = finish && func_mode_finish ${1+"$@"}
 +
 +
 +# func_mode_install arg...
 +func_mode_install ()
 +{
-     $debug_cmd
- 
++    $opt_debug
 +    # There may be an optional sh(1) argument at the beginning of
 +    # install_prog (especially on Windows NT).
-     if test "$SHELL" = "$nonopt" || test /bin/sh = "$nonopt" ||
++    if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
 +       # Allow the use of GNU shtool's install command.
-        case $nonopt in *shtool*) :;; *) false;; esac
-     then
++       case $nonopt in *shtool*) :;; *) false;; esac; then
 +      # Aesthetically quote it.
 +      func_quote_for_eval "$nonopt"
 +      install_prog="$func_quote_for_eval_result "
 +      arg=$1
 +      shift
 +    else
 +      install_prog=
 +      arg=$nonopt
 +    fi
 +
 +    # The real first argument should be the name of the installation program.
 +    # Aesthetically quote it.
 +    func_quote_for_eval "$arg"
 +    func_append install_prog "$func_quote_for_eval_result"
 +    install_shared_prog=$install_prog
 +    case " $install_prog " in
 +      *[\\\ /]cp\ *) install_cp=: ;;
 +      *) install_cp=false ;;
 +    esac
 +
 +    # We need to accept at least all the BSD install flags.
 +    dest=
 +    files=
 +    opts=
 +    prev=
 +    install_type=
-     isdir=false
++    isdir=no
 +    stripme=
 +    no_mode=:
 +    for arg
 +    do
 +      arg2=
 +      if test -n "$dest"; then
 +	func_append files " $dest"
 +	dest=$arg
 +	continue
 +      fi
 +
 +      case $arg in
-       -d) isdir=: ;;
++      -d) isdir=yes ;;
 +      -f)
 +	if $install_cp; then :; else
 +	  prev=$arg
 +	fi
 +	;;
 +      -g | -m | -o)
 +	prev=$arg
 +	;;
 +      -s)
 +	stripme=" -s"
 +	continue
 +	;;
 +      -*)
 +	;;
 +      *)
 +	# If the previous option needed an argument, then skip it.
 +	if test -n "$prev"; then
- 	  if test X-m = "X$prev" && test -n "$install_override_mode"; then
++	  if test "x$prev" = x-m && test -n "$install_override_mode"; then
 +	    arg2=$install_override_mode
 +	    no_mode=false
 +	  fi
 +	  prev=
 +	else
 +	  dest=$arg
 +	  continue
 +	fi
 +	;;
 +      esac
 +
 +      # Aesthetically quote the argument.
 +      func_quote_for_eval "$arg"
 +      func_append install_prog " $func_quote_for_eval_result"
 +      if test -n "$arg2"; then
 +	func_quote_for_eval "$arg2"
 +      fi
 +      func_append install_shared_prog " $func_quote_for_eval_result"
 +    done
 +
 +    test -z "$install_prog" && \
 +      func_fatal_help "you must specify an install program"
 +
 +    test -n "$prev" && \
-       func_fatal_help "the '$prev' option requires an argument"
++      func_fatal_help "the \`$prev' option requires an argument"
 +
 +    if test -n "$install_override_mode" && $no_mode; then
 +      if $install_cp; then :; else
 +	func_quote_for_eval "$install_override_mode"
 +	func_append install_shared_prog " -m $func_quote_for_eval_result"
 +      fi
 +    fi
 +
 +    if test -z "$files"; then
 +      if test -z "$dest"; then
 +	func_fatal_help "no file or destination specified"
 +      else
 +	func_fatal_help "you must specify a destination"
 +      fi
 +    fi
 +
 +    # Strip any trailing slash from the destination.
 +    func_stripname '' '/' "$dest"
 +    dest=$func_stripname_result
 +
 +    # Check to see that the destination is a directory.
-     test -d "$dest" && isdir=:
-     if $isdir; then
-       destdir=$dest
++    test -d "$dest" && isdir=yes
++    if test "$isdir" = yes; then
++      destdir="$dest"
 +      destname=
 +    else
 +      func_dirname_and_basename "$dest" "" "."
-       destdir=$func_dirname_result
-       destname=$func_basename_result
++      destdir="$func_dirname_result"
++      destname="$func_basename_result"
 +
 +      # Not a directory, so check to see that there is only one file specified.
 +      set dummy $files; shift
 +      test "$#" -gt 1 && \
- 	func_fatal_help "'$dest' is not a directory"
++	func_fatal_help "\`$dest' is not a directory"
 +    fi
 +    case $destdir in
 +    [\\/]* | [A-Za-z]:[\\/]*) ;;
 +    *)
 +      for file in $files; do
 +	case $file in
 +	*.lo) ;;
 +	*)
- 	  func_fatal_help "'$destdir' must be an absolute directory name"
++	  func_fatal_help "\`$destdir' must be an absolute directory name"
 +	  ;;
 +	esac
 +      done
 +      ;;
 +    esac
 +
 +    # This variable tells wrapper scripts just to set variables rather
 +    # than running their programs.
-     libtool_install_magic=$magic
++    libtool_install_magic="$magic"
 +
 +    staticlibs=
 +    future_libdirs=
 +    current_libdirs=
 +    for file in $files; do
 +
 +      # Do each installation.
 +      case $file in
 +      *.$libext)
 +	# Do the static libraries later.
 +	func_append staticlibs " $file"
 +	;;
 +
 +      *.la)
 +	func_resolve_sysroot "$file"
 +	file=$func_resolve_sysroot_result
 +
 +	# Check to see that this really is a libtool archive.
 +	func_lalib_unsafe_p "$file" \
- 	  || func_fatal_help "'$file' is not a valid libtool archive"
++	  || func_fatal_help "\`$file' is not a valid libtool archive"
 +
 +	library_names=
 +	old_library=
 +	relink_command=
 +	func_source "$file"
 +
 +	# Add the libdir to current_libdirs if it is the destination.
 +	if test "X$destdir" = "X$libdir"; then
 +	  case "$current_libdirs " in
 +	  *" $libdir "*) ;;
 +	  *) func_append current_libdirs " $libdir" ;;
 +	  esac
 +	else
 +	  # Note the libdir as a future libdir.
 +	  case "$future_libdirs " in
 +	  *" $libdir "*) ;;
 +	  *) func_append future_libdirs " $libdir" ;;
 +	  esac
 +	fi
 +
 +	func_dirname "$file" "/" ""
- 	dir=$func_dirname_result
++	dir="$func_dirname_result"
 +	func_append dir "$objdir"
 +
 +	if test -n "$relink_command"; then
 +	  # Determine the prefix the user has applied to our future dir.
 +	  inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
 +
 +	  # Don't allow the user to place us outside of our expected
 +	  # location b/c this prevents finding dependent libraries that
 +	  # are installed to the same prefix.
 +	  # At present, this check doesn't affect windows .dll's that
 +	  # are installed into $libdir/../bin (currently, that works fine)
 +	  # but it's something to keep an eye on.
 +	  test "$inst_prefix_dir" = "$destdir" && \
- 	    func_fatal_error "error: cannot install '$file' to a directory not ending in $libdir"
++	    func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
 +
 +	  if test -n "$inst_prefix_dir"; then
 +	    # Stick the inst_prefix_dir data into the link command.
 +	    relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
 +	  else
 +	    relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
 +	  fi
 +
- 	  func_warning "relinking '$file'"
++	  func_warning "relinking \`$file'"
 +	  func_show_eval "$relink_command" \
- 	    'func_fatal_error "error: relink '\''$file'\'' with the above command before installing it"'
++	    'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"'
 +	fi
 +
 +	# See the names of the shared library.
 +	set dummy $library_names; shift
 +	if test -n "$1"; then
- 	  realname=$1
++	  realname="$1"
 +	  shift
 +
- 	  srcname=$realname
- 	  test -n "$relink_command" && srcname=${realname}T
++	  srcname="$realname"
++	  test -n "$relink_command" && srcname="$realname"T
 +
 +	  # Install the shared library and build the symlinks.
 +	  func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \
 +	      'exit $?'
- 	  tstripme=$stripme
++	  tstripme="$stripme"
 +	  case $host_os in
 +	  cygwin* | mingw* | pw32* | cegcc*)
 +	    case $realname in
 +	    *.dll.a)
- 	      tstripme=
- 	      ;;
- 	    esac
- 	    ;;
- 	  os2*)
- 	    case $realname in
- 	    *_dll.a)
- 	      tstripme=
++	      tstripme=""
 +	      ;;
 +	    esac
 +	    ;;
 +	  esac
 +	  if test -n "$tstripme" && test -n "$striplib"; then
 +	    func_show_eval "$striplib $destdir/$realname" 'exit $?'
 +	  fi
 +
 +	  if test "$#" -gt 0; then
 +	    # Delete the old symlinks, and create new ones.
- 	    # Try 'ln -sf' first, because the 'ln' binary might depend on
++	    # Try `ln -sf' first, because the `ln' binary might depend on
 +	    # the symlink we replace!  Solaris /bin/ln does not understand -f,
 +	    # so we also need to try rm && ln -s.
 +	    for linkname
 +	    do
 +	      test "$linkname" != "$realname" \
 +		&& func_show_eval "(cd $destdir && { $LN_S -f $realname $linkname || { $RM $linkname && $LN_S $realname $linkname; }; })"
 +	    done
 +	  fi
 +
 +	  # Do each command in the postinstall commands.
- 	  lib=$destdir/$realname
++	  lib="$destdir/$realname"
 +	  func_execute_cmds "$postinstall_cmds" 'exit $?'
 +	fi
 +
 +	# Install the pseudo-library for information purposes.
 +	func_basename "$file"
- 	name=$func_basename_result
- 	instname=$dir/${name}i
++	name="$func_basename_result"
++	instname="$dir/$name"i
 +	func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
 +
 +	# Maybe install the static library, too.
 +	test -n "$old_library" && func_append staticlibs " $dir/$old_library"
 +	;;
 +
 +      *.lo)
 +	# Install (i.e. copy) a libtool object.
 +
 +	# Figure out destination file name, if it wasn't already specified.
 +	if test -n "$destname"; then
- 	  destfile=$destdir/$destname
++	  destfile="$destdir/$destname"
 +	else
 +	  func_basename "$file"
- 	  destfile=$func_basename_result
- 	  destfile=$destdir/$destfile
++	  destfile="$func_basename_result"
++	  destfile="$destdir/$destfile"
 +	fi
 +
 +	# Deduce the name of the destination old-style object file.
 +	case $destfile in
 +	*.lo)
 +	  func_lo2o "$destfile"
 +	  staticdest=$func_lo2o_result
 +	  ;;
 +	*.$objext)
- 	  staticdest=$destfile
++	  staticdest="$destfile"
 +	  destfile=
 +	  ;;
 +	*)
- 	  func_fatal_help "cannot copy a libtool object to '$destfile'"
++	  func_fatal_help "cannot copy a libtool object to \`$destfile'"
 +	  ;;
 +	esac
 +
 +	# Install the libtool object if requested.
 +	test -n "$destfile" && \
 +	  func_show_eval "$install_prog $file $destfile" 'exit $?'
 +
 +	# Install the old object if enabled.
- 	if test yes = "$build_old_libs"; then
++	if test "$build_old_libs" = yes; then
 +	  # Deduce the name of the old-style object file.
 +	  func_lo2o "$file"
 +	  staticobj=$func_lo2o_result
 +	  func_show_eval "$install_prog \$staticobj \$staticdest" 'exit $?'
 +	fi
 +	exit $EXIT_SUCCESS
 +	;;
 +
 +      *)
 +	# Figure out destination file name, if it wasn't already specified.
 +	if test -n "$destname"; then
- 	  destfile=$destdir/$destname
++	  destfile="$destdir/$destname"
 +	else
 +	  func_basename "$file"
- 	  destfile=$func_basename_result
- 	  destfile=$destdir/$destfile
++	  destfile="$func_basename_result"
++	  destfile="$destdir/$destfile"
 +	fi
 +
 +	# If the file is missing, and there is a .exe on the end, strip it
 +	# because it is most likely a libtool script we actually want to
 +	# install
- 	stripped_ext=
++	stripped_ext=""
 +	case $file in
 +	  *.exe)
 +	    if test ! -f "$file"; then
 +	      func_stripname '' '.exe' "$file"
 +	      file=$func_stripname_result
- 	      stripped_ext=.exe
++	      stripped_ext=".exe"
 +	    fi
 +	    ;;
 +	esac
 +
 +	# Do a test to see if this is really a libtool program.
 +	case $host in
 +	*cygwin* | *mingw*)
 +	    if func_ltwrapper_executable_p "$file"; then
 +	      func_ltwrapper_scriptname "$file"
 +	      wrapper=$func_ltwrapper_scriptname_result
 +	    else
 +	      func_stripname '' '.exe' "$file"
 +	      wrapper=$func_stripname_result
 +	    fi
 +	    ;;
 +	*)
 +	    wrapper=$file
 +	    ;;
 +	esac
 +	if func_ltwrapper_script_p "$wrapper"; then
 +	  notinst_deplibs=
 +	  relink_command=
 +
 +	  func_source "$wrapper"
 +
 +	  # Check the variables that should have been set.
 +	  test -z "$generated_by_libtool_version" && \
- 	    func_fatal_error "invalid libtool wrapper script '$wrapper'"
++	    func_fatal_error "invalid libtool wrapper script \`$wrapper'"
 +
- 	  finalize=:
++	  finalize=yes
 +	  for lib in $notinst_deplibs; do
 +	    # Check to see that each library is installed.
 +	    libdir=
 +	    if test -f "$lib"; then
 +	      func_source "$lib"
 +	    fi
- 	    libfile=$libdir/`$ECHO "$lib" | $SED 's%^.*/%%g'`
++	    libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test
 +	    if test -n "$libdir" && test ! -f "$libfile"; then
- 	      func_warning "'$lib' has not been installed in '$libdir'"
- 	      finalize=false
++	      func_warning "\`$lib' has not been installed in \`$libdir'"
++	      finalize=no
 +	    fi
 +	  done
 +
 +	  relink_command=
 +	  func_source "$wrapper"
 +
 +	  outputname=
- 	  if test no = "$fast_install" && test -n "$relink_command"; then
++	  if test "$fast_install" = no && test -n "$relink_command"; then
 +	    $opt_dry_run || {
- 	      if $finalize; then
++	      if test "$finalize" = yes; then
 +	        tmpdir=`func_mktempdir`
 +		func_basename "$file$stripped_ext"
- 		file=$func_basename_result
- 	        outputname=$tmpdir/$file
++		file="$func_basename_result"
++	        outputname="$tmpdir/$file"
 +	        # Replace the output file specification.
 +	        relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'`
 +
- 	        $opt_quiet || {
++	        $opt_silent || {
 +	          func_quote_for_expand "$relink_command"
 +		  eval "func_echo $func_quote_for_expand_result"
 +	        }
 +	        if eval "$relink_command"; then :
 +	          else
- 		  func_error "error: relink '$file' with the above command before installing it"
++		  func_error "error: relink \`$file' with the above command before installing it"
 +		  $opt_dry_run || ${RM}r "$tmpdir"
 +		  continue
 +	        fi
- 	        file=$outputname
++	        file="$outputname"
 +	      else
- 	        func_warning "cannot relink '$file'"
++	        func_warning "cannot relink \`$file'"
 +	      fi
 +	    }
 +	  else
 +	    # Install the binary that we compiled earlier.
 +	    file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"`
 +	  fi
 +	fi
 +
 +	# remove .exe since cygwin /usr/bin/install will append another
 +	# one anyway
 +	case $install_prog,$host in
 +	*/usr/bin/install*,*cygwin*)
 +	  case $file:$destfile in
 +	  *.exe:*.exe)
 +	    # this is ok
 +	    ;;
 +	  *.exe:*)
 +	    destfile=$destfile.exe
 +	    ;;
 +	  *:*.exe)
 +	    func_stripname '' '.exe' "$destfile"
 +	    destfile=$func_stripname_result
 +	    ;;
 +	  esac
 +	  ;;
 +	esac
 +	func_show_eval "$install_prog\$stripme \$file \$destfile" 'exit $?'
 +	$opt_dry_run || if test -n "$outputname"; then
 +	  ${RM}r "$tmpdir"
 +	fi
 +	;;
 +      esac
 +    done
 +
 +    for file in $staticlibs; do
 +      func_basename "$file"
-       name=$func_basename_result
++      name="$func_basename_result"
 +
 +      # Set up the ranlib parameters.
-       oldlib=$destdir/$name
++      oldlib="$destdir/$name"
 +      func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
 +      tool_oldlib=$func_to_tool_file_result
 +
 +      func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
 +
 +      if test -n "$stripme" && test -n "$old_striplib"; then
 +	func_show_eval "$old_striplib $tool_oldlib" 'exit $?'
 +      fi
 +
 +      # Do each command in the postinstall commands.
 +      func_execute_cmds "$old_postinstall_cmds" 'exit $?'
 +    done
 +
 +    test -n "$future_libdirs" && \
-       func_warning "remember to run '$progname --finish$future_libdirs'"
++      func_warning "remember to run \`$progname --finish$future_libdirs'"
 +
 +    if test -n "$current_libdirs"; then
 +      # Maybe just do a dry run.
 +      $opt_dry_run && current_libdirs=" -n$current_libdirs"
-       exec_cmd='$SHELL "$progpath" $preserve_args --finish$current_libdirs'
++      exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
 +    else
 +      exit $EXIT_SUCCESS
 +    fi
 +}
 +
- test install = "$opt_mode" && func_mode_install ${1+"$@"}
++test "$opt_mode" = install && func_mode_install ${1+"$@"}
 +
 +
 +# func_generate_dlsyms outputname originator pic_p
 +# Extract symbols from dlprefiles and create ${outputname}S.o with
 +# a dlpreopen symbol table.
 +func_generate_dlsyms ()
 +{
-     $debug_cmd
- 
-     my_outputname=$1
-     my_originator=$2
-     my_pic_p=${3-false}
-     my_prefix=`$ECHO "$my_originator" | $SED 's%[^a-zA-Z0-9]%_%g'`
++    $opt_debug
++    my_outputname="$1"
++    my_originator="$2"
++    my_pic_p="${3-no}"
++    my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'`
 +    my_dlsyms=
 +
-     if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
++    if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
 +      if test -n "$NM" && test -n "$global_symbol_pipe"; then
- 	my_dlsyms=${my_outputname}S.c
++	my_dlsyms="${my_outputname}S.c"
 +      else
 +	func_error "not configured to extract global symbols from dlpreopened files"
 +      fi
 +    fi
 +
 +    if test -n "$my_dlsyms"; then
 +      case $my_dlsyms in
 +      "") ;;
 +      *.c)
 +	# Discover the nlist of each of the dlfiles.
- 	nlist=$output_objdir/$my_outputname.nm
++	nlist="$output_objdir/${my_outputname}.nm"
 +
 +	func_show_eval "$RM $nlist ${nlist}S ${nlist}T"
 +
 +	# Parse the name list into a source file.
 +	func_verbose "creating $output_objdir/$my_dlsyms"
 +
 +	$opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\
- /* $my_dlsyms - symbol resolution table for '$my_outputname' dlsym emulation. */
- /* Generated by $PROGRAM (GNU $PACKAGE) $VERSION */
++/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */
++/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */
 +
 +#ifdef __cplusplus
 +extern \"C\" {
 +#endif
 +
- #if defined __GNUC__ && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
++#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
 +#pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
 +#endif
 +
 +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
- #if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
- /* DATA imports from DLLs on WIN32 can't be const, because runtime
++#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
++/* DATA imports from DLLs on WIN32 con't be const, because runtime
 +   relocations are performed -- see ld's documentation on pseudo-relocs.  */
 +# define LT_DLSYM_CONST
- #elif defined __osf__
++#elif defined(__osf__)
 +/* This system does not cope well with relocations in const data.  */
 +# define LT_DLSYM_CONST
 +#else
 +# define LT_DLSYM_CONST const
 +#endif
 +
- #define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0)
- 
 +/* External symbol declarations for the compiler. */\
 +"
 +
- 	if test yes = "$dlself"; then
- 	  func_verbose "generating symbol list for '$output'"
++	if test "$dlself" = yes; then
++	  func_verbose "generating symbol list for \`$output'"
 +
 +	  $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
 +
 +	  # Add our own program objects to the symbol list.
 +	  progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
 +	  for progfile in $progfiles; do
 +	    func_to_tool_file "$progfile" func_convert_file_msys_to_w32
- 	    func_verbose "extracting global C symbols from '$func_to_tool_file_result'"
++	    func_verbose "extracting global C symbols from \`$func_to_tool_file_result'"
 +	    $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'"
 +	  done
 +
 +	  if test -n "$exclude_expsyms"; then
 +	    $opt_dry_run || {
 +	      eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
 +	      eval '$MV "$nlist"T "$nlist"'
 +	    }
 +	  fi
 +
 +	  if test -n "$export_symbols_regex"; then
 +	    $opt_dry_run || {
 +	      eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
 +	      eval '$MV "$nlist"T "$nlist"'
 +	    }
 +	  fi
 +
 +	  # Prepare the list of exported symbols
 +	  if test -z "$export_symbols"; then
- 	    export_symbols=$output_objdir/$outputname.exp
++	    export_symbols="$output_objdir/$outputname.exp"
 +	    $opt_dry_run || {
 +	      $RM $export_symbols
- 	      eval "$SED -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
++	      eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
 +	      case $host in
 +	      *cygwin* | *mingw* | *cegcc* )
 +                eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
 +                eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
 +	        ;;
 +	      esac
 +	    }
 +	  else
 +	    $opt_dry_run || {
- 	      eval "$SED -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
++	      eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
 +	      eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
 +	      eval '$MV "$nlist"T "$nlist"'
 +	      case $host in
 +	        *cygwin* | *mingw* | *cegcc* )
 +	          eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
 +	          eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
 +	          ;;
 +	      esac
 +	    }
 +	  fi
 +	fi
 +
 +	for dlprefile in $dlprefiles; do
- 	  func_verbose "extracting global C symbols from '$dlprefile'"
++	  func_verbose "extracting global C symbols from \`$dlprefile'"
 +	  func_basename "$dlprefile"
- 	  name=$func_basename_result
++	  name="$func_basename_result"
 +          case $host in
 +	    *cygwin* | *mingw* | *cegcc* )
 +	      # if an import library, we need to obtain dlname
 +	      if func_win32_import_lib_p "$dlprefile"; then
 +	        func_tr_sh "$dlprefile"
 +	        eval "curr_lafile=\$libfile_$func_tr_sh_result"
- 	        dlprefile_dlbasename=
++	        dlprefile_dlbasename=""
 +	        if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then
 +	          # Use subshell, to avoid clobbering current variable values
 +	          dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"`
- 	          if test -n "$dlprefile_dlname"; then
++	          if test -n "$dlprefile_dlname" ; then
 +	            func_basename "$dlprefile_dlname"
- 	            dlprefile_dlbasename=$func_basename_result
++	            dlprefile_dlbasename="$func_basename_result"
 +	          else
 +	            # no lafile. user explicitly requested -dlpreopen <import library>.
 +	            $sharedlib_from_linklib_cmd "$dlprefile"
 +	            dlprefile_dlbasename=$sharedlib_from_linklib_result
 +	          fi
 +	        fi
 +	        $opt_dry_run || {
- 	          if test -n "$dlprefile_dlbasename"; then
++	          if test -n "$dlprefile_dlbasename" ; then
 +	            eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'
 +	          else
 +	            func_warning "Could not compute DLL name from $name"
 +	            eval '$ECHO ": $name " >> "$nlist"'
 +	          fi
 +	          func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
 +	          eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe |
 +	            $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'"
 +	        }
 +	      else # not an import lib
 +	        $opt_dry_run || {
 +	          eval '$ECHO ": $name " >> "$nlist"'
 +	          func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
 +	          eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
 +	        }
 +	      fi
 +	    ;;
 +	    *)
 +	      $opt_dry_run || {
 +	        eval '$ECHO ": $name " >> "$nlist"'
 +	        func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
 +	        eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
 +	      }
 +	    ;;
 +          esac
 +	done
 +
 +	$opt_dry_run || {
 +	  # Make sure we have at least an empty file.
 +	  test -f "$nlist" || : > "$nlist"
 +
 +	  if test -n "$exclude_expsyms"; then
 +	    $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
 +	    $MV "$nlist"T "$nlist"
 +	  fi
 +
 +	  # Try sorting and uniquifying the output.
 +	  if $GREP -v "^: " < "$nlist" |
 +	      if sort -k 3 </dev/null >/dev/null 2>&1; then
 +		sort -k 3
 +	      else
 +		sort +2
 +	      fi |
 +	      uniq > "$nlist"S; then
 +	    :
 +	  else
 +	    $GREP -v "^: " < "$nlist" > "$nlist"S
 +	  fi
 +
 +	  if test -f "$nlist"S; then
 +	    eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'
 +	  else
 +	    echo '/* NONE */' >> "$output_objdir/$my_dlsyms"
 +	  fi
 +
- 	  func_show_eval '$RM "${nlist}I"'
- 	  if test -n "$global_symbol_to_import"; then
- 	    eval "$global_symbol_to_import"' < "$nlist"S > "$nlist"I'
- 	  fi
- 
 +	  echo >> "$output_objdir/$my_dlsyms" "\
 +
 +/* The mapping between symbol names and symbols.  */
 +typedef struct {
 +  const char *name;
 +  void *address;
 +} lt_dlsymlist;
 +extern LT_DLSYM_CONST lt_dlsymlist
- lt_${my_prefix}_LTX_preloaded_symbols[];\
- "
- 
- 	  if test -s "$nlist"I; then
- 	    echo >> "$output_objdir/$my_dlsyms" "\
- static void lt_syminit(void)
- {
-   LT_DLSYM_CONST lt_dlsymlist *symbol = lt_${my_prefix}_LTX_preloaded_symbols;
-   for (; symbol->name; ++symbol)
-     {"
- 	    $SED 's/.*/      if (STREQ (symbol->name, \"&\")) symbol->address = (void *) \&&;/' < "$nlist"I >> "$output_objdir/$my_dlsyms"
- 	    echo >> "$output_objdir/$my_dlsyms" "\
-     }
- }"
- 	  fi
- 	  echo >> "$output_objdir/$my_dlsyms" "\
++lt_${my_prefix}_LTX_preloaded_symbols[];
 +LT_DLSYM_CONST lt_dlsymlist
 +lt_${my_prefix}_LTX_preloaded_symbols[] =
- { {\"$my_originator\", (void *) 0},"
- 
- 	  if test -s "$nlist"I; then
- 	    echo >> "$output_objdir/$my_dlsyms" "\
-   {\"@INIT@\", (void *) &lt_syminit},"
- 	  fi
++{\
++  { \"$my_originator\", (void *) 0 },"
 +
 +	  case $need_lib_prefix in
 +	  no)
 +	    eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$my_dlsyms"
 +	    ;;
 +	  *)
 +	    eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms"
 +	    ;;
 +	  esac
 +	  echo >> "$output_objdir/$my_dlsyms" "\
 +  {0, (void *) 0}
 +};
 +
 +/* This works around a problem in FreeBSD linker */
 +#ifdef FREEBSD_WORKAROUND
 +static const void *lt_preloaded_setup() {
 +  return lt_${my_prefix}_LTX_preloaded_symbols;
 +}
 +#endif
 +
 +#ifdef __cplusplus
 +}
 +#endif\
 +"
 +	} # !$opt_dry_run
 +
 +	pic_flag_for_symtable=
 +	case "$compile_command " in
 +	*" -static "*) ;;
 +	*)
 +	  case $host in
 +	  # compiling the symbol table file with pic_flag works around
 +	  # a FreeBSD bug that causes programs to crash when -lm is
 +	  # linked before any other PIC object.  But we must not use
 +	  # pic_flag when linking with -static.  The problem exists in
 +	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
 +	  *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
 +	    pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
 +	  *-*-hpux*)
 +	    pic_flag_for_symtable=" $pic_flag"  ;;
 +	  *)
- 	    $my_pic_p && pic_flag_for_symtable=" $pic_flag"
++	    if test "X$my_pic_p" != Xno; then
++	      pic_flag_for_symtable=" $pic_flag"
++	    fi
 +	    ;;
 +	  esac
 +	  ;;
 +	esac
 +	symtab_cflags=
 +	for arg in $LTCFLAGS; do
 +	  case $arg in
 +	  -pie | -fpie | -fPIE) ;;
 +	  *) func_append symtab_cflags " $arg" ;;
 +	  esac
 +	done
 +
 +	# Now compile the dynamic symbol file.
 +	func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?'
 +
 +	# Clean up the generated files.
- 	func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T" "${nlist}I"'
++	func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"'
 +
 +	# Transform the symbol file into the correct name.
- 	symfileobj=$output_objdir/${my_outputname}S.$objext
++	symfileobj="$output_objdir/${my_outputname}S.$objext"
 +	case $host in
 +	*cygwin* | *mingw* | *cegcc* )
 +	  if test -f "$output_objdir/$my_outputname.def"; then
 +	    compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
 +	    finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
 +	  else
 +	    compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
 +	    finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
 +	  fi
 +	  ;;
 +	*)
 +	  compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
 +	  finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
 +	  ;;
 +	esac
 +	;;
 +      *)
- 	func_fatal_error "unknown suffix for '$my_dlsyms'"
++	func_fatal_error "unknown suffix for \`$my_dlsyms'"
 +	;;
 +      esac
 +    else
 +      # We keep going just in case the user didn't refer to
 +      # lt_preloaded_symbols.  The linker will fail if global_symbol_pipe
 +      # really was required.
 +
 +      # Nullify the symbol file.
 +      compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"`
 +      finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"`
 +    fi
 +}
 +
- # func_cygming_gnu_implib_p ARG
- # This predicate returns with zero status (TRUE) if
- # ARG is a GNU/binutils-style import library. Returns
- # with nonzero status (FALSE) otherwise.
- func_cygming_gnu_implib_p ()
- {
-   $debug_cmd
- 
-   func_to_tool_file "$1" func_convert_file_msys_to_w32
-   func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'`
-   test -n "$func_cygming_gnu_implib_tmp"
- }
- 
- # func_cygming_ms_implib_p ARG
- # This predicate returns with zero status (TRUE) if
- # ARG is an MS-style import library. Returns
- # with nonzero status (FALSE) otherwise.
- func_cygming_ms_implib_p ()
- {
-   $debug_cmd
- 
-   func_to_tool_file "$1" func_convert_file_msys_to_w32
-   func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
-   test -n "$func_cygming_ms_implib_tmp"
- }
- 
 +# func_win32_libid arg
 +# return the library type of file 'arg'
 +#
 +# Need a lot of goo to handle *both* DLLs and import libs
 +# Has to be a shell function in order to 'eat' the argument
 +# that is supplied when $file_magic_command is called.
 +# Despite the name, also deal with 64 bit binaries.
 +func_win32_libid ()
 +{
-   $debug_cmd
- 
-   win32_libid_type=unknown
++  $opt_debug
++  win32_libid_type="unknown"
 +  win32_fileres=`file -L $1 2>/dev/null`
 +  case $win32_fileres in
 +  *ar\ archive\ import\ library*) # definitely import
 +    win32_libid_type="x86 archive import"
 +    ;;
 +  *ar\ archive*) # could be an import, or static
 +    # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
 +    if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
 +       $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
-       case $nm_interface in
-       "MS dumpbin")
- 	if func_cygming_ms_implib_p "$1" ||
- 	   func_cygming_gnu_implib_p "$1"
- 	then
- 	  win32_nmres=import
- 	else
- 	  win32_nmres=
- 	fi
- 	;;
-       *)
- 	func_to_tool_file "$1" func_convert_file_msys_to_w32
- 	win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
- 	  $SED -n -e '
++      func_to_tool_file "$1" func_convert_file_msys_to_w32
++      win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
++	$SED -n -e '
 +	    1,100{
 +		/ I /{
- 		    s|.*|import|
++		    s,.*,import,
 +		    p
 +		    q
 +		}
 +	    }'`
- 	;;
-       esac
 +      case $win32_nmres in
 +      import*)  win32_libid_type="x86 archive import";;
 +      *)        win32_libid_type="x86 archive static";;
 +      esac
 +    fi
 +    ;;
 +  *DLL*)
 +    win32_libid_type="x86 DLL"
 +    ;;
 +  *executable*) # but shell scripts are "executable" too...
 +    case $win32_fileres in
 +    *MS\ Windows\ PE\ Intel*)
 +      win32_libid_type="x86 DLL"
 +      ;;
 +    esac
 +    ;;
 +  esac
 +  $ECHO "$win32_libid_type"
 +}
 +
 +# func_cygming_dll_for_implib ARG
 +#
 +# Platform-specific function to extract the
 +# name of the DLL associated with the specified
 +# import library ARG.
 +# Invoked by eval'ing the libtool variable
 +#    $sharedlib_from_linklib_cmd
 +# Result is available in the variable
 +#    $sharedlib_from_linklib_result
 +func_cygming_dll_for_implib ()
 +{
-   $debug_cmd
- 
++  $opt_debug
 +  sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`
 +}
 +
 +# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs
 +#
 +# The is the core of a fallback implementation of a
 +# platform-specific function to extract the name of the
 +# DLL associated with the specified import library LIBNAME.
 +#
 +# SECTION_NAME is either .idata$6 or .idata$7, depending
 +# on the platform and compiler that created the implib.
 +#
 +# Echos the name of the DLL associated with the
 +# specified import library.
 +func_cygming_dll_for_implib_fallback_core ()
 +{
-   $debug_cmd
- 
++  $opt_debug
 +  match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"`
 +  $OBJDUMP -s --section "$1" "$2" 2>/dev/null |
 +    $SED '/^Contents of section '"$match_literal"':/{
 +      # Place marker at beginning of archive member dllname section
 +      s/.*/====MARK====/
 +      p
 +      d
 +    }
 +    # These lines can sometimes be longer than 43 characters, but
 +    # are always uninteresting
 +    /:[	 ]*file format pe[i]\{,1\}-/d
 +    /^In archive [^:]*:/d
 +    # Ensure marker is printed
 +    /^====MARK====/p
 +    # Remove all lines with less than 43 characters
 +    /^.\{43\}/!d
 +    # From remaining lines, remove first 43 characters
 +    s/^.\{43\}//' |
 +    $SED -n '
 +      # Join marker and all lines until next marker into a single line
 +      /^====MARK====/ b para
 +      H
 +      $ b para
 +      b
 +      :para
 +      x
 +      s/\n//g
 +      # Remove the marker
 +      s/^====MARK====//
 +      # Remove trailing dots and whitespace
 +      s/[\. \t]*$//
 +      # Print
 +      /./p' |
 +    # we now have a list, one entry per line, of the stringified
 +    # contents of the appropriate section of all members of the
-     # archive that possess that section. Heuristic: eliminate
-     # all those that have a first or second character that is
++    # archive which possess that section. Heuristic: eliminate
++    # all those which have a first or second character that is
 +    # a '.' (that is, objdump's representation of an unprintable
 +    # character.) This should work for all archives with less than
 +    # 0x302f exports -- but will fail for DLLs whose name actually
 +    # begins with a literal '.' or a single character followed by
 +    # a '.'.
 +    #
 +    # Of those that remain, print the first one.
 +    $SED -e '/^\./d;/^.\./d;q'
 +}
 +
++# func_cygming_gnu_implib_p ARG
++# This predicate returns with zero status (TRUE) if
++# ARG is a GNU/binutils-style import library. Returns
++# with nonzero status (FALSE) otherwise.
++func_cygming_gnu_implib_p ()
++{
++  $opt_debug
++  func_to_tool_file "$1" func_convert_file_msys_to_w32
++  func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'`
++  test -n "$func_cygming_gnu_implib_tmp"
++}
++
++# func_cygming_ms_implib_p ARG
++# This predicate returns with zero status (TRUE) if
++# ARG is an MS-style import library. Returns
++# with nonzero status (FALSE) otherwise.
++func_cygming_ms_implib_p ()
++{
++  $opt_debug
++  func_to_tool_file "$1" func_convert_file_msys_to_w32
++  func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
++  test -n "$func_cygming_ms_implib_tmp"
++}
++
 +# func_cygming_dll_for_implib_fallback ARG
 +# Platform-specific function to extract the
 +# name of the DLL associated with the specified
 +# import library ARG.
 +#
 +# This fallback implementation is for use when $DLLTOOL
 +# does not support the --identify-strict option.
 +# Invoked by eval'ing the libtool variable
 +#    $sharedlib_from_linklib_cmd
 +# Result is available in the variable
 +#    $sharedlib_from_linklib_result
 +func_cygming_dll_for_implib_fallback ()
 +{
-   $debug_cmd
- 
-   if func_cygming_gnu_implib_p "$1"; then
++  $opt_debug
++  if func_cygming_gnu_implib_p "$1" ; then
 +    # binutils import library
 +    sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"`
-   elif func_cygming_ms_implib_p "$1"; then
++  elif func_cygming_ms_implib_p "$1" ; then
 +    # ms-generated import library
 +    sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"`
 +  else
 +    # unknown
-     sharedlib_from_linklib_result=
++    sharedlib_from_linklib_result=""
 +  fi
 +}
 +
 +
 +# func_extract_an_archive dir oldlib
 +func_extract_an_archive ()
 +{
-     $debug_cmd
- 
-     f_ex_an_ar_dir=$1; shift
-     f_ex_an_ar_oldlib=$1
-     if test yes = "$lock_old_archive_extraction"; then
++    $opt_debug
++    f_ex_an_ar_dir="$1"; shift
++    f_ex_an_ar_oldlib="$1"
++    if test "$lock_old_archive_extraction" = yes; then
 +      lockfile=$f_ex_an_ar_oldlib.lock
 +      until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
 +	func_echo "Waiting for $lockfile to be removed"
 +	sleep 2
 +      done
 +    fi
 +    func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \
 +		   'stat=$?; rm -f "$lockfile"; exit $stat'
-     if test yes = "$lock_old_archive_extraction"; then
++    if test "$lock_old_archive_extraction" = yes; then
 +      $opt_dry_run || rm -f "$lockfile"
 +    fi
 +    if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
 +     :
 +    else
 +      func_fatal_error "object name conflicts in archive: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib"
 +    fi
 +}
 +
 +
 +# func_extract_archives gentop oldlib ...
 +func_extract_archives ()
 +{
-     $debug_cmd
- 
-     my_gentop=$1; shift
++    $opt_debug
++    my_gentop="$1"; shift
 +    my_oldlibs=${1+"$@"}
-     my_oldobjs=
-     my_xlib=
-     my_xabs=
-     my_xdir=
++    my_oldobjs=""
++    my_xlib=""
++    my_xabs=""
++    my_xdir=""
 +
 +    for my_xlib in $my_oldlibs; do
 +      # Extract the objects.
 +      case $my_xlib in
- 	[\\/]* | [A-Za-z]:[\\/]*) my_xabs=$my_xlib ;;
++	[\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
 +	*) my_xabs=`pwd`"/$my_xlib" ;;
 +      esac
 +      func_basename "$my_xlib"
-       my_xlib=$func_basename_result
++      my_xlib="$func_basename_result"
 +      my_xlib_u=$my_xlib
 +      while :; do
 +        case " $extracted_archives " in
 +	*" $my_xlib_u "*)
 +	  func_arith $extracted_serial + 1
 +	  extracted_serial=$func_arith_result
 +	  my_xlib_u=lt$extracted_serial-$my_xlib ;;
 +	*) break ;;
 +	esac
 +      done
 +      extracted_archives="$extracted_archives $my_xlib_u"
-       my_xdir=$my_gentop/$my_xlib_u
++      my_xdir="$my_gentop/$my_xlib_u"
 +
 +      func_mkdir_p "$my_xdir"
 +
 +      case $host in
 +      *-darwin*)
 +	func_verbose "Extracting $my_xabs"
 +	# Do not bother doing anything if just a dry run
 +	$opt_dry_run || {
 +	  darwin_orig_dir=`pwd`
 +	  cd $my_xdir || exit $?
 +	  darwin_archive=$my_xabs
 +	  darwin_curdir=`pwd`
- 	  func_basename "$darwin_archive"
- 	  darwin_base_archive=$func_basename_result
++	  darwin_base_archive=`basename "$darwin_archive"`
 +	  darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true`
 +	  if test -n "$darwin_arches"; then
 +	    darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'`
 +	    darwin_arch=
 +	    func_verbose "$darwin_base_archive has multiple architectures $darwin_arches"
- 	    for darwin_arch in  $darwin_arches; do
- 	      func_mkdir_p "unfat-$$/$darwin_base_archive-$darwin_arch"
- 	      $LIPO -thin $darwin_arch -output "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive" "$darwin_archive"
- 	      cd "unfat-$$/$darwin_base_archive-$darwin_arch"
- 	      func_extract_an_archive "`pwd`" "$darwin_base_archive"
++	    for darwin_arch in  $darwin_arches ; do
++	      func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
++	      $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
++	      cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
++	      func_extract_an_archive "`pwd`" "${darwin_base_archive}"
 +	      cd "$darwin_curdir"
- 	      $RM "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive"
++	      $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
 +	    done # $darwin_arches
 +            ## Okay now we've a bunch of thin objects, gotta fatten them up :)
- 	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$sed_basename" | sort -u`
++	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u`
 +	    darwin_file=
 +	    darwin_files=
 +	    for darwin_file in $darwin_filelist; do
 +	      darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP`
 +	      $LIPO -create -output "$darwin_file" $darwin_files
 +	    done # $darwin_filelist
 +	    $RM -rf unfat-$$
 +	    cd "$darwin_orig_dir"
 +	  else
 +	    cd $darwin_orig_dir
 +	    func_extract_an_archive "$my_xdir" "$my_xabs"
 +	  fi # $darwin_arches
 +	} # !$opt_dry_run
 +	;;
 +      *)
 +        func_extract_an_archive "$my_xdir" "$my_xabs"
 +	;;
 +      esac
 +      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
 +    done
 +
-     func_extract_archives_result=$my_oldobjs
++    func_extract_archives_result="$my_oldobjs"
 +}
 +
 +
 +# func_emit_wrapper [arg=no]
 +#
 +# Emit a libtool wrapper script on stdout.
 +# Don't directly open a file because we may want to
 +# incorporate the script contents within a cygwin/mingw
 +# wrapper executable.  Must ONLY be called from within
 +# func_mode_link because it depends on a number of variables
 +# set therein.
 +#
 +# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
 +# variable will take.  If 'yes', then the emitted script
- # will assume that the directory where it is stored is
++# will assume that the directory in which it is stored is
 +# the $objdir directory.  This is a cygwin/mingw-specific
 +# behavior.
 +func_emit_wrapper ()
 +{
 +	func_emit_wrapper_arg1=${1-no}
 +
 +	$ECHO "\
 +#! $SHELL
 +
 +# $output - temporary wrapper script for $objdir/$outputname
- # Generated by $PROGRAM (GNU $PACKAGE) $VERSION
++# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
 +#
 +# The $output program cannot be directly executed until all the libtool
 +# libraries that it depends on are installed.
 +#
 +# This wrapper script should never be moved out of the build directory.
 +# If it is, it will not operate correctly.
 +
 +# Sed substitution that helps us do robust quoting.  It backslashifies
 +# metacharacters that are still active within double-quoted strings.
 +sed_quote_subst='$sed_quote_subst'
 +
 +# Be Bourne compatible
 +if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
 +  emulate sh
 +  NULLCMD=:
 +  # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
 +  # is contrary to our usage.  Disable this feature.
 +  alias -g '\${1+\"\$@\"}'='\"\$@\"'
 +  setopt NO_GLOB_SUBST
 +else
 +  case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
 +fi
 +BIN_SH=xpg4; export BIN_SH # for Tru64
 +DUALCASE=1; export DUALCASE # for MKS sh
 +
 +# The HP-UX ksh and POSIX shell print the target directory to stdout
 +# if CDPATH is set.
 +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 +
 +relink_command=\"$relink_command\"
 +
 +# This environment variable determines our operation mode.
 +if test \"\$libtool_install_magic\" = \"$magic\"; then
 +  # install mode needs the following variables:
 +  generated_by_libtool_version='$macro_version'
 +  notinst_deplibs='$notinst_deplibs'
 +else
 +  # When we are sourced in execute mode, \$file and \$ECHO are already set.
 +  if test \"\$libtool_execute_magic\" != \"$magic\"; then
 +    file=\"\$0\""
 +
 +    qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"`
 +    $ECHO "\
 +
 +# A function that is used when there is no print builtin or printf.
 +func_fallback_echo ()
 +{
 +  eval 'cat <<_LTECHO_EOF
 +\$1
 +_LTECHO_EOF'
 +}
 +    ECHO=\"$qECHO\"
 +  fi
 +
 +# Very basic option parsing. These options are (a) specific to
 +# the libtool wrapper, (b) are identical between the wrapper
- # /script/ and the wrapper /executable/ that is used only on
++# /script/ and the wrapper /executable/ which is used only on
 +# windows platforms, and (c) all begin with the string "--lt-"
- # (application programs are unlikely to have options that match
++# (application programs are unlikely to have options which match
 +# this pattern).
 +#
 +# There are only two supported options: --lt-debug and
 +# --lt-dump-script. There is, deliberately, no --lt-help.
 +#
 +# The first argument to this parsing function should be the
 +# script's $0 value, followed by "$@".
 +lt_option_debug=
 +func_parse_lt_options ()
 +{
 +  lt_script_arg0=\$0
 +  shift
 +  for lt_opt
 +  do
 +    case \"\$lt_opt\" in
 +    --lt-debug) lt_option_debug=1 ;;
 +    --lt-dump-script)
 +        lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\`
 +        test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=.
 +        lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\`
 +        cat \"\$lt_dump_D/\$lt_dump_F\"
 +        exit 0
 +      ;;
 +    --lt-*)
 +        \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2
 +        exit 1
 +      ;;
 +    esac
 +  done
 +
 +  # Print the debug banner immediately:
 +  if test -n \"\$lt_option_debug\"; then
-     echo \"$outputname:$output:\$LINENO: libtool wrapper (GNU $PACKAGE) $VERSION\" 1>&2
++    echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2
 +  fi
 +}
 +
 +# Used when --lt-debug. Prints its arguments to stdout
 +# (redirection is the responsibility of the caller)
 +func_lt_dump_args ()
 +{
 +  lt_dump_args_N=1;
 +  for lt_arg
 +  do
-     \$ECHO \"$outputname:$output:\$LINENO: newargv[\$lt_dump_args_N]: \$lt_arg\"
++    \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\"
 +    lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
 +  done
 +}
 +
 +# Core function for launching the target application
 +func_exec_program_core ()
 +{
 +"
 +  case $host in
 +  # Backslashes separate directories on plain windows
 +  *-*-mingw | *-*-os2* | *-cegcc*)
 +    $ECHO "\
 +      if test -n \"\$lt_option_debug\"; then
-         \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir\\\\\$program\" 1>&2
++        \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2
 +        func_lt_dump_args \${1+\"\$@\"} 1>&2
 +      fi
 +      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
 +"
 +    ;;
 +
 +  *)
 +    $ECHO "\
 +      if test -n \"\$lt_option_debug\"; then
-         \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir/\$program\" 1>&2
++        \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2
 +        func_lt_dump_args \${1+\"\$@\"} 1>&2
 +      fi
 +      exec \"\$progdir/\$program\" \${1+\"\$@\"}
 +"
 +    ;;
 +  esac
 +  $ECHO "\
 +      \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
 +      exit 1
 +}
 +
 +# A function to encapsulate launching the target application
 +# Strips options in the --lt-* namespace from \$@ and
 +# launches target application with the remaining arguments.
 +func_exec_program ()
 +{
 +  case \" \$* \" in
 +  *\\ --lt-*)
 +    for lt_wr_arg
 +    do
 +      case \$lt_wr_arg in
 +      --lt-*) ;;
 +      *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
 +      esac
 +      shift
 +    done ;;
 +  esac
 +  func_exec_program_core \${1+\"\$@\"}
 +}
 +
 +  # Parse options
 +  func_parse_lt_options \"\$0\" \${1+\"\$@\"}
 +
 +  # Find the directory that this script lives in.
 +  thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\`
 +  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
 +
 +  # Follow symbolic links until we get to the real thisdir.
 +  file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\`
 +  while test -n \"\$file\"; do
 +    destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\`
 +
 +    # If there was a directory component, then change thisdir.
 +    if test \"x\$destdir\" != \"x\$file\"; then
 +      case \"\$destdir\" in
 +      [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
 +      *) thisdir=\"\$thisdir/\$destdir\" ;;
 +      esac
 +    fi
 +
 +    file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\`
 +    file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\`
 +  done
 +
 +  # Usually 'no', except on cygwin/mingw when embedded into
 +  # the cwrapper.
 +  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1
 +  if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
 +    # special case for '.'
 +    if test \"\$thisdir\" = \".\"; then
 +      thisdir=\`pwd\`
 +    fi
 +    # remove .libs from thisdir
 +    case \"\$thisdir\" in
 +    *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;;
 +    $objdir )   thisdir=. ;;
 +    esac
 +  fi
 +
 +  # Try to get the absolute directory name.
 +  absdir=\`cd \"\$thisdir\" && pwd\`
 +  test -n \"\$absdir\" && thisdir=\"\$absdir\"
 +"
 +
- 	if test yes = "$fast_install"; then
++	if test "$fast_install" = yes; then
 +	  $ECHO "\
 +  program=lt-'$outputname'$exeext
 +  progdir=\"\$thisdir/$objdir\"
 +
 +  if test ! -f \"\$progdir/\$program\" ||
-      { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | $SED 1q\`; \\
++     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
 +       test \"X\$file\" != \"X\$progdir/\$program\"; }; then
 +
 +    file=\"\$\$-\$program\"
 +
 +    if test ! -d \"\$progdir\"; then
 +      $MKDIR \"\$progdir\"
 +    else
 +      $RM \"\$progdir/\$file\"
 +    fi"
 +
 +	  $ECHO "\
 +
 +    # relink executable if necessary
 +    if test -n \"\$relink_command\"; then
 +      if relink_command_output=\`eval \$relink_command 2>&1\`; then :
 +      else
- 	\$ECHO \"\$relink_command_output\" >&2
++	$ECHO \"\$relink_command_output\" >&2
 +	$RM \"\$progdir/\$file\"
 +	exit 1
 +      fi
 +    fi
 +
 +    $MV \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
 +    { $RM \"\$progdir/\$program\";
 +      $MV \"\$progdir/\$file\" \"\$progdir/\$program\"; }
 +    $RM \"\$progdir/\$file\"
 +  fi"
 +	else
 +	  $ECHO "\
 +  program='$outputname'
 +  progdir=\"\$thisdir/$objdir\"
 +"
 +	fi
 +
 +	$ECHO "\
 +
 +  if test -f \"\$progdir/\$program\"; then"
 +
 +	# fixup the dll searchpath if we need to.
 +	#
 +	# Fix the DLL searchpath if we need to.  Do this before prepending
 +	# to shlibpath, because on Windows, both are PATH and uninstalled
 +	# libraries must come first.
 +	if test -n "$dllsearchpath"; then
 +	  $ECHO "\
 +    # Add the dll search path components to the executable PATH
 +    PATH=$dllsearchpath:\$PATH
 +"
 +	fi
 +
 +	# Export our shlibpath_var if we have one.
- 	if test yes = "$shlibpath_overrides_runpath" && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
++	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
 +	  $ECHO "\
 +    # Add our own library path to $shlibpath_var
 +    $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
 +
 +    # Some systems cannot cope with colon-terminated $shlibpath_var
 +    # The second colon is a workaround for a bug in BeOS R4 sed
 +    $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\`
 +
 +    export $shlibpath_var
 +"
 +	fi
 +
 +	$ECHO "\
 +    if test \"\$libtool_execute_magic\" != \"$magic\"; then
 +      # Run the actual program with our arguments.
 +      func_exec_program \${1+\"\$@\"}
 +    fi
 +  else
 +    # The program doesn't exist.
-     \$ECHO \"\$0: error: '\$progdir/\$program' does not exist\" 1>&2
++    \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
 +    \$ECHO \"This script is just a wrapper for \$program.\" 1>&2
 +    \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
 +    exit 1
 +  fi
 +fi\
 +"
 +}
 +
 +
 +# func_emit_cwrapperexe_src
 +# emit the source code for a wrapper executable on stdout
 +# Must ONLY be called from within func_mode_link because
 +# it depends on a number of variable set therein.
 +func_emit_cwrapperexe_src ()
 +{
 +	cat <<EOF
 +
 +/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
-    Generated by $PROGRAM (GNU $PACKAGE) $VERSION
++   Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
 +
 +   The $output program cannot be directly executed until all the libtool
 +   libraries that it depends on are installed.
 +
 +   This wrapper executable should never be moved out of the build directory.
 +   If it is, it will not operate correctly.
 +*/
 +EOF
 +	    cat <<"EOF"
 +#ifdef _MSC_VER
 +# define _CRT_SECURE_NO_DEPRECATE 1
 +#endif
 +#include <stdio.h>
 +#include <stdlib.h>
 +#ifdef _MSC_VER
 +# include <direct.h>
 +# include <process.h>
 +# include <io.h>
 +#else
 +# include <unistd.h>
 +# include <stdint.h>
 +# ifdef __CYGWIN__
 +#  include <io.h>
 +# endif
 +#endif
 +#include <malloc.h>
 +#include <stdarg.h>
 +#include <assert.h>
 +#include <string.h>
 +#include <ctype.h>
 +#include <errno.h>
 +#include <fcntl.h>
 +#include <sys/stat.h>
 +
- #define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0)
- 
 +/* declarations of non-ANSI functions */
- #if defined __MINGW32__
++#if defined(__MINGW32__)
 +# ifdef __STRICT_ANSI__
 +int _putenv (const char *);
 +# endif
- #elif defined __CYGWIN__
++#elif defined(__CYGWIN__)
 +# ifdef __STRICT_ANSI__
 +char *realpath (const char *, char *);
 +int putenv (char *);
 +int setenv (const char *, const char *, int);
 +# endif
- /* #elif defined other_platform || defined ... */
++/* #elif defined (other platforms) ... */
 +#endif
 +
 +/* portability defines, excluding path handling macros */
- #if defined _MSC_VER
++#if defined(_MSC_VER)
 +# define setmode _setmode
 +# define stat    _stat
 +# define chmod   _chmod
 +# define getcwd  _getcwd
 +# define putenv  _putenv
 +# define S_IXUSR _S_IEXEC
- #elif defined __MINGW32__
++# ifndef _INTPTR_T_DEFINED
++#  define _INTPTR_T_DEFINED
++#  define intptr_t int
++# endif
++#elif defined(__MINGW32__)
 +# define setmode _setmode
 +# define stat    _stat
 +# define chmod   _chmod
 +# define getcwd  _getcwd
 +# define putenv  _putenv
- #elif defined __CYGWIN__
++#elif defined(__CYGWIN__)
 +# define HAVE_SETENV
 +# define FOPEN_WB "wb"
- /* #elif defined other platforms ... */
++/* #elif defined (other platforms) ... */
 +#endif
 +
- #if defined PATH_MAX
++#if defined(PATH_MAX)
 +# define LT_PATHMAX PATH_MAX
- #elif defined MAXPATHLEN
++#elif defined(MAXPATHLEN)
 +# define LT_PATHMAX MAXPATHLEN
 +#else
 +# define LT_PATHMAX 1024
 +#endif
 +
 +#ifndef S_IXOTH
 +# define S_IXOTH 0
 +#endif
 +#ifndef S_IXGRP
 +# define S_IXGRP 0
 +#endif
 +
 +/* path handling portability macros */
 +#ifndef DIR_SEPARATOR
 +# define DIR_SEPARATOR '/'
 +# define PATH_SEPARATOR ':'
 +#endif
 +
- #if defined _WIN32 || defined __MSDOS__ || defined __DJGPP__ || \
-   defined __OS2__
++#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
++  defined (__OS2__)
 +# define HAVE_DOS_BASED_FILE_SYSTEM
 +# define FOPEN_WB "wb"
 +# ifndef DIR_SEPARATOR_2
 +#  define DIR_SEPARATOR_2 '\\'
 +# endif
 +# ifndef PATH_SEPARATOR_2
 +#  define PATH_SEPARATOR_2 ';'
 +# endif
 +#endif
 +
 +#ifndef DIR_SEPARATOR_2
 +# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
 +#else /* DIR_SEPARATOR_2 */
 +# define IS_DIR_SEPARATOR(ch) \
 +	(((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
 +#endif /* DIR_SEPARATOR_2 */
 +
 +#ifndef PATH_SEPARATOR_2
 +# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR)
 +#else /* PATH_SEPARATOR_2 */
 +# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
 +#endif /* PATH_SEPARATOR_2 */
 +
 +#ifndef FOPEN_WB
 +# define FOPEN_WB "w"
 +#endif
 +#ifndef _O_BINARY
 +# define _O_BINARY 0
 +#endif
 +
 +#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
 +#define XFREE(stale) do { \
-   if (stale) { free (stale); stale = 0; } \
++  if (stale) { free ((void *) stale); stale = 0; } \
 +} while (0)
 +
- #if defined LT_DEBUGWRAPPER
++#if defined(LT_DEBUGWRAPPER)
 +static int lt_debug = 1;
 +#else
 +static int lt_debug = 0;
 +#endif
 +
 +const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */
 +
 +void *xmalloc (size_t num);
 +char *xstrdup (const char *string);
 +const char *base_name (const char *name);
 +char *find_executable (const char *wrapper);
 +char *chase_symlinks (const char *pathspec);
 +int make_executable (const char *path);
 +int check_executable (const char *path);
 +char *strendzap (char *str, const char *pat);
 +void lt_debugprintf (const char *file, int line, const char *fmt, ...);
 +void lt_fatal (const char *file, int line, const char *message, ...);
 +static const char *nonnull (const char *s);
 +static const char *nonempty (const char *s);
 +void lt_setenv (const char *name, const char *value);
 +char *lt_extend_str (const char *orig_value, const char *add, int to_end);
 +void lt_update_exe_path (const char *name, const char *value);
 +void lt_update_lib_path (const char *name, const char *value);
 +char **prepare_spawn (char **argv);
 +void lt_dump_script (FILE *f);
 +EOF
 +
 +	    cat <<EOF
- #if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 5)
- # define externally_visible volatile
- #else
- # define externally_visible __attribute__((externally_visible)) volatile
- #endif
- externally_visible const char * MAGIC_EXE = "$magic_exe";
++volatile const char * MAGIC_EXE = "$magic_exe";
 +const char * LIB_PATH_VARNAME = "$shlibpath_var";
 +EOF
 +
- 	    if test yes = "$shlibpath_overrides_runpath" && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
++	    if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
 +              func_to_host_path "$temp_rpath"
 +	      cat <<EOF
 +const char * LIB_PATH_VALUE   = "$func_to_host_path_result";
 +EOF
 +	    else
 +	      cat <<"EOF"
 +const char * LIB_PATH_VALUE   = "";
 +EOF
 +	    fi
 +
 +	    if test -n "$dllsearchpath"; then
 +              func_to_host_path "$dllsearchpath:"
 +	      cat <<EOF
 +const char * EXE_PATH_VARNAME = "PATH";
 +const char * EXE_PATH_VALUE   = "$func_to_host_path_result";
 +EOF
 +	    else
 +	      cat <<"EOF"
 +const char * EXE_PATH_VARNAME = "";
 +const char * EXE_PATH_VALUE   = "";
 +EOF
 +	    fi
 +
- 	    if test yes = "$fast_install"; then
++	    if test "$fast_install" = yes; then
 +	      cat <<EOF
 +const char * TARGET_PROGRAM_NAME = "lt-$outputname"; /* hopefully, no .exe */
 +EOF
 +	    else
 +	      cat <<EOF
 +const char * TARGET_PROGRAM_NAME = "$outputname"; /* hopefully, no .exe */
 +EOF
 +	    fi
 +
 +
 +	    cat <<"EOF"
 +
 +#define LTWRAPPER_OPTION_PREFIX         "--lt-"
 +
 +static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
 +static const char *dumpscript_opt       = LTWRAPPER_OPTION_PREFIX "dump-script";
 +static const char *debug_opt            = LTWRAPPER_OPTION_PREFIX "debug";
 +
 +int
 +main (int argc, char *argv[])
 +{
 +  char **newargz;
 +  int  newargc;
 +  char *tmp_pathspec;
 +  char *actual_cwrapper_path;
 +  char *actual_cwrapper_name;
 +  char *target_name;
 +  char *lt_argv_zero;
-   int rval = 127;
++  intptr_t rval = 127;
 +
 +  int i;
 +
 +  program_name = (char *) xstrdup (base_name (argv[0]));
-   newargz = XMALLOC (char *, (size_t) argc + 1);
++  newargz = XMALLOC (char *, argc + 1);
 +
 +  /* very simple arg parsing; don't want to rely on getopt
 +   * also, copy all non cwrapper options to newargz, except
 +   * argz[0], which is handled differently
 +   */
 +  newargc=0;
 +  for (i = 1; i < argc; i++)
 +    {
-       if (STREQ (argv[i], dumpscript_opt))
++      if (strcmp (argv[i], dumpscript_opt) == 0)
 +	{
 +EOF
- 	    case $host in
++	    case "$host" in
 +	      *mingw* | *cygwin* )
 +		# make stdout use "unix" line endings
 +		echo "          setmode(1,_O_BINARY);"
 +		;;
 +	      esac
 +
 +	    cat <<"EOF"
 +	  lt_dump_script (stdout);
 +	  return 0;
 +	}
-       if (STREQ (argv[i], debug_opt))
++      if (strcmp (argv[i], debug_opt) == 0)
 +	{
 +          lt_debug = 1;
 +          continue;
 +	}
-       if (STREQ (argv[i], ltwrapper_option_prefix))
++      if (strcmp (argv[i], ltwrapper_option_prefix) == 0)
 +        {
 +          /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
 +             namespace, but it is not one of the ones we know about and
 +             have already dealt with, above (inluding dump-script), then
 +             report an error. Otherwise, targets might begin to believe
 +             they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
 +             namespace. The first time any user complains about this, we'll
 +             need to make LTWRAPPER_OPTION_PREFIX a configure-time option
 +             or a configure.ac-settable value.
 +           */
 +          lt_fatal (__FILE__, __LINE__,
 +		    "unrecognized %s option: '%s'",
 +                    ltwrapper_option_prefix, argv[i]);
 +        }
 +      /* otherwise ... */
 +      newargz[++newargc] = xstrdup (argv[i]);
 +    }
 +  newargz[++newargc] = NULL;
 +
 +EOF
 +	    cat <<EOF
 +  /* The GNU banner must be the first non-error debug message */
-   lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE) $VERSION\n");
++  lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n");
 +EOF
 +	    cat <<"EOF"
 +  lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]);
 +  lt_debugprintf (__FILE__, __LINE__, "(main) program_name: %s\n", program_name);
 +
 +  tmp_pathspec = find_executable (argv[0]);
 +  if (tmp_pathspec == NULL)
 +    lt_fatal (__FILE__, __LINE__, "couldn't find %s", argv[0]);
 +  lt_debugprintf (__FILE__, __LINE__,
 +                  "(main) found exe (before symlink chase) at: %s\n",
 +		  tmp_pathspec);
 +
 +  actual_cwrapper_path = chase_symlinks (tmp_pathspec);
 +  lt_debugprintf (__FILE__, __LINE__,
 +                  "(main) found exe (after symlink chase) at: %s\n",
 +		  actual_cwrapper_path);
 +  XFREE (tmp_pathspec);
 +
 +  actual_cwrapper_name = xstrdup (base_name (actual_cwrapper_path));
 +  strendzap (actual_cwrapper_path, actual_cwrapper_name);
 +
 +  /* wrapper name transforms */
 +  strendzap (actual_cwrapper_name, ".exe");
 +  tmp_pathspec = lt_extend_str (actual_cwrapper_name, ".exe", 1);
 +  XFREE (actual_cwrapper_name);
 +  actual_cwrapper_name = tmp_pathspec;
 +  tmp_pathspec = 0;
 +
 +  /* target_name transforms -- use actual target program name; might have lt- prefix */
 +  target_name = xstrdup (base_name (TARGET_PROGRAM_NAME));
 +  strendzap (target_name, ".exe");
 +  tmp_pathspec = lt_extend_str (target_name, ".exe", 1);
 +  XFREE (target_name);
 +  target_name = tmp_pathspec;
 +  tmp_pathspec = 0;
 +
 +  lt_debugprintf (__FILE__, __LINE__,
 +		  "(main) libtool target name: %s\n",
 +		  target_name);
 +EOF
 +
 +	    cat <<EOF
 +  newargz[0] =
 +    XMALLOC (char, (strlen (actual_cwrapper_path) +
 +		    strlen ("$objdir") + 1 + strlen (actual_cwrapper_name) + 1));
 +  strcpy (newargz[0], actual_cwrapper_path);
 +  strcat (newargz[0], "$objdir");
 +  strcat (newargz[0], "/");
 +EOF
 +
 +	    cat <<"EOF"
 +  /* stop here, and copy so we don't have to do this twice */
 +  tmp_pathspec = xstrdup (newargz[0]);
 +
 +  /* do NOT want the lt- prefix here, so use actual_cwrapper_name */
 +  strcat (newargz[0], actual_cwrapper_name);
 +
 +  /* DO want the lt- prefix here if it exists, so use target_name */
 +  lt_argv_zero = lt_extend_str (tmp_pathspec, target_name, 1);
 +  XFREE (tmp_pathspec);
 +  tmp_pathspec = NULL;
 +EOF
 +
 +	    case $host_os in
 +	      mingw*)
 +	    cat <<"EOF"
 +  {
 +    char* p;
 +    while ((p = strchr (newargz[0], '\\')) != NULL)
 +      {
 +	*p = '/';
 +      }
 +    while ((p = strchr (lt_argv_zero, '\\')) != NULL)
 +      {
 +	*p = '/';
 +      }
 +  }
 +EOF
 +	    ;;
 +	    esac
 +
 +	    cat <<"EOF"
 +  XFREE (target_name);
 +  XFREE (actual_cwrapper_path);
 +  XFREE (actual_cwrapper_name);
 +
 +  lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
 +  lt_setenv ("DUALCASE", "1");  /* for MSK sh */
 +  /* Update the DLL searchpath.  EXE_PATH_VALUE ($dllsearchpath) must
 +     be prepended before (that is, appear after) LIB_PATH_VALUE ($temp_rpath)
 +     because on Windows, both *_VARNAMEs are PATH but uninstalled
 +     libraries must come first. */
 +  lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
 +  lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
 +
 +  lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n",
 +		  nonnull (lt_argv_zero));
 +  for (i = 0; i < newargc; i++)
 +    {
 +      lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n",
 +		      i, nonnull (newargz[i]));
 +    }
 +
 +EOF
 +
 +	    case $host_os in
 +	      mingw*)
 +		cat <<"EOF"
 +  /* execv doesn't actually work on mingw as expected on unix */
 +  newargz = prepare_spawn (newargz);
-   rval = (int) _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
++  rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
 +  if (rval == -1)
 +    {
 +      /* failed to start process */
 +      lt_debugprintf (__FILE__, __LINE__,
 +		      "(main) failed to launch target \"%s\": %s\n",
 +		      lt_argv_zero, nonnull (strerror (errno)));
 +      return 127;
 +    }
 +  return rval;
 +EOF
 +		;;
 +	      *)
 +		cat <<"EOF"
 +  execv (lt_argv_zero, newargz);
 +  return rval; /* =127, but avoids unused variable warning */
 +EOF
 +		;;
 +	    esac
 +
 +	    cat <<"EOF"
 +}
 +
 +void *
 +xmalloc (size_t num)
 +{
 +  void *p = (void *) malloc (num);
 +  if (!p)
 +    lt_fatal (__FILE__, __LINE__, "memory exhausted");
 +
 +  return p;
 +}
 +
 +char *
 +xstrdup (const char *string)
 +{
 +  return string ? strcpy ((char *) xmalloc (strlen (string) + 1),
 +			  string) : NULL;
 +}
 +
 +const char *
 +base_name (const char *name)
 +{
 +  const char *base;
 +
- #if defined HAVE_DOS_BASED_FILE_SYSTEM
++#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
 +  /* Skip over the disk name in MSDOS pathnames. */
 +  if (isalpha ((unsigned char) name[0]) && name[1] == ':')
 +    name += 2;
 +#endif
 +
 +  for (base = name; *name; name++)
 +    if (IS_DIR_SEPARATOR (*name))
 +      base = name + 1;
 +  return base;
 +}
 +
 +int
 +check_executable (const char *path)
 +{
 +  struct stat st;
 +
 +  lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n",
 +                  nonempty (path));
 +  if ((!path) || (!*path))
 +    return 0;
 +
 +  if ((stat (path, &st) >= 0)
 +      && (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)))
 +    return 1;
 +  else
 +    return 0;
 +}
 +
 +int
 +make_executable (const char *path)
 +{
 +  int rval = 0;
 +  struct stat st;
 +
 +  lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n",
 +                  nonempty (path));
 +  if ((!path) || (!*path))
 +    return 0;
 +
 +  if (stat (path, &st) >= 0)
 +    {
 +      rval = chmod (path, st.st_mode | S_IXOTH | S_IXGRP | S_IXUSR);
 +    }
 +  return rval;
 +}
 +
 +/* Searches for the full path of the wrapper.  Returns
 +   newly allocated full path name if found, NULL otherwise
 +   Does not chase symlinks, even on platforms that support them.
 +*/
 +char *
 +find_executable (const char *wrapper)
 +{
 +  int has_slash = 0;
 +  const char *p;
 +  const char *p_next;
 +  /* static buffer for getcwd */
 +  char tmp[LT_PATHMAX + 1];
-   size_t tmp_len;
++  int tmp_len;
 +  char *concat_name;
 +
 +  lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
 +                  nonempty (wrapper));
 +
 +  if ((wrapper == NULL) || (*wrapper == '\0'))
 +    return NULL;
 +
 +  /* Absolute path? */
- #if defined HAVE_DOS_BASED_FILE_SYSTEM
++#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
 +  if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':')
 +    {
 +      concat_name = xstrdup (wrapper);
 +      if (check_executable (concat_name))
 +	return concat_name;
 +      XFREE (concat_name);
 +    }
 +  else
 +    {
 +#endif
 +      if (IS_DIR_SEPARATOR (wrapper[0]))
 +	{
 +	  concat_name = xstrdup (wrapper);
 +	  if (check_executable (concat_name))
 +	    return concat_name;
 +	  XFREE (concat_name);
 +	}
- #if defined HAVE_DOS_BASED_FILE_SYSTEM
++#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
 +    }
 +#endif
 +
 +  for (p = wrapper; *p; p++)
 +    if (*p == '/')
 +      {
 +	has_slash = 1;
 +	break;
 +      }
 +  if (!has_slash)
 +    {
 +      /* no slashes; search PATH */
 +      const char *path = getenv ("PATH");
 +      if (path != NULL)
 +	{
 +	  for (p = path; *p; p = p_next)
 +	    {
 +	      const char *q;
 +	      size_t p_len;
 +	      for (q = p; *q; q++)
 +		if (IS_PATH_SEPARATOR (*q))
 +		  break;
- 	      p_len = (size_t) (q - p);
++	      p_len = q - p;
 +	      p_next = (*q == '\0' ? q : q + 1);
 +	      if (p_len == 0)
 +		{
 +		  /* empty path: current directory */
 +		  if (getcwd (tmp, LT_PATHMAX) == NULL)
 +		    lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
 +                              nonnull (strerror (errno)));
 +		  tmp_len = strlen (tmp);
 +		  concat_name =
 +		    XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
 +		  memcpy (concat_name, tmp, tmp_len);
 +		  concat_name[tmp_len] = '/';
 +		  strcpy (concat_name + tmp_len + 1, wrapper);
 +		}
 +	      else
 +		{
 +		  concat_name =
 +		    XMALLOC (char, p_len + 1 + strlen (wrapper) + 1);
 +		  memcpy (concat_name, p, p_len);
 +		  concat_name[p_len] = '/';
 +		  strcpy (concat_name + p_len + 1, wrapper);
 +		}
 +	      if (check_executable (concat_name))
 +		return concat_name;
 +	      XFREE (concat_name);
 +	    }
 +	}
 +      /* not found in PATH; assume curdir */
 +    }
 +  /* Relative path | not found in path: prepend cwd */
 +  if (getcwd (tmp, LT_PATHMAX) == NULL)
 +    lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
 +              nonnull (strerror (errno)));
 +  tmp_len = strlen (tmp);
 +  concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
 +  memcpy (concat_name, tmp, tmp_len);
 +  concat_name[tmp_len] = '/';
 +  strcpy (concat_name + tmp_len + 1, wrapper);
 +
 +  if (check_executable (concat_name))
 +    return concat_name;
 +  XFREE (concat_name);
 +  return NULL;
 +}
 +
 +char *
 +chase_symlinks (const char *pathspec)
 +{
 +#ifndef S_ISLNK
 +  return xstrdup (pathspec);
 +#else
 +  char buf[LT_PATHMAX];
 +  struct stat s;
 +  char *tmp_pathspec = xstrdup (pathspec);
 +  char *p;
 +  int has_symlinks = 0;
 +  while (strlen (tmp_pathspec) && !has_symlinks)
 +    {
 +      lt_debugprintf (__FILE__, __LINE__,
 +		      "checking path component for symlinks: %s\n",
 +		      tmp_pathspec);
 +      if (lstat (tmp_pathspec, &s) == 0)
 +	{
 +	  if (S_ISLNK (s.st_mode) != 0)
 +	    {
 +	      has_symlinks = 1;
 +	      break;
 +	    }
 +
 +	  /* search backwards for last DIR_SEPARATOR */
 +	  p = tmp_pathspec + strlen (tmp_pathspec) - 1;
 +	  while ((p > tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
 +	    p--;
 +	  if ((p == tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
 +	    {
 +	      /* no more DIR_SEPARATORS left */
 +	      break;
 +	    }
 +	  *p = '\0';
 +	}
 +      else
 +	{
 +	  lt_fatal (__FILE__, __LINE__,
 +		    "error accessing file \"%s\": %s",
 +		    tmp_pathspec, nonnull (strerror (errno)));
 +	}
 +    }
 +  XFREE (tmp_pathspec);
 +
 +  if (!has_symlinks)
 +    {
 +      return xstrdup (pathspec);
 +    }
 +
 +  tmp_pathspec = realpath (pathspec, buf);
 +  if (tmp_pathspec == 0)
 +    {
 +      lt_fatal (__FILE__, __LINE__,
 +		"could not follow symlinks for %s", pathspec);
 +    }
 +  return xstrdup (tmp_pathspec);
 +#endif
 +}
 +
 +char *
 +strendzap (char *str, const char *pat)
 +{
 +  size_t len, patlen;
 +
 +  assert (str != NULL);
 +  assert (pat != NULL);
 +
 +  len = strlen (str);
 +  patlen = strlen (pat);
 +
 +  if (patlen <= len)
 +    {
 +      str += len - patlen;
-       if (STREQ (str, pat))
++      if (strcmp (str, pat) == 0)
 +	*str = '\0';
 +    }
 +  return str;
 +}
 +
 +void
 +lt_debugprintf (const char *file, int line, const char *fmt, ...)
 +{
 +  va_list args;
 +  if (lt_debug)
 +    {
 +      (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line);
 +      va_start (args, fmt);
 +      (void) vfprintf (stderr, fmt, args);
 +      va_end (args);
 +    }
 +}
 +
 +static void
 +lt_error_core (int exit_status, const char *file,
 +	       int line, const char *mode,
 +	       const char *message, va_list ap)
 +{
 +  fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode);
 +  vfprintf (stderr, message, ap);
 +  fprintf (stderr, ".\n");
 +
 +  if (exit_status >= 0)
 +    exit (exit_status);
 +}
 +
 +void
 +lt_fatal (const char *file, int line, const char *message, ...)
 +{
 +  va_list ap;
 +  va_start (ap, message);
 +  lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap);
 +  va_end (ap);
 +}
 +
 +static const char *
 +nonnull (const char *s)
 +{
 +  return s ? s : "(null)";
 +}
 +
 +static const char *
 +nonempty (const char *s)
 +{
 +  return (s && !*s) ? "(empty)" : nonnull (s);
 +}
 +
 +void
 +lt_setenv (const char *name, const char *value)
 +{
 +  lt_debugprintf (__FILE__, __LINE__,
 +		  "(lt_setenv) setting '%s' to '%s'\n",
 +                  nonnull (name), nonnull (value));
 +  {
 +#ifdef HAVE_SETENV
 +    /* always make a copy, for consistency with !HAVE_SETENV */
 +    char *str = xstrdup (value);
 +    setenv (name, str, 1);
 +#else
-     size_t len = strlen (name) + 1 + strlen (value) + 1;
++    int len = strlen (name) + 1 + strlen (value) + 1;
 +    char *str = XMALLOC (char, len);
 +    sprintf (str, "%s=%s", name, value);
 +    if (putenv (str) != EXIT_SUCCESS)
 +      {
 +        XFREE (str);
 +      }
 +#endif
 +  }
 +}
 +
 +char *
 +lt_extend_str (const char *orig_value, const char *add, int to_end)
 +{
 +  char *new_value;
 +  if (orig_value && *orig_value)
 +    {
-       size_t orig_value_len = strlen (orig_value);
-       size_t add_len = strlen (add);
++      int orig_value_len = strlen (orig_value);
++      int add_len = strlen (add);
 +      new_value = XMALLOC (char, add_len + orig_value_len + 1);
 +      if (to_end)
 +        {
 +          strcpy (new_value, orig_value);
 +          strcpy (new_value + orig_value_len, add);
 +        }
 +      else
 +        {
 +          strcpy (new_value, add);
 +          strcpy (new_value + add_len, orig_value);
 +        }
 +    }
 +  else
 +    {
 +      new_value = xstrdup (add);
 +    }
 +  return new_value;
 +}
 +
 +void
 +lt_update_exe_path (const char *name, const char *value)
 +{
 +  lt_debugprintf (__FILE__, __LINE__,
 +		  "(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
 +                  nonnull (name), nonnull (value));
 +
 +  if (name && *name && value && *value)
 +    {
 +      char *new_value = lt_extend_str (getenv (name), value, 0);
 +      /* some systems can't cope with a ':'-terminated path #' */
-       size_t len = strlen (new_value);
-       while ((len > 0) && IS_PATH_SEPARATOR (new_value[len-1]))
++      int len = strlen (new_value);
++      while (((len = strlen (new_value)) > 0) && IS_PATH_SEPARATOR (new_value[len-1]))
 +        {
-           new_value[--len] = '\0';
++          new_value[len-1] = '\0';
 +        }
 +      lt_setenv (name, new_value);
 +      XFREE (new_value);
 +    }
 +}
 +
 +void
 +lt_update_lib_path (const char *name, const char *value)
 +{
 +  lt_debugprintf (__FILE__, __LINE__,
 +		  "(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
 +                  nonnull (name), nonnull (value));
 +
 +  if (name && *name && value && *value)
 +    {
 +      char *new_value = lt_extend_str (getenv (name), value, 0);
 +      lt_setenv (name, new_value);
 +      XFREE (new_value);
 +    }
 +}
 +
 +EOF
 +	    case $host_os in
 +	      mingw*)
 +		cat <<"EOF"
 +
 +/* Prepares an argument vector before calling spawn().
 +   Note that spawn() does not by itself call the command interpreter
 +     (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") :
 +      ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
 +         GetVersionEx(&v);
 +         v.dwPlatformId == VER_PLATFORM_WIN32_NT;
 +      }) ? "cmd.exe" : "command.com").
 +   Instead it simply concatenates the arguments, separated by ' ', and calls
 +   CreateProcess().  We must quote the arguments since Win32 CreateProcess()
 +   interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a
 +   special way:
 +   - Space and tab are interpreted as delimiters. They are not treated as
 +     delimiters if they are surrounded by double quotes: "...".
 +   - Unescaped double quotes are removed from the input. Their only effect is
 +     that within double quotes, space and tab are treated like normal
 +     characters.
 +   - Backslashes not followed by double quotes are not special.
 +   - But 2*n+1 backslashes followed by a double quote become
 +     n backslashes followed by a double quote (n >= 0):
 +       \" -> "
 +       \\\" -> \"
 +       \\\\\" -> \\"
 + */
 +#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
 +#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
 +char **
 +prepare_spawn (char **argv)
 +{
 +  size_t argc;
 +  char **new_argv;
 +  size_t i;
 +
 +  /* Count number of arguments.  */
 +  for (argc = 0; argv[argc] != NULL; argc++)
 +    ;
 +
 +  /* Allocate new argument vector.  */
 +  new_argv = XMALLOC (char *, argc + 1);
 +
 +  /* Put quoted arguments into the new argument vector.  */
 +  for (i = 0; i < argc; i++)
 +    {
 +      const char *string = argv[i];
 +
 +      if (string[0] == '\0')
 +	new_argv[i] = xstrdup ("\"\"");
 +      else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL)
 +	{
 +	  int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL);
 +	  size_t length;
 +	  unsigned int backslashes;
 +	  const char *s;
 +	  char *quoted_string;
 +	  char *p;
 +
 +	  length = 0;
 +	  backslashes = 0;
 +	  if (quote_around)
 +	    length++;
 +	  for (s = string; *s != '\0'; s++)
 +	    {
 +	      char c = *s;
 +	      if (c == '"')
 +		length += backslashes + 1;
 +	      length++;
 +	      if (c == '\\')
 +		backslashes++;
 +	      else
 +		backslashes = 0;
 +	    }
 +	  if (quote_around)
 +	    length += backslashes + 1;
 +
 +	  quoted_string = XMALLOC (char, length + 1);
 +
 +	  p = quoted_string;
 +	  backslashes = 0;
 +	  if (quote_around)
 +	    *p++ = '"';
 +	  for (s = string; *s != '\0'; s++)
 +	    {
 +	      char c = *s;
 +	      if (c == '"')
 +		{
 +		  unsigned int j;
 +		  for (j = backslashes + 1; j > 0; j--)
 +		    *p++ = '\\';
 +		}
 +	      *p++ = c;
 +	      if (c == '\\')
 +		backslashes++;
 +	      else
 +		backslashes = 0;
 +	    }
 +	  if (quote_around)
 +	    {
 +	      unsigned int j;
 +	      for (j = backslashes; j > 0; j--)
 +		*p++ = '\\';
 +	      *p++ = '"';
 +	    }
 +	  *p = '\0';
 +
 +	  new_argv[i] = quoted_string;
 +	}
 +      else
 +	new_argv[i] = (char *) string;
 +    }
 +  new_argv[argc] = NULL;
 +
 +  return new_argv;
 +}
 +EOF
 +		;;
 +	    esac
 +
 +            cat <<"EOF"
 +void lt_dump_script (FILE* f)
 +{
 +EOF
 +	    func_emit_wrapper yes |
 +	      $SED -n -e '
 +s/^\(.\{79\}\)\(..*\)/\1\
 +\2/
 +h
 +s/\([\\"]\)/\\\1/g
 +s/$/\\n/
 +s/\([^\n]*\).*/  fputs ("\1", f);/p
 +g
 +D'
 +            cat <<"EOF"
 +}
 +EOF
 +}
 +# end: func_emit_cwrapperexe_src
 +
 +# func_win32_import_lib_p ARG
 +# True if ARG is an import lib, as indicated by $file_magic_cmd
 +func_win32_import_lib_p ()
 +{
-     $debug_cmd
- 
++    $opt_debug
 +    case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
 +    *import*) : ;;
 +    *) false ;;
 +    esac
 +}
 +
- # func_suncc_cstd_abi
- # !!ONLY CALL THIS FOR SUN CC AFTER $compile_command IS FULLY EXPANDED!!
- # Several compiler flags select an ABI that is incompatible with the
- # Cstd library. Avoid specifying it if any are in CXXFLAGS.
- func_suncc_cstd_abi ()
- {
-     $debug_cmd
- 
-     case " $compile_command " in
-     *" -compat=g "*|*\ -std=c++[0-9][0-9]\ *|*" -library=stdcxx4 "*|*" -library=stlport4 "*)
-       suncc_use_cstd_abi=no
-       ;;
-     *)
-       suncc_use_cstd_abi=yes
-       ;;
-     esac
- }
- 
 +# func_mode_link arg...
 +func_mode_link ()
 +{
-     $debug_cmd
- 
++    $opt_debug
 +    case $host in
 +    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
 +      # It is impossible to link a dll without this setting, and
 +      # we shouldn't force the makefile maintainer to figure out
-       # what system we are compiling for in order to pass an extra
++      # which system we are compiling for in order to pass an extra
 +      # flag for every libtool invocation.
 +      # allow_undefined=no
 +
 +      # FIXME: Unfortunately, there are problems with the above when trying
-       # to make a dll that has undefined symbols, in which case not
++      # to make a dll which has undefined symbols, in which case not
 +      # even a static library is built.  For now, we need to specify
 +      # -no-undefined on the libtool link line when we can be certain
 +      # that all symbols are satisfied, otherwise we get a static library.
 +      allow_undefined=yes
 +      ;;
 +    *)
 +      allow_undefined=yes
 +      ;;
 +    esac
 +    libtool_args=$nonopt
 +    base_compile="$nonopt $@"
 +    compile_command=$nonopt
 +    finalize_command=$nonopt
 +
 +    compile_rpath=
 +    finalize_rpath=
 +    compile_shlibpath=
 +    finalize_shlibpath=
 +    convenience=
 +    old_convenience=
 +    deplibs=
 +    old_deplibs=
 +    compiler_flags=
 +    linker_flags=
 +    dllsearchpath=
 +    lib_search_path=`pwd`
 +    inst_prefix_dir=
 +    new_inherited_linker_flags=
 +
 +    avoid_version=no
 +    bindir=
 +    dlfiles=
 +    dlprefiles=
 +    dlself=no
 +    export_dynamic=no
 +    export_symbols=
 +    export_symbols_regex=
 +    generated=
 +    libobjs=
 +    ltlibs=
 +    module=no
 +    no_install=no
 +    objs=
-     os2dllname=
 +    non_pic_objects=
 +    precious_files_regex=
 +    prefer_static_libs=no
-     preload=false
++    preload=no
 +    prev=
 +    prevarg=
 +    release=
 +    rpath=
 +    xrpath=
 +    perm_rpath=
 +    temp_rpath=
 +    thread_safe=no
 +    vinfo=
 +    vinfo_number=no
 +    weak_libs=
-     single_module=$wl-single_module
++    single_module="${wl}-single_module"
 +    func_infer_tag $base_compile
 +
 +    # We need to know -static, to get the right output filenames.
 +    for arg
 +    do
 +      case $arg in
 +      -shared)
- 	test yes != "$build_libtool_libs" \
- 	  && func_fatal_configuration "cannot build a shared library"
++	test "$build_libtool_libs" != yes && \
++	  func_fatal_configuration "can not build a shared library"
 +	build_old_libs=no
 +	break
 +	;;
 +      -all-static | -static | -static-libtool-libs)
 +	case $arg in
 +	-all-static)
- 	  if test yes = "$build_libtool_libs" && test -z "$link_static_flag"; then
++	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
 +	    func_warning "complete static linking is impossible in this configuration"
 +	  fi
 +	  if test -n "$link_static_flag"; then
 +	    dlopen_self=$dlopen_self_static
 +	  fi
 +	  prefer_static_libs=yes
 +	  ;;
 +	-static)
 +	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
 +	    dlopen_self=$dlopen_self_static
 +	  fi
 +	  prefer_static_libs=built
 +	  ;;
 +	-static-libtool-libs)
 +	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
 +	    dlopen_self=$dlopen_self_static
 +	  fi
 +	  prefer_static_libs=yes
 +	  ;;
 +	esac
 +	build_libtool_libs=no
 +	build_old_libs=yes
 +	break
 +	;;
 +      esac
 +    done
 +
 +    # See if our shared archives depend on static archives.
 +    test -n "$old_archive_from_new_cmds" && build_old_libs=yes
 +
 +    # Go through the arguments, transforming them on the way.
 +    while test "$#" -gt 0; do
-       arg=$1
++      arg="$1"
 +      shift
 +      func_quote_for_eval "$arg"
 +      qarg=$func_quote_for_eval_unquoted_result
 +      func_append libtool_args " $func_quote_for_eval_result"
 +
 +      # If the previous option needs an argument, assign it.
 +      if test -n "$prev"; then
 +	case $prev in
 +	output)
 +	  func_append compile_command " @OUTPUT@"
 +	  func_append finalize_command " @OUTPUT@"
 +	  ;;
 +	esac
 +
 +	case $prev in
 +	bindir)
- 	  bindir=$arg
++	  bindir="$arg"
 +	  prev=
 +	  continue
 +	  ;;
 +	dlfiles|dlprefiles)
- 	  $preload || {
++	  if test "$preload" = no; then
 +	    # Add the symbol object into the linking commands.
 +	    func_append compile_command " @SYMFILE@"
 +	    func_append finalize_command " @SYMFILE@"
- 	    preload=:
- 	  }
++	    preload=yes
++	  fi
 +	  case $arg in
 +	  *.la | *.lo) ;;  # We handle these cases below.
 +	  force)
- 	    if test no = "$dlself"; then
++	    if test "$dlself" = no; then
 +	      dlself=needless
 +	      export_dynamic=yes
 +	    fi
 +	    prev=
 +	    continue
 +	    ;;
 +	  self)
- 	    if test dlprefiles = "$prev"; then
++	    if test "$prev" = dlprefiles; then
 +	      dlself=yes
- 	    elif test dlfiles = "$prev" && test yes != "$dlopen_self"; then
++	    elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
 +	      dlself=yes
 +	    else
 +	      dlself=needless
 +	      export_dynamic=yes
 +	    fi
 +	    prev=
 +	    continue
 +	    ;;
 +	  *)
- 	    if test dlfiles = "$prev"; then
++	    if test "$prev" = dlfiles; then
 +	      func_append dlfiles " $arg"
 +	    else
 +	      func_append dlprefiles " $arg"
 +	    fi
 +	    prev=
 +	    continue
 +	    ;;
 +	  esac
 +	  ;;
 +	expsyms)
- 	  export_symbols=$arg
++	  export_symbols="$arg"
 +	  test -f "$arg" \
- 	    || func_fatal_error "symbol file '$arg' does not exist"
++	    || func_fatal_error "symbol file \`$arg' does not exist"
 +	  prev=
 +	  continue
 +	  ;;
 +	expsyms_regex)
- 	  export_symbols_regex=$arg
++	  export_symbols_regex="$arg"
 +	  prev=
 +	  continue
 +	  ;;
 +	framework)
 +	  case $host in
 +	    *-*-darwin*)
 +	      case "$deplibs " in
 +		*" $qarg.ltframework "*) ;;
 +		*) func_append deplibs " $qarg.ltframework" # this is fixed later
 +		   ;;
 +	      esac
 +	      ;;
 +	  esac
 +	  prev=
 +	  continue
 +	  ;;
 +	inst_prefix)
- 	  inst_prefix_dir=$arg
- 	  prev=
- 	  continue
- 	  ;;
- 	mllvm)
- 	  # Clang does not use LLVM to link, so we can simply discard any
- 	  # '-mllvm $arg' options when doing the link step.
++	  inst_prefix_dir="$arg"
 +	  prev=
 +	  continue
 +	  ;;
 +	objectlist)
 +	  if test -f "$arg"; then
 +	    save_arg=$arg
 +	    moreargs=
 +	    for fil in `cat "$save_arg"`
 +	    do
 +#	      func_append moreargs " $fil"
 +	      arg=$fil
 +	      # A libtool-controlled object.
 +
 +	      # Check to see that this really is a libtool object.
 +	      if func_lalib_unsafe_p "$arg"; then
 +		pic_object=
 +		non_pic_object=
 +
 +		# Read the .lo file
 +		func_source "$arg"
 +
 +		if test -z "$pic_object" ||
 +		   test -z "$non_pic_object" ||
- 		   test none = "$pic_object" &&
- 		   test none = "$non_pic_object"; then
- 		  func_fatal_error "cannot find name of object for '$arg'"
++		   test "$pic_object" = none &&
++		   test "$non_pic_object" = none; then
++		  func_fatal_error "cannot find name of object for \`$arg'"
 +		fi
 +
 +		# Extract subdirectory from the argument.
 +		func_dirname "$arg" "/" ""
- 		xdir=$func_dirname_result
++		xdir="$func_dirname_result"
 +
- 		if test none != "$pic_object"; then
++		if test "$pic_object" != none; then
 +		  # Prepend the subdirectory the object is found in.
- 		  pic_object=$xdir$pic_object
++		  pic_object="$xdir$pic_object"
 +
- 		  if test dlfiles = "$prev"; then
- 		    if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then
++		  if test "$prev" = dlfiles; then
++		    if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
 +		      func_append dlfiles " $pic_object"
 +		      prev=
 +		      continue
 +		    else
 +		      # If libtool objects are unsupported, then we need to preload.
 +		      prev=dlprefiles
 +		    fi
 +		  fi
 +
 +		  # CHECK ME:  I think I busted this.  -Ossama
- 		  if test dlprefiles = "$prev"; then
++		  if test "$prev" = dlprefiles; then
 +		    # Preload the old-style object.
 +		    func_append dlprefiles " $pic_object"
 +		    prev=
 +		  fi
 +
 +		  # A PIC object.
 +		  func_append libobjs " $pic_object"
- 		  arg=$pic_object
++		  arg="$pic_object"
 +		fi
 +
 +		# Non-PIC object.
- 		if test none != "$non_pic_object"; then
++		if test "$non_pic_object" != none; then
 +		  # Prepend the subdirectory the object is found in.
- 		  non_pic_object=$xdir$non_pic_object
++		  non_pic_object="$xdir$non_pic_object"
 +
 +		  # A standard non-PIC object
 +		  func_append non_pic_objects " $non_pic_object"
- 		  if test -z "$pic_object" || test none = "$pic_object"; then
- 		    arg=$non_pic_object
++		  if test -z "$pic_object" || test "$pic_object" = none ; then
++		    arg="$non_pic_object"
 +		  fi
 +		else
 +		  # If the PIC object exists, use it instead.
 +		  # $xdir was prepended to $pic_object above.
- 		  non_pic_object=$pic_object
++		  non_pic_object="$pic_object"
 +		  func_append non_pic_objects " $non_pic_object"
 +		fi
 +	      else
 +		# Only an error if not doing a dry-run.
 +		if $opt_dry_run; then
 +		  # Extract subdirectory from the argument.
 +		  func_dirname "$arg" "/" ""
- 		  xdir=$func_dirname_result
++		  xdir="$func_dirname_result"
 +
 +		  func_lo2o "$arg"
 +		  pic_object=$xdir$objdir/$func_lo2o_result
 +		  non_pic_object=$xdir$func_lo2o_result
 +		  func_append libobjs " $pic_object"
 +		  func_append non_pic_objects " $non_pic_object"
 +	        else
- 		  func_fatal_error "'$arg' is not a valid libtool object"
++		  func_fatal_error "\`$arg' is not a valid libtool object"
 +		fi
 +	      fi
 +	    done
 +	  else
- 	    func_fatal_error "link input file '$arg' does not exist"
++	    func_fatal_error "link input file \`$arg' does not exist"
 +	  fi
 +	  arg=$save_arg
 +	  prev=
 +	  continue
 +	  ;;
- 	os2dllname)
- 	  os2dllname=$arg
- 	  prev=
- 	  continue
- 	  ;;
 +	precious_regex)
- 	  precious_files_regex=$arg
++	  precious_files_regex="$arg"
 +	  prev=
 +	  continue
 +	  ;;
 +	release)
- 	  release=-$arg
++	  release="-$arg"
 +	  prev=
 +	  continue
 +	  ;;
 +	rpath | xrpath)
 +	  # We need an absolute path.
 +	  case $arg in
 +	  [\\/]* | [A-Za-z]:[\\/]*) ;;
 +	  *)
 +	    func_fatal_error "only absolute run-paths are allowed"
 +	    ;;
 +	  esac
- 	  if test rpath = "$prev"; then
++	  if test "$prev" = rpath; then
 +	    case "$rpath " in
 +	    *" $arg "*) ;;
 +	    *) func_append rpath " $arg" ;;
 +	    esac
 +	  else
 +	    case "$xrpath " in
 +	    *" $arg "*) ;;
 +	    *) func_append xrpath " $arg" ;;
 +	    esac
 +	  fi
 +	  prev=
 +	  continue
 +	  ;;
 +	shrext)
- 	  shrext_cmds=$arg
++	  shrext_cmds="$arg"
 +	  prev=
 +	  continue
 +	  ;;
 +	weak)
 +	  func_append weak_libs " $arg"
 +	  prev=
 +	  continue
 +	  ;;
 +	xcclinker)
 +	  func_append linker_flags " $qarg"
 +	  func_append compiler_flags " $qarg"
 +	  prev=
 +	  func_append compile_command " $qarg"
 +	  func_append finalize_command " $qarg"
 +	  continue
 +	  ;;
 +	xcompiler)
 +	  func_append compiler_flags " $qarg"
 +	  prev=
 +	  func_append compile_command " $qarg"
 +	  func_append finalize_command " $qarg"
 +	  continue
 +	  ;;
 +	xlinker)
 +	  func_append linker_flags " $qarg"
 +	  func_append compiler_flags " $wl$qarg"
 +	  prev=
 +	  func_append compile_command " $wl$qarg"
 +	  func_append finalize_command " $wl$qarg"
 +	  continue
 +	  ;;
 +	*)
 +	  eval "$prev=\"\$arg\""
 +	  prev=
 +	  continue
 +	  ;;
 +	esac
 +      fi # test -n "$prev"
 +
-       prevarg=$arg
++      prevarg="$arg"
 +
 +      case $arg in
 +      -all-static)
 +	if test -n "$link_static_flag"; then
 +	  # See comment for -static flag below, for more details.
 +	  func_append compile_command " $link_static_flag"
 +	  func_append finalize_command " $link_static_flag"
 +	fi
 +	continue
 +	;;
 +
 +      -allow-undefined)
 +	# FIXME: remove this flag sometime in the future.
- 	func_fatal_error "'-allow-undefined' must not be used because it is the default"
++	func_fatal_error "\`-allow-undefined' must not be used because it is the default"
 +	;;
 +
 +      -avoid-version)
 +	avoid_version=yes
 +	continue
 +	;;
 +
 +      -bindir)
 +	prev=bindir
 +	continue
 +	;;
 +
 +      -dlopen)
 +	prev=dlfiles
 +	continue
 +	;;
 +
 +      -dlpreopen)
 +	prev=dlprefiles
 +	continue
 +	;;
 +
 +      -export-dynamic)
 +	export_dynamic=yes
 +	continue
 +	;;
 +
 +      -export-symbols | -export-symbols-regex)
 +	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
 +	  func_fatal_error "more than one -exported-symbols argument is not allowed"
 +	fi
- 	if test X-export-symbols = "X$arg"; then
++	if test "X$arg" = "X-export-symbols"; then
 +	  prev=expsyms
 +	else
 +	  prev=expsyms_regex
 +	fi
 +	continue
 +	;;
 +
 +      -framework)
 +	prev=framework
 +	continue
 +	;;
 +
 +      -inst-prefix-dir)
 +	prev=inst_prefix
 +	continue
 +	;;
 +
 +      # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
 +      # so, if we see these flags be careful not to treat them like -L
 +      -L[A-Z][A-Z]*:*)
 +	case $with_gcc/$host in
 +	no/*-*-irix* | /*-*-irix*)
 +	  func_append compile_command " $arg"
 +	  func_append finalize_command " $arg"
 +	  ;;
 +	esac
 +	continue
 +	;;
 +
 +      -L*)
 +	func_stripname "-L" '' "$arg"
 +	if test -z "$func_stripname_result"; then
 +	  if test "$#" -gt 0; then
- 	    func_fatal_error "require no space between '-L' and '$1'"
++	    func_fatal_error "require no space between \`-L' and \`$1'"
 +	  else
- 	    func_fatal_error "need path for '-L' option"
++	    func_fatal_error "need path for \`-L' option"
 +	  fi
 +	fi
 +	func_resolve_sysroot "$func_stripname_result"
 +	dir=$func_resolve_sysroot_result
 +	# We need an absolute path.
 +	case $dir in
 +	[\\/]* | [A-Za-z]:[\\/]*) ;;
 +	*)
 +	  absdir=`cd "$dir" && pwd`
 +	  test -z "$absdir" && \
- 	    func_fatal_error "cannot determine absolute directory name of '$dir'"
- 	  dir=$absdir
++	    func_fatal_error "cannot determine absolute directory name of \`$dir'"
++	  dir="$absdir"
 +	  ;;
 +	esac
 +	case "$deplibs " in
 +	*" -L$dir "* | *" $arg "*)
 +	  # Will only happen for absolute or sysroot arguments
 +	  ;;
 +	*)
 +	  # Preserve sysroot, but never include relative directories
 +	  case $dir in
 +	    [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;;
 +	    *) func_append deplibs " -L$dir" ;;
 +	  esac
 +	  func_append lib_search_path " $dir"
 +	  ;;
 +	esac
 +	case $host in
 +	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
 +	  testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'`
 +	  case :$dllsearchpath: in
 +	  *":$dir:"*) ;;
 +	  ::) dllsearchpath=$dir;;
 +	  *) func_append dllsearchpath ":$dir";;
 +	  esac
 +	  case :$dllsearchpath: in
 +	  *":$testbindir:"*) ;;
 +	  ::) dllsearchpath=$testbindir;;
 +	  *) func_append dllsearchpath ":$testbindir";;
 +	  esac
 +	  ;;
 +	esac
 +	continue
 +	;;
 +
 +      -l*)
- 	if test X-lc = "X$arg" || test X-lm = "X$arg"; then
++	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
 +	  case $host in
 +	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
 +	    # These systems don't actually have a C or math library (as such)
 +	    continue
 +	    ;;
 +	  *-*-os2*)
 +	    # These systems don't actually have a C library (as such)
- 	    test X-lc = "X$arg" && continue
++	    test "X$arg" = "X-lc" && continue
 +	    ;;
- 	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*)
++	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
 +	    # Do not include libc due to us having libc/libc_r.
- 	    test X-lc = "X$arg" && continue
++	    test "X$arg" = "X-lc" && continue
 +	    ;;
 +	  *-*-rhapsody* | *-*-darwin1.[012])
 +	    # Rhapsody C and math libraries are in the System framework
 +	    func_append deplibs " System.ltframework"
 +	    continue
 +	    ;;
 +	  *-*-sco3.2v5* | *-*-sco5v6*)
 +	    # Causes problems with __ctype
- 	    test X-lc = "X$arg" && continue
++	    test "X$arg" = "X-lc" && continue
 +	    ;;
 +	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
 +	    # Compiler inserts libc in the correct place for threads to work
- 	    test X-lc = "X$arg" && continue
++	    test "X$arg" = "X-lc" && continue
 +	    ;;
 +	  esac
- 	elif test X-lc_r = "X$arg"; then
++	elif test "X$arg" = "X-lc_r"; then
 +	 case $host in
- 	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*)
++	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
 +	   # Do not include libc_r directly, use -pthread flag.
 +	   continue
 +	   ;;
 +	 esac
 +	fi
 +	func_append deplibs " $arg"
 +	continue
 +	;;
 +
-       -mllvm)
- 	prev=mllvm
- 	continue
- 	;;
- 
 +      -module)
 +	module=yes
 +	continue
 +	;;
 +
 +      # Tru64 UNIX uses -model [arg] to determine the layout of C++
 +      # classes, name mangling, and exception handling.
 +      # Darwin uses the -arch flag to determine output architecture.
 +      -model|-arch|-isysroot|--sysroot)
 +	func_append compiler_flags " $arg"
 +	func_append compile_command " $arg"
 +	func_append finalize_command " $arg"
 +	prev=xcompiler
 +	continue
 +	;;
 +
 +      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
 +      |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
 +	func_append compiler_flags " $arg"
 +	func_append compile_command " $arg"
 +	func_append finalize_command " $arg"
 +	case "$new_inherited_linker_flags " in
 +	    *" $arg "*) ;;
 +	    * ) func_append new_inherited_linker_flags " $arg" ;;
 +	esac
 +	continue
 +	;;
 +
 +      -multi_module)
- 	single_module=$wl-multi_module
++	single_module="${wl}-multi_module"
 +	continue
 +	;;
 +
 +      -no-fast-install)
 +	fast_install=no
 +	continue
 +	;;
 +
 +      -no-install)
 +	case $host in
 +	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
 +	  # The PATH hackery in wrapper scripts is required on Windows
 +	  # and Darwin in order for the loader to find any dlls it needs.
- 	  func_warning "'-no-install' is ignored for $host"
- 	  func_warning "assuming '-no-fast-install' instead"
++	  func_warning "\`-no-install' is ignored for $host"
++	  func_warning "assuming \`-no-fast-install' instead"
 +	  fast_install=no
 +	  ;;
 +	*) no_install=yes ;;
 +	esac
 +	continue
 +	;;
 +
 +      -no-undefined)
 +	allow_undefined=no
 +	continue
 +	;;
 +
 +      -objectlist)
 +	prev=objectlist
 +	continue
 +	;;
 +
-       -os2dllname)
- 	prev=os2dllname
- 	continue
- 	;;
- 
 +      -o) prev=output ;;
 +
 +      -precious-files-regex)
 +	prev=precious_regex
 +	continue
 +	;;
 +
 +      -release)
 +	prev=release
 +	continue
 +	;;
 +
 +      -rpath)
 +	prev=rpath
 +	continue
 +	;;
 +
 +      -R)
 +	prev=xrpath
 +	continue
 +	;;
 +
 +      -R*)
 +	func_stripname '-R' '' "$arg"
 +	dir=$func_stripname_result
 +	# We need an absolute path.
 +	case $dir in
 +	[\\/]* | [A-Za-z]:[\\/]*) ;;
 +	=*)
 +	  func_stripname '=' '' "$dir"
 +	  dir=$lt_sysroot$func_stripname_result
 +	  ;;
 +	*)
 +	  func_fatal_error "only absolute run-paths are allowed"
 +	  ;;
 +	esac
 +	case "$xrpath " in
 +	*" $dir "*) ;;
 +	*) func_append xrpath " $dir" ;;
 +	esac
 +	continue
 +	;;
 +
 +      -shared)
 +	# The effects of -shared are defined in a previous loop.
 +	continue
 +	;;
 +
 +      -shrext)
 +	prev=shrext
 +	continue
 +	;;
 +
 +      -static | -static-libtool-libs)
 +	# The effects of -static are defined in a previous loop.
 +	# We used to do the same as -all-static on platforms that
 +	# didn't have a PIC flag, but the assumption that the effects
 +	# would be equivalent was wrong.  It would break on at least
 +	# Digital Unix and AIX.
 +	continue
 +	;;
 +
 +      -thread-safe)
 +	thread_safe=yes
 +	continue
 +	;;
 +
 +      -version-info)
 +	prev=vinfo
 +	continue
 +	;;
 +
 +      -version-number)
 +	prev=vinfo
 +	vinfo_number=yes
 +	continue
 +	;;
 +
 +      -weak)
 +        prev=weak
 +	continue
 +	;;
 +
 +      -Wc,*)
 +	func_stripname '-Wc,' '' "$arg"
 +	args=$func_stripname_result
 +	arg=
- 	save_ifs=$IFS; IFS=,
++	save_ifs="$IFS"; IFS=','
 +	for flag in $args; do
- 	  IFS=$save_ifs
++	  IFS="$save_ifs"
 +          func_quote_for_eval "$flag"
 +	  func_append arg " $func_quote_for_eval_result"
 +	  func_append compiler_flags " $func_quote_for_eval_result"
 +	done
- 	IFS=$save_ifs
++	IFS="$save_ifs"
 +	func_stripname ' ' '' "$arg"
 +	arg=$func_stripname_result
 +	;;
 +
 +      -Wl,*)
 +	func_stripname '-Wl,' '' "$arg"
 +	args=$func_stripname_result
 +	arg=
- 	save_ifs=$IFS; IFS=,
++	save_ifs="$IFS"; IFS=','
 +	for flag in $args; do
- 	  IFS=$save_ifs
++	  IFS="$save_ifs"
 +          func_quote_for_eval "$flag"
 +	  func_append arg " $wl$func_quote_for_eval_result"
 +	  func_append compiler_flags " $wl$func_quote_for_eval_result"
 +	  func_append linker_flags " $func_quote_for_eval_result"
 +	done
- 	IFS=$save_ifs
++	IFS="$save_ifs"
 +	func_stripname ' ' '' "$arg"
 +	arg=$func_stripname_result
 +	;;
 +
 +      -Xcompiler)
 +	prev=xcompiler
 +	continue
 +	;;
 +
 +      -Xlinker)
 +	prev=xlinker
 +	continue
 +	;;
 +
 +      -XCClinker)
 +	prev=xcclinker
 +	continue
 +	;;
 +
 +      # -msg_* for osf cc
 +      -msg_*)
 +	func_quote_for_eval "$arg"
- 	arg=$func_quote_for_eval_result
++	arg="$func_quote_for_eval_result"
 +	;;
 +
 +      # Flags to be passed through unchanged, with rationale:
 +      # -64, -mips[0-9]      enable 64-bit mode for the SGI compiler
 +      # -r[0-9][0-9]*        specify processor for the SGI compiler
 +      # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler
 +      # +DA*, +DD*           enable 64-bit mode for the HP compiler
 +      # -q*                  compiler args for the IBM compiler
 +      # -m*, -t[45]*, -txscale* architecture-specific flags for GCC
 +      # -F/path              path to uninstalled frameworks, gcc on darwin
 +      # -p, -pg, --coverage, -fprofile-*  profiling flags for GCC
-       # -fstack-protector*   stack protector flags for GCC
 +      # @file                GCC response files
 +      # -tp=*                Portland pgcc target processor selection
 +      # --sysroot=*          for sysroot support
-       # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
-       # -stdlib=*            select c++ std lib with clang
++      # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
 +      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
 +      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
-       -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*)
++      -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
 +        func_quote_for_eval "$arg"
- 	arg=$func_quote_for_eval_result
++	arg="$func_quote_for_eval_result"
 +        func_append compile_command " $arg"
 +        func_append finalize_command " $arg"
 +        func_append compiler_flags " $arg"
 +        continue
 +        ;;
 +
-       -Z*)
-         if test os2 = "`expr $host : '.*\(os2\)'`"; then
-           # OS/2 uses -Zxxx to specify OS/2-specific options
- 	  compiler_flags="$compiler_flags $arg"
- 	  func_append compile_command " $arg"
- 	  func_append finalize_command " $arg"
- 	  case $arg in
- 	  -Zlinker | -Zstack)
- 	    prev=xcompiler
- 	    ;;
- 	  esac
- 	  continue
-         else
- 	  # Otherwise treat like 'Some other compiler flag' below
- 	  func_quote_for_eval "$arg"
- 	  arg=$func_quote_for_eval_result
-         fi
- 	;;
- 
 +      # Some other compiler flag.
 +      -* | +*)
 +        func_quote_for_eval "$arg"
- 	arg=$func_quote_for_eval_result
++	arg="$func_quote_for_eval_result"
 +	;;
 +
 +      *.$objext)
 +	# A standard object.
 +	func_append objs " $arg"
 +	;;
 +
 +      *.lo)
 +	# A libtool-controlled object.
 +
 +	# Check to see that this really is a libtool object.
 +	if func_lalib_unsafe_p "$arg"; then
 +	  pic_object=
 +	  non_pic_object=
 +
 +	  # Read the .lo file
 +	  func_source "$arg"
 +
 +	  if test -z "$pic_object" ||
 +	     test -z "$non_pic_object" ||
- 	     test none = "$pic_object" &&
- 	     test none = "$non_pic_object"; then
- 	    func_fatal_error "cannot find name of object for '$arg'"
++	     test "$pic_object" = none &&
++	     test "$non_pic_object" = none; then
++	    func_fatal_error "cannot find name of object for \`$arg'"
 +	  fi
 +
 +	  # Extract subdirectory from the argument.
 +	  func_dirname "$arg" "/" ""
- 	  xdir=$func_dirname_result
++	  xdir="$func_dirname_result"
 +
- 	  test none = "$pic_object" || {
++	  if test "$pic_object" != none; then
 +	    # Prepend the subdirectory the object is found in.
- 	    pic_object=$xdir$pic_object
++	    pic_object="$xdir$pic_object"
 +
- 	    if test dlfiles = "$prev"; then
- 	      if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then
++	    if test "$prev" = dlfiles; then
++	      if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
 +		func_append dlfiles " $pic_object"
 +		prev=
 +		continue
 +	      else
 +		# If libtool objects are unsupported, then we need to preload.
 +		prev=dlprefiles
 +	      fi
 +	    fi
 +
 +	    # CHECK ME:  I think I busted this.  -Ossama
- 	    if test dlprefiles = "$prev"; then
++	    if test "$prev" = dlprefiles; then
 +	      # Preload the old-style object.
 +	      func_append dlprefiles " $pic_object"
 +	      prev=
 +	    fi
 +
 +	    # A PIC object.
 +	    func_append libobjs " $pic_object"
- 	    arg=$pic_object
- 	  }
++	    arg="$pic_object"
++	  fi
 +
 +	  # Non-PIC object.
- 	  if test none != "$non_pic_object"; then
++	  if test "$non_pic_object" != none; then
 +	    # Prepend the subdirectory the object is found in.
- 	    non_pic_object=$xdir$non_pic_object
++	    non_pic_object="$xdir$non_pic_object"
 +
 +	    # A standard non-PIC object
 +	    func_append non_pic_objects " $non_pic_object"
- 	    if test -z "$pic_object" || test none = "$pic_object"; then
- 	      arg=$non_pic_object
++	    if test -z "$pic_object" || test "$pic_object" = none ; then
++	      arg="$non_pic_object"
 +	    fi
 +	  else
 +	    # If the PIC object exists, use it instead.
 +	    # $xdir was prepended to $pic_object above.
- 	    non_pic_object=$pic_object
++	    non_pic_object="$pic_object"
 +	    func_append non_pic_objects " $non_pic_object"
 +	  fi
 +	else
 +	  # Only an error if not doing a dry-run.
 +	  if $opt_dry_run; then
 +	    # Extract subdirectory from the argument.
 +	    func_dirname "$arg" "/" ""
- 	    xdir=$func_dirname_result
++	    xdir="$func_dirname_result"
 +
 +	    func_lo2o "$arg"
 +	    pic_object=$xdir$objdir/$func_lo2o_result
 +	    non_pic_object=$xdir$func_lo2o_result
 +	    func_append libobjs " $pic_object"
 +	    func_append non_pic_objects " $non_pic_object"
 +	  else
- 	    func_fatal_error "'$arg' is not a valid libtool object"
++	    func_fatal_error "\`$arg' is not a valid libtool object"
 +	  fi
 +	fi
 +	;;
 +
 +      *.$libext)
 +	# An archive.
 +	func_append deplibs " $arg"
 +	func_append old_deplibs " $arg"
 +	continue
 +	;;
 +
 +      *.la)
 +	# A libtool-controlled library.
 +
 +	func_resolve_sysroot "$arg"
- 	if test dlfiles = "$prev"; then
++	if test "$prev" = dlfiles; then
 +	  # This library was specified with -dlopen.
 +	  func_append dlfiles " $func_resolve_sysroot_result"
 +	  prev=
- 	elif test dlprefiles = "$prev"; then
++	elif test "$prev" = dlprefiles; then
 +	  # The library was specified with -dlpreopen.
 +	  func_append dlprefiles " $func_resolve_sysroot_result"
 +	  prev=
 +	else
 +	  func_append deplibs " $func_resolve_sysroot_result"
 +	fi
 +	continue
 +	;;
 +
 +      # Some other compiler argument.
 +      *)
 +	# Unknown arguments in both finalize_command and compile_command need
 +	# to be aesthetically quoted because they are evaled later.
 +	func_quote_for_eval "$arg"
- 	arg=$func_quote_for_eval_result
++	arg="$func_quote_for_eval_result"
 +	;;
 +      esac # arg
 +
 +      # Now actually substitute the argument into the commands.
 +      if test -n "$arg"; then
 +	func_append compile_command " $arg"
 +	func_append finalize_command " $arg"
 +      fi
 +    done # argument parsing loop
 +
 +    test -n "$prev" && \
-       func_fatal_help "the '$prevarg' option requires an argument"
++      func_fatal_help "the \`$prevarg' option requires an argument"
 +
-     if test yes = "$export_dynamic" && test -n "$export_dynamic_flag_spec"; then
++    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
 +      eval arg=\"$export_dynamic_flag_spec\"
 +      func_append compile_command " $arg"
 +      func_append finalize_command " $arg"
 +    fi
 +
 +    oldlibs=
 +    # calculate the name of the file, without its directory
 +    func_basename "$output"
-     outputname=$func_basename_result
-     libobjs_save=$libobjs
++    outputname="$func_basename_result"
++    libobjs_save="$libobjs"
 +
 +    if test -n "$shlibpath_var"; then
 +      # get the directories listed in $shlibpath_var
-       eval shlib_search_path=\`\$ECHO \"\$$shlibpath_var\" \| \$SED \'s/:/ /g\'\`
++      eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\`
 +    else
 +      shlib_search_path=
 +    fi
 +    eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
 +    eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
 +
-     # Definition is injected by LT_CONFIG during libtool generation.
-     func_munge_path_list sys_lib_dlsearch_path "$LT_SYS_LIBRARY_PATH"
- 
 +    func_dirname "$output" "/" ""
-     output_objdir=$func_dirname_result$objdir
++    output_objdir="$func_dirname_result$objdir"
 +    func_to_tool_file "$output_objdir/"
 +    tool_output_objdir=$func_to_tool_file_result
 +    # Create the object directory.
 +    func_mkdir_p "$output_objdir"
 +
 +    # Determine the type of output
 +    case $output in
 +    "")
 +      func_fatal_help "you must specify an output file"
 +      ;;
 +    *.$libext) linkmode=oldlib ;;
 +    *.lo | *.$objext) linkmode=obj ;;
 +    *.la) linkmode=lib ;;
 +    *) linkmode=prog ;; # Anything else should be a program.
 +    esac
 +
 +    specialdeplibs=
 +
 +    libs=
 +    # Find all interdependent deplibs by searching for libraries
 +    # that are linked more than once (e.g. -la -lb -la)
 +    for deplib in $deplibs; do
-       if $opt_preserve_dup_deps; then
++      if $opt_preserve_dup_deps ; then
 +	case "$libs " in
 +	*" $deplib "*) func_append specialdeplibs " $deplib" ;;
 +	esac
 +      fi
 +      func_append libs " $deplib"
 +    done
 +
-     if test lib = "$linkmode"; then
++    if test "$linkmode" = lib; then
 +      libs="$predeps $libs $compiler_lib_search_path $postdeps"
 +
 +      # Compute libraries that are listed more than once in $predeps
 +      # $postdeps and mark them as special (i.e., whose duplicates are
 +      # not to be eliminated).
 +      pre_post_deps=
 +      if $opt_duplicate_compiler_generated_deps; then
 +	for pre_post_dep in $predeps $postdeps; do
 +	  case "$pre_post_deps " in
 +	  *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;;
 +	  esac
 +	  func_append pre_post_deps " $pre_post_dep"
 +	done
 +      fi
 +      pre_post_deps=
 +    fi
 +
 +    deplibs=
 +    newdependency_libs=
 +    newlib_search_path=
 +    need_relink=no # whether we're linking any uninstalled libtool libraries
 +    notinst_deplibs= # not-installed libtool libraries
 +    notinst_path= # paths that contain not-installed libtool libraries
 +
 +    case $linkmode in
 +    lib)
 +	passes="conv dlpreopen link"
 +	for file in $dlfiles $dlprefiles; do
 +	  case $file in
 +	  *.la) ;;
 +	  *)
- 	    func_fatal_help "libraries can '-dlopen' only libtool libraries: $file"
++	    func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file"
 +	    ;;
 +	  esac
 +	done
 +	;;
 +    prog)
 +	compile_deplibs=
 +	finalize_deplibs=
- 	alldeplibs=false
++	alldeplibs=no
 +	newdlfiles=
 +	newdlprefiles=
 +	passes="conv scan dlopen dlpreopen link"
 +	;;
 +    *)  passes="conv"
 +	;;
 +    esac
 +
 +    for pass in $passes; do
 +      # The preopen pass in lib mode reverses $deplibs; put it back here
 +      # so that -L comes before libs that need it for instance...
-       if test lib,link = "$linkmode,$pass"; then
++      if test "$linkmode,$pass" = "lib,link"; then
 +	## FIXME: Find the place where the list is rebuilt in the wrong
 +	##        order, and fix it there properly
 +        tmp_deplibs=
 +	for deplib in $deplibs; do
 +	  tmp_deplibs="$deplib $tmp_deplibs"
 +	done
- 	deplibs=$tmp_deplibs
++	deplibs="$tmp_deplibs"
 +      fi
 +
-       if test lib,link = "$linkmode,$pass" ||
- 	 test prog,scan = "$linkmode,$pass"; then
- 	libs=$deplibs
++      if test "$linkmode,$pass" = "lib,link" ||
++	 test "$linkmode,$pass" = "prog,scan"; then
++	libs="$deplibs"
 +	deplibs=
 +      fi
-       if test prog = "$linkmode"; then
++      if test "$linkmode" = prog; then
 +	case $pass in
- 	dlopen) libs=$dlfiles ;;
- 	dlpreopen) libs=$dlprefiles ;;
++	dlopen) libs="$dlfiles" ;;
++	dlpreopen) libs="$dlprefiles" ;;
 +	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
 +	esac
 +      fi
-       if test lib,dlpreopen = "$linkmode,$pass"; then
++      if test "$linkmode,$pass" = "lib,dlpreopen"; then
 +	# Collect and forward deplibs of preopened libtool libs
 +	for lib in $dlprefiles; do
 +	  # Ignore non-libtool-libs
 +	  dependency_libs=
 +	  func_resolve_sysroot "$lib"
 +	  case $lib in
 +	  *.la)	func_source "$func_resolve_sysroot_result" ;;
 +	  esac
 +
 +	  # Collect preopened libtool deplibs, except any this library
 +	  # has declared as weak libs
 +	  for deplib in $dependency_libs; do
 +	    func_basename "$deplib"
 +            deplib_base=$func_basename_result
 +	    case " $weak_libs " in
 +	    *" $deplib_base "*) ;;
 +	    *) func_append deplibs " $deplib" ;;
 +	    esac
 +	  done
 +	done
- 	libs=$dlprefiles
++	libs="$dlprefiles"
 +      fi
-       if test dlopen = "$pass"; then
++      if test "$pass" = dlopen; then
 +	# Collect dlpreopened libraries
- 	save_deplibs=$deplibs
++	save_deplibs="$deplibs"
 +	deplibs=
 +      fi
 +
 +      for deplib in $libs; do
 +	lib=
- 	found=false
++	found=no
 +	case $deplib in
 +	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
 +        |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
- 	  if test prog,link = "$linkmode,$pass"; then
++	  if test "$linkmode,$pass" = "prog,link"; then
 +	    compile_deplibs="$deplib $compile_deplibs"
 +	    finalize_deplibs="$deplib $finalize_deplibs"
 +	  else
 +	    func_append compiler_flags " $deplib"
- 	    if test lib = "$linkmode"; then
++	    if test "$linkmode" = lib ; then
 +		case "$new_inherited_linker_flags " in
 +		    *" $deplib "*) ;;
 +		    * ) func_append new_inherited_linker_flags " $deplib" ;;
 +		esac
 +	    fi
 +	  fi
 +	  continue
 +	  ;;
 +	-l*)
- 	  if test lib != "$linkmode" && test prog != "$linkmode"; then
- 	    func_warning "'-l' is ignored for archives/objects"
++	  if test "$linkmode" != lib && test "$linkmode" != prog; then
++	    func_warning "\`-l' is ignored for archives/objects"
 +	    continue
 +	  fi
 +	  func_stripname '-l' '' "$deplib"
 +	  name=$func_stripname_result
- 	  if test lib = "$linkmode"; then
++	  if test "$linkmode" = lib; then
 +	    searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
 +	  else
 +	    searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
 +	  fi
 +	  for searchdir in $searchdirs; do
 +	    for search_ext in .la $std_shrext .so .a; do
 +	      # Search the libtool library
- 	      lib=$searchdir/lib$name$search_ext
++	      lib="$searchdir/lib${name}${search_ext}"
 +	      if test -f "$lib"; then
- 		if test .la = "$search_ext"; then
- 		  found=:
++		if test "$search_ext" = ".la"; then
++		  found=yes
 +		else
- 		  found=false
++		  found=no
 +		fi
 +		break 2
 +	      fi
 +	    done
 +	  done
- 	  if $found; then
- 	    # deplib is a libtool library
++	  if test "$found" != yes; then
++	    # deplib doesn't seem to be a libtool library
++	    if test "$linkmode,$pass" = "prog,link"; then
++	      compile_deplibs="$deplib $compile_deplibs"
++	      finalize_deplibs="$deplib $finalize_deplibs"
++	    else
++	      deplibs="$deplib $deplibs"
++	      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
++	    fi
++	    continue
++	  else # deplib is a libtool library
 +	    # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
 +	    # We need to do some special things here, and not later.
- 	    if test yes = "$allow_libtool_libs_with_static_runtimes"; then
++	    if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 +	      case " $predeps $postdeps " in
 +	      *" $deplib "*)
 +		if func_lalib_p "$lib"; then
 +		  library_names=
 +		  old_library=
 +		  func_source "$lib"
 +		  for l in $old_library $library_names; do
- 		    ll=$l
++		    ll="$l"
 +		  done
- 		  if test "X$ll" = "X$old_library"; then # only static version available
- 		    found=false
++		  if test "X$ll" = "X$old_library" ; then # only static version available
++		    found=no
 +		    func_dirname "$lib" "" "."
- 		    ladir=$func_dirname_result
++		    ladir="$func_dirname_result"
 +		    lib=$ladir/$old_library
- 		    if test prog,link = "$linkmode,$pass"; then
++		    if test "$linkmode,$pass" = "prog,link"; then
 +		      compile_deplibs="$deplib $compile_deplibs"
 +		      finalize_deplibs="$deplib $finalize_deplibs"
 +		    else
 +		      deplibs="$deplib $deplibs"
- 		      test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs"
++		      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
 +		    fi
 +		    continue
 +		  fi
 +		fi
 +		;;
 +	      *) ;;
 +	      esac
 +	    fi
- 	  else
- 	    # deplib doesn't seem to be a libtool library
- 	    if test prog,link = "$linkmode,$pass"; then
- 	      compile_deplibs="$deplib $compile_deplibs"
- 	      finalize_deplibs="$deplib $finalize_deplibs"
- 	    else
- 	      deplibs="$deplib $deplibs"
- 	      test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs"
- 	    fi
- 	    continue
 +	  fi
 +	  ;; # -l
 +	*.ltframework)
- 	  if test prog,link = "$linkmode,$pass"; then
++	  if test "$linkmode,$pass" = "prog,link"; then
 +	    compile_deplibs="$deplib $compile_deplibs"
 +	    finalize_deplibs="$deplib $finalize_deplibs"
 +	  else
 +	    deplibs="$deplib $deplibs"
- 	    if test lib = "$linkmode"; then
++	    if test "$linkmode" = lib ; then
 +		case "$new_inherited_linker_flags " in
 +		    *" $deplib "*) ;;
 +		    * ) func_append new_inherited_linker_flags " $deplib" ;;
 +		esac
 +	    fi
 +	  fi
 +	  continue
 +	  ;;
 +	-L*)
 +	  case $linkmode in
 +	  lib)
 +	    deplibs="$deplib $deplibs"
- 	    test conv = "$pass" && continue
++	    test "$pass" = conv && continue
 +	    newdependency_libs="$deplib $newdependency_libs"
 +	    func_stripname '-L' '' "$deplib"
 +	    func_resolve_sysroot "$func_stripname_result"
 +	    func_append newlib_search_path " $func_resolve_sysroot_result"
 +	    ;;
 +	  prog)
- 	    if test conv = "$pass"; then
++	    if test "$pass" = conv; then
 +	      deplibs="$deplib $deplibs"
 +	      continue
 +	    fi
- 	    if test scan = "$pass"; then
++	    if test "$pass" = scan; then
 +	      deplibs="$deplib $deplibs"
 +	    else
 +	      compile_deplibs="$deplib $compile_deplibs"
 +	      finalize_deplibs="$deplib $finalize_deplibs"
 +	    fi
 +	    func_stripname '-L' '' "$deplib"
 +	    func_resolve_sysroot "$func_stripname_result"
 +	    func_append newlib_search_path " $func_resolve_sysroot_result"
 +	    ;;
 +	  *)
- 	    func_warning "'-L' is ignored for archives/objects"
++	    func_warning "\`-L' is ignored for archives/objects"
 +	    ;;
 +	  esac # linkmode
 +	  continue
 +	  ;; # -L
 +	-R*)
- 	  if test link = "$pass"; then
++	  if test "$pass" = link; then
 +	    func_stripname '-R' '' "$deplib"
 +	    func_resolve_sysroot "$func_stripname_result"
 +	    dir=$func_resolve_sysroot_result
 +	    # Make sure the xrpath contains only unique directories.
 +	    case "$xrpath " in
 +	    *" $dir "*) ;;
 +	    *) func_append xrpath " $dir" ;;
 +	    esac
 +	  fi
 +	  deplibs="$deplib $deplibs"
 +	  continue
 +	  ;;
 +	*.la)
 +	  func_resolve_sysroot "$deplib"
 +	  lib=$func_resolve_sysroot_result
 +	  ;;
 +	*.$libext)
- 	  if test conv = "$pass"; then
++	  if test "$pass" = conv; then
 +	    deplibs="$deplib $deplibs"
 +	    continue
 +	  fi
 +	  case $linkmode in
 +	  lib)
 +	    # Linking convenience modules into shared libraries is allowed,
 +	    # but linking other static libraries is non-portable.
 +	    case " $dlpreconveniencelibs " in
 +	    *" $deplib "*) ;;
 +	    *)
- 	      valid_a_lib=false
++	      valid_a_lib=no
 +	      case $deplibs_check_method in
 +		match_pattern*)
 +		  set dummy $deplibs_check_method; shift
 +		  match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
 +		  if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \
 +		    | $EGREP "$match_pattern_regex" > /dev/null; then
- 		    valid_a_lib=:
++		    valid_a_lib=yes
 +		  fi
 +		;;
 +		pass_all)
- 		  valid_a_lib=:
++		  valid_a_lib=yes
 +		;;
 +	      esac
- 	      if $valid_a_lib; then
- 		echo
- 		$ECHO "*** Warning: Linking the shared library $output against the"
- 		$ECHO "*** static library $deplib is not portable!"
- 		deplibs="$deplib $deplibs"
- 	      else
++	      if test "$valid_a_lib" != yes; then
 +		echo
 +		$ECHO "*** Warning: Trying to link with static lib archive $deplib."
 +		echo "*** I have the capability to make that library automatically link in when"
 +		echo "*** you link to this library.  But I can only do this if you have a"
 +		echo "*** shared version of the library, which you do not appear to have"
 +		echo "*** because the file extensions .$libext of this argument makes me believe"
 +		echo "*** that it is just a static archive that I should not use here."
++	      else
++		echo
++		$ECHO "*** Warning: Linking the shared library $output against the"
++		$ECHO "*** static library $deplib is not portable!"
++		deplibs="$deplib $deplibs"
 +	      fi
 +	      ;;
 +	    esac
 +	    continue
 +	    ;;
 +	  prog)
- 	    if test link != "$pass"; then
++	    if test "$pass" != link; then
 +	      deplibs="$deplib $deplibs"
 +	    else
 +	      compile_deplibs="$deplib $compile_deplibs"
 +	      finalize_deplibs="$deplib $finalize_deplibs"
 +	    fi
 +	    continue
 +	    ;;
 +	  esac # linkmode
 +	  ;; # *.$libext
 +	*.lo | *.$objext)
- 	  if test conv = "$pass"; then
++	  if test "$pass" = conv; then
 +	    deplibs="$deplib $deplibs"
- 	  elif test prog = "$linkmode"; then
- 	    if test dlpreopen = "$pass" || test yes != "$dlopen_support" || test no = "$build_libtool_libs"; then
++	  elif test "$linkmode" = prog; then
++	    if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
 +	      # If there is no dlopen support or we're linking statically,
 +	      # we need to preload.
 +	      func_append newdlprefiles " $deplib"
 +	      compile_deplibs="$deplib $compile_deplibs"
 +	      finalize_deplibs="$deplib $finalize_deplibs"
 +	    else
 +	      func_append newdlfiles " $deplib"
 +	    fi
 +	  fi
 +	  continue
 +	  ;;
 +	%DEPLIBS%)
- 	  alldeplibs=:
++	  alldeplibs=yes
 +	  continue
 +	  ;;
 +	esac # case $deplib
 +
- 	$found || test -f "$lib" \
- 	  || func_fatal_error "cannot find the library '$lib' or unhandled argument '$deplib'"
++	if test "$found" = yes || test -f "$lib"; then :
++	else
++	  func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'"
++	fi
 +
 +	# Check to see that this really is a libtool archive.
 +	func_lalib_unsafe_p "$lib" \
- 	  || func_fatal_error "'$lib' is not a valid libtool archive"
++	  || func_fatal_error "\`$lib' is not a valid libtool archive"
 +
 +	func_dirname "$lib" "" "."
- 	ladir=$func_dirname_result
++	ladir="$func_dirname_result"
 +
 +	dlname=
 +	dlopen=
 +	dlpreopen=
 +	libdir=
 +	library_names=
 +	old_library=
 +	inherited_linker_flags=
 +	# If the library was installed with an old release of libtool,
 +	# it will not redefine variables installed, or shouldnotlink
 +	installed=yes
 +	shouldnotlink=no
 +	avoidtemprpath=
 +
 +
 +	# Read the .la file
 +	func_source "$lib"
 +
 +	# Convert "-framework foo" to "foo.ltframework"
 +	if test -n "$inherited_linker_flags"; then
 +	  tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'`
 +	  for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
 +	    case " $new_inherited_linker_flags " in
 +	      *" $tmp_inherited_linker_flag "*) ;;
 +	      *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";;
 +	    esac
 +	  done
 +	fi
 +	dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
- 	if test lib,link = "$linkmode,$pass" ||
- 	   test prog,scan = "$linkmode,$pass" ||
- 	   { test prog != "$linkmode" && test lib != "$linkmode"; }; then
++	if test "$linkmode,$pass" = "lib,link" ||
++	   test "$linkmode,$pass" = "prog,scan" ||
++	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
 +	  test -n "$dlopen" && func_append dlfiles " $dlopen"
 +	  test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
 +	fi
 +
- 	if test conv = "$pass"; then
++	if test "$pass" = conv; then
 +	  # Only check for convenience libraries
 +	  deplibs="$lib $deplibs"
 +	  if test -z "$libdir"; then
 +	    if test -z "$old_library"; then
- 	      func_fatal_error "cannot find name of link library for '$lib'"
++	      func_fatal_error "cannot find name of link library for \`$lib'"
 +	    fi
 +	    # It is a libtool convenience library, so add in its objects.
 +	    func_append convenience " $ladir/$objdir/$old_library"
 +	    func_append old_convenience " $ladir/$objdir/$old_library"
- 	  elif test prog != "$linkmode" && test lib != "$linkmode"; then
- 	    func_fatal_error "'$lib' is not a convenience library"
++	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
++	    func_fatal_error "\`$lib' is not a convenience library"
 +	  fi
 +	  tmp_libs=
 +	  for deplib in $dependency_libs; do
 +	    deplibs="$deplib $deplibs"
- 	    if $opt_preserve_dup_deps; then
++	    if $opt_preserve_dup_deps ; then
 +	      case "$tmp_libs " in
 +	      *" $deplib "*) func_append specialdeplibs " $deplib" ;;
 +	      esac
 +	    fi
 +	    func_append tmp_libs " $deplib"
 +	  done
 +	  continue
 +	fi # $pass = conv
 +
 +
 +	# Get the name of the library we link against.
 +	linklib=
 +	if test -n "$old_library" &&
- 	   { test yes = "$prefer_static_libs" ||
- 	     test built,no = "$prefer_static_libs,$installed"; }; then
++	   { test "$prefer_static_libs" = yes ||
++	     test "$prefer_static_libs,$installed" = "built,no"; }; then
 +	  linklib=$old_library
 +	else
 +	  for l in $old_library $library_names; do
- 	    linklib=$l
++	    linklib="$l"
 +	  done
 +	fi
 +	if test -z "$linklib"; then
- 	  func_fatal_error "cannot find name of link library for '$lib'"
++	  func_fatal_error "cannot find name of link library for \`$lib'"
 +	fi
 +
 +	# This library was specified with -dlopen.
- 	if test dlopen = "$pass"; then
- 	  test -z "$libdir" \
- 	    && func_fatal_error "cannot -dlopen a convenience library: '$lib'"
++	if test "$pass" = dlopen; then
++	  if test -z "$libdir"; then
++	    func_fatal_error "cannot -dlopen a convenience library: \`$lib'"
++	  fi
 +	  if test -z "$dlname" ||
- 	     test yes != "$dlopen_support" ||
- 	     test no = "$build_libtool_libs"
- 	  then
++	     test "$dlopen_support" != yes ||
++	     test "$build_libtool_libs" = no; then
 +	    # If there is no dlname, no dlopen support or we're linking
 +	    # statically, we need to preload.  We also need to preload any
 +	    # dependent libraries so libltdl's deplib preloader doesn't
 +	    # bomb out in the load deplibs phase.
 +	    func_append dlprefiles " $lib $dependency_libs"
 +	  else
 +	    func_append newdlfiles " $lib"
 +	  fi
 +	  continue
 +	fi # $pass = dlopen
 +
 +	# We need an absolute path.
 +	case $ladir in
- 	[\\/]* | [A-Za-z]:[\\/]*) abs_ladir=$ladir ;;
++	[\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
 +	*)
 +	  abs_ladir=`cd "$ladir" && pwd`
 +	  if test -z "$abs_ladir"; then
- 	    func_warning "cannot determine absolute directory name of '$ladir'"
++	    func_warning "cannot determine absolute directory name of \`$ladir'"
 +	    func_warning "passing it literally to the linker, although it might fail"
- 	    abs_ladir=$ladir
++	    abs_ladir="$ladir"
 +	  fi
 +	  ;;
 +	esac
 +	func_basename "$lib"
- 	laname=$func_basename_result
++	laname="$func_basename_result"
 +
 +	# Find the relevant object directory and library name.
- 	if test yes = "$installed"; then
++	if test "X$installed" = Xyes; then
 +	  if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
- 	    func_warning "library '$lib' was moved."
- 	    dir=$ladir
- 	    absdir=$abs_ladir
- 	    libdir=$abs_ladir
++	    func_warning "library \`$lib' was moved."
++	    dir="$ladir"
++	    absdir="$abs_ladir"
++	    libdir="$abs_ladir"
 +	  else
- 	    dir=$lt_sysroot$libdir
- 	    absdir=$lt_sysroot$libdir
++	    dir="$lt_sysroot$libdir"
++	    absdir="$lt_sysroot$libdir"
 +	  fi
- 	  test yes = "$hardcode_automatic" && avoidtemprpath=yes
++	  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
 +	else
 +	  if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
- 	    dir=$ladir
- 	    absdir=$abs_ladir
++	    dir="$ladir"
++	    absdir="$abs_ladir"
 +	    # Remove this search path later
 +	    func_append notinst_path " $abs_ladir"
 +	  else
- 	    dir=$ladir/$objdir
- 	    absdir=$abs_ladir/$objdir
++	    dir="$ladir/$objdir"
++	    absdir="$abs_ladir/$objdir"
 +	    # Remove this search path later
 +	    func_append notinst_path " $abs_ladir"
 +	  fi
 +	fi # $installed = yes
 +	func_stripname 'lib' '.la' "$laname"
 +	name=$func_stripname_result
 +
 +	# This library was specified with -dlpreopen.
- 	if test dlpreopen = "$pass"; then
- 	  if test -z "$libdir" && test prog = "$linkmode"; then
- 	    func_fatal_error "only libraries may -dlpreopen a convenience library: '$lib'"
++	if test "$pass" = dlpreopen; then
++	  if test -z "$libdir" && test "$linkmode" = prog; then
++	    func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
 +	  fi
- 	  case $host in
++	  case "$host" in
 +	    # special handling for platforms with PE-DLLs.
 +	    *cygwin* | *mingw* | *cegcc* )
 +	      # Linker will automatically link against shared library if both
 +	      # static and shared are present.  Therefore, ensure we extract
 +	      # symbols from the import library if a shared library is present
 +	      # (otherwise, the dlopen module name will be incorrect).  We do
 +	      # this by putting the import library name into $newdlprefiles.
 +	      # We recover the dlopen module name by 'saving' the la file
 +	      # name in a special purpose variable, and (later) extracting the
 +	      # dlname from the la file.
 +	      if test -n "$dlname"; then
 +	        func_tr_sh "$dir/$linklib"
 +	        eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname"
 +	        func_append newdlprefiles " $dir/$linklib"
 +	      else
 +	        func_append newdlprefiles " $dir/$old_library"
 +	        # Keep a list of preopened convenience libraries to check
 +	        # that they are being used correctly in the link pass.
 +	        test -z "$libdir" && \
 +	          func_append dlpreconveniencelibs " $dir/$old_library"
 +	      fi
 +	    ;;
 +	    * )
 +	      # Prefer using a static library (so that no silly _DYNAMIC symbols
 +	      # are required to link).
 +	      if test -n "$old_library"; then
 +	        func_append newdlprefiles " $dir/$old_library"
 +	        # Keep a list of preopened convenience libraries to check
 +	        # that they are being used correctly in the link pass.
 +	        test -z "$libdir" && \
 +	          func_append dlpreconveniencelibs " $dir/$old_library"
 +	      # Otherwise, use the dlname, so that lt_dlopen finds it.
 +	      elif test -n "$dlname"; then
 +	        func_append newdlprefiles " $dir/$dlname"
 +	      else
 +	        func_append newdlprefiles " $dir/$linklib"
 +	      fi
 +	    ;;
 +	  esac
 +	fi # $pass = dlpreopen
 +
 +	if test -z "$libdir"; then
 +	  # Link the convenience library
- 	  if test lib = "$linkmode"; then
++	  if test "$linkmode" = lib; then
 +	    deplibs="$dir/$old_library $deplibs"
- 	  elif test prog,link = "$linkmode,$pass"; then
++	  elif test "$linkmode,$pass" = "prog,link"; then
 +	    compile_deplibs="$dir/$old_library $compile_deplibs"
 +	    finalize_deplibs="$dir/$old_library $finalize_deplibs"
 +	  else
 +	    deplibs="$lib $deplibs" # used for prog,scan pass
 +	  fi
 +	  continue
 +	fi
 +
 +
- 	if test prog = "$linkmode" && test link != "$pass"; then
++	if test "$linkmode" = prog && test "$pass" != link; then
 +	  func_append newlib_search_path " $ladir"
 +	  deplibs="$lib $deplibs"
 +
- 	  linkalldeplibs=false
- 	  if test no != "$link_all_deplibs" || test -z "$library_names" ||
- 	     test no = "$build_libtool_libs"; then
- 	    linkalldeplibs=:
++	  linkalldeplibs=no
++	  if test "$link_all_deplibs" != no || test -z "$library_names" ||
++	     test "$build_libtool_libs" = no; then
++	    linkalldeplibs=yes
 +	  fi
 +
 +	  tmp_libs=
 +	  for deplib in $dependency_libs; do
 +	    case $deplib in
 +	    -L*) func_stripname '-L' '' "$deplib"
 +	         func_resolve_sysroot "$func_stripname_result"
 +	         func_append newlib_search_path " $func_resolve_sysroot_result"
 +		 ;;
 +	    esac
 +	    # Need to link against all dependency_libs?
- 	    if $linkalldeplibs; then
++	    if test "$linkalldeplibs" = yes; then
 +	      deplibs="$deplib $deplibs"
 +	    else
 +	      # Need to hardcode shared library paths
 +	      # or/and link against static libraries
 +	      newdependency_libs="$deplib $newdependency_libs"
 +	    fi
- 	    if $opt_preserve_dup_deps; then
++	    if $opt_preserve_dup_deps ; then
 +	      case "$tmp_libs " in
 +	      *" $deplib "*) func_append specialdeplibs " $deplib" ;;
 +	      esac
 +	    fi
 +	    func_append tmp_libs " $deplib"
 +	  done # for deplib
 +	  continue
 +	fi # $linkmode = prog...
 +
- 	if test prog,link = "$linkmode,$pass"; then
++	if test "$linkmode,$pass" = "prog,link"; then
 +	  if test -n "$library_names" &&
- 	     { { test no = "$prefer_static_libs" ||
- 	         test built,yes = "$prefer_static_libs,$installed"; } ||
++	     { { test "$prefer_static_libs" = no ||
++	         test "$prefer_static_libs,$installed" = "built,yes"; } ||
 +	       test -z "$old_library"; }; then
 +	    # We need to hardcode the library path
- 	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath"; then
++	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
 +	      # Make sure the rpath contains only unique directories.
- 	      case $temp_rpath: in
++	      case "$temp_rpath:" in
 +	      *"$absdir:"*) ;;
 +	      *) func_append temp_rpath "$absdir:" ;;
 +	      esac
 +	    fi
 +
 +	    # Hardcode the library path.
 +	    # Skip directories that are in the system default run-time
 +	    # search path.
 +	    case " $sys_lib_dlsearch_path " in
 +	    *" $absdir "*) ;;
 +	    *)
 +	      case "$compile_rpath " in
 +	      *" $absdir "*) ;;
 +	      *) func_append compile_rpath " $absdir" ;;
 +	      esac
 +	      ;;
 +	    esac
 +	    case " $sys_lib_dlsearch_path " in
 +	    *" $libdir "*) ;;
 +	    *)
 +	      case "$finalize_rpath " in
 +	      *" $libdir "*) ;;
 +	      *) func_append finalize_rpath " $libdir" ;;
 +	      esac
 +	      ;;
 +	    esac
 +	  fi # $linkmode,$pass = prog,link...
 +
- 	  if $alldeplibs &&
- 	     { test pass_all = "$deplibs_check_method" ||
- 	       { test yes = "$build_libtool_libs" &&
++	  if test "$alldeplibs" = yes &&
++	     { test "$deplibs_check_method" = pass_all ||
++	       { test "$build_libtool_libs" = yes &&
 +		 test -n "$library_names"; }; }; then
 +	    # We only need to search for static libraries
 +	    continue
 +	  fi
 +	fi
 +
 +	link_static=no # Whether the deplib will be linked statically
 +	use_static_libs=$prefer_static_libs
- 	if test built = "$use_static_libs" && test yes = "$installed"; then
++	if test "$use_static_libs" = built && test "$installed" = yes; then
 +	  use_static_libs=no
 +	fi
 +	if test -n "$library_names" &&
- 	   { test no = "$use_static_libs" || test -z "$old_library"; }; then
++	   { test "$use_static_libs" = no || test -z "$old_library"; }; then
 +	  case $host in
- 	  *cygwin* | *mingw* | *cegcc* | *os2*)
++	  *cygwin* | *mingw* | *cegcc*)
 +	      # No point in relinking DLLs because paths are not encoded
 +	      func_append notinst_deplibs " $lib"
 +	      need_relink=no
 +	    ;;
 +	  *)
- 	    if test no = "$installed"; then
++	    if test "$installed" = no; then
 +	      func_append notinst_deplibs " $lib"
 +	      need_relink=yes
 +	    fi
 +	    ;;
 +	  esac
 +	  # This is a shared library
 +
 +	  # Warn about portability, can't link against -module's on some
 +	  # systems (darwin).  Don't bleat about dlopened modules though!
- 	  dlopenmodule=
++	  dlopenmodule=""
 +	  for dlpremoduletest in $dlprefiles; do
 +	    if test "X$dlpremoduletest" = "X$lib"; then
- 	      dlopenmodule=$dlpremoduletest
++	      dlopenmodule="$dlpremoduletest"
 +	      break
 +	    fi
 +	  done
- 	  if test -z "$dlopenmodule" && test yes = "$shouldnotlink" && test link = "$pass"; then
++	  if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
 +	    echo
- 	    if test prog = "$linkmode"; then
++	    if test "$linkmode" = prog; then
 +	      $ECHO "*** Warning: Linking the executable $output against the loadable module"
 +	    else
 +	      $ECHO "*** Warning: Linking the shared library $output against the loadable module"
 +	    fi
 +	    $ECHO "*** $linklib is not portable!"
 +	  fi
- 	  if test lib = "$linkmode" &&
- 	     test yes = "$hardcode_into_libs"; then
++	  if test "$linkmode" = lib &&
++	     test "$hardcode_into_libs" = yes; then
 +	    # Hardcode the library path.
 +	    # Skip directories that are in the system default run-time
 +	    # search path.
 +	    case " $sys_lib_dlsearch_path " in
 +	    *" $absdir "*) ;;
 +	    *)
 +	      case "$compile_rpath " in
 +	      *" $absdir "*) ;;
 +	      *) func_append compile_rpath " $absdir" ;;
 +	      esac
 +	      ;;
 +	    esac
 +	    case " $sys_lib_dlsearch_path " in
 +	    *" $libdir "*) ;;
 +	    *)
 +	      case "$finalize_rpath " in
 +	      *" $libdir "*) ;;
 +	      *) func_append finalize_rpath " $libdir" ;;
 +	      esac
 +	      ;;
 +	    esac
 +	  fi
 +
 +	  if test -n "$old_archive_from_expsyms_cmds"; then
 +	    # figure out the soname
 +	    set dummy $library_names
 +	    shift
- 	    realname=$1
++	    realname="$1"
 +	    shift
 +	    libname=`eval "\\$ECHO \"$libname_spec\""`
 +	    # use dlname if we got it. it's perfectly good, no?
 +	    if test -n "$dlname"; then
- 	      soname=$dlname
++	      soname="$dlname"
 +	    elif test -n "$soname_spec"; then
 +	      # bleh windows
 +	      case $host in
- 	      *cygwin* | mingw* | *cegcc* | *os2*)
++	      *cygwin* | mingw* | *cegcc*)
 +	        func_arith $current - $age
 +		major=$func_arith_result
- 		versuffix=-$major
++		versuffix="-$major"
 +		;;
 +	      esac
 +	      eval soname=\"$soname_spec\"
 +	    else
- 	      soname=$realname
++	      soname="$realname"
 +	    fi
 +
 +	    # Make a new name for the extract_expsyms_cmds to use
- 	    soroot=$soname
++	    soroot="$soname"
 +	    func_basename "$soroot"
- 	    soname=$func_basename_result
++	    soname="$func_basename_result"
 +	    func_stripname 'lib' '.dll' "$soname"
 +	    newlib=libimp-$func_stripname_result.a
 +
 +	    # If the library has no export list, then create one now
 +	    if test -f "$output_objdir/$soname-def"; then :
 +	    else
- 	      func_verbose "extracting exported symbol list from '$soname'"
++	      func_verbose "extracting exported symbol list from \`$soname'"
 +	      func_execute_cmds "$extract_expsyms_cmds" 'exit $?'
 +	    fi
 +
 +	    # Create $newlib
 +	    if test -f "$output_objdir/$newlib"; then :; else
- 	      func_verbose "generating import library for '$soname'"
++	      func_verbose "generating import library for \`$soname'"
 +	      func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?'
 +	    fi
 +	    # make sure the library variables are pointing to the new library
 +	    dir=$output_objdir
 +	    linklib=$newlib
 +	  fi # test -n "$old_archive_from_expsyms_cmds"
 +
- 	  if test prog = "$linkmode" || test relink != "$opt_mode"; then
++	  if test "$linkmode" = prog || test "$opt_mode" != relink; then
 +	    add_shlibpath=
 +	    add_dir=
 +	    add=
 +	    lib_linked=yes
 +	    case $hardcode_action in
 +	    immediate | unsupported)
- 	      if test no = "$hardcode_direct"; then
- 		add=$dir/$linklib
++	      if test "$hardcode_direct" = no; then
++		add="$dir/$linklib"
 +		case $host in
- 		  *-*-sco3.2v5.0.[024]*) add_dir=-L$dir ;;
- 		  *-*-sysv4*uw2*) add_dir=-L$dir ;;
++		  *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;;
++		  *-*-sysv4*uw2*) add_dir="-L$dir" ;;
 +		  *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
- 		    *-*-unixware7*) add_dir=-L$dir ;;
++		    *-*-unixware7*) add_dir="-L$dir" ;;
 +		  *-*-darwin* )
- 		    # if the lib is a (non-dlopened) module then we cannot
++		    # if the lib is a (non-dlopened) module then we can not
 +		    # link against it, someone is ignoring the earlier warnings
 +		    if /usr/bin/file -L $add 2> /dev/null |
- 			 $GREP ": [^:]* bundle" >/dev/null; then
++			 $GREP ": [^:]* bundle" >/dev/null ; then
 +		      if test "X$dlopenmodule" != "X$lib"; then
 +			$ECHO "*** Warning: lib $linklib is a module, not a shared library"
- 			if test -z "$old_library"; then
++			if test -z "$old_library" ; then
 +			  echo
 +			  echo "*** And there doesn't seem to be a static archive available"
 +			  echo "*** The link will probably fail, sorry"
 +			else
- 			  add=$dir/$old_library
++			  add="$dir/$old_library"
 +			fi
 +		      elif test -n "$old_library"; then
- 			add=$dir/$old_library
++			add="$dir/$old_library"
 +		      fi
 +		    fi
 +		esac
- 	      elif test no = "$hardcode_minus_L"; then
++	      elif test "$hardcode_minus_L" = no; then
 +		case $host in
- 		*-*-sunos*) add_shlibpath=$dir ;;
++		*-*-sunos*) add_shlibpath="$dir" ;;
 +		esac
- 		add_dir=-L$dir
- 		add=-l$name
- 	      elif test no = "$hardcode_shlibpath_var"; then
- 		add_shlibpath=$dir
- 		add=-l$name
++		add_dir="-L$dir"
++		add="-l$name"
++	      elif test "$hardcode_shlibpath_var" = no; then
++		add_shlibpath="$dir"
++		add="-l$name"
 +	      else
 +		lib_linked=no
 +	      fi
 +	      ;;
 +	    relink)
- 	      if test yes = "$hardcode_direct" &&
- 	         test no = "$hardcode_direct_absolute"; then
- 		add=$dir/$linklib
- 	      elif test yes = "$hardcode_minus_L"; then
- 		add_dir=-L$absdir
++	      if test "$hardcode_direct" = yes &&
++	         test "$hardcode_direct_absolute" = no; then
++		add="$dir/$linklib"
++	      elif test "$hardcode_minus_L" = yes; then
++		add_dir="-L$absdir"
 +		# Try looking first in the location we're being installed to.
 +		if test -n "$inst_prefix_dir"; then
 +		  case $libdir in
 +		    [\\/]*)
 +		      func_append add_dir " -L$inst_prefix_dir$libdir"
 +		      ;;
 +		  esac
 +		fi
- 		add=-l$name
- 	      elif test yes = "$hardcode_shlibpath_var"; then
- 		add_shlibpath=$dir
- 		add=-l$name
++		add="-l$name"
++	      elif test "$hardcode_shlibpath_var" = yes; then
++		add_shlibpath="$dir"
++		add="-l$name"
 +	      else
 +		lib_linked=no
 +	      fi
 +	      ;;
 +	    *) lib_linked=no ;;
 +	    esac
 +
- 	    if test yes != "$lib_linked"; then
++	    if test "$lib_linked" != yes; then
 +	      func_fatal_configuration "unsupported hardcode properties"
 +	    fi
 +
 +	    if test -n "$add_shlibpath"; then
 +	      case :$compile_shlibpath: in
 +	      *":$add_shlibpath:"*) ;;
 +	      *) func_append compile_shlibpath "$add_shlibpath:" ;;
 +	      esac
 +	    fi
- 	    if test prog = "$linkmode"; then
++	    if test "$linkmode" = prog; then
 +	      test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
 +	      test -n "$add" && compile_deplibs="$add $compile_deplibs"
 +	    else
 +	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
 +	      test -n "$add" && deplibs="$add $deplibs"
- 	      if test yes != "$hardcode_direct" &&
- 		 test yes != "$hardcode_minus_L" &&
- 		 test yes = "$hardcode_shlibpath_var"; then
++	      if test "$hardcode_direct" != yes &&
++		 test "$hardcode_minus_L" != yes &&
++		 test "$hardcode_shlibpath_var" = yes; then
 +		case :$finalize_shlibpath: in
 +		*":$libdir:"*) ;;
 +		*) func_append finalize_shlibpath "$libdir:" ;;
 +		esac
 +	      fi
 +	    fi
 +	  fi
 +
- 	  if test prog = "$linkmode" || test relink = "$opt_mode"; then
++	  if test "$linkmode" = prog || test "$opt_mode" = relink; then
 +	    add_shlibpath=
 +	    add_dir=
 +	    add=
 +	    # Finalize command for both is simple: just hardcode it.
- 	    if test yes = "$hardcode_direct" &&
- 	       test no = "$hardcode_direct_absolute"; then
- 	      add=$libdir/$linklib
- 	    elif test yes = "$hardcode_minus_L"; then
- 	      add_dir=-L$libdir
- 	      add=-l$name
- 	    elif test yes = "$hardcode_shlibpath_var"; then
++	    if test "$hardcode_direct" = yes &&
++	       test "$hardcode_direct_absolute" = no; then
++	      add="$libdir/$linklib"
++	    elif test "$hardcode_minus_L" = yes; then
++	      add_dir="-L$libdir"
++	      add="-l$name"
++	    elif test "$hardcode_shlibpath_var" = yes; then
 +	      case :$finalize_shlibpath: in
 +	      *":$libdir:"*) ;;
 +	      *) func_append finalize_shlibpath "$libdir:" ;;
 +	      esac
- 	      add=-l$name
- 	    elif test yes = "$hardcode_automatic"; then
++	      add="-l$name"
++	    elif test "$hardcode_automatic" = yes; then
 +	      if test -n "$inst_prefix_dir" &&
- 		 test -f "$inst_prefix_dir$libdir/$linklib"; then
- 		add=$inst_prefix_dir$libdir/$linklib
++		 test -f "$inst_prefix_dir$libdir/$linklib" ; then
++		add="$inst_prefix_dir$libdir/$linklib"
 +	      else
- 		add=$libdir/$linklib
++		add="$libdir/$linklib"
 +	      fi
 +	    else
 +	      # We cannot seem to hardcode it, guess we'll fake it.
- 	      add_dir=-L$libdir
++	      add_dir="-L$libdir"
 +	      # Try looking first in the location we're being installed to.
 +	      if test -n "$inst_prefix_dir"; then
 +		case $libdir in
 +		  [\\/]*)
 +		    func_append add_dir " -L$inst_prefix_dir$libdir"
 +		    ;;
 +		esac
 +	      fi
- 	      add=-l$name
++	      add="-l$name"
 +	    fi
 +
- 	    if test prog = "$linkmode"; then
++	    if test "$linkmode" = prog; then
 +	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
 +	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
 +	    else
 +	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
 +	      test -n "$add" && deplibs="$add $deplibs"
 +	    fi
 +	  fi
- 	elif test prog = "$linkmode"; then
++	elif test "$linkmode" = prog; then
 +	  # Here we assume that one of hardcode_direct or hardcode_minus_L
 +	  # is not unsupported.  This is valid on all known static and
 +	  # shared platforms.
- 	  if test unsupported != "$hardcode_direct"; then
- 	    test -n "$old_library" && linklib=$old_library
++	  if test "$hardcode_direct" != unsupported; then
++	    test -n "$old_library" && linklib="$old_library"
 +	    compile_deplibs="$dir/$linklib $compile_deplibs"
 +	    finalize_deplibs="$dir/$linklib $finalize_deplibs"
 +	  else
 +	    compile_deplibs="-l$name -L$dir $compile_deplibs"
 +	    finalize_deplibs="-l$name -L$dir $finalize_deplibs"
 +	  fi
- 	elif test yes = "$build_libtool_libs"; then
++	elif test "$build_libtool_libs" = yes; then
 +	  # Not a shared library
- 	  if test pass_all != "$deplibs_check_method"; then
++	  if test "$deplibs_check_method" != pass_all; then
 +	    # We're trying link a shared library against a static one
 +	    # but the system doesn't support it.
 +
 +	    # Just print a warning and add the library to dependency_libs so
 +	    # that the program can be linked against the static library.
 +	    echo
- 	    $ECHO "*** Warning: This system cannot link to static lib archive $lib."
++	    $ECHO "*** Warning: This system can not link to static lib archive $lib."
 +	    echo "*** I have the capability to make that library automatically link in when"
 +	    echo "*** you link to this library.  But I can only do this if you have a"
 +	    echo "*** shared version of the library, which you do not appear to have."
- 	    if test yes = "$module"; then
++	    if test "$module" = yes; then
 +	      echo "*** But as you try to build a module library, libtool will still create "
 +	      echo "*** a static module, that should work as long as the dlopening application"
 +	      echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
 +	      if test -z "$global_symbol_pipe"; then
 +		echo
 +		echo "*** However, this would only work if libtool was able to extract symbol"
- 		echo "*** lists from a program, using 'nm' or equivalent, but libtool could"
++		echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
 +		echo "*** not find such a program.  So, this module is probably useless."
- 		echo "*** 'nm' from GNU binutils and a full rebuild may help."
++		echo "*** \`nm' from GNU binutils and a full rebuild may help."
 +	      fi
- 	      if test no = "$build_old_libs"; then
++	      if test "$build_old_libs" = no; then
 +		build_libtool_libs=module
 +		build_old_libs=yes
 +	      else
 +		build_libtool_libs=no
 +	      fi
 +	    fi
 +	  else
 +	    deplibs="$dir/$old_library $deplibs"
 +	    link_static=yes
 +	  fi
 +	fi # link shared/static library?
 +
- 	if test lib = "$linkmode"; then
++	if test "$linkmode" = lib; then
 +	  if test -n "$dependency_libs" &&
- 	     { test yes != "$hardcode_into_libs" ||
- 	       test yes = "$build_old_libs" ||
- 	       test yes = "$link_static"; }; then
++	     { test "$hardcode_into_libs" != yes ||
++	       test "$build_old_libs" = yes ||
++	       test "$link_static" = yes; }; then
 +	    # Extract -R from dependency_libs
 +	    temp_deplibs=
 +	    for libdir in $dependency_libs; do
 +	      case $libdir in
 +	      -R*) func_stripname '-R' '' "$libdir"
 +	           temp_xrpath=$func_stripname_result
 +		   case " $xrpath " in
 +		   *" $temp_xrpath "*) ;;
 +		   *) func_append xrpath " $temp_xrpath";;
 +		   esac;;
 +	      *) func_append temp_deplibs " $libdir";;
 +	      esac
 +	    done
- 	    dependency_libs=$temp_deplibs
++	    dependency_libs="$temp_deplibs"
 +	  fi
 +
 +	  func_append newlib_search_path " $absdir"
 +	  # Link against this library
- 	  test no = "$link_static" && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
++	  test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
 +	  # ... and its dependency_libs
 +	  tmp_libs=
 +	  for deplib in $dependency_libs; do
 +	    newdependency_libs="$deplib $newdependency_libs"
 +	    case $deplib in
 +              -L*) func_stripname '-L' '' "$deplib"
 +                   func_resolve_sysroot "$func_stripname_result";;
 +              *) func_resolve_sysroot "$deplib" ;;
 +            esac
- 	    if $opt_preserve_dup_deps; then
++	    if $opt_preserve_dup_deps ; then
 +	      case "$tmp_libs " in
 +	      *" $func_resolve_sysroot_result "*)
 +                func_append specialdeplibs " $func_resolve_sysroot_result" ;;
 +	      esac
 +	    fi
 +	    func_append tmp_libs " $func_resolve_sysroot_result"
 +	  done
 +
- 	  if test no != "$link_all_deplibs"; then
++	  if test "$link_all_deplibs" != no; then
 +	    # Add the search paths of all dependency libraries
 +	    for deplib in $dependency_libs; do
 +	      path=
 +	      case $deplib in
- 	      -L*) path=$deplib ;;
++	      -L*) path="$deplib" ;;
 +	      *.la)
 +	        func_resolve_sysroot "$deplib"
 +	        deplib=$func_resolve_sysroot_result
 +	        func_dirname "$deplib" "" "."
 +		dir=$func_dirname_result
 +		# We need an absolute path.
 +		case $dir in
- 		[\\/]* | [A-Za-z]:[\\/]*) absdir=$dir ;;
++		[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
 +		*)
 +		  absdir=`cd "$dir" && pwd`
 +		  if test -z "$absdir"; then
- 		    func_warning "cannot determine absolute directory name of '$dir'"
- 		    absdir=$dir
++		    func_warning "cannot determine absolute directory name of \`$dir'"
++		    absdir="$dir"
 +		  fi
 +		  ;;
 +		esac
 +		if $GREP "^installed=no" $deplib > /dev/null; then
 +		case $host in
 +		*-*-darwin*)
 +		  depdepl=
- 		  eval deplibrary_names=`$SED -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
- 		  if test -n "$deplibrary_names"; then
- 		    for tmp in $deplibrary_names; do
++		  eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
++		  if test -n "$deplibrary_names" ; then
++		    for tmp in $deplibrary_names ; do
 +		      depdepl=$tmp
 +		    done
- 		    if test -f "$absdir/$objdir/$depdepl"; then
- 		      depdepl=$absdir/$objdir/$depdepl
- 		      darwin_install_name=`$OTOOL -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
++		    if test -f "$absdir/$objdir/$depdepl" ; then
++		      depdepl="$absdir/$objdir/$depdepl"
++		      darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
 +                      if test -z "$darwin_install_name"; then
-                           darwin_install_name=`$OTOOL64 -L $depdepl  | awk '{if (NR == 2) {print $1;exit}}'`
++                          darwin_install_name=`${OTOOL64} -L $depdepl  | awk '{if (NR == 2) {print $1;exit}}'`
 +                      fi
- 		      func_append compiler_flags " $wl-dylib_file $wl$darwin_install_name:$depdepl"
- 		      func_append linker_flags " -dylib_file $darwin_install_name:$depdepl"
++		      func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
++		      func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}"
 +		      path=
 +		    fi
 +		  fi
 +		  ;;
 +		*)
- 		  path=-L$absdir/$objdir
++		  path="-L$absdir/$objdir"
 +		  ;;
 +		esac
 +		else
- 		  eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
++		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
 +		  test -z "$libdir" && \
- 		    func_fatal_error "'$deplib' is not a valid libtool archive"
++		    func_fatal_error "\`$deplib' is not a valid libtool archive"
 +		  test "$absdir" != "$libdir" && \
- 		    func_warning "'$deplib' seems to be moved"
++		    func_warning "\`$deplib' seems to be moved"
 +
- 		  path=-L$absdir
++		  path="-L$absdir"
 +		fi
 +		;;
 +	      esac
 +	      case " $deplibs " in
 +	      *" $path "*) ;;
 +	      *) deplibs="$path $deplibs" ;;
 +	      esac
 +	    done
 +	  fi # link_all_deplibs != no
 +	fi # linkmode = lib
 +      done # for deplib in $libs
-       if test link = "$pass"; then
- 	if test prog = "$linkmode"; then
++      if test "$pass" = link; then
++	if test "$linkmode" = "prog"; then
 +	  compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
 +	  finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
 +	else
 +	  compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
 +	fi
 +      fi
-       dependency_libs=$newdependency_libs
-       if test dlpreopen = "$pass"; then
++      dependency_libs="$newdependency_libs"
++      if test "$pass" = dlpreopen; then
 +	# Link the dlpreopened libraries before other libraries
 +	for deplib in $save_deplibs; do
 +	  deplibs="$deplib $deplibs"
 +	done
 +      fi
-       if test dlopen != "$pass"; then
- 	test conv = "$pass" || {
++      if test "$pass" != dlopen; then
++	if test "$pass" != conv; then
 +	  # Make sure lib_search_path contains only unique directories.
 +	  lib_search_path=
 +	  for dir in $newlib_search_path; do
 +	    case "$lib_search_path " in
 +	    *" $dir "*) ;;
 +	    *) func_append lib_search_path " $dir" ;;
 +	    esac
 +	  done
 +	  newlib_search_path=
- 	}
++	fi
 +
- 	if test prog,link = "$linkmode,$pass"; then
- 	  vars="compile_deplibs finalize_deplibs"
++	if test "$linkmode,$pass" != "prog,link"; then
++	  vars="deplibs"
 +	else
- 	  vars=deplibs
++	  vars="compile_deplibs finalize_deplibs"
 +	fi
 +	for var in $vars dependency_libs; do
 +	  # Add libraries to $var in reverse order
 +	  eval tmp_libs=\"\$$var\"
 +	  new_libs=
 +	  for deplib in $tmp_libs; do
 +	    # FIXME: Pedantically, this is the right thing to do, so
 +	    #        that some nasty dependency loop isn't accidentally
 +	    #        broken:
 +	    #new_libs="$deplib $new_libs"
 +	    # Pragmatically, this seems to cause very few problems in
 +	    # practice:
 +	    case $deplib in
 +	    -L*) new_libs="$deplib $new_libs" ;;
 +	    -R*) ;;
 +	    *)
 +	      # And here is the reason: when a library appears more
 +	      # than once as an explicit dependence of a library, or
 +	      # is implicitly linked in more than once by the
 +	      # compiler, it is considered special, and multiple
 +	      # occurrences thereof are not removed.  Compare this
 +	      # with having the same library being listed as a
 +	      # dependency of multiple other libraries: in this case,
 +	      # we know (pedantically, we assume) the library does not
 +	      # need to be listed more than once, so we keep only the
 +	      # last copy.  This is not always right, but it is rare
 +	      # enough that we require users that really mean to play
 +	      # such unportable linking tricks to link the library
 +	      # using -Wl,-lname, so that libtool does not consider it
 +	      # for duplicate removal.
 +	      case " $specialdeplibs " in
 +	      *" $deplib "*) new_libs="$deplib $new_libs" ;;
 +	      *)
 +		case " $new_libs " in
 +		*" $deplib "*) ;;
 +		*) new_libs="$deplib $new_libs" ;;
 +		esac
 +		;;
 +	      esac
 +	      ;;
 +	    esac
 +	  done
 +	  tmp_libs=
 +	  for deplib in $new_libs; do
 +	    case $deplib in
 +	    -L*)
 +	      case " $tmp_libs " in
 +	      *" $deplib "*) ;;
 +	      *) func_append tmp_libs " $deplib" ;;
 +	      esac
 +	      ;;
 +	    *) func_append tmp_libs " $deplib" ;;
 +	    esac
 +	  done
 +	  eval $var=\"$tmp_libs\"
 +	done # for var
 +      fi
- 
-       # Add Sun CC postdeps if required:
-       test CXX = "$tagname" && {
-         case $host_os in
-         linux*)
-           case `$CC -V 2>&1 | sed 5q` in
-           *Sun\ C*) # Sun C++ 5.9
-             func_suncc_cstd_abi
- 
-             if test no != "$suncc_use_cstd_abi"; then
-               func_append postdeps ' -library=Cstd -library=Crun'
-             fi
-             ;;
-           esac
-           ;;
- 
-         solaris*)
-           func_cc_basename "$CC"
-           case $func_cc_basename_result in
-           CC* | sunCC*)
-             func_suncc_cstd_abi
- 
-             if test no != "$suncc_use_cstd_abi"; then
-               func_append postdeps ' -library=Cstd -library=Crun'
-             fi
-             ;;
-           esac
-           ;;
-         esac
-       }
- 
 +      # Last step: remove runtime libs from dependency_libs
 +      # (they stay in deplibs)
 +      tmp_libs=
-       for i in $dependency_libs; do
++      for i in $dependency_libs ; do
 +	case " $predeps $postdeps $compiler_lib_search_path " in
 +	*" $i "*)
- 	  i=
++	  i=""
 +	  ;;
 +	esac
- 	if test -n "$i"; then
++	if test -n "$i" ; then
 +	  func_append tmp_libs " $i"
 +	fi
 +      done
 +      dependency_libs=$tmp_libs
 +    done # for pass
-     if test prog = "$linkmode"; then
-       dlfiles=$newdlfiles
++    if test "$linkmode" = prog; then
++      dlfiles="$newdlfiles"
 +    fi
-     if test prog = "$linkmode" || test lib = "$linkmode"; then
-       dlprefiles=$newdlprefiles
++    if test "$linkmode" = prog || test "$linkmode" = lib; then
++      dlprefiles="$newdlprefiles"
 +    fi
 +
 +    case $linkmode in
 +    oldlib)
-       if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
- 	func_warning "'-dlopen' is ignored for archives"
++      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
++	func_warning "\`-dlopen' is ignored for archives"
 +      fi
 +
 +      case " $deplibs" in
 +      *\ -l* | *\ -L*)
- 	func_warning "'-l' and '-L' are ignored for archives" ;;
++	func_warning "\`-l' and \`-L' are ignored for archives" ;;
 +      esac
 +
 +      test -n "$rpath" && \
- 	func_warning "'-rpath' is ignored for archives"
++	func_warning "\`-rpath' is ignored for archives"
 +
 +      test -n "$xrpath" && \
- 	func_warning "'-R' is ignored for archives"
++	func_warning "\`-R' is ignored for archives"
 +
 +      test -n "$vinfo" && \
- 	func_warning "'-version-info/-version-number' is ignored for archives"
++	func_warning "\`-version-info/-version-number' is ignored for archives"
 +
 +      test -n "$release" && \
- 	func_warning "'-release' is ignored for archives"
++	func_warning "\`-release' is ignored for archives"
 +
 +      test -n "$export_symbols$export_symbols_regex" && \
- 	func_warning "'-export-symbols' is ignored for archives"
++	func_warning "\`-export-symbols' is ignored for archives"
 +
 +      # Now set the variables for building old libraries.
 +      build_libtool_libs=no
-       oldlibs=$output
++      oldlibs="$output"
 +      func_append objs "$old_deplibs"
 +      ;;
 +
 +    lib)
-       # Make sure we only generate libraries of the form 'libNAME.la'.
++      # Make sure we only generate libraries of the form `libNAME.la'.
 +      case $outputname in
 +      lib*)
 +	func_stripname 'lib' '.la' "$outputname"
 +	name=$func_stripname_result
 +	eval shared_ext=\"$shrext_cmds\"
 +	eval libname=\"$libname_spec\"
 +	;;
 +      *)
- 	test no = "$module" \
- 	  && func_fatal_help "libtool library '$output' must begin with 'lib'"
++	test "$module" = no && \
++	  func_fatal_help "libtool library \`$output' must begin with \`lib'"
 +
- 	if test no != "$need_lib_prefix"; then
++	if test "$need_lib_prefix" != no; then
 +	  # Add the "lib" prefix for modules if required
 +	  func_stripname '' '.la' "$outputname"
 +	  name=$func_stripname_result
 +	  eval shared_ext=\"$shrext_cmds\"
 +	  eval libname=\"$libname_spec\"
 +	else
 +	  func_stripname '' '.la' "$outputname"
 +	  libname=$func_stripname_result
 +	fi
 +	;;
 +      esac
 +
 +      if test -n "$objs"; then
- 	if test pass_all != "$deplibs_check_method"; then
- 	  func_fatal_error "cannot build libtool library '$output' from non-libtool objects on this host:$objs"
++	if test "$deplibs_check_method" != pass_all; then
++	  func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"
 +	else
 +	  echo
 +	  $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
 +	  $ECHO "*** objects $objs is not portable!"
 +	  func_append libobjs " $objs"
 +	fi
 +      fi
 +
-       test no = "$dlself" \
- 	|| func_warning "'-dlopen self' is ignored for libtool libraries"
++      test "$dlself" != no && \
++	func_warning "\`-dlopen self' is ignored for libtool libraries"
 +
 +      set dummy $rpath
 +      shift
-       test 1 -lt "$#" \
- 	&& func_warning "ignoring multiple '-rpath's for a libtool library"
++      test "$#" -gt 1 && \
++	func_warning "ignoring multiple \`-rpath's for a libtool library"
 +
-       install_libdir=$1
++      install_libdir="$1"
 +
 +      oldlibs=
 +      if test -z "$rpath"; then
- 	if test yes = "$build_libtool_libs"; then
++	if test "$build_libtool_libs" = yes; then
 +	  # Building a libtool convenience library.
- 	  # Some compilers have problems with a '.al' extension so
++	  # Some compilers have problems with a `.al' extension so
 +	  # convenience libraries should have the same extension an
 +	  # archive normally would.
 +	  oldlibs="$output_objdir/$libname.$libext $oldlibs"
 +	  build_libtool_libs=convenience
 +	  build_old_libs=yes
 +	fi
 +
 +	test -n "$vinfo" && \
- 	  func_warning "'-version-info/-version-number' is ignored for convenience libraries"
++	  func_warning "\`-version-info/-version-number' is ignored for convenience libraries"
 +
 +	test -n "$release" && \
- 	  func_warning "'-release' is ignored for convenience libraries"
++	  func_warning "\`-release' is ignored for convenience libraries"
 +      else
 +
 +	# Parse the version information argument.
- 	save_ifs=$IFS; IFS=:
++	save_ifs="$IFS"; IFS=':'
 +	set dummy $vinfo 0 0 0
 +	shift
- 	IFS=$save_ifs
++	IFS="$save_ifs"
 +
 +	test -n "$7" && \
- 	  func_fatal_help "too many parameters to '-version-info'"
++	  func_fatal_help "too many parameters to \`-version-info'"
 +
 +	# convert absolute version numbers to libtool ages
 +	# this retains compatibility with .la files and attempts
 +	# to make the code below a bit more comprehensible
 +
 +	case $vinfo_number in
 +	yes)
- 	  number_major=$1
- 	  number_minor=$2
- 	  number_revision=$3
++	  number_major="$1"
++	  number_minor="$2"
++	  number_revision="$3"
 +	  #
 +	  # There are really only two kinds -- those that
 +	  # use the current revision as the major version
 +	  # and those that subtract age and use age as
 +	  # a minor version.  But, then there is irix
- 	  # that has an extra 1 added just for fun
++	  # which has an extra 1 added just for fun
 +	  #
 +	  case $version_type in
 +	  # correct linux to gnu/linux during the next big refactor
- 	  darwin|freebsd-elf|linux|osf|windows|none)
++	  darwin|linux|osf|windows|none)
 +	    func_arith $number_major + $number_minor
 +	    current=$func_arith_result
- 	    age=$number_minor
- 	    revision=$number_revision
++	    age="$number_minor"
++	    revision="$number_revision"
 +	    ;;
- 	  freebsd-aout|qnx|sunos)
- 	    current=$number_major
- 	    revision=$number_minor
- 	    age=0
++	  freebsd-aout|freebsd-elf|qnx|sunos)
++	    current="$number_major"
++	    revision="$number_minor"
++	    age="0"
 +	    ;;
 +	  irix|nonstopux)
 +	    func_arith $number_major + $number_minor
 +	    current=$func_arith_result
- 	    age=$number_minor
- 	    revision=$number_minor
++	    age="$number_minor"
++	    revision="$number_minor"
 +	    lt_irix_increment=no
 +	    ;;
 +	  esac
 +	  ;;
 +	no)
- 	  current=$1
- 	  revision=$2
- 	  age=$3
++	  current="$1"
++	  revision="$2"
++	  age="$3"
 +	  ;;
 +	esac
 +
 +	# Check that each of the things are valid numbers.
 +	case $current in
 +	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
 +	*)
- 	  func_error "CURRENT '$current' must be a nonnegative integer"
- 	  func_fatal_error "'$vinfo' is not valid version information"
++	  func_error "CURRENT \`$current' must be a nonnegative integer"
++	  func_fatal_error "\`$vinfo' is not valid version information"
 +	  ;;
 +	esac
 +
 +	case $revision in
 +	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
 +	*)
- 	  func_error "REVISION '$revision' must be a nonnegative integer"
- 	  func_fatal_error "'$vinfo' is not valid version information"
++	  func_error "REVISION \`$revision' must be a nonnegative integer"
++	  func_fatal_error "\`$vinfo' is not valid version information"
 +	  ;;
 +	esac
 +
 +	case $age in
 +	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
 +	*)
- 	  func_error "AGE '$age' must be a nonnegative integer"
- 	  func_fatal_error "'$vinfo' is not valid version information"
++	  func_error "AGE \`$age' must be a nonnegative integer"
++	  func_fatal_error "\`$vinfo' is not valid version information"
 +	  ;;
 +	esac
 +
 +	if test "$age" -gt "$current"; then
- 	  func_error "AGE '$age' is greater than the current interface number '$current'"
- 	  func_fatal_error "'$vinfo' is not valid version information"
++	  func_error "AGE \`$age' is greater than the current interface number \`$current'"
++	  func_fatal_error "\`$vinfo' is not valid version information"
 +	fi
 +
 +	# Calculate the version variables.
 +	major=
 +	versuffix=
 +	verstring=
 +	case $version_type in
 +	none) ;;
 +
 +	darwin)
 +	  # Like Linux, but with the current version available in
 +	  # verstring for coding it into the library header
 +	  func_arith $current - $age
 +	  major=.$func_arith_result
- 	  versuffix=$major.$age.$revision
++	  versuffix="$major.$age.$revision"
 +	  # Darwin ld doesn't like 0 for these options...
 +	  func_arith $current + 1
 +	  minor_current=$func_arith_result
- 	  xlcverstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision"
++	  xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
 +	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
-           # On Darwin other compilers
-           case $CC in
-               nagfor*)
-                   verstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision"
-                   ;;
-               *)
-                   verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
-                   ;;
-           esac
 +	  ;;
 +
 +	freebsd-aout)
- 	  major=.$current
- 	  versuffix=.$current.$revision
++	  major=".$current"
++	  versuffix=".$current.$revision";
 +	  ;;
 +
 +	freebsd-elf)
- 	  func_arith $current - $age
- 	  major=.$func_arith_result
- 	  versuffix=$major.$age.$revision
++	  major=".$current"
++	  versuffix=".$current"
 +	  ;;
 +
 +	irix | nonstopux)
- 	  if test no = "$lt_irix_increment"; then
++	  if test "X$lt_irix_increment" = "Xno"; then
 +	    func_arith $current - $age
 +	  else
 +	    func_arith $current - $age + 1
 +	  fi
 +	  major=$func_arith_result
 +
 +	  case $version_type in
 +	    nonstopux) verstring_prefix=nonstopux ;;
 +	    *)         verstring_prefix=sgi ;;
 +	  esac
- 	  verstring=$verstring_prefix$major.$revision
++	  verstring="$verstring_prefix$major.$revision"
 +
 +	  # Add in all the interfaces that we are compatible with.
 +	  loop=$revision
- 	  while test 0 -ne "$loop"; do
++	  while test "$loop" -ne 0; do
 +	    func_arith $revision - $loop
 +	    iface=$func_arith_result
 +	    func_arith $loop - 1
 +	    loop=$func_arith_result
- 	    verstring=$verstring_prefix$major.$iface:$verstring
++	    verstring="$verstring_prefix$major.$iface:$verstring"
 +	  done
 +
- 	  # Before this point, $major must not contain '.'.
++	  # Before this point, $major must not contain `.'.
 +	  major=.$major
- 	  versuffix=$major.$revision
++	  versuffix="$major.$revision"
 +	  ;;
 +
 +	linux) # correct to gnu/linux during the next big refactor
 +	  func_arith $current - $age
 +	  major=.$func_arith_result
- 	  versuffix=$major.$age.$revision
++	  versuffix="$major.$age.$revision"
 +	  ;;
 +
 +	osf)
 +	  func_arith $current - $age
 +	  major=.$func_arith_result
- 	  versuffix=.$current.$age.$revision
- 	  verstring=$current.$age.$revision
++	  versuffix=".$current.$age.$revision"
++	  verstring="$current.$age.$revision"
 +
 +	  # Add in all the interfaces that we are compatible with.
 +	  loop=$age
- 	  while test 0 -ne "$loop"; do
++	  while test "$loop" -ne 0; do
 +	    func_arith $current - $loop
 +	    iface=$func_arith_result
 +	    func_arith $loop - 1
 +	    loop=$func_arith_result
- 	    verstring=$verstring:$iface.0
++	    verstring="$verstring:${iface}.0"
 +	  done
 +
 +	  # Make executables depend on our current version.
- 	  func_append verstring ":$current.0"
++	  func_append verstring ":${current}.0"
 +	  ;;
 +
 +	qnx)
- 	  major=.$current
- 	  versuffix=.$current
- 	  ;;
- 
- 	sco)
- 	  major=.$current
- 	  versuffix=.$current
++	  major=".$current"
++	  versuffix=".$current"
 +	  ;;
 +
 +	sunos)
- 	  major=.$current
- 	  versuffix=.$current.$revision
++	  major=".$current"
++	  versuffix=".$current.$revision"
 +	  ;;
 +
 +	windows)
 +	  # Use '-' rather than '.', since we only want one
- 	  # extension on DOS 8.3 file systems.
++	  # extension on DOS 8.3 filesystems.
 +	  func_arith $current - $age
 +	  major=$func_arith_result
- 	  versuffix=-$major
++	  versuffix="-$major"
 +	  ;;
 +
 +	*)
- 	  func_fatal_configuration "unknown library version type '$version_type'"
++	  func_fatal_configuration "unknown library version type \`$version_type'"
 +	  ;;
 +	esac
 +
 +	# Clear the version info if we defaulted, and they specified a release.
 +	if test -z "$vinfo" && test -n "$release"; then
 +	  major=
 +	  case $version_type in
 +	  darwin)
 +	    # we can't check for "0.0" in archive_cmds due to quoting
 +	    # problems, so we reset it completely
 +	    verstring=
 +	    ;;
 +	  *)
- 	    verstring=0.0
++	    verstring="0.0"
 +	    ;;
 +	  esac
- 	  if test no = "$need_version"; then
++	  if test "$need_version" = no; then
 +	    versuffix=
 +	  else
- 	    versuffix=.0.0
++	    versuffix=".0.0"
 +	  fi
 +	fi
 +
 +	# Remove version info from name if versioning should be avoided
- 	if test yes,no = "$avoid_version,$need_version"; then
++	if test "$avoid_version" = yes && test "$need_version" = no; then
 +	  major=
 +	  versuffix=
- 	  verstring=
++	  verstring=""
 +	fi
 +
 +	# Check to see if the archive will have undefined symbols.
- 	if test yes = "$allow_undefined"; then
- 	  if test unsupported = "$allow_undefined_flag"; then
- 	    if test yes = "$build_old_libs"; then
- 	      func_warning "undefined symbols not allowed in $host shared libraries; building static only"
- 	      build_libtool_libs=no
- 	    else
- 	      func_fatal_error "can't build $host shared library unless -no-undefined is specified"
- 	    fi
++	if test "$allow_undefined" = yes; then
++	  if test "$allow_undefined_flag" = unsupported; then
++	    func_warning "undefined symbols not allowed in $host shared libraries"
++	    build_libtool_libs=no
++	    build_old_libs=yes
 +	  fi
 +	else
 +	  # Don't allow undefined symbols.
- 	  allow_undefined_flag=$no_undefined_flag
++	  allow_undefined_flag="$no_undefined_flag"
 +	fi
 +
 +      fi
 +
-       func_generate_dlsyms "$libname" "$libname" :
++      func_generate_dlsyms "$libname" "$libname" "yes"
 +      func_append libobjs " $symfileobj"
-       test " " = "$libobjs" && libobjs=
++      test "X$libobjs" = "X " && libobjs=
 +
-       if test relink != "$opt_mode"; then
++      if test "$opt_mode" != relink; then
 +	# Remove our outputs, but don't remove object files since they
 +	# may have been created when compiling PIC objects.
 +	removelist=
 +	tempremovelist=`$ECHO "$output_objdir/*"`
 +	for p in $tempremovelist; do
 +	  case $p in
 +	    *.$objext | *.gcno)
 +	       ;;
- 	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/$libname$release.*)
- 	       if test -n "$precious_files_regex"; then
++	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
++	       if test "X$precious_files_regex" != "X"; then
 +		 if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
 +		 then
 +		   continue
 +		 fi
 +	       fi
 +	       func_append removelist " $p"
 +	       ;;
 +	    *) ;;
 +	  esac
 +	done
 +	test -n "$removelist" && \
 +	  func_show_eval "${RM}r \$removelist"
 +      fi
 +
 +      # Now set the variables for building old libraries.
-       if test yes = "$build_old_libs" && test convenience != "$build_libtool_libs"; then
++      if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
 +	func_append oldlibs " $output_objdir/$libname.$libext"
 +
 +	# Transform .lo files to .o files.
- 	oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; $lo2o" | $NL2SP`
++	oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`
 +      fi
 +
 +      # Eliminate all temporary directories.
 +      #for path in $notinst_path; do
 +      #	lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"`
 +      #	deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"`
 +      #	dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"`
 +      #done
 +
 +      if test -n "$xrpath"; then
 +	# If the user specified any rpath flags, then add them.
 +	temp_xrpath=
 +	for libdir in $xrpath; do
 +	  func_replace_sysroot "$libdir"
 +	  func_append temp_xrpath " -R$func_replace_sysroot_result"
 +	  case "$finalize_rpath " in
 +	  *" $libdir "*) ;;
 +	  *) func_append finalize_rpath " $libdir" ;;
 +	  esac
 +	done
- 	if test yes != "$hardcode_into_libs" || test yes = "$build_old_libs"; then
++	if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
 +	  dependency_libs="$temp_xrpath $dependency_libs"
 +	fi
 +      fi
 +
 +      # Make sure dlfiles contains only unique files that won't be dlpreopened
-       old_dlfiles=$dlfiles
++      old_dlfiles="$dlfiles"
 +      dlfiles=
 +      for lib in $old_dlfiles; do
 +	case " $dlprefiles $dlfiles " in
 +	*" $lib "*) ;;
 +	*) func_append dlfiles " $lib" ;;
 +	esac
 +      done
 +
 +      # Make sure dlprefiles contains only unique files
-       old_dlprefiles=$dlprefiles
++      old_dlprefiles="$dlprefiles"
 +      dlprefiles=
 +      for lib in $old_dlprefiles; do
 +	case "$dlprefiles " in
 +	*" $lib "*) ;;
 +	*) func_append dlprefiles " $lib" ;;
 +	esac
 +      done
 +
-       if test yes = "$build_libtool_libs"; then
++      if test "$build_libtool_libs" = yes; then
 +	if test -n "$rpath"; then
 +	  case $host in
 +	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
 +	    # these systems don't actually have a c library (as such)!
 +	    ;;
 +	  *-*-rhapsody* | *-*-darwin1.[012])
 +	    # Rhapsody C library is in the System framework
 +	    func_append deplibs " System.ltframework"
 +	    ;;
 +	  *-*-netbsd*)
 +	    # Don't link with libc until the a.out ld.so is fixed.
 +	    ;;
 +	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
 +	    # Do not include libc due to us having libc/libc_r.
 +	    ;;
 +	  *-*-sco3.2v5* | *-*-sco5v6*)
 +	    # Causes problems with __ctype
 +	    ;;
 +	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
 +	    # Compiler inserts libc in the correct place for threads to work
 +	    ;;
 +	  *)
 +	    # Add libc to deplibs on all other systems if necessary.
- 	    if test yes = "$build_libtool_need_lc"; then
++	    if test "$build_libtool_need_lc" = "yes"; then
 +	      func_append deplibs " -lc"
 +	    fi
 +	    ;;
 +	  esac
 +	fi
 +
 +	# Transform deplibs into only deplibs that can be linked in shared.
 +	name_save=$name
 +	libname_save=$libname
 +	release_save=$release
 +	versuffix_save=$versuffix
 +	major_save=$major
 +	# I'm not sure if I'm treating the release correctly.  I think
 +	# release should show up in the -l (ie -lgmp5) so we don't want to
 +	# add it in twice.  Is that correct?
- 	release=
- 	versuffix=
- 	major=
++	release=""
++	versuffix=""
++	major=""
 +	newdeplibs=
 +	droppeddeps=no
 +	case $deplibs_check_method in
 +	pass_all)
 +	  # Don't check for shared/static.  Everything works.
 +	  # This might be a little naive.  We might want to check
 +	  # whether the library exists or not.  But this is on
 +	  # osf3 & osf4 and I'm not really sure... Just
 +	  # implementing what was already the behavior.
 +	  newdeplibs=$deplibs
 +	  ;;
 +	test_compile)
 +	  # This code stresses the "libraries are programs" paradigm to its
 +	  # limits. Maybe even breaks it.  We compile a program, linking it
 +	  # against the deplibs as a proxy for the library.  Then we can check
 +	  # whether they linked in statically or dynamically with ldd.
 +	  $opt_dry_run || $RM conftest.c
 +	  cat > conftest.c <<EOF
 +	  int main() { return 0; }
 +EOF
 +	  $opt_dry_run || $RM conftest
 +	  if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
 +	    ldd_output=`ldd conftest`
 +	    for i in $deplibs; do
 +	      case $i in
 +	      -l*)
 +		func_stripname -l '' "$i"
 +		name=$func_stripname_result
- 		if test yes = "$allow_libtool_libs_with_static_runtimes"; then
++		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 +		  case " $predeps $postdeps " in
 +		  *" $i "*)
 +		    func_append newdeplibs " $i"
- 		    i=
++		    i=""
 +		    ;;
 +		  esac
 +		fi
- 		if test -n "$i"; then
++		if test -n "$i" ; then
 +		  libname=`eval "\\$ECHO \"$libname_spec\""`
 +		  deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
 +		  set dummy $deplib_matches; shift
 +		  deplib_match=$1
- 		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then
++		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
 +		    func_append newdeplibs " $i"
 +		  else
 +		    droppeddeps=yes
 +		    echo
 +		    $ECHO "*** Warning: dynamic linker does not accept needed library $i."
 +		    echo "*** I have the capability to make that library automatically link in when"
 +		    echo "*** you link to this library.  But I can only do this if you have a"
 +		    echo "*** shared version of the library, which I believe you do not have"
 +		    echo "*** because a test_compile did reveal that the linker did not use it for"
 +		    echo "*** its dynamic dependency list that programs get resolved with at runtime."
 +		  fi
 +		fi
 +		;;
 +	      *)
 +		func_append newdeplibs " $i"
 +		;;
 +	      esac
 +	    done
 +	  else
 +	    # Error occurred in the first compile.  Let's try to salvage
 +	    # the situation: Compile a separate program for each library.
 +	    for i in $deplibs; do
 +	      case $i in
 +	      -l*)
 +		func_stripname -l '' "$i"
 +		name=$func_stripname_result
 +		$opt_dry_run || $RM conftest
 +		if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
 +		  ldd_output=`ldd conftest`
- 		  if test yes = "$allow_libtool_libs_with_static_runtimes"; then
++		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 +		    case " $predeps $postdeps " in
 +		    *" $i "*)
 +		      func_append newdeplibs " $i"
- 		      i=
++		      i=""
 +		      ;;
 +		    esac
 +		  fi
- 		  if test -n "$i"; then
++		  if test -n "$i" ; then
 +		    libname=`eval "\\$ECHO \"$libname_spec\""`
 +		    deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
 +		    set dummy $deplib_matches; shift
 +		    deplib_match=$1
- 		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then
++		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
 +		      func_append newdeplibs " $i"
 +		    else
 +		      droppeddeps=yes
 +		      echo
 +		      $ECHO "*** Warning: dynamic linker does not accept needed library $i."
 +		      echo "*** I have the capability to make that library automatically link in when"
 +		      echo "*** you link to this library.  But I can only do this if you have a"
 +		      echo "*** shared version of the library, which you do not appear to have"
 +		      echo "*** because a test_compile did reveal that the linker did not use this one"
 +		      echo "*** as a dynamic dependency that programs can get resolved with at runtime."
 +		    fi
 +		  fi
 +		else
 +		  droppeddeps=yes
 +		  echo
 +		  $ECHO "*** Warning!  Library $i is needed by this library but I was not able to"
 +		  echo "*** make it link in!  You will probably need to install it or some"
 +		  echo "*** library that it depends on before this library will be fully"
 +		  echo "*** functional.  Installing it before continuing would be even better."
 +		fi
 +		;;
 +	      *)
 +		func_append newdeplibs " $i"
 +		;;
 +	      esac
 +	    done
 +	  fi
 +	  ;;
 +	file_magic*)
 +	  set dummy $deplibs_check_method; shift
 +	  file_magic_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
 +	  for a_deplib in $deplibs; do
 +	    case $a_deplib in
 +	    -l*)
 +	      func_stripname -l '' "$a_deplib"
 +	      name=$func_stripname_result
- 	      if test yes = "$allow_libtool_libs_with_static_runtimes"; then
++	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 +		case " $predeps $postdeps " in
 +		*" $a_deplib "*)
 +		  func_append newdeplibs " $a_deplib"
- 		  a_deplib=
++		  a_deplib=""
 +		  ;;
 +		esac
 +	      fi
- 	      if test -n "$a_deplib"; then
++	      if test -n "$a_deplib" ; then
 +		libname=`eval "\\$ECHO \"$libname_spec\""`
 +		if test -n "$file_magic_glob"; then
 +		  libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob`
 +		else
 +		  libnameglob=$libname
 +		fi
- 		test yes = "$want_nocaseglob" && nocaseglob=`shopt -p nocaseglob`
++		test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob`
 +		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
- 		  if test yes = "$want_nocaseglob"; then
++		  if test "$want_nocaseglob" = yes; then
 +		    shopt -s nocaseglob
 +		    potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
 +		    $nocaseglob
 +		  else
 +		    potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
 +		  fi
 +		  for potent_lib in $potential_libs; do
 +		      # Follow soft links.
 +		      if ls -lLd "$potent_lib" 2>/dev/null |
 +			 $GREP " -> " >/dev/null; then
 +			continue
 +		      fi
 +		      # The statement above tries to avoid entering an
 +		      # endless loop below, in case of cyclic links.
 +		      # We might still enter an endless loop, since a link
 +		      # loop can be closed while we follow links,
 +		      # but so what?
- 		      potlib=$potent_lib
++		      potlib="$potent_lib"
 +		      while test -h "$potlib" 2>/dev/null; do
- 			potliblink=`ls -ld $potlib | $SED 's/.* -> //'`
++			potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
 +			case $potliblink in
- 			[\\/]* | [A-Za-z]:[\\/]*) potlib=$potliblink;;
- 			*) potlib=`$ECHO "$potlib" | $SED 's|[^/]*$||'`"$potliblink";;
++			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
++			*) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";;
 +			esac
 +		      done
 +		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
 +			 $SED -e 10q |
 +			 $EGREP "$file_magic_regex" > /dev/null; then
 +			func_append newdeplibs " $a_deplib"
- 			a_deplib=
++			a_deplib=""
 +			break 2
 +		      fi
 +		  done
 +		done
 +	      fi
- 	      if test -n "$a_deplib"; then
++	      if test -n "$a_deplib" ; then
 +		droppeddeps=yes
 +		echo
 +		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
 +		echo "*** I have the capability to make that library automatically link in when"
 +		echo "*** you link to this library.  But I can only do this if you have a"
 +		echo "*** shared version of the library, which you do not appear to have"
 +		echo "*** because I did check the linker path looking for a file starting"
- 		if test -z "$potlib"; then
++		if test -z "$potlib" ; then
 +		  $ECHO "*** with $libname but no candidates were found. (...for file magic test)"
 +		else
 +		  $ECHO "*** with $libname and none of the candidates passed a file format test"
 +		  $ECHO "*** using a file magic. Last file checked: $potlib"
 +		fi
 +	      fi
 +	      ;;
 +	    *)
 +	      # Add a -L argument.
 +	      func_append newdeplibs " $a_deplib"
 +	      ;;
 +	    esac
 +	  done # Gone through all deplibs.
 +	  ;;
 +	match_pattern*)
 +	  set dummy $deplibs_check_method; shift
 +	  match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
 +	  for a_deplib in $deplibs; do
 +	    case $a_deplib in
 +	    -l*)
 +	      func_stripname -l '' "$a_deplib"
 +	      name=$func_stripname_result
- 	      if test yes = "$allow_libtool_libs_with_static_runtimes"; then
++	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 +		case " $predeps $postdeps " in
 +		*" $a_deplib "*)
 +		  func_append newdeplibs " $a_deplib"
- 		  a_deplib=
++		  a_deplib=""
 +		  ;;
 +		esac
 +	      fi
- 	      if test -n "$a_deplib"; then
++	      if test -n "$a_deplib" ; then
 +		libname=`eval "\\$ECHO \"$libname_spec\""`
 +		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
 +		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
 +		  for potent_lib in $potential_libs; do
- 		    potlib=$potent_lib # see symlink-check above in file_magic test
++		    potlib="$potent_lib" # see symlink-check above in file_magic test
 +		    if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
 +		       $EGREP "$match_pattern_regex" > /dev/null; then
 +		      func_append newdeplibs " $a_deplib"
- 		      a_deplib=
++		      a_deplib=""
 +		      break 2
 +		    fi
 +		  done
 +		done
 +	      fi
- 	      if test -n "$a_deplib"; then
++	      if test -n "$a_deplib" ; then
 +		droppeddeps=yes
 +		echo
 +		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
 +		echo "*** I have the capability to make that library automatically link in when"
 +		echo "*** you link to this library.  But I can only do this if you have a"
 +		echo "*** shared version of the library, which you do not appear to have"
 +		echo "*** because I did check the linker path looking for a file starting"
- 		if test -z "$potlib"; then
++		if test -z "$potlib" ; then
 +		  $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
 +		else
 +		  $ECHO "*** with $libname and none of the candidates passed a file format test"
 +		  $ECHO "*** using a regex pattern. Last file checked: $potlib"
 +		fi
 +	      fi
 +	      ;;
 +	    *)
 +	      # Add a -L argument.
 +	      func_append newdeplibs " $a_deplib"
 +	      ;;
 +	    esac
 +	  done # Gone through all deplibs.
 +	  ;;
 +	none | unknown | *)
- 	  newdeplibs=
++	  newdeplibs=""
 +	  tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'`
- 	  if test yes = "$allow_libtool_libs_with_static_runtimes"; then
- 	    for i in $predeps $postdeps; do
++	  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
++	    for i in $predeps $postdeps ; do
 +	      # can't use Xsed below, because $i might contain '/'
- 	      tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s|$i||"`
++	      tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"`
 +	    done
 +	  fi
 +	  case $tmp_deplibs in
 +	  *[!\	\ ]*)
 +	    echo
- 	    if test none = "$deplibs_check_method"; then
++	    if test "X$deplibs_check_method" = "Xnone"; then
 +	      echo "*** Warning: inter-library dependencies are not supported in this platform."
 +	    else
 +	      echo "*** Warning: inter-library dependencies are not known to be supported."
 +	    fi
 +	    echo "*** All declared inter-library dependencies are being dropped."
 +	    droppeddeps=yes
 +	    ;;
 +	  esac
 +	  ;;
 +	esac
 +	versuffix=$versuffix_save
 +	major=$major_save
 +	release=$release_save
 +	libname=$libname_save
 +	name=$name_save
 +
 +	case $host in
 +	*-*-rhapsody* | *-*-darwin1.[012])
 +	  # On Rhapsody replace the C library with the System framework
 +	  newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'`
 +	  ;;
 +	esac
 +
- 	if test yes = "$droppeddeps"; then
- 	  if test yes = "$module"; then
++	if test "$droppeddeps" = yes; then
++	  if test "$module" = yes; then
 +	    echo
 +	    echo "*** Warning: libtool could not satisfy all declared inter-library"
 +	    $ECHO "*** dependencies of module $libname.  Therefore, libtool will create"
 +	    echo "*** a static module, that should work as long as the dlopening"
 +	    echo "*** application is linked with the -dlopen flag."
 +	    if test -z "$global_symbol_pipe"; then
 +	      echo
 +	      echo "*** However, this would only work if libtool was able to extract symbol"
- 	      echo "*** lists from a program, using 'nm' or equivalent, but libtool could"
++	      echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
 +	      echo "*** not find such a program.  So, this module is probably useless."
- 	      echo "*** 'nm' from GNU binutils and a full rebuild may help."
++	      echo "*** \`nm' from GNU binutils and a full rebuild may help."
 +	    fi
- 	    if test no = "$build_old_libs"; then
- 	      oldlibs=$output_objdir/$libname.$libext
++	    if test "$build_old_libs" = no; then
++	      oldlibs="$output_objdir/$libname.$libext"
 +	      build_libtool_libs=module
 +	      build_old_libs=yes
 +	    else
 +	      build_libtool_libs=no
 +	    fi
 +	  else
 +	    echo "*** The inter-library dependencies that have been dropped here will be"
 +	    echo "*** automatically added whenever a program is linked with this library"
 +	    echo "*** or is declared to -dlopen it."
 +
- 	    if test no = "$allow_undefined"; then
++	    if test "$allow_undefined" = no; then
 +	      echo
 +	      echo "*** Since this library must not contain undefined symbols,"
 +	      echo "*** because either the platform does not support them or"
 +	      echo "*** it was explicitly requested with -no-undefined,"
 +	      echo "*** libtool will only create a static version of it."
- 	      if test no = "$build_old_libs"; then
- 		oldlibs=$output_objdir/$libname.$libext
++	      if test "$build_old_libs" = no; then
++		oldlibs="$output_objdir/$libname.$libext"
 +		build_libtool_libs=module
 +		build_old_libs=yes
 +	      else
 +		build_libtool_libs=no
 +	      fi
 +	    fi
 +	  fi
 +	fi
 +	# Done checking deplibs!
 +	deplibs=$newdeplibs
 +      fi
 +      # Time to change all our "foo.ltframework" stuff back to "-framework foo"
 +      case $host in
 +	*-*-darwin*)
 +	  newdeplibs=`$ECHO " $newdeplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
 +	  new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
 +	  deplibs=`$ECHO " $deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
 +	  ;;
 +      esac
 +
 +      # move library search paths that coincide with paths to not yet
 +      # installed libraries to the beginning of the library search list
 +      new_libs=
 +      for path in $notinst_path; do
 +	case " $new_libs " in
 +	*" -L$path/$objdir "*) ;;
 +	*)
 +	  case " $deplibs " in
 +	  *" -L$path/$objdir "*)
 +	    func_append new_libs " -L$path/$objdir" ;;
 +	  esac
 +	  ;;
 +	esac
 +      done
 +      for deplib in $deplibs; do
 +	case $deplib in
 +	-L*)
 +	  case " $new_libs " in
 +	  *" $deplib "*) ;;
 +	  *) func_append new_libs " $deplib" ;;
 +	  esac
 +	  ;;
 +	*) func_append new_libs " $deplib" ;;
 +	esac
 +      done
-       deplibs=$new_libs
++      deplibs="$new_libs"
 +
 +      # All the library-specific variables (install_libdir is set above).
 +      library_names=
 +      old_library=
 +      dlname=
 +
 +      # Test again, we may have decided not to build it any more
-       if test yes = "$build_libtool_libs"; then
- 	# Remove $wl instances when linking with ld.
++      if test "$build_libtool_libs" = yes; then
++	# Remove ${wl} instances when linking with ld.
 +	# FIXME: should test the right _cmds variable.
 +	case $archive_cmds in
 +	  *\$LD\ *) wl= ;;
 +        esac
- 	if test yes = "$hardcode_into_libs"; then
++	if test "$hardcode_into_libs" = yes; then
 +	  # Hardcode the library paths
 +	  hardcode_libdirs=
 +	  dep_rpath=
- 	  rpath=$finalize_rpath
- 	  test relink = "$opt_mode" || rpath=$compile_rpath$rpath
++	  rpath="$finalize_rpath"
++	  test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
 +	  for libdir in $rpath; do
 +	    if test -n "$hardcode_libdir_flag_spec"; then
 +	      if test -n "$hardcode_libdir_separator"; then
 +		func_replace_sysroot "$libdir"
 +		libdir=$func_replace_sysroot_result
 +		if test -z "$hardcode_libdirs"; then
- 		  hardcode_libdirs=$libdir
++		  hardcode_libdirs="$libdir"
 +		else
 +		  # Just accumulate the unique libdirs.
 +		  case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
 +		  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
 +		    ;;
 +		  *)
 +		    func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
 +		    ;;
 +		  esac
 +		fi
 +	      else
 +		eval flag=\"$hardcode_libdir_flag_spec\"
 +		func_append dep_rpath " $flag"
 +	      fi
 +	    elif test -n "$runpath_var"; then
 +	      case "$perm_rpath " in
 +	      *" $libdir "*) ;;
 +	      *) func_append perm_rpath " $libdir" ;;
 +	      esac
 +	    fi
 +	  done
 +	  # Substitute the hardcoded libdirs into the rpath.
 +	  if test -n "$hardcode_libdir_separator" &&
 +	     test -n "$hardcode_libdirs"; then
- 	    libdir=$hardcode_libdirs
++	    libdir="$hardcode_libdirs"
 +	    eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
 +	  fi
 +	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
 +	    # We should set the runpath_var.
 +	    rpath=
 +	    for dir in $perm_rpath; do
 +	      func_append rpath "$dir:"
 +	    done
 +	    eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
 +	  fi
 +	  test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
 +	fi
 +
- 	shlibpath=$finalize_shlibpath
- 	test relink = "$opt_mode" || shlibpath=$compile_shlibpath$shlibpath
++	shlibpath="$finalize_shlibpath"
++	test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
 +	if test -n "$shlibpath"; then
 +	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
 +	fi
 +
 +	# Get the real and link names of the library.
 +	eval shared_ext=\"$shrext_cmds\"
 +	eval library_names=\"$library_names_spec\"
 +	set dummy $library_names
 +	shift
- 	realname=$1
++	realname="$1"
 +	shift
 +
 +	if test -n "$soname_spec"; then
 +	  eval soname=\"$soname_spec\"
 +	else
- 	  soname=$realname
++	  soname="$realname"
 +	fi
 +	if test -z "$dlname"; then
 +	  dlname=$soname
 +	fi
 +
- 	lib=$output_objdir/$realname
++	lib="$output_objdir/$realname"
 +	linknames=
 +	for link
 +	do
 +	  func_append linknames " $link"
 +	done
 +
 +	# Use standard objects if they are pic
 +	test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP`
 +	test "X$libobjs" = "X " && libobjs=
 +
 +	delfiles=
 +	if test -n "$export_symbols" && test -n "$include_expsyms"; then
 +	  $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
- 	  export_symbols=$output_objdir/$libname.uexp
++	  export_symbols="$output_objdir/$libname.uexp"
 +	  func_append delfiles " $export_symbols"
 +	fi
 +
 +	orig_export_symbols=
 +	case $host_os in
 +	cygwin* | mingw* | cegcc*)
 +	  if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
 +	    # exporting using user supplied symfile
- 	    func_dll_def_p "$export_symbols" || {
++	    if test "x`$SED 1q $export_symbols`" != xEXPORTS; then
 +	      # and it's NOT already a .def file. Must figure out
 +	      # which of the given symbols are data symbols and tag
 +	      # them as such. So, trigger use of export_symbols_cmds.
 +	      # export_symbols gets reassigned inside the "prepare
 +	      # the list of exported symbols" if statement, so the
 +	      # include_expsyms logic still works.
- 	      orig_export_symbols=$export_symbols
++	      orig_export_symbols="$export_symbols"
 +	      export_symbols=
 +	      always_export_symbols=yes
- 	    }
++	    fi
 +	  fi
 +	  ;;
 +	esac
 +
 +	# Prepare the list of exported symbols
 +	if test -z "$export_symbols"; then
- 	  if test yes = "$always_export_symbols" || test -n "$export_symbols_regex"; then
- 	    func_verbose "generating symbol list for '$libname.la'"
- 	    export_symbols=$output_objdir/$libname.exp
++	  if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
++	    func_verbose "generating symbol list for \`$libname.la'"
++	    export_symbols="$output_objdir/$libname.exp"
 +	    $opt_dry_run || $RM $export_symbols
 +	    cmds=$export_symbols_cmds
- 	    save_ifs=$IFS; IFS='~'
++	    save_ifs="$IFS"; IFS='~'
 +	    for cmd1 in $cmds; do
- 	      IFS=$save_ifs
++	      IFS="$save_ifs"
 +	      # Take the normal branch if the nm_file_list_spec branch
 +	      # doesn't work or if tool conversion is not needed.
 +	      case $nm_file_list_spec~$to_tool_file_cmd in
 +		*~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*)
 +		  try_normal_branch=yes
 +		  eval cmd=\"$cmd1\"
 +		  func_len " $cmd"
 +		  len=$func_len_result
 +		  ;;
 +		*)
 +		  try_normal_branch=no
 +		  ;;
 +	      esac
- 	      if test yes = "$try_normal_branch" \
++	      if test "$try_normal_branch" = yes \
 +		 && { test "$len" -lt "$max_cmd_len" \
 +		      || test "$max_cmd_len" -le -1; }
 +	      then
 +		func_show_eval "$cmd" 'exit $?'
 +		skipped_export=false
 +	      elif test -n "$nm_file_list_spec"; then
 +		func_basename "$output"
 +		output_la=$func_basename_result
 +		save_libobjs=$libobjs
 +		save_output=$output
- 		output=$output_objdir/$output_la.nm
++		output=${output_objdir}/${output_la}.nm
 +		func_to_tool_file "$output"
 +		libobjs=$nm_file_list_spec$func_to_tool_file_result
 +		func_append delfiles " $output"
 +		func_verbose "creating $NM input file list: $output"
 +		for obj in $save_libobjs; do
 +		  func_to_tool_file "$obj"
 +		  $ECHO "$func_to_tool_file_result"
 +		done > "$output"
 +		eval cmd=\"$cmd1\"
 +		func_show_eval "$cmd" 'exit $?'
 +		output=$save_output
 +		libobjs=$save_libobjs
 +		skipped_export=false
 +	      else
 +		# The command line is too long to execute in one step.
 +		func_verbose "using reloadable object file for export list..."
 +		skipped_export=:
 +		# Break out early, otherwise skipped_export may be
 +		# set to false by a later but shorter cmd.
 +		break
 +	      fi
 +	    done
- 	    IFS=$save_ifs
- 	    if test -n "$export_symbols_regex" && test : != "$skipped_export"; then
++	    IFS="$save_ifs"
++	    if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then
 +	      func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
 +	      func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
 +	    fi
 +	  fi
 +	fi
 +
 +	if test -n "$export_symbols" && test -n "$include_expsyms"; then
- 	  tmp_export_symbols=$export_symbols
- 	  test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols
++	  tmp_export_symbols="$export_symbols"
++	  test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
 +	  $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
 +	fi
 +
- 	if test : != "$skipped_export" && test -n "$orig_export_symbols"; then
++	if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
 +	  # The given exports_symbols file has to be filtered, so filter it.
- 	  func_verbose "filter symbol list for '$libname.la' to tag DATA exports"
++	  func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
 +	  # FIXME: $output_objdir/$libname.filter potentially contains lots of
- 	  # 's' commands, which not all seds can handle. GNU sed should be fine
++	  # 's' commands which not all seds can handle. GNU sed should be fine
 +	  # though. Also, the filter scales superlinearly with the number of
 +	  # global variables. join(1) would be nice here, but unfortunately
 +	  # isn't a blessed tool.
 +	  $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
 +	  func_append delfiles " $export_symbols $output_objdir/$libname.filter"
 +	  export_symbols=$output_objdir/$libname.def
 +	  $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
 +	fi
 +
 +	tmp_deplibs=
 +	for test_deplib in $deplibs; do
 +	  case " $convenience " in
 +	  *" $test_deplib "*) ;;
 +	  *)
 +	    func_append tmp_deplibs " $test_deplib"
 +	    ;;
 +	  esac
 +	done
- 	deplibs=$tmp_deplibs
++	deplibs="$tmp_deplibs"
 +
 +	if test -n "$convenience"; then
 +	  if test -n "$whole_archive_flag_spec" &&
- 	    test yes = "$compiler_needs_object" &&
++	    test "$compiler_needs_object" = yes &&
 +	    test -z "$libobjs"; then
 +	    # extract the archives, so we have objects to list.
 +	    # TODO: could optimize this to just extract one archive.
 +	    whole_archive_flag_spec=
 +	  fi
 +	  if test -n "$whole_archive_flag_spec"; then
 +	    save_libobjs=$libobjs
 +	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
 +	    test "X$libobjs" = "X " && libobjs=
 +	  else
- 	    gentop=$output_objdir/${outputname}x
++	    gentop="$output_objdir/${outputname}x"
 +	    func_append generated " $gentop"
 +
 +	    func_extract_archives $gentop $convenience
 +	    func_append libobjs " $func_extract_archives_result"
 +	    test "X$libobjs" = "X " && libobjs=
 +	  fi
 +	fi
 +
- 	if test yes = "$thread_safe" && test -n "$thread_safe_flag_spec"; then
++	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
 +	  eval flag=\"$thread_safe_flag_spec\"
 +	  func_append linker_flags " $flag"
 +	fi
 +
 +	# Make a backup of the uninstalled library when relinking
- 	if test relink = "$opt_mode"; then
++	if test "$opt_mode" = relink; then
 +	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
 +	fi
 +
 +	# Do each of the archive commands.
- 	if test yes = "$module" && test -n "$module_cmds"; then
++	if test "$module" = yes && test -n "$module_cmds" ; then
 +	  if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
 +	    eval test_cmds=\"$module_expsym_cmds\"
 +	    cmds=$module_expsym_cmds
 +	  else
 +	    eval test_cmds=\"$module_cmds\"
 +	    cmds=$module_cmds
 +	  fi
 +	else
 +	  if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
 +	    eval test_cmds=\"$archive_expsym_cmds\"
 +	    cmds=$archive_expsym_cmds
 +	  else
 +	    eval test_cmds=\"$archive_cmds\"
 +	    cmds=$archive_cmds
 +	  fi
 +	fi
 +
- 	if test : != "$skipped_export" &&
++	if test "X$skipped_export" != "X:" &&
 +	   func_len " $test_cmds" &&
 +	   len=$func_len_result &&
 +	   test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
 +	  :
 +	else
 +	  # The command line is too long to link in one step, link piecewise
 +	  # or, if using GNU ld and skipped_export is not :, use a linker
 +	  # script.
 +
 +	  # Save the value of $output and $libobjs because we want to
 +	  # use them later.  If we have whole_archive_flag_spec, we
 +	  # want to use save_libobjs as it was before
 +	  # whole_archive_flag_spec was expanded, because we can't
 +	  # assume the linker understands whole_archive_flag_spec.
 +	  # This may have to be revisited, in case too many
 +	  # convenience libraries get linked in and end up exceeding
 +	  # the spec.
 +	  if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then
 +	    save_libobjs=$libobjs
 +	  fi
 +	  save_output=$output
 +	  func_basename "$output"
 +	  output_la=$func_basename_result
 +
 +	  # Clear the reloadable object creation command queue and
 +	  # initialize k to one.
 +	  test_cmds=
 +	  concat_cmds=
 +	  objlist=
 +	  last_robj=
 +	  k=1
 +
- 	  if test -n "$save_libobjs" && test : != "$skipped_export" && test yes = "$with_gnu_ld"; then
- 	    output=$output_objdir/$output_la.lnkscript
++	  if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
++	    output=${output_objdir}/${output_la}.lnkscript
 +	    func_verbose "creating GNU ld script: $output"
 +	    echo 'INPUT (' > $output
 +	    for obj in $save_libobjs
 +	    do
 +	      func_to_tool_file "$obj"
 +	      $ECHO "$func_to_tool_file_result" >> $output
 +	    done
 +	    echo ')' >> $output
 +	    func_append delfiles " $output"
 +	    func_to_tool_file "$output"
 +	    output=$func_to_tool_file_result
- 	  elif test -n "$save_libobjs" && test : != "$skipped_export" && test -n "$file_list_spec"; then
- 	    output=$output_objdir/$output_la.lnk
++	  elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
++	    output=${output_objdir}/${output_la}.lnk
 +	    func_verbose "creating linker input file list: $output"
 +	    : > $output
 +	    set x $save_libobjs
 +	    shift
 +	    firstobj=
- 	    if test yes = "$compiler_needs_object"; then
++	    if test "$compiler_needs_object" = yes; then
 +	      firstobj="$1 "
 +	      shift
 +	    fi
 +	    for obj
 +	    do
 +	      func_to_tool_file "$obj"
 +	      $ECHO "$func_to_tool_file_result" >> $output
 +	    done
 +	    func_append delfiles " $output"
 +	    func_to_tool_file "$output"
 +	    output=$firstobj\"$file_list_spec$func_to_tool_file_result\"
 +	  else
 +	    if test -n "$save_libobjs"; then
 +	      func_verbose "creating reloadable object files..."
- 	      output=$output_objdir/$output_la-$k.$objext
++	      output=$output_objdir/$output_la-${k}.$objext
 +	      eval test_cmds=\"$reload_cmds\"
 +	      func_len " $test_cmds"
 +	      len0=$func_len_result
 +	      len=$len0
 +
 +	      # Loop over the list of objects to be linked.
 +	      for obj in $save_libobjs
 +	      do
 +		func_len " $obj"
 +		func_arith $len + $func_len_result
 +		len=$func_arith_result
- 		if test -z "$objlist" ||
++		if test "X$objlist" = X ||
 +		   test "$len" -lt "$max_cmd_len"; then
 +		  func_append objlist " $obj"
 +		else
 +		  # The command $test_cmds is almost too long, add a
 +		  # command to the queue.
- 		  if test 1 -eq "$k"; then
++		  if test "$k" -eq 1 ; then
 +		    # The first file doesn't have a previous command to add.
 +		    reload_objs=$objlist
 +		    eval concat_cmds=\"$reload_cmds\"
 +		  else
 +		    # All subsequent reloadable object files will link in
 +		    # the last one created.
 +		    reload_objs="$objlist $last_robj"
 +		    eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
 +		  fi
- 		  last_robj=$output_objdir/$output_la-$k.$objext
++		  last_robj=$output_objdir/$output_la-${k}.$objext
 +		  func_arith $k + 1
 +		  k=$func_arith_result
- 		  output=$output_objdir/$output_la-$k.$objext
++		  output=$output_objdir/$output_la-${k}.$objext
 +		  objlist=" $obj"
 +		  func_len " $last_robj"
 +		  func_arith $len0 + $func_len_result
 +		  len=$func_arith_result
 +		fi
 +	      done
 +	      # Handle the remaining objects by creating one last
 +	      # reloadable object file.  All subsequent reloadable object
 +	      # files will link in the last one created.
 +	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
 +	      reload_objs="$objlist $last_robj"
- 	      eval concat_cmds=\"\$concat_cmds$reload_cmds\"
++	      eval concat_cmds=\"\${concat_cmds}$reload_cmds\"
 +	      if test -n "$last_robj"; then
- 	        eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
++	        eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
 +	      fi
 +	      func_append delfiles " $output"
 +
 +	    else
 +	      output=
 +	    fi
 +
- 	    ${skipped_export-false} && {
- 	      func_verbose "generating symbol list for '$libname.la'"
- 	      export_symbols=$output_objdir/$libname.exp
++	    if ${skipped_export-false}; then
++	      func_verbose "generating symbol list for \`$libname.la'"
++	      export_symbols="$output_objdir/$libname.exp"
 +	      $opt_dry_run || $RM $export_symbols
 +	      libobjs=$output
 +	      # Append the command to create the export file.
 +	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
 +	      eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\"
 +	      if test -n "$last_robj"; then
 +		eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
 +	      fi
- 	    }
++	    fi
 +
 +	    test -n "$save_libobjs" &&
 +	      func_verbose "creating a temporary reloadable object file: $output"
 +
 +	    # Loop through the commands generated above and execute them.
- 	    save_ifs=$IFS; IFS='~'
++	    save_ifs="$IFS"; IFS='~'
 +	    for cmd in $concat_cmds; do
- 	      IFS=$save_ifs
- 	      $opt_quiet || {
++	      IFS="$save_ifs"
++	      $opt_silent || {
 +		  func_quote_for_expand "$cmd"
 +		  eval "func_echo $func_quote_for_expand_result"
 +	      }
 +	      $opt_dry_run || eval "$cmd" || {
 +		lt_exit=$?
 +
 +		# Restore the uninstalled library and exit
- 		if test relink = "$opt_mode"; then
++		if test "$opt_mode" = relink; then
 +		  ( cd "$output_objdir" && \
 +		    $RM "${realname}T" && \
 +		    $MV "${realname}U" "$realname" )
 +		fi
 +
 +		exit $lt_exit
 +	      }
 +	    done
- 	    IFS=$save_ifs
++	    IFS="$save_ifs"
 +
 +	    if test -n "$export_symbols_regex" && ${skipped_export-false}; then
 +	      func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
 +	      func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
 +	    fi
 +	  fi
 +
-           ${skipped_export-false} && {
++          if ${skipped_export-false}; then
 +	    if test -n "$export_symbols" && test -n "$include_expsyms"; then
- 	      tmp_export_symbols=$export_symbols
- 	      test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols
++	      tmp_export_symbols="$export_symbols"
++	      test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
 +	      $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
 +	    fi
 +
 +	    if test -n "$orig_export_symbols"; then
 +	      # The given exports_symbols file has to be filtered, so filter it.
- 	      func_verbose "filter symbol list for '$libname.la' to tag DATA exports"
++	      func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
 +	      # FIXME: $output_objdir/$libname.filter potentially contains lots of
- 	      # 's' commands, which not all seds can handle. GNU sed should be fine
++	      # 's' commands which not all seds can handle. GNU sed should be fine
 +	      # though. Also, the filter scales superlinearly with the number of
 +	      # global variables. join(1) would be nice here, but unfortunately
 +	      # isn't a blessed tool.
 +	      $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
 +	      func_append delfiles " $export_symbols $output_objdir/$libname.filter"
 +	      export_symbols=$output_objdir/$libname.def
 +	      $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
 +	    fi
- 	  }
++	  fi
 +
 +	  libobjs=$output
 +	  # Restore the value of output.
 +	  output=$save_output
 +
 +	  if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
 +	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
 +	    test "X$libobjs" = "X " && libobjs=
 +	  fi
 +	  # Expand the library linking commands again to reset the
 +	  # value of $libobjs for piecewise linking.
 +
 +	  # Do each of the archive commands.
- 	  if test yes = "$module" && test -n "$module_cmds"; then
++	  if test "$module" = yes && test -n "$module_cmds" ; then
 +	    if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
 +	      cmds=$module_expsym_cmds
 +	    else
 +	      cmds=$module_cmds
 +	    fi
 +	  else
 +	    if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
 +	      cmds=$archive_expsym_cmds
 +	    else
 +	      cmds=$archive_cmds
 +	    fi
 +	  fi
 +	fi
 +
 +	if test -n "$delfiles"; then
 +	  # Append the command to remove temporary files to $cmds.
 +	  eval cmds=\"\$cmds~\$RM $delfiles\"
 +	fi
 +
 +	# Add any objects from preloaded convenience libraries
 +	if test -n "$dlprefiles"; then
- 	  gentop=$output_objdir/${outputname}x
++	  gentop="$output_objdir/${outputname}x"
 +	  func_append generated " $gentop"
 +
 +	  func_extract_archives $gentop $dlprefiles
 +	  func_append libobjs " $func_extract_archives_result"
 +	  test "X$libobjs" = "X " && libobjs=
 +	fi
 +
- 	save_ifs=$IFS; IFS='~'
++	save_ifs="$IFS"; IFS='~'
 +	for cmd in $cmds; do
- 	  IFS=$sp$nl
++	  IFS="$save_ifs"
 +	  eval cmd=\"$cmd\"
- 	  IFS=$save_ifs
- 	  $opt_quiet || {
++	  $opt_silent || {
 +	    func_quote_for_expand "$cmd"
 +	    eval "func_echo $func_quote_for_expand_result"
 +	  }
 +	  $opt_dry_run || eval "$cmd" || {
 +	    lt_exit=$?
 +
 +	    # Restore the uninstalled library and exit
- 	    if test relink = "$opt_mode"; then
++	    if test "$opt_mode" = relink; then
 +	      ( cd "$output_objdir" && \
 +	        $RM "${realname}T" && \
 +		$MV "${realname}U" "$realname" )
 +	    fi
 +
 +	    exit $lt_exit
 +	  }
 +	done
- 	IFS=$save_ifs
++	IFS="$save_ifs"
 +
 +	# Restore the uninstalled library and exit
- 	if test relink = "$opt_mode"; then
++	if test "$opt_mode" = relink; then
 +	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
 +
 +	  if test -n "$convenience"; then
 +	    if test -z "$whole_archive_flag_spec"; then
 +	      func_show_eval '${RM}r "$gentop"'
 +	    fi
 +	  fi
 +
 +	  exit $EXIT_SUCCESS
 +	fi
 +
 +	# Create links to the real library.
 +	for linkname in $linknames; do
 +	  if test "$realname" != "$linkname"; then
 +	    func_show_eval '(cd "$output_objdir" && $RM "$linkname" && $LN_S "$realname" "$linkname")' 'exit $?'
 +	  fi
 +	done
 +
 +	# If -module or -export-dynamic was specified, set the dlname.
- 	if test yes = "$module" || test yes = "$export_dynamic"; then
++	if test "$module" = yes || test "$export_dynamic" = yes; then
 +	  # On all known operating systems, these are identical.
- 	  dlname=$soname
++	  dlname="$soname"
 +	fi
 +      fi
 +      ;;
 +
 +    obj)
-       if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
- 	func_warning "'-dlopen' is ignored for objects"
++      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
++	func_warning "\`-dlopen' is ignored for objects"
 +      fi
 +
 +      case " $deplibs" in
 +      *\ -l* | *\ -L*)
- 	func_warning "'-l' and '-L' are ignored for objects" ;;
++	func_warning "\`-l' and \`-L' are ignored for objects" ;;
 +      esac
 +
 +      test -n "$rpath" && \
- 	func_warning "'-rpath' is ignored for objects"
++	func_warning "\`-rpath' is ignored for objects"
 +
 +      test -n "$xrpath" && \
- 	func_warning "'-R' is ignored for objects"
++	func_warning "\`-R' is ignored for objects"
 +
 +      test -n "$vinfo" && \
- 	func_warning "'-version-info' is ignored for objects"
++	func_warning "\`-version-info' is ignored for objects"
 +
 +      test -n "$release" && \
- 	func_warning "'-release' is ignored for objects"
++	func_warning "\`-release' is ignored for objects"
 +
 +      case $output in
 +      *.lo)
 +	test -n "$objs$old_deplibs" && \
- 	  func_fatal_error "cannot build library object '$output' from non-libtool objects"
++	  func_fatal_error "cannot build library object \`$output' from non-libtool objects"
 +
 +	libobj=$output
 +	func_lo2o "$libobj"
 +	obj=$func_lo2o_result
 +	;;
 +      *)
 +	libobj=
- 	obj=$output
++	obj="$output"
 +	;;
 +      esac
 +
 +      # Delete the old objects.
 +      $opt_dry_run || $RM $obj $libobj
 +
 +      # Objects from convenience libraries.  This assumes
 +      # single-version convenience libraries.  Whenever we create
 +      # different ones for PIC/non-PIC, this we'll have to duplicate
 +      # the extraction.
 +      reload_conv_objs=
 +      gentop=
-       # if reload_cmds runs $LD directly, get rid of -Wl from
-       # whole_archive_flag_spec and hope we can get by with turning comma
-       # into space.
-       case $reload_cmds in
-         *\$LD[\ \$]*) wl= ;;
-       esac
++      # reload_cmds runs $LD directly, so let us get rid of
++      # -Wl from whole_archive_flag_spec and hope we can get by with
++      # turning comma into space..
++      wl=
++
 +      if test -n "$convenience"; then
 +	if test -n "$whole_archive_flag_spec"; then
 +	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
- 	  test -n "$wl" || tmp_whole_archive_flags=`$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
- 	  reload_conv_objs=$reload_objs\ $tmp_whole_archive_flags
++	  reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
 +	else
- 	  gentop=$output_objdir/${obj}x
++	  gentop="$output_objdir/${obj}x"
 +	  func_append generated " $gentop"
 +
 +	  func_extract_archives $gentop $convenience
 +	  reload_conv_objs="$reload_objs $func_extract_archives_result"
 +	fi
 +      fi
 +
 +      # If we're not building shared, we need to use non_pic_objs
-       test yes = "$build_libtool_libs" || libobjs=$non_pic_objects
++      test "$build_libtool_libs" != yes && libobjs="$non_pic_objects"
 +
 +      # Create the old-style object.
-       reload_objs=$objs$old_deplibs' '`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; /\.lib$/d; $lo2o" | $NL2SP`' '$reload_conv_objs
++      reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
 +
-       output=$obj
++      output="$obj"
 +      func_execute_cmds "$reload_cmds" 'exit $?'
 +
 +      # Exit if we aren't doing a library object file.
 +      if test -z "$libobj"; then
 +	if test -n "$gentop"; then
 +	  func_show_eval '${RM}r "$gentop"'
 +	fi
 +
 +	exit $EXIT_SUCCESS
 +      fi
 +
-       test yes = "$build_libtool_libs" || {
++      if test "$build_libtool_libs" != yes; then
 +	if test -n "$gentop"; then
 +	  func_show_eval '${RM}r "$gentop"'
 +	fi
 +
 +	# Create an invalid libtool object if no PIC, so that we don't
 +	# accidentally link it into a program.
 +	# $show "echo timestamp > $libobj"
 +	# $opt_dry_run || eval "echo timestamp > $libobj" || exit $?
 +	exit $EXIT_SUCCESS
-       }
++      fi
 +
-       if test -n "$pic_flag" || test default != "$pic_mode"; then
++      if test -n "$pic_flag" || test "$pic_mode" != default; then
 +	# Only do commands if we really have different PIC objects.
 +	reload_objs="$libobjs $reload_conv_objs"
- 	output=$libobj
++	output="$libobj"
 +	func_execute_cmds "$reload_cmds" 'exit $?'
 +      fi
 +
 +      if test -n "$gentop"; then
 +	func_show_eval '${RM}r "$gentop"'
 +      fi
 +
 +      exit $EXIT_SUCCESS
 +      ;;
 +
 +    prog)
 +      case $host in
 +	*cygwin*) func_stripname '' '.exe' "$output"
 +	          output=$func_stripname_result.exe;;
 +      esac
 +      test -n "$vinfo" && \
- 	func_warning "'-version-info' is ignored for programs"
++	func_warning "\`-version-info' is ignored for programs"
 +
 +      test -n "$release" && \
- 	func_warning "'-release' is ignored for programs"
++	func_warning "\`-release' is ignored for programs"
 +
-       $preload \
- 	&& test unknown,unknown,unknown = "$dlopen_support,$dlopen_self,$dlopen_self_static" \
- 	&& func_warning "'LT_INIT([dlopen])' not used. Assuming no dlopen support."
++      test "$preload" = yes \
++        && test "$dlopen_support" = unknown \
++	&& test "$dlopen_self" = unknown \
++	&& test "$dlopen_self_static" = unknown && \
++	  func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support."
 +
 +      case $host in
 +      *-*-rhapsody* | *-*-darwin1.[012])
 +	# On Rhapsody replace the C library is the System framework
 +	compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'`
 +	finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'`
 +	;;
 +      esac
 +
 +      case $host in
 +      *-*-darwin*)
 +	# Don't allow lazy linking, it breaks C++ global constructors
 +	# But is supposedly fixed on 10.4 or later (yay!).
- 	if test CXX = "$tagname"; then
++	if test "$tagname" = CXX ; then
 +	  case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
 +	    10.[0123])
- 	      func_append compile_command " $wl-bind_at_load"
- 	      func_append finalize_command " $wl-bind_at_load"
++	      func_append compile_command " ${wl}-bind_at_load"
++	      func_append finalize_command " ${wl}-bind_at_load"
 +	    ;;
 +	  esac
 +	fi
 +	# Time to change all our "foo.ltframework" stuff back to "-framework foo"
 +	compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
 +	finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
 +	;;
 +      esac
 +
 +
 +      # move library search paths that coincide with paths to not yet
 +      # installed libraries to the beginning of the library search list
 +      new_libs=
 +      for path in $notinst_path; do
 +	case " $new_libs " in
 +	*" -L$path/$objdir "*) ;;
 +	*)
 +	  case " $compile_deplibs " in
 +	  *" -L$path/$objdir "*)
 +	    func_append new_libs " -L$path/$objdir" ;;
 +	  esac
 +	  ;;
 +	esac
 +      done
 +      for deplib in $compile_deplibs; do
 +	case $deplib in
 +	-L*)
 +	  case " $new_libs " in
 +	  *" $deplib "*) ;;
 +	  *) func_append new_libs " $deplib" ;;
 +	  esac
 +	  ;;
 +	*) func_append new_libs " $deplib" ;;
 +	esac
 +      done
-       compile_deplibs=$new_libs
++      compile_deplibs="$new_libs"
 +
 +
 +      func_append compile_command " $compile_deplibs"
 +      func_append finalize_command " $finalize_deplibs"
 +
 +      if test -n "$rpath$xrpath"; then
 +	# If the user specified any rpath flags, then add them.
 +	for libdir in $rpath $xrpath; do
 +	  # This is the magic to use -rpath.
 +	  case "$finalize_rpath " in
 +	  *" $libdir "*) ;;
 +	  *) func_append finalize_rpath " $libdir" ;;
 +	  esac
 +	done
 +      fi
 +
 +      # Now hardcode the library paths
 +      rpath=
 +      hardcode_libdirs=
 +      for libdir in $compile_rpath $finalize_rpath; do
 +	if test -n "$hardcode_libdir_flag_spec"; then
 +	  if test -n "$hardcode_libdir_separator"; then
 +	    if test -z "$hardcode_libdirs"; then
- 	      hardcode_libdirs=$libdir
++	      hardcode_libdirs="$libdir"
 +	    else
 +	      # Just accumulate the unique libdirs.
 +	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
 +	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
 +		;;
 +	      *)
 +		func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
 +		;;
 +	      esac
 +	    fi
 +	  else
 +	    eval flag=\"$hardcode_libdir_flag_spec\"
 +	    func_append rpath " $flag"
 +	  fi
 +	elif test -n "$runpath_var"; then
 +	  case "$perm_rpath " in
 +	  *" $libdir "*) ;;
 +	  *) func_append perm_rpath " $libdir" ;;
 +	  esac
 +	fi
 +	case $host in
 +	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
- 	  testbindir=`$ECHO "$libdir" | $SED -e 's*/lib$*/bin*'`
++	  testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'`
 +	  case :$dllsearchpath: in
 +	  *":$libdir:"*) ;;
 +	  ::) dllsearchpath=$libdir;;
 +	  *) func_append dllsearchpath ":$libdir";;
 +	  esac
 +	  case :$dllsearchpath: in
 +	  *":$testbindir:"*) ;;
 +	  ::) dllsearchpath=$testbindir;;
 +	  *) func_append dllsearchpath ":$testbindir";;
 +	  esac
 +	  ;;
 +	esac
 +      done
 +      # Substitute the hardcoded libdirs into the rpath.
 +      if test -n "$hardcode_libdir_separator" &&
 +	 test -n "$hardcode_libdirs"; then
- 	libdir=$hardcode_libdirs
++	libdir="$hardcode_libdirs"
 +	eval rpath=\" $hardcode_libdir_flag_spec\"
 +      fi
-       compile_rpath=$rpath
++      compile_rpath="$rpath"
 +
 +      rpath=
 +      hardcode_libdirs=
 +      for libdir in $finalize_rpath; do
 +	if test -n "$hardcode_libdir_flag_spec"; then
 +	  if test -n "$hardcode_libdir_separator"; then
 +	    if test -z "$hardcode_libdirs"; then
- 	      hardcode_libdirs=$libdir
++	      hardcode_libdirs="$libdir"
 +	    else
 +	      # Just accumulate the unique libdirs.
 +	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
 +	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
 +		;;
 +	      *)
 +		func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
 +		;;
 +	      esac
 +	    fi
 +	  else
 +	    eval flag=\"$hardcode_libdir_flag_spec\"
 +	    func_append rpath " $flag"
 +	  fi
 +	elif test -n "$runpath_var"; then
 +	  case "$finalize_perm_rpath " in
 +	  *" $libdir "*) ;;
 +	  *) func_append finalize_perm_rpath " $libdir" ;;
 +	  esac
 +	fi
 +      done
 +      # Substitute the hardcoded libdirs into the rpath.
 +      if test -n "$hardcode_libdir_separator" &&
 +	 test -n "$hardcode_libdirs"; then
- 	libdir=$hardcode_libdirs
++	libdir="$hardcode_libdirs"
 +	eval rpath=\" $hardcode_libdir_flag_spec\"
 +      fi
-       finalize_rpath=$rpath
++      finalize_rpath="$rpath"
 +
-       if test -n "$libobjs" && test yes = "$build_old_libs"; then
++      if test -n "$libobjs" && test "$build_old_libs" = yes; then
 +	# Transform all the library objects into standard objects.
 +	compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
 +	finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
 +      fi
 +
-       func_generate_dlsyms "$outputname" "@PROGRAM@" false
++      func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
 +
 +      # template prelinking step
 +      if test -n "$prelink_cmds"; then
 +	func_execute_cmds "$prelink_cmds" 'exit $?'
 +      fi
 +
-       wrappers_required=:
++      wrappers_required=yes
 +      case $host in
 +      *cegcc* | *mingw32ce*)
 +        # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
-         wrappers_required=false
++        wrappers_required=no
 +        ;;
 +      *cygwin* | *mingw* )
-         test yes = "$build_libtool_libs" || wrappers_required=false
++        if test "$build_libtool_libs" != yes; then
++          wrappers_required=no
++        fi
 +        ;;
 +      *)
-         if test no = "$need_relink" || test yes != "$build_libtool_libs"; then
-           wrappers_required=false
++        if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
++          wrappers_required=no
 +        fi
 +        ;;
 +      esac
-       $wrappers_required || {
++      if test "$wrappers_required" = no; then
 +	# Replace the output file specification.
 +	compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
- 	link_command=$compile_command$compile_rpath
++	link_command="$compile_command$compile_rpath"
 +
 +	# We have no uninstalled library dependencies, so finalize right now.
 +	exit_status=0
 +	func_show_eval "$link_command" 'exit_status=$?'
 +
 +	if test -n "$postlink_cmds"; then
 +	  func_to_tool_file "$output"
 +	  postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
 +	  func_execute_cmds "$postlink_cmds" 'exit $?'
 +	fi
 +
 +	# Delete the generated files.
- 	if test -f "$output_objdir/${outputname}S.$objext"; then
- 	  func_show_eval '$RM "$output_objdir/${outputname}S.$objext"'
++	if test -f "$output_objdir/${outputname}S.${objext}"; then
++	  func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
 +	fi
 +
 +	exit $exit_status
-       }
++      fi
 +
 +      if test -n "$compile_shlibpath$finalize_shlibpath"; then
 +	compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
 +      fi
 +      if test -n "$finalize_shlibpath"; then
 +	finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
 +      fi
 +
 +      compile_var=
 +      finalize_var=
 +      if test -n "$runpath_var"; then
 +	if test -n "$perm_rpath"; then
 +	  # We should set the runpath_var.
 +	  rpath=
 +	  for dir in $perm_rpath; do
 +	    func_append rpath "$dir:"
 +	  done
 +	  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
 +	fi
 +	if test -n "$finalize_perm_rpath"; then
 +	  # We should set the runpath_var.
 +	  rpath=
 +	  for dir in $finalize_perm_rpath; do
 +	    func_append rpath "$dir:"
 +	  done
 +	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
 +	fi
 +      fi
 +
-       if test yes = "$no_install"; then
++      if test "$no_install" = yes; then
 +	# We don't need to create a wrapper script.
- 	link_command=$compile_var$compile_command$compile_rpath
++	link_command="$compile_var$compile_command$compile_rpath"
 +	# Replace the output file specification.
 +	link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
 +	# Delete the old output file.
 +	$opt_dry_run || $RM $output
 +	# Link the executable and exit
 +	func_show_eval "$link_command" 'exit $?'
 +
 +	if test -n "$postlink_cmds"; then
 +	  func_to_tool_file "$output"
 +	  postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
 +	  func_execute_cmds "$postlink_cmds" 'exit $?'
 +	fi
 +
 +	exit $EXIT_SUCCESS
 +      fi
 +
-       case $hardcode_action,$fast_install in
-         relink,*)
- 	  # Fast installation is not supported
- 	  link_command=$compile_var$compile_command$compile_rpath
- 	  relink_command=$finalize_var$finalize_command$finalize_rpath
++      if test "$hardcode_action" = relink; then
++	# Fast installation is not supported
++	link_command="$compile_var$compile_command$compile_rpath"
++	relink_command="$finalize_var$finalize_command$finalize_rpath"
 +
- 	  func_warning "this platform does not like uninstalled shared libraries"
- 	  func_warning "'$output' will be relinked during installation"
- 	  ;;
-         *,yes)
- 	  link_command=$finalize_var$compile_command$finalize_rpath
- 	  relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
-           ;;
- 	*,no)
- 	  link_command=$compile_var$compile_command$compile_rpath
- 	  relink_command=$finalize_var$finalize_command$finalize_rpath
-           ;;
- 	*,needless)
- 	  link_command=$finalize_var$compile_command$finalize_rpath
- 	  relink_command=
-           ;;
-       esac
++	func_warning "this platform does not like uninstalled shared libraries"
++	func_warning "\`$output' will be relinked during installation"
++      else
++	if test "$fast_install" != no; then
++	  link_command="$finalize_var$compile_command$finalize_rpath"
++	  if test "$fast_install" = yes; then
++	    relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
++	  else
++	    # fast_install is set to needless
++	    relink_command=
++	  fi
++	else
++	  link_command="$compile_var$compile_command$compile_rpath"
++	  relink_command="$finalize_var$finalize_command$finalize_rpath"
++	fi
++      fi
 +
 +      # Replace the output file specification.
 +      link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
 +
 +      # Delete the old output files.
 +      $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
 +
 +      func_show_eval "$link_command" 'exit $?'
 +
 +      if test -n "$postlink_cmds"; then
 +	func_to_tool_file "$output_objdir/$outputname"
 +	postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
 +	func_execute_cmds "$postlink_cmds" 'exit $?'
 +      fi
 +
 +      # Now create the wrapper script.
 +      func_verbose "creating $output"
 +
 +      # Quote the relink command for shipping.
 +      if test -n "$relink_command"; then
 +	# Preserve any variables that may affect compiler behavior
 +	for var in $variables_saved_for_relink; do
 +	  if eval test -z \"\${$var+set}\"; then
 +	    relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
 +	  elif eval var_value=\$$var; test -z "$var_value"; then
 +	    relink_command="$var=; export $var; $relink_command"
 +	  else
 +	    func_quote_for_eval "$var_value"
 +	    relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
 +	  fi
 +	done
 +	relink_command="(cd `pwd`; $relink_command)"
 +	relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
 +      fi
 +
 +      # Only actually do things if not in dry run mode.
 +      $opt_dry_run || {
 +	# win32 will think the script is a binary if it has
 +	# a .exe suffix, so we strip it off here.
 +	case $output in
 +	  *.exe) func_stripname '' '.exe' "$output"
 +	         output=$func_stripname_result ;;
 +	esac
 +	# test for cygwin because mv fails w/o .exe extensions
 +	case $host in
 +	  *cygwin*)
 +	    exeext=.exe
 +	    func_stripname '' '.exe' "$outputname"
 +	    outputname=$func_stripname_result ;;
 +	  *) exeext= ;;
 +	esac
 +	case $host in
 +	  *cygwin* | *mingw* )
 +	    func_dirname_and_basename "$output" "" "."
 +	    output_name=$func_basename_result
 +	    output_path=$func_dirname_result
- 	    cwrappersource=$output_path/$objdir/lt-$output_name.c
- 	    cwrapper=$output_path/$output_name.exe
++	    cwrappersource="$output_path/$objdir/lt-$output_name.c"
++	    cwrapper="$output_path/$output_name.exe"
 +	    $RM $cwrappersource $cwrapper
 +	    trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
 +
 +	    func_emit_cwrapperexe_src > $cwrappersource
 +
 +	    # The wrapper executable is built using the $host compiler,
 +	    # because it contains $host paths and files. If cross-
 +	    # compiling, it, like the target executable, must be
 +	    # executed on the $host or under an emulation environment.
 +	    $opt_dry_run || {
 +	      $LTCC $LTCFLAGS -o $cwrapper $cwrappersource
 +	      $STRIP $cwrapper
 +	    }
 +
 +	    # Now, create the wrapper script for func_source use:
 +	    func_ltwrapper_scriptname $cwrapper
 +	    $RM $func_ltwrapper_scriptname_result
 +	    trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15
 +	    $opt_dry_run || {
 +	      # note: this script will not be executed, so do not chmod.
- 	      if test "x$build" = "x$host"; then
++	      if test "x$build" = "x$host" ; then
 +		$cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result
 +	      else
 +		func_emit_wrapper no > $func_ltwrapper_scriptname_result
 +	      fi
 +	    }
 +	  ;;
 +	  * )
 +	    $RM $output
 +	    trap "$RM $output; exit $EXIT_FAILURE" 1 2 15
 +
 +	    func_emit_wrapper no > $output
 +	    chmod +x $output
 +	  ;;
 +	esac
 +      }
 +      exit $EXIT_SUCCESS
 +      ;;
 +    esac
 +
 +    # See if we need to build an old-fashioned archive.
 +    for oldlib in $oldlibs; do
 +
-       case $build_libtool_libs in
-         convenience)
- 	  oldobjs="$libobjs_save $symfileobj"
- 	  addlibs=$convenience
- 	  build_libtool_libs=no
- 	  ;;
- 	module)
- 	  oldobjs=$libobjs_save
- 	  addlibs=$old_convenience
++      if test "$build_libtool_libs" = convenience; then
++	oldobjs="$libobjs_save $symfileobj"
++	addlibs="$convenience"
++	build_libtool_libs=no
++      else
++	if test "$build_libtool_libs" = module; then
++	  oldobjs="$libobjs_save"
 +	  build_libtool_libs=no
-           ;;
- 	*)
++	else
 +	  oldobjs="$old_deplibs $non_pic_objects"
- 	  $preload && test -f "$symfileobj" \
- 	    && func_append oldobjs " $symfileobj"
- 	  addlibs=$old_convenience
- 	  ;;
-       esac
++	  if test "$preload" = yes && test -f "$symfileobj"; then
++	    func_append oldobjs " $symfileobj"
++	  fi
++	fi
++	addlibs="$old_convenience"
++      fi
 +
 +      if test -n "$addlibs"; then
- 	gentop=$output_objdir/${outputname}x
++	gentop="$output_objdir/${outputname}x"
 +	func_append generated " $gentop"
 +
 +	func_extract_archives $gentop $addlibs
 +	func_append oldobjs " $func_extract_archives_result"
 +      fi
 +
 +      # Do each command in the archive commands.
-       if test -n "$old_archive_from_new_cmds" && test yes = "$build_libtool_libs"; then
++      if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
 +	cmds=$old_archive_from_new_cmds
 +      else
 +
 +	# Add any objects from preloaded convenience libraries
 +	if test -n "$dlprefiles"; then
- 	  gentop=$output_objdir/${outputname}x
++	  gentop="$output_objdir/${outputname}x"
 +	  func_append generated " $gentop"
 +
 +	  func_extract_archives $gentop $dlprefiles
 +	  func_append oldobjs " $func_extract_archives_result"
 +	fi
 +
 +	# POSIX demands no paths to be encoded in archives.  We have
 +	# to avoid creating archives with duplicate basenames if we
 +	# might have to extract them afterwards, e.g., when creating a
 +	# static archive out of a convenience library, or when linking
 +	# the entirety of a libtool archive into another (currently
 +	# not supported by libtool).
 +	if (for obj in $oldobjs
 +	    do
 +	      func_basename "$obj"
 +	      $ECHO "$func_basename_result"
 +	    done | sort | sort -uc >/dev/null 2>&1); then
 +	  :
 +	else
 +	  echo "copying selected object files to avoid basename conflicts..."
- 	  gentop=$output_objdir/${outputname}x
++	  gentop="$output_objdir/${outputname}x"
 +	  func_append generated " $gentop"
 +	  func_mkdir_p "$gentop"
 +	  save_oldobjs=$oldobjs
 +	  oldobjs=
 +	  counter=1
 +	  for obj in $save_oldobjs
 +	  do
 +	    func_basename "$obj"
- 	    objbase=$func_basename_result
++	    objbase="$func_basename_result"
 +	    case " $oldobjs " in
 +	    " ") oldobjs=$obj ;;
 +	    *[\ /]"$objbase "*)
 +	      while :; do
 +		# Make sure we don't pick an alternate name that also
 +		# overlaps.
 +		newobj=lt$counter-$objbase
 +		func_arith $counter + 1
 +		counter=$func_arith_result
 +		case " $oldobjs " in
 +		*[\ /]"$newobj "*) ;;
 +		*) if test ! -f "$gentop/$newobj"; then break; fi ;;
 +		esac
 +	      done
 +	      func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
 +	      func_append oldobjs " $gentop/$newobj"
 +	      ;;
 +	    *) func_append oldobjs " $obj" ;;
 +	    esac
 +	  done
 +	fi
 +	func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
 +	tool_oldlib=$func_to_tool_file_result
 +	eval cmds=\"$old_archive_cmds\"
 +
 +	func_len " $cmds"
 +	len=$func_len_result
 +	if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
 +	  cmds=$old_archive_cmds
 +	elif test -n "$archiver_list_spec"; then
 +	  func_verbose "using command file archive linking..."
 +	  for obj in $oldobjs
 +	  do
 +	    func_to_tool_file "$obj"
 +	    $ECHO "$func_to_tool_file_result"
 +	  done > $output_objdir/$libname.libcmd
 +	  func_to_tool_file "$output_objdir/$libname.libcmd"
 +	  oldobjs=" $archiver_list_spec$func_to_tool_file_result"
 +	  cmds=$old_archive_cmds
 +	else
 +	  # the command line is too long to link in one step, link in parts
 +	  func_verbose "using piecewise archive linking..."
 +	  save_RANLIB=$RANLIB
 +	  RANLIB=:
 +	  objlist=
 +	  concat_cmds=
 +	  save_oldobjs=$oldobjs
 +	  oldobjs=
 +	  # Is there a better way of finding the last object in the list?
 +	  for obj in $save_oldobjs
 +	  do
 +	    last_oldobj=$obj
 +	  done
 +	  eval test_cmds=\"$old_archive_cmds\"
 +	  func_len " $test_cmds"
 +	  len0=$func_len_result
 +	  len=$len0
 +	  for obj in $save_oldobjs
 +	  do
 +	    func_len " $obj"
 +	    func_arith $len + $func_len_result
 +	    len=$func_arith_result
 +	    func_append objlist " $obj"
 +	    if test "$len" -lt "$max_cmd_len"; then
 +	      :
 +	    else
 +	      # the above command should be used before it gets too long
 +	      oldobjs=$objlist
- 	      if test "$obj" = "$last_oldobj"; then
++	      if test "$obj" = "$last_oldobj" ; then
 +		RANLIB=$save_RANLIB
 +	      fi
 +	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
- 	      eval concat_cmds=\"\$concat_cmds$old_archive_cmds\"
++	      eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
 +	      objlist=
 +	      len=$len0
 +	    fi
 +	  done
 +	  RANLIB=$save_RANLIB
 +	  oldobjs=$objlist
- 	  if test -z "$oldobjs"; then
++	  if test "X$oldobjs" = "X" ; then
 +	    eval cmds=\"\$concat_cmds\"
 +	  else
 +	    eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
 +	  fi
 +	fi
 +      fi
 +      func_execute_cmds "$cmds" 'exit $?'
 +    done
 +
 +    test -n "$generated" && \
 +      func_show_eval "${RM}r$generated"
 +
 +    # Now create the libtool archive.
 +    case $output in
 +    *.la)
 +      old_library=
-       test yes = "$build_old_libs" && old_library=$libname.$libext
++      test "$build_old_libs" = yes && old_library="$libname.$libext"
 +      func_verbose "creating $output"
 +
 +      # Preserve any variables that may affect compiler behavior
 +      for var in $variables_saved_for_relink; do
 +	if eval test -z \"\${$var+set}\"; then
 +	  relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
 +	elif eval var_value=\$$var; test -z "$var_value"; then
 +	  relink_command="$var=; export $var; $relink_command"
 +	else
 +	  func_quote_for_eval "$var_value"
 +	  relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
 +	fi
 +      done
 +      # Quote the link command for shipping.
-       relink_command="(cd `pwd`; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
++      relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
 +      relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
-       if test yes = "$hardcode_automatic"; then
++      if test "$hardcode_automatic" = yes ; then
 +	relink_command=
 +      fi
 +
 +      # Only create the output if not a dry run.
 +      $opt_dry_run || {
 +	for installed in no yes; do
- 	  if test yes = "$installed"; then
++	  if test "$installed" = yes; then
 +	    if test -z "$install_libdir"; then
 +	      break
 +	    fi
- 	    output=$output_objdir/${outputname}i
++	    output="$output_objdir/$outputname"i
 +	    # Replace all uninstalled libtool libraries with the installed ones
 +	    newdependency_libs=
 +	    for deplib in $dependency_libs; do
 +	      case $deplib in
 +	      *.la)
 +		func_basename "$deplib"
- 		name=$func_basename_result
++		name="$func_basename_result"
 +		func_resolve_sysroot "$deplib"
- 		eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
++		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
 +		test -z "$libdir" && \
- 		  func_fatal_error "'$deplib' is not a valid libtool archive"
++		  func_fatal_error "\`$deplib' is not a valid libtool archive"
 +		func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
 +		;;
 +	      -L*)
 +		func_stripname -L '' "$deplib"
 +		func_replace_sysroot "$func_stripname_result"
 +		func_append newdependency_libs " -L$func_replace_sysroot_result"
 +		;;
 +	      -R*)
 +		func_stripname -R '' "$deplib"
 +		func_replace_sysroot "$func_stripname_result"
 +		func_append newdependency_libs " -R$func_replace_sysroot_result"
 +		;;
 +	      *) func_append newdependency_libs " $deplib" ;;
 +	      esac
 +	    done
- 	    dependency_libs=$newdependency_libs
++	    dependency_libs="$newdependency_libs"
 +	    newdlfiles=
 +
 +	    for lib in $dlfiles; do
 +	      case $lib in
 +	      *.la)
 +	        func_basename "$lib"
- 		name=$func_basename_result
- 		eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
++		name="$func_basename_result"
++		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
 +		test -z "$libdir" && \
- 		  func_fatal_error "'$lib' is not a valid libtool archive"
++		  func_fatal_error "\`$lib' is not a valid libtool archive"
 +		func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
 +		;;
 +	      *) func_append newdlfiles " $lib" ;;
 +	      esac
 +	    done
- 	    dlfiles=$newdlfiles
++	    dlfiles="$newdlfiles"
 +	    newdlprefiles=
 +	    for lib in $dlprefiles; do
 +	      case $lib in
 +	      *.la)
 +		# Only pass preopened files to the pseudo-archive (for
 +		# eventual linking with the app. that links it) if we
 +		# didn't already link the preopened objects directly into
 +		# the library:
 +		func_basename "$lib"
- 		name=$func_basename_result
- 		eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
++		name="$func_basename_result"
++		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
 +		test -z "$libdir" && \
- 		  func_fatal_error "'$lib' is not a valid libtool archive"
++		  func_fatal_error "\`$lib' is not a valid libtool archive"
 +		func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
 +		;;
 +	      esac
 +	    done
- 	    dlprefiles=$newdlprefiles
++	    dlprefiles="$newdlprefiles"
 +	  else
 +	    newdlfiles=
 +	    for lib in $dlfiles; do
 +	      case $lib in
- 		[\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;;
++		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
 +		*) abs=`pwd`"/$lib" ;;
 +	      esac
 +	      func_append newdlfiles " $abs"
 +	    done
- 	    dlfiles=$newdlfiles
++	    dlfiles="$newdlfiles"
 +	    newdlprefiles=
 +	    for lib in $dlprefiles; do
 +	      case $lib in
- 		[\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;;
++		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
 +		*) abs=`pwd`"/$lib" ;;
 +	      esac
 +	      func_append newdlprefiles " $abs"
 +	    done
- 	    dlprefiles=$newdlprefiles
++	    dlprefiles="$newdlprefiles"
 +	  fi
 +	  $RM $output
 +	  # place dlname in correct position for cygwin
 +	  # In fact, it would be nice if we could use this code for all target
 +	  # systems that can't hard-code library paths into their executables
 +	  # and that have no shared library path variable independent of PATH,
 +	  # but it turns out we can't easily determine that from inspecting
 +	  # libtool variables, so we have to hard-code the OSs to which it
 +	  # applies here; at the moment, that means platforms that use the PE
 +	  # object format with DLL files.  See the long comment at the top of
 +	  # tests/bindir.at for full details.
 +	  tdlname=$dlname
 +	  case $host,$output,$installed,$module,$dlname in
 +	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
 +	      # If a -bindir argument was supplied, place the dll there.
- 	      if test -n "$bindir"; then
++	      if test "x$bindir" != x ;
++	      then
 +		func_relative_path "$install_libdir" "$bindir"
- 		tdlname=$func_relative_path_result/$dlname
++		tdlname=$func_relative_path_result$dlname
 +	      else
 +		# Otherwise fall back on heuristic.
 +		tdlname=../bin/$dlname
 +	      fi
 +	      ;;
 +	  esac
 +	  $ECHO > $output "\
 +# $outputname - a libtool library file
- # Generated by $PROGRAM (GNU $PACKAGE) $VERSION
++# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
 +#
 +# Please DO NOT delete this file!
 +# It is necessary for linking the library.
 +
 +# The name that we can dlopen(3).
 +dlname='$tdlname'
 +
 +# Names of this library.
 +library_names='$library_names'
 +
 +# The name of the static archive.
 +old_library='$old_library'
 +
- # Linker flags that cannot go in dependency_libs.
++# Linker flags that can not go in dependency_libs.
 +inherited_linker_flags='$new_inherited_linker_flags'
 +
 +# Libraries that this one depends upon.
 +dependency_libs='$dependency_libs'
 +
 +# Names of additional weak libraries provided by this library
 +weak_library_names='$weak_libs'
 +
 +# Version information for $libname.
 +current=$current
 +age=$age
 +revision=$revision
 +
 +# Is this an already installed library?
 +installed=$installed
 +
 +# Should we warn about portability when linking against -modules?
 +shouldnotlink=$module
 +
 +# Files to dlopen/dlpreopen
 +dlopen='$dlfiles'
 +dlpreopen='$dlprefiles'
 +
 +# Directory that this library needs to be installed in:
 +libdir='$install_libdir'"
- 	  if test no,yes = "$installed,$need_relink"; then
++	  if test "$installed" = no && test "$need_relink" = yes; then
 +	    $ECHO >> $output "\
 +relink_command=\"$relink_command\""
 +	  fi
 +	done
 +      }
 +
 +      # Do a symbolic link so that the libtool archive can be found in
 +      # LD_LIBRARY_PATH before the program is installed.
 +      func_show_eval '( cd "$output_objdir" && $RM "$outputname" && $LN_S "../$outputname" "$outputname" )' 'exit $?'
 +      ;;
 +    esac
 +    exit $EXIT_SUCCESS
 +}
 +
- if test link = "$opt_mode" || test relink = "$opt_mode"; then
-   func_mode_link ${1+"$@"}
- fi
++{ test "$opt_mode" = link || test "$opt_mode" = relink; } &&
++    func_mode_link ${1+"$@"}
 +
 +
 +# func_mode_uninstall arg...
 +func_mode_uninstall ()
 +{
-     $debug_cmd
- 
-     RM=$nonopt
++    $opt_debug
++    RM="$nonopt"
 +    files=
-     rmforce=false
++    rmforce=
 +    exit_status=0
 +
 +    # This variable tells wrapper scripts just to set variables rather
 +    # than running their programs.
-     libtool_install_magic=$magic
++    libtool_install_magic="$magic"
 +
 +    for arg
 +    do
 +      case $arg in
-       -f) func_append RM " $arg"; rmforce=: ;;
++      -f) func_append RM " $arg"; rmforce=yes ;;
 +      -*) func_append RM " $arg" ;;
 +      *) func_append files " $arg" ;;
 +      esac
 +    done
 +
 +    test -z "$RM" && \
 +      func_fatal_help "you must specify an RM program"
 +
 +    rmdirs=
 +
 +    for file in $files; do
 +      func_dirname "$file" "" "."
-       dir=$func_dirname_result
-       if test . = "$dir"; then
- 	odir=$objdir
++      dir="$func_dirname_result"
++      if test "X$dir" = X.; then
++	odir="$objdir"
 +      else
- 	odir=$dir/$objdir
++	odir="$dir/$objdir"
 +      fi
 +      func_basename "$file"
-       name=$func_basename_result
-       test uninstall = "$opt_mode" && odir=$dir
++      name="$func_basename_result"
++      test "$opt_mode" = uninstall && odir="$dir"
 +
 +      # Remember odir for removal later, being careful to avoid duplicates
-       if test clean = "$opt_mode"; then
++      if test "$opt_mode" = clean; then
 +	case " $rmdirs " in
 +	  *" $odir "*) ;;
 +	  *) func_append rmdirs " $odir" ;;
 +	esac
 +      fi
 +
 +      # Don't error if the file doesn't exist and rm -f was used.
 +      if { test -L "$file"; } >/dev/null 2>&1 ||
 +	 { test -h "$file"; } >/dev/null 2>&1 ||
 +	 test -f "$file"; then
 +	:
 +      elif test -d "$file"; then
 +	exit_status=1
 +	continue
-       elif $rmforce; then
++      elif test "$rmforce" = yes; then
 +	continue
 +      fi
 +
-       rmfiles=$file
++      rmfiles="$file"
 +
 +      case $name in
 +      *.la)
 +	# Possibly a libtool archive, so verify it.
 +	if func_lalib_p "$file"; then
 +	  func_source $dir/$name
 +
 +	  # Delete the libtool libraries and symlinks.
 +	  for n in $library_names; do
 +	    func_append rmfiles " $odir/$n"
 +	  done
 +	  test -n "$old_library" && func_append rmfiles " $odir/$old_library"
 +
- 	  case $opt_mode in
++	  case "$opt_mode" in
 +	  clean)
 +	    case " $library_names " in
 +	    *" $dlname "*) ;;
 +	    *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;;
 +	    esac
 +	    test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i"
 +	    ;;
 +	  uninstall)
 +	    if test -n "$library_names"; then
 +	      # Do each command in the postuninstall commands.
- 	      func_execute_cmds "$postuninstall_cmds" '$rmforce || exit_status=1'
++	      func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
 +	    fi
 +
 +	    if test -n "$old_library"; then
 +	      # Do each command in the old_postuninstall commands.
- 	      func_execute_cmds "$old_postuninstall_cmds" '$rmforce || exit_status=1'
++	      func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
 +	    fi
 +	    # FIXME: should reinstall the best remaining shared library.
 +	    ;;
 +	  esac
 +	fi
 +	;;
 +
 +      *.lo)
 +	# Possibly a libtool object, so verify it.
 +	if func_lalib_p "$file"; then
 +
 +	  # Read the .lo file
 +	  func_source $dir/$name
 +
 +	  # Add PIC object to the list of files to remove.
- 	  if test -n "$pic_object" && test none != "$pic_object"; then
++	  if test -n "$pic_object" &&
++	     test "$pic_object" != none; then
 +	    func_append rmfiles " $dir/$pic_object"
 +	  fi
 +
 +	  # Add non-PIC object to the list of files to remove.
- 	  if test -n "$non_pic_object" && test none != "$non_pic_object"; then
++	  if test -n "$non_pic_object" &&
++	     test "$non_pic_object" != none; then
 +	    func_append rmfiles " $dir/$non_pic_object"
 +	  fi
 +	fi
 +	;;
 +
 +      *)
- 	if test clean = "$opt_mode"; then
++	if test "$opt_mode" = clean ; then
 +	  noexename=$name
 +	  case $file in
 +	  *.exe)
 +	    func_stripname '' '.exe' "$file"
 +	    file=$func_stripname_result
 +	    func_stripname '' '.exe' "$name"
 +	    noexename=$func_stripname_result
 +	    # $file with .exe has already been added to rmfiles,
 +	    # add $file without .exe
 +	    func_append rmfiles " $file"
 +	    ;;
 +	  esac
 +	  # Do a test to see if this is a libtool program.
 +	  if func_ltwrapper_p "$file"; then
 +	    if func_ltwrapper_executable_p "$file"; then
 +	      func_ltwrapper_scriptname "$file"
 +	      relink_command=
 +	      func_source $func_ltwrapper_scriptname_result
 +	      func_append rmfiles " $func_ltwrapper_scriptname_result"
 +	    else
 +	      relink_command=
 +	      func_source $dir/$noexename
 +	    fi
 +
 +	    # note $name still contains .exe if it was in $file originally
 +	    # as does the version of $file that was added into $rmfiles
- 	    func_append rmfiles " $odir/$name $odir/${name}S.$objext"
- 	    if test yes = "$fast_install" && test -n "$relink_command"; then
++	    func_append rmfiles " $odir/$name $odir/${name}S.${objext}"
++	    if test "$fast_install" = yes && test -n "$relink_command"; then
 +	      func_append rmfiles " $odir/lt-$name"
 +	    fi
- 	    if test "X$noexename" != "X$name"; then
- 	      func_append rmfiles " $odir/lt-$noexename.c"
++	    if test "X$noexename" != "X$name" ; then
++	      func_append rmfiles " $odir/lt-${noexename}.c"
 +	    fi
 +	  fi
 +	fi
 +	;;
 +      esac
 +      func_show_eval "$RM $rmfiles" 'exit_status=1'
 +    done
 +
-     # Try to remove the $objdir's in the directories where we deleted files
++    # Try to remove the ${objdir}s in the directories where we deleted files
 +    for dir in $rmdirs; do
 +      if test -d "$dir"; then
 +	func_show_eval "rmdir $dir >/dev/null 2>&1"
 +      fi
 +    done
 +
 +    exit $exit_status
 +}
 +
- if test uninstall = "$opt_mode" || test clean = "$opt_mode"; then
-   func_mode_uninstall ${1+"$@"}
- fi
++{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } &&
++    func_mode_uninstall ${1+"$@"}
 +
 +test -z "$opt_mode" && {
-   help=$generic_help
++  help="$generic_help"
 +  func_fatal_help "you must specify a MODE"
 +}
 +
 +test -z "$exec_cmd" && \
-   func_fatal_help "invalid operation mode '$opt_mode'"
++  func_fatal_help "invalid operation mode \`$opt_mode'"
 +
 +if test -n "$exec_cmd"; then
 +  eval exec "$exec_cmd"
 +  exit $EXIT_FAILURE
 +fi
 +
 +exit $exit_status
 +
 +
 +# The TAGs below are defined such that we never get into a situation
- # where we disable both kinds of libraries.  Given conflicting
++# in which we disable both kinds of libraries.  Given conflicting
 +# choices, we go for a static library, that is the most portable,
 +# since we can't tell whether shared libraries were disabled because
 +# the user asked for that or because the platform doesn't support
 +# them.  This is particularly important on AIX, because we don't
 +# support having both static and shared libraries enabled at the same
 +# time on that platform, so we default to a shared-only configuration.
 +# If a disable-shared tag is given, we'll fallback to a static-only
 +# configuration.  But we'll never go from static-only to shared-only.
 +
 +# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
 +build_libtool_libs=no
 +build_old_libs=yes
 +# ### END LIBTOOL TAG CONFIG: disable-shared
 +
 +# ### BEGIN LIBTOOL TAG CONFIG: disable-static
 +build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
 +# ### END LIBTOOL TAG CONFIG: disable-static
 +
 +# Local Variables:
 +# mode:shell-script
 +# sh-indentation:2
 +# End:
++# vi:sw=2
++
diff --cc build-aux/missing
index f62bbae,0000000..cdea514
mode 100755,000000..100755
--- a/build-aux/missing
+++ b/build-aux/missing
@@@ -1,215 -1,0 +1,215 @@@
 +#! /bin/sh
 +# Common wrapper for a few potentially missing GNU programs.
 +
- scriptversion=2013-10-28.13; # UTC
++scriptversion=2012-06-26.16; # UTC
 +
- # Copyright (C) 1996-2014 Free Software Foundation, Inc.
++# Copyright (C) 1996-2013 Free Software Foundation, Inc.
 +# Originally written by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
 +
 +# 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, see <http://www.gnu.org/licenses/>.
 +
 +# As a special exception to the GNU General Public License, if you
 +# distribute this file as part of a program that contains a
 +# configuration script generated by Autoconf, you may include it under
 +# the same distribution terms that you use for the rest of that program.
 +
 +if test $# -eq 0; then
 +  echo 1>&2 "Try '$0 --help' for more information"
 +  exit 1
 +fi
 +
 +case $1 in
 +
 +  --is-lightweight)
 +    # Used by our autoconf macros to check whether the available missing
 +    # script is modern enough.
 +    exit 0
 +    ;;
 +
 +  --run)
 +    # Back-compat with the calling convention used by older automake.
 +    shift
 +    ;;
 +
 +  -h|--h|--he|--hel|--help)
 +    echo "\
 +$0 [OPTION]... PROGRAM [ARGUMENT]...
 +
 +Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due
 +to PROGRAM being missing or too old.
 +
 +Options:
 +  -h, --help      display this help and exit
 +  -v, --version   output version information and exit
 +
 +Supported PROGRAM values:
 +  aclocal   autoconf  autoheader   autom4te  automake  makeinfo
 +  bison     yacc      flex         lex       help2man
 +
 +Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
 +'g' are ignored when checking the name.
 +
 +Send bug reports to <bug-automake at gnu.org>."
 +    exit $?
 +    ;;
 +
 +  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
 +    echo "missing $scriptversion (GNU Automake)"
 +    exit $?
 +    ;;
 +
 +  -*)
 +    echo 1>&2 "$0: unknown '$1' option"
 +    echo 1>&2 "Try '$0 --help' for more information"
 +    exit 1
 +    ;;
 +
 +esac
 +
 +# Run the given program, remember its exit status.
 +"$@"; st=$?
 +
 +# If it succeeded, we are done.
 +test $st -eq 0 && exit 0
 +
 +# Also exit now if we it failed (or wasn't found), and '--version' was
 +# passed; such an option is passed most likely to detect whether the
 +# program is present and works.
 +case $2 in --version|--help) exit $st;; esac
 +
 +# Exit code 63 means version mismatch.  This often happens when the user
 +# tries to use an ancient version of a tool on a file that requires a
 +# minimum version.
 +if test $st -eq 63; then
 +  msg="probably too old"
 +elif test $st -eq 127; then
 +  # Program was missing.
 +  msg="missing on your system"
 +else
 +  # Program was found and executed, but failed.  Give up.
 +  exit $st
 +fi
 +
 +perl_URL=http://www.perl.org/
 +flex_URL=http://flex.sourceforge.net/
 +gnu_software_URL=http://www.gnu.org/software
 +
 +program_details ()
 +{
 +  case $1 in
 +    aclocal|automake)
 +      echo "The '$1' program is part of the GNU Automake package:"
 +      echo "<$gnu_software_URL/automake>"
 +      echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
 +      echo "<$gnu_software_URL/autoconf>"
 +      echo "<$gnu_software_URL/m4/>"
 +      echo "<$perl_URL>"
 +      ;;
 +    autoconf|autom4te|autoheader)
 +      echo "The '$1' program is part of the GNU Autoconf package:"
 +      echo "<$gnu_software_URL/autoconf/>"
 +      echo "It also requires GNU m4 and Perl in order to run:"
 +      echo "<$gnu_software_URL/m4/>"
 +      echo "<$perl_URL>"
 +      ;;
 +  esac
 +}
 +
 +give_advice ()
 +{
 +  # Normalize program name to check for.
 +  normalized_program=`echo "$1" | sed '
 +    s/^gnu-//; t
 +    s/^gnu//; t
 +    s/^g//; t'`
 +
 +  printf '%s\n' "'$1' is $msg."
 +
 +  configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
 +  case $normalized_program in
 +    autoconf*)
 +      echo "You should only need it if you modified 'configure.ac',"
 +      echo "or m4 files included by it."
 +      program_details 'autoconf'
 +      ;;
 +    autoheader*)
 +      echo "You should only need it if you modified 'acconfig.h' or"
 +      echo "$configure_deps."
 +      program_details 'autoheader'
 +      ;;
 +    automake*)
 +      echo "You should only need it if you modified 'Makefile.am' or"
 +      echo "$configure_deps."
 +      program_details 'automake'
 +      ;;
 +    aclocal*)
 +      echo "You should only need it if you modified 'acinclude.m4' or"
 +      echo "$configure_deps."
 +      program_details 'aclocal'
 +      ;;
 +   autom4te*)
 +      echo "You might have modified some maintainer files that require"
-       echo "the 'autom4te' program to be rebuilt."
++      echo "the 'automa4te' program to be rebuilt."
 +      program_details 'autom4te'
 +      ;;
 +    bison*|yacc*)
 +      echo "You should only need it if you modified a '.y' file."
 +      echo "You may want to install the GNU Bison package:"
 +      echo "<$gnu_software_URL/bison/>"
 +      ;;
 +    lex*|flex*)
 +      echo "You should only need it if you modified a '.l' file."
 +      echo "You may want to install the Fast Lexical Analyzer package:"
 +      echo "<$flex_URL>"
 +      ;;
 +    help2man*)
 +      echo "You should only need it if you modified a dependency" \
 +           "of a man page."
 +      echo "You may want to install the GNU Help2man package:"
 +      echo "<$gnu_software_URL/help2man/>"
 +    ;;
 +    makeinfo*)
 +      echo "You should only need it if you modified a '.texi' file, or"
 +      echo "any other file indirectly affecting the aspect of the manual."
 +      echo "You might want to install the Texinfo package:"
 +      echo "<$gnu_software_URL/texinfo/>"
 +      echo "The spurious makeinfo call might also be the consequence of"
 +      echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might"
 +      echo "want to install GNU make:"
 +      echo "<$gnu_software_URL/make/>"
 +      ;;
 +    *)
 +      echo "You might have modified some files without having the proper"
 +      echo "tools for further handling them.  Check the 'README' file, it"
 +      echo "often tells you about the needed prerequisites for installing"
 +      echo "this package.  You may also peek at any GNU archive site, in"
 +      echo "case some other package contains this missing '$1' program."
 +      ;;
 +  esac
 +}
 +
 +give_advice "$1" | sed -e '1s/^/WARNING: /' \
 +                       -e '2,$s/^/         /' >&2
 +
 +# Propagate the correct exit status (expected to be 127 for a program
 +# not found, 63 for a program that failed due to version mismatch).
 +exit $st
 +
 +# Local variables:
 +# eval: (add-hook 'write-file-hooks 'time-stamp)
 +# time-stamp-start: "scriptversion="
 +# time-stamp-format: "%:y-%02m-%02d.%02H"
 +# time-stamp-time-zone: "UTC"
 +# time-stamp-end: "; # UTC"
 +# End:
diff --cc config.h.in
index 4a58bcf,0000000..6406e74
mode 100644,000000..100644
--- a/config.h.in
+++ b/config.h.in
@@@ -1,146 -1,0 +1,147 @@@
 +/* config.h.in.  Generated from configure.ac by autoheader.  */
 +
 +/* Defined if the requested minimum BOOST version is satisfied */
 +#undef HAVE_BOOST
 +
 +/* Define to 1 if you have <boost/algorithm/string.hpp> */
 +#undef HAVE_BOOST_ALGORITHM_STRING_HPP
 +
 +/* Define to 1 if you have <boost/bind.hpp> */
 +#undef HAVE_BOOST_BIND_HPP
 +
 +/* Define to 1 if you have <boost/lambda/lambda.hpp> */
 +#undef HAVE_BOOST_LAMBDA_LAMBDA_HPP
 +
 +/* Define to 1 if you have <boost/ptr_container/ptr_array.hpp> */
 +#undef HAVE_BOOST_PTR_CONTAINER_PTR_ARRAY_HPP
 +
 +/* Define to 1 if you have <boost/ptr_container/ptr_deque.hpp> */
 +#undef HAVE_BOOST_PTR_CONTAINER_PTR_DEQUE_HPP
 +
 +/* Define to 1 if you have <boost/ptr_container/ptr_list.hpp> */
 +#undef HAVE_BOOST_PTR_CONTAINER_PTR_LIST_HPP
 +
 +/* Define to 1 if you have <boost/ptr_container/ptr_map.hpp> */
 +#undef HAVE_BOOST_PTR_CONTAINER_PTR_MAP_HPP
 +
 +/* Define to 1 if you have <boost/ptr_container/ptr_set.hpp> */
 +#undef HAVE_BOOST_PTR_CONTAINER_PTR_SET_HPP
 +
 +/* Define to 1 if you have <boost/ptr_container/ptr_vector.hpp> */
 +#undef HAVE_BOOST_PTR_CONTAINER_PTR_VECTOR_HPP
 +
 +/* Define to 1 if you have <boost/scoped_ptr.hpp> */
 +#undef HAVE_BOOST_SCOPED_PTR_HPP
 +
 +/* Define to 1 if you have <boost/shared_ptr.hpp> */
 +#undef HAVE_BOOST_SHARED_PTR_HPP
 +
 +/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
 +   */
 +#undef HAVE_DIRENT_H
 +
 +/* Define to 1 if you have the <dlfcn.h> header file. */
 +#undef HAVE_DLFCN_H
 +
 +/* Define to 1 if you have the <inttypes.h> header file. */
 +#undef HAVE_INTTYPES_H
 +
 +/* Define to 1 if you have the <memory.h> header file. */
 +#undef HAVE_MEMORY_H
 +
 +/* define if the compiler implements namespaces */
 +#undef HAVE_NAMESPACES
 +
 +/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
 +#undef HAVE_NDIR_H
 +
 +/* Define if you have POSIX threads libraries and header files. */
 +#undef HAVE_PTHREAD
 +
 +/* Define to 1 if you have the <stdint.h> header file. */
 +#undef HAVE_STDINT_H
 +
 +/* Define to 1 if you have the <stdlib.h> header file. */
 +#undef HAVE_STDLIB_H
 +
 +/* Define to 1 if you have the `strchr' function. */
 +#undef HAVE_STRCHR
 +
 +/* Define to 1 if you have the `strdup' function. */
 +#undef HAVE_STRDUP
 +
 +/* Define to 1 if you have the <strings.h> header file. */
 +#undef HAVE_STRINGS_H
 +
 +/* Define to 1 if you have the <string.h> header file. */
 +#undef HAVE_STRING_H
 +
 +/* Define to 1 if you have the `strstr' function. */
 +#undef HAVE_STRSTR
 +
 +/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
 +   */
 +#undef HAVE_SYS_DIR_H
 +
 +/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
 +   */
 +#undef HAVE_SYS_NDIR_H
 +
 +/* Define to 1 if you have the <sys/stat.h> header file. */
 +#undef HAVE_SYS_STAT_H
 +
 +/* Define to 1 if you have the <sys/types.h> header file. */
 +#undef HAVE_SYS_TYPES_H
 +
 +/* Define to 1 if you have the <unistd.h> header file. */
 +#undef HAVE_UNISTD_H
 +
- /* Define to the sub-directory where libtool stores uninstalled libraries. */
++/* Define to the sub-directory in which libtool stores uninstalled libraries.
++   */
 +#undef LT_OBJDIR
 +
 +/* Define to 1 if log4cpp library is used. */
 +#undef OPENSAML_LOG4CPP
 +
 +/* Define to 1 if log4shib library is used. */
 +#undef OPENSAML_LOG4SHIB
 +
 +/* Define to 1 if Xerces XMLString includes XMLByte release. */
 +#undef OPENSAML_XERCESC_HAS_XMLBYTE_RELEASE
 +
 +/* Name of package */
 +#undef PACKAGE
 +
 +/* Define to the address where bug reports for this package should be sent. */
 +#undef PACKAGE_BUGREPORT
 +
 +/* Define to the full name of this package. */
 +#undef PACKAGE_NAME
 +
 +/* Define to the full name and version of this package. */
 +#undef PACKAGE_STRING
 +
 +/* Define to the one symbol short name of this package. */
 +#undef PACKAGE_TARNAME
 +
 +/* Define to the home page for this package. */
 +#undef PACKAGE_URL
 +
 +/* Define to the version of this package. */
 +#undef PACKAGE_VERSION
 +
 +/* Define to necessary symbol if this constant uses a non-standard name on
 +   your system. */
 +#undef PTHREAD_CREATE_JOINABLE
 +
 +/* Define to 1 if you have the ANSI C header files. */
 +#undef STDC_HEADERS
 +
 +/* Version number of package */
 +#undef VERSION
 +
 +/* Define to empty if `const' does not conform to ANSI C. */
 +#undef const
 +
 +/* Define to `unsigned int' if <sys/types.h> does not define. */
 +#undef size_t
diff --cc configure
index 12e386a,0000000..d02cd79
mode 100755,000000..100755
--- a/configure
+++ b/configure
@@@ -1,23320 -1,0 +1,22651 @@@
 +#! /bin/sh
 +# Guess values for system-dependent variables and create Makefiles.
- # Generated by GNU Autoconf 2.69 for opensaml 2.5.5.
++# Generated by GNU Autoconf 2.69 for opensaml 2.6.0.
 +#
 +# Report bugs to <https://issues.shibboleth.net/>.
 +#
 +#
 +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
 +#
 +#
 +# This configure script is free software; the Free Software Foundation
 +# gives unlimited permission to copy, distribute and modify it.
 +## -------------------- ##
 +## M4sh Initialization. ##
 +## -------------------- ##
 +
 +# Be more Bourne compatible
 +DUALCASE=1; export DUALCASE # for MKS sh
 +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
 +  emulate sh
 +  NULLCMD=:
 +  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
 +  # is contrary to our usage.  Disable this feature.
 +  alias -g '${1+"$@"}'='"$@"'
 +  setopt NO_GLOB_SUBST
 +else
 +  case `(set -o) 2>/dev/null` in #(
 +  *posix*) :
 +    set -o posix ;; #(
 +  *) :
 +     ;;
 +esac
 +fi
 +
 +
 +as_nl='
 +'
 +export as_nl
 +# Printing a long string crashes Solaris 7 /usr/bin/printf.
 +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
 +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
 +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
 +# Prefer a ksh shell builtin over an external printf program on Solaris,
 +# but without wasting forks for bash or zsh.
 +if test -z "$BASH_VERSION$ZSH_VERSION" \
 +    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
 +  as_echo='print -r --'
 +  as_echo_n='print -rn --'
 +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
 +  as_echo='printf %s\n'
 +  as_echo_n='printf %s'
 +else
 +  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
 +    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
 +    as_echo_n='/usr/ucb/echo -n'
 +  else
 +    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
 +    as_echo_n_body='eval
 +      arg=$1;
 +      case $arg in #(
 +      *"$as_nl"*)
 +	expr "X$arg" : "X\\(.*\\)$as_nl";
 +	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
 +      esac;
 +      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
 +    '
 +    export as_echo_n_body
 +    as_echo_n='sh -c $as_echo_n_body as_echo'
 +  fi
 +  export as_echo_body
 +  as_echo='sh -c $as_echo_body as_echo'
 +fi
 +
 +# The user is always right.
 +if test "${PATH_SEPARATOR+set}" != set; then
 +  PATH_SEPARATOR=:
 +  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
 +    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
 +      PATH_SEPARATOR=';'
 +  }
 +fi
 +
 +
 +# IFS
 +# We need space, tab and new line, in precisely that order.  Quoting is
 +# there to prevent editors from complaining about space-tab.
 +# (If _AS_PATH_WALK were called with IFS unset, it would disable word
 +# splitting by setting IFS to empty value.)
 +IFS=" ""	$as_nl"
 +
 +# Find who we are.  Look in the path if we contain no directory separator.
 +as_myself=
 +case $0 in #((
 +  *[\\/]* ) as_myself=$0 ;;
 +  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +for as_dir in $PATH
 +do
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
 +  done
 +IFS=$as_save_IFS
 +
 +     ;;
 +esac
 +# We did not find ourselves, most probably we were run as `sh COMMAND'
 +# in which case we are not to be found in the path.
 +if test "x$as_myself" = x; then
 +  as_myself=$0
 +fi
 +if test ! -f "$as_myself"; then
 +  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
 +  exit 1
 +fi
 +
 +# Unset variables that we do not need and which cause bugs (e.g. in
 +# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
 +# suppresses any "Segmentation fault" message there.  '((' could
 +# trigger a bug in pdksh 5.2.14.
 +for as_var in BASH_ENV ENV MAIL MAILPATH
 +do eval test x\${$as_var+set} = xset \
 +  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
 +done
 +PS1='$ '
 +PS2='> '
 +PS4='+ '
 +
 +# NLS nuisances.
 +LC_ALL=C
 +export LC_ALL
 +LANGUAGE=C
 +export LANGUAGE
 +
 +# CDPATH.
 +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 +
 +# Use a proper internal environment variable to ensure we don't fall
 +  # into an infinite loop, continuously re-executing ourselves.
 +  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
 +    _as_can_reexec=no; export _as_can_reexec;
 +    # We cannot yet assume a decent shell, so we have to provide a
 +# neutralization value for shells without unset; and this also
 +# works around shells that cannot unset nonexistent variables.
 +# Preserve -v and -x to the replacement shell.
 +BASH_ENV=/dev/null
 +ENV=/dev/null
 +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
 +case $- in # ((((
 +  *v*x* | *x*v* ) as_opts=-vx ;;
 +  *v* ) as_opts=-v ;;
 +  *x* ) as_opts=-x ;;
 +  * ) as_opts= ;;
 +esac
 +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
 +# Admittedly, this is quite paranoid, since all the known shells bail
 +# out after a failed `exec'.
 +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
 +as_fn_exit 255
 +  fi
 +  # We don't want this to propagate to other subprocesses.
 +          { _as_can_reexec=; unset _as_can_reexec;}
 +if test "x$CONFIG_SHELL" = x; then
 +  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
 +  emulate sh
 +  NULLCMD=:
 +  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
 +  # is contrary to our usage.  Disable this feature.
 +  alias -g '\${1+\"\$@\"}'='\"\$@\"'
 +  setopt NO_GLOB_SUBST
 +else
 +  case \`(set -o) 2>/dev/null\` in #(
 +  *posix*) :
 +    set -o posix ;; #(
 +  *) :
 +     ;;
 +esac
 +fi
 +"
 +  as_required="as_fn_return () { (exit \$1); }
 +as_fn_success () { as_fn_return 0; }
 +as_fn_failure () { as_fn_return 1; }
 +as_fn_ret_success () { return 0; }
 +as_fn_ret_failure () { return 1; }
 +
 +exitcode=0
 +as_fn_success || { exitcode=1; echo as_fn_success failed.; }
 +as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
 +as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
 +as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
 +if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
 +
 +else
 +  exitcode=1; echo positional parameters were not saved.
 +fi
 +test x\$exitcode = x0 || exit 1
 +test -x / || exit 1"
 +  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
 +  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
 +  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
 +  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
 +
 +  test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || (
 +    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
 +    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
 +    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
 +    PATH=/empty FPATH=/empty; export PATH FPATH
 +    test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\
 +      || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1
 +test \$(( 1 + 1 )) = 2 || exit 1"
 +  if (eval "$as_required") 2>/dev/null; then :
 +  as_have_required=yes
 +else
 +  as_have_required=no
 +fi
 +  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
 +
 +else
 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +as_found=false
 +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
 +do
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +  as_found=:
 +  case $as_dir in #(
 +	 /*)
 +	   for as_base in sh bash ksh sh5; do
 +	     # Try only shells that exist, to save several forks.
 +	     as_shell=$as_dir/$as_base
 +	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
 +		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
 +  CONFIG_SHELL=$as_shell as_have_required=yes
 +		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
 +  break 2
 +fi
 +fi
 +	   done;;
 +       esac
 +  as_found=false
 +done
 +$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
 +	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
 +  CONFIG_SHELL=$SHELL as_have_required=yes
 +fi; }
 +IFS=$as_save_IFS
 +
 +
 +      if test "x$CONFIG_SHELL" != x; then :
 +  export CONFIG_SHELL
 +             # We cannot yet assume a decent shell, so we have to provide a
 +# neutralization value for shells without unset; and this also
 +# works around shells that cannot unset nonexistent variables.
 +# Preserve -v and -x to the replacement shell.
 +BASH_ENV=/dev/null
 +ENV=/dev/null
 +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
 +case $- in # ((((
 +  *v*x* | *x*v* ) as_opts=-vx ;;
 +  *v* ) as_opts=-v ;;
 +  *x* ) as_opts=-x ;;
 +  * ) as_opts= ;;
 +esac
 +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
 +# Admittedly, this is quite paranoid, since all the known shells bail
 +# out after a failed `exec'.
 +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
 +exit 255
 +fi
 +
 +    if test x$as_have_required = xno; then :
 +  $as_echo "$0: This script requires a shell more modern than all"
 +  $as_echo "$0: the shells that I found on your system."
 +  if test x${ZSH_VERSION+set} = xset ; then
 +    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
 +    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
 +  else
 +    $as_echo "$0: Please tell bug-autoconf at gnu.org and
 +$0: https://issues.shibboleth.net/ about your system,
 +$0: including any error possibly output before this
 +$0: message. Then install a modern shell, or manually run
 +$0: the script under such a shell if you do have one."
 +  fi
 +  exit 1
 +fi
 +fi
 +fi
 +SHELL=${CONFIG_SHELL-/bin/sh}
 +export SHELL
 +# Unset more variables known to interfere with behavior of common tools.
 +CLICOLOR_FORCE= GREP_OPTIONS=
 +unset CLICOLOR_FORCE GREP_OPTIONS
 +
 +## --------------------- ##
 +## M4sh Shell Functions. ##
 +## --------------------- ##
 +# as_fn_unset VAR
 +# ---------------
 +# Portably unset VAR.
 +as_fn_unset ()
 +{
 +  { eval $1=; unset $1;}
 +}
 +as_unset=as_fn_unset
 +
 +# as_fn_set_status STATUS
 +# -----------------------
 +# Set $? to STATUS, without forking.
 +as_fn_set_status ()
 +{
 +  return $1
 +} # as_fn_set_status
 +
 +# as_fn_exit STATUS
 +# -----------------
 +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
 +as_fn_exit ()
 +{
 +  set +e
 +  as_fn_set_status $1
 +  exit $1
 +} # as_fn_exit
 +
 +# as_fn_mkdir_p
 +# -------------
 +# Create "$as_dir" as a directory, including parents if necessary.
 +as_fn_mkdir_p ()
 +{
 +
 +  case $as_dir in #(
 +  -*) as_dir=./$as_dir;;
 +  esac
 +  test -d "$as_dir" || eval $as_mkdir_p || {
 +    as_dirs=
 +    while :; do
 +      case $as_dir in #(
 +      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
 +      *) as_qdir=$as_dir;;
 +      esac
 +      as_dirs="'$as_qdir' $as_dirs"
 +      as_dir=`$as_dirname -- "$as_dir" ||
 +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 +	 X"$as_dir" : 'X\(//\)[^/]' \| \
 +	 X"$as_dir" : 'X\(//\)$' \| \
 +	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
 +$as_echo X"$as_dir" |
 +    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 +	    s//\1/
 +	    q
 +	  }
 +	  /^X\(\/\/\)[^/].*/{
 +	    s//\1/
 +	    q
 +	  }
 +	  /^X\(\/\/\)$/{
 +	    s//\1/
 +	    q
 +	  }
 +	  /^X\(\/\).*/{
 +	    s//\1/
 +	    q
 +	  }
 +	  s/.*/./; q'`
 +      test -d "$as_dir" && break
 +    done
 +    test -z "$as_dirs" || eval "mkdir $as_dirs"
 +  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
 +
 +
 +} # as_fn_mkdir_p
 +
 +# as_fn_executable_p FILE
 +# -----------------------
 +# Test if FILE is an executable regular file.
 +as_fn_executable_p ()
 +{
 +  test -f "$1" && test -x "$1"
 +} # as_fn_executable_p
 +# as_fn_append VAR VALUE
 +# ----------------------
 +# Append the text in VALUE to the end of the definition contained in VAR. Take
 +# advantage of any shell optimizations that allow amortized linear growth over
 +# repeated appends, instead of the typical quadratic growth present in naive
 +# implementations.
 +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
 +  eval 'as_fn_append ()
 +  {
 +    eval $1+=\$2
 +  }'
 +else
 +  as_fn_append ()
 +  {
 +    eval $1=\$$1\$2
 +  }
 +fi # as_fn_append
 +
 +# as_fn_arith ARG...
 +# ------------------
 +# Perform arithmetic evaluation on the ARGs, and store the result in the
 +# global $as_val. Take advantage of shells that can avoid forks. The arguments
 +# must be portable across $(()) and expr.
 +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
 +  eval 'as_fn_arith ()
 +  {
 +    as_val=$(( $* ))
 +  }'
 +else
 +  as_fn_arith ()
 +  {
 +    as_val=`expr "$@" || test $? -eq 1`
 +  }
 +fi # as_fn_arith
 +
 +
 +# as_fn_error STATUS ERROR [LINENO LOG_FD]
 +# ----------------------------------------
 +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
 +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
 +# script with STATUS, using 1 if that was 0.
 +as_fn_error ()
 +{
 +  as_status=$1; test $as_status -eq 0 && as_status=1
 +  if test "$4"; then
 +    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
 +    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
 +  fi
 +  $as_echo "$as_me: error: $2" >&2
 +  as_fn_exit $as_status
 +} # as_fn_error
 +
 +if expr a : '\(a\)' >/dev/null 2>&1 &&
 +   test "X`expr 00001 : '.*\(...\)'`" = X001; then
 +  as_expr=expr
 +else
 +  as_expr=false
 +fi
 +
 +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
 +  as_basename=basename
 +else
 +  as_basename=false
 +fi
 +
 +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
 +  as_dirname=dirname
 +else
 +  as_dirname=false
 +fi
 +
 +as_me=`$as_basename -- "$0" ||
 +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 +	 X"$0" : 'X\(//\)$' \| \
 +	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
 +$as_echo X/"$0" |
 +    sed '/^.*\/\([^/][^/]*\)\/*$/{
 +	    s//\1/
 +	    q
 +	  }
 +	  /^X\/\(\/\/\)$/{
 +	    s//\1/
 +	    q
 +	  }
 +	  /^X\/\(\/\).*/{
 +	    s//\1/
 +	    q
 +	  }
 +	  s/.*/./; q'`
 +
 +# Avoid depending upon Character Ranges.
 +as_cr_letters='abcdefghijklmnopqrstuvwxyz'
 +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
 +as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 +as_cr_digits='0123456789'
 +as_cr_alnum=$as_cr_Letters$as_cr_digits
 +
 +
 +  as_lineno_1=$LINENO as_lineno_1a=$LINENO
 +  as_lineno_2=$LINENO as_lineno_2a=$LINENO
 +  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
 +  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
 +  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
 +  sed -n '
 +    p
 +    /[$]LINENO/=
 +  ' <$as_myself |
 +    sed '
 +      s/[$]LINENO.*/&-/
 +      t lineno
 +      b
 +      :lineno
 +      N
 +      :loop
 +      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
 +      t loop
 +      s/-\n.*//
 +    ' >$as_me.lineno &&
 +  chmod +x "$as_me.lineno" ||
 +    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 +
 +  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
 +  # already done that, so ensure we don't try to do so again and fall
 +  # in an infinite loop.  This has already happened in practice.
 +  _as_can_reexec=no; export _as_can_reexec
 +  # Don't try to exec as it changes $[0], causing all sort of problems
 +  # (the dirname of $[0] is not the place where we might find the
 +  # original and so on.  Autoconf is especially sensitive to this).
 +  . "./$as_me.lineno"
 +  # Exit status is that of the last command.
 +  exit
 +}
 +
 +ECHO_C= ECHO_N= ECHO_T=
 +case `echo -n x` in #(((((
 +-n*)
 +  case `echo 'xy\c'` in
 +  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
 +  xy)  ECHO_C='\c';;
 +  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
 +       ECHO_T='	';;
 +  esac;;
 +*)
 +  ECHO_N='-n';;
 +esac
 +
 +rm -f conf$$ conf$$.exe conf$$.file
 +if test -d conf$$.dir; then
 +  rm -f conf$$.dir/conf$$.file
 +else
 +  rm -f conf$$.dir
 +  mkdir conf$$.dir 2>/dev/null
 +fi
 +if (echo >conf$$.file) 2>/dev/null; then
 +  if ln -s conf$$.file conf$$ 2>/dev/null; then
 +    as_ln_s='ln -s'
 +    # ... but there are two gotchas:
 +    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
 +    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
 +    # In both cases, we have to default to `cp -pR'.
 +    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
 +      as_ln_s='cp -pR'
 +  elif ln conf$$.file conf$$ 2>/dev/null; then
 +    as_ln_s=ln
 +  else
 +    as_ln_s='cp -pR'
 +  fi
 +else
 +  as_ln_s='cp -pR'
 +fi
 +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 +rmdir conf$$.dir 2>/dev/null
 +
 +if mkdir -p . 2>/dev/null; then
 +  as_mkdir_p='mkdir -p "$as_dir"'
 +else
 +  test -d ./-p && rmdir ./-p
 +  as_mkdir_p=false
 +fi
 +
 +as_test_x='test -x'
 +as_executable_p=as_fn_executable_p
 +
 +# Sed expression to map a string onto a valid CPP name.
 +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
 +
 +# Sed expression to map a string onto a valid variable name.
 +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 +
 +SHELL=${CONFIG_SHELL-/bin/sh}
 +
 +
 +test -n "$DJDIR" || exec 7<&0 </dev/null
 +exec 6>&1
 +
 +# Name of the host.
 +# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
 +# so uname gets run too.
 +ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
 +
 +#
 +# Initializations.
 +#
 +ac_default_prefix=/usr/local
 +ac_clean_files=
 +ac_config_libobj_dir=.
 +LIBOBJS=
 +cross_compiling=no
 +subdirs=
 +MFLAGS=
 +MAKEFLAGS=
 +
 +# Identity of this package.
 +PACKAGE_NAME='opensaml'
 +PACKAGE_TARNAME='opensaml'
- PACKAGE_VERSION='2.5.5'
- PACKAGE_STRING='opensaml 2.5.5'
++PACKAGE_VERSION='2.6.0'
++PACKAGE_STRING='opensaml 2.6.0'
 +PACKAGE_BUGREPORT='https://issues.shibboleth.net/'
 +PACKAGE_URL=''
 +
 +ac_unique_file="saml"
 +# Factoring default headers for most tests.
 +ac_includes_default="\
 +#include <stdio.h>
 +#ifdef HAVE_SYS_TYPES_H
 +# include <sys/types.h>
 +#endif
 +#ifdef HAVE_SYS_STAT_H
 +# include <sys/stat.h>
 +#endif
 +#ifdef STDC_HEADERS
 +# include <stdlib.h>
 +# include <stddef.h>
 +#else
 +# ifdef HAVE_STDLIB_H
 +#  include <stdlib.h>
 +# endif
 +#endif
 +#ifdef HAVE_STRING_H
 +# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
 +#  include <memory.h>
 +# endif
 +# include <string.h>
 +#endif
 +#ifdef HAVE_STRINGS_H
 +# include <strings.h>
 +#endif
 +#ifdef HAVE_INTTYPES_H
 +# include <inttypes.h>
 +#endif
 +#ifdef HAVE_STDINT_H
 +# include <stdint.h>
 +#endif
 +#ifdef HAVE_UNISTD_H
 +# include <unistd.h>
 +#endif"
 +
 +ac_subst_vars='am__EXEEXT_FALSE
 +am__EXEEXT_TRUE
 +LTLIBOBJS
 +LIBOBJS
 +DX_INCLUDE
 +pkgconfig_libfile
 +pkgconfig_libdir
 +BUILD_UNITTEST_FALSE
 +BUILD_UNITTEST_TRUE
 +CXXTESTFLAGS
 +CXXTEST
 +LOG4CPP_CONFIG
 +LOG4SHIB_CONFIG
 +BOOST_CPPFLAGS
 +DISTCHECK_CONFIGURE_FLAGS
 +BOOST_ROOT
 +PKG_CONFIG
 +PTHREAD_CFLAGS
 +PTHREAD_LIBS
 +PTHREAD_CC
 +acx_pthread_config
 +CXXCPP
 +am__fastdepCXX_FALSE
 +am__fastdepCXX_TRUE
 +CXXDEPMODE
 +ac_ct_CXX
 +CXXFLAGS
 +CXX
 +DOXYGEN_PAPER_SIZE
 +DX_COND_latex_FALSE
 +DX_COND_latex_TRUE
 +DX_COND_pdf_FALSE
 +DX_COND_pdf_TRUE
 +DX_PDFLATEX
 +DX_FLAG_pdf
 +DX_COND_ps_FALSE
 +DX_COND_ps_TRUE
 +DX_EGREP
 +DX_DVIPS
 +DX_MAKEINDEX
 +DX_LATEX
 +DX_FLAG_ps
 +DX_COND_html_FALSE
 +DX_COND_html_TRUE
 +DX_FLAG_html
 +DX_COND_chi_FALSE
 +DX_COND_chi_TRUE
 +DX_FLAG_chi
 +DX_COND_chm_FALSE
 +DX_COND_chm_TRUE
 +DX_HHC
 +DX_FLAG_chm
 +DX_COND_xml_FALSE
 +DX_COND_xml_TRUE
 +DX_FLAG_xml
 +DX_COND_rtf_FALSE
 +DX_COND_rtf_TRUE
 +DX_FLAG_rtf
 +DX_COND_man_FALSE
 +DX_COND_man_TRUE
 +DX_FLAG_man
 +DX_COND_dot_FALSE
 +DX_COND_dot_TRUE
 +DX_DOT
 +DX_FLAG_dot
 +DX_COND_doc_FALSE
 +DX_COND_doc_TRUE
 +DX_PERL
 +DX_DOXYGEN
 +DX_FLAG_doc
 +DX_ENV
 +DX_DOCDIR
 +DX_CONFIG
 +DX_PROJECT
 +CPP
- LT_SYS_LIBRARY_PATH
 +OTOOL64
 +OTOOL
 +LIPO
 +NMEDIT
 +DSYMUTIL
 +MANIFEST_TOOL
 +RANLIB
 +ac_ct_AR
 +AR
 +DLLTOOL
 +OBJDUMP
 +LN_S
 +NM
 +ac_ct_DUMPBIN
 +DUMPBIN
 +LD
 +FGREP
 +EGREP
 +GREP
 +SED
 +am__fastdepCC_FALSE
 +am__fastdepCC_TRUE
 +CCDEPMODE
 +am__nodep
 +AMDEPBACKSLASH
 +AMDEP_FALSE
 +AMDEP_TRUE
 +am__quote
 +am__include
 +DEPDIR
 +OBJEXT
 +EXEEXT
 +ac_ct_CC
 +CPPFLAGS
 +LDFLAGS
 +CFLAGS
 +CC
 +host_os
 +host_vendor
 +host_cpu
 +host
 +build_os
 +build_vendor
 +build_cpu
 +build
 +LIBTOOL
 +AM_BACKSLASH
 +AM_DEFAULT_VERBOSITY
 +AM_DEFAULT_V
 +AM_V
 +am__untar
 +am__tar
 +AMTAR
 +am__leading_dot
 +SET_MAKE
 +AWK
 +mkdir_p
 +MKDIR_P
 +INSTALL_STRIP_PROGRAM
 +STRIP
 +install_sh
 +MAKEINFO
 +AUTOHEADER
 +AUTOMAKE
 +AUTOCONF
 +ACLOCAL
 +VERSION
 +PACKAGE
 +CYGPATH_W
 +am__isrc
 +INSTALL_DATA
 +INSTALL_SCRIPT
 +INSTALL_PROGRAM
 +target_alias
 +host_alias
 +build_alias
 +LIBS
 +ECHO_T
 +ECHO_N
 +ECHO_C
 +DEFS
 +mandir
 +localedir
 +libdir
 +psdir
 +pdfdir
 +dvidir
 +htmldir
 +infodir
 +docdir
 +oldincludedir
 +includedir
 +localstatedir
 +sharedstatedir
 +sysconfdir
 +datadir
 +datarootdir
 +libexecdir
 +sbindir
 +bindir
 +program_transform_name
 +prefix
 +exec_prefix
 +PACKAGE_URL
 +PACKAGE_BUGREPORT
 +PACKAGE_STRING
 +PACKAGE_VERSION
 +PACKAGE_TARNAME
 +PACKAGE_NAME
 +PATH_SEPARATOR
 +SHELL'
 +ac_subst_files=''
 +ac_user_opts='
 +enable_option_checking
 +enable_silent_rules
 +enable_static
 +enable_shared
 +with_pic
 +enable_fast_install
- with_aix_soname
 +enable_dependency_tracking
 +with_gnu_ld
 +with_sysroot
 +enable_libtool_lock
 +enable_doxygen_doc
 +enable_doxygen_dot
 +enable_doxygen_man
 +enable_doxygen_rtf
 +enable_doxygen_xml
 +enable_doxygen_chm
 +enable_doxygen_chi
 +enable_doxygen_html
 +enable_doxygen_ps
 +enable_doxygen_pdf
 +enable_debug
 +with_zlib
 +with_openssl
 +with_boost
 +with_log4shib
 +with_log4cpp
 +with_xerces
 +with_xmlsec
 +with_xmltooling
 +with_cxxtest
 +'
 +      ac_precious_vars='build_alias
 +host_alias
 +target_alias
 +CC
 +CFLAGS
 +LDFLAGS
 +LIBS
 +CPPFLAGS
- LT_SYS_LIBRARY_PATH
 +CPP
 +DOXYGEN_PAPER_SIZE
 +CXX
 +CXXFLAGS
 +CCC
 +CXXCPP
 +BOOST_ROOT'
 +
 +
 +# Initialize some variables set by options.
 +ac_init_help=
 +ac_init_version=false
 +ac_unrecognized_opts=
 +ac_unrecognized_sep=
 +# The variables have the same names as the options, with
 +# dashes changed to underlines.
 +cache_file=/dev/null
 +exec_prefix=NONE
 +no_create=
 +no_recursion=
 +prefix=NONE
 +program_prefix=NONE
 +program_suffix=NONE
 +program_transform_name=s,x,x,
 +silent=
 +site=
 +srcdir=
 +verbose=
 +x_includes=NONE
 +x_libraries=NONE
 +
 +# Installation directory options.
 +# These are left unexpanded so users can "make install exec_prefix=/foo"
 +# and all the variables that are supposed to be based on exec_prefix
 +# by default will actually change.
 +# Use braces instead of parens because sh, perl, etc. also accept them.
 +# (The list follows the same order as the GNU Coding Standards.)
 +bindir='${exec_prefix}/bin'
 +sbindir='${exec_prefix}/sbin'
 +libexecdir='${exec_prefix}/libexec'
 +datarootdir='${prefix}/share'
 +datadir='${datarootdir}'
 +sysconfdir='${prefix}/etc'
 +sharedstatedir='${prefix}/com'
 +localstatedir='${prefix}/var'
 +includedir='${prefix}/include'
 +oldincludedir='/usr/include'
 +docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
 +infodir='${datarootdir}/info'
 +htmldir='${docdir}'
 +dvidir='${docdir}'
 +pdfdir='${docdir}'
 +psdir='${docdir}'
 +libdir='${exec_prefix}/lib'
 +localedir='${datarootdir}/locale'
 +mandir='${datarootdir}/man'
 +
 +ac_prev=
 +ac_dashdash=
 +for ac_option
 +do
 +  # If the previous option needs an argument, assign it.
 +  if test -n "$ac_prev"; then
 +    eval $ac_prev=\$ac_option
 +    ac_prev=
 +    continue
 +  fi
 +
 +  case $ac_option in
 +  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
 +  *=)   ac_optarg= ;;
 +  *)    ac_optarg=yes ;;
 +  esac
 +
 +  # Accept the important Cygnus configure options, so we can diagnose typos.
 +
 +  case $ac_dashdash$ac_option in
 +  --)
 +    ac_dashdash=yes ;;
 +
 +  -bindir | --bindir | --bindi | --bind | --bin | --bi)
 +    ac_prev=bindir ;;
 +  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
 +    bindir=$ac_optarg ;;
 +
 +  -build | --build | --buil | --bui | --bu)
 +    ac_prev=build_alias ;;
 +  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
 +    build_alias=$ac_optarg ;;
 +
 +  -cache-file | --cache-file | --cache-fil | --cache-fi \
 +  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
 +    ac_prev=cache_file ;;
 +  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
 +  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
 +    cache_file=$ac_optarg ;;
 +
 +  --config-cache | -C)
 +    cache_file=config.cache ;;
 +
 +  -datadir | --datadir | --datadi | --datad)
 +    ac_prev=datadir ;;
 +  -datadir=* | --datadir=* | --datadi=* | --datad=*)
 +    datadir=$ac_optarg ;;
 +
 +  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
 +  | --dataroo | --dataro | --datar)
 +    ac_prev=datarootdir ;;
 +  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
 +  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
 +    datarootdir=$ac_optarg ;;
 +
 +  -disable-* | --disable-*)
 +    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
 +    # Reject names that are not valid shell variable names.
 +    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
 +      as_fn_error $? "invalid feature name: $ac_useropt"
 +    ac_useropt_orig=$ac_useropt
 +    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
 +    case $ac_user_opts in
 +      *"
 +"enable_$ac_useropt"
 +"*) ;;
 +      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
 +	 ac_unrecognized_sep=', ';;
 +    esac
 +    eval enable_$ac_useropt=no ;;
 +
 +  -docdir | --docdir | --docdi | --doc | --do)
 +    ac_prev=docdir ;;
 +  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
 +    docdir=$ac_optarg ;;
 +
 +  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
 +    ac_prev=dvidir ;;
 +  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
 +    dvidir=$ac_optarg ;;
 +
 +  -enable-* | --enable-*)
 +    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
 +    # Reject names that are not valid shell variable names.
 +    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
 +      as_fn_error $? "invalid feature name: $ac_useropt"
 +    ac_useropt_orig=$ac_useropt
 +    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
 +    case $ac_user_opts in
 +      *"
 +"enable_$ac_useropt"
 +"*) ;;
 +      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
 +	 ac_unrecognized_sep=', ';;
 +    esac
 +    eval enable_$ac_useropt=\$ac_optarg ;;
 +
 +  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
 +  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
 +  | --exec | --exe | --ex)
 +    ac_prev=exec_prefix ;;
 +  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
 +  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
 +  | --exec=* | --exe=* | --ex=*)
 +    exec_prefix=$ac_optarg ;;
 +
 +  -gas | --gas | --ga | --g)
 +    # Obsolete; use --with-gas.
 +    with_gas=yes ;;
 +
 +  -help | --help | --hel | --he | -h)
 +    ac_init_help=long ;;
 +  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
 +    ac_init_help=recursive ;;
 +  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
 +    ac_init_help=short ;;
 +
 +  -host | --host | --hos | --ho)
 +    ac_prev=host_alias ;;
 +  -host=* | --host=* | --hos=* | --ho=*)
 +    host_alias=$ac_optarg ;;
 +
 +  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
 +    ac_prev=htmldir ;;
 +  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
 +  | --ht=*)
 +    htmldir=$ac_optarg ;;
 +
 +  -includedir | --includedir | --includedi | --included | --include \
 +  | --includ | --inclu | --incl | --inc)
 +    ac_prev=includedir ;;
 +  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
 +  | --includ=* | --inclu=* | --incl=* | --inc=*)
 +    includedir=$ac_optarg ;;
 +
 +  -infodir | --infodir | --infodi | --infod | --info | --inf)
 +    ac_prev=infodir ;;
 +  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
 +    infodir=$ac_optarg ;;
 +
 +  -libdir | --libdir | --libdi | --libd)
 +    ac_prev=libdir ;;
 +  -libdir=* | --libdir=* | --libdi=* | --libd=*)
 +    libdir=$ac_optarg ;;
 +
 +  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
 +  | --libexe | --libex | --libe)
 +    ac_prev=libexecdir ;;
 +  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
 +  | --libexe=* | --libex=* | --libe=*)
 +    libexecdir=$ac_optarg ;;
 +
 +  -localedir | --localedir | --localedi | --localed | --locale)
 +    ac_prev=localedir ;;
 +  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
 +    localedir=$ac_optarg ;;
 +
 +  -localstatedir | --localstatedir | --localstatedi | --localstated \
 +  | --localstate | --localstat | --localsta | --localst | --locals)
 +    ac_prev=localstatedir ;;
 +  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
 +  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
 +    localstatedir=$ac_optarg ;;
 +
 +  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
 +    ac_prev=mandir ;;
 +  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
 +    mandir=$ac_optarg ;;
 +
 +  -nfp | --nfp | --nf)
 +    # Obsolete; use --without-fp.
 +    with_fp=no ;;
 +
 +  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
 +  | --no-cr | --no-c | -n)
 +    no_create=yes ;;
 +
 +  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
 +  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
 +    no_recursion=yes ;;
 +
 +  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
 +  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
 +  | --oldin | --oldi | --old | --ol | --o)
 +    ac_prev=oldincludedir ;;
 +  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
 +  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
 +  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
 +    oldincludedir=$ac_optarg ;;
 +
 +  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
 +    ac_prev=prefix ;;
 +  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
 +    prefix=$ac_optarg ;;
 +
 +  -program-prefix | --program-prefix | --program-prefi | --program-pref \
 +  | --program-pre | --program-pr | --program-p)
 +    ac_prev=program_prefix ;;
 +  -program-prefix=* | --program-prefix=* | --program-prefi=* \
 +  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
 +    program_prefix=$ac_optarg ;;
 +
 +  -program-suffix | --program-suffix | --program-suffi | --program-suff \
 +  | --program-suf | --program-su | --program-s)
 +    ac_prev=program_suffix ;;
 +  -program-suffix=* | --program-suffix=* | --program-suffi=* \
 +  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
 +    program_suffix=$ac_optarg ;;
 +
 +  -program-transform-name | --program-transform-name \
 +  | --program-transform-nam | --program-transform-na \
 +  | --program-transform-n | --program-transform- \
 +  | --program-transform | --program-transfor \
 +  | --program-transfo | --program-transf \
 +  | --program-trans | --program-tran \
 +  | --progr-tra | --program-tr | --program-t)
 +    ac_prev=program_transform_name ;;
 +  -program-transform-name=* | --program-transform-name=* \
 +  | --program-transform-nam=* | --program-transform-na=* \
 +  | --program-transform-n=* | --program-transform-=* \
 +  | --program-transform=* | --program-transfor=* \
 +  | --program-transfo=* | --program-transf=* \
 +  | --program-trans=* | --program-tran=* \
 +  | --progr-tra=* | --program-tr=* | --program-t=*)
 +    program_transform_name=$ac_optarg ;;
 +
 +  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
 +    ac_prev=pdfdir ;;
 +  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
 +    pdfdir=$ac_optarg ;;
 +
 +  -psdir | --psdir | --psdi | --psd | --ps)
 +    ac_prev=psdir ;;
 +  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
 +    psdir=$ac_optarg ;;
 +
 +  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
 +  | -silent | --silent | --silen | --sile | --sil)
 +    silent=yes ;;
 +
 +  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
 +    ac_prev=sbindir ;;
 +  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
 +  | --sbi=* | --sb=*)
 +    sbindir=$ac_optarg ;;
 +
 +  -sharedstatedir | --sharedstatedir | --sharedstatedi \
 +  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
 +  | --sharedst | --shareds | --shared | --share | --shar \
 +  | --sha | --sh)
 +    ac_prev=sharedstatedir ;;
 +  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
 +  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
 +  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
 +  | --sha=* | --sh=*)
 +    sharedstatedir=$ac_optarg ;;
 +
 +  -site | --site | --sit)
 +    ac_prev=site ;;
 +  -site=* | --site=* | --sit=*)
 +    site=$ac_optarg ;;
 +
 +  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
 +    ac_prev=srcdir ;;
 +  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
 +    srcdir=$ac_optarg ;;
 +
 +  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
 +  | --syscon | --sysco | --sysc | --sys | --sy)
 +    ac_prev=sysconfdir ;;
 +  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
 +  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
 +    sysconfdir=$ac_optarg ;;
 +
 +  -target | --target | --targe | --targ | --tar | --ta | --t)
 +    ac_prev=target_alias ;;
 +  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
 +    target_alias=$ac_optarg ;;
 +
 +  -v | -verbose | --verbose | --verbos | --verbo | --verb)
 +    verbose=yes ;;
 +
 +  -version | --version | --versio | --versi | --vers | -V)
 +    ac_init_version=: ;;
 +
 +  -with-* | --with-*)
 +    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
 +    # Reject names that are not valid shell variable names.
 +    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
 +      as_fn_error $? "invalid package name: $ac_useropt"
 +    ac_useropt_orig=$ac_useropt
 +    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
 +    case $ac_user_opts in
 +      *"
 +"with_$ac_useropt"
 +"*) ;;
 +      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
 +	 ac_unrecognized_sep=', ';;
 +    esac
 +    eval with_$ac_useropt=\$ac_optarg ;;
 +
 +  -without-* | --without-*)
 +    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
 +    # Reject names that are not valid shell variable names.
 +    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
 +      as_fn_error $? "invalid package name: $ac_useropt"
 +    ac_useropt_orig=$ac_useropt
 +    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
 +    case $ac_user_opts in
 +      *"
 +"with_$ac_useropt"
 +"*) ;;
 +      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
 +	 ac_unrecognized_sep=', ';;
 +    esac
 +    eval with_$ac_useropt=no ;;
 +
 +  --x)
 +    # Obsolete; use --with-x.
 +    with_x=yes ;;
 +
 +  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
 +  | --x-incl | --x-inc | --x-in | --x-i)
 +    ac_prev=x_includes ;;
 +  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
 +  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
 +    x_includes=$ac_optarg ;;
 +
 +  -x-libraries | --x-libraries | --x-librarie | --x-librari \
 +  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
 +    ac_prev=x_libraries ;;
 +  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
 +  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
 +    x_libraries=$ac_optarg ;;
 +
 +  -*) as_fn_error $? "unrecognized option: \`$ac_option'
 +Try \`$0 --help' for more information"
 +    ;;
 +
 +  *=*)
 +    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
 +    # Reject names that are not valid shell variable names.
 +    case $ac_envvar in #(
 +      '' | [0-9]* | *[!_$as_cr_alnum]* )
 +      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
 +    esac
 +    eval $ac_envvar=\$ac_optarg
 +    export $ac_envvar ;;
 +
 +  *)
 +    # FIXME: should be removed in autoconf 3.0.
 +    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
 +    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
 +      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
 +    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
 +    ;;
 +
 +  esac
 +done
 +
 +if test -n "$ac_prev"; then
 +  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
 +  as_fn_error $? "missing argument to $ac_option"
 +fi
 +
 +if test -n "$ac_unrecognized_opts"; then
 +  case $enable_option_checking in
 +    no) ;;
 +    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
 +    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
 +  esac
 +fi
 +
 +# Check all directory arguments for consistency.
 +for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 +		datadir sysconfdir sharedstatedir localstatedir includedir \
 +		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
 +		libdir localedir mandir
 +do
 +  eval ac_val=\$$ac_var
 +  # Remove trailing slashes.
 +  case $ac_val in
 +    */ )
 +      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
 +      eval $ac_var=\$ac_val;;
 +  esac
 +  # Be sure to have absolute directory names.
 +  case $ac_val in
 +    [\\/$]* | ?:[\\/]* )  continue;;
 +    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
 +  esac
 +  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
 +done
 +
 +# There might be people who depend on the old broken behavior: `$host'
 +# used to hold the argument of --host etc.
 +# FIXME: To remove some day.
 +build=$build_alias
 +host=$host_alias
 +target=$target_alias
 +
 +# FIXME: To remove some day.
 +if test "x$host_alias" != x; then
 +  if test "x$build_alias" = x; then
 +    cross_compiling=maybe
 +  elif test "x$build_alias" != "x$host_alias"; then
 +    cross_compiling=yes
 +  fi
 +fi
 +
 +ac_tool_prefix=
 +test -n "$host_alias" && ac_tool_prefix=$host_alias-
 +
 +test "$silent" = yes && exec 6>/dev/null
 +
 +
 +ac_pwd=`pwd` && test -n "$ac_pwd" &&
 +ac_ls_di=`ls -di .` &&
 +ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
 +  as_fn_error $? "working directory cannot be determined"
 +test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
 +  as_fn_error $? "pwd does not report name of working directory"
 +
 +
 +# Find the source files, if location was not specified.
 +if test -z "$srcdir"; then
 +  ac_srcdir_defaulted=yes
 +  # Try the directory containing this script, then the parent directory.
 +  ac_confdir=`$as_dirname -- "$as_myself" ||
 +$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 +	 X"$as_myself" : 'X\(//\)[^/]' \| \
 +	 X"$as_myself" : 'X\(//\)$' \| \
 +	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
 +$as_echo X"$as_myself" |
 +    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 +	    s//\1/
 +	    q
 +	  }
 +	  /^X\(\/\/\)[^/].*/{
 +	    s//\1/
 +	    q
 +	  }
 +	  /^X\(\/\/\)$/{
 +	    s//\1/
 +	    q
 +	  }
 +	  /^X\(\/\).*/{
 +	    s//\1/
 +	    q
 +	  }
 +	  s/.*/./; q'`
 +  srcdir=$ac_confdir
 +  if test ! -r "$srcdir/$ac_unique_file"; then
 +    srcdir=..
 +  fi
 +else
 +  ac_srcdir_defaulted=no
 +fi
 +if test ! -r "$srcdir/$ac_unique_file"; then
 +  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
 +  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
 +fi
 +ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 +ac_abs_confdir=`(
 +	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
 +	pwd)`
 +# When building in place, set srcdir=.
 +if test "$ac_abs_confdir" = "$ac_pwd"; then
 +  srcdir=.
 +fi
 +# Remove unnecessary trailing slashes from srcdir.
 +# Double slashes in file names in object file debugging info
 +# mess up M-x gdb in Emacs.
 +case $srcdir in
 +*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
 +esac
 +for ac_var in $ac_precious_vars; do
 +  eval ac_env_${ac_var}_set=\${${ac_var}+set}
 +  eval ac_env_${ac_var}_value=\$${ac_var}
 +  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
 +  eval ac_cv_env_${ac_var}_value=\$${ac_var}
 +done
 +
 +#
 +# Report the --help message.
 +#
 +if test "$ac_init_help" = "long"; then
 +  # Omit some internal or obsolete options to make the list less imposing.
 +  # This message is too long to be a string in the A/UX 3.1 sh.
 +  cat <<_ACEOF
- \`configure' configures opensaml 2.5.5 to adapt to many kinds of systems.
++\`configure' configures opensaml 2.6.0 to adapt to many kinds of systems.
 +
 +Usage: $0 [OPTION]... [VAR=VALUE]...
 +
 +To assign environment variables (e.g., CC, CFLAGS...), specify them as
 +VAR=VALUE.  See below for descriptions of some of the useful variables.
 +
 +Defaults for the options are specified in brackets.
 +
 +Configuration:
 +  -h, --help              display this help and exit
 +      --help=short        display options specific to this package
 +      --help=recursive    display the short help of all the included packages
 +  -V, --version           display version information and exit
 +  -q, --quiet, --silent   do not print \`checking ...' messages
 +      --cache-file=FILE   cache test results in FILE [disabled]
 +  -C, --config-cache      alias for \`--cache-file=config.cache'
 +  -n, --no-create         do not create output files
 +      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
 +
 +Installation directories:
 +  --prefix=PREFIX         install architecture-independent files in PREFIX
 +                          [$ac_default_prefix]
 +  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
 +                          [PREFIX]
 +
 +By default, \`make install' will install all the files in
 +\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
 +an installation prefix other than \`$ac_default_prefix' using \`--prefix',
 +for instance \`--prefix=\$HOME'.
 +
 +For better control, use the options below.
 +
 +Fine tuning of the installation directories:
 +  --bindir=DIR            user executables [EPREFIX/bin]
 +  --sbindir=DIR           system admin executables [EPREFIX/sbin]
 +  --libexecdir=DIR        program executables [EPREFIX/libexec]
 +  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
 +  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
 +  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
 +  --libdir=DIR            object code libraries [EPREFIX/lib]
 +  --includedir=DIR        C header files [PREFIX/include]
 +  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
 +  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
 +  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
 +  --infodir=DIR           info documentation [DATAROOTDIR/info]
 +  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
 +  --mandir=DIR            man documentation [DATAROOTDIR/man]
 +  --docdir=DIR            documentation root [DATAROOTDIR/doc/opensaml]
 +  --htmldir=DIR           html documentation [DOCDIR]
 +  --dvidir=DIR            dvi documentation [DOCDIR]
 +  --pdfdir=DIR            pdf documentation [DOCDIR]
 +  --psdir=DIR             ps documentation [DOCDIR]
 +_ACEOF
 +
 +  cat <<\_ACEOF
 +
 +Program names:
 +  --program-prefix=PREFIX            prepend PREFIX to installed program names
 +  --program-suffix=SUFFIX            append SUFFIX to installed program names
 +  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
 +
 +System types:
 +  --build=BUILD     configure for building on BUILD [guessed]
 +  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
 +_ACEOF
 +fi
 +
 +if test -n "$ac_init_help"; then
 +  case $ac_init_help in
-      short | recursive ) echo "Configuration of opensaml 2.5.5:";;
++     short | recursive ) echo "Configuration of opensaml 2.6.0:";;
 +   esac
 +  cat <<\_ACEOF
 +
 +Optional Features:
 +  --disable-option-checking  ignore unrecognized --enable/--with options
 +  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
 +  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
 +  --enable-silent-rules   less verbose build output (undo: "make V=1")
 +  --disable-silent-rules  verbose build output (undo: "make V=0")
 +  --enable-static[=PKGS]  build static libraries [default=no]
 +  --enable-shared[=PKGS]  build shared libraries [default=yes]
 +  --enable-fast-install[=PKGS]
 +                          optimize for fast installation [default=yes]
 +  --enable-dependency-tracking
 +                          do not reject slow dependency extractors
 +  --disable-dependency-tracking
 +                          speeds up one-time build
 +  --disable-libtool-lock  avoid locking (might break parallel builds)
 +  --disable-doxygen-doc   don't generate any doxygen documentation
 +  --enable-doxygen-dot    generate graphics for doxygen documentation
 +  --enable-doxygen-man    generate doxygen manual pages
 +  --enable-doxygen-rtf    generate doxygen RTF documentation
 +  --enable-doxygen-xml    generate doxygen XML documentation
 +  --enable-doxygen-chm    generate doxygen compressed HTML help documentation
 +  --enable-doxygen-chi    generate doxygen seperate compressed HTML help index
 +                          file
 +  --disable-doxygen-html  don't generate doxygen plain HTML documentation
 +  --enable-doxygen-ps     generate doxygen PostScript documentation
 +  --enable-doxygen-pdf    generate doxygen PDF documentation
 +  --enable-debug          Have GCC compile with symbols (Default = no)
 +
 +Optional Packages:
 +  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
 +  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
 +  --with-pic[=PKGS]       try to use only PIC/non-PIC objects [default=use
 +                          both]
-   --with-aix-soname=aix|svr4|both
-                           shared library versioning (aka "SONAME") variant to
-                           provide on AIX, [default=aix].
 +  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
-   --with-sysroot[=DIR]    Search for dependent libraries within DIR (or the
-                           compiler's sysroot if not specified).
++  --with-sysroot=DIR Search for dependent libraries within DIR
++                        (or the compiler's sysroot if not specified).
 +  --with-zlib=PATH        where zlib is installed
 +  --with-openssl=PATH     where openssl is installed
 +  --with-boost=DIR        prefix of Boost [guess]
 +  --with-log4shib=PATH    where log4shib-config is installed
 +  --with-log4cpp=PATH     where log4cpp-config is installed
 +  --with-xerces=PATH      where xerces-c is installed
 +  --with-xmlsec=PATH      where xmlsec is installed
 +  --with-xmltooling=PATH  where xmltooling is installed
 +  --with-cxxtest=PATH     where cxxtest is installed
 +
 +Some influential environment variables:
 +  CC          C compiler command
 +  CFLAGS      C compiler flags
 +  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
 +              nonstandard directory <lib dir>
 +  LIBS        libraries to pass to the linker, e.g. -l<library>
 +  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
 +              you have headers in a nonstandard directory <include dir>
-   LT_SYS_LIBRARY_PATH
-               User-defined run-time library search path.
 +  CPP         C preprocessor
 +  DOXYGEN_PAPER_SIZE
 +              a4wide (default), a4, letter, legal or executive
 +  CXX         C++ compiler command
 +  CXXFLAGS    C++ compiler flags
 +  CXXCPP      C++ preprocessor
 +  BOOST_ROOT  Location of Boost installation
 +
 +Use these variables to override the choices made by `configure' or to help
 +it to find libraries and programs with nonstandard names/locations.
 +
 +Report bugs to <https://issues.shibboleth.net/>.
 +_ACEOF
 +ac_status=$?
 +fi
 +
 +if test "$ac_init_help" = "recursive"; then
 +  # If there are subdirs, report their specific --help.
 +  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
 +    test -d "$ac_dir" ||
 +      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
 +      continue
 +    ac_builddir=.
 +
 +case "$ac_dir" in
 +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 +*)
 +  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
 +  # A ".." for each directory in $ac_dir_suffix.
 +  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
 +  case $ac_top_builddir_sub in
 +  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
 +  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
 +  esac ;;
 +esac
 +ac_abs_top_builddir=$ac_pwd
 +ac_abs_builddir=$ac_pwd$ac_dir_suffix
 +# for backward compatibility:
 +ac_top_builddir=$ac_top_build_prefix
 +
 +case $srcdir in
 +  .)  # We are building in place.
 +    ac_srcdir=.
 +    ac_top_srcdir=$ac_top_builddir_sub
 +    ac_abs_top_srcdir=$ac_pwd ;;
 +  [\\/]* | ?:[\\/]* )  # Absolute name.
 +    ac_srcdir=$srcdir$ac_dir_suffix;
 +    ac_top_srcdir=$srcdir
 +    ac_abs_top_srcdir=$srcdir ;;
 +  *) # Relative name.
 +    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
 +    ac_top_srcdir=$ac_top_build_prefix$srcdir
 +    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
 +esac
 +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
 +
 +    cd "$ac_dir" || { ac_status=$?; continue; }
 +    # Check for guested configure.
 +    if test -f "$ac_srcdir/configure.gnu"; then
 +      echo &&
 +      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
 +    elif test -f "$ac_srcdir/configure"; then
 +      echo &&
 +      $SHELL "$ac_srcdir/configure" --help=recursive
 +    else
 +      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
 +    fi || ac_status=$?
 +    cd "$ac_pwd" || { ac_status=$?; break; }
 +  done
 +fi
 +
 +test -n "$ac_init_help" && exit $ac_status
 +if $ac_init_version; then
 +  cat <<\_ACEOF
- opensaml configure 2.5.5
++opensaml configure 2.6.0
 +generated by GNU Autoconf 2.69
 +
 +Copyright (C) 2012 Free Software Foundation, Inc.
 +This configure script is free software; the Free Software Foundation
 +gives unlimited permission to copy, distribute and modify it.
 +_ACEOF
 +  exit
 +fi
 +
 +## ------------------------ ##
 +## Autoconf initialization. ##
 +## ------------------------ ##
 +
 +# ac_fn_c_try_compile LINENO
 +# --------------------------
 +# Try to compile conftest.$ac_ext, and return whether this succeeded.
 +ac_fn_c_try_compile ()
 +{
 +  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
 +  rm -f conftest.$ac_objext
 +  if { { ac_try="$ac_compile"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
 +esac
 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
 +$as_echo "$ac_try_echo"; } >&5
 +  (eval "$ac_compile") 2>conftest.err
 +  ac_status=$?
 +  if test -s conftest.err; then
 +    grep -v '^ *+' conftest.err >conftest.er1
 +    cat conftest.er1 >&5
 +    mv -f conftest.er1 conftest.err
 +  fi
 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 +  test $ac_status = 0; } && {
 +	 test -z "$ac_c_werror_flag" ||
 +	 test ! -s conftest.err
 +       } && test -s conftest.$ac_objext; then :
 +  ac_retval=0
 +else
 +  $as_echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +	ac_retval=1
 +fi
 +  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 +  as_fn_set_status $ac_retval
 +
 +} # ac_fn_c_try_compile
 +
 +# ac_fn_c_try_link LINENO
 +# -----------------------
 +# Try to link conftest.$ac_ext, and return whether this succeeded.
 +ac_fn_c_try_link ()
 +{
 +  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
 +  rm -f conftest.$ac_objext conftest$ac_exeext
 +  if { { ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
 +esac
 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
 +$as_echo "$ac_try_echo"; } >&5
 +  (eval "$ac_link") 2>conftest.err
 +  ac_status=$?
 +  if test -s conftest.err; then
 +    grep -v '^ *+' conftest.err >conftest.er1
 +    cat conftest.er1 >&5
 +    mv -f conftest.er1 conftest.err
 +  fi
 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 +  test $ac_status = 0; } && {
 +	 test -z "$ac_c_werror_flag" ||
 +	 test ! -s conftest.err
 +       } && test -s conftest$ac_exeext && {
 +	 test "$cross_compiling" = yes ||
 +	 test -x conftest$ac_exeext
 +       }; then :
 +  ac_retval=0
 +else
 +  $as_echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +	ac_retval=1
 +fi
 +  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
 +  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
 +  # interfere with the next link command; also delete a directory that is
 +  # left behind by Apple's compiler.  We do this before executing the actions.
 +  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
 +  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 +  as_fn_set_status $ac_retval
 +
 +} # ac_fn_c_try_link
 +
 +# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
 +# -------------------------------------------------------
 +# Tests whether HEADER exists and can be compiled using the include files in
 +# INCLUDES, setting the cache variable VAR accordingly.
 +ac_fn_c_check_header_compile ()
 +{
 +  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 +$as_echo_n "checking for $2... " >&6; }
 +if eval \${$3+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +$4
 +#include <$2>
 +_ACEOF
 +if ac_fn_c_try_compile "$LINENO"; then :
 +  eval "$3=yes"
 +else
 +  eval "$3=no"
 +fi
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +fi
 +eval ac_res=\$$3
 +	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 +$as_echo "$ac_res" >&6; }
 +  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 +
 +} # ac_fn_c_check_header_compile
 +
 +# ac_fn_c_try_cpp LINENO
 +# ----------------------
 +# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
 +ac_fn_c_try_cpp ()
 +{
 +  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
 +  if { { ac_try="$ac_cpp conftest.$ac_ext"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
 +esac
 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
 +$as_echo "$ac_try_echo"; } >&5
 +  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
 +  ac_status=$?
 +  if test -s conftest.err; then
 +    grep -v '^ *+' conftest.err >conftest.er1
 +    cat conftest.er1 >&5
 +    mv -f conftest.er1 conftest.err
 +  fi
 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 +  test $ac_status = 0; } > conftest.i && {
 +	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 +	 test ! -s conftest.err
 +       }; then :
 +  ac_retval=0
 +else
 +  $as_echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +    ac_retval=1
 +fi
 +  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 +  as_fn_set_status $ac_retval
 +
 +} # ac_fn_c_try_cpp
 +
 +# ac_fn_c_try_run LINENO
 +# ----------------------
 +# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
 +# that executables *can* be run.
 +ac_fn_c_try_run ()
 +{
 +  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
 +  if { { ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
 +esac
 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
 +$as_echo "$ac_try_echo"; } >&5
 +  (eval "$ac_link") 2>&5
 +  ac_status=$?
 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 +  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
 +  { { case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
 +esac
 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
 +$as_echo "$ac_try_echo"; } >&5
 +  (eval "$ac_try") 2>&5
 +  ac_status=$?
 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 +  test $ac_status = 0; }; }; then :
 +  ac_retval=0
 +else
 +  $as_echo "$as_me: program exited with status $ac_status" >&5
 +       $as_echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +       ac_retval=$ac_status
 +fi
 +  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
 +  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 +  as_fn_set_status $ac_retval
 +
 +} # ac_fn_c_try_run
 +
 +# ac_fn_c_check_func LINENO FUNC VAR
 +# ----------------------------------
 +# Tests whether FUNC exists, setting the cache variable VAR accordingly
 +ac_fn_c_check_func ()
 +{
 +  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 +$as_echo_n "checking for $2... " >&6; }
 +if eval \${$3+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
 +   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 +#define $2 innocuous_$2
 +
 +/* System header to define __stub macros and hopefully few prototypes,
 +    which can conflict with char $2 (); 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 $2
 +
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
 +#ifdef __cplusplus
 +extern "C"
 +#endif
 +char $2 ();
 +/* 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_$2 || defined __stub___$2
 +choke me
 +#endif
 +
 +int
 +main ()
 +{
 +return $2 ();
 +  ;
 +  return 0;
 +}
 +_ACEOF
 +if ac_fn_c_try_link "$LINENO"; then :
 +  eval "$3=yes"
 +else
 +  eval "$3=no"
 +fi
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext conftest.$ac_ext
 +fi
 +eval ac_res=\$$3
 +	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 +$as_echo "$ac_res" >&6; }
 +  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 +
 +} # ac_fn_c_check_func
 +
 +# ac_fn_cxx_try_compile LINENO
 +# ----------------------------
 +# Try to compile conftest.$ac_ext, and return whether this succeeded.
 +ac_fn_cxx_try_compile ()
 +{
 +  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
 +  rm -f conftest.$ac_objext
 +  if { { ac_try="$ac_compile"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
 +esac
 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
 +$as_echo "$ac_try_echo"; } >&5
 +  (eval "$ac_compile") 2>conftest.err
 +  ac_status=$?
 +  if test -s conftest.err; then
 +    grep -v '^ *+' conftest.err >conftest.er1
 +    cat conftest.er1 >&5
 +    mv -f conftest.er1 conftest.err
 +  fi
 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 +  test $ac_status = 0; } && {
 +	 test -z "$ac_cxx_werror_flag" ||
 +	 test ! -s conftest.err
 +       } && test -s conftest.$ac_objext; then :
 +  ac_retval=0
 +else
 +  $as_echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +	ac_retval=1
 +fi
 +  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 +  as_fn_set_status $ac_retval
 +
 +} # ac_fn_cxx_try_compile
 +
 +# ac_fn_cxx_try_cpp LINENO
 +# ------------------------
 +# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
 +ac_fn_cxx_try_cpp ()
 +{
 +  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
 +  if { { ac_try="$ac_cpp conftest.$ac_ext"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
 +esac
 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
 +$as_echo "$ac_try_echo"; } >&5
 +  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
 +  ac_status=$?
 +  if test -s conftest.err; then
 +    grep -v '^ *+' conftest.err >conftest.er1
 +    cat conftest.er1 >&5
 +    mv -f conftest.er1 conftest.err
 +  fi
 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 +  test $ac_status = 0; } > conftest.i && {
 +	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
 +	 test ! -s conftest.err
 +       }; then :
 +  ac_retval=0
 +else
 +  $as_echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +    ac_retval=1
 +fi
 +  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 +  as_fn_set_status $ac_retval
 +
 +} # ac_fn_cxx_try_cpp
 +
 +# ac_fn_cxx_try_link LINENO
 +# -------------------------
 +# Try to link conftest.$ac_ext, and return whether this succeeded.
 +ac_fn_cxx_try_link ()
 +{
 +  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
 +  rm -f conftest.$ac_objext conftest$ac_exeext
 +  if { { ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
 +esac
 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
 +$as_echo "$ac_try_echo"; } >&5
 +  (eval "$ac_link") 2>conftest.err
 +  ac_status=$?
 +  if test -s conftest.err; then
 +    grep -v '^ *+' conftest.err >conftest.er1
 +    cat conftest.er1 >&5
 +    mv -f conftest.er1 conftest.err
 +  fi
 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 +  test $ac_status = 0; } && {
 +	 test -z "$ac_cxx_werror_flag" ||
 +	 test ! -s conftest.err
 +       } && test -s conftest$ac_exeext && {
 +	 test "$cross_compiling" = yes ||
 +	 test -x conftest$ac_exeext
 +       }; then :
 +  ac_retval=0
 +else
 +  $as_echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +	ac_retval=1
 +fi
 +  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
 +  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
 +  # interfere with the next link command; also delete a directory that is
 +  # left behind by Apple's compiler.  We do this before executing the actions.
 +  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
 +  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 +  as_fn_set_status $ac_retval
 +
 +} # ac_fn_cxx_try_link
 +
 +# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
 +# -------------------------------------------
 +# Tests whether TYPE exists after having included INCLUDES, setting cache
 +# variable VAR accordingly.
 +ac_fn_c_check_type ()
 +{
 +  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 +$as_echo_n "checking for $2... " >&6; }
 +if eval \${$3+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  eval "$3=no"
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +$4
 +int
 +main ()
 +{
 +if (sizeof ($2))
 +	 return 0;
 +  ;
 +  return 0;
 +}
 +_ACEOF
 +if ac_fn_c_try_compile "$LINENO"; then :
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +$4
 +int
 +main ()
 +{
 +if (sizeof (($2)))
 +	    return 0;
 +  ;
 +  return 0;
 +}
 +_ACEOF
 +if ac_fn_c_try_compile "$LINENO"; then :
 +
 +else
 +  eval "$3=yes"
 +fi
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +fi
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +fi
 +eval ac_res=\$$3
 +	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 +$as_echo "$ac_res" >&6; }
 +  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 +
 +} # ac_fn_c_check_type
 +
 +# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
 +# -------------------------------------------------------
 +# Tests whether HEADER exists, giving a warning if it cannot be compiled using
 +# the include files in INCLUDES and setting the cache variable VAR
 +# accordingly.
 +ac_fn_c_check_header_mongrel ()
 +{
 +  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
 +  if eval \${$3+:} false; then :
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 +$as_echo_n "checking for $2... " >&6; }
 +if eval \${$3+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +fi
 +eval ac_res=\$$3
 +	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 +$as_echo "$ac_res" >&6; }
 +else
 +  # Is the header compilable?
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
 +$as_echo_n "checking $2 usability... " >&6; }
 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +$4
 +#include <$2>
 +_ACEOF
 +if ac_fn_c_try_compile "$LINENO"; then :
 +  ac_header_compiler=yes
 +else
 +  ac_header_compiler=no
 +fi
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
 +$as_echo "$ac_header_compiler" >&6; }
 +
 +# Is the header present?
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
 +$as_echo_n "checking $2 presence... " >&6; }
 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +#include <$2>
 +_ACEOF
 +if ac_fn_c_try_cpp "$LINENO"; then :
 +  ac_header_preproc=yes
 +else
 +  ac_header_preproc=no
 +fi
 +rm -f conftest.err conftest.i conftest.$ac_ext
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
 +$as_echo "$ac_header_preproc" >&6; }
 +
 +# So?  What about this header?
 +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
 +  yes:no: )
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
 +$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
 +    ;;
 +  no:yes:* )
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
 +$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
 +$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
 +$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
 +$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
 +( $as_echo "## --------------------------------------------- ##
 +## Report this to https://issues.shibboleth.net/ ##
 +## --------------------------------------------- ##"
 +     ) | sed "s/^/$as_me: WARNING:     /" >&2
 +    ;;
 +esac
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 +$as_echo_n "checking for $2... " >&6; }
 +if eval \${$3+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  eval "$3=\$ac_header_compiler"
 +fi
 +eval ac_res=\$$3
 +	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 +$as_echo "$ac_res" >&6; }
 +fi
 +  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 +
 +} # ac_fn_c_check_header_mongrel
 +
 +# ac_fn_cxx_check_header_mongrel LINENO HEADER VAR INCLUDES
 +# ---------------------------------------------------------
 +# Tests whether HEADER exists, giving a warning if it cannot be compiled using
 +# the include files in INCLUDES and setting the cache variable VAR
 +# accordingly.
 +ac_fn_cxx_check_header_mongrel ()
 +{
 +  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
 +  if eval \${$3+:} false; then :
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 +$as_echo_n "checking for $2... " >&6; }
 +if eval \${$3+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +fi
 +eval ac_res=\$$3
 +	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 +$as_echo "$ac_res" >&6; }
 +else
 +  # Is the header compilable?
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
 +$as_echo_n "checking $2 usability... " >&6; }
 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +$4
 +#include <$2>
 +_ACEOF
 +if ac_fn_cxx_try_compile "$LINENO"; then :
 +  ac_header_compiler=yes
 +else
 +  ac_header_compiler=no
 +fi
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
 +$as_echo "$ac_header_compiler" >&6; }
 +
 +# Is the header present?
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
 +$as_echo_n "checking $2 presence... " >&6; }
 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +#include <$2>
 +_ACEOF
 +if ac_fn_cxx_try_cpp "$LINENO"; then :
 +  ac_header_preproc=yes
 +else
 +  ac_header_preproc=no
 +fi
 +rm -f conftest.err conftest.i conftest.$ac_ext
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
 +$as_echo "$ac_header_preproc" >&6; }
 +
 +# So?  What about this header?
 +case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in #((
 +  yes:no: )
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
 +$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
 +    ;;
 +  no:yes:* )
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
 +$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
 +$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
 +$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
 +$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
 +( $as_echo "## --------------------------------------------- ##
 +## Report this to https://issues.shibboleth.net/ ##
 +## --------------------------------------------- ##"
 +     ) | sed "s/^/$as_me: WARNING:     /" >&2
 +    ;;
 +esac
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 +$as_echo_n "checking for $2... " >&6; }
 +if eval \${$3+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  eval "$3=\$ac_header_compiler"
 +fi
 +eval ac_res=\$$3
 +	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 +$as_echo "$ac_res" >&6; }
 +fi
 +  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 +
 +} # ac_fn_cxx_check_header_mongrel
 +cat >config.log <<_ACEOF
 +This file contains any messages produced by compilers while
 +running configure, to aid debugging if configure makes a mistake.
 +
- It was created by opensaml $as_me 2.5.5, which was
++It was created by opensaml $as_me 2.6.0, which was
 +generated by GNU Autoconf 2.69.  Invocation command line was
 +
 +  $ $0 $@
 +
 +_ACEOF
 +exec 5>>config.log
 +{
 +cat <<_ASUNAME
 +## --------- ##
 +## Platform. ##
 +## --------- ##
 +
 +hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
 +uname -m = `(uname -m) 2>/dev/null || echo unknown`
 +uname -r = `(uname -r) 2>/dev/null || echo unknown`
 +uname -s = `(uname -s) 2>/dev/null || echo unknown`
 +uname -v = `(uname -v) 2>/dev/null || echo unknown`
 +
 +/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
 +/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
 +
 +/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
 +/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
 +/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
 +/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
 +/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
 +/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
 +/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
 +
 +_ASUNAME
 +
 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +for as_dir in $PATH
 +do
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +    $as_echo "PATH: $as_dir"
 +  done
 +IFS=$as_save_IFS
 +
 +} >&5
 +
 +cat >&5 <<_ACEOF
 +
 +
 +## ----------- ##
 +## Core tests. ##
 +## ----------- ##
 +
 +_ACEOF
 +
 +
 +# Keep a trace of the command line.
 +# Strip out --no-create and --no-recursion so they do not pile up.
 +# Strip out --silent because we don't want to record it for future runs.
 +# Also quote any args containing shell meta-characters.
 +# Make two passes to allow for proper duplicate-argument suppression.
 +ac_configure_args=
 +ac_configure_args0=
 +ac_configure_args1=
 +ac_must_keep_next=false
 +for ac_pass in 1 2
 +do
 +  for ac_arg
 +  do
 +    case $ac_arg in
 +    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
 +    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
 +    | -silent | --silent | --silen | --sile | --sil)
 +      continue ;;
 +    *\'*)
 +      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
 +    esac
 +    case $ac_pass in
 +    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
 +    2)
 +      as_fn_append ac_configure_args1 " '$ac_arg'"
 +      if test $ac_must_keep_next = true; then
 +	ac_must_keep_next=false # Got value, back to normal.
 +      else
 +	case $ac_arg in
 +	  *=* | --config-cache | -C | -disable-* | --disable-* \
 +	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
 +	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
 +	  | -with-* | --with-* | -without-* | --without-* | --x)
 +	    case "$ac_configure_args0 " in
 +	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
 +	    esac
 +	    ;;
 +	  -* ) ac_must_keep_next=true ;;
 +	esac
 +      fi
 +      as_fn_append ac_configure_args " '$ac_arg'"
 +      ;;
 +    esac
 +  done
 +done
 +{ ac_configure_args0=; unset ac_configure_args0;}
 +{ ac_configure_args1=; unset ac_configure_args1;}
 +
 +# When interrupted or exit'd, cleanup temporary files, and complete
 +# config.log.  We remove comments because anyway the quotes in there
 +# would cause problems or look ugly.
 +# WARNING: Use '\'' to represent an apostrophe within the trap.
 +# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
 +trap 'exit_status=$?
 +  # Save into config.log some information that might help in debugging.
 +  {
 +    echo
 +
 +    $as_echo "## ---------------- ##
 +## Cache variables. ##
 +## ---------------- ##"
 +    echo
 +    # The following way of writing the cache mishandles newlines in values,
 +(
 +  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
 +    eval ac_val=\$$ac_var
 +    case $ac_val in #(
 +    *${as_nl}*)
 +      case $ac_var in #(
 +      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
 +      esac
 +      case $ac_var in #(
 +      _ | IFS | as_nl) ;; #(
 +      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
 +      *) { eval $ac_var=; unset $ac_var;} ;;
 +      esac ;;
 +    esac
 +  done
 +  (set) 2>&1 |
 +    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
 +    *${as_nl}ac_space=\ *)
 +      sed -n \
 +	"s/'\''/'\''\\\\'\'''\''/g;
 +	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
 +      ;; #(
 +    *)
 +      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
 +      ;;
 +    esac |
 +    sort
 +)
 +    echo
 +
 +    $as_echo "## ----------------- ##
 +## Output variables. ##
 +## ----------------- ##"
 +    echo
 +    for ac_var in $ac_subst_vars
 +    do
 +      eval ac_val=\$$ac_var
 +      case $ac_val in
 +      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
 +      esac
 +      $as_echo "$ac_var='\''$ac_val'\''"
 +    done | sort
 +    echo
 +
 +    if test -n "$ac_subst_files"; then
 +      $as_echo "## ------------------- ##
 +## File substitutions. ##
 +## ------------------- ##"
 +      echo
 +      for ac_var in $ac_subst_files
 +      do
 +	eval ac_val=\$$ac_var
 +	case $ac_val in
 +	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
 +	esac
 +	$as_echo "$ac_var='\''$ac_val'\''"
 +      done | sort
 +      echo
 +    fi
 +
 +    if test -s confdefs.h; then
 +      $as_echo "## ----------- ##
 +## confdefs.h. ##
 +## ----------- ##"
 +      echo
 +      cat confdefs.h
 +      echo
 +    fi
 +    test "$ac_signal" != 0 &&
 +      $as_echo "$as_me: caught signal $ac_signal"
 +    $as_echo "$as_me: exit $exit_status"
 +  } >&5
 +  rm -f core *.core core.conftest.* &&
 +    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
 +    exit $exit_status
 +' 0
 +for ac_signal in 1 2 13 15; do
 +  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
 +done
 +ac_signal=0
 +
 +# confdefs.h avoids OS command line length limits that DEFS can exceed.
 +rm -f -r conftest* confdefs.h
 +
 +$as_echo "/* confdefs.h */" > confdefs.h
 +
 +# Predefined preprocessor variables.
 +
 +cat >>confdefs.h <<_ACEOF
 +#define PACKAGE_NAME "$PACKAGE_NAME"
 +_ACEOF
 +
 +cat >>confdefs.h <<_ACEOF
 +#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
 +_ACEOF
 +
 +cat >>confdefs.h <<_ACEOF
 +#define PACKAGE_VERSION "$PACKAGE_VERSION"
 +_ACEOF
 +
 +cat >>confdefs.h <<_ACEOF
 +#define PACKAGE_STRING "$PACKAGE_STRING"
 +_ACEOF
 +
 +cat >>confdefs.h <<_ACEOF
 +#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
 +_ACEOF
 +
 +cat >>confdefs.h <<_ACEOF
 +#define PACKAGE_URL "$PACKAGE_URL"
 +_ACEOF
 +
 +
 +# Let the site file select an alternate cache file if it wants to.
 +# Prefer an explicitly selected file to automatically selected ones.
 +ac_site_file1=NONE
 +ac_site_file2=NONE
 +if test -n "$CONFIG_SITE"; then
 +  # We do not want a PATH search for config.site.
 +  case $CONFIG_SITE in #((
 +    -*)  ac_site_file1=./$CONFIG_SITE;;
 +    */*) ac_site_file1=$CONFIG_SITE;;
 +    *)   ac_site_file1=./$CONFIG_SITE;;
 +  esac
 +elif test "x$prefix" != xNONE; then
 +  ac_site_file1=$prefix/share/config.site
 +  ac_site_file2=$prefix/etc/config.site
 +else
 +  ac_site_file1=$ac_default_prefix/share/config.site
 +  ac_site_file2=$ac_default_prefix/etc/config.site
 +fi
 +for ac_site_file in "$ac_site_file1" "$ac_site_file2"
 +do
 +  test "x$ac_site_file" = xNONE && continue
 +  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
 +$as_echo "$as_me: loading site script $ac_site_file" >&6;}
 +    sed 's/^/| /' "$ac_site_file" >&5
 +    . "$ac_site_file" \
 +      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 +as_fn_error $? "failed to load site script $ac_site_file
 +See \`config.log' for more details" "$LINENO" 5; }
 +  fi
 +done
 +
 +if test -r "$cache_file"; then
 +  # Some versions of bash will fail to source /dev/null (special files
 +  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
 +  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
 +$as_echo "$as_me: loading cache $cache_file" >&6;}
 +    case $cache_file in
 +      [\\/]* | ?:[\\/]* ) . "$cache_file";;
 +      *)                      . "./$cache_file";;
 +    esac
 +  fi
 +else
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
 +$as_echo "$as_me: creating cache $cache_file" >&6;}
 +  >$cache_file
 +fi
 +
 +# Check that the precious variables saved in the cache have kept the same
 +# value.
 +ac_cache_corrupted=false
 +for ac_var in $ac_precious_vars; do
 +  eval ac_old_set=\$ac_cv_env_${ac_var}_set
 +  eval ac_new_set=\$ac_env_${ac_var}_set
 +  eval ac_old_val=\$ac_cv_env_${ac_var}_value
 +  eval ac_new_val=\$ac_env_${ac_var}_value
 +  case $ac_old_set,$ac_new_set in
 +    set,)
 +      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
 +$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
 +      ac_cache_corrupted=: ;;
 +    ,set)
 +      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
 +$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
 +      ac_cache_corrupted=: ;;
 +    ,);;
 +    *)
 +      if test "x$ac_old_val" != "x$ac_new_val"; then
 +	# differences in whitespace do not lead to failure.
 +	ac_old_val_w=`echo x $ac_old_val`
 +	ac_new_val_w=`echo x $ac_new_val`
 +	if test "$ac_old_val_w" != "$ac_new_val_w"; then
 +	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
 +$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
 +	  ac_cache_corrupted=:
 +	else
 +	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
 +$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
 +	  eval $ac_var=\$ac_old_val
 +	fi
 +	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
 +$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
 +	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
 +$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
 +      fi;;
 +  esac
 +  # Pass precious variables to config.status.
 +  if test "$ac_new_set" = set; then
 +    case $ac_new_val in
 +    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
 +    *) ac_arg=$ac_var=$ac_new_val ;;
 +    esac
 +    case " $ac_configure_args " in
 +      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
 +      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
 +    esac
 +  fi
 +done
 +if $ac_cache_corrupted; then
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
 +$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
 +  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
 +fi
 +## -------------------- ##
 +## Main body of script. ##
 +## -------------------- ##
 +
 +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
 +
 +
 +
 +ac_aux_dir=
 +for ac_dir in build-aux "$srcdir"/build-aux; do
 +  if test -f "$ac_dir/install-sh"; then
 +    ac_aux_dir=$ac_dir
 +    ac_install_sh="$ac_aux_dir/install-sh -c"
 +    break
 +  elif test -f "$ac_dir/install.sh"; then
 +    ac_aux_dir=$ac_dir
 +    ac_install_sh="$ac_aux_dir/install.sh -c"
 +    break
 +  elif test -f "$ac_dir/shtool"; then
 +    ac_aux_dir=$ac_dir
 +    ac_install_sh="$ac_aux_dir/shtool install -c"
 +    break
 +  fi
 +done
 +if test -z "$ac_aux_dir"; then
 +  as_fn_error $? "cannot find install-sh, install.sh, or shtool in build-aux \"$srcdir\"/build-aux" "$LINENO" 5
 +fi
 +
 +# These three variables are undocumented and unsupported,
 +# and are intended to be withdrawn in a future Autoconf release.
 +# They can cause serious problems if a builder's source tree is in a directory
 +# whose full name contains unusual characters.
 +ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
 +ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
 +ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 +
 +
 +
- am__api_version='1.15'
++am__api_version='1.13'
 +
 +# Find a good install program.  We prefer a C program (faster),
 +# so one script is as good as another.  But avoid the broken or
 +# incompatible versions:
 +# SysV /etc/install, /usr/sbin/install
 +# SunOS /usr/etc/install
 +# IRIX /sbin/install
 +# AIX /bin/install
 +# AmigaOS /C/install, which installs bootblocks on floppy discs
 +# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
 +# AFS /usr/afsws/bin/install, which mishandles nonexistent args
 +# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 +# OS/2's system install, which has a completely different semantic
 +# ./install, which can be erroneously created by make from ./install.sh.
 +# Reject install programs that cannot install multiple files.
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
 +$as_echo_n "checking for a BSD-compatible install... " >&6; }
 +if test -z "$INSTALL"; then
 +if ${ac_cv_path_install+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +for as_dir in $PATH
 +do
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +    # Account for people who put trailing slashes in PATH elements.
 +case $as_dir/ in #((
 +  ./ | .// | /[cC]/* | \
 +  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
 +  ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
 +  /usr/ucb/* ) ;;
 +  *)
 +    # OSF1 and SCO ODT 3.0 have their own names for install.
 +    # Don't use installbsd from OSF since it installs stuff as root
 +    # by default.
 +    for ac_prog in ginstall scoinst install; do
 +      for ac_exec_ext in '' $ac_executable_extensions; do
 +	if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
 +	  if test $ac_prog = install &&
 +	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
 +	    # AIX install.  It has an incompatible calling convention.
 +	    :
 +	  elif test $ac_prog = install &&
 +	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
 +	    # program-specific install script used by HP pwplus--don't use.
 +	    :
 +	  else
 +	    rm -rf conftest.one conftest.two conftest.dir
 +	    echo one > conftest.one
 +	    echo two > conftest.two
 +	    mkdir conftest.dir
 +	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
 +	      test -s conftest.one && test -s conftest.two &&
 +	      test -s conftest.dir/conftest.one &&
 +	      test -s conftest.dir/conftest.two
 +	    then
 +	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
 +	      break 3
 +	    fi
 +	  fi
 +	fi
 +      done
 +    done
 +    ;;
 +esac
 +
 +  done
 +IFS=$as_save_IFS
 +
 +rm -rf conftest.one conftest.two conftest.dir
 +
 +fi
 +  if test "${ac_cv_path_install+set}" = set; then
 +    INSTALL=$ac_cv_path_install
 +  else
 +    # As a last resort, use the slow shell script.  Don't cache a
 +    # value for INSTALL within a source directory, because that will
 +    # break other packages using the cache if that directory is
 +    # removed, or if the value is a relative name.
 +    INSTALL=$ac_install_sh
 +  fi
 +fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
 +$as_echo "$INSTALL" >&6; }
 +
 +# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
 +# It thinks the first close brace ends the variable substitution.
 +test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
 +
 +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 +
 +test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 +
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
 +$as_echo_n "checking whether build environment is sane... " >&6; }
 +# Reject unsafe characters in $srcdir or the absolute working directory
 +# name.  Accept space and tab only in the latter.
 +am_lf='
 +'
 +case `pwd` in
 +  *[\\\"\#\$\&\'\`$am_lf]*)
 +    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
 +esac
 +case $srcdir in
 +  *[\\\"\#\$\&\'\`$am_lf\ \	]*)
 +    as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
 +esac
 +
 +# Do 'set' in a subshell so we don't clobber the current shell's
 +# arguments.  Must try -L first in case configure is actually a
 +# symlink; some systems play weird games with the mod time of symlinks
 +# (eg FreeBSD returns the mod time of the symlink's containing
 +# directory).
 +if (
 +   am_has_slept=no
 +   for am_try in 1 2; do
 +     echo "timestamp, slept: $am_has_slept" > conftest.file
 +     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
 +     if test "$*" = "X"; then
 +	# -L didn't work.
 +	set X `ls -t "$srcdir/configure" conftest.file`
 +     fi
 +     if test "$*" != "X $srcdir/configure conftest.file" \
 +	&& test "$*" != "X conftest.file $srcdir/configure"; then
 +
 +	# If neither matched, then we have a broken ls.  This can happen
 +	# if, for instance, CONFIG_SHELL is bash and it inherits a
 +	# broken ls alias from the environment.  This has actually
 +	# happened.  Such a system could not be considered "sane".
 +	as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
 +  alias in your environment" "$LINENO" 5
 +     fi
 +     if test "$2" = conftest.file || test $am_try -eq 2; then
 +       break
 +     fi
 +     # Just in case.
 +     sleep 1
 +     am_has_slept=yes
 +   done
 +   test "$2" = conftest.file
 +   )
 +then
 +   # Ok.
 +   :
 +else
 +   as_fn_error $? "newly created file is older than distributed files!
 +Check your system clock" "$LINENO" 5
 +fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 +$as_echo "yes" >&6; }
 +# If we didn't sleep, we still need to ensure time stamps of config.status and
 +# generated files are strictly newer.
 +am_sleep_pid=
 +if grep 'slept: no' conftest.file >/dev/null 2>&1; then
 +  ( sleep 1 ) &
 +  am_sleep_pid=$!
 +fi
 +
 +rm -f conftest.file
 +
 +test "$program_prefix" != NONE &&
 +  program_transform_name="s&^&$program_prefix&;$program_transform_name"
 +# Use a double $ so make ignores it.
 +test "$program_suffix" != NONE &&
 +  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
 +# Double any \ or $.
 +# By default was `s,x,x', remove it if useless.
 +ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
 +program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
 +
- # Expand $ac_aux_dir to an absolute path.
- am_aux_dir=`cd "$ac_aux_dir" && pwd`
++# expand $ac_aux_dir to an absolute path
++am_aux_dir=`cd $ac_aux_dir && pwd`
 +
 +if test x"${MISSING+set}" != xset; then
 +  case $am_aux_dir in
 +  *\ * | *\	*)
 +    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
 +  *)
 +    MISSING="\${SHELL} $am_aux_dir/missing" ;;
 +  esac
 +fi
 +# Use eval to expand $SHELL
 +if eval "$MISSING --is-lightweight"; then
 +  am_missing_run="$MISSING "
 +else
 +  am_missing_run=
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
 +$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
 +fi
 +
- if test x"${install_sh+set}" != xset; then
++if test x"${install_sh}" != xset; then
 +  case $am_aux_dir in
 +  *\ * | *\	*)
 +    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
 +  *)
 +    install_sh="\${SHELL} $am_aux_dir/install-sh"
 +  esac
 +fi
 +
 +# Installed binaries are usually stripped using 'strip' when the user
 +# run "make install-strip".  However 'strip' might not be the right
 +# tool to use in cross-compilation environments, therefore Automake
 +# will honor the 'STRIP' environment variable to overrule this program.
 +if test "$cross_compiling" != no; then
 +  if test -n "$ac_tool_prefix"; then
 +  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 +set dummy ${ac_tool_prefix}strip; ac_word=$2
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
 +if ${ac_cv_prog_STRIP+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  if test -n "$STRIP"; then
 +  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
 +else
 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +for as_dir in $PATH
 +do
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +    for ac_exec_ext in '' $ac_executable_extensions; do
 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 +    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
 +  fi
 +done
 +  done
 +IFS=$as_save_IFS
 +
 +fi
 +fi
 +STRIP=$ac_cv_prog_STRIP
 +if test -n "$STRIP"; then
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
 +$as_echo "$STRIP" >&6; }
 +else
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
 +fi
 +
 +
 +fi
 +if test -z "$ac_cv_prog_STRIP"; then
 +  ac_ct_STRIP=$STRIP
 +  # Extract the first word of "strip", so it can be a program name with args.
 +set dummy strip; ac_word=$2
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
 +if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  if test -n "$ac_ct_STRIP"; then
 +  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
 +else
 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +for as_dir in $PATH
 +do
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +    for ac_exec_ext in '' $ac_executable_extensions; do
 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 +    ac_cv_prog_ac_ct_STRIP="strip"
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
 +  fi
 +done
 +  done
 +IFS=$as_save_IFS
 +
 +fi
 +fi
 +ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 +if test -n "$ac_ct_STRIP"; then
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
 +$as_echo "$ac_ct_STRIP" >&6; }
 +else
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
 +fi
 +
 +  if test "x$ac_ct_STRIP" = x; then
 +    STRIP=":"
 +  else
 +    case $cross_compiling:$ac_tool_warned in
 +yes:)
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 +ac_tool_warned=yes ;;
 +esac
 +    STRIP=$ac_ct_STRIP
 +  fi
 +else
 +  STRIP="$ac_cv_prog_STRIP"
 +fi
 +
 +fi
 +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 +
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
 +$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
 +if test -z "$MKDIR_P"; then
 +  if ${ac_cv_path_mkdir+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
 +do
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +    for ac_prog in mkdir gmkdir; do
 +	 for ac_exec_ext in '' $ac_executable_extensions; do
 +	   as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
 +	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
 +	     'mkdir (GNU coreutils) '* | \
 +	     'mkdir (coreutils) '* | \
 +	     'mkdir (fileutils) '4.1*)
 +	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
 +	       break 3;;
 +	   esac
 +	 done
 +       done
 +  done
 +IFS=$as_save_IFS
 +
 +fi
 +
 +  test -d ./--version && rmdir ./--version
 +  if test "${ac_cv_path_mkdir+set}" = set; then
 +    MKDIR_P="$ac_cv_path_mkdir -p"
 +  else
 +    # As a last resort, use the slow shell script.  Don't cache a
 +    # value for MKDIR_P within a source directory, because that will
 +    # break other packages using the cache if that directory is
 +    # removed, or if the value is a relative name.
 +    MKDIR_P="$ac_install_sh -d"
 +  fi
 +fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
 +$as_echo "$MKDIR_P" >&6; }
 +
 +for ac_prog in gawk mawk nawk awk
 +do
 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
 +set dummy $ac_prog; ac_word=$2
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
 +if ${ac_cv_prog_AWK+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  if test -n "$AWK"; then
 +  ac_cv_prog_AWK="$AWK" # Let the user override the test.
 +else
 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +for as_dir in $PATH
 +do
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +    for ac_exec_ext in '' $ac_executable_extensions; do
 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 +    ac_cv_prog_AWK="$ac_prog"
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
 +  fi
 +done
 +  done
 +IFS=$as_save_IFS
 +
 +fi
 +fi
 +AWK=$ac_cv_prog_AWK
 +if test -n "$AWK"; then
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
 +$as_echo "$AWK" >&6; }
 +else
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
 +fi
 +
 +
 +  test -n "$AWK" && break
 +done
 +
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
 +$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
 +set x ${MAKE-make}
 +ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
 +if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  cat >conftest.make <<\_ACEOF
 +SHELL = /bin/sh
 +all:
 +	@echo '@@@%%%=$(MAKE)=@@@%%%'
 +_ACEOF
 +# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
 +case `${MAKE-make} -f conftest.make 2>/dev/null` in
 +  *@@@%%%=?*=@@@%%%*)
 +    eval ac_cv_prog_make_${ac_make}_set=yes;;
 +  *)
 +    eval ac_cv_prog_make_${ac_make}_set=no;;
 +esac
 +rm -f conftest.make
 +fi
 +if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 +$as_echo "yes" >&6; }
 +  SET_MAKE=
 +else
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
 +  SET_MAKE="MAKE=${MAKE-make}"
 +fi
 +
 +rm -rf .tst 2>/dev/null
 +mkdir .tst 2>/dev/null
 +if test -d .tst; then
 +  am__leading_dot=.
 +else
 +  am__leading_dot=_
 +fi
 +rmdir .tst 2>/dev/null
 +
 +# Check whether --enable-silent-rules was given.
 +if test "${enable_silent_rules+set}" = set; then :
 +  enableval=$enable_silent_rules;
 +fi
 +
 +case $enable_silent_rules in # (((
 +  yes) AM_DEFAULT_VERBOSITY=0;;
 +   no) AM_DEFAULT_VERBOSITY=1;;
 +    *) AM_DEFAULT_VERBOSITY=1;;
 +esac
 +am_make=${MAKE-make}
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
 +$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
 +if ${am_cv_make_support_nested_variables+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  if $as_echo 'TRUE=$(BAR$(V))
 +BAR0=false
 +BAR1=true
 +V=1
 +am__doit:
 +	@$(TRUE)
 +.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
 +  am_cv_make_support_nested_variables=yes
 +else
 +  am_cv_make_support_nested_variables=no
 +fi
 +fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
 +$as_echo "$am_cv_make_support_nested_variables" >&6; }
 +if test $am_cv_make_support_nested_variables = yes; then
 +    AM_V='$(V)'
 +  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
 +else
 +  AM_V=$AM_DEFAULT_VERBOSITY
 +  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
 +fi
 +AM_BACKSLASH='\'
 +
 +if test "`cd $srcdir && pwd`" != "`pwd`"; then
 +  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
 +  # is not polluted with repeated "-I."
 +  am__isrc=' -I$(srcdir)'
 +  # test to see if srcdir already configured
 +  if test -f $srcdir/config.status; then
 +    as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
 +  fi
 +fi
 +
 +# test whether we have cygpath
 +if test -z "$CYGPATH_W"; then
 +  if (cygpath --version) >/dev/null 2>/dev/null; then
 +    CYGPATH_W='cygpath -w'
 +  else
 +    CYGPATH_W=echo
 +  fi
 +fi
 +
 +
 +# Define the identity of the package.
 + PACKAGE='opensaml'
-  VERSION='2.5.5'
++ VERSION='2.6.0'
 +
 +
 +cat >>confdefs.h <<_ACEOF
 +#define PACKAGE "$PACKAGE"
 +_ACEOF
 +
 +
 +cat >>confdefs.h <<_ACEOF
 +#define VERSION "$VERSION"
 +_ACEOF
 +
 +# Some tools Automake needs.
 +
 +ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
 +
 +
 +AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
 +
 +
 +AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
 +
 +
 +AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
 +
 +
 +MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 +
 +# For better backward compatibility.  To be removed once Automake 1.9.x
 +# dies out for good.  For more background, see:
 +# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
 +# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
 +mkdir_p='$(MKDIR_P)'
 +
- # We need awk for the "check" target (and possibly the TAP driver).  The
- # system "awk" is bad on some platforms.
++# We need awk for the "check" target.  The system "awk" is bad on
++# some platforms.
 +# Always define AMTAR for backward compatibility.  Yes, it's still used
 +# in the wild :-(  We should find a proper way to deprecate it ...
 +AMTAR='$${TAR-tar}'
 +
 +
 +# We'll loop over all known methods to create a tar archive until one works.
 +_am_tools='gnutar  pax cpio none'
 +
 +am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
 +
 +
 +
 +
 +
 +
- # POSIX will say in a future version that running "rm -f" with no argument
- # is OK; and we want to be able to make that assumption in our Makefile
- # recipes.  So use an aggressive probe to check that the usage we want is
- # actually supported "in the wild" to an acceptable degree.
- # See automake bug#10828.
- # To make any issue more visible, cause the running configure to be aborted
- # by default if the 'rm' program in use doesn't match our expectations; the
- # user can still override this though.
- if rm -f && rm -fr && rm -rf; then : OK; else
-   cat >&2 <<'END'
- Oops!
- 
- Your 'rm' program seems unable to run without file operands specified
- on the command line, even when the '-f' option is present.  This is contrary
- to the behaviour of most rm programs out there, and not conforming with
- the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
- 
- Please tell bug-automake at gnu.org about your system, including the value
- of your $PATH and any error possibly output before this message.  This
- can help us improve future automake versions.
- 
- END
-   if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
-     echo 'Configuration will proceed anyway, since you have set the' >&2
-     echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
-     echo >&2
-   else
-     cat >&2 <<'END'
- Aborting the configuration process, to ensure you take notice of the issue.
- 
- You can download and install GNU coreutils to get an 'rm' implementation
- that behaves properly: <http://www.gnu.org/software/coreutils/>.
- 
- If you want to complete the configuration process using your problematic
- 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
- to "yes", and re-run configure.
- 
- END
-     as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
-   fi
- fi
- 
 +# Check whether --enable-static was given.
 +if test "${enable_static+set}" = set; then :
 +  enableval=$enable_static; p=${PACKAGE-default}
 +    case $enableval in
 +    yes) enable_static=yes ;;
 +    no) enable_static=no ;;
 +    *)
 +     enable_static=no
 +      # Look at the argument we got.  We use all the common list separators.
-       lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
++      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
 +      for pkg in $enableval; do
- 	IFS=$lt_save_ifs
++	IFS="$lt_save_ifs"
 +	if test "X$pkg" = "X$p"; then
 +	  enable_static=yes
 +	fi
 +      done
-       IFS=$lt_save_ifs
++      IFS="$lt_save_ifs"
 +      ;;
 +    esac
 +else
 +  enable_static=no
 +fi
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +case `pwd` in
 +  *\ * | *\	*)
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
 +$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
 +esac
 +
 +
 +
- macro_version='2.4.6'
- macro_revision='2.4.6'
++macro_version='2.4.2'
++macro_revision='1.3337'
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
- ltmain=$ac_aux_dir/ltmain.sh
++ltmain="$ac_aux_dir/ltmain.sh"
 +
 +# Make sure we can run config.sub.
 +$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
 +  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
 +
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
 +$as_echo_n "checking build system type... " >&6; }
 +if ${ac_cv_build+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  ac_build_alias=$build_alias
 +test "x$ac_build_alias" = x &&
 +  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
 +test "x$ac_build_alias" = x &&
 +  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
 +ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
 +  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
 +
 +fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
 +$as_echo "$ac_cv_build" >&6; }
 +case $ac_cv_build in
 +*-*-*) ;;
 +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
 +esac
 +build=$ac_cv_build
 +ac_save_IFS=$IFS; IFS='-'
 +set x $ac_cv_build
 +shift
 +build_cpu=$1
 +build_vendor=$2
 +shift; shift
 +# Remember, the first character of IFS is used to create $*,
 +# except with old shells:
 +build_os=$*
 +IFS=$ac_save_IFS
 +case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
 +
 +
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
 +$as_echo_n "checking host system type... " >&6; }
 +if ${ac_cv_host+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  if test "x$host_alias" = x; then
 +  ac_cv_host=$ac_cv_build
 +else
 +  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
 +    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
 +fi
 +
 +fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
 +$as_echo "$ac_cv_host" >&6; }
 +case $ac_cv_host in
 +*-*-*) ;;
 +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
 +esac
 +host=$ac_cv_host
 +ac_save_IFS=$IFS; IFS='-'
 +set x $ac_cv_host
 +shift
 +host_cpu=$1
 +host_vendor=$2
 +shift; shift
 +# Remember, the first character of IFS is used to create $*,
 +# except with old shells:
 +host_os=$*
 +IFS=$ac_save_IFS
 +case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
 +
 +
 +# Backslashify metacharacters that are still active within
 +# double-quoted strings.
 +sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
 +
 +# Same as above, but do not quote variable references.
 +double_quote_subst='s/\(["`\\]\)/\\\1/g'
 +
 +# Sed substitution to delay expansion of an escaped shell variable in a
 +# double_quote_subst'ed string.
 +delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
 +
 +# Sed substitution to delay expansion of an escaped single quote.
 +delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
 +
 +# Sed substitution to avoid accidental globbing in evaled expressions
 +no_glob_subst='s/\*/\\\*/g'
 +
 +ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
 +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
 +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
 +
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
 +$as_echo_n "checking how to print strings... " >&6; }
 +# Test print first, because it will be a builtin if present.
 +if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
 +   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
 +  ECHO='print -r --'
 +elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
 +  ECHO='printf %s\n'
 +else
 +  # Use this function as a fallback that always works.
 +  func_fallback_echo ()
 +  {
 +    eval 'cat <<_LTECHO_EOF
 +$1
 +_LTECHO_EOF'
 +  }
 +  ECHO='func_fallback_echo'
 +fi
 +
 +# func_echo_all arg...
 +# Invoke $ECHO with all args, space-separated.
 +func_echo_all ()
 +{
 +    $ECHO ""
 +}
 +
- case $ECHO in
++case "$ECHO" in
 +  printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
 +$as_echo "printf" >&6; } ;;
 +  print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
 +$as_echo "print -r" >&6; } ;;
 +  *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5
 +$as_echo "cat" >&6; } ;;
 +esac
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +DEPDIR="${am__leading_dot}deps"
 +
 +ac_config_commands="$ac_config_commands depfiles"
 +
 +
 +am_make=${MAKE-make}
 +cat > confinc << 'END'
 +am__doit:
 +	@echo this is the am__doit target
 +.PHONY: am__doit
 +END
 +# If we don't find an include directive, just comment out the code.
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
 +$as_echo_n "checking for style of include used by $am_make... " >&6; }
 +am__include="#"
 +am__quote=
 +_am_result=none
 +# First try GNU make style include.
 +echo "include confinc" > confmf
 +# Ignore all kinds of additional output from 'make'.
 +case `$am_make -s -f confmf 2> /dev/null` in #(
 +*the\ am__doit\ target*)
 +  am__include=include
 +  am__quote=
 +  _am_result=GNU
 +  ;;
 +esac
 +# Now try BSD make style include.
 +if test "$am__include" = "#"; then
 +   echo '.include "confinc"' > confmf
 +   case `$am_make -s -f confmf 2> /dev/null` in #(
 +   *the\ am__doit\ target*)
 +     am__include=.include
 +     am__quote="\""
 +     _am_result=BSD
 +     ;;
 +   esac
 +fi
 +
 +
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
 +$as_echo "$_am_result" >&6; }
 +rm -f confinc confmf
 +
 +# Check whether --enable-dependency-tracking was given.
 +if test "${enable_dependency_tracking+set}" = set; then :
 +  enableval=$enable_dependency_tracking;
 +fi
 +
 +if test "x$enable_dependency_tracking" != xno; then
 +  am_depcomp="$ac_aux_dir/depcomp"
 +  AMDEPBACKSLASH='\'
 +  am__nodep='_no'
 +fi
 + if test "x$enable_dependency_tracking" != xno; then
 +  AMDEP_TRUE=
 +  AMDEP_FALSE='#'
 +else
 +  AMDEP_TRUE='#'
 +  AMDEP_FALSE=
 +fi
 +
 +
 +ac_ext=c
 +ac_cpp='$CPP $CPPFLAGS'
 +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 +ac_compiler_gnu=$ac_cv_c_compiler_gnu
 +if test -n "$ac_tool_prefix"; then
 +  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 +set dummy ${ac_tool_prefix}gcc; ac_word=$2
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
 +if ${ac_cv_prog_CC+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  if test -n "$CC"; then
 +  ac_cv_prog_CC="$CC" # Let the user override the test.
 +else
 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +for as_dir in $PATH
 +do
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +    for ac_exec_ext in '' $ac_executable_extensions; do
 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 +    ac_cv_prog_CC="${ac_tool_prefix}gcc"
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
 +  fi
 +done
 +  done
 +IFS=$as_save_IFS
 +
 +fi
 +fi
 +CC=$ac_cv_prog_CC
 +if test -n "$CC"; then
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
 +$as_echo "$CC" >&6; }
 +else
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
 +fi
 +
 +
 +fi
 +if test -z "$ac_cv_prog_CC"; then
 +  ac_ct_CC=$CC
 +  # Extract the first word of "gcc", so it can be a program name with args.
 +set dummy gcc; ac_word=$2
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
 +if ${ac_cv_prog_ac_ct_CC+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  if test -n "$ac_ct_CC"; then
 +  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
 +else
 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +for as_dir in $PATH
 +do
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +    for ac_exec_ext in '' $ac_executable_extensions; do
 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 +    ac_cv_prog_ac_ct_CC="gcc"
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
 +  fi
 +done
 +  done
 +IFS=$as_save_IFS
 +
 +fi
 +fi
 +ac_ct_CC=$ac_cv_prog_ac_ct_CC
 +if test -n "$ac_ct_CC"; then
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
 +$as_echo "$ac_ct_CC" >&6; }
 +else
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
 +fi
 +
 +  if test "x$ac_ct_CC" = x; then
 +    CC=""
 +  else
 +    case $cross_compiling:$ac_tool_warned in
 +yes:)
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 +ac_tool_warned=yes ;;
 +esac
 +    CC=$ac_ct_CC
 +  fi
 +else
 +  CC="$ac_cv_prog_CC"
 +fi
 +
 +if test -z "$CC"; then
 +          if test -n "$ac_tool_prefix"; then
 +    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 +set dummy ${ac_tool_prefix}cc; ac_word=$2
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
 +if ${ac_cv_prog_CC+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  if test -n "$CC"; then
 +  ac_cv_prog_CC="$CC" # Let the user override the test.
 +else
 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +for as_dir in $PATH
 +do
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +    for ac_exec_ext in '' $ac_executable_extensions; do
 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 +    ac_cv_prog_CC="${ac_tool_prefix}cc"
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
 +  fi
 +done
 +  done
 +IFS=$as_save_IFS
 +
 +fi
 +fi
 +CC=$ac_cv_prog_CC
 +if test -n "$CC"; then
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
 +$as_echo "$CC" >&6; }
 +else
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
 +fi
 +
 +
 +  fi
 +fi
 +if test -z "$CC"; then
 +  # Extract the first word of "cc", so it can be a program name with args.
 +set dummy cc; ac_word=$2
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
 +if ${ac_cv_prog_CC+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  if test -n "$CC"; then
 +  ac_cv_prog_CC="$CC" # Let the user override the test.
 +else
 +  ac_prog_rejected=no
 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +for as_dir in $PATH
 +do
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +    for ac_exec_ext in '' $ac_executable_extensions; do
 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 +    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
 +       ac_prog_rejected=yes
 +       continue
 +     fi
 +    ac_cv_prog_CC="cc"
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
 +  fi
 +done
 +  done
 +IFS=$as_save_IFS
 +
 +if test $ac_prog_rejected = yes; then
 +  # We found a bogon in the path, so make sure we never use it.
 +  set dummy $ac_cv_prog_CC
 +  shift
 +  if test $# != 0; then
 +    # We chose a different compiler from the bogus one.
 +    # However, it has the same basename, so the bogon will be chosen
 +    # first if we set CC to just the basename; use the full file name.
 +    shift
 +    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
 +  fi
 +fi
 +fi
 +fi
 +CC=$ac_cv_prog_CC
 +if test -n "$CC"; then
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
 +$as_echo "$CC" >&6; }
 +else
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
 +fi
 +
 +
 +fi
 +if test -z "$CC"; then
 +  if test -n "$ac_tool_prefix"; then
 +  for ac_prog in cl.exe
 +  do
 +    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 +set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
 +if ${ac_cv_prog_CC+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  if test -n "$CC"; then
 +  ac_cv_prog_CC="$CC" # Let the user override the test.
 +else
 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +for as_dir in $PATH
 +do
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +    for ac_exec_ext in '' $ac_executable_extensions; do
 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 +    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
 +  fi
 +done
 +  done
 +IFS=$as_save_IFS
 +
 +fi
 +fi
 +CC=$ac_cv_prog_CC
 +if test -n "$CC"; then
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
 +$as_echo "$CC" >&6; }
 +else
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
 +fi
 +
 +
 +    test -n "$CC" && break
 +  done
 +fi
 +if test -z "$CC"; then
 +  ac_ct_CC=$CC
 +  for ac_prog in cl.exe
 +do
 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
 +set dummy $ac_prog; ac_word=$2
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
 +if ${ac_cv_prog_ac_ct_CC+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  if test -n "$ac_ct_CC"; then
 +  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
 +else
 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +for as_dir in $PATH
 +do
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +    for ac_exec_ext in '' $ac_executable_extensions; do
 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 +    ac_cv_prog_ac_ct_CC="$ac_prog"
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
 +  fi
 +done
 +  done
 +IFS=$as_save_IFS
 +
 +fi
 +fi
 +ac_ct_CC=$ac_cv_prog_ac_ct_CC
 +if test -n "$ac_ct_CC"; then
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
 +$as_echo "$ac_ct_CC" >&6; }
 +else
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
 +fi
 +
 +
 +  test -n "$ac_ct_CC" && break
 +done
 +
 +  if test "x$ac_ct_CC" = x; then
 +    CC=""
 +  else
 +    case $cross_compiling:$ac_tool_warned in
 +yes:)
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 +ac_tool_warned=yes ;;
 +esac
 +    CC=$ac_ct_CC
 +  fi
 +fi
 +
 +fi
 +
 +
 +test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 +as_fn_error $? "no acceptable C compiler found in \$PATH
 +See \`config.log' for more details" "$LINENO" 5; }
 +
 +# Provide some information about the compiler.
 +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
 +set X $ac_compile
 +ac_compiler=$2
 +for ac_option in --version -v -V -qversion; do
 +  { { ac_try="$ac_compiler $ac_option >&5"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
 +esac
 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
 +$as_echo "$ac_try_echo"; } >&5
 +  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
 +  ac_status=$?
 +  if test -s conftest.err; then
 +    sed '10a\
 +... rest of stderr output deleted ...
 +         10q' conftest.err >conftest.er1
 +    cat conftest.er1 >&5
 +  fi
 +  rm -f conftest.er1 conftest.err
 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 +  test $ac_status = 0; }
 +done
 +
 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +
 +int
 +main ()
 +{
 +
 +  ;
 +  return 0;
 +}
 +_ACEOF
 +ac_clean_files_save=$ac_clean_files
 +ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
 +# Try to create an executable without -o first, disregard a.out.
 +# It will help us diagnose broken compilers, and finding out an intuition
 +# of exeext.
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
 +$as_echo_n "checking whether the C compiler works... " >&6; }
 +ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
 +
 +# The possible output files:
 +ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
 +
 +ac_rmfiles=
 +for ac_file in $ac_files
 +do
 +  case $ac_file in
 +    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
 +    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
 +  esac
 +done
 +rm -f $ac_rmfiles
 +
 +if { { ac_try="$ac_link_default"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
 +esac
 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
 +$as_echo "$ac_try_echo"; } >&5
 +  (eval "$ac_link_default") 2>&5
 +  ac_status=$?
 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 +  test $ac_status = 0; }; then :
 +  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
 +# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
 +# in a Makefile.  We should not override ac_cv_exeext if it was cached,
 +# so that the user can short-circuit this test for compilers unknown to
 +# Autoconf.
 +for ac_file in $ac_files ''
 +do
 +  test -f "$ac_file" || continue
 +  case $ac_file in
 +    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
 +	;;
 +    [ab].out )
 +	# We found the default executable, but exeext='' is most
 +	# certainly right.
 +	break;;
 +    *.* )
 +	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
 +	then :; else
 +	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
 +	fi
 +	# We set ac_cv_exeext here because the later test for it is not
 +	# safe: cross compilers may not add the suffix if given an `-o'
 +	# argument, so we may need to know it at that point already.
 +	# Even if this section looks crufty: it has the advantage of
 +	# actually working.
 +	break;;
 +    * )
 +	break;;
 +  esac
 +done
 +test "$ac_cv_exeext" = no && ac_cv_exeext=
 +
 +else
 +  ac_file=''
 +fi
 +if test -z "$ac_file"; then :
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
 +$as_echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 +as_fn_error 77 "C compiler cannot create executables
 +See \`config.log' for more details" "$LINENO" 5; }
 +else
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 +$as_echo "yes" >&6; }
 +fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
 +$as_echo_n "checking for C compiler default output file name... " >&6; }
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
 +$as_echo "$ac_file" >&6; }
 +ac_exeext=$ac_cv_exeext
 +
 +rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
 +ac_clean_files=$ac_clean_files_save
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
 +$as_echo_n "checking for suffix of executables... " >&6; }
 +if { { ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
 +esac
 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
 +$as_echo "$ac_try_echo"; } >&5
 +  (eval "$ac_link") 2>&5
 +  ac_status=$?
 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 +  test $ac_status = 0; }; then :
 +  # If both `conftest.exe' and `conftest' are `present' (well, observable)
 +# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
 +# work properly (i.e., refer to `conftest.exe'), while it won't with
 +# `rm'.
 +for ac_file in conftest.exe conftest conftest.*; do
 +  test -f "$ac_file" || continue
 +  case $ac_file in
 +    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
 +    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
 +	  break;;
 +    * ) break;;
 +  esac
 +done
 +else
 +  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 +as_fn_error $? "cannot compute suffix of executables: cannot compile and link
 +See \`config.log' for more details" "$LINENO" 5; }
 +fi
 +rm -f conftest conftest$ac_cv_exeext
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
 +$as_echo "$ac_cv_exeext" >&6; }
 +
 +rm -f conftest.$ac_ext
 +EXEEXT=$ac_cv_exeext
 +ac_exeext=$EXEEXT
 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +#include <stdio.h>
 +int
 +main ()
 +{
 +FILE *f = fopen ("conftest.out", "w");
 + return ferror (f) || fclose (f) != 0;
 +
 +  ;
 +  return 0;
 +}
 +_ACEOF
 +ac_clean_files="$ac_clean_files conftest.out"
 +# Check that the compiler produces executables we can run.  If not, either
 +# the compiler is broken, or we cross compile.
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
 +$as_echo_n "checking whether we are cross compiling... " >&6; }
 +if test "$cross_compiling" != yes; then
 +  { { ac_try="$ac_link"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
 +esac
 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
 +$as_echo "$ac_try_echo"; } >&5
 +  (eval "$ac_link") 2>&5
 +  ac_status=$?
 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 +  test $ac_status = 0; }
 +  if { ac_try='./conftest$ac_cv_exeext'
 +  { { case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
 +esac
 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
 +$as_echo "$ac_try_echo"; } >&5
 +  (eval "$ac_try") 2>&5
 +  ac_status=$?
 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 +  test $ac_status = 0; }; }; then
 +    cross_compiling=no
 +  else
 +    if test "$cross_compiling" = maybe; then
 +	cross_compiling=yes
 +    else
 +	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 +as_fn_error $? "cannot run C compiled programs.
 +If you meant to cross compile, use \`--host'.
 +See \`config.log' for more details" "$LINENO" 5; }
 +    fi
 +  fi
 +fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
 +$as_echo "$cross_compiling" >&6; }
 +
 +rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
 +ac_clean_files=$ac_clean_files_save
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
 +$as_echo_n "checking for suffix of object files... " >&6; }
 +if ${ac_cv_objext+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +
 +int
 +main ()
 +{
 +
 +  ;
 +  return 0;
 +}
 +_ACEOF
 +rm -f conftest.o conftest.obj
 +if { { ac_try="$ac_compile"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
 +esac
 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
 +$as_echo "$ac_try_echo"; } >&5
 +  (eval "$ac_compile") 2>&5
 +  ac_status=$?
 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 +  test $ac_status = 0; }; then :
 +  for ac_file in conftest.o conftest.obj conftest.*; do
 +  test -f "$ac_file" || continue;
 +  case $ac_file in
 +    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
 +    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
 +       break;;
 +  esac
 +done
 +else
 +  $as_echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 +as_fn_error $? "cannot compute suffix of object files: cannot compile
 +See \`config.log' for more details" "$LINENO" 5; }
 +fi
 +rm -f conftest.$ac_cv_objext conftest.$ac_ext
 +fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
 +$as_echo "$ac_cv_objext" >&6; }
 +OBJEXT=$ac_cv_objext
 +ac_objext=$OBJEXT
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
 +$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
 +if ${ac_cv_c_compiler_gnu+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +
 +int
 +main ()
 +{
 +#ifndef __GNUC__
 +       choke me
 +#endif
 +
 +  ;
 +  return 0;
 +}
 +_ACEOF
 +if ac_fn_c_try_compile "$LINENO"; then :
 +  ac_compiler_gnu=yes
 +else
 +  ac_compiler_gnu=no
 +fi
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +ac_cv_c_compiler_gnu=$ac_compiler_gnu
 +
 +fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
 +$as_echo "$ac_cv_c_compiler_gnu" >&6; }
 +if test $ac_compiler_gnu = yes; then
 +  GCC=yes
 +else
 +  GCC=
 +fi
 +ac_test_CFLAGS=${CFLAGS+set}
 +ac_save_CFLAGS=$CFLAGS
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
 +$as_echo_n "checking whether $CC accepts -g... " >&6; }
 +if ${ac_cv_prog_cc_g+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  ac_save_c_werror_flag=$ac_c_werror_flag
 +   ac_c_werror_flag=yes
 +   ac_cv_prog_cc_g=no
 +   CFLAGS="-g"
 +   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +
 +int
 +main ()
 +{
 +
 +  ;
 +  return 0;
 +}
 +_ACEOF
 +if ac_fn_c_try_compile "$LINENO"; then :
 +  ac_cv_prog_cc_g=yes
 +else
 +  CFLAGS=""
 +      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +
 +int
 +main ()
 +{
 +
 +  ;
 +  return 0;
 +}
 +_ACEOF
 +if ac_fn_c_try_compile "$LINENO"; then :
 +
 +else
 +  ac_c_werror_flag=$ac_save_c_werror_flag
 +	 CFLAGS="-g"
 +	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +
 +int
 +main ()
 +{
 +
 +  ;
 +  return 0;
 +}
 +_ACEOF
 +if ac_fn_c_try_compile "$LINENO"; then :
 +  ac_cv_prog_cc_g=yes
 +fi
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +fi
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +fi
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +   ac_c_werror_flag=$ac_save_c_werror_flag
 +fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
 +$as_echo "$ac_cv_prog_cc_g" >&6; }
 +if test "$ac_test_CFLAGS" = set; then
 +  CFLAGS=$ac_save_CFLAGS
 +elif test $ac_cv_prog_cc_g = yes; then
 +  if test "$GCC" = yes; then
 +    CFLAGS="-g -O2"
 +  else
 +    CFLAGS="-g"
 +  fi
 +else
 +  if test "$GCC" = yes; then
 +    CFLAGS="-O2"
 +  else
 +    CFLAGS=
 +  fi
 +fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
 +$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
 +if ${ac_cv_prog_cc_c89+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  ac_cv_prog_cc_c89=no
 +ac_save_CC=$CC
 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +#include <stdarg.h>
 +#include <stdio.h>
 +struct stat;
 +/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
 +struct buf { int x; };
 +FILE * (*rcsopen) (struct buf *, struct stat *, int);
 +static char *e (p, i)
 +     char **p;
 +     int i;
 +{
 +  return p[i];
 +}
 +static char *f (char * (*g) (char **, int), char **p, ...)
 +{
 +  char *s;
 +  va_list v;
 +  va_start (v,p);
 +  s = g (p, va_arg (v,int));
 +  va_end (v);
 +  return s;
 +}
 +
 +/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
 +   function prototypes and stuff, but not '\xHH' hex character constants.
 +   These don't provoke an error unfortunately, instead are silently treated
 +   as 'x'.  The following induces an error, until -std is added to get
 +   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
 +   array size at least.  It's necessary to write '\x00'==0 to get something
 +   that's true only with -std.  */
 +int osf4_cc_array ['\x00' == 0 ? 1 : -1];
 +
 +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
 +   inside strings and character constants.  */
 +#define FOO(x) 'x'
 +int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
 +
 +int test (int i, double x);
 +struct s1 {int (*f) (int a);};
 +struct s2 {int (*f) (double a);};
 +int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
 +int argc;
 +char **argv;
 +int
 +main ()
 +{
 +return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
 +  ;
 +  return 0;
 +}
 +_ACEOF
 +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
 +	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
 +do
 +  CC="$ac_save_CC $ac_arg"
 +  if ac_fn_c_try_compile "$LINENO"; then :
 +  ac_cv_prog_cc_c89=$ac_arg
 +fi
 +rm -f core conftest.err conftest.$ac_objext
 +  test "x$ac_cv_prog_cc_c89" != "xno" && break
 +done
 +rm -f conftest.$ac_ext
 +CC=$ac_save_CC
 +
 +fi
 +# AC_CACHE_VAL
 +case "x$ac_cv_prog_cc_c89" in
 +  x)
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
 +$as_echo "none needed" >&6; } ;;
 +  xno)
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
 +$as_echo "unsupported" >&6; } ;;
 +  *)
 +    CC="$CC $ac_cv_prog_cc_c89"
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
 +$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
 +esac
 +if test "x$ac_cv_prog_cc_c89" != xno; then :
 +
 +fi
 +
 +ac_ext=c
 +ac_cpp='$CPP $CPPFLAGS'
 +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 +ac_compiler_gnu=$ac_cv_c_compiler_gnu
 +
- 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
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
- $as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
- if ${am_cv_prog_cc_c_o+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- int
- main ()
- {
- 
-   ;
-   return 0;
- }
- _ACEOF
-   # Make sure it works both with $CC and with simple cc.
-   # Following AC_PROG_CC_C_O, we do the test twice because some
-   # compilers refuse to overwrite an existing .o file with -o,
-   # though they will create one.
-   am_cv_prog_cc_c_o=yes
-   for am_i in 1 2; do
-     if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
-    ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
-    ac_status=$?
-    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-    (exit $ac_status); } \
-          && test -f conftest2.$ac_objext; then
-       : OK
-     else
-       am_cv_prog_cc_c_o=no
-       break
-     fi
-   done
-   rm -f core conftest*
-   unset am_i
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
- $as_echo "$am_cv_prog_cc_c_o" >&6; }
- if test "$am_cv_prog_cc_c_o" != yes; then
-    # Losing compiler, so override with the script.
-    # FIXME: It is wrong to rewrite CC.
-    # But if we don't then we get into trouble of one sort or another.
-    # A longer-term fix would be to have automake use am__CC in this case,
-    # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-    CC="$am_aux_dir/compile $CC"
- fi
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
- 
 +depcc="$CC"   am_compiler_list=
 +
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
 +$as_echo_n "checking dependency style of $depcc... " >&6; }
 +if ${am_cv_CC_dependencies_compiler_type+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
 +  # We make a subdir and do the tests there.  Otherwise we can end up
 +  # making bogus files that we don't know about and never remove.  For
 +  # instance it was reported that on HP-UX the gcc test will end up
 +  # making a dummy file named 'D' -- because '-MD' means "put the output
 +  # in D".
 +  rm -rf conftest.dir
 +  mkdir conftest.dir
 +  # Copy depcomp to subdir because otherwise we won't find it if we're
 +  # using a relative directory.
 +  cp "$am_depcomp" conftest.dir
 +  cd conftest.dir
 +  # We will build objects and dependencies in a subdirectory because
 +  # it helps to detect inapplicable dependency modes.  For instance
 +  # both Tru64's cc and ICC support -MD to output dependencies as a
 +  # side effect of compilation, but ICC will put the dependencies in
 +  # the current directory while Tru64 will put them in the object
 +  # directory.
 +  mkdir sub
 +
 +  am_cv_CC_dependencies_compiler_type=none
 +  if test "$am_compiler_list" = ""; then
 +     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
 +  fi
 +  am__universal=false
 +  case " $depcc " in #(
 +     *\ -arch\ *\ -arch\ *) am__universal=true ;;
 +     esac
 +
 +  for depmode in $am_compiler_list; do
 +    # Setup a source with many dependencies, because some compilers
 +    # like to wrap large dependency lists on column 80 (with \), and
 +    # we should not choose a depcomp mode which is confused by this.
 +    #
 +    # We need to recreate these files for each test, as the compiler may
 +    # overwrite some of them when testing with obscure command lines.
 +    # This happens at least with the AIX C compiler.
 +    : > sub/conftest.c
 +    for i in 1 2 3 4 5 6; do
 +      echo '#include "conftst'$i'.h"' >> sub/conftest.c
 +      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
 +      # Solaris 10 /bin/sh.
 +      echo '/* dummy */' > sub/conftst$i.h
 +    done
 +    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 +
 +    # We check with '-c' and '-o' for the sake of the "dashmstdout"
 +    # mode.  It turns out that the SunPro C++ compiler does not properly
 +    # handle '-M -o', and we need to detect this.  Also, some Intel
 +    # versions had trouble with output in subdirs.
 +    am__obj=sub/conftest.${OBJEXT-o}
 +    am__minus_obj="-o $am__obj"
 +    case $depmode in
 +    gcc)
 +      # This depmode causes a compiler race in universal mode.
 +      test "$am__universal" = false || continue
 +      ;;
 +    nosideeffect)
 +      # After this tag, mechanisms are not by side-effect, so they'll
 +      # only be used when explicitly requested.
 +      if test "x$enable_dependency_tracking" = xyes; then
 +	continue
 +      else
 +	break
 +      fi
 +      ;;
 +    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
 +      # This compiler won't grok '-c -o', but also, the minuso test has
 +      # not run yet.  These depmodes are late enough in the game, and
 +      # so weak that their functioning should not be impacted.
 +      am__obj=conftest.${OBJEXT-o}
 +      am__minus_obj=
 +      ;;
 +    none) break ;;
 +    esac
 +    if depmode=$depmode \
 +       source=sub/conftest.c object=$am__obj \
 +       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
 +       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
 +         >/dev/null 2>conftest.err &&
 +       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
 +       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
 +       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
 +       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
 +      # icc doesn't choke on unknown options, it will just issue warnings
 +      # or remarks (even with -Werror).  So we grep stderr for any message
 +      # that says an option was ignored or not supported.
 +      # When given -MP, icc 7.0 and 7.1 complain thusly:
 +      #   icc: Command line warning: ignoring option '-M'; no argument required
 +      # The diagnosis changed in icc 8.0:
 +      #   icc: Command line remark: option '-MP' not supported
 +      if (grep 'ignoring option' conftest.err ||
 +          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
 +        am_cv_CC_dependencies_compiler_type=$depmode
 +        break
 +      fi
 +    fi
 +  done
 +
 +  cd ..
 +  rm -rf conftest.dir
 +else
 +  am_cv_CC_dependencies_compiler_type=none
 +fi
 +
 +fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
 +$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
 +CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
 +
 + if
 +  test "x$enable_dependency_tracking" != xno \
 +  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
 +  am__fastdepCC_TRUE=
 +  am__fastdepCC_FALSE='#'
 +else
 +  am__fastdepCC_TRUE='#'
 +  am__fastdepCC_FALSE=
 +fi
 +
 +
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
 +$as_echo_n "checking for a sed that does not truncate output... " >&6; }
 +if ${ac_cv_path_SED+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +            ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
 +     for ac_i in 1 2 3 4 5 6 7; do
 +       ac_script="$ac_script$as_nl$ac_script"
 +     done
 +     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
 +     { ac_script=; unset ac_script;}
 +     if test -z "$SED"; then
 +  ac_path_SED_found=false
 +  # Loop through the user's path and test for each of PROGNAME-LIST
 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +for as_dir in $PATH
 +do
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +    for ac_prog in sed gsed; do
 +    for ac_exec_ext in '' $ac_executable_extensions; do
 +      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
 +      as_fn_executable_p "$ac_path_SED" || continue
 +# Check for GNU ac_path_SED and select it if it is found.
 +  # Check for GNU $ac_path_SED
 +case `"$ac_path_SED" --version 2>&1` in
 +*GNU*)
 +  ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
 +*)
 +  ac_count=0
 +  $as_echo_n 0123456789 >"conftest.in"
 +  while :
 +  do
 +    cat "conftest.in" "conftest.in" >"conftest.tmp"
 +    mv "conftest.tmp" "conftest.in"
 +    cp "conftest.in" "conftest.nl"
 +    $as_echo '' >> "conftest.nl"
 +    "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
 +    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
 +    as_fn_arith $ac_count + 1 && ac_count=$as_val
 +    if test $ac_count -gt ${ac_path_SED_max-0}; then
 +      # Best one so far, save it but keep looking for a better one
 +      ac_cv_path_SED="$ac_path_SED"
 +      ac_path_SED_max=$ac_count
 +    fi
 +    # 10*(2^10) chars as input seems more than enough
 +    test $ac_count -gt 10 && break
 +  done
 +  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 +esac
 +
 +      $ac_path_SED_found && break 3
 +    done
 +  done
 +  done
 +IFS=$as_save_IFS
 +  if test -z "$ac_cv_path_SED"; then
 +    as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
 +  fi
 +else
 +  ac_cv_path_SED=$SED
 +fi
 +
 +fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
 +$as_echo "$ac_cv_path_SED" >&6; }
 + SED="$ac_cv_path_SED"
 +  rm -f conftest.sed
 +
 +test -z "$SED" && SED=sed
 +Xsed="$SED -e 1s/^X//"
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
 +$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
 +if ${ac_cv_path_GREP+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  if test -z "$GREP"; then
 +  ac_path_GREP_found=false
 +  # Loop through the user's path and test for each of PROGNAME-LIST
 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 +do
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +    for ac_prog in grep ggrep; do
 +    for ac_exec_ext in '' $ac_executable_extensions; do
 +      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
 +      as_fn_executable_p "$ac_path_GREP" || continue
 +# Check for GNU ac_path_GREP and select it if it is found.
 +  # Check for GNU $ac_path_GREP
 +case `"$ac_path_GREP" --version 2>&1` in
 +*GNU*)
 +  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
 +*)
 +  ac_count=0
 +  $as_echo_n 0123456789 >"conftest.in"
 +  while :
 +  do
 +    cat "conftest.in" "conftest.in" >"conftest.tmp"
 +    mv "conftest.tmp" "conftest.in"
 +    cp "conftest.in" "conftest.nl"
 +    $as_echo 'GREP' >> "conftest.nl"
 +    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
 +    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
 +    as_fn_arith $ac_count + 1 && ac_count=$as_val
 +    if test $ac_count -gt ${ac_path_GREP_max-0}; then
 +      # Best one so far, save it but keep looking for a better one
 +      ac_cv_path_GREP="$ac_path_GREP"
 +      ac_path_GREP_max=$ac_count
 +    fi
 +    # 10*(2^10) chars as input seems more than enough
 +    test $ac_count -gt 10 && break
 +  done
 +  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 +esac
 +
 +      $ac_path_GREP_found && break 3
 +    done
 +  done
 +  done
 +IFS=$as_save_IFS
 +  if test -z "$ac_cv_path_GREP"; then
 +    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
 +  fi
 +else
 +  ac_cv_path_GREP=$GREP
 +fi
 +
 +fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
 +$as_echo "$ac_cv_path_GREP" >&6; }
 + GREP="$ac_cv_path_GREP"
 +
 +
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
 +$as_echo_n "checking for egrep... " >&6; }
 +if ${ac_cv_path_EGREP+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
 +   then ac_cv_path_EGREP="$GREP -E"
 +   else
 +     if test -z "$EGREP"; then
 +  ac_path_EGREP_found=false
 +  # Loop through the user's path and test for each of PROGNAME-LIST
 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 +do
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +    for ac_prog in egrep; do
 +    for ac_exec_ext in '' $ac_executable_extensions; do
 +      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
 +      as_fn_executable_p "$ac_path_EGREP" || continue
 +# Check for GNU ac_path_EGREP and select it if it is found.
 +  # Check for GNU $ac_path_EGREP
 +case `"$ac_path_EGREP" --version 2>&1` in
 +*GNU*)
 +  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
 +*)
 +  ac_count=0
 +  $as_echo_n 0123456789 >"conftest.in"
 +  while :
 +  do
 +    cat "conftest.in" "conftest.in" >"conftest.tmp"
 +    mv "conftest.tmp" "conftest.in"
 +    cp "conftest.in" "conftest.nl"
 +    $as_echo 'EGREP' >> "conftest.nl"
 +    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
 +    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
 +    as_fn_arith $ac_count + 1 && ac_count=$as_val
 +    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
 +      # Best one so far, save it but keep looking for a better one
 +      ac_cv_path_EGREP="$ac_path_EGREP"
 +      ac_path_EGREP_max=$ac_count
 +    fi
 +    # 10*(2^10) chars as input seems more than enough
 +    test $ac_count -gt 10 && break
 +  done
 +  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 +esac
 +
 +      $ac_path_EGREP_found && break 3
 +    done
 +  done
 +  done
 +IFS=$as_save_IFS
 +  if test -z "$ac_cv_path_EGREP"; then
 +    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
 +  fi
 +else
 +  ac_cv_path_EGREP=$EGREP
 +fi
 +
 +   fi
 +fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
 +$as_echo "$ac_cv_path_EGREP" >&6; }
 + EGREP="$ac_cv_path_EGREP"
 +
 +
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
 +$as_echo_n "checking for fgrep... " >&6; }
 +if ${ac_cv_path_FGREP+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
 +   then ac_cv_path_FGREP="$GREP -F"
 +   else
 +     if test -z "$FGREP"; then
 +  ac_path_FGREP_found=false
 +  # Loop through the user's path and test for each of PROGNAME-LIST
 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 +do
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +    for ac_prog in fgrep; do
 +    for ac_exec_ext in '' $ac_executable_extensions; do
 +      ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
 +      as_fn_executable_p "$ac_path_FGREP" || continue
 +# Check for GNU ac_path_FGREP and select it if it is found.
 +  # Check for GNU $ac_path_FGREP
 +case `"$ac_path_FGREP" --version 2>&1` in
 +*GNU*)
 +  ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;;
 +*)
 +  ac_count=0
 +  $as_echo_n 0123456789 >"conftest.in"
 +  while :
 +  do
 +    cat "conftest.in" "conftest.in" >"conftest.tmp"
 +    mv "conftest.tmp" "conftest.in"
 +    cp "conftest.in" "conftest.nl"
 +    $as_echo 'FGREP' >> "conftest.nl"
 +    "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
 +    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
 +    as_fn_arith $ac_count + 1 && ac_count=$as_val
 +    if test $ac_count -gt ${ac_path_FGREP_max-0}; then
 +      # Best one so far, save it but keep looking for a better one
 +      ac_cv_path_FGREP="$ac_path_FGREP"
 +      ac_path_FGREP_max=$ac_count
 +    fi
 +    # 10*(2^10) chars as input seems more than enough
 +    test $ac_count -gt 10 && break
 +  done
 +  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 +esac
 +
 +      $ac_path_FGREP_found && break 3
 +    done
 +  done
 +  done
 +IFS=$as_save_IFS
 +  if test -z "$ac_cv_path_FGREP"; then
 +    as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
 +  fi
 +else
 +  ac_cv_path_FGREP=$FGREP
 +fi
 +
 +   fi
 +fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
 +$as_echo "$ac_cv_path_FGREP" >&6; }
 + FGREP="$ac_cv_path_FGREP"
 +
 +
 +test -z "$GREP" && GREP=grep
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +# Check whether --with-gnu-ld was given.
 +if test "${with_gnu_ld+set}" = set; then :
-   withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes
++  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
 +else
 +  with_gnu_ld=no
 +fi
 +
 +ac_prog=ld
- if test yes = "$GCC"; then
++if test "$GCC" = yes; then
 +  # Check if gcc -print-prog-name=ld gives a path.
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
 +$as_echo_n "checking for ld used by $CC... " >&6; }
 +  case $host in
 +  *-*-mingw*)
-     # gcc leaves a trailing carriage return, which upsets mingw
++    # gcc leaves a trailing carriage return which upsets mingw
 +    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
 +  *)
 +    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
 +  esac
 +  case $ac_prog in
 +    # Accept absolute paths.
 +    [\\/]* | ?:[\\/]*)
 +      re_direlt='/[^/][^/]*/\.\./'
 +      # Canonicalize the pathname of ld
 +      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
 +      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
 +	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
 +      done
-       test -z "$LD" && LD=$ac_prog
++      test -z "$LD" && LD="$ac_prog"
 +      ;;
 +  "")
 +    # If it fails, then pretend we aren't using GCC.
 +    ac_prog=ld
 +    ;;
 +  *)
 +    # If it is relative, then search for the first ld in PATH.
 +    with_gnu_ld=unknown
 +    ;;
 +  esac
- elif test yes = "$with_gnu_ld"; then
++elif test "$with_gnu_ld" = yes; then
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
 +$as_echo_n "checking for GNU ld... " >&6; }
 +else
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
 +$as_echo_n "checking for non-GNU ld... " >&6; }
 +fi
 +if ${lt_cv_path_LD+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  if test -z "$LD"; then
-   lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
++  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
 +  for ac_dir in $PATH; do
-     IFS=$lt_save_ifs
++    IFS="$lt_save_ifs"
 +    test -z "$ac_dir" && ac_dir=.
 +    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-       lt_cv_path_LD=$ac_dir/$ac_prog
++      lt_cv_path_LD="$ac_dir/$ac_prog"
 +      # Check to see if the program is GNU ld.  I'd rather use --version,
 +      # but apparently some variants of GNU ld only accept -v.
 +      # Break only if it was the GNU/non-GNU ld that we prefer.
 +      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
 +      *GNU* | *'with BFD'*)
- 	test no != "$with_gnu_ld" && break
++	test "$with_gnu_ld" != no && break
 +	;;
 +      *)
- 	test yes != "$with_gnu_ld" && break
++	test "$with_gnu_ld" != yes && break
 +	;;
 +      esac
 +    fi
 +  done
-   IFS=$lt_save_ifs
++  IFS="$lt_save_ifs"
 +else
-   lt_cv_path_LD=$LD # Let the user override the test with a path.
++  lt_cv_path_LD="$LD" # Let the user override the test with a path.
 +fi
 +fi
 +
- LD=$lt_cv_path_LD
++LD="$lt_cv_path_LD"
 +if test -n "$LD"; then
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
 +$as_echo "$LD" >&6; }
 +else
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
 +fi
 +test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
 +$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
 +if ${lt_cv_prog_gnu_ld+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  # I'd rather use --version here, but apparently some GNU lds only accept -v.
 +case `$LD -v 2>&1 </dev/null` in
 +*GNU* | *'with BFD'*)
 +  lt_cv_prog_gnu_ld=yes
 +  ;;
 +*)
 +  lt_cv_prog_gnu_ld=no
 +  ;;
 +esac
 +fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
 +$as_echo "$lt_cv_prog_gnu_ld" >&6; }
 +with_gnu_ld=$lt_cv_prog_gnu_ld
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
 +$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
 +if ${lt_cv_path_NM+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  if test -n "$NM"; then
 +  # Let the user override the test.
-   lt_cv_path_NM=$NM
++  lt_cv_path_NM="$NM"
 +else
-   lt_nm_to_check=${ac_tool_prefix}nm
++  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
++    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
 +    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
-       IFS=$lt_save_ifs
++      IFS="$lt_save_ifs"
 +      test -z "$ac_dir" && ac_dir=.
-       tmp_nm=$ac_dir/$lt_tmp_nm
-       if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then
++      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:
++	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
 +	#   nm: unknown option "B" ignored
 +	# Tru64's nm complains that /dev/null is an invalid object file
- 	# MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty
- 	case $build_os in
- 	mingw*) lt_bad_file=conftest.nm/nofile ;;
- 	*) lt_bad_file=/dev/null ;;
- 	esac
- 	case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in
- 	*$lt_bad_file* | *'Invalid file or object type'*)
++	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
++	*/dev/null* | *'Invalid file or object type'*)
 +	  lt_cv_path_NM="$tmp_nm -B"
- 	  break 2
++	  break
 +	  ;;
 +	*)
 +	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
 +	  */dev/null*)
 +	    lt_cv_path_NM="$tmp_nm -p"
- 	    break 2
++	    break
 +	    ;;
 +	  *)
 +	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
 +	    continue # so that we can try to find one that supports BSD flags
 +	    ;;
 +	  esac
 +	  ;;
 +	esac
 +      fi
 +    done
-     IFS=$lt_save_ifs
++    IFS="$lt_save_ifs"
 +  done
 +  : ${lt_cv_path_NM=no}
 +fi
 +fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
 +$as_echo "$lt_cv_path_NM" >&6; }
- if test no != "$lt_cv_path_NM"; then
-   NM=$lt_cv_path_NM
++if test "$lt_cv_path_NM" != "no"; then
++  NM="$lt_cv_path_NM"
 +else
 +  # Didn't find any BSD compatible name lister, look for dumpbin.
 +  if test -n "$DUMPBIN"; then :
 +    # Let the user override the test.
 +  else
 +    if test -n "$ac_tool_prefix"; then
 +  for ac_prog in dumpbin "link -dump"
 +  do
 +    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 +set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
 +if ${ac_cv_prog_DUMPBIN+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  if test -n "$DUMPBIN"; then
 +  ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test.
 +else
 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +for as_dir in $PATH
 +do
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +    for ac_exec_ext in '' $ac_executable_extensions; do
 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 +    ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
 +  fi
 +done
 +  done
 +IFS=$as_save_IFS
 +
 +fi
 +fi
 +DUMPBIN=$ac_cv_prog_DUMPBIN
 +if test -n "$DUMPBIN"; then
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
 +$as_echo "$DUMPBIN" >&6; }
 +else
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
 +fi
 +
 +
 +    test -n "$DUMPBIN" && break
 +  done
 +fi
 +if test -z "$DUMPBIN"; then
 +  ac_ct_DUMPBIN=$DUMPBIN
 +  for ac_prog in dumpbin "link -dump"
 +do
 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
 +set dummy $ac_prog; ac_word=$2
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
 +if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  if test -n "$ac_ct_DUMPBIN"; then
 +  ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test.
 +else
 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +for as_dir in $PATH
 +do
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +    for ac_exec_ext in '' $ac_executable_extensions; do
 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 +    ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
 +  fi
 +done
 +  done
 +IFS=$as_save_IFS
 +
 +fi
 +fi
 +ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
 +if test -n "$ac_ct_DUMPBIN"; then
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
 +$as_echo "$ac_ct_DUMPBIN" >&6; }
 +else
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
 +fi
 +
 +
 +  test -n "$ac_ct_DUMPBIN" && break
 +done
 +
 +  if test "x$ac_ct_DUMPBIN" = x; then
 +    DUMPBIN=":"
 +  else
 +    case $cross_compiling:$ac_tool_warned in
 +yes:)
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 +ac_tool_warned=yes ;;
 +esac
 +    DUMPBIN=$ac_ct_DUMPBIN
 +  fi
 +fi
 +
-     case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in
++    case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
 +    *COFF*)
-       DUMPBIN="$DUMPBIN -symbols -headers"
++      DUMPBIN="$DUMPBIN -symbols"
 +      ;;
 +    *)
 +      DUMPBIN=:
 +      ;;
 +    esac
 +  fi
 +
-   if test : != "$DUMPBIN"; then
-     NM=$DUMPBIN
++  if test "$DUMPBIN" != ":"; then
++    NM="$DUMPBIN"
 +  fi
 +fi
 +test -z "$NM" && NM=nm
 +
 +
 +
 +
 +
 +
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
 +$as_echo_n "checking the name lister ($NM) interface... " >&6; }
 +if ${lt_cv_nm_interface+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  lt_cv_nm_interface="BSD nm"
 +  echo "int some_variable = 0;" > conftest.$ac_ext
 +  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)
 +  (eval "$ac_compile" 2>conftest.err)
 +  cat conftest.err >&5
 +  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
 +  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
 +  cat conftest.err >&5
 +  (eval echo "\"\$as_me:$LINENO: output\"" >&5)
 +  cat conftest.out >&5
 +  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
 +    lt_cv_nm_interface="MS dumpbin"
 +  fi
 +  rm -f conftest*
 +fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
 +$as_echo "$lt_cv_nm_interface" >&6; }
 +
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
 +$as_echo_n "checking whether ln -s works... " >&6; }
 +LN_S=$as_ln_s
 +if test "$LN_S" = "ln -s"; then
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 +$as_echo "yes" >&6; }
 +else
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
 +$as_echo "no, using $LN_S" >&6; }
 +fi
 +
 +# find the maximum length of command line arguments
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
 +$as_echo_n "checking the maximum length of command line arguments... " >&6; }
 +if ${lt_cv_sys_max_cmd_len+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +    i=0
-   teststring=ABCD
++  teststring="ABCD"
 +
 +  case $build_os in
 +  msdosdjgpp*)
 +    # On DJGPP, this test can blow up pretty badly due to problems in libc
 +    # (any single argument exceeding 2000 bytes causes a buffer overrun
 +    # during glob expansion).  Even if it were fixed, the result of this
 +    # check would be larger than it should be.
 +    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
 +    ;;
 +
 +  gnu*)
 +    # Under GNU Hurd, this test is not required because there is
 +    # no limit to the length of command line arguments.
 +    # Libtool will interpret -1 as no limit whatsoever
 +    lt_cv_sys_max_cmd_len=-1;
 +    ;;
 +
 +  cygwin* | mingw* | cegcc*)
 +    # On Win9x/ME, this test blows up -- it succeeds, but takes
 +    # about 5 minutes as the teststring grows exponentially.
 +    # Worse, since 9x/ME are not pre-emptively multitasking,
 +    # you end up with a "frozen" computer, even though with patience
 +    # the test eventually succeeds (with a max line length of 256k).
 +    # Instead, let's just punt: use the minimum linelength reported by
 +    # all of the supported platforms: 8192 (on NT/2K/XP).
 +    lt_cv_sys_max_cmd_len=8192;
 +    ;;
 +
 +  mint*)
 +    # On MiNT this can take a long time and run out of memory.
 +    lt_cv_sys_max_cmd_len=8192;
 +    ;;
 +
 +  amigaos*)
 +    # On AmigaOS with pdksh, this test takes hours, literally.
 +    # So we just punt and use a minimum line length of 8192.
 +    lt_cv_sys_max_cmd_len=8192;
 +    ;;
 +
-   bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*)
++  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
 +    ;;
 +
 +  os2*)
 +    # The test takes a long time on OS/2.
 +    lt_cv_sys_max_cmd_len=8192
 +    ;;
 +
 +  osf*)
 +    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
 +    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
 +    # nice to cause kernel panics so lets avoid the loop below.
 +    # First set a reasonable default.
 +    lt_cv_sys_max_cmd_len=16384
 +    #
 +    if test -x /sbin/sysconfig; then
 +      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
 +        *1*) lt_cv_sys_max_cmd_len=-1 ;;
 +      esac
 +    fi
 +    ;;
 +  sco3.2v5*)
 +    lt_cv_sys_max_cmd_len=102400
 +    ;;
 +  sysv5* | sco5v6* | sysv4.2uw2*)
 +    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
 +    if test -n "$kargmax"; then
 +      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[	 ]//'`
 +    else
 +      lt_cv_sys_max_cmd_len=32768
 +    fi
 +    ;;
 +  *)
 +    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-     if test -n "$lt_cv_sys_max_cmd_len" && \
-        test undefined != "$lt_cv_sys_max_cmd_len"; then
++    if test -n "$lt_cv_sys_max_cmd_len"; then
 +      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
 +      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
 +    else
 +      # Make teststring a little bigger before we do anything with it.
 +      # a 1K string should be a reasonable start.
-       for i in 1 2 3 4 5 6 7 8; do
++      for i in 1 2 3 4 5 6 7 8 ; do
 +        teststring=$teststring$teststring
 +      done
 +      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
 +      # If test is not a shell built-in, we'll probably end up computing a
 +      # maximum length that is only half of the actual maximum length, but
 +      # we can't tell.
-       while { test X`env echo "$teststring$teststring" 2>/dev/null` \
++      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
 +	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
- 	      test 17 != "$i" # 1/2 MB should be enough
++	      test $i != 17 # 1/2 MB should be enough
 +      do
 +        i=`expr $i + 1`
 +        teststring=$teststring$teststring
 +      done
 +      # Only check the string length outside the loop.
 +      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
 +      teststring=
 +      # Add a significant safety factor because C++ compilers can tack on
 +      # massive amounts of additional arguments before passing them to the
 +      # linker.  It appears as though 1/2 is a usable value.
 +      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
 +    fi
 +    ;;
 +  esac
 +
 +fi
 +
- if test -n "$lt_cv_sys_max_cmd_len"; then
++if test -n $lt_cv_sys_max_cmd_len ; then
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
 +$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
 +else
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
 +$as_echo "none" >&6; }
 +fi
 +max_cmd_len=$lt_cv_sys_max_cmd_len
 +
 +
 +
 +
 +
 +
 +: ${CP="cp -f"}
 +: ${MV="mv -f"}
 +: ${RM="rm -f"}
 +
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5
++$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
++# Try some XSI features
++xsi_shell=no
++( _lt_dummy="a/b/c"
++  test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
++      = c,a/b,b/c, \
++    && eval 'test $(( 1 + 1 )) -eq 2 \
++    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
++  && xsi_shell=yes
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5
++$as_echo "$xsi_shell" >&6; }
++
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5
++$as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
++lt_shell_append=no
++( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
++    >/dev/null 2>&1 \
++  && lt_shell_append=yes
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5
++$as_echo "$lt_shell_append" >&6; }
++
++
 +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
 +  lt_unset=unset
 +else
 +  lt_unset=false
 +fi
 +
 +
 +
 +
 +
 +# test EBCDIC or ASCII
 +case `echo X|tr X '\101'` in
 + A) # ASCII based system
 +    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
 +  lt_SP2NL='tr \040 \012'
 +  lt_NL2SP='tr \015\012 \040\040'
 +  ;;
 + *) # EBCDIC based system
 +  lt_SP2NL='tr \100 \n'
 +  lt_NL2SP='tr \r\n \100\100'
 +  ;;
 +esac
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
 +$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
 +if ${lt_cv_to_host_file_cmd+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  case $host in
 +  *-*-mingw* )
 +    case $build in
 +      *-*-mingw* ) # actually msys
 +        lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
 +        ;;
 +      *-*-cygwin* )
 +        lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
 +        ;;
 +      * ) # otherwise, assume *nix
 +        lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
 +        ;;
 +    esac
 +    ;;
 +  *-*-cygwin* )
 +    case $build in
 +      *-*-mingw* ) # actually msys
 +        lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
 +        ;;
 +      *-*-cygwin* )
 +        lt_cv_to_host_file_cmd=func_convert_file_noop
 +        ;;
 +      * ) # otherwise, assume *nix
 +        lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
 +        ;;
 +    esac
 +    ;;
 +  * ) # unhandled hosts (and "normal" native builds)
 +    lt_cv_to_host_file_cmd=func_convert_file_noop
 +    ;;
 +esac
 +
 +fi
 +
 +to_host_file_cmd=$lt_cv_to_host_file_cmd
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
 +$as_echo "$lt_cv_to_host_file_cmd" >&6; }
 +
 +
 +
 +
 +
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
 +$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
 +if ${lt_cv_to_tool_file_cmd+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  #assume ordinary cross tools, or native build.
 +lt_cv_to_tool_file_cmd=func_convert_file_noop
 +case $host in
 +  *-*-mingw* )
 +    case $build in
 +      *-*-mingw* ) # actually msys
 +        lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
 +        ;;
 +    esac
 +    ;;
 +esac
 +
 +fi
 +
 +to_tool_file_cmd=$lt_cv_to_tool_file_cmd
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
 +$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
 +
 +
 +
 +
 +
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
 +$as_echo_n "checking for $LD option to reload object files... " >&6; }
 +if ${lt_cv_ld_reload_flag+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  lt_cv_ld_reload_flag='-r'
 +fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
 +$as_echo "$lt_cv_ld_reload_flag" >&6; }
 +reload_flag=$lt_cv_ld_reload_flag
 +case $reload_flag in
 +"" | " "*) ;;
 +*) reload_flag=" $reload_flag" ;;
 +esac
 +reload_cmds='$LD$reload_flag -o $output$reload_objs'
 +case $host_os in
 +  cygwin* | mingw* | pw32* | cegcc*)
-     if test yes != "$GCC"; then
++    if test "$GCC" != yes; then
 +      reload_cmds=false
 +    fi
 +    ;;
 +  darwin*)
-     if test yes = "$GCC"; then
-       reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs'
++    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
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +if test -n "$ac_tool_prefix"; then
 +  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
 +set dummy ${ac_tool_prefix}objdump; ac_word=$2
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
 +if ${ac_cv_prog_OBJDUMP+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  if test -n "$OBJDUMP"; then
 +  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
 +else
 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +for as_dir in $PATH
 +do
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +    for ac_exec_ext in '' $ac_executable_extensions; do
 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 +    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
 +  fi
 +done
 +  done
 +IFS=$as_save_IFS
 +
 +fi
 +fi
 +OBJDUMP=$ac_cv_prog_OBJDUMP
 +if test -n "$OBJDUMP"; then
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
 +$as_echo "$OBJDUMP" >&6; }
 +else
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
 +fi
 +
 +
 +fi
 +if test -z "$ac_cv_prog_OBJDUMP"; then
 +  ac_ct_OBJDUMP=$OBJDUMP
 +  # Extract the first word of "objdump", so it can be a program name with args.
 +set dummy objdump; ac_word=$2
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
 +if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  if test -n "$ac_ct_OBJDUMP"; then
 +  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
 +else
 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +for as_dir in $PATH
 +do
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +    for ac_exec_ext in '' $ac_executable_extensions; do
 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 +    ac_cv_prog_ac_ct_OBJDUMP="objdump"
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
 +  fi
 +done
 +  done
 +IFS=$as_save_IFS
 +
 +fi
 +fi
 +ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
 +if test -n "$ac_ct_OBJDUMP"; then
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
 +$as_echo "$ac_ct_OBJDUMP" >&6; }
 +else
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
 +fi
 +
 +  if test "x$ac_ct_OBJDUMP" = x; then
 +    OBJDUMP="false"
 +  else
 +    case $cross_compiling:$ac_tool_warned in
 +yes:)
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 +ac_tool_warned=yes ;;
 +esac
 +    OBJDUMP=$ac_ct_OBJDUMP
 +  fi
 +else
 +  OBJDUMP="$ac_cv_prog_OBJDUMP"
 +fi
 +
 +test -z "$OBJDUMP" && OBJDUMP=objdump
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
 +$as_echo_n "checking how to recognize dependent libraries... " >&6; }
 +if ${lt_cv_deplibs_check_method+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  lt_cv_file_magic_cmd='$MAGIC_CMD'
 +lt_cv_file_magic_test_file=
 +lt_cv_deplibs_check_method='unknown'
 +# Need to set the preceding variable on all platforms that support
 +# interlibrary dependencies.
 +# 'none' -- dependencies not supported.
- # 'unknown' -- same as none, but documents that we really don't know.
++# `unknown' -- same as none, but documents that we really don't know.
 +# 'pass_all' -- all dependencies passed with no checks.
 +# 'test_compile' -- check by making test program.
 +# 'file_magic [[regex]]' -- check by looking for files in library path
- # that responds to the $file_magic_cmd with a given extended regex.
- # If you have 'file' or equivalent on your system and you're not sure
- # whether 'pass_all' will *always* work, you probably want this one.
++# which responds to the $file_magic_cmd with a given extended regex.
++# If you have `file' or equivalent on your system and you're not sure
++# whether `pass_all' will *always* work, you probably want this one.
 +
 +case $host_os in
 +aix[4-9]*)
 +  lt_cv_deplibs_check_method=pass_all
 +  ;;
 +
 +beos*)
 +  lt_cv_deplibs_check_method=pass_all
 +  ;;
 +
 +bsdi[45]*)
 +  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
 +  lt_cv_file_magic_cmd='/usr/bin/file -L'
 +  lt_cv_file_magic_test_file=/shlib/libc.so
 +  ;;
 +
 +cygwin*)
 +  # func_win32_libid is a shell function defined in ltmain.sh
 +  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
 +  lt_cv_file_magic_cmd='func_win32_libid'
 +  ;;
 +
 +mingw* | pw32*)
 +  # Base MSYS/MinGW do not provide the 'file' command needed by
 +  # func_win32_libid shell function, so use a weaker test based on 'objdump',
 +  # unless we find 'file', for example because we are cross-compiling.
-   if ( file / ) >/dev/null 2>&1; then
++  # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
++  if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
 +    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
 +    lt_cv_file_magic_cmd='func_win32_libid'
 +  else
 +    # Keep this pattern in sync with the one in func_win32_libid.
 +    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
 +    lt_cv_file_magic_cmd='$OBJDUMP -f'
 +  fi
 +  ;;
 +
 +cegcc*)
 +  # use the weaker test based on 'objdump'. See mingw*.
 +  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
 +  lt_cv_file_magic_cmd='$OBJDUMP -f'
 +  ;;
 +
 +darwin* | rhapsody*)
 +  lt_cv_deplibs_check_method=pass_all
 +  ;;
 +
 +freebsd* | dragonfly*)
 +  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
 +    case $host_cpu in
 +    i*86 )
 +      # Not sure whether the presence of OpenBSD here was a mistake.
 +      # Let's accept both of them until this is cleared up.
 +      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
 +      lt_cv_file_magic_cmd=/usr/bin/file
 +      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
 +      ;;
 +    esac
 +  else
 +    lt_cv_deplibs_check_method=pass_all
 +  fi
 +  ;;
 +
++gnu*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
 +haiku*)
 +  lt_cv_deplibs_check_method=pass_all
 +  ;;
 +
 +hpux10.20* | hpux11*)
 +  lt_cv_file_magic_cmd=/usr/bin/file
 +  case $host_cpu in
 +  ia64*)
 +    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
 +    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
 +    ;;
 +  hppa*64*)
 +    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'
 +    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
 +    ;;
 +  *)
 +    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library'
 +    lt_cv_file_magic_test_file=/usr/lib/libc.sl
 +    ;;
 +  esac
 +  ;;
 +
 +interix[3-9]*)
 +  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
 +  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
 +  ;;
 +
 +irix5* | irix6* | nonstopux*)
 +  case $LD in
 +  *-32|*"-32 ") libmagic=32-bit;;
 +  *-n32|*"-n32 ") libmagic=N32;;
 +  *-64|*"-64 ") libmagic=64-bit;;
 +  *) libmagic=never-match;;
 +  esac
 +  lt_cv_deplibs_check_method=pass_all
 +  ;;
 +
 +# This must be glibc/ELF.
- linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
 +  lt_cv_deplibs_check_method=pass_all
 +  ;;
 +
 +netbsd*)
 +  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
 +    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
 +  else
 +    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
 +  fi
 +  ;;
 +
 +newos6*)
 +  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
 +  lt_cv_file_magic_cmd=/usr/bin/file
 +  lt_cv_file_magic_test_file=/usr/lib/libnls.so
 +  ;;
 +
 +*nto* | *qnx*)
 +  lt_cv_deplibs_check_method=pass_all
 +  ;;
 +
- openbsd* | bitrig*)
-   if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
++openbsd*)
++  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
 +    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
 +  else
 +    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
 +  fi
 +  ;;
 +
 +osf3* | osf4* | osf5*)
 +  lt_cv_deplibs_check_method=pass_all
 +  ;;
 +
 +rdos*)
 +  lt_cv_deplibs_check_method=pass_all
 +  ;;
 +
 +solaris*)
 +  lt_cv_deplibs_check_method=pass_all
 +  ;;
 +
 +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
 +  lt_cv_deplibs_check_method=pass_all
 +  ;;
 +
 +sysv4 | sysv4.3*)
 +  case $host_vendor in
 +  motorola)
 +    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
 +    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
 +    ;;
 +  ncr)
 +    lt_cv_deplibs_check_method=pass_all
 +    ;;
 +  sequent)
 +    lt_cv_file_magic_cmd='/bin/file'
 +    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
 +    ;;
 +  sni)
 +    lt_cv_file_magic_cmd='/bin/file'
 +    lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
 +    lt_cv_file_magic_test_file=/lib/libc.so
 +    ;;
 +  siemens)
 +    lt_cv_deplibs_check_method=pass_all
 +    ;;
 +  pc)
 +    lt_cv_deplibs_check_method=pass_all
 +    ;;
 +  esac
 +  ;;
 +
 +tpf*)
 +  lt_cv_deplibs_check_method=pass_all
 +  ;;
- os2*)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
 +esac
 +
 +fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
 +$as_echo "$lt_cv_deplibs_check_method" >&6; }
 +
 +file_magic_glob=
 +want_nocaseglob=no
 +if test "$build" = "$host"; then
 +  case $host_os in
 +  mingw* | pw32*)
 +    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
 +      want_nocaseglob=yes
 +    else
 +      file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
 +    fi
 +    ;;
 +  esac
 +fi
 +
 +file_magic_cmd=$lt_cv_file_magic_cmd
 +deplibs_check_method=$lt_cv_deplibs_check_method
 +test -z "$deplibs_check_method" && deplibs_check_method=unknown
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +if test -n "$ac_tool_prefix"; then
 +  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
 +set dummy ${ac_tool_prefix}dlltool; ac_word=$2
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
 +if ${ac_cv_prog_DLLTOOL+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  if test -n "$DLLTOOL"; then
 +  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
 +else
 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +for as_dir in $PATH
 +do
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +    for ac_exec_ext in '' $ac_executable_extensions; do
 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 +    ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
 +  fi
 +done
 +  done
 +IFS=$as_save_IFS
 +
 +fi
 +fi
 +DLLTOOL=$ac_cv_prog_DLLTOOL
 +if test -n "$DLLTOOL"; then
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
 +$as_echo "$DLLTOOL" >&6; }
 +else
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
 +fi
 +
 +
 +fi
 +if test -z "$ac_cv_prog_DLLTOOL"; then
 +  ac_ct_DLLTOOL=$DLLTOOL
 +  # Extract the first word of "dlltool", so it can be a program name with args.
 +set dummy dlltool; ac_word=$2
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
 +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  if test -n "$ac_ct_DLLTOOL"; then
 +  ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
 +else
 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +for as_dir in $PATH
 +do
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +    for ac_exec_ext in '' $ac_executable_extensions; do
 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 +    ac_cv_prog_ac_ct_DLLTOOL="dlltool"
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
 +  fi
 +done
 +  done
 +IFS=$as_save_IFS
 +
 +fi
 +fi
 +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
 +if test -n "$ac_ct_DLLTOOL"; then
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
 +$as_echo "$ac_ct_DLLTOOL" >&6; }
 +else
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
 +fi
 +
 +  if test "x$ac_ct_DLLTOOL" = x; then
 +    DLLTOOL="false"
 +  else
 +    case $cross_compiling:$ac_tool_warned in
 +yes:)
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 +ac_tool_warned=yes ;;
 +esac
 +    DLLTOOL=$ac_ct_DLLTOOL
 +  fi
 +else
 +  DLLTOOL="$ac_cv_prog_DLLTOOL"
 +fi
 +
 +test -z "$DLLTOOL" && DLLTOOL=dlltool
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
 +$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
 +if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  lt_cv_sharedlib_from_linklib_cmd='unknown'
 +
 +case $host_os in
 +cygwin* | mingw* | pw32* | cegcc*)
-   # two different shell functions defined in ltmain.sh;
-   # decide which one to use based on capabilities of $DLLTOOL
++  # two different shell functions defined in ltmain.sh
++  # decide which to use based on capabilities of $DLLTOOL
 +  case `$DLLTOOL --help 2>&1` in
 +  *--identify-strict*)
 +    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
 +    ;;
 +  *)
 +    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
 +    ;;
 +  esac
 +  ;;
 +*)
 +  # fallback: assume linklib IS sharedlib
-   lt_cv_sharedlib_from_linklib_cmd=$ECHO
++  lt_cv_sharedlib_from_linklib_cmd="$ECHO"
 +  ;;
 +esac
 +
 +fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
 +$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
 +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
 +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
 +
 +
 +
 +
 +
 +
 +
 +
 +if test -n "$ac_tool_prefix"; then
 +  for ac_prog in ar
 +  do
 +    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 +set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
 +if ${ac_cv_prog_AR+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  if test -n "$AR"; then
 +  ac_cv_prog_AR="$AR" # Let the user override the test.
 +else
 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +for as_dir in $PATH
 +do
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +    for ac_exec_ext in '' $ac_executable_extensions; do
 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 +    ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
 +  fi
 +done
 +  done
 +IFS=$as_save_IFS
 +
 +fi
 +fi
 +AR=$ac_cv_prog_AR
 +if test -n "$AR"; then
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
 +$as_echo "$AR" >&6; }
 +else
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
 +fi
 +
 +
 +    test -n "$AR" && break
 +  done
 +fi
 +if test -z "$AR"; then
 +  ac_ct_AR=$AR
 +  for ac_prog in ar
 +do
 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
 +set dummy $ac_prog; ac_word=$2
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
 +if ${ac_cv_prog_ac_ct_AR+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  if test -n "$ac_ct_AR"; then
 +  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
 +else
 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +for as_dir in $PATH
 +do
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +    for ac_exec_ext in '' $ac_executable_extensions; do
 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 +    ac_cv_prog_ac_ct_AR="$ac_prog"
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
 +  fi
 +done
 +  done
 +IFS=$as_save_IFS
 +
 +fi
 +fi
 +ac_ct_AR=$ac_cv_prog_ac_ct_AR
 +if test -n "$ac_ct_AR"; then
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
 +$as_echo "$ac_ct_AR" >&6; }
 +else
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
 +fi
 +
 +
 +  test -n "$ac_ct_AR" && break
 +done
 +
 +  if test "x$ac_ct_AR" = x; then
 +    AR="false"
 +  else
 +    case $cross_compiling:$ac_tool_warned in
 +yes:)
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 +ac_tool_warned=yes ;;
 +esac
 +    AR=$ac_ct_AR
 +  fi
 +fi
 +
 +: ${AR=ar}
 +: ${AR_FLAGS=cru}
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
 +$as_echo_n "checking for archiver @FILE support... " >&6; }
 +if ${lt_cv_ar_at_file+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  lt_cv_ar_at_file=no
 +   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +
 +int
 +main ()
 +{
 +
 +  ;
 +  return 0;
 +}
 +_ACEOF
 +if ac_fn_c_try_compile "$LINENO"; then :
 +  echo conftest.$ac_objext > conftest.lst
 +      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
 +      { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
 +  (eval $lt_ar_try) 2>&5
 +  ac_status=$?
 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 +  test $ac_status = 0; }
-       if test 0 -eq "$ac_status"; then
++      if test "$ac_status" -eq 0; then
 +	# Ensure the archiver fails upon bogus file names.
 +	rm -f conftest.$ac_objext libconftest.a
 +	{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
 +  (eval $lt_ar_try) 2>&5
 +  ac_status=$?
 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 +  test $ac_status = 0; }
- 	if test 0 -ne "$ac_status"; then
++	if test "$ac_status" -ne 0; then
 +          lt_cv_ar_at_file=@
 +        fi
 +      fi
 +      rm -f conftest.* libconftest.a
 +
 +fi
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +
 +fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
 +$as_echo "$lt_cv_ar_at_file" >&6; }
 +
- if test no = "$lt_cv_ar_at_file"; then
++if test "x$lt_cv_ar_at_file" = xno; then
 +  archiver_list_spec=
 +else
 +  archiver_list_spec=$lt_cv_ar_at_file
 +fi
 +
 +
 +
 +
 +
 +
 +
 +if test -n "$ac_tool_prefix"; then
 +  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 +set dummy ${ac_tool_prefix}strip; ac_word=$2
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
 +if ${ac_cv_prog_STRIP+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  if test -n "$STRIP"; then
 +  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
 +else
 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +for as_dir in $PATH
 +do
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +    for ac_exec_ext in '' $ac_executable_extensions; do
 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 +    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
 +  fi
 +done
 +  done
 +IFS=$as_save_IFS
 +
 +fi
 +fi
 +STRIP=$ac_cv_prog_STRIP
 +if test -n "$STRIP"; then
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
 +$as_echo "$STRIP" >&6; }
 +else
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
 +fi
 +
 +
 +fi
 +if test -z "$ac_cv_prog_STRIP"; then
 +  ac_ct_STRIP=$STRIP
 +  # Extract the first word of "strip", so it can be a program name with args.
 +set dummy strip; ac_word=$2
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
 +if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  if test -n "$ac_ct_STRIP"; then
 +  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
 +else
 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +for as_dir in $PATH
 +do
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +    for ac_exec_ext in '' $ac_executable_extensions; do
 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 +    ac_cv_prog_ac_ct_STRIP="strip"
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
 +  fi
 +done
 +  done
 +IFS=$as_save_IFS
 +
 +fi
 +fi
 +ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 +if test -n "$ac_ct_STRIP"; then
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
 +$as_echo "$ac_ct_STRIP" >&6; }
 +else
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
 +fi
 +
 +  if test "x$ac_ct_STRIP" = x; then
 +    STRIP=":"
 +  else
 +    case $cross_compiling:$ac_tool_warned in
 +yes:)
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 +ac_tool_warned=yes ;;
 +esac
 +    STRIP=$ac_ct_STRIP
 +  fi
 +else
 +  STRIP="$ac_cv_prog_STRIP"
 +fi
 +
 +test -z "$STRIP" && STRIP=:
 +
 +
 +
 +
 +
 +
 +if test -n "$ac_tool_prefix"; then
 +  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 +set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
 +if ${ac_cv_prog_RANLIB+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  if test -n "$RANLIB"; then
 +  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
 +else
 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +for as_dir in $PATH
 +do
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +    for ac_exec_ext in '' $ac_executable_extensions; do
 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 +    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
 +  fi
 +done
 +  done
 +IFS=$as_save_IFS
 +
 +fi
 +fi
 +RANLIB=$ac_cv_prog_RANLIB
 +if test -n "$RANLIB"; then
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
 +$as_echo "$RANLIB" >&6; }
 +else
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
 +fi
 +
 +
 +fi
 +if test -z "$ac_cv_prog_RANLIB"; then
 +  ac_ct_RANLIB=$RANLIB
 +  # Extract the first word of "ranlib", so it can be a program name with args.
 +set dummy ranlib; ac_word=$2
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
 +if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  if test -n "$ac_ct_RANLIB"; then
 +  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
 +else
 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +for as_dir in $PATH
 +do
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +    for ac_exec_ext in '' $ac_executable_extensions; do
 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 +    ac_cv_prog_ac_ct_RANLIB="ranlib"
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
 +  fi
 +done
 +  done
 +IFS=$as_save_IFS
 +
 +fi
 +fi
 +ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 +if test -n "$ac_ct_RANLIB"; then
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
 +$as_echo "$ac_ct_RANLIB" >&6; }
 +else
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
 +fi
 +
 +  if test "x$ac_ct_RANLIB" = x; then
 +    RANLIB=":"
 +  else
 +    case $cross_compiling:$ac_tool_warned in
 +yes:)
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 +ac_tool_warned=yes ;;
 +esac
 +    RANLIB=$ac_ct_RANLIB
 +  fi
 +else
 +  RANLIB="$ac_cv_prog_RANLIB"
 +fi
 +
 +test -z "$RANLIB" && RANLIB=:
 +
 +
 +
 +
 +
 +
 +# Determine commands to create old-style static archives.
 +old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
 +old_postinstall_cmds='chmod 644 $oldlib'
 +old_postuninstall_cmds=
 +
 +if test -n "$RANLIB"; then
 +  case $host_os in
-   bitrig* | openbsd*)
++  openbsd*)
 +    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
 +    ;;
 +  *)
 +    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
 +    ;;
 +  esac
 +  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
 +fi
 +
 +case $host_os in
 +  darwin*)
 +    lock_old_archive_extraction=yes ;;
 +  *)
 +    lock_old_archive_extraction=no ;;
 +esac
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +# If no C compiler was specified, use CC.
 +LTCC=${LTCC-"$CC"}
 +
 +# If no C compiler flags were specified, use CFLAGS.
 +LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
 +
 +# Allow CC to be a program name with arguments.
 +compiler=$CC
 +
 +
 +# Check for command to grab the raw symbol name followed by C symbol from nm.
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
 +$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
 +if ${lt_cv_sys_global_symbol_pipe+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +
 +# These are sane defaults that work on at least a few old systems.
 +# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
 +
 +# Character class describing NM global symbol codes.
 +symcode='[BCDEGRST]'
 +
 +# Regexp to match symbols that can be accessed directly from C.
 +sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
 +
 +# Define system-specific variables.
 +case $host_os in
 +aix*)
 +  symcode='[BCDT]'
 +  ;;
 +cygwin* | mingw* | pw32* | cegcc*)
 +  symcode='[ABCDGISTW]'
 +  ;;
 +hpux*)
-   if test ia64 = "$host_cpu"; then
++  if test "$host_cpu" = ia64; then
 +    symcode='[ABCDEGRST]'
 +  fi
 +  ;;
 +irix* | nonstopux*)
 +  symcode='[BCDEGRST]'
 +  ;;
 +osf*)
 +  symcode='[BCDEGQRST]'
 +  ;;
 +solaris*)
 +  symcode='[BDRT]'
 +  ;;
 +sco3.2v5*)
 +  symcode='[DT]'
 +  ;;
 +sysv4.2uw2*)
 +  symcode='[DT]'
 +  ;;
 +sysv5* | sco5v6* | unixware* | OpenUNIX*)
 +  symcode='[ABDT]'
 +  ;;
 +sysv4)
 +  symcode='[DFNSTU]'
 +  ;;
 +esac
 +
 +# If we're using GNU nm, then use its standard symbol codes.
 +case `$NM -V 2>&1` in
 +*GNU* | *'with BFD'*)
 +  symcode='[ABCDGIRSTW]' ;;
 +esac
 +
- if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-   # Gets list of data symbols to import.
-   lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'"
-   # Adjust the below global symbol transforms to fixup imported variables.
-   lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'"
-   lt_c_name_hook=" -e 's/^I .* \(.*\)$/  {\"\1\", (void *) 0},/p'"
-   lt_c_name_lib_hook="\
-   -e 's/^I .* \(lib.*\)$/  {\"\1\", (void *) 0},/p'\
-   -e 's/^I .* \(.*\)$/  {\"lib\1\", (void *) 0},/p'"
- else
-   # Disable hooks by default.
-   lt_cv_sys_global_symbol_to_import=
-   lt_cdecl_hook=
-   lt_c_name_hook=
-   lt_c_name_lib_hook=
- fi
- 
 +# Transform an extracted symbol line into a proper C declaration.
 +# Some systems (esp. on ia64) link data and code symbols differently,
 +# so use this general approach.
- lt_cv_sys_global_symbol_to_cdecl="sed -n"\
- $lt_cdecl_hook\
- " -e 's/^T .* \(.*\)$/extern int \1();/p'"\
- " -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'"
++lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
 +
 +# Transform an extracted symbol line into symbol name and symbol address
- lt_cv_sys_global_symbol_to_c_name_address="sed -n"\
- $lt_c_name_hook\
- " -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
- " -e 's/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/p'"
- 
- # Transform an extracted symbol line into symbol name with lib prefix and
- # symbol address.
- lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\
- $lt_c_name_lib_hook\
- " -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
- " -e 's/^$symcode$symcode* .* \(lib.*\)$/  {\"\1\", (void *) \&\1},/p'"\
- " -e 's/^$symcode$symcode* .* \(.*\)$/  {\"lib\1\", (void *) \&\1},/p'"
++lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (void *) \&\2},/p'"
++lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
 +
 +# Handle CRLF in mingw tool chain
 +opt_cr=
 +case $build_os in
 +mingw*)
 +  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
 +  ;;
 +esac
 +
 +# Try without a prefix underscore, then with it.
 +for ac_symprfx in "" "_"; do
 +
 +  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
 +  symxfrm="\\1 $ac_symprfx\\2 \\2"
 +
 +  # Write the raw and C identifiers.
 +  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-     # Fake it for dumpbin and say T for any non-static function,
-     # D for any global variable and I for any imported variable.
++    # Fake it for dumpbin and say T for any non-static function
++    # and D for any global variable.
 +    # Also find C++ and __fastcall symbols from MSVC++,
 +    # which start with @ or ?.
 +    lt_cv_sys_global_symbol_pipe="$AWK '"\
 +"     {last_section=section; section=\$ 3};"\
 +"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
 +"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
- "     /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\
- "     /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\
- "     /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\
 +"     \$ 0!~/External *\|/{next};"\
 +"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
 +"     {if(hide[section]) next};"\
- "     {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\
- "     {split(\$ 0,a,/\||\r/); split(a[2],s)};"\
- "     s[1]~/^[@?]/{print f,s[1],s[1]; next};"\
- "     s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\
++"     {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
++"     {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
++"     s[1]~/^[@?]/{print s[1], s[1]; next};"\
++"     s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
 +"     ' prfx=^$ac_symprfx"
 +  else
 +    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[	 ]\($symcode$symcode*\)[	 ][	 ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
 +  fi
 +  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
 +
 +  # Check to see that the pipe works correctly.
 +  pipe_works=no
 +
 +  rm -f conftest*
 +  cat > conftest.$ac_ext <<_LT_EOF
 +#ifdef __cplusplus
 +extern "C" {
 +#endif
 +char nm_test_var;
 +void nm_test_func(void);
 +void nm_test_func(void){}
 +#ifdef __cplusplus
 +}
 +#endif
 +int main(){nm_test_var='a';nm_test_func();return(0);}
 +_LT_EOF
 +
 +  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 +  test $ac_status = 0; }; then
 +    # Now try to grab the symbols.
 +    nlist=conftest.nm
 +    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5
 +  (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5
 +  ac_status=$?
 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 +  test $ac_status = 0; } && test -s "$nlist"; then
 +      # Try sorting and uniquifying the output.
 +      if sort "$nlist" | uniq > "$nlist"T; then
 +	mv -f "$nlist"T "$nlist"
 +      else
 +	rm -f "$nlist"T
 +      fi
 +
 +      # Make sure that we snagged all the symbols we need.
 +      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
 +	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
 +	  cat <<_LT_EOF > conftest.$ac_ext
 +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
- #if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
- /* DATA imports from DLLs on WIN32 can't be const, because runtime
++#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
++/* DATA imports from DLLs on WIN32 con't be const, because runtime
 +   relocations are performed -- see ld's documentation on pseudo-relocs.  */
 +# define LT_DLSYM_CONST
- #elif defined __osf__
++#elif defined(__osf__)
 +/* This system does not cope well with relocations in const data.  */
 +# define LT_DLSYM_CONST
 +#else
 +# define LT_DLSYM_CONST const
 +#endif
 +
 +#ifdef __cplusplus
 +extern "C" {
 +#endif
 +
 +_LT_EOF
 +	  # Now generate the symbol file.
 +	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
 +
 +	  cat <<_LT_EOF >> conftest.$ac_ext
 +
 +/* The mapping between symbol names and symbols.  */
 +LT_DLSYM_CONST struct {
 +  const char *name;
 +  void       *address;
 +}
 +lt__PROGRAM__LTX_preloaded_symbols[] =
 +{
 +  { "@PROGRAM@", (void *) 0 },
 +_LT_EOF
- 	  $SED "s/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
++	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
 +	  cat <<\_LT_EOF >> conftest.$ac_ext
 +  {0, (void *) 0}
 +};
 +
 +/* This works around a problem in FreeBSD linker */
 +#ifdef FREEBSD_WORKAROUND
 +static const void *lt_preloaded_setup() {
 +  return lt__PROGRAM__LTX_preloaded_symbols;
 +}
 +#endif
 +
 +#ifdef __cplusplus
 +}
 +#endif
 +_LT_EOF
 +	  # Now try linking the two files.
 +	  mv conftest.$ac_objext conftstm.$ac_objext
 +	  lt_globsym_save_LIBS=$LIBS
 +	  lt_globsym_save_CFLAGS=$CFLAGS
- 	  LIBS=conftstm.$ac_objext
++	  LIBS="conftstm.$ac_objext"
 +	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
 +	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
 +  (eval $ac_link) 2>&5
 +  ac_status=$?
 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; } && test -s conftest$ac_exeext; then
++  test $ac_status = 0; } && test -s conftest${ac_exeext}; then
 +	    pipe_works=yes
 +	  fi
 +	  LIBS=$lt_globsym_save_LIBS
 +	  CFLAGS=$lt_globsym_save_CFLAGS
 +	else
 +	  echo "cannot find nm_test_func in $nlist" >&5
 +	fi
 +      else
 +	echo "cannot find nm_test_var in $nlist" >&5
 +      fi
 +    else
 +      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
 +    fi
 +  else
 +    echo "$progname: failed program was:" >&5
 +    cat conftest.$ac_ext >&5
 +  fi
 +  rm -rf conftest* conftst*
 +
 +  # Do not use the global_symbol_pipe unless it works.
-   if test yes = "$pipe_works"; then
++  if test "$pipe_works" = yes; then
 +    break
 +  else
 +    lt_cv_sys_global_symbol_pipe=
 +  fi
 +done
 +
 +fi
 +
 +if test -z "$lt_cv_sys_global_symbol_pipe"; then
 +  lt_cv_sys_global_symbol_to_cdecl=
 +fi
 +if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
 +$as_echo "failed" >&6; }
 +else
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
 +$as_echo "ok" >&6; }
 +fi
 +
 +# Response file support.
 +if test "$lt_cv_nm_interface" = "MS dumpbin"; then
 +  nm_file_list_spec='@'
 +elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
 +  nm_file_list_spec='@'
 +fi
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
 +$as_echo_n "checking for sysroot... " >&6; }
 +
 +# Check whether --with-sysroot was given.
 +if test "${with_sysroot+set}" = set; then :
 +  withval=$with_sysroot;
 +else
 +  with_sysroot=no
 +fi
 +
 +
 +lt_sysroot=
- case $with_sysroot in #(
++case ${with_sysroot} in #(
 + yes)
-    if test yes = "$GCC"; then
++   if test "$GCC" = yes; then
 +     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
 +   fi
 +   ;; #(
 + /*)
 +   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
 +   ;; #(
 + no|'')
 +   ;; #(
 + *)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5
- $as_echo "$with_sysroot" >&6; }
++   { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5
++$as_echo "${with_sysroot}" >&6; }
 +   as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
 +   ;;
 +esac
 +
 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
 +$as_echo "${lt_sysroot:-no}" >&6; }
 +
 +
 +
 +
 +
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5
- $as_echo_n "checking for a working dd... " >&6; }
- if ${ac_cv_path_lt_DD+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   printf 0123456789abcdef0123456789abcdef >conftest.i
- cat conftest.i conftest.i >conftest2.i
- : ${lt_DD:=$DD}
- if test -z "$lt_DD"; then
-   ac_path_lt_DD_found=false
-   # Loop through the user's path and test for each of PROGNAME-LIST
-   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- for as_dir in $PATH
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-     for ac_prog in dd; do
-     for ac_exec_ext in '' $ac_executable_extensions; do
-       ac_path_lt_DD="$as_dir/$ac_prog$ac_exec_ext"
-       as_fn_executable_p "$ac_path_lt_DD" || continue
- if "$ac_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
-   cmp -s conftest.i conftest.out \
-   && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=:
- fi
-       $ac_path_lt_DD_found && break 3
-     done
-   done
-   done
- IFS=$as_save_IFS
-   if test -z "$ac_cv_path_lt_DD"; then
-     :
-   fi
- else
-   ac_cv_path_lt_DD=$lt_DD
- fi
- 
- rm -f conftest.i conftest2.i conftest.out
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5
- $as_echo "$ac_cv_path_lt_DD" >&6; }
- 
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5
- $as_echo_n "checking how to truncate binary pipes... " >&6; }
- if ${lt_cv_truncate_bin+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   printf 0123456789abcdef0123456789abcdef >conftest.i
- cat conftest.i conftest.i >conftest2.i
- lt_cv_truncate_bin=
- if "$ac_cv_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
-   cmp -s conftest.i conftest.out \
-   && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1"
- fi
- rm -f conftest.i conftest2.i conftest.out
- test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5
- $as_echo "$lt_cv_truncate_bin" >&6; }
- 
- 
- 
- 
- 
- 
- 
- # Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
- func_cc_basename ()
- {
-     for cc_temp in $*""; do
-       case $cc_temp in
-         compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-         distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-         \-*) ;;
-         *) break;;
-       esac
-     done
-     func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
- }
- 
 +# Check whether --enable-libtool-lock was given.
 +if test "${enable_libtool_lock+set}" = set; then :
 +  enableval=$enable_libtool_lock;
 +fi
 +
- test no = "$enable_libtool_lock" || enable_libtool_lock=yes
++test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
 +
 +# Some flags need to be propagated to the compiler or linker for good
 +# libtool support.
 +case $host in
 +ia64-*-hpux*)
-   # Find out what ABI is being produced by ac_compile, and set mode
-   # options accordingly.
++  # Find out which ABI we are using.
 +  echo 'int i;' > conftest.$ac_ext
 +  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 +  test $ac_status = 0; }; then
 +    case `/usr/bin/file conftest.$ac_objext` in
 +      *ELF-32*)
- 	HPUX_IA64_MODE=32
++	HPUX_IA64_MODE="32"
 +	;;
 +      *ELF-64*)
- 	HPUX_IA64_MODE=64
++	HPUX_IA64_MODE="64"
 +	;;
 +    esac
 +  fi
 +  rm -rf conftest*
 +  ;;
 +*-*-irix6*)
-   # Find out what ABI is being produced by ac_compile, and set linker
-   # options accordingly.
++  # Find out which ABI we are using.
 +  echo '#line '$LINENO' "configure"' > conftest.$ac_ext
 +  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 +  test $ac_status = 0; }; then
-     if test yes = "$lt_cv_prog_gnu_ld"; then
++    if test "$lt_cv_prog_gnu_ld" = yes; then
 +      case `/usr/bin/file conftest.$ac_objext` in
 +	*32-bit*)
 +	  LD="${LD-ld} -melf32bsmip"
 +	  ;;
 +	*N32*)
 +	  LD="${LD-ld} -melf32bmipn32"
 +	  ;;
 +	*64-bit*)
 +	  LD="${LD-ld} -melf64bmip"
 +	;;
 +      esac
 +    else
 +      case `/usr/bin/file conftest.$ac_objext` in
 +	*32-bit*)
 +	  LD="${LD-ld} -32"
 +	  ;;
 +	*N32*)
 +	  LD="${LD-ld} -n32"
 +	  ;;
 +	*64-bit*)
 +	  LD="${LD-ld} -64"
 +	  ;;
 +      esac
 +    fi
 +  fi
 +  rm -rf conftest*
 +  ;;
 +
- mips64*-*linux*)
-   # Find out what ABI is being produced by ac_compile, and set linker
-   # options accordingly.
-   echo '#line '$LINENO' "configure"' > conftest.$ac_ext
-   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
-     emul=elf
-     case `/usr/bin/file conftest.$ac_objext` in
-       *32-bit*)
- 	emul="${emul}32"
- 	;;
-       *64-bit*)
- 	emul="${emul}64"
- 	;;
-     esac
-     case `/usr/bin/file conftest.$ac_objext` in
-       *MSB*)
- 	emul="${emul}btsmip"
- 	;;
-       *LSB*)
- 	emul="${emul}ltsmip"
- 	;;
-     esac
-     case `/usr/bin/file conftest.$ac_objext` in
-       *N32*)
- 	emul="${emul}n32"
- 	;;
-     esac
-     LD="${LD-ld} -m $emul"
-   fi
-   rm -rf conftest*
-   ;;
- 
- x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
++x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
 +s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
-   # Find out what ABI is being produced by ac_compile, and set linker
-   # options accordingly.  Note that the listed cases only cover the
-   # situations where additional linker options are needed (such as when
-   # doing 32-bit compilation for a host where ld defaults to 64-bit, or
-   # vice versa); the common cases where no linker options are needed do
-   # not appear in the list.
++  # Find out which ABI we are using.
 +  echo 'int i;' > conftest.$ac_ext
 +  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 +  test $ac_status = 0; }; then
 +    case `/usr/bin/file conftest.o` in
 +      *32-bit*)
 +	case $host in
 +	  x86_64-*kfreebsd*-gnu)
 +	    LD="${LD-ld} -m elf_i386_fbsd"
 +	    ;;
 +	  x86_64-*linux*)
- 	    case `/usr/bin/file conftest.o` in
- 	      *x86-64*)
- 		LD="${LD-ld} -m elf32_x86_64"
- 		;;
- 	      *)
- 		LD="${LD-ld} -m elf_i386"
- 		;;
- 	    esac
- 	    ;;
- 	  powerpc64le-*linux*)
- 	    LD="${LD-ld} -m elf32lppclinux"
++	    LD="${LD-ld} -m elf_i386"
 +	    ;;
- 	  powerpc64-*linux*)
++	  ppc64-*linux*|powerpc64-*linux*)
 +	    LD="${LD-ld} -m elf32ppclinux"
 +	    ;;
 +	  s390x-*linux*)
 +	    LD="${LD-ld} -m elf_s390"
 +	    ;;
 +	  sparc64-*linux*)
 +	    LD="${LD-ld} -m elf32_sparc"
 +	    ;;
 +	esac
 +	;;
 +      *64-bit*)
 +	case $host in
 +	  x86_64-*kfreebsd*-gnu)
 +	    LD="${LD-ld} -m elf_x86_64_fbsd"
 +	    ;;
 +	  x86_64-*linux*)
 +	    LD="${LD-ld} -m elf_x86_64"
 +	    ;;
- 	  powerpcle-*linux*)
- 	    LD="${LD-ld} -m elf64lppc"
- 	    ;;
- 	  powerpc-*linux*)
++	  ppc*-*linux*|powerpc*-*linux*)
 +	    LD="${LD-ld} -m elf64ppc"
 +	    ;;
 +	  s390*-*linux*|s390*-*tpf*)
 +	    LD="${LD-ld} -m elf64_s390"
 +	    ;;
 +	  sparc*-*linux*)
 +	    LD="${LD-ld} -m elf64_sparc"
 +	    ;;
 +	esac
 +	;;
 +    esac
 +  fi
 +  rm -rf conftest*
 +  ;;
 +
 +*-*-sco3.2v5*)
 +  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-   SAVE_CFLAGS=$CFLAGS
++  SAVE_CFLAGS="$CFLAGS"
 +  CFLAGS="$CFLAGS -belf"
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
 +$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
 +if ${lt_cv_cc_needs_belf+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  ac_ext=c
 +ac_cpp='$CPP $CPPFLAGS'
 +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 +ac_compiler_gnu=$ac_cv_c_compiler_gnu
 +
 +     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +
 +int
 +main ()
 +{
 +
 +  ;
 +  return 0;
 +}
 +_ACEOF
 +if ac_fn_c_try_link "$LINENO"; then :
 +  lt_cv_cc_needs_belf=yes
 +else
 +  lt_cv_cc_needs_belf=no
 +fi
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext conftest.$ac_ext
 +     ac_ext=c
 +ac_cpp='$CPP $CPPFLAGS'
 +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 +ac_compiler_gnu=$ac_cv_c_compiler_gnu
 +
 +fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
 +$as_echo "$lt_cv_cc_needs_belf" >&6; }
-   if test yes != "$lt_cv_cc_needs_belf"; then
++  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
 +    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-     CFLAGS=$SAVE_CFLAGS
++    CFLAGS="$SAVE_CFLAGS"
 +  fi
 +  ;;
 +*-*solaris*)
-   # Find out what ABI is being produced by ac_compile, and set linker
-   # options accordingly.
++  # Find out which ABI we are using.
 +  echo 'int i;' > conftest.$ac_ext
 +  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 +  test $ac_status = 0; }; then
 +    case `/usr/bin/file conftest.o` in
 +    *64-bit*)
 +      case $lt_cv_prog_gnu_ld in
 +      yes*)
 +        case $host in
-         i?86-*-solaris*|x86_64-*-solaris*)
++        i?86-*-solaris*)
 +          LD="${LD-ld} -m elf_x86_64"
 +          ;;
 +        sparc*-*-solaris*)
 +          LD="${LD-ld} -m elf64_sparc"
 +          ;;
 +        esac
 +        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
 +        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
-           LD=${LD-ld}_sol2
++          LD="${LD-ld}_sol2"
 +        fi
 +        ;;
 +      *)
 +	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
 +	  LD="${LD-ld} -64"
 +	fi
 +	;;
 +      esac
 +      ;;
 +    esac
 +  fi
 +  rm -rf conftest*
 +  ;;
 +esac
 +
- need_locks=$enable_libtool_lock
++need_locks="$enable_libtool_lock"
 +
 +if test -n "$ac_tool_prefix"; then
 +  # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
 +set dummy ${ac_tool_prefix}mt; ac_word=$2
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
 +if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  if test -n "$MANIFEST_TOOL"; then
 +  ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
 +else
 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +for as_dir in $PATH
 +do
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +    for ac_exec_ext in '' $ac_executable_extensions; do
 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 +    ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
 +  fi
 +done
 +  done
 +IFS=$as_save_IFS
 +
 +fi
 +fi
 +MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
 +if test -n "$MANIFEST_TOOL"; then
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
 +$as_echo "$MANIFEST_TOOL" >&6; }
 +else
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
 +fi
 +
 +
 +fi
 +if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
 +  ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
 +  # Extract the first word of "mt", so it can be a program name with args.
 +set dummy mt; ac_word=$2
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
 +if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  if test -n "$ac_ct_MANIFEST_TOOL"; then
 +  ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
 +else
 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +for as_dir in $PATH
 +do
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +    for ac_exec_ext in '' $ac_executable_extensions; do
 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 +    ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
 +  fi
 +done
 +  done
 +IFS=$as_save_IFS
 +
 +fi
 +fi
 +ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
 +if test -n "$ac_ct_MANIFEST_TOOL"; then
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
 +$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
 +else
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
 +fi
 +
 +  if test "x$ac_ct_MANIFEST_TOOL" = x; then
 +    MANIFEST_TOOL=":"
 +  else
 +    case $cross_compiling:$ac_tool_warned in
 +yes:)
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 +ac_tool_warned=yes ;;
 +esac
 +    MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
 +  fi
 +else
 +  MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
 +fi
 +
 +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
 +$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
 +if ${lt_cv_path_mainfest_tool+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  lt_cv_path_mainfest_tool=no
 +  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
 +  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
 +  cat conftest.err >&5
 +  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
 +    lt_cv_path_mainfest_tool=yes
 +  fi
 +  rm -f conftest*
 +fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
 +$as_echo "$lt_cv_path_mainfest_tool" >&6; }
- if test yes != "$lt_cv_path_mainfest_tool"; then
++if test "x$lt_cv_path_mainfest_tool" != xyes; then
 +  MANIFEST_TOOL=:
 +fi
 +
 +
 +
 +
 +
 +
 +  case $host_os in
 +    rhapsody* | darwin*)
 +    if test -n "$ac_tool_prefix"; then
 +  # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
 +set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
 +if ${ac_cv_prog_DSYMUTIL+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  if test -n "$DSYMUTIL"; then
 +  ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
 +else
 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +for as_dir in $PATH
 +do
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +    for ac_exec_ext in '' $ac_executable_extensions; do
 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 +    ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
 +  fi
 +done
 +  done
 +IFS=$as_save_IFS
 +
 +fi
 +fi
 +DSYMUTIL=$ac_cv_prog_DSYMUTIL
 +if test -n "$DSYMUTIL"; then
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
 +$as_echo "$DSYMUTIL" >&6; }
 +else
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
 +fi
 +
 +
 +fi
 +if test -z "$ac_cv_prog_DSYMUTIL"; then
 +  ac_ct_DSYMUTIL=$DSYMUTIL
 +  # Extract the first word of "dsymutil", so it can be a program name with args.
 +set dummy dsymutil; ac_word=$2
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
 +if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  if test -n "$ac_ct_DSYMUTIL"; then
 +  ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
 +else
 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +for as_dir in $PATH
 +do
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +    for ac_exec_ext in '' $ac_executable_extensions; do
 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 +    ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
 +  fi
 +done
 +  done
 +IFS=$as_save_IFS
 +
 +fi
 +fi
 +ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
 +if test -n "$ac_ct_DSYMUTIL"; then
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
 +$as_echo "$ac_ct_DSYMUTIL" >&6; }
 +else
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
 +fi
 +
 +  if test "x$ac_ct_DSYMUTIL" = x; then
 +    DSYMUTIL=":"
 +  else
 +    case $cross_compiling:$ac_tool_warned in
 +yes:)
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 +ac_tool_warned=yes ;;
 +esac
 +    DSYMUTIL=$ac_ct_DSYMUTIL
 +  fi
 +else
 +  DSYMUTIL="$ac_cv_prog_DSYMUTIL"
 +fi
 +
 +    if test -n "$ac_tool_prefix"; then
 +  # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
 +set dummy ${ac_tool_prefix}nmedit; ac_word=$2
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
 +if ${ac_cv_prog_NMEDIT+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  if test -n "$NMEDIT"; then
 +  ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
 +else
 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +for as_dir in $PATH
 +do
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +    for ac_exec_ext in '' $ac_executable_extensions; do
 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 +    ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
 +  fi
 +done
 +  done
 +IFS=$as_save_IFS
 +
 +fi
 +fi
 +NMEDIT=$ac_cv_prog_NMEDIT
 +if test -n "$NMEDIT"; then
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
 +$as_echo "$NMEDIT" >&6; }
 +else
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
 +fi
 +
 +
 +fi
 +if test -z "$ac_cv_prog_NMEDIT"; then
 +  ac_ct_NMEDIT=$NMEDIT
 +  # Extract the first word of "nmedit", so it can be a program name with args.
 +set dummy nmedit; ac_word=$2
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
 +if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  if test -n "$ac_ct_NMEDIT"; then
 +  ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
 +else
 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +for as_dir in $PATH
 +do
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +    for ac_exec_ext in '' $ac_executable_extensions; do
 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 +    ac_cv_prog_ac_ct_NMEDIT="nmedit"
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
 +  fi
 +done
 +  done
 +IFS=$as_save_IFS
 +
 +fi
 +fi
 +ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
 +if test -n "$ac_ct_NMEDIT"; then
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
 +$as_echo "$ac_ct_NMEDIT" >&6; }
 +else
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
 +fi
 +
 +  if test "x$ac_ct_NMEDIT" = x; then
 +    NMEDIT=":"
 +  else
 +    case $cross_compiling:$ac_tool_warned in
 +yes:)
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 +ac_tool_warned=yes ;;
 +esac
 +    NMEDIT=$ac_ct_NMEDIT
 +  fi
 +else
 +  NMEDIT="$ac_cv_prog_NMEDIT"
 +fi
 +
 +    if test -n "$ac_tool_prefix"; then
 +  # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
 +set dummy ${ac_tool_prefix}lipo; ac_word=$2
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
 +if ${ac_cv_prog_LIPO+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  if test -n "$LIPO"; then
 +  ac_cv_prog_LIPO="$LIPO" # Let the user override the test.
 +else
 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +for as_dir in $PATH
 +do
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +    for ac_exec_ext in '' $ac_executable_extensions; do
 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 +    ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
 +  fi
 +done
 +  done
 +IFS=$as_save_IFS
 +
 +fi
 +fi
 +LIPO=$ac_cv_prog_LIPO
 +if test -n "$LIPO"; then
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
 +$as_echo "$LIPO" >&6; }
 +else
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
 +fi
 +
 +
 +fi
 +if test -z "$ac_cv_prog_LIPO"; then
 +  ac_ct_LIPO=$LIPO
 +  # Extract the first word of "lipo", so it can be a program name with args.
 +set dummy lipo; ac_word=$2
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
 +if ${ac_cv_prog_ac_ct_LIPO+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  if test -n "$ac_ct_LIPO"; then
 +  ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test.
 +else
 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +for as_dir in $PATH
 +do
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +    for ac_exec_ext in '' $ac_executable_extensions; do
 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 +    ac_cv_prog_ac_ct_LIPO="lipo"
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
 +  fi
 +done
 +  done
 +IFS=$as_save_IFS
 +
 +fi
 +fi
 +ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
 +if test -n "$ac_ct_LIPO"; then
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
 +$as_echo "$ac_ct_LIPO" >&6; }
 +else
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
 +fi
 +
 +  if test "x$ac_ct_LIPO" = x; then
 +    LIPO=":"
 +  else
 +    case $cross_compiling:$ac_tool_warned in
 +yes:)
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 +ac_tool_warned=yes ;;
 +esac
 +    LIPO=$ac_ct_LIPO
 +  fi
 +else
 +  LIPO="$ac_cv_prog_LIPO"
 +fi
 +
 +    if test -n "$ac_tool_prefix"; then
 +  # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
 +set dummy ${ac_tool_prefix}otool; ac_word=$2
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
 +if ${ac_cv_prog_OTOOL+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  if test -n "$OTOOL"; then
 +  ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test.
 +else
 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +for as_dir in $PATH
 +do
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +    for ac_exec_ext in '' $ac_executable_extensions; do
 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 +    ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
 +  fi
 +done
 +  done
 +IFS=$as_save_IFS
 +
 +fi
 +fi
 +OTOOL=$ac_cv_prog_OTOOL
 +if test -n "$OTOOL"; then
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
 +$as_echo "$OTOOL" >&6; }
 +else
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
 +fi
 +
 +
 +fi
 +if test -z "$ac_cv_prog_OTOOL"; then
 +  ac_ct_OTOOL=$OTOOL
 +  # Extract the first word of "otool", so it can be a program name with args.
 +set dummy otool; ac_word=$2
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
 +if ${ac_cv_prog_ac_ct_OTOOL+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  if test -n "$ac_ct_OTOOL"; then
 +  ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test.
 +else
 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +for as_dir in $PATH
 +do
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +    for ac_exec_ext in '' $ac_executable_extensions; do
 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 +    ac_cv_prog_ac_ct_OTOOL="otool"
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
 +  fi
 +done
 +  done
 +IFS=$as_save_IFS
 +
 +fi
 +fi
 +ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
 +if test -n "$ac_ct_OTOOL"; then
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
 +$as_echo "$ac_ct_OTOOL" >&6; }
 +else
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
 +fi
 +
 +  if test "x$ac_ct_OTOOL" = x; then
 +    OTOOL=":"
 +  else
 +    case $cross_compiling:$ac_tool_warned in
 +yes:)
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 +ac_tool_warned=yes ;;
 +esac
 +    OTOOL=$ac_ct_OTOOL
 +  fi
 +else
 +  OTOOL="$ac_cv_prog_OTOOL"
 +fi
 +
 +    if test -n "$ac_tool_prefix"; then
 +  # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
 +set dummy ${ac_tool_prefix}otool64; ac_word=$2
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
 +if ${ac_cv_prog_OTOOL64+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  if test -n "$OTOOL64"; then
 +  ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test.
 +else
 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +for as_dir in $PATH
 +do
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +    for ac_exec_ext in '' $ac_executable_extensions; do
 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 +    ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
 +  fi
 +done
 +  done
 +IFS=$as_save_IFS
 +
 +fi
 +fi
 +OTOOL64=$ac_cv_prog_OTOOL64
 +if test -n "$OTOOL64"; then
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
 +$as_echo "$OTOOL64" >&6; }
 +else
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
 +fi
 +
 +
 +fi
 +if test -z "$ac_cv_prog_OTOOL64"; then
 +  ac_ct_OTOOL64=$OTOOL64
 +  # Extract the first word of "otool64", so it can be a program name with args.
 +set dummy otool64; ac_word=$2
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 +$as_echo_n "checking for $ac_word... " >&6; }
 +if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  if test -n "$ac_ct_OTOOL64"; then
 +  ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test.
 +else
 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +for as_dir in $PATH
 +do
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +    for ac_exec_ext in '' $ac_executable_extensions; do
 +  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
 +    ac_cv_prog_ac_ct_OTOOL64="otool64"
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
 +  fi
 +done
 +  done
 +IFS=$as_save_IFS
 +
 +fi
 +fi
 +ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
 +if test -n "$ac_ct_OTOOL64"; then
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
 +$as_echo "$ac_ct_OTOOL64" >&6; }
 +else
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
 +fi
 +
 +  if test "x$ac_ct_OTOOL64" = x; then
 +    OTOOL64=":"
 +  else
 +    case $cross_compiling:$ac_tool_warned in
 +yes:)
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 +ac_tool_warned=yes ;;
 +esac
 +    OTOOL64=$ac_ct_OTOOL64
 +  fi
 +else
 +  OTOOL64="$ac_cv_prog_OTOOL64"
 +fi
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
 +$as_echo_n "checking for -single_module linker flag... " >&6; }
 +if ${lt_cv_apple_cc_single_mod+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  lt_cv_apple_cc_single_mod=no
-       if test -z "$LT_MULTI_MODULE"; then
++      if test -z "${LT_MULTI_MODULE}"; then
 +	# By default we will add the -single_module flag. You can override
 +	# by either setting the environment variable LT_MULTI_MODULE
 +	# non-empty at configure time, or by adding -multi_module to the
 +	# link flags.
 +	rm -rf libconftest.dylib*
 +	echo "int foo(void){return 1;}" > conftest.c
 +	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
 +-dynamiclib -Wl,-single_module conftest.c" >&5
 +	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
 +	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
 +        _lt_result=$?
 +	# If there is a non-empty error log, and "single_module"
 +	# appears in it, assume the flag caused a linker warning
 +        if test -s conftest.err && $GREP single_module conftest.err; then
 +	  cat conftest.err >&5
 +	# Otherwise, if the output was created with a 0 exit code from
 +	# the compiler, it worked.
- 	elif test -f libconftest.dylib && test 0 = "$_lt_result"; then
++	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
 +	  lt_cv_apple_cc_single_mod=yes
 +	else
 +	  cat conftest.err >&5
 +	fi
 +	rm -rf libconftest.dylib*
 +	rm -f conftest.*
 +      fi
 +fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
 +$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
 +
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
 +$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
 +if ${lt_cv_ld_exported_symbols_list+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  lt_cv_ld_exported_symbols_list=no
 +      save_LDFLAGS=$LDFLAGS
 +      echo "_main" > conftest.sym
 +      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
 +      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +
 +int
 +main ()
 +{
 +
 +  ;
 +  return 0;
 +}
 +_ACEOF
 +if ac_fn_c_try_link "$LINENO"; then :
 +  lt_cv_ld_exported_symbols_list=yes
 +else
 +  lt_cv_ld_exported_symbols_list=no
 +fi
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext conftest.$ac_ext
- 	LDFLAGS=$save_LDFLAGS
++	LDFLAGS="$save_LDFLAGS"
 +
 +fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
 +$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
 +
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
 +$as_echo_n "checking for -force_load linker flag... " >&6; }
 +if ${lt_cv_ld_force_load+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  lt_cv_ld_force_load=no
 +      cat > conftest.c << _LT_EOF
 +int forced_loaded() { return 2;}
 +_LT_EOF
 +      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5
 +      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
 +      echo "$AR cru libconftest.a conftest.o" >&5
 +      $AR cru libconftest.a conftest.o 2>&5
 +      echo "$RANLIB libconftest.a" >&5
 +      $RANLIB libconftest.a 2>&5
 +      cat > conftest.c << _LT_EOF
 +int main() { return 0;}
 +_LT_EOF
 +      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
 +      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
 +      _lt_result=$?
 +      if test -s conftest.err && $GREP force_load conftest.err; then
 +	cat conftest.err >&5
-       elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then
++      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
 +	lt_cv_ld_force_load=yes
 +      else
 +	cat conftest.err >&5
 +      fi
 +        rm -f conftest.err libconftest.a conftest conftest.c
 +        rm -rf conftest.dSYM
 +
 +fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
 +$as_echo "$lt_cv_ld_force_load" >&6; }
 +    case $host_os in
 +    rhapsody* | darwin1.[012])
-       _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
++      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
 +    darwin1.*)
-       _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
++      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
 +    darwin*) # darwin 5.x on
 +      # if running on 10.5 or later, the deployment target defaults
 +      # to the OS version, if on x86, and 10.4, the deployment
 +      # target defaults to 10.4. Don't you love it?
 +      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
 +	10.0,*86*-darwin8*|10.0,*-darwin[91]*)
- 	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
- 	10.[012][,.]*)
- 	  _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
++	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
++	10.[012]*)
++	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
 +	10.*)
- 	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
++	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
 +      esac
 +    ;;
 +  esac
-     if test yes = "$lt_cv_apple_cc_single_mod"; then
++    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
 +      _lt_dar_single_mod='$single_module'
 +    fi
-     if test yes = "$lt_cv_ld_exported_symbols_list"; then
-       _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym'
++    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
++      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
 +    else
-       _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib'
++      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
 +    fi
-     if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then
++    if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
 +      _lt_dsymutil='~$DSYMUTIL $lib || :'
 +    else
 +      _lt_dsymutil=
 +    fi
 +    ;;
 +  esac
 +
- # func_munge_path_list VARIABLE PATH
- # -----------------------------------
- # VARIABLE is name of variable containing _space_ separated list of
- # directories to be munged by the contents of PATH, which is string
- # having a format:
- # "DIR[:DIR]:"
- #       string "DIR[ DIR]" will be prepended to VARIABLE
- # ":DIR[:DIR]"
- #       string "DIR[ DIR]" will be appended to VARIABLE
- # "DIRP[:DIRP]::[DIRA:]DIRA"
- #       string "DIRP[ DIRP]" will be prepended to VARIABLE and string
- #       "DIRA[ DIRA]" will be appended to VARIABLE
- # "DIR[:DIR]"
- #       VARIABLE will be replaced by "DIR[ DIR]"
- func_munge_path_list ()
- {
-     case x$2 in
-     x)
-         ;;
-     *:)
-         eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
-         ;;
-     x:*)
-         eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
-         ;;
-     *::*)
-         eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
-         eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\"
-         ;;
-     *)
-         eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\"
-         ;;
-     esac
- }
- 
 +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
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
 +$as_echo_n "checking how to run the C preprocessor... " >&6; }
 +# On Suns, sometimes $CPP names a directory.
 +if test -n "$CPP" && test -d "$CPP"; then
 +  CPP=
 +fi
 +if test -z "$CPP"; then
 +  if ${ac_cv_prog_CPP+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +      # Double quotes because CPP needs to be expanded
 +    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
 +    do
 +      ac_preproc_ok=false
 +for ac_c_preproc_warn_flag in '' yes
 +do
 +  # Use a header file that comes with gcc, so configuring glibc
 +  # with a fresh cross-compiler works.
 +  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 +  # <limits.h> exists even on freestanding compilers.
 +  # On the NeXT, cc -E runs the code through the compiler's parser,
 +  # not just through cpp. "Syntax error" is here to catch this case.
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +#ifdef __STDC__
 +# include <limits.h>
 +#else
 +# include <assert.h>
 +#endif
 +		     Syntax error
 +_ACEOF
 +if ac_fn_c_try_cpp "$LINENO"; then :
 +
 +else
 +  # Broken: fails on valid input.
 +continue
 +fi
 +rm -f conftest.err conftest.i conftest.$ac_ext
 +
 +  # OK, works on sane cases.  Now check whether nonexistent headers
 +  # can be detected and how.
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +#include <ac_nonexistent.h>
 +_ACEOF
 +if ac_fn_c_try_cpp "$LINENO"; then :
 +  # Broken: success on invalid input.
 +continue
 +else
 +  # Passes both tests.
 +ac_preproc_ok=:
 +break
 +fi
 +rm -f conftest.err conftest.i conftest.$ac_ext
 +
 +done
 +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 +rm -f conftest.i conftest.err conftest.$ac_ext
 +if $ac_preproc_ok; then :
 +  break
 +fi
 +
 +    done
 +    ac_cv_prog_CPP=$CPP
 +
 +fi
 +  CPP=$ac_cv_prog_CPP
 +else
 +  ac_cv_prog_CPP=$CPP
 +fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
 +$as_echo "$CPP" >&6; }
 +ac_preproc_ok=false
 +for ac_c_preproc_warn_flag in '' yes
 +do
 +  # Use a header file that comes with gcc, so configuring glibc
 +  # with a fresh cross-compiler works.
 +  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 +  # <limits.h> exists even on freestanding compilers.
 +  # On the NeXT, cc -E runs the code through the compiler's parser,
 +  # not just through cpp. "Syntax error" is here to catch this case.
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +#ifdef __STDC__
 +# include <limits.h>
 +#else
 +# include <assert.h>
 +#endif
 +		     Syntax error
 +_ACEOF
 +if ac_fn_c_try_cpp "$LINENO"; then :
 +
 +else
 +  # Broken: fails on valid input.
 +continue
 +fi
 +rm -f conftest.err conftest.i conftest.$ac_ext
 +
 +  # OK, works on sane cases.  Now check whether nonexistent headers
 +  # can be detected and how.
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +#include <ac_nonexistent.h>
 +_ACEOF
 +if ac_fn_c_try_cpp "$LINENO"; then :
 +  # Broken: success on invalid input.
 +continue
 +else
 +  # Passes both tests.
 +ac_preproc_ok=:
 +break
 +fi
 +rm -f conftest.err conftest.i conftest.$ac_ext
 +
 +done
 +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 +rm -f conftest.i conftest.err conftest.$ac_ext
 +if $ac_preproc_ok; then :
 +
 +else
 +  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
 +See \`config.log' for more details" "$LINENO" 5; }
 +fi
 +
 +ac_ext=c
 +ac_cpp='$CPP $CPPFLAGS'
 +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 +ac_compiler_gnu=$ac_cv_c_compiler_gnu
 +
 +
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
 +$as_echo_n "checking for ANSI C header files... " >&6; }
 +if ${ac_cv_header_stdc+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +#include <stdlib.h>
 +#include <stdarg.h>
 +#include <string.h>
 +#include <float.h>
 +
 +int
 +main ()
 +{
 +
 +  ;
 +  return 0;
 +}
 +_ACEOF
 +if ac_fn_c_try_compile "$LINENO"; then :
 +  ac_cv_header_stdc=yes
 +else
 +  ac_cv_header_stdc=no
 +fi
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +
 +if test $ac_cv_header_stdc = yes; then
 +  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +#include <string.h>
 +
 +_ACEOF
 +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 +  $EGREP "memchr" >/dev/null 2>&1; then :
 +
 +else
 +  ac_cv_header_stdc=no
 +fi
 +rm -f conftest*
 +
 +fi
 +
 +if test $ac_cv_header_stdc = yes; then
 +  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +#include <stdlib.h>
 +
 +_ACEOF
 +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 +  $EGREP "free" >/dev/null 2>&1; then :
 +
 +else
 +  ac_cv_header_stdc=no
 +fi
 +rm -f conftest*
 +
 +fi
 +
 +if test $ac_cv_header_stdc = yes; then
 +  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
 +  if test "$cross_compiling" = yes; then :
 +  :
 +else
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +#include <ctype.h>
 +#include <stdlib.h>
 +#if ((' ' & 0x0FF) == 0x020)
 +# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
 +# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
 +#else
 +# define ISLOWER(c) \
 +		   (('a' <= (c) && (c) <= 'i') \
 +		     || ('j' <= (c) && (c) <= 'r') \
 +		     || ('s' <= (c) && (c) <= 'z'))
 +# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
 +#endif
 +
 +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
 +int
 +main ()
 +{
 +  int i;
 +  for (i = 0; i < 256; i++)
 +    if (XOR (islower (i), ISLOWER (i))
 +	|| toupper (i) != TOUPPER (i))
 +      return 2;
 +  return 0;
 +}
 +_ACEOF
 +if ac_fn_c_try_run "$LINENO"; then :
 +
 +else
 +  ac_cv_header_stdc=no
 +fi
 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
 +  conftest.$ac_objext conftest.beam conftest.$ac_ext
 +fi
 +
 +fi
 +fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
 +$as_echo "$ac_cv_header_stdc" >&6; }
 +if test $ac_cv_header_stdc = yes; then
 +
 +$as_echo "#define STDC_HEADERS 1" >>confdefs.h
 +
 +fi
 +
 +# On IRIX 5.3, sys/types and inttypes.h are conflicting.
 +for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
 +		  inttypes.h stdint.h unistd.h
 +do :
 +  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 +ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
 +"
 +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
 +  cat >>confdefs.h <<_ACEOF
 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 +_ACEOF
 +
 +fi
 +
 +done
 +
 +
 +for ac_header in dlfcn.h
 +do :
 +  ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
 +"
 +if test "x$ac_cv_header_dlfcn_h" = xyes; then :
 +  cat >>confdefs.h <<_ACEOF
 +#define HAVE_DLFCN_H 1
 +_ACEOF
 +
 +fi
 +
 +done
 +
 +
 +
 +
 +
 +# Set options
 +
 +
 +
 +        enable_dlopen=no
 +
 +
 +  enable_win32_dll=no
 +
 +
 +            # Check whether --enable-shared was given.
 +if test "${enable_shared+set}" = set; then :
 +  enableval=$enable_shared; p=${PACKAGE-default}
 +    case $enableval in
 +    yes) enable_shared=yes ;;
 +    no) enable_shared=no ;;
 +    *)
 +      enable_shared=no
 +      # Look at the argument we got.  We use all the common list separators.
-       lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
++      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
 +      for pkg in $enableval; do
- 	IFS=$lt_save_ifs
++	IFS="$lt_save_ifs"
 +	if test "X$pkg" = "X$p"; then
 +	  enable_shared=yes
 +	fi
 +      done
-       IFS=$lt_save_ifs
++      IFS="$lt_save_ifs"
 +      ;;
 +    esac
 +else
 +  enable_shared=yes
 +fi
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +# Check whether --with-pic was given.
 +if test "${with_pic+set}" = set; then :
 +  withval=$with_pic; lt_p=${PACKAGE-default}
 +    case $withval in
 +    yes|no) pic_mode=$withval ;;
 +    *)
 +      pic_mode=default
 +      # Look at the argument we got.  We use all the common list separators.
-       lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
++      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
 +      for lt_pkg in $withval; do
- 	IFS=$lt_save_ifs
++	IFS="$lt_save_ifs"
 +	if test "X$lt_pkg" = "X$lt_p"; then
 +	  pic_mode=yes
 +	fi
 +      done
-       IFS=$lt_save_ifs
++      IFS="$lt_save_ifs"
 +      ;;
 +    esac
 +else
 +  pic_mode=default
 +fi
 +
 +
++test -z "$pic_mode" && pic_mode=default
++
 +
 +
 +
 +
 +
 +
 +  # Check whether --enable-fast-install was given.
 +if test "${enable_fast_install+set}" = set; then :
 +  enableval=$enable_fast_install; p=${PACKAGE-default}
 +    case $enableval in
 +    yes) enable_fast_install=yes ;;
 +    no) enable_fast_install=no ;;
 +    *)
 +      enable_fast_install=no
 +      # Look at the argument we got.  We use all the common list separators.
-       lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
++      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
 +      for pkg in $enableval; do
- 	IFS=$lt_save_ifs
++	IFS="$lt_save_ifs"
 +	if test "X$pkg" = "X$p"; then
 +	  enable_fast_install=yes
 +	fi
 +      done
-       IFS=$lt_save_ifs
++      IFS="$lt_save_ifs"
 +      ;;
 +    esac
 +else
 +  enable_fast_install=yes
 +fi
 +
 +
 +
 +
 +
 +
 +
 +
-   shared_archive_member_spec=
- case $host,$enable_shared in
- power*-*-aix[5-9]*,yes)
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5
- $as_echo_n "checking which variant of shared library versioning to provide... " >&6; }
- 
- # Check whether --with-aix-soname was given.
- if test "${with_aix_soname+set}" = set; then :
-   withval=$with_aix_soname; case $withval in
-     aix|svr4|both)
-       ;;
-     *)
-       as_fn_error $? "Unknown argument to --with-aix-soname" "$LINENO" 5
-       ;;
-     esac
-     lt_cv_with_aix_soname=$with_aix_soname
- else
-   if ${lt_cv_with_aix_soname+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   lt_cv_with_aix_soname=aix
- fi
- 
-     with_aix_soname=$lt_cv_with_aix_soname
- fi
- 
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5
- $as_echo "$with_aix_soname" >&6; }
-   if test aix != "$with_aix_soname"; then
-     # For the AIX way of multilib, we name the shared archive member
-     # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
-     # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File.
-     # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag,
-     # the AIX toolchain works better with OBJECT_MODE set (default 32).
-     if test 64 = "${OBJECT_MODE-32}"; then
-       shared_archive_member_spec=shr_64
-     else
-       shared_archive_member_spec=shr
-     fi
-   fi
-   ;;
- *)
-   with_aix_soname=aix
-   ;;
- esac
- 
- 
- 
- 
- 
- 
- 
 +
 +
 +
 +# This can be used to rebuild libtool when needed
- LIBTOOL_DEPS=$ltmain
++LIBTOOL_DEPS="$ltmain"
 +
 +# Always use our own libtool.
 +LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +test -z "$LN_S" && LN_S="ln -s"
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
- if test -n "${ZSH_VERSION+set}"; then
++if test -n "${ZSH_VERSION+set}" ; then
 +   setopt NO_GLOB_SUBST
 +fi
 +
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
 +$as_echo_n "checking for objdir... " >&6; }
 +if ${lt_cv_objdir+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  rm -f .libs 2>/dev/null
 +mkdir .libs 2>/dev/null
 +if test -d .libs; then
 +  lt_cv_objdir=.libs
 +else
 +  # MS-DOS does not allow filenames that begin with a dot.
 +  lt_cv_objdir=_libs
 +fi
 +rmdir .libs 2>/dev/null
 +fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
 +$as_echo "$lt_cv_objdir" >&6; }
 +objdir=$lt_cv_objdir
 +
 +
 +
 +
 +
 +cat >>confdefs.h <<_ACEOF
 +#define LT_OBJDIR "$lt_cv_objdir/"
 +_ACEOF
 +
 +
 +
 +
 +case $host_os in
 +aix3*)
 +  # AIX sometimes has problems with the GCC collect2 program.  For some
 +  # reason, if we set the COLLECT_NAMES environment variable, the problems
 +  # vanish in a puff of smoke.
-   if test set != "${COLLECT_NAMES+set}"; then
++  if test "X${COLLECT_NAMES+set}" != Xset; then
 +    COLLECT_NAMES=
 +    export COLLECT_NAMES
 +  fi
 +  ;;
 +esac
 +
 +# Global variables:
 +ofile=libtool
 +can_build_shared=yes
 +
- # All known linkers require a '.a' archive for static linking (except MSVC,
++# All known linkers require a `.a' archive for static linking (except MSVC,
 +# which needs '.lib').
 +libext=a
 +
- with_gnu_ld=$lt_cv_prog_gnu_ld
++with_gnu_ld="$lt_cv_prog_gnu_ld"
 +
- old_CC=$CC
- old_CFLAGS=$CFLAGS
++old_CC="$CC"
++old_CFLAGS="$CFLAGS"
 +
 +# Set sane defaults for various variables
 +test -z "$CC" && CC=cc
 +test -z "$LTCC" && LTCC=$CC
 +test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
 +test -z "$LD" && LD=ld
 +test -z "$ac_objext" && ac_objext=o
 +
- func_cc_basename $compiler
- cc_basename=$func_cc_basename_result
++for cc_temp in $compiler""; do
++  case $cc_temp in
++    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
++    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
++    \-*) ;;
++    *) break;;
++  esac
++done
++cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
 +
 +
 +# Only perform the check for file, if the check method requires it
 +test -z "$MAGIC_CMD" && MAGIC_CMD=file
 +case $deplibs_check_method in
 +file_magic*)
 +  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
 +$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
 +if ${lt_cv_path_MAGIC_CMD+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  case $MAGIC_CMD in
 +[\\/*] |  ?:[\\/]*)
-   lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
++  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
 +  ;;
 +*)
-   lt_save_MAGIC_CMD=$MAGIC_CMD
-   lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
++  lt_save_MAGIC_CMD="$MAGIC_CMD"
++  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
 +  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
 +  for ac_dir in $ac_dummy; do
-     IFS=$lt_save_ifs
++    IFS="$lt_save_ifs"
 +    test -z "$ac_dir" && ac_dir=.
-     if test -f "$ac_dir/${ac_tool_prefix}file"; then
-       lt_cv_path_MAGIC_CMD=$ac_dir/"${ac_tool_prefix}file"
++    if test -f $ac_dir/${ac_tool_prefix}file; then
++      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
 +      if test -n "$file_magic_test_file"; then
 +	case $deplibs_check_method in
 +	"file_magic "*)
 +	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
- 	  MAGIC_CMD=$lt_cv_path_MAGIC_CMD
++	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 +	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
 +	    $EGREP "$file_magic_regex" > /dev/null; then
 +	    :
 +	  else
 +	    cat <<_LT_EOF 1>&2
 +
 +*** Warning: the command libtool uses to detect shared libraries,
 +*** $file_magic_cmd, produces output that libtool cannot recognize.
 +*** The result is that libtool may fail to recognize shared libraries
 +*** as such.  This will affect the creation of libtool libraries that
 +*** depend on shared libraries, but programs linked with such libtool
 +*** libraries will work regardless of this problem.  Nevertheless, you
 +*** may want to report the problem to your system manager and/or to
 +*** bug-libtool at gnu.org
 +
 +_LT_EOF
 +	  fi ;;
 +	esac
 +      fi
 +      break
 +    fi
 +  done
-   IFS=$lt_save_ifs
-   MAGIC_CMD=$lt_save_MAGIC_CMD
++  IFS="$lt_save_ifs"
++  MAGIC_CMD="$lt_save_MAGIC_CMD"
 +  ;;
 +esac
 +fi
 +
- MAGIC_CMD=$lt_cv_path_MAGIC_CMD
++MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 +if test -n "$MAGIC_CMD"; then
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
 +$as_echo "$MAGIC_CMD" >&6; }
 +else
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
 +fi
 +
 +
 +
 +
 +
 +if test -z "$lt_cv_path_MAGIC_CMD"; then
 +  if test -n "$ac_tool_prefix"; then
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
 +$as_echo_n "checking for file... " >&6; }
 +if ${lt_cv_path_MAGIC_CMD+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  case $MAGIC_CMD in
 +[\\/*] |  ?:[\\/]*)
-   lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
++  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
 +  ;;
 +*)
-   lt_save_MAGIC_CMD=$MAGIC_CMD
-   lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
++  lt_save_MAGIC_CMD="$MAGIC_CMD"
++  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
 +  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
 +  for ac_dir in $ac_dummy; do
-     IFS=$lt_save_ifs
++    IFS="$lt_save_ifs"
 +    test -z "$ac_dir" && ac_dir=.
-     if test -f "$ac_dir/file"; then
-       lt_cv_path_MAGIC_CMD=$ac_dir/"file"
++    if test -f $ac_dir/file; then
++      lt_cv_path_MAGIC_CMD="$ac_dir/file"
 +      if test -n "$file_magic_test_file"; then
 +	case $deplibs_check_method in
 +	"file_magic "*)
 +	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
- 	  MAGIC_CMD=$lt_cv_path_MAGIC_CMD
++	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 +	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
 +	    $EGREP "$file_magic_regex" > /dev/null; then
 +	    :
 +	  else
 +	    cat <<_LT_EOF 1>&2
 +
 +*** Warning: the command libtool uses to detect shared libraries,
 +*** $file_magic_cmd, produces output that libtool cannot recognize.
 +*** The result is that libtool may fail to recognize shared libraries
 +*** as such.  This will affect the creation of libtool libraries that
 +*** depend on shared libraries, but programs linked with such libtool
 +*** libraries will work regardless of this problem.  Nevertheless, you
 +*** may want to report the problem to your system manager and/or to
 +*** bug-libtool at gnu.org
 +
 +_LT_EOF
 +	  fi ;;
 +	esac
 +      fi
 +      break
 +    fi
 +  done
-   IFS=$lt_save_ifs
-   MAGIC_CMD=$lt_save_MAGIC_CMD
++  IFS="$lt_save_ifs"
++  MAGIC_CMD="$lt_save_MAGIC_CMD"
 +  ;;
 +esac
 +fi
 +
- MAGIC_CMD=$lt_cv_path_MAGIC_CMD
++MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 +if test -n "$MAGIC_CMD"; then
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
 +$as_echo "$MAGIC_CMD" >&6; }
 +else
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
 +fi
 +
 +
 +  else
 +    MAGIC_CMD=:
 +  fi
 +fi
 +
 +  fi
 +  ;;
 +esac
 +
 +# Use C for the default configuration in the libtool script
 +
- lt_save_CC=$CC
++lt_save_CC="$CC"
 +ac_ext=c
 +ac_cpp='$CPP $CPPFLAGS'
 +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 +ac_compiler_gnu=$ac_cv_c_compiler_gnu
 +
 +
 +# Source file extension for C test sources.
 +ac_ext=c
 +
 +# Object file extension for compiled C test sources.
 +objext=o
 +objext=$objext
 +
 +# Code to be used in simple compile tests
 +lt_simple_compile_test_code="int some_variable = 0;"
 +
 +# Code to be used in simple link tests
 +lt_simple_link_test_code='int main(){return(0);}'
 +
 +
 +
 +
 +
 +
 +
 +# If no C compiler was specified, use CC.
 +LTCC=${LTCC-"$CC"}
 +
 +# If no C compiler flags were specified, use CFLAGS.
 +LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
 +
 +# Allow CC to be a program name with arguments.
 +compiler=$CC
 +
 +# Save the default compiler, since it gets overwritten when the other
 +# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
 +compiler_DEFAULT=$CC
 +
 +# save warnings/boilerplate of simple test code
 +ac_outfile=conftest.$ac_objext
 +echo "$lt_simple_compile_test_code" >conftest.$ac_ext
 +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 +_lt_compiler_boilerplate=`cat conftest.err`
 +$RM conftest*
 +
 +ac_outfile=conftest.$ac_objext
 +echo "$lt_simple_link_test_code" >conftest.$ac_ext
 +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 +_lt_linker_boilerplate=`cat conftest.err`
 +$RM -r conftest*
 +
 +
 +## CAVEAT EMPTOR:
 +## There is no encapsulation within the following macros, do not change
 +## the running order or otherwise move them around unless you know exactly
 +## what you are doing...
 +if test -n "$compiler"; then
 +
 +lt_prog_compiler_no_builtin_flag=
 +
- if test yes = "$GCC"; then
++if test "$GCC" = yes; then
 +  case $cc_basename in
 +  nvcc*)
 +    lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;;
 +  *)
 +    lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;;
 +  esac
 +
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
 +$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
 +if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  lt_cv_prog_compiler_rtti_exceptions=no
 +   ac_outfile=conftest.$ac_objext
 +   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-    lt_compiler_flag="-fno-rtti -fno-exceptions"  ## exclude from sc_useless_quotes_in_assignment
++   lt_compiler_flag="-fno-rtti -fno-exceptions"
 +   # Insert the option either (1) after the last *FLAGS variable, or
 +   # (2) before a word containing "conftest.", or (3) at the end.
 +   # Note that $ac_compile itself does not contain backslashes and begins
 +   # with a dollar sign (not a hyphen), so the echo should work correctly.
 +   # The option is referenced via a variable to avoid confusing sed.
 +   lt_compile=`echo "$ac_compile" | $SED \
 +   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
 +   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
 +   -e 's:$: $lt_compiler_flag:'`
 +   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
 +   (eval "$lt_compile" 2>conftest.err)
 +   ac_status=$?
 +   cat conftest.err >&5
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +   if (exit $ac_status) && test -s "$ac_outfile"; then
 +     # The compiler can only warn and ignore the option if not recognized
 +