[Pkg-privacy-commits] [torsocks] 32/38: Imported Upstream version 2.2.0~rc1

Intrigeri intrigeri at moszumanska.debian.org
Thu Jun 23 15:18:25 UTC 2016


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

intrigeri pushed a commit to branch experimental/master
in repository torsocks.

commit abfa230b1e3a7795cc538fe49cc231b38564f344
Merge: de1f71a bcf6ae8
Author: intrigeri <intrigeri at boum.org>
Date:   Thu Jun 23 07:32:36 2016 +0000

    Imported Upstream version 2.2.0~rc1

 ChangeLog                    |   32 +
 Makefile.in                  |   57 +-
 aclocal.m4                   |   62 +-
 config/libtool.m4            | 2521 +++++++++++--------
 config/ltmain.sh             | 5533 +++++++++++++++++++++++++++---------------
 config/ltoptions.m4          |  127 +-
 config/ltversion.m4          |   12 +-
 config/test-driver           |  148 ++
 configure                    | 2139 +++++++++-------
 configure.ac                 |    4 +-
 doc/Makefile.in              |   28 +-
 doc/torsocks.1               |    6 +
 doc/torsocks.8               |    8 +
 doc/torsocks.conf            |    4 +-
 doc/torsocks.conf.5          |    7 +-
 extras/Makefile.in           |   24 +-
 include/config.h.in          |    3 +-
 src/Makefile.in              |   24 +-
 src/bin/Makefile.in          |   25 +-
 src/bin/torsocks.in          |   61 +-
 src/common/Makefile.in       |   25 +-
 src/common/compat.c          |    5 +-
 src/common/compat.h          |    9 +-
 src/common/config-file.c     |  164 +-
 src/common/config-file.h     |    4 +-
 src/common/connection.c      |    2 +-
 src/common/defaults.h        |    4 +
 src/common/log.c             |    4 +-
 src/common/onion.c           |    6 +-
 src/common/ref.h             |    5 +-
 src/common/socks5.c          |   35 +-
 src/common/utils.c           |   37 +-
 src/lib/Makefile.am          |    2 +-
 src/lib/Makefile.in          |   30 +-
 src/lib/accept.c             |   15 +-
 src/lib/connect.c            |   14 +-
 src/lib/execve.c             |   82 +
 src/lib/recv.c               |    6 +-
 src/lib/sendto.c             |    8 +-
 src/lib/socket.c             |   10 +
 src/lib/torsocks.c           |   35 +-
 src/lib/torsocks.h           |   37 +-
 tests/Makefile.am            |   31 +-
 tests/Makefile.in            |  465 +++-
 tests/run.sh                 |   21 -
 tests/test_dns.c             |    6 +-
 tests/test_fd_passing.c      |   13 +-
 tests/test_list              |   11 -
 tests/unit/Makefile.am       |   12 +
 tests/unit/Makefile.in       |  469 +++-
 tests/unit/test_connection.c |    6 +
 tests/unit/test_socks5.c     |    2 +-
 tests/utils/Makefile.in      |   24 +-
 tests/utils/tap/Makefile.in  |   26 +-
 54 files changed, 8073 insertions(+), 4377 deletions(-)

diff --cc Makefile.in
index 26f0465,0000000..c860532
mode 100644,000000..100644
--- a/Makefile.in
+++ b/Makefile.in
@@@ -1,871 -1,0 +1,884 @@@
- # Makefile.in generated by automake 1.14.1 from Makefile.am.
++# Makefile.in generated by automake 1.15 from Makefile.am.
 +# @configure_input@
 +
- # Copyright (C) 1994-2013 Free Software Foundation, Inc.
++# Copyright (C) 1994-2014 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@
 +
 +VPATH = @srcdir@
- am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
++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__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@
 +target_triplet = @target@
 +subdir = .
- DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- 	$(top_srcdir)/configure $(am__configure_deps) \
- 	$(top_srcdir)/include/config.h.in $(dist_doc_DATA) ChangeLog \
- 	INSTALL TODO config/compile config/config.guess \
- 	config/config.sub config/depcomp config/install-sh \
- 	config/missing config/ltmain.sh $(top_srcdir)/config/compile \
- 	$(top_srcdir)/config/config.guess \
- 	$(top_srcdir)/config/config.sub \
- 	$(top_srcdir)/config/install-sh $(top_srcdir)/config/ltmain.sh \
- 	$(top_srcdir)/config/missing
 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 +am__aclocal_m4_deps = $(top_srcdir)/config/ax_check_compile_flag.m4 \
 +	$(top_srcdir)/config/ax_check_link_flag.m4 \
 +	$(top_srcdir)/config/libtool.m4 \
 +	$(top_srcdir)/config/ltoptions.m4 \
 +	$(top_srcdir)/config/ltsugar.m4 \
 +	$(top_srcdir)/config/ltversion.m4 \
 +	$(top_srcdir)/config/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) $(dist_doc_DATA) $(am__DIST_COMMON)
 +am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
 + configure.lineno config.status.lineno
 +mkinstalldirs = $(install_sh) -d
 +CONFIG_HEADER = $(top_builddir)/include/config.h
 +CONFIG_CLEAN_FILES =
 +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)$(docdir)"
 +DATA = $(dist_doc_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)
 +# 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 $(top_srcdir)/config/compile \
++	$(top_srcdir)/config/config.guess \
++	$(top_srcdir)/config/config.sub \
++	$(top_srcdir)/config/install-sh $(top_srcdir)/config/ltmain.sh \
++	$(top_srcdir)/config/missing $(top_srcdir)/include/config.h.in \
++	ChangeLog INSTALL TODO config/compile config/config.guess \
++	config/config.sub config/depcomp config/install-sh \
++	config/ltmain.sh config/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"
 +GZIP_ENV = --best
 +DIST_ARCHIVES = $(distdir).tar.bz2
 +DIST_TARGETS = dist-bzip2
 +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@
 +CC = @CC@
 +CCDEPMODE = @CCDEPMODE@
 +CFLAGS = @CFLAGS@
 +CONFDIR = @CONFDIR@
 +CPP = @CPP@
 +CPPFLAGS = @CPPFLAGS@
 +CYGPATH_W = @CYGPATH_W@
 +DEFAULT_INCLUDES = @DEFAULT_INCLUDES@
 +DEFS = @DEFS@
 +DEPDIR = @DEPDIR@
 +DLLTOOL = @DLLTOOL@
 +DSYMUTIL = @DSYMUTIL@
 +DUMPBIN = @DUMPBIN@
 +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@
 +LDPRELOAD = @LDPRELOAD@
 +LIBOBJS = @LIBOBJS@
 +LIBS = @LIBS@
 +LIBTOOL = @LIBTOOL@
 +LIBTOOL_DEPS = @LIBTOOL_DEPS@
 +LIPO = @LIPO@
 +LN_S = @LN_S@
 +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@
 +RANLIB = @RANLIB@
 +SED = @SED@
 +SET_MAKE = @SET_MAKE@
 +SHELL = @SHELL@
 +SHLIB_EXT = @SHLIB_EXT@
 +STRIP = @STRIP@
 +TESTLDFLAGS = @TESTLDFLAGS@
 +TORSOCKSLDFLAGS = @TORSOCKSLDFLAGS@
 +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_DUMPBIN = @ac_ct_DUMPBIN@
 +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@
 +prefix = @prefix@
 +program_transform_name = @program_transform_name@
 +psdir = @psdir@
++runstatedir = @runstatedir@
 +sbindir = @sbindir@
 +sharedstatedir = @sharedstatedir@
 +srcdir = @srcdir@
 +sysconfdir = @sysconfdir@
 +target = @target@
 +target_alias = @target_alias@
 +target_cpu = @target_cpu@
 +target_os = @target_os@
 +target_vendor = @target_vendor@
 +top_build_prefix = @top_build_prefix@
 +top_builddir = @top_builddir@
 +top_srcdir = @top_srcdir@
 +ACLOCAL_AMFLAGS = -I config
 +SUBDIRS = src doc tests extras
 +dist_doc_DATA = ChangeLog
 +EXTRA_DIST = gpl-2.0.txt extras/torsocks-bash_completion
 +all: all-recursive
 +
 +.SUFFIXES:
 +am--refresh: Makefile
 +	@:
 +$(srcdir)/Makefile.in:  $(srcdir)/Makefile.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;
 +
 +$(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):
 +
 +include/config.h: include/stamp-h1
 +	@test -f $@ || rm -f include/stamp-h1
 +	@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) include/stamp-h1
 +
 +include/stamp-h1: $(top_srcdir)/include/config.h.in $(top_builddir)/config.status
 +	@rm -f include/stamp-h1
 +	cd $(top_builddir) && $(SHELL) ./config.status include/config.h
 +$(top_srcdir)/include/config.h.in:  $(am__configure_deps) 
 +	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
 +	rm -f include/stamp-h1
 +	touch $@
 +
 +distclean-hdr:
 +	-rm -f include/config.h include/stamp-h1
 +
 +mostlyclean-libtool:
 +	-rm -f *.lo
 +
 +clean-libtool:
 +	-rm -rf .libs _libs
 +
 +distclean-libtool:
 +	-rm -f libtool config.lt
 +install-dist_docDATA: $(dist_doc_DATA)
 +	@$(NORMAL_INSTALL)
 +	@list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \
 +	if test -n "$$list"; then \
 +	  echo " $(MKDIR_P) '$(DESTDIR)$(docdir)'"; \
 +	  $(MKDIR_P) "$(DESTDIR)$(docdir)" || 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)$(docdir)'"; \
 +	  $(INSTALL_DATA) $$files "$(DESTDIR)$(docdir)" || exit $$?; \
 +	done
 +
 +uninstall-dist_docDATA:
 +	@$(NORMAL_UNINSTALL)
 +	@list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \
 +	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 +	dir='$(DESTDIR)$(docdir)'; $(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 shar distribution archives is" \
- 	               "deprecated." >&2
++	@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 distribution archives compressed with" \
- 		       "legacy program 'compress' is deprecated." >&2
++	@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)/_inst
++	mkdir $(distdir)/_build $(distdir)/_build/sub $(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 \
- 	  && ../configure \
++	  && $(am__cd) $(distdir)/_build/sub \
++	  && ../../configure \
 +	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
 +	    $(DISTCHECK_CONFIGURE_FLAGS) \
- 	    --srcdir=.. --prefix="$$dc_install_base" \
++	    --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)
 +installdirs: installdirs-recursive
 +installdirs-am:
 +	for dir in "$(DESTDIR)$(docdir)"; 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:
 +
 +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)
 +
 +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-dist_docDATA
 +
 +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-dist_docDATA
 +
 +.MAKE: $(am__recursive_targets) install-am install-strip
 +
 +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
 +	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-dist_docDATA 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-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-dist_docDATA
 +
++.PRECIOUS: Makefile
++
 +
 +# 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 e678c4b,0000000..6906ecd
mode 100644,000000..100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@@ -1,1157 -1,0 +1,1159 @@@
- # generated automatically by aclocal 1.14.1 -*- Autoconf -*-
++# generated automatically by aclocal 1.15 -*- Autoconf -*-
 +
- # Copyright (C) 1996-2013 Free Software Foundation, Inc.
++# Copyright (C) 1996-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.
 +
 +# 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-2013 Free Software Foundation, Inc.
++# Copyright (C) 2002-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_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.14'
++[am__api_version='1.15'
 +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.14.1], [],
++m4_if([$1], [1.15], [],
 +      [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.14.1])dnl
++[AM_AUTOMAKE_VERSION([1.15])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-2013 Free Software Foundation, Inc.
++# 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.
 +
 +# 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],
- [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`
++[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
++# Expand $ac_aux_dir to an absolute path.
++am_aux_dir=`cd "$ac_aux_dir" && pwd`
 +])
 +
 +# AM_CONDITIONAL                                            -*- Autoconf -*-
 +
- # Copyright (C) 1997-2013 Free Software Foundation, Inc.
++# Copyright (C) 1997-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_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-2013 Free Software Foundation, Inc.
++# 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.
 +
 +
 +# 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-2013 Free Software Foundation, Inc.
++# 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_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-2013 Free Software Foundation, Inc.
++# Copyright (C) 1996-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.
 +
 +# 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.  The system "awk" is bad on
- # some platforms.
++# We need awk for the "check" target (and possibly the TAP driver).  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-2013 Free Software Foundation, Inc.
++# 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_PROG_INSTALL_SH
 +# ------------------
 +# Define $install_sh.
 +AC_DEFUN([AM_PROG_INSTALL_SH],
 +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
- if test x"${install_sh}" != xset; then
++if test x"${install_sh+set}" != 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-2013 Free Software Foundation, Inc.
++# Copyright (C) 2003-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.
 +
 +# 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-2013 Free Software Foundation, Inc.
++# 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_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-2013 Free Software Foundation, Inc.
++# Copyright (C) 1997-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_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-2013 Free Software Foundation, Inc.
++# 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_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-2013 Free Software Foundation, Inc.
++# 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-2013 Free Software Foundation, Inc.
++# 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-2013 Free Software Foundation, Inc.
++# Copyright (C) 1996-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_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-2013 Free Software Foundation, Inc.
++# Copyright (C) 2009-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_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-2013 Free Software Foundation, Inc.
++# 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_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-2013 Free Software Foundation, Inc.
++# Copyright (C) 2006-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_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-2013 Free Software Foundation, Inc.
++# Copyright (C) 2004-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_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([config/ax_check_compile_flag.m4])
 +m4_include([config/ax_check_link_flag.m4])
 +m4_include([config/libtool.m4])
 +m4_include([config/ltoptions.m4])
 +m4_include([config/ltsugar.m4])
 +m4_include([config/ltversion.m4])
 +m4_include([config/lt~obsolete.m4])
diff --cc config/libtool.m4
index d7c043f,0000000..10ab284
mode 100644,000000..100644
--- a/config/libtool.m4
+++ b/config/libtool.m4
@@@ -1,7997 -1,0 +1,8388 @@@
 +# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 +#
- #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
- #                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
- #                 Foundation, Inc.
++#   Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc.
 +#   Written by Gordon Matzigkeit, 1996
 +#
 +# This file is free software; the Free Software Foundation gives
 +# unlimited permission to copy and/or distribute it, with or without
 +# modifications, as long as this notice is preserved.
 +
 +m4_define([_LT_COPYING], [dnl
- #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
- #                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
- #                 Foundation, Inc.
- #   Written by Gordon Matzigkeit, 1996
- #
- #   This file is part of GNU Libtool.
- #
- # GNU Libtool is free software; you can redistribute it and/or
- # modify it under the terms of the GNU General Public License as
- # published by the Free Software Foundation; either version 2 of
- # the License, or (at your option) any later version.
++# Copyright (C) 2014 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 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.
++# 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
++# GNU Libtool is distributed in the hope that it will be useful, but
++# WITHOUT ANY WARRANTY; without even the implied warranty of
 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +# GNU General Public License for more details.
 +#
 +# You should have received a copy of the GNU General Public License
- # along with GNU Libtool; see the file COPYING.  If not, a copy
- # can be downloaded from http://www.gnu.org/licenses/gpl.html, or
- # obtained by writing to the Free Software Foundation, Inc.,
- # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
++# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 +])
 +
- # serial 57 LT_INIT
++# serial 58 LT_INIT
 +
 +
 +# LT_PREREQ(VERSION)
 +# ------------------
 +# Complain and exit if this libtool version is less that VERSION.
 +m4_defun([LT_PREREQ],
 +[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1,
 +       [m4_default([$3],
 +		   [m4_fatal([Libtool version $1 or higher is required],
 +		             63)])],
 +       [$2])])
 +
 +
 +# _LT_CHECK_BUILDDIR
 +# ------------------
 +# Complain if the absolute build directory name contains unusual characters
 +m4_defun([_LT_CHECK_BUILDDIR],
 +[case `pwd` in
 +  *\ * | *\	*)
 +    AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;;
 +esac
 +])
 +
 +
 +# LT_INIT([OPTIONS])
 +# ------------------
 +AC_DEFUN([LT_INIT],
- [AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
++[AC_PREREQ([2.62])dnl We use AC_PATH_PROGS_FEATURE_CHECK
 +AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
 +AC_BEFORE([$0], [LT_LANG])dnl
 +AC_BEFORE([$0], [LT_OUTPUT])dnl
 +AC_BEFORE([$0], [LTDL_INIT])dnl
 +m4_require([_LT_CHECK_BUILDDIR])dnl
 +
 +dnl Autoconf doesn't catch unexpanded LT_ macros by default:
 +m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl
 +m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl
 +dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4
 +dnl unless we require an AC_DEFUNed macro:
 +AC_REQUIRE([LTOPTIONS_VERSION])dnl
 +AC_REQUIRE([LTSUGAR_VERSION])dnl
 +AC_REQUIRE([LTVERSION_VERSION])dnl
 +AC_REQUIRE([LTOBSOLETE_VERSION])dnl
 +m4_require([_LT_PROG_LTMAIN])dnl
 +
 +_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])
 +
 +dnl Parse OPTIONS
 +_LT_SET_OPTIONS([$0], [$1])
 +
 +# 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'
 +AC_SUBST(LIBTOOL)dnl
 +
 +_LT_SETUP
 +
 +# Only expand once:
 +m4_define([LT_INIT])
 +])# LT_INIT
 +
 +# Old names:
 +AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT])
 +AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT])
 +dnl aclocal-1.4 backwards compatibility:
 +dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
 +dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
 +
 +
++# _LT_PREPARE_CC_BASENAME
++# -----------------------
++m4_defun([_LT_PREPARE_CC_BASENAME], [
++# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
++func_cc_basename ()
++{
++    for cc_temp in @S|@*""; 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-%%"`
++}
++])# _LT_PREPARE_CC_BASENAME
++
++
 +# _LT_CC_BASENAME(CC)
 +# -------------------
- # Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
++# It would be clearer to call AC_REQUIREs from _LT_PREPARE_CC_BASENAME,
++# but that macro is also expanded into generated libtool script, which
++# arranges for $SED and $ECHO to be set by different means.
 +m4_defun([_LT_CC_BASENAME],
- [for cc_temp in $1""; do
-   case $cc_temp in
-     compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
-     distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
-     \-*) ;;
-     *) break;;
-   esac
- done
- cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
++[m4_require([_LT_PREPARE_CC_BASENAME])dnl
++AC_REQUIRE([_LT_DECL_SED])dnl
++AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
++func_cc_basename $1
++cc_basename=$func_cc_basename_result
 +])
 +
 +
 +# _LT_FILEUTILS_DEFAULTS
 +# ----------------------
 +# It is okay to use these file commands and assume they have been set
- # sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'.
++# sensibly after 'm4_require([_LT_FILEUTILS_DEFAULTS])'.
 +m4_defun([_LT_FILEUTILS_DEFAULTS],
 +[: ${CP="cp -f"}
 +: ${MV="mv -f"}
 +: ${RM="rm -f"}
 +])# _LT_FILEUTILS_DEFAULTS
 +
 +
 +# _LT_SETUP
 +# ---------
 +m4_defun([_LT_SETUP],
 +[AC_REQUIRE([AC_CANONICAL_HOST])dnl
 +AC_REQUIRE([AC_CANONICAL_BUILD])dnl
 +AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
 +AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
 +
 +_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl
 +dnl
 +_LT_DECL([], [host_alias], [0], [The host system])dnl
 +_LT_DECL([], [host], [0])dnl
 +_LT_DECL([], [host_os], [0])dnl
 +dnl
 +_LT_DECL([], [build_alias], [0], [The build system])dnl
 +_LT_DECL([], [build], [0])dnl
 +_LT_DECL([], [build_os], [0])dnl
 +dnl
 +AC_REQUIRE([AC_PROG_CC])dnl
 +AC_REQUIRE([LT_PATH_LD])dnl
 +AC_REQUIRE([LT_PATH_NM])dnl
 +dnl
 +AC_REQUIRE([AC_PROG_LN_S])dnl
 +test -z "$LN_S" && LN_S="ln -s"
 +_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl
 +dnl
 +AC_REQUIRE([LT_CMD_MAX_LEN])dnl
 +_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl
 +_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
 +dnl
 +m4_require([_LT_FILEUTILS_DEFAULTS])dnl
 +m4_require([_LT_CHECK_SHELL_FEATURES])dnl
 +m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
 +m4_require([_LT_CMD_RELOAD])dnl
 +m4_require([_LT_CHECK_MAGIC_METHOD])dnl
 +m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
 +m4_require([_LT_CMD_OLD_ARCHIVE])dnl
 +m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
 +m4_require([_LT_WITH_SYSROOT])dnl
++m4_require([_LT_CMD_TRUNCATE])dnl
 +
 +_LT_CONFIG_LIBTOOL_INIT([
- # See if we are running on zsh, and set the options which allow our
++# See if we are running on zsh, and set the options that allow our
 +# commands through without removal of \ escapes INIT.
- if test -n "\${ZSH_VERSION+set}" ; then
++if test -n "\${ZSH_VERSION+set}"; then
 +   setopt NO_GLOB_SUBST
 +fi
 +])
- if test -n "${ZSH_VERSION+set}" ; then
++if test -n "${ZSH_VERSION+set}"; then
 +   setopt NO_GLOB_SUBST
 +fi
 +
 +_LT_CHECK_OBJDIR
 +
 +m4_require([_LT_TAG_COMPILER])dnl
 +
 +case $host_os in
 +aix3*)
 +  # AIX sometimes has problems with the GCC collect2 program.  For some
 +  # reason, if we set the COLLECT_NAMES environment variable, the problems
 +  # vanish in a puff of smoke.
-   if test "X${COLLECT_NAMES+set}" != Xset; then
++  if test set != "${COLLECT_NAMES+set}"; 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
 +
 +_LT_CC_BASENAME([$compiler])
 +
 +# Only perform the check for file, if the check method requires it
 +test -z "$MAGIC_CMD" && MAGIC_CMD=file
 +case $deplibs_check_method in
 +file_magic*)
 +  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
 +    _LT_PATH_MAGIC
 +  fi
 +  ;;
 +esac
 +
 +# Use C for the default configuration in the libtool script
 +LT_SUPPORTED_TAG([CC])
 +_LT_LANG_C_CONFIG
 +_LT_LANG_DEFAULT_CONFIG
 +_LT_CONFIG_COMMANDS
 +])# _LT_SETUP
 +
 +
 +# _LT_PREPARE_SED_QUOTE_VARS
 +# --------------------------
 +# Define a few sed substitution that help us do robust quoting.
 +m4_defun([_LT_PREPARE_SED_QUOTE_VARS],
 +[# 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'
 +])
 +
 +# _LT_PROG_LTMAIN
 +# ---------------
- # Note that this code is called both from `configure', and `config.status'
++# Note that this code is called both from 'configure', and 'config.status'
 +# now that we use AC_CONFIG_COMMANDS to generate libtool.  Notably,
- # `config.status' has no value for ac_aux_dir unless we are using Automake,
++# 'config.status' has no value for ac_aux_dir unless we are using Automake,
 +# so we pass a copy along to make sure it has a sensible value anyway.
 +m4_defun([_LT_PROG_LTMAIN],
 +[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl
 +_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
- ltmain="$ac_aux_dir/ltmain.sh"
++ltmain=$ac_aux_dir/ltmain.sh
 +])# _LT_PROG_LTMAIN
 +
 +
 +## ------------------------------------- ##
 +## Accumulate code for creating libtool. ##
 +## ------------------------------------- ##
 +
 +# So that we can recreate a full libtool script including additional
 +# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
- # in macros and then make a single call at the end using the `libtool'
++# in macros and then make a single call at the end using the 'libtool'
 +# label.
 +
 +
 +# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS])
 +# ----------------------------------------
 +# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later.
 +m4_define([_LT_CONFIG_LIBTOOL_INIT],
 +[m4_ifval([$1],
 +          [m4_append([_LT_OUTPUT_LIBTOOL_INIT],
 +                     [$1
 +])])])
 +
 +# Initialize.
 +m4_define([_LT_OUTPUT_LIBTOOL_INIT])
 +
 +
 +# _LT_CONFIG_LIBTOOL([COMMANDS])
 +# ------------------------------
 +# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later.
 +m4_define([_LT_CONFIG_LIBTOOL],
 +[m4_ifval([$1],
 +          [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS],
 +                     [$1
 +])])])
 +
 +# Initialize.
 +m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS])
 +
 +
 +# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS])
 +# -----------------------------------------------------
 +m4_defun([_LT_CONFIG_SAVE_COMMANDS],
 +[_LT_CONFIG_LIBTOOL([$1])
 +_LT_CONFIG_LIBTOOL_INIT([$2])
 +])
 +
 +
 +# _LT_FORMAT_COMMENT([COMMENT])
 +# -----------------------------
 +# Add leading comment marks to the start of each line, and a trailing
 +# full-stop to the whole comment if one is not present already.
 +m4_define([_LT_FORMAT_COMMENT],
 +[m4_ifval([$1], [
 +m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])],
 +              [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.])
 +)])
 +
 +
 +
 +## ------------------------ ##
 +## FIXME: Eliminate VARNAME ##
 +## ------------------------ ##
 +
 +
 +# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?])
 +# -------------------------------------------------------------------
 +# CONFIGNAME is the name given to the value in the libtool script.
 +# VARNAME is the (base) name used in the configure script.
 +# VALUE may be 0, 1 or 2 for a computed quote escaped value based on
 +# VARNAME.  Any other value will be used directly.
 +m4_define([_LT_DECL],
 +[lt_if_append_uniq([lt_decl_varnames], [$2], [, ],
 +    [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name],
 +	[m4_ifval([$1], [$1], [$2])])
 +    lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3])
 +    m4_ifval([$4],
 +	[lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])])
 +    lt_dict_add_subkey([lt_decl_dict], [$2],
 +	[tagged?], [m4_ifval([$5], [yes], [no])])])
 +])
 +
 +
 +# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION])
 +# --------------------------------------------------------
 +m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])])
 +
 +
 +# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...])
 +# ------------------------------------------------
 +m4_define([lt_decl_tag_varnames],
 +[_lt_decl_filter([tagged?], [yes], $@)])
 +
 +
 +# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..])
 +# ---------------------------------------------------------
 +m4_define([_lt_decl_filter],
 +[m4_case([$#],
 +  [0], [m4_fatal([$0: too few arguments: $#])],
 +  [1], [m4_fatal([$0: too few arguments: $#: $1])],
 +  [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)],
 +  [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)],
 +  [lt_dict_filter([lt_decl_dict], $@)])[]dnl
 +])
 +
 +
 +# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...])
 +# --------------------------------------------------
 +m4_define([lt_decl_quote_varnames],
 +[_lt_decl_filter([value], [1], $@)])
 +
 +
 +# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...])
 +# ---------------------------------------------------
 +m4_define([lt_decl_dquote_varnames],
 +[_lt_decl_filter([value], [2], $@)])
 +
 +
 +# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
 +# ---------------------------------------------------
 +m4_define([lt_decl_varnames_tagged],
 +[m4_assert([$# <= 2])dnl
 +_$0(m4_quote(m4_default([$1], [[, ]])),
 +    m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]),
 +    m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))])
 +m4_define([_lt_decl_varnames_tagged],
 +[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])])
 +
 +
 +# lt_decl_all_varnames([SEPARATOR], [VARNAME1...])
 +# ------------------------------------------------
 +m4_define([lt_decl_all_varnames],
 +[_$0(m4_quote(m4_default([$1], [[, ]])),
 +     m4_if([$2], [],
 +	   m4_quote(lt_decl_varnames),
 +	m4_quote(m4_shift($@))))[]dnl
 +])
 +m4_define([_lt_decl_all_varnames],
 +[lt_join($@, lt_decl_varnames_tagged([$1],
 +			lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl
 +])
 +
 +
 +# _LT_CONFIG_STATUS_DECLARE([VARNAME])
 +# ------------------------------------
- # Quote a variable value, and forward it to `config.status' so that its
- # declaration there will have the same value as in `configure'.  VARNAME
++# Quote a variable value, and forward it to 'config.status' so that its
++# declaration there will have the same value as in 'configure'.  VARNAME
 +# must have a single quote delimited value for this to work.
 +m4_define([_LT_CONFIG_STATUS_DECLARE],
 +[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
 +
 +
 +# _LT_CONFIG_STATUS_DECLARATIONS
 +# ------------------------------
 +# We delimit libtool config variables with single quotes, so when
 +# we write them to config.status, we have to be sure to quote all
 +# embedded single quotes properly.  In configure, this macro expands
 +# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
 +#
 +#    <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`'
 +m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
 +[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
 +    [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
 +
 +
 +# _LT_LIBTOOL_TAGS
 +# ----------------
 +# Output comment and list of tags supported by the script
 +m4_defun([_LT_LIBTOOL_TAGS],
 +[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
- available_tags="_LT_TAGS"dnl
++available_tags='_LT_TAGS'dnl
 +])
 +
 +
 +# _LT_LIBTOOL_DECLARE(VARNAME, [TAG])
 +# -----------------------------------
 +# Extract the dictionary values for VARNAME (optionally with TAG) and
 +# expand to a commented shell variable setting:
 +#
 +#    # Some comment about what VAR is for.
 +#    visible_name=$lt_internal_name
 +m4_define([_LT_LIBTOOL_DECLARE],
 +[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1],
 +					   [description])))[]dnl
 +m4_pushdef([_libtool_name],
 +    m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl
 +m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])),
 +    [0], [_libtool_name=[$]$1],
 +    [1], [_libtool_name=$lt_[]$1],
 +    [2], [_libtool_name=$lt_[]$1],
 +    [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl
 +m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl
 +])
 +
 +
 +# _LT_LIBTOOL_CONFIG_VARS
 +# -----------------------
 +# Produce commented declarations of non-tagged libtool config variables
- # suitable for insertion in the LIBTOOL CONFIG section of the `libtool'
++# suitable for insertion in the LIBTOOL CONFIG section of the 'libtool'
 +# script.  Tagged libtool config variables (even for the LIBTOOL CONFIG
 +# section) are produced by _LT_LIBTOOL_TAG_VARS.
 +m4_defun([_LT_LIBTOOL_CONFIG_VARS],
 +[m4_foreach([_lt_var],
 +    m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)),
 +    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])])
 +
 +
 +# _LT_LIBTOOL_TAG_VARS(TAG)
 +# -------------------------
 +m4_define([_LT_LIBTOOL_TAG_VARS],
 +[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames),
 +    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])])
 +
 +
 +# _LT_TAGVAR(VARNAME, [TAGNAME])
 +# ------------------------------
 +m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])
 +
 +
 +# _LT_CONFIG_COMMANDS
 +# -------------------
 +# Send accumulated output to $CONFIG_STATUS.  Thanks to the lists of
 +# variables for single and double quote escaping we saved from calls
 +# to _LT_DECL, we can put quote escaped variables declarations
- # into `config.status', and then the shell code to quote escape them in
- # for loops in `config.status'.  Finally, any additional code accumulated
++# into 'config.status', and then the shell code to quote escape them in
++# for loops in 'config.status'.  Finally, any additional code accumulated
 +# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
 +m4_defun([_LT_CONFIG_COMMANDS],
 +[AC_PROVIDE_IFELSE([LT_OUTPUT],
 +	dnl If the libtool generation code has been placed in $CONFIG_LT,
 +	dnl instead of duplicating it all over again into config.status,
 +	dnl then we will have config.status run $CONFIG_LT later, so it
 +	dnl needs to know what name is stored there:
 +        [AC_CONFIG_COMMANDS([libtool],
 +            [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])],
 +    dnl If the libtool generation code is destined for config.status,
 +    dnl expand the accumulated commands and init code now:
 +    [AC_CONFIG_COMMANDS([libtool],
 +        [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])])
 +])#_LT_CONFIG_COMMANDS
 +
 +
 +# Initialize.
 +m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT],
 +[
 +
 +# The HP-UX ksh and POSIX shell print the target directory to stdout
 +# if CDPATH is set.
 +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 +
 +sed_quote_subst='$sed_quote_subst'
 +double_quote_subst='$double_quote_subst'
 +delay_variable_subst='$delay_variable_subst'
 +_LT_CONFIG_STATUS_DECLARATIONS
 +LTCC='$LTCC'
 +LTCFLAGS='$LTCFLAGS'
 +compiler='$compiler_DEFAULT'
 +
 +# A function that is used when there is no print builtin or printf.
 +func_fallback_echo ()
 +{
 +  eval 'cat <<_LTECHO_EOF
 +\$[]1
 +_LTECHO_EOF'
 +}
 +
 +# Quote evaled strings.
 +for var in lt_decl_all_varnames([[ \
 +]], lt_decl_quote_varnames); do
 +    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
 +    *[[\\\\\\\`\\"\\\$]]*)
-       eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
++      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
 +      ;;
 +    *)
 +      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
 +      ;;
 +    esac
 +done
 +
 +# Double-quote double-evaled strings.
 +for var in lt_decl_all_varnames([[ \
 +]], lt_decl_dquote_varnames); do
 +    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
 +    *[[\\\\\\\`\\"\\\$]]*)
-       eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
++      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
 +      ;;
 +    *)
 +      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
 +      ;;
 +    esac
 +done
 +
 +_LT_OUTPUT_LIBTOOL_INIT
 +])
 +
 +# _LT_GENERATED_FILE_INIT(FILE, [COMMENT])
 +# ------------------------------------
 +# Generate a child script FILE with all initialization necessary to
 +# reuse the environment learned by the parent script, and make the
 +# file executable.  If COMMENT is supplied, it is inserted after the
- # `#!' sequence but before initialization text begins.  After this
++# '#!' sequence but before initialization text begins.  After this
 +# macro, additional text can be appended to FILE to form the body of
 +# the child script.  The macro ends with non-zero status if the
 +# file could not be fully written (such as if the disk is full).
 +m4_ifdef([AS_INIT_GENERATED],
 +[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])],
 +[m4_defun([_LT_GENERATED_FILE_INIT],
 +[m4_require([AS_PREPARE])]dnl
 +[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl
 +[lt_write_fail=0
 +cat >$1 <<_ASEOF || lt_write_fail=1
 +#! $SHELL
 +# Generated by $as_me.
 +$2
 +SHELL=\${CONFIG_SHELL-$SHELL}
 +export SHELL
 +_ASEOF
 +cat >>$1 <<\_ASEOF || lt_write_fail=1
 +AS_SHELL_SANITIZE
 +_AS_PREPARE
 +exec AS_MESSAGE_FD>&1
 +_ASEOF
- test $lt_write_fail = 0 && chmod +x $1[]dnl
++test 0 = "$lt_write_fail" && chmod +x $1[]dnl
 +m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
 +
 +# LT_OUTPUT
 +# ---------
 +# This macro allows early generation of the libtool script (before
 +# AC_OUTPUT is called), incase it is used in configure for compilation
 +# tests.
 +AC_DEFUN([LT_OUTPUT],
 +[: ${CONFIG_LT=./config.lt}
 +AC_MSG_NOTICE([creating $CONFIG_LT])
 +_LT_GENERATED_FILE_INIT(["$CONFIG_LT"],
 +[# Run this file to recreate a libtool stub with the current configuration.])
 +
 +cat >>"$CONFIG_LT" <<\_LTEOF
 +lt_cl_silent=false
 +exec AS_MESSAGE_LOG_FD>>config.log
 +{
 +  echo
 +  AS_BOX([Running $as_me.])
 +} >&AS_MESSAGE_LOG_FD
 +
 +lt_cl_help="\
- \`$as_me' creates a local libtool stub from the current configuration,
++'$as_me' creates a local libtool stub from the current configuration,
 +for use in further configure time tests before the real libtool is
 +generated.
 +
 +Usage: $[0] [[OPTIONS]]
 +
 +  -h, --help      print this help, then exit
 +  -V, --version   print version number, then exit
 +  -q, --quiet     do not print progress messages
 +  -d, --debug     don't remove temporary files
 +
 +Report bugs to <bug-libtool at gnu.org>."
 +
 +lt_cl_version="\
 +m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
 +m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
 +configured by $[0], generated by m4_PACKAGE_STRING.
 +
 +Copyright (C) 2011 Free Software Foundation, Inc.
 +This config.lt script is free software; the Free Software Foundation
 +gives unlimited permision to copy, distribute and modify it."
 +
- while test $[#] != 0
++while test 0 != $[#]
 +do
 +  case $[1] in
 +    --version | --v* | -V )
 +      echo "$lt_cl_version"; exit 0 ;;
 +    --help | --h* | -h )
 +      echo "$lt_cl_help"; exit 0 ;;
 +    --debug | --d* | -d )
 +      debug=: ;;
 +    --quiet | --q* | --silent | --s* | -q )
 +      lt_cl_silent=: ;;
 +
 +    -*) AC_MSG_ERROR([unrecognized option: $[1]
- Try \`$[0] --help' for more information.]) ;;
++Try '$[0] --help' for more information.]) ;;
 +
 +    *) AC_MSG_ERROR([unrecognized argument: $[1]
- Try \`$[0] --help' for more information.]) ;;
++Try '$[0] --help' for more information.]) ;;
 +  esac
 +  shift
 +done
 +
 +if $lt_cl_silent; then
 +  exec AS_MESSAGE_FD>/dev/null
 +fi
 +_LTEOF
 +
 +cat >>"$CONFIG_LT" <<_LTEOF
 +_LT_OUTPUT_LIBTOOL_COMMANDS_INIT
 +_LTEOF
 +
 +cat >>"$CONFIG_LT" <<\_LTEOF
 +AC_MSG_NOTICE([creating $ofile])
 +_LT_OUTPUT_LIBTOOL_COMMANDS
 +AS_EXIT(0)
 +_LTEOF
 +chmod +x "$CONFIG_LT"
 +
 +# configure is writing to config.log, but config.lt does its own redirection,
 +# appending to config.log, which fails on DOS, as config.log is still kept
 +# open by configure.  Here we exec the FD to /dev/null, effectively closing
 +# config.log, so it can be properly (re)opened and appended to by config.lt.
 +lt_cl_success=:
- test "$silent" = yes &&
++test yes = "$silent" &&
 +  lt_config_lt_args="$lt_config_lt_args --quiet"
 +exec AS_MESSAGE_LOG_FD>/dev/null
 +$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
 +exec AS_MESSAGE_LOG_FD>>config.log
 +$lt_cl_success || AS_EXIT(1)
 +])# LT_OUTPUT
 +
 +
 +# _LT_CONFIG(TAG)
 +# ---------------
 +# If TAG is the built-in tag, create an initial libtool script with a
 +# default configuration from the untagged config vars.  Otherwise add code
 +# to config.status for appending the configuration named by TAG from the
 +# matching tagged config vars.
 +m4_defun([_LT_CONFIG],
 +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
 +_LT_CONFIG_SAVE_COMMANDS([
 +  m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl
 +  m4_if(_LT_TAG, [C], [
-     # See if we are running on zsh, and set the options which allow our
++    # See if we are running on zsh, and set the options that allow our
 +    # commands through without removal of \ escapes.
-     if test -n "${ZSH_VERSION+set}" ; then
++    if test -n "${ZSH_VERSION+set}"; then
 +      setopt NO_GLOB_SUBST
 +    fi
 +
-     cfgfile="${ofile}T"
++    cfgfile=${ofile}T
 +    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
 +    $RM "$cfgfile"
 +
 +    cat <<_LT_EOF >> "$cfgfile"
 +#! $SHELL
- 
- # `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
- # Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
++# Generated automatically by $as_me ($PACKAGE) $VERSION
 +# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
 +# NOTE: Changes made to this file will be lost: look at ltmain.sh.
- #
++
++# Provide generalized library-building support services.
++# Written by Gordon Matzigkeit, 1996
++
 +_LT_COPYING
 +_LT_LIBTOOL_TAGS
 +
++# Configured defaults for sys_lib_dlsearch_path munging.
++: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"}
++
 +# ### BEGIN LIBTOOL CONFIG
 +_LT_LIBTOOL_CONFIG_VARS
 +_LT_LIBTOOL_TAG_VARS
 +# ### END LIBTOOL CONFIG
 +
 +_LT_EOF
 +
++    cat <<'_LT_EOF' >> "$cfgfile"
++
++# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE
++
++_LT_PREPARE_MUNGE_PATH_LIST
++_LT_PREPARE_CC_BASENAME
++
++# ### END FUNCTIONS SHARED WITH CONFIGURE
++
++_LT_EOF
++
 +  case $host_os in
 +  aix3*)
 +    cat <<\_LT_EOF >> "$cfgfile"
 +# AIX sometimes has problems with the GCC collect2 program.  For some
 +# reason, if we set the COLLECT_NAMES environment variable, the problems
 +# vanish in a puff of smoke.
- if test "X${COLLECT_NAMES+set}" != Xset; then
++if test set != "${COLLECT_NAMES+set}"; then
 +  COLLECT_NAMES=
 +  export COLLECT_NAMES
 +fi
 +_LT_EOF
 +    ;;
 +  esac
 +
 +  _LT_PROG_LTMAIN
 +
 +  # We use sed instead of cat because bash on DJGPP gets confused if
 +  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
 +  # text mode, it properly converts lines to CR/LF.  This bash problem
 +  # is reportedly fixed, but why not run on old versions too?
 +  sed '$q' "$ltmain" >> "$cfgfile" \
 +     || (rm -f "$cfgfile"; exit 1)
 +
-   _LT_PROG_REPLACE_SHELLFNS
- 
 +   mv -f "$cfgfile" "$ofile" ||
 +    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
 +  chmod +x "$ofile"
 +],
 +[cat <<_LT_EOF >> "$ofile"
 +
 +dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded
 +dnl in a comment (ie after a #).
 +# ### BEGIN LIBTOOL TAG CONFIG: $1
 +_LT_LIBTOOL_TAG_VARS(_LT_TAG)
 +# ### END LIBTOOL TAG CONFIG: $1
 +_LT_EOF
 +])dnl /m4_if
 +],
 +[m4_if([$1], [], [
 +    PACKAGE='$PACKAGE'
 +    VERSION='$VERSION'
-     TIMESTAMP='$TIMESTAMP'
 +    RM='$RM'
 +    ofile='$ofile'], [])
 +])dnl /_LT_CONFIG_SAVE_COMMANDS
 +])# _LT_CONFIG
 +
 +
 +# LT_SUPPORTED_TAG(TAG)
 +# ---------------------
 +# Trace this macro to discover what tags are supported by the libtool
 +# --tag option, using:
 +#    autoconf --trace 'LT_SUPPORTED_TAG:$1'
 +AC_DEFUN([LT_SUPPORTED_TAG], [])
 +
 +
 +# C support is built-in for now
 +m4_define([_LT_LANG_C_enabled], [])
 +m4_define([_LT_TAGS], [])
 +
 +
 +# LT_LANG(LANG)
 +# -------------
 +# Enable libtool support for the given language if not already enabled.
 +AC_DEFUN([LT_LANG],
 +[AC_BEFORE([$0], [LT_OUTPUT])dnl
 +m4_case([$1],
 +  [C],			[_LT_LANG(C)],
 +  [C++],		[_LT_LANG(CXX)],
 +  [Go],			[_LT_LANG(GO)],
 +  [Java],		[_LT_LANG(GCJ)],
 +  [Fortran 77],		[_LT_LANG(F77)],
 +  [Fortran],		[_LT_LANG(FC)],
 +  [Windows Resource],	[_LT_LANG(RC)],
 +  [m4_ifdef([_LT_LANG_]$1[_CONFIG],
 +    [_LT_LANG($1)],
 +    [m4_fatal([$0: unsupported language: "$1"])])])dnl
 +])# LT_LANG
 +
 +
 +# _LT_LANG(LANGNAME)
 +# ------------------
 +m4_defun([_LT_LANG],
 +[m4_ifdef([_LT_LANG_]$1[_enabled], [],
 +  [LT_SUPPORTED_TAG([$1])dnl
 +  m4_append([_LT_TAGS], [$1 ])dnl
 +  m4_define([_LT_LANG_]$1[_enabled], [])dnl
 +  _LT_LANG_$1_CONFIG($1)])dnl
 +])# _LT_LANG
 +
 +
 +m4_ifndef([AC_PROG_GO], [
 +############################################################
 +# NOTE: This macro has been submitted for inclusion into   #
 +#  GNU Autoconf as AC_PROG_GO.  When it is available in    #
 +#  a released version of Autoconf we should remove this    #
 +#  macro and use it instead.                               #
 +############################################################
 +m4_defun([AC_PROG_GO],
 +[AC_LANG_PUSH(Go)dnl
 +AC_ARG_VAR([GOC],     [Go compiler command])dnl
 +AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl
 +_AC_ARG_VAR_LDFLAGS()dnl
 +AC_CHECK_TOOL(GOC, gccgo)
 +if test -z "$GOC"; then
 +  if test -n "$ac_tool_prefix"; then
 +    AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo])
 +  fi
 +fi
 +if test -z "$GOC"; then
 +  AC_CHECK_PROG(GOC, gccgo, gccgo, false)
 +fi
 +])#m4_defun
 +])#m4_ifndef
 +
 +
 +# _LT_LANG_DEFAULT_CONFIG
 +# -----------------------
 +m4_defun([_LT_LANG_DEFAULT_CONFIG],
 +[AC_PROVIDE_IFELSE([AC_PROG_CXX],
 +  [LT_LANG(CXX)],
 +  [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])])
 +
 +AC_PROVIDE_IFELSE([AC_PROG_F77],
 +  [LT_LANG(F77)],
 +  [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])])
 +
 +AC_PROVIDE_IFELSE([AC_PROG_FC],
 +  [LT_LANG(FC)],
 +  [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])])
 +
 +dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal
 +dnl pulling things in needlessly.
 +AC_PROVIDE_IFELSE([AC_PROG_GCJ],
 +  [LT_LANG(GCJ)],
 +  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
 +    [LT_LANG(GCJ)],
 +    [AC_PROVIDE_IFELSE([LT_PROG_GCJ],
 +      [LT_LANG(GCJ)],
 +      [m4_ifdef([AC_PROG_GCJ],
 +	[m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])])
 +       m4_ifdef([A][M_PROG_GCJ],
 +	[m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])])
 +       m4_ifdef([LT_PROG_GCJ],
 +	[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
 +
 +AC_PROVIDE_IFELSE([AC_PROG_GO],
 +  [LT_LANG(GO)],
 +  [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])])
 +
 +AC_PROVIDE_IFELSE([LT_PROG_RC],
 +  [LT_LANG(RC)],
 +  [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
 +])# _LT_LANG_DEFAULT_CONFIG
 +
 +# Obsolete macros:
 +AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)])
 +AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
 +AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
 +AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
 +AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)])
 +dnl aclocal-1.4 backwards compatibility:
 +dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
 +dnl AC_DEFUN([AC_LIBTOOL_F77], [])
 +dnl AC_DEFUN([AC_LIBTOOL_FC], [])
 +dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
 +dnl AC_DEFUN([AC_LIBTOOL_RC], [])
 +
 +
 +# _LT_TAG_COMPILER
 +# ----------------
 +m4_defun([_LT_TAG_COMPILER],
 +[AC_REQUIRE([AC_PROG_CC])dnl
 +
 +_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl
 +_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl
 +_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl
 +_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl
 +
 +# If no C compiler was specified, use CC.
 +LTCC=${LTCC-"$CC"}
 +
 +# If no C compiler flags were specified, use CFLAGS.
 +LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
 +
 +# Allow CC to be a program name with arguments.
 +compiler=$CC
 +])# _LT_TAG_COMPILER
 +
 +
 +# _LT_COMPILER_BOILERPLATE
 +# ------------------------
 +# Check for compiler boilerplate output or warnings with
 +# the simple compiler test code.
 +m4_defun([_LT_COMPILER_BOILERPLATE],
 +[m4_require([_LT_DECL_SED])dnl
 +ac_outfile=conftest.$ac_objext
 +echo "$lt_simple_compile_test_code" >conftest.$ac_ext
 +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 +_lt_compiler_boilerplate=`cat conftest.err`
 +$RM conftest*
 +])# _LT_COMPILER_BOILERPLATE
 +
 +
 +# _LT_LINKER_BOILERPLATE
 +# ----------------------
 +# Check for linker boilerplate output or warnings with
 +# the simple link test code.
 +m4_defun([_LT_LINKER_BOILERPLATE],
 +[m4_require([_LT_DECL_SED])dnl
 +ac_outfile=conftest.$ac_objext
 +echo "$lt_simple_link_test_code" >conftest.$ac_ext
 +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 +_lt_linker_boilerplate=`cat conftest.err`
 +$RM -r conftest*
 +])# _LT_LINKER_BOILERPLATE
 +
 +# _LT_REQUIRED_DARWIN_CHECKS
 +# -------------------------
 +m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
 +  case $host_os in
 +    rhapsody* | darwin*)
 +    AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
 +    AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
 +    AC_CHECK_TOOL([LIPO], [lipo], [:])
 +    AC_CHECK_TOOL([OTOOL], [otool], [:])
 +    AC_CHECK_TOOL([OTOOL64], [otool64], [:])
 +    _LT_DECL([], [DSYMUTIL], [1],
 +      [Tool to manipulate archived DWARF debug symbol files on Mac OS X])
 +    _LT_DECL([], [NMEDIT], [1],
 +      [Tool to change global to local symbols on Mac OS X])
 +    _LT_DECL([], [LIPO], [1],
 +      [Tool to manipulate fat objects and archives on Mac OS X])
 +    _LT_DECL([], [OTOOL], [1],
 +      [ldd/readelf like tool for Mach-O binaries on Mac OS X])
 +    _LT_DECL([], [OTOOL64], [1],
 +      [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4])
 +
 +    AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
 +      [lt_cv_apple_cc_single_mod=no
-       if test -z "${LT_MULTI_MODULE}"; then
++      if test -z "$LT_MULTI_MODULE"; then
 +	# By default we will add the -single_module flag. You can override
 +	# by either setting the environment variable LT_MULTI_MODULE
 +	# non-empty at configure time, or by adding -multi_module to the
 +	# link flags.
 +	rm -rf libconftest.dylib*
 +	echo "int foo(void){return 1;}" > conftest.c
 +	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
 +-dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD
 +	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
 +	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
 +        _lt_result=$?
 +	# If 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 >&AS_MESSAGE_LOG_FD
 +	# Otherwise, if the output was created with a 0 exit code from
 +	# the compiler, it worked.
- 	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
++	elif test -f libconftest.dylib && test 0 = "$_lt_result"; then
 +	  lt_cv_apple_cc_single_mod=yes
 +	else
 +	  cat conftest.err >&AS_MESSAGE_LOG_FD
 +	fi
 +	rm -rf libconftest.dylib*
 +	rm -f conftest.*
 +      fi])
 +
 +    AC_CACHE_CHECK([for -exported_symbols_list linker flag],
 +      [lt_cv_ld_exported_symbols_list],
 +      [lt_cv_ld_exported_symbols_list=no
 +      save_LDFLAGS=$LDFLAGS
 +      echo "_main" > conftest.sym
 +      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
 +      AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
 +	[lt_cv_ld_exported_symbols_list=yes],
 +	[lt_cv_ld_exported_symbols_list=no])
- 	LDFLAGS="$save_LDFLAGS"
++	LDFLAGS=$save_LDFLAGS
 +    ])
 +
 +    AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
 +      [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" >&AS_MESSAGE_LOG_FD
 +      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
 +      echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
 +      $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
 +      echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
 +      $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
 +      cat > conftest.c << _LT_EOF
 +int main() { return 0;}
 +_LT_EOF
 +      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
 +      $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 >&AS_MESSAGE_LOG_FD
-       elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
++      elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then
 +	lt_cv_ld_force_load=yes
 +      else
 +	cat conftest.err >&AS_MESSAGE_LOG_FD
 +      fi
 +        rm -f conftest.err libconftest.a conftest conftest.c
 +        rm -rf conftest.dSYM
 +    ])
 +    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 "$lt_cv_apple_cc_single_mod" = "yes"; then
++    if test yes = "$lt_cv_apple_cc_single_mod"; then
 +      _lt_dar_single_mod='$single_module'
 +    fi
-     if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
-       _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
++    if test yes = "$lt_cv_ld_exported_symbols_list"; 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 "$lt_cv_ld_force_load" = "no"; then
++    if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then
 +      _lt_dsymutil='~$DSYMUTIL $lib || :'
 +    else
 +      _lt_dsymutil=
 +    fi
 +    ;;
 +  esac
 +])
 +
 +
 +# _LT_DARWIN_LINKER_FEATURES([TAG])
 +# ---------------------------------
 +# Checks for linker and compiler features on darwin
 +m4_defun([_LT_DARWIN_LINKER_FEATURES],
 +[
 +  m4_require([_LT_REQUIRED_DARWIN_CHECKS])
 +  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
 +  _LT_TAGVAR(hardcode_direct, $1)=no
 +  _LT_TAGVAR(hardcode_automatic, $1)=yes
 +  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-   if test "$lt_cv_ld_force_load" = "yes"; then
-     _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
++  if test yes = "$lt_cv_ld_force_load"; then
++    _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
 +    m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
 +                  [FC],  [_LT_TAGVAR(compiler_needs_object, $1)=yes])
 +  else
 +    _LT_TAGVAR(whole_archive_flag_spec, $1)=''
 +  fi
 +  _LT_TAGVAR(link_all_deplibs, $1)=yes
-   _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
++  _LT_TAGVAR(allow_undefined_flag, $1)=$_lt_dar_allow_undefined
 +  case $cc_basename in
-      ifort*) _lt_dar_can_shared=yes ;;
++     ifort*|nagfor*) _lt_dar_can_shared=yes ;;
 +     *) _lt_dar_can_shared=$GCC ;;
 +  esac
-   if test "$_lt_dar_can_shared" = "yes"; then
++  if test yes = "$_lt_dar_can_shared"; then
 +    output_verbose_link_cmd=func_echo_all
-     _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-     _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-     _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-     _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
++    _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
++    _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
++    _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
++    _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
 +    m4_if([$1], [CXX],
- [   if test "$lt_cv_apple_cc_single_mod" != "yes"; then
-       _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
-       _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
++[   if test yes != "$lt_cv_apple_cc_single_mod"; then
++      _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil"
++      _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil"
 +    fi
 +],[])
 +  else
 +  _LT_TAGVAR(ld_shlibs, $1)=no
 +  fi
 +])
 +
 +# _LT_SYS_MODULE_PATH_AIX([TAGNAME])
 +# ----------------------------------
 +# Links a minimal program and checks the executable
 +# for the system default hardcoded library path. In most cases,
 +# this is /usr/lib:/lib, but when the MPI compilers are used
 +# the location of the communication and MPI libs are included too.
 +# If we don't find anything, use the default library path according
 +# to the aix ld manual.
 +# Store the results from the different compilers for each TAGNAME.
 +# Allow to override them for all tags through lt_cv_aix_libpath.
 +m4_defun([_LT_SYS_MODULE_PATH_AIX],
 +[m4_require([_LT_DECL_SED])dnl
- if test "${lt_cv_aix_libpath+set}" = set; then
++if test set = "${lt_cv_aix_libpath+set}"; then
 +  aix_libpath=$lt_cv_aix_libpath
 +else
 +  AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
 +  [AC_LINK_IFELSE([AC_LANG_PROGRAM],[
 +  lt_aix_libpath_sed='[
 +      /Import File Strings/,/^$/ {
 +	  /^0/ {
 +	      s/^0  *\([^ ]*\) *$/\1/
 +	      p
 +	  }
 +      }]'
 +  _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 +  # Check for a 64-bit object if we didn't find anything.
 +  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
 +    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 +  fi],[])
 +  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
-     _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib"
++    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=/usr/lib:/lib
 +  fi
 +  ])
 +  aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
 +fi
 +])# _LT_SYS_MODULE_PATH_AIX
 +
 +
 +# _LT_SHELL_INIT(ARG)
 +# -------------------
 +m4_define([_LT_SHELL_INIT],
 +[m4_divert_text([M4SH-INIT], [$1
 +])])# _LT_SHELL_INIT
 +
 +
 +
 +# _LT_PROG_ECHO_BACKSLASH
 +# -----------------------
 +# Find how we can fake an echo command that does not interpret backslash.
 +# In particular, with Autoconf 2.60 or later we add some code to the start
- # of the generated configure script which will find a shell with a builtin
- # printf (which we can use as an echo command).
++# of the generated configure script that will find a shell with a builtin
++# printf (that we can use as an echo command).
 +m4_defun([_LT_PROG_ECHO_BACKSLASH],
 +[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
 +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
 +ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
 +
 +AC_MSG_CHECKING([how to print strings])
 +# 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 "$*" 
++    $ECHO "$*"
 +}
 +
- case "$ECHO" in
++case $ECHO in
 +  printf*) AC_MSG_RESULT([printf]) ;;
 +  print*) AC_MSG_RESULT([print -r]) ;;
 +  *) AC_MSG_RESULT([cat]) ;;
 +esac
 +
 +m4_ifdef([_AS_DETECT_SUGGESTED],
 +[_AS_DETECT_SUGGESTED([
 +  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" )])])
 +
 +_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
 +_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
 +])# _LT_PROG_ECHO_BACKSLASH
 +
 +
 +# _LT_WITH_SYSROOT
 +# ----------------
 +AC_DEFUN([_LT_WITH_SYSROOT],
 +[AC_MSG_CHECKING([for sysroot])
 +AC_ARG_WITH([sysroot],
- [  --with-sysroot[=DIR] Search for dependent libraries within DIR
-                         (or the compiler's sysroot if not specified).],
++[AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@],
++  [Search for dependent libraries within DIR (or the compiler's sysroot
++   if not specified).])],
 +[], [with_sysroot=no])
 +
 +dnl lt_sysroot will always be passed unquoted.  We quote it here
 +dnl in case the user passed a directory name.
 +lt_sysroot=
- case ${with_sysroot} in #(
++case $with_sysroot in #(
 + yes)
-    if test "$GCC" = yes; then
++   if test yes = "$GCC"; then
 +     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
 +   fi
 +   ;; #(
 + /*)
 +   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
 +   ;; #(
 + no|'')
 +   ;; #(
 + *)
-    AC_MSG_RESULT([${with_sysroot}])
++   AC_MSG_RESULT([$with_sysroot])
 +   AC_MSG_ERROR([The sysroot must be an absolute path.])
 +   ;;
 +esac
 +
 + AC_MSG_RESULT([${lt_sysroot:-no}])
 +_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
- [dependent libraries, and in which our libraries should be installed.])])
++[dependent libraries, and where our libraries should be installed.])])
 +
 +# _LT_ENABLE_LOCK
 +# ---------------
 +m4_defun([_LT_ENABLE_LOCK],
 +[AC_ARG_ENABLE([libtool-lock],
 +  [AS_HELP_STRING([--disable-libtool-lock],
 +    [avoid locking (might break parallel builds)])])
- test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
++test no = "$enable_libtool_lock" || enable_libtool_lock=yes
 +
 +# Some flags need to be propagated to the compiler or linker for good
 +# libtool support.
 +case $host in
 +ia64-*-hpux*)
-   # Find out which ABI we are using.
++  # Find out what ABI is being produced by ac_compile, and set mode
++  # options accordingly.
 +  echo 'int i;' > conftest.$ac_ext
 +  if AC_TRY_EVAL(ac_compile); then
 +    case `/usr/bin/file conftest.$ac_objext` in
 +      *ELF-32*)
- 	HPUX_IA64_MODE="32"
++	HPUX_IA64_MODE=32
 +	;;
 +      *ELF-64*)
- 	HPUX_IA64_MODE="64"
++	HPUX_IA64_MODE=64
 +	;;
 +    esac
 +  fi
 +  rm -rf conftest*
 +  ;;
 +*-*-irix6*)
-   # Find out which ABI we are using.
++  # Find out what ABI is being produced by ac_compile, and set linker
++  # options accordingly.
 +  echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
 +  if AC_TRY_EVAL(ac_compile); then
-     if test "$lt_cv_prog_gnu_ld" = yes; then
++    if test yes = "$lt_cv_prog_gnu_ld"; 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 AC_TRY_EVAL(ac_compile); 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*| \
 +s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
-   # Find out which ABI we are using.
++  # 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.
 +  echo 'int i;' > conftest.$ac_ext
 +  if AC_TRY_EVAL(ac_compile); then
 +    case `/usr/bin/file conftest.o` in
 +      *32-bit*)
 +	case $host in
 +	  x86_64-*kfreebsd*-gnu)
 +	    LD="${LD-ld} -m elf_i386_fbsd"
 +	    ;;
 +	  x86_64-*linux*)
 +	    case `/usr/bin/file conftest.o` in
 +	      *x86-64*)
 +		LD="${LD-ld} -m elf32_x86_64"
 +		;;
 +	      *)
 +		LD="${LD-ld} -m elf_i386"
 +		;;
 +	    esac
 +	    ;;
- 	  powerpc64le-*)
++	  powerpc64le-*linux*)
 +	    LD="${LD-ld} -m elf32lppclinux"
 +	    ;;
- 	  powerpc64-*)
++	  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-*)
++	  powerpcle-*linux*)
 +	    LD="${LD-ld} -m elf64lppc"
 +	    ;;
- 	  powerpc-*)
++	  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"
 +  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
 +    [AC_LANG_PUSH(C)
 +     AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
 +     AC_LANG_POP])
-   if test x"$lt_cv_cc_needs_belf" != x"yes"; then
++  if test yes != "$lt_cv_cc_needs_belf"; 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 which ABI we are using.
++  # Find out what ABI is being produced by ac_compile, and set linker
++  # options accordingly.
 +  echo 'int i;' > conftest.$ac_ext
 +  if AC_TRY_EVAL(ac_compile); then
 +    case `/usr/bin/file conftest.o` in
 +    *64-bit*)
 +      case $lt_cv_prog_gnu_ld in
 +      yes*)
 +        case $host in
-         i?86-*-solaris*)
++        i?86-*-solaris*|x86_64-*-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
 +])# _LT_ENABLE_LOCK
 +
 +
 +# _LT_PROG_AR
 +# -----------
 +m4_defun([_LT_PROG_AR],
 +[AC_CHECK_TOOLS(AR, [ar], false)
 +: ${AR=ar}
 +: ${AR_FLAGS=cru}
 +_LT_DECL([], [AR], [1], [The archiver])
 +_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
 +
 +AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
 +  [lt_cv_ar_at_file=no
 +   AC_COMPILE_IFELSE([AC_LANG_PROGRAM],
 +     [echo conftest.$ac_objext > conftest.lst
 +      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
 +      AC_TRY_EVAL([lt_ar_try])
-       if test "$ac_status" -eq 0; then
++      if test 0 -eq "$ac_status"; then
 +	# Ensure the archiver fails upon bogus file names.
 +	rm -f conftest.$ac_objext libconftest.a
 +	AC_TRY_EVAL([lt_ar_try])
- 	if test "$ac_status" -ne 0; then
++	if test 0 -ne "$ac_status"; then
 +          lt_cv_ar_at_file=@
 +        fi
 +      fi
 +      rm -f conftest.* libconftest.a
 +     ])
 +  ])
 +
- if test "x$lt_cv_ar_at_file" = xno; then
++if test no = "$lt_cv_ar_at_file"; then
 +  archiver_list_spec=
 +else
 +  archiver_list_spec=$lt_cv_ar_at_file
 +fi
 +_LT_DECL([], [archiver_list_spec], [1],
 +  [How to feed a file listing to the archiver])
 +])# _LT_PROG_AR
 +
 +
 +# _LT_CMD_OLD_ARCHIVE
 +# -------------------
 +m4_defun([_LT_CMD_OLD_ARCHIVE],
 +[_LT_PROG_AR
 +
 +AC_CHECK_TOOL(STRIP, strip, :)
 +test -z "$STRIP" && STRIP=:
 +_LT_DECL([], [STRIP], [1], [A symbol stripping program])
 +
 +AC_CHECK_TOOL(RANLIB, ranlib, :)
 +test -z "$RANLIB" && RANLIB=:
 +_LT_DECL([], [RANLIB], [1],
 +    [Commands used to install an old-style archive])
 +
 +# 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
-   openbsd*)
++  bitrig* | 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
 +_LT_DECL([], [old_postinstall_cmds], [2])
 +_LT_DECL([], [old_postuninstall_cmds], [2])
 +_LT_TAGDECL([], [old_archive_cmds], [2],
 +    [Commands used to build an old-style archive])
 +_LT_DECL([], [lock_old_archive_extraction], [0],
 +    [Whether to use a lock for old archive extraction])
 +])# _LT_CMD_OLD_ARCHIVE
 +
 +
 +# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
 +#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
 +# ----------------------------------------------------------------
 +# Check whether the given compiler option works
 +AC_DEFUN([_LT_COMPILER_OPTION],
 +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
 +m4_require([_LT_DECL_SED])dnl
 +AC_CACHE_CHECK([$1], [$2],
 +  [$2=no
 +   m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
 +   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-    lt_compiler_flag="$3"
++   lt_compiler_flag="$3"  ## exclude from sc_useless_quotes_in_assignment
 +   # 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\"" >&AS_MESSAGE_LOG_FD)
 +   (eval "$lt_compile" 2>conftest.err)
 +   ac_status=$?
 +   cat conftest.err >&AS_MESSAGE_LOG_FD
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
 +   if (exit $ac_status) && test -s "$ac_outfile"; then
 +     # The compiler can only warn and ignore the option if not recognized
 +     # So say no if there are warnings other than the usual output.
 +     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
 +     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
 +     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
 +       $2=yes
 +     fi
 +   fi
 +   $RM conftest*
 +])
 +
- if test x"[$]$2" = xyes; then
++if test yes = "[$]$2"; then
 +    m4_if([$5], , :, [$5])
 +else
 +    m4_if([$6], , :, [$6])
 +fi
 +])# _LT_COMPILER_OPTION
 +
 +# Old name:
 +AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION])
 +dnl aclocal-1.4 backwards compatibility:
 +dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [])
 +
 +
 +# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
 +#                  [ACTION-SUCCESS], [ACTION-FAILURE])
 +# ----------------------------------------------------
 +# Check whether the given linker option works
 +AC_DEFUN([_LT_LINKER_OPTION],
 +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
 +m4_require([_LT_DECL_SED])dnl
 +AC_CACHE_CHECK([$1], [$2],
 +  [$2=no
-    save_LDFLAGS="$LDFLAGS"
++   save_LDFLAGS=$LDFLAGS
 +   LDFLAGS="$LDFLAGS $3"
 +   echo "$lt_simple_link_test_code" > conftest.$ac_ext
 +   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
 +     # The linker can only warn and ignore the option if not recognized
 +     # So say no if there are warnings
 +     if test -s conftest.err; then
 +       # Append any errors to the config.log.
 +       cat conftest.err 1>&AS_MESSAGE_LOG_FD
 +       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
 +       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
 +       if diff conftest.exp conftest.er2 >/dev/null; then
 +         $2=yes
 +       fi
 +     else
 +       $2=yes
 +     fi
 +   fi
 +   $RM -r conftest*
-    LDFLAGS="$save_LDFLAGS"
++   LDFLAGS=$save_LDFLAGS
 +])
 +
- if test x"[$]$2" = xyes; then
++if test yes = "[$]$2"; then
 +    m4_if([$4], , :, [$4])
 +else
 +    m4_if([$5], , :, [$5])
 +fi
 +])# _LT_LINKER_OPTION
 +
 +# Old name:
 +AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION])
 +dnl aclocal-1.4 backwards compatibility:
 +dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], [])
 +
 +
 +# LT_CMD_MAX_LEN
 +#---------------
 +AC_DEFUN([LT_CMD_MAX_LEN],
 +[AC_REQUIRE([AC_CANONICAL_HOST])dnl
 +# find the maximum length of command line arguments
 +AC_MSG_CHECKING([the maximum length of command line arguments])
 +AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
 +  i=0
-   teststring="ABCD"
++  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;
 +    ;;
 +
-   netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
++  bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*)
 +    # 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
++       test undefined != "$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 $i != 17 # 1/2 MB should be enough
++	      test 17 != "$i" # 1/2 MB should be enough
 +      do
 +        i=`expr $i + 1`
 +        teststring=$teststring$teststring
 +      done
 +      # Only check the string length outside the loop.
 +      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
 +      teststring=
 +      # Add a significant safety factor because C++ compilers can tack on
 +      # massive amounts of additional arguments before passing them to the
 +      # linker.  It appears as though 1/2 is a usable value.
 +      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
 +    fi
 +    ;;
 +  esac
 +])
- if test -n $lt_cv_sys_max_cmd_len ; then
++if test -n "$lt_cv_sys_max_cmd_len"; then
 +  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
 +else
 +  AC_MSG_RESULT(none)
 +fi
 +max_cmd_len=$lt_cv_sys_max_cmd_len
 +_LT_DECL([], [max_cmd_len], [0],
 +    [What is the maximum length of a command?])
 +])# LT_CMD_MAX_LEN
 +
 +# Old name:
 +AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN])
 +dnl aclocal-1.4 backwards compatibility:
 +dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], [])
 +
 +
 +# _LT_HEADER_DLFCN
 +# ----------------
 +m4_defun([_LT_HEADER_DLFCN],
 +[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl
 +])# _LT_HEADER_DLFCN
 +
 +
 +# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
 +#                      ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
 +# ----------------------------------------------------------------
 +m4_defun([_LT_TRY_DLOPEN_SELF],
 +[m4_require([_LT_HEADER_DLFCN])dnl
- if test "$cross_compiling" = yes; then :
++if test yes = "$cross_compiling"; then :
 +  [$4]
 +else
 +  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
 +  lt_status=$lt_dlunknown
 +  cat > conftest.$ac_ext <<_LT_EOF
 +[#line $LINENO "configure"
 +#include "confdefs.h"
 +
 +#if HAVE_DLFCN_H
 +#include <dlfcn.h>
 +#endif
 +
 +#include <stdio.h>
 +
 +#ifdef RTLD_GLOBAL
 +#  define LT_DLGLOBAL		RTLD_GLOBAL
 +#else
 +#  ifdef DL_GLOBAL
 +#    define LT_DLGLOBAL		DL_GLOBAL
 +#  else
 +#    define LT_DLGLOBAL		0
 +#  endif
 +#endif
 +
 +/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
 +   find out it does not work in some platform. */
 +#ifndef LT_DLLAZY_OR_NOW
 +#  ifdef RTLD_LAZY
 +#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
 +#  else
 +#    ifdef DL_LAZY
 +#      define LT_DLLAZY_OR_NOW		DL_LAZY
 +#    else
 +#      ifdef RTLD_NOW
 +#        define LT_DLLAZY_OR_NOW	RTLD_NOW
 +#      else
 +#        ifdef DL_NOW
 +#          define LT_DLLAZY_OR_NOW	DL_NOW
 +#        else
 +#          define LT_DLLAZY_OR_NOW	0
 +#        endif
 +#      endif
 +#    endif
 +#  endif
 +#endif
 +
- /* When -fvisbility=hidden is used, assume the code has been annotated
++/* When -fvisibility=hidden is used, assume the code has been annotated
 +   correspondingly for the symbols needed.  */
- #if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
++#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
 +int fnord () __attribute__((visibility("default")));
 +#endif
 +
 +int fnord () { return 42; }
 +int main ()
 +{
 +  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
 +  int status = $lt_dlunknown;
 +
 +  if (self)
 +    {
 +      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
 +      else
 +        {
 +	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
 +          else puts (dlerror ());
 +	}
 +      /* dlclose (self); */
 +    }
 +  else
 +    puts (dlerror ());
 +
 +  return status;
 +}]
 +_LT_EOF
-   if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
++  if AC_TRY_EVAL(ac_link) && test -s "conftest$ac_exeext" 2>/dev/null; then
 +    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
 +    lt_status=$?
 +    case x$lt_status in
 +      x$lt_dlno_uscore) $1 ;;
 +      x$lt_dlneed_uscore) $2 ;;
 +      x$lt_dlunknown|x*) $3 ;;
 +    esac
 +  else :
 +    # compilation failed
 +    $3
 +  fi
 +fi
 +rm -fr conftest*
 +])# _LT_TRY_DLOPEN_SELF
 +
 +
 +# LT_SYS_DLOPEN_SELF
 +# ------------------
 +AC_DEFUN([LT_SYS_DLOPEN_SELF],
 +[m4_require([_LT_HEADER_DLFCN])dnl
- if test "x$enable_dlopen" != xyes; then
++if test yes != "$enable_dlopen"; then
 +  enable_dlopen=unknown
 +  enable_dlopen_self=unknown
 +  enable_dlopen_self_static=unknown
 +else
 +  lt_cv_dlopen=no
 +  lt_cv_dlopen_libs=
 +
 +  case $host_os in
 +  beos*)
-     lt_cv_dlopen="load_add_on"
++    lt_cv_dlopen=load_add_on
 +    lt_cv_dlopen_libs=
 +    lt_cv_dlopen_self=yes
 +    ;;
 +
 +  mingw* | pw32* | cegcc*)
-     lt_cv_dlopen="LoadLibrary"
++    lt_cv_dlopen=LoadLibrary
 +    lt_cv_dlopen_libs=
 +    ;;
 +
 +  cygwin*)
-     lt_cv_dlopen="dlopen"
++    lt_cv_dlopen=dlopen
 +    lt_cv_dlopen_libs=
 +    ;;
 +
 +  darwin*)
-   # if libdl is installed we need to link against it
++    # if libdl is installed we need to link against it
 +    AC_CHECK_LIB([dl], [dlopen],
- 		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
-     lt_cv_dlopen="dyld"
++		[lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl],[
++    lt_cv_dlopen=dyld
 +    lt_cv_dlopen_libs=
 +    lt_cv_dlopen_self=yes
 +    ])
 +    ;;
 +
++  tpf*)
++    # Don't try to run any link tests for TPF.  We know it's impossible
++    # because TPF is a cross-compiler, and we know how we open DSOs.
++    lt_cv_dlopen=dlopen
++    lt_cv_dlopen_libs=
++    lt_cv_dlopen_self=no
++    ;;
++
 +  *)
 +    AC_CHECK_FUNC([shl_load],
- 	  [lt_cv_dlopen="shl_load"],
++	  [lt_cv_dlopen=shl_load],
 +      [AC_CHECK_LIB([dld], [shl_load],
- 	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
++	    [lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld],
 +	[AC_CHECK_FUNC([dlopen],
- 	      [lt_cv_dlopen="dlopen"],
++	      [lt_cv_dlopen=dlopen],
 +	  [AC_CHECK_LIB([dl], [dlopen],
- 		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
++		[lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl],
 +	    [AC_CHECK_LIB([svld], [dlopen],
- 		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
++		  [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld],
 +	      [AC_CHECK_LIB([dld], [dld_link],
- 		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
++		    [lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld])
 +	      ])
 +	    ])
 +	  ])
 +	])
 +      ])
 +    ;;
 +  esac
 +
-   if test "x$lt_cv_dlopen" != xno; then
-     enable_dlopen=yes
-   else
++  if test no = "$lt_cv_dlopen"; then
 +    enable_dlopen=no
++  else
++    enable_dlopen=yes
 +  fi
 +
 +  case $lt_cv_dlopen in
 +  dlopen)
-     save_CPPFLAGS="$CPPFLAGS"
-     test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
++    save_CPPFLAGS=$CPPFLAGS
++    test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
 +
-     save_LDFLAGS="$LDFLAGS"
++    save_LDFLAGS=$LDFLAGS
 +    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
 +
-     save_LIBS="$LIBS"
++    save_LIBS=$LIBS
 +    LIBS="$lt_cv_dlopen_libs $LIBS"
 +
 +    AC_CACHE_CHECK([whether a program can dlopen itself],
 +	  lt_cv_dlopen_self, [dnl
 +	  _LT_TRY_DLOPEN_SELF(
 +	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
 +	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
 +    ])
 +
-     if test "x$lt_cv_dlopen_self" = xyes; then
++    if test yes = "$lt_cv_dlopen_self"; then
 +      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
 +      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
 +	  lt_cv_dlopen_self_static, [dnl
 +	  _LT_TRY_DLOPEN_SELF(
 +	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
 +	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
 +      ])
 +    fi
 +
-     CPPFLAGS="$save_CPPFLAGS"
-     LDFLAGS="$save_LDFLAGS"
-     LIBS="$save_LIBS"
++    CPPFLAGS=$save_CPPFLAGS
++    LDFLAGS=$save_LDFLAGS
++    LIBS=$save_LIBS
 +    ;;
 +  esac
 +
 +  case $lt_cv_dlopen_self in
 +  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
 +  *) enable_dlopen_self=unknown ;;
 +  esac
 +
 +  case $lt_cv_dlopen_self_static in
 +  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
 +  *) enable_dlopen_self_static=unknown ;;
 +  esac
 +fi
 +_LT_DECL([dlopen_support], [enable_dlopen], [0],
 +	 [Whether dlopen is supported])
 +_LT_DECL([dlopen_self], [enable_dlopen_self], [0],
 +	 [Whether dlopen of programs is supported])
 +_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0],
 +	 [Whether dlopen of statically linked programs is supported])
 +])# LT_SYS_DLOPEN_SELF
 +
 +# Old name:
 +AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF])
 +dnl aclocal-1.4 backwards compatibility:
 +dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [])
 +
 +
 +# _LT_COMPILER_C_O([TAGNAME])
 +# ---------------------------
 +# Check to see if options -c and -o are simultaneously supported by compiler.
 +# This macro does not hard code the compiler like AC_PROG_CC_C_O.
 +m4_defun([_LT_COMPILER_C_O],
 +[m4_require([_LT_DECL_SED])dnl
 +m4_require([_LT_FILEUTILS_DEFAULTS])dnl
 +m4_require([_LT_TAG_COMPILER])dnl
 +AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
 +  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
 +  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
 +   $RM -r conftest 2>/dev/null
 +   mkdir conftest
 +   cd conftest
 +   mkdir out
 +   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 +
 +   lt_compiler_flag="-o out/conftest2.$ac_objext"
 +   # Insert the option either (1) after the last *FLAGS variable, or
 +   # (2) before a word containing "conftest.", or (3) at the end.
 +   # Note that $ac_compile itself does not contain backslashes and begins
 +   # with a dollar sign (not a hyphen), so the echo should work correctly.
 +   lt_compile=`echo "$ac_compile" | $SED \
 +   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
 +   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
 +   -e 's:$: $lt_compiler_flag:'`
 +   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
 +   (eval "$lt_compile" 2>out/conftest.err)
 +   ac_status=$?
 +   cat out/conftest.err >&AS_MESSAGE_LOG_FD
 +   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
 +   if (exit $ac_status) && test -s out/conftest2.$ac_objext
 +   then
 +     # The compiler can only warn and ignore the option if not recognized
 +     # So say no if there are warnings
 +     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
 +     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
 +     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
 +       _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
 +     fi
 +   fi
 +   chmod u+w . 2>&AS_MESSAGE_LOG_FD
 +   $RM conftest*
 +   # SGI C++ compiler will create directory out/ii_files/ for
 +   # template instantiation
 +   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
 +   $RM out/* && rmdir out
 +   cd ..
 +   $RM -r conftest
 +   $RM conftest*
 +])
 +_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1],
 +	[Does compiler simultaneously support -c and -o options?])
 +])# _LT_COMPILER_C_O
 +
 +
 +# _LT_COMPILER_FILE_LOCKS([TAGNAME])
 +# ----------------------------------
 +# Check to see if we can do hard links to lock some files if needed
 +m4_defun([_LT_COMPILER_FILE_LOCKS],
 +[m4_require([_LT_ENABLE_LOCK])dnl
 +m4_require([_LT_FILEUTILS_DEFAULTS])dnl
 +_LT_COMPILER_C_O([$1])
 +
- hard_links="nottested"
- if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
++hard_links=nottested
++if test no = "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" && test no != "$need_locks"; then
 +  # do not overwrite the value of need_locks provided by the user
 +  AC_MSG_CHECKING([if we can lock with hard links])
 +  hard_links=yes
 +  $RM conftest*
 +  ln conftest.a conftest.b 2>/dev/null && hard_links=no
 +  touch conftest.a
 +  ln conftest.a conftest.b 2>&5 || hard_links=no
 +  ln conftest.a conftest.b 2>/dev/null && hard_links=no
 +  AC_MSG_RESULT([$hard_links])
-   if test "$hard_links" = no; then
-     AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
++  if test no = "$hard_links"; then
++    AC_MSG_WARN(['$CC' does not support '-c -o', so 'make -j' may be unsafe])
 +    need_locks=warn
 +  fi
 +else
 +  need_locks=no
 +fi
 +_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?])
 +])# _LT_COMPILER_FILE_LOCKS
 +
 +
 +# _LT_CHECK_OBJDIR
 +# ----------------
 +m4_defun([_LT_CHECK_OBJDIR],
 +[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
 +[rm -f .libs 2>/dev/null
 +mkdir .libs 2>/dev/null
 +if test -d .libs; then
 +  lt_cv_objdir=.libs
 +else
 +  # MS-DOS does not allow filenames that begin with a dot.
 +  lt_cv_objdir=_libs
 +fi
 +rmdir .libs 2>/dev/null])
 +objdir=$lt_cv_objdir
 +_LT_DECL([], [objdir], [0],
 +         [The name of the directory that contains temporary libtool files])dnl
 +m4_pattern_allow([LT_OBJDIR])dnl
- AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/",
-   [Define to the sub-directory in which libtool stores uninstalled libraries.])
++AC_DEFINE_UNQUOTED([LT_OBJDIR], "$lt_cv_objdir/",
++  [Define to the sub-directory where libtool stores uninstalled libraries.])
 +])# _LT_CHECK_OBJDIR
 +
 +
 +# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME])
 +# --------------------------------------
 +# Check hardcoding attributes.
 +m4_defun([_LT_LINKER_HARDCODE_LIBPATH],
 +[AC_MSG_CHECKING([how to hardcode library paths into programs])
 +_LT_TAGVAR(hardcode_action, $1)=
 +if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" ||
 +   test -n "$_LT_TAGVAR(runpath_var, $1)" ||
-    test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
++   test yes = "$_LT_TAGVAR(hardcode_automatic, $1)"; then
 +
 +  # We can hardcode non-existent directories.
-   if test "$_LT_TAGVAR(hardcode_direct, $1)" != no &&
++  if test no != "$_LT_TAGVAR(hardcode_direct, $1)" &&
 +     # If the only mechanism to avoid hardcoding is shlibpath_var, we
 +     # have to relink, otherwise we might link with an installed library
 +     # when we should be linking with a yet-to-be-installed one
-      ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
-      test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then
++     ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" &&
++     test no != "$_LT_TAGVAR(hardcode_minus_L, $1)"; then
 +    # Linking always hardcodes the temporary library directory.
 +    _LT_TAGVAR(hardcode_action, $1)=relink
 +  else
 +    # We can link without hardcoding, and we can hardcode nonexisting dirs.
 +    _LT_TAGVAR(hardcode_action, $1)=immediate
 +  fi
 +else
 +  # We cannot hardcode anything, or else we can only hardcode existing
 +  # directories.
 +  _LT_TAGVAR(hardcode_action, $1)=unsupported
 +fi
 +AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)])
 +
- if test "$_LT_TAGVAR(hardcode_action, $1)" = relink ||
-    test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then
++if test relink = "$_LT_TAGVAR(hardcode_action, $1)" ||
++   test yes = "$_LT_TAGVAR(inherit_rpath, $1)"; then
 +  # Fast installation is not supported
 +  enable_fast_install=no
- elif test "$shlibpath_overrides_runpath" = yes ||
-      test "$enable_shared" = no; then
++elif test yes = "$shlibpath_overrides_runpath" ||
++     test no = "$enable_shared"; then
 +  # Fast installation is not necessary
 +  enable_fast_install=needless
 +fi
 +_LT_TAGDECL([], [hardcode_action], [0],
 +    [How to hardcode a shared library path into an executable])
 +])# _LT_LINKER_HARDCODE_LIBPATH
 +
 +
 +# _LT_CMD_STRIPLIB
 +# ----------------
 +m4_defun([_LT_CMD_STRIPLIB],
 +[m4_require([_LT_DECL_EGREP])
 +striplib=
 +old_striplib=
 +AC_MSG_CHECKING([whether stripping libraries is possible])
 +if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
 +  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
 +  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
 +  AC_MSG_RESULT([yes])
 +else
 +# FIXME - insert some real tests, host_os isn't really good enough
 +  case $host_os in
 +  darwin*)
-     if test -n "$STRIP" ; then
++    if test -n "$STRIP"; then
 +      striplib="$STRIP -x"
 +      old_striplib="$STRIP -S"
 +      AC_MSG_RESULT([yes])
 +    else
 +      AC_MSG_RESULT([no])
 +    fi
 +    ;;
 +  *)
 +    AC_MSG_RESULT([no])
 +    ;;
 +  esac
 +fi
 +_LT_DECL([], [old_striplib], [1], [Commands to strip libraries])
 +_LT_DECL([], [striplib], [1])
 +])# _LT_CMD_STRIPLIB
 +
 +
++# _LT_PREPARE_MUNGE_PATH_LIST
++# ---------------------------
++# Make sure func_munge_path_list() is defined correctly.
++m4_defun([_LT_PREPARE_MUNGE_PATH_LIST],
++[[# 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 at S|@2 in
++    x)
++        ;;
++    *:)
++        eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'` \@S|@@S|@1\"
++        ;;
++    x:*)
++        eval @S|@1=\"\@S|@@S|@1 `$ECHO @S|@2 | $SED 's/:/ /g'`\"
++        ;;
++    *::*)
++        eval @S|@1=\"\@S|@@S|@1\ `$ECHO @S|@2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
++        eval @S|@1=\"`$ECHO @S|@2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \@S|@@S|@1\"
++        ;;
++    *)
++        eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'`\"
++        ;;
++    esac
++}
++]])# _LT_PREPARE_PATH_LIST
++
++
 +# _LT_SYS_DYNAMIC_LINKER([TAG])
 +# -----------------------------
 +# PORTME Fill in your ld.so characteristics
 +m4_defun([_LT_SYS_DYNAMIC_LINKER],
 +[AC_REQUIRE([AC_CANONICAL_HOST])dnl
 +m4_require([_LT_DECL_EGREP])dnl
 +m4_require([_LT_FILEUTILS_DEFAULTS])dnl
 +m4_require([_LT_DECL_OBJDUMP])dnl
 +m4_require([_LT_DECL_SED])dnl
 +m4_require([_LT_CHECK_SHELL_FEATURES])dnl
++m4_require([_LT_PREPARE_MUNGE_PATH_LIST])dnl
 +AC_MSG_CHECKING([dynamic linker characteristics])
 +m4_if([$1],
 +	[], [
- if test "$GCC" = yes; then
++if test yes = "$GCC"; then
 +  case $host_os in
-     darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
-     *) lt_awk_arg="/^libraries:/" ;;
++    darwin*) lt_awk_arg='/^libraries:/,/LR/' ;;
++    *) lt_awk_arg='/^libraries:/' ;;
 +  esac
 +  case $host_os in
-     mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;;
-     *) lt_sed_strip_eq="s,=/,/,g" ;;
++    mingw* | cegcc*) lt_sed_strip_eq='s|=\([[A-Za-z]]:\)|\1|g' ;;
++    *) lt_sed_strip_eq='s|=/|/|g' ;;
 +  esac
 +  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
 +  case $lt_search_path_spec in
 +  *\;*)
 +    # if the path contains ";" then we assume it to be the separator
 +    # otherwise default to the standard path separator (i.e. ":") - it is
 +    # assumed that no part of a normal pathname contains ";" but that should
 +    # okay in the real world where ";" in dirpaths is itself problematic.
 +    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
 +    ;;
 +  *)
 +    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
 +    ;;
 +  esac
 +  # Ok, now we have the path, separated by spaces, we can step through it
-   # and add multilib dir if necessary.
++  # and add multilib dir if necessary...
 +  lt_tmp_lt_search_path_spec=
-   lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
++  lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
++  # ...but if some path component already ends with the multilib dir we assume
++  # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer).
++  case "$lt_multi_os_dir; $lt_search_path_spec " in
++  "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*)
++    lt_multi_os_dir=
++    ;;
++  esac
 +  for lt_sys_path in $lt_search_path_spec; do
-     if test -d "$lt_sys_path/$lt_multi_os_dir"; then
-       lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
-     else
++    if test -d "$lt_sys_path$lt_multi_os_dir"; then
++      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir"
++    elif test -n "$lt_multi_os_dir"; then
 +      test -d "$lt_sys_path" && \
 +	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
 +    fi
 +  done
 +  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
- BEGIN {RS=" "; FS="/|\n";} {
-   lt_foo="";
-   lt_count=0;
++BEGIN {RS = " "; FS = "/|\n";} {
++  lt_foo = "";
++  lt_count = 0;
 +  for (lt_i = NF; lt_i > 0; lt_i--) {
 +    if ($lt_i != "" && $lt_i != ".") {
 +      if ($lt_i == "..") {
 +        lt_count++;
 +      } else {
 +        if (lt_count == 0) {
-           lt_foo="/" $lt_i lt_foo;
++          lt_foo = "/" $lt_i lt_foo;
 +        } else {
 +          lt_count--;
 +        }
 +      }
 +    }
 +  }
 +  if (lt_foo != "") { lt_freq[[lt_foo]]++; }
 +  if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
 +}'`
 +  # AWK program above erroneously prepends '/' to C:/dos/paths
 +  # for these hosts.
 +  case $host_os in
 +    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
-       $SED 's,/\([[A-Za-z]]:\),\1,g'` ;;
++      $SED 's|/\([[A-Za-z]]:\)|\1|g'` ;;
 +  esac
 +  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
 +else
 +  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
 +fi])
 +library_names_spec=
 +libname_spec='lib$name'
 +soname_spec=
- shrext_cmds=".so"
++shrext_cmds=.so
 +postinstall_cmds=
 +postuninstall_cmds=
 +finish_cmds=
 +finish_eval=
 +shlibpath_var=
 +shlibpath_overrides_runpath=unknown
 +version_type=none
 +dynamic_linker="$host_os ld.so"
 +sys_lib_dlsearch_path_spec="/lib /usr/lib"
 +need_lib_prefix=unknown
 +hardcode_into_libs=no
 +
 +# when you set need_version to no, make sure it does not cause -set_version
 +# flags to be left without arguments
 +need_version=unknown
 +
++AC_ARG_VAR([LT_SYS_LIBRARY_PATH],
++[User-defined run-time library search path.])
++
 +case $host_os in
 +aix3*)
 +  version_type=linux # correct to gnu/linux during the next big refactor
-   library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
++  library_names_spec='$libname$release$shared_ext$versuffix $libname.a'
 +  shlibpath_var=LIBPATH
 +
 +  # AIX 3 has no versioning support, so we append a major version to the name.
-   soname_spec='${libname}${release}${shared_ext}$major'
++  soname_spec='$libname$release$shared_ext$major'
 +  ;;
 +
 +aix[[4-9]]*)
 +  version_type=linux # correct to gnu/linux during the next big refactor
 +  need_lib_prefix=no
 +  need_version=no
 +  hardcode_into_libs=yes
-   if test "$host_cpu" = ia64; then
++  if test ia64 = "$host_cpu"; then
 +    # AIX 5 supports IA64
-     library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
++    library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext'
 +    shlibpath_var=LD_LIBRARY_PATH
 +  else
 +    # With GCC up to 2.95.x, collect2 would create an import file
 +    # for dependence libraries.  The import file would start with
-     # the line `#! .'.  This would cause the generated library to
-     # depend on `.', always an invalid library.  This was fixed in
++    # the line '#! .'.  This would cause the generated library to
++    # depend on '.', always an invalid library.  This was fixed in
 +    # development snapshots of GCC prior to 3.0.
 +    case $host_os in
 +      aix4 | aix4.[[01]] | aix4.[[01]].*)
 +      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
 +	   echo ' yes '
- 	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
++	   echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then
 +	:
 +      else
 +	can_build_shared=no
 +      fi
 +      ;;
 +    esac
-     # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
++    # Using Import Files as archive members, it is possible to support
++    # filename-based versioning of shared library archives on AIX. While
++    # this would work for both with and without runtime linking, it will
++    # prevent static linking of such archives. So we do filename-based
++    # shared library versioning with .so extension only, which is used
++    # when both runtime linking and shared linking is enabled.
++    # Unfortunately, runtime linking may impact performance, so we do
++    # not want this to be the default eventually. Also, we use the
++    # versioned .so libs for executables only if there is the -brtl
++    # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
++    # To allow for filename-based versioning support, we need to create
++    # libNAME.so.V as an archive file, containing:
++    # *) an Import File, referring to the versioned filename of the
++    #    archive as well as the shared archive member, telling the
++    #    bitwidth (32 or 64) of that shared object, and providing the
++    #    list of exported symbols of that shared object, eventually
++    #    decorated with the 'weak' keyword
++    # *) the shared object with the F_LOADONLY flag set, to really avoid
++    #    it being seen by the linker.
++    # At run time we better use the real file rather than another symlink,
++    # but for link time we create the symlink libNAME.so -> libNAME.so.V
++
++    case $with_aix_soname,$aix_use_runtimelinking in
++    # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
 +    # soname into executable. Probably we can add versioning support to
 +    # collect2, so additional links can be useful in future.
-     if test "$aix_use_runtimelinking" = yes; then
++    aix,yes) # traditional libtool
++      dynamic_linker='AIX unversionable lib.so'
 +      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
 +      # instead of lib<name>.a to let people know that these are not
 +      # typical AIX shared libraries.
-       library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-     else
++      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
++      ;;
++    aix,no) # traditional AIX only
++      dynamic_linker='AIX lib.a[(]lib.so.V[)]'
 +      # We preserve .a as extension for shared libraries through AIX4.2
 +      # and later when we are not doing run time linking.
-       library_names_spec='${libname}${release}.a $libname.a'
-       soname_spec='${libname}${release}${shared_ext}$major'
-     fi
++      library_names_spec='$libname$release.a $libname.a'
++      soname_spec='$libname$release$shared_ext$major'
++      ;;
++    svr4,*) # full svr4 only
++      dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)]"
++      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
++      # We do not specify a path in Import Files, so LIBPATH fires.
++      shlibpath_overrides_runpath=yes
++      ;;
++    *,yes) # both, prefer svr4
++      dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)], lib.a[(]lib.so.V[)]"
++      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
++      # unpreferred sharedlib libNAME.a needs extra handling
++      postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
++      postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
++      # We do not specify a path in Import Files, so LIBPATH fires.
++      shlibpath_overrides_runpath=yes
++      ;;
++    *,no) # both, prefer aix
++      dynamic_linker="AIX lib.a[(]lib.so.V[)], lib.so.V[(]$shared_archive_member_spec.o[)]"
++      library_names_spec='$libname$release.a $libname.a'
++      soname_spec='$libname$release$shared_ext$major'
++      # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
++      postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
++      postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
++      ;;
++    esac
 +    shlibpath_var=LIBPATH
 +  fi
 +  ;;
 +
 +amigaos*)
 +  case $host_cpu in
 +  powerpc)
 +    # Since July 2007 AmigaOS4 officially supports .so libraries.
 +    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
-     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
 +    ;;
 +  m68k)
 +    library_names_spec='$libname.ixlibrary $libname.a'
 +    # Create ${libname}_ixlibrary.a entries in /sys/libs.
-     finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
++    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
 +    ;;
 +  esac
 +  ;;
 +
 +beos*)
-   library_names_spec='${libname}${shared_ext}'
++  library_names_spec='$libname$shared_ext'
 +  dynamic_linker="$host_os ld.so"
 +  shlibpath_var=LIBRARY_PATH
 +  ;;
 +
 +bsdi[[45]]*)
 +  version_type=linux # correct to gnu/linux during the next big refactor
 +  need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-   soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
++  soname_spec='$libname$release$shared_ext$major'
 +  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
 +  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
 +  # the default ld.so.conf also contains /usr/contrib/lib and
 +  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
 +  # libtool to hard-code these into programs
 +  ;;
 +
 +cygwin* | mingw* | pw32* | cegcc*)
 +  version_type=windows
-   shrext_cmds=".dll"
++  shrext_cmds=.dll
 +  need_version=no
 +  need_lib_prefix=no
 +
 +  case $GCC,$cc_basename in
 +  yes,*)
 +    # gcc
 +    library_names_spec='$libname.dll.a'
 +    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-     postinstall_cmds='base_file=`basename \${file}`~
-       dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
++    postinstall_cmds='base_file=`basename \$file`~
++      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
 +      dldir=$destdir/`dirname \$dlpath`~
 +      test -d \$dldir || mkdir -p \$dldir~
 +      $install_prog $dir/$dlname \$dldir/$dlname~
 +      chmod a+x \$dldir/$dlname~
 +      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
 +        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
 +      fi'
 +    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
 +      dlpath=$dir/\$dldll~
 +       $RM \$dlpath'
 +    shlibpath_overrides_runpath=yes
 +
 +    case $host_os in
 +    cygwin*)
 +      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-       soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
++      soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
 +m4_if([$1], [],[
 +      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
 +      ;;
 +    mingw* | cegcc*)
 +      # MinGW DLLs use traditional 'lib' prefix
-       soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
++      soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
 +      ;;
 +    pw32*)
 +      # pw32 DLLs use 'pw' prefix rather than 'lib'
-       library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
++      library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
 +      ;;
 +    esac
 +    dynamic_linker='Win32 ld.exe'
 +    ;;
 +
 +  *,cl*)
 +    # Native MSVC
 +    libname_spec='$name'
-     soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-     library_names_spec='${libname}.dll.lib'
++    soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
++    library_names_spec='$libname.dll.lib'
 +
 +    case $build_os in
 +    mingw*)
 +      sys_lib_search_path_spec=
 +      lt_save_ifs=$IFS
 +      IFS=';'
 +      for lt_path in $LIB
 +      do
 +        IFS=$lt_save_ifs
 +        # Let DOS variable expansion print the short 8.3 style file name.
 +        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
 +        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
 +      done
 +      IFS=$lt_save_ifs
 +      # Convert to MSYS style.
 +      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
 +      ;;
 +    cygwin*)
 +      # Convert to unix form, then to dos form, then back to unix form
 +      # but this time dos style (no spaces!) so that the unix form looks
 +      # like /cygdrive/c/PROGRA~1:/cygdr...
 +      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
 +      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
 +      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
 +      ;;
 +    *)
-       sys_lib_search_path_spec="$LIB"
++      sys_lib_search_path_spec=$LIB
 +      if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
 +        # It is most probably a Windows format PATH.
 +        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
 +      else
 +        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
 +      fi
 +      # FIXME: find the short name or the path components, as spaces are
 +      # common. (e.g. "Program Files" -> "PROGRA~1")
 +      ;;
 +    esac
 +
 +    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-     postinstall_cmds='base_file=`basename \${file}`~
-       dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
++    postinstall_cmds='base_file=`basename \$file`~
++      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
 +      dldir=$destdir/`dirname \$dlpath`~
 +      test -d \$dldir || mkdir -p \$dldir~
 +      $install_prog $dir/$dlname \$dldir/$dlname'
 +    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
 +      dlpath=$dir/\$dldll~
 +       $RM \$dlpath'
 +    shlibpath_overrides_runpath=yes
 +    dynamic_linker='Win32 link.exe'
 +    ;;
 +
 +  *)
 +    # Assume MSVC wrapper
-     library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
++    library_names_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext $libname.lib'
 +    dynamic_linker='Win32 ld.exe'
 +    ;;
 +  esac
 +  # FIXME: first we should search . and the directory the executable is in
 +  shlibpath_var=PATH
 +  ;;
 +
 +darwin* | rhapsody*)
 +  dynamic_linker="$host_os dyld"
 +  version_type=darwin
 +  need_lib_prefix=no
 +  need_version=no
-   library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-   soname_spec='${libname}${release}${major}$shared_ext'
++  library_names_spec='$libname$release$major$shared_ext $libname$shared_ext'
++  soname_spec='$libname$release$major$shared_ext'
 +  shlibpath_overrides_runpath=yes
 +  shlibpath_var=DYLD_LIBRARY_PATH
 +  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
 +m4_if([$1], [],[
 +  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
 +  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
 +  ;;
 +
 +dgux*)
 +  version_type=linux # correct to gnu/linux during the next big refactor
 +  need_lib_prefix=no
 +  need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-   soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
++  soname_spec='$libname$release$shared_ext$major'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  ;;
 +
 +freebsd* | dragonfly*)
 +  # DragonFly does not have aout.  When/if they implement a new
 +  # versioning mechanism, adjust this.
 +  if test -x /usr/bin/objformat; then
 +    objformat=`/usr/bin/objformat`
 +  else
 +    case $host_os in
 +    freebsd[[23]].*) objformat=aout ;;
 +    *) objformat=elf ;;
 +    esac
 +  fi
 +  version_type=freebsd-$objformat
 +  case $version_type in
 +    freebsd-elf*)
-       library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
++      soname_spec='$libname$release$shared_ext$major'
 +      need_version=no
 +      need_lib_prefix=no
 +      ;;
 +    freebsd-*)
-       library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
++      library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
 +      need_version=yes
 +      ;;
 +  esac
 +  shlibpath_var=LD_LIBRARY_PATH
 +  case $host_os in
 +  freebsd2.*)
 +    shlibpath_overrides_runpath=yes
 +    ;;
 +  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
 +    shlibpath_overrides_runpath=yes
 +    hardcode_into_libs=yes
 +    ;;
 +  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
 +  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
 +    shlibpath_overrides_runpath=no
 +    hardcode_into_libs=yes
 +    ;;
 +  *) # from 4.6 on, and DragonFly
 +    shlibpath_overrides_runpath=yes
 +    hardcode_into_libs=yes
 +    ;;
 +  esac
 +  ;;
 +
 +haiku*)
 +  version_type=linux # correct to gnu/linux during the next big refactor
 +  need_lib_prefix=no
 +  need_version=no
 +  dynamic_linker="$host_os runtime_loader"
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-   soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
++  soname_spec='$libname$release$shared_ext$major'
 +  shlibpath_var=LIBRARY_PATH
-   shlibpath_overrides_runpath=yes
++  shlibpath_overrides_runpath=no
 +  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
 +  hardcode_into_libs=yes
 +  ;;
 +
 +hpux9* | hpux10* | hpux11*)
 +  # Give a soname corresponding to the major version so that dld.sl refuses to
 +  # link against other versions.
 +  version_type=sunos
 +  need_lib_prefix=no
 +  need_version=no
 +  case $host_cpu in
 +  ia64*)
 +    shrext_cmds='.so'
 +    hardcode_into_libs=yes
 +    dynamic_linker="$host_os dld.so"
 +    shlibpath_var=LD_LIBRARY_PATH
 +    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-     soname_spec='${libname}${release}${shared_ext}$major'
-     if test "X$HPUX_IA64_MODE" = X32; then
++    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
++    soname_spec='$libname$release$shared_ext$major'
++    if test 32 = "$HPUX_IA64_MODE"; then
 +      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
++      sys_lib_dlsearch_path_spec=/usr/lib/hpux32
 +    else
 +      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
++      sys_lib_dlsearch_path_spec=/usr/lib/hpux64
 +    fi
-     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
 +    ;;
 +  hppa*64*)
 +    shrext_cmds='.sl'
 +    hardcode_into_libs=yes
 +    dynamic_linker="$host_os dld.sl"
 +    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
 +    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-     soname_spec='${libname}${release}${shared_ext}$major'
++    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
++    soname_spec='$libname$release$shared_ext$major'
 +    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
 +    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
 +    ;;
 +  *)
 +    shrext_cmds='.sl'
 +    dynamic_linker="$host_os dld.sl"
 +    shlibpath_var=SHLIB_PATH
 +    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-     soname_spec='${libname}${release}${shared_ext}$major'
++    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
++    soname_spec='$libname$release$shared_ext$major'
 +    ;;
 +  esac
 +  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
 +  postinstall_cmds='chmod 555 $lib'
 +  # or fails outright, so override atomically:
 +  install_override_mode=555
 +  ;;
 +
 +interix[[3-9]]*)
 +  version_type=linux # correct to gnu/linux during the next big refactor
 +  need_lib_prefix=no
 +  need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-   soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
++  soname_spec='$libname$release$shared_ext$major'
 +  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  shlibpath_overrides_runpath=no
 +  hardcode_into_libs=yes
 +  ;;
 +
 +irix5* | irix6* | nonstopux*)
 +  case $host_os in
 +    nonstopux*) version_type=nonstopux ;;
 +    *)
- 	if test "$lt_cv_prog_gnu_ld" = yes; then
++	if test yes = "$lt_cv_prog_gnu_ld"; then
 +		version_type=linux # correct to gnu/linux during the next big refactor
 +	else
 +		version_type=irix
 +	fi ;;
 +  esac
 +  need_lib_prefix=no
 +  need_version=no
-   soname_spec='${libname}${release}${shared_ext}$major'
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
++  soname_spec='$libname$release$shared_ext$major'
++  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext'
 +  case $host_os in
 +  irix5* | nonstopux*)
 +    libsuff= shlibsuff=
 +    ;;
 +  *)
 +    case $LD in # libtool.m4 will add one of these switches to LD
 +    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
 +      libsuff= shlibsuff= libmagic=32-bit;;
 +    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
 +      libsuff=32 shlibsuff=N32 libmagic=N32;;
 +    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
 +      libsuff=64 shlibsuff=64 libmagic=64-bit;;
 +    *) libsuff= shlibsuff= libmagic=never-match;;
 +    esac
 +    ;;
 +  esac
 +  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
 +  shlibpath_overrides_runpath=no
-   sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-   sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
++  sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff"
++  sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff"
 +  hardcode_into_libs=yes
 +  ;;
 +
 +# No shared lib support for Linux oldld, aout, or coff.
 +linux*oldld* | linux*aout* | linux*coff*)
 +  dynamic_linker=no
 +  ;;
 +
++linux*android*)
++  version_type=none # Android doesn't support versioned libraries.
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='$libname$release$shared_ext'
++  soname_spec='$libname$release$shared_ext'
++  finish_cmds=
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++
++  # This implies no fast_install, which is unacceptable.
++  # Some rework will be needed to allow for fast_install
++  # before this can be enabled.
++  hardcode_into_libs=yes
++
++  dynamic_linker='Android linker'
++  # Don't embed -rpath directories since the linker doesn't support them.
++  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++  ;;
++
 +# This must be glibc/ELF.
 +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
 +  version_type=linux # correct to gnu/linux during the next big refactor
 +  need_lib_prefix=no
 +  need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-   soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
++  soname_spec='$libname$release$shared_ext$major'
 +  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  shlibpath_overrides_runpath=no
 +
 +  # Some binutils ld are patched to set DT_RUNPATH
 +  AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath],
 +    [lt_cv_shlibpath_overrides_runpath=no
 +    save_LDFLAGS=$LDFLAGS
 +    save_libdir=$libdir
 +    eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
 +	 LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
 +    AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
 +      [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
 +	 [lt_cv_shlibpath_overrides_runpath=yes])])
 +    LDFLAGS=$save_LDFLAGS
 +    libdir=$save_libdir
 +    ])
 +  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
 +
 +  # This implies no fast_install, which is unacceptable.
 +  # Some rework will be needed to allow for fast_install
 +  # before this can be enabled.
 +  hardcode_into_libs=yes
 +
-   # Append ld.so.conf contents to the search path
++  # Ideally, we could use ldconfig to report *all* directores which are
++  # searched for libraries, however this is still not possible.  Aside from not
++  # being certain /sbin/ldconfig is available, command
++  # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
++  # even though it is searched at run-time.  Try to do the best guess by
++  # appending ld.so.conf contents (and includes) to the search path.
 +  if test -f /etc/ld.so.conf; then
 +    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
 +    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
 +  fi
 +
 +  # We used to test for /lib/ld.so.1 and disable shared libraries on
 +  # powerpc, because MkLinux only supported shared libraries with the
 +  # GNU dynamic linker.  Since this was broken with cross compilers,
 +  # most powerpc-linux boxes support dynamic linking these days and
 +  # people can always --disable-shared, the test was removed, and we
 +  # assume the GNU/Linux dynamic linker is in use.
 +  dynamic_linker='GNU/Linux ld.so'
 +  ;;
 +
 +netbsdelf*-gnu)
 +  version_type=linux
 +  need_lib_prefix=no
 +  need_version=no
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
 +  soname_spec='${libname}${release}${shared_ext}$major'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  shlibpath_overrides_runpath=no
 +  hardcode_into_libs=yes
 +  dynamic_linker='NetBSD ld.elf_so'
 +  ;;
 +
 +netbsd*)
 +  version_type=sunos
 +  need_lib_prefix=no
 +  need_version=no
 +  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++    library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
 +    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
 +    dynamic_linker='NetBSD (a.out) ld.so'
 +  else
-     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-     soname_spec='${libname}${release}${shared_ext}$major'
++    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
++    soname_spec='$libname$release$shared_ext$major'
 +    dynamic_linker='NetBSD ld.elf_so'
 +  fi
 +  shlibpath_var=LD_LIBRARY_PATH
 +  shlibpath_overrides_runpath=yes
 +  hardcode_into_libs=yes
 +  ;;
 +
 +newsos6)
 +  version_type=linux # correct to gnu/linux during the next big refactor
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  shlibpath_overrides_runpath=yes
 +  ;;
 +
 +*nto* | *qnx*)
 +  version_type=qnx
 +  need_lib_prefix=no
 +  need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-   soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
++  soname_spec='$libname$release$shared_ext$major'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  shlibpath_overrides_runpath=no
 +  hardcode_into_libs=yes
 +  dynamic_linker='ldqnx.so'
 +  ;;
 +
- openbsd*)
++openbsd* | bitrig*)
 +  version_type=sunos
-   sys_lib_dlsearch_path_spec="/usr/lib"
++  sys_lib_dlsearch_path_spec=/usr/lib
 +  need_lib_prefix=no
-   # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-   case $host_os in
-     openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
-     *)				need_version=no  ;;
-   esac
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-   shlibpath_var=LD_LIBRARY_PATH
-   if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-     case $host_os in
-       openbsd2.[[89]] | openbsd2.[[89]].*)
- 	shlibpath_overrides_runpath=no
- 	;;
-       *)
- 	shlibpath_overrides_runpath=yes
- 	;;
-       esac
++  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
++    need_version=no
 +  else
-     shlibpath_overrides_runpath=yes
++    need_version=yes
 +  fi
++  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
 +  ;;
 +
 +os2*)
 +  libname_spec='$name'
-   shrext_cmds=".dll"
++  version_type=windows
++  shrext_cmds=.dll
++  need_version=no
 +  need_lib_prefix=no
-   library_names_spec='$libname${shared_ext} $libname.a'
++  # OS/2 can only load a DLL with a base name of 8 characters or less.
++  soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
++    v=$($ECHO $release$versuffix | tr -d .-);
++    n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
++    $ECHO $n$v`$shared_ext'
++  library_names_spec='${libname}_dll.$libext'
 +  dynamic_linker='OS/2 ld.exe'
-   shlibpath_var=LIBPATH
++  shlibpath_var=BEGINLIBPATH
++  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
++  postinstall_cmds='base_file=`basename \$file`~
++    dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~
++    dldir=$destdir/`dirname \$dlpath`~
++    test -d \$dldir || mkdir -p \$dldir~
++    $install_prog $dir/$dlname \$dldir/$dlname~
++    chmod a+x \$dldir/$dlname~
++    if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
++      eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
++    fi'
++  postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
++    dlpath=$dir/\$dldll~
++    $RM \$dlpath'
 +  ;;
 +
 +osf3* | osf4* | osf5*)
 +  version_type=osf
 +  need_lib_prefix=no
 +  need_version=no
-   soname_spec='${libname}${release}${shared_ext}$major'
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='$libname$release$shared_ext$major'
++  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
++  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
 +  ;;
 +
 +rdos*)
 +  dynamic_linker=no
 +  ;;
 +
 +solaris*)
 +  version_type=linux # correct to gnu/linux during the next big refactor
 +  need_lib_prefix=no
 +  need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-   soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
++  soname_spec='$libname$release$shared_ext$major'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  shlibpath_overrides_runpath=yes
 +  hardcode_into_libs=yes
 +  # ldd complains unless libraries are executable
 +  postinstall_cmds='chmod +x $lib'
 +  ;;
 +
 +sunos4*)
 +  version_type=sunos
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
 +  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  shlibpath_overrides_runpath=yes
-   if test "$with_gnu_ld" = yes; then
++  if test yes = "$with_gnu_ld"; then
 +    need_lib_prefix=no
 +  fi
 +  need_version=yes
 +  ;;
 +
 +sysv4 | sysv4.3*)
 +  version_type=linux # correct to gnu/linux during the next big refactor
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-   soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
++  soname_spec='$libname$release$shared_ext$major'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  case $host_vendor in
 +    sni)
 +      shlibpath_overrides_runpath=no
 +      need_lib_prefix=no
 +      runpath_var=LD_RUN_PATH
 +      ;;
 +    siemens)
 +      need_lib_prefix=no
 +      ;;
 +    motorola)
 +      need_lib_prefix=no
 +      need_version=no
 +      shlibpath_overrides_runpath=no
 +      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
 +      ;;
 +  esac
 +  ;;
 +
 +sysv4*MP*)
-   if test -d /usr/nec ;then
++  if test -d /usr/nec; then
 +    version_type=linux # correct to gnu/linux during the next big refactor
-     library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-     soname_spec='$libname${shared_ext}.$major'
++    library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext'
++    soname_spec='$libname$shared_ext.$major'
 +    shlibpath_var=LD_LIBRARY_PATH
 +  fi
 +  ;;
 +
 +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-   version_type=freebsd-elf
++  version_type=sco
 +  need_lib_prefix=no
 +  need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-   soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
++  soname_spec='$libname$release$shared_ext$major'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  shlibpath_overrides_runpath=yes
 +  hardcode_into_libs=yes
-   if test "$with_gnu_ld" = yes; then
++  if test yes = "$with_gnu_ld"; then
 +    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
 +  else
 +    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
 +    case $host_os in
 +      sco3.2v5*)
 +        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
 +	;;
 +    esac
 +  fi
 +  sys_lib_dlsearch_path_spec='/usr/lib'
 +  ;;
 +
 +tpf*)
 +  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
 +  version_type=linux # correct to gnu/linux during the next big refactor
 +  need_lib_prefix=no
 +  need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  shlibpath_overrides_runpath=no
 +  hardcode_into_libs=yes
 +  ;;
 +
 +uts4*)
 +  version_type=linux # correct to gnu/linux during the next big refactor
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-   soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
++  soname_spec='$libname$release$shared_ext$major'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  ;;
 +
 +*)
 +  dynamic_linker=no
 +  ;;
 +esac
 +AC_MSG_RESULT([$dynamic_linker])
- test "$dynamic_linker" = no && can_build_shared=no
++test no = "$dynamic_linker" && can_build_shared=no
 +
 +variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
- if test "$GCC" = yes; then
++if test yes = "$GCC"; then
 +  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 +fi
 +
- if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-   sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
++if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
++  sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
 +fi
- if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-   sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
++
++if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
++  sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
 +fi
 +
++# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
++configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
++
++# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
++func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
++
++# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
++configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
++
 +_LT_DECL([], [variables_saved_for_relink], [1],
 +    [Variables whose values should be saved in libtool wrapper scripts and
 +    restored at link time])
 +_LT_DECL([], [need_lib_prefix], [0],
 +    [Do we need the "lib" prefix for modules?])
 +_LT_DECL([], [need_version], [0], [Do we need a version for libraries?])
 +_LT_DECL([], [version_type], [0], [Library versioning type])
 +_LT_DECL([], [runpath_var], [0],  [Shared library runtime path variable])
 +_LT_DECL([], [shlibpath_var], [0],[Shared library path variable])
 +_LT_DECL([], [shlibpath_overrides_runpath], [0],
 +    [Is shlibpath searched before the hard-coded library search path?])
 +_LT_DECL([], [libname_spec], [1], [Format of library name prefix])
 +_LT_DECL([], [library_names_spec], [1],
 +    [[List of archive names.  First name is the real one, the rest are links.
 +    The last name is the one that the linker finds with -lNAME]])
 +_LT_DECL([], [soname_spec], [1],
 +    [[The coded name of the library, if different from the real name]])
 +_LT_DECL([], [install_override_mode], [1],
 +    [Permission mode override for installation of shared libraries])
 +_LT_DECL([], [postinstall_cmds], [2],
 +    [Command to use after installation of a shared archive])
 +_LT_DECL([], [postuninstall_cmds], [2],
 +    [Command to use after uninstallation of a shared archive])
 +_LT_DECL([], [finish_cmds], [2],
 +    [Commands used to finish a libtool library installation in a directory])
 +_LT_DECL([], [finish_eval], [1],
 +    [[As "finish_cmds", except a single script fragment to be evaled but
 +    not shown]])
 +_LT_DECL([], [hardcode_into_libs], [0],
 +    [Whether we should hardcode library paths into libraries])
 +_LT_DECL([], [sys_lib_search_path_spec], [2],
 +    [Compile-time system search path for libraries])
- _LT_DECL([], [sys_lib_dlsearch_path_spec], [2],
-     [Run-time system search path for libraries])
++_LT_DECL([sys_lib_dlsearch_path_spec], [configure_time_dlsearch_path], [2],
++    [Detected run-time system search path for libraries])
++_LT_DECL([], [configure_time_lt_sys_library_path], [2],
++    [Explicit LT_SYS_LIBRARY_PATH set during ./configure time])
 +])# _LT_SYS_DYNAMIC_LINKER
 +
 +
 +# _LT_PATH_TOOL_PREFIX(TOOL)
 +# --------------------------
- # find a file program which can recognize shared library
++# find a file program that can recognize shared library
 +AC_DEFUN([_LT_PATH_TOOL_PREFIX],
 +[m4_require([_LT_DECL_EGREP])dnl
 +AC_MSG_CHECKING([for $1])
 +AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
 +[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
 +dnl $ac_dummy forces splitting on constant user-supplied paths.
 +dnl POSIX.2 word splitting is done only on the output of word expansions,
 +dnl not every word.  This closes a longstanding sh security hole.
 +  ac_dummy="m4_if([$2], , $PATH, [$2])"
 +  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/$1; then
-       lt_cv_path_MAGIC_CMD="$ac_dir/$1"
++    if test -f "$ac_dir/$1"; then
++      lt_cv_path_MAGIC_CMD=$ac_dir/"$1"
 +      if test -n "$file_magic_test_file"; then
 +	case $deplibs_check_method in
 +	"file_magic "*)
 +	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
- 	  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])
- MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
++MAGIC_CMD=$lt_cv_path_MAGIC_CMD
 +if test -n "$MAGIC_CMD"; then
 +  AC_MSG_RESULT($MAGIC_CMD)
 +else
 +  AC_MSG_RESULT(no)
 +fi
 +_LT_DECL([], [MAGIC_CMD], [0],
 +	 [Used to examine libraries when file_magic_cmd begins with "file"])dnl
 +])# _LT_PATH_TOOL_PREFIX
 +
 +# Old name:
 +AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX])
 +dnl aclocal-1.4 backwards compatibility:
 +dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], [])
 +
 +
 +# _LT_PATH_MAGIC
 +# --------------
- # find a file program which can recognize a shared library
++# find a file program that can recognize a shared library
 +m4_defun([_LT_PATH_MAGIC],
 +[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
 +if test -z "$lt_cv_path_MAGIC_CMD"; then
 +  if test -n "$ac_tool_prefix"; then
 +    _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
 +  else
 +    MAGIC_CMD=:
 +  fi
 +fi
 +])# _LT_PATH_MAGIC
 +
 +
 +# LT_PATH_LD
 +# ----------
 +# find the pathname to the GNU or non-GNU linker
 +AC_DEFUN([LT_PATH_LD],
 +[AC_REQUIRE([AC_PROG_CC])dnl
 +AC_REQUIRE([AC_CANONICAL_HOST])dnl
 +AC_REQUIRE([AC_CANONICAL_BUILD])dnl
 +m4_require([_LT_DECL_SED])dnl
 +m4_require([_LT_DECL_EGREP])dnl
 +m4_require([_LT_PROG_ECHO_BACKSLASH])dnl
 +
 +AC_ARG_WITH([gnu-ld],
 +    [AS_HELP_STRING([--with-gnu-ld],
 +	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
-     [test "$withval" = no || with_gnu_ld=yes],
++    [test no = "$withval" || with_gnu_ld=yes],
 +    [with_gnu_ld=no])dnl
 +
 +ac_prog=ld
- if test "$GCC" = yes; then
++if test yes = "$GCC"; then
 +  # Check if gcc -print-prog-name=ld gives a path.
 +  AC_MSG_CHECKING([for ld used by $CC])
 +  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 "$with_gnu_ld" = yes; then
++elif test yes = "$with_gnu_ld"; then
 +  AC_MSG_CHECKING([for GNU ld])
 +else
 +  AC_MSG_CHECKING([for non-GNU ld])
 +fi
 +AC_CACHE_VAL(lt_cv_path_LD,
 +[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 "$with_gnu_ld" != no && break
++	test no != "$with_gnu_ld" && break
 +	;;
 +      *)
- 	test "$with_gnu_ld" != yes && break
++	test yes != "$with_gnu_ld" && 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])
- LD="$lt_cv_path_LD"
++LD=$lt_cv_path_LD
 +if test -n "$LD"; then
 +  AC_MSG_RESULT($LD)
 +else
 +  AC_MSG_RESULT(no)
 +fi
 +test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
 +_LT_PATH_LD_GNU
 +AC_SUBST([LD])
 +
 +_LT_TAGDECL([], [LD], [1], [The linker used to build libraries])
 +])# LT_PATH_LD
 +
 +# Old names:
 +AU_ALIAS([AM_PROG_LD], [LT_PATH_LD])
 +AU_ALIAS([AC_PROG_LD], [LT_PATH_LD])
 +dnl aclocal-1.4 backwards compatibility:
 +dnl AC_DEFUN([AM_PROG_LD], [])
 +dnl AC_DEFUN([AC_PROG_LD], [])
 +
 +
 +# _LT_PATH_LD_GNU
 +#- --------------
 +m4_defun([_LT_PATH_LD_GNU],
 +[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
 +[# I'd rather use --version here, but apparently some GNU 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])
 +with_gnu_ld=$lt_cv_prog_gnu_ld
 +])# _LT_PATH_LD_GNU
 +
 +
 +# _LT_CMD_RELOAD
 +# --------------
 +# find reload flag for linker
 +#   -- PORTME Some linkers may need a different reload flag.
 +m4_defun([_LT_CMD_RELOAD],
 +[AC_CACHE_CHECK([for $LD option to reload object files],
 +  lt_cv_ld_reload_flag,
 +  [lt_cv_ld_reload_flag='-r'])
 +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 "$GCC" != yes; then
++    if test yes != "$GCC"; then
 +      reload_cmds=false
 +    fi
 +    ;;
 +  darwin*)
-     if test "$GCC" = yes; then
-       reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
++    if test yes = "$GCC"; then
++      reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs'
 +    else
 +      reload_cmds='$LD$reload_flag -o $output$reload_objs'
 +    fi
 +    ;;
 +esac
 +_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl
 +_LT_TAGDECL([], [reload_cmds], [2])dnl
 +])# _LT_CMD_RELOAD
 +
 +
++# _LT_PATH_DD
++# -----------
++# find a working dd
++m4_defun([_LT_PATH_DD],
++[AC_CACHE_CHECK([for a working dd], [ac_cv_path_lt_DD],
++[printf 0123456789abcdef0123456789abcdef >conftest.i
++cat conftest.i conftest.i >conftest2.i
++: ${lt_DD:=$DD}
++AC_PATH_PROGS_FEATURE_CHECK([lt_DD], [dd],
++[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])
++rm -f conftest.i conftest2.i conftest.out])
++])# _LT_PATH_DD
++
++
++# _LT_CMD_TRUNCATE
++# ----------------
++# find command to truncate a binary pipe
++m4_defun([_LT_CMD_TRUNCATE],
++[m4_require([_LT_PATH_DD])
++AC_CACHE_CHECK([how to truncate binary pipes], [lt_cv_truncate_bin],
++[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"])
++_LT_DECL([lt_truncate_bin], [lt_cv_truncate_bin], [1],
++  [Command to truncate a binary pipe])
++])# _LT_CMD_TRUNCATE
++
++
 +# _LT_CHECK_MAGIC_METHOD
 +# ----------------------
 +# how to check for library dependencies
 +#  -- PORTME fill in with the dynamic library characteristics
 +m4_defun([_LT_CHECK_MAGIC_METHOD],
 +[m4_require([_LT_DECL_EGREP])
 +m4_require([_LT_DECL_OBJDUMP])
 +AC_CACHE_CHECK([how to recognize dependent libraries],
 +lt_cv_deplibs_check_method,
 +[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
- # 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.
++# 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.
 +
 +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.
-   # 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
++  if ( file / ) >/dev/null 2>&1; then
 +    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
 +    lt_cv_file_magic_cmd='func_win32_libid'
 +  else
 +    # 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
 +  ;;
 +
 +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*)
 +  lt_cv_deplibs_check_method=pass_all
 +  ;;
 +
 +netbsd* | netbsdelf*-gnu)
 +  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
 +    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
 +  else
 +    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*)
-   if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++openbsd* | bitrig*)
++  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; 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
 +])
 +
 +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
 +
 +_LT_DECL([], [deplibs_check_method], [1],
 +    [Method to check whether dependent libraries are shared objects])
 +_LT_DECL([], [file_magic_cmd], [1],
 +    [Command to use when deplibs_check_method = "file_magic"])
 +_LT_DECL([], [file_magic_glob], [1],
 +    [How to find potential files when deplibs_check_method = "file_magic"])
 +_LT_DECL([], [want_nocaseglob], [1],
 +    [Find potential files using nocaseglob when deplibs_check_method = "file_magic"])
 +])# _LT_CHECK_MAGIC_METHOD
 +
 +
 +# LT_PATH_NM
 +# ----------
 +# find the pathname to a BSD- or MS-compatible name lister
 +AC_DEFUN([LT_PATH_NM],
 +[AC_REQUIRE([AC_PROG_CC])dnl
 +AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM,
 +[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
- 	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
- 	*/dev/null* | *'Invalid file or object type'*)
++	# 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'*)
 +	  lt_cv_path_NM="$tmp_nm -B"
- 	  break
++	  break 2
 +	  ;;
 +	*)
 +	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
 +	  */dev/null*)
 +	    lt_cv_path_NM="$tmp_nm -p"
- 	    break
++	    break 2
 +	    ;;
 +	  *)
 +	    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])
- if test "$lt_cv_path_NM" != "no"; then
-   NM="$lt_cv_path_NM"
++if test no != "$lt_cv_path_NM"; 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
 +    AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :)
-     case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
++    case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in
 +    *COFF*)
-       DUMPBIN="$DUMPBIN -symbols"
++      DUMPBIN="$DUMPBIN -symbols -headers"
 +      ;;
 +    *)
 +      DUMPBIN=:
 +      ;;
 +    esac
 +  fi
 +  AC_SUBST([DUMPBIN])
-   if test "$DUMPBIN" != ":"; then
-     NM="$DUMPBIN"
++  if test : != "$DUMPBIN"; then
++    NM=$DUMPBIN
 +  fi
 +fi
 +test -z "$NM" && NM=nm
 +AC_SUBST([NM])
 +_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl
 +
 +AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
 +  [lt_cv_nm_interface="BSD nm"
 +  echo "int some_variable = 0;" > conftest.$ac_ext
 +  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
 +  (eval "$ac_compile" 2>conftest.err)
 +  cat conftest.err >&AS_MESSAGE_LOG_FD
 +  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
 +  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
 +  cat conftest.err >&AS_MESSAGE_LOG_FD
 +  (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD)
 +  cat conftest.out >&AS_MESSAGE_LOG_FD
 +  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
 +    lt_cv_nm_interface="MS dumpbin"
 +  fi
 +  rm -f conftest*])
 +])# LT_PATH_NM
 +
 +# Old names:
 +AU_ALIAS([AM_PROG_NM], [LT_PATH_NM])
 +AU_ALIAS([AC_PROG_NM], [LT_PATH_NM])
 +dnl aclocal-1.4 backwards compatibility:
 +dnl AC_DEFUN([AM_PROG_NM], [])
 +dnl AC_DEFUN([AC_PROG_NM], [])
 +
 +# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
 +# --------------------------------
 +# how to determine the name of the shared library
 +# associated with a specific link library.
 +#  -- PORTME fill in with the dynamic library characteristics
 +m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB],
 +[m4_require([_LT_DECL_EGREP])
 +m4_require([_LT_DECL_OBJDUMP])
 +m4_require([_LT_DECL_DLLTOOL])
 +AC_CACHE_CHECK([how to associate runtime and link libraries],
 +lt_cv_sharedlib_from_linklib_cmd,
 +[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 to use based on capabilities of $DLLTOOL
++  # two different shell functions defined in ltmain.sh;
++  # decide which one 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
 +])
 +sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
 +test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
 +
 +_LT_DECL([], [sharedlib_from_linklib_cmd], [1],
 +    [Command to associate shared and link libraries])
 +])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
 +
 +
 +# _LT_PATH_MANIFEST_TOOL
 +# ----------------------
 +# locate the manifest tool
 +m4_defun([_LT_PATH_MANIFEST_TOOL],
 +[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
 +test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
 +AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool],
 +  [lt_cv_path_mainfest_tool=no
 +  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
 +  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
 +  cat conftest.err >&AS_MESSAGE_LOG_FD
 +  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
 +    lt_cv_path_mainfest_tool=yes
 +  fi
 +  rm -f conftest*])
- if test "x$lt_cv_path_mainfest_tool" != xyes; then
++if test yes != "$lt_cv_path_mainfest_tool"; then
 +  MANIFEST_TOOL=:
 +fi
 +_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
 +])# _LT_PATH_MANIFEST_TOOL
 +
 +
++# _LT_DLL_DEF_P([FILE])
++# ---------------------
++# True iff FILE is a Windows DLL '.def' file.
++# Keep in sync with func_dll_def_p in the libtool script
++AC_DEFUN([_LT_DLL_DEF_P],
++[dnl
++  test DEF = "`$SED -n dnl
++    -e '\''s/^[[	 ]]*//'\'' dnl Strip leading whitespace
++    -e '\''/^\(;.*\)*$/d'\'' dnl      Delete empty lines and comments
++    -e '\''s/^\(EXPORTS\|LIBRARY\)\([[	 ]].*\)*$/DEF/p'\'' dnl
++    -e q dnl                          Only consider the first "real" line
++    $1`" dnl
++])# _LT_DLL_DEF_P
++
++
 +# LT_LIB_M
 +# --------
 +# check for math library
 +AC_DEFUN([LT_LIB_M],
 +[AC_REQUIRE([AC_CANONICAL_HOST])dnl
 +LIBM=
 +case $host in
 +*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
 +  # These system don't have libm, or don't need it
 +  ;;
 +*-ncr-sysv4.3*)
-   AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
++  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM=-lmw)
 +  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
 +  ;;
 +*)
-   AC_CHECK_LIB(m, cos, LIBM="-lm")
++  AC_CHECK_LIB(m, cos, LIBM=-lm)
 +  ;;
 +esac
 +AC_SUBST([LIBM])
 +])# LT_LIB_M
 +
 +# Old name:
 +AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M])
 +dnl aclocal-1.4 backwards compatibility:
 +dnl AC_DEFUN([AC_CHECK_LIBM], [])
 +
 +
 +# _LT_COMPILER_NO_RTTI([TAGNAME])
 +# -------------------------------
 +m4_defun([_LT_COMPILER_NO_RTTI],
 +[m4_require([_LT_TAG_COMPILER])dnl
 +
 +_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
 +
- if test "$GCC" = yes; then
++if test yes = "$GCC"; then
 +  case $cc_basename in
 +  nvcc*)
 +    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
 +  *)
 +    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;;
 +  esac
 +
 +  _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
 +    lt_cv_prog_compiler_rtti_exceptions,
 +    [-fno-rtti -fno-exceptions], [],
 +    [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
 +fi
 +_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1],
 +	[Compiler flag to turn off builtin functions])
 +])# _LT_COMPILER_NO_RTTI
 +
 +
 +# _LT_CMD_GLOBAL_SYMBOLS
 +# ----------------------
 +m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
 +[AC_REQUIRE([AC_CANONICAL_HOST])dnl
 +AC_REQUIRE([AC_PROG_CC])dnl
 +AC_REQUIRE([AC_PROG_AWK])dnl
 +AC_REQUIRE([LT_PATH_NM])dnl
 +AC_REQUIRE([LT_PATH_LD])dnl
 +m4_require([_LT_DECL_SED])dnl
 +m4_require([_LT_DECL_EGREP])dnl
 +m4_require([_LT_TAG_COMPILER])dnl
 +
 +# Check for command to grab the raw symbol name followed by C symbol from nm.
 +AC_MSG_CHECKING([command to parse $NM output from $compiler object])
 +AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
 +[
 +# These are sane defaults that work on at least a few old systems.
 +# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
 +
 +# 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 "$host_cpu" = ia64; then
++  if test ia64 = "$host_cpu"; 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 -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
++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'"
 +
 +# Transform an extracted symbol line into symbol name and symbol address
- lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p'"
- lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
++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'"
 +
 +# 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
-     # and D for any global variable.
++    # Fake it for dumpbin and say T for any non-static function,
++    # D for any global variable and I for any imported 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=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))}"\
++"     {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))}"\
 +"     ' 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 AC_TRY_EVAL(ac_compile); then
 +    # Now try to grab the symbols.
 +    nlist=conftest.nm
 +    if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
 +      # Try sorting and uniquifying the output.
 +      if sort "$nlist" | uniq > "$nlist"T; then
 +	mv -f "$nlist"T "$nlist"
 +      else
 +	rm -f "$nlist"T
 +      fi
 +
 +      # 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 con't be const, because runtime
++#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
++/* DATA imports from DLLs on WIN32 can't be const, because runtime
 +   relocations are performed -- see ld's documentation on pseudo-relocs.  */
 +# define LT@&t at _DLSYM_CONST
- #elif defined(__osf__)
++#elif defined __osf__
 +/* This system does not cope well with relocations in const data.  */
 +# define LT@&t at _DLSYM_CONST
 +#else
 +# define LT@&t at _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@&t at _DLSYM_CONST struct {
 +  const char *name;
 +  void       *address;
 +}
 +lt__PROGRAM__LTX_preloaded_symbols[[]] =
 +{
 +  { "@PROGRAM@", (void *) 0 },
 +_LT_EOF
- 	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
++	  $SED "s/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/" < "$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_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
- 	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
++	  if AC_TRY_EVAL(ac_link) && 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" >&AS_MESSAGE_LOG_FD
 +	fi
 +      else
 +	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
 +      fi
 +    else
 +      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
 +    fi
 +  else
 +    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
 +    cat conftest.$ac_ext >&5
 +  fi
 +  rm -rf conftest* conftst*
 +
 +  # Do not use the global_symbol_pipe unless it works.
-   if test "$pipe_works" = yes; then
++  if test yes = "$pipe_works"; then
 +    break
 +  else
 +    lt_cv_sys_global_symbol_pipe=
 +  fi
 +done
 +])
 +if test -z "$lt_cv_sys_global_symbol_pipe"; then
 +  lt_cv_sys_global_symbol_to_cdecl=
 +fi
 +if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
 +  AC_MSG_RESULT(failed)
 +else
 +  AC_MSG_RESULT(ok)
 +fi
 +
 +# 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
 +
 +_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
 +    [Take the output of nm and produce a listing of raw symbols and C names])
 +_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
 +    [Transform the output of nm in a proper C declaration])
++_LT_DECL([global_symbol_to_import], [lt_cv_sys_global_symbol_to_import], [1],
++    [Transform the output of nm into a list of symbols to manually relocate])
 +_LT_DECL([global_symbol_to_c_name_address],
 +    [lt_cv_sys_global_symbol_to_c_name_address], [1],
 +    [Transform the output of nm in a C name address pair])
 +_LT_DECL([global_symbol_to_c_name_address_lib_prefix],
 +    [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
 +    [Transform the output of nm in a C name address pair when lib prefix is needed])
++_LT_DECL([nm_interface], [lt_cv_nm_interface], [1],
++    [The name lister interface])
 +_LT_DECL([], [nm_file_list_spec], [1],
 +    [Specify filename containing input files for $NM])
 +]) # _LT_CMD_GLOBAL_SYMBOLS
 +
 +
 +# _LT_COMPILER_PIC([TAGNAME])
 +# ---------------------------
 +m4_defun([_LT_COMPILER_PIC],
 +[m4_require([_LT_TAG_COMPILER])dnl
 +_LT_TAGVAR(lt_prog_compiler_wl, $1)=
 +_LT_TAGVAR(lt_prog_compiler_pic, $1)=
 +_LT_TAGVAR(lt_prog_compiler_static, $1)=
 +
 +m4_if([$1], [CXX], [
 +  # C++ specific cases for pic, static, wl, etc.
-   if test "$GXX" = yes; then
++  if test yes = "$GXX"; then
 +    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 +    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
 +
 +    case $host_os in
 +    aix*)
 +      # All AIX code is PIC.
-       if test "$host_cpu" = ia64; then
++      if test ia64 = "$host_cpu"; then
 +	# AIX 5 now supports IA64 processor
 +	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 +      fi
++      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
 +      ;;
 +
 +    amigaos*)
 +      case $host_cpu in
 +      powerpc)
 +            # see comment about AmigaOS4 .so support
 +            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
 +        ;;
 +      m68k)
 +            # FIXME: we need at least 68020 code to build shared libraries, but
-             # adding the `-m68020' flag to GCC prevents building anything better,
-             # like `-m68040'.
++            # adding the '-m68020' flag to GCC prevents building anything better,
++            # like '-m68040'.
 +            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
 +        ;;
 +      esac
 +      ;;
 +
 +    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
 +      # PIC is the default for these OSes.
 +      ;;
 +    mingw* | cygwin* | os2* | pw32* | cegcc*)
 +      # This hack is so that the source file can tell whether it is being
 +      # built for inclusion in a dll (and should export symbols for example).
 +      # Although the cygwin gcc ignores -fPIC, still need this for old-style
 +      # (--disable-auto-import) libraries
 +      m4_if([$1], [GCJ], [],
 +	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
++      case $host_os in
++      os2*)
++	_LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
++	;;
++      esac
 +      ;;
 +    darwin* | rhapsody*)
 +      # PIC is the default on this platform
 +      # Common symbols not allowed in MH_DYLIB files
 +      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
 +      ;;
 +    *djgpp*)
 +      # DJGPP does not support shared libraries at all
 +      _LT_TAGVAR(lt_prog_compiler_pic, $1)=
 +      ;;
 +    haiku*)
 +      # PIC is the default for Haiku.
 +      # The "-static" flag exists, but is broken.
 +      _LT_TAGVAR(lt_prog_compiler_static, $1)=
 +      ;;
 +    interix[[3-9]]*)
 +      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
 +      # Instead, we relocate shared libraries at runtime.
 +      ;;
 +    sysv4*MP*)
 +      if test -d /usr/nec; then
 +	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
 +      fi
 +      ;;
 +    hpux*)
 +      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
 +      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
 +      # sets the default TLS model and affects inlining.
 +      case $host_cpu in
 +      hppa*64*)
 +	;;
 +      *)
 +	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
 +	;;
 +      esac
 +      ;;
 +    *qnx* | *nto*)
 +      # QNX uses GNU C++, but need to define -shared option too, otherwise
 +      # it will coredump.
 +      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
 +      ;;
 +    *)
 +      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
 +      ;;
 +    esac
 +  else
 +    case $host_os in
 +      aix[[4-9]]*)
 +	# All AIX code is PIC.
- 	if test "$host_cpu" = ia64; then
++	if test ia64 = "$host_cpu"; then
 +	  # AIX 5 now supports IA64 processor
 +	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 +	else
 +	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
 +	fi
 +	;;
 +      chorus*)
 +	case $cc_basename in
 +	cxch68*)
 +	  # Green Hills C++ Compiler
 +	  # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
 +	  ;;
 +	esac
 +	;;
 +      mingw* | cygwin* | os2* | pw32* | cegcc*)
 +	# This hack is so that the source file can tell whether it is being
 +	# built for inclusion in a dll (and should export symbols for example).
 +	m4_if([$1], [GCJ], [],
 +	  [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
 +	;;
 +      dgux*)
 +	case $cc_basename in
 +	  ec++*)
 +	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 +	    ;;
 +	  ghcx*)
 +	    # Green Hills C++ Compiler
 +	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
 +	    ;;
 +	  *)
 +	    ;;
 +	esac
 +	;;
 +      freebsd* | dragonfly*)
 +	# FreeBSD uses GNU C++
 +	;;
 +      hpux9* | hpux10* | hpux11*)
 +	case $cc_basename in
 +	  CC*)
 +	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- 	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
- 	    if test "$host_cpu" != ia64; then
++	    _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive'
++	    if test ia64 != "$host_cpu"; then
 +	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
 +	    fi
 +	    ;;
 +	  aCC*)
 +	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- 	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
++	    _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive'
 +	    case $host_cpu in
 +	    hppa*64*|ia64*)
 +	      # +Z the default
 +	      ;;
 +	    *)
 +	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
 +	      ;;
 +	    esac
 +	    ;;
 +	  *)
 +	    ;;
 +	esac
 +	;;
 +      interix*)
 +	# This is c89, which is MS Visual C++ (no shared libs)
 +	# Anyone wants to do a port?
 +	;;
 +      irix5* | irix6* | nonstopux*)
 +	case $cc_basename in
 +	  CC*)
 +	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 +	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
 +	    # CC pic flag -KPIC is the default.
 +	    ;;
 +	  *)
 +	    ;;
 +	esac
 +	;;
 +      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
 +	case $cc_basename in
 +	  KCC*)
 +	    # KAI C++ Compiler
 +	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
 +	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
 +	    ;;
 +	  ecpc* )
- 	    # old Intel C++ for x86_64 which still supported -KPIC.
++	    # old Intel C++ for x86_64, which still supported -KPIC.
 +	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 +	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 +	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
 +	    ;;
 +	  icpc* )
 +	    # Intel C++, used to be incompatible with GCC.
 +	    # ICC 10 doesn't accept -KPIC any more.
 +	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 +	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
 +	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
 +	    ;;
 +	  pgCC* | pgcpp*)
 +	    # Portland Group C++ compiler
 +	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 +	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
 +	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 +	    ;;
 +	  cxx*)
 +	    # Compaq C++
 +	    # Make sure the PIC flag is empty.  It appears that all Alpha
 +	    # Linux and Compaq Tru64 Unix objects are PIC.
 +	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
 +	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
 +	    ;;
 +	  xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*)
 +	    # IBM XL 8.0, 9.0 on PPC and BlueGene
 +	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 +	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
 +	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
 +	    ;;
 +	  *)
 +	    case `$CC -V 2>&1 | sed 5q` in
 +	    *Sun\ C*)
 +	      # Sun C++ 5.9
 +	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 +	      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 +	      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
 +	      ;;
 +	    esac
 +	    ;;
 +	esac
 +	;;
 +      lynxos*)
 +	;;
 +      m88k*)
 +	;;
 +      mvs*)
 +	case $cc_basename in
 +	  cxx*)
 +	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
 +	    ;;
 +	  *)
 +	    ;;
 +	esac
 +	;;
 +      netbsd* | netbsdelf*-gnu)
 +	;;
 +      *qnx* | *nto*)
 +        # QNX uses GNU C++, but need to define -shared option too, otherwise
 +        # it will coredump.
 +        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
 +        ;;
 +      osf3* | osf4* | osf5*)
 +	case $cc_basename in
 +	  KCC*)
 +	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
 +	    ;;
 +	  RCC*)
 +	    # Rational C++ 2.4.1
 +	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
 +	    ;;
 +	  cxx*)
 +	    # Digital/Compaq C++
 +	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 +	    # Make sure the PIC flag is empty.  It appears that all Alpha
 +	    # Linux and Compaq Tru64 Unix objects are PIC.
 +	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
 +	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
 +	    ;;
 +	  *)
 +	    ;;
 +	esac
 +	;;
 +      psos*)
 +	;;
 +      solaris*)
 +	case $cc_basename in
 +	  CC* | sunCC*)
 +	    # Sun C++ 4.2, 5.x and Centerline C++
 +	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 +	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 +	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
 +	    ;;
 +	  gcx*)
 +	    # Green Hills C++ Compiler
 +	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
 +	    ;;
 +	  *)
 +	    ;;
 +	esac
 +	;;
 +      sunos4*)
 +	case $cc_basename in
 +	  CC*)
 +	    # Sun C++ 4.x
 +	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
 +	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 +	    ;;
 +	  lcc*)
 +	    # Lucid
 +	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
 +	    ;;
 +	  *)
 +	    ;;
 +	esac
 +	;;
 +      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
 +	case $cc_basename in
 +	  CC*)
 +	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 +	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 +	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 +	    ;;
 +	esac
 +	;;
 +      tandem*)
 +	case $cc_basename in
 +	  NCC*)
 +	    # NonStop-UX NCC 3.20
 +	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 +	    ;;
 +	  *)
 +	    ;;
 +	esac
 +	;;
 +      vxworks*)
 +	;;
 +      *)
 +	_LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
 +	;;
 +    esac
 +  fi
 +],
 +[
-   if test "$GCC" = yes; then
++  if test yes = "$GCC"; then
 +    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 +    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
 +
 +    case $host_os in
 +      aix*)
 +      # All AIX code is PIC.
-       if test "$host_cpu" = ia64; then
++      if test ia64 = "$host_cpu"; then
 +	# AIX 5 now supports IA64 processor
 +	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 +      fi
++      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
 +      ;;
 +
 +    amigaos*)
 +      case $host_cpu in
 +      powerpc)
 +            # see comment about AmigaOS4 .so support
 +            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
 +        ;;
 +      m68k)
 +            # FIXME: we need at least 68020 code to build shared libraries, but
-             # adding the `-m68020' flag to GCC prevents building anything better,
-             # like `-m68040'.
++            # adding the '-m68020' flag to GCC prevents building anything better,
++            # like '-m68040'.
 +            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
 +        ;;
 +      esac
 +      ;;
 +
 +    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
 +      # PIC is the default for these OSes.
 +      ;;
 +
 +    mingw* | cygwin* | pw32* | os2* | cegcc*)
 +      # This hack is so that the source file can tell whether it is being
 +      # built for inclusion in a dll (and should export symbols for example).
 +      # Although the cygwin gcc ignores -fPIC, still need this for old-style
 +      # (--disable-auto-import) libraries
 +      m4_if([$1], [GCJ], [],
 +	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
++      case $host_os in
++      os2*)
++	_LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
++	;;
++      esac
 +      ;;
 +
 +    darwin* | rhapsody*)
 +      # PIC is the default on this platform
 +      # Common symbols not allowed in MH_DYLIB files
 +      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
 +      ;;
 +
 +    haiku*)
 +      # PIC is the default for Haiku.
 +      # The "-static" flag exists, but is broken.
 +      _LT_TAGVAR(lt_prog_compiler_static, $1)=
 +      ;;
 +
 +    hpux*)
 +      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
 +      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
 +      # sets the default TLS model and affects inlining.
 +      case $host_cpu in
 +      hppa*64*)
 +	# +Z the default
 +	;;
 +      *)
 +	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
 +	;;
 +      esac
 +      ;;
 +
 +    interix[[3-9]]*)
 +      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
 +      # Instead, we relocate shared libraries at runtime.
 +      ;;
 +
 +    msdosdjgpp*)
 +      # Just because we use GCC doesn't mean we suddenly get shared libraries
 +      # on systems that don't support them.
 +      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
 +      enable_shared=no
 +      ;;
 +
 +    *nto* | *qnx*)
 +      # QNX uses GNU C++, but need to define -shared option too, otherwise
 +      # it will coredump.
 +      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
 +      ;;
 +
 +    sysv4*MP*)
 +      if test -d /usr/nec; then
 +	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
 +      fi
 +      ;;
 +
 +    *)
 +      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
 +      ;;
 +    esac
 +
 +    case $cc_basename in
 +    nvcc*) # Cuda Compiler Driver 2.2
 +      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
 +      if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
 +        _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)"
 +      fi
 +      ;;
 +    esac
 +  else
 +    # PORTME Check for flag to pass linker flags through the system compiler.
 +    case $host_os in
 +    aix*)
 +      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-       if test "$host_cpu" = ia64; then
++      if test ia64 = "$host_cpu"; then
 +	# AIX 5 now supports IA64 processor
 +	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 +      else
 +	_LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
 +      fi
 +      ;;
 +
++    darwin* | rhapsody*)
++      # PIC is the default on this platform
++      # Common symbols not allowed in MH_DYLIB files
++      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
++      case $cc_basename in
++      nagfor*)
++        # NAG Fortran compiler
++        _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
++        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
++        _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++        ;;
++      esac
++      ;;
++
 +    mingw* | cygwin* | pw32* | os2* | cegcc*)
 +      # This hack is so that the source file can tell whether it is being
 +      # built for inclusion in a dll (and should export symbols for example).
 +      m4_if([$1], [GCJ], [],
 +	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
++      case $host_os in
++      os2*)
++	_LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
++	;;
++      esac
 +      ;;
 +
 +    hpux9* | hpux10* | hpux11*)
 +      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 +      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
 +      # not for PA HP-UX.
 +      case $host_cpu in
 +      hppa*64*|ia64*)
 +	# +Z the default
 +	;;
 +      *)
 +	_LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
 +	;;
 +      esac
 +      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-       _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
++      _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive'
 +      ;;
 +
 +    irix5* | irix6* | nonstopux*)
 +      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 +      # PIC (with -KPIC) is the default.
 +      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
 +      ;;
 +
 +    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
 +      case $cc_basename in
-       # old Intel for x86_64 which still supported -KPIC.
++      # old Intel for x86_64, which still supported -KPIC.
 +      ecc*)
 +	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 +	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 +	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
 +        ;;
 +      # icc used to be incompatible with GCC.
 +      # ICC 10 doesn't accept -KPIC any more.
 +      icc* | ifort*)
 +	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 +	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
 +	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
 +        ;;
 +      # Lahey Fortran 8.1.
 +      lf95*)
 +	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 +	_LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
 +	_LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
 +	;;
 +      nagfor*)
 +	# NAG Fortran compiler
 +	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
 +	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
 +	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 +	;;
++      tcc*)
++	# Fabrice Bellard et al's Tiny C Compiler
++	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
++	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
++	;;
 +      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
 +        # Portland Group compilers (*not* the Pentium gcc compiler,
 +	# which looks to be a dead project)
 +	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 +	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
 +	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 +        ;;
 +      ccc*)
 +        _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 +        # All Alpha code is PIC.
 +        _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
 +        ;;
 +      xl* | bgxl* | bgf* | mpixl*)
 +	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
 +	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 +	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
 +	_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
 +	;;
 +      *)
 +	case `$CC -V 2>&1 | sed 5q` in
 +	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*)
 +	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
 +	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 +	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 +	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
 +	  ;;
 +	*Sun\ F* | *Sun*Fortran*)
 +	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 +	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 +	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
 +	  ;;
 +	*Sun\ C*)
 +	  # Sun C 5.9
 +	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 +	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 +	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 +	  ;;
 +        *Intel*\ [[CF]]*Compiler*)
 +	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 +	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
 +	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
 +	  ;;
 +	*Portland\ Group*)
 +	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 +	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
 +	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 +	  ;;
 +	esac
 +	;;
 +      esac
 +      ;;
 +
 +    newsos6)
 +      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 +      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 +      ;;
 +
 +    *nto* | *qnx*)
 +      # QNX uses GNU C++, but need to define -shared option too, otherwise
 +      # it will coredump.
 +      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
 +      ;;
 +
 +    osf3* | osf4* | osf5*)
 +      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 +      # All OSF/1 code is PIC.
 +      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
 +      ;;
 +
 +    rdos*)
 +      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
 +      ;;
 +
 +    solaris*)
 +      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 +      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 +      case $cc_basename in
 +      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
 +	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
 +      *)
 +	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
 +      esac
 +      ;;
 +
 +    sunos4*)
 +      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
 +      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
 +      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 +      ;;
 +
 +    sysv4 | sysv4.2uw2* | sysv4.3*)
 +      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 +      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 +      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 +      ;;
 +
 +    sysv4*MP*)
-       if test -d /usr/nec ;then
++      if test -d /usr/nec; then
 +	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
 +	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 +      fi
 +      ;;
 +
 +    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
 +      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 +      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 +      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 +      ;;
 +
 +    unicos*)
 +      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 +      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
 +      ;;
 +
 +    uts4*)
 +      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
 +      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 +      ;;
 +
 +    *)
 +      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
 +      ;;
 +    esac
 +  fi
 +])
 +case $host_os in
-   # For platforms which do not support PIC, -DPIC is meaningless:
++  # For platforms that do not support PIC, -DPIC is meaningless:
 +  *djgpp*)
 +    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
 +    ;;
 +  *)
 +    _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t at m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
 +    ;;
 +esac
 +
 +AC_CACHE_CHECK([for $compiler option to produce PIC],
 +  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)],
 +  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
 +_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)
 +
 +#
 +# Check to make sure the PIC flag actually works.
 +#
 +if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
 +  _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works],
 +    [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)],
 +    [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t at m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [],
 +    [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in
 +     "" | " "*) ;;
 +     *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;;
 +     esac],
 +    [_LT_TAGVAR(lt_prog_compiler_pic, $1)=
 +     _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
 +fi
 +_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
 +	[Additional compiler flags for building library objects])
 +
 +_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
 +	[How to pass a linker flag through the compiler])
 +#
 +# Check to make sure the static flag actually works.
 +#
 +wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\"
 +_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
 +  _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1),
 +  $lt_tmp_static_flag,
 +  [],
 +  [_LT_TAGVAR(lt_prog_compiler_static, $1)=])
 +_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
 +	[Compiler flag to prevent dynamic linking])
 +])# _LT_COMPILER_PIC
 +
 +
 +# _LT_LINKER_SHLIBS([TAGNAME])
 +# ----------------------------
 +# See if the linker supports building shared libraries.
 +m4_defun([_LT_LINKER_SHLIBS],
 +[AC_REQUIRE([LT_PATH_LD])dnl
 +AC_REQUIRE([LT_PATH_NM])dnl
 +m4_require([_LT_PATH_MANIFEST_TOOL])dnl
 +m4_require([_LT_FILEUTILS_DEFAULTS])dnl
 +m4_require([_LT_DECL_EGREP])dnl
 +m4_require([_LT_DECL_SED])dnl
 +m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
 +m4_require([_LT_TAG_COMPILER])dnl
 +AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
 +m4_if([$1], [CXX], [
 +  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
 +  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
 +  case $host_os in
 +  aix[[4-9]]*)
 +    # If we're using GNU nm, then we don't want the "-C" option.
-     # -C means demangle to AIX nm, but means don't demangle with GNU nm
-     # Also, AIX nm treats weak defined symbols like other global defined
-     # symbols, whereas GNU nm marks them as "W".
++    # -C means demangle to GNU nm, but means don't demangle to AIX nm.
++    # Without the "-l" option, or with the "-B" option, AIX nm treats
++    # weak defined symbols like other global defined symbols, whereas
++    # GNU nm marks them as "W".
++    # While the 'weak' keyword is ignored in the Export File, we need
++    # it in the Import File for the 'aix-soname' feature, so we have
++    # to replace the "-B" option with "-P" for AIX nm.
 +    if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-       _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
++      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
 +    else
-       _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
++      _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
 +    fi
 +    ;;
 +  pw32*)
-     _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
++    _LT_TAGVAR(export_symbols_cmds, $1)=$ltdll_cmds
 +    ;;
 +  cygwin* | mingw* | cegcc*)
 +    case $cc_basename in
 +    cl*)
 +      _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
 +      ;;
 +    *)
 +      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
 +      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
 +      ;;
 +    esac
 +    ;;
 +  linux* | k*bsd*-gnu | gnu*)
 +    _LT_TAGVAR(link_all_deplibs, $1)=no
 +    ;;
 +  *)
 +    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
 +    ;;
 +  esac
 +], [
 +  runpath_var=
 +  _LT_TAGVAR(allow_undefined_flag, $1)=
 +  _LT_TAGVAR(always_export_symbols, $1)=no
 +  _LT_TAGVAR(archive_cmds, $1)=
 +  _LT_TAGVAR(archive_expsym_cmds, $1)=
 +  _LT_TAGVAR(compiler_needs_object, $1)=no
 +  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
 +  _LT_TAGVAR(export_dynamic_flag_spec, $1)=
 +  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
 +  _LT_TAGVAR(hardcode_automatic, $1)=no
 +  _LT_TAGVAR(hardcode_direct, $1)=no
 +  _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 +  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
 +  _LT_TAGVAR(hardcode_libdir_separator, $1)=
 +  _LT_TAGVAR(hardcode_minus_L, $1)=no
 +  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
 +  _LT_TAGVAR(inherit_rpath, $1)=no
 +  _LT_TAGVAR(link_all_deplibs, $1)=unknown
 +  _LT_TAGVAR(module_cmds, $1)=
 +  _LT_TAGVAR(module_expsym_cmds, $1)=
 +  _LT_TAGVAR(old_archive_from_new_cmds, $1)=
 +  _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)=
 +  _LT_TAGVAR(thread_safe_flag_spec, $1)=
 +  _LT_TAGVAR(whole_archive_flag_spec, $1)=
 +  # include_expsyms should be a list of space-separated symbols to be *always*
 +  # included in the symbol list
 +  _LT_TAGVAR(include_expsyms, $1)=
 +  # exclude_expsyms can be an extended regexp of symbols to exclude
-   # it will be wrapped by ` (' and `)$', so one must not match beginning or
-   # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-   # as well as any symbol that contains `d'.
++  # it will be wrapped by ' (' and ')$', so one must not match beginning or
++  # end of line.  Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc',
++  # as well as any symbol that contains 'd'.
 +  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
 +  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
 +  # platforms (ab)use it in PIC code, but their linkers get confused if
 +  # the symbol is explicitly referenced.  Since portable code cannot
 +  # rely on this symbol name, it's probably fine to never include it in
 +  # preloaded symbol tables.
 +  # Exclude shared library initialization/finalization symbols.
 +dnl Note also adjust exclude_expsyms for C++ above.
 +  extract_expsyms_cmds=
 +
 +  case $host_os in
 +  cygwin* | mingw* | pw32* | cegcc*)
 +    # FIXME: the MSVC++ port hasn't been tested in a loooong time
 +    # When not using gcc, we currently assume that we are using
 +    # Microsoft Visual C++.
-     if test "$GCC" != yes; then
++    if test yes != "$GCC"; then
 +      with_gnu_ld=no
 +    fi
 +    ;;
 +  interix*)
 +    # we just hope/assume this is gcc and not c89 (= MSVC++)
 +    with_gnu_ld=yes
 +    ;;
-   openbsd*)
++  openbsd* | bitrig*)
 +    with_gnu_ld=no
 +    ;;
 +  linux* | k*bsd*-gnu | gnu*)
 +    _LT_TAGVAR(link_all_deplibs, $1)=no
 +    ;;
 +  esac
 +
 +  _LT_TAGVAR(ld_shlibs, $1)=yes
 +
 +  # On some targets, GNU ld is compatible enough with the native linker
 +  # that we're better off using the native interface for both.
 +  lt_use_gnu_ld_interface=no
-   if test "$with_gnu_ld" = yes; then
++  if test yes = "$with_gnu_ld"; then
 +    case $host_os in
 +      aix*)
 +	# The AIX port of GNU ld has always aspired to compatibility
 +	# with the native linker.  However, as the warning in the GNU ld
 +	# block says, versions before 2.19.5* couldn't really create working
 +	# shared libraries, regardless of the interface used.
 +	case `$LD -v 2>&1` in
 +	  *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
 +	  *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;;
 +	  *\ \(GNU\ Binutils\)\ [[3-9]]*) ;;
 +	  *)
 +	    lt_use_gnu_ld_interface=yes
 +	    ;;
 +	esac
 +	;;
 +      *)
 +	lt_use_gnu_ld_interface=yes
 +	;;
 +    esac
 +  fi
 +
-   if test "$lt_use_gnu_ld_interface" = yes; then
++  if test yes = "$lt_use_gnu_ld_interface"; then
 +    # If archive_cmds runs LD, not CC, wlarc should be empty
-     wlarc='${wl}'
++    wlarc='$wl'
 +
 +    # Set some defaults for GNU ld with shared library support. These
 +    # are reset later if shared libraries are not supported. Putting them
 +    # here allows them to be overridden if necessary.
 +    runpath_var=LD_RUN_PATH
-     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-     _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
++    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
 +    # ancient GNU ld didn't support --whole-archive et. al.
 +    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
-       _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++      _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
 +    else
 +      _LT_TAGVAR(whole_archive_flag_spec, $1)=
 +    fi
 +    supports_anon_versioning=no
-     case `$LD -v 2>&1` in
++    case `$LD -v | $SED -e 's/([^)]\+)\s\+//' 2>&1` in
 +      *GNU\ gold*) supports_anon_versioning=yes ;;
 +      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
 +      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
 +      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
 +      *\ 2.11.*) ;; # other 2.11 versions
 +      *) supports_anon_versioning=yes ;;
 +    esac
 +
 +    # See if GNU ld supports shared libraries.
 +    case $host_os in
 +    aix[[3-9]]*)
 +      # On AIX/PPC, the GNU linker is very broken
-       if test "$host_cpu" != ia64; then
++      if test ia64 != "$host_cpu"; then
 +	_LT_TAGVAR(ld_shlibs, $1)=no
 +	cat <<_LT_EOF 1>&2
 +
 +*** Warning: the GNU linker, at least up to release 2.19, is reported
 +*** to be unable to reliably create shared libraries on AIX.
 +*** Therefore, libtool is disabling shared libraries support.  If you
 +*** really care for shared libraries, you may want to install binutils
 +*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
 +*** You will then need to restart the configuration process.
 +
 +_LT_EOF
 +      fi
 +      ;;
 +
 +    amigaos*)
 +      case $host_cpu in
 +      powerpc)
 +            # see comment about AmigaOS4 .so support
-             _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
 +            _LT_TAGVAR(archive_expsym_cmds, $1)=''
 +        ;;
 +      m68k)
 +            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
 +            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
 +            _LT_TAGVAR(hardcode_minus_L, $1)=yes
 +        ;;
 +      esac
 +      ;;
 +
 +    beos*)
 +      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
 +	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
 +	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
 +	# support --undefined.  This deserves some investigation.  FIXME
- 	_LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	_LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
 +      else
 +	_LT_TAGVAR(ld_shlibs, $1)=no
 +      fi
 +      ;;
 +
 +    cygwin* | mingw* | pw32* | cegcc*)
 +      # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
 +      # as there is no search path for DLLs.
 +      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-       _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
++      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols'
 +      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
 +      _LT_TAGVAR(always_export_symbols, $1)=no
 +      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
 +      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
 +      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
 +
 +      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-         _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
- 	# If the export-symbols file already is a .def file (1st line
- 	# is EXPORTS), use it as is; otherwise, prepend...
- 	_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- 	  cp $export_symbols $output_objdir/$soname.def;
- 	else
- 	  echo EXPORTS > $output_objdir/$soname.def;
- 	  cat $export_symbols >> $output_objdir/$soname.def;
- 	fi~
- 	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
++        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
++	# If the export-symbols file already is a .def file, use it as
++	# is; otherwise, prepend EXPORTS...
++	_LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
++          cp $export_symbols $output_objdir/$soname.def;
++        else
++          echo EXPORTS > $output_objdir/$soname.def;
++          cat $export_symbols >> $output_objdir/$soname.def;
++        fi~
++        $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
 +      else
 +	_LT_TAGVAR(ld_shlibs, $1)=no
 +      fi
 +      ;;
 +
 +    haiku*)
-       _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
 +      _LT_TAGVAR(link_all_deplibs, $1)=yes
 +      ;;
 +
++    os2*)
++      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++      _LT_TAGVAR(hardcode_minus_L, $1)=yes
++      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
++      shrext_cmds=.dll
++      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
++	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
++	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
++	$ECHO EXPORTS >> $output_objdir/$libname.def~
++	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
++	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
++	emximp -o $lib $output_objdir/$libname.def'
++      _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
++	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
++	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
++	$ECHO EXPORTS >> $output_objdir/$libname.def~
++	prefix_cmds="$SED"~
++	if test EXPORTS = "`$SED 1q $export_symbols`"; then
++	  prefix_cmds="$prefix_cmds -e 1d";
++	fi~
++	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
++	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
++	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
++	emximp -o $lib $output_objdir/$libname.def'
++      _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
++      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
++      ;;
++
 +    interix[[3-9]]*)
 +      _LT_TAGVAR(hardcode_direct, $1)=no
 +      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-       _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
++      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
 +      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
 +      # Instead, shared libraries are loaded at an image base (0x10000000 by
 +      # default) and relocated if they conflict, which is a slow very memory
 +      # consuming and fragmenting process.  To avoid this, we pick a random,
 +      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
 +      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-       _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-       _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++      _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
 +      ;;
 +
 +    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
 +      tmp_diet=no
-       if test "$host_os" = linux-dietlibc; then
++      if test linux-dietlibc = "$host_os"; then
 +	case $cc_basename in
 +	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
 +	esac
 +      fi
 +      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
- 	 && test "$tmp_diet" = no
++	 && test no = "$tmp_diet"
 +      then
 +	tmp_addflag=' $pic_flag'
 +	tmp_sharedflag='-shared'
 +	case $cc_basename,$host_cpu in
 +        pgcc*)				# Portland Group C compiler
- 	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
++	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
 +	  tmp_addflag=' $pic_flag'
 +	  ;;
 +	pgf77* | pgf90* | pgf95* | pgfortran*)
 +					# Portland Group f77 and f90 compilers
- 	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
++	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
 +	  tmp_addflag=' $pic_flag -Mnomain' ;;
 +	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
 +	  tmp_addflag=' -i_dynamic' ;;
 +	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
 +	  tmp_addflag=' -i_dynamic -nofor_main' ;;
 +	ifc* | ifort*)			# Intel Fortran compiler
 +	  tmp_addflag=' -nofor_main' ;;
 +	lf95*)				# Lahey Fortran 8.1
 +	  _LT_TAGVAR(whole_archive_flag_spec, $1)=
 +	  tmp_sharedflag='--shared' ;;
++        nagfor*)                        # NAGFOR 5.3
++          tmp_sharedflag='-Wl,-shared' ;;
 +	xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
 +	  tmp_sharedflag='-qmkshrobj'
 +	  tmp_addflag= ;;
 +	nvcc*)	# Cuda Compiler Driver 2.2
- 	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
++	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
 +	  _LT_TAGVAR(compiler_needs_object, $1)=yes
 +	  ;;
 +	esac
 +	case `$CC -V 2>&1 | sed 5q` in
 +	*Sun\ C*)			# Sun C 5.9
- 	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
++	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
 +	  _LT_TAGVAR(compiler_needs_object, $1)=yes
 +	  tmp_sharedflag='-G' ;;
 +	*Sun\ F*)			# Sun Fortran 8.3
 +	  tmp_sharedflag='-G' ;;
 +	esac
- 	_LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	_LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
 +
-         if test "x$supports_anon_versioning" = xyes; then
++        if test yes = "$supports_anon_versioning"; then
 +          _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
- 	    cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
- 	    echo "local: *; };" >> $output_objdir/$libname.ver~
- 	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++            cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++            echo "local: *; };" >> $output_objdir/$libname.ver~
++            $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
 +        fi
 +
 +	case $cc_basename in
++	tcc*)
++	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='-rdynamic'
++	  ;;
 +	xlf* | bgf* | bgxlf* | mpixlf*)
 +	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
 +	  _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
- 	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
 +	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
- 	  if test "x$supports_anon_versioning" = xyes; then
++	  if test yes = "$supports_anon_versioning"; then
 +	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
- 	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
- 	      echo "local: *; };" >> $output_objdir/$libname.ver~
- 	      $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
++              cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++              echo "local: *; };" >> $output_objdir/$libname.ver~
++              $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
 +	  fi
 +	  ;;
 +	esac
 +      else
 +        _LT_TAGVAR(ld_shlibs, $1)=no
 +      fi
 +      ;;
 +
 +    netbsd* | netbsdelf*-gnu)
 +      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 +	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 +	wlarc=
 +      else
- 	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- 	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
++	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
 +      fi
 +      ;;
 +
 +    solaris*)
 +      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
 +	_LT_TAGVAR(ld_shlibs, $1)=no
 +	cat <<_LT_EOF 1>&2
 +
 +*** Warning: The releases 2.8.* of the GNU linker cannot reliably
 +*** create shared libraries on Solaris systems.  Therefore, libtool
 +*** is disabling shared libraries support.  We urge you to upgrade GNU
 +*** binutils to release 2.9.1 or newer.  Another option is to modify
 +*** your PATH or compiler configuration so that the native linker is
 +*** used, and then restart.
 +
 +_LT_EOF
 +      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- 	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- 	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
++	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
 +      else
 +	_LT_TAGVAR(ld_shlibs, $1)=no
 +      fi
 +      ;;
 +
 +    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
 +      case `$LD -v 2>&1` in
 +        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
 +	_LT_TAGVAR(ld_shlibs, $1)=no
 +	cat <<_LT_EOF 1>&2
 +
- *** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
++*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot
 +*** reliably create shared libraries on SCO systems.  Therefore, libtool
 +*** is disabling shared libraries support.  We urge you to upgrade GNU
 +*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
 +*** your PATH or compiler configuration so that the native linker is
 +*** used, and then restart.
 +
 +_LT_EOF
 +	;;
 +	*)
 +	  # For security reasons, it is highly recommended that you always
 +	  # use absolute paths for naming shared libraries, and exclude the
 +	  # DT_RUNPATH tag from executables and libraries.  But doing so
 +	  # requires that you compile everything twice, which is a pain.
 +	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- 	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- 	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- 	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
++	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
++	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
 +	  else
 +	    _LT_TAGVAR(ld_shlibs, $1)=no
 +	  fi
 +	;;
 +      esac
 +      ;;
 +
 +    sunos4*)
 +      _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
 +      wlarc=
 +      _LT_TAGVAR(hardcode_direct, $1)=yes
 +      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
 +      ;;
 +
 +    *)
 +      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- 	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- 	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
++	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
 +      else
 +	_LT_TAGVAR(ld_shlibs, $1)=no
 +      fi
 +      ;;
 +    esac
 +
-     if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then
++    if test no = "$_LT_TAGVAR(ld_shlibs, $1)"; then
 +      runpath_var=
 +      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
 +      _LT_TAGVAR(export_dynamic_flag_spec, $1)=
 +      _LT_TAGVAR(whole_archive_flag_spec, $1)=
 +    fi
 +  else
 +    # PORTME fill in a description of your system's linker (not GNU ld)
 +    case $host_os in
 +    aix3*)
 +      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
 +      _LT_TAGVAR(always_export_symbols, $1)=yes
 +      _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
 +      # Note: this linker hardcodes the directories in LIBPATH if there
 +      # are no directories specified by -L.
 +      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-       if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
++      if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then
 +	# Neither direct hardcoding nor static linking is supported with a
 +	# broken collect2.
 +	_LT_TAGVAR(hardcode_direct, $1)=unsupported
 +      fi
 +      ;;
 +
 +    aix[[4-9]]*)
-       if test "$host_cpu" = ia64; then
++      if test ia64 = "$host_cpu"; then
 +	# On IA64, the linker does run time linking by default, so we don't
 +	# have to do anything special.
 +	aix_use_runtimelinking=no
 +	exp_sym_flag='-Bexport'
- 	no_entry_flag=""
++	no_entry_flag=
 +      else
 +	# If we're using GNU nm, then we don't want the "-C" option.
- 	# -C means demangle to AIX nm, but means don't demangle with GNU nm
- 	# Also, AIX nm treats weak defined symbols like other global
- 	# defined symbols, whereas GNU nm marks them as "W".
++	# -C means demangle to GNU nm, but means don't demangle to AIX nm.
++	# Without the "-l" option, or with the "-B" option, AIX nm treats
++	# weak defined symbols like other global defined symbols, whereas
++	# GNU nm marks them as "W".
++	# While the 'weak' keyword is ignored in the Export File, we need
++	# it in the Import File for the 'aix-soname' feature, so we have
++	# to replace the "-B" option with "-P" for AIX nm.
 +	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
- 	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
++	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
 +	else
- 	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
++	  _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
 +	fi
 +	aix_use_runtimelinking=no
 +
 +	# Test if we are trying to use run time linking or normal
 +	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
- 	# need to do runtime linking.
++	# have runtime linking enabled, and use it for executables.
++	# For shared libraries, we enable/disable runtime linking
++	# depending on the kind of the shared library created -
++	# when "with_aix_soname,aix_use_runtimelinking" is:
++	# "aix,no"   lib.a(lib.so.V) shared, rtl:no,  for executables
++	# "aix,yes"  lib.so          shared, rtl:yes, for executables
++	#            lib.a           static archive
++	# "both,no"  lib.so.V(shr.o) shared, rtl:yes
++	#            lib.a(lib.so.V) shared, rtl:no,  for executables
++	# "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
++	#            lib.a(lib.so.V) shared, rtl:no
++	# "svr4,*"   lib.so.V(shr.o) shared, rtl:yes, for executables
++	#            lib.a           static archive
 +	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
 +	  for ld_flag in $LDFLAGS; do
- 	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
++	  if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then
 +	    aix_use_runtimelinking=yes
 +	    break
 +	  fi
 +	  done
++	  if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
++	    # With aix-soname=svr4, we create the lib.so.V shared archives only,
++	    # so we don't have lib.a shared libs to link our executables.
++	    # We have to force runtime linking in this case.
++	    aix_use_runtimelinking=yes
++	    LDFLAGS="$LDFLAGS -Wl,-brtl"
++	  fi
 +	  ;;
 +	esac
 +
 +	exp_sym_flag='-bexport'
 +	no_entry_flag='-bnoentry'
 +      fi
 +
 +      # When large executables or shared objects are built, AIX ld can
 +      # have problems creating the table of contents.  If linking a library
 +      # or program results in "error TOC overflow" add -mminimal-toc to
 +      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
 +      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
 +
 +      _LT_TAGVAR(archive_cmds, $1)=''
 +      _LT_TAGVAR(hardcode_direct, $1)=yes
 +      _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
 +      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
 +      _LT_TAGVAR(link_all_deplibs, $1)=yes
-       _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
++      _LT_TAGVAR(file_list_spec, $1)='$wl-f,'
++      case $with_aix_soname,$aix_use_runtimelinking in
++      aix,*) ;; # traditional, no import file
++      svr4,* | *,yes) # use import file
++	# The Import File defines what to hardcode.
++	_LT_TAGVAR(hardcode_direct, $1)=no
++	_LT_TAGVAR(hardcode_direct_absolute, $1)=no
++	;;
++      esac
 +
-       if test "$GCC" = yes; then
++      if test yes = "$GCC"; then
 +	case $host_os in aix4.[[012]]|aix4.[[012]].*)
 +	# We only want to do this on AIX 4.2 and lower, the check
 +	# below for broken collect2 doesn't work under 4.3+
- 	  collect2name=`${CC} -print-prog-name=collect2`
++	  collect2name=`$CC -print-prog-name=collect2`
 +	  if test -f "$collect2name" &&
 +	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
 +	  then
 +	  # We have reworked collect2
 +	  :
 +	  else
 +	  # We have old collect2
 +	  _LT_TAGVAR(hardcode_direct, $1)=unsupported
 +	  # It fails to find uninstalled libraries when the uninstalled
 +	  # path is not listed in the libpath.  Setting hardcode_minus_L
 +	  # to unsupported forces relinking
 +	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
 +	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
 +	  _LT_TAGVAR(hardcode_libdir_separator, $1)=
 +	  fi
 +	  ;;
 +	esac
 +	shared_flag='-shared'
- 	if test "$aix_use_runtimelinking" = yes; then
- 	  shared_flag="$shared_flag "'${wl}-G'
++	if test yes = "$aix_use_runtimelinking"; then
++	  shared_flag="$shared_flag "'$wl-G'
 +	fi
- 	_LT_TAGVAR(link_all_deplibs, $1)=no
++	# Need to ensure runtime linking is disabled for the traditional
++	# shared library, or the linker may eventually find shared libraries
++	# /with/ Import File - we do not want to mix them.
++	shared_flag_aix='-shared'
++	shared_flag_svr4='-shared $wl-G'
 +      else
 +	# not using gcc
- 	if test "$host_cpu" = ia64; then
++	if test ia64 = "$host_cpu"; then
 +	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
 +	# chokes on -Wl,-G. The following line is correct:
 +	  shared_flag='-G'
 +	else
- 	  if test "$aix_use_runtimelinking" = yes; then
- 	    shared_flag='${wl}-G'
++	  if test yes = "$aix_use_runtimelinking"; then
++	    shared_flag='$wl-G'
 +	  else
- 	    shared_flag='${wl}-bM:SRE'
++	    shared_flag='$wl-bM:SRE'
 +	  fi
++	  shared_flag_aix='$wl-bM:SRE'
++	  shared_flag_svr4='$wl-G'
 +	fi
 +      fi
 +
-       _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
++      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall'
 +      # It seems that -bexpall does not export symbols beginning with
 +      # underscore (_), so it is better to generate a list of symbols to export.
 +      _LT_TAGVAR(always_export_symbols, $1)=yes
-       if test "$aix_use_runtimelinking" = yes; then
++      if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
 +	# Warning - without using the other runtime loading flags (-brtl),
 +	# -berok will link without error, but may produce a broken library.
 +	_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
 +        # Determine the default libpath from the value encoded in an
 +        # empty executable.
 +        _LT_SYS_MODULE_PATH_AIX([$1])
-         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-         _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
++        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
 +      else
- 	if test "$host_cpu" = ia64; then
- 	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
++	if test ia64 = "$host_cpu"; then
++	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib'
 +	  _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
- 	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
++	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
 +	else
 +	 # Determine the default libpath from the value encoded in an
 +	 # empty executable.
 +	 _LT_SYS_MODULE_PATH_AIX([$1])
- 	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
++	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
 +	  # Warning - without using the other run time loading flags,
 +	  # -berok will link without error, but may produce a broken library.
- 	  _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
- 	  _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
- 	  if test "$with_gnu_ld" = yes; then
++	  _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok'
++	  _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok'
++	  if test yes = "$with_gnu_ld"; then
 +	    # We only use this code for GNU lds that support --whole-archive.
- 	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
++	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive'
 +	  else
 +	    # Exported symbols can be pulled into shared objects from archives
 +	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
 +	  fi
 +	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
- 	  # This is similar to how AIX traditionally builds its shared libraries.
- 	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++	  _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
++	  # -brtl affects multiple linker settings, -berok does not and is overridden later
++	  compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`'
++	  if test svr4 != "$with_aix_soname"; then
++	    # This is similar to how AIX traditionally builds its shared libraries.
++	    _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
++	  fi
++	  if test aix != "$with_aix_soname"; then
++	    _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "#  [...]
++	  else
++	    # used by -dlpreopen to get the symbols
++	    _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV  $output_objdir/$realname.d/$soname $output_objdir'
++	  fi
++	  _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d'
 +	fi
 +      fi
 +      ;;
 +
 +    amigaos*)
 +      case $host_cpu in
 +      powerpc)
 +            # see comment about AmigaOS4 .so support
-             _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
 +            _LT_TAGVAR(archive_expsym_cmds, $1)=''
 +        ;;
 +      m68k)
 +            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
 +            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
 +            _LT_TAGVAR(hardcode_minus_L, $1)=yes
 +        ;;
 +      esac
 +      ;;
 +
 +    bsdi[[45]]*)
 +      _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
 +      ;;
 +
 +    cygwin* | mingw* | pw32* | cegcc*)
 +      # When not using gcc, we currently assume that we are using
 +      # Microsoft Visual C++.
 +      # hardcode_libdir_flag_spec is actually meaningless, as there is
 +      # no search path for DLLs.
 +      case $cc_basename in
 +      cl*)
 +	# Native MSVC
 +	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
 +	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
 +	_LT_TAGVAR(always_export_symbols, $1)=yes
 +	_LT_TAGVAR(file_list_spec, $1)='@'
 +	# Tell ltmain to make .lib files, not .a files.
 +	libext=lib
 +	# Tell ltmain to make .dll files, not .so files.
- 	shrext_cmds=".dll"
++	shrext_cmds=.dll
 +	# FIXME: Setting linknames here is a bad hack.
- 	_LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
- 	_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- 	    sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
- 	  else
- 	    sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
- 	  fi~
- 	  $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
- 	  linknames='
++	_LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
++	_LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
++            cp "$export_symbols" "$output_objdir/$soname.def";
++            echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
++          else
++            $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
++          fi~
++          $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
++          linknames='
 +	# The linker will not automatically build a static lib if we build a DLL.
 +	# _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
 +	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
 +	_LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
 +	_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
 +	# Don't use ranlib
 +	_LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
 +	_LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
- 	  lt_tool_outputfile="@TOOL_OUTPUT@"~
- 	  case $lt_outputfile in
- 	    *.exe|*.EXE) ;;
- 	    *)
- 	      lt_outputfile="$lt_outputfile.exe"
- 	      lt_tool_outputfile="$lt_tool_outputfile.exe"
- 	      ;;
- 	  esac~
- 	  if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
- 	    $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
- 	    $RM "$lt_outputfile.manifest";
- 	  fi'
++          lt_tool_outputfile="@TOOL_OUTPUT@"~
++          case $lt_outputfile in
++            *.exe|*.EXE) ;;
++            *)
++              lt_outputfile=$lt_outputfile.exe
++              lt_tool_outputfile=$lt_tool_outputfile.exe
++              ;;
++          esac~
++          if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
++            $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
++            $RM "$lt_outputfile.manifest";
++          fi'
 +	;;
 +      *)
 +	# Assume MSVC wrapper
 +	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
 +	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
 +	# Tell ltmain to make .lib files, not .a files.
 +	libext=lib
 +	# Tell ltmain to make .dll files, not .so files.
- 	shrext_cmds=".dll"
++	shrext_cmds=.dll
 +	# FIXME: Setting linknames here is a bad hack.
 +	_LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
 +	# The linker will automatically build a .lib file if we build a DLL.
 +	_LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
 +	# FIXME: Should let the user specify the lib program.
 +	_LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
 +	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
 +	;;
 +      esac
 +      ;;
 +
 +    darwin* | rhapsody*)
 +      _LT_DARWIN_LINKER_FEATURES($1)
 +      ;;
 +
 +    dgux*)
 +      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
 +      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
 +      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
 +      ;;
 +
 +    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
 +    # support.  Future versions do this automatically, but an explicit c++rt0.o
 +    # does not break anything, and helps significantly (at the cost of a little
 +    # extra space).
 +    freebsd2.2*)
 +      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
 +      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
 +      _LT_TAGVAR(hardcode_direct, $1)=yes
 +      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
 +      ;;
 +
 +    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
 +    freebsd2.*)
 +      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
 +      _LT_TAGVAR(hardcode_direct, $1)=yes
 +      _LT_TAGVAR(hardcode_minus_L, $1)=yes
 +      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
 +      ;;
 +
 +    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
 +    freebsd* | dragonfly*)
 +      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
 +      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
 +      _LT_TAGVAR(hardcode_direct, $1)=yes
 +      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
 +      ;;
 +
 +    hpux9*)
-       if test "$GCC" = yes; then
- 	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++      if test yes = "$GCC"; then
++	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
 +      else
- 	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
 +      fi
-       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
 +      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
 +      _LT_TAGVAR(hardcode_direct, $1)=yes
 +
 +      # hardcode_minus_L: Not really in the search PATH,
 +      # but as the default location of the library.
 +      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-       _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
 +      ;;
 +
 +    hpux10*)
-       if test "$GCC" = yes && test "$with_gnu_ld" = no; then
- 	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++      if test yes,no = "$GCC,$with_gnu_ld"; then
++	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 +      else
 +	_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
 +      fi
-       if test "$with_gnu_ld" = no; then
- 	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++      if test no = "$with_gnu_ld"; then
++	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
 +	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
 +	_LT_TAGVAR(hardcode_direct, $1)=yes
 +	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
- 	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++	_LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
 +	# hardcode_minus_L: Not really in the search PATH,
 +	# but as the default location of the library.
 +	_LT_TAGVAR(hardcode_minus_L, $1)=yes
 +      fi
 +      ;;
 +
 +    hpux11*)
-       if test "$GCC" = yes && test "$with_gnu_ld" = no; then
++      if test yes,no = "$GCC,$with_gnu_ld"; then
 +	case $host_cpu in
 +	hppa*64*)
- 	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
 +	  ;;
 +	ia64*)
- 	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
++	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 +	  ;;
 +	*)
- 	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 +	  ;;
 +	esac
 +      else
 +	case $host_cpu in
 +	hppa*64*)
- 	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	  _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
 +	  ;;
 +	ia64*)
- 	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
++	  _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 +	  ;;
 +	*)
 +	m4_if($1, [], [
 +	  # Older versions of the 11.00 compiler do not understand -b yet
 +	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
 +	  _LT_LINKER_OPTION([if $CC understands -b],
 +	    _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b],
- 	    [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
++	    [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
 +	    [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])],
- 	  [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'])
++	  [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'])
 +	  ;;
 +	esac
 +      fi
-       if test "$with_gnu_ld" = no; then
- 	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++      if test no = "$with_gnu_ld"; then
++	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
 +	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
 +
 +	case $host_cpu in
 +	hppa*64*|ia64*)
 +	  _LT_TAGVAR(hardcode_direct, $1)=no
 +	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
 +	  ;;
 +	*)
 +	  _LT_TAGVAR(hardcode_direct, $1)=yes
 +	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
- 	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
 +
 +	  # hardcode_minus_L: Not really in the search PATH,
 +	  # but as the default location of the library.
 +	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
 +	  ;;
 +	esac
 +      fi
 +      ;;
 +
 +    irix5* | irix6* | nonstopux*)
-       if test "$GCC" = yes; then
- 	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++      if test yes = "$GCC"; then
++	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
 +	# Try to use the -exported_symbol ld option, if it does not
 +	# work, assume that -exports_file does not work either and
 +	# implicitly export all symbols.
 +	# This should be the same for all languages, so no per-tag cache variable.
 +	AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol],
 +	  [lt_cv_irix_exported_symbol],
- 	  [save_LDFLAGS="$LDFLAGS"
- 	   LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
++	  [save_LDFLAGS=$LDFLAGS
++	   LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null"
 +	   AC_LINK_IFELSE(
 +	     [AC_LANG_SOURCE(
 +	        [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
 +			      [C++], [[int foo (void) { return 0; }]],
 +			      [Fortran 77], [[
 +      subroutine foo
 +      end]],
 +			      [Fortran], [[
 +      subroutine foo
 +      end]])])],
 +	      [lt_cv_irix_exported_symbol=yes],
 +	      [lt_cv_irix_exported_symbol=no])
-            LDFLAGS="$save_LDFLAGS"])
- 	if test "$lt_cv_irix_exported_symbol" = yes; then
-           _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
++           LDFLAGS=$save_LDFLAGS])
++	if test yes = "$lt_cv_irix_exported_symbol"; then
++          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
 +	fi
++	_LT_TAGVAR(link_all_deplibs, $1)=no
 +      else
- 	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
- 	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
++	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
++	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib'
 +      fi
 +      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
 +      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
 +      _LT_TAGVAR(inherit_rpath, $1)=yes
 +      _LT_TAGVAR(link_all_deplibs, $1)=yes
 +      ;;
 +
++    linux*)
++      case $cc_basename in
++      tcc*)
++	# Fabrice Bellard et al's Tiny C Compiler
++	_LT_TAGVAR(ld_shlibs, $1)=yes
++	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	;;
++      esac
++      ;;
++
 +    netbsd* | netbsdelf*-gnu)
 +      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 +	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
 +      else
 +	_LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
 +      fi
 +      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
 +      _LT_TAGVAR(hardcode_direct, $1)=yes
 +      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
 +      ;;
 +
 +    newsos6)
 +      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
 +      _LT_TAGVAR(hardcode_direct, $1)=yes
-       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
 +      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
 +      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
 +      ;;
 +
 +    *nto* | *qnx*)
 +      ;;
 +
-     openbsd*)
++    openbsd* | bitrig*)
 +      if test -f /usr/libexec/ld.so; then
 +	_LT_TAGVAR(hardcode_direct, $1)=yes
 +	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
 +	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
- 	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
 +	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
- 	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
- 	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- 	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols'
++	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
++	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
 +	else
- 	  case $host_os in
- 	   openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
- 	     _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
- 	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- 	     ;;
- 	   *)
- 	     _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
- 	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- 	     ;;
- 	  esac
++	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
 +	fi
 +      else
 +	_LT_TAGVAR(ld_shlibs, $1)=no
 +      fi
 +      ;;
 +
 +    os2*)
 +      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
 +      _LT_TAGVAR(hardcode_minus_L, $1)=yes
 +      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-       _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-       _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
++      shrext_cmds=.dll
++      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
++	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
++	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
++	$ECHO EXPORTS >> $output_objdir/$libname.def~
++	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
++	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
++	emximp -o $lib $output_objdir/$libname.def'
++      _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
++	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
++	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
++	$ECHO EXPORTS >> $output_objdir/$libname.def~
++	prefix_cmds="$SED"~
++	if test EXPORTS = "`$SED 1q $export_symbols`"; then
++	  prefix_cmds="$prefix_cmds -e 1d";
++	fi~
++	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
++	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
++	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
++	emximp -o $lib $output_objdir/$libname.def'
++      _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
++      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
 +      ;;
 +
 +    osf3*)
-       if test "$GCC" = yes; then
- 	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- 	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++      if test yes = "$GCC"; then
++	_LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
++	_LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
 +      else
 +	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
- 	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
++	_LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
 +      fi
 +      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
 +      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
 +      ;;
 +
 +    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-       if test "$GCC" = yes; then
- 	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- 	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- 	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++      if test yes = "$GCC"; then
++	_LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
++	_LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
++	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
 +      else
 +	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
- 	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
++	_LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
 +	_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
- 	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
++          $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp'
 +
 +	# Both c and cxx compiler support -rpath directly
 +	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
 +      fi
 +      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
 +      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
 +      ;;
 +
 +    solaris*)
 +      _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
-       if test "$GCC" = yes; then
- 	wlarc='${wl}'
- 	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++      if test yes = "$GCC"; then
++	wlarc='$wl'
++	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
 +	_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- 	  $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
++          $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
 +      else
 +	case `$CC -V 2>&1` in
 +	*"Compilers 5.0"*)
 +	  wlarc=''
- 	  _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	  _LT_TAGVAR(archive_cmds, $1)='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags'
 +	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- 	  $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
++            $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
 +	  ;;
 +	*)
- 	  wlarc='${wl}'
- 	  _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
++	  wlarc='$wl'
++	  _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags'
 +	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- 	  $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
++            $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
 +	  ;;
 +	esac
 +      fi
 +      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
 +      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
 +      case $host_os in
 +      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
 +      *)
 +	# The compiler driver will combine and reorder linker options,
- 	# but understands `-z linker_flag'.  GCC discards it without `$wl',
++	# but understands '-z linker_flag'.  GCC discards it without '$wl',
 +	# but is careful enough not to reorder.
 +	# Supported since Solaris 2.6 (maybe 2.5.1?)
- 	if test "$GCC" = yes; then
- 	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++	if test yes = "$GCC"; then
++	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
 +	else
 +	  _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
 +	fi
 +	;;
 +      esac
 +      _LT_TAGVAR(link_all_deplibs, $1)=yes
 +      ;;
 +
 +    sunos4*)
-       if test "x$host_vendor" = xsequent; then
++      if test sequent = "$host_vendor"; then
 +	# Use $CC to link under sequent, because it throws in some extra .o
 +	# files that make .init and .fini sections work.
- 	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags'
 +      else
 +	_LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
 +      fi
 +      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
 +      _LT_TAGVAR(hardcode_direct, $1)=yes
 +      _LT_TAGVAR(hardcode_minus_L, $1)=yes
 +      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
 +      ;;
 +
 +    sysv4)
 +      case $host_vendor in
 +	sni)
 +	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
 +	  _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true???
 +	;;
 +	siemens)
 +	  ## LD is ld it makes a PLAMLIB
 +	  ## CC just makes a GrossModule.
 +	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
 +	  _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
 +	  _LT_TAGVAR(hardcode_direct, $1)=no
 +        ;;
 +	motorola)
 +	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
 +	  _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
 +	;;
 +      esac
 +      runpath_var='LD_RUN_PATH'
 +      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
 +      ;;
 +
 +    sysv4.3*)
 +      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
 +      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
 +      _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
 +      ;;
 +
 +    sysv4*MP*)
 +      if test -d /usr/nec; then
 +	_LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
 +	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
 +	runpath_var=LD_RUN_PATH
 +	hardcode_runpath_var=yes
 +	_LT_TAGVAR(ld_shlibs, $1)=yes
 +      fi
 +      ;;
 +
 +    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
-       _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
++      _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
 +      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
 +      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
 +      runpath_var='LD_RUN_PATH'
 +
-       if test "$GCC" = yes; then
- 	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- 	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++      if test yes = "$GCC"; then
++	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 +      else
- 	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- 	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 +      fi
 +      ;;
 +
 +    sysv5* | sco3.2v5* | sco5v6*)
-       # Note: We can NOT use -z defs as we might desire, because we do not
++      # Note: We CANNOT use -z defs as we might desire, because we do not
 +      # link with -lc, and that would cause any symbols used from libc to
 +      # always be unresolved, which means just about no library would
 +      # ever link correctly.  If we're not using GNU ld we use -z text
 +      # though, which does catch some bad symbols but isn't as heavy-handed
 +      # as -z defs.
-       _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-       _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
++      _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
++      _LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs'
 +      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
 +      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
++      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir'
 +      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
 +      _LT_TAGVAR(link_all_deplibs, $1)=yes
-       _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
++      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport'
 +      runpath_var='LD_RUN_PATH'
 +
-       if test "$GCC" = yes; then
- 	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- 	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++      if test yes = "$GCC"; then
++	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 +      else
- 	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- 	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 +      fi
 +      ;;
 +
 +    uts4*)
 +      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
 +      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
 +      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
 +      ;;
 +
 +    *)
 +      _LT_TAGVAR(ld_shlibs, $1)=no
 +      ;;
 +    esac
 +
-     if test x$host_vendor = xsni; then
++    if test sni = "$host_vendor"; then
 +      case $host in
 +      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
- 	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym'
++	_LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Blargedynsym'
 +	;;
 +      esac
 +    fi
 +  fi
 +])
 +AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
- test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
++test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no
 +
 +_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld
 +
 +_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl
 +_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl
 +_LT_DECL([], [extract_expsyms_cmds], [2],
 +    [The commands to extract the exported symbol list from a shared archive])
 +
 +#
 +# Do we need to explicitly link libc?
 +#
 +case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in
 +x|xyes)
 +  # Assume -lc should be added
 +  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
 +
-   if test "$enable_shared" = yes && test "$GCC" = yes; then
++  if test yes,yes = "$GCC,$enable_shared"; then
 +    case $_LT_TAGVAR(archive_cmds, $1) in
 +    *'~'*)
 +      # FIXME: we may have to deal with multi-command sequences.
 +      ;;
 +    '$CC '*)
 +      # Test whether the compiler implicitly links with -lc since on some
 +      # systems, -lgcc has to come before -lc. If gcc already passes -lc
 +      # to ld, don't add -lc before -lgcc.
 +      AC_CACHE_CHECK([whether -lc should be explicitly linked in],
 +	[lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1),
 +	[$RM conftest*
 +	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 +
 +	if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
 +	  soname=conftest
 +	  lib=conftest
 +	  libobjs=conftest.$ac_objext
 +	  deplibs=
 +	  wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
 +	  pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
 +	  compiler_flags=-v
 +	  linker_flags=-v
 +	  verstring=
 +	  output_objdir=.
 +	  libname=conftest
 +	  lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
 +	  _LT_TAGVAR(allow_undefined_flag, $1)=
 +	  if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
 +	  then
 +	    lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no
 +	  else
 +	    lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
 +	  fi
 +	  _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
 +	else
 +	  cat conftest.err 1>&5
 +	fi
 +	$RM conftest*
 +	])
 +      _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)
 +      ;;
 +    esac
 +  fi
 +  ;;
 +esac
 +
 +_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0],
 +    [Whether or not to add -lc for building shared libraries])
 +_LT_TAGDECL([allow_libtool_libs_with_static_runtimes],
 +    [enable_shared_with_static_runtimes], [0],
 +    [Whether or not to disallow shared libs when runtime libs are static])
 +_LT_TAGDECL([], [export_dynamic_flag_spec], [1],
 +    [Compiler flag to allow reflexive dlopens])
 +_LT_TAGDECL([], [whole_archive_flag_spec], [1],
 +    [Compiler flag to generate shared objects directly from archives])
 +_LT_TAGDECL([], [compiler_needs_object], [1],
 +    [Whether the compiler copes with passing no objects directly])
 +_LT_TAGDECL([], [old_archive_from_new_cmds], [2],
 +    [Create an old-style archive from a shared archive])
 +_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2],
 +    [Create a temporary old-style archive to link instead of a shared archive])
 +_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive])
 +_LT_TAGDECL([], [archive_expsym_cmds], [2])
 +_LT_TAGDECL([], [module_cmds], [2],
 +    [Commands used to build a loadable module if different from building
 +    a shared archive.])
 +_LT_TAGDECL([], [module_expsym_cmds], [2])
 +_LT_TAGDECL([], [with_gnu_ld], [1],
 +    [Whether we are building with GNU ld or not])
 +_LT_TAGDECL([], [allow_undefined_flag], [1],
 +    [Flag that allows shared libraries with undefined symbols to be built])
 +_LT_TAGDECL([], [no_undefined_flag], [1],
 +    [Flag that enforces no undefined symbols])
 +_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
 +    [Flag to hardcode $libdir into a binary during linking.
 +    This must work even if $libdir does not exist])
 +_LT_TAGDECL([], [hardcode_libdir_separator], [1],
 +    [Whether we need a single "-rpath" flag with a separated argument])
 +_LT_TAGDECL([], [hardcode_direct], [0],
-     [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
++    [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes
 +    DIR into the resulting binary])
 +_LT_TAGDECL([], [hardcode_direct_absolute], [0],
-     [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
++    [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes
 +    DIR into the resulting binary and the resulting library dependency is
-     "absolute", i.e impossible to change by setting ${shlibpath_var} if the
++    "absolute", i.e impossible to change by setting $shlibpath_var if the
 +    library is relocated])
 +_LT_TAGDECL([], [hardcode_minus_L], [0],
 +    [Set to "yes" if using the -LDIR flag during linking hardcodes DIR
 +    into the resulting binary])
 +_LT_TAGDECL([], [hardcode_shlibpath_var], [0],
 +    [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
 +    into the resulting binary])
 +_LT_TAGDECL([], [hardcode_automatic], [0],
 +    [Set to "yes" if building a shared library automatically hardcodes DIR
 +    into the library and all subsequent libraries and executables linked
 +    against it])
 +_LT_TAGDECL([], [inherit_rpath], [0],
 +    [Set to yes if linker adds runtime paths of dependent libraries
 +    to runtime path list])
 +_LT_TAGDECL([], [link_all_deplibs], [0],
 +    [Whether libtool must link a program against all its dependency libraries])
 +_LT_TAGDECL([], [always_export_symbols], [0],
 +    [Set to "yes" if exported symbols are required])
 +_LT_TAGDECL([], [export_symbols_cmds], [2],
 +    [The commands to list exported symbols])
 +_LT_TAGDECL([], [exclude_expsyms], [1],
 +    [Symbols that should not be listed in the preloaded symbols])
 +_LT_TAGDECL([], [include_expsyms], [1],
 +    [Symbols that must always be exported])
 +_LT_TAGDECL([], [prelink_cmds], [2],
 +    [Commands necessary for linking programs (against libraries) with templates])
 +_LT_TAGDECL([], [postlink_cmds], [2],
 +    [Commands necessary for finishing linking programs])
 +_LT_TAGDECL([], [file_list_spec], [1],
 +    [Specify filename containing input files])
 +dnl FIXME: Not yet implemented
 +dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1],
 +dnl    [Compiler flag to generate thread safe objects])
 +])# _LT_LINKER_SHLIBS
 +
 +
 +# _LT_LANG_C_CONFIG([TAG])
 +# ------------------------
 +# Ensure that the configuration variables for a C compiler are suitably
 +# defined.  These variables are subsequently used by _LT_CONFIG to write
- # the compiler configuration to `libtool'.
++# the compiler configuration to 'libtool'.
 +m4_defun([_LT_LANG_C_CONFIG],
 +[m4_require([_LT_DECL_EGREP])dnl
- lt_save_CC="$CC"
++lt_save_CC=$CC
 +AC_LANG_PUSH(C)
 +
 +# Source file extension for C test sources.
 +ac_ext=c
 +
 +# Object file extension for compiled C test sources.
 +objext=o
 +_LT_TAGVAR(objext, $1)=$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);}'
 +
 +_LT_TAG_COMPILER
 +# Save the default compiler, since it gets overwritten when the other
 +# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
 +compiler_DEFAULT=$CC
 +
 +# save warnings/boilerplate of simple test code
 +_LT_COMPILER_BOILERPLATE
 +_LT_LINKER_BOILERPLATE
 +
 +## 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_COMPILER_NO_RTTI($1)
 +  _LT_COMPILER_PIC($1)
 +  _LT_COMPILER_C_O($1)
 +  _LT_COMPILER_FILE_LOCKS($1)
 +  _LT_LINKER_SHLIBS($1)
 +  _LT_SYS_DYNAMIC_LINKER($1)
 +  _LT_LINKER_HARDCODE_LIBPATH($1)
 +  LT_SYS_DLOPEN_SELF
 +  _LT_CMD_STRIPLIB
 +
-   # Report which library types will actually be built
++  # Report what library types will actually be built
 +  AC_MSG_CHECKING([if libtool supports shared libraries])
 +  AC_MSG_RESULT([$can_build_shared])
 +
 +  AC_MSG_CHECKING([whether to build shared libraries])
-   test "$can_build_shared" = "no" && enable_shared=no
++  test no = "$can_build_shared" && enable_shared=no
 +
 +  # On AIX, shared libraries and static libraries use the same namespace, and
 +  # are all built from PIC.
 +  case $host_os in
 +  aix3*)
-     test "$enable_shared" = yes && enable_static=no
++    test yes = "$enable_shared" && enable_static=no
 +    if test -n "$RANLIB"; then
 +      archive_cmds="$archive_cmds~\$RANLIB \$lib"
 +      postinstall_cmds='$RANLIB $lib'
 +    fi
 +    ;;
 +
 +  aix[[4-9]]*)
-     if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-       test "$enable_shared" = yes && enable_static=no
++    if test ia64 != "$host_cpu"; then
++      case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
++      yes,aix,yes) ;;			# shared object as lib.so file only
++      yes,svr4,*) ;;			# shared object as lib.so archive member only
++      yes,*) enable_static=no ;;	# shared object in lib.a archive as well
++      esac
 +    fi
 +    ;;
 +  esac
 +  AC_MSG_RESULT([$enable_shared])
 +
 +  AC_MSG_CHECKING([whether to build static libraries])
 +  # Make sure either enable_shared or enable_static is yes.
-   test "$enable_shared" = yes || enable_static=yes
++  test yes = "$enable_shared" || enable_static=yes
 +  AC_MSG_RESULT([$enable_static])
 +
 +  _LT_CONFIG($1)
 +fi
 +AC_LANG_POP
- CC="$lt_save_CC"
++CC=$lt_save_CC
 +])# _LT_LANG_C_CONFIG
 +
 +
 +# _LT_LANG_CXX_CONFIG([TAG])
 +# --------------------------
 +# Ensure that the configuration variables for a C++ compiler are suitably
 +# defined.  These variables are subsequently used by _LT_CONFIG to write
- # the compiler configuration to `libtool'.
++# the compiler configuration to 'libtool'.
 +m4_defun([_LT_LANG_CXX_CONFIG],
 +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
 +m4_require([_LT_DECL_EGREP])dnl
 +m4_require([_LT_PATH_MANIFEST_TOOL])dnl
- if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-     ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-     (test "X$CXX" != "Xg++"))) ; then
++if test -n "$CXX" && ( test no != "$CXX" &&
++    ( (test g++ = "$CXX" && `g++ -v >/dev/null 2>&1` ) ||
++    (test g++ != "$CXX"))); then
 +  AC_PROG_CXXCPP
 +else
 +  _lt_caught_CXX_error=yes
 +fi
 +
 +AC_LANG_PUSH(C++)
 +_LT_TAGVAR(archive_cmds_need_lc, $1)=no
 +_LT_TAGVAR(allow_undefined_flag, $1)=
 +_LT_TAGVAR(always_export_symbols, $1)=no
 +_LT_TAGVAR(archive_expsym_cmds, $1)=
 +_LT_TAGVAR(compiler_needs_object, $1)=no
 +_LT_TAGVAR(export_dynamic_flag_spec, $1)=
 +_LT_TAGVAR(hardcode_direct, $1)=no
 +_LT_TAGVAR(hardcode_direct_absolute, $1)=no
 +_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
 +_LT_TAGVAR(hardcode_libdir_separator, $1)=
 +_LT_TAGVAR(hardcode_minus_L, $1)=no
 +_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
 +_LT_TAGVAR(hardcode_automatic, $1)=no
 +_LT_TAGVAR(inherit_rpath, $1)=no
 +_LT_TAGVAR(module_cmds, $1)=
 +_LT_TAGVAR(module_expsym_cmds, $1)=
 +_LT_TAGVAR(link_all_deplibs, $1)=unknown
 +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
 +_LT_TAGVAR(reload_flag, $1)=$reload_flag
 +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
 +_LT_TAGVAR(no_undefined_flag, $1)=
 +_LT_TAGVAR(whole_archive_flag_spec, $1)=
 +_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
 +
 +# Source file extension for C++ test sources.
 +ac_ext=cpp
 +
 +# Object file extension for compiled C++ test sources.
 +objext=o
 +_LT_TAGVAR(objext, $1)=$objext
 +
 +# No sense in running all these tests if we already determined that
 +# the CXX compiler isn't working.  Some variables (like enable_shared)
 +# are currently assumed to apply to all compilers on this platform,
 +# and will be corrupted by setting them based on a non-working compiler.
- if test "$_lt_caught_CXX_error" != yes; then
++if test yes != "$_lt_caught_CXX_error"; then
 +  # Code to be used in simple compile tests
 +  lt_simple_compile_test_code="int some_variable = 0;"
 +
 +  # Code to be used in simple link tests
 +  lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
 +
 +  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
 +  _LT_TAG_COMPILER
 +
 +  # save warnings/boilerplate of simple test code
 +  _LT_COMPILER_BOILERPLATE
 +  _LT_LINKER_BOILERPLATE
 +
 +  # Allow CC to be a program name with arguments.
 +  lt_save_CC=$CC
 +  lt_save_CFLAGS=$CFLAGS
 +  lt_save_LD=$LD
 +  lt_save_GCC=$GCC
 +  GCC=$GXX
 +  lt_save_with_gnu_ld=$with_gnu_ld
 +  lt_save_path_LD=$lt_cv_path_LD
 +  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
 +    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
 +  else
 +    $as_unset lt_cv_prog_gnu_ld
 +  fi
 +  if test -n "${lt_cv_path_LDCXX+set}"; then
 +    lt_cv_path_LD=$lt_cv_path_LDCXX
 +  else
 +    $as_unset lt_cv_path_LD
 +  fi
 +  test -z "${LDCXX+set}" || LD=$LDCXX
 +  CC=${CXX-"c++"}
 +  CFLAGS=$CXXFLAGS
 +  compiler=$CC
 +  _LT_TAGVAR(compiler, $1)=$CC
 +  _LT_CC_BASENAME([$compiler])
 +
 +  if test -n "$compiler"; then
 +    # We don't want -fno-exception when compiling C++ code, so set the
 +    # no_builtin_flag separately
-     if test "$GXX" = yes; then
++    if test yes = "$GXX"; then
 +      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
 +    else
 +      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
 +    fi
 +
-     if test "$GXX" = yes; then
++    if test yes = "$GXX"; then
 +      # Set up default GNU C++ configuration
 +
 +      LT_PATH_LD
 +
 +      # Check if GNU C++ uses GNU ld as the underlying linker, since the
 +      # archiving commands below assume that GNU ld is being used.
-       if test "$with_gnu_ld" = yes; then
-         _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-         _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      if test yes = "$with_gnu_ld"; then
++        _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
++        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
 +
-         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-         _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
++        _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
 +
 +        # If archive_cmds runs LD, not CC, wlarc should be empty
 +        # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
 +        #     investigate it a little bit more. (MM)
-         wlarc='${wl}'
++        wlarc='$wl'
 +
 +        # ancient GNU ld didn't support --whole-archive et. al.
 +        if eval "`$CC -print-prog-name=ld` --help 2>&1" |
 +	  $GREP 'no-whole-archive' > /dev/null; then
-           _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++          _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
 +        else
 +          _LT_TAGVAR(whole_archive_flag_spec, $1)=
 +        fi
 +      else
 +        with_gnu_ld=no
 +        wlarc=
 +
 +        # A generic and very simple default shared library creation
 +        # command for GNU C++ for the case where it uses the native
 +        # linker, instead of GNU ld.  If possible, this setting should
 +        # overridden to take advantage of the native linker features on
 +        # the platform it is being used on.
 +        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
 +      fi
 +
 +      # Commands to make compiler produce verbose output that lists
 +      # what "hidden" libraries, object files and flags are used when
 +      # linking a shared library.
 +      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
 +
 +    else
 +      GXX=no
 +      with_gnu_ld=no
 +      wlarc=
 +    fi
 +
 +    # PORTME: fill in a description of your system's C++ link characteristics
 +    AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
 +    _LT_TAGVAR(ld_shlibs, $1)=yes
 +    case $host_os in
 +      aix3*)
 +        # FIXME: insert proper C++ library support
 +        _LT_TAGVAR(ld_shlibs, $1)=no
 +        ;;
 +      aix[[4-9]]*)
-         if test "$host_cpu" = ia64; then
++        if test ia64 = "$host_cpu"; then
 +          # On IA64, the linker does run time linking by default, so we don't
 +          # have to do anything special.
 +          aix_use_runtimelinking=no
 +          exp_sym_flag='-Bexport'
-           no_entry_flag=""
++          no_entry_flag=
 +        else
 +          aix_use_runtimelinking=no
 +
 +          # Test if we are trying to use run time linking or normal
 +          # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-           # need to do runtime linking.
++          # have runtime linking enabled, and use it for executables.
++          # For shared libraries, we enable/disable runtime linking
++          # depending on the kind of the shared library created -
++          # when "with_aix_soname,aix_use_runtimelinking" is:
++          # "aix,no"   lib.a(lib.so.V) shared, rtl:no,  for executables
++          # "aix,yes"  lib.so          shared, rtl:yes, for executables
++          #            lib.a           static archive
++          # "both,no"  lib.so.V(shr.o) shared, rtl:yes
++          #            lib.a(lib.so.V) shared, rtl:no,  for executables
++          # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
++          #            lib.a(lib.so.V) shared, rtl:no
++          # "svr4,*"   lib.so.V(shr.o) shared, rtl:yes, for executables
++          #            lib.a           static archive
 +          case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
 +	    for ld_flag in $LDFLAGS; do
 +	      case $ld_flag in
 +	      *-brtl*)
 +	        aix_use_runtimelinking=yes
 +	        break
 +	        ;;
 +	      esac
 +	    done
++	    if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
++	      # With aix-soname=svr4, we create the lib.so.V shared archives only,
++	      # so we don't have lib.a shared libs to link our executables.
++	      # We have to force runtime linking in this case.
++	      aix_use_runtimelinking=yes
++	      LDFLAGS="$LDFLAGS -Wl,-brtl"
++	    fi
 +	    ;;
 +          esac
 +
 +          exp_sym_flag='-bexport'
 +          no_entry_flag='-bnoentry'
 +        fi
 +
 +        # When large executables or shared objects are built, AIX ld can
 +        # have problems creating the table of contents.  If linking a library
 +        # or program results in "error TOC overflow" add -mminimal-toc to
 +        # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
 +        # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
 +
 +        _LT_TAGVAR(archive_cmds, $1)=''
 +        _LT_TAGVAR(hardcode_direct, $1)=yes
 +        _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
 +        _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
 +        _LT_TAGVAR(link_all_deplibs, $1)=yes
-         _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
++        _LT_TAGVAR(file_list_spec, $1)='$wl-f,'
++        case $with_aix_soname,$aix_use_runtimelinking in
++        aix,*) ;;	# no import file
++        svr4,* | *,yes) # use import file
++          # The Import File defines what to hardcode.
++          _LT_TAGVAR(hardcode_direct, $1)=no
++          _LT_TAGVAR(hardcode_direct_absolute, $1)=no
++          ;;
++        esac
 +
-         if test "$GXX" = yes; then
++        if test yes = "$GXX"; then
 +          case $host_os in aix4.[[012]]|aix4.[[012]].*)
 +          # We only want to do this on AIX 4.2 and lower, the check
 +          # below for broken collect2 doesn't work under 4.3+
- 	  collect2name=`${CC} -print-prog-name=collect2`
++	  collect2name=`$CC -print-prog-name=collect2`
 +	  if test -f "$collect2name" &&
 +	     strings "$collect2name" | $GREP resolve_lib_name >/dev/null
 +	  then
 +	    # We have reworked collect2
 +	    :
 +	  else
 +	    # We have old collect2
 +	    _LT_TAGVAR(hardcode_direct, $1)=unsupported
 +	    # It fails to find uninstalled libraries when the uninstalled
 +	    # path is not listed in the libpath.  Setting hardcode_minus_L
 +	    # to unsupported forces relinking
 +	    _LT_TAGVAR(hardcode_minus_L, $1)=yes
 +	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
 +	    _LT_TAGVAR(hardcode_libdir_separator, $1)=
 +	  fi
 +          esac
 +          shared_flag='-shared'
- 	  if test "$aix_use_runtimelinking" = yes; then
- 	    shared_flag="$shared_flag "'${wl}-G'
++	  if test yes = "$aix_use_runtimelinking"; then
++	    shared_flag=$shared_flag' $wl-G'
 +	  fi
++	  # Need to ensure runtime linking is disabled for the traditional
++	  # shared library, or the linker may eventually find shared libraries
++	  # /with/ Import File - we do not want to mix them.
++	  shared_flag_aix='-shared'
++	  shared_flag_svr4='-shared $wl-G'
 +        else
 +          # not using gcc
-           if test "$host_cpu" = ia64; then
++          if test ia64 = "$host_cpu"; then
 +	  # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
 +	  # chokes on -Wl,-G. The following line is correct:
 +	  shared_flag='-G'
 +          else
- 	    if test "$aix_use_runtimelinking" = yes; then
- 	      shared_flag='${wl}-G'
++	    if test yes = "$aix_use_runtimelinking"; then
++	      shared_flag='$wl-G'
 +	    else
- 	      shared_flag='${wl}-bM:SRE'
++	      shared_flag='$wl-bM:SRE'
 +	    fi
++	    shared_flag_aix='$wl-bM:SRE'
++	    shared_flag_svr4='$wl-G'
 +          fi
 +        fi
 +
-         _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
++        _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall'
 +        # It seems that -bexpall does not export symbols beginning with
 +        # underscore (_), so it is better to generate a list of symbols to
 +	# export.
 +        _LT_TAGVAR(always_export_symbols, $1)=yes
-         if test "$aix_use_runtimelinking" = yes; then
++	if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
 +          # Warning - without using the other runtime loading flags (-brtl),
 +          # -berok will link without error, but may produce a broken library.
-           _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
++          # The "-G" linker flag allows undefined symbols.
++          _LT_TAGVAR(no_undefined_flag, $1)='-bernotok'
 +          # Determine the default libpath from the value encoded in an empty
 +          # executable.
 +          _LT_SYS_MODULE_PATH_AIX([$1])
-           _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
++          _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
 +
-           _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
 +        else
-           if test "$host_cpu" = ia64; then
- 	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
++          if test ia64 = "$host_cpu"; then
++	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib'
 +	    _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
- 	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
++	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
 +          else
 +	    # Determine the default libpath from the value encoded in an
 +	    # empty executable.
 +	    _LT_SYS_MODULE_PATH_AIX([$1])
- 	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
++	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
 +	    # Warning - without using the other run time loading flags,
 +	    # -berok will link without error, but may produce a broken library.
- 	    _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
- 	    _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
- 	    if test "$with_gnu_ld" = yes; then
++	    _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok'
++	    _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok'
++	    if test yes = "$with_gnu_ld"; then
 +	      # We only use this code for GNU lds that support --whole-archive.
- 	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
++	      _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive'
 +	    else
 +	      # Exported symbols can be pulled into shared objects from archives
 +	      _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
 +	    fi
 +	    _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
- 	    # This is similar to how AIX traditionally builds its shared
- 	    # libraries.
- 	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++	    _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
++	    # -brtl affects multiple linker settings, -berok does not and is overridden later
++	    compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`'
++	    if test svr4 != "$with_aix_soname"; then
++	      # This is similar to how AIX traditionally builds its shared
++	      # libraries. Need -bnortl late, we may have -brtl in LDFLAGS.
++	      _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
++	    fi
++	    if test aix != "$with_aix_soname"; then
++	      _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all " [...]
++	    else
++	      # used by -dlpreopen to get the symbols
++	      _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV  $output_objdir/$realname.d/$soname $output_objdir'
++	    fi
++	    _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d'
 +          fi
 +        fi
 +        ;;
 +
 +      beos*)
 +	if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
 +	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
 +	  # Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
 +	  # support --undefined.  This deserves some investigation.  FIXME
- 	  _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	  _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
 +	else
 +	  _LT_TAGVAR(ld_shlibs, $1)=no
 +	fi
 +	;;
 +
 +      chorus*)
 +        case $cc_basename in
 +          *)
 +	  # FIXME: insert proper C++ library support
 +	  _LT_TAGVAR(ld_shlibs, $1)=no
 +	  ;;
 +        esac
 +        ;;
 +
 +      cygwin* | mingw* | pw32* | cegcc*)
 +	case $GXX,$cc_basename in
 +	,cl* | no,cl*)
 +	  # Native MSVC
 +	  # hardcode_libdir_flag_spec is actually meaningless, as there is
 +	  # no search path for DLLs.
 +	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
 +	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
 +	  _LT_TAGVAR(always_export_symbols, $1)=yes
 +	  _LT_TAGVAR(file_list_spec, $1)='@'
 +	  # Tell ltmain to make .lib files, not .a files.
 +	  libext=lib
 +	  # Tell ltmain to make .dll files, not .so files.
- 	  shrext_cmds=".dll"
++	  shrext_cmds=.dll
 +	  # FIXME: Setting linknames here is a bad hack.
- 	  _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
- 	  _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- 	      $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
- 	    else
- 	      $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
- 	    fi~
- 	    $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
- 	    linknames='
++	  _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
++	  _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
++              cp "$export_symbols" "$output_objdir/$soname.def";
++              echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
++            else
++              $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
++            fi~
++            $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
++            linknames='
 +	  # The linker will not automatically build a static lib if we build a DLL.
 +	  # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
 +	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
 +	  # Don't use ranlib
 +	  _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
 +	  _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
- 	    lt_tool_outputfile="@TOOL_OUTPUT@"~
- 	    case $lt_outputfile in
- 	      *.exe|*.EXE) ;;
- 	      *)
- 		lt_outputfile="$lt_outputfile.exe"
- 		lt_tool_outputfile="$lt_tool_outputfile.exe"
- 		;;
- 	    esac~
- 	    func_to_tool_file "$lt_outputfile"~
- 	    if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
- 	      $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
- 	      $RM "$lt_outputfile.manifest";
- 	    fi'
++            lt_tool_outputfile="@TOOL_OUTPUT@"~
++            case $lt_outputfile in
++              *.exe|*.EXE) ;;
++              *)
++                lt_outputfile=$lt_outputfile.exe
++                lt_tool_outputfile=$lt_tool_outputfile.exe
++                ;;
++            esac~
++            func_to_tool_file "$lt_outputfile"~
++            if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
++              $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
++              $RM "$lt_outputfile.manifest";
++            fi'
 +	  ;;
 +	*)
 +	  # g++
 +	  # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
 +	  # as there is no search path for DLLs.
 +	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- 	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
++	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols'
 +	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
 +	  _LT_TAGVAR(always_export_symbols, $1)=no
 +	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
 +
 +	  if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
- 	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
- 	    # If the export-symbols file already is a .def file (1st line
- 	    # is EXPORTS), use it as is; otherwise, prepend...
- 	    _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- 	      cp $export_symbols $output_objdir/$soname.def;
- 	    else
- 	      echo EXPORTS > $output_objdir/$soname.def;
- 	      cat $export_symbols >> $output_objdir/$soname.def;
- 	    fi~
- 	    $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
++	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
++	    # If the export-symbols file already is a .def file, use it as
++	    # is; otherwise, prepend EXPORTS...
++	    _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
++              cp $export_symbols $output_objdir/$soname.def;
++            else
++              echo EXPORTS > $output_objdir/$soname.def;
++              cat $export_symbols >> $output_objdir/$soname.def;
++            fi~
++            $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
 +	  else
 +	    _LT_TAGVAR(ld_shlibs, $1)=no
 +	  fi
 +	  ;;
 +	esac
 +	;;
 +      darwin* | rhapsody*)
 +        _LT_DARWIN_LINKER_FEATURES($1)
 +	;;
 +
++      os2*)
++	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++	_LT_TAGVAR(hardcode_minus_L, $1)=yes
++	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
++	shrext_cmds=.dll
++	_LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
++	  $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
++	  $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
++	  $ECHO EXPORTS >> $output_objdir/$libname.def~
++	  emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
++	  $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
++	  emximp -o $lib $output_objdir/$libname.def'
++	_LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
++	  $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
++	  $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
++	  $ECHO EXPORTS >> $output_objdir/$libname.def~
++	  prefix_cmds="$SED"~
++	  if test EXPORTS = "`$SED 1q $export_symbols`"; then
++	    prefix_cmds="$prefix_cmds -e 1d";
++	  fi~
++	  prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
++	  cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
++	  $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
++	  emximp -o $lib $output_objdir/$libname.def'
++	_LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
++	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
++	;;
++
 +      dgux*)
 +        case $cc_basename in
 +          ec++*)
 +	    # FIXME: insert proper C++ library support
 +	    _LT_TAGVAR(ld_shlibs, $1)=no
 +	    ;;
 +          ghcx*)
 +	    # Green Hills C++ Compiler
 +	    # FIXME: insert proper C++ library support
 +	    _LT_TAGVAR(ld_shlibs, $1)=no
 +	    ;;
 +          *)
 +	    # FIXME: insert proper C++ library support
 +	    _LT_TAGVAR(ld_shlibs, $1)=no
 +	    ;;
 +        esac
 +        ;;
 +
 +      freebsd2.*)
 +        # C++ shared libraries reported to be fairly broken before
 +	# switch to ELF
 +        _LT_TAGVAR(ld_shlibs, $1)=no
 +        ;;
 +
 +      freebsd-elf*)
 +        _LT_TAGVAR(archive_cmds_need_lc, $1)=no
 +        ;;
 +
 +      freebsd* | dragonfly*)
 +        # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
 +        # conventions
 +        _LT_TAGVAR(ld_shlibs, $1)=yes
 +        ;;
 +
 +      haiku*)
-         _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
 +        _LT_TAGVAR(link_all_deplibs, $1)=yes
 +        ;;
 +
 +      hpux9*)
-         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
 +        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-         _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++        _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
 +        _LT_TAGVAR(hardcode_direct, $1)=yes
 +        _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
 +				             # but as the default
 +				             # location of the library.
 +
 +        case $cc_basename in
 +          CC*)
 +            # FIXME: insert proper C++ library support
 +            _LT_TAGVAR(ld_shlibs, $1)=no
 +            ;;
 +          aCC*)
-             _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
 +            # Commands to make compiler produce verbose output that lists
 +            # what "hidden" libraries, object files and flags are used when
 +            # linking a shared library.
 +            #
 +            # There doesn't appear to be a way to prevent this compiler from
 +            # explicitly linking system object files so we need to strip them
 +            # from the output so that they don't get included in the library
 +            # dependencies.
-             output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
++            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
 +            ;;
 +          *)
-             if test "$GXX" = yes; then
-               _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++            if test yes = "$GXX"; then
++              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
 +            else
 +              # FIXME: insert proper C++ library support
 +              _LT_TAGVAR(ld_shlibs, $1)=no
 +            fi
 +            ;;
 +        esac
 +        ;;
 +
 +      hpux10*|hpux11*)
-         if test $with_gnu_ld = no; then
- 	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++        if test no = "$with_gnu_ld"; then
++	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
 +	  _LT_TAGVAR(hardcode_libdir_separator, $1)=:
 +
 +          case $host_cpu in
 +            hppa*64*|ia64*)
 +              ;;
 +            *)
- 	      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++	      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
 +              ;;
 +          esac
 +        fi
 +        case $host_cpu in
 +          hppa*64*|ia64*)
 +            _LT_TAGVAR(hardcode_direct, $1)=no
 +            _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
 +            ;;
 +          *)
 +            _LT_TAGVAR(hardcode_direct, $1)=yes
 +            _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
 +            _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
 +					         # but as the default
 +					         # location of the library.
 +            ;;
 +        esac
 +
 +        case $cc_basename in
 +          CC*)
 +	    # FIXME: insert proper C++ library support
 +	    _LT_TAGVAR(ld_shlibs, $1)=no
 +	    ;;
 +          aCC*)
 +	    case $host_cpu in
 +	      hppa*64*)
- 	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	        _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 +	        ;;
 +	      ia64*)
- 	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	        _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 +	        ;;
 +	      *)
- 	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	        _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 +	        ;;
 +	    esac
 +	    # Commands to make compiler produce verbose output that lists
 +	    # what "hidden" libraries, object files and flags are used when
 +	    # linking a shared library.
 +	    #
 +	    # There doesn't appear to be a way to prevent this compiler from
 +	    # explicitly linking system object files so we need to strip them
 +	    # from the output so that they don't get included in the library
 +	    # dependencies.
- 	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
++	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
 +	    ;;
 +          *)
- 	    if test "$GXX" = yes; then
- 	      if test $with_gnu_ld = no; then
++	    if test yes = "$GXX"; then
++	      if test no = "$with_gnu_ld"; then
 +	        case $host_cpu in
 +	          hppa*64*)
- 	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 +	            ;;
 +	          ia64*)
- 	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 +	            ;;
 +	          *)
- 	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 +	            ;;
 +	        esac
 +	      fi
 +	    else
 +	      # FIXME: insert proper C++ library support
 +	      _LT_TAGVAR(ld_shlibs, $1)=no
 +	    fi
 +	    ;;
 +        esac
 +        ;;
 +
 +      interix[[3-9]]*)
 +	_LT_TAGVAR(hardcode_direct, $1)=no
 +	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- 	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- 	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
++	_LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
 +	# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
 +	# Instead, shared libraries are loaded at an image base (0x10000000 by
 +	# default) and relocated if they conflict, which is a slow very memory
 +	# consuming and fragmenting process.  To avoid this, we pick a random,
 +	# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
 +	# time.  Moving up from 0x10000000 also allows more sbrk(2) space.
- 	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- 	_LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++	_LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
 +	;;
 +      irix5* | irix6*)
 +        case $cc_basename in
 +          CC*)
 +	    # SGI C++
- 	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
++	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
 +
 +	    # Archives containing C++ object files must be created using
 +	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
 +	    # necessary to make sure instantiated templates are included
 +	    # in the archive.
 +	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
 +	    ;;
 +          *)
- 	    if test "$GXX" = yes; then
- 	      if test "$with_gnu_ld" = no; then
- 	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++	    if test yes = "$GXX"; then
++	      if test no = "$with_gnu_ld"; then
++	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
 +	      else
- 	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
++	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` -o $lib'
 +	      fi
 +	    fi
 +	    _LT_TAGVAR(link_all_deplibs, $1)=yes
 +	    ;;
 +        esac
-         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
 +        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
 +        _LT_TAGVAR(inherit_rpath, $1)=yes
 +        ;;
 +
 +      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
 +        case $cc_basename in
 +          KCC*)
 +	    # Kuck and Associates, Inc. (KAI) C++ Compiler
 +
 +	    # KCC will only create a shared library if the output file
 +	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
 +	    # to its proper name (with version) after linking.
- 	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
- 	    _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
++	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
++	    _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib $wl-retain-symbols-file,$export_symbols; mv \$templib $lib'
 +	    # Commands to make compiler produce verbose output that lists
 +	    # what "hidden" libraries, object files and flags are used when
 +	    # linking a shared library.
 +	    #
 +	    # There doesn't appear to be a way to prevent this compiler from
 +	    # explicitly linking system object files so we need to strip them
 +	    # from the output so that they don't get included in the library
 +	    # dependencies.
- 	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
++	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
 +
- 	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- 	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
++	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
 +
 +	    # Archives containing C++ object files must be created using
 +	    # "CC -Bstatic", where "CC" is the KAI C++ compiler.
 +	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
 +	    ;;
 +	  icpc* | ecpc* )
 +	    # Intel C++
 +	    with_gnu_ld=yes
 +	    # version 8.0 and above of icpc choke on multiply defined symbols
 +	    # if we add $predep_objects and $postdep_objects, however 7.1 and
 +	    # earlier do not add the objects themselves.
 +	    case `$CC -V 2>&1` in
 +	      *"Version 7."*)
- 	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
- 		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
++		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
 +		;;
 +	      *)  # Version 8.0 or newer
 +	        tmp_idyn=
 +	        case $host_cpu in
 +		  ia64*) tmp_idyn=' -i_dynamic';;
 +		esac
- 	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- 		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
++		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
 +		;;
 +	    esac
 +	    _LT_TAGVAR(archive_cmds_need_lc, $1)=no
- 	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- 	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
- 	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
++	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
++	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
++	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive'
 +	    ;;
 +          pgCC* | pgcpp*)
 +            # Portland Group C++ compiler
 +	    case `$CC -V` in
 +	    *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*)
 +	      _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
- 		rm -rf $tpldir~
- 		$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
- 		compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
++               rm -rf $tpldir~
++               $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
++               compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
 +	      _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
- 		rm -rf $tpldir~
- 		$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
- 		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
- 		$RANLIB $oldlib'
++                rm -rf $tpldir~
++                $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
++                $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
++                $RANLIB $oldlib'
 +	      _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
- 		rm -rf $tpldir~
- 		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
- 		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
++                rm -rf $tpldir~
++                $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
++                $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
 +	      _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
- 		rm -rf $tpldir~
- 		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
- 		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
++                rm -rf $tpldir~
++                $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
++                $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
 +	      ;;
 +	    *) # Version 6 and above use weak symbols
- 	      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
- 	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
++	      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
++	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
 +	      ;;
 +	    esac
 +
- 	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
- 	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
- 	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
++	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl--rpath $wl$libdir'
++	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
++	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
 +            ;;
 +	  cxx*)
 +	    # Compaq C++
- 	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
- 	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
++	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
++	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname  -o $lib $wl-retain-symbols-file $wl$export_symbols'
 +
 +	    runpath_var=LD_RUN_PATH
 +	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
 +	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
 +
 +	    # Commands to make compiler produce verbose output that lists
 +	    # what "hidden" libraries, object files and flags are used when
 +	    # linking a shared library.
 +	    #
 +	    # There doesn't appear to be a way to prevent this compiler from
 +	    # explicitly linking system object files so we need to strip them
 +	    # from the output so that they don't get included in the library
 +	    # dependencies.
- 	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
++	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
 +	    ;;
 +	  xl* | mpixl* | bgxl*)
 +	    # IBM XL 8.0 on PPC, with GNU ld
- 	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- 	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
- 	    _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- 	    if test "x$supports_anon_versioning" = xyes; then
++	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
++	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
++	    _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
++	    if test yes = "$supports_anon_versioning"; then
 +	      _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
- 		cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
- 		echo "local: *; };" >> $output_objdir/$libname.ver~
- 		$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++                cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++                echo "local: *; };" >> $output_objdir/$libname.ver~
++                $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
 +	    fi
 +	    ;;
 +	  *)
 +	    case `$CC -V 2>&1 | sed 5q` in
 +	    *Sun\ C*)
 +	      # Sun C++ 5.9
 +	      _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
- 	      _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
- 	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
++	      _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file $wl$export_symbols'
 +	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- 	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
++	      _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
 +	      _LT_TAGVAR(compiler_needs_object, $1)=yes
 +
 +	      # Not sure whether something based on
 +	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
 +	      # would be better.
 +	      output_verbose_link_cmd='func_echo_all'
 +
 +	      # Archives containing C++ object files must be created using
 +	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
 +	      # necessary to make sure instantiated templates are included
 +	      # in the archive.
 +	      _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
 +	      ;;
 +	    esac
 +	    ;;
 +	esac
 +	;;
 +
 +      lynxos*)
 +        # FIXME: insert proper C++ library support
 +	_LT_TAGVAR(ld_shlibs, $1)=no
 +	;;
 +
 +      m88k*)
 +        # FIXME: insert proper C++ library support
 +        _LT_TAGVAR(ld_shlibs, $1)=no
 +	;;
 +
 +      mvs*)
 +        case $cc_basename in
 +          cxx*)
 +	    # FIXME: insert proper C++ library support
 +	    _LT_TAGVAR(ld_shlibs, $1)=no
 +	    ;;
 +	  *)
 +	    # FIXME: insert proper C++ library support
 +	    _LT_TAGVAR(ld_shlibs, $1)=no
 +	    ;;
 +	esac
 +	;;
 +
 +      netbsd*)
 +        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 +	  _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
 +	  wlarc=
 +	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
 +	  _LT_TAGVAR(hardcode_direct, $1)=yes
 +	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
 +	fi
 +	# Workaround some broken pre-1.5 toolchains
 +	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
 +	;;
 +
 +      *nto* | *qnx*)
 +        _LT_TAGVAR(ld_shlibs, $1)=yes
 +	;;
 +
-       openbsd2*)
-         # C++ shared libraries are fairly broken
- 	_LT_TAGVAR(ld_shlibs, $1)=no
- 	;;
- 
-       openbsd*)
++      openbsd* | bitrig*)
 +	if test -f /usr/libexec/ld.so; then
 +	  _LT_TAGVAR(hardcode_direct, $1)=yes
 +	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
 +	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
 +	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
- 	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- 	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- 	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
- 	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
- 	    _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
++	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then
++	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file,$export_symbols -o $lib'
++	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
++	    _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
 +	  fi
 +	  output_verbose_link_cmd=func_echo_all
 +	else
 +	  _LT_TAGVAR(ld_shlibs, $1)=no
 +	fi
 +	;;
 +
 +      osf3* | osf4* | osf5*)
 +        case $cc_basename in
 +          KCC*)
 +	    # Kuck and Associates, Inc. (KAI) C++ Compiler
 +
 +	    # KCC will only create a shared library if the output file
 +	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
 +	    # to its proper name (with version) after linking.
- 	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
++	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
 +
- 	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
 +	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
 +
 +	    # Archives containing C++ object files must be created using
 +	    # the KAI C++ compiler.
 +	    case $host in
 +	      osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;;
 +	      *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;;
 +	    esac
 +	    ;;
 +          RCC*)
 +	    # Rational C++ 2.4.1
 +	    # FIXME: insert proper C++ library support
 +	    _LT_TAGVAR(ld_shlibs, $1)=no
 +	    ;;
 +          cxx*)
 +	    case $host in
 +	      osf3*)
- 	        _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- 	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
- 	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++	        _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
++	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $soname `test -n "$verstring" && func_echo_all "$wl-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
++	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
 +		;;
 +	      *)
 +	        _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
- 	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
++	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
 +	        _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
- 	          echo "-hidden">> $lib.exp~
- 	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~
- 	          $RM $lib.exp'
++                  echo "-hidden">> $lib.exp~
++                  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname $wl-input $wl$lib.exp  `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~
++                  $RM $lib.exp'
 +	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
 +		;;
 +	    esac
 +
 +	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
 +
 +	    # Commands to make compiler produce verbose output that lists
 +	    # what "hidden" libraries, object files and flags are used when
 +	    # linking a shared library.
 +	    #
 +	    # There doesn't appear to be a way to prevent this compiler from
 +	    # explicitly linking system object files so we need to strip them
 +	    # from the output so that they don't get included in the library
 +	    # dependencies.
- 	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
++	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
 +	    ;;
 +	  *)
- 	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- 	      _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
++	    if test yes,no = "$GXX,$with_gnu_ld"; then
++	      _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
 +	      case $host in
 +	        osf3*)
- 	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
 +		  ;;
 +	        *)
- 	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
 +		  ;;
 +	      esac
 +
- 	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
 +	      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
 +
 +	      # Commands to make compiler produce verbose output that lists
 +	      # what "hidden" libraries, object files and flags are used when
 +	      # linking a shared library.
 +	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
 +
 +	    else
 +	      # FIXME: insert proper C++ library support
 +	      _LT_TAGVAR(ld_shlibs, $1)=no
 +	    fi
 +	    ;;
 +        esac
 +        ;;
 +
 +      psos*)
 +        # FIXME: insert proper C++ library support
 +        _LT_TAGVAR(ld_shlibs, $1)=no
 +        ;;
 +
 +      sunos4*)
 +        case $cc_basename in
 +          CC*)
 +	    # Sun C++ 4.x
 +	    # FIXME: insert proper C++ library support
 +	    _LT_TAGVAR(ld_shlibs, $1)=no
 +	    ;;
 +          lcc*)
 +	    # Lucid
 +	    # FIXME: insert proper C++ library support
 +	    _LT_TAGVAR(ld_shlibs, $1)=no
 +	    ;;
 +          *)
 +	    # FIXME: insert proper C++ library support
 +	    _LT_TAGVAR(ld_shlibs, $1)=no
 +	    ;;
 +        esac
 +        ;;
 +
 +      solaris*)
 +        case $cc_basename in
 +          CC* | sunCC*)
 +	    # Sun C++ 4.2, 5.x and Centerline C++
 +            _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
 +	    _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
- 	    _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	    _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 +	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- 	      $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
++              $CC -G$allow_undefined_flag $wl-M $wl$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
 +
 +	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
 +	    _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
 +	    case $host_os in
 +	      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
 +	      *)
 +		# The compiler driver will combine and reorder linker options,
- 		# but understands `-z linker_flag'.
++		# but understands '-z linker_flag'.
 +	        # Supported since Solaris 2.6 (maybe 2.5.1?)
 +		_LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
 +	        ;;
 +	    esac
 +	    _LT_TAGVAR(link_all_deplibs, $1)=yes
 +
 +	    output_verbose_link_cmd='func_echo_all'
 +
 +	    # Archives containing C++ object files must be created using
 +	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
 +	    # necessary to make sure instantiated templates are included
 +	    # in the archive.
 +	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
 +	    ;;
 +          gcx*)
 +	    # Green Hills C++ Compiler
- 	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
++	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
 +
 +	    # The C++ compiler must be used to create the archive.
 +	    _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
 +	    ;;
 +          *)
 +	    # GNU C++ compiler with Solaris linker
- 	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- 	      _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
++	    if test yes,no = "$GXX,$with_gnu_ld"; then
++	      _LT_TAGVAR(no_undefined_flag, $1)=' $wl-z ${wl}defs'
 +	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
- 	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
++	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
 +	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- 		  $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
++                  $CC -shared $pic_flag -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
 +
 +	        # Commands to make compiler produce verbose output that lists
 +	        # what "hidden" libraries, object files and flags are used when
 +	        # linking a shared library.
 +	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
 +	      else
- 	        # g++ 2.7 appears to require `-G' NOT `-shared' on this
++	        # g++ 2.7 appears to require '-G' NOT '-shared' on this
 +	        # platform.
- 	        _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
++	        _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
 +	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- 		  $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
++                  $CC -G -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
 +
 +	        # Commands to make compiler produce verbose output that lists
 +	        # what "hidden" libraries, object files and flags are used when
 +	        # linking a shared library.
 +	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
 +	      fi
 +
- 	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
++	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir'
 +	      case $host_os in
 +		solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
 +		*)
- 		  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++		  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
 +		  ;;
 +	      esac
 +	    fi
 +	    ;;
 +        esac
 +        ;;
 +
 +    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
-       _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
++      _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
 +      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
 +      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
 +      runpath_var='LD_RUN_PATH'
 +
 +      case $cc_basename in
 +        CC*)
- 	  _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- 	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	  _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 +	  ;;
 +	*)
- 	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- 	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 +	  ;;
 +      esac
 +      ;;
 +
 +      sysv5* | sco3.2v5* | sco5v6*)
- 	# Note: We can NOT use -z defs as we might desire, because we do not
++	# Note: We CANNOT use -z defs as we might desire, because we do not
 +	# link with -lc, and that would cause any symbols used from libc to
 +	# always be unresolved, which means just about no library would
 +	# ever link correctly.  If we're not using GNU ld we use -z text
 +	# though, which does catch some bad symbols but isn't as heavy-handed
 +	# as -z defs.
- 	_LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
- 	_LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
++	_LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
++	_LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs'
 +	_LT_TAGVAR(archive_cmds_need_lc, $1)=no
 +	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- 	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
++	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir'
 +	_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
 +	_LT_TAGVAR(link_all_deplibs, $1)=yes
- 	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
++	_LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport'
 +	runpath_var='LD_RUN_PATH'
 +
 +	case $cc_basename in
 +          CC*)
- 	    _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- 	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	    _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 +	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~
- 	      '"$_LT_TAGVAR(old_archive_cmds, $1)"
++              '"$_LT_TAGVAR(old_archive_cmds, $1)"
 +	    _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
- 	      '"$_LT_TAGVAR(reload_cmds, $1)"
++              '"$_LT_TAGVAR(reload_cmds, $1)"
 +	    ;;
 +	  *)
- 	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- 	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 +	    ;;
 +	esac
 +      ;;
 +
 +      tandem*)
 +        case $cc_basename in
 +          NCC*)
 +	    # NonStop-UX NCC 3.20
 +	    # FIXME: insert proper C++ library support
 +	    _LT_TAGVAR(ld_shlibs, $1)=no
 +	    ;;
 +          *)
 +	    # FIXME: insert proper C++ library support
 +	    _LT_TAGVAR(ld_shlibs, $1)=no
 +	    ;;
 +        esac
 +        ;;
 +
 +      vxworks*)
 +        # FIXME: insert proper C++ library support
 +        _LT_TAGVAR(ld_shlibs, $1)=no
 +        ;;
 +
 +      *)
 +        # FIXME: insert proper C++ library support
 +        _LT_TAGVAR(ld_shlibs, $1)=no
 +        ;;
 +    esac
 +
 +    AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
-     test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
++    test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no
 +
-     _LT_TAGVAR(GCC, $1)="$GXX"
-     _LT_TAGVAR(LD, $1)="$LD"
++    _LT_TAGVAR(GCC, $1)=$GXX
++    _LT_TAGVAR(LD, $1)=$LD
 +
 +    ## CAVEAT EMPTOR:
 +    ## There is no encapsulation within the following macros, do not change
 +    ## the running order or otherwise move them around unless you know exactly
 +    ## what you are doing...
 +    _LT_SYS_HIDDEN_LIBDEPS($1)
 +    _LT_COMPILER_PIC($1)
 +    _LT_COMPILER_C_O($1)
 +    _LT_COMPILER_FILE_LOCKS($1)
 +    _LT_LINKER_SHLIBS($1)
 +    _LT_SYS_DYNAMIC_LINKER($1)
 +    _LT_LINKER_HARDCODE_LIBPATH($1)
 +
 +    _LT_CONFIG($1)
 +  fi # test -n "$compiler"
 +
 +  CC=$lt_save_CC
 +  CFLAGS=$lt_save_CFLAGS
 +  LDCXX=$LD
 +  LD=$lt_save_LD
 +  GCC=$lt_save_GCC
 +  with_gnu_ld=$lt_save_with_gnu_ld
 +  lt_cv_path_LDCXX=$lt_cv_path_LD
 +  lt_cv_path_LD=$lt_save_path_LD
 +  lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
 +  lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
- fi # test "$_lt_caught_CXX_error" != yes
++fi # test yes != "$_lt_caught_CXX_error"
 +
 +AC_LANG_POP
 +])# _LT_LANG_CXX_CONFIG
 +
 +
 +# _LT_FUNC_STRIPNAME_CNF
 +# ----------------------
 +# func_stripname_cnf 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).
 +#
 +# This function is identical to the (non-XSI) version of func_stripname,
 +# except this one can be used by m4 code that may be executed by configure,
 +# rather than the libtool script.
 +m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl
 +AC_REQUIRE([_LT_DECL_SED])
 +AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
 +func_stripname_cnf ()
 +{
-   case ${2} in
-   .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
-   *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
++  case @S|@2 in
++  .*) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%\\\\@S|@2\$%%"`;;
++  *)  func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%@S|@2\$%%"`;;
 +  esac
 +} # func_stripname_cnf
 +])# _LT_FUNC_STRIPNAME_CNF
 +
++
 +# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
 +# ---------------------------------
 +# Figure out "hidden" library dependencies from verbose
 +# compiler output when linking a shared library.
 +# Parse the compiler output and extract the necessary
 +# objects, libraries and library flags.
 +m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
 +[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
 +AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl
 +# Dependencies to place before and after the object being linked:
 +_LT_TAGVAR(predep_objects, $1)=
 +_LT_TAGVAR(postdep_objects, $1)=
 +_LT_TAGVAR(predeps, $1)=
 +_LT_TAGVAR(postdeps, $1)=
 +_LT_TAGVAR(compiler_lib_search_path, $1)=
 +
 +dnl we can't use the lt_simple_compile_test_code here,
 +dnl because it contains code intended for an executable,
 +dnl not a library.  It's possible we should let each
 +dnl tag define a new lt_????_link_test_code variable,
 +dnl but it's only used here...
 +m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF
 +int a;
 +void foo (void) { a = 0; }
 +_LT_EOF
 +], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF
 +class Foo
 +{
 +public:
 +  Foo (void) { a = 0; }
 +private:
 +  int a;
 +};
 +_LT_EOF
 +], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF
 +      subroutine foo
 +      implicit none
 +      integer*4 a
 +      a=0
 +      return
 +      end
 +_LT_EOF
 +], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF
 +      subroutine foo
 +      implicit none
 +      integer a
 +      a=0
 +      return
 +      end
 +_LT_EOF
 +], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF
 +public class foo {
 +  private int a;
 +  public void bar (void) {
 +    a = 0;
 +  }
 +};
 +_LT_EOF
 +], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF
 +package foo
 +func foo() {
 +}
 +_LT_EOF
 +])
 +
 +_lt_libdeps_save_CFLAGS=$CFLAGS
 +case "$CC $CFLAGS " in #(
 +*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
 +*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
 +*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
 +esac
 +
 +dnl Parse the compiler output and extract the necessary
 +dnl objects, libraries and library flags.
 +if AC_TRY_EVAL(ac_compile); then
 +  # Parse the compiler output and extract the necessary
 +  # objects, libraries and library flags.
 +
 +  # Sentinel used to keep track of whether or not we are before
 +  # the conftest object file.
 +  pre_test_object_deps_done=no
 +
 +  for p in `eval "$output_verbose_link_cmd"`; do
-     case ${prev}${p} in
++    case $prev$p in
 +
 +    -L* | -R* | -l*)
 +       # Some compilers place space between "-{L,R}" and the path.
 +       # Remove the space.
-        if test $p = "-L" ||
-           test $p = "-R"; then
++       if test x-L = "$p" ||
++          test x-R = "$p"; then
 +	 prev=$p
 +	 continue
 +       fi
 +
 +       # Expand the sysroot to ease extracting the directories later.
 +       if test -z "$prev"; then
 +         case $p in
 +         -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
 +         -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
 +         -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
 +         esac
 +       fi
 +       case $p in
 +       =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
 +       esac
-        if test "$pre_test_object_deps_done" = no; then
- 	 case ${prev} in
++       if test no = "$pre_test_object_deps_done"; then
++	 case $prev in
 +	 -L | -R)
 +	   # Internal compiler library paths should come after those
 +	   # provided the user.  The postdeps already come after the
 +	   # user supplied libs so there is no need to process them.
 +	   if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then
- 	     _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
++	     _LT_TAGVAR(compiler_lib_search_path, $1)=$prev$p
 +	   else
- 	     _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
++	     _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} $prev$p"
 +	   fi
 +	   ;;
 +	 # The "-l" case would never come before the object being
 +	 # linked, so don't bother handling this case.
 +	 esac
 +       else
 +	 if test -z "$_LT_TAGVAR(postdeps, $1)"; then
- 	   _LT_TAGVAR(postdeps, $1)="${prev}${p}"
++	   _LT_TAGVAR(postdeps, $1)=$prev$p
 +	 else
- 	   _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
++	   _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} $prev$p"
 +	 fi
 +       fi
 +       prev=
 +       ;;
 +
 +    *.lto.$objext) ;; # Ignore GCC LTO objects
 +    *.$objext)
 +       # This assumes that the test object file only shows up
 +       # once in the compiler output.
 +       if test "$p" = "conftest.$objext"; then
 +	 pre_test_object_deps_done=yes
 +	 continue
 +       fi
 +
-        if test "$pre_test_object_deps_done" = no; then
++       if test no = "$pre_test_object_deps_done"; then
 +	 if test -z "$_LT_TAGVAR(predep_objects, $1)"; then
- 	   _LT_TAGVAR(predep_objects, $1)="$p"
++	   _LT_TAGVAR(predep_objects, $1)=$p
 +	 else
 +	   _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p"
 +	 fi
 +       else
 +	 if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then
- 	   _LT_TAGVAR(postdep_objects, $1)="$p"
++	   _LT_TAGVAR(postdep_objects, $1)=$p
 +	 else
 +	   _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p"
 +	 fi
 +       fi
 +       ;;
 +
 +    *) ;; # Ignore the rest.
 +
 +    esac
 +  done
 +
 +  # Clean up.
 +  rm -f a.out a.exe
 +else
 +  echo "libtool.m4: error: problem compiling $1 test program"
 +fi
 +
 +$RM -f confest.$objext
 +CFLAGS=$_lt_libdeps_save_CFLAGS
 +
 +# PORTME: override above test on systems where it is broken
 +m4_if([$1], [CXX],
 +[case $host_os in
 +interix[[3-9]]*)
 +  # Interix 3.5 installs completely hosed .la files for C++, so rather than
 +  # hack all around it, let's just trust "g++" to DTRT.
 +  _LT_TAGVAR(predep_objects,$1)=
 +  _LT_TAGVAR(postdep_objects,$1)=
 +  _LT_TAGVAR(postdeps,$1)=
 +  ;;
- 
- linux*)
-   case `$CC -V 2>&1 | sed 5q` in
-   *Sun\ C*)
-     # Sun C++ 5.9
- 
-     # The more standards-conforming stlport4 library is
-     # incompatible with the Cstd library. Avoid specifying
-     # it if it's in CXXFLAGS. Ignore libCrun as
-     # -library=stlport4 depends on it.
-     case " $CXX $CXXFLAGS " in
-     *" -library=stlport4 "*)
-       solaris_use_stlport4=yes
-       ;;
-     esac
- 
-     if test "$solaris_use_stlport4" != yes; then
-       _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
-     fi
-     ;;
-   esac
-   ;;
- 
- solaris*)
-   case $cc_basename in
-   CC* | sunCC*)
-     # The more standards-conforming stlport4 library is
-     # incompatible with the Cstd library. Avoid specifying
-     # it if it's in CXXFLAGS. Ignore libCrun as
-     # -library=stlport4 depends on it.
-     case " $CXX $CXXFLAGS " in
-     *" -library=stlport4 "*)
-       solaris_use_stlport4=yes
-       ;;
-     esac
- 
-     # Adding this requires a known-good setup of shared libraries for
-     # Sun compiler versions before 5.6, else PIC objects from an old
-     # archive will be linked into the output, leading to subtle bugs.
-     if test "$solaris_use_stlport4" != yes; then
-       _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
-     fi
-     ;;
-   esac
-   ;;
 +esac
 +])
 +
 +case " $_LT_TAGVAR(postdeps, $1) " in
 +*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;;
 +esac
 + _LT_TAGVAR(compiler_lib_search_dirs, $1)=
 +if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then
-  _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
++ _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | $SED -e 's! -L! !g' -e 's!^ !!'`
 +fi
 +_LT_TAGDECL([], [compiler_lib_search_dirs], [1],
 +    [The directories searched by this compiler when creating a shared library])
 +_LT_TAGDECL([], [predep_objects], [1],
 +    [Dependencies to place before and after the objects being linked to
 +    create a shared library])
 +_LT_TAGDECL([], [postdep_objects], [1])
 +_LT_TAGDECL([], [predeps], [1])
 +_LT_TAGDECL([], [postdeps], [1])
 +_LT_TAGDECL([], [compiler_lib_search_path], [1],
 +    [The library search path used internally by the compiler when linking
 +    a shared library])
 +])# _LT_SYS_HIDDEN_LIBDEPS
 +
 +
 +# _LT_LANG_F77_CONFIG([TAG])
 +# --------------------------
 +# Ensure that the configuration variables for a Fortran 77 compiler are
 +# suitably defined.  These variables are subsequently used by _LT_CONFIG
- # to write the compiler configuration to `libtool'.
++# to write the compiler configuration to 'libtool'.
 +m4_defun([_LT_LANG_F77_CONFIG],
 +[AC_LANG_PUSH(Fortran 77)
- if test -z "$F77" || test "X$F77" = "Xno"; then
++if test -z "$F77" || test no = "$F77"; then
 +  _lt_disable_F77=yes
 +fi
 +
 +_LT_TAGVAR(archive_cmds_need_lc, $1)=no
 +_LT_TAGVAR(allow_undefined_flag, $1)=
 +_LT_TAGVAR(always_export_symbols, $1)=no
 +_LT_TAGVAR(archive_expsym_cmds, $1)=
 +_LT_TAGVAR(export_dynamic_flag_spec, $1)=
 +_LT_TAGVAR(hardcode_direct, $1)=no
 +_LT_TAGVAR(hardcode_direct_absolute, $1)=no
 +_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
 +_LT_TAGVAR(hardcode_libdir_separator, $1)=
 +_LT_TAGVAR(hardcode_minus_L, $1)=no
 +_LT_TAGVAR(hardcode_automatic, $1)=no
 +_LT_TAGVAR(inherit_rpath, $1)=no
 +_LT_TAGVAR(module_cmds, $1)=
 +_LT_TAGVAR(module_expsym_cmds, $1)=
 +_LT_TAGVAR(link_all_deplibs, $1)=unknown
 +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
 +_LT_TAGVAR(reload_flag, $1)=$reload_flag
 +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
 +_LT_TAGVAR(no_undefined_flag, $1)=
 +_LT_TAGVAR(whole_archive_flag_spec, $1)=
 +_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
 +
 +# Source file extension for f77 test sources.
 +ac_ext=f
 +
 +# Object file extension for compiled f77 test sources.
 +objext=o
 +_LT_TAGVAR(objext, $1)=$objext
 +
 +# No sense in running all these tests if we already determined that
 +# the F77 compiler isn't working.  Some variables (like enable_shared)
 +# are currently assumed to apply to all compilers on this platform,
 +# and will be corrupted by setting them based on a non-working compiler.
- if test "$_lt_disable_F77" != yes; then
++if test yes != "$_lt_disable_F77"; then
 +  # Code to be used in simple compile tests
 +  lt_simple_compile_test_code="\
 +      subroutine t
 +      return
 +      end
 +"
 +
 +  # Code to be used in simple link tests
 +  lt_simple_link_test_code="\
 +      program t
 +      end
 +"
 +
 +  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
 +  _LT_TAG_COMPILER
 +
 +  # save warnings/boilerplate of simple test code
 +  _LT_COMPILER_BOILERPLATE
 +  _LT_LINKER_BOILERPLATE
 +
 +  # Allow CC to be a program name with arguments.
-   lt_save_CC="$CC"
++  lt_save_CC=$CC
 +  lt_save_GCC=$GCC
 +  lt_save_CFLAGS=$CFLAGS
 +  CC=${F77-"f77"}
 +  CFLAGS=$FFLAGS
 +  compiler=$CC
 +  _LT_TAGVAR(compiler, $1)=$CC
 +  _LT_CC_BASENAME([$compiler])
 +  GCC=$G77
 +  if test -n "$compiler"; then
 +    AC_MSG_CHECKING([if libtool supports shared libraries])
 +    AC_MSG_RESULT([$can_build_shared])
 +
 +    AC_MSG_CHECKING([whether to build shared libraries])
-     test "$can_build_shared" = "no" && enable_shared=no
++    test no = "$can_build_shared" && enable_shared=no
 +
 +    # On AIX, shared libraries and static libraries use the same namespace, and
 +    # are all built from PIC.
 +    case $host_os in
 +      aix3*)
-         test "$enable_shared" = yes && enable_static=no
++        test yes = "$enable_shared" && enable_static=no
 +        if test -n "$RANLIB"; then
 +          archive_cmds="$archive_cmds~\$RANLIB \$lib"
 +          postinstall_cmds='$RANLIB $lib'
 +        fi
 +        ;;
 +      aix[[4-9]]*)
- 	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
- 	  test "$enable_shared" = yes && enable_static=no
++	if test ia64 != "$host_cpu"; then
++	  case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
++	  yes,aix,yes) ;;		# shared object as lib.so file only
++	  yes,svr4,*) ;;		# shared object as lib.so archive member only
++	  yes,*) enable_static=no ;;	# shared object in lib.a archive as well
++	  esac
 +	fi
 +        ;;
 +    esac
 +    AC_MSG_RESULT([$enable_shared])
 +
 +    AC_MSG_CHECKING([whether to build static libraries])
 +    # Make sure either enable_shared or enable_static is yes.
-     test "$enable_shared" = yes || enable_static=yes
++    test yes = "$enable_shared" || enable_static=yes
 +    AC_MSG_RESULT([$enable_static])
 +
-     _LT_TAGVAR(GCC, $1)="$G77"
-     _LT_TAGVAR(LD, $1)="$LD"
++    _LT_TAGVAR(GCC, $1)=$G77
++    _LT_TAGVAR(LD, $1)=$LD
 +
 +    ## CAVEAT EMPTOR:
 +    ## There is no encapsulation within the following macros, do not change
 +    ## the running order or otherwise move them around unless you know exactly
 +    ## what you are doing...
 +    _LT_COMPILER_PIC($1)
 +    _LT_COMPILER_C_O($1)
 +    _LT_COMPILER_FILE_LOCKS($1)
 +    _LT_LINKER_SHLIBS($1)
 +    _LT_SYS_DYNAMIC_LINKER($1)
 +    _LT_LINKER_HARDCODE_LIBPATH($1)
 +
 +    _LT_CONFIG($1)
 +  fi # test -n "$compiler"
 +
 +  GCC=$lt_save_GCC
-   CC="$lt_save_CC"
-   CFLAGS="$lt_save_CFLAGS"
- fi # test "$_lt_disable_F77" != yes
++  CC=$lt_save_CC
++  CFLAGS=$lt_save_CFLAGS
++fi # test yes != "$_lt_disable_F77"
 +
 +AC_LANG_POP
 +])# _LT_LANG_F77_CONFIG
 +
 +
 +# _LT_LANG_FC_CONFIG([TAG])
 +# -------------------------
 +# Ensure that the configuration variables for a Fortran compiler are
 +# suitably defined.  These variables are subsequently used by _LT_CONFIG
- # to write the compiler configuration to `libtool'.
++# to write the compiler configuration to 'libtool'.
 +m4_defun([_LT_LANG_FC_CONFIG],
 +[AC_LANG_PUSH(Fortran)
 +
- if test -z "$FC" || test "X$FC" = "Xno"; then
++if test -z "$FC" || test no = "$FC"; then
 +  _lt_disable_FC=yes
 +fi
 +
 +_LT_TAGVAR(archive_cmds_need_lc, $1)=no
 +_LT_TAGVAR(allow_undefined_flag, $1)=
 +_LT_TAGVAR(always_export_symbols, $1)=no
 +_LT_TAGVAR(archive_expsym_cmds, $1)=
 +_LT_TAGVAR(export_dynamic_flag_spec, $1)=
 +_LT_TAGVAR(hardcode_direct, $1)=no
 +_LT_TAGVAR(hardcode_direct_absolute, $1)=no
 +_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
 +_LT_TAGVAR(hardcode_libdir_separator, $1)=
 +_LT_TAGVAR(hardcode_minus_L, $1)=no
 +_LT_TAGVAR(hardcode_automatic, $1)=no
 +_LT_TAGVAR(inherit_rpath, $1)=no
 +_LT_TAGVAR(module_cmds, $1)=
 +_LT_TAGVAR(module_expsym_cmds, $1)=
 +_LT_TAGVAR(link_all_deplibs, $1)=unknown
 +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
 +_LT_TAGVAR(reload_flag, $1)=$reload_flag
 +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
 +_LT_TAGVAR(no_undefined_flag, $1)=
 +_LT_TAGVAR(whole_archive_flag_spec, $1)=
 +_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
 +
 +# Source file extension for fc test sources.
 +ac_ext=${ac_fc_srcext-f}
 +
 +# Object file extension for compiled fc test sources.
 +objext=o
 +_LT_TAGVAR(objext, $1)=$objext
 +
 +# No sense in running all these tests if we already determined that
 +# the FC compiler isn't working.  Some variables (like enable_shared)
 +# are currently assumed to apply to all compilers on this platform,
 +# and will be corrupted by setting them based on a non-working compiler.
- if test "$_lt_disable_FC" != yes; then
++if test yes != "$_lt_disable_FC"; then
 +  # Code to be used in simple compile tests
 +  lt_simple_compile_test_code="\
 +      subroutine t
 +      return
 +      end
 +"
 +
 +  # Code to be used in simple link tests
 +  lt_simple_link_test_code="\
 +      program t
 +      end
 +"
 +
 +  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
 +  _LT_TAG_COMPILER
 +
 +  # save warnings/boilerplate of simple test code
 +  _LT_COMPILER_BOILERPLATE
 +  _LT_LINKER_BOILERPLATE
 +
 +  # Allow CC to be a program name with arguments.
-   lt_save_CC="$CC"
++  lt_save_CC=$CC
 +  lt_save_GCC=$GCC
 +  lt_save_CFLAGS=$CFLAGS
 +  CC=${FC-"f95"}
 +  CFLAGS=$FCFLAGS
 +  compiler=$CC
 +  GCC=$ac_cv_fc_compiler_gnu
 +
 +  _LT_TAGVAR(compiler, $1)=$CC
 +  _LT_CC_BASENAME([$compiler])
 +
 +  if test -n "$compiler"; then
 +    AC_MSG_CHECKING([if libtool supports shared libraries])
 +    AC_MSG_RESULT([$can_build_shared])
 +
 +    AC_MSG_CHECKING([whether to build shared libraries])
-     test "$can_build_shared" = "no" && enable_shared=no
++    test no = "$can_build_shared" && enable_shared=no
 +
 +    # On AIX, shared libraries and static libraries use the same namespace, and
 +    # are all built from PIC.
 +    case $host_os in
 +      aix3*)
-         test "$enable_shared" = yes && enable_static=no
++        test yes = "$enable_shared" && enable_static=no
 +        if test -n "$RANLIB"; then
 +          archive_cmds="$archive_cmds~\$RANLIB \$lib"
 +          postinstall_cmds='$RANLIB $lib'
 +        fi
 +        ;;
 +      aix[[4-9]]*)
- 	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
- 	  test "$enable_shared" = yes && enable_static=no
++	if test ia64 != "$host_cpu"; then
++	  case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
++	  yes,aix,yes) ;;		# shared object as lib.so file only
++	  yes,svr4,*) ;;		# shared object as lib.so archive member only
++	  yes,*) enable_static=no ;;	# shared object in lib.a archive as well
++	  esac
 +	fi
 +        ;;
 +    esac
 +    AC_MSG_RESULT([$enable_shared])
 +
 +    AC_MSG_CHECKING([whether to build static libraries])
 +    # Make sure either enable_shared or enable_static is yes.
-     test "$enable_shared" = yes || enable_static=yes
++    test yes = "$enable_shared" || enable_static=yes
 +    AC_MSG_RESULT([$enable_static])
 +
-     _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu"
-     _LT_TAGVAR(LD, $1)="$LD"
++    _LT_TAGVAR(GCC, $1)=$ac_cv_fc_compiler_gnu
++    _LT_TAGVAR(LD, $1)=$LD
 +
 +    ## CAVEAT EMPTOR:
 +    ## There is no encapsulation within the following macros, do not change
 +    ## the running order or otherwise move them around unless you know exactly
 +    ## what you are doing...
 +    _LT_SYS_HIDDEN_LIBDEPS($1)
 +    _LT_COMPILER_PIC($1)
 +    _LT_COMPILER_C_O($1)
 +    _LT_COMPILER_FILE_LOCKS($1)
 +    _LT_LINKER_SHLIBS($1)
 +    _LT_SYS_DYNAMIC_LINKER($1)
 +    _LT_LINKER_HARDCODE_LIBPATH($1)
 +
 +    _LT_CONFIG($1)
 +  fi # test -n "$compiler"
 +
 +  GCC=$lt_save_GCC
 +  CC=$lt_save_CC
 +  CFLAGS=$lt_save_CFLAGS
- fi # test "$_lt_disable_FC" != yes
++fi # test yes != "$_lt_disable_FC"
 +
 +AC_LANG_POP
 +])# _LT_LANG_FC_CONFIG
 +
 +
 +# _LT_LANG_GCJ_CONFIG([TAG])
 +# --------------------------
 +# Ensure that the configuration variables for the GNU Java Compiler compiler
 +# are suitably defined.  These variables are subsequently used by _LT_CONFIG
- # to write the compiler configuration to `libtool'.
++# to write the compiler configuration to 'libtool'.
 +m4_defun([_LT_LANG_GCJ_CONFIG],
 +[AC_REQUIRE([LT_PROG_GCJ])dnl
 +AC_LANG_SAVE
 +
 +# Source file extension for Java test sources.
 +ac_ext=java
 +
 +# Object file extension for compiled Java test sources.
 +objext=o
 +_LT_TAGVAR(objext, $1)=$objext
 +
 +# Code to be used in simple compile tests
 +lt_simple_compile_test_code="class foo {}"
 +
 +# Code to be used in simple link tests
 +lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
 +
 +# ltmain only uses $CC for tagged configurations so make sure $CC is set.
 +_LT_TAG_COMPILER
 +
 +# save warnings/boilerplate of simple test code
 +_LT_COMPILER_BOILERPLATE
 +_LT_LINKER_BOILERPLATE
 +
 +# Allow CC to be a program name with arguments.
 +lt_save_CC=$CC
 +lt_save_CFLAGS=$CFLAGS
 +lt_save_GCC=$GCC
 +GCC=yes
 +CC=${GCJ-"gcj"}
 +CFLAGS=$GCJFLAGS
 +compiler=$CC
 +_LT_TAGVAR(compiler, $1)=$CC
- _LT_TAGVAR(LD, $1)="$LD"
++_LT_TAGVAR(LD, $1)=$LD
 +_LT_CC_BASENAME([$compiler])
 +
 +# GCJ did not exist at the time GCC didn't implicitly link libc in.
 +_LT_TAGVAR(archive_cmds_need_lc, $1)=no
 +
 +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
 +_LT_TAGVAR(reload_flag, $1)=$reload_flag
 +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
 +
 +## 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_COMPILER_NO_RTTI($1)
 +  _LT_COMPILER_PIC($1)
 +  _LT_COMPILER_C_O($1)
 +  _LT_COMPILER_FILE_LOCKS($1)
 +  _LT_LINKER_SHLIBS($1)
 +  _LT_LINKER_HARDCODE_LIBPATH($1)
 +
 +  _LT_CONFIG($1)
 +fi
 +
 +AC_LANG_RESTORE
 +
 +GCC=$lt_save_GCC
 +CC=$lt_save_CC
 +CFLAGS=$lt_save_CFLAGS
 +])# _LT_LANG_GCJ_CONFIG
 +
 +
 +# _LT_LANG_GO_CONFIG([TAG])
 +# --------------------------
 +# Ensure that the configuration variables for the GNU Go compiler
 +# are suitably defined.  These variables are subsequently used by _LT_CONFIG
- # to write the compiler configuration to `libtool'.
++# to write the compiler configuration to 'libtool'.
 +m4_defun([_LT_LANG_GO_CONFIG],
 +[AC_REQUIRE([LT_PROG_GO])dnl
 +AC_LANG_SAVE
 +
 +# Source file extension for Go test sources.
 +ac_ext=go
 +
 +# Object file extension for compiled Go test sources.
 +objext=o
 +_LT_TAGVAR(objext, $1)=$objext
 +
 +# Code to be used in simple compile tests
 +lt_simple_compile_test_code="package main; func main() { }"
 +
 +# Code to be used in simple link tests
 +lt_simple_link_test_code='package main; func main() { }'
 +
 +# ltmain only uses $CC for tagged configurations so make sure $CC is set.
 +_LT_TAG_COMPILER
 +
 +# save warnings/boilerplate of simple test code
 +_LT_COMPILER_BOILERPLATE
 +_LT_LINKER_BOILERPLATE
 +
 +# Allow CC to be a program name with arguments.
 +lt_save_CC=$CC
 +lt_save_CFLAGS=$CFLAGS
 +lt_save_GCC=$GCC
 +GCC=yes
 +CC=${GOC-"gccgo"}
 +CFLAGS=$GOFLAGS
 +compiler=$CC
 +_LT_TAGVAR(compiler, $1)=$CC
- _LT_TAGVAR(LD, $1)="$LD"
++_LT_TAGVAR(LD, $1)=$LD
 +_LT_CC_BASENAME([$compiler])
 +
 +# Go did not exist at the time GCC didn't implicitly link libc in.
 +_LT_TAGVAR(archive_cmds_need_lc, $1)=no
 +
 +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
 +_LT_TAGVAR(reload_flag, $1)=$reload_flag
 +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
 +
 +## 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_COMPILER_NO_RTTI($1)
 +  _LT_COMPILER_PIC($1)
 +  _LT_COMPILER_C_O($1)
 +  _LT_COMPILER_FILE_LOCKS($1)
 +  _LT_LINKER_SHLIBS($1)
 +  _LT_LINKER_HARDCODE_LIBPATH($1)
 +
 +  _LT_CONFIG($1)
 +fi
 +
 +AC_LANG_RESTORE
 +
 +GCC=$lt_save_GCC
 +CC=$lt_save_CC
 +CFLAGS=$lt_save_CFLAGS
 +])# _LT_LANG_GO_CONFIG
 +
 +
 +# _LT_LANG_RC_CONFIG([TAG])
 +# -------------------------
 +# Ensure that the configuration variables for the Windows resource compiler
 +# are suitably defined.  These variables are subsequently used by _LT_CONFIG
- # to write the compiler configuration to `libtool'.
++# to write the compiler configuration to 'libtool'.
 +m4_defun([_LT_LANG_RC_CONFIG],
 +[AC_REQUIRE([LT_PROG_RC])dnl
 +AC_LANG_SAVE
 +
 +# Source file extension for RC test sources.
 +ac_ext=rc
 +
 +# Object file extension for compiled RC test sources.
 +objext=o
 +_LT_TAGVAR(objext, $1)=$objext
 +
 +# Code to be used in simple compile tests
 +lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
 +
 +# Code to be used in simple link tests
- lt_simple_link_test_code="$lt_simple_compile_test_code"
++lt_simple_link_test_code=$lt_simple_compile_test_code
 +
 +# ltmain only uses $CC for tagged configurations so make sure $CC is set.
 +_LT_TAG_COMPILER
 +
 +# save warnings/boilerplate of simple test code
 +_LT_COMPILER_BOILERPLATE
 +_LT_LINKER_BOILERPLATE
 +
 +# Allow CC to be a program name with arguments.
- lt_save_CC="$CC"
++lt_save_CC=$CC
 +lt_save_CFLAGS=$CFLAGS
 +lt_save_GCC=$GCC
 +GCC=
 +CC=${RC-"windres"}
 +CFLAGS=
 +compiler=$CC
 +_LT_TAGVAR(compiler, $1)=$CC
 +_LT_CC_BASENAME([$compiler])
 +_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
 +
 +if test -n "$compiler"; then
 +  :
 +  _LT_CONFIG($1)
 +fi
 +
 +GCC=$lt_save_GCC
 +AC_LANG_RESTORE
 +CC=$lt_save_CC
 +CFLAGS=$lt_save_CFLAGS
 +])# _LT_LANG_RC_CONFIG
 +
 +
 +# LT_PROG_GCJ
 +# -----------
 +AC_DEFUN([LT_PROG_GCJ],
 +[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ],
 +  [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ],
 +    [AC_CHECK_TOOL(GCJ, gcj,)
-       test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
++      test set = "${GCJFLAGS+set}" || GCJFLAGS="-g -O2"
 +      AC_SUBST(GCJFLAGS)])])[]dnl
 +])
 +
 +# Old name:
 +AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ])
 +dnl aclocal-1.4 backwards compatibility:
 +dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
 +
 +
 +# LT_PROG_GO
 +# ----------
 +AC_DEFUN([LT_PROG_GO],
 +[AC_CHECK_TOOL(GOC, gccgo,)
 +])
 +
 +
 +# LT_PROG_RC
 +# ----------
 +AC_DEFUN([LT_PROG_RC],
 +[AC_CHECK_TOOL(RC, windres,)
 +])
 +
 +# Old name:
 +AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC])
 +dnl aclocal-1.4 backwards compatibility:
 +dnl AC_DEFUN([LT_AC_PROG_RC], [])
 +
 +
 +# _LT_DECL_EGREP
 +# --------------
 +# If we don't have a new enough Autoconf to choose the best grep
 +# available, choose the one first in the user's PATH.
 +m4_defun([_LT_DECL_EGREP],
 +[AC_REQUIRE([AC_PROG_EGREP])dnl
 +AC_REQUIRE([AC_PROG_FGREP])dnl
 +test -z "$GREP" && GREP=grep
 +_LT_DECL([], [GREP], [1], [A grep program that handles long lines])
 +_LT_DECL([], [EGREP], [1], [An ERE matcher])
 +_LT_DECL([], [FGREP], [1], [A literal string matcher])
 +dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too
 +AC_SUBST([GREP])
 +])
 +
 +
 +# _LT_DECL_OBJDUMP
 +# --------------
 +# If we don't have a new enough Autoconf to choose the best objdump
 +# available, choose the one first in the user's PATH.
 +m4_defun([_LT_DECL_OBJDUMP],
 +[AC_CHECK_TOOL(OBJDUMP, objdump, false)
 +test -z "$OBJDUMP" && OBJDUMP=objdump
 +_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
 +AC_SUBST([OBJDUMP])
 +])
 +
 +# _LT_DECL_DLLTOOL
 +# ----------------
 +# Ensure DLLTOOL variable is set.
 +m4_defun([_LT_DECL_DLLTOOL],
 +[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
 +test -z "$DLLTOOL" && DLLTOOL=dlltool
 +_LT_DECL([], [DLLTOOL], [1], [DLL creation program])
 +AC_SUBST([DLLTOOL])
 +])
 +
 +# _LT_DECL_SED
 +# ------------
 +# Check for a fully-functional sed program, that truncates
 +# as few characters as possible.  Prefer GNU sed if found.
 +m4_defun([_LT_DECL_SED],
 +[AC_PROG_SED
 +test -z "$SED" && SED=sed
 +Xsed="$SED -e 1s/^X//"
 +_LT_DECL([], [SED], [1], [A sed program that does not truncate output])
 +_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"],
 +    [Sed that helps us avoid accidentally triggering echo(1) options like -n])
 +])# _LT_DECL_SED
 +
 +m4_ifndef([AC_PROG_SED], [
 +############################################################
 +# NOTE: This macro has been submitted for inclusion into   #
 +#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
 +#  a released version of Autoconf we should remove this    #
 +#  macro and use it instead.                               #
 +############################################################
 +
 +m4_defun([AC_PROG_SED],
 +[AC_MSG_CHECKING([for a sed that does not truncate output])
 +AC_CACHE_VAL(lt_cv_path_SED,
 +[# Loop through the user's path and test for sed and gsed.
 +# Then use that list of sed's as ones to test for truncation.
 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +for as_dir in $PATH
 +do
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +  for lt_ac_prog in sed gsed; do
 +    for ac_exec_ext in '' $ac_executable_extensions; do
 +      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
 +        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
 +      fi
 +    done
 +  done
 +done
 +IFS=$as_save_IFS
 +lt_ac_max=0
 +lt_ac_count=0
 +# Add /usr/xpg4/bin/sed as it is typically found on Solaris
 +# along with /bin/sed that truncates output.
 +for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
-   test ! -f $lt_ac_sed && continue
++  test ! -f "$lt_ac_sed" && continue
 +  cat /dev/null > conftest.in
 +  lt_ac_count=0
 +  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
 +  # Check for GNU sed and select it if it is found.
 +  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
 +    lt_cv_path_SED=$lt_ac_sed
 +    break
 +  fi
 +  while true; do
 +    cat conftest.in conftest.in >conftest.tmp
 +    mv conftest.tmp conftest.in
 +    cp conftest.in conftest.nl
 +    echo >>conftest.nl
 +    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
 +    cmp -s conftest.out conftest.nl || break
 +    # 10000 chars as input seems more than enough
-     test $lt_ac_count -gt 10 && break
++    test 10 -lt "$lt_ac_count" && break
 +    lt_ac_count=`expr $lt_ac_count + 1`
-     if test $lt_ac_count -gt $lt_ac_max; then
++    if test "$lt_ac_count" -gt "$lt_ac_max"; then
 +      lt_ac_max=$lt_ac_count
 +      lt_cv_path_SED=$lt_ac_sed
 +    fi
 +  done
 +done
 +])
 +SED=$lt_cv_path_SED
 +AC_SUBST([SED])
 +AC_MSG_RESULT([$SED])
 +])#AC_PROG_SED
 +])#m4_ifndef
 +
 +# Old name:
 +AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED])
 +dnl aclocal-1.4 backwards compatibility:
 +dnl AC_DEFUN([LT_AC_PROG_SED], [])
 +
 +
 +# _LT_CHECK_SHELL_FEATURES
 +# ------------------------
 +# Find out whether the shell is Bourne or XSI compatible,
 +# or has some other useful features.
 +m4_defun([_LT_CHECK_SHELL_FEATURES],
- [AC_MSG_CHECKING([whether the shell understands some XSI constructs])
- # Try some XSI features
- xsi_shell=no
- ( _lt_dummy="a/b/c"
-   test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_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
- AC_MSG_RESULT([$xsi_shell])
- _LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell'])
- 
- AC_MSG_CHECKING([whether the shell understands "+="])
- lt_shell_append=no
- ( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \
-     >/dev/null 2>&1 \
-   && lt_shell_append=yes
- AC_MSG_RESULT([$lt_shell_append])
- _LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append'])
- 
- if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
++[if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
 +  lt_unset=unset
 +else
 +  lt_unset=false
 +fi
 +_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl
 +
 +# test EBCDIC or ASCII
 +case `echo X|tr X '\101'` in
 + A) # ASCII based system
 +    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
 +  lt_SP2NL='tr \040 \012'
 +  lt_NL2SP='tr \015\012 \040\040'
 +  ;;
 + *) # EBCDIC based system
 +  lt_SP2NL='tr \100 \n'
 +  lt_NL2SP='tr \r\n \100\100'
 +  ;;
 +esac
 +_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl
 +_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
 +])# _LT_CHECK_SHELL_FEATURES
 +
 +
- # _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY)
- # ------------------------------------------------------
- # In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and
- # '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY.
- m4_defun([_LT_PROG_FUNCTION_REPLACE],
- [dnl {
- sed -e '/^$1 ()$/,/^} # $1 /c\
- $1 ()\
- {\
- m4_bpatsubsts([$2], [$], [\\], [^\([	 ]\)], [\\\1])
- } # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \
-   && mv -f "$cfgfile.tmp" "$cfgfile" \
-     || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- test 0 -eq $? || _lt_function_replace_fail=:
- ])
- 
- 
- # _LT_PROG_REPLACE_SHELLFNS
- # -------------------------
- # Replace existing portable implementations of several shell functions with
- # equivalent extended shell implementations where those features are available..
- m4_defun([_LT_PROG_REPLACE_SHELLFNS],
- [if test x"$xsi_shell" = xyes; then
-   _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl
-     case ${1} in
-       */*) func_dirname_result="${1%/*}${2}" ;;
-       *  ) func_dirname_result="${3}" ;;
-     esac])
- 
-   _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl
-     func_basename_result="${1##*/}"])
- 
-   _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl
-     case ${1} in
-       */*) func_dirname_result="${1%/*}${2}" ;;
-       *  ) func_dirname_result="${3}" ;;
-     esac
-     func_basename_result="${1##*/}"])
- 
-   _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl
-     # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
-     # positional parameters, so assign one to ordinary parameter first.
-     func_stripname_result=${3}
-     func_stripname_result=${func_stripname_result#"${1}"}
-     func_stripname_result=${func_stripname_result%"${2}"}])
- 
-   _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl
-     func_split_long_opt_name=${1%%=*}
-     func_split_long_opt_arg=${1#*=}])
- 
-   _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl
-     func_split_short_opt_arg=${1#??}
-     func_split_short_opt_name=${1%"$func_split_short_opt_arg"}])
- 
-   _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl
-     case ${1} in
-       *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
-       *)    func_lo2o_result=${1} ;;
-     esac])
- 
-   _LT_PROG_FUNCTION_REPLACE([func_xform], [    func_xform_result=${1%.*}.lo])
- 
-   _LT_PROG_FUNCTION_REPLACE([func_arith], [    func_arith_result=$(( $[*] ))])
- 
-   _LT_PROG_FUNCTION_REPLACE([func_len], [    func_len_result=${#1}])
- fi
- 
- if test x"$lt_shell_append" = xyes; then
-   _LT_PROG_FUNCTION_REPLACE([func_append], [    eval "${1}+=\\${2}"])
- 
-   _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl
-     func_quote_for_eval "${2}"
- dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \
-     eval "${1}+=\\\\ \\$func_quote_for_eval_result"])
- 
-   # Save a `func_append' function call where possible by direct use of '+='
-   sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
-     && mv -f "$cfgfile.tmp" "$cfgfile" \
-       || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-   test 0 -eq $? || _lt_function_replace_fail=:
- else
-   # Save a `func_append' function call even when '+=' is not available
-   sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
-     && mv -f "$cfgfile.tmp" "$cfgfile" \
-       || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-   test 0 -eq $? || _lt_function_replace_fail=:
- fi
- 
- if test x"$_lt_function_replace_fail" = x":"; then
-   AC_MSG_WARN([Unable to substitute extended shell functions in $ofile])
- fi
- ])
- 
 +# _LT_PATH_CONVERSION_FUNCTIONS
 +# -----------------------------
- # Determine which file name conversion functions should be used by
++# Determine what file name conversion functions should be used by
 +# func_to_host_file (and, implicitly, by func_to_host_path).  These are needed
 +# for certain cross-compile configurations and native mingw.
 +m4_defun([_LT_PATH_CONVERSION_FUNCTIONS],
 +[AC_REQUIRE([AC_CANONICAL_HOST])dnl
 +AC_REQUIRE([AC_CANONICAL_BUILD])dnl
 +AC_MSG_CHECKING([how to convert $build file names to $host format])
 +AC_CACHE_VAL(lt_cv_to_host_file_cmd,
 +[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
 +])
 +to_host_file_cmd=$lt_cv_to_host_file_cmd
 +AC_MSG_RESULT([$lt_cv_to_host_file_cmd])
 +_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd],
 +         [0], [convert $build file names to $host format])dnl
 +
 +AC_MSG_CHECKING([how to convert $build file names to toolchain format])
 +AC_CACHE_VAL(lt_cv_to_tool_file_cmd,
 +[#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
 +])
 +to_tool_file_cmd=$lt_cv_to_tool_file_cmd
 +AC_MSG_RESULT([$lt_cv_to_tool_file_cmd])
 +_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
 +         [0], [convert $build files to toolchain format])dnl
 +])# _LT_PATH_CONVERSION_FUNCTIONS
diff --cc config/ltmain.sh
index bffda54,0000000..147d758
mode 100644,000000..100644
--- a/config/ltmain.sh
+++ b/config/ltmain.sh
@@@ -1,9661 -1,0 +1,11156 @@@
++#! /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.2
++# libtool (GNU libtool) 2.4.6
++# Provide generalized library-building support services.
 +# Written by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
 +
- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
- # 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
++# Copyright (C) 1996-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.
 +
 +# GNU Libtool is free software; you can redistribute it and/or modify
 +# it under the terms of the GNU General Public License as published by
 +# the Free Software Foundation; either version 2 of the License, or
 +# (at your option) any later version.
 +#
 +# As a special exception to the GNU General Public License,
 +# if you distribute this file as part of a program or library that
 +# is built using GNU Libtool, you may include this file under the
 +# same distribution terms that you use for the rest of that program.
 +#
 +# GNU Libtool is distributed in the hope that it will be useful, but
 +# WITHOUT ANY WARRANTY; without even the implied warranty of
 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 +# General Public License for more details.
 +#
 +# You should have received a copy of the GNU General Public License
- # along with GNU Libtool; see the file COPYING.  If not, a copy
- # can be downloaded from http://www.gnu.org/licenses/gpl.html,
- # or obtained by writing to the Free Software Foundation, Inc.,
- # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
++# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 +
- # Usage: $progname [OPTION]... [MODE-ARG]...
- #
- # Provide generalized library-building support services.
- #
- #       --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
- #
- # 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 Debian-2.4.2-1.11
- #         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/>.
 +
 +PROGRAM=libtool
 +PACKAGE=libtool
- VERSION="2.4.2 Debian-2.4.2-1.11"
- TIMESTAMP=""
- package_revision=1.3337
++VERSION="2.4.6 Debian-2.4.6-0.1"
++package_revision=2.4.6
 +
- # Be Bourne compatible
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
++
++## ------ ##
++## 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/>.
++
++# 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:
++#
++#   . `echo "$0" | ${SED-sed} 's|[^/]*$||'`/build-aux/funclib.sh
++#
++# If you need to override any of the default environment variable
++# settings, do that before evaluating this file.
++
++
++## -------------------- ##
++## Shell normalisation. ##
++## -------------------- ##
++
++# 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!
++
++DUALCASE=1; export DUALCASE # for MKS sh
++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
++  # 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
++  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
- 
- # A function that is used when there is no print builtin or printf.
- func_fallback_echo ()
- {
-   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
++# 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 \"\${$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\"
++  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
- LC_ALL=C
- LANGUAGE=C
- export LANGUAGE LC_ALL
 +
- $lt_unset CDPATH
++# 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=';'
++  }
++fi
 +
- # 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"
 +
 +
++## ------------------------- ##
++## 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 ()
++{
++    _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
++}
++
++
++# 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
++  }
++
++  func_path_progs "grep ggrep" func_check_prog_grep $PATH:/usr/xpg4/bin
++  GREP=$func_path_progs_result
++}
++
++
++## ------------------------------- ##
++## 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"}
- test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
++: ${ECHO="printf %s\n"}
++: ${EGREP="$GREP -E"}
++: ${FGREP="$GREP -F"}
++: ${LN_S="ln -s"}
 +: ${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.
- 
- exit_status=$EXIT_SUCCESS
- 
- # Make sure IFS has a sensible default
- lt_nl='
- '
- IFS=" 	$lt_nl"
 +
- dirname="s,/[^/]*$,,"
- basename="s,^.*/,,"
 +
- # 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
++## -------------------- ##
++## Useful sed snippets. ##
++## -------------------- ##
 +
++sed_dirname='s|/[^/]*$||'
++sed_basename='s|^.*/||'
 +
- # func_basename file
- func_basename ()
- {
-     func_basename_result=`$ECHO "${1}" | $SED "$basename"`
- } # func_basename may be replaced by extended shell implementation
++# Sed substitution that helps us do robust quoting.  It backslashifies
++# metacharacters that are still active within double-quoted strings.
++sed_quote_subst='s|\([`"$\\]\)|\\\1|g'
 +
++# Same as above, but do not quote variable references.
++sed_double_quote_subst='s/\(["`\\]\)/\\\1/g'
 +
- # 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
++# 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_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
 +
++## ----------------- ##
++## Global variables. ##
++## ----------------- ##
 +
- # 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,/*$,/,'
++# 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.
 +
- # 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
- }
++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_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
++# 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=:
 +
-   # 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
++# 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
 +
-   # 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
- }
++# 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
 +
- # The name of this program:
- func_dirname_and_basename "$progpath"
- progname=$func_basename_result
++# The name of this program.
++progname=`$ECHO "$progpath" |$SED "$sed_basename"`
 +
- # Make sure we have an absolute path for reexecution:
++# Make sure we have an absolute progpath for reexecution:
 +case $progpath in
 +  [\\/]*|[A-Za-z]:\\*) ;;
 +  *[\\/]*)
-      progdir=$func_dirname_result
++     progdir=`$ECHO "$progpath" |$SED "$sed_dirname"`
 +     progdir=`cd "$progdir" && pwd`
-      progpath="$progdir/$progname"
++     progpath=$progdir/$progname
 +     ;;
 +  *)
-      save_IFS="$IFS"
++     _G_IFS=$IFS
 +     IFS=${PATH_SEPARATOR-:}
 +     for progdir in $PATH; do
-        IFS="$save_IFS"
++       IFS=$_G_IFS
 +       test -x "$progdir/$progname" && break
 +     done
-      IFS="$save_IFS"
++     IFS=$_G_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'
 +
- # Sed substitution that turns a string into a regex matching for the
- # string literally.
- sed_make_literal_regex='s,[].[^$\\*\/],\\&,g'
++## ----------------- ##
++## Standard options. ##
++## ----------------- ##
 +
- # 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"
++# 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.
 +
- # Standard options:
 +opt_dry_run=false
- opt_help=false
 +opt_quiet=false
 +opt_verbose=false
- opt_warning=:
 +
- # 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: }$*"
- }
++# 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_verbose arg...
- # Echo program name prefixed message in verbose mode only.
- func_verbose ()
- {
-     $opt_verbose && func_echo ${1+"$@"}
++# 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
 +
-     # 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:
-     :
- }
++# 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
 +
- # func_echo_all arg...
- # Invoke $ECHO with all args, space-separated.
- func_echo_all ()
- {
-     $ECHO "$*"
- }
 +
- # func_error arg...
- # Echo program name prefixed message to standard error.
- func_error ()
- {
-     $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
- }
++## -------------------- ##
++## Resource management. ##
++## -------------------- ##
 +
- # 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
++# 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.
 +
-     # bash bug again:
-     :
- }
 +
- # func_fatal_error arg...
- # Echo program name prefixed message to standard error, and exit.
- func_fatal_error ()
++# 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_error ${1+"$@"}
-     exit $EXIT_FAILURE
- }
++    $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_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"
++    require_term_colors=:
 +}
- help="Try \`$progname --help' for more information."  ## default
 +
 +
- # func_grep expression filename
++## ----------------- ##
++## 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
++# -----------------------------
 +# Check whether EXPRESSION matches any line of FILENAME, without output.
 +func_grep ()
 +{
++    $debug_cmd
++
 +    $GREP "$1" "$2" >/dev/null 2>&1
 +}
 +
 +
- # func_mkdir_p directory-path
++# 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
++# ---------------------------
 +# Make sure the entire path to DIRECTORY-PATH is available.
 +func_mkdir_p ()
 +{
-     my_directory_path="$1"
-     my_dir_list=
++    $debug_cmd
 +
-     if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then
++    _G_directory_path=$1
++    _G_dir_list=
 +
-       # Protect directory names starting with `-'
-       case $my_directory_path in
-         -*) my_directory_path="./$my_directory_path" ;;
++    if test -n "$_G_directory_path" && test : != "$opt_dry_run"; then
++
++      # Protect directory names starting with '-'
++      case $_G_directory_path in
++        -*) _G_directory_path=./$_G_directory_path ;;
 +      esac
 +
 +      # While some portion of DIR does not yet exist...
-       while test ! -d "$my_directory_path"; do
++      while test ! -d "$_G_directory_path"; do
 +        # ...make a list in topmost first order.  Use a colon delimited
 +	# list incase some portion of path contains whitespace.
-         my_dir_list="$my_directory_path:$my_dir_list"
++        _G_dir_list=$_G_directory_path:$_G_dir_list
 +
 +        # If the last portion added has no slash in it, the list is done
-         case $my_directory_path in */*) ;; *) break ;; esac
++        case $_G_directory_path in */*) ;; *) break ;; esac
 +
 +        # ...otherwise throw away the child directory and loop
-         my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"`
++        _G_directory_path=`$ECHO "$_G_directory_path" | $SED -e "$sed_dirname"`
 +      done
-       my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'`
++      _G_dir_list=`$ECHO "$_G_dir_list" | $SED 's|:*$||'`
 +
-       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
++      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
 +        # try to create one of the directories concurrently.  Don't
 +        # stop in that case!
-         $MKDIR "$my_dir" 2>/dev/null || :
++        $MKDIR "$_G_dir" 2>/dev/null || :
 +      done
-       IFS="$save_mkdir_p_IFS"
++      IFS=$func_mkdir_p_IFS
 +
 +      # Bail out if we (or some other process) failed to create a directory.
-       test -d "$my_directory_path" || \
-         func_fatal_error "Failed to create \`$1'"
++      test -d "$_G_directory_path" || \
++        func_fatal_error "Failed to create '$1'"
 +    fi
 +}
 +
 +
- # func_mktempdir [string]
++# func_mktempdir [BASENAME]
++# -------------------------
 +# Make a temporary directory that won't clash with other running
 +# libtool processes, and avoids race conditions if possible.  If
- # given, STRING is the basename for that directory.
++# given, BASENAME is the basename for that directory.
 +func_mktempdir ()
 +{
-     my_template="${TMPDIR-/tmp}/${1-$progname}"
++    $debug_cmd
++
++    _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
-       my_tmpdir="${my_template}-$$"
++      _G_tmpdir=$_G_template-$$
 +    else
 +
 +      # If mktemp works, use that first and foremost
-       my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
++      _G_tmpdir=`mktemp -d "$_G_template-XXXXXXXX" 2>/dev/null`
 +
-       if test ! -d "$my_tmpdir"; then
++      if test ! -d "$_G_tmpdir"; then
 +        # Failing that, at least try and use $RANDOM to avoid a race
-         my_tmpdir="${my_template}-${RANDOM-0}$$"
++        _G_tmpdir=$_G_template-${RANDOM-0}$$
 +
-         save_mktempdir_umask=`umask`
++        func_mktempdir_umask=`umask`
 +        umask 0077
-         $MKDIR "$my_tmpdir"
-         umask $save_mktempdir_umask
++        $MKDIR "$_G_tmpdir"
++        umask $func_mktempdir_umask
 +      fi
 +
 +      # If we're not in dry-run mode, bomb out on failure
-       test -d "$my_tmpdir" || \
-         func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
++      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
 +
-     $ECHO "$my_tmpdir"
++    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"}
++
++    # save modified positional parameters for caller
++    func_options_result=$func_run_hooks_result
 +}
 +
 +
- # 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 ()
++# 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 ()
 +{
-     case $1 in
-       *[\\\`\"\$]*)
- 	func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;;
-       *)
-         func_quote_for_eval_unquoted_result="$1" ;;
-     esac
++    $debug_cmd
 +
-     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
++    # Option defaults:
++    opt_verbose=false
++    opt_warning_types=
++
++    func_run_hooks func_options_prep ${1+"$@"}
++
++    # save modified positional parameters for caller
++    func_options_prep_result=$func_run_hooks_result
 +}
 +
 +
- # 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 ()
++# func_parse_options [ARG]...
++# ---------------------------
++# The main option parsing loop.
++func_hookable func_parse_options
++func_parse_options ()
 +{
-     case $1 in
-       *[\\\`\"]*)
- 	my_arg=`$ECHO "$1" | $SED \
- 	    -e "$double_quote_subst" -e "$sed_double_backslash"` ;;
-       *)
-         my_arg="$1" ;;
-     esac
++    $debug_cmd
 +
-     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
++    func_parse_options_result=
 +
-     func_quote_for_expand_result="$my_arg"
- }
++    # 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+"$@"}
 +
++      # Adjust func_parse_options positional parameters to match
++      eval set dummy "$func_run_hooks_result"; 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-:}"
++      # Break out of the loop if we already parsed every option.
++      test $# -gt 0 || break
 +
-     ${opt_silent-false} || {
-       func_quote_for_expand "$my_cmd"
-       eval "func_echo $func_quote_for_expand_result"
-     }
++      _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
++		      ;;
 +
-     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
++        --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
++
++    # save modified positional parameters for caller
++    func_quote_for_eval ${1+"$@"}
++    func_parse_options_result=$func_quote_for_eval_result
 +}
 +
 +
- # 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 ()
++# func_validate_options [ARG]...
++# ------------------------------
++# Perform any sanity checks on option settings and/or unconsumed
++# arguments.
++func_hookable func_validate_options
++func_validate_options ()
 +{
-     my_cmd="$1"
-     my_fail_exp="${2-:}"
++    $debug_cmd
 +
-     ${opt_silent-false} || {
-       func_quote_for_expand "$my_cmd"
-       eval "func_echo $func_quote_for_expand_result"
-     }
++    # Display all warnings if -W was not given.
++    test -n "$opt_warning_types" || opt_warning_types=" $warning_categories"
 +
-     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_run_hooks func_validate_options ${1+"$@"}
 +
- # 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
++    # Bail if the options were screwed!
++    $exit_cmd $EXIT_FAILURE
++
++    # save modified positional parameters for caller
++    func_validate_options_result=$func_run_hooks_result
 +}
 +
 +
- # 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 $?
- }
++## ----------------- ##
++## Helper functions. ##
++## ----------------- ##
 +
- # func_usage
- # Echo short help message to standard output and exit.
- func_usage ()
++# This section contains the helper functions used by the rest of the
++# hookable option parser framework in ascii-betical order.
++
++
++# func_fatal_help ARG...
++# ----------------------
++# Echo program name prefixed message to standard error, followed by
++# a help hint, and exit.
++func_fatal_help ()
 +{
-     $opt_debug
++    $debug_cmd
 +
-     $SED -n '/^# Usage:/,/^#  *.*--help/ {
-         s/^# //
- 	s/^# *$//
- 	s/\$progname/'$progname'/
- 	p
-     }' < "$progpath"
-     echo
-     $ECHO "run \`$progname --help | more' for full usage"
-     exit $?
++    eval \$ECHO \""Usage: $usage"\"
++    eval \$ECHO \""$fatal_help"\"
++    func_error ${1+"$@"}
++    exit $EXIT_FAILURE
 +}
 +
- # func_help [NOEXIT]
- # Echo long help message to standard output and exit,
- # unless 'noexit' is passed as argument.
++
++# func_help
++# ---------
++# Echo long help message to standard output and exit.
 +func_help ()
 +{
-     $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
++    $debug_cmd
++
++    func_usage_message
++    $ECHO "$long_help_message"
++    exit 0
 +}
 +
- # func_missing_arg argname
++
++# func_missing_arg ARGNAME
++# ------------------------
 +# Echo program name prefixed message to standard error and set global
 +# exit_cmd.
 +func_missing_arg ()
 +{
-     $opt_debug
++    $debug_cmd
 +
-     func_error "missing argument for $1."
++    func_error "Missing argument for '$1'."
 +    exit_cmd=exit
 +}
 +
 +
- # func_split_short_opt shortopt
++# 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
++# -----------------------------
 +# Set func_split_short_opt_name and func_split_short_opt_arg shell
 +# variables after splitting SHORTOPT after the 2nd character.
- func_split_short_opt ()
++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 ()
 +{
-     my_sed_short_opt='1s/^\(..\).*$/\1/;q'
-     my_sed_short_rest='1s/^..\(.*\)$/\1/;q'
++    $debug_cmd
 +
-     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 "Run '$progname --help |${PAGER-more}' for full usage"
++    exit 0
++}
 +
 +
- # 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 ()
++# func_usage_message
++# ------------------
++# Echo short help message to standard output.
++func_usage_message ()
 +{
-     my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q'
-     my_sed_long_arg='1s/^--[^=]*=//'
++    $debug_cmd
 +
-     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
++    eval \$ECHO \""Usage: $usage"\"
++    echo
++    $SED -n 's|^# ||
++        /^Written by/{
++          x;p;x
++        }
++	h
++	/^Written by/q' < "$progpath"
++    echo
++    eval \$ECHO \""$usage_message"\"
++}
 +
- 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 $?
++}
 +
 +
- magic="%%%MAGIC variable%%%"
- magic_exe="%%%MAGIC EXE variable%%%"
++# 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:
 +
- # Global variables.
- nonopt=
- preserve_args=
- lo2o="s/\\.lo\$/.${objext}/"
- o2lo="s/\\.${objext}\$/.lo/"
- extracted_archives=
- extracted_serial=0
++# Set a version string.
++scriptversion='(GNU libtool) 2.4.6'
 +
- # 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_append var value
- # Append VALUE to the end of shell variable VAR.
- func_append ()
++# func_echo ARG...
++# ----------------
++# Libtool also displays the current mode in messages, so override
++# funclib.sh func_echo with this custom definition.
++func_echo ()
 +{
-     eval "${1}=\$${1}\${2}"
- } # func_append may be replaced by extended shell implementation
++    $debug_cmd
 +
- # func_append_quoted var value
- # Quote VALUE and append to the end of shell variable VAR, separated
- # by a space.
- func_append_quoted ()
- {
-     func_quote_for_eval "${2}"
-     eval "${1}=\$${1}\\ \$func_quote_for_eval_result"
- } # func_append_quoted may be replaced by extended shell implementation
++    _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
++}
 +
- # func_arith arithmetic-term...
- func_arith ()
++
++# func_warning ARG...
++# -------------------
++# Libtool warnings are not categorized, so override funclib.sh
++# func_warning with this simpler definition.
++func_warning ()
 +{
-     func_arith_result=`expr "${@}"`
- } # func_arith may be replaced by extended shell implementation
++    $debug_cmd
 +
++    $warning_func ${1+"$@"}
++}
 +
- # 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
 +
++## ---------------- ##
++## 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
++"
 +
- # func_lo2o object
- func_lo2o ()
++# Additional text appended to 'usage_message' in response to '--help'.
++func_help ()
 +{
-     func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
- } # func_lo2o may be replaced by extended shell implementation
++    $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/s/libtool/>.
++General help using GNU software: <http://www.gnu.org/gethelp/>."
++    exit 0
++}
 +
 +
- # 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_lo2o OBJECT-NAME
++# ---------------------
++# Transform OBJECT-NAME from a '.lo' suffix to the platform specific
++# object suffix.
++
++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_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_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_error ${1+"$@"}
-     func_error "See the $PACKAGE documentation for more information."
-     func_fatal_error "Fatal configuration error."
++    func__fatal_error ${1+"$@"} \
++      "See the $PACKAGE documentation for more information." \
++      "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 "$build_libtool_libs" = yes; then
++    if test yes = "$build_libtool_libs"; then
 +      echo "enable shared libraries"
 +    else
 +      echo "disable shared libraries"
 +    fi
-     if test "$build_old_libs" = yes; then
++    if test yes = "$build_old_libs"; 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
++      fi
 +
-     exit $EXIT_MISMATCH
-   fi
++      exit $EXIT_MISMATCH
++    fi
 +}
 +
 +
- # 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
++# 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
 +
++    nonopt=
++    preserve_args=
 +
- # 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
++    # 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
 +
 +
- # Parse options once, thoroughly.  This comes as soon as possible in the
- # script to make things like `--version' happen as quickly as we can.
++# libtool_parse_options [ARG]...
++# ---------------------------------
++# Provide handling for libtool specific options.
++libtool_parse_options ()
 +{
-   # 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
++    $debug_cmd
 +
-   # Validate options:
++    # 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
 +
-   # save first non-option argument
-   if test "$#" -gt 0; then
-     nonopt="$opt"
-     shift
-   fi
 +
-   # preserve --debug
-   test "$opt_debug" = : || func_append preserve_args " --debug"
++    # 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
 +
-   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
 +
-     if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
-       func_fatal_configuration "not configured to build any kind of library"
++# 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
 +    fi
 +
-     # Darwin sucks
-     eval std_shrext=\"$shrext_cmds\"
++    # preserve --debug
++    test : = "$debug_cmd" || func_append preserve_args " --debug"
 +
-     # 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
++    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
 +
-     # Change the help message to a mode-specific one.
-     generic_help="$help"
-     help="Try \`$progname --help --mode=$opt_mode' for more information."
-   }
++    $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\"
++
++      # 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."
++    }
 +
-   # Bail if the options were screwed
-   $exit_cmd $EXIT_FAILURE
++    # Pass back the unparsed argument list
++    func_quote_for_eval ${1+"$@"}
++    libtool_validate_options_result=$func_quote_for_eval_result
 +}
++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 \
-         | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
++      $SED -e 4q "$1" 2>/dev/null | func_generated_by_libtool_p
 +}
 +
 +# 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 "$lalib_p" = yes
++    test yes = "$lalib_p"
 +}
 +
 +# 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 ()
 +{
-     func_lalib_p "$1"
++    test -f "$1" &&
++      $lt_truncate_bin < "$1" 2>/dev/null | func_generated_by_libtool_p
 +}
 +
 +# 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 ()
 +{
-     $opt_debug
++    $debug_cmd
++
 +    save_ifs=$IFS; IFS='~'
 +    for cmd in $1; do
-       IFS=$save_ifs
++      IFS=$sp$nl
 +      eval cmd=\"$cmd\"
++      IFS=$save_ifs
 +      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 ()
 +{
-     $opt_debug
++    $debug_cmd
++
 +    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 ()
 +{
-     $opt_debug
++    $debug_cmd
++
 +    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 "$build_libtool_libs" = yes; then
-       write_lobj=\'${2}\'
++    write_libobj=$1
++    if test yes = "$build_libtool_libs"; then
++      write_lobj=\'$2\'
 +    else
 +      write_lobj=none
 +    fi
 +
-     if test "$build_old_libs" = yes; then
-       write_oldobj=\'${3}\'
++    if test yes = "$build_old_libs"; 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$TIMESTAMP) $VERSION
++# Generated by $PROGRAM (GNU $PACKAGE) $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 ()
 +{
-   $opt_debug
-   func_convert_core_file_wine_to_w32_result="$1"
++  $debug_cmd
++
++  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 "$lt_sed_naive_backslashify"`
++        $SED -e "$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 ()
 +{
-   $opt_debug
++  $debug_cmd
++
 +  # 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 ()
 +{
-   $opt_debug
++  $debug_cmd
++
 +  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 ()
 +{
-   $opt_debug
++  $debug_cmd
++
 +  # awkward: cmd appends spaces to result
 +  func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |
-     $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
++    $SED -e 's/[ ]*$//' -e "$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 ()
 +{
-   $opt_debug
-   if test -z "$2" && test -n "$1" ; then
++  $debug_cmd
++
++  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 ()
 +{
-   $opt_debug
++  $debug_cmd
++
 +  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 ()
 +{
-   $opt_debug
++  $debug_cmd
++
 +  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 ()
 +{
-   $opt_debug
++  $debug_cmd
++
 +  $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 ()
 +{
-   $opt_debug
++  $debug_cmd
++
 +  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 ()
 +{
-   $opt_debug
-   func_to_host_file_result="$1"
++  $debug_cmd
++
++  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 ()
 +{
-   $opt_debug
-   func_to_host_file_result="$1"
++  $debug_cmd
++
++  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 ()
 +{
-   $opt_debug
-   func_to_host_file_result="$1"
++  $debug_cmd
++
++  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 ()
 +{
-   $opt_debug
-   func_to_host_file_result="$1"
++  $debug_cmd
++
++  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 ()
 +{
-   $opt_debug
-   func_to_host_file_result="$1"
++  $debug_cmd
++
++  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 ()
 +{
-   $opt_debug
++  $debug_cmd
++
 +  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 ()
 +{
-   $opt_debug
++  $debug_cmd
++
 +  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 ()
 +{
-   $opt_debug
-   func_to_host_path_result="$1"
++  $debug_cmd
++
++  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 ()
 +{
-   $opt_debug
-   func_to_host_path_result="$1"
++  $debug_cmd
++
++  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 ()
 +{
-   $opt_debug
-   func_to_host_path_result="$1"
++  $debug_cmd
++
++  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 ()
 +{
-   $opt_debug
-   func_to_host_path_result="$1"
++  $debug_cmd
++
++  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 ()
 +{
-   $opt_debug
-   func_to_host_path_result="$1"
++  $debug_cmd
++
++  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 ()
 +{
-     $opt_debug
++    $debug_cmd
++
 +    # 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 "$build_libtool_libs" != yes && \
- 	  func_fatal_configuration "can not build a shared library"
++	test yes = "$build_libtool_libs" \
++	  || func_fatal_configuration "cannot 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 "$build_old_libs" = yes; then
++    if test yes = "$build_old_libs"; 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 "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
++    if test no = "$pic_mode" && test pass_all != "$deplibs_check_method"; 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 "$compiler_c_o" = no; then
-       output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext}
-       lockfile="$output_obj.lock"
++    if test no = "$compiler_c_o"; 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 "$need_locks" = yes; then
++    if test yes = "$need_locks"; 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 "$need_locks" = warn; then
++    elif test warn = "$need_locks"; 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 "$build_libtool_libs" = yes; then
++    if test yes = "$build_libtool_libs"; then
 +      # Without this assignment, base_compile gets emptied.
 +      fbsd_hideous_sh_bug=$base_compile
 +
-       if test "$pic_mode" != no; then
++      if test no != "$pic_mode"; 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 "$need_locks" = warn &&
++      if test warn = "$need_locks" &&
 +	 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 "$suppress_opt" = yes; then
++      if test yes = "$suppress_opt"; then
 +	suppress_output=' >/dev/null 2>&1'
 +      fi
 +    fi
 +
 +    # Only build a position-dependent object if we build old libraries.
-     if test "$build_old_libs" = yes; then
-       if test "$pic_mode" != yes; then
++    if test yes = "$build_old_libs"; then
++      if test yes != "$pic_mode"; then
 +	# Don't build PIC code
 +	command="$base_compile $qsrcfile$pie_flag"
 +      else
 +	command="$base_compile $qsrcfile $pic_flag"
 +      fi
-       if test "$compiler_c_o" = yes; then
++      if test yes = "$compiler_c_o"; 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 "$need_locks" = warn &&
++      if test warn = "$need_locks" &&
 +	 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 "$need_locks" != no; then
++      if test no != "$need_locks"; then
 +	removelist=$lockfile
 +        $RM "$lockfile"
 +      fi
 +    }
 +
 +    exit $EXIT_SUCCESS
 +}
 +
 +$opt_help || {
-   test "$opt_mode" = compile && func_mode_compile ${1+"$@"}
++  test compile = "$opt_mode" && 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
++  -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)
 +  -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 ()
 +{
-     $opt_debug
++    $debug_cmd
++
 +    # 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 test "X$opt_dry_run" = Xfalse; then
++    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 -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"
-     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
++      exec_cmd=\$cmd$args
 +    fi
 +}
 +
- test "$opt_mode" = execute && func_mode_execute ${1+"$@"}
++test execute = "$opt_mode" && func_mode_execute ${1+"$@"}
 +
 +
 +# func_mode_finish arg...
 +func_mode_finish ()
 +{
-     $opt_debug
++    $debug_cmd
++
 +    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_silent && exit $EXIT_SUCCESS
++    $opt_quiet && 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 "$opt_mode" = finish && func_mode_finish ${1+"$@"}
++test finish = "$opt_mode" && func_mode_finish ${1+"$@"}
 +
 +
 +# func_mode_install arg...
 +func_mode_install ()
 +{
-     $opt_debug
++    $debug_cmd
++
 +    # There may be an optional sh(1) argument at the beginning of
 +    # install_prog (especially on Windows NT).
-     if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
++    if test "$SHELL" = "$nonopt" || test /bin/sh = "$nonopt" ||
 +       # 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=no
++    isdir=false
 +    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=yes ;;
++      -d) isdir=: ;;
 +      -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$prev" = x-m && test -n "$install_override_mode"; then
++	  if test X-m = "X$prev" && 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=yes
-     if test "$isdir" = yes; then
-       destdir="$dest"
++    test -d "$dest" && isdir=:
++    if $isdir; 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=""
++	      tstripme=
++	      ;;
++	    esac
++	    ;;
++	  os2*)
++	    case $realname in
++	    *_dll.a)
++	      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 "$build_old_libs" = yes; then
++	if test yes = "$build_old_libs"; 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=yes
++	  finalize=:
 +	  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'` ### testsuite: skip nested quoting test
++	    libfile=$libdir/`$ECHO "$lib" | $SED 's%^.*/%%g'`
 +	    if test -n "$libdir" && test ! -f "$libfile"; then
- 	      func_warning "\`$lib' has not been installed in \`$libdir'"
- 	      finalize=no
++	      func_warning "'$lib' has not been installed in '$libdir'"
++	      finalize=false
 +	    fi
 +	  done
 +
 +	  relink_command=
 +	  func_source "$wrapper"
 +
 +	  outputname=
- 	  if test "$fast_install" = no && test -n "$relink_command"; then
++	  if test no = "$fast_install" && test -n "$relink_command"; then
 +	    $opt_dry_run || {
- 	      if test "$finalize" = yes; then
++	      if $finalize; 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_silent || {
++	        $opt_quiet || {
 +	          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 "$opt_mode" = install && func_mode_install ${1+"$@"}
++test install = "$opt_mode" && 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 ()
 +{
-     $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'`
++    $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'`
 +    my_dlsyms=
 +
-     if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
++    if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; 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$TIMESTAMP) $VERSION */
++/* $my_dlsyms - symbol resolution table for '$my_outputname' dlsym emulation. */
++/* Generated by $PROGRAM (GNU $PACKAGE) $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 con't be const, because runtime
++#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
++/* DATA imports from DLLs on WIN32 can'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 "$dlself" = yes; then
- 	  func_verbose "generating symbol list for \`$output'"
++	if test yes = "$dlself"; 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[];
++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_DLSYM_CONST lt_dlsymlist
 +lt_${my_prefix}_LTX_preloaded_symbols[] =
- {\
-   { \"$my_originator\", (void *) 0 },"
++{ {\"$my_originator\", (void *) 0},"
++
++	  if test -s "$nlist"I; then
++	    echo >> "$output_objdir/$my_dlsyms" "\
++  {\"@INIT@\", (void *) &lt_syminit},"
++	  fi
 +
 +	  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"  ;;
 +	  *)
- 	    if test "X$my_pic_p" != Xno; then
- 	      pic_flag_for_symtable=" $pic_flag"
- 	    fi
++	    $my_pic_p && pic_flag_for_symtable=" $pic_flag"
 +	    ;;
 +	  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"'
++	func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T" "${nlist}I"'
 +
 +	# 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 ()
 +{
-   $opt_debug
-   win32_libid_type="unknown"
++  $debug_cmd
++
++  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
-       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 '
++      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 '
 +	    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 ()
 +{
-   $opt_debug
++  $debug_cmd
++
 +  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 ()
 +{
-   $opt_debug
++  $debug_cmd
++
 +  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 which possess that section. Heuristic: eliminate
-     # all those which have a first or second character that is
++    # archive that possess that section. Heuristic: eliminate
++    # all those that 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 ()
 +{
-   $opt_debug
-   if func_cygming_gnu_implib_p "$1" ; then
++  $debug_cmd
++
++  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 ()
 +{
-     $opt_debug
-     f_ex_an_ar_dir="$1"; shift
-     f_ex_an_ar_oldlib="$1"
-     if test "$lock_old_archive_extraction" = yes; then
++    $debug_cmd
++
++    f_ex_an_ar_dir=$1; shift
++    f_ex_an_ar_oldlib=$1
++    if test yes = "$lock_old_archive_extraction"; 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 "$lock_old_archive_extraction" = yes; then
++    if test yes = "$lock_old_archive_extraction"; 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 ()
 +{
-     $opt_debug
-     my_gentop="$1"; shift
++    $debug_cmd
++
++    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`
- 	  darwin_base_archive=`basename "$darwin_archive"`
++	  func_basename "$darwin_archive"
++	  darwin_base_archive=$func_basename_result
 +	  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 "$basename" | sort -u`
++	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$sed_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 in which it is stored is
++# will assume that the directory where 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$TIMESTAMP) $VERSION
++# Generated by $PROGRAM (GNU $PACKAGE) $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/ which is used only on
++# /script/ and the wrapper /executable/ that is used only on
 +# windows platforms, and (c) all begin with the string "--lt-"
- # (application programs are unlikely to have options which match
++# (application programs are unlikely to have options that 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$TIMESTAMP) $VERSION\" 1>&2
++    echo \"$outputname:$output:\$LINENO: libtool wrapper (GNU $PACKAGE) $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 "$fast_install" = yes; then
++	if test yes = "$fast_install"; 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 "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
++	if test yes = "$shlibpath_overrides_runpath" && 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$TIMESTAMP) $VERSION
++   Generated by $PROGRAM (GNU $PACKAGE) $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 platforms) ... */
++/* #elif defined other_platform || defined ... */
 +#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
- # ifndef _INTPTR_T_DEFINED
- #  define _INTPTR_T_DEFINED
- #  define intptr_t int
- # endif
- #elif defined(__MINGW32__)
++#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 ((void *) stale); stale = 0; } \
++  if (stale) { free (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
- volatile const char * MAGIC_EXE = "$magic_exe";
++#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";
 +const char * LIB_PATH_VARNAME = "$shlibpath_var";
 +EOF
 +
- 	    if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
++	    if test yes = "$shlibpath_overrides_runpath" && 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 "$fast_install" = yes; then
++	    if test yes = "$fast_install"; 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;
-   intptr_t rval = 127;
++  int rval = 127;
 +
 +  int i;
 +
 +  program_name = (char *) xstrdup (base_name (argv[0]));
-   newargz = XMALLOC (char *, argc + 1);
++  newargz = XMALLOC (char *, (size_t) 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 (strcmp (argv[i], dumpscript_opt) == 0)
++      if (STREQ (argv[i], dumpscript_opt))
 +	{
 +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 (strcmp (argv[i], debug_opt) == 0)
++      if (STREQ (argv[i], debug_opt))
 +	{
 +          lt_debug = 1;
 +          continue;
 +	}
-       if (strcmp (argv[i], ltwrapper_option_prefix) == 0)
++      if (STREQ (argv[i], ltwrapper_option_prefix))
 +        {
 +          /* 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$TIMESTAMP) $VERSION\n");
++  lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE) $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 = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
++  rval = (int) _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];
-   int tmp_len;
++  size_t 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 = q - p;
++	      p_len = (size_t) (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 (strcmp (str, pat) == 0)
++      if (STREQ (str, pat))
 +	*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
-     int len = strlen (name) + 1 + strlen (value) + 1;
++    size_t 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)
 +    {
-       int orig_value_len = strlen (orig_value);
-       int add_len = strlen (add);
++      size_t orig_value_len = strlen (orig_value);
++      size_t 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 #' */
-       int len = strlen (new_value);
-       while (((len = strlen (new_value)) > 0) && IS_PATH_SEPARATOR (new_value[len-1]))
++      size_t len = strlen (new_value);
++      while ((len > 0) && IS_PATH_SEPARATOR (new_value[len-1]))
 +        {
-           new_value[len-1] = '\0';
++          new_value[--len] = '\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 ()
 +{
-     $opt_debug
++    $debug_cmd
++
 +    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 ()
 +{
-     $opt_debug
++    $debug_cmd
++
 +    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
-       # which system we are compiling for in order to pass an extra
++      # what 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 which has undefined symbols, in which case not
++      # to make a dll that 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=no
++    preload=false
 +    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 "$build_libtool_libs" != yes && \
- 	  func_fatal_configuration "can not build a shared library"
++	test yes != "$build_libtool_libs" \
++	  && func_fatal_configuration "cannot build a shared library"
 +	build_old_libs=no
 +	break
 +	;;
 +      -all-static | -static | -static-libtool-libs)
 +	case $arg in
 +	-all-static)
- 	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
++	  if test yes = "$build_libtool_libs" && 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)
- 	  if test "$preload" = no; then
++	  $preload || {
 +	    # Add the symbol object into the linking commands.
 +	    func_append compile_command " @SYMFILE@"
 +	    func_append finalize_command " @SYMFILE@"
- 	    preload=yes
- 	  fi
++	    preload=:
++	  }
 +	  case $arg in
 +	  *.la | *.lo) ;;  # We handle these cases below.
 +	  force)
- 	    if test "$dlself" = no; then
++	    if test no = "$dlself"; then
 +	      dlself=needless
 +	      export_dynamic=yes
 +	    fi
 +	    prev=
 +	    continue
 +	    ;;
 +	  self)
- 	    if test "$prev" = dlprefiles; then
++	    if test dlprefiles = "$prev"; then
 +	      dlself=yes
- 	    elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
++	    elif test dlfiles = "$prev" && test yes != "$dlopen_self"; then
 +	      dlself=yes
 +	    else
 +	      dlself=needless
 +	      export_dynamic=yes
 +	    fi
 +	    prev=
 +	    continue
 +	    ;;
 +	  *)
- 	    if test "$prev" = dlfiles; then
++	    if test dlfiles = "$prev"; 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"
++	  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.
 +	  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 "$pic_object" = none &&
- 		   test "$non_pic_object" = none; then
- 		  func_fatal_error "cannot find name of object for \`$arg'"
++		   test none = "$pic_object" &&
++		   test none = "$non_pic_object"; 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 "$pic_object" != none; then
++		if test none != "$pic_object"; then
 +		  # Prepend the subdirectory the object is found in.
- 		  pic_object="$xdir$pic_object"
++		  pic_object=$xdir$pic_object
 +
- 		  if test "$prev" = dlfiles; then
- 		    if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
++		  if test dlfiles = "$prev"; then
++		    if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; 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 "$prev" = dlprefiles; then
++		  if test dlprefiles = "$prev"; 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 "$non_pic_object" != none; then
++		if test none != "$non_pic_object"; 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 "$pic_object" = none ; then
- 		    arg="$non_pic_object"
++		  if test -z "$pic_object" || test none = "$pic_object"; 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 "$prev" = rpath; then
++	  if test rpath = "$prev"; 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$arg" = "X-export-symbols"; then
++	if test X-export-symbols = "X$arg"; 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$arg" = "X-lc" || test "X$arg" = "X-lm"; then
++	if test X-lc = "X$arg" || test X-lm = "X$arg"; 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$arg" = "X-lc" && continue
++	    test X-lc = "X$arg" && continue
 +	    ;;
- 	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
++	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*)
 +	    # Do not include libc due to us having libc/libc_r.
- 	    test "X$arg" = "X-lc" && continue
++	    test X-lc = "X$arg" && 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$arg" = "X-lc" && continue
++	    test X-lc = "X$arg" && continue
 +	    ;;
 +	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
 +	    # Compiler inserts libc in the correct place for threads to work
- 	    test "X$arg" = "X-lc" && continue
++	    test X-lc = "X$arg" && continue
 +	    ;;
 +	  esac
- 	elif test "X$arg" = "X-lc_r"; then
++	elif test X-lc_r = "X$arg"; then
 +	 case $host in
- 	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
++	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*)
 +	   # 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*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
++      # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
++      # -specs=*             GCC specs files
++      # -stdlib=*            select c++ std lib with clang
++      # -fsanitize=*         Clang/GCC memory and address sanitizer
 +      -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*|-flto*|-fwhopr*|-fuse-linker-plugin)
++      -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
++      -specs=*|-fsanitize=*)
 +        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 "$pic_object" = none &&
- 	     test "$non_pic_object" = none; then
- 	    func_fatal_error "cannot find name of object for \`$arg'"
++	     test none = "$pic_object" &&
++	     test none = "$non_pic_object"; 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 "$pic_object" != none; then
++	  test none = "$pic_object" || {
 +	    # Prepend the subdirectory the object is found in.
- 	    pic_object="$xdir$pic_object"
++	    pic_object=$xdir$pic_object
 +
- 	    if test "$prev" = dlfiles; then
- 	      if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
++	    if test dlfiles = "$prev"; then
++	      if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; 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 "$prev" = dlprefiles; then
++	    if test dlprefiles = "$prev"; then
 +	      # Preload the old-style object.
 +	      func_append dlprefiles " $pic_object"
 +	      prev=
 +	    fi
 +
 +	    # A PIC object.
 +	    func_append libobjs " $pic_object"
- 	    arg="$pic_object"
- 	  fi
++	    arg=$pic_object
++	  }
 +
 +	  # Non-PIC object.
- 	  if test "$non_pic_object" != none; then
++	  if test none != "$non_pic_object"; 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 "$pic_object" = none ; then
- 	      arg="$non_pic_object"
++	    if test -z "$pic_object" || test none = "$pic_object"; 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 "$prev" = dlfiles; then
++	if test dlfiles = "$prev"; then
 +	  # This library was specified with -dlopen.
 +	  func_append dlfiles " $func_resolve_sysroot_result"
 +	  prev=
- 	elif test "$prev" = dlprefiles; then
++	elif test dlprefiles = "$prev"; 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 "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
++    if test yes = "$export_dynamic" && 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 "$linkmode" = lib; then
++    if test lib = "$linkmode"; 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=no
++	alldeplibs=false
 +	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 "$linkmode,$pass" = "lib,link"; then
++      if test lib,link = "$linkmode,$pass"; 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 "$linkmode,$pass" = "lib,link" ||
- 	 test "$linkmode,$pass" = "prog,scan"; then
- 	libs="$deplibs"
++      if test lib,link = "$linkmode,$pass" ||
++	 test prog,scan = "$linkmode,$pass"; then
++	libs=$deplibs
 +	deplibs=
 +      fi
-       if test "$linkmode" = prog; then
++      if test prog = "$linkmode"; then
 +	case $pass in
- 	dlopen) libs="$dlfiles" ;;
- 	dlpreopen) libs="$dlprefiles" ;;
++	dlopen) libs=$dlfiles ;;
++	dlpreopen) libs=$dlprefiles ;;
 +	link)
 +	  libs="$deplibs %DEPLIBS%"
 +	  test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
 +	  ;;
 +	esac
 +      fi
-       if test "$linkmode,$pass" = "lib,dlpreopen"; then
++      if test lib,dlpreopen = "$linkmode,$pass"; 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 "$pass" = dlopen; then
++      if test dlopen = "$pass"; then
 +	# Collect dlpreopened libraries
- 	save_deplibs="$deplibs"
++	save_deplibs=$deplibs
 +	deplibs=
 +      fi
 +
 +      for deplib in $libs; do
 +	lib=
- 	found=no
++	found=false
 +	case $deplib in
 +	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
 +        |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
- 	  if test "$linkmode,$pass" = "prog,link"; then
++	  if test prog,link = "$linkmode,$pass"; then
 +	    compile_deplibs="$deplib $compile_deplibs"
 +	    finalize_deplibs="$deplib $finalize_deplibs"
 +	  else
 +	    func_append compiler_flags " $deplib"
- 	    if test "$linkmode" = lib ; then
++	    if test lib = "$linkmode"; then
 +		case "$new_inherited_linker_flags " in
 +		    *" $deplib "*) ;;
 +		    * ) func_append new_inherited_linker_flags " $deplib" ;;
 +		esac
 +	    fi
 +	  fi
 +	  continue
 +	  ;;
 +	-l*)
- 	  if test "$linkmode" != lib && test "$linkmode" != prog; then
- 	    func_warning "\`-l' is ignored for archives/objects"
++	  if test lib != "$linkmode" && test prog != "$linkmode"; then
++	    func_warning "'-l' is ignored for archives/objects"
 +	    continue
 +	  fi
 +	  func_stripname '-l' '' "$deplib"
 +	  name=$func_stripname_result
- 	  if test "$linkmode" = lib; then
++	  if test lib = "$linkmode"; 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 "$search_ext" = ".la"; then
- 		  found=yes
++		if test .la = "$search_ext"; then
++		  found=:
 +		else
- 		  found=no
++		  found=false
 +		fi
 +		break 2
 +	      fi
 +	    done
 +	  done
- 	  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 $found; then
++	    # 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 "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
++	    if test yes = "$allow_libtool_libs_with_static_runtimes"; 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=no
++		  if test "X$ll" = "X$old_library"; then # only static version available
++		    found=false
 +		    func_dirname "$lib" "" "."
- 		    ladir="$func_dirname_result"
++		    ladir=$func_dirname_result
 +		    lib=$ladir/$old_library
- 		    if test "$linkmode,$pass" = "prog,link"; then
++		    if test prog,link = "$linkmode,$pass"; then
 +		      compile_deplibs="$deplib $compile_deplibs"
 +		      finalize_deplibs="$deplib $finalize_deplibs"
 +		    else
 +		      deplibs="$deplib $deplibs"
- 		      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
++		      test lib = "$linkmode" && 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 "$linkmode,$pass" = "prog,link"; then
++	  if test prog,link = "$linkmode,$pass"; then
 +	    compile_deplibs="$deplib $compile_deplibs"
 +	    finalize_deplibs="$deplib $finalize_deplibs"
 +	  else
 +	    deplibs="$deplib $deplibs"
- 	    if test "$linkmode" = lib ; then
++	    if test lib = "$linkmode"; 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 "$pass" = conv && continue
++	    test conv = "$pass" && 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 "$pass" = conv; then
++	    if test conv = "$pass"; then
 +	      deplibs="$deplib $deplibs"
 +	      continue
 +	    fi
- 	    if test "$pass" = scan; then
++	    if test scan = "$pass"; 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 "$pass" = link; then
++	  if test link = "$pass"; 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 "$pass" = conv; then
++	  if test conv = "$pass"; 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=no
++	      valid_a_lib=false
 +	      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=yes
++		    valid_a_lib=:
 +		  fi
 +		;;
 +		pass_all)
- 		  valid_a_lib=yes
++		  valid_a_lib=:
 +		;;
 +	      esac
- 	      if test "$valid_a_lib" != yes; then
++	      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
 +		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 "$pass" != link; then
++	    if test link != "$pass"; then
 +	      deplibs="$deplib $deplibs"
 +	    else
 +	      compile_deplibs="$deplib $compile_deplibs"
 +	      finalize_deplibs="$deplib $finalize_deplibs"
 +	    fi
 +	    continue
 +	    ;;
 +	  esac # linkmode
 +	  ;; # *.$libext
 +	*.lo | *.$objext)
- 	  if test "$pass" = conv; then
++	  if test conv = "$pass"; then
 +	    deplibs="$deplib $deplibs"
- 	  elif test "$linkmode" = prog; then
- 	    if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
++	  elif test prog = "$linkmode"; then
++	    if test dlpreopen = "$pass" || test yes != "$dlopen_support" || test no = "$build_libtool_libs"; 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=yes
++	  alldeplibs=:
 +	  continue
 +	  ;;
 +	esac # case $deplib
 +
- 	if test "$found" = yes || test -f "$lib"; then :
- 	else
- 	  func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'"
- 	fi
++	$found || test -f "$lib" \
++	  || func_fatal_error "cannot find the library '$lib' or unhandled argument '$deplib'"
 +
 +	# 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 "$linkmode,$pass" = "lib,link" ||
- 	   test "$linkmode,$pass" = "prog,scan" ||
- 	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
++	if test lib,link = "$linkmode,$pass" ||
++	   test prog,scan = "$linkmode,$pass" ||
++	   { test prog != "$linkmode" && test lib != "$linkmode"; }; then
 +	  test -n "$dlopen" && func_append dlfiles " $dlopen"
 +	  test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
 +	fi
 +
- 	if test "$pass" = conv; then
++	if test conv = "$pass"; 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"
 +	    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
- 	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
- 	    func_fatal_error "\`$lib' is not a convenience library"
++	  elif test prog != "$linkmode" && test lib != "$linkmode"; then
++	    func_fatal_error "'$lib' is not a convenience library"
 +	  fi
 +	  continue
 +	fi # $pass = conv
 +
 +
 +	# Get the name of the library we link against.
 +	linklib=
 +	if test -n "$old_library" &&
- 	   { test "$prefer_static_libs" = yes ||
- 	     test "$prefer_static_libs,$installed" = "built,no"; }; then
++	   { test yes = "$prefer_static_libs" ||
++	     test built,no = "$prefer_static_libs,$installed"; }; 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 "$pass" = dlopen; then
- 	  if test -z "$libdir"; then
- 	    func_fatal_error "cannot -dlopen a convenience library: \`$lib'"
- 	  fi
++	if test dlopen = "$pass"; then
++	  test -z "$libdir" \
++	    && func_fatal_error "cannot -dlopen a convenience library: '$lib'"
 +	  if test -z "$dlname" ||
- 	     test "$dlopen_support" != yes ||
- 	     test "$build_libtool_libs" = no; then
++	     test yes != "$dlopen_support" ||
++	     test no = "$build_libtool_libs"
++	  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 "X$installed" = Xyes; then
++	if test yes = "$installed"; 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 "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
++	  test yes = "$hardcode_automatic" && 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 "$pass" = dlpreopen; then
- 	  if test -z "$libdir" && test "$linkmode" = prog; then
- 	    func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
++	if test dlpreopen = "$pass"; then
++	  if test -z "$libdir" && test prog = "$linkmode"; 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 "$linkmode" = lib; then
++	  if test lib = "$linkmode"; then
 +	    deplibs="$dir/$old_library $deplibs"
- 	  elif test "$linkmode,$pass" = "prog,link"; then
++	  elif test prog,link = "$linkmode,$pass"; 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 "$linkmode" = prog && test "$pass" != link; then
++	if test prog = "$linkmode" && test link != "$pass"; then
 +	  func_append newlib_search_path " $ladir"
 +	  deplibs="$lib $deplibs"
 +
- 	  linkalldeplibs=no
- 	  if test "$link_all_deplibs" != no || test -z "$library_names" ||
- 	     test "$build_libtool_libs" = no; then
- 	    linkalldeplibs=yes
++	  linkalldeplibs=false
++	  if test no != "$link_all_deplibs" || test -z "$library_names" ||
++	     test no = "$build_libtool_libs"; then
++	    linkalldeplibs=:
 +	  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 test "$linkalldeplibs" = yes; then
++	    if $linkalldeplibs; 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 "$linkmode,$pass" = "prog,link"; then
++	if test prog,link = "$linkmode,$pass"; then
 +	  if test -n "$library_names" &&
- 	     { { test "$prefer_static_libs" = no ||
- 	         test "$prefer_static_libs,$installed" = "built,yes"; } ||
++	     { { test no = "$prefer_static_libs" ||
++	         test built,yes = "$prefer_static_libs,$installed"; } ||
 +	       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 test "$alldeplibs" = yes &&
- 	     { test "$deplibs_check_method" = pass_all ||
- 	       { test "$build_libtool_libs" = yes &&
++	  if $alldeplibs &&
++	     { test pass_all = "$deplibs_check_method" ||
++	       { test yes = "$build_libtool_libs" &&
 +		 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 "$use_static_libs" = built && test "$installed" = yes; then
++	if test built = "$use_static_libs" && test yes = "$installed"; then
 +	  use_static_libs=no
 +	fi
 +	if test -n "$library_names" &&
- 	   { test "$use_static_libs" = no || test -z "$old_library"; }; then
++	   { test no = "$use_static_libs" || test -z "$old_library"; }; then
 +	  case $host in
- 	  *cygwin* | *mingw* | *cegcc*)
++	  *cygwin* | *mingw* | *cegcc* | *os2*)
 +	      # No point in relinking DLLs because paths are not encoded
 +	      func_append notinst_deplibs " $lib"
 +	      need_relink=no
 +	    ;;
 +	  *)
- 	    if test "$installed" = no; then
++	    if test no = "$installed"; 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 "$shouldnotlink" = yes && test "$pass" = link; then
++	  if test -z "$dlopenmodule" && test yes = "$shouldnotlink" && test link = "$pass"; then
 +	    echo
- 	    if test "$linkmode" = prog; then
++	    if test prog = "$linkmode"; 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 "$linkmode" = lib &&
- 	     test "$hardcode_into_libs" = yes; then
++	  if test lib = "$linkmode" &&
++	     test yes = "$hardcode_into_libs"; 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*)
++	      *cygwin* | mingw* | *cegcc* | *os2*)
 +	        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 "$linkmode" = prog || test "$opt_mode" != relink; then
++	  if test prog = "$linkmode" || test relink != "$opt_mode"; then
 +	    add_shlibpath=
 +	    add_dir=
 +	    add=
 +	    lib_linked=yes
 +	    case $hardcode_action in
 +	    immediate | unsupported)
- 	      if test "$hardcode_direct" = no; then
- 		add="$dir/$linklib"
++	      if test no = "$hardcode_direct"; 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 can not
++		    # if the lib is a (non-dlopened) module then we cannot
 +		    # 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 "$hardcode_minus_L" = no; then
++	      elif test no = "$hardcode_minus_L"; then
 +		case $host in
- 		*-*-sunos*) add_shlibpath="$dir" ;;
++		*-*-sunos*) add_shlibpath=$dir ;;
 +		esac
- 		add_dir="-L$dir"
- 		add="-l$name"
- 	      elif test "$hardcode_shlibpath_var" = no; then
- 		add_shlibpath="$dir"
- 		add="-l$name"
++		add_dir=-L$dir
++		add=-l$name
++	      elif test no = "$hardcode_shlibpath_var"; then
++		add_shlibpath=$dir
++		add=-l$name
 +	      else
 +		lib_linked=no
 +	      fi
 +	      ;;
 +	    relink)
- 	      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"
++	      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
 +		# 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 "$hardcode_shlibpath_var" = yes; then
- 		add_shlibpath="$dir"
- 		add="-l$name"
++		add=-l$name
++	      elif test yes = "$hardcode_shlibpath_var"; then
++		add_shlibpath=$dir
++		add=-l$name
 +	      else
 +		lib_linked=no
 +	      fi
 +	      ;;
 +	    *) lib_linked=no ;;
 +	    esac
 +
- 	    if test "$lib_linked" != yes; then
++	    if test yes != "$lib_linked"; 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 "$linkmode" = prog; then
++	    if test prog = "$linkmode"; 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 "$hardcode_direct" != yes &&
- 		 test "$hardcode_minus_L" != yes &&
- 		 test "$hardcode_shlibpath_var" = yes; then
++	      if test yes != "$hardcode_direct" &&
++		 test yes != "$hardcode_minus_L" &&
++		 test yes = "$hardcode_shlibpath_var"; then
 +		case :$finalize_shlibpath: in
 +		*":$libdir:"*) ;;
 +		*) func_append finalize_shlibpath "$libdir:" ;;
 +		esac
 +	      fi
 +	    fi
 +	  fi
 +
- 	  if test "$linkmode" = prog || test "$opt_mode" = relink; then
++	  if test prog = "$linkmode" || test relink = "$opt_mode"; then
 +	    add_shlibpath=
 +	    add_dir=
 +	    add=
 +	    # Finalize command for both is simple: just hardcode it.
- 	    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
++	    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
 +	      case :$finalize_shlibpath: in
 +	      *":$libdir:"*) ;;
 +	      *) func_append finalize_shlibpath "$libdir:" ;;
 +	      esac
- 	      add="-l$name"
- 	    elif test "$hardcode_automatic" = yes; then
++	      add=-l$name
++	    elif test yes = "$hardcode_automatic"; 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 "$linkmode" = prog; then
++	    if test prog = "$linkmode"; 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 "$linkmode" = prog; then
++	elif test prog = "$linkmode"; 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 "$hardcode_direct" != unsupported; then
- 	    test -n "$old_library" && linklib="$old_library"
++	  if test unsupported != "$hardcode_direct"; 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 "$build_libtool_libs" = yes; then
++	elif test yes = "$build_libtool_libs"; then
 +	  # Not a shared library
- 	  if test "$deplibs_check_method" != pass_all; then
++	  if test pass_all != "$deplibs_check_method"; 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 can not link to static lib archive $lib."
++	    $ECHO "*** Warning: This system cannot 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 "$module" = yes; then
++	    if test yes = "$module"; 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 "$build_old_libs" = no; then
++	      if test no = "$build_old_libs"; 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 "$linkmode" = lib; then
++	if test lib = "$linkmode"; then
 +	  if test -n "$dependency_libs" &&
- 	     { test "$hardcode_into_libs" != yes ||
- 	       test "$build_old_libs" = yes ||
- 	       test "$link_static" = yes; }; then
++	     { test yes != "$hardcode_into_libs" ||
++	       test yes = "$build_old_libs" ||
++	       test yes = "$link_static"; }; 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 "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
++	  test no = "$link_static" && 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 "$link_all_deplibs" != no; then
++	  if test no != "$link_all_deplibs"; 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 "$pass" = link; then
- 	if test "$linkmode" = "prog"; then
++      if test link = "$pass"; then
++	if test prog = "$linkmode"; 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 "$pass" = dlpreopen; then
++      dependency_libs=$newdependency_libs
++      if test dlpreopen = "$pass"; then
 +	# Link the dlpreopened libraries before other libraries
 +	for deplib in $save_deplibs; do
 +	  deplibs="$deplib $deplibs"
 +	done
 +      fi
-       if test "$pass" != dlopen; then
- 	if test "$pass" != conv; then
++      if test dlopen != "$pass"; then
++	test conv = "$pass" || {
 +	  # 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 "$linkmode,$pass" != "prog,link"; then
- 	  vars="deplibs"
- 	else
++	if test prog,link = "$linkmode,$pass"; then
 +	  vars="compile_deplibs finalize_deplibs"
++	else
++	  vars=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 "$linkmode" = prog; then
-       dlfiles="$newdlfiles"
++    if test prog = "$linkmode"; then
++      dlfiles=$newdlfiles
 +    fi
-     if test "$linkmode" = prog || test "$linkmode" = lib; then
-       dlprefiles="$newdlprefiles"
++    if test prog = "$linkmode" || test lib = "$linkmode"; then
++      dlprefiles=$newdlprefiles
 +    fi
 +
 +    case $linkmode in
 +    oldlib)
-       if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
- 	func_warning "\`-dlopen' is ignored for archives"
++      if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; 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 "$module" = no && \
- 	  func_fatal_help "libtool library \`$output' must begin with \`lib'"
++	test no = "$module" \
++	  && func_fatal_help "libtool library '$output' must begin with 'lib'"
 +
- 	if test "$need_lib_prefix" != no; then
++	if test no != "$need_lib_prefix"; 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 "$deplibs_check_method" != pass_all; then
- 	  func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"
++	if test pass_all != "$deplibs_check_method"; 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 "$dlself" != no && \
- 	func_warning "\`-dlopen self' is ignored for libtool libraries"
++      test no = "$dlself" \
++	|| func_warning "'-dlopen self' is ignored for libtool libraries"
 +
 +      set dummy $rpath
 +      shift
-       test "$#" -gt 1 && \
- 	func_warning "ignoring multiple \`-rpath's for a libtool library"
++      test 1 -lt "$#" \
++	&& func_warning "ignoring multiple '-rpath's for a libtool library"
 +
-       install_libdir="$1"
++      install_libdir=$1
 +
 +      oldlibs=
 +      if test -z "$rpath"; then
- 	if test "$build_libtool_libs" = yes; then
++	if test yes = "$build_libtool_libs"; 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
- 	  # which has an extra 1 added just for fun
++	  # that has an extra 1 added just for fun
 +	  #
 +	  case $version_type in
 +	  # correct linux to gnu/linux during the next big refactor
- 	  darwin|linux|osf|windows|none)
++	  darwin|freebsd-elf|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|freebsd-elf|qnx|sunos)
- 	    current="$number_major"
- 	    revision="$number_minor"
- 	    age="0"
++	  freebsd-aout|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
 +	    ;;
 +	  *)
- 	    func_fatal_configuration "$modename: unknown library version type \`$version_type'"
++	    func_fatal_configuration "$modename: unknown library version type '$version_type'"
 +	    ;;
 +	  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)
- 	  major=".$current"
- 	  versuffix=".$current"
++	  func_arith $current - $age
++	  major=.$func_arith_result
++	  versuffix=$major.$age.$revision
 +	  ;;
 +
 +	irix | nonstopux)
- 	  if test "X$lt_irix_increment" = "Xno"; then
++	  if test no = "$lt_irix_increment"; 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 "$loop" -ne 0; do
++	  while test 0 -ne "$loop"; 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 "$loop" -ne 0; do
++	  while test 0 -ne "$loop"; 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"
++	  major=.$current
++	  versuffix=.$current
++	  ;;
++
++	sco)
++	  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 filesystems.
++	  # extension on DOS 8.3 file systems.
 +	  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 "$need_version" = no; then
++	  if test no = "$need_version"; then
 +	    versuffix=
 +	  else
- 	    versuffix=".0.0"
++	    versuffix=.0.0
 +	  fi
 +	fi
 +
 +	# Remove version info from name if versioning should be avoided
- 	if test "$avoid_version" = yes && test "$need_version" = no; then
++	if test yes,no = "$avoid_version,$need_version"; then
 +	  major=
 +	  versuffix=
- 	  verstring=""
++	  verstring=
 +	fi
 +
 +	# Check to see if the archive will have undefined symbols.
- 	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
++	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
 +	  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" "yes"
++      func_generate_dlsyms "$libname" "$libname" :
 +      func_append libobjs " $symfileobj"
-       test "X$libobjs" = "X " && libobjs=
++      test " " = "$libobjs" && libobjs=
 +
-       if test "$opt_mode" != relink; then
++      if test relink != "$opt_mode"; 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 "X$precious_files_regex" != "X"; then
++	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/$libname$release.*)
++	       if test -n "$precious_files_regex"; 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 "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
++      if test yes = "$build_old_libs" && test convenience != "$build_libtool_libs"; 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 "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
++	if test yes != "$hardcode_into_libs" || test yes = "$build_old_libs"; 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 "$build_libtool_libs" = yes; then
++      if test yes = "$build_libtool_libs"; 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 "$build_libtool_need_lc" = "yes"; then
++	    if test yes = "$build_libtool_need_lc"; 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 "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
++		if test yes = "$allow_libtool_libs_with_static_runtimes"; 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 "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
++		  if test yes = "$allow_libtool_libs_with_static_runtimes"; 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 "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
++	      if test yes = "$allow_libtool_libs_with_static_runtimes"; 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 "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob`
++		test yes = "$want_nocaseglob" && nocaseglob=`shopt -p nocaseglob`
 +		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
- 		  if test "$want_nocaseglob" = yes; then
++		  if test yes = "$want_nocaseglob"; 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 "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
++	      if test yes = "$allow_libtool_libs_with_static_runtimes"; 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 "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
- 	    for i in $predeps $postdeps ; do
++	  if test yes = "$allow_libtool_libs_with_static_runtimes"; 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 "X$deplibs_check_method" = "Xnone"; then
++	    if test none = "$deplibs_check_method"; 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 "$droppeddeps" = yes; then
- 	  if test "$module" = yes; then
++	if test yes = "$droppeddeps"; then
++	  if test yes = "$module"; 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 "$build_old_libs" = no; then
- 	      oldlibs="$output_objdir/$libname.$libext"
++	    if test no = "$build_old_libs"; 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 "$allow_undefined" = no; then
++	    if test no = "$allow_undefined"; 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 "$build_old_libs" = no; then
- 		oldlibs="$output_objdir/$libname.$libext"
++	      if test no = "$build_old_libs"; 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 "$build_libtool_libs" = yes; then
- 	# Remove ${wl} instances when linking with ld.
++      if test yes = "$build_libtool_libs"; then
++	# Remove $wl instances when linking with ld.
 +	# FIXME: should test the right _cmds variable.
 +	case $archive_cmds in
 +	  *\$LD\ *) wl= ;;
 +        esac
- 	if test "$hardcode_into_libs" = yes; then
++	if test yes = "$hardcode_into_libs"; then
 +	  # Hardcode the library paths
 +	  hardcode_libdirs=
 +	  dep_rpath=
- 	  rpath="$finalize_rpath"
- 	  test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
++	  rpath=$finalize_rpath
++	  test relink = "$opt_mode" || 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 "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
++	shlibpath=$finalize_shlibpath
++	test relink = "$opt_mode" || 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
- 	    if test "x`$SED 1q $export_symbols`" != xEXPORTS; then
++	    func_dll_def_p "$export_symbols" || {
 +	      # 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 "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
- 	    func_verbose "generating symbol list for \`$libname.la'"
- 	    export_symbols="$output_objdir/$libname.exp"
++	  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
 +	    $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 "$try_normal_branch" = yes \
++	      if test yes = "$try_normal_branch" \
 +		 && { 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 "X$skipped_export" != "X:"; then
++	    IFS=$save_ifs
++	    if test -n "$export_symbols_regex" && test : != "$skipped_export"; 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 "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
++	if test : != "$skipped_export" && 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 "$compiler_needs_object" = yes &&
++	    test yes = "$compiler_needs_object" &&
 +	    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 "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
++	if test yes = "$thread_safe" && 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 "$opt_mode" = relink; then
++	if test relink = "$opt_mode"; 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 "$module" = yes && test -n "$module_cmds" ; then
++	if test yes = "$module" && 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 "X$skipped_export" != "X:" &&
++	if test : != "$skipped_export" &&
 +	   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 "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
- 	    output=${output_objdir}/${output_la}.lnkscript
++	  if test -n "$save_libobjs" && test : != "$skipped_export" && test yes = "$with_gnu_ld"; 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 "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
- 	    output=${output_objdir}/${output_la}.lnk
++	  elif test -n "$save_libobjs" && test : != "$skipped_export" && test -n "$file_list_spec"; then
++	    output=$output_objdir/$output_la.lnk
 +	    func_verbose "creating linker input file list: $output"
 +	    : > $output
 +	    set x $save_libobjs
 +	    shift
 +	    firstobj=
- 	    if test "$compiler_needs_object" = yes; then
++	    if test yes = "$compiler_needs_object"; 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 "X$objlist" = X ||
++		if test -z "$objlist" ||
 +		   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 "$k" -eq 1 ; then
++		  if test 1 -eq "$k"; 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
 +
- 	    if ${skipped_export-false}; then
- 	      func_verbose "generating symbol list for \`$libname.la'"
- 	      export_symbols="$output_objdir/$libname.exp"
++	    ${skipped_export-false} && {
++	      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_silent || {
++	      IFS=$save_ifs
++	      $opt_quiet || {
 +		  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 "$opt_mode" = relink; then
++		if test relink = "$opt_mode"; 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
 +
-           if ${skipped_export-false}; then
++          ${skipped_export-false} && {
 +	    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 "$module" = yes && test -n "$module_cmds" ; then
++	  if test yes = "$module" && 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="$save_ifs"
++	  IFS=$sp$nl
 +	  eval cmd=\"$cmd\"
- 	  $opt_silent || {
++	  IFS=$save_ifs
++	  $opt_quiet || {
 +	    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 "$opt_mode" = relink; then
++	    if test relink = "$opt_mode"; 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 "$opt_mode" = relink; then
++	if test relink = "$opt_mode"; 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 "$module" = yes || test "$export_dynamic" = yes; then
++	if test yes = "$module" || test yes = "$export_dynamic"; then
 +	  # On all known operating systems, these are identical.
- 	  dlname="$soname"
++	  dlname=$soname
 +	fi
 +      fi
 +      ;;
 +
 +    obj)
-       if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
- 	func_warning "\`-dlopen' is ignored for objects"
++      if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; 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=
-       # 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 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
 +      if test -n "$convenience"; then
 +	if test -n "$whole_archive_flag_spec"; then
 +	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
- 	  reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
++	  test -n "$wl" || tmp_whole_archive_flags=`$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
++	  reload_conv_objs=$reload_objs\ $tmp_whole_archive_flags
 +	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 "$build_libtool_libs" != yes && libobjs="$non_pic_objects"
++      test yes = "$build_libtool_libs" || 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" ### testsuite: skip nested quoting test
++      reload_objs=$objs$old_deplibs' '`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; /\.lib$/d; $lo2o" | $NL2SP`' '$reload_conv_objs
 +
-       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
 +
-       if test "$build_libtool_libs" != yes; then
++      test yes = "$build_libtool_libs" || {
 +	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 "$pic_mode" != default; then
++      if test -n "$pic_flag" || test default != "$pic_mode"; 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"
 +
-       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."
++      $preload \
++	&& test unknown,unknown,unknown = "$dlopen_support,$dlopen_self,$dlopen_self_static" \
++	&& 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 "$tagname" = CXX ; then
++	if test CXX = "$tagname"; 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 "$build_old_libs" = yes; then
++      if test -n "$libobjs" && test yes = "$build_old_libs"; 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@" "no"
++      func_generate_dlsyms "$outputname" "@PROGRAM@" false
 +
 +      # template prelinking step
 +      if test -n "$prelink_cmds"; then
 +	func_execute_cmds "$prelink_cmds" 'exit $?'
 +      fi
 +
-       wrappers_required=yes
++      wrappers_required=:
 +      case $host in
 +      *cegcc* | *mingw32ce*)
 +        # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
-         wrappers_required=no
++        wrappers_required=false
 +        ;;
 +      *cygwin* | *mingw* )
-         if test "$build_libtool_libs" != yes; then
-           wrappers_required=no
-         fi
++        test yes = "$build_libtool_libs" || wrappers_required=false
 +        ;;
 +      *)
-         if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
-           wrappers_required=no
++        if test no = "$need_relink" || test yes != "$build_libtool_libs"; then
++          wrappers_required=false
 +        fi
 +        ;;
 +      esac
-       if test "$wrappers_required" = no; then
++      $wrappers_required || {
 +	# 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 "$no_install" = yes; then
++      if test yes = "$no_install"; 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
 +
-       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"
++      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
 +
- 	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
++	  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
 +
 +      # 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
 +
-       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"
++      case $build_libtool_libs in
++        convenience)
++	  oldobjs="$libobjs_save $symfileobj"
++	  addlibs=$convenience
 +	  build_libtool_libs=no
- 	else
++	  ;;
++	module)
++	  oldobjs=$libobjs_save
++	  addlibs=$old_convenience
++	  build_libtool_libs=no
++          ;;
++	*)
 +	  oldobjs="$old_deplibs $non_pic_objects"
- 	  if test "$preload" = yes && test -f "$symfileobj"; then
- 	    func_append oldobjs " $symfileobj"
- 	  fi
- 	fi
- 	addlibs="$old_convenience"
-       fi
++	  $preload && test -f "$symfileobj" \
++	    && func_append oldobjs " $symfileobj"
++	  addlibs=$old_convenience
++	  ;;
++      esac
 +
 +      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 "$build_libtool_libs" = yes; then
++      if test -n "$old_archive_from_new_cmds" && test yes = "$build_libtool_libs"; 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 "X$oldobjs" = "X" ; then
++	  if test -z "$oldobjs"; 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 "$build_old_libs" = yes && old_library="$libname.$libext"
++      test yes = "$build_old_libs" && 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 "$hardcode_automatic" = yes ; then
++      if test yes = "$hardcode_automatic"; then
 +	relink_command=
 +      fi
 +
 +      # Only create the output if not a dry run.
 +      $opt_dry_run || {
 +	for installed in no yes; do
- 	  if test "$installed" = yes; then
++	  if test yes = "$installed"; 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 "x$bindir" != x ;
- 	      then
++	      if test -n "$bindir"; 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$TIMESTAMP) $VERSION
++# Generated by $PROGRAM (GNU $PACKAGE) $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 can not go in dependency_libs.
++# Linker flags that cannot 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 "$installed" = no && test "$need_relink" = yes; then
++	  if test no,yes = "$installed,$need_relink"; 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
 +}
 +
- { test "$opt_mode" = link || test "$opt_mode" = relink; } &&
-     func_mode_link ${1+"$@"}
++if test link = "$opt_mode" || test relink = "$opt_mode"; then
++  func_mode_link ${1+"$@"}
++fi
 +
 +
 +# func_mode_uninstall arg...
 +func_mode_uninstall ()
 +{
-     $opt_debug
-     RM="$nonopt"
++    $debug_cmd
++
++    RM=$nonopt
 +    files=
-     rmforce=
++    rmforce=false
 +    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=yes ;;
++      -f) func_append RM " $arg"; rmforce=: ;;
 +      -*) 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 "X$dir" = X.; then
- 	odir="$objdir"
++      dir=$func_dirname_result
++      if test . = "$dir"; then
++	odir=$objdir
 +      else
- 	odir="$dir/$objdir"
++	odir=$dir/$objdir
 +      fi
 +      func_basename "$file"
-       name="$func_basename_result"
-       test "$opt_mode" = uninstall && odir="$dir"
++      name=$func_basename_result
++      test uninstall = "$opt_mode" && odir=$dir
 +
 +      # Remember odir for removal later, being careful to avoid duplicates
-       if test "$opt_mode" = clean; then
++      if test clean = "$opt_mode"; 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 test "$rmforce" = yes; then
++      elif $rmforce; 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" 'test "$rmforce" = yes || exit_status=1'
++	      func_execute_cmds "$postuninstall_cmds" '$rmforce || exit_status=1'
 +	    fi
 +
 +	    if test -n "$old_library"; then
 +	      # Do each command in the old_postuninstall commands.
- 	      func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
++	      func_execute_cmds "$old_postuninstall_cmds" '$rmforce || 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 "$pic_object" != none; then
++	  if test -n "$pic_object" && test none != "$pic_object"; 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 "$non_pic_object" != none; then
++	  if test -n "$non_pic_object" && test none != "$non_pic_object"; then
 +	    func_append rmfiles " $dir/$non_pic_object"
 +	  fi
 +	fi
 +	;;
 +
 +      *)
- 	if test "$opt_mode" = clean ; then
++	if test clean = "$opt_mode"; 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 "$fast_install" = yes && test -n "$relink_command"; then
++	    func_append rmfiles " $odir/$name $odir/${name}S.$objext"
++	    if test yes = "$fast_install" && 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
 +}
 +
- { test "$opt_mode" = uninstall || test "$opt_mode" = clean; } &&
-     func_mode_uninstall ${1+"$@"}
++if test uninstall = "$opt_mode" || test clean = "$opt_mode"; then
++  func_mode_uninstall ${1+"$@"}
++fi
 +
 +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
- # in which we disable both kinds of libraries.  Given conflicting
++# where 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 config/ltoptions.m4
index 5d9acd8,0000000..94b0829
mode 100644,000000..100644
--- a/config/ltoptions.m4
+++ b/config/ltoptions.m4
@@@ -1,384 -1,0 +1,437 @@@
 +# Helper functions for option handling.                    -*- Autoconf -*-
 +#
- #   Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation,
- #   Inc.
++#   Copyright (C) 2004-2005, 2007-2009, 2011-2015 Free Software
++#   Foundation, Inc.
 +#   Written by Gary V. Vaughan, 2004
 +#
 +# This file is free software; the Free Software Foundation gives
 +# unlimited permission to copy and/or distribute it, with or without
 +# modifications, as long as this notice is preserved.
 +
- # serial 7 ltoptions.m4
++# serial 8 ltoptions.m4
 +
 +# This is to help aclocal find these macros, as it can't see m4_define.
 +AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
 +
 +
 +# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME)
 +# ------------------------------------------
 +m4_define([_LT_MANGLE_OPTION],
 +[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])])
 +
 +
 +# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME)
 +# ---------------------------------------
 +# Set option OPTION-NAME for macro MACRO-NAME, and if there is a
 +# matching handler defined, dispatch to it.  Other OPTION-NAMEs are
 +# saved as a flag.
 +m4_define([_LT_SET_OPTION],
 +[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
 +m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
 +        _LT_MANGLE_DEFUN([$1], [$2]),
-     [m4_warning([Unknown $1 option `$2'])])[]dnl
++    [m4_warning([Unknown $1 option '$2'])])[]dnl
 +])
 +
 +
 +# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET])
 +# ------------------------------------------------------------
 +# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
 +m4_define([_LT_IF_OPTION],
 +[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])])
 +
 +
 +# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET)
 +# -------------------------------------------------------
 +# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME
 +# are set.
 +m4_define([_LT_UNLESS_OPTIONS],
 +[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
 +	    [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option),
 +		      [m4_define([$0_found])])])[]dnl
 +m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3
 +])[]dnl
 +])
 +
 +
 +# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST)
 +# ----------------------------------------
 +# OPTION-LIST is a space-separated list of Libtool options associated
 +# with MACRO-NAME.  If any OPTION has a matching handler declared with
 +# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about
 +# the unknown option and exit.
 +m4_defun([_LT_SET_OPTIONS],
 +[# Set options
 +m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
 +    [_LT_SET_OPTION([$1], _LT_Option)])
 +
 +m4_if([$1],[LT_INIT],[
 +  dnl
 +  dnl Simply set some default values (i.e off) if boolean options were not
 +  dnl specified:
 +  _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no
 +  ])
 +  _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no
 +  ])
 +  dnl
 +  dnl If no reference was made to various pairs of opposing options, then
 +  dnl we run the default mode handler for the pair.  For example, if neither
-   dnl `shared' nor `disable-shared' was passed, we enable building of shared
++  dnl 'shared' nor 'disable-shared' was passed, we enable building of shared
 +  dnl archives by default:
 +  _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
 +  _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
 +  _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
 +  _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
-   		   [_LT_ENABLE_FAST_INSTALL])
++		   [_LT_ENABLE_FAST_INSTALL])
++  _LT_UNLESS_OPTIONS([LT_INIT], [aix-soname=aix aix-soname=both aix-soname=svr4],
++		   [_LT_WITH_AIX_SONAME([aix])])
 +  ])
 +])# _LT_SET_OPTIONS
 +
 +
 +## --------------------------------- ##
 +## Macros to handle LT_INIT options. ##
 +## --------------------------------- ##
 +
 +# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME)
 +# -----------------------------------------
 +m4_define([_LT_MANGLE_DEFUN],
 +[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])])
 +
 +
 +# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE)
 +# -----------------------------------------------
 +m4_define([LT_OPTION_DEFINE],
 +[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl
 +])# LT_OPTION_DEFINE
 +
 +
 +# dlopen
 +# ------
 +LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes
 +])
 +
 +AU_DEFUN([AC_LIBTOOL_DLOPEN],
 +[_LT_SET_OPTION([LT_INIT], [dlopen])
 +AC_DIAGNOSE([obsolete],
 +[$0: Remove this warning and the call to _LT_SET_OPTION when you
- put the `dlopen' option into LT_INIT's first parameter.])
++put the 'dlopen' option into LT_INIT's first parameter.])
 +])
 +
 +dnl aclocal-1.4 backwards compatibility:
 +dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], [])
 +
 +
 +# win32-dll
 +# ---------
 +# Declare package support for building win32 dll's.
 +LT_OPTION_DEFINE([LT_INIT], [win32-dll],
 +[enable_win32_dll=yes
 +
 +case $host in
 +*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
 +  AC_CHECK_TOOL(AS, as, false)
 +  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
 +  AC_CHECK_TOOL(OBJDUMP, objdump, false)
 +  ;;
 +esac
 +
 +test -z "$AS" && AS=as
 +_LT_DECL([], [AS],      [1], [Assembler program])dnl
 +
 +test -z "$DLLTOOL" && DLLTOOL=dlltool
 +_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl
 +
 +test -z "$OBJDUMP" && OBJDUMP=objdump
 +_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl
 +])# win32-dll
 +
 +AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
 +[AC_REQUIRE([AC_CANONICAL_HOST])dnl
 +_LT_SET_OPTION([LT_INIT], [win32-dll])
 +AC_DIAGNOSE([obsolete],
 +[$0: Remove this warning and the call to _LT_SET_OPTION when you
- put the `win32-dll' option into LT_INIT's first parameter.])
++put the 'win32-dll' option into LT_INIT's first parameter.])
 +])
 +
 +dnl aclocal-1.4 backwards compatibility:
 +dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
 +
 +
 +# _LT_ENABLE_SHARED([DEFAULT])
 +# ----------------------------
- # implement the --enable-shared flag, and supports the `shared' and
- # `disable-shared' LT_INIT options.
- # DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
++# implement the --enable-shared flag, and supports the 'shared' and
++# 'disable-shared' LT_INIT options.
++# DEFAULT is either 'yes' or 'no'.  If omitted, it defaults to 'yes'.
 +m4_define([_LT_ENABLE_SHARED],
 +[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
 +AC_ARG_ENABLE([shared],
 +    [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
 +	[build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])],
 +    [p=${PACKAGE-default}
 +    case $enableval in
 +    yes) enable_shared=yes ;;
 +    no) enable_shared=no ;;
 +    *)
 +      enable_shared=no
 +      # Look at the argument we got.  We use all the common list separators.
-       lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++      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],
 +    [enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
 +
 +    _LT_DECL([build_libtool_libs], [enable_shared], [0],
 +	[Whether or not to build shared libraries])
 +])# _LT_ENABLE_SHARED
 +
 +LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])])
 +LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])])
 +
 +# Old names:
 +AC_DEFUN([AC_ENABLE_SHARED],
 +[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared])
 +])
 +
 +AC_DEFUN([AC_DISABLE_SHARED],
 +[_LT_SET_OPTION([LT_INIT], [disable-shared])
 +])
 +
 +AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
 +AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
 +
 +dnl aclocal-1.4 backwards compatibility:
 +dnl AC_DEFUN([AM_ENABLE_SHARED], [])
 +dnl AC_DEFUN([AM_DISABLE_SHARED], [])
 +
 +
 +
 +# _LT_ENABLE_STATIC([DEFAULT])
 +# ----------------------------
- # implement the --enable-static flag, and support the `static' and
- # `disable-static' LT_INIT options.
- # DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
++# implement the --enable-static flag, and support the 'static' and
++# 'disable-static' LT_INIT options.
++# DEFAULT is either 'yes' or 'no'.  If omitted, it defaults to 'yes'.
 +m4_define([_LT_ENABLE_STATIC],
 +[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
 +AC_ARG_ENABLE([static],
 +    [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@],
 +	[build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])],
 +    [p=${PACKAGE-default}
 +    case $enableval in
 +    yes) enable_static=yes ;;
 +    no) enable_static=no ;;
 +    *)
 +     enable_static=no
 +      # Look at the argument we got.  We use all the common list separators.
-       lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++      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],
 +    [enable_static=]_LT_ENABLE_STATIC_DEFAULT)
 +
 +    _LT_DECL([build_old_libs], [enable_static], [0],
 +	[Whether or not to build static libraries])
 +])# _LT_ENABLE_STATIC
 +
 +LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])])
 +LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])])
 +
 +# Old names:
 +AC_DEFUN([AC_ENABLE_STATIC],
 +[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static])
 +])
 +
 +AC_DEFUN([AC_DISABLE_STATIC],
 +[_LT_SET_OPTION([LT_INIT], [disable-static])
 +])
 +
 +AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
 +AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
 +
 +dnl aclocal-1.4 backwards compatibility:
 +dnl AC_DEFUN([AM_ENABLE_STATIC], [])
 +dnl AC_DEFUN([AM_DISABLE_STATIC], [])
 +
 +
 +
 +# _LT_ENABLE_FAST_INSTALL([DEFAULT])
 +# ----------------------------------
- # implement the --enable-fast-install flag, and support the `fast-install'
- # and `disable-fast-install' LT_INIT options.
- # DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
++# implement the --enable-fast-install flag, and support the 'fast-install'
++# and 'disable-fast-install' LT_INIT options.
++# DEFAULT is either 'yes' or 'no'.  If omitted, it defaults to 'yes'.
 +m4_define([_LT_ENABLE_FAST_INSTALL],
 +[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
 +AC_ARG_ENABLE([fast-install],
 +    [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
 +    [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
 +    [p=${PACKAGE-default}
 +    case $enableval in
 +    yes) enable_fast_install=yes ;;
 +    no) enable_fast_install=no ;;
 +    *)
 +      enable_fast_install=no
 +      # Look at the argument we got.  We use all the common list separators.
-       lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++      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],
 +    [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
 +
 +_LT_DECL([fast_install], [enable_fast_install], [0],
 +	 [Whether or not to optimize for fast installation])dnl
 +])# _LT_ENABLE_FAST_INSTALL
 +
 +LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])])
 +LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])])
 +
 +# Old names:
 +AU_DEFUN([AC_ENABLE_FAST_INSTALL],
 +[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
 +AC_DIAGNOSE([obsolete],
 +[$0: Remove this warning and the call to _LT_SET_OPTION when you put
- the `fast-install' option into LT_INIT's first parameter.])
++the 'fast-install' option into LT_INIT's first parameter.])
 +])
 +
 +AU_DEFUN([AC_DISABLE_FAST_INSTALL],
 +[_LT_SET_OPTION([LT_INIT], [disable-fast-install])
 +AC_DIAGNOSE([obsolete],
 +[$0: Remove this warning and the call to _LT_SET_OPTION when you put
- the `disable-fast-install' option into LT_INIT's first parameter.])
++the 'disable-fast-install' option into LT_INIT's first parameter.])
 +])
 +
 +dnl aclocal-1.4 backwards compatibility:
 +dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
 +dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
 +
 +
++# _LT_WITH_AIX_SONAME([DEFAULT])
++# ----------------------------------
++# implement the --with-aix-soname flag, and support the `aix-soname=aix'
++# and `aix-soname=both' and `aix-soname=svr4' LT_INIT options. DEFAULT
++# is either `aix', `both' or `svr4'.  If omitted, it defaults to `aix'.
++m4_define([_LT_WITH_AIX_SONAME],
++[m4_define([_LT_WITH_AIX_SONAME_DEFAULT], [m4_if($1, svr4, svr4, m4_if($1, both, both, aix))])dnl
++shared_archive_member_spec=
++case $host,$enable_shared in
++power*-*-aix[[5-9]]*,yes)
++  AC_MSG_CHECKING([which variant of shared library versioning to provide])
++  AC_ARG_WITH([aix-soname],
++    [AS_HELP_STRING([--with-aix-soname=aix|svr4|both],
++      [shared library versioning (aka "SONAME") variant to provide on AIX, @<:@default=]_LT_WITH_AIX_SONAME_DEFAULT[@:>@.])],
++    [case $withval in
++    aix|svr4|both)
++      ;;
++    *)
++      AC_MSG_ERROR([Unknown argument to --with-aix-soname])
++      ;;
++    esac
++    lt_cv_with_aix_soname=$with_aix_soname],
++    [AC_CACHE_VAL([lt_cv_with_aix_soname],
++      [lt_cv_with_aix_soname=]_LT_WITH_AIX_SONAME_DEFAULT)
++    with_aix_soname=$lt_cv_with_aix_soname])
++  AC_MSG_RESULT([$with_aix_soname])
++  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
++
++_LT_DECL([], [shared_archive_member_spec], [0],
++    [Shared archive member basename, for filename based shared library versioning on AIX])dnl
++])# _LT_WITH_AIX_SONAME
++
++LT_OPTION_DEFINE([LT_INIT], [aix-soname=aix], [_LT_WITH_AIX_SONAME([aix])])
++LT_OPTION_DEFINE([LT_INIT], [aix-soname=both], [_LT_WITH_AIX_SONAME([both])])
++LT_OPTION_DEFINE([LT_INIT], [aix-soname=svr4], [_LT_WITH_AIX_SONAME([svr4])])
++
++
 +# _LT_WITH_PIC([MODE])
 +# --------------------
- # implement the --with-pic flag, and support the `pic-only' and `no-pic'
++# implement the --with-pic flag, and support the 'pic-only' and 'no-pic'
 +# LT_INIT options.
- # MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
++# MODE is either 'yes' or 'no'.  If omitted, it defaults to 'both'.
 +m4_define([_LT_WITH_PIC],
 +[AC_ARG_WITH([pic],
 +    [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
 +	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
 +    [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],
-     [pic_mode=default])
- 
- test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
++    [pic_mode=m4_default([$1], [default])])
 +
 +_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
 +])# _LT_WITH_PIC
 +
 +LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])])
 +LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])])
 +
 +# Old name:
 +AU_DEFUN([AC_LIBTOOL_PICMODE],
 +[_LT_SET_OPTION([LT_INIT], [pic-only])
 +AC_DIAGNOSE([obsolete],
 +[$0: Remove this warning and the call to _LT_SET_OPTION when you
- put the `pic-only' option into LT_INIT's first parameter.])
++put the 'pic-only' option into LT_INIT's first parameter.])
 +])
 +
 +dnl aclocal-1.4 backwards compatibility:
 +dnl AC_DEFUN([AC_LIBTOOL_PICMODE], [])
 +
 +## ----------------- ##
 +## LTDL_INIT Options ##
 +## ----------------- ##
 +
 +m4_define([_LTDL_MODE], [])
 +LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive],
 +		 [m4_define([_LTDL_MODE], [nonrecursive])])
 +LT_OPTION_DEFINE([LTDL_INIT], [recursive],
 +		 [m4_define([_LTDL_MODE], [recursive])])
 +LT_OPTION_DEFINE([LTDL_INIT], [subproject],
 +		 [m4_define([_LTDL_MODE], [subproject])])
 +
 +m4_define([_LTDL_TYPE], [])
 +LT_OPTION_DEFINE([LTDL_INIT], [installable],
 +		 [m4_define([_LTDL_TYPE], [installable])])
 +LT_OPTION_DEFINE([LTDL_INIT], [convenience],
 +		 [m4_define([_LTDL_TYPE], [convenience])])
diff --cc config/ltversion.m4
index 07a8602,0000000..fa04b52
mode 100644,000000..100644
--- a/config/ltversion.m4
+++ b/config/ltversion.m4
@@@ -1,23 -1,0 +1,23 @@@
 +# ltversion.m4 -- version numbers			-*- Autoconf -*-
 +#
- #   Copyright (C) 2004 Free Software Foundation, Inc.
++#   Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc.
 +#   Written by Scott James Remnant, 2004
 +#
 +# This file is free software; the Free Software Foundation gives
 +# unlimited permission to copy and/or distribute it, with or without
 +# modifications, as long as this notice is preserved.
 +
 +# @configure_input@
 +
- # serial 3337 ltversion.m4
++# serial 4179 ltversion.m4
 +# This file is part of GNU Libtool
 +
- m4_define([LT_PACKAGE_VERSION], [2.4.2])
- m4_define([LT_PACKAGE_REVISION], [1.3337])
++m4_define([LT_PACKAGE_VERSION], [2.4.6])
++m4_define([LT_PACKAGE_REVISION], [2.4.6])
 +
 +AC_DEFUN([LTVERSION_VERSION],
- [macro_version='2.4.2'
- macro_revision='1.3337'
++[macro_version='2.4.6'
++macro_revision='2.4.6'
 +_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
 +_LT_DECL(, macro_revision, 0)
 +])
diff --cc config/test-driver
index 0000000,0000000..8e575b0
new file mode 100755
--- /dev/null
+++ b/config/test-driver
@@@ -1,0 -1,0 +1,148 @@@
++#! /bin/sh
++# test-driver - basic testsuite driver script.
++
++scriptversion=2013-07-13.22; # UTC
++
++# Copyright (C) 2011-2014 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.
++
++# This file is maintained in Automake, please report
++# bugs to <bug-automake at gnu.org> or send patches to
++# <automake-patches at gnu.org>.
++
++# Make unconditional expansion of undefined variables an error.  This
++# helps a lot in preventing typo-related bugs.
++set -u
++
++usage_error ()
++{
++  echo "$0: $*" >&2
++  print_usage >&2
++  exit 2
++}
++
++print_usage ()
++{
++  cat <<END
++Usage:
++  test-driver --test-name=NAME --log-file=PATH --trs-file=PATH
++              [--expect-failure={yes|no}] [--color-tests={yes|no}]
++              [--enable-hard-errors={yes|no}] [--]
++              TEST-SCRIPT [TEST-SCRIPT-ARGUMENTS]
++The '--test-name', '--log-file' and '--trs-file' options are mandatory.
++END
++}
++
++test_name= # Used for reporting.
++log_file=  # Where to save the output of the test script.
++trs_file=  # Where to save the metadata of the test run.
++expect_failure=no
++color_tests=no
++enable_hard_errors=yes
++while test $# -gt 0; do
++  case $1 in
++  --help) print_usage; exit $?;;
++  --version) echo "test-driver $scriptversion"; exit $?;;
++  --test-name) test_name=$2; shift;;
++  --log-file) log_file=$2; shift;;
++  --trs-file) trs_file=$2; shift;;
++  --color-tests) color_tests=$2; shift;;
++  --expect-failure) expect_failure=$2; shift;;
++  --enable-hard-errors) enable_hard_errors=$2; shift;;
++  --) shift; break;;
++  -*) usage_error "invalid option: '$1'";;
++   *) break;;
++  esac
++  shift
++done
++
++missing_opts=
++test x"$test_name" = x && missing_opts="$missing_opts --test-name"
++test x"$log_file"  = x && missing_opts="$missing_opts --log-file"
++test x"$trs_file"  = x && missing_opts="$missing_opts --trs-file"
++if test x"$missing_opts" != x; then
++  usage_error "the following mandatory options are missing:$missing_opts"
++fi
++
++if test $# -eq 0; then
++  usage_error "missing argument"
++fi
++
++if test $color_tests = yes; then
++  # Keep this in sync with 'lib/am/check.am:$(am__tty_colors)'.
++  red='' # Red.
++  grn='' # Green.
++  lgn='' # Light green.
++  blu='' # Blue.
++  mgn='' # Magenta.
++  std=''     # No color.
++else
++  red= grn= lgn= blu= mgn= std=
++fi
++
++do_exit='rm -f $log_file $trs_file; (exit $st); exit $st'
++trap "st=129; $do_exit" 1
++trap "st=130; $do_exit" 2
++trap "st=141; $do_exit" 13
++trap "st=143; $do_exit" 15
++
++# Test script is run here.
++"$@" >$log_file 2>&1
++estatus=$?
++
++if test $enable_hard_errors = no && test $estatus -eq 99; then
++  tweaked_estatus=1
++else
++  tweaked_estatus=$estatus
++fi
++
++case $tweaked_estatus:$expect_failure in
++  0:yes) col=$red res=XPASS recheck=yes gcopy=yes;;
++  0:*)   col=$grn res=PASS  recheck=no  gcopy=no;;
++  77:*)  col=$blu res=SKIP  recheck=no  gcopy=yes;;
++  99:*)  col=$mgn res=ERROR recheck=yes gcopy=yes;;
++  *:yes) col=$lgn res=XFAIL recheck=no  gcopy=yes;;
++  *:*)   col=$red res=FAIL  recheck=yes gcopy=yes;;
++esac
++
++# Report the test outcome and exit status in the logs, so that one can
++# know whether the test passed or failed simply by looking at the '.log'
++# file, without the need of also peaking into the corresponding '.trs'
++# file (automake bug#11814).
++echo "$res $test_name (exit status: $estatus)" >>$log_file
++
++# Report outcome to console.
++echo "${col}${res}${std}: $test_name"
++
++# Register the test result, and other relevant metadata.
++echo ":test-result: $res" > $trs_file
++echo ":global-test-result: $res" >> $trs_file
++echo ":recheck: $recheck" >> $trs_file
++echo ":copy-in-global-log: $gcopy" >> $trs_file
++
++# 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 configure
index 979307b,0000000..b28a7bf
mode 100755,000000..100755
--- a/configure
+++ b/configure
@@@ -1,15532 -1,0 +1,15959 @@@
 +#! /bin/sh
 +# Guess values for system-dependent variables and create Makefiles.
- # Generated by GNU Autoconf 2.69 for torsocks 2.1.0.
++# Generated by GNU Autoconf 2.69 for torsocks 2.2.0-rc1.
 +#
- # Report bugs to <dgoulet at ev0ke.net>.
++# Report bugs to <dgoulet at torproject.org>.
 +#
 +#
 +# 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 \$(( 1 + 1 )) = 2 || 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"
 +  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 dgoulet at ev0ke.net
- $0: about your system, including any error possibly output
- $0: before this message. Then install a modern shell, or
- $0: manually run the script under such a shell if you do
- $0: have one."
++    $as_echo "$0: Please tell bug-autoconf at gnu.org and
++$0: dgoulet at torproject.org about your system, including any
++$0: error possibly output before this message. Then install
++$0: a modern shell, or manually run the script under such a
++$0: 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='torsocks'
 +PACKAGE_TARNAME='torsocks'
- PACKAGE_VERSION='2.1.0'
- PACKAGE_STRING='torsocks 2.1.0'
- PACKAGE_BUGREPORT='dgoulet at ev0ke.net'
++PACKAGE_VERSION='2.2.0-rc1'
++PACKAGE_STRING='torsocks 2.2.0-rc1'
++PACKAGE_BUGREPORT='dgoulet at torproject.org'
 +PACKAGE_URL='https://torproject.org'
 +
 +# 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
 +DEFAULT_INCLUDES
 +LIBTOOL_DEPS
++LT_SYS_LIBRARY_PATH
 +OTOOL64
 +OTOOL
 +LIPO
 +NMEDIT
 +DSYMUTIL
 +MANIFEST_TOOL
 +RANLIB
 +ac_ct_AR
 +AR
 +DLLTOOL
 +OBJDUMP
 +NM
 +ac_ct_DUMPBIN
 +DUMPBIN
 +LD
 +FGREP
 +SED
 +LIBTOOL
 +CONFDIR
 +TORSOCKSLDFLAGS
 +LDPRELOAD
 +SHLIB_EXT
 +TESTLDFLAGS
 +EGREP
 +GREP
 +CPP
 +LN_S
 +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
 +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_os
 +target_vendor
 +target_cpu
 +target
 +host_os
 +host_vendor
 +host_cpu
 +host
 +build_os
 +build_vendor
 +build_cpu
 +build
 +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
++runstatedir
 +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_dependency_tracking
 +with_conf
 +enable_shared
 +enable_static
 +with_pic
 +enable_fast_install
++with_aix_soname
 +with_gnu_ld
 +with_sysroot
 +enable_libtool_lock
 +'
 +      ac_precious_vars='build_alias
 +host_alias
 +target_alias
 +CC
 +CFLAGS
 +LDFLAGS
 +LIBS
 +CPPFLAGS
- CPP'
++CPP
++LT_SYS_LIBRARY_PATH'
 +
 +
 +# 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'
++runstatedir='${localstatedir}/run'
 +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 ;;
 +
++  -runstatedir | --runstatedir | --runstatedi | --runstated \
++  | --runstate | --runstat | --runsta | --runst | --runs \
++  | --run | --ru | --r)
++    ac_prev=runstatedir ;;
++  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
++  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
++  | --run=* | --ru=* | --r=*)
++    runstatedir=$ac_optarg ;;
++
 +  -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 ;;
 +  -srcdi