PageRenderTime 150ms CodeModel.GetById 28ms app.highlight 50ms RepoModel.GetById 1ms app.codeStats 2ms

/core/10.4/libfuse/fuse-2.7.3-macosx.patch

http://macfuse.googlecode.com/
Patch | 12796 lines | 12358 code | 438 blank | 0 comment | 0 complexity | ed96b5cbba27551834293a2455db19a9 MD5 | raw file
    1diff -Naur old/Makefile.in new/Makefile.in
    2--- old/Makefile.in	2008-02-19 12:00:55.000000000 -0800
    3+++ new/Makefile.in	2008-11-26 22:23:12.000000000 -0800
    4@@ -1,8 +1,8 @@
    5-# Makefile.in generated by automake 1.9.6 from Makefile.am.
    6+# Makefile.in generated by automake 1.10 from Makefile.am.
    7 # @configure_input@
    8 
    9 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
   10-# 2003, 2004, 2005  Free Software Foundation, Inc.
   11+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
   12 # This Makefile.in is free software; the Free Software Foundation
   13 # gives unlimited permission to copy and/or distribute it,
   14 # with or without modifications, as long as this notice is preserved.
   15@@ -14,15 +14,11 @@
   16 
   17 @SET_MAKE@
   18 
   19-srcdir = @srcdir@
   20-top_srcdir = @top_srcdir@
   21 VPATH = @srcdir@
   22 pkgdatadir = $(datadir)/@PACKAGE@
   23 pkglibdir = $(libdir)/@PACKAGE@
   24 pkgincludedir = $(includedir)/@PACKAGE@
   25-top_builddir = .
   26 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
   27-INSTALL = @INSTALL@
   28 install_sh_DATA = $(install_sh) -c -m 644
   29 install_sh_PROGRAM = $(install_sh) -c
   30 install_sh_SCRIPT = $(install_sh) -c
   31@@ -37,18 +33,19 @@
   32 build_triplet = @build@
   33 host_triplet = @host@
   34 target_triplet = @target@
   35+subdir = .
   36 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
   37 	$(srcdir)/Makefile.in $(srcdir)/fuse.pc.in \
   38 	$(top_srcdir)/configure AUTHORS COPYING COPYING.LIB ChangeLog \
   39 	INSTALL NEWS compile config.guess config.rpath config.sub \
   40 	depcomp install-sh ltmain.sh missing mkinstalldirs
   41-subdir = .
   42 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
   43-am__aclocal_m4_deps = $(top_srcdir)/configure.in
   44+am__aclocal_m4_deps = $(top_srcdir)/iconv.m4 \
   45+	$(top_srcdir)/configure.in
   46 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
   47 	$(ACLOCAL_M4)
   48 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
   49- configure.lineno configure.status.lineno
   50+ configure.lineno config.status.lineno
   51 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
   52 CONFIG_HEADER = $(top_builddir)/include/config.h
   53 CONFIG_CLEAN_FILES = fuse.pc
   54@@ -56,10 +53,11 @@
   55 DIST_SOURCES =
   56 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
   57 	html-recursive info-recursive install-data-recursive \
   58-	install-exec-recursive install-info-recursive \
   59-	install-recursive installcheck-recursive installdirs-recursive \
   60-	pdf-recursive ps-recursive uninstall-info-recursive \
   61-	uninstall-recursive
   62+	install-dvi-recursive install-exec-recursive \
   63+	install-html-recursive install-info-recursive \
   64+	install-pdf-recursive install-ps-recursive install-recursive \
   65+	installcheck-recursive installdirs-recursive pdf-recursive \
   66+	ps-recursive uninstall-recursive
   67 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
   68 am__vpath_adj = case $$p in \
   69     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
   70@@ -69,6 +67,8 @@
   71 am__installdirs = "$(DESTDIR)$(pkgconfigdir)"
   72 pkgconfigDATA_INSTALL = $(INSTALL_DATA)
   73 DATA = $(pkgconfig_DATA)
   74+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   75+  distclean-recursive maintainer-clean-recursive
   76 ETAGS = etags
   77 CTAGS = ctags
   78 DIST_SUBDIRS = $(SUBDIRS)
   79@@ -84,53 +84,49 @@
   80 distuninstallcheck_listfiles = find . -type f -print
   81 distcleancheck_listfiles = find . -type f -print
   82 ACLOCAL = @ACLOCAL@
   83-AMDEP_FALSE = @AMDEP_FALSE@
   84-AMDEP_TRUE = @AMDEP_TRUE@
   85 AMTAR = @AMTAR@
   86 AR = @AR@
   87 AUTOCONF = @AUTOCONF@
   88 AUTOHEADER = @AUTOHEADER@
   89 AUTOMAKE = @AUTOMAKE@
   90 AWK = @AWK@
   91-BSD_FALSE = @BSD_FALSE@
   92-BSD_TRUE = @BSD_TRUE@
   93 CC = @CC@
   94 CCDEPMODE = @CCDEPMODE@
   95 CFLAGS = @CFLAGS@
   96 CPP = @CPP@
   97 CPPFLAGS = @CPPFLAGS@
   98+CXX = @CXX@
   99+CXXCPP = @CXXCPP@
  100+CXXDEPMODE = @CXXDEPMODE@
  101+CXXFLAGS = @CXXFLAGS@
  102 CYGPATH_W = @CYGPATH_W@
  103 DEFS = @DEFS@
  104 DEPDIR = @DEPDIR@
  105-DUMPBIN = @DUMPBIN@
  106+ECHO = @ECHO@
  107 ECHO_C = @ECHO_C@
  108 ECHO_N = @ECHO_N@
  109 ECHO_T = @ECHO_T@
  110 EGREP = @EGREP@
  111 EXEEXT = @EXEEXT@
  112-FGREP = @FGREP@
  113+F77 = @F77@
  114+FFLAGS = @FFLAGS@
  115 GREP = @GREP@
  116-ICONV_FALSE = @ICONV_FALSE@
  117-ICONV_TRUE = @ICONV_TRUE@
  118 INIT_D_PATH = @INIT_D_PATH@
  119+INSTALL = @INSTALL@
  120 INSTALL_DATA = @INSTALL_DATA@
  121 INSTALL_PROGRAM = @INSTALL_PROGRAM@
  122 INSTALL_SCRIPT = @INSTALL_SCRIPT@
  123 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
  124-LD = @LD@
  125 LDFLAGS = @LDFLAGS@
  126 LIBICONV = @LIBICONV@
  127 LIBOBJS = @LIBOBJS@
  128 LIBS = @LIBS@
  129 LIBTOOL = @LIBTOOL@
  130-LINUX_FALSE = @LINUX_FALSE@
  131-LINUX_TRUE = @LINUX_TRUE@
  132 LN_S = @LN_S@
  133-LTLIBICONV = @LTLIBICONV@
  134 LTLIBOBJS = @LTLIBOBJS@
  135 MAKEINFO = @MAKEINFO@
  136+MKDIR_P = @MKDIR_P@
  137 MOUNT_FUSE_PATH = @MOUNT_FUSE_PATH@
  138-NM = @NM@
  139 OBJEXT = @OBJEXT@
  140 PACKAGE = @PACKAGE@
  141 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
  142@@ -140,16 +136,18 @@
  143 PACKAGE_VERSION = @PACKAGE_VERSION@
  144 PATH_SEPARATOR = @PATH_SEPARATOR@
  145 RANLIB = @RANLIB@
  146-SED = @SED@
  147 SET_MAKE = @SET_MAKE@
  148 SHELL = @SHELL@
  149 STRIP = @STRIP@
  150 UDEV_RULES_PATH = @UDEV_RULES_PATH@
  151 VERSION = @VERSION@
  152+abs_builddir = @abs_builddir@
  153+abs_srcdir = @abs_srcdir@
  154+abs_top_builddir = @abs_top_builddir@
  155+abs_top_srcdir = @abs_top_srcdir@
  156 ac_ct_CC = @ac_ct_CC@
  157-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
  158-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
  159-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
  160+ac_ct_CXX = @ac_ct_CXX@
  161+ac_ct_F77 = @ac_ct_F77@
  162 am__include = @am__include@
  163 am__leading_dot = @am__leading_dot@
  164 am__quote = @am__quote@
  165@@ -161,6 +159,7 @@
  166 build_cpu = @build_cpu@
  167 build_os = @build_os@
  168 build_vendor = @build_vendor@
  169+builddir = @builddir@
  170 datadir = @datadir@
  171 datarootdir = @datarootdir@
  172 docdir = @docdir@
  173@@ -180,7 +179,6 @@
  174 libfuse_libs = @libfuse_libs@
  175 localedir = @localedir@
  176 localstatedir = @localstatedir@
  177-lt_ECHO = @lt_ECHO@
  178 mandir = @mandir@
  179 mkdir_p = @mkdir_p@
  180 oldincludedir = @oldincludedir@
  181@@ -191,6 +189,7 @@
  182 psdir = @psdir@
  183 sbindir = @sbindir@
  184 sharedstatedir = @sharedstatedir@
  185+srcdir = @srcdir@
  186 subdirs = @subdirs@
  187 subdirs2 = @subdirs2@
  188 sysconfdir = @sysconfdir@
  189@@ -199,6 +198,8 @@
  190 target_cpu = @target_cpu@
  191 target_os = @target_os@
  192 target_vendor = @target_vendor@
  193+top_builddir = @top_builddir@
  194+top_srcdir = @top_srcdir@
  195 SUBDIRS = @subdirs@ @subdirs2@
  196 EXTRA_DIST = \
  197 	fuse.pc.in		\
  198@@ -257,10 +258,9 @@
  199 
  200 distclean-libtool:
  201 	-rm -f libtool
  202-uninstall-info-am:
  203 install-pkgconfigDATA: $(pkgconfig_DATA)
  204 	@$(NORMAL_INSTALL)
  205-	test -z "$(pkgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfigdir)"
  206+	test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
  207 	@list='$(pkgconfig_DATA)'; for p in $$list; do \
  208 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
  209 	  f=$(am__strip_dir) \
  210@@ -307,8 +307,7 @@
  211 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
  212 	fi; test -z "$$fail"
  213 
  214-mostlyclean-recursive clean-recursive distclean-recursive \
  215-maintainer-clean-recursive:
  216+$(RECURSIVE_CLEAN_TARGETS):
  217 	@failcom='exit 1'; \
  218 	for f in x $$MAKEFLAGS; do \
  219 	  case $$f in \
  220@@ -410,24 +409,22 @@
  221 
  222 distdir: $(DISTFILES)
  223 	$(am__remove_distdir)
  224-	mkdir $(distdir)
  225-	$(mkdir_p) $(distdir)/. $(distdir)/doc
  226-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
  227-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
  228-	list='$(DISTFILES)'; for file in $$list; do \
  229-	  case $$file in \
  230-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
  231-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
  232-	  esac; \
  233+	test -d $(distdir) || mkdir $(distdir)
  234+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
  235+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
  236+	list='$(DISTFILES)'; \
  237+	  dist_files=`for file in $$list; do echo $$file; done | \
  238+	  sed -e "s|^$$srcdirstrip/||;t" \
  239+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
  240+	case $$dist_files in \
  241+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
  242+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
  243+			   sort -u` ;; \
  244+	esac; \
  245+	for file in $$dist_files; do \
  246 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
  247-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  248-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  249-	    dir="/$$dir"; \
  250-	    $(mkdir_p) "$(distdir)$$dir"; \
  251-	  else \
  252-	    dir=''; \
  253-	  fi; \
  254 	  if test -d $$d/$$file; then \
  255+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
  256 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
  257 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
  258 	    fi; \
  259@@ -441,7 +438,7 @@
  260 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
  261 	  if test "$$subdir" = .; then :; else \
  262 	    test -d "$(distdir)/$$subdir" \
  263-	    || $(mkdir_p) "$(distdir)/$$subdir" \
  264+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
  265 	    || exit 1; \
  266 	    distdir=`$(am__cd) $(distdir) && pwd`; \
  267 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
  268@@ -449,6 +446,8 @@
  269 	      $(MAKE) $(AM_MAKEFLAGS) \
  270 	        top_distdir="$$top_distdir" \
  271 	        distdir="$$distdir/$$subdir" \
  272+		am__remove_distdir=: \
  273+		am__skip_length_check=: \
  274 	        distdir) \
  275 	      || exit 1; \
  276 	  fi; \
  277@@ -456,7 +455,7 @@
  278 	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
  279 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
  280 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
  281-	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
  282+	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
  283 	|| chmod -R a+r $(distdir)
  284 dist-gzip: distdir
  285 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
  286@@ -531,7 +530,7 @@
  287 	$(am__remove_distdir)
  288 	@(echo "$(distdir) archives ready for distribution: "; \
  289 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
  290-	  sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
  291+	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
  292 distuninstallcheck:
  293 	@cd $(distuninstallcheck_dir) \
  294 	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
  295@@ -556,7 +555,7 @@
  296 installdirs: installdirs-recursive
  297 installdirs-am:
  298 	for dir in "$(DESTDIR)$(pkgconfigdir)"; do \
  299-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
  300+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
  301 	done
  302 install: install-recursive
  303 install-exec: install-exec-recursive
  304@@ -604,12 +603,20 @@
  305 
  306 install-data-am: install-pkgconfigDATA
  307 
  308+install-dvi: install-dvi-recursive
  309+
  310 install-exec-am:
  311 
  312+install-html: install-html-recursive
  313+
  314 install-info: install-info-recursive
  315 
  316 install-man:
  317 
  318+install-pdf: install-pdf-recursive
  319+
  320+install-ps: install-ps-recursive
  321+
  322 installcheck-am:
  323 
  324 maintainer-clean: maintainer-clean-recursive
  325@@ -630,24 +637,26 @@
  326 
  327 ps-am:
  328 
  329-uninstall-am: uninstall-info-am uninstall-pkgconfigDATA
  330+uninstall-am: uninstall-pkgconfigDATA
  331 
  332-uninstall-info: uninstall-info-recursive
  333+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
  334+	install-strip
  335 
  336-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
  337-	check-am clean clean-generic clean-libtool clean-recursive \
  338-	ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
  339-	dist-shar dist-tarZ dist-zip distcheck distclean \
  340-	distclean-generic distclean-libtool distclean-recursive \
  341-	distclean-tags distcleancheck distdir distuninstallcheck dvi \
  342-	dvi-am html html-am info info-am install install-am \
  343-	install-data install-data-am install-exec install-exec-am \
  344-	install-info install-info-am install-man install-pkgconfigDATA \
  345-	install-strip installcheck installcheck-am installdirs \
  346-	installdirs-am maintainer-clean maintainer-clean-generic \
  347-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
  348-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
  349-	tags tags-recursive uninstall uninstall-am uninstall-info-am \
  350+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
  351+	all all-am am--refresh check check-am clean clean-generic \
  352+	clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
  353+	dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
  354+	distclean-generic distclean-libtool distclean-tags \
  355+	distcleancheck distdir distuninstallcheck dvi dvi-am html \
  356+	html-am info info-am install install-am install-data \
  357+	install-data-am install-dvi install-dvi-am install-exec \
  358+	install-exec-am install-html install-html-am install-info \
  359+	install-info-am install-man install-pdf install-pdf-am \
  360+	install-pkgconfigDATA install-ps install-ps-am install-strip \
  361+	installcheck installcheck-am installdirs installdirs-am \
  362+	maintainer-clean maintainer-clean-generic mostlyclean \
  363+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
  364+	tags tags-recursive uninstall uninstall-am \
  365 	uninstall-pkgconfigDATA
  366 
  367 
  368diff -Naur old/README.MacFUSE new/README.MacFUSE
  369--- old/README.MacFUSE	1969-12-31 16:00:00.000000000 -0800
  370+++ new/README.MacFUSE	2008-11-26 22:23:12.000000000 -0800
  371@@ -0,0 +1,12 @@
  372+MacFUSE Project Page:
  373+
  374+http://code.google.com/p/macfuse/
  375+
  376+Making a Universal build of libfuse:
  377+
  378+1. Run "/bin/sh ./darwin_configure.sh /path/to/macfuse/core/10.5/fusefs/"
  379+2. Run make
  380+
  381+If you begin with the "raw" patch, you need to perform a step 0 as follows:
  382+
  383+aclocal -I . && autoheader && autoconf && automake -a
  384diff -Naur old/aclocal.m4 new/aclocal.m4
  385--- old/aclocal.m4	2008-02-19 12:00:31.000000000 -0800
  386+++ new/aclocal.m4	2008-11-26 22:23:12.000000000 -0800
  387@@ -1,7 +1,7 @@
  388-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
  389+# generated automatically by aclocal 1.10 -*- Autoconf -*-
  390 
  391 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
  392-# 2005  Free Software Foundation, Inc.
  393+# 2005, 2006  Free Software Foundation, Inc.
  394 # This file is free software; the Free Software Foundation
  395 # gives unlimited permission to copy and/or distribute it,
  396 # with or without modifications, as long as this notice is preserved.
  397@@ -11,3269 +11,1519 @@
  398 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
  399 # PARTICULAR PURPOSE.
  400 
  401-# iconv.m4 serial AM4 (gettext-0.11.3)
  402-dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
  403-dnl This file is free software; the Free Software Foundation
  404-dnl gives unlimited permission to copy and/or distribute it,
  405-dnl with or without modifications, as long as this notice is preserved.
  406+m4_if(m4_PACKAGE_VERSION, [2.61],,
  407+[m4_fatal([this file was generated for autoconf 2.61.
  408+You have another version of autoconf.  If you want to use that,
  409+you should regenerate the build system entirely.], [63])])
  410 
  411-dnl From Bruno Haible.
  412+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
  413 
  414-AC_DEFUN([AM_ICONV_LINKFLAGS_BODY],
  415-[
  416-  dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
  417-  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
  418-  AC_REQUIRE([AC_LIB_RPATH])
  419-
  420-  dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
  421-  dnl accordingly.
  422-  AC_LIB_LINKFLAGS_BODY([iconv])
  423-])
  424+# serial 48 AC_PROG_LIBTOOL
  425 
  426-AC_DEFUN([AM_ICONV_LINK],
  427-[
  428-  dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
  429-  dnl those with the standalone portable GNU libiconv installed).
  430 
  431-  dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
  432-  dnl accordingly.
  433-  AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
  434-
  435-  dnl Add $INCICONV to CPPFLAGS before performing the following checks,
  436-  dnl because if the user has installed libiconv and not disabled its use
  437-  dnl via --without-libiconv-prefix, he wants to use it. The first
  438-  dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed.
  439-  am_save_CPPFLAGS="$CPPFLAGS"
  440-  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
  441-
  442-  AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [
  443-    am_cv_func_iconv="no, consider installing GNU libiconv"
  444-    am_cv_lib_iconv=no
  445-    AC_TRY_LINK([#include <stdlib.h>
  446-#include <iconv.h>],
  447-      [iconv_t cd = iconv_open("","");
  448-       iconv(cd,NULL,NULL,NULL,NULL);
  449-       iconv_close(cd);],
  450-      am_cv_func_iconv=yes)
  451-    if test "$am_cv_func_iconv" != yes; then
  452-      am_save_LIBS="$LIBS"
  453-      LIBS="$LIBS $LIBICONV"
  454-      AC_TRY_LINK([#include <stdlib.h>
  455-#include <iconv.h>],
  456-        [iconv_t cd = iconv_open("","");
  457-         iconv(cd,NULL,NULL,NULL,NULL);
  458-         iconv_close(cd);],
  459-        am_cv_lib_iconv=yes
  460-        am_cv_func_iconv=yes)
  461-      LIBS="$am_save_LIBS"
  462-    fi
  463-  ])
  464-  if test "$am_cv_func_iconv" = yes; then
  465-    AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.])
  466-  fi
  467-  if test "$am_cv_lib_iconv" = yes; then
  468-    AC_MSG_CHECKING([how to link with libiconv])
  469-    AC_MSG_RESULT([$LIBICONV])
  470-  else
  471-    dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV
  472-    dnl either.
  473-    CPPFLAGS="$am_save_CPPFLAGS"
  474-    LIBICONV=
  475-    LTLIBICONV=
  476-  fi
  477-  AC_SUBST(LIBICONV)
  478-  AC_SUBST(LTLIBICONV)
  479-])
  480+# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
  481+# -----------------------------------------------------------
  482+# If this macro is not defined by Autoconf, define it here.
  483+m4_ifdef([AC_PROVIDE_IFELSE],
  484+         [],
  485+         [m4_define([AC_PROVIDE_IFELSE],
  486+	         [m4_ifdef([AC_PROVIDE_$1],
  487+		           [$2], [$3])])])
  488 
  489-AC_DEFUN([AM_ICONV],
  490-[
  491-  AM_ICONV_LINK
  492-  if test "$am_cv_func_iconv" = yes; then
  493-    AC_MSG_CHECKING([for iconv declaration])
  494-    AC_CACHE_VAL(am_cv_proto_iconv, [
  495-      AC_TRY_COMPILE([
  496-#include <stdlib.h>
  497-#include <iconv.h>
  498-extern
  499-#ifdef __cplusplus
  500-"C"
  501-#endif
  502-#if defined(__STDC__) || defined(__cplusplus)
  503-size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
  504-#else
  505-size_t iconv();
  506-#endif
  507-], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const")
  508-      am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
  509-    am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
  510-    AC_MSG_RESULT([$]{ac_t:-
  511-         }[$]am_cv_proto_iconv)
  512-    AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
  513-      [Define as const if the declaration of iconv() needs const.])
  514-  fi
  515-])
  516 
  517-# lib-ld.m4 serial 3 (gettext-0.13)
  518-dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
  519-dnl This file is free software; the Free Software Foundation
  520-dnl gives unlimited permission to copy and/or distribute it,
  521-dnl with or without modifications, as long as this notice is preserved.
  522-
  523-dnl Subroutines of libtool.m4,
  524-dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision
  525-dnl with libtool.m4.
  526-
  527-dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
  528-AC_DEFUN([AC_LIB_PROG_LD_GNU],
  529-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld,
  530-[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
  531-case `$LD -v 2>&1 </dev/null` in
  532-*GNU* | *'with BFD'*)
  533-  acl_cv_prog_gnu_ld=yes ;;
  534-*)
  535-  acl_cv_prog_gnu_ld=no ;;
  536-esac])
  537-with_gnu_ld=$acl_cv_prog_gnu_ld
  538-])
  539+# AC_PROG_LIBTOOL
  540+# ---------------
  541+AC_DEFUN([AC_PROG_LIBTOOL],
  542+[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
  543+dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
  544+dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
  545+  AC_PROVIDE_IFELSE([AC_PROG_CXX],
  546+    [AC_LIBTOOL_CXX],
  547+    [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
  548+  ])])
  549+dnl And a similar setup for Fortran 77 support
  550+  AC_PROVIDE_IFELSE([AC_PROG_F77],
  551+    [AC_LIBTOOL_F77],
  552+    [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
  553+])])
  554+
  555+dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
  556+dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
  557+dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
  558+  AC_PROVIDE_IFELSE([AC_PROG_GCJ],
  559+    [AC_LIBTOOL_GCJ],
  560+    [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
  561+      [AC_LIBTOOL_GCJ],
  562+      [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
  563+	[AC_LIBTOOL_GCJ],
  564+      [ifdef([AC_PROG_GCJ],
  565+	     [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
  566+       ifdef([A][M_PROG_GCJ],
  567+	     [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
  568+       ifdef([LT_AC_PROG_GCJ],
  569+	     [define([LT_AC_PROG_GCJ],
  570+		defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
  571+])])# AC_PROG_LIBTOOL
  572 
  573-dnl From libtool-1.4. Sets the variable LD.
  574-AC_DEFUN([AC_LIB_PROG_LD],
  575-[AC_ARG_WITH(gnu-ld,
  576-[  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
  577-test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
  578-AC_REQUIRE([AC_PROG_CC])dnl
  579-AC_REQUIRE([AC_CANONICAL_HOST])dnl
  580-# Prepare PATH_SEPARATOR.
  581-# The user is always right.
  582-if test "${PATH_SEPARATOR+set}" != set; then
  583-  echo "#! /bin/sh" >conf$$.sh
  584-  echo  "exit 0"   >>conf$$.sh
  585-  chmod +x conf$$.sh
  586-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
  587-    PATH_SEPARATOR=';'
  588-  else
  589-    PATH_SEPARATOR=:
  590-  fi
  591-  rm -f conf$$.sh
  592-fi
  593-ac_prog=ld
  594-if test "$GCC" = yes; then
  595-  # Check if gcc -print-prog-name=ld gives a path.
  596-  AC_MSG_CHECKING([for ld used by GCC])
  597-  case $host in
  598-  *-*-mingw*)
  599-    # gcc leaves a trailing carriage return which upsets mingw
  600-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
  601-  *)
  602-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
  603-  esac
  604-  case $ac_prog in
  605-    # Accept absolute paths.
  606-    [[\\/]* | [A-Za-z]:[\\/]*)]
  607-      [re_direlt='/[^/][^/]*/\.\./']
  608-      # Canonicalize the path of ld
  609-      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
  610-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
  611-	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
  612-      done
  613-      test -z "$LD" && LD="$ac_prog"
  614-      ;;
  615-  "")
  616-    # If it fails, then pretend we aren't using GCC.
  617-    ac_prog=ld
  618-    ;;
  619-  *)
  620-    # If it is relative, then search for the first ld in PATH.
  621-    with_gnu_ld=unknown
  622-    ;;
  623-  esac
  624-elif test "$with_gnu_ld" = yes; then
  625-  AC_MSG_CHECKING([for GNU ld])
  626-else
  627-  AC_MSG_CHECKING([for non-GNU ld])
  628-fi
  629-AC_CACHE_VAL(acl_cv_path_LD,
  630-[if test -z "$LD"; then
  631-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
  632-  for ac_dir in $PATH; do
  633-    test -z "$ac_dir" && ac_dir=.
  634-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
  635-      acl_cv_path_LD="$ac_dir/$ac_prog"
  636-      # Check to see if the program is GNU ld.  I'd rather use --version,
  637-      # but apparently some GNU ld's only accept -v.
  638-      # Break only if it was the GNU/non-GNU ld that we prefer.
  639-      case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
  640-      *GNU* | *'with BFD'*)
  641-	test "$with_gnu_ld" != no && break ;;
  642-      *)
  643-	test "$with_gnu_ld" != yes && break ;;
  644-      esac
  645-    fi
  646-  done
  647-  IFS="$ac_save_ifs"
  648-else
  649-  acl_cv_path_LD="$LD" # Let the user override the test with a path.
  650-fi])
  651-LD="$acl_cv_path_LD"
  652-if test -n "$LD"; then
  653-  AC_MSG_RESULT($LD)
  654-else
  655-  AC_MSG_RESULT(no)
  656-fi
  657-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
  658-AC_LIB_PROG_LD_GNU
  659-])
  660 
  661-# lib-link.m4 serial 9 (gettext-0.16)
  662-dnl Copyright (C) 2001-2006 Free Software Foundation, Inc.
  663-dnl This file is free software; the Free Software Foundation
  664-dnl gives unlimited permission to copy and/or distribute it,
  665-dnl with or without modifications, as long as this notice is preserved.
  666-
  667-dnl From Bruno Haible.
  668-
  669-AC_PREREQ(2.50)
  670-
  671-dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
  672-dnl the libraries corresponding to explicit and implicit dependencies.
  673-dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
  674-dnl augments the CPPFLAGS variable.
  675-AC_DEFUN([AC_LIB_LINKFLAGS],
  676-[
  677-  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
  678-  AC_REQUIRE([AC_LIB_RPATH])
  679-  define([Name],[translit([$1],[./-], [___])])
  680-  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
  681-                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
  682-  AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
  683-    AC_LIB_LINKFLAGS_BODY([$1], [$2])
  684-    ac_cv_lib[]Name[]_libs="$LIB[]NAME"
  685-    ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
  686-    ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
  687-  ])
  688-  LIB[]NAME="$ac_cv_lib[]Name[]_libs"
  689-  LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
  690-  INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
  691-  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
  692-  AC_SUBST([LIB]NAME)
  693-  AC_SUBST([LTLIB]NAME)
  694-  dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
  695-  dnl results of this search when this library appears as a dependency.
  696-  HAVE_LIB[]NAME=yes
  697-  undefine([Name])
  698-  undefine([NAME])
  699-])
  700+# _AC_PROG_LIBTOOL
  701+# ----------------
  702+AC_DEFUN([_AC_PROG_LIBTOOL],
  703+[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
  704+AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
  705+AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
  706+AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
  707 
  708-dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode)
  709-dnl searches for libname and the libraries corresponding to explicit and
  710-dnl implicit dependencies, together with the specified include files and
  711-dnl the ability to compile and link the specified testcode. If found, it
  712-dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and
  713-dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and
  714-dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
  715-dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
  716-AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
  717-[
  718-  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
  719-  AC_REQUIRE([AC_LIB_RPATH])
  720-  define([Name],[translit([$1],[./-], [___])])
  721-  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
  722-                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
  723-
  724-  dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
  725-  dnl accordingly.
  726-  AC_LIB_LINKFLAGS_BODY([$1], [$2])
  727-
  728-  dnl Add $INC[]NAME to CPPFLAGS before performing the following checks,
  729-  dnl because if the user has installed lib[]Name and not disabled its use
  730-  dnl via --without-lib[]Name-prefix, he wants to use it.
  731-  ac_save_CPPFLAGS="$CPPFLAGS"
  732-  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
  733-
  734-  AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
  735-    ac_save_LIBS="$LIBS"
  736-    LIBS="$LIBS $LIB[]NAME"
  737-    AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no])
  738-    LIBS="$ac_save_LIBS"
  739-  ])
  740-  if test "$ac_cv_lib[]Name" = yes; then
  741-    HAVE_LIB[]NAME=yes
  742-    AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.])
  743-    AC_MSG_CHECKING([how to link with lib[]$1])
  744-    AC_MSG_RESULT([$LIB[]NAME])
  745-  else
  746-    HAVE_LIB[]NAME=no
  747-    dnl If $LIB[]NAME didn't lead to a usable library, we don't need
  748-    dnl $INC[]NAME either.
  749-    CPPFLAGS="$ac_save_CPPFLAGS"
  750-    LIB[]NAME=
  751-    LTLIB[]NAME=
  752-  fi
  753-  AC_SUBST([HAVE_LIB]NAME)
  754-  AC_SUBST([LIB]NAME)
  755-  AC_SUBST([LTLIB]NAME)
  756-  undefine([Name])
  757-  undefine([NAME])
  758-])
  759+# This can be used to rebuild libtool when needed
  760+LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
  761 
  762-dnl Determine the platform dependent parameters needed to use rpath:
  763-dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator,
  764-dnl hardcode_direct, hardcode_minus_L.
  765-AC_DEFUN([AC_LIB_RPATH],
  766-[
  767-  dnl Tell automake >= 1.10 to complain if config.rpath is missing.
  768-  m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])])
  769-  AC_REQUIRE([AC_PROG_CC])                dnl we use $CC, $GCC, $LDFLAGS
  770-  AC_REQUIRE([AC_LIB_PROG_LD])            dnl we use $LD, $with_gnu_ld
  771-  AC_REQUIRE([AC_CANONICAL_HOST])         dnl we use $host
  772-  AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
  773-  AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [
  774-    CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
  775-    ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
  776-    . ./conftest.sh
  777-    rm -f ./conftest.sh
  778-    acl_cv_rpath=done
  779-  ])
  780-  wl="$acl_cv_wl"
  781-  libext="$acl_cv_libext"
  782-  shlibext="$acl_cv_shlibext"
  783-  hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
  784-  hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
  785-  hardcode_direct="$acl_cv_hardcode_direct"
  786-  hardcode_minus_L="$acl_cv_hardcode_minus_L"
  787-  dnl Determine whether the user wants rpath handling at all.
  788-  AC_ARG_ENABLE(rpath,
  789-    [  --disable-rpath         do not hardcode runtime library paths],
  790-    :, enable_rpath=yes)
  791-])
  792+# Always use our own libtool.
  793+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
  794+AC_SUBST(LIBTOOL)dnl
  795 
  796-dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
  797-dnl the libraries corresponding to explicit and implicit dependencies.
  798-dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
  799-AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
  800-[
  801-  AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
  802-  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
  803-                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
  804-  dnl By default, look in $includedir and $libdir.
  805-  use_additional=yes
  806-  AC_LIB_WITH_FINAL_PREFIX([
  807-    eval additional_includedir=\"$includedir\"
  808-    eval additional_libdir=\"$libdir\"
  809-  ])
  810-  AC_LIB_ARG_WITH([lib$1-prefix],
  811-[  --with-lib$1-prefix[=DIR]  search for lib$1 in DIR/include and DIR/lib
  812-  --without-lib$1-prefix     don't search for lib$1 in includedir and libdir],
  813-[
  814-    if test "X$withval" = "Xno"; then
  815-      use_additional=no
  816-    else
  817-      if test "X$withval" = "X"; then
  818-        AC_LIB_WITH_FINAL_PREFIX([
  819-          eval additional_includedir=\"$includedir\"
  820-          eval additional_libdir=\"$libdir\"
  821-        ])
  822-      else
  823-        additional_includedir="$withval/include"
  824-        additional_libdir="$withval/$acl_libdirstem"
  825-      fi
  826-    fi
  827-])
  828-  dnl Search the library and its dependencies in $additional_libdir and
  829-  dnl $LDFLAGS. Using breadth-first-seach.
  830-  LIB[]NAME=
  831-  LTLIB[]NAME=
  832-  INC[]NAME=
  833-  rpathdirs=
  834-  ltrpathdirs=
  835-  names_already_handled=
  836-  names_next_round='$1 $2'
  837-  while test -n "$names_next_round"; do
  838-    names_this_round="$names_next_round"
  839-    names_next_round=
  840-    for name in $names_this_round; do
  841-      already_handled=
  842-      for n in $names_already_handled; do
  843-        if test "$n" = "$name"; then
  844-          already_handled=yes
  845-          break
  846-        fi
  847-      done
  848-      if test -z "$already_handled"; then
  849-        names_already_handled="$names_already_handled $name"
  850-        dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
  851-        dnl or AC_LIB_HAVE_LINKFLAGS call.
  852-        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
  853-        eval value=\"\$HAVE_LIB$uppername\"
  854-        if test -n "$value"; then
  855-          if test "$value" = yes; then
  856-            eval value=\"\$LIB$uppername\"
  857-            test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value"
  858-            eval value=\"\$LTLIB$uppername\"
  859-            test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value"
  860-          else
  861-            dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined
  862-            dnl that this library doesn't exist. So just drop it.
  863-            :
  864-          fi
  865-        else
  866-          dnl Search the library lib$name in $additional_libdir and $LDFLAGS
  867-          dnl and the already constructed $LIBNAME/$LTLIBNAME.
  868-          found_dir=
  869-          found_la=
  870-          found_so=
  871-          found_a=
  872-          if test $use_additional = yes; then
  873-            if test -n "$shlibext" \
  874-               && { test -f "$additional_libdir/lib$name.$shlibext" \
  875-                    || { test "$shlibext" = dll \
  876-                         && test -f "$additional_libdir/lib$name.dll.a"; }; }; then
  877-              found_dir="$additional_libdir"
  878-              if test -f "$additional_libdir/lib$name.$shlibext"; then
  879-                found_so="$additional_libdir/lib$name.$shlibext"
  880-              else
  881-                found_so="$additional_libdir/lib$name.dll.a"
  882-              fi
  883-              if test -f "$additional_libdir/lib$name.la"; then
  884-                found_la="$additional_libdir/lib$name.la"
  885-              fi
  886-            else
  887-              if test -f "$additional_libdir/lib$name.$libext"; then
  888-                found_dir="$additional_libdir"
  889-                found_a="$additional_libdir/lib$name.$libext"
  890-                if test -f "$additional_libdir/lib$name.la"; then
  891-                  found_la="$additional_libdir/lib$name.la"
  892-                fi
  893-              fi
  894-            fi
  895-          fi
  896-          if test "X$found_dir" = "X"; then
  897-            for x in $LDFLAGS $LTLIB[]NAME; do
  898-              AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
  899-              case "$x" in
  900-                -L*)
  901-                  dir=`echo "X$x" | sed -e 's/^X-L//'`
  902-                  if test -n "$shlibext" \
  903-                     && { test -f "$dir/lib$name.$shlibext" \
  904-                          || { test "$shlibext" = dll \
  905-                               && test -f "$dir/lib$name.dll.a"; }; }; then
  906-                    found_dir="$dir"
  907-                    if test -f "$dir/lib$name.$shlibext"; then
  908-                      found_so="$dir/lib$name.$shlibext"
  909-                    else
  910-                      found_so="$dir/lib$name.dll.a"
  911-                    fi
  912-                    if test -f "$dir/lib$name.la"; then
  913-                      found_la="$dir/lib$name.la"
  914-                    fi
  915-                  else
  916-                    if test -f "$dir/lib$name.$libext"; then
  917-                      found_dir="$dir"
  918-                      found_a="$dir/lib$name.$libext"
  919-                      if test -f "$dir/lib$name.la"; then
  920-                        found_la="$dir/lib$name.la"
  921-                      fi
  922-                    fi
  923-                  fi
  924-                  ;;
  925-              esac
  926-              if test "X$found_dir" != "X"; then
  927-                break
  928-              fi
  929-            done
  930-          fi
  931-          if test "X$found_dir" != "X"; then
  932-            dnl Found the library.
  933-            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
  934-            if test "X$found_so" != "X"; then
  935-              dnl Linking with a shared library. We attempt to hardcode its
  936-              dnl directory into the executable's runpath, unless it's the
  937-              dnl standard /usr/lib.
  938-              if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then
  939-                dnl No hardcoding is needed.
  940-                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
  941-              else
  942-                dnl Use an explicit option to hardcode DIR into the resulting
  943-                dnl binary.
  944-                dnl Potentially add DIR to ltrpathdirs.
  945-                dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
  946-                haveit=
  947-                for x in $ltrpathdirs; do
  948-                  if test "X$x" = "X$found_dir"; then
  949-                    haveit=yes
  950-                    break
  951-                  fi
  952-                done
  953-                if test -z "$haveit"; then
  954-                  ltrpathdirs="$ltrpathdirs $found_dir"
  955-                fi
  956-                dnl The hardcoding into $LIBNAME is system dependent.
  957-                if test "$hardcode_direct" = yes; then
  958-                  dnl Using DIR/libNAME.so during linking hardcodes DIR into the
  959-                  dnl resulting binary.
  960-                  LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
  961-                else
  962-                  if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
  963-                    dnl Use an explicit option to hardcode DIR into the resulting
  964-                    dnl binary.
  965-                    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
  966-                    dnl Potentially add DIR to rpathdirs.
  967-                    dnl The rpathdirs will be appended to $LIBNAME at the end.
  968-                    haveit=
  969-                    for x in $rpathdirs; do
  970-                      if test "X$x" = "X$found_dir"; then
  971-                        haveit=yes
  972-                        break
  973-                      fi
  974-                    done
  975-                    if test -z "$haveit"; then
  976-                      rpathdirs="$rpathdirs $found_dir"
  977-                    fi
  978-                  else
  979-                    dnl Rely on "-L$found_dir".
  980-                    dnl But don't add it if it's already contained in the LDFLAGS
  981-                    dnl or the already constructed $LIBNAME
  982-                    haveit=
  983-                    for x in $LDFLAGS $LIB[]NAME; do
  984-                      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
  985-                      if test "X$x" = "X-L$found_dir"; then
  986-                        haveit=yes
  987-                        break
  988-                      fi
  989-                    done
  990-                    if test -z "$haveit"; then
  991-                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
  992-                    fi
  993-                    if test "$hardcode_minus_L" != no; then
  994-                      dnl FIXME: Not sure whether we should use
  995-                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
  996-                      dnl here.
  997-                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
  998-                    else
  999-                      dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH
 1000-                      dnl here, because this doesn't fit in flags passed to the
 1001-                      dnl compiler. So give up. No hardcoding. This affects only
 1002-                      dnl very old systems.
 1003-                      dnl FIXME: Not sure whether we should use
 1004-                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
 1005-                      dnl here.
 1006-                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
 1007-                    fi
 1008-                  fi
 1009-                fi
 1010-              fi
 1011-            else
 1012-              if test "X$found_a" != "X"; then
 1013-                dnl Linking with a static library.
 1014-                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
 1015-              else
 1016-                dnl We shouldn't come here, but anyway it's good to have a
 1017-                dnl fallback.
 1018-                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
 1019-              fi
 1020-            fi
 1021-            dnl Assume the include files are nearby.
 1022-            additional_includedir=
 1023-            case "$found_dir" in
 1024-              */$acl_libdirstem | */$acl_libdirstem/)
 1025-                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
 1026-                additional_includedir="$basedir/include"
 1027-                ;;
 1028-            esac
 1029-            if test "X$additional_includedir" != "X"; then
 1030-              dnl Potentially add $additional_includedir to $INCNAME.
 1031-              dnl But don't add it
 1032-              dnl   1. if it's the standard /usr/include,
 1033-              dnl   2. if it's /usr/local/include and we are using GCC on Linux,
 1034-              dnl   3. if it's already present in $CPPFLAGS or the already
 1035-              dnl      constructed $INCNAME,
 1036-              dnl   4. if it doesn't exist as a directory.
 1037-              if test "X$additional_includedir" != "X/usr/include"; then
 1038-                haveit=
 1039-                if test "X$additional_includedir" = "X/usr/local/include"; then
 1040-                  if test -n "$GCC"; then
 1041-                    case $host_os in
 1042-                      linux* | gnu* | k*bsd*-gnu) haveit=yes;;
 1043-                    esac
 1044-                  fi
 1045-                fi
 1046-                if test -z "$haveit"; then
 1047-                  for x in $CPPFLAGS $INC[]NAME; do
 1048-                    AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
 1049-                    if test "X$x" = "X-I$additional_includedir"; then
 1050-                      haveit=yes
 1051-                      break
 1052-                    fi
 1053-                  done
 1054-                  if test -z "$haveit"; then
 1055-                    if test -d "$additional_includedir"; then
 1056-                      dnl Really add $additional_includedir to $INCNAME.
 1057-                      INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir"
 1058-                    fi
 1059-                  fi
 1060-                fi
 1061-              fi
 1062-            fi
 1063-            dnl Look for dependencies.
 1064-            if test -n "$found_la"; then
 1065-              dnl Read the .la file. It defines the variables
 1066-              dnl dlname, library_names, old_library, dependency_libs, current,
 1067-              dnl age, revision, installed, dlopen, dlpreopen, libdir.
 1068-              save_libdir="$libdir"
 1069-              case "$found_la" in
 1070-                */* | *\\*) . "$found_la" ;;
 1071-                *) . "./$found_la" ;;
 1072-              esac
 1073-              libdir="$save_libdir"
 1074-              dnl We use only dependency_libs.
 1075-              for dep in $dependency_libs; do
 1076-                case "$dep" in
 1077-                  -L*)
 1078-                    additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
 1079-                    dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME.
 1080-                    dnl But don't add it
 1081-                    dnl   1. if it's the standard /usr/lib,
 1082-                    dnl   2. if it's /usr/local/lib and we are using GCC on Linux,
 1083-                    dnl   3. if it's already present in $LDFLAGS or the already
 1084-                    dnl      constructed $LIBNAME,
 1085-                    dnl   4. if it doesn't exist as a directory.
 1086-                    if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
 1087-                      haveit=
 1088-                      if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
 1089-                        if test -n "$GCC"; then
 1090-                          case $host_os in
 1091-                            linux* | gnu* | k*bsd*-gnu) haveit=yes;;
 1092-                          esac
 1093-                        fi
 1094-                      fi
 1095-                      if test -z "$haveit"; then
 1096-                        haveit=
 1097-                        for x in $LDFLAGS $LIB[]NAME; do
 1098-                          AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
 1099-                          if test "X$x" = "X-L$additional_libdir"; then
 1100-                            haveit=yes
 1101-                            break
 1102-                          fi
 1103-                        done
 1104-                        if test -z "$haveit"; then
 1105-                          if test -d "$additional_libdir"; then
 1106-                            dnl Really add $additional_libdir to $LIBNAME.
 1107-                            LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir"
 1108-                          fi
 1109-                        fi
 1110-                        haveit=
 1111-                        for x in $LDFLAGS $LTLIB[]NAME; do
 1112-                          AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
 1113-                          if test "X$x" = "X-L$additional_libdir"; then
 1114-                            haveit=yes
 1115-                            break
 1116-                          fi
 1117-                        done
 1118-                        if test -z "$haveit"; then
 1119-                          if test -d "$additional_libdir"; then
 1120-                            dnl Really add $additional_libdir to $LTLIBNAME.
 1121-                            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir"
 1122-                          fi
 1123-                        fi
 1124-                      fi
 1125-                    fi
 1126-                    ;;
 1127-                  -R*)
 1128-                    dir=`echo "X$dep" | sed -e 's/^X-R//'`
 1129-                    if test "$enable_rpath" != no; then
 1130-                      dnl Potentially add DIR to rpathdirs.
 1131-                      dnl The rpathdirs will be appended to $LIBNAME at the end.
 1132-                      haveit=
 1133-                      for x in $rpathdirs; do
 1134-                        if test "X$x" = "X$dir"; then
 1135-                          haveit=yes
 1136-                          break
 1137-                        fi
 1138-                      done
 1139-                      if test -z "$haveit"; then
 1140-                        rpathdirs="$rpathdirs $dir"
 1141-                      fi
 1142-                      dnl Potentially add DIR to ltrpathdirs.
 1143-                      dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
 1144-                      haveit=
 1145-                      for x in $ltrpathdirs; do
 1146-                        if test "X$x" = "X$dir"; then
 1147-                          haveit=yes
 1148-                          break
 1149-                        fi
 1150-                      done
 1151-                      if test -z "$haveit"; then
 1152-                        ltrpathdirs="$ltrpathdirs $dir"
 1153-                      fi
 1154-                    fi
 1155-                    ;;
 1156-                  -l*)
 1157-                    dnl Handle this in the next round.
 1158-                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
 1159-                    ;;
 1160-                  *.la)
 1161-                    dnl Handle this in the next round. Throw away the .la's
 1162-                    dnl directory; it is already contained in a preceding -L
 1163-                    dnl option.
 1164-                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
 1165-                    ;;
 1166-                  *)
 1167-                    dnl Most likely an immediate library name.
 1168-                    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep"
 1169-                    LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep"
 1170-                    ;;
 1171-                esac
 1172-              done
 1173-            fi
 1174-          else
 1175-            dnl Didn't find the library; assume it is in the system directories
 1176-            dnl known to the linker and runtime loader. (All the system
 1177-            dnl directories known to the linker should also be known to the
 1178-            dnl runtime loader, otherwise the system is severely misconfigured.)
 1179-            LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
 1180-            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
 1181-          fi
 1182-        fi
 1183-      fi
 1184-    done
 1185-  done
 1186-  if test "X$rpathdirs" != "X"; then
 1187-    if test -n "$hardcode_libdir_separator"; then
 1188-      dnl Weird platform: only the last -rpath option counts, the user must
 1189-      dnl pass all path elements in one option. We can arrange that for a
 1190-      dnl single library, but not when more than one $LIBNAMEs are used.
 1191-      alldirs=
 1192-      for found_dir in $rpathdirs; do
 1193-        alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
 1194-      done
 1195-      dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl.
 1196-      acl_save_libdir="$libdir"
 1197-      libdir="$alldirs"
 1198-      eval flag=\"$hardcode_libdir_flag_spec\"
 1199-      libdir="$acl_save_libdir"
 1200-      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
 1201-    else
 1202-      dnl The -rpath options are cumulative.
 1203-      for found_dir in $rpathdirs; do
 1204-        acl_save_libdir="$libdir"
 1205-        libdir="$found_dir"
 1206-        eval flag=\"$hardcode_libdir_flag_spec\"
 1207-        libdir="$acl_save_libdir"
 1208-        LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
 1209-      done
 1210-    fi
 1211-  fi
 1212-  if test "X$ltrpathdirs" != "X"; then
 1213-    dnl When using libtool, the option that works for both libraries and
 1214-    dnl executables is -R. The -R options are cumulative.
 1215-    for found_dir in $ltrpathdirs; do
 1216-      LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
 1217-    done
 1218-  fi
 1219-])
 1220+# Prevent multiple expansion
 1221+define([AC_PROG_LIBTOOL], [])
 1222+])# _AC_PROG_LIBTOOL
 1223 
 1224-dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
 1225-dnl unless already present in VAR.
 1226-dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes
 1227-dnl contains two or three consecutive elements that belong together.
 1228-AC_DEFUN([AC_LIB_APPENDTOVAR],
 1229-[
 1230-  for element in [$2]; do
 1231-    haveit=
 1232-    for x in $[$1]; do
 1233-      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
 1234-      if test "X$x" = "X$element"; then
 1235-        haveit=yes
 1236-        break
 1237-      fi
 1238-    done
 1239-    if test -z "$haveit"; then
 1240-      [$1]="${[$1]}${[$1]:+ }$element"
 1241-    fi
 1242-  done
 1243-])
 1244 
 1245-dnl For those cases where a variable contains several -L and -l options
 1246-dnl referring to unknown libraries and directories, this macro determines the
 1247-dnl necessary additional linker options for the runtime path.
 1248-dnl AC_LIB_LINKFLAGS_FROM_LIBS([LDADDVAR], [LIBSVALUE], [USE-LIBTOOL])
 1249-dnl sets LDADDVAR to linker options needed together with LIBSVALUE.
 1250-dnl If USE-LIBTOOL evaluates to non-empty, linking with libtool is assumed,
 1251-dnl otherwise linking without libtool is assumed.
 1252-AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
 1253-[
 1254-  AC_REQUIRE([AC_LIB_RPATH])
 1255-  AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
 1256-  $1=
 1257-  if test "$enable_rpath" != no; then
 1258-    if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
 1259-      dnl Use an explicit option to hardcode directories into the resulting
 1260-      dnl binary.
 1261-      rpathdirs=
 1262-      next=
 1263-      for opt in $2; do
 1264-        if test -n "$next"; then
 1265-          dir="$next"
 1266-          dnl No need to hardcode the standard /usr/lib.
 1267-          if test "X$dir" != "X/usr/$acl_libdirstem"; then
 1268-            rpathdirs="$rpathdirs $dir"
 1269-          fi
 1270-          next=
 1271-        else
 1272-          case $opt in
 1273-            -L) next=yes ;;
 1274-            -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'`
 1275-                 dnl No need to hardcode the standard /usr/lib.
 1276-                 if test "X$dir" != "X/usr/$acl_libdirstem"; then
 1277-                   rpathdirs="$rpathdirs $dir"
 1278-                 fi
 1279-                 next= ;;
 1280-            *) next= ;;
 1281-          esac
 1282-        fi
 1283-      done
 1284-      if test "X$rpathdirs" != "X"; then
 1285-        if test -n ""$3""; then
 1286-          dnl libtool is used for linking. Use -R options.
 1287-          for dir in $rpathdirs; do
 1288-            $1="${$1}${$1:+ }-R$dir"
 1289-          done
 1290-        else
 1291-          dnl The linker is used for linking directly.
 1292-          if test -n "$hardcode_libdir_separator"; then
 1293-            dnl Weird platform: only the last -rpath option counts, the user
 1294-            dnl must pass all path elements in one option.
 1295-            alldirs=
 1296-            for dir in $rpathdirs; do
 1297-              alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$dir"
 1298-            done
 1299-            acl_save_libdir="$libdir"
 1300-            libdir="$alldirs"
 1301-            eval flag=\"$hardcode_libdir_flag_spec\"
 1302-            libdir="$acl_save_libdir"
 1303-            $1="$flag"
 1304-          else
 1305-            dnl The -rpath options are cumulative.
 1306-            for dir in $rpathdirs; do
 1307-              acl_save_libdir="$libdir"
 1308-              libdir="$dir"
 1309-              eval flag=\"$hardcode_libdir_flag_spec\"
 1310-              libdir="$acl_save_libdir"
 1311-              $1="${$1}${$1:+ }$flag"
 1312-            done
 1313-          fi
 1314-        fi
 1315-      fi
 1316-    fi
 1317-  fi
 1318-  AC_SUBST([$1])
 1319-])
 1320+# AC_LIBTOOL_SETUP
 1321+# ----------------
 1322+AC_DEFUN([AC_LIBTOOL_SETUP],
 1323+[AC_PREREQ(2.50)dnl
 1324+AC_REQUIRE([AC_ENABLE_SHARED])dnl
 1325+AC_REQUIRE([AC_ENABLE_STATIC])dnl
 1326+AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
 1327+AC_REQUIRE([AC_CANONICAL_HOST])dnl
 1328+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
 1329+AC_REQUIRE([AC_PROG_CC])dnl
 1330+AC_REQUIRE([AC_PROG_LD])dnl
 1331+AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
 1332+AC_REQUIRE([AC_PROG_NM])dnl
 1333 
 1334-# lib-prefix.m4 serial 5 (gettext-0.15)
 1335-dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
 1336-dnl This file is free software; the Free Software Foundation
 1337-dnl gives unlimited permission to copy and/or distribute it,
 1338-dnl with or without modifications, as long as this notice is preserved.
 1339-
 1340-dnl From Bruno Haible.
 1341-
 1342-dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and
 1343-dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't
 1344-dnl require excessive bracketing.
 1345-ifdef([AC_HELP_STRING],
 1346-[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])],
 1347-[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])])
 1348-
 1349-dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
 1350-dnl to access previously installed libraries. The basic assumption is that
 1351-dnl a user will want packages to use other packages he previously installed
 1352-dnl with the same --prefix option.
 1353-dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
 1354-dnl libraries, but is otherwise very convenient.
 1355-AC_DEFUN([AC_LIB_PREFIX],
 1356-[
 1357-  AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
 1358-  AC_REQUIRE([AC_PROG_CC])
 1359-  AC_REQUIRE([AC_CANONICAL_HOST])
 1360-  AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
 1361-  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
 1362-  dnl By default, look in $includedir and $libdir.
 1363-  use_additional=yes
 1364-  AC_LIB_WITH_FINAL_PREFIX([
 1365-    eval additional_includedir=\"$includedir\"
 1366-    eval additional_libdir=\"$libdir\"
 1367-  ])
 1368-  AC_LIB_ARG_WITH([lib-prefix],
 1369-[  --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
 1370-  --without-lib-prefix    don't search for libraries in includedir and libdir],
 1371-[
 1372-    if test "X$withval" = "Xno"; then
 1373-      use_additional=no
 1374-    else
 1375-      if test "X$withval" = "X"; then
 1376-        AC_LIB_WITH_FINAL_PREFIX([
 1377-          eval additional_includedir=\"$includedir\"
 1378-          eval additional_libdir=\"$libdir\"
 1379-        ])
 1380-      else
 1381-        additional_includedir="$withval/include"
 1382-        additional_libdir="$withval/$acl_libdirstem"
 1383-      fi
 1384-    fi
 1385-])
 1386-  if test $use_additional = yes; then
 1387-    dnl Potentially add $additional_includedir to $CPPFLAGS.
 1388-    dnl But don't add it
 1389-    dnl   1. if it's the standard /usr/include,
 1390-    dnl   2. if it's already present in $CPPFLAGS,
 1391-    dnl   3. if it's /usr/local/include and we are using GCC on Linux,
 1392-    dnl   4. if it doesn't exist as a directory.
 1393-    if test "X$additional_includedir" != "X/usr/include"; then
 1394-      haveit=
 1395-      for x in $CPPFLAGS; do
 1396-        AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
 1397-        if test "X$x" = "X-I$additional_includedir"; then
 1398-          haveit=yes
 1399-          break
 1400-        fi
 1401-      done
 1402-      if test -z "$haveit"; then
 1403-        if test "X$additional_includedir" = "X/usr/local/include"; then
 1404-          if test -n "$GCC"; then
 1405-            case $host_os in
 1406-              linux* | gnu* | k*bsd*-gnu) haveit=yes;;
 1407-            esac
 1408-          fi
 1409-        fi
 1410-        if test -z "$haveit"; then
 1411-          if test -d "$additional_includedir"; then
 1412-            dnl Really add $additional_includedir to $CPPFLAGS.
 1413-            CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
 1414-          fi
 1415-        fi
 1416-      fi
 1417-    fi
 1418-    dnl Potentially add $additional_libdir to $LDFLAGS.
 1419-    dnl But don't add it
 1420-    dnl   1. if it's the standard /usr/lib,
 1421-    dnl   2. if it's already present in $LDFLAGS,
 1422-    dnl   3. if it's /usr/local/lib and we are using GCC on Linux,
 1423-    dnl   4. if it doesn't exist as a directory.
 1424-    if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
 1425-      haveit=
 1426-      for x in $LDFLAGS; do
 1427-        AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
 1428-        if test "X$x" = "X-L$additional_libdir"; then
 1429-          haveit=yes
 1430-          break
 1431-        fi
 1432-      done
 1433-      if test -z "$haveit"; then
 1434-        if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
 1435-          if test -n "$GCC"; then
 1436-            case $host_os in
 1437-              linux*) haveit=yes;;
 1438-            esac
 1439-          fi
 1440-        fi
 1441-        if test -z "$haveit"; then
 1442-          if test -d "$additional_libdir"; then
 1443-            dnl Really add $additional_libdir to $LDFLAGS.
 1444-            LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
 1445-          fi
 1446-        fi
 1447-      fi
 1448-    fi
 1449-  fi
 1450-])
 1451+AC_REQUIRE([AC_PROG_LN_S])dnl
 1452+AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
 1453+# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
 1454+AC_REQUIRE([AC_OBJEXT])dnl
 1455+AC_REQUIRE([AC_EXEEXT])dnl
 1456+dnl
 1457 
 1458-dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix,
 1459-dnl acl_final_exec_prefix, containing the values to which $prefix and
 1460-dnl $exec_prefix will expand at the end of the configure script.
 1461-AC_DEFUN([AC_LIB_PREPARE_PREFIX],
 1462-[
 1463-  dnl Unfortunately, prefix and exec_prefix get only finally determined
 1464-  dnl at the end of configure.
 1465-  if test "X$prefix" = "XNONE"; then
 1466-    acl_final_prefix="$ac_default_prefix"
 1467-  else
 1468-    acl_final_prefix="$prefix"
 1469-  fi
 1470-  if test "X$exec_prefix" = "XNONE"; then
 1471-    acl_final_exec_prefix='${prefix}'
 1472-  else
 1473-    acl_final_exec_prefix="$exec_prefix"
 1474-  fi
 1475-  acl_save_prefix="$prefix"
 1476-  prefix="$acl_final_prefix"
 1477-  eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
 1478-  prefix="$acl_save_prefix"
 1479-])
 1480+AC_LIBTOOL_SYS_MAX_CMD_LEN
 1481+AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
 1482+AC_LIBTOOL_OBJDIR
 1483 
 1484-dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the
 1485-dnl variables prefix and exec_prefix bound to the values they will have
 1486-dnl at the end of the configure script.
 1487-AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
 1488-[
 1489-  acl_save_prefix="$prefix"
 1490-  prefix="$acl_final_prefix"
 1491-  acl_save_exec_prefix="$exec_prefix"
 1492-  exec_prefix="$acl_final_exec_prefix"
 1493-  $1
 1494-  exec_prefix="$acl_save_exec_prefix"
 1495-  prefix="$acl_save_prefix"
 1496-])
 1497+AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
 1498+_LT_AC_PROG_ECHO_BACKSLASH
 1499 
 1500-dnl AC_LIB_PREPARE_MULTILIB creates a variable acl_libdirstem, containing
 1501-dnl the basename of the libdir, either "lib" or "lib64".
 1502-AC_DEFUN([AC_LIB_PREPARE_MULTILIB],
 1503-[
 1504-  dnl There is no formal standard regarding lib and lib64. The current
 1505-  dnl practice is that on a system supporting 32-bit and 64-bit instruction
 1506-  dnl sets or ABIs, 64-bit libraries go under $prefix/lib64 and 32-bit
 1507-  dnl libraries go under $prefix/lib. We determine the compiler's default
 1508-  dnl mode by looking at the compiler's library search path. If at least
 1509-  dnl of its elements ends in /lib64 or points to a directory whose absolute
 1510-  dnl pathname ends in /lib64, we assume a 64-bit ABI. Otherwise we use the
 1511-  dnl default, namely "lib".
 1512-  acl_libdirstem=lib
 1513-  searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
 1514-  if test -n "$searchpath"; then
 1515-    acl_save_IFS="${IFS= 	}"; IFS=":"
 1516-    for searchdir in $searchpath; do
 1517-      if test -d "$searchdir"; then
 1518-        case "$searchdir" in
 1519-          */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
 1520-          *) searchdir=`cd "$searchdir" && pwd`
 1521-             case "$searchdir" in
 1522-               */lib64 ) acl_libdirstem=lib64 ;;
 1523-             esac ;;
 1524-        esac
 1525-      fi
 1526-    done
 1527-    IFS="$acl_save_IFS"
 1528+case $host_os in
 1529+aix3*)
 1530+  # AIX sometimes has problems with the GCC collect2 program.  For some
 1531+  # reason, if we set the COLLECT_NAMES environment variable, the problems
 1532+  # vanish in a puff of smoke.
 1533+  if test "X${COLLECT_NAMES+set}" != Xset; then
 1534+    COLLECT_NAMES=
 1535+    export COLLECT_NAMES
 1536   fi
 1537-])
 1538+  ;;
 1539+esac
 1540 
 1541-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 1542-#
 1543-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
 1544-# Free Software Foundation, Inc.
 1545-#
 1546-# This file is part of GNU Libtool:
 1547-# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 1548-#
 1549-# This file is free software; the Free Software Foundation gives
 1550-# unlimited permission to copy and/or distribute it, with or without
 1551-# modifications, as long as this notice is preserved.
 1552+# Sed substitution that helps us do robust quoting.  It backslashifies
 1553+# metacharacters that are still active within double-quoted strings.
 1554+Xsed='sed -e 1s/^X//'
 1555+[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
 1556 
 1557-m4_define([_LT_COPYING], [dnl
 1558-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
 1559-# Free Software Foundation, Inc.
 1560-#
 1561-# This file is part of GNU Libtool:
 1562-# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 1563-#
 1564-# This program is free software; you can redistribute it and/or modify
 1565-# it under the terms of the GNU General Public License as published by
 1566-# the Free Software Foundation; either version 2 of the License, or
 1567-# (at your option) any later version.
 1568-#
 1569-# This program is distributed in the hope that it will be useful, but
 1570-# WITHOUT ANY WARRANTY; without even the implied warranty of
 1571-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 1572-# General Public License for more details.
 1573-#
 1574-# You should have received a copy of the GNU General Public License
 1575-# along with this program; if not, write to the Free Software
 1576-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 1577-#
 1578-# As a special exception to the GNU General Public License, if you
 1579-# distribute this file as part of a program that contains a
 1580-# configuration script generated by Autoconf, you may include it under
 1581-# the same distribution terms that you use for the rest of that program.
 1582-])
 1583+# Same as above, but do not quote variable references.
 1584+[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
 1585 
 1586-# serial 51 LT_INIT
 1587+# Sed substitution to delay expansion of an escaped shell variable in a
 1588+# double_quote_subst'ed string.
 1589+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
 1590 
 1591+# Sed substitution to avoid accidental globbing in evaled expressions
 1592+no_glob_subst='s/\*/\\\*/g'
 1593 
 1594-# LT_PREREQ(VERSION)
 1595-# ------------------
 1596-# Complain and exit if this libtool version is less that VERSION.
 1597-m4_defun([LT_PREREQ],
 1598-[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1,
 1599-       [m4_default([$3],
 1600-		   [m4_fatal([Libtool version $1 or higher is required],
 1601-		             63)])],
 1602-       [$2])])
 1603+# Constants:
 1604+rm="rm -f"
 1605 
 1606+# Global variables:
 1607+default_ofile=libtool
 1608+can_build_shared=yes
 1609 
 1610-# LT_INIT([OPTIONS])
 1611-# ------------------
 1612-AC_DEFUN([LT_INIT],
 1613-[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
 1614-AC_BEFORE([$0], [LT_LANG])dnl
 1615-AC_BEFORE([$0], [LT_OUTPUT])dnl
 1616-
 1617-dnl Autoconf doesn't catch unexpanded LT_ macros by default:
 1618-m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl
 1619-m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl
 1620-dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4
 1621-dnl unless we require an AC_DEFUNed macro:
 1622-AC_REQUIRE([LTOPTIONS_VERSION])dnl
 1623-AC_REQUIRE([LTSUGAR_VERSION])dnl
 1624-AC_REQUIRE([LTVERSION_VERSION])dnl
 1625-m4_require([_LT_PROG_LTMAIN])dnl
 1626-m4_require([_LT_SET_OPTIONS], [_LT_SET_OPTIONS([$1])])dnl
 1627+# All known linkers require a `.a' archive for static linking (except MSVC,
 1628+# which needs '.lib').
 1629+libext=a
 1630+ltmain="$ac_aux_dir/ltmain.sh"
 1631+ofile="$default_ofile"
 1632+with_gnu_ld="$lt_cv_prog_gnu_ld"
 1633 
 1634-# This can be used to rebuild libtool when needed
 1635-LIBTOOL_DEPS="$ltmain"
 1636+AC_CHECK_TOOL(AR, ar, false)
 1637+AC_CHECK_TOOL(RANLIB, ranlib, :)
 1638+AC_CHECK_TOOL(STRIP, strip, :)
 1639 
 1640-# Always use our own libtool.
 1641-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 1642-AC_SUBST(LIBTOOL)dnl
 1643-
 1644-_LT_SETUP
 1645-
 1646-# Only expand once:
 1647-m4_define([LT_INIT])
 1648-])# _LT_INIT
 1649-
 1650-# Old names:
 1651-AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT])
 1652-AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT])
 1653-dnl aclocal-1.4 backwards compatibility:
 1654-dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
 1655-dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
 1656-
 1657-
 1658-# _LT_CC_BASENAME(CC)
 1659-# -------------------
 1660-# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
 1661-m4_defun([_LT_CC_BASENAME],
 1662-[for cc_temp in $1""; do
 1663-  case $cc_temp in
 1664-    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
 1665-    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
 1666-    \-*) ;;
 1667-    *) break;;
 1668-  esac
 1669-done
 1670-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 1671-])
 1672-
 1673-
 1674-# _LT_FILEUTILS_DEFAULTS
 1675-# ----------------------
 1676-# It is okay to use these file commands and assume they have been set
 1677-# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'.
 1678-m4_defun([_LT_FILEUTILS_DEFAULTS],
 1679-[: ${CP="cp -f"}
 1680-: ${MV="mv -f"}
 1681-: ${RM="rm -f"}
 1682-])# _LT_FILEUTILS_DEFAULTS
 1683-
 1684-
 1685-# _LT_SETUP
 1686-# ---------
 1687-m4_defun([_LT_SETUP],
 1688-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
 1689-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
 1690-_LT_DECL([], [host_alias], [0], [The host system])dnl
 1691-_LT_DECL([], [host], [0])dnl
 1692-_LT_DECL([], [host_os], [0])dnl
 1693-dnl
 1694-_LT_DECL([], [build_alias], [0], [The build system])dnl
 1695-_LT_DECL([], [build], [0])dnl
 1696-_LT_DECL([], [build_os], [0])dnl
 1697-dnl
 1698-AC_REQUIRE([AC_PROG_CC])dnl
 1699-AC_REQUIRE([LT_PATH_LD])dnl
 1700-AC_REQUIRE([LT_PATH_NM])dnl
 1701-dnl
 1702-AC_REQUIRE([AC_PROG_LN_S])dnl
 1703-test -z "$LN_S" && LN_S="ln -s"
 1704-_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl
 1705-dnl
 1706-AC_REQUIRE([LT_CMD_MAX_LEN])dnl
 1707-AC_REQUIRE([AC_OBJEXT])dnl
 1708-_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl
 1709-AC_REQUIRE([AC_EXEEXT])dnl
 1710-_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
 1711-dnl
 1712-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
 1713-m4_require([_LT_CHECK_XSI_SHELL])dnl
 1714-m4_require([_LT_CMD_RELOAD])dnl
 1715-m4_require([_LT_CHECK_MAGIC_METHOD])dnl
 1716-m4_require([_LT_CMD_OLD_ARCHIVE])dnl
 1717-m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
 1718-
 1719-_LT_CONFIG_LIBTOOL_INIT([
 1720-# See if we are running on zsh, and set the options which allow our
 1721-# commands through without removal of \ escapes INIT.
 1722-if test -n "\${ZSH_VERSION+set}" ; then
 1723-   setopt NO_GLOB_SUBST
 1724-fi
 1725-])
 1726-if test -n "${ZSH_VERSION+set}" ; then
 1727-   setopt NO_GLOB_SUBST
 1728-fi
 1729-
 1730-_LT_CHECK_OBJDIR
 1731-
 1732-m4_require([_LT_TAG_COMPILER])dnl
 1733-_LT_PROG_ECHO_BACKSLASH
 1734-
 1735-case $host_os in
 1736-aix3*)
 1737-  # AIX sometimes has problems with the GCC collect2 program.  For some
 1738-  # reason, if we set the COLLECT_NAMES environment variable, the problems
 1739-  # vanish in a puff of smoke.
 1740-  if test "X${COLLECT_NAMES+set}" != Xset; then
 1741-    COLLECT_NAMES=
 1742-    export COLLECT_NAMES
 1743-  fi
 1744-  ;;
 1745-esac
 1746-
 1747-# Sed substitution that helps us do robust quoting.  It backslashifies
 1748-# metacharacters that are still active within double-quoted strings.
 1749-Xsed='sed -e 1s/^X//'
 1750-sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
 1751-
 1752-# Same as above, but do not quote variable references.
 1753-double_quote_subst='s/\([["`\\]]\)/\\\1/g'
 1754-
 1755-# Sed substitution to delay expansion of an escaped shell variable in a
 1756-# double_quote_subst'ed string.
 1757-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
 1758-
 1759-# Sed substitution to delay expansion of an escaped single quote.
 1760-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
 1761-
 1762-# Sed substitution to avoid accidental globbing in evaled expressions
 1763-no_glob_subst='s/\*/\\\*/g'
 1764-
 1765-# Global variables:
 1766-ofile=libtool
 1767-can_build_shared=yes
 1768-
 1769-# All known linkers require a `.a' archive for static linking (except MSVC,
 1770-# which needs '.lib').
 1771-libext=a
 1772-
 1773-with_gnu_ld="$lt_cv_prog_gnu_ld"
 1774-
 1775-old_CC="$CC"
 1776-old_CFLAGS="$CFLAGS"
 1777+old_CC="$CC"
 1778+old_CFLAGS="$CFLAGS"
 1779 
 1780 # Set sane defaults for various variables
 1781+test -z "$AR" && AR=ar
 1782+test -z "$AR_FLAGS" && AR_FLAGS=cru
 1783+test -z "$AS" && AS=as
 1784 test -z "$CC" && CC=cc
 1785 test -z "$LTCC" && LTCC=$CC
 1786 test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
 1787+test -z "$DLLTOOL" && DLLTOOL=dlltool
 1788 test -z "$LD" && LD=ld
 1789+test -z "$LN_S" && LN_S="ln -s"
 1790+test -z "$MAGIC_CMD" && MAGIC_CMD=file
 1791+test -z "$NM" && NM=nm
 1792+test -z "$SED" && SED=sed
 1793+test -z "$OBJDUMP" && OBJDUMP=objdump
 1794+test -z "$RANLIB" && RANLIB=:
 1795+test -z "$STRIP" && STRIP=:
 1796 test -z "$ac_objext" && ac_objext=o
 1797 
 1798+# Determine commands to create old-style static archives.
 1799+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
 1800+old_postinstall_cmds='chmod 644 $oldlib'
 1801+old_postuninstall_cmds=
 1802+
 1803+if test -n "$RANLIB"; then
 1804+  case $host_os in
 1805+  openbsd*)
 1806+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
 1807+    ;;
 1808+  *)
 1809+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
 1810+    ;;
 1811+  esac
 1812+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
 1813+fi
 1814+
 1815 _LT_CC_BASENAME([$compiler])
 1816 
 1817 # Only perform the check for file, if the check method requires it
 1818-test -z "$MAGIC_CMD" && MAGIC_CMD=file
 1819 case $deplibs_check_method in
 1820 file_magic*)
 1821   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
 1822-    _LT_PATH_MAGIC
 1823+    AC_PATH_MAGIC
 1824   fi
 1825   ;;
 1826 esac
 1827 
 1828-# Use C for the default configuration in the libtool script
 1829-LT_SUPPORTED_TAG([CC])
 1830-_LT_LANG_C_CONFIG
 1831-_LT_LANG_DEFAULT_CONFIG
 1832-_LT_CONFIG_COMMANDS
 1833-])# _LT_SETUP
 1834+AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
 1835+AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
 1836+enable_win32_dll=yes, enable_win32_dll=no)
 1837 
 1838+AC_ARG_ENABLE([libtool-lock],
 1839+    [AC_HELP_STRING([--disable-libtool-lock],
 1840+	[avoid locking (might break parallel builds)])])
 1841+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
 1842 
 1843-# _LT_PROG_LTMAIN
 1844-# ---------------
 1845-# Note that this code is called both from `configure', and `config.status'
 1846-# now that we use AC_CONFIG_COMMANDS to generate libtool.  Notably,
 1847-# `config.status' has no value for ac_aux_dir unless we are using Automake,
 1848-# so we pass a copy along to make sure it has a sensible value anyway.
 1849-m4_defun([_LT_PROG_LTMAIN],
 1850-[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl
 1851-_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
 1852-ltmain="$ac_aux_dir/ltmain.sh"
 1853-])# _LT_PROG_LTMAIN
 1854+AC_ARG_WITH([pic],
 1855+    [AC_HELP_STRING([--with-pic],
 1856+	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
 1857+    [pic_mode="$withval"],
 1858+    [pic_mode=default])
 1859+test -z "$pic_mode" && pic_mode=default
 1860 
 1861+# Use C for the default configuration in the libtool script
 1862+tagname=
 1863+AC_LIBTOOL_LANG_C_CONFIG
 1864+_LT_AC_TAGCONFIG
 1865+])# AC_LIBTOOL_SETUP
 1866 
 1867 
 1868-# So that we can recreate a full libtool script including additional
 1869-# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
 1870-# in macros and then make a single call at the end using the `libtool'
 1871-# label.
 1872+# _LT_AC_SYS_COMPILER
 1873+# -------------------
 1874+AC_DEFUN([_LT_AC_SYS_COMPILER],
 1875+[AC_REQUIRE([AC_PROG_CC])dnl
 1876 
 1877+# If no C compiler was specified, use CC.
 1878+LTCC=${LTCC-"$CC"}
 1879 
 1880-# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS])
 1881-# ----------------------------------------
 1882-# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later.
 1883-m4_define([_LT_CONFIG_LIBTOOL_INIT],
 1884-[m4_ifval([$1],
 1885-          [m4_append([_LT_OUTPUT_LIBTOOL_INIT],
 1886-                     [$1
 1887-])])])
 1888+# If no C compiler flags were specified, use CFLAGS.
 1889+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
 1890 
 1891-# Initialize.
 1892-m4_define([_LT_OUTPUT_LIBTOOL_INIT])
 1893+# Allow CC to be a program name with arguments.
 1894+compiler=$CC
 1895+])# _LT_AC_SYS_COMPILER
 1896 
 1897 
 1898-# _LT_CONFIG_LIBTOOL([COMMANDS])
 1899-# ------------------------------
 1900-# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later.
 1901-m4_define([_LT_CONFIG_LIBTOOL],
 1902-[m4_ifval([$1],
 1903-          [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS],
 1904-                     [$1
 1905-])])])
 1906-
 1907-# Initialize.
 1908-m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS])
 1909-
 1910-
 1911-# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS])
 1912-# -----------------------------------------------------
 1913-m4_defun([_LT_CONFIG_SAVE_COMMANDS],
 1914-[_LT_CONFIG_LIBTOOL([$1])
 1915-_LT_CONFIG_LIBTOOL_INIT([$2])
 1916+# _LT_CC_BASENAME(CC)
 1917+# -------------------
 1918+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
 1919+AC_DEFUN([_LT_CC_BASENAME],
 1920+[for cc_temp in $1""; do
 1921+  case $cc_temp in
 1922+    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
 1923+    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
 1924+    \-*) ;;
 1925+    *) break;;
 1926+  esac
 1927+done
 1928+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 1929 ])
 1930 
 1931 
 1932-# _LT_FORMAT_COMMENT([COMMENT])
 1933-# -----------------------------
 1934-# Add leading comment marks to the start of each line, and a trailing
 1935-# full-stop to the whole comment if one is not present already.
 1936-m4_define([_LT_FORMAT_COMMENT],
 1937-[m4_ifval([$1], [
 1938-m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])],
 1939-              [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.])
 1940-)])
 1941-
 1942-
 1943-
 1944-
 1945-
 1946-# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?])
 1947-# -------------------------------------------------------------------
 1948-# CONFIGNAME is the name given to the value in the libtool script.
 1949-# VARNAME is the (base) name used in the configure script.
 1950-# VALUE may be 0, 1 or 2 for a computed quote escaped value based on
 1951-# VARNAME.  Any other value will be used directly.
 1952-m4_define([_LT_DECL],
 1953-[lt_if_append_uniq([lt_decl_varnames], [$2], [[, ]],
 1954-    [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name],
 1955-	[m4_ifval([$1], [$1], [$2])])
 1956-    lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3])
 1957-    m4_ifval([$4],
 1958-	[lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])])
 1959-    lt_dict_add_subkey([lt_decl_dict], [$2],
 1960-	[tagged?], [m4_ifval([$5], [yes], [no])])])
 1961-])
 1962+# _LT_COMPILER_BOILERPLATE
 1963+# ------------------------
 1964+# Check for compiler boilerplate output or warnings with
 1965+# the simple compiler test code.
 1966+AC_DEFUN([_LT_COMPILER_BOILERPLATE],
 1967+[ac_outfile=conftest.$ac_objext
 1968+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
 1969+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 1970+_lt_compiler_boilerplate=`cat conftest.err`
 1971+$rm conftest*
 1972+])# _LT_COMPILER_BOILERPLATE
 1973 
 1974 
 1975-# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION])
 1976-# --------------------------------------------------------
 1977-m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])])
 1978-
 1979-
 1980-# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...])
 1981-# ------------------------------------------------
 1982-m4_define([lt_decl_tag_varnames],
 1983-[_lt_decl_filter([tagged?], [yes], $@)])
 1984-
 1985-
 1986-# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..])
 1987-# ---------------------------------------------------------
 1988-m4_define([_lt_decl_filter],
 1989-[m4_case([$#],
 1990-  [0], [m4_fatal([$0: too few arguments: $#])],
 1991-  [1], [m4_fatal([$0: too few arguments: $#: $1])],
 1992-  [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)],
 1993-  [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)],
 1994-  [lt_dict_filter([lt_decl_dict], $@)])[]dnl
 1995-])
 1996+# _LT_LINKER_BOILERPLATE
 1997+# ----------------------
 1998+# Check for linker boilerplate output or warnings with
 1999+# the simple link test code.
 2000+AC_DEFUN([_LT_LINKER_BOILERPLATE],
 2001+[ac_outfile=conftest.$ac_objext
 2002+printf "$lt_simple_link_test_code" >conftest.$ac_ext
 2003+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 2004+_lt_linker_boilerplate=`cat conftest.err`
 2005+$rm conftest*
 2006+])# _LT_LINKER_BOILERPLATE
 2007 
 2008 
 2009-# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...])
 2010-# --------------------------------------------------
 2011-m4_define([lt_decl_quote_varnames],
 2012-[_lt_decl_filter([value], [1], $@)])
 2013-
 2014-
 2015-# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...])
 2016-# ---------------------------------------------------
 2017-m4_define([lt_decl_dquote_varnames],
 2018-[_lt_decl_filter([value], [2], $@)])
 2019-
 2020-
 2021-# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
 2022-# ---------------------------------------------------
 2023-m4_define([lt_decl_varnames_tagged],
 2024-[_$0(m4_quote(m4_default([$1], [[, ]])),
 2025-     m4_quote(m4_if([$2], [],
 2026-		     m4_quote(lt_decl_tag_varnames),
 2027-		  m4_quote(m4_shift($@)))),
 2028-     m4_split(m4_normalize(m4_quote(_LT_TAGS))))])
 2029-m4_define([_lt_decl_varnames_tagged], [lt_combine([$1], [$2], [_], $3)])
 2030-
 2031-
 2032-# lt_decl_all_varnames([SEPARATOR], [VARNAME1...])
 2033-# ------------------------------------------------
 2034-m4_define([lt_decl_all_varnames],
 2035-[_$0(m4_quote(m4_default([$1], [[, ]])),
 2036-     m4_if([$2], [],
 2037-	   m4_quote(lt_decl_varnames),
 2038-	m4_quote(m4_shift($@))))[]dnl
 2039-])
 2040-m4_define([_lt_decl_all_varnames],
 2041-[lt_join($@, lt_decl_varnames_tagged([$1],
 2042-			lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl
 2043-])
 2044+# _LT_AC_SYS_LIBPATH_AIX
 2045+# ----------------------
 2046+# Links a minimal program and checks the executable
 2047+# for the system default hardcoded library path. In most cases,
 2048+# this is /usr/lib:/lib, but when the MPI compilers are used
 2049+# the location of the communication and MPI libs are included too.
 2050+# If we don't find anything, use the default library path according
 2051+# to the aix ld manual.
 2052+AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
 2053+[AC_LINK_IFELSE(AC_LANG_PROGRAM,[
 2054+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
 2055+}'`
 2056+# Check for a 64-bit object if we didn't find anything.
 2057+if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
 2058+}'`; fi],[])
 2059+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 2060+])# _LT_AC_SYS_LIBPATH_AIX
 2061 
 2062 
 2063-# _LT_CONFIG_STATUS_DECLARE([VARNAME])
 2064-# ------------------------------------
 2065-# Quote a variable value, and forward it to `config.status' so that its
 2066-# declaration there will have the same value as in `configure'.  VARNAME
 2067-# must have a single quote delimited value for this to work.
 2068-m4_define([_LT_CONFIG_STATUS_DECLARE],
 2069-[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`'])
 2070+# _LT_AC_SHELL_INIT(ARG)
 2071+# ----------------------
 2072+AC_DEFUN([_LT_AC_SHELL_INIT],
 2073+[ifdef([AC_DIVERSION_NOTICE],
 2074+	     [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
 2075+	 [AC_DIVERT_PUSH(NOTICE)])
 2076+$1
 2077+AC_DIVERT_POP
 2078+])# _LT_AC_SHELL_INIT
 2079 
 2080 
 2081-# _LT_CONFIG_STATUS_DECLARATIONS
 2082-# ------------------------------
 2083-# We delimit libtool config variables with single quotes, so when
 2084-# we write them to config.status, we have to be sure to quote all
 2085-# embedded single quotes properly.  In configure, this macro expands
 2086-# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
 2087-#
 2088-#    <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`'
 2089-m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
 2090-[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
 2091-    [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
 2092+# _LT_AC_PROG_ECHO_BACKSLASH
 2093+# --------------------------
 2094+# Add some code to the start of the generated configure script which
 2095+# will find an echo command which doesn't interpret backslashes.
 2096+AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
 2097+[_LT_AC_SHELL_INIT([
 2098+# Check that we are running under the correct shell.
 2099+SHELL=${CONFIG_SHELL-/bin/sh}
 2100 
 2101+case X$ECHO in
 2102+X*--fallback-echo)
 2103+  # Remove one level of quotation (which was required for Make).
 2104+  ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
 2105+  ;;
 2106+esac
 2107 
 2108-# _LT_LIBTOOL_TAGS
 2109-# ----------------
 2110-# Output comment and list of tags supported by the script
 2111-m4_defun([_LT_LIBTOOL_TAGS],
 2112-[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
 2113-available_tags="_LT_TAGS"dnl
 2114-])
 2115+echo=${ECHO-echo}
 2116+if test "X[$]1" = X--no-reexec; then
 2117+  # Discard the --no-reexec flag, and continue.
 2118+  shift
 2119+elif test "X[$]1" = X--fallback-echo; then
 2120+  # Avoid inline document here, it may be left over
 2121+  :
 2122+elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
 2123+  # Yippee, $echo works!
 2124+  :
 2125+else
 2126+  # Restart under the correct shell.
 2127+  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
 2128+fi
 2129 
 2130+if test "X[$]1" = X--fallback-echo; then
 2131+  # used as fallback echo
 2132+  shift
 2133+  cat <<EOF
 2134+[$]*
 2135+EOF
 2136+  exit 0
 2137+fi
 2138 
 2139-# _LT_LIBTOOL_DECLARE(VARNAME, [TAG])
 2140-# -----------------------------------
 2141-# Extract the dictionary values for VARNAME (optionally with TAG) and
 2142-# expand to a commented shell variable setting:
 2143-#
 2144-#    # Some comment about what VAR is for.
 2145-#    visible_name=$lt_internal_name
 2146-m4_define([_LT_LIBTOOL_DECLARE],
 2147-[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1],
 2148-					   [description])))[]dnl
 2149-m4_pushdef([_libtool_name],
 2150-    m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl
 2151-m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])),
 2152-    [0], [_libtool_name=[$]$1],
 2153-    [1], [_libtool_name=$lt_[]$1],
 2154-    [2], [_libtool_name=$lt_[]$1],
 2155-    [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl
 2156-m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl
 2157-])
 2158+# The HP-UX ksh and POSIX shell print the target directory to stdout
 2159+# if CDPATH is set.
 2160+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 2161 
 2162+if test -z "$ECHO"; then
 2163+if test "X${echo_test_string+set}" != Xset; then
 2164+# find a string as large as possible, as long as the shell can cope with it
 2165+  for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
 2166+    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
 2167+    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
 2168+       echo_test_string=`eval $cmd` &&
 2169+       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
 2170+    then
 2171+      break
 2172+    fi
 2173+  done
 2174+fi
 2175 
 2176-# _LT_LIBTOOL_CONFIG_VARS
 2177-# -----------------------
 2178-# Produce commented declarations of non-tagged libtool config variables
 2179-# suitable for insertion in the LIBTOOL CONFIG section of the `libtool'
 2180-# script.  Tagged libtool config variables (even for the LIBTOOL CONFIG
 2181-# section) are produced by _LT_LIBTOOL_TAG_VARS.
 2182-m4_defun([_LT_LIBTOOL_CONFIG_VARS],
 2183-[m4_foreach([_lt_var],
 2184-    m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)),
 2185-    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])])
 2186+if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
 2187+   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
 2188+   test "X$echo_testing_string" = "X$echo_test_string"; then
 2189+  :
 2190+else
 2191+  # The Solaris, AIX, and Digital Unix default echo programs unquote
 2192+  # backslashes.  This makes it impossible to quote backslashes using
 2193+  #   echo "$something" | sed 's/\\/\\\\/g'
 2194+  #
 2195+  # So, first we look for a working echo in the user's PATH.
 2196 
 2197+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
 2198+  for dir in $PATH /usr/ucb; do
 2199+    IFS="$lt_save_ifs"
 2200+    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
 2201+       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
 2202+       echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
 2203+       test "X$echo_testing_string" = "X$echo_test_string"; then
 2204+      echo="$dir/echo"
 2205+      break
 2206+    fi
 2207+  done
 2208+  IFS="$lt_save_ifs"
 2209 
 2210-# _LT_LIBTOOL_TAG_VARS(TAG)
 2211-# -------------------------
 2212-m4_define([_LT_LIBTOOL_TAG_VARS],
 2213-[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames),
 2214-    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])])
 2215+  if test "X$echo" = Xecho; then
 2216+    # We didn't find a better echo, so look for alternatives.
 2217+    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
 2218+       echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
 2219+       test "X$echo_testing_string" = "X$echo_test_string"; then
 2220+      # This shell has a builtin print -r that does the trick.
 2221+      echo='print -r'
 2222+    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
 2223+	 test "X$CONFIG_SHELL" != X/bin/ksh; then
 2224+      # If we have ksh, try running configure again with it.
 2225+      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
 2226+      export ORIGINAL_CONFIG_SHELL
 2227+      CONFIG_SHELL=/bin/ksh
 2228+      export CONFIG_SHELL
 2229+      exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
 2230+    else
 2231+      # Try using printf.
 2232+      echo='printf %s\n'
 2233+      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
 2234+	 echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
 2235+	 test "X$echo_testing_string" = "X$echo_test_string"; then
 2236+	# Cool, printf works
 2237+	:
 2238+      elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
 2239+	   test "X$echo_testing_string" = 'X\t' &&
 2240+	   echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
 2241+	   test "X$echo_testing_string" = "X$echo_test_string"; then
 2242+	CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
 2243+	export CONFIG_SHELL
 2244+	SHELL="$CONFIG_SHELL"
 2245+	export SHELL
 2246+	echo="$CONFIG_SHELL [$]0 --fallback-echo"
 2247+      elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
 2248+	   test "X$echo_testing_string" = 'X\t' &&
 2249+	   echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
 2250+	   test "X$echo_testing_string" = "X$echo_test_string"; then
 2251+	echo="$CONFIG_SHELL [$]0 --fallback-echo"
 2252+      else
 2253+	# maybe with a smaller string...
 2254+	prev=:
 2255 
 2256+	for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
 2257+	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
 2258+	  then
 2259+	    break
 2260+	  fi
 2261+	  prev="$cmd"
 2262+	done
 2263 
 2264-# _LT_TAGVAR(VARNAME, [TAGNAME])
 2265-# ------------------------------
 2266-m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])
 2267+	if test "$prev" != 'sed 50q "[$]0"'; then
 2268+	  echo_test_string=`eval $prev`
 2269+	  export echo_test_string
 2270+	  exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
 2271+	else
 2272+	  # Oops.  We lost completely, so just stick with echo.
 2273+	  echo=echo
 2274+	fi
 2275+      fi
 2276+    fi
 2277+  fi
 2278+fi
 2279+fi
 2280 
 2281+# Copy echo and quote the copy suitably for passing to libtool from
 2282+# the Makefile, instead of quoting the original, which is used later.
 2283+ECHO=$echo
 2284+if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
 2285+   ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
 2286+fi
 2287 
 2288-# _LT_CONFIG_COMMANDS
 2289-# -------------------
 2290-# Send accumulated output to $CONFIG_STATUS.  Thanks to the lists of
 2291-# variables for single and double quote escaping we saved from calls
 2292-# to _LT_DECL, we can put quote escaped variables declarations
 2293-# into `config.status', and then the shell code to quote escape them in
 2294-# for loops in `config.status'.  Finally, any additional code accumulated
 2295-# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
 2296-m4_defun([_LT_CONFIG_COMMANDS],
 2297-[AC_PROVIDE_IFELSE([LT_OUTPUT],
 2298-	dnl If the libtool generation code has been placed in $CONFIG_LT,
 2299-	dnl instead of duplicating it all over again into config.status,
 2300-	dnl then we will have config.status run $CONFIG_LT later, so it
 2301-	dnl needs to know what name is stored there:
 2302-        [AC_CONFIG_COMMANDS([libtool],
 2303-            [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])],
 2304-    dnl If the libtool generation code is destined for config.status,
 2305-    dnl expand the accumulated commands and init code now:
 2306-    [AC_CONFIG_COMMANDS([libtool],
 2307-        [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])])
 2308-])#_LT_CONFIG_COMMANDS
 2309+AC_SUBST(ECHO)
 2310+])])# _LT_AC_PROG_ECHO_BACKSLASH
 2311 
 2312 
 2313-# Initialize.
 2314-m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT],
 2315-[
 2316+# _LT_AC_LOCK
 2317+# -----------
 2318+AC_DEFUN([_LT_AC_LOCK],
 2319+[AC_ARG_ENABLE([libtool-lock],
 2320+    [AC_HELP_STRING([--disable-libtool-lock],
 2321+	[avoid locking (might break parallel builds)])])
 2322+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
 2323 
 2324-# The HP-UX ksh and POSIX shell print the target directory to stdout
 2325-# if CDPATH is set.
 2326-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 2327-
 2328-sed_quote_subst='$sed_quote_subst'
 2329-double_quote_subst='$double_quote_subst'
 2330-delay_variable_subst='$delay_variable_subst'
 2331-_LT_CONFIG_STATUS_DECLARATIONS
 2332-LTCC='$LTCC'
 2333-LTCFLAGS='$LTCFLAGS'
 2334-compiler='$compiler_DEFAULT'
 2335-
 2336-# Quote evaled strings.
 2337-for var in lt_decl_all_varnames([[ \
 2338-]], lt_decl_quote_varnames); do
 2339-    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
 2340-    *[[\\\\\\\`\\"\\\$]]*)
 2341-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
 2342+# Some flags need to be propagated to the compiler or linker for good
 2343+# libtool support.
 2344+case $host in
 2345+ia64-*-hpux*)
 2346+  # Find out which ABI we are using.
 2347+  echo 'int i;' > conftest.$ac_ext
 2348+  if AC_TRY_EVAL(ac_compile); then
 2349+    case `/usr/bin/file conftest.$ac_objext` in
 2350+    *ELF-32*)
 2351+      HPUX_IA64_MODE="32"
 2352       ;;
 2353-    *)
 2354-      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
 2355+    *ELF-64*)
 2356+      HPUX_IA64_MODE="64"
 2357       ;;
 2358     esac
 2359-done
 2360-
 2361-# Double-quote double-evaled strings.
 2362-for var in lt_decl_all_varnames([[ \
 2363-]], lt_decl_dquote_varnames); do
 2364-    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
 2365-    *[[\\\\\\\`\\"\\\$]]*)
 2366-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
 2367+  fi
 2368+  rm -rf conftest*
 2369+  ;;
 2370+*-*-irix6*)
 2371+  # Find out which ABI we are using.
 2372+  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
 2373+  if AC_TRY_EVAL(ac_compile); then
 2374+   if test "$lt_cv_prog_gnu_ld" = yes; then
 2375+    case `/usr/bin/file conftest.$ac_objext` in
 2376+    *32-bit*)
 2377+      LD="${LD-ld} -melf32bsmip"
 2378       ;;
 2379-    *)
 2380-      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
 2381+    *N32*)
 2382+      LD="${LD-ld} -melf32bmipn32"
 2383+      ;;
 2384+    *64-bit*)
 2385+      LD="${LD-ld} -melf64bmip"
 2386       ;;
 2387     esac
 2388-done
 2389-
 2390-# Fix-up fallback echo if it was mangled by the above quoting rules.
 2391-case \$lt_ECHO in
 2392-*'\\\[$]0 --fallback-echo"')dnl "
 2393-  lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\`
 2394+   else
 2395+    case `/usr/bin/file conftest.$ac_objext` in
 2396+    *32-bit*)
 2397+      LD="${LD-ld} -32"
 2398+      ;;
 2399+    *N32*)
 2400+      LD="${LD-ld} -n32"
 2401+      ;;
 2402+    *64-bit*)
 2403+      LD="${LD-ld} -64"
 2404+      ;;
 2405+    esac
 2406+   fi
 2407+  fi
 2408+  rm -rf conftest*
 2409   ;;
 2410-esac
 2411-
 2412-_LT_OUTPUT_LIBTOOL_INIT
 2413-])
 2414 
 2415+x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
 2416+  # Find out which ABI we are using.
 2417+  echo 'int i;' > conftest.$ac_ext
 2418+  if AC_TRY_EVAL(ac_compile); then
 2419+    case `/usr/bin/file conftest.o` in
 2420+    *32-bit*)
 2421+      case $host in
 2422+        x86_64-*linux*)
 2423+          LD="${LD-ld} -m elf_i386"
 2424+          ;;
 2425+        ppc64-*linux*|powerpc64-*linux*)
 2426+          LD="${LD-ld} -m elf32ppclinux"
 2427+          ;;
 2428+        s390x-*linux*)
 2429+          LD="${LD-ld} -m elf_s390"
 2430+          ;;
 2431+        sparc64-*linux*)
 2432+          LD="${LD-ld} -m elf32_sparc"
 2433+          ;;
 2434+      esac
 2435+      ;;
 2436+    *64-bit*)
 2437+      case $host in
 2438+        x86_64-*linux*)
 2439+          LD="${LD-ld} -m elf_x86_64"
 2440+          ;;
 2441+        ppc*-*linux*|powerpc*-*linux*)
 2442+          LD="${LD-ld} -m elf64ppc"
 2443+          ;;
 2444+        s390*-*linux*)
 2445+          LD="${LD-ld} -m elf64_s390"
 2446+          ;;
 2447+        sparc*-*linux*)
 2448+          LD="${LD-ld} -m elf64_sparc"
 2449+          ;;
 2450+      esac
 2451+      ;;
 2452+    esac
 2453+  fi
 2454+  rm -rf conftest*
 2455+  ;;
 2456 
 2457-# LT_OUTPUT
 2458-# ---------
 2459-# This macro allows early generation of the libtool script (before
 2460-# AC_OUTPUT is called), incase it is used in configure for compilation
 2461-# tests.
 2462-AC_DEFUN([LT_OUTPUT],
 2463-[: ${CONFIG_LT=./config.lt}
 2464-AC_MSG_NOTICE([creating $CONFIG_LT])
 2465-cat >"$CONFIG_LT" <<_LTEOF
 2466-#! $SHELL
 2467-# Generated by $as_me.
 2468-# Run this file to recreate a libtool stub with the current configuration.
 2469-
 2470-lt_cl_silent=false
 2471-SHELL=\${CONFIG_SHELL-$SHELL}
 2472-_LTEOF
 2473-
 2474-cat >>"$CONFIG_LT" <<\_LTEOF
 2475-AS_SHELL_SANITIZE
 2476-_AS_PREPARE
 2477+*-*-sco3.2v5*)
 2478+  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
 2479+  SAVE_CFLAGS="$CFLAGS"
 2480+  CFLAGS="$CFLAGS -belf"
 2481+  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
 2482+    [AC_LANG_PUSH(C)
 2483+     AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
 2484+     AC_LANG_POP])
 2485+  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
 2486+    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
 2487+    CFLAGS="$SAVE_CFLAGS"
 2488+  fi
 2489+  ;;
 2490+sparc*-*solaris*)
 2491+  # Find out which ABI we are using.
 2492+  echo 'int i;' > conftest.$ac_ext
 2493+  if AC_TRY_EVAL(ac_compile); then
 2494+    case `/usr/bin/file conftest.o` in
 2495+    *64-bit*)
 2496+      case $lt_cv_prog_gnu_ld in
 2497+      yes*) LD="${LD-ld} -m elf64_sparc" ;;
 2498+      *)    LD="${LD-ld} -64" ;;
 2499+      esac
 2500+      ;;
 2501+    esac
 2502+  fi
 2503+  rm -rf conftest*
 2504+  ;;
 2505 
 2506-exec AS_MESSAGE_FD>&1
 2507-exec AS_MESSAGE_LOG_FD>>config.log
 2508-{
 2509-  echo
 2510-  AS_BOX([Running $as_me.])
 2511-} >&AS_MESSAGE_LOG_FD
 2512-
 2513-lt_cl_help="\
 2514-\`$as_me' creates a local libtool stub from the current configuration,
 2515-for use in further configure time tests before the real libtool is
 2516-generated.
 2517-
 2518-Usage: $[0] [[OPTIONS]]
 2519-
 2520-  -h, --help      print this help, then exit
 2521-  -V, --version   print version number, then exit
 2522-  -q, --quiet     do not print progress messages
 2523-  -d, --debug     don't remove temporary files
 2524-
 2525-Report bugs to <bug-libtool@gnu.org>."
 2526-
 2527-lt_cl_version="\
 2528-m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
 2529-m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
 2530-configured by $[0], generated by m4_PACKAGE_STRING.
 2531-
 2532-Copyright (C) 2005 Free Software Foundation, Inc.
 2533-This config.lt script is free software; the Free Software Foundation
 2534-gives unlimited permision to copy, distribute and modify it."
 2535+AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
 2536+[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
 2537+  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
 2538+  AC_CHECK_TOOL(AS, as, false)
 2539+  AC_CHECK_TOOL(OBJDUMP, objdump, false)
 2540+  ;;
 2541+  ])
 2542+esac
 2543 
 2544-while test $[#] != 0
 2545-do
 2546-  case $[1] in
 2547-    --version | --v* | -V )
 2548-      echo "$lt_cl_version"; exit 0 ;;
 2549-    --help | --h* | -h )
 2550-      echo "$lt_cl_help"; exit 0 ;;
 2551-    --debug | --d* | -d )
 2552-      debug=: ;;
 2553-    --quiet | --q* | --silent | --s* | -q )
 2554-      lt_cl_silent=: ;;
 2555+need_locks="$enable_libtool_lock"
 2556 
 2557-    -*) AC_MSG_ERROR([unrecognized option: $[1]
 2558-Try `$[0] --help' for more information.]) ;;
 2559+])# _LT_AC_LOCK
 2560 
 2561-    *) AC_MSG_ERROR([unrecognised argument: $[1]
 2562-Try `$[0] --help for more information.]) ;;
 2563-  esac
 2564-  shift
 2565-done
 2566 
 2567-if $lt_cl_silent; then
 2568-  exec AS_MESSAGE_FD>/dev/null
 2569-fi
 2570-_LTEOF
 2571+# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
 2572+#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
 2573+# ----------------------------------------------------------------
 2574+# Check whether the given compiler option works
 2575+AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],
 2576+[AC_REQUIRE([LT_AC_PROG_SED])
 2577+AC_CACHE_CHECK([$1], [$2],
 2578+  [$2=no
 2579+  ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
 2580+   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
 2581+   lt_compiler_flag="$3"
 2582+   # Insert the option either (1) after the last *FLAGS variable, or
 2583+   # (2) before a word containing "conftest.", or (3) at the end.
 2584+   # Note that $ac_compile itself does not contain backslashes and begins
 2585+   # with a dollar sign (not a hyphen), so the echo should work correctly.
 2586+   # The option is referenced via a variable to avoid confusing sed.
 2587+   lt_compile=`echo "$ac_compile" | $SED \
 2588+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
 2589+   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
 2590+   -e 's:$: $lt_compiler_flag:'`
 2591+   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
 2592+   (eval "$lt_compile" 2>conftest.err)
 2593+   ac_status=$?
 2594+   cat conftest.err >&AS_MESSAGE_LOG_FD
 2595+   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
 2596+   if (exit $ac_status) && test -s "$ac_outfile"; then
 2597+     # The compiler can only warn and ignore the option if not recognized
 2598+     # So say no if there are warnings other than the usual output.
 2599+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
 2600+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
 2601+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
 2602+       $2=yes
 2603+     fi
 2604+   fi
 2605+   $rm conftest*
 2606+])
 2607 
 2608-cat >>"$CONFIG_LT" <<_LTEOF
 2609-_LT_OUTPUT_LIBTOOL_COMMANDS_INIT
 2610-_LTEOF
 2611-
 2612-cat >>"$CONFIG_LT" <<\_LTEOF
 2613-AC_MSG_NOTICE([creating $ofile])
 2614-_LT_OUTPUT_LIBTOOL_COMMANDS
 2615-AS_EXIT(0)
 2616-_LTEOF
 2617-chmod +x "$CONFIG_LT"
 2618-
 2619-# configure is writing to config.log, but config.lt does its own redirection,
 2620-# appending to config.log, which fails on DOS, as config.log is still kept
 2621-# open by configure.  Here we exec the FD to /dev/null, effectively closing
 2622-# config.log, so it can be properly (re)opened and appended to by config.lt.
 2623-if test "$no_create" != yes; then
 2624-  lt_cl_success=:
 2625-  test "$silent" = yes &&
 2626-    lt_config_lt_args="$lt_config_lt_args --quiet"
 2627-  exec AS_MESSAGE_LOG_FD>/dev/null
 2628-  $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
 2629-  exec AS_MESSAGE_LOG_FD>>config.log
 2630-  $lt_cl_success || AS_EXIT(1)
 2631+if test x"[$]$2" = xyes; then
 2632+    ifelse([$5], , :, [$5])
 2633+else
 2634+    ifelse([$6], , :, [$6])
 2635 fi
 2636-])# LT_OUTPUT
 2637-
 2638-
 2639-# _LT_CONFIG(TAG)
 2640-# ---------------
 2641-# If TAG is the built-in tag, create an initial libtool script with a
 2642-# default configuration from the untagged config vars.  Otherwise add code
 2643-# to config.status for appending the configuration named by TAG from the
 2644-# matching tagged config vars.
 2645-m4_defun([_LT_CONFIG],
 2646-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
 2647-_LT_CONFIG_SAVE_COMMANDS([
 2648-  m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl
 2649-  m4_if(_LT_TAG, [C], [
 2650-    # See if we are running on zsh, and set the options which allow our
 2651-    # commands through without removal of \ escapes.
 2652-    if test -n "${ZSH_VERSION+set}" ; then
 2653-      setopt NO_GLOB_SUBST
 2654-    fi
 2655-
 2656-    cfgfile="${ofile}T"
 2657-    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
 2658-    $RM "$cfgfile"
 2659-
 2660-    cat <<_LT_EOF >> "$cfgfile"
 2661-#! $SHELL
 2662-
 2663-# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
 2664-# Generated automatically by $as_me (GNU $PACKAGE$TIMESTAMP) $VERSION
 2665-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
 2666-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
 2667-#
 2668-_LT_COPYING
 2669-# TEST SUITE MARKER ## BEGIN SOURCABLE
 2670-_LT_LIBTOOL_TAGS
 2671-
 2672-# ### BEGIN LIBTOOL CONFIG
 2673-_LT_LIBTOOL_CONFIG_VARS
 2674-_LT_LIBTOOL_TAG_VARS
 2675-# ### END LIBTOOL CONFIG
 2676+])# AC_LIBTOOL_COMPILER_OPTION
 2677 
 2678-# The HP-UX ksh and POSIX shell print the target directory to stdout
 2679-# if CDPATH is set.
 2680-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 2681 
 2682-_LT_EOF
 2683+# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
 2684+#                          [ACTION-SUCCESS], [ACTION-FAILURE])
 2685+# ------------------------------------------------------------
 2686+# Check whether the given compiler option works
 2687+AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
 2688+[AC_CACHE_CHECK([$1], [$2],
 2689+  [$2=no
 2690+   save_LDFLAGS="$LDFLAGS"
 2691+   LDFLAGS="$LDFLAGS $3"
 2692+   printf "$lt_simple_link_test_code" > conftest.$ac_ext
 2693+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
 2694+     # The linker can only warn and ignore the option if not recognized
 2695+     # So say no if there are warnings
 2696+     if test -s conftest.err; then
 2697+       # Append any errors to the config.log.
 2698+       cat conftest.err 1>&AS_MESSAGE_LOG_FD
 2699+       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
 2700+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
 2701+       if diff conftest.exp conftest.er2 >/dev/null; then
 2702+         $2=yes
 2703+       fi
 2704+     else
 2705+       $2=yes
 2706+     fi
 2707+   fi
 2708+   $rm conftest*
 2709+   LDFLAGS="$save_LDFLAGS"
 2710+])
 2711 
 2712-  case $host_os in
 2713-  aix3*)
 2714-    cat <<\_LT_EOF >> "$cfgfile"
 2715-# AIX sometimes has problems with the GCC collect2 program.  For some
 2716-# reason, if we set the COLLECT_NAMES environment variable, the problems
 2717-# vanish in a puff of smoke.
 2718-if test "X${COLLECT_NAMES+set}" != Xset; then
 2719-  COLLECT_NAMES=
 2720-  export COLLECT_NAMES
 2721+if test x"[$]$2" = xyes; then
 2722+    ifelse([$4], , :, [$4])
 2723+else
 2724+    ifelse([$5], , :, [$5])
 2725 fi
 2726-_LT_EOF
 2727-    ;;
 2728-  esac
 2729-
 2730-  _LT_PROG_LTMAIN
 2731-
 2732-  # We use sed instead of cat because bash on DJGPP gets confused if
 2733-  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
 2734-  # text mode, it properly converts lines to CR/LF.  This bash problem
 2735-  # is reportedly fixed, but why not run on old versions too?
 2736-  sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
 2737-    || (rm -f "$cfgfile"; exit 1)
 2738-
 2739-  _LT_PROG_XSI_SHELLFNS
 2740-
 2741-  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
 2742-    || (rm -f "$cfgfile"; exit 1)
 2743-
 2744-  mv -f "$cfgfile" "$ofile" ||
 2745-    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
 2746-  chmod +x "$ofile"
 2747-],
 2748-[cat <<_LT_EOF >> "$ofile"
 2749-
 2750-dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded
 2751-dnl in a comment (ie after a #).
 2752-# ### BEGIN LIBTOOL TAG CONFIG: $1
 2753-_LT_LIBTOOL_TAG_VARS(_LT_TAG)
 2754-# ### END LIBTOOL TAG CONFIG: $1
 2755-_LT_EOF
 2756-])dnl /m4_if
 2757-],
 2758-[m4_if([$1], [], [
 2759-    PACKAGE='$PACKAGE'
 2760-    VERSION='$VERSION'
 2761-    TIMESTAMP='$TIMESTAMP'
 2762-    RM='$RM'
 2763-    ofile='$ofile'], [])
 2764-])dnl /_LT_CONFIG_SAVE_COMMANDS
 2765-])# _LT_CONFIG
 2766-
 2767-
 2768-# LT_SUPPORTED_TAG(TAG)
 2769-# ---------------------
 2770-# Trace this macro to discover what tags are supported by the libtool
 2771-# --tag option, using:
 2772-#    autoconf --trace 'LT_SUPPORTED_TAG:$1'
 2773-AC_DEFUN([LT_SUPPORTED_TAG], [])
 2774+])# AC_LIBTOOL_LINKER_OPTION
 2775 
 2776 
 2777-# C support is built-in for now
 2778-m4_define([_LT_LANG_C_enabled], [])
 2779-m4_define([_LT_TAGS], [])
 2780-
 2781+# AC_LIBTOOL_SYS_MAX_CMD_LEN
 2782+# --------------------------
 2783+AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN],
 2784+[# find the maximum length of command line arguments
 2785+AC_MSG_CHECKING([the maximum length of command line arguments])
 2786+AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
 2787+  i=0
 2788+  teststring="ABCD"
 2789 
 2790-# LT_LANG(LANG)
 2791-# -------------
 2792-# Enable libtool support for the given language if not already enabled.
 2793-AC_DEFUN([LT_LANG],
 2794-[AC_BEFORE([$0], [LT_OUTPUT])dnl
 2795-m4_case([$1],
 2796-  [C],			[_LT_LANG(C)],
 2797-  [C++],		[_LT_LANG(CXX)],
 2798-  [Java],		[_LT_LANG(GCJ)],
 2799-  [Fortran 77],		[_LT_LANG(F77)],
 2800-  [Fortran],		[_LT_LANG(FC)],
 2801-  [Windows Resource],	[_LT_LANG(RC)],
 2802-  [m4_ifdef([_LT_LANG_]$1[_CONFIG],
 2803-    [_LT_LANG($1)],
 2804-    [m4_fatal([$0: unsupported language: "$1"])])])dnl
 2805-])# LT_LANG
 2806+  case $build_os in
 2807+  msdosdjgpp*)
 2808+    # On DJGPP, this test can blow up pretty badly due to problems in libc
 2809+    # (any single argument exceeding 2000 bytes causes a buffer overrun
 2810+    # during glob expansion).  Even if it were fixed, the result of this
 2811+    # check would be larger than it should be.
 2812+    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
 2813+    ;;
 2814 
 2815+  gnu*)
 2816+    # Under GNU Hurd, this test is not required because there is
 2817+    # no limit to the length of command line arguments.
 2818+    # Libtool will interpret -1 as no limit whatsoever
 2819+    lt_cv_sys_max_cmd_len=-1;
 2820+    ;;
 2821 
 2822-# _LT_LANG(LANGNAME)
 2823-# ------------------
 2824-m4_defun([_LT_LANG],
 2825-[m4_ifdef([_LT_LANG_]$1[_enabled], [],
 2826-  [LT_SUPPORTED_TAG([$1])dnl
 2827-  m4_append([_LT_TAGS], [$1 ])dnl
 2828-  m4_define([_LT_LANG_]$1[_enabled], [])dnl
 2829-  _LT_LANG_$1_CONFIG($1)])dnl
 2830-])# _LT_LANG
 2831+  cygwin* | mingw*)
 2832+    # On Win9x/ME, this test blows up -- it succeeds, but takes
 2833+    # about 5 minutes as the teststring grows exponentially.
 2834+    # Worse, since 9x/ME are not pre-emptively multitasking,
 2835+    # you end up with a "frozen" computer, even though with patience
 2836+    # the test eventually succeeds (with a max line length of 256k).
 2837+    # Instead, let's just punt: use the minimum linelength reported by
 2838+    # all of the supported platforms: 8192 (on NT/2K/XP).
 2839+    lt_cv_sys_max_cmd_len=8192;
 2840+    ;;
 2841 
 2842+  amigaos*)
 2843+    # On AmigaOS with pdksh, this test takes hours, literally.
 2844+    # So we just punt and use a minimum line length of 8192.
 2845+    lt_cv_sys_max_cmd_len=8192;
 2846+    ;;
 2847 
 2848-# _LT_LANG_DEFAULT_CONFIG
 2849-# -----------------------
 2850-m4_defun([_LT_LANG_DEFAULT_CONFIG],
 2851-[AC_PROVIDE_IFELSE([AC_PROG_CXX],
 2852-  [LT_LANG(CXX)],
 2853-  [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])])
 2854-
 2855-AC_PROVIDE_IFELSE([AC_PROG_F77],
 2856-  [LT_LANG(F77)],
 2857-  [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])])
 2858-
 2859-AC_PROVIDE_IFELSE([AC_PROG_FC],
 2860-  [LT_LANG(FC)],
 2861-  [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])])
 2862-
 2863-dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal
 2864-dnl pulling things in needlessly.
 2865-AC_PROVIDE_IFELSE([AC_PROG_GCJ],
 2866-  [LT_LANG(GCJ)],
 2867-  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
 2868-    [LT_LANG(GCJ)],
 2869-    [AC_PROVIDE_IFELSE([LT_PROG_GCJ],
 2870-      [LT_LANG(GCJ)],
 2871-      [m4_ifdef([AC_PROG_GCJ],
 2872-	[m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])])
 2873-       m4_ifdef([A][M_PROG_GCJ],
 2874-	[m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])])
 2875-       m4_ifdef([LT_PROG_GCJ],
 2876-	[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
 2877-
 2878-AC_PROVIDE_IFELSE([LT_PROG_RC],
 2879-  [LT_LANG(RC)],
 2880-  [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
 2881-])# _LT_LANG_DEFAULT_CONFIG
 2882-
 2883-# Obsolete macros:
 2884-AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)])
 2885-AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
 2886-AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
 2887-AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
 2888-dnl aclocal-1.4 backwards compatibility:
 2889-dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
 2890-dnl AC_DEFUN([AC_LIBTOOL_F77], [])
 2891-dnl AC_DEFUN([AC_LIBTOOL_FC], [])
 2892-dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
 2893+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
 2894+    # This has been around since 386BSD, at least.  Likely further.
 2895+    if test -x /sbin/sysctl; then
 2896+      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
 2897+    elif test -x /usr/sbin/sysctl; then
 2898+      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
 2899+    else
 2900+      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
 2901+    fi
 2902+    # And add a safety zone
 2903+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
 2904+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
 2905+    ;;
 2906 
 2907+  interix*)
 2908+    # We know the value 262144 and hardcode it with a safety zone (like BSD)
 2909+    lt_cv_sys_max_cmd_len=196608
 2910+    ;;
 2911 
 2912-# _LT_TAG_COMPILER
 2913-# ----------------
 2914-m4_defun([_LT_TAG_COMPILER],
 2915-[AC_REQUIRE([AC_PROG_CC])dnl
 2916+  osf*)
 2917+    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
 2918+    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
 2919+    # nice to cause kernel panics so lets avoid the loop below.
 2920+    # First set a reasonable default.
 2921+    lt_cv_sys_max_cmd_len=16384
 2922+    #
 2923+    if test -x /sbin/sysconfig; then
 2924+      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
 2925+        *1*) lt_cv_sys_max_cmd_len=-1 ;;
 2926+      esac
 2927+    fi
 2928+    ;;
 2929+  sco3.2v5*)
 2930+    lt_cv_sys_max_cmd_len=102400
 2931+    ;;
 2932+  sysv5* | sco5v6* | sysv4.2uw2*)
 2933+    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
 2934+    if test -n "$kargmax"; then
 2935+      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ 	]]//'`
 2936+    else
 2937+      lt_cv_sys_max_cmd_len=32768
 2938+    fi
 2939+    ;;
 2940+  *)
 2941+    # If test is not a shell built-in, we'll probably end up computing a
 2942+    # maximum length that is only half of the actual maximum length, but
 2943+    # we can't tell.
 2944+    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
 2945+    while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
 2946+	       = "XX$teststring") >/dev/null 2>&1 &&
 2947+	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
 2948+	    lt_cv_sys_max_cmd_len=$new_result &&
 2949+	    test $i != 17 # 1/2 MB should be enough
 2950+    do
 2951+      i=`expr $i + 1`
 2952+      teststring=$teststring$teststring
 2953+    done
 2954+    teststring=
 2955+    # Add a significant safety factor because C++ compilers can tack on massive
 2956+    # amounts of additional arguments before passing them to the linker.
 2957+    # It appears as though 1/2 is a usable value.
 2958+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
 2959+    ;;
 2960+  esac
 2961+])
 2962+if test -n $lt_cv_sys_max_cmd_len ; then
 2963+  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
 2964+else
 2965+  AC_MSG_RESULT(none)
 2966+fi
 2967+])# AC_LIBTOOL_SYS_MAX_CMD_LEN
 2968 
 2969-_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl
 2970-_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl
 2971-_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl
 2972-_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl
 2973 
 2974-# If no C compiler was specified, use CC.
 2975-LTCC=${LTCC-"$CC"}
 2976+# _LT_AC_CHECK_DLFCN
 2977+# ------------------
 2978+AC_DEFUN([_LT_AC_CHECK_DLFCN],
 2979+[AC_CHECK_HEADERS(dlfcn.h)dnl
 2980+])# _LT_AC_CHECK_DLFCN
 2981 
 2982-# If no C compiler flags were specified, use CFLAGS.
 2983-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
 2984 
 2985-# Allow CC to be a program name with arguments.
 2986-compiler=$CC
 2987-])# _LT_TAG_COMPILER
 2988+# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
 2989+#                           ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
 2990+# ---------------------------------------------------------------------
 2991+AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
 2992+[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
 2993+if test "$cross_compiling" = yes; then :
 2994+  [$4]
 2995+else
 2996+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
 2997+  lt_status=$lt_dlunknown
 2998+  cat > conftest.$ac_ext <<EOF
 2999+[#line __oline__ "configure"
 3000+#include "confdefs.h"
 3001 
 3002+#if HAVE_DLFCN_H
 3003+#include <dlfcn.h>
 3004+#endif
 3005 
 3006-# _LT_COMPILER_BOILERPLATE
 3007-# ------------------------
 3008-# Check for compiler boilerplate output or warnings with
 3009-# the simple compiler test code.
 3010-m4_defun([_LT_COMPILER_BOILERPLATE],
 3011-[ac_outfile=conftest.$ac_objext
 3012-printf "$lt_simple_compile_test_code" >conftest.$ac_ext
 3013-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 3014-_lt_compiler_boilerplate=`cat conftest.err`
 3015-$RM conftest*
 3016-])# _LT_COMPILER_BOILERPLATE
 3017+#include <stdio.h>
 3018 
 3019+#ifdef RTLD_GLOBAL
 3020+#  define LT_DLGLOBAL		RTLD_GLOBAL
 3021+#else
 3022+#  ifdef DL_GLOBAL
 3023+#    define LT_DLGLOBAL		DL_GLOBAL
 3024+#  else
 3025+#    define LT_DLGLOBAL		0
 3026+#  endif
 3027+#endif
 3028 
 3029-# _LT_LINKER_BOILERPLATE
 3030-# ----------------------
 3031-# Check for linker boilerplate output or warnings with
 3032-# the simple link test code.
 3033-m4_defun([_LT_LINKER_BOILERPLATE],
 3034-[ac_outfile=conftest.$ac_objext
 3035-printf "$lt_simple_link_test_code" >conftest.$ac_ext
 3036-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 3037-_lt_linker_boilerplate=`cat conftest.err`
 3038-$RM conftest*
 3039-])# _LT_LINKER_BOILERPLATE
 3040+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
 3041+   find out it does not work in some platform. */
 3042+#ifndef LT_DLLAZY_OR_NOW
 3043+#  ifdef RTLD_LAZY
 3044+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
 3045+#  else
 3046+#    ifdef DL_LAZY
 3047+#      define LT_DLLAZY_OR_NOW		DL_LAZY
 3048+#    else
 3049+#      ifdef RTLD_NOW
 3050+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
 3051+#      else
 3052+#        ifdef DL_NOW
 3053+#          define LT_DLLAZY_OR_NOW	DL_NOW
 3054+#        else
 3055+#          define LT_DLLAZY_OR_NOW	0
 3056+#        endif
 3057+#      endif
 3058+#    endif
 3059+#  endif
 3060+#endif
 3061 
 3062+#ifdef __cplusplus
 3063+extern "C" void exit (int);
 3064+#endif
 3065 
 3066-# _LT_SYS_MODULE_PATH_AIX
 3067-# -----------------------
 3068-# Links a minimal program and checks the executable
 3069-# for the system default hardcoded library path. In most cases,
 3070-# this is /usr/lib:/lib, but when the MPI compilers are used
 3071-# the location of the communication and MPI libs are included too.
 3072-# If we don't find anything, use the default library path according
 3073-# to the aix ld manual.
 3074-m4_defun([_LT_SYS_MODULE_PATH_AIX],
 3075-[AC_LINK_IFELSE(AC_LANG_PROGRAM,[
 3076-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
 3077-}'`
 3078-# Check for a 64-bit object if we didn't find anything.
 3079-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
 3080-}'`; fi],[])
 3081-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 3082-])# _LT_SYS_MODULE_PATH_AIX
 3083+void fnord() { int i=42;}
 3084+int main ()
 3085+{
 3086+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
 3087+  int status = $lt_dlunknown;
 3088 
 3089+  if (self)
 3090+    {
 3091+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
 3092+      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
 3093+      /* dlclose (self); */
 3094+    }
 3095+  else
 3096+    puts (dlerror ());
 3097 
 3098-# _LT_SHELL_INIT(ARG)
 3099-# -------------------
 3100-m4_define([_LT_SHELL_INIT],
 3101-[ifdef([AC_DIVERSION_NOTICE],
 3102-	     [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
 3103-	 [AC_DIVERT_PUSH(NOTICE)])
 3104-$1
 3105-AC_DIVERT_POP
 3106-])# _LT_SHELL_INIT
 3107+    exit (status);
 3108+}]
 3109+EOF
 3110+  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
 3111+    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
 3112+    lt_status=$?
 3113+    case x$lt_status in
 3114+      x$lt_dlno_uscore) $1 ;;
 3115+      x$lt_dlneed_uscore) $2 ;;
 3116+      x$lt_dlunknown|x*) $3 ;;
 3117+    esac
 3118+  else :
 3119+    # compilation failed
 3120+    $3
 3121+  fi
 3122+fi
 3123+rm -fr conftest*
 3124+])# _LT_AC_TRY_DLOPEN_SELF
 3125 
 3126 
 3127-# _LT_PROG_ECHO_BACKSLASH
 3128-# -----------------------
 3129-# Add some code to the start of the generated configure script which
 3130-# will find an echo command which doesn't interpret backslashes.
 3131-m4_defun([_LT_PROG_ECHO_BACKSLASH],
 3132-[_LT_SHELL_INIT([
 3133-# Check that we are running under the correct shell.
 3134-SHELL=${CONFIG_SHELL-/bin/sh}
 3135+# AC_LIBTOOL_DLOPEN_SELF
 3136+# ----------------------
 3137+AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
 3138+[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
 3139+if test "x$enable_dlopen" != xyes; then
 3140+  enable_dlopen=unknown
 3141+  enable_dlopen_self=unknown
 3142+  enable_dlopen_self_static=unknown
 3143+else
 3144+  lt_cv_dlopen=no
 3145+  lt_cv_dlopen_libs=
 3146 
 3147-case X$lt_ECHO in
 3148-X*--fallback-echo)
 3149-  # Remove one level of quotation (which was required for Make).
 3150-  ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
 3151-  ;;
 3152-esac
 3153+  case $host_os in
 3154+  beos*)
 3155+    lt_cv_dlopen="load_add_on"
 3156+    lt_cv_dlopen_libs=
 3157+    lt_cv_dlopen_self=yes
 3158+    ;;
 3159 
 3160-ECHO=${lt_ECHO-echo}
 3161-if test "X[$]1" = X--no-reexec; then
 3162-  # Discard the --no-reexec flag, and continue.
 3163-  shift
 3164-elif test "X[$]1" = X--fallback-echo; then
 3165-  # Avoid inline document here, it may be left over
 3166-  :
 3167-elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
 3168-  # Yippee, $ECHO works!
 3169-  :
 3170-else
 3171-  # Restart under the correct shell.
 3172-  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
 3173-fi
 3174+  mingw* | pw32*)
 3175+    lt_cv_dlopen="LoadLibrary"
 3176+    lt_cv_dlopen_libs=
 3177+   ;;
 3178 
 3179-if test "X[$]1" = X--fallback-echo; then
 3180-  # used as fallback echo
 3181-  shift
 3182-  cat <<_LT_EOF
 3183-[$]*
 3184-_LT_EOF
 3185-  exit 0
 3186-fi
 3187+  cygwin*)
 3188+    lt_cv_dlopen="dlopen"
 3189+    lt_cv_dlopen_libs=
 3190+   ;;
 3191 
 3192-# The HP-UX ksh and POSIX shell print the target directory to stdout
 3193-# if CDPATH is set.
 3194-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 3195+  darwin*)
 3196+  # if libdl is installed we need to link against it
 3197+    AC_CHECK_LIB([dl], [dlopen],
 3198+		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
 3199+    lt_cv_dlopen="dyld"
 3200+    lt_cv_dlopen_libs=
 3201+    lt_cv_dlopen_self=yes
 3202+    ])
 3203+   ;;
 3204 
 3205-if test -z "$lt_ECHO"; then
 3206-  if test "X${echo_test_string+set}" != Xset; then
 3207-    # find a string as large as possible, as long as the shell can cope with it
 3208-    for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
 3209-      # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
 3210-      if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
 3211-	 { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
 3212-      then
 3213-        break
 3214-      fi
 3215-    done
 3216-  fi
 3217+  *)
 3218+    AC_CHECK_FUNC([shl_load],
 3219+	  [lt_cv_dlopen="shl_load"],
 3220+      [AC_CHECK_LIB([dld], [shl_load],
 3221+	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
 3222+	[AC_CHECK_FUNC([dlopen],
 3223+	      [lt_cv_dlopen="dlopen"],
 3224+	  [AC_CHECK_LIB([dl], [dlopen],
 3225+		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
 3226+	    [AC_CHECK_LIB([svld], [dlopen],
 3227+		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
 3228+	      [AC_CHECK_LIB([dld], [dld_link],
 3229+		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
 3230+	      ])
 3231+	    ])
 3232+	  ])
 3233+	])
 3234+      ])
 3235+    ;;
 3236+  esac
 3237 
 3238-  if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
 3239-     echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
 3240-     test "X$echo_testing_string" = "X$echo_test_string"; then
 3241-    :
 3242+  if test "x$lt_cv_dlopen" != xno; then
 3243+    enable_dlopen=yes
 3244   else
 3245-    # The Solaris, AIX, and Digital Unix default echo programs unquote
 3246-    # backslashes.  This makes it impossible to quote backslashes using
 3247-    #   echo "$something" | sed 's/\\/\\\\/g'
 3248-    #
 3249-    # So, first we look for a working echo in the user's PATH.
 3250+    enable_dlopen=no
 3251+  fi
 3252 
 3253-    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
 3254-    for dir in $PATH /usr/ucb; do
 3255-      IFS="$lt_save_ifs"
 3256-      if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
 3257-         test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
 3258-         echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
 3259-         test "X$echo_testing_string" = "X$echo_test_string"; then
 3260-        ECHO="$dir/echo"
 3261-        break
 3262-      fi
 3263-    done
 3264-    IFS="$lt_save_ifs"
 3265-
 3266-    if test "X$ECHO" = Xecho; then
 3267-      # We didn't find a better echo, so look for alternatives.
 3268-      if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
 3269-         echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
 3270-         test "X$echo_testing_string" = "X$echo_test_string"; then
 3271-        # This shell has a builtin print -r that does the trick.
 3272-        ECHO='print -r'
 3273-      elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
 3274-	   test "X$CONFIG_SHELL" != X/bin/ksh; then
 3275-        # If we have ksh, try running configure again with it.
 3276-        ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
 3277-        export ORIGINAL_CONFIG_SHELL
 3278-        CONFIG_SHELL=/bin/ksh
 3279-        export CONFIG_SHELL
 3280-        exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
 3281-      else
 3282-        # Try using printf.
 3283-        ECHO='printf %s\n'
 3284-        if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
 3285-	   echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
 3286-	   test "X$echo_testing_string" = "X$echo_test_string"; then
 3287-	  # Cool, printf works
 3288-	  :
 3289-        elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
 3290-	     test "X$echo_testing_string" = 'X\t' &&
 3291-	     echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
 3292-	     test "X$echo_testing_string" = "X$echo_test_string"; then
 3293-	  CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
 3294-	  export CONFIG_SHELL
 3295-	  SHELL="$CONFIG_SHELL"
 3296-	  export SHELL
 3297-	  ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
 3298-        elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
 3299-	     test "X$echo_testing_string" = 'X\t' &&
 3300-	     echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
 3301-	     test "X$echo_testing_string" = "X$echo_test_string"; then
 3302-	  ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
 3303-        else
 3304-	  # maybe with a smaller string...
 3305-	  prev=:
 3306-
 3307-	  for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
 3308-	    if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
 3309-	    then
 3310-	      break
 3311-	    fi
 3312-	    prev="$cmd"
 3313-	  done
 3314-
 3315-	  if test "$prev" != 'sed 50q "[$]0"'; then
 3316-	    echo_test_string=`eval $prev`
 3317-	    export echo_test_string
 3318-	    exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
 3319-	  else
 3320-	    # Oops.  We lost completely, so just stick with echo.
 3321-	    ECHO=echo
 3322-	  fi
 3323-        fi
 3324-      fi
 3325-    fi
 3326-  fi
 3327-fi
 3328-
 3329-# Copy echo and quote the copy suitably for passing to libtool from
 3330-# the Makefile, instead of quoting the original, which is used later.
 3331-lt_ECHO=$ECHO
 3332-if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
 3333-   lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
 3334-fi
 3335+  case $lt_cv_dlopen in
 3336+  dlopen)
 3337+    save_CPPFLAGS="$CPPFLAGS"
 3338+    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
 3339 
 3340-AC_SUBST(lt_ECHO)
 3341-])
 3342-_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
 3343-_LT_DECL([], [ECHO], [1],
 3344-    [An echo program that does not interpret backslashes])
 3345-])# _LT_PROG_ECHO_BACKSLASH
 3346+    save_LDFLAGS="$LDFLAGS"
 3347+    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
 3348 
 3349+    save_LIBS="$LIBS"
 3350+    LIBS="$lt_cv_dlopen_libs $LIBS"
 3351 
 3352-# _LT_ENABLE_LOCK
 3353-# ---------------
 3354-m4_defun([_LT_ENABLE_LOCK],
 3355-[AC_REQUIRE([AC_OBJEXT])dnl
 3356-AC_ARG_ENABLE([libtool-lock],
 3357-  [AS_HELP_STRING([--disable-libtool-lock],
 3358-    [avoid locking (might break parallel builds)])])
 3359-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
 3360+    AC_CACHE_CHECK([whether a program can dlopen itself],
 3361+	  lt_cv_dlopen_self, [dnl
 3362+	  _LT_AC_TRY_DLOPEN_SELF(
 3363+	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
 3364+	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
 3365+    ])
 3366 
 3367-# Some flags need to be propagated to the compiler or linker for good
 3368-# libtool support.
 3369-case $host in
 3370-ia64-*-hpux*)
 3371-  # Find out which ABI we are using.
 3372-  echo 'int i;' > conftest.$ac_ext
 3373-  if AC_TRY_EVAL(ac_compile); then
 3374-    case `/usr/bin/file conftest.$ac_objext` in
 3375-      *ELF-32*)
 3376-	HPUX_IA64_MODE="32"
 3377-	;;
 3378-      *ELF-64*)
 3379-	HPUX_IA64_MODE="64"
 3380-	;;
 3381-    esac
 3382-  fi
 3383-  rm -rf conftest*
 3384-  ;;
 3385-*-*-irix6*)
 3386-  # Find out which ABI we are using.
 3387-  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
 3388-  if AC_TRY_EVAL(ac_compile); then
 3389-    if test "$lt_cv_prog_gnu_ld" = yes; then
 3390-      case `/usr/bin/file conftest.$ac_objext` in
 3391-	*32-bit*)
 3392-	  LD="${LD-ld} -melf32bsmip"
 3393-	  ;;
 3394-	*N32*)
 3395-	  LD="${LD-ld} -melf32bmipn32"
 3396-	  ;;
 3397-	*64-bit*)
 3398-	  LD="${LD-ld} -melf64bmip"
 3399-	;;
 3400-      esac
 3401-    else
 3402-      case `/usr/bin/file conftest.$ac_objext` in
 3403-	*32-bit*)
 3404-	  LD="${LD-ld} -32"
 3405-	  ;;
 3406-	*N32*)
 3407-	  LD="${LD-ld} -n32"
 3408-	  ;;
 3409-	*64-bit*)
 3410-	  LD="${LD-ld} -64"
 3411-	  ;;
 3412-      esac
 3413+    if test "x$lt_cv_dlopen_self" = xyes; then
 3414+      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
 3415+      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
 3416+    	  lt_cv_dlopen_self_static, [dnl
 3417+	  _LT_AC_TRY_DLOPEN_SELF(
 3418+	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
 3419+	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
 3420+      ])
 3421     fi
 3422-  fi
 3423-  rm -rf conftest*
 3424-  ;;
 3425-
 3426-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
 3427-  # Find out which ABI we are using.
 3428-  echo 'int i;' > conftest.$ac_ext
 3429-  if AC_TRY_EVAL(ac_compile); then
 3430-    case `/usr/bin/file conftest.o` in
 3431-      *32-bit*)
 3432-	case $host in
 3433-	  x86_64-*linux*)
 3434-	    LD="${LD-ld} -m elf_i386"
 3435-	    ;;
 3436-	  ppc64-*linux*|powerpc64-*linux*)
 3437-	    LD="${LD-ld} -m elf32ppclinux"
 3438-	    ;;
 3439-	  s390x-*linux*)
 3440-	    LD="${LD-ld} -m elf_s390"
 3441-	    ;;
 3442-	  sparc64-*linux*)
 3443-	    LD="${LD-ld} -m elf32_sparc"
 3444-	    ;;
 3445-	esac
 3446-	;;
 3447-      *64-bit*)
 3448-	case $host in
 3449-	  x86_64-*linux*)
 3450-	    LD="${LD-ld} -m elf_x86_64"
 3451-	    ;;
 3452-	  ppc*-*linux*|powerpc*-*linux*)
 3453-	    LD="${LD-ld} -m elf64ppc"
 3454-	    ;;
 3455-	  s390*-*linux*|s390*-*tpf*)
 3456-	    LD="${LD-ld} -m elf64_s390"
 3457-	    ;;
 3458-	  sparc*-*linux*)
 3459-	    LD="${LD-ld} -m elf64_sparc"
 3460-	    ;;
 3461-	esac
 3462-	;;
 3463-    esac
 3464-  fi
 3465-  rm -rf conftest*
 3466-  ;;
 3467-
 3468-*-*-sco3.2v5*)
 3469-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
 3470-  SAVE_CFLAGS="$CFLAGS"
 3471-  CFLAGS="$CFLAGS -belf"
 3472-  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
 3473-    [AC_LANG_PUSH(C)
 3474-     AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
 3475-     AC_LANG_POP])
 3476-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
 3477-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
 3478-    CFLAGS="$SAVE_CFLAGS"
 3479-  fi
 3480-  ;;
 3481-sparc*-*solaris*)
 3482-  # Find out which ABI we are using.
 3483-  echo 'int i;' > conftest.$ac_ext
 3484-  if AC_TRY_EVAL(ac_compile); then
 3485-    case `/usr/bin/file conftest.o` in
 3486-    *64-bit*)
 3487-      case $lt_cv_prog_gnu_ld in
 3488-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
 3489-      *)    LD="${LD-ld} -64" ;;
 3490-      esac
 3491-      ;;
 3492-    esac
 3493-  fi
 3494-  rm -rf conftest*
 3495-  ;;
 3496-esac
 3497-
 3498-need_locks="$enable_libtool_lock"
 3499-])# _LT_ENABLE_LOCK
 3500 
 3501+    CPPFLAGS="$save_CPPFLAGS"
 3502+    LDFLAGS="$save_LDFLAGS"
 3503+    LIBS="$save_LIBS"
 3504+    ;;
 3505+  esac
 3506 
 3507-# _LT_CMD_OLD_ARCHIVE
 3508-# -------------------
 3509-m4_defun([_LT_CMD_OLD_ARCHIVE],
 3510-[AC_CHECK_TOOL(AR, ar, false)
 3511-test -z "$AR" && AR=ar
 3512-test -z "$AR_FLAGS" && AR_FLAGS=cru
 3513-_LT_DECL([], [AR], [1], [The archiver])
 3514-_LT_DECL([], [AR_FLAGS], [1])
 3515-
 3516-AC_CHECK_TOOL(STRIP, strip, :)
 3517-test -z "$STRIP" && STRIP=:
 3518-_LT_DECL([], [STRIP], [1], [A symbol stripping program])
 3519-
 3520-AC_CHECK_TOOL(RANLIB, ranlib, :)
 3521-test -z "$RANLIB" && RANLIB=:
 3522-_LT_DECL([], [RANLIB], [1],
 3523-    [Commands used to install an old-style archive])
 3524-
 3525-# Determine commands to create old-style static archives.
 3526-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
 3527-old_postinstall_cmds='chmod 644 $oldlib'
 3528-old_postuninstall_cmds=
 3529+  case $lt_cv_dlopen_self in
 3530+  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
 3531+  *) enable_dlopen_self=unknown ;;
 3532+  esac
 3533 
 3534-if test -n "$RANLIB"; then
 3535-  case $host_os in
 3536-  openbsd*)
 3537-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
 3538-    ;;
 3539-  *)
 3540-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
 3541-    ;;
 3542+  case $lt_cv_dlopen_self_static in
 3543+  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
 3544+  *) enable_dlopen_self_static=unknown ;;
 3545   esac
 3546-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
 3547 fi
 3548-_LT_DECL([], [old_postinstall_cmds], [2])
 3549-_LT_DECL([], [old_postuninstall_cmds], [2])
 3550-_LT_TAGDECL([], [old_archive_cmds], [2],
 3551-    [Commands used to build an old-style archive])
 3552-])# _LT_CMD_OLD_ARCHIVE
 3553+])# AC_LIBTOOL_DLOPEN_SELF
 3554 
 3555 
 3556-# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
 3557-#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
 3558-# ----------------------------------------------------------------
 3559-# Check whether the given compiler option works
 3560-AC_DEFUN([_LT_COMPILER_OPTION],
 3561-[AC_REQUIRE([AC_OBJEXT])dnl
 3562-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
 3563-m4_require([_LT_DECL_SED])dnl
 3564-AC_CACHE_CHECK([$1], [$2],
 3565-  [$2=no
 3566-   m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
 3567+# AC_LIBTOOL_PROG_CC_C_O([TAGNAME])
 3568+# ---------------------------------
 3569+# Check to see if options -c and -o are simultaneously supported by compiler
 3570+AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
 3571+[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
 3572+AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
 3573+  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
 3574+  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
 3575+   $rm -r conftest 2>/dev/null
 3576+   mkdir conftest
 3577+   cd conftest
 3578+   mkdir out
 3579    printf "$lt_simple_compile_test_code" > conftest.$ac_ext
 3580-   lt_compiler_flag="$3"
 3581+
 3582+   lt_compiler_flag="-o out/conftest2.$ac_objext"
 3583    # Insert the option either (1) after the last *FLAGS variable, or
 3584    # (2) before a word containing "conftest.", or (3) at the end.
 3585    # Note that $ac_compile itself does not contain backslashes and begins
 3586    # with a dollar sign (not a hyphen), so the echo should work correctly.
 3587-   # The option is referenced via a variable to avoid confusing sed.
 3588    lt_compile=`echo "$ac_compile" | $SED \
 3589    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
 3590    -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
 3591    -e 's:$: $lt_compiler_flag:'`
 3592    (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
 3593-   (eval "$lt_compile" 2>conftest.err)
 3594+   (eval "$lt_compile" 2>out/conftest.err)
 3595    ac_status=$?
 3596-   cat conftest.err >&AS_MESSAGE_LOG_FD
 3597+   cat out/conftest.err >&AS_MESSAGE_LOG_FD
 3598    echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
 3599-   if (exit $ac_status) && test -s "$ac_outfile"; then
 3600+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
 3601+   then
 3602      # The compiler can only warn and ignore the option if not recognized
 3603-     # So say no if there are warnings other than the usual output.
 3604-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
 3605-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
 3606-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
 3607-       $2=yes
 3608+     # So say no if there are warnings
 3609+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
 3610+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
 3611+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
 3612+       _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
 3613      fi
 3614    fi
 3615-   $RM conftest*
 3616+   chmod u+w . 2>&AS_MESSAGE_LOG_FD
 3617+   $rm conftest*
 3618+   # SGI C++ compiler will create directory out/ii_files/ for
 3619+   # template instantiation
 3620+   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
 3621+   $rm out/* && rmdir out
 3622+   cd ..
 3623+   rmdir conftest
 3624+   $rm conftest*
 3625 ])
 3626+])# AC_LIBTOOL_PROG_CC_C_O
 3627 
 3628-if test x"[$]$2" = xyes; then
 3629-    m4_if([$5], , :, [$5])
 3630+
 3631+# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME])
 3632+# -----------------------------------------
 3633+# Check to see if we can do hard links to lock some files if needed
 3634+AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS],
 3635+[AC_REQUIRE([_LT_AC_LOCK])dnl
 3636+
 3637+hard_links="nottested"
 3638+if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
 3639+  # do not overwrite the value of need_locks provided by the user
 3640+  AC_MSG_CHECKING([if we can lock with hard links])
 3641+  hard_links=yes
 3642+  $rm conftest*
 3643+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
 3644+  touch conftest.a
 3645+  ln conftest.a conftest.b 2>&5 || hard_links=no
 3646+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
 3647+  AC_MSG_RESULT([$hard_links])
 3648+  if test "$hard_links" = no; then
 3649+    AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
 3650+    need_locks=warn
 3651+  fi
 3652 else
 3653-    m4_if([$6], , :, [$6])
 3654+  need_locks=no
 3655 fi
 3656-])# _LT_COMPILER_OPTION
 3657+])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS
 3658 
 3659-# Old name:
 3660-AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION])
 3661-dnl aclocal-1.4 backwards compatibility:
 3662-dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [])
 3663-
 3664-
 3665-# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
 3666-#                  [ACTION-SUCCESS], [ACTION-FAILURE])
 3667-# ----------------------------------------------------
 3668-# Check whether the given linker option works
 3669-AC_DEFUN([_LT_LINKER_OPTION],
 3670-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
 3671-AC_CACHE_CHECK([$1], [$2],
 3672-  [$2=no
 3673-   save_LDFLAGS="$LDFLAGS"
 3674-   LDFLAGS="$LDFLAGS $3"
 3675-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
 3676-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
 3677-     # The linker can only warn and ignore the option if not recognized
 3678-     # So say no if there are warnings
 3679-     if test -s conftest.err; then
 3680-       # Append any errors to the config.log.
 3681-       cat conftest.err 1>&AS_MESSAGE_LOG_FD
 3682-       $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
 3683-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
 3684-       if diff conftest.exp conftest.er2 >/dev/null; then
 3685-         $2=yes
 3686-       fi
 3687-     else
 3688-       $2=yes
 3689-     fi
 3690-   fi
 3691-   $RM conftest*
 3692-   LDFLAGS="$save_LDFLAGS"
 3693-])
 3694 
 3695-if test x"[$]$2" = xyes; then
 3696-    m4_if([$4], , :, [$4])
 3697+# AC_LIBTOOL_OBJDIR
 3698+# -----------------
 3699+AC_DEFUN([AC_LIBTOOL_OBJDIR],
 3700+[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
 3701+[rm -f .libs 2>/dev/null
 3702+mkdir .libs 2>/dev/null
 3703+if test -d .libs; then
 3704+  lt_cv_objdir=.libs
 3705 else
 3706-    m4_if([$5], , :, [$5])
 3707+  # MS-DOS does not allow filenames that begin with a dot.
 3708+  lt_cv_objdir=_libs
 3709 fi
 3710-])# _LT_LINKER_OPTION
 3711-
 3712-# Old name:
 3713-AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION])
 3714-dnl aclocal-1.4 backwards compatibility:
 3715-dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], [])
 3716+rmdir .libs 2>/dev/null])
 3717+objdir=$lt_cv_objdir
 3718+])# AC_LIBTOOL_OBJDIR
 3719 
 3720 
 3721-# LT_CMD_MAX_LEN
 3722-#---------------
 3723-AC_DEFUN([LT_CMD_MAX_LEN],
 3724-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
 3725-# find the maximum length of command line arguments
 3726-AC_MSG_CHECKING([the maximum length of command line arguments])
 3727-AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
 3728-  i=0
 3729-  teststring="ABCD"
 3730+# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME])
 3731+# ----------------------------------------------
 3732+# Check hardcoding attributes.
 3733+AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH],
 3734+[AC_MSG_CHECKING([how to hardcode library paths into programs])
 3735+_LT_AC_TAGVAR(hardcode_action, $1)=
 3736+if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
 3737+   test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
 3738+   test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
 3739 
 3740-  case $build_os in
 3741-  msdosdjgpp*)
 3742-    # On DJGPP, this test can blow up pretty badly due to problems in libc
 3743-    # (any single argument exceeding 2000 bytes causes a buffer overrun
 3744-    # during glob expansion).  Even if it were fixed, the result of this
 3745-    # check would be larger than it should be.
 3746-    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
 3747-    ;;
 3748-
 3749-  gnu*)
 3750-    # Under GNU Hurd, this test is not required because there is
 3751-    # no limit to the length of command line arguments.
 3752-    # Libtool will interpret -1 as no limit whatsoever
 3753-    lt_cv_sys_max_cmd_len=-1;
 3754-    ;;
 3755+  # We can hardcode non-existant directories.
 3756+  if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
 3757+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
 3758+     # have to relink, otherwise we might link with an installed library
 3759+     # when we should be linking with a yet-to-be-installed one
 3760+     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
 3761+     test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then
 3762+    # Linking always hardcodes the temporary library directory.
 3763+    _LT_AC_TAGVAR(hardcode_action, $1)=relink
 3764+  else
 3765+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
 3766+    _LT_AC_TAGVAR(hardcode_action, $1)=immediate
 3767+  fi
 3768+else
 3769+  # We cannot hardcode anything, or else we can only hardcode existing
 3770+  # directories.
 3771+  _LT_AC_TAGVAR(hardcode_action, $1)=unsupported
 3772+fi
 3773+AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)])
 3774 
 3775-  cygwin* | mingw*)
 3776-    # On Win9x/ME, this test blows up -- it succeeds, but takes
 3777-    # about 5 minutes as the teststring grows exponentially.
 3778-    # Worse, since 9x/ME are not pre-emptively multitasking,
 3779-    # you end up with a "frozen" computer, even though with patience
 3780-    # the test eventually succeeds (with a max line length of 256k).
 3781-    # Instead, let's just punt: use the minimum linelength reported by
 3782-    # all of the supported platforms: 8192 (on NT/2K/XP).
 3783-    lt_cv_sys_max_cmd_len=8192;
 3784-    ;;
 3785+if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then
 3786+  # Fast installation is not supported
 3787+  enable_fast_install=no
 3788+elif test "$shlibpath_overrides_runpath" = yes ||
 3789+     test "$enable_shared" = no; then
 3790+  # Fast installation is not necessary
 3791+  enable_fast_install=needless
 3792+fi
 3793+])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH
 3794 
 3795-  amigaos*)
 3796-    # On AmigaOS with pdksh, this test takes hours, literally.
 3797-    # So we just punt and use a minimum line length of 8192.
 3798-    lt_cv_sys_max_cmd_len=8192;
 3799-    ;;
 3800 
 3801-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
 3802-    # This has been around since 386BSD, at least.  Likely further.
 3803-    if test -x /sbin/sysctl; then
 3804-      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
 3805-    elif test -x /usr/sbin/sysctl; then
 3806-      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
 3807-    else
 3808-      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
 3809-    fi
 3810-    # And add a safety zone
 3811-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
 3812-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
 3813+# AC_LIBTOOL_SYS_LIB_STRIP
 3814+# ------------------------
 3815+AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP],
 3816+[striplib=
 3817+old_striplib=
 3818+AC_MSG_CHECKING([whether stripping libraries is possible])
 3819+if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
 3820+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
 3821+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
 3822+  AC_MSG_RESULT([yes])
 3823+else
 3824+# FIXME - insert some real tests, host_os isn't really good enough
 3825+  case $host_os in
 3826+   darwin*)
 3827+       if test -n "$STRIP" ; then
 3828+         striplib="$STRIP -x"
 3829+         AC_MSG_RESULT([yes])
 3830+       else
 3831+  AC_MSG_RESULT([no])
 3832+fi
 3833+       ;;
 3834+   *)
 3835+  AC_MSG_RESULT([no])
 3836     ;;
 3837+  esac
 3838+fi
 3839+])# AC_LIBTOOL_SYS_LIB_STRIP
 3840 
 3841-  interix*)
 3842-    # We know the value 262144 and hardcode it with a safety zone (like BSD)
 3843-    lt_cv_sys_max_cmd_len=196608
 3844-    ;;
 3845 
 3846-  osf*)
 3847-    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
 3848-    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
 3849-    # nice to cause kernel panics so lets avoid the loop below.
 3850-    # First set a reasonable default.
 3851-    lt_cv_sys_max_cmd_len=16384
 3852-    #
 3853-    if test -x /sbin/sysconfig; then
 3854-      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
 3855-        *1*) lt_cv_sys_max_cmd_len=-1 ;;
 3856-      esac
 3857-    fi
 3858-    ;;
 3859-  sco3.2v5*)
 3860-    lt_cv_sys_max_cmd_len=102400
 3861-    ;;
 3862-  sysv5* | sco5v6* | sysv4.2uw2*)
 3863-    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
 3864-    if test -n "$kargmax"; then
 3865-      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ 	]]//'`
 3866-    else
 3867-      lt_cv_sys_max_cmd_len=32768
 3868-    fi
 3869-    ;;
 3870-  *)
 3871-    # Make teststring a little bigger before we do anything with it.
 3872-    # a 1K string should be a reasonable start.
 3873-    for i in 1 2 3 4 5 6 7 8 ; do
 3874-      teststring=$teststring$teststring
 3875-    done
 3876-    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
 3877-    # If test is not a shell built-in, we'll probably end up computing a
 3878-    # maximum length that is only half of the actual maximum length, but
 3879-    # we can't tell.
 3880-    while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
 3881-	       = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
 3882-	    test $i != 17 # 1/2 MB should be enough
 3883-    do
 3884-      i=`expr $i + 1`
 3885-      teststring=$teststring$teststring
 3886-    done
 3887-    # Only check the string length outside the loop.
 3888-    lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
 3889-    teststring=
 3890-    # Add a significant safety factor because C++ compilers can tack on massive
 3891-    # amounts of additional arguments before passing them to the linker.
 3892-    # It appears as though 1/2 is a usable value.
 3893-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
 3894-    ;;
 3895-  esac
 3896-])
 3897-if test -n $lt_cv_sys_max_cmd_len ; then
 3898-  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
 3899+# AC_LIBTOOL_SYS_DYNAMIC_LINKER
 3900+# -----------------------------
 3901+# PORTME Fill in your ld.so characteristics
 3902+AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
 3903+[AC_MSG_CHECKING([dynamic linker characteristics])
 3904+library_names_spec=
 3905+libname_spec='lib$name'
 3906+soname_spec=
 3907+shrext_cmds=".so"
 3908+postinstall_cmds=
 3909+postuninstall_cmds=
 3910+finish_cmds=
 3911+finish_eval=
 3912+shlibpath_var=
 3913+shlibpath_overrides_runpath=unknown
 3914+version_type=none
 3915+dynamic_linker="$host_os ld.so"
 3916+sys_lib_dlsearch_path_spec="/lib /usr/lib"
 3917+if test "$GCC" = yes; then
 3918+  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
 3919+  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
 3920+    # if the path contains ";" then we assume it to be the separator
 3921+    # otherwise default to the standard path separator (i.e. ":") - it is
 3922+    # assumed that no part of a normal pathname contains ";" but that should
 3923+    # okay in the real world where ";" in dirpaths is itself problematic.
 3924+    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
 3925+  else
 3926+    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
 3927+  fi
 3928 else
 3929-  AC_MSG_RESULT(none)
 3930+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
 3931 fi
 3932-max_cmd_len=$lt_cv_sys_max_cmd_len
 3933-_LT_DECL([], [max_cmd_len], [0],
 3934-    [What is the maximum length of a command?])
 3935-])# LT_CMD_MAX_LEN
 3936+need_lib_prefix=unknown
 3937+hardcode_into_libs=no
 3938 
 3939-# Old name:
 3940-AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN])
 3941-dnl aclocal-1.4 backwards compatibility:
 3942-dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], [])
 3943+# when you set need_version to no, make sure it does not cause -set_version
 3944+# flags to be left without arguments
 3945+need_version=unknown
 3946 
 3947+case $host_os in
 3948+aix3*)
 3949+  version_type=linux
 3950+  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
 3951+  shlibpath_var=LIBPATH
 3952 
 3953-# _LT_HEADER_DLFCN
 3954-# ----------------
 3955-m4_defun([_LT_HEADER_DLFCN],
 3956-[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl
 3957-])# _LT_HEADER_DLFCN
 3958+  # AIX 3 has no versioning support, so we append a major version to the name.
 3959+  soname_spec='${libname}${release}${shared_ext}$major'
 3960+  ;;
 3961 
 3962+aix4* | aix5*)
 3963+  version_type=linux
 3964+  need_lib_prefix=no
 3965+  need_version=no
 3966+  hardcode_into_libs=yes
 3967+  if test "$host_cpu" = ia64; then
 3968+    # AIX 5 supports IA64
 3969+    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
 3970+    shlibpath_var=LD_LIBRARY_PATH
 3971+  else
 3972+    # With GCC up to 2.95.x, collect2 would create an import file
 3973+    # for dependence libraries.  The import file would start with
 3974+    # the line `#! .'.  This would cause the generated library to
 3975+    # depend on `.', always an invalid library.  This was fixed in
 3976+    # development snapshots of GCC prior to 3.0.
 3977+    case $host_os in
 3978+      aix4 | aix4.[[01]] | aix4.[[01]].*)
 3979+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
 3980+	   echo ' yes '
 3981+	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
 3982+	:
 3983+      else
 3984+	can_build_shared=no
 3985+      fi
 3986+      ;;
 3987+    esac
 3988+    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
 3989+    # soname into executable. Probably we can add versioning support to
 3990+    # collect2, so additional links can be useful in future.
 3991+    if test "$aix_use_runtimelinking" = yes; then
 3992+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
 3993+      # instead of lib<name>.a to let people know that these are not
 3994+      # typical AIX shared libraries.
 3995+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 3996+    else
 3997+      # We preserve .a as extension for shared libraries through AIX4.2
 3998+      # and later when we are not doing run time linking.
 3999+      library_names_spec='${libname}${release}.a $libname.a'
 4000+      soname_spec='${libname}${release}${shared_ext}$major'
 4001+    fi
 4002+    shlibpath_var=LIBPATH
 4003+  fi
 4004+  ;;
 4005 
 4006-# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
 4007-#                      ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
 4008-# ----------------------------------------------------------------
 4009-m4_defun([_LT_TRY_DLOPEN_SELF],
 4010-[m4_require([_LT_HEADER_DLFCN])dnl
 4011-if test "$cross_compiling" = yes; then :
 4012-  [$4]
 4013-else
 4014-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
 4015-  lt_status=$lt_dlunknown
 4016-  cat > conftest.$ac_ext <<_LT_EOF
 4017-[#line __oline__ "configure"
 4018-#include "confdefs.h"
 4019+amigaos*)
 4020+  library_names_spec='$libname.ixlibrary $libname.a'
 4021+  # Create ${libname}_ixlibrary.a entries in /sys/libs.
 4022+  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
 4023+  ;;
 4024 
 4025-#if HAVE_DLFCN_H
 4026-#include <dlfcn.h>
 4027-#endif
 4028+beos*)
 4029+  library_names_spec='${libname}${shared_ext}'
 4030+  dynamic_linker="$host_os ld.so"
 4031+  shlibpath_var=LIBRARY_PATH
 4032+  ;;
 4033 
 4034-#include <stdio.h>
 4035+bsdi[[45]]*)
 4036+  version_type=linux
 4037+  need_version=no
 4038+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 4039+  soname_spec='${libname}${release}${shared_ext}$major'
 4040+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
 4041+  shlibpath_var=LD_LIBRARY_PATH
 4042+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
 4043+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
 4044+  # the default ld.so.conf also contains /usr/contrib/lib and
 4045+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
 4046+  # libtool to hard-code these into programs
 4047+  ;;
 4048 
 4049-#ifdef RTLD_GLOBAL
 4050-#  define LT_DLGLOBAL		RTLD_GLOBAL
 4051-#else
 4052-#  ifdef DL_GLOBAL
 4053-#    define LT_DLGLOBAL		DL_GLOBAL
 4054-#  else
 4055-#    define LT_DLGLOBAL		0
 4056-#  endif
 4057-#endif
 4058+cygwin* | mingw* | pw32*)
 4059+  version_type=windows
 4060+  shrext_cmds=".dll"
 4061+  need_version=no
 4062+  need_lib_prefix=no
 4063 
 4064-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
 4065-   find out it does not work in some platform. */
 4066-#ifndef LT_DLLAZY_OR_NOW
 4067-#  ifdef RTLD_LAZY
 4068-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
 4069-#  else
 4070-#    ifdef DL_LAZY
 4071-#      define LT_DLLAZY_OR_NOW		DL_LAZY
 4072-#    else
 4073-#      ifdef RTLD_NOW
 4074-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
 4075-#      else
 4076-#        ifdef DL_NOW
 4077-#          define LT_DLLAZY_OR_NOW	DL_NOW
 4078-#        else
 4079-#          define LT_DLLAZY_OR_NOW	0
 4080-#        endif
 4081-#      endif
 4082-#    endif
 4083-#  endif
 4084-#endif
 4085-
 4086-#ifdef __cplusplus
 4087-extern "C" void exit (int);
 4088-#endif
 4089-
 4090-void fnord() { int i=42;}
 4091-int main ()
 4092-{
 4093-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
 4094-  int status = $lt_dlunknown;
 4095-
 4096-  if (self)
 4097-    {
 4098-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
 4099-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
 4100-      /* dlclose (self); */
 4101-    }
 4102-  else
 4103-    puts (dlerror ());
 4104+  case $GCC,$host_os in
 4105+  yes,cygwin* | yes,mingw* | yes,pw32*)
 4106+    library_names_spec='$libname.dll.a'
 4107+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
 4108+    postinstall_cmds='base_file=`basename \${file}`~
 4109+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
 4110+      dldir=$destdir/`dirname \$dlpath`~
 4111+      test -d \$dldir || mkdir -p \$dldir~
 4112+      $install_prog $dir/$dlname \$dldir/$dlname~
 4113+      chmod a+x \$dldir/$dlname'
 4114+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
 4115+      dlpath=$dir/\$dldll~
 4116+       $rm \$dlpath'
 4117+    shlibpath_overrides_runpath=yes
 4118 
 4119-    exit (status);
 4120-}]
 4121-_LT_EOF
 4122-  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
 4123-    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
 4124-    lt_status=$?
 4125-    case x$lt_status in
 4126-      x$lt_dlno_uscore) $1 ;;
 4127-      x$lt_dlneed_uscore) $2 ;;
 4128-      x$lt_dlunknown|x*) $3 ;;
 4129+    case $host_os in
 4130+    cygwin*)
 4131+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
 4132+      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
 4133+      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
 4134+      ;;
 4135+    mingw*)
 4136+      # MinGW DLLs use traditional 'lib' prefix
 4137+      soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
 4138+      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
 4139+      if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then
 4140+        # It is most probably a Windows format PATH printed by
 4141+        # mingw gcc, but we are running on Cygwin. Gcc prints its search
 4142+        # path with ; separators, and with drive letters. We can handle the
 4143+        # drive letters (cygwin fileutils understands them), so leave them,
 4144+        # especially as we might pass files found there to a mingw objdump,
 4145+        # which wouldn't understand a cygwinified path. Ahh.
 4146+        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
 4147+      else
 4148+        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
 4149+      fi
 4150+      ;;
 4151+    pw32*)
 4152+      # pw32 DLLs use 'pw' prefix rather than 'lib'
 4153+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
 4154+      ;;
 4155     esac
 4156-  else :
 4157-    # compilation failed
 4158-    $3
 4159-  fi
 4160-fi
 4161-rm -fr conftest*
 4162-])# _LT_TRY_DLOPEN_SELF
 4163-
 4164-
 4165-# LT_SYS_DLOPEN_SELF
 4166-# ------------------
 4167-AC_DEFUN([LT_SYS_DLOPEN_SELF],
 4168-[m4_require([_LT_HEADER_DLFCN])dnl
 4169-if test "x$enable_dlopen" != xyes; then
 4170-  enable_dlopen=unknown
 4171-  enable_dlopen_self=unknown
 4172-  enable_dlopen_self_static=unknown
 4173-else
 4174-  lt_cv_dlopen=no
 4175-  lt_cv_dlopen_libs=
 4176-
 4177-  case $host_os in
 4178-  beos*)
 4179-    lt_cv_dlopen="load_add_on"
 4180-    lt_cv_dlopen_libs=
 4181-    lt_cv_dlopen_self=yes
 4182-    ;;
 4183-
 4184-  mingw* | pw32*)
 4185-    lt_cv_dlopen="LoadLibrary"
 4186-    lt_cv_dlopen_libs=
 4187-    ;;
 4188-
 4189-  cygwin*)
 4190-    lt_cv_dlopen="dlopen"
 4191-    lt_cv_dlopen_libs=
 4192-    ;;
 4193-
 4194-  darwin*)
 4195-  # if libdl is installed we need to link against it
 4196-    AC_CHECK_LIB([dl], [dlopen],
 4197-		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
 4198-    lt_cv_dlopen="dyld"
 4199-    lt_cv_dlopen_libs=
 4200-    lt_cv_dlopen_self=yes
 4201-    ])
 4202     ;;
 4203 
 4204   *)
 4205-    AC_CHECK_FUNC([shl_load],
 4206-	  [lt_cv_dlopen="shl_load"],
 4207-      [AC_CHECK_LIB([dld], [shl_load],
 4208-	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
 4209-	[AC_CHECK_FUNC([dlopen],
 4210-	      [lt_cv_dlopen="dlopen"],
 4211-	  [AC_CHECK_LIB([dl], [dlopen],
 4212-		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
 4213-	    [AC_CHECK_LIB([svld], [dlopen],
 4214-		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
 4215-	      [AC_CHECK_LIB([dld], [dld_link],
 4216-		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
 4217-	      ])
 4218-	    ])
 4219-	  ])
 4220-	])
 4221-      ])
 4222+    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
 4223     ;;
 4224   esac
 4225+  dynamic_linker='Win32 ld.exe'
 4226+  # FIXME: first we should search . and the directory the executable is in
 4227+  shlibpath_var=PATH
 4228+  ;;
 4229 
 4230-  if test "x$lt_cv_dlopen" != xno; then
 4231-    enable_dlopen=yes
 4232+darwin* | rhapsody*)
 4233+  dynamic_linker="$host_os dyld"
 4234+  version_type=darwin
 4235+  need_lib_prefix=no
 4236+  need_version=no
 4237+  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext ${libname}${release}${versuffix}$shared_ext'
 4238+  soname_spec='${libname}${release}${major}$shared_ext'
 4239+  shlibpath_overrides_runpath=yes
 4240+  shlibpath_var=DYLD_LIBRARY_PATH
 4241+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
 4242+  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
 4243+  if test "$GCC" = yes; then
 4244+    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
 4245   else
 4246-    enable_dlopen=no
 4247+    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
 4248   fi
 4249+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
 4250+  ;;
 4251 
 4252-  case $lt_cv_dlopen in
 4253-  dlopen)
 4254-    save_CPPFLAGS="$CPPFLAGS"
 4255-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
 4256-
 4257-    save_LDFLAGS="$LDFLAGS"
 4258-    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
 4259-
 4260-    save_LIBS="$LIBS"
 4261-    LIBS="$lt_cv_dlopen_libs $LIBS"
 4262-
 4263-    AC_CACHE_CHECK([whether a program can dlopen itself],
 4264-	  lt_cv_dlopen_self, [dnl
 4265-	  _LT_TRY_DLOPEN_SELF(
 4266-	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
 4267-	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
 4268-    ])
 4269+dgux*)
 4270+  version_type=linux
 4271+  need_lib_prefix=no
 4272+  need_version=no
 4273+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
 4274+  soname_spec='${libname}${release}${shared_ext}$major'
 4275+  shlibpath_var=LD_LIBRARY_PATH
 4276+  ;;
 4277 
 4278-    if test "x$lt_cv_dlopen_self" = xyes; then
 4279-      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
 4280-      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
 4281-    	  lt_cv_dlopen_self_static, [dnl
 4282-	  _LT_TRY_DLOPEN_SELF(
 4283-	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
 4284-	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
 4285-      ])
 4286-    fi
 4287+freebsd1*)
 4288+  dynamic_linker=no
 4289+  ;;
 4290 
 4291-    CPPFLAGS="$save_CPPFLAGS"
 4292-    LDFLAGS="$save_LDFLAGS"
 4293-    LIBS="$save_LIBS"
 4294-    ;;
 4295-  esac
 4296+kfreebsd*-gnu)
 4297+  version_type=linux
 4298+  need_lib_prefix=no
 4299+  need_version=no
 4300+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
 4301+  soname_spec='${libname}${release}${shared_ext}$major'
 4302+  shlibpath_var=LD_LIBRARY_PATH
 4303+  shlibpath_overrides_runpath=no
 4304+  hardcode_into_libs=yes
 4305+  dynamic_linker='GNU ld.so'
 4306+  ;;
 4307 
 4308-  case $lt_cv_dlopen_self in
 4309-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
 4310-  *) enable_dlopen_self=unknown ;;
 4311+freebsd* | dragonfly*)
 4312+  # DragonFly does not have aout.  When/if they implement a new
 4313+  # versioning mechanism, adjust this.
 4314+  if test -x /usr/bin/objformat; then
 4315+    objformat=`/usr/bin/objformat`
 4316+  else
 4317+    case $host_os in
 4318+    freebsd[[123]]*) objformat=aout ;;
 4319+    *) objformat=elf ;;
 4320+    esac
 4321+  fi
 4322+  version_type=freebsd-$objformat
 4323+  case $version_type in
 4324+    freebsd-elf*)
 4325+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
 4326+      need_version=no
 4327+      need_lib_prefix=no
 4328+      ;;
 4329+    freebsd-*)
 4330+      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
 4331+      need_version=yes
 4332+      ;;
 4333   esac
 4334-
 4335-  case $lt_cv_dlopen_self_static in
 4336-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
 4337-  *) enable_dlopen_self_static=unknown ;;
 4338+  shlibpath_var=LD_LIBRARY_PATH
 4339+  case $host_os in
 4340+  freebsd2*)
 4341+    shlibpath_overrides_runpath=yes
 4342+    ;;
 4343+  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
 4344+    shlibpath_overrides_runpath=yes
 4345+    hardcode_into_libs=yes
 4346+    ;;
 4347+  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
 4348+  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
 4349+    shlibpath_overrides_runpath=no
 4350+    hardcode_into_libs=yes
 4351+    ;;
 4352+  freebsd*) # from 4.6 on
 4353+    shlibpath_overrides_runpath=yes
 4354+    hardcode_into_libs=yes
 4355+    ;;
 4356   esac
 4357-fi
 4358-_LT_DECL([dlopen_support], [enable_dlopen], [0],
 4359-	 [Whether dlopen is supported])
 4360-_LT_DECL([dlopen_self], [enable_dlopen_self], [0],
 4361-	 [Whether dlopen of programs is supported])
 4362-_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0],
 4363-	 [Whether dlopen of statically linked programs is supported])
 4364-])# LT_SYS_DLOPEN_SELF
 4365-
 4366-# Old name:
 4367-AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF])
 4368-dnl aclocal-1.4 backwards compatibility:
 4369-dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [])
 4370-
 4371+  ;;
 4372 
 4373-# _LT_COMPILER_C_O([TAGNAME])
 4374-# ---------------------------
 4375-# Check to see if options -c and -o are simultaneously supported by compiler.
 4376-# This macro does not hard code the compiler like AC_PROG_CC_C_O.
 4377-m4_defun([_LT_COMPILER_C_O],
 4378-[AC_REQUIRE([AC_OBJEXT])dnl
 4379-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
 4380-m4_require([_LT_TAG_COMPILER])dnl
 4381-AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
 4382-  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
 4383-  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
 4384-   $RM -r conftest 2>/dev/null
 4385-   mkdir conftest
 4386-   cd conftest
 4387-   mkdir out
 4388-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
 4389-
 4390-   lt_compiler_flag="-o out/conftest2.$ac_objext"
 4391-   # Insert the option either (1) after the last *FLAGS variable, or
 4392-   # (2) before a word containing "conftest.", or (3) at the end.
 4393-   # Note that $ac_compile itself does not contain backslashes and begins
 4394-   # with a dollar sign (not a hyphen), so the echo should work correctly.
 4395-   lt_compile=`echo "$ac_compile" | $SED \
 4396-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
 4397-   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
 4398-   -e 's:$: $lt_compiler_flag:'`
 4399-   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
 4400-   (eval "$lt_compile" 2>out/conftest.err)
 4401-   ac_status=$?
 4402-   cat out/conftest.err >&AS_MESSAGE_LOG_FD
 4403-   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
 4404-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
 4405-   then
 4406-     # The compiler can only warn and ignore the option if not recognized
 4407-     # So say no if there are warnings
 4408-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
 4409-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
 4410-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
 4411-       _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
 4412-     fi
 4413-   fi
 4414-   chmod u+w . 2>&AS_MESSAGE_LOG_FD
 4415-   $RM conftest*
 4416-   # SGI C++ compiler will create directory out/ii_files/ for
 4417-   # template instantiation
 4418-   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
 4419-   $RM out/* && rmdir out
 4420-   cd ..
 4421-   $RM -r conftest
 4422-   $RM conftest*
 4423-])
 4424-_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1],
 4425-	[Does compiler simultaneously support -c and -o options?])
 4426-])# _LT_COMPILER_C_O
 4427-
 4428-
 4429-# _LT_COMPILER_FILE_LOCKS([TAGNAME])
 4430-# ----------------------------------
 4431-# Check to see if we can do hard links to lock some files if needed
 4432-m4_defun([_LT_COMPILER_FILE_LOCKS],
 4433-[m4_require([_LT_ENABLE_LOCK])dnl
 4434-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
 4435-_LT_COMPILER_C_O([$1])
 4436-
 4437-hard_links="nottested"
 4438-if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
 4439-  # do not overwrite the value of need_locks provided by the user
 4440-  AC_MSG_CHECKING([if we can lock with hard links])
 4441-  hard_links=yes
 4442-  $RM conftest*
 4443-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
 4444-  touch conftest.a
 4445-  ln conftest.a conftest.b 2>&5 || hard_links=no
 4446-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
 4447-  AC_MSG_RESULT([$hard_links])
 4448-  if test "$hard_links" = no; then
 4449-    AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
 4450-    need_locks=warn
 4451-  fi
 4452-else
 4453-  need_locks=no
 4454-fi
 4455-_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?])
 4456-])# _LT_COMPILER_FILE_LOCKS
 4457-
 4458-
 4459-# _LT_CHECK_OBJDIR
 4460-# ----------------
 4461-m4_defun([_LT_CHECK_OBJDIR],
 4462-[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
 4463-[rm -f .libs 2>/dev/null
 4464-mkdir .libs 2>/dev/null
 4465-if test -d .libs; then
 4466-  lt_cv_objdir=.libs
 4467-else
 4468-  # MS-DOS does not allow filenames that begin with a dot.
 4469-  lt_cv_objdir=_libs
 4470-fi
 4471-rmdir .libs 2>/dev/null])
 4472-objdir=$lt_cv_objdir
 4473-_LT_DECL([], [objdir], [0],
 4474-         [The name of the directory that contains temporary libtool files])dnl
 4475-m4_pattern_allow([LT_OBJDIR])dnl
 4476-AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/",
 4477-  [Define to the sub-directory in which libtool stores uninstalled libraries.])
 4478-])# _LT_CHECK_OBJDIR
 4479-
 4480-
 4481-# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME])
 4482-# --------------------------------------
 4483-# Check hardcoding attributes.
 4484-m4_defun([_LT_LINKER_HARDCODE_LIBPATH],
 4485-[AC_MSG_CHECKING([how to hardcode library paths into programs])
 4486-_LT_TAGVAR(hardcode_action, $1)=
 4487-if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" ||
 4488-   test -n "$_LT_TAGVAR(runpath_var, $1)" ||
 4489-   test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
 4490-
 4491-  # We can hardcode non-existent directories.
 4492-  if test "$_LT_TAGVAR(hardcode_direct, $1)" != no &&
 4493-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
 4494-     # have to relink, otherwise we might link with an installed library
 4495-     # when we should be linking with a yet-to-be-installed one
 4496-     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
 4497-     test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then
 4498-    # Linking always hardcodes the temporary library directory.
 4499-    _LT_TAGVAR(hardcode_action, $1)=relink
 4500-  else
 4501-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
 4502-    _LT_TAGVAR(hardcode_action, $1)=immediate
 4503-  fi
 4504-else
 4505-  # We cannot hardcode anything, or else we can only hardcode existing
 4506-  # directories.
 4507-  _LT_TAGVAR(hardcode_action, $1)=unsupported
 4508-fi
 4509-AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)])
 4510-
 4511-if test "$_LT_TAGVAR(hardcode_action, $1)" = relink ||
 4512-   test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then
 4513-  # Fast installation is not supported
 4514-  enable_fast_install=no
 4515-elif test "$shlibpath_overrides_runpath" = yes ||
 4516-     test "$enable_shared" = no; then
 4517-  # Fast installation is not necessary
 4518-  enable_fast_install=needless
 4519-fi
 4520-_LT_TAGDECL([], [hardcode_action], [0],
 4521-    [How to hardcode a shared library path into an executable])
 4522-])# _LT_LINKER_HARDCODE_LIBPATH
 4523-
 4524-
 4525-# _LT_CMD_STRIPLIB
 4526-# ----------------
 4527-m4_defun([_LT_CMD_STRIPLIB],
 4528-[m4_require([_LT_DECL_EGREP])
 4529-striplib=
 4530-old_striplib=
 4531-AC_MSG_CHECKING([whether stripping libraries is possible])
 4532-if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
 4533-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
 4534-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
 4535-  AC_MSG_RESULT([yes])
 4536-else
 4537-# FIXME - insert some real tests, host_os isn't really good enough
 4538-  case $host_os in
 4539-  darwin*)
 4540-    if test -n "$STRIP" ; then
 4541-      striplib="$STRIP -x"
 4542-      old_striplib="$STRIP -S"
 4543-      AC_MSG_RESULT([yes])
 4544-    else
 4545-      AC_MSG_RESULT([no])
 4546-    fi
 4547-    ;;
 4548-  *)
 4549-    AC_MSG_RESULT([no])
 4550-    ;;
 4551-  esac
 4552-fi
 4553-_LT_DECL([], [old_striplib], [1], [Commands to strip libraries])
 4554-_LT_DECL([], [striplib], [1])
 4555-])# _LT_CMD_STRIPLIB
 4556-
 4557-
 4558-# _LT_SYS_DYNAMIC_LINKER([TAG])
 4559-# -----------------------------
 4560-# PORTME Fill in your ld.so characteristics
 4561-m4_defun([_LT_SYS_DYNAMIC_LINKER],
 4562-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
 4563-m4_require([_LT_DECL_EGREP])dnl
 4564-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
 4565-m4_require([_LT_DECL_SED])dnl
 4566-AC_MSG_CHECKING([dynamic linker characteristics])
 4567-m4_case([$1],
 4568-	[C], [withGCC=$GCC],
 4569-	[CXX], [withGCC=$GXX],
 4570-	[F77], [withGCC=$G77],
 4571-	[FC], [withGCC=$ac_cv_fc_compiler_gnu],
 4572-	[withGCC=$GCC])
 4573-library_names_spec=
 4574-libname_spec='lib$name'
 4575-soname_spec=
 4576-shrext_cmds=".so"
 4577-postinstall_cmds=
 4578-postuninstall_cmds=
 4579-finish_cmds=
 4580-finish_eval=
 4581-shlibpath_var=
 4582-shlibpath_overrides_runpath=unknown
 4583-version_type=none
 4584-dynamic_linker="$host_os ld.so"
 4585-sys_lib_dlsearch_path_spec="/lib /usr/lib"
 4586-if test "$withGCC" = yes; then
 4587-  sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
 4588-  if $ECHO "$sys_lib_search_path_spec" | $GREP ';' >/dev/null ; then
 4589-    # if the path contains ";" then we assume it to be the separator
 4590-    # otherwise default to the standard path separator (i.e. ":") - it is
 4591-    # assumed that no part of a normal pathname contains ";" but that should
 4592-    # okay in the real world where ";" in dirpaths is itself problematic.
 4593-    sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
 4594-  else
 4595-    sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
 4596-  fi
 4597-else
 4598-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
 4599-fi
 4600-need_lib_prefix=unknown
 4601-hardcode_into_libs=no
 4602-
 4603-# when you set need_version to no, make sure it does not cause -set_version
 4604-# flags to be left without arguments
 4605-need_version=unknown
 4606-
 4607-case $host_os in
 4608-aix3*)
 4609+gnu*)
 4610   version_type=linux
 4611-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
 4612-  shlibpath_var=LIBPATH
 4613-
 4614-  # AIX 3 has no versioning support, so we append a major version to the name.
 4615+  need_lib_prefix=no
 4616+  need_version=no
 4617+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
 4618   soname_spec='${libname}${release}${shared_ext}$major'
 4619+  shlibpath_var=LD_LIBRARY_PATH
 4620+  hardcode_into_libs=yes
 4621   ;;
 4622 
 4623-aix4* | aix5*)
 4624-  version_type=linux
 4625+hpux9* | hpux10* | hpux11*)
 4626+  # Give a soname corresponding to the major version so that dld.sl refuses to
 4627+  # link against other versions.
 4628+  version_type=sunos
 4629   need_lib_prefix=no
 4630   need_version=no
 4631-  hardcode_into_libs=yes
 4632-  if test "$host_cpu" = ia64; then
 4633-    # AIX 5 supports IA64
 4634-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
 4635+  case $host_cpu in
 4636+  ia64*)
 4637+    shrext_cmds='.so'
 4638+    hardcode_into_libs=yes
 4639+    dynamic_linker="$host_os dld.so"
 4640     shlibpath_var=LD_LIBRARY_PATH
 4641-  else
 4642-    # With GCC up to 2.95.x, collect2 would create an import file
 4643-    # for dependence libraries.  The import file would start with
 4644-    # the line `#! .'.  This would cause the generated library to
 4645-    # depend on `.', always an invalid library.  This was fixed in
 4646-    # development snapshots of GCC prior to 3.0.
 4647-    case $host_os in
 4648-      aix4 | aix4.[[01]] | aix4.[[01]].*)
 4649-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
 4650-	   echo ' yes '
 4651-	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
 4652-	:
 4653-      else
 4654-	can_build_shared=no
 4655-      fi
 4656-      ;;
 4657-    esac
 4658-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
 4659-    # soname into executable. Probably we can add versioning support to
 4660-    # collect2, so additional links can be useful in future.
 4661-    if test "$aix_use_runtimelinking" = yes; then
 4662-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
 4663-      # instead of lib<name>.a to let people know that these are not
 4664-      # typical AIX shared libraries.
 4665-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 4666+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
 4667+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 4668+    soname_spec='${libname}${release}${shared_ext}$major'
 4669+    if test "X$HPUX_IA64_MODE" = X32; then
 4670+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
 4671     else
 4672-      # We preserve .a as extension for shared libraries through AIX4.2
 4673-      # and later when we are not doing run time linking.
 4674-      library_names_spec='${libname}${release}.a $libname.a'
 4675-      soname_spec='${libname}${release}${shared_ext}$major'
 4676+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
 4677     fi
 4678-    shlibpath_var=LIBPATH
 4679-  fi
 4680-  ;;
 4681-
 4682-amigaos*)
 4683-  if test "$host_cpu" = m68k; then
 4684-    library_names_spec='$libname.ixlibrary $libname.a'
 4685-    # Create ${libname}_ixlibrary.a entries in /sys/libs.
 4686-    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
 4687-  else
 4688-    dynamic_linker=no
 4689-  fi
 4690-  ;;
 4691-
 4692-beos*)
 4693-  library_names_spec='${libname}${shared_ext}'
 4694-  dynamic_linker="$host_os ld.so"
 4695-  shlibpath_var=LIBRARY_PATH
 4696+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
 4697+    ;;
 4698+   hppa*64*)
 4699+     shrext_cmds='.sl'
 4700+     hardcode_into_libs=yes
 4701+     dynamic_linker="$host_os dld.sl"
 4702+     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
 4703+     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
 4704+     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 4705+     soname_spec='${libname}${release}${shared_ext}$major'
 4706+     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
 4707+     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
 4708+     ;;
 4709+   *)
 4710+    shrext_cmds='.sl'
 4711+    dynamic_linker="$host_os dld.sl"
 4712+    shlibpath_var=SHLIB_PATH
 4713+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
 4714+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 4715+    soname_spec='${libname}${release}${shared_ext}$major'
 4716+    ;;
 4717+  esac
 4718+  # HP-UX runs *really* slowly unless shared libraries are mode 555.
 4719+  postinstall_cmds='chmod 555 $lib'
 4720   ;;
 4721 
 4722-bsdi[[45]]*)
 4723+interix3*)
 4724   version_type=linux
 4725+  need_lib_prefix=no
 4726   need_version=no
 4727-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 4728+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
 4729   soname_spec='${libname}${release}${shared_ext}$major'
 4730-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
 4731+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
 4732   shlibpath_var=LD_LIBRARY_PATH
 4733-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
 4734-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
 4735-  # the default ld.so.conf also contains /usr/contrib/lib and
 4736-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
 4737-  # libtool to hard-code these into programs
 4738-  ;;
 4739-
 4740-cygwin* | mingw* | pw32*)
 4741-  version_type=windows
 4742-  shrext_cmds=".dll"
 4743-  need_version=no
 4744-  need_lib_prefix=no
 4745-
 4746-  case $withGCC,$host_os in
 4747-  yes,cygwin* | yes,mingw* | yes,pw32*)
 4748-    library_names_spec='$libname.dll.a'
 4749-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
 4750-    postinstall_cmds='base_file=`basename \${file}`~
 4751-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
 4752-      dldir=$destdir/`dirname \$dlpath`~
 4753-      test -d \$dldir || mkdir -p \$dldir~
 4754-      $install_prog $dir/$dlname \$dldir/$dlname~
 4755-      chmod a+x \$dldir/$dlname~
 4756-      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
 4757-        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
 4758-      fi'
 4759-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
 4760-      dlpath=$dir/\$dldll~
 4761-       $RM \$dlpath'
 4762-    shlibpath_overrides_runpath=yes
 4763-
 4764-    case $host_os in
 4765-    cygwin*)
 4766-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
 4767-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
 4768-      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
 4769-      ;;
 4770-    mingw*)
 4771-      # MinGW DLLs use traditional 'lib' prefix
 4772-      soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
 4773-      sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
 4774-      if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
 4775-        # It is most probably a Windows format PATH printed by
 4776-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
 4777-        # path with ; separators, and with drive letters. We can handle the
 4778-        # drive letters (cygwin fileutils understands them), so leave them,
 4779-        # especially as we might pass files found there to a mingw objdump,
 4780-        # which wouldn't understand a cygwinified path. Ahh.
 4781-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
 4782-      else
 4783-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
 4784-      fi
 4785-      ;;
 4786-    pw32*)
 4787-      # pw32 DLLs use 'pw' prefix rather than 'lib'
 4788-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
 4789-      ;;
 4790-    esac
 4791-    ;;
 4792-
 4793-  *)
 4794-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
 4795-    ;;
 4796-  esac
 4797-  dynamic_linker='Win32 ld.exe'
 4798-  # FIXME: first we should search . and the directory the executable is in
 4799-  shlibpath_var=PATH
 4800-  ;;
 4801-
 4802-darwin* | rhapsody*)
 4803-  dynamic_linker="$host_os dyld"
 4804-  version_type=darwin
 4805-  need_lib_prefix=no
 4806-  need_version=no
 4807-  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
 4808-  soname_spec='${libname}${release}${major}$shared_ext'
 4809-  shlibpath_overrides_runpath=yes
 4810-  shlibpath_var=DYLD_LIBRARY_PATH
 4811-  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
 4812-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
 4813-  if test "$withGCC" = yes; then
 4814-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | $GREP "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
 4815-  else
 4816-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
 4817-  fi
 4818-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
 4819-  ;;
 4820-
 4821-dgux*)
 4822-  version_type=linux
 4823-  need_lib_prefix=no
 4824-  need_version=no
 4825-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
 4826-  soname_spec='${libname}${release}${shared_ext}$major'
 4827-  shlibpath_var=LD_LIBRARY_PATH
 4828-  ;;
 4829-
 4830-freebsd1*)
 4831-  dynamic_linker=no
 4832-  ;;
 4833-
 4834-kfreebsd*-gnu)
 4835-  version_type=linux
 4836-  need_lib_prefix=no
 4837-  need_version=no
 4838-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
 4839-  soname_spec='${libname}${release}${shared_ext}$major'
 4840-  shlibpath_var=LD_LIBRARY_PATH
 4841-  shlibpath_overrides_runpath=no
 4842-  hardcode_into_libs=yes
 4843-  dynamic_linker='GNU ld.so'
 4844-  ;;
 4845-
 4846-freebsd* | dragonfly*)
 4847-  # DragonFly does not have aout.  When/if they implement a new
 4848-  # versioning mechanism, adjust this.
 4849-  if test -x /usr/bin/objformat; then
 4850-    objformat=`/usr/bin/objformat`
 4851-  else
 4852-    case $host_os in
 4853-    freebsd[[123]]*) objformat=aout ;;
 4854-    *) objformat=elf ;;
 4855-    esac
 4856-  fi
 4857-  version_type=freebsd-$objformat
 4858-  case $version_type in
 4859-    freebsd-elf*)
 4860-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
 4861-      need_version=no
 4862-      need_lib_prefix=no
 4863-      ;;
 4864-    freebsd-*)
 4865-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
 4866-      need_version=yes
 4867-      ;;
 4868-  esac
 4869-  shlibpath_var=LD_LIBRARY_PATH
 4870-  case $host_os in
 4871-  freebsd2*)
 4872-    shlibpath_overrides_runpath=yes
 4873-    ;;
 4874-  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
 4875-    shlibpath_overrides_runpath=yes
 4876-    hardcode_into_libs=yes
 4877-    ;;
 4878-  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
 4879-  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
 4880-    shlibpath_overrides_runpath=no
 4881-    hardcode_into_libs=yes
 4882-    ;;
 4883-  freebsd*) # from 4.6 on
 4884-    shlibpath_overrides_runpath=yes
 4885-    hardcode_into_libs=yes
 4886-    ;;
 4887-  esac
 4888-  ;;
 4889-
 4890-gnu*)
 4891-  version_type=linux
 4892-  need_lib_prefix=no
 4893-  need_version=no
 4894-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
 4895-  soname_spec='${libname}${release}${shared_ext}$major'
 4896-  shlibpath_var=LD_LIBRARY_PATH
 4897-  hardcode_into_libs=yes
 4898-  ;;
 4899-
 4900-hpux9* | hpux10* | hpux11*)
 4901-  # Give a soname corresponding to the major version so that dld.sl refuses to
 4902-  # link against other versions.
 4903-  version_type=sunos
 4904-  need_lib_prefix=no
 4905-  need_version=no
 4906-  case $host_cpu in
 4907-  ia64*)
 4908-    shrext_cmds='.so'
 4909-    hardcode_into_libs=yes
 4910-    dynamic_linker="$host_os dld.so"
 4911-    shlibpath_var=LD_LIBRARY_PATH
 4912-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
 4913-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 4914-    soname_spec='${libname}${release}${shared_ext}$major'
 4915-    if test "X$HPUX_IA64_MODE" = X32; then
 4916-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
 4917-    else
 4918-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
 4919-    fi
 4920-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
 4921-    ;;
 4922-  hppa*64*)
 4923-    shrext_cmds='.sl'
 4924-    hardcode_into_libs=yes
 4925-    dynamic_linker="$host_os dld.sl"
 4926-    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
 4927-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
 4928-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 4929-    soname_spec='${libname}${release}${shared_ext}$major'
 4930-    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
 4931-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
 4932-    ;;
 4933-  *)
 4934-    shrext_cmds='.sl'
 4935-    dynamic_linker="$host_os dld.sl"
 4936-    shlibpath_var=SHLIB_PATH
 4937-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
 4938-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 4939-    soname_spec='${libname}${release}${shared_ext}$major'
 4940-    ;;
 4941-  esac
 4942-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
 4943-  postinstall_cmds='chmod 555 $lib'
 4944-  ;;
 4945-
 4946-interix3*)
 4947-  version_type=linux
 4948-  need_lib_prefix=no
 4949-  need_version=no
 4950-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
 4951-  soname_spec='${libname}${release}${shared_ext}$major'
 4952-  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
 4953-  shlibpath_var=LD_LIBRARY_PATH
 4954-  shlibpath_overrides_runpath=no
 4955-  hardcode_into_libs=yes
 4956+  shlibpath_overrides_runpath=no
 4957+  hardcode_into_libs=yes
 4958   ;;
 4959 
 4960 irix5* | irix6* | nonstopux*)
 4961@@ -3348,18 +1598,6 @@
 4962   dynamic_linker='GNU/Linux ld.so'
 4963   ;;
 4964 
 4965-netbsdelf*-gnu)
 4966-  version_type=linux
 4967-  need_lib_prefix=no
 4968-  need_version=no
 4969-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
 4970-  soname_spec='${libname}${release}${shared_ext}$major'
 4971-  shlibpath_var=LD_LIBRARY_PATH
 4972-  shlibpath_overrides_runpath=no
 4973-  hardcode_into_libs=yes
 4974-  dynamic_linker='NetBSD ld.elf_so'
 4975-  ;;
 4976-
 4977 knetbsd*-gnu)
 4978   version_type=linux
 4979   need_lib_prefix=no
 4980@@ -3376,7 +1614,7 @@
 4981   version_type=sunos
 4982   need_lib_prefix=no
 4983   need_version=no
 4984-  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 4985+  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 4986     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
 4987     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
 4988     dynamic_linker='NetBSD (a.out) ld.so'
 4989@@ -3397,16 +1635,14 @@
 4990   shlibpath_overrides_runpath=yes
 4991   ;;
 4992 
 4993-*nto* | *qnx*)
 4994-  version_type=qnx
 4995+nto-qnx*)
 4996+  version_type=linux
 4997   need_lib_prefix=no
 4998   need_version=no
 4999   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 5000   soname_spec='${libname}${release}${shared_ext}$major'
 5001   shlibpath_var=LD_LIBRARY_PATH
 5002-  shlibpath_overrides_runpath=no
 5003-  hardcode_into_libs=yes
 5004-  dynamic_linker='ldqnx.so'
 5005+  shlibpath_overrides_runpath=yes
 5006   ;;
 5007 
 5008 openbsd*)
 5009@@ -3415,13 +1651,13 @@
 5010   need_lib_prefix=no
 5011   # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
 5012   case $host_os in
 5013-    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
 5014-    *)				need_version=no  ;;
 5015+    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
 5016+    *)                         need_version=no  ;;
 5017   esac
 5018   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
 5019   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
 5020   shlibpath_var=LD_LIBRARY_PATH
 5021-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
 5022+  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
 5023     case $host_os in
 5024       openbsd2.[[89]] | openbsd2.[[89]].*)
 5025 	shlibpath_overrides_runpath=no
 5026@@ -3489,6 +1725,7 @@
 5027     sni)
 5028       shlibpath_overrides_runpath=no
 5029       need_lib_prefix=no
 5030+      export_dynamic_flag_spec='${wl}-Blargedynsym'
 5031       runpath_var=LD_RUN_PATH
 5032       ;;
 5033     siemens)
 5034@@ -3519,12 +1756,13 @@
 5035   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
 5036   soname_spec='${libname}${release}${shared_ext}$major'
 5037   shlibpath_var=LD_LIBRARY_PATH
 5038-  shlibpath_overrides_runpath=yes
 5039   hardcode_into_libs=yes
 5040   if test "$with_gnu_ld" = yes; then
 5041     sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
 5042+    shlibpath_overrides_runpath=no
 5043   else
 5044     sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
 5045+    shlibpath_overrides_runpath=yes
 5046     case $host_os in
 5047       sco3.2v5*)
 5048         sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
 5049@@ -3534,17 +1772,6 @@
 5050   sys_lib_dlsearch_path_spec='/usr/lib'
 5051   ;;
 5052 
 5053-tpf*)
 5054-  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
 5055-  version_type=linux
 5056-  need_lib_prefix=no
 5057-  need_version=no
 5058-  library_name_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 5059-  shlibpath_var=LD_LIBRARY_PATH
 5060-  shlibpath_overrides_runpath=no
 5061-  hardcode_into_libs=yes
 5062-  ;;
 5063-
 5064 uts4*)
 5065   version_type=linux
 5066   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 5067@@ -3563,78 +1790,307 @@
 5068 if test "$GCC" = yes; then
 5069   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 5070 fi
 5071+])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
 5072 
 5073-_LT_DECL([], [variables_saved_for_relink], [1],
 5074-    [Variables whose values should be saved in libtool wrapper scripts and
 5075-    restored at link time])
 5076-_LT_DECL([], [need_lib_prefix], [0],
 5077-    [Do we need the "lib" prefix for modules?])
 5078-_LT_DECL([], [need_version], [0], [Do we need a version for libraries?])
 5079-_LT_DECL([], [version_type], [0], [Library versioning type])
 5080-_LT_DECL([], [runpath_var], [0],  [Shared library runtime path variable])
 5081-_LT_DECL([], [shlibpath_var], [0],[Shared library path variable])
 5082-_LT_DECL([], [shlibpath_overrides_runpath], [0],
 5083-    [Is shlibpath searched before the hard-coded library search path?])
 5084-_LT_DECL([], [libname_spec], [1], [Format of library name prefix])
 5085-_LT_DECL([], [library_names_spec], [1],
 5086-    [[List of archive names.  First name is the real one, the rest are links.
 5087-    The last name is the one that the linker finds with -lNAME]])
 5088-_LT_DECL([], [soname_spec], [1],
 5089-    [[The coded name of the library, if different from the real name]])
 5090-_LT_DECL([], [postinstall_cmds], [2],
 5091-    [Command to use after installation of a shared archive])
 5092-_LT_DECL([], [postuninstall_cmds], [2],
 5093-    [Command to use after uninstallation of a shared archive])
 5094-_LT_DECL([], [finish_cmds], [2],
 5095-    [Commands used to finish a libtool library installation in a directory])
 5096-_LT_DECL([], [finish_eval], [1],
 5097-    [[As "finish_cmds", except a single script fragment to be evaled but
 5098-    not shown]])
 5099-_LT_DECL([], [hardcode_into_libs], [0],
 5100-    [Whether we should hardcode library paths into libraries])
 5101-_LT_DECL([], [sys_lib_search_path_spec], [2],
 5102-    [Compile-time system search path for libraries])
 5103-_LT_DECL([], [sys_lib_dlsearch_path_spec], [2],
 5104-    [Run-time system search path for libraries])
 5105-])# _LT_SYS_DYNAMIC_LINKER
 5106 
 5107+# _LT_AC_TAGCONFIG
 5108+# ----------------
 5109+AC_DEFUN([_LT_AC_TAGCONFIG],
 5110+[AC_ARG_WITH([tags],
 5111+    [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
 5112+        [include additional configurations @<:@automatic@:>@])],
 5113+    [tagnames="$withval"])
 5114+
 5115+if test -f "$ltmain" && test -n "$tagnames"; then
 5116+  if test ! -f "${ofile}"; then
 5117+    AC_MSG_WARN([output file `$ofile' does not exist])
 5118+  fi
 5119 
 5120-# _LT_PATH_TOOL_PREFIX(TOOL)
 5121-# --------------------------
 5122-# find a file program which can recognise shared library
 5123-AC_DEFUN([_LT_PATH_TOOL_PREFIX],
 5124-[m4_require([_LT_DECL_EGREP])dnl
 5125-AC_MSG_CHECKING([for $1])
 5126-AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
 5127-[case $MAGIC_CMD in
 5128-[[\\/*] |  ?:[\\/]*])
 5129-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
 5130-  ;;
 5131-*)
 5132-  lt_save_MAGIC_CMD="$MAGIC_CMD"
 5133-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
 5134-dnl $ac_dummy forces splitting on constant user-supplied paths.
 5135-dnl POSIX.2 word splitting is done only on the output of word expansions,
 5136-dnl not every word.  This closes a longstanding sh security hole.
 5137-  ac_dummy="m4_if([$2], , $PATH, [$2])"
 5138-  for ac_dir in $ac_dummy; do
 5139+  if test -z "$LTCC"; then
 5140+    eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
 5141+    if test -z "$LTCC"; then
 5142+      AC_MSG_WARN([output file `$ofile' does not look like a libtool script])
 5143+    else
 5144+      AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
 5145+    fi
 5146+  fi
 5147+  if test -z "$LTCFLAGS"; then
 5148+    eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
 5149+  fi
 5150+
 5151+  # Extract list of available tagged configurations in $ofile.
 5152+  # Note that this assumes the entire list is on one line.
 5153+  available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
 5154+
 5155+  lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
 5156+  for tagname in $tagnames; do
 5157     IFS="$lt_save_ifs"
 5158-    test -z "$ac_dir" && ac_dir=.
 5159-    if test -f $ac_dir/$1; then
 5160-      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
 5161-      if test -n "$file_magic_test_file"; then
 5162-	case $deplibs_check_method in
 5163-	"file_magic "*)
 5164-	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
 5165-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 5166-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
 5167-	    $EGREP "$file_magic_regex" > /dev/null; then
 5168-	    :
 5169-	  else
 5170-	    cat <<_LT_EOF 1>&2
 5171+    # Check whether tagname contains only valid characters
 5172+    case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in
 5173+    "") ;;
 5174+    *)  AC_MSG_ERROR([invalid tag name: $tagname])
 5175+	;;
 5176+    esac
 5177 
 5178-*** Warning: the command libtool uses to detect shared libraries,
 5179-*** $file_magic_cmd, produces output that libtool cannot recognize.
 5180+    if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
 5181+    then
 5182+      AC_MSG_ERROR([tag name \"$tagname\" already exists])
 5183+    fi
 5184+
 5185+    # Update the list of available tags.
 5186+    if test -n "$tagname"; then
 5187+      echo appending configuration tag \"$tagname\" to $ofile
 5188+
 5189+      case $tagname in
 5190+      CXX)
 5191+	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
 5192+	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
 5193+	    (test "X$CXX" != "Xg++"))) ; then
 5194+	  AC_LIBTOOL_LANG_CXX_CONFIG
 5195+	else
 5196+	  tagname=""
 5197+	fi
 5198+	;;
 5199+
 5200+      F77)
 5201+	if test -n "$F77" && test "X$F77" != "Xno"; then
 5202+	  AC_LIBTOOL_LANG_F77_CONFIG
 5203+	else
 5204+	  tagname=""
 5205+	fi
 5206+	;;
 5207+
 5208+      GCJ)
 5209+	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
 5210+	  AC_LIBTOOL_LANG_GCJ_CONFIG
 5211+	else
 5212+	  tagname=""
 5213+	fi
 5214+	;;
 5215+
 5216+      RC)
 5217+	AC_LIBTOOL_LANG_RC_CONFIG
 5218+	;;
 5219+
 5220+      *)
 5221+	AC_MSG_ERROR([Unsupported tag name: $tagname])
 5222+	;;
 5223+      esac
 5224+
 5225+      # Append the new tag name to the list of available tags.
 5226+      if test -n "$tagname" ; then
 5227+      available_tags="$available_tags $tagname"
 5228+    fi
 5229+    fi
 5230+  done
 5231+  IFS="$lt_save_ifs"
 5232+
 5233+  # Now substitute the updated list of available tags.
 5234+  if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
 5235+    mv "${ofile}T" "$ofile"
 5236+    chmod +x "$ofile"
 5237+  else
 5238+    rm -f "${ofile}T"
 5239+    AC_MSG_ERROR([unable to update list of available tagged configurations.])
 5240+  fi
 5241+fi
 5242+])# _LT_AC_TAGCONFIG
 5243+
 5244+
 5245+# AC_LIBTOOL_DLOPEN
 5246+# -----------------
 5247+# enable checks for dlopen support
 5248+AC_DEFUN([AC_LIBTOOL_DLOPEN],
 5249+ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])
 5250+])# AC_LIBTOOL_DLOPEN
 5251+
 5252+
 5253+# AC_LIBTOOL_WIN32_DLL
 5254+# --------------------
 5255+# declare package support for building win32 DLLs
 5256+AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
 5257+[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
 5258+])# AC_LIBTOOL_WIN32_DLL
 5259+
 5260+
 5261+# AC_ENABLE_SHARED([DEFAULT])
 5262+# ---------------------------
 5263+# implement the --enable-shared flag
 5264+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
 5265+AC_DEFUN([AC_ENABLE_SHARED],
 5266+[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
 5267+AC_ARG_ENABLE([shared],
 5268+    [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
 5269+	[build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])],
 5270+    [p=${PACKAGE-default}
 5271+    case $enableval in
 5272+    yes) enable_shared=yes ;;
 5273+    no) enable_shared=no ;;
 5274+    *)
 5275+      enable_shared=no
 5276+      # Look at the argument we got.  We use all the common list separators.
 5277+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
 5278+      for pkg in $enableval; do
 5279+	IFS="$lt_save_ifs"
 5280+	if test "X$pkg" = "X$p"; then
 5281+	  enable_shared=yes
 5282+	fi
 5283+      done
 5284+      IFS="$lt_save_ifs"
 5285+      ;;
 5286+    esac],
 5287+    [enable_shared=]AC_ENABLE_SHARED_DEFAULT)
 5288+])# AC_ENABLE_SHARED
 5289+
 5290+
 5291+# AC_DISABLE_SHARED
 5292+# -----------------
 5293+# set the default shared flag to --disable-shared
 5294+AC_DEFUN([AC_DISABLE_SHARED],
 5295+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
 5296+AC_ENABLE_SHARED(no)
 5297+])# AC_DISABLE_SHARED
 5298+
 5299+
 5300+# AC_ENABLE_STATIC([DEFAULT])
 5301+# ---------------------------
 5302+# implement the --enable-static flag
 5303+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
 5304+AC_DEFUN([AC_ENABLE_STATIC],
 5305+[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
 5306+AC_ARG_ENABLE([static],
 5307+    [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@],
 5308+	[build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])],
 5309+    [p=${PACKAGE-default}
 5310+    case $enableval in
 5311+    yes) enable_static=yes ;;
 5312+    no) enable_static=no ;;
 5313+    *)
 5314+     enable_static=no
 5315+      # Look at the argument we got.  We use all the common list separators.
 5316+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
 5317+      for pkg in $enableval; do
 5318+	IFS="$lt_save_ifs"
 5319+	if test "X$pkg" = "X$p"; then
 5320+	  enable_static=yes
 5321+	fi
 5322+      done
 5323+      IFS="$lt_save_ifs"
 5324+      ;;
 5325+    esac],
 5326+    [enable_static=]AC_ENABLE_STATIC_DEFAULT)
 5327+])# AC_ENABLE_STATIC
 5328+
 5329+
 5330+# AC_DISABLE_STATIC
 5331+# -----------------
 5332+# set the default static flag to --disable-static
 5333+AC_DEFUN([AC_DISABLE_STATIC],
 5334+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
 5335+AC_ENABLE_STATIC(no)
 5336+])# AC_DISABLE_STATIC
 5337+
 5338+
 5339+# AC_ENABLE_FAST_INSTALL([DEFAULT])
 5340+# ---------------------------------
 5341+# implement the --enable-fast-install flag
 5342+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
 5343+AC_DEFUN([AC_ENABLE_FAST_INSTALL],
 5344+[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
 5345+AC_ARG_ENABLE([fast-install],
 5346+    [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
 5347+    [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
 5348+    [p=${PACKAGE-default}
 5349+    case $enableval in
 5350+    yes) enable_fast_install=yes ;;
 5351+    no) enable_fast_install=no ;;
 5352+    *)
 5353+      enable_fast_install=no
 5354+      # Look at the argument we got.  We use all the common list separators.
 5355+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
 5356+      for pkg in $enableval; do
 5357+	IFS="$lt_save_ifs"
 5358+	if test "X$pkg" = "X$p"; then
 5359+	  enable_fast_install=yes
 5360+	fi
 5361+      done
 5362+      IFS="$lt_save_ifs"
 5363+      ;;
 5364+    esac],
 5365+    [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT)
 5366+])# AC_ENABLE_FAST_INSTALL
 5367+
 5368+
 5369+# AC_DISABLE_FAST_INSTALL
 5370+# -----------------------
 5371+# set the default to --disable-fast-install
 5372+AC_DEFUN([AC_DISABLE_FAST_INSTALL],
 5373+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
 5374+AC_ENABLE_FAST_INSTALL(no)
 5375+])# AC_DISABLE_FAST_INSTALL
 5376+
 5377+
 5378+# AC_LIBTOOL_PICMODE([MODE])
 5379+# --------------------------
 5380+# implement the --with-pic flag
 5381+# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
 5382+AC_DEFUN([AC_LIBTOOL_PICMODE],
 5383+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
 5384+pic_mode=ifelse($#,1,$1,default)
 5385+])# AC_LIBTOOL_PICMODE
 5386+
 5387+
 5388+# AC_PROG_EGREP
 5389+# -------------
 5390+# This is predefined starting with Autoconf 2.54, so this conditional
 5391+# definition can be removed once we require Autoconf 2.54 or later.
 5392+m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP],
 5393+[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep],
 5394+   [if echo a | (grep -E '(a|b)') >/dev/null 2>&1
 5395+    then ac_cv_prog_egrep='grep -E'
 5396+    else ac_cv_prog_egrep='egrep'
 5397+    fi])
 5398+ EGREP=$ac_cv_prog_egrep
 5399+ AC_SUBST([EGREP])
 5400+])])
 5401+
 5402+
 5403+# AC_PATH_TOOL_PREFIX
 5404+# -------------------
 5405+# find a file program which can recognise shared library
 5406+AC_DEFUN([AC_PATH_TOOL_PREFIX],
 5407+[AC_REQUIRE([AC_PROG_EGREP])dnl
 5408+AC_MSG_CHECKING([for $1])
 5409+AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
 5410+[case $MAGIC_CMD in
 5411+[[\\/*] |  ?:[\\/]*])
 5412+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
 5413+  ;;
 5414+*)
 5415+  lt_save_MAGIC_CMD="$MAGIC_CMD"
 5416+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
 5417+dnl $ac_dummy forces splitting on constant user-supplied paths.
 5418+dnl POSIX.2 word splitting is done only on the output of word expansions,
 5419+dnl not every word.  This closes a longstanding sh security hole.
 5420+  ac_dummy="ifelse([$2], , $PATH, [$2])"
 5421+  for ac_dir in $ac_dummy; do
 5422+    IFS="$lt_save_ifs"
 5423+    test -z "$ac_dir" && ac_dir=.
 5424+    if test -f $ac_dir/$1; then
 5425+      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
 5426+      if test -n "$file_magic_test_file"; then
 5427+	case $deplibs_check_method in
 5428+	"file_magic "*)
 5429+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
 5430+	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 5431+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
 5432+	    $EGREP "$file_magic_regex" > /dev/null; then
 5433+	    :
 5434+	  else
 5435+	    cat <<EOF 1>&2
 5436+
 5437+*** Warning: the command libtool uses to detect shared libraries,
 5438+*** $file_magic_cmd, produces output that libtool cannot recognize.
 5439 *** The result is that libtool may fail to recognize shared libraries
 5440 *** as such.  This will affect the creation of libtool libraries that
 5441 *** depend on shared libraries, but programs linked with such libtool
 5442@@ -3642,7 +2098,7 @@
 5443 *** may want to report the problem to your system manager and/or to
 5444 *** bug-libtool@gnu.org
 5445 
 5446-_LT_EOF
 5447+EOF
 5448 	  fi ;;
 5449 	esac
 5450       fi
 5451@@ -3659,47 +2115,37 @@
 5452 else
 5453   AC_MSG_RESULT(no)
 5454 fi
 5455-_LT_DECL([], [MAGIC_CMD], [0],
 5456-	 [Used to examine libraries when file_magic_cmd begins with "file"])dnl
 5457-])# _LT_PATH_TOOL_PREFIX
 5458-
 5459-# Old name:
 5460-AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX])
 5461-dnl aclocal-1.4 backwards compatibility:
 5462-dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], [])
 5463+])# AC_PATH_TOOL_PREFIX
 5464 
 5465 
 5466-# _LT_PATH_MAGIC
 5467-# --------------
 5468+# AC_PATH_MAGIC
 5469+# -------------
 5470 # find a file program which can recognise a shared library
 5471-m4_defun([_LT_PATH_MAGIC],
 5472-[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
 5473+AC_DEFUN([AC_PATH_MAGIC],
 5474+[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
 5475 if test -z "$lt_cv_path_MAGIC_CMD"; then
 5476   if test -n "$ac_tool_prefix"; then
 5477-    _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
 5478+    AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
 5479   else
 5480     MAGIC_CMD=:
 5481   fi
 5482 fi
 5483-])# _LT_PATH_MAGIC
 5484+])# AC_PATH_MAGIC
 5485 
 5486 
 5487-# LT_PATH_LD
 5488+# AC_PROG_LD
 5489 # ----------
 5490 # find the pathname to the GNU or non-GNU linker
 5491-AC_DEFUN([LT_PATH_LD],
 5492-[AC_REQUIRE([AC_PROG_CC])dnl
 5493-AC_REQUIRE([AC_CANONICAL_HOST])dnl
 5494-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
 5495-m4_require([_LT_DECL_SED])dnl
 5496-m4_require([_LT_DECL_EGREP])dnl
 5497-
 5498-AC_ARG_WITH([gnu-ld],
 5499-    [AS_HELP_STRING([--with-gnu-ld],
 5500+AC_DEFUN([AC_PROG_LD],
 5501+[AC_ARG_WITH([gnu-ld],
 5502+    [AC_HELP_STRING([--with-gnu-ld],
 5503 	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
 5504     [test "$withval" = no || with_gnu_ld=yes],
 5505-    [with_gnu_ld=no])dnl
 5506-
 5507+    [with_gnu_ld=no])
 5508+AC_REQUIRE([LT_AC_PROG_SED])dnl
 5509+AC_REQUIRE([AC_PROG_CC])dnl
 5510+AC_REQUIRE([AC_CANONICAL_HOST])dnl
 5511+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
 5512 ac_prog=ld
 5513 if test "$GCC" = yes; then
 5514   # Check if gcc -print-prog-name=ld gives a path.
 5515@@ -3716,9 +2162,9 @@
 5516     [[\\/]]* | ?:[[\\/]]*)
 5517       re_direlt='/[[^/]][[^/]]*/\.\./'
 5518       # Canonicalize the pathname of ld
 5519-      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
 5520-      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
 5521-	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
 5522+      ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
 5523+      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
 5524+	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
 5525       done
 5526       test -z "$LD" && LD="$ac_prog"
 5527       ;;
 5528@@ -3768,24 +2214,15 @@
 5529   AC_MSG_RESULT(no)
 5530 fi
 5531 test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
 5532-_LT_PATH_LD_GNU
 5533-AC_SUBST([LD])
 5534+AC_PROG_LD_GNU
 5535+])# AC_PROG_LD
 5536 
 5537-_LT_TAGDECL([], [LD], [1], [The linker used to build libraries])
 5538-])# LT_PATH_LD
 5539 
 5540-# Old names:
 5541-AU_ALIAS([AM_PROG_LD], [LT_PATH_LD])
 5542-AU_ALIAS([AC_PROG_LD], [LT_PATH_LD])
 5543-dnl aclocal-1.4 backwards compatibility:
 5544-dnl AC_DEFUN([AM_PROG_LD], [])
 5545-dnl AC_DEFUN([AC_PROG_LD], [])
 5546-
 5547-
 5548-# _LT_PATH_LD_GNU
 5549-#- --------------
 5550-m4_defun([_LT_PATH_LD_GNU],
 5551-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
 5552+# AC_PROG_LD_GNU
 5553+# --------------
 5554+AC_DEFUN([AC_PROG_LD_GNU],
 5555+[AC_REQUIRE([AC_PROG_EGREP])dnl
 5556+AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
 5557 [# I'd rather use --version here, but apparently some GNU lds only accept -v.
 5558 case `$LD -v 2>&1 </dev/null` in
 5559 *GNU* | *'with BFD'*)
 5560@@ -3796,14 +2233,14 @@
 5561   ;;
 5562 esac])
 5563 with_gnu_ld=$lt_cv_prog_gnu_ld
 5564-])# _LT_PATH_LD_GNU
 5565+])# AC_PROG_LD_GNU
 5566 
 5567 
 5568-# _LT_CMD_RELOAD
 5569-# --------------
 5570+# AC_PROG_LD_RELOAD_FLAG
 5571+# ----------------------
 5572 # find reload flag for linker
 5573 #   -- PORTME Some linkers may need a different reload flag.
 5574-m4_defun([_LT_CMD_RELOAD],
 5575+AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
 5576 [AC_CACHE_CHECK([for $LD option to reload object files],
 5577   lt_cv_ld_reload_flag,
 5578   [lt_cv_ld_reload_flag='-r'])
 5579@@ -3822,18 +2259,15 @@
 5580     fi
 5581     ;;
 5582 esac
 5583-_LT_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl
 5584-_LT_DECL([], [reload_cmds], [2])dnl
 5585-])# _LT_CMD_RELOAD
 5586+])# AC_PROG_LD_RELOAD_FLAG
 5587 
 5588 
 5589-# _LT_CHECK_MAGIC_METHOD
 5590-# ----------------------
 5591+# AC_DEPLIBS_CHECK_METHOD
 5592+# -----------------------
 5593 # how to check for library dependencies
 5594 #  -- PORTME fill in with the dynamic library characteristics
 5595-m4_defun([_LT_CHECK_MAGIC_METHOD],
 5596-[m4_require([_LT_DECL_EGREP])
 5597-AC_CACHE_CHECK([how to recognise dependent libraries],
 5598+AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
 5599+[AC_CACHE_CHECK([how to recognise dependent libraries],
 5600 lt_cv_deplibs_check_method,
 5601 [lt_cv_file_magic_cmd='$MAGIC_CMD'
 5602 lt_cv_file_magic_test_file=
 5603@@ -3870,9 +2304,9 @@
 5604   lt_cv_file_magic_cmd='func_win32_libid'
 5605   ;;
 5606 
 5607+mingw* | pw32*)
 5608   # Base MSYS/MinGW do not provide the 'file' command needed by
 5609   # func_win32_libid shell function, so use a weaker test based on 'objdump'.
 5610-mingw* | pw32*)
 5611   lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
 5612   lt_cv_file_magic_cmd='$OBJDUMP -f'
 5613   ;;
 5614@@ -3882,7 +2316,7 @@
 5615   ;;
 5616 
 5617 freebsd* | kfreebsd*-gnu | dragonfly*)
 5618-  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
 5619+  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
 5620     case $host_cpu in
 5621     i*86 )
 5622       # Not sure whether the presence of OpenBSD here was a mistake.
 5623@@ -3939,8 +2373,8 @@
 5624   lt_cv_deplibs_check_method=pass_all
 5625   ;;
 5626 
 5627-netbsd* | knetbsd*-gnu | netbsdelf*-gnu)
 5628-  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
 5629+netbsd*)
 5630+  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
 5631     lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
 5632   else
 5633     lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
 5634@@ -3953,12 +2387,12 @@
 5635   lt_cv_file_magic_test_file=/usr/lib/libnls.so
 5636   ;;
 5637 
 5638-*nto* | *qnx*)
 5639-  lt_cv_deplibs_check_method=pass_all
 5640+nto-qnx*)
 5641+  lt_cv_deplibs_check_method=unknown
 5642   ;;
 5643 
 5644 openbsd*)
 5645-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
 5646+  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
 5647     lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
 5648   else
 5649     lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
 5650@@ -3973,10 +2407,6 @@
 5651   lt_cv_deplibs_check_method=pass_all
 5652   ;;
 5653 
 5654-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
 5655-  lt_cv_deplibs_check_method=pass_all
 5656-  ;;
 5657-
 5658 sysv4 | sysv4.3*)
 5659   case $host_vendor in
 5660   motorola)
 5661@@ -4004,7 +2434,7 @@
 5662   esac
 5663   ;;
 5664 
 5665-tpf*)
 5666+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
 5667   lt_cv_deplibs_check_method=pass_all
 5668   ;;
 5669 esac
 5670@@ -4012,27 +2442,20 @@
 5671 file_magic_cmd=$lt_cv_file_magic_cmd
 5672 deplibs_check_method=$lt_cv_deplibs_check_method
 5673 test -z "$deplibs_check_method" && deplibs_check_method=unknown
 5674+])# AC_DEPLIBS_CHECK_METHOD
 5675 
 5676-_LT_DECL([], [deplibs_check_method], [1],
 5677-    [Method to check whether dependent libraries are shared objects])
 5678-_LT_DECL([], [file_magic_cmd], [1],
 5679-    [Command to use when deplibs_check_method == "file_magic"])
 5680-])# _LT_CHECK_MAGIC_METHOD
 5681 
 5682-
 5683-# LT_PATH_NM
 5684+# AC_PROG_NM
 5685 # ----------
 5686-# find the pathname to a BSD- or MS-compatible name lister
 5687-AC_DEFUN([LT_PATH_NM],
 5688-[AC_REQUIRE([AC_PROG_CC])dnl
 5689-AC_REQUIRE([AC_OBJEXT])dnl
 5690-AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM,
 5691+# find the pathname to a BSD-compatible name lister
 5692+AC_DEFUN([AC_PROG_NM],
 5693+[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM,
 5694 [if test -n "$NM"; then
 5695   # Let the user override the test.
 5696   lt_cv_path_NM="$NM"
 5697 else
 5698   lt_nm_to_check="${ac_tool_prefix}nm"
 5699-  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
 5700+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then 
 5701     lt_nm_to_check="$lt_nm_to_check nm"
 5702   fi
 5703   for lt_tmp_nm in $lt_nm_to_check; do
 5704@@ -4068,51 +2491,16 @@
 5705     done
 5706     IFS="$lt_save_ifs"
 5707   done
 5708-  : ${lt_cv_path_NM=no}
 5709+  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
 5710 fi])
 5711-if test "$lt_cv_path_NM" != "no"; then
 5712-  NM="$lt_cv_path_NM"
 5713-else
 5714-  # Didn't find any BSD compatible name lister, look for dumpbin.
 5715-  AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :)
 5716-  AC_SUBST([DUMPBIN])
 5717-  if test "$DUMPBIN" != ":"; then
 5718-    NM="$DUMPBIN"
 5719-  fi
 5720-fi
 5721-test -z "$NM" && NM=nm
 5722-AC_SUBST([NM])
 5723-_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl
 5724-
 5725-AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
 5726-  [lt_cv_nm_interface="BSD nm"
 5727-  echo "int some_variable = 0;" > conftest.$ac_ext
 5728-  (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
 5729-  (eval "$ac_compile" 2>conftest.err)
 5730-  cat conftest.err >&AS_MESSAGE_LOG_FD
 5731-  (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
 5732-  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
 5733-  cat conftest.err >&AS_MESSAGE_LOG_FD
 5734-  (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD)
 5735-  cat conftest.out >&AS_MESSAGE_LOG_FD
 5736-  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
 5737-    lt_cv_nm_interface="MS dumpbin"
 5738-  fi
 5739-  rm -f conftest*])
 5740-])# LT_PATH_NM
 5741-
 5742-# Old names:
 5743-AU_ALIAS([AM_PROG_NM], [LT_PATH_NM])
 5744-AU_ALIAS([AC_PROG_NM], [LT_PATH_NM])
 5745-dnl aclocal-1.4 backwards compatibility:
 5746-dnl AC_DEFUN([AM_PROG_NM], [])
 5747-dnl AC_DEFUN([AC_PROG_NM], [])
 5748+NM="$lt_cv_path_NM"
 5749+])# AC_PROG_NM
 5750 
 5751 
 5752-# LT_LIB_M
 5753-# --------
 5754+# AC_CHECK_LIBM
 5755+# -------------
 5756 # check for math library
 5757-AC_DEFUN([LT_LIB_M],
 5758+AC_DEFUN([AC_CHECK_LIBM],
 5759 [AC_REQUIRE([AC_CANONICAL_HOST])dnl
 5760 LIBM=
 5761 case $host in
 5762@@ -4127,3660 +2515,3832 @@
 5763   AC_CHECK_LIB(m, cos, LIBM="-lm")
 5764   ;;
 5765 esac
 5766-AC_SUBST([LIBM])
 5767-])# LT_LIB_M
 5768+])# AC_CHECK_LIBM
 5769 
 5770-# Old name:
 5771-AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M])
 5772-dnl aclocal-1.4 backwards compatibility:
 5773-dnl AC_DEFUN([AC_CHECK_LIBM], [])
 5774 
 5775+# AC_LIBLTDL_CONVENIENCE([DIRECTORY])
 5776+# -----------------------------------
 5777+# sets LIBLTDL to the link flags for the libltdl convenience library and
 5778+# LTDLINCL to the include flags for the libltdl header and adds
 5779+# --enable-ltdl-convenience to the configure arguments.  Note that
 5780+# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
 5781+# it is assumed to be `libltdl'.  LIBLTDL will be prefixed with
 5782+# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/'
 5783+# (note the single quotes!).  If your package is not flat and you're not
 5784+# using automake, define top_builddir and top_srcdir appropriately in
 5785+# the Makefiles.
 5786+AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
 5787+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
 5788+  case $enable_ltdl_convenience in
 5789+  no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
 5790+  "") enable_ltdl_convenience=yes
 5791+      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
 5792+  esac
 5793+  LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
 5794+  LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
 5795+  # For backwards non-gettext consistent compatibility...
 5796+  INCLTDL="$LTDLINCL"
 5797+])# AC_LIBLTDL_CONVENIENCE
 5798 
 5799-# _LT_COMPILER_NO_RTTI([TAGNAME])
 5800-# -------------------------------
 5801-m4_defun([_LT_COMPILER_NO_RTTI],
 5802-[m4_require([_LT_TAG_COMPILER])dnl
 5803 
 5804-_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
 5805+# AC_LIBLTDL_INSTALLABLE([DIRECTORY])
 5806+# -----------------------------------
 5807+# sets LIBLTDL to the link flags for the libltdl installable library and
 5808+# LTDLINCL to the include flags for the libltdl header and adds
 5809+# --enable-ltdl-install to the configure arguments.  Note that
 5810+# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
 5811+# and an installed libltdl is not found, it is assumed to be `libltdl'.
 5812+# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with
 5813+# '${top_srcdir}/' (note the single quotes!).  If your package is not
 5814+# flat and you're not using automake, define top_builddir and top_srcdir
 5815+# appropriately in the Makefiles.
 5816+# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
 5817+AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
 5818+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
 5819+  AC_CHECK_LIB(ltdl, lt_dlinit,
 5820+  [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
 5821+  [if test x"$enable_ltdl_install" = xno; then
 5822+     AC_MSG_WARN([libltdl not installed, but installation disabled])
 5823+   else
 5824+     enable_ltdl_install=yes
 5825+   fi
 5826+  ])
 5827+  if test x"$enable_ltdl_install" = x"yes"; then
 5828+    ac_configure_args="$ac_configure_args --enable-ltdl-install"
 5829+    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
 5830+    LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
 5831+  else
 5832+    ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
 5833+    LIBLTDL="-lltdl"
 5834+    LTDLINCL=
 5835+  fi
 5836+  # For backwards non-gettext consistent compatibility...
 5837+  INCLTDL="$LTDLINCL"
 5838+])# AC_LIBLTDL_INSTALLABLE
 5839 
 5840-if test "$GCC" = yes; then
 5841-  _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
 5842 
 5843-  _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
 5844-    lt_cv_prog_compiler_rtti_exceptions,
 5845-    [-fno-rtti -fno-exceptions], [],
 5846-    [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
 5847-fi
 5848-_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1],
 5849-	[Compiler flag to turn off builtin functions])
 5850-])# _LT_COMPILER_NO_RTTI
 5851+# AC_LIBTOOL_CXX
 5852+# --------------
 5853+# enable support for C++ libraries
 5854+AC_DEFUN([AC_LIBTOOL_CXX],
 5855+[AC_REQUIRE([_LT_AC_LANG_CXX])
 5856+])# AC_LIBTOOL_CXX
 5857 
 5858 
 5859-# _LT_CMD_GLOBAL_SYMBOLS
 5860-# ----------------------
 5861-m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
 5862-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
 5863-AC_REQUIRE([AC_PROG_CC])dnl
 5864-AC_REQUIRE([AC_OBJEXT])dnl
 5865-AC_REQUIRE([LT_PATH_NM])dnl
 5866-AC_REQUIRE([LT_PATH_LD])dnl
 5867-m4_require([_LT_DECL_EGREP])dnl
 5868-m4_require([_LT_TAG_COMPILER])dnl
 5869+# _LT_AC_LANG_CXX
 5870+# ---------------
 5871+AC_DEFUN([_LT_AC_LANG_CXX],
 5872+[AC_REQUIRE([AC_PROG_CXX])
 5873+AC_REQUIRE([_LT_AC_PROG_CXXCPP])
 5874+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
 5875+])# _LT_AC_LANG_CXX
 5876 
 5877-# Check for command to grab the raw symbol name followed by C symbol from nm.
 5878-AC_MSG_CHECKING([command to parse $NM output from $compiler object])
 5879-AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
 5880+# _LT_AC_PROG_CXXCPP
 5881+# ------------------
 5882+AC_DEFUN([_LT_AC_PROG_CXXCPP],
 5883 [
 5884-# These are sane defaults that work on at least a few old systems.
 5885-# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
 5886+AC_REQUIRE([AC_PROG_CXX])
 5887+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
 5888+    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
 5889+    (test "X$CXX" != "Xg++"))) ; then
 5890+  AC_PROG_CXXCPP
 5891+fi
 5892+])# _LT_AC_PROG_CXXCPP
 5893 
 5894-# Character class describing NM global symbol codes.
 5895-symcode='[[BCDEGRST]]'
 5896+# AC_LIBTOOL_F77
 5897+# --------------
 5898+# enable support for Fortran 77 libraries
 5899+AC_DEFUN([AC_LIBTOOL_F77],
 5900+[AC_REQUIRE([_LT_AC_LANG_F77])
 5901+])# AC_LIBTOOL_F77
 5902 
 5903-# Regexp to match symbols that can be accessed directly from C.
 5904-sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
 5905 
 5906-# Define system-specific variables.
 5907-case $host_os in
 5908-aix*)
 5909-  symcode='[[BCDT]]'
 5910-  ;;
 5911-cygwin* | mingw* | pw32*)
 5912-  symcode='[[ABCDGISTW]]'
 5913-  ;;
 5914-hpux*)
 5915-  if test "$host_cpu" = ia64; then
 5916-    symcode='[[ABCDEGRST]]'
 5917-  fi
 5918-  ;;
 5919-irix* | nonstopux*)
 5920-  symcode='[[BCDEGRST]]'
 5921-  ;;
 5922-osf*)
 5923-  symcode='[[BCDEGQRST]]'
 5924-  ;;
 5925-solaris*)
 5926-  symcode='[[BDRT]]'
 5927-  ;;
 5928-sco3.2v5*)
 5929-  symcode='[[DT]]'
 5930-  ;;
 5931-sysv4.2uw2*)
 5932-  symcode='[[DT]]'
 5933-  ;;
 5934-sysv5* | sco5v6* | unixware* | OpenUNIX*)
 5935-  symcode='[[ABDT]]'
 5936-  ;;
 5937-sysv4)
 5938-  symcode='[[DFNSTU]]'
 5939-  ;;
 5940-esac
 5941+# _LT_AC_LANG_F77
 5942+# ---------------
 5943+AC_DEFUN([_LT_AC_LANG_F77],
 5944+[AC_REQUIRE([AC_PROG_F77])
 5945+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77])
 5946+])# _LT_AC_LANG_F77
 5947 
 5948-# If we're using GNU nm, then use its standard symbol codes.
 5949-case `$NM -V 2>&1` in
 5950-*GNU* | *'with BFD'*)
 5951-  symcode='[[ABCDGIRSTW]]' ;;
 5952-esac
 5953 
 5954-# Transform an extracted symbol line into a proper C declaration.
 5955-# Some systems (esp. on ia64) link data and code symbols differently,
 5956-# so use this general approach.
 5957-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
 5958+# AC_LIBTOOL_GCJ
 5959+# --------------
 5960+# enable support for GCJ libraries
 5961+AC_DEFUN([AC_LIBTOOL_GCJ],
 5962+[AC_REQUIRE([_LT_AC_LANG_GCJ])
 5963+])# AC_LIBTOOL_GCJ
 5964 
 5965-# Transform an extracted symbol line into symbol name and symbol address
 5966-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p'"
 5967 
 5968-# Handle CRLF in mingw tool chain
 5969-opt_cr=
 5970-case $build_os in
 5971-mingw*)
 5972-  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
 5973+# _LT_AC_LANG_GCJ
 5974+# ---------------
 5975+AC_DEFUN([_LT_AC_LANG_GCJ],
 5976+[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
 5977+  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
 5978+    [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
 5979+      [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
 5980+	 [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
 5981+	   [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
 5982+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ])
 5983+])# _LT_AC_LANG_GCJ
 5984+
 5985+
 5986+# AC_LIBTOOL_RC
 5987+# -------------
 5988+# enable support for Windows resource files
 5989+AC_DEFUN([AC_LIBTOOL_RC],
 5990+[AC_REQUIRE([LT_AC_PROG_RC])
 5991+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC])
 5992+])# AC_LIBTOOL_RC
 5993+
 5994+
 5995+# AC_LIBTOOL_LANG_C_CONFIG
 5996+# ------------------------
 5997+# Ensure that the configuration vars for the C compiler are
 5998+# suitably defined.  Those variables are subsequently used by
 5999+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
 6000+AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG])
 6001+AC_DEFUN([_LT_AC_LANG_C_CONFIG],
 6002+[lt_save_CC="$CC"
 6003+AC_LANG_PUSH(C)
 6004+
 6005+# Source file extension for C test sources.
 6006+ac_ext=c
 6007+
 6008+# Object file extension for compiled C test sources.
 6009+objext=o
 6010+_LT_AC_TAGVAR(objext, $1)=$objext
 6011+
 6012+# Code to be used in simple compile tests
 6013+lt_simple_compile_test_code="int some_variable = 0;\n"
 6014+
 6015+# Code to be used in simple link tests
 6016+lt_simple_link_test_code='int main(){return(0);}\n'
 6017+
 6018+_LT_AC_SYS_COMPILER
 6019+
 6020+# save warnings/boilerplate of simple test code
 6021+_LT_COMPILER_BOILERPLATE
 6022+_LT_LINKER_BOILERPLATE
 6023+
 6024+AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
 6025+AC_LIBTOOL_PROG_COMPILER_PIC($1)
 6026+AC_LIBTOOL_PROG_CC_C_O($1)
 6027+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
 6028+AC_LIBTOOL_PROG_LD_SHLIBS($1)
 6029+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
 6030+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
 6031+AC_LIBTOOL_SYS_LIB_STRIP
 6032+AC_LIBTOOL_DLOPEN_SELF
 6033+
 6034+# Report which library types will actually be built
 6035+AC_MSG_CHECKING([if libtool supports shared libraries])
 6036+AC_MSG_RESULT([$can_build_shared])
 6037+
 6038+AC_MSG_CHECKING([whether to build shared libraries])
 6039+test "$can_build_shared" = "no" && enable_shared=no
 6040+
 6041+# On AIX, shared libraries and static libraries use the same namespace, and
 6042+# are all built from PIC.
 6043+case $host_os in
 6044+aix3*)
 6045+  test "$enable_shared" = yes && enable_static=no
 6046+  if test -n "$RANLIB"; then
 6047+    archive_cmds="$archive_cmds~\$RANLIB \$lib"
 6048+    postinstall_cmds='$RANLIB $lib'
 6049+  fi
 6050   ;;
 6051+
 6052+aix4* | aix5*)
 6053+  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
 6054+    test "$enable_shared" = yes && enable_static=no
 6055+  fi
 6056+    ;;
 6057 esac
 6058+AC_MSG_RESULT([$enable_shared])
 6059 
 6060-# Try without a prefix underscore, then with it.
 6061-for ac_symprfx in "" "_"; do
 6062+AC_MSG_CHECKING([whether to build static libraries])
 6063+# Make sure either enable_shared or enable_static is yes.
 6064+test "$enable_shared" = yes || enable_static=yes
 6065+AC_MSG_RESULT([$enable_static])
 6066 
 6067-  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
 6068-  symxfrm="\\1 $ac_symprfx\\2 \\2"
 6069+AC_LIBTOOL_CONFIG($1)
 6070 
 6071-  # Write the raw and C identifiers.
 6072-  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
 6073-    # Fake it for dumpbin and say T for any non-static function
 6074-    # and D for any global variable.
 6075-    # Also find C++ and __fastcall symbols from MSVC++,
 6076-    # which start with @ or ?.
 6077-    lt_cv_sys_global_symbol_pipe="$AWK ['"\
 6078-"     {last_section=section; section=\$ 3};"\
 6079-"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
 6080-"     \$ 0!~/External *\|/{next};"\
 6081-"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
 6082-"     {if(hide[section]) next};"\
 6083-"     {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
 6084-"     {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
 6085-"     s[1]~/^[@?]/{print s[1], s[1]; next};"\
 6086-"     s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
 6087-"     ' prfx=^$ac_symprfx]"
 6088-  else
 6089-    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]\($symcode$symcode*\)[[ 	]][[ 	]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
 6090-  fi
 6091+AC_LANG_POP
 6092+CC="$lt_save_CC"
 6093+])# AC_LIBTOOL_LANG_C_CONFIG
 6094 
 6095-  # Check to see that the pipe works correctly.
 6096-  pipe_works=no
 6097 
 6098-  rm -f conftest*
 6099-  cat > conftest.$ac_ext <<_LT_EOF
 6100-#ifdef __cplusplus
 6101-extern "C" {
 6102-#endif
 6103-char nm_test_var;
 6104-void nm_test_func(){}
 6105-#ifdef __cplusplus
 6106-}
 6107-#endif
 6108-int main(){nm_test_var='a';nm_test_func();return(0);}
 6109-_LT_EOF
 6110+# AC_LIBTOOL_LANG_CXX_CONFIG
 6111+# --------------------------
 6112+# Ensure that the configuration vars for the C compiler are
 6113+# suitably defined.  Those variables are subsequently used by
 6114+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
 6115+AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)])
 6116+AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
 6117+[AC_LANG_PUSH(C++)
 6118+AC_REQUIRE([AC_PROG_CXX])
 6119+AC_REQUIRE([_LT_AC_PROG_CXXCPP])
 6120+
 6121+_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
 6122+_LT_AC_TAGVAR(allow_undefined_flag, $1)=
 6123+_LT_AC_TAGVAR(always_export_symbols, $1)=no
 6124+_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
 6125+_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
 6126+_LT_AC_TAGVAR(hardcode_direct, $1)=no
 6127+_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
 6128+_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 6129+_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
 6130+_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
 6131+_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
 6132+_LT_AC_TAGVAR(hardcode_automatic, $1)=no
 6133+_LT_AC_TAGVAR(module_cmds, $1)=
 6134+_LT_AC_TAGVAR(module_expsym_cmds, $1)=
 6135+_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
 6136+_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
 6137+_LT_AC_TAGVAR(no_undefined_flag, $1)=
 6138+_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
 6139+_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
 6140 
 6141-  if AC_TRY_EVAL(ac_compile); then
 6142-    # Now try to grab the symbols.
 6143-    nlist=conftest.nm
 6144-    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
 6145-      # Try sorting and uniquifying the output.
 6146-      if sort "$nlist" | uniq > "$nlist"T; then
 6147-	mv -f "$nlist"T "$nlist"
 6148-      else
 6149-	rm -f "$nlist"T
 6150-      fi
 6151+# Dependencies to place before and after the object being linked:
 6152+_LT_AC_TAGVAR(predep_objects, $1)=
 6153+_LT_AC_TAGVAR(postdep_objects, $1)=
 6154+_LT_AC_TAGVAR(predeps, $1)=
 6155+_LT_AC_TAGVAR(postdeps, $1)=
 6156+_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
 6157 
 6158-      # Make sure that we snagged all the symbols we need.
 6159-      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
 6160-	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
 6161-	  cat <<_LT_EOF > conftest.$ac_ext
 6162-#ifdef __cplusplus
 6163-extern "C" {
 6164-#endif
 6165+# Source file extension for C++ test sources.
 6166+ac_ext=cpp
 6167 
 6168-_LT_EOF
 6169-	  # Now generate the symbol file.
 6170-	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
 6171+# Object file extension for compiled C++ test sources.
 6172+objext=o
 6173+_LT_AC_TAGVAR(objext, $1)=$objext
 6174 
 6175-	  cat <<_LT_EOF >> conftest.$ac_ext
 6176+# Code to be used in simple compile tests
 6177+lt_simple_compile_test_code="int some_variable = 0;\n"
 6178 
 6179-/* The mapping between symbol names and symbols.  */
 6180-const struct {
 6181-  const char *name;
 6182-  void       *address;
 6183-}
 6184-lt__PROGRAM__LTX_preloaded_symbols[[]] =
 6185-{
 6186-  { "@PROGRAM@", (void *) 0 },
 6187-_LT_EOF
 6188-	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
 6189-	  cat <<\_LT_EOF >> conftest.$ac_ext
 6190-  {0, (void *) 0}
 6191-};
 6192+# Code to be used in simple link tests
 6193+lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n'
 6194 
 6195-/* This works around a problem in FreeBSD linker */
 6196-#ifdef FREEBSD_WORKAROUND
 6197-static const void *lt_preloaded_setup() {
 6198-  return lt__PROGRAM__LTX_preloaded_symbols;
 6199-}
 6200-#endif
 6201+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
 6202+_LT_AC_SYS_COMPILER
 6203 
 6204-#ifdef __cplusplus
 6205-}
 6206-#endif
 6207-_LT_EOF
 6208-	  # Now try linking the two files.
 6209-	  mv conftest.$ac_objext conftstm.$ac_objext
 6210-	  lt_save_LIBS="$LIBS"
 6211-	  lt_save_CFLAGS="$CFLAGS"
 6212-	  LIBS="conftstm.$ac_objext"
 6213-	  CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
 6214-	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
 6215-	    pipe_works=yes
 6216-	  fi
 6217-	  LIBS="$lt_save_LIBS"
 6218-	  CFLAGS="$lt_save_CFLAGS"
 6219-	else
 6220-	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
 6221-	fi
 6222-      else
 6223-	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
 6224-      fi
 6225+# save warnings/boilerplate of simple test code
 6226+_LT_COMPILER_BOILERPLATE
 6227+_LT_LINKER_BOILERPLATE
 6228+
 6229+# Allow CC to be a program name with arguments.
 6230+lt_save_CC=$CC
 6231+lt_save_LD=$LD
 6232+lt_save_GCC=$GCC
 6233+GCC=$GXX
 6234+lt_save_with_gnu_ld=$with_gnu_ld
 6235+lt_save_path_LD=$lt_cv_path_LD
 6236+if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
 6237+  lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
 6238+else
 6239+  $as_unset lt_cv_prog_gnu_ld
 6240+fi
 6241+if test -n "${lt_cv_path_LDCXX+set}"; then
 6242+  lt_cv_path_LD=$lt_cv_path_LDCXX
 6243+else
 6244+  $as_unset lt_cv_path_LD
 6245+fi
 6246+test -z "${LDCXX+set}" || LD=$LDCXX
 6247+CC=${CXX-"c++"}
 6248+compiler=$CC
 6249+_LT_AC_TAGVAR(compiler, $1)=$CC
 6250+_LT_CC_BASENAME([$compiler])
 6251+
 6252+# We don't want -fno-exception wen compiling C++ code, so set the
 6253+# no_builtin_flag separately
 6254+if test "$GXX" = yes; then
 6255+  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
 6256+else
 6257+  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
 6258+fi
 6259+
 6260+if test "$GXX" = yes; then
 6261+  # Set up default GNU C++ configuration
 6262+
 6263+  AC_PROG_LD
 6264+
 6265+  # Check if GNU C++ uses GNU ld as the underlying linker, since the
 6266+  # archiving commands below assume that GNU ld is being used.
 6267+  if test "$with_gnu_ld" = yes; then
 6268+    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
 6269+    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 6270+
 6271+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
 6272+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
 6273+
 6274+    # If archive_cmds runs LD, not CC, wlarc should be empty
 6275+    # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
 6276+    #     investigate it a little bit more. (MM)
 6277+    wlarc='${wl}'
 6278+
 6279+    # ancient GNU ld didn't support --whole-archive et. al.
 6280+    if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
 6281+	grep 'no-whole-archive' > /dev/null; then
 6282+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
 6283     else
 6284-      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
 6285+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
 6286     fi
 6287   else
 6288-    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
 6289-    cat conftest.$ac_ext >&5
 6290-  fi
 6291-  rm -f conftest* conftst*
 6292+    with_gnu_ld=no
 6293+    wlarc=
 6294 
 6295-  # Do not use the global_symbol_pipe unless it works.
 6296-  if test "$pipe_works" = yes; then
 6297-    break
 6298-  else
 6299-    lt_cv_sys_global_symbol_pipe=
 6300+    # A generic and very simple default shared library creation
 6301+    # command for GNU C++ for the case where it uses the native
 6302+    # linker, instead of GNU ld.  If possible, this setting should
 6303+    # overridden to take advantage of the native linker features on
 6304+    # the platform it is being used on.
 6305+    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
 6306   fi
 6307-done
 6308-])
 6309-if test -z "$lt_cv_sys_global_symbol_pipe"; then
 6310-  lt_cv_sys_global_symbol_to_cdecl=
 6311-fi
 6312-if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
 6313-  AC_MSG_RESULT(failed)
 6314+
 6315+  # Commands to make compiler produce verbose output that lists
 6316+  # what "hidden" libraries, object files and flags are used when
 6317+  # linking a shared library.
 6318+  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
 6319+
 6320 else
 6321-  AC_MSG_RESULT(ok)
 6322+  GXX=no
 6323+  with_gnu_ld=no
 6324+  wlarc=
 6325 fi
 6326 
 6327-_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
 6328-    [Take the output of nm and produce a listing of raw symbols and C names])
 6329-_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
 6330-    [Transform the output of nm in a proper C declaration])
 6331-_LT_DECL([global_symbol_to_c_name_address],
 6332-    [lt_cv_sys_global_symbol_to_c_name_address], [1],
 6333-    [Transform the output of nm in a C name address pair])
 6334-]) # _LT_CMD_GLOBAL_SYMBOLS
 6335+# PORTME: fill in a description of your system's C++ link characteristics
 6336+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
 6337+_LT_AC_TAGVAR(ld_shlibs, $1)=yes
 6338+case $host_os in
 6339+  aix3*)
 6340+    # FIXME: insert proper C++ library support
 6341+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
 6342+    ;;
 6343+  aix4* | aix5*)
 6344+    if test "$host_cpu" = ia64; then
 6345+      # On IA64, the linker does run time linking by default, so we don't
 6346+      # have to do anything special.
 6347+      aix_use_runtimelinking=no
 6348+      exp_sym_flag='-Bexport'
 6349+      no_entry_flag=""
 6350+    else
 6351+      aix_use_runtimelinking=no
 6352 
 6353+      # Test if we are trying to use run time linking or normal
 6354+      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
 6355+      # need to do runtime linking.
 6356+      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
 6357+	for ld_flag in $LDFLAGS; do
 6358+	  case $ld_flag in
 6359+	  *-brtl*)
 6360+	    aix_use_runtimelinking=yes
 6361+	    break
 6362+	    ;;
 6363+	  esac
 6364+	done
 6365+	;;
 6366+      esac
 6367 
 6368-# _LT_COMPILER_PIC([TAGNAME])
 6369-# ---------------------------
 6370-m4_defun([_LT_COMPILER_PIC],
 6371-[m4_require([_LT_TAG_COMPILER])dnl
 6372-_LT_TAGVAR(lt_prog_compiler_wl, $1)=
 6373-_LT_TAGVAR(lt_prog_compiler_pic, $1)=
 6374-_LT_TAGVAR(lt_prog_compiler_static, $1)=
 6375+      exp_sym_flag='-bexport'
 6376+      no_entry_flag='-bnoentry'
 6377+    fi
 6378 
 6379-AC_MSG_CHECKING([for $compiler option to produce PIC])
 6380-m4_if([$1], [CXX], [
 6381-  # C++ specific cases for pic, static, wl, etc.
 6382-  if test "$GXX" = yes; then
 6383-    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 6384-    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
 6385+    # When large executables or shared objects are built, AIX ld can
 6386+    # have problems creating the table of contents.  If linking a library
 6387+    # or program results in "error TOC overflow" add -mminimal-toc to
 6388+    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
 6389+    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
 6390+
 6391+    _LT_AC_TAGVAR(archive_cmds, $1)=''
 6392+    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
 6393+    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
 6394+    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
 6395 
 6396-    case $host_os in
 6397-    aix*)
 6398-      # All AIX code is PIC.
 6399-      if test "$host_cpu" = ia64; then
 6400-	# AIX 5 now supports IA64 processor
 6401-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 6402+    if test "$GXX" = yes; then
 6403+      case $host_os in aix4.[[012]]|aix4.[[012]].*)
 6404+      # We only want to do this on AIX 4.2 and lower, the check
 6405+      # below for broken collect2 doesn't work under 4.3+
 6406+	collect2name=`${CC} -print-prog-name=collect2`
 6407+	if test -f "$collect2name" && \
 6408+	   strings "$collect2name" | grep resolve_lib_name >/dev/null
 6409+	then
 6410+	  # We have reworked collect2
 6411+	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
 6412+	else
 6413+	  # We have old collect2
 6414+	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
 6415+	  # It fails to find uninstalled libraries when the uninstalled
 6416+	  # path is not listed in the libpath.  Setting hardcode_minus_L
 6417+	  # to unsupported forces relinking
 6418+	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
 6419+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
 6420+	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
 6421+	fi
 6422+	;;
 6423+      esac
 6424+      shared_flag='-shared'
 6425+      if test "$aix_use_runtimelinking" = yes; then
 6426+	shared_flag="$shared_flag "'${wl}-G'
 6427       fi
 6428-      ;;
 6429-    amigaos*)
 6430-      if test "$host_cpu" = m68k; then
 6431-        # FIXME: we need at least 68020 code to build shared libraries, but
 6432-        # adding the `-m68020' flag to GCC prevents building anything better,
 6433-        # like `-m68040'.
 6434-        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
 6435+    else
 6436+      # not using gcc
 6437+      if test "$host_cpu" = ia64; then
 6438+	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
 6439+	# chokes on -Wl,-G. The following line is correct:
 6440+	shared_flag='-G'
 6441+      else
 6442+	if test "$aix_use_runtimelinking" = yes; then
 6443+	  shared_flag='${wl}-G'
 6444+	else
 6445+	  shared_flag='${wl}-bM:SRE'
 6446+	fi
 6447       fi
 6448-      ;;
 6449-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
 6450-      # PIC is the default for these OSes.
 6451-      ;;
 6452-    mingw* | os2* | pw32*)
 6453-      # This hack is so that the source file can tell whether it is being
 6454-      # built for inclusion in a dll (and should export symbols for example).
 6455-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
 6456-      ;;
 6457-    darwin* | rhapsody*)
 6458-      # PIC is the default on this platform
 6459-      # Common symbols not allowed in MH_DYLIB files
 6460-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
 6461-      ;;
 6462-    *djgpp*)
 6463-      # DJGPP does not support shared libraries at all
 6464-      _LT_TAGVAR(lt_prog_compiler_pic, $1)=
 6465-      ;;
 6466-    interix3*)
 6467-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
 6468-      # Instead, we relocate shared libraries at runtime.
 6469-      ;;
 6470-    sysv4*MP*)
 6471-      if test -d /usr/nec; then
 6472-	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
 6473+    fi
 6474+
 6475+    # It seems that -bexpall does not export symbols beginning with
 6476+    # underscore (_), so it is better to generate a list of symbols to export.
 6477+    _LT_AC_TAGVAR(always_export_symbols, $1)=yes
 6478+    if test "$aix_use_runtimelinking" = yes; then
 6479+      # Warning - without using the other runtime loading flags (-brtl),
 6480+      # -berok will link without error, but may produce a broken library.
 6481+      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
 6482+      # Determine the default libpath from the value encoded in an empty executable.
 6483+      _LT_AC_SYS_LIBPATH_AIX
 6484+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
 6485+
 6486+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
 6487+     else
 6488+      if test "$host_cpu" = ia64; then
 6489+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
 6490+	_LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
 6491+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
 6492+      else
 6493+	# Determine the default libpath from the value encoded in an empty executable.
 6494+	_LT_AC_SYS_LIBPATH_AIX
 6495+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
 6496+	# Warning - without using the other run time loading flags,
 6497+	# -berok will link without error, but may produce a broken library.
 6498+	_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
 6499+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
 6500+	# Exported symbols can be pulled into shared objects from archives
 6501+	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
 6502+	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
 6503+	# This is similar to how AIX traditionally builds its shared libraries.
 6504+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
 6505       fi
 6506-      ;;
 6507-    hpux*)
 6508-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
 6509-      # not for PA HP-UX.
 6510-      case $host_cpu in
 6511-      hppa*64*|ia64*)
 6512-	;;
 6513+    fi
 6514+    ;;
 6515+
 6516+  beos*)
 6517+    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 6518+      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
 6519+      # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
 6520+      # support --undefined.  This deserves some investigation.  FIXME
 6521+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 6522+    else
 6523+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
 6524+    fi
 6525+    ;;
 6526+
 6527+  chorus*)
 6528+    case $cc_basename in
 6529       *)
 6530-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
 6531+	# FIXME: insert proper C++ library support
 6532+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 6533 	;;
 6534-      esac
 6535-      ;;
 6536-    *qnx* | *nto*)
 6537-      # QNX uses GNU C++, but need to define -shared option too, otherwise
 6538-      # it will coredump.
 6539-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
 6540-      ;;
 6541-    *)
 6542-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
 6543-      ;;
 6544     esac
 6545-  else
 6546-    case $host_os in
 6547-      aix4* | aix5*)
 6548-	# All AIX code is PIC.
 6549-	if test "$host_cpu" = ia64; then
 6550-	  # AIX 5 now supports IA64 processor
 6551-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 6552-	else
 6553-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
 6554-	fi
 6555+    ;;
 6556+
 6557+  cygwin* | mingw* | pw32*)
 6558+    # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
 6559+    # as there is no search path for DLLs.
 6560+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
 6561+    _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
 6562+    _LT_AC_TAGVAR(always_export_symbols, $1)=no
 6563+    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
 6564+
 6565+    if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
 6566+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
 6567+      # If the export-symbols file already is a .def file (1st line
 6568+      # is EXPORTS), use it as is; otherwise, prepend...
 6569+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
 6570+	cp $export_symbols $output_objdir/$soname.def;
 6571+      else
 6572+	echo EXPORTS > $output_objdir/$soname.def;
 6573+	cat $export_symbols >> $output_objdir/$soname.def;
 6574+      fi~
 6575+      $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'
 6576+    else
 6577+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
 6578+    fi
 6579+  ;;
 6580+      darwin* | rhapsody*)
 6581+        case $host_os in
 6582+        rhapsody* | darwin1.[[012]])
 6583+         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
 6584+         ;;
 6585+       *) # Darwin 1.3 on
 6586+         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
 6587+           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
 6588+         else
 6589+           case ${MACOSX_DEPLOYMENT_TARGET} in
 6590+             10.[[012]])
 6591+               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
 6592+               ;;
 6593+             10.*)
 6594+               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
 6595+               ;;
 6596+           esac
 6597+         fi
 6598+         ;;
 6599+        esac
 6600+      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
 6601+      _LT_AC_TAGVAR(hardcode_direct, $1)=no
 6602+      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
 6603+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
 6604+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
 6605+      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
 6606+
 6607+    if test "$GXX" = yes ; then
 6608+      lt_int_apple_cc_single_mod=no
 6609+      output_verbose_link_cmd='echo'
 6610+      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
 6611+       lt_int_apple_cc_single_mod=yes
 6612+      fi
 6613+      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
 6614+       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
 6615+      else
 6616+          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
 6617+        fi
 6618+        _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
 6619+        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
 6620+          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
 6621+            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
 6622+          else
 6623+            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
 6624+          fi
 6625+            _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
 6626+      else
 6627+      case $cc_basename in
 6628+        xlc*)
 6629+         output_verbose_link_cmd='echo'
 6630+          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
 6631+          _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
 6632+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
 6633+          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
 6634+          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
 6635+          ;;
 6636+       *)
 6637+         _LT_AC_TAGVAR(ld_shlibs, $1)=no
 6638+          ;;
 6639+      esac
 6640+      fi
 6641+        ;;
 6642+
 6643+  dgux*)
 6644+    case $cc_basename in
 6645+      ec++*)
 6646+	# FIXME: insert proper C++ library support
 6647+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 6648+	;;
 6649+      ghcx*)
 6650+	# Green Hills C++ Compiler
 6651+	# FIXME: insert proper C++ library support
 6652+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 6653 	;;
 6654-      chorus*)
 6655-	case $cc_basename in
 6656-	cxch68*)
 6657-	  # Green Hills C++ Compiler
 6658-	  # _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"
 6659-	  ;;
 6660-	esac
 6661+      *)
 6662+	# FIXME: insert proper C++ library support
 6663+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 6664 	;;
 6665-      darwin*)
 6666-        # PIC is the default on this platform
 6667-        # Common symbols not allowed in MH_DYLIB files
 6668-        case $cc_basename in
 6669-          xlc*)
 6670-          _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
 6671-          _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 6672-          ;;
 6673-        esac
 6674+    esac
 6675+    ;;
 6676+  freebsd[[12]]*)
 6677+    # C++ shared libraries reported to be fairly broken before switch to ELF
 6678+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
 6679+    ;;
 6680+  freebsd-elf*)
 6681+    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
 6682+    ;;
 6683+  freebsd* | kfreebsd*-gnu | dragonfly*)
 6684+    # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
 6685+    # conventions
 6686+    _LT_AC_TAGVAR(ld_shlibs, $1)=yes
 6687+    ;;
 6688+  gnu*)
 6689+    ;;
 6690+  hpux9*)
 6691+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
 6692+    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
 6693+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
 6694+    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
 6695+    _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
 6696+				# but as the default
 6697+				# location of the library.
 6698+
 6699+    case $cc_basename in
 6700+    CC*)
 6701+      # FIXME: insert proper C++ library support
 6702+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
 6703+      ;;
 6704+    aCC*)
 6705+      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
 6706+      # Commands to make compiler produce verbose output that lists
 6707+      # what "hidden" libraries, object files and flags are used when
 6708+      # linking a shared library.
 6709+      #
 6710+      # There doesn't appear to be a way to prevent this compiler from
 6711+      # explicitly linking system object files so we need to strip them
 6712+      # from the output so that they don't get included in the library
 6713+      # dependencies.
 6714+      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
 6715+      ;;
 6716+    *)
 6717+      if test "$GXX" = yes; then
 6718+        _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
 6719+      else
 6720+        # FIXME: insert proper C++ library support
 6721+        _LT_AC_TAGVAR(ld_shlibs, $1)=no
 6722+      fi
 6723+      ;;
 6724+    esac
 6725+    ;;
 6726+  hpux10*|hpux11*)
 6727+    if test $with_gnu_ld = no; then
 6728+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
 6729+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
 6730+
 6731+      case $host_cpu in
 6732+      hppa*64*|ia64*)
 6733+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
 6734         ;;
 6735-      dgux*)
 6736-	case $cc_basename in
 6737-	  ec++*)
 6738-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 6739-	    ;;
 6740-	  ghcx*)
 6741-	    # Green Hills C++ Compiler
 6742-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
 6743-	    ;;
 6744-	  *)
 6745-	    ;;
 6746-	esac
 6747+      *)
 6748+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
 6749+        ;;
 6750+      esac
 6751+    fi
 6752+    case $host_cpu in
 6753+    hppa*64*|ia64*)
 6754+      _LT_AC_TAGVAR(hardcode_direct, $1)=no
 6755+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
 6756+      ;;
 6757+    *)
 6758+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
 6759+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
 6760+					      # but as the default
 6761+					      # location of the library.
 6762+      ;;
 6763+    esac
 6764+
 6765+    case $cc_basename in
 6766+      CC*)
 6767+	# FIXME: insert proper C++ library support
 6768+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 6769 	;;
 6770-      freebsd* | kfreebsd*-gnu | dragonfly*)
 6771-	# FreeBSD uses GNU C++
 6772+      aCC*)
 6773+	case $host_cpu in
 6774+	hppa*64*)
 6775+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 6776+	  ;;
 6777+	ia64*)
 6778+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 6779+	  ;;
 6780+	*)
 6781+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 6782+	  ;;
 6783+	esac
 6784+	# Commands to make compiler produce verbose output that lists
 6785+	# what "hidden" libraries, object files and flags are used when
 6786+	# linking a shared library.
 6787+	#
 6788+	# There doesn't appear to be a way to prevent this compiler from
 6789+	# explicitly linking system object files so we need to strip them
 6790+	# from the output so that they don't get included in the library
 6791+	# dependencies.
 6792+	output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
 6793 	;;
 6794-      hpux9* | hpux10* | hpux11*)
 6795-	case $cc_basename in
 6796-	  CC*)
 6797-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 6798-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
 6799-	    if test "$host_cpu" != ia64; then
 6800-	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
 6801-	    fi
 6802-	    ;;
 6803-	  aCC*)
 6804-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 6805-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
 6806+      *)
 6807+	if test "$GXX" = yes; then
 6808+	  if test $with_gnu_ld = no; then
 6809 	    case $host_cpu in
 6810-	    hppa*64*|ia64*)
 6811-	      # +Z the default
 6812+	    hppa*64*)
 6813+	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 6814+	      ;;
 6815+	    ia64*)
 6816+	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 6817 	      ;;
 6818 	    *)
 6819-	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
 6820+	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 6821 	      ;;
 6822 	    esac
 6823-	    ;;
 6824-	  *)
 6825-	    ;;
 6826-	esac
 6827+	  fi
 6828+	else
 6829+	  # FIXME: insert proper C++ library support
 6830+	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
 6831+	fi
 6832 	;;
 6833-      interix*)
 6834-	# This is c89, which is MS Visual C++ (no shared libs)
 6835-	# Anyone wants to do a port?
 6836+    esac
 6837+    ;;
 6838+  interix3*)
 6839+    _LT_AC_TAGVAR(hardcode_direct, $1)=no
 6840+    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
 6841+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
 6842+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
 6843+    # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
 6844+    # Instead, shared libraries are loaded at an image base (0x10000000 by
 6845+    # default) and relocated if they conflict, which is a slow very memory
 6846+    # consuming and fragmenting process.  To avoid this, we pick a random,
 6847+    # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
 6848+    # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
 6849+    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
 6850+    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
 6851+    ;;
 6852+  irix5* | irix6*)
 6853+    case $cc_basename in
 6854+      CC*)
 6855+	# SGI C++
 6856+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
 6857+
 6858+	# Archives containing C++ object files must be created using
 6859+	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
 6860+	# necessary to make sure instantiated templates are included
 6861+	# in the archive.
 6862+	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
 6863 	;;
 6864-      irix5* | irix6* | nonstopux*)
 6865-	case $cc_basename in
 6866-	  CC*)
 6867-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 6868-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
 6869-	    # CC pic flag -KPIC is the default.
 6870-	    ;;
 6871-	  *)
 6872-	    ;;
 6873-	esac
 6874+      *)
 6875+	if test "$GXX" = yes; then
 6876+	  if test "$with_gnu_ld" = no; then
 6877+	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 6878+	  else
 6879+	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
 6880+	  fi
 6881+	fi
 6882+	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
 6883 	;;
 6884-      linux*)
 6885-	case $cc_basename in
 6886-	  KCC*)
 6887-	    # KAI C++ Compiler
 6888-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
 6889-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
 6890-	    ;;
 6891-	  icpc* | ecpc* )
 6892-	    # Intel C++
 6893-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 6894-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 6895-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
 6896-	    ;;
 6897-	  pgCC*)
 6898-	    # Portland Group C++ compiler
 6899-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 6900-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
 6901-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 6902-	    ;;
 6903-	  cxx*)
 6904-	    # Compaq C++
 6905-	    # Make sure the PIC flag is empty.  It appears that all Alpha
 6906-	    # Linux and Compaq Tru64 Unix objects are PIC.
 6907-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
 6908-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
 6909-	    ;;
 6910-	  *)
 6911-	    ;;
 6912+    esac
 6913+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
 6914+    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
 6915+    ;;
 6916+  linux*)
 6917+    case $cc_basename in
 6918+      KCC*)
 6919+	# Kuck and Associates, Inc. (KAI) C++ Compiler
 6920+
 6921+	# KCC will only create a shared library if the output file
 6922+	# ends with ".so" (or ".sl" for HP-UX), so rename the library
 6923+	# to its proper name (with version) after linking.
 6924+	_LT_AC_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'
 6925+	_LT_AC_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'
 6926+	# Commands to make compiler produce verbose output that lists
 6927+	# what "hidden" libraries, object files and flags are used when
 6928+	# linking a shared library.
 6929+	#
 6930+	# There doesn't appear to be a way to prevent this compiler from
 6931+	# explicitly linking system object files so we need to strip them
 6932+	# from the output so that they don't get included in the library
 6933+	# dependencies.
 6934+	output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
 6935+
 6936+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir'
 6937+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
 6938+
 6939+	# Archives containing C++ object files must be created using
 6940+	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
 6941+	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
 6942+	;;
 6943+      icpc*)
 6944+	# Intel C++
 6945+	with_gnu_ld=yes
 6946+	# version 8.0 and above of icpc choke on multiply defined symbols
 6947+	# if we add $predep_objects and $postdep_objects, however 7.1 and
 6948+	# earlier do not add the objects themselves.
 6949+	case `$CC -V 2>&1` in
 6950+	*"Version 7."*)
 6951+  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
 6952+  	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 6953+	  ;;
 6954+	*)  # Version 8.0 or newer
 6955+	  tmp_idyn=
 6956+	  case $host_cpu in
 6957+	    ia64*) tmp_idyn=' -i_dynamic';;
 6958+	  esac
 6959+  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 6960+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 6961+	  ;;
 6962 	esac
 6963+	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
 6964+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
 6965+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
 6966+	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
 6967+	;;
 6968+      pgCC*)
 6969+        # Portland Group C++ compiler
 6970+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
 6971+  	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
 6972+
 6973+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
 6974+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
 6975+	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
 6976+        ;;
 6977+      cxx*)
 6978+	# Compaq C++
 6979+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
 6980+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
 6981+
 6982+	runpath_var=LD_RUN_PATH
 6983+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
 6984+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
 6985+
 6986+	# Commands to make compiler produce verbose output that lists
 6987+	# what "hidden" libraries, object files and flags are used when
 6988+	# linking a shared library.
 6989+	#
 6990+	# There doesn't appear to be a way to prevent this compiler from
 6991+	# explicitly linking system object files so we need to strip them
 6992+	# from the output so that they don't get included in the library
 6993+	# dependencies.
 6994+	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
 6995 	;;
 6996-      lynxos*)
 6997-	;;
 6998-      m88k*)
 6999+    esac
 7000+    ;;
 7001+  lynxos*)
 7002+    # FIXME: insert proper C++ library support
 7003+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
 7004+    ;;
 7005+  m88k*)
 7006+    # FIXME: insert proper C++ library support
 7007+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
 7008+    ;;
 7009+  mvs*)
 7010+    case $cc_basename in
 7011+      cxx*)
 7012+	# FIXME: insert proper C++ library support
 7013+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 7014 	;;
 7015-      mvs*)
 7016-	case $cc_basename in
 7017-	  cxx*)
 7018-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
 7019-	    ;;
 7020-	  *)
 7021-	    ;;
 7022-	esac
 7023+      *)
 7024+	# FIXME: insert proper C++ library support
 7025+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 7026 	;;
 7027-      netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
 7028+    esac
 7029+    ;;
 7030+  netbsd*)
 7031+    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 7032+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
 7033+      wlarc=
 7034+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
 7035+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
 7036+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
 7037+    fi
 7038+    # Workaround some broken pre-1.5 toolchains
 7039+    output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
 7040+    ;;
 7041+  openbsd2*)
 7042+    # C++ shared libraries are fairly broken
 7043+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
 7044+    ;;
 7045+  openbsd*)
 7046+    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
 7047+    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
 7048+    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
 7049+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
 7050+    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
 7051+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
 7052+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
 7053+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
 7054+    fi
 7055+    output_verbose_link_cmd='echo'
 7056+    ;;
 7057+  osf3*)
 7058+    case $cc_basename in
 7059+      KCC*)
 7060+	# Kuck and Associates, Inc. (KAI) C++ Compiler
 7061+
 7062+	# KCC will only create a shared library if the output file
 7063+	# ends with ".so" (or ".sl" for HP-UX), so rename the library
 7064+	# to its proper name (with version) after linking.
 7065+	_LT_AC_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'
 7066+
 7067+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
 7068+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
 7069+
 7070+	# Archives containing C++ object files must be created using
 7071+	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
 7072+	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
 7073+
 7074+	;;
 7075+      RCC*)
 7076+	# Rational C++ 2.4.1
 7077+	# FIXME: insert proper C++ library support
 7078+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 7079+	;;
 7080+      cxx*)
 7081+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
 7082+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
 7083+
 7084+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
 7085+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
 7086+
 7087+	# Commands to make compiler produce verbose output that lists
 7088+	# what "hidden" libraries, object files and flags are used when
 7089+	# linking a shared library.
 7090+	#
 7091+	# There doesn't appear to be a way to prevent this compiler from
 7092+	# explicitly linking system object files so we need to strip them
 7093+	# from the output so that they don't get included in the library
 7094+	# dependencies.
 7095+	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
 7096 	;;
 7097-      *qnx* | *nto*)
 7098-        # QNX uses GNU C++, but need to define -shared option too, otherwise
 7099-        # it will coredump.
 7100-        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
 7101-        ;;
 7102-      osf3* | osf4* | osf5*)
 7103-	case $cc_basename in
 7104-	  KCC*)
 7105-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
 7106-	    ;;
 7107-	  RCC*)
 7108-	    # Rational C++ 2.4.1
 7109-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
 7110-	    ;;
 7111-	  cxx*)
 7112-	    # Digital/Compaq C++
 7113-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 7114-	    # Make sure the PIC flag is empty.  It appears that all Alpha
 7115-	    # Linux and Compaq Tru64 Unix objects are PIC.
 7116-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
 7117-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
 7118-	    ;;
 7119-	  *)
 7120-	    ;;
 7121-	esac
 7122+      *)
 7123+	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
 7124+	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
 7125+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 7126+
 7127+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
 7128+	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
 7129+
 7130+	  # Commands to make compiler produce verbose output that lists
 7131+	  # what "hidden" libraries, object files and flags are used when
 7132+	  # linking a shared library.
 7133+	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
 7134+
 7135+	else
 7136+	  # FIXME: insert proper C++ library support
 7137+	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
 7138+	fi
 7139 	;;
 7140-      psos*)
 7141+    esac
 7142+    ;;
 7143+  osf4* | osf5*)
 7144+    case $cc_basename in
 7145+      KCC*)
 7146+	# Kuck and Associates, Inc. (KAI) C++ Compiler
 7147+
 7148+	# KCC will only create a shared library if the output file
 7149+	# ends with ".so" (or ".sl" for HP-UX), so rename the library
 7150+	# to its proper name (with version) after linking.
 7151+	_LT_AC_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'
 7152+
 7153+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
 7154+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
 7155+
 7156+	# Archives containing C++ object files must be created using
 7157+	# the KAI C++ compiler.
 7158+	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
 7159+	;;
 7160+      RCC*)
 7161+	# Rational C++ 2.4.1
 7162+	# FIXME: insert proper C++ library support
 7163+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 7164+	;;
 7165+      cxx*)
 7166+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
 7167+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
 7168+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
 7169+	  echo "-hidden">> $lib.exp~
 7170+	  $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~
 7171+	  $rm $lib.exp'
 7172+
 7173+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
 7174+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
 7175+
 7176+	# Commands to make compiler produce verbose output that lists
 7177+	# what "hidden" libraries, object files and flags are used when
 7178+	# linking a shared library.
 7179+	#
 7180+	# There doesn't appear to be a way to prevent this compiler from
 7181+	# explicitly linking system object files so we need to strip them
 7182+	# from the output so that they don't get included in the library
 7183+	# dependencies.
 7184+	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
 7185 	;;
 7186-      solaris*)
 7187-	case $cc_basename in
 7188-	  CC*)
 7189-	    # Sun C++ 4.2, 5.x and Centerline C++
 7190-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 7191-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 7192-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
 7193-	    ;;
 7194-	  gcx*)
 7195-	    # Green Hills C++ Compiler
 7196-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
 7197-	    ;;
 7198-	  *)
 7199-	    ;;
 7200-	esac
 7201+      *)
 7202+	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
 7203+	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
 7204+	 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 7205+
 7206+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
 7207+	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
 7208+
 7209+	  # Commands to make compiler produce verbose output that lists
 7210+	  # what "hidden" libraries, object files and flags are used when
 7211+	  # linking a shared library.
 7212+	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
 7213+
 7214+	else
 7215+	  # FIXME: insert proper C++ library support
 7216+	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
 7217+	fi
 7218 	;;
 7219-      sunos4*)
 7220-	case $cc_basename in
 7221-	  CC*)
 7222-	    # Sun C++ 4.x
 7223-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
 7224-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 7225-	    ;;
 7226-	  lcc*)
 7227-	    # Lucid
 7228-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
 7229-	    ;;
 7230-	  *)
 7231-	    ;;
 7232-	esac
 7233+    esac
 7234+    ;;
 7235+  psos*)
 7236+    # FIXME: insert proper C++ library support
 7237+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
 7238+    ;;
 7239+  sunos4*)
 7240+    case $cc_basename in
 7241+      CC*)
 7242+	# Sun C++ 4.x
 7243+	# FIXME: insert proper C++ library support
 7244+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 7245+	;;
 7246+      lcc*)
 7247+	# Lucid
 7248+	# FIXME: insert proper C++ library support
 7249+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 7250 	;;
 7251-      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
 7252-	case $cc_basename in
 7253-	  CC*)
 7254-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 7255-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 7256-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 7257-	    ;;
 7258-	esac
 7259+      *)
 7260+	# FIXME: insert proper C++ library support
 7261+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 7262 	;;
 7263-      tandem*)
 7264-	case $cc_basename in
 7265-	  NCC*)
 7266-	    # NonStop-UX NCC 3.20
 7267-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 7268-	    ;;
 7269+    esac
 7270+    ;;
 7271+  solaris*)
 7272+    case $cc_basename in
 7273+      CC*)
 7274+	# Sun C++ 4.2, 5.x and Centerline C++
 7275+        _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes
 7276+	_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
 7277+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 7278+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
 7279+	$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'
 7280+
 7281+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
 7282+	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
 7283+	case $host_os in
 7284+	  solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
 7285 	  *)
 7286+	    # The C++ compiler is used as linker so we must use $wl
 7287+	    # flag to pass the commands to the underlying system
 7288+	    # linker. We must also pass each convience library through
 7289+	    # to the system linker between allextract/defaultextract.
 7290+	    # The C++ compiler will combine linker options so we
 7291+	    # cannot just pass the convience library names through
 7292+	    # without $wl.
 7293+	    # Supported since Solaris 2.6 (maybe 2.5.1?)
 7294+	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
 7295 	    ;;
 7296 	esac
 7297-	;;
 7298-      vxworks*)
 7299+	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
 7300+
 7301+	output_verbose_link_cmd='echo'
 7302+
 7303+	# Archives containing C++ object files must be created using
 7304+	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
 7305+	# necessary to make sure instantiated templates are included
 7306+	# in the archive.
 7307+	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
 7308+	;;
 7309+      gcx*)
 7310+	# Green Hills C++ Compiler
 7311+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
 7312+
 7313+	# The C++ compiler must be used to create the archive.
 7314+	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
 7315 	;;
 7316       *)
 7317-	_LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
 7318+	# GNU C++ compiler with Solaris linker
 7319+	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
 7320+	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
 7321+	  if $CC --version | grep -v '^2\.7' > /dev/null; then
 7322+	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
 7323+	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
 7324+		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
 7325+
 7326+	    # Commands to make compiler produce verbose output that lists
 7327+	    # what "hidden" libraries, object files and flags are used when
 7328+	    # linking a shared library.
 7329+	    output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
 7330+	  else
 7331+	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
 7332+	    # platform.
 7333+	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
 7334+	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
 7335+		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
 7336+
 7337+	    # Commands to make compiler produce verbose output that lists
 7338+	    # what "hidden" libraries, object files and flags are used when
 7339+	    # linking a shared library.
 7340+	    output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
 7341+	  fi
 7342+
 7343+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
 7344+	fi
 7345 	;;
 7346     esac
 7347-  fi
 7348-],
 7349-[
 7350-  if test "$GCC" = yes; then
 7351-    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 7352-    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
 7353+    ;;
 7354+  sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
 7355+    _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
 7356+    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
 7357+    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
 7358+    runpath_var='LD_RUN_PATH'
 7359+
 7360+    case $cc_basename in
 7361+      CC*)
 7362+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 7363+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 7364+	;;
 7365+      *)
 7366+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 7367+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 7368+	;;
 7369+    esac
 7370+    ;;
 7371+  sysv5* | sco3.2v5* | sco5v6*)
 7372+    # Note: We can NOT use -z defs as we might desire, because we do not
 7373+    # link with -lc, and that would cause any symbols used from libc to
 7374+    # always be unresolved, which means just about no library would
 7375+    # ever link correctly.  If we're not using GNU ld we use -z text
 7376+    # though, which does catch some bad symbols but isn't as heavy-handed
 7377+    # as -z defs.
 7378+    # For security reasons, it is highly recommended that you always
 7379+    # use absolute paths for naming shared libraries, and exclude the
 7380+    # DT_RUNPATH tag from executables and libraries.  But doing so
 7381+    # requires that you compile everything twice, which is a pain.
 7382+    # So that behaviour is only enabled if SCOABSPATH is set to a
 7383+    # non-empty value in the environment.  Most likely only useful for
 7384+    # creating official distributions of packages.
 7385+    # This is a hack until libtool officially supports absolute path
 7386+    # names for shared libraries.
 7387+    _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
 7388+    _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
 7389+    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
 7390+    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
 7391+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
 7392+    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
 7393+    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
 7394+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
 7395+    runpath_var='LD_RUN_PATH'
 7396+
 7397+    case $cc_basename in
 7398+      CC*)
 7399+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
 7400+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
 7401+	;;
 7402+      *)
 7403+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
 7404+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
 7405+	;;
 7406+    esac
 7407+    ;;
 7408+  tandem*)
 7409+    case $cc_basename in
 7410+      NCC*)
 7411+	# NonStop-UX NCC 3.20
 7412+	# FIXME: insert proper C++ library support
 7413+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 7414+	;;
 7415+      *)
 7416+	# FIXME: insert proper C++ library support
 7417+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 7418+	;;
 7419+    esac
 7420+    ;;
 7421+  vxworks*)
 7422+    # FIXME: insert proper C++ library support
 7423+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
 7424+    ;;
 7425+  *)
 7426+    # FIXME: insert proper C++ library support
 7427+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
 7428+    ;;
 7429+esac
 7430+AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
 7431+test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
 7432 
 7433-    case $host_os in
 7434-      aix*)
 7435-      # All AIX code is PIC.
 7436-      if test "$host_cpu" = ia64; then
 7437-	# AIX 5 now supports IA64 processor
 7438-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 7439-      fi
 7440+_LT_AC_TAGVAR(GCC, $1)="$GXX"
 7441+_LT_AC_TAGVAR(LD, $1)="$LD"
 7442+
 7443+AC_LIBTOOL_POSTDEP_PREDEP($1)
 7444+AC_LIBTOOL_PROG_COMPILER_PIC($1)
 7445+AC_LIBTOOL_PROG_CC_C_O($1)
 7446+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
 7447+AC_LIBTOOL_PROG_LD_SHLIBS($1)
 7448+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
 7449+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
 7450+
 7451+AC_LIBTOOL_CONFIG($1)
 7452+
 7453+AC_LANG_POP
 7454+CC=$lt_save_CC
 7455+LDCXX=$LD
 7456+LD=$lt_save_LD
 7457+GCC=$lt_save_GCC
 7458+with_gnu_ldcxx=$with_gnu_ld
 7459+with_gnu_ld=$lt_save_with_gnu_ld
 7460+lt_cv_path_LDCXX=$lt_cv_path_LD
 7461+lt_cv_path_LD=$lt_save_path_LD
 7462+lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
 7463+lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
 7464+])# AC_LIBTOOL_LANG_CXX_CONFIG
 7465+
 7466+# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
 7467+# ------------------------------------
 7468+# Figure out "hidden" library dependencies from verbose
 7469+# compiler output when linking a shared library.
 7470+# Parse the compiler output and extract the necessary
 7471+# objects, libraries and library flags.
 7472+AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[
 7473+dnl we can't use the lt_simple_compile_test_code here,
 7474+dnl because it contains code intended for an executable,
 7475+dnl not a library.  It's possible we should let each
 7476+dnl tag define a new lt_????_link_test_code variable,
 7477+dnl but it's only used here...
 7478+ifelse([$1],[],[cat > conftest.$ac_ext <<EOF
 7479+int a;
 7480+void foo (void) { a = 0; }
 7481+EOF
 7482+],[$1],[CXX],[cat > conftest.$ac_ext <<EOF
 7483+class Foo
 7484+{
 7485+public:
 7486+  Foo (void) { a = 0; }
 7487+private:
 7488+  int a;
 7489+};
 7490+EOF
 7491+],[$1],[F77],[cat > conftest.$ac_ext <<EOF
 7492+      subroutine foo
 7493+      implicit none
 7494+      integer*4 a
 7495+      a=0
 7496+      return
 7497+      end
 7498+EOF
 7499+],[$1],[GCJ],[cat > conftest.$ac_ext <<EOF
 7500+public class foo {
 7501+  private int a;
 7502+  public void bar (void) {
 7503+    a = 0;
 7504+  }
 7505+};
 7506+EOF
 7507+])
 7508+dnl Parse the compiler output and extract the necessary
 7509+dnl objects, libraries and library flags.
 7510+if AC_TRY_EVAL(ac_compile); then
 7511+  # Parse the compiler output and extract the necessary
 7512+  # objects, libraries and library flags.
 7513+
 7514+  # Sentinel used to keep track of whether or not we are before
 7515+  # the conftest object file.
 7516+  pre_test_object_deps_done=no
 7517+
 7518+  # The `*' in the case matches for architectures that use `case' in
 7519+  # $output_verbose_cmd can trigger glob expansion during the loop
 7520+  # eval without this substitution.
 7521+  output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
 7522+
 7523+  for p in `eval $output_verbose_link_cmd`; do
 7524+    case $p in
 7525+
 7526+    -L* | -R* | -l*)
 7527+       # Some compilers place space between "-{L,R}" and the path.
 7528+       # Remove the space.
 7529+       if test $p = "-L" \
 7530+	  || test $p = "-R"; then
 7531+	 prev=$p
 7532+	 continue
 7533+       else
 7534+	 prev=
 7535+       fi
 7536+
 7537+       if test "$pre_test_object_deps_done" = no; then
 7538+	 case $p in
 7539+	 -L* | -R*)
 7540+	   # Internal compiler library paths should come after those
 7541+	   # provided the user.  The postdeps already come after the
 7542+	   # user supplied libs so there is no need to process them.
 7543+	   if test -z "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
 7544+	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
 7545+	   else
 7546+	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${_LT_AC_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
 7547+	   fi
 7548+	   ;;
 7549+	 # The "-l" case would never come before the object being
 7550+	 # linked, so don't bother handling this case.
 7551+	 esac
 7552+       else
 7553+	 if test -z "$_LT_AC_TAGVAR(postdeps, $1)"; then
 7554+	   _LT_AC_TAGVAR(postdeps, $1)="${prev}${p}"
 7555+	 else
 7556+	   _LT_AC_TAGVAR(postdeps, $1)="${_LT_AC_TAGVAR(postdeps, $1)} ${prev}${p}"
 7557+	 fi
 7558+       fi
 7559+       ;;
 7560+
 7561+    *.$objext)
 7562+       # This assumes that the test object file only shows up
 7563+       # once in the compiler output.
 7564+       if test "$p" = "conftest.$objext"; then
 7565+	 pre_test_object_deps_done=yes
 7566+	 continue
 7567+       fi
 7568+
 7569+       if test "$pre_test_object_deps_done" = no; then
 7570+	 if test -z "$_LT_AC_TAGVAR(predep_objects, $1)"; then
 7571+	   _LT_AC_TAGVAR(predep_objects, $1)="$p"
 7572+	 else
 7573+	   _LT_AC_TAGVAR(predep_objects, $1)="$_LT_AC_TAGVAR(predep_objects, $1) $p"
 7574+	 fi
 7575+       else
 7576+	 if test -z "$_LT_AC_TAGVAR(postdep_objects, $1)"; then
 7577+	   _LT_AC_TAGVAR(postdep_objects, $1)="$p"
 7578+	 else
 7579+	   _LT_AC_TAGVAR(postdep_objects, $1)="$_LT_AC_TAGVAR(postdep_objects, $1) $p"
 7580+	 fi
 7581+       fi
 7582+       ;;
 7583+
 7584+    *) ;; # Ignore the rest.
 7585+
 7586+    esac
 7587+  done
 7588+
 7589+  # Clean up.
 7590+  rm -f a.out a.exe
 7591+else
 7592+  echo "libtool.m4: error: problem compiling $1 test program"
 7593+fi
 7594+
 7595+$rm -f confest.$objext
 7596+
 7597+# PORTME: override above test on systems where it is broken
 7598+ifelse([$1],[CXX],
 7599+[case $host_os in
 7600+interix3*)
 7601+  # Interix 3.5 installs completely hosed .la files for C++, so rather than
 7602+  # hack all around it, let's just trust "g++" to DTRT.
 7603+  _LT_AC_TAGVAR(predep_objects,$1)=
 7604+  _LT_AC_TAGVAR(postdep_objects,$1)=
 7605+  _LT_AC_TAGVAR(postdeps,$1)=
 7606+  ;;
 7607+
 7608+solaris*)
 7609+  case $cc_basename in
 7610+  CC*)
 7611+    # Adding this requires a known-good setup of shared libraries for
 7612+    # Sun compiler versions before 5.6, else PIC objects from an old
 7613+    # archive will be linked into the output, leading to subtle bugs.
 7614+    _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun'
 7615+    ;;
 7616+  esac
 7617+  ;;
 7618+esac
 7619+])
 7620+
 7621+case " $_LT_AC_TAGVAR(postdeps, $1) " in
 7622+*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
 7623+esac
 7624+])# AC_LIBTOOL_POSTDEP_PREDEP
 7625+
 7626+# AC_LIBTOOL_LANG_F77_CONFIG
 7627+# --------------------------
 7628+# Ensure that the configuration vars for the C compiler are
 7629+# suitably defined.  Those variables are subsequently used by
 7630+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
 7631+AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)])
 7632+AC_DEFUN([_LT_AC_LANG_F77_CONFIG],
 7633+[AC_REQUIRE([AC_PROG_F77])
 7634+AC_LANG_PUSH(Fortran 77)
 7635+
 7636+_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
 7637+_LT_AC_TAGVAR(allow_undefined_flag, $1)=
 7638+_LT_AC_TAGVAR(always_export_symbols, $1)=no
 7639+_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
 7640+_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
 7641+_LT_AC_TAGVAR(hardcode_direct, $1)=no
 7642+_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
 7643+_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 7644+_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
 7645+_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
 7646+_LT_AC_TAGVAR(hardcode_automatic, $1)=no
 7647+_LT_AC_TAGVAR(module_cmds, $1)=
 7648+_LT_AC_TAGVAR(module_expsym_cmds, $1)=
 7649+_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
 7650+_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
 7651+_LT_AC_TAGVAR(no_undefined_flag, $1)=
 7652+_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
 7653+_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
 7654+
 7655+# Source file extension for f77 test sources.
 7656+ac_ext=f
 7657+
 7658+# Object file extension for compiled f77 test sources.
 7659+objext=o
 7660+_LT_AC_TAGVAR(objext, $1)=$objext
 7661+
 7662+# Code to be used in simple compile tests
 7663+lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
 7664+
 7665+# Code to be used in simple link tests
 7666+lt_simple_link_test_code="      program t\n      end\n"
 7667+
 7668+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
 7669+_LT_AC_SYS_COMPILER
 7670+
 7671+# save warnings/boilerplate of simple test code
 7672+_LT_COMPILER_BOILERPLATE
 7673+_LT_LINKER_BOILERPLATE
 7674+
 7675+# Allow CC to be a program name with arguments.
 7676+lt_save_CC="$CC"
 7677+CC=${F77-"f77"}
 7678+compiler=$CC
 7679+_LT_AC_TAGVAR(compiler, $1)=$CC
 7680+_LT_CC_BASENAME([$compiler])
 7681+
 7682+AC_MSG_CHECKING([if libtool supports shared libraries])
 7683+AC_MSG_RESULT([$can_build_shared])
 7684+
 7685+AC_MSG_CHECKING([whether to build shared libraries])
 7686+test "$can_build_shared" = "no" && enable_shared=no
 7687+
 7688+# On AIX, shared libraries and static libraries use the same namespace, and
 7689+# are all built from PIC.
 7690+case $host_os in
 7691+aix3*)
 7692+  test "$enable_shared" = yes && enable_static=no
 7693+  if test -n "$RANLIB"; then
 7694+    archive_cmds="$archive_cmds~\$RANLIB \$lib"
 7695+    postinstall_cmds='$RANLIB $lib'
 7696+  fi
 7697+  ;;
 7698+aix4* | aix5*)
 7699+  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
 7700+    test "$enable_shared" = yes && enable_static=no
 7701+  fi
 7702+  ;;
 7703+esac
 7704+AC_MSG_RESULT([$enable_shared])
 7705+
 7706+AC_MSG_CHECKING([whether to build static libraries])
 7707+# Make sure either enable_shared or enable_static is yes.
 7708+test "$enable_shared" = yes || enable_static=yes
 7709+AC_MSG_RESULT([$enable_static])
 7710+
 7711+_LT_AC_TAGVAR(GCC, $1)="$G77"
 7712+_LT_AC_TAGVAR(LD, $1)="$LD"
 7713+
 7714+AC_LIBTOOL_PROG_COMPILER_PIC($1)
 7715+AC_LIBTOOL_PROG_CC_C_O($1)
 7716+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
 7717+AC_LIBTOOL_PROG_LD_SHLIBS($1)
 7718+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
 7719+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
 7720+
 7721+AC_LIBTOOL_CONFIG($1)
 7722+
 7723+AC_LANG_POP
 7724+CC="$lt_save_CC"
 7725+])# AC_LIBTOOL_LANG_F77_CONFIG
 7726+
 7727+
 7728+# AC_LIBTOOL_LANG_GCJ_CONFIG
 7729+# --------------------------
 7730+# Ensure that the configuration vars for the C compiler are
 7731+# suitably defined.  Those variables are subsequently used by
 7732+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
 7733+AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)])
 7734+AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG],
 7735+[AC_LANG_SAVE
 7736+
 7737+# Source file extension for Java test sources.
 7738+ac_ext=java
 7739+
 7740+# Object file extension for compiled Java test sources.
 7741+objext=o
 7742+_LT_AC_TAGVAR(objext, $1)=$objext
 7743+
 7744+# Code to be used in simple compile tests
 7745+lt_simple_compile_test_code="class foo {}\n"
 7746+
 7747+# Code to be used in simple link tests
 7748+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n'
 7749+
 7750+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
 7751+_LT_AC_SYS_COMPILER
 7752+
 7753+# save warnings/boilerplate of simple test code
 7754+_LT_COMPILER_BOILERPLATE
 7755+_LT_LINKER_BOILERPLATE
 7756+
 7757+# Allow CC to be a program name with arguments.
 7758+lt_save_CC="$CC"
 7759+CC=${GCJ-"gcj"}
 7760+compiler=$CC
 7761+_LT_AC_TAGVAR(compiler, $1)=$CC
 7762+_LT_CC_BASENAME([$compiler])
 7763+
 7764+# GCJ did not exist at the time GCC didn't implicitly link libc in.
 7765+_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
 7766+
 7767+_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
 7768+
 7769+AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
 7770+AC_LIBTOOL_PROG_COMPILER_PIC($1)
 7771+AC_LIBTOOL_PROG_CC_C_O($1)
 7772+AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
 7773+AC_LIBTOOL_PROG_LD_SHLIBS($1)
 7774+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
 7775+AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
 7776+
 7777+AC_LIBTOOL_CONFIG($1)
 7778+
 7779+AC_LANG_RESTORE
 7780+CC="$lt_save_CC"
 7781+])# AC_LIBTOOL_LANG_GCJ_CONFIG
 7782+
 7783+
 7784+# AC_LIBTOOL_LANG_RC_CONFIG
 7785+# -------------------------
 7786+# Ensure that the configuration vars for the Windows resource compiler are
 7787+# suitably defined.  Those variables are subsequently used by
 7788+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
 7789+AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)])
 7790+AC_DEFUN([_LT_AC_LANG_RC_CONFIG],
 7791+[AC_LANG_SAVE
 7792+
 7793+# Source file extension for RC test sources.
 7794+ac_ext=rc
 7795+
 7796+# Object file extension for compiled RC test sources.
 7797+objext=o
 7798+_LT_AC_TAGVAR(objext, $1)=$objext
 7799+
 7800+# Code to be used in simple compile tests
 7801+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
 7802+
 7803+# Code to be used in simple link tests
 7804+lt_simple_link_test_code="$lt_simple_compile_test_code"
 7805+
 7806+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
 7807+_LT_AC_SYS_COMPILER
 7808+
 7809+# save warnings/boilerplate of simple test code
 7810+_LT_COMPILER_BOILERPLATE
 7811+_LT_LINKER_BOILERPLATE
 7812+
 7813+# Allow CC to be a program name with arguments.
 7814+lt_save_CC="$CC"
 7815+CC=${RC-"windres"}
 7816+compiler=$CC
 7817+_LT_AC_TAGVAR(compiler, $1)=$CC
 7818+_LT_CC_BASENAME([$compiler])
 7819+_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
 7820+
 7821+AC_LIBTOOL_CONFIG($1)
 7822+
 7823+AC_LANG_RESTORE
 7824+CC="$lt_save_CC"
 7825+])# AC_LIBTOOL_LANG_RC_CONFIG
 7826+
 7827+
 7828+# AC_LIBTOOL_CONFIG([TAGNAME])
 7829+# ----------------------------
 7830+# If TAGNAME is not passed, then create an initial libtool script
 7831+# with a default configuration from the untagged config vars.  Otherwise
 7832+# add code to config.status for appending the configuration named by
 7833+# TAGNAME from the matching tagged config vars.
 7834+AC_DEFUN([AC_LIBTOOL_CONFIG],
 7835+[# The else clause should only fire when bootstrapping the
 7836+# libtool distribution, otherwise you forgot to ship ltmain.sh
 7837+# with your package, and you will get complaints that there are
 7838+# no rules to generate ltmain.sh.
 7839+if test -f "$ltmain"; then
 7840+  # See if we are running on zsh, and set the options which allow our commands through
 7841+  # without removal of \ escapes.
 7842+  if test -n "${ZSH_VERSION+set}" ; then
 7843+    setopt NO_GLOB_SUBST
 7844+  fi
 7845+  # Now quote all the things that may contain metacharacters while being
 7846+  # careful not to overquote the AC_SUBSTed values.  We take copies of the
 7847+  # variables and quote the copies for generation of the libtool script.
 7848+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
 7849+    SED SHELL STRIP \
 7850+    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
 7851+    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
 7852+    deplibs_check_method reload_flag reload_cmds need_locks \
 7853+    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
 7854+    lt_cv_sys_global_symbol_to_c_name_address \
 7855+    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
 7856+    old_postinstall_cmds old_postuninstall_cmds \
 7857+    _LT_AC_TAGVAR(compiler, $1) \
 7858+    _LT_AC_TAGVAR(CC, $1) \
 7859+    _LT_AC_TAGVAR(LD, $1) \
 7860+    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1) \
 7861+    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1) \
 7862+    _LT_AC_TAGVAR(lt_prog_compiler_static, $1) \
 7863+    _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) \
 7864+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1) \
 7865+    _LT_AC_TAGVAR(thread_safe_flag_spec, $1) \
 7866+    _LT_AC_TAGVAR(whole_archive_flag_spec, $1) \
 7867+    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) \
 7868+    _LT_AC_TAGVAR(old_archive_cmds, $1) \
 7869+    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) \
 7870+    _LT_AC_TAGVAR(predep_objects, $1) \
 7871+    _LT_AC_TAGVAR(postdep_objects, $1) \
 7872+    _LT_AC_TAGVAR(predeps, $1) \
 7873+    _LT_AC_TAGVAR(postdeps, $1) \
 7874+    _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
 7875+    _LT_AC_TAGVAR(archive_cmds, $1) \
 7876+    _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
 7877+    _LT_AC_TAGVAR(postinstall_cmds, $1) \
 7878+    _LT_AC_TAGVAR(postuninstall_cmds, $1) \
 7879+    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) \
 7880+    _LT_AC_TAGVAR(allow_undefined_flag, $1) \
 7881+    _LT_AC_TAGVAR(no_undefined_flag, $1) \
 7882+    _LT_AC_TAGVAR(export_symbols_cmds, $1) \
 7883+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) \
 7884+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) \
 7885+    _LT_AC_TAGVAR(hardcode_libdir_separator, $1) \
 7886+    _LT_AC_TAGVAR(hardcode_automatic, $1) \
 7887+    _LT_AC_TAGVAR(module_cmds, $1) \
 7888+    _LT_AC_TAGVAR(module_expsym_cmds, $1) \
 7889+    _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
 7890+    _LT_AC_TAGVAR(exclude_expsyms, $1) \
 7891+    _LT_AC_TAGVAR(include_expsyms, $1); do
 7892+
 7893+    case $var in
 7894+    _LT_AC_TAGVAR(old_archive_cmds, $1) | \
 7895+    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \
 7896+    _LT_AC_TAGVAR(archive_cmds, $1) | \
 7897+    _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
 7898+    _LT_AC_TAGVAR(module_cmds, $1) | \
 7899+    _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
 7900+    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
 7901+    _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
 7902+    extract_expsyms_cmds | reload_cmds | finish_cmds | \
 7903+    postinstall_cmds | postuninstall_cmds | \
 7904+    old_postinstall_cmds | old_postuninstall_cmds | \
 7905+    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
 7906+      # Double-quote double-evaled strings.
 7907+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
 7908+      ;;
 7909+    *)
 7910+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
 7911       ;;
 7912+    esac
 7913+  done
 7914 
 7915-    amigaos*)
 7916-      if test "$host_cpu" = m68k; then
 7917-        # FIXME: we need at least 68020 code to build shared libraries, but
 7918-        # adding the `-m68020' flag to GCC prevents building anything better,
 7919-        # like `-m68040'.
 7920-        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
 7921-      fi
 7922-      ;;
 7923+  case $lt_echo in
 7924+  *'\[$]0 --fallback-echo"')
 7925+    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'`
 7926+    ;;
 7927+  esac
 7928 
 7929-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
 7930-      # PIC is the default for these OSes.
 7931-      ;;
 7932+ifelse([$1], [],
 7933+  [cfgfile="${ofile}T"
 7934+  trap "$rm \"$cfgfile\"; exit 1" 1 2 15
 7935+  $rm -f "$cfgfile"
 7936+  AC_MSG_NOTICE([creating $ofile])],
 7937+  [cfgfile="$ofile"])
 7938+
 7939+  cat <<__EOF__ >> "$cfgfile"
 7940+ifelse([$1], [],
 7941+[#! $SHELL
 7942 
 7943-    mingw* | pw32* | os2*)
 7944-      # This hack is so that the source file can tell whether it is being
 7945-      # built for inclusion in a dll (and should export symbols for example).
 7946-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
 7947-      ;;
 7948+# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
 7949+# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
 7950+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
 7951+#
 7952+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
 7953+# Free Software Foundation, Inc.
 7954+#
 7955+# This file is part of GNU Libtool:
 7956+# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 7957+#
 7958+# This program is free software; you can redistribute it and/or modify
 7959+# it under the terms of the GNU General Public License as published by
 7960+# the Free Software Foundation; either version 2 of the License, or
 7961+# (at your option) any later version.
 7962+#
 7963+# This program is distributed in the hope that it will be useful, but
 7964+# WITHOUT ANY WARRANTY; without even the implied warranty of
 7965+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 7966+# General Public License for more details.
 7967+#
 7968+# You should have received a copy of the GNU General Public License
 7969+# along with this program; if not, write to the Free Software
 7970+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 7971+#
 7972+# As a special exception to the GNU General Public License, if you
 7973+# distribute this file as part of a program that contains a
 7974+# configuration script generated by Autoconf, you may include it under
 7975+# the same distribution terms that you use for the rest of that program.
 7976 
 7977-    darwin* | rhapsody*)
 7978-      # PIC is the default on this platform
 7979-      # Common symbols not allowed in MH_DYLIB files
 7980-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
 7981-      ;;
 7982+# A sed program that does not truncate output.
 7983+SED=$lt_SED
 7984 
 7985-    hpux*)
 7986-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
 7987-      # not for PA HP-UX.
 7988-      case $host_cpu in
 7989-      hppa*64*|ia64*)
 7990-	# +Z the default
 7991-	;;
 7992-      *)
 7993-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
 7994-	;;
 7995-      esac
 7996-      ;;
 7997+# Sed that helps us avoid accidentally triggering echo(1) options like -n.
 7998+Xsed="$SED -e 1s/^X//"
 7999 
 8000-    interix3*)
 8001-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
 8002-      # Instead, we relocate shared libraries at runtime.
 8003-      ;;
 8004+# The HP-UX ksh and POSIX shell print the target directory to stdout
 8005+# if CDPATH is set.
 8006+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 8007 
 8008-    msdosdjgpp*)
 8009-      # Just because we use GCC doesn't mean we suddenly get shared libraries
 8010-      # on systems that don't support them.
 8011-      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
 8012-      enable_shared=no
 8013-      ;;
 8014+# The names of the tagged configurations supported by this script.
 8015+available_tags=
 8016 
 8017-    *nto* | *qnx*)
 8018-      # QNX uses GNU C++, but need to define -shared option too, otherwise
 8019-      # it will coredump.
 8020-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
 8021-      ;;
 8022+# ### BEGIN LIBTOOL CONFIG],
 8023+[# ### BEGIN LIBTOOL TAG CONFIG: $tagname])
 8024 
 8025-    sysv4*MP*)
 8026-      if test -d /usr/nec; then
 8027-	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
 8028-      fi
 8029-      ;;
 8030+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
 8031 
 8032-    *)
 8033-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
 8034-      ;;
 8035-    esac
 8036-  else
 8037-    # PORTME Check for flag to pass linker flags through the system compiler.
 8038-    case $host_os in
 8039-    aix*)
 8040-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 8041-      if test "$host_cpu" = ia64; then
 8042-	# AIX 5 now supports IA64 processor
 8043-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 8044-      else
 8045-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
 8046-      fi
 8047-      ;;
 8048-    darwin*)
 8049-      # PIC is the default on this platform
 8050-      # Common symbols not allowed in MH_DYLIB files
 8051-      case $cc_basename in
 8052-      xlc*)
 8053-        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
 8054-        _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 8055-        ;;
 8056-      esac
 8057-      ;;
 8058+# Shell to use when invoking shell scripts.
 8059+SHELL=$lt_SHELL
 8060 
 8061-    mingw* | pw32* | os2*)
 8062-      # This hack is so that the source file can tell whether it is being
 8063-      # built for inclusion in a dll (and should export symbols for example).
 8064-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
 8065-      ;;
 8066+# Whether or not to build shared libraries.
 8067+build_libtool_libs=$enable_shared
 8068 
 8069-    hpux9* | hpux10* | hpux11*)
 8070-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 8071-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
 8072-      # not for PA HP-UX.
 8073-      case $host_cpu in
 8074-      hppa*64*|ia64*)
 8075-	# +Z the default
 8076-	;;
 8077-      *)
 8078-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
 8079-	;;
 8080-      esac
 8081-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
 8082-      _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
 8083-      ;;
 8084+# Whether or not to build static libraries.
 8085+build_old_libs=$enable_static
 8086 
 8087-    irix5* | irix6* | nonstopux*)
 8088-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 8089-      # PIC (with -KPIC) is the default.
 8090-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
 8091-      ;;
 8092+# Whether or not to add -lc for building shared libraries.
 8093+build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)
 8094 
 8095-    linux*)
 8096-      case $cc_basename in
 8097-      icc* | ecc*)
 8098-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 8099-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 8100-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
 8101-        ;;
 8102-      pgcc* | pgf77* | pgf90* | pgf95*)
 8103-        # Portland Group compilers (*not* the Pentium gcc compiler,
 8104-	# which looks to be a dead project)
 8105-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 8106-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
 8107-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 8108-        ;;
 8109-      ccc*)
 8110-        _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 8111-        # All Alpha code is PIC.
 8112-        _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
 8113-        ;;
 8114-      esac
 8115-      ;;
 8116+# Whether or not to disallow shared libs when runtime libs are static
 8117+allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)
 8118 
 8119-    newsos6)
 8120-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 8121-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 8122-      ;;
 8123+# Whether or not to optimize for fast installation.
 8124+fast_install=$enable_fast_install
 8125 
 8126-    *nto* | *qnx*)
 8127-      # QNX uses GNU C++, but need to define -shared option too, otherwise
 8128-      # it will coredump.
 8129-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
 8130-      ;;
 8131+# The host system.
 8132+host_alias=$host_alias
 8133+host=$host
 8134+host_os=$host_os
 8135 
 8136-    osf3* | osf4* | osf5*)
 8137-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 8138-      # All OSF/1 code is PIC.
 8139-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
 8140-      ;;
 8141+# The build system.
 8142+build_alias=$build_alias
 8143+build=$build
 8144+build_os=$build_os
 8145 
 8146-    solaris*)
 8147-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 8148-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 8149-      case $cc_basename in
 8150-      f77* | f90* | f95*)
 8151-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
 8152-      *)
 8153-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
 8154-      esac
 8155-      ;;
 8156+# An echo program that does not interpret backslashes.
 8157+echo=$lt_echo
 8158 
 8159-    sunos4*)
 8160-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
 8161-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
 8162-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 8163-      ;;
 8164+# The archiver.
 8165+AR=$lt_AR
 8166+AR_FLAGS=$lt_AR_FLAGS
 8167 
 8168-    sysv4 | sysv4.2uw2* | sysv4.3*)
 8169-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 8170-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 8171-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 8172-      ;;
 8173+# A C compiler.
 8174+LTCC=$lt_LTCC
 8175 
 8176-    sysv4*MP*)
 8177-      if test -d /usr/nec ;then
 8178-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
 8179-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 8180-      fi
 8181-      ;;
 8182+# LTCC compiler flags.
 8183+LTCFLAGS=$lt_LTCFLAGS
 8184 
 8185-    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
 8186-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 8187-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 8188-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 8189-      ;;
 8190+# A language-specific compiler.
 8191+CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
 8192 
 8193-    unicos*)
 8194-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 8195-      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
 8196-      ;;
 8197+# Is the compiler the GNU C compiler?
 8198+with_gcc=$_LT_AC_TAGVAR(GCC, $1)
 8199 
 8200-    uts4*)
 8201-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
 8202-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 8203-      ;;
 8204+# An ERE matcher.
 8205+EGREP=$lt_EGREP
 8206 
 8207-    *)
 8208-      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
 8209-      ;;
 8210-    esac
 8211-  fi
 8212-])
 8213-case $host_os in
 8214-  # For platforms which do not support PIC, -DPIC is meaningless:
 8215-  *djgpp*)
 8216-    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
 8217-    ;;
 8218-  *)
 8219-    _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
 8220-    ;;
 8221-esac
 8222-AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
 8223-_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
 8224-	[How to pass a linker flag through the compiler])
 8225+# The linker used to build libraries.
 8226+LD=$lt_[]_LT_AC_TAGVAR(LD, $1)
 8227 
 8228-#
 8229-# Check to make sure the PIC flag actually works.
 8230-#
 8231-if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
 8232-  _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works],
 8233-    [_LT_TAGVAR(lt_prog_compiler_pic_works, $1)],
 8234-    [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [],
 8235-    [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in
 8236-     "" | " "*) ;;
 8237-     *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;;
 8238-     esac],
 8239-    [_LT_TAGVAR(lt_prog_compiler_pic, $1)=
 8240-     _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
 8241-fi
 8242-_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
 8243-	[Additional compiler flags for building library objects])
 8244+# Whether we need hard or soft links.
 8245+LN_S=$lt_LN_S
 8246 
 8247-#
 8248-# Check to make sure the static flag actually works.
 8249-#
 8250-wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\"
 8251-_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
 8252-  _LT_TAGVAR(lt_prog_compiler_static_works, $1),
 8253-  $lt_tmp_static_flag,
 8254-  [],
 8255-  [_LT_TAGVAR(lt_prog_compiler_static, $1)=])
 8256-_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
 8257-	[Compiler flag to prevent dynamic linking])
 8258-])# _LT_COMPILER_PIC
 8259+# A BSD-compatible nm program.
 8260+NM=$lt_NM
 8261 
 8262+# A symbol stripping program
 8263+STRIP=$lt_STRIP
 8264 
 8265-# _LT_LINKER_SHLIBS([TAGNAME])
 8266-# ----------------------------
 8267-# See if the linker supports building shared libraries.
 8268-m4_defun([_LT_LINKER_SHLIBS],
 8269-[AC_REQUIRE([LT_PATH_LD])dnl
 8270-AC_REQUIRE([LT_PATH_NM])dnl
 8271-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
 8272-m4_require([_LT_DECL_EGREP])dnl
 8273-m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
 8274-m4_require([_LT_TAG_COMPILER])dnl
 8275-AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
 8276-m4_if([$1], [CXX], [
 8277-  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
 8278-  case $host_os in
 8279-  aix4* | aix5*)
 8280-    # If we're using GNU nm, then we don't want the "-C" option.
 8281-    # -C means demangle to AIX nm, but means don't demangle with GNU nm
 8282-    if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
 8283-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
 8284-    else
 8285-      _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'
 8286-    fi
 8287-    ;;
 8288-  pw32*)
 8289-    _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
 8290-  ;;
 8291-  cygwin* | mingw*)
 8292-    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
 8293-  ;;
 8294-  kfreebsd*-gnu)
 8295-    _LT_TAGVAR(link_all_deplibs, $1)=no
 8296-  ;;
 8297-  linux*)
 8298-    _LT_TAGVAR(link_all_deplibs, $1)=no
 8299-  ;;
 8300-  *)
 8301-    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
 8302-  ;;
 8303-  esac
 8304-], [
 8305-  runpath_var=
 8306-  _LT_TAGVAR(allow_undefined_flag, $1)=
 8307-  _LT_TAGVAR(always_export_symbols, $1)=no
 8308-  _LT_TAGVAR(archive_cmds, $1)=
 8309-  _LT_TAGVAR(archive_expsym_cmds, $1)=
 8310-  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
 8311-  _LT_TAGVAR(export_dynamic_flag_spec, $1)=
 8312-  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
 8313-  _LT_TAGVAR(hardcode_automatic, $1)=no
 8314-  _LT_TAGVAR(hardcode_direct, $1)=no
 8315-  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
 8316-  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 8317-  _LT_TAGVAR(hardcode_libdir_separator, $1)=
 8318-  _LT_TAGVAR(hardcode_minus_L, $1)=no
 8319-  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
 8320-  _LT_TAGVAR(inherit_rpath, $1)=no
 8321-  _LT_TAGVAR(link_all_deplibs, $1)=unknown
 8322-  _LT_TAGVAR(module_cmds, $1)=
 8323-  _LT_TAGVAR(module_expsym_cmds, $1)=
 8324-  _LT_TAGVAR(old_archive_from_new_cmds, $1)=
 8325-  _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)=
 8326-  _LT_TAGVAR(thread_safe_flag_spec, $1)=
 8327-  _LT_TAGVAR(whole_archive_flag_spec, $1)=
 8328-  # include_expsyms should be a list of space-separated symbols to be *always*
 8329-  # included in the symbol list
 8330-  _LT_TAGVAR(include_expsyms, $1)=
 8331-  # exclude_expsyms can be an extended regexp of symbols to exclude
 8332-  # it will be wrapped by ` (' and `)$', so one must not match beginning or
 8333-  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
 8334-  # as well as any symbol that contains `d'.
 8335-  _LT_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_"
 8336-  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
 8337-  # platforms (ab)use it in PIC code, but their linkers get confused if
 8338-  # the symbol is explicitly referenced.  Since portable code cannot
 8339-  # rely on this symbol name, it's probably fine to never include it in
 8340-  # preloaded symbol tables.
 8341-  extract_expsyms_cmds=
 8342+# Used to examine libraries when file_magic_cmd begins "file"
 8343+MAGIC_CMD=$MAGIC_CMD
 8344 
 8345-  case $host_os in
 8346-  cygwin* | mingw* | pw32*)
 8347-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
 8348-    # When not using gcc, we currently assume that we are using
 8349-    # Microsoft Visual C++.
 8350-    if test "$GCC" != yes; then
 8351-      with_gnu_ld=no
 8352-    fi
 8353-    ;;
 8354-  interix*)
 8355-    # we just hope/assume this is gcc and not c89 (= MSVC++)
 8356-    with_gnu_ld=yes
 8357-    ;;
 8358-  openbsd*)
 8359-    with_gnu_ld=no
 8360-    ;;
 8361-  esac
 8362+# Used on cygwin: DLL creation program.
 8363+DLLTOOL="$DLLTOOL"
 8364 
 8365-  _LT_TAGVAR(ld_shlibs, $1)=yes
 8366-  if test "$with_gnu_ld" = yes; then
 8367-    # If archive_cmds runs LD, not CC, wlarc should be empty
 8368-    wlarc='${wl}'
 8369+# Used on cygwin: object dumper.
 8370+OBJDUMP="$OBJDUMP"
 8371 
 8372-    # Set some defaults for GNU ld with shared library support. These
 8373-    # are reset later if shared libraries are not supported. Putting them
 8374-    # here allows them to be overridden if necessary.
 8375-    runpath_var=LD_RUN_PATH
 8376-    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
 8377-    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
 8378-    # ancient GNU ld didn't support --whole-archive et. al.
 8379-    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
 8380-      _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
 8381-    else
 8382-      _LT_TAGVAR(whole_archive_flag_spec, $1)=
 8383-    fi
 8384-    supports_anon_versioning=no
 8385-    case `$LD -v 2>&1` in
 8386-      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
 8387-      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
 8388-      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
 8389-      *\ 2.11.*) ;; # other 2.11 versions
 8390-      *) supports_anon_versioning=yes ;;
 8391-    esac
 8392+# Used on cygwin: assembler.
 8393+AS="$AS"
 8394 
 8395-    # See if GNU ld supports shared libraries.
 8396-    case $host_os in
 8397-    aix3* | aix4* | aix5*)
 8398-      # On AIX/PPC, the GNU linker is very broken
 8399-      if test "$host_cpu" != ia64; then
 8400-	_LT_TAGVAR(ld_shlibs, $1)=no
 8401-	cat <<_LT_EOF 1>&2
 8402+# The name of the directory that contains temporary libtool files.
 8403+objdir=$objdir
 8404+
 8405+# How to create reloadable object files.
 8406+reload_flag=$lt_reload_flag
 8407+reload_cmds=$lt_reload_cmds
 8408+
 8409+# How to pass a linker flag through the compiler.
 8410+wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
 8411+
 8412+# Object file suffix (normally "o").
 8413+objext="$ac_objext"
 8414+
 8415+# Old archive suffix (normally "a").
 8416+libext="$libext"
 8417+
 8418+# Shared library suffix (normally ".so").
 8419+shrext_cmds='$shrext_cmds'
 8420+
 8421+# Executable file suffix (normally "").
 8422+exeext="$exeext"
 8423+
 8424+# Additional compiler flags for building library objects.
 8425+pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
 8426+pic_mode=$pic_mode
 8427+
 8428+# What is the maximum length of a command?
 8429+max_cmd_len=$lt_cv_sys_max_cmd_len
 8430+
 8431+# Does compiler simultaneously support -c and -o options?
 8432+compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
 8433+
 8434+# Must we lock files when doing compilation?
 8435+need_locks=$lt_need_locks
 8436 
 8437-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
 8438-*** to be unable to reliably create shared libraries on AIX.
 8439-*** Therefore, libtool is disabling shared libraries support.  If you
 8440-*** really care for shared libraries, you may want to modify your PATH
 8441-*** so that a non-GNU linker is found, and then restart.
 8442+# Do we need the lib prefix for modules?
 8443+need_lib_prefix=$need_lib_prefix
 8444 
 8445-_LT_EOF
 8446-      fi
 8447-      ;;
 8448+# Do we need a version for libraries?
 8449+need_version=$need_version
 8450 
 8451-    amigaos*)
 8452-      if test "$host_cpu" = m68k; then
 8453-        _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)'
 8454-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
 8455-        _LT_TAGVAR(hardcode_minus_L, $1)=yes
 8456-      fi
 8457+# Whether dlopen is supported.
 8458+dlopen_support=$enable_dlopen
 8459 
 8460-      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
 8461-      # that the semantics of dynamic libraries on AmigaOS, at least up
 8462-      # to version 4, is to share data among multiple programs linked
 8463-      # with the same dynamic library.  Since this doesn't match the
 8464-      # behavior of shared libraries on other platforms, we can't use
 8465-      # them.
 8466-      _LT_TAGVAR(ld_shlibs, $1)=no
 8467-      ;;
 8468+# Whether dlopen of programs is supported.
 8469+dlopen_self=$enable_dlopen_self
 8470 
 8471-    beos*)
 8472-      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
 8473-	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
 8474-	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
 8475-	# support --undefined.  This deserves some investigation.  FIXME
 8476-	_LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 8477-      else
 8478-	_LT_TAGVAR(ld_shlibs, $1)=no
 8479-      fi
 8480-      ;;
 8481+# Whether dlopen of statically linked programs is supported.
 8482+dlopen_self_static=$enable_dlopen_self_static
 8483 
 8484-    cygwin* | mingw* | pw32*)
 8485-      # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
 8486-      # as there is no search path for DLLs.
 8487-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
 8488-      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
 8489-      _LT_TAGVAR(always_export_symbols, $1)=no
 8490-      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
 8491-      _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'
 8492+# Compiler flag to prevent dynamic linking.
 8493+link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1)
 8494 
 8495-      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
 8496-        _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'
 8497-	# If the export-symbols file already is a .def file (1st line
 8498-	# is EXPORTS), use it as is; otherwise, prepend...
 8499-	_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
 8500-	  cp $export_symbols $output_objdir/$soname.def;
 8501-	else
 8502-	  echo EXPORTS > $output_objdir/$soname.def;
 8503-	  cat $export_symbols >> $output_objdir/$soname.def;
 8504-	fi~
 8505-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
 8506-      else
 8507-	_LT_TAGVAR(ld_shlibs, $1)=no
 8508-      fi
 8509-      ;;
 8510+# Compiler flag to turn off builtin functions.
 8511+no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)
 8512 
 8513-    interix3*)
 8514-      _LT_TAGVAR(hardcode_direct, $1)=no
 8515-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
 8516-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
 8517-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
 8518-      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
 8519-      # Instead, shared libraries are loaded at an image base (0x10000000 by
 8520-      # default) and relocated if they conflict, which is a slow very memory
 8521-      # consuming and fragmenting process.  To avoid this, we pick a random,
 8522-      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
 8523-      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
 8524-      _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'
 8525-      _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'
 8526-      ;;
 8527+# Compiler flag to allow reflexive dlopens.
 8528+export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)
 8529 
 8530-    linux*|tpf*)
 8531-      tmp_diet=no
 8532-      if test "$host_os" = linux-dietlibc; then
 8533-	case $cc_basename in
 8534-	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
 8535-	esac
 8536-      fi
 8537-      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
 8538-	 && test "$tmp_diet" = no
 8539-      then
 8540-	tmp_addflag=
 8541-	case $cc_basename,$host_cpu in
 8542-        pgcc*)				# Portland Group C compiler
 8543-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
 8544-	  tmp_addflag=' $pic_flag'
 8545-	  ;;
 8546-	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
 8547-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
 8548-	  tmp_addflag=' $pic_flag -Mnomain' ;;
 8549-	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
 8550-	  tmp_addflag=' -i_dynamic' ;;
 8551-	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
 8552-	  tmp_addflag=' -i_dynamic -nofor_main' ;;
 8553-	ifc* | ifort*)			# Intel Fortran compiler
 8554-	  tmp_addflag=' -nofor_main' ;;
 8555-	esac
 8556+# Compiler flag to generate shared objects directly from archives.
 8557+whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1)
 8558 
 8559-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 8560+# Compiler flag to generate thread-safe objects.
 8561+thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1)
 8562 
 8563-        if test "x$supports_anon_versioning" = xyes; then
 8564-          _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 -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
 8565-        fi
 8566-	_LT_TAGVAR(link_all_deplibs, $1)=no
 8567-      else
 8568-        _LT_TAGVAR(ld_shlibs, $1)=no
 8569-      fi
 8570-      ;;
 8571+# Library versioning type.
 8572+version_type=$version_type
 8573 
 8574-    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
 8575-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 8576-	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 8577-	wlarc=
 8578-      else
 8579-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 8580-	_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'
 8581-      fi
 8582-      ;;
 8583+# Format of library name prefix.
 8584+libname_spec=$lt_libname_spec
 8585 
 8586-    solaris*)
 8587-      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
 8588-	_LT_TAGVAR(ld_shlibs, $1)=no
 8589-	cat <<_LT_EOF 1>&2
 8590+# List of archive names.  First name is the real one, the rest are links.
 8591+# The last name is the one that the linker finds with -lNAME.
 8592+library_names_spec=$lt_library_names_spec
 8593 
 8594-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
 8595-*** create shared libraries on Solaris systems.  Therefore, libtool
 8596-*** is disabling shared libraries support.  We urge you to upgrade GNU
 8597-*** binutils to release 2.9.1 or newer.  Another option is to modify
 8598-*** your PATH or compiler configuration so that the native linker is
 8599-*** used, and then restart.
 8600+# The coded name of the library, if different from the real name.
 8601+soname_spec=$lt_soname_spec
 8602 
 8603-_LT_EOF
 8604-      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
 8605-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 8606-	_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'
 8607-      else
 8608-	_LT_TAGVAR(ld_shlibs, $1)=no
 8609-      fi
 8610-      ;;
 8611+# Commands used to build and install an old-style archive.
 8612+RANLIB=$lt_RANLIB
 8613+old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1)
 8614+old_postinstall_cmds=$lt_old_postinstall_cmds
 8615+old_postuninstall_cmds=$lt_old_postuninstall_cmds
 8616 
 8617-    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
 8618-      case `$LD -v 2>&1` in
 8619-        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) 
 8620-	_LT_TAGVAR(ld_shlibs, $1)=no
 8621-	cat <<_LT_EOF 1>&2
 8622+# Create an old-style archive from a shared archive.
 8623+old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1)
 8624 
 8625-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
 8626-*** reliably create shared libraries on SCO systems.  Therefore, libtool
 8627-*** is disabling shared libraries support.  We urge you to upgrade GNU
 8628-*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
 8629-*** your PATH or compiler configuration so that the native linker is
 8630-*** used, and then restart.
 8631+# Create a temporary old-style archive to link instead of a shared archive.
 8632+old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)
 8633 
 8634-_LT_EOF
 8635-	;;
 8636-	*)
 8637-	  # For security reasons, it is highly recommended that you always
 8638-	  # use absolute paths for naming shared libraries, and exclude the
 8639-	  # DT_RUNPATH tag from executables and libraries.  But doing so
 8640-	  # requires that you compile everything twice, which is a pain.
 8641-	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
 8642-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
 8643-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 8644-	    _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'
 8645-	  else
 8646-	    _LT_TAGVAR(ld_shlibs, $1)=no
 8647-	  fi
 8648-	;;
 8649-      esac
 8650-      ;;
 8651+# Commands used to build and install a shared archive.
 8652+archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1)
 8653+archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1)
 8654+postinstall_cmds=$lt_postinstall_cmds
 8655+postuninstall_cmds=$lt_postuninstall_cmds
 8656 
 8657-    sunos4*)
 8658-      _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
 8659-      wlarc=
 8660-      _LT_TAGVAR(hardcode_direct, $1)=yes
 8661-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
 8662-      ;;
 8663+# Commands used to build a loadable module (assumed same as above if empty)
 8664+module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1)
 8665+module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1)
 8666 
 8667-    *)
 8668-      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
 8669-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 8670-	_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'
 8671-      else
 8672-	_LT_TAGVAR(ld_shlibs, $1)=no
 8673-      fi
 8674-      ;;
 8675-    esac
 8676+# Commands to strip libraries.
 8677+old_striplib=$lt_old_striplib
 8678+striplib=$lt_striplib
 8679 
 8680-    if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then
 8681-      runpath_var=
 8682-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
 8683-      _LT_TAGVAR(export_dynamic_flag_spec, $1)=
 8684-      _LT_TAGVAR(whole_archive_flag_spec, $1)=
 8685-    fi
 8686-  else
 8687-    # PORTME fill in a description of your system's linker (not GNU ld)
 8688-    case $host_os in
 8689-    aix3*)
 8690-      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
 8691-      _LT_TAGVAR(always_export_symbols, $1)=yes
 8692-      _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'
 8693-      # Note: this linker hardcodes the directories in LIBPATH if there
 8694-      # are no directories specified by -L.
 8695-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
 8696-      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
 8697-	# Neither direct hardcoding nor static linking is supported with a
 8698-	# broken collect2.
 8699-	_LT_TAGVAR(hardcode_direct, $1)=unsupported
 8700-      fi
 8701-      ;;
 8702+# Dependencies to place before the objects being linked to create a
 8703+# shared library.
 8704+predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
 8705 
 8706-    aix4* | aix5*)
 8707-      if test "$host_cpu" = ia64; then
 8708-	# On IA64, the linker does run time linking by default, so we don't
 8709-	# have to do anything special.
 8710-	aix_use_runtimelinking=no
 8711-	exp_sym_flag='-Bexport'
 8712-	no_entry_flag=""
 8713-      else
 8714-	# If we're using GNU nm, then we don't want the "-C" option.
 8715-	# -C means demangle to AIX nm, but means don't demangle with GNU nm
 8716-	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
 8717-	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
 8718-	else
 8719-	  _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'
 8720-	fi
 8721-	aix_use_runtimelinking=no
 8722+# Dependencies to place after the objects being linked to create a
 8723+# shared library.
 8724+postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
 8725 
 8726-	# Test if we are trying to use run time linking or normal
 8727-	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
 8728-	# need to do runtime linking.
 8729-	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
 8730-	  for ld_flag in $LDFLAGS; do
 8731-  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
 8732-  	    aix_use_runtimelinking=yes
 8733-  	    break
 8734-  	  fi
 8735-	  done
 8736-	  ;;
 8737-	esac
 8738+# Dependencies to place before the objects being linked to create a
 8739+# shared library.
 8740+predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
 8741 
 8742-	exp_sym_flag='-bexport'
 8743-	no_entry_flag='-bnoentry'
 8744-      fi
 8745+# Dependencies to place after the objects being linked to create a
 8746+# shared library.
 8747+postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
 8748 
 8749-      # When large executables or shared objects are built, AIX ld can
 8750-      # have problems creating the table of contents.  If linking a library
 8751-      # or program results in "error TOC overflow" add -mminimal-toc to
 8752-      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
 8753-      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
 8754+# The library search path used internally by the compiler when linking
 8755+# a shared library.
 8756+compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
 8757 
 8758-      _LT_TAGVAR(archive_cmds, $1)=''
 8759-      _LT_TAGVAR(hardcode_direct, $1)=yes
 8760-      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
 8761-      _LT_TAGVAR(link_all_deplibs, $1)=yes
 8762-      _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
 8763+# Method to check whether dependent libraries are shared objects.
 8764+deplibs_check_method=$lt_deplibs_check_method
 8765 
 8766-      if test "$GCC" = yes; then
 8767-	case $host_os in aix4.[[012]]|aix4.[[012]].*)
 8768-	# We only want to do this on AIX 4.2 and lower, the check
 8769-	# below for broken collect2 doesn't work under 4.3+
 8770-	  collect2name=`${CC} -print-prog-name=collect2`
 8771-	  if test -f "$collect2name" &&
 8772-  	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
 8773-	  then
 8774-  	  # We have reworked collect2
 8775-  	  _LT_TAGVAR(hardcode_direct, $1)=yes
 8776-	  else
 8777-  	  # We have old collect2
 8778-  	  _LT_TAGVAR(hardcode_direct, $1)=unsupported
 8779-  	  # It fails to find uninstalled libraries when the uninstalled
 8780-  	  # path is not listed in the libpath.  Setting hardcode_minus_L
 8781-  	  # to unsupported forces relinking
 8782-  	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
 8783-  	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
 8784-  	  _LT_TAGVAR(hardcode_libdir_separator, $1)=
 8785-	  fi
 8786-	  ;;
 8787-	esac
 8788-	shared_flag='-shared'
 8789-	if test "$aix_use_runtimelinking" = yes; then
 8790-	  shared_flag="$shared_flag "'${wl}-G'
 8791-	fi
 8792-      else
 8793-	# not using gcc
 8794-	if test "$host_cpu" = ia64; then
 8795-  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
 8796-  	# chokes on -Wl,-G. The following line is correct:
 8797-	  shared_flag='-G'
 8798-	else
 8799-	  if test "$aix_use_runtimelinking" = yes; then
 8800-	    shared_flag='${wl}-G'
 8801-	  else
 8802-	    shared_flag='${wl}-bM:SRE'
 8803-	  fi
 8804-	fi
 8805-      fi
 8806+# Command to use when deplibs_check_method == file_magic.
 8807+file_magic_cmd=$lt_file_magic_cmd
 8808 
 8809-      # It seems that -bexpall does not export symbols beginning with
 8810-      # underscore (_), so it is better to generate a list of symbols to export.
 8811-      _LT_TAGVAR(always_export_symbols, $1)=yes
 8812-      if test "$aix_use_runtimelinking" = yes; then
 8813-	# Warning - without using the other runtime loading flags (-brtl),
 8814-	# -berok will link without error, but may produce a broken library.
 8815-	_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
 8816-        # Determine the default libpath from the value encoded in an
 8817-        # empty executable.
 8818-        _LT_SYS_MODULE_PATH_AIX
 8819-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
 8820-        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
 8821-      else
 8822-	if test "$host_cpu" = ia64; then
 8823-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
 8824-	  _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
 8825-	  _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"
 8826-	else
 8827-	 # Determine the default libpath from the value encoded in an
 8828-	 # empty executable.
 8829-	 _LT_SYS_MODULE_PATH_AIX
 8830-	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
 8831-	  # Warning - without using the other run time loading flags,
 8832-	  # -berok will link without error, but may produce a broken library.
 8833-	  _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
 8834-	  _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
 8835-	  # Exported symbols can be pulled into shared objects from archives
 8836-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
 8837-	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
 8838-	  # This is similar to how AIX traditionally builds its shared libraries.
 8839-	  _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'
 8840-	fi
 8841-      fi
 8842-      ;;
 8843+# Flag that allows shared libraries with undefined symbols to be built.
 8844+allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1)
 8845 
 8846-    amigaos*)
 8847-      if test "$host_cpu" = m68k; then
 8848-        _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)'
 8849-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
 8850-        _LT_TAGVAR(hardcode_minus_L, $1)=yes
 8851-      fi
 8852-      # see comment about different semantics on the GNU ld section
 8853-      _LT_TAGVAR(ld_shlibs, $1)=no
 8854-      ;;
 8855+# Flag that forces no undefined symbols.
 8856+no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1)
 8857 
 8858-    bsdi[[45]]*)
 8859-      _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
 8860-      ;;
 8861+# Commands used to finish a libtool library installation in a directory.
 8862+finish_cmds=$lt_finish_cmds
 8863 
 8864-    cygwin* | mingw* | pw32*)
 8865-      # When not using gcc, we currently assume that we are using
 8866-      # Microsoft Visual C++.
 8867-      # hardcode_libdir_flag_spec is actually meaningless, as there is
 8868-      # no search path for DLLs.
 8869-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
 8870-      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
 8871-      # Tell ltmain to make .lib files, not .a files.
 8872-      libext=lib
 8873-      # Tell ltmain to make .dll files, not .so files.
 8874-      shrext_cmds=".dll"
 8875-      # FIXME: Setting linknames here is a bad hack.
 8876-      _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
 8877-      # The linker will automatically build a .lib file if we build a DLL.
 8878-      _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
 8879-      # FIXME: Should let the user specify the lib program.
 8880-      _LT_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
 8881-      _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
 8882-      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
 8883-      ;;
 8884+# Same as above, but a single script fragment to be evaled but not shown.
 8885+finish_eval=$lt_finish_eval
 8886 
 8887-    darwin* | rhapsody*)
 8888-      case $host_os in
 8889-      rhapsody* | darwin1.[[012]])
 8890-	_LT_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
 8891-	;;
 8892-      *) # Darwin 1.3 on
 8893-	case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
 8894-	10.[[012]])
 8895-	  _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
 8896-	  ;;
 8897-	10.*)
 8898-	  _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
 8899-	  ;;
 8900-	esac
 8901-	;;
 8902-      esac
 8903-      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
 8904-      _LT_TAGVAR(hardcode_direct, $1)=no
 8905-      _LT_TAGVAR(hardcode_automatic, $1)=yes
 8906-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
 8907-      _LT_TAGVAR(whole_archive_flag_spec, $1)=''
 8908-      _LT_TAGVAR(link_all_deplibs, $1)=yes
 8909-      if test "$GCC" = yes ; then
 8910-	AC_CACHE_VAL([lt_cv_apple_cc_single_mod],
 8911-	[lt_cv_apple_cc_single_mod=no
 8912-	if test -z "${LT_MULTI_MODULE}"; then
 8913-	  # By default we will add the -single_module flag. You can override
 8914-	  # by either setting the environment variable LT_MULTI_MODULE
 8915-	  # non-empty at configure time, or by adding -multi-module to the
 8916-	  # link flags.
 8917-	  echo "int foo(void){return 1;}" > conftest.c
 8918-	  $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
 8919-	      -dynamiclib ${wl}-single_module conftest.c
 8920-	  if test -f libconftest.dylib; then
 8921-	      lt_cv_apple_cc_single_mod=yes
 8922-	      rm libconftest.dylib
 8923-	  fi
 8924-	  rm conftest.$ac_ext
 8925-	fi])
 8926-	output_verbose_link_cmd=echo
 8927-	if test "X$lt_cv_apple_cc_single_mod" = Xyes ; then
 8928-	  _LT_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
 8929-	  _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $single_module -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
 8930-	else
 8931-	  _LT_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
 8932-	  _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~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
 8933-	fi
 8934-	_LT_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
 8935-	_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~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
 8936-      else
 8937-	case $cc_basename in
 8938-	xlc*)
 8939-	  output_verbose_link_cmd=echo
 8940-	  _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`$ECHO $rpath/$soname` $verstring'
 8941-	  _LT_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
 8942-	  # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
 8943-	  _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
 8944-	  _LT_TAGVAR(module_expsym_cmds, $1)='sed "s,^,_," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
 8945-	  ;;
 8946-	*)
 8947-	  _LT_TAGVAR(ld_shlibs, $1)=no
 8948-	  ;;
 8949-	esac
 8950-      fi
 8951-      ;;
 8952+# Take the output of nm and produce a listing of raw symbols and C names.
 8953+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
 8954 
 8955-    dgux*)
 8956-      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
 8957-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
 8958-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
 8959-      ;;
 8960+# Transform the output of nm in a proper C declaration
 8961+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
 8962 
 8963-    freebsd1*)
 8964-      _LT_TAGVAR(ld_shlibs, $1)=no
 8965-      ;;
 8966+# Transform the output of nm in a C name address pair
 8967+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
 8968 
 8969-    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
 8970-    # support.  Future versions do this automatically, but an explicit c++rt0.o
 8971-    # does not break anything, and helps significantly (at the cost of a little
 8972-    # extra space).
 8973-    freebsd2.2*)
 8974-      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
 8975-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
 8976-      _LT_TAGVAR(hardcode_direct, $1)=yes
 8977-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
 8978-      ;;
 8979+# This is the shared library runtime path variable.
 8980+runpath_var=$runpath_var
 8981 
 8982-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
 8983-    freebsd2*)
 8984-      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
 8985-      _LT_TAGVAR(hardcode_direct, $1)=yes
 8986-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
 8987-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
 8988-      ;;
 8989+# This is the shared library path variable.
 8990+shlibpath_var=$shlibpath_var
 8991 
 8992-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
 8993-    freebsd* | dragonfly*)
 8994-      _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
 8995-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
 8996-      _LT_TAGVAR(hardcode_direct, $1)=yes
 8997-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
 8998-      ;;
 8999+# Is shlibpath searched before the hard-coded library search path?
 9000+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
 9001+
 9002+# How to hardcode a shared library path into an executable.
 9003+hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1)
 9004+
 9005+# Whether we should hardcode library paths into libraries.
 9006+hardcode_into_libs=$hardcode_into_libs
 9007+
 9008+# Flag to hardcode \$libdir into a binary during linking.
 9009+# This must work even if \$libdir does not exist.
 9010+hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)
 9011+
 9012+# If ld is used when linking, flag to hardcode \$libdir into
 9013+# a binary during linking. This must work even if \$libdir does
 9014+# not exist.
 9015+hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)
 9016 
 9017-    # GNU/kFreeBSD uses gcc -shared to do shared libraries.
 9018-    kfreebsd*-gnu)
 9019-      _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
 9020-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
 9021-      _LT_TAGVAR(hardcode_direct, $1)=yes
 9022-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
 9023-      _LT_TAGVAR(link_all_deplibs, $1)=no
 9024-      ;;
 9025+# Whether we need a single -rpath flag with a separated argument.
 9026+hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1)
 9027 
 9028-    hpux9*)
 9029-      if test "$GCC" = yes; then
 9030-	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
 9031-      else
 9032-	_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'
 9033-      fi
 9034-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
 9035-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
 9036-      _LT_TAGVAR(hardcode_direct, $1)=yes
 9037+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
 9038+# resulting binary.
 9039+hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1)
 9040 
 9041-      # hardcode_minus_L: Not really in the search PATH,
 9042-      # but as the default location of the library.
 9043-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
 9044-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
 9045-      ;;
 9046+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
 9047+# resulting binary.
 9048+hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1)
 9049 
 9050-    hpux10*)
 9051-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
 9052-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 9053-      else
 9054-	_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
 9055-      fi
 9056-      if test "$with_gnu_ld" = no; then
 9057-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
 9058-	_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
 9059-	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
 9060-	_LT_TAGVAR(hardcode_direct, $1)=yes
 9061-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
 9062-	# hardcode_minus_L: Not really in the search PATH,
 9063-	# but as the default location of the library.
 9064-	_LT_TAGVAR(hardcode_minus_L, $1)=yes
 9065-      fi
 9066-      ;;
 9067+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
 9068+# the resulting binary.
 9069+hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)
 9070 
 9071-    hpux11*)
 9072-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
 9073-	case $host_cpu in
 9074-	hppa*64*)
 9075-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 9076-	  ;;
 9077-	ia64*)
 9078-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 9079-	  ;;
 9080-	*)
 9081-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 9082-	  ;;
 9083-	esac
 9084-      else
 9085-	case $host_cpu in
 9086-	hppa*64*)
 9087-	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 9088-	  ;;
 9089-	ia64*)
 9090-	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 9091-	  ;;
 9092-	*)
 9093-	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 9094-	  ;;
 9095-	esac
 9096-      fi
 9097-      if test "$with_gnu_ld" = no; then
 9098-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
 9099-	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
 9100+# Set to yes if building a shared library automatically hardcodes DIR into the library
 9101+# and all subsequent libraries and executables linked against it.
 9102+hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1)
 9103 
 9104-	case $host_cpu in
 9105-	hppa*64*|ia64*)
 9106-	  _LT_TAGVAR(hardcode_direct, $1)=no
 9107-	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
 9108-	  ;;
 9109-	*)
 9110-	  _LT_TAGVAR(hardcode_direct, $1)=yes
 9111-	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
 9112+# Variables whose values should be saved in libtool wrapper scripts and
 9113+# restored at relink time.
 9114+variables_saved_for_relink="$variables_saved_for_relink"
 9115 
 9116-	  # hardcode_minus_L: Not really in the search PATH,
 9117-	  # but as the default location of the library.
 9118-	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
 9119-	  ;;
 9120-	esac
 9121-      fi
 9122-      ;;
 9123+# Whether libtool must link a program against all its dependency libraries.
 9124+link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
 9125 
 9126-    irix5* | irix6* | nonstopux*)
 9127-      if test "$GCC" = yes; then
 9128-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 9129-	# Try to use the -exported_symbol ld option, if it does not
 9130-	# work, assume that -exports_file does not work either and
 9131-	# implicitly export all symbols.
 9132-        save_LDFLAGS="$LDFLAGS"
 9133-        LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
 9134-        AC_LINK_IFELSE(int foo(void) {},
 9135-          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
 9136-        )
 9137-        LDFLAGS="$save_LDFLAGS"
 9138-      else
 9139-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
 9140-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
 9141-      fi
 9142-      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
 9143-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
 9144-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
 9145-      _LT_TAGVAR(inherit_rpath, $1)=yes
 9146-      _LT_TAGVAR(link_all_deplibs, $1)=yes
 9147-      ;;
 9148+# Compile-time system search path for libraries
 9149+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
 9150 
 9151-    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
 9152-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 9153-	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
 9154-      else
 9155-	_LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
 9156-      fi
 9157-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
 9158-      _LT_TAGVAR(hardcode_direct, $1)=yes
 9159-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
 9160-      ;;
 9161+# Run-time system search path for libraries
 9162+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
 9163 
 9164-    newsos6)
 9165-      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
 9166-      _LT_TAGVAR(hardcode_direct, $1)=yes
 9167-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
 9168-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
 9169-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
 9170-      ;;
 9171+# Fix the shell variable \$srcfile for the compiler.
 9172+fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)"
 9173 
 9174-    *nto* | *qnx*)
 9175-      ;;
 9176+# Set to yes if exported symbols are required.
 9177+always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
 9178 
 9179-    openbsd*)
 9180-      _LT_TAGVAR(hardcode_direct, $1)=yes
 9181-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
 9182-      if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
 9183-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
 9184-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
 9185-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
 9186-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
 9187-      else
 9188-        case $host_os in
 9189-	openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
 9190-	  _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
 9191-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
 9192-	  ;;
 9193-	*)
 9194-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
 9195-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
 9196-	  ;;
 9197-        esac
 9198-      fi
 9199-      ;;
 9200+# The commands to list exported symbols.
 9201+export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1)
 9202 
 9203-    os2*)
 9204-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
 9205-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
 9206-      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
 9207-      _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'
 9208-      _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
 9209-      ;;
 9210+# The commands to extract the exported symbol list from a shared archive.
 9211+extract_expsyms_cmds=$lt_extract_expsyms_cmds
 9212 
 9213-    osf3*)
 9214-      if test "$GCC" = yes; then
 9215-	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
 9216-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 9217-      else
 9218-	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
 9219-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
 9220-      fi
 9221-      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
 9222-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
 9223-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
 9224-      ;;
 9225+# Symbols that should not be listed in the preloaded symbols.
 9226+exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1)
 9227 
 9228-    osf4* | osf5*)	# as osf3* with the addition of -msym flag
 9229-      if test "$GCC" = yes; then
 9230-	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
 9231-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 9232-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
 9233-      else
 9234-	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
 9235-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
 9236