[couchdb] Fix building on f18
Peter Lemenkov
peter at fedoraproject.org
Sun Mar 11 17:05:40 UTC 2012
commit 022a5e3bce6d1b70a956d9980c5982b42dc8cb92
Author: Peter Lemenkov <lemenkov at gmail.com>
Date: Sun Mar 11 20:59:27 2012 +0400
Fix building on f18
Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
couchdb-9999-Autoreconf.patch | 5760 +++++++++++++++++++++++++++++++++--------
couchdb.spec | 56 +-
2 files changed, 4658 insertions(+), 1158 deletions(-)
---
diff --git a/couchdb-9999-Autoreconf.patch b/couchdb-9999-Autoreconf.patch
index 6077a27..260eeb4 100644
--- a/couchdb-9999-Autoreconf.patch
+++ b/couchdb-9999-Autoreconf.patch
@@ -1,44 +1,61 @@
-From a9cd282d33cb14be1fe0721e0b1e26f94e8a7997 Mon Sep 17 00:00:00 2001
+From 07325ab88e3ca8e3d2c7b0a10656bae3385202a6 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
-Date: Tue, 12 Jul 2011 12:51:02 +0400
-Subject: [PATCH] Autoreconf
+Date: Sun, 11 Mar 2012 17:37:14 +0400
+Subject: [PATCH 1/1] Autoreconf
---
- Makefile.in | 63 +-
- aclocal.m4 | 4 +-
- bin/Makefile.in | 4 +-
- build-aux/config.guess | 142 +-
- build-aux/config.sub | 30 +-
- build-aux/ltmain.sh | 3989 +++++++++++++++++++++++++++---------------
- configure | 3155 +++++++++++++++++++++------------
- etc/Makefile.in | 4 +-
- etc/couchdb/Makefile.in | 4 +-
- etc/default/Makefile.in | 4 +-
- etc/init/Makefile.in | 4 +-
- etc/launchd/Makefile.in | 4 +-
- etc/logrotate.d/Makefile.in | 4 +-
- etc/windows/Makefile.in | 4 +-
- m4/libtool.m4 | 2046 +++++++++++++---------
- m4/ltoptions.m4 | 13 +-
+ Makefile.in | 139 +-
+ aclocal.m4 | 72 +-
+ bin/Makefile.in | 37 +-
+ build-aux/config.guess | 383 ++--
+ build-aux/config.sub | 207 ++-
+ build-aux/depcomp | 74 +-
+ build-aux/install-sh | 29 +-
+ build-aux/ltmain.sh | 4038 +++++++++++++++++++++++++++---------------
+ build-aux/missing | 53 +-
+ configure | 3308 ++++++++++++++++++++++-------------
+ etc/Makefile.in | 41 +-
+ etc/couchdb/Makefile.in | 33 +-
+ etc/default/Makefile.in | 23 +-
+ etc/init/Makefile.in | 23 +-
+ etc/launchd/Makefile.in | 23 +-
+ etc/logrotate.d/Makefile.in | 23 +-
+ etc/windows/Makefile.in | 23 +-
+ m4/libtool.m4 | 2263 +++++++++++++++---------
+ m4/ltoptions.m4 | 32 +-
m4/ltversion.m4 | 12 +-
m4/lt~obsolete.m4 | 12 +-
- share/Makefile.in | 4 +-
- src/Makefile.in | 6 +-
- src/couchdb/Makefile.in | 4 +-
- src/couchdb/priv/Makefile.in | 4 +-
- test/Makefile.in | 4 +-
- test/bench/Makefile.in | 4 +-
- test/etap/Makefile.in | 4 +-
- test/javascript/Makefile.in | 4 +-
- test/view_server/Makefile.in | 4 +-
- utils/Makefile.in | 4 +-
- var/Makefile.in | 4 +-
- 29 files changed, 6021 insertions(+), 3523 deletions(-)
+ share/Makefile.in | 37 +-
+ src/Makefile.in | 25 +-
+ src/couchdb/Makefile.in | 37 +-
+ src/couchdb/priv/Makefile.in | 39 +-
+ test/Makefile.in | 23 +-
+ test/bench/Makefile.in | 23 +-
+ test/etap/Makefile.in | 23 +-
+ test/javascript/Makefile.in | 23 +-
+ test/view_server/Makefile.in | 23 +-
+ utils/Makefile.in | 23 +-
+ var/Makefile.in | 23 +-
+ 32 files changed, 7072 insertions(+), 4075 deletions(-)
+ mode change 100755 => 100644 build-aux/ltmain.sh
diff --git a/Makefile.in b/Makefile.in
-index fc6508d..1215160 100644
+index fc6508d..645d320 100644
--- a/Makefile.in
+++ b/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
@@ -37,7 +37,7 @@ host_triplet = @host@
subdir = .
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
@@ -48,7 +65,44 @@ index fc6508d..1215160 100644
build-aux/config.guess build-aux/config.sub build-aux/depcomp \
build-aux/install-sh build-aux/ltmain.sh build-aux/missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -149,6 +149,7 @@ CURL_LIBS = @CURL_LIBS@
+@@ -84,6 +84,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(localdocdir)"
+ DATA = $(localdoc_DATA)
+ RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+@@ -98,9 +104,11 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ distdir = $(PACKAGE)-$(VERSION)
+ top_distdir = $(distdir)
+ am__remove_distdir = \
+- { test ! -d "$(distdir)" \
+- || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+- && rm -fr "$(distdir)"; }; }
++ if test -d "$(distdir)"; then \
++ find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
++ && rm -rf "$(distdir)" \
++ || { sleep 5 && rm -rf "$(distdir)"; }; \
++ else :; fi
+ am__relativize = \
+ dir0=`pwd`; \
+ sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+@@ -129,6 +137,8 @@ am__relativize = \
+ DIST_ARCHIVES = $(distdir).tar.gz
+ GZIP_ENV = --best
+ distuninstallcheck_listfiles = find . -type f -print
++am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
++ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
+ distcleancheck_listfiles = find . -type f -print
+ ACLOCAL = @ACLOCAL@
+ AMTAR = @AMTAR@
+@@ -149,6 +159,7 @@ CURL_LIBS = @CURL_LIBS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -56,7 +110,7 @@ index fc6508d..1215160 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -189,6 +190,7 @@ LIPO = @LIPO@
+@@ -189,6 +200,7 @@ LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -64,7 +118,7 @@ index fc6508d..1215160 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -214,6 +216,7 @@ abs_builddir = @abs_builddir@
+@@ -214,6 +226,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -72,7 +126,7 @@ index fc6508d..1215160 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
-@@ -258,7 +261,6 @@ localstatedir = @localstatedir@
+@@ -258,7 +271,6 @@ localstatedir = @localstatedir@
localstatelibdir = @localstatelibdir@
localstatelogdir = @localstatelogdir@
localstaterundir = @localstaterundir@
@@ -80,7 +134,7 @@ index fc6508d..1215160 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
msvc_redist_dir = @msvc_redist_dir@
-@@ -291,18 +293,15 @@ version_stage = @version_stage@
+@@ -291,18 +303,15 @@ version_stage = @version_stage@
SUBDIRS = bin etc src share test var utils
ACLOCAL_AMFLAGS = -I m4
localdoc_DATA = \
@@ -108,7 +162,131 @@ index fc6508d..1215160 100644
DISTCLEANFILES = $(localdoc_DATA)
EXTRA_DIST = \
-@@ -847,42 +846,6 @@ uninstall-am: uninstall-localdocDATA
+@@ -324,7 +333,7 @@ all: config.h
+ $(MAKE) $(AM_MAKEFLAGS) all-recursive
+
+ .SUFFIXES:
+-am--refresh:
++am--refresh: Makefile
+ @:
+ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+@@ -360,10 +369,8 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
+ $(am__aclocal_m4_deps):
+
+ config.h: stamp-h1
+- @if test ! -f $@; then \
+- rm -f stamp-h1; \
+- $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
+- else :; fi
++ @if test ! -f $@; then rm -f stamp-h1; else :; fi
++ @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
+
+ stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
+ @rm -f stamp-h1
+@@ -401,9 +408,7 @@ uninstall-localdocDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(localdoc_DATA)'; test -n "$(localdocdir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+- test -n "$$files" || exit 0; \
+- echo " ( cd '$(DESTDIR)$(localdocdir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(localdocdir)" && rm -f $$files
++ dir='$(DESTDIR)$(localdocdir)'; $(am__uninstall_files_from_dir)
+
+ # This directory's subdirectories are mostly independent; you can cd
+ # into them and run `make' without going through this Makefile.
+@@ -615,7 +620,11 @@ dist-gzip: distdir
+ $(am__remove_distdir)
+
+ dist-bzip2: distdir
+- tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
++ tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
++ $(am__remove_distdir)
++
++dist-lzip: distdir
++ tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
+ $(am__remove_distdir)
+
+ dist-lzma: distdir
+@@ -623,7 +632,7 @@ dist-lzma: distdir
+ $(am__remove_distdir)
+
+ dist-xz: distdir
+- tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
++ tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
+ $(am__remove_distdir)
+
+ dist-tarZ: distdir
+@@ -654,6 +663,8 @@ distcheck: dist
+ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
+ *.tar.lzma*) \
+ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
++ *.tar.lz*) \
++ lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
+ *.tar.xz*) \
+ xz -dc $(distdir).tar.xz | $(am__untar) ;;\
+ *.tar.Z*) \
+@@ -674,6 +685,7 @@ distcheck: dist
+ && am__cwd=`pwd` \
+ && $(am__cd) $(distdir)/_build \
+ && ../configure --srcdir=.. --prefix="$$dc_install_base" \
++ $(AM_DISTCHECK_CONFIGURE_FLAGS) \
+ $(DISTCHECK_CONFIGURE_FLAGS) \
+ && $(MAKE) $(AM_MAKEFLAGS) \
+ && $(MAKE) $(AM_MAKEFLAGS) dvi \
+@@ -702,8 +714,16 @@ distcheck: dist
+ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
+ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
+ distuninstallcheck:
+- @$(am__cd) '$(distuninstallcheck_dir)' \
+- && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
++ @test -n '$(distuninstallcheck_dir)' || { \
++ echo 'ERROR: trying to run $@ with an empty' \
++ '$$(distuninstallcheck_dir)' >&2; \
++ exit 1; \
++ }; \
++ $(am__cd) '$(distuninstallcheck_dir)' || { \
++ echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
++ exit 1; \
++ }; \
++ test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
+ || { echo "ERROR: files left after uninstall:" ; \
+ if test -n "$(DESTDIR)"; then \
+ echo " (check DESTDIR support)"; \
+@@ -737,10 +757,15 @@ install-am: all-am
+
+ installcheck: installcheck-recursive
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
+@@ -831,9 +856,9 @@ uninstall-am: uninstall-localdocDATA
+ .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ all all-am am--refresh check check-am clean clean-generic \
+ clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
+- dist-gzip dist-hook dist-lzma dist-shar dist-tarZ dist-xz \
+- dist-zip distcheck distclean distclean-generic distclean-hdr \
+- distclean-libtool distclean-local distclean-tags \
++ dist-gzip dist-hook dist-lzip dist-lzma dist-shar dist-tarZ \
++ dist-xz dist-zip distcheck distclean distclean-generic \
++ distclean-hdr distclean-libtool distclean-local distclean-tags \
+ distcleancheck distdir distuninstallcheck dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-data-hook install-dvi install-dvi-am \
+@@ -847,42 +872,6 @@ uninstall-am: uninstall-localdocDATA
uninstall-localdocDATA
@@ -152,10 +330,21 @@ index fc6508d..1215160 100644
$(top_builddir)/test/etap/run
diff --git a/aclocal.m4 b/aclocal.m4
-index bf290af..0c36ff3 100644
+index bf290af..c68617d 100644
--- a/aclocal.m4
+++ b/aclocal.m4
-@@ -13,8 +13,8 @@
+@@ -1,7 +1,8 @@
+-# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
++# generated automatically by aclocal 1.11.3 -*- Autoconf -*-
+
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+-# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
++# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
++# Inc.
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,18 +14,21 @@
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
@@ -166,11 +355,263 @@ index bf290af..0c36ff3 100644
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
+
+-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
++# Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+
++# serial 1
++
+ # AM_AUTOMAKE_VERSION(VERSION)
+ # ----------------------------
+ # Automake X.Y traces this macro to ensure aclocal.m4 has been
+@@ -34,7 +38,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
+ [am__api_version='1.11'
+ dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+ dnl require some minimum version. Point them to the right macro.
+-m4_if([$1], [1.11.1], [],
++m4_if([$1], [1.11.3], [],
+ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+ ])
+
+@@ -50,19 +54,21 @@ m4_define([_AM_AUTOCONF_VERSION], [])
+ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+ # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
+ AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+-[AM_AUTOMAKE_VERSION([1.11.1])dnl
++[AM_AUTOMAKE_VERSION([1.11.3])dnl
+ m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
+
+ # AM_AUX_DIR_EXPAND -*- Autoconf -*-
+
+-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
++# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+
++# serial 1
++
+ # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
+ # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
+ # `$srcdir', `$srcdir/..', or `$srcdir/../..'.
+@@ -144,14 +150,14 @@ AC_CONFIG_COMMANDS_PRE(
+ Usually this means the macro was only invoked conditionally.]])
+ fi])])
+
+-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
+-# Free Software Foundation, Inc.
++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
++# 2010, 2011 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+
+-# serial 10
++# serial 12
+
+ # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+ # written in clear, in which case automake, when reading aclocal.m4,
+@@ -191,6 +197,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
+ # instance it was reported that on HP-UX the gcc test will end up
+ # making a dummy file named `D' -- because `-MD' means `put the output
+ # in D'.
++ rm -rf conftest.dir
+ mkdir conftest.dir
+ # Copy depcomp to subdir because otherwise we won't find it if we're
+ # using a relative directory.
+@@ -255,7 +262,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
+ break
+ fi
+ ;;
+- msvisualcpp | msvcmsys)
++ msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+ # This compiler won't grok `-c -o', but also, the minuso test has
+ # not run yet. These depmodes are late enough in the game, and
+ # so weak that their functioning should not be impacted.
+@@ -320,10 +327,13 @@ AC_DEFUN([AM_DEP_TRACK],
+ if test "x$enable_dependency_tracking" != xno; then
+ am_depcomp="$ac_aux_dir/depcomp"
+ AMDEPBACKSLASH='\'
++ am__nodep='_no'
+ fi
+ AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
+ AC_SUBST([AMDEPBACKSLASH])dnl
+ _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
++AC_SUBST([am__nodep])dnl
++_AM_SUBST_NOTMAKE([am__nodep])dnl
+ ])
+
+ # Generate code to set up dependency tracking. -*- Autoconf -*-
+@@ -557,12 +567,15 @@ for _am_header in $config_headers :; do
+ done
+ echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
+
+-# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc.
++# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
++# Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+
++# serial 1
++
+ # AM_PROG_INSTALL_SH
+ # ------------------
+ # Define $install_sh.
+@@ -694,12 +707,15 @@ else
+ fi
+ ])
+
+-# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
++# Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+
++# serial 1
++
+ # AM_PROG_MKDIR_P
+ # ---------------
+ # Check for `mkdir -p'.
+@@ -722,13 +738,14 @@ esac
+
+ # Helper functions for option handling. -*- Autoconf -*-
+
+-# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc.
++# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
++# Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+
+-# serial 4
++# serial 5
+
+ # _AM_MANGLE_OPTION(NAME)
+ # -----------------------
+@@ -736,13 +753,13 @@ AC_DEFUN([_AM_MANGLE_OPTION],
+ [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
+
+ # _AM_SET_OPTION(NAME)
+-# ------------------------------
++# --------------------
+ # Set option NAME. Presently that only means defining a flag for this option.
+ AC_DEFUN([_AM_SET_OPTION],
+ [m4_define(_AM_MANGLE_OPTION([$1]), 1)])
+
+ # _AM_SET_OPTIONS(OPTIONS)
+-# ----------------------------------
++# ------------------------
+ # OPTIONS is a space-separated list of Automake options.
+ AC_DEFUN([_AM_SET_OPTIONS],
+ [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
+@@ -818,12 +835,14 @@ Check your system clock])
+ fi
+ AC_MSG_RESULT(yes)])
+
+-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
++# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+
++# serial 1
++
+ # AM_PROG_INSTALL_STRIP
+ # ---------------------
+ # One issue with vendor `install' (even GNU) is that you can't
+@@ -846,13 +865,13 @@ fi
+ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+ AC_SUBST([INSTALL_STRIP_PROGRAM])])
+
+-# Copyright (C) 2006, 2008 Free Software Foundation, Inc.
++# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+
+-# serial 2
++# serial 3
+
+ # _AM_SUBST_NOTMAKE(VARIABLE)
+ # ---------------------------
+@@ -861,13 +880,13 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])])
+ AC_DEFUN([_AM_SUBST_NOTMAKE])
+
+ # AM_SUBST_NOTMAKE(VARIABLE)
+-# ---------------------------
++# --------------------------
+ # Public sister of _AM_SUBST_NOTMAKE.
+ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
+
+ # Check how to create a tarball. -*- Autoconf -*-
+
+-# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
++# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -889,10 +908,11 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
+ # a tarball read from stdin.
+ # $(am__untar) < result.tar
+ AC_DEFUN([_AM_PROG_TAR],
+-[# Always define AMTAR for backward compatibility.
+-AM_MISSING_PROG([AMTAR], [tar])
++[# Always define AMTAR for backward compatibility. Yes, it's still used
++# in the wild :-( We should find a proper way to deprecate it ...
++AC_SUBST([AMTAR], ['$${TAR-tar}'])
+ m4_if([$1], [v7],
+- [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
++ [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
+ [m4_case([$1], [ustar],, [pax],,
+ [m4_fatal([Unknown tar format])])
+ AC_MSG_CHECKING([how to create a $1 tar archive])
diff --git a/bin/Makefile.in b/bin/Makefile.in
-index d4da0a1..d5e1bb3 100644
+index d4da0a1..39a2cc7 100644
--- a/bin/Makefile.in
+++ b/bin/Makefile.in
-@@ -98,6 +98,7 @@ CURL_LIBS = @CURL_LIBS@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -70,6 +70,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
+ SCRIPTS = $(bin_SCRIPTS) $(noinst_SCRIPTS)
+ SOURCES =
+@@ -98,6 +104,7 @@ CURL_LIBS = @CURL_LIBS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -178,7 +619,7 @@ index d4da0a1..d5e1bb3 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -138,6 +139,7 @@ LIPO = @LIPO@
+@@ -138,6 +145,7 @@ LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -186,7 +627,7 @@ index d4da0a1..d5e1bb3 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -163,6 +165,7 @@ abs_builddir = @abs_builddir@
+@@ -163,6 +171,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -194,7 +635,7 @@ index d4da0a1..d5e1bb3 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
-@@ -207,7 +210,6 @@ localstatedir = @localstatedir@
+@@ -207,7 +216,6 @@ localstatedir = @localstatedir@
localstatelibdir = @localstatelibdir@
localstatelogdir = @localstatelogdir@
localstaterundir = @localstaterundir@
@@ -202,16 +643,63 @@ index d4da0a1..d5e1bb3 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
msvc_redist_dir = @msvc_redist_dir@
+@@ -315,9 +323,7 @@ uninstall-binSCRIPTS:
+ @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \
+ files=`for p in $$list; do echo "$$p"; done | \
+ sed -e 's,.*/,,;$(transform)'`; \
+- test -n "$$list" || exit 0; \
+- echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(bindir)" && rm -f $$files
++ dir='$(DESTDIR)$(bindir)'; $(am__uninstall_files_from_dir)
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -355,9 +361,7 @@ uninstall-man1:
+ files=`{ for i in $$list; do echo "$$i"; done; \
+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+- test -z "$$files" || { \
+- echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
++ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
+ tags: TAGS
+ TAGS:
+
+@@ -425,10 +429,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
diff --git a/build-aux/config.guess b/build-aux/config.guess
-index e3a2116..dc84c68 100755
+index e3a2116..49ba16f 100755
--- a/build-aux/config.guess
+++ b/build-aux/config.guess
-@@ -4,7 +4,7 @@
- # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
- # Free Software Foundation, Inc.
+@@ -1,10 +1,10 @@
+ #! /bin/sh
+ # Attempt to guess a canonical system name.
+ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+-# Free Software Foundation, Inc.
++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
++# 2011, 2012 Free Software Foundation, Inc.
-timestamp='2009-06-10'
-+timestamp='2009-11-20'
++timestamp='2012-01-01'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -237,7 +725,67 @@ index e3a2116..dc84c68 100755
me=`echo "$0" | sed -e 's,.*/,,'`
-@@ -333,6 +333,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+@@ -56,8 +56,9 @@ version="\
+ GNU config.guess ($timestamp)
+
+ Originally written by Per Bothner.
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
++Free Software Foundation, Inc.
+
+ This is free software; see the source for copying conditions. There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -144,7 +145,7 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+ *:NetBSD:*:*)
+ # NetBSD (nbsd) targets should (where applicable) match one or
+- # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
++ # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
+ # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
+ # switched to ELF, *-*-netbsd* would select the old
+ # object file format. This provides both forward
+@@ -180,7 +181,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+ fi
+ ;;
+ *)
+- os=netbsd
++ os=netbsd
+ ;;
+ esac
+ # The OS release
+@@ -223,7 +224,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+ ;;
+ *5.*)
+- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
++ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+ ;;
+ esac
+ # According to Compaq, /usr/sbin/psrinfo has been available on
+@@ -269,7 +270,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+ # A Xn.n version is an unreleased experimental baselevel.
+ # 1.2 uses "1.2" for uname -r.
+ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+- exit ;;
++ # Reset EXIT trap before exiting to avoid spurious non-zero exit code.
++ exitcode=$?
++ trap '' 0
++ exit $exitcode ;;
+ Alpha\ *:Windows_NT*:*)
+ # How do we know it's Interix rather than the generic POSIX subsystem?
+ # Should we change UNAME_MACHINE based on the output of uname instead
+@@ -295,7 +299,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+ echo s390-ibm-zvmoe
+ exit ;;
+ *:OS400:*:*)
+- echo powerpc-ibm-os400
++ echo powerpc-ibm-os400
+ exit ;;
+ arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+ echo arm-acorn-riscix${UNAME_RELEASE}
+@@ -333,6 +337,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
@@ -247,13 +795,247 @@ index e3a2116..dc84c68 100755
i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
eval $set_cc_for_build
SUN_ARCH="i386"
-@@ -807,12 +810,12 @@ EOF
+@@ -391,23 +398,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+ # MiNT. But MiNT is downward compatible to TOS, so this should
+ # be no problem.
+ atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
+- echo m68k-atari-mint${UNAME_RELEASE}
++ echo m68k-atari-mint${UNAME_RELEASE}
+ exit ;;
+ atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
+ echo m68k-atari-mint${UNAME_RELEASE}
+- exit ;;
++ exit ;;
+ *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
+- echo m68k-atari-mint${UNAME_RELEASE}
++ echo m68k-atari-mint${UNAME_RELEASE}
+ exit ;;
+ milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
+- echo m68k-milan-mint${UNAME_RELEASE}
+- exit ;;
++ echo m68k-milan-mint${UNAME_RELEASE}
++ exit ;;
+ hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
+- echo m68k-hades-mint${UNAME_RELEASE}
+- exit ;;
++ echo m68k-hades-mint${UNAME_RELEASE}
++ exit ;;
+ *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
+- echo m68k-unknown-mint${UNAME_RELEASE}
+- exit ;;
++ echo m68k-unknown-mint${UNAME_RELEASE}
++ exit ;;
+ m68k:machten:*:*)
+ echo m68k-apple-machten${UNAME_RELEASE}
+ exit ;;
+@@ -477,8 +484,8 @@ EOF
+ echo m88k-motorola-sysv3
+ exit ;;
+ AViiON:dgux:*:*)
+- # DG/UX returns AViiON for all architectures
+- UNAME_PROCESSOR=`/usr/bin/uname -p`
++ # DG/UX returns AViiON for all architectures
++ UNAME_PROCESSOR=`/usr/bin/uname -p`
+ if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
+ then
+ if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
+@@ -491,7 +498,7 @@ EOF
+ else
+ echo i586-dg-dgux${UNAME_RELEASE}
+ fi
+- exit ;;
++ exit ;;
+ M88*:DolphinOS:*:*) # DolphinOS (SVR3)
+ echo m88k-dolphin-sysv3
+ exit ;;
+@@ -548,7 +555,7 @@ EOF
+ echo rs6000-ibm-aix3.2
+ fi
+ exit ;;
+- *:AIX:*:[456])
++ *:AIX:*:[4567])
+ IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+ if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+ IBM_ARCH=rs6000
+@@ -591,52 +598,52 @@ EOF
+ 9000/[678][0-9][0-9])
+ if [ -x /usr/bin/getconf ]; then
+ sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+- sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+- case "${sc_cpu_version}" in
+- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+- 532) # CPU_PA_RISC2_0
+- case "${sc_kernel_bits}" in
+- 32) HP_ARCH="hppa2.0n" ;;
+- 64) HP_ARCH="hppa2.0w" ;;
++ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
++ case "${sc_cpu_version}" in
++ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
++ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
++ 532) # CPU_PA_RISC2_0
++ case "${sc_kernel_bits}" in
++ 32) HP_ARCH="hppa2.0n" ;;
++ 64) HP_ARCH="hppa2.0w" ;;
+ '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
+- esac ;;
+- esac
++ esac ;;
++ esac
+ fi
+ if [ "${HP_ARCH}" = "" ]; then
+ eval $set_cc_for_build
+- sed 's/^ //' << EOF >$dummy.c
++ sed 's/^ //' << EOF >$dummy.c
+
+- #define _HPUX_SOURCE
+- #include <stdlib.h>
+- #include <unistd.h>
++ #define _HPUX_SOURCE
++ #include <stdlib.h>
++ #include <unistd.h>
+
+- int main ()
+- {
+- #if defined(_SC_KERNEL_BITS)
+- long bits = sysconf(_SC_KERNEL_BITS);
+- #endif
+- long cpu = sysconf (_SC_CPU_VERSION);
++ int main ()
++ {
++ #if defined(_SC_KERNEL_BITS)
++ long bits = sysconf(_SC_KERNEL_BITS);
++ #endif
++ long cpu = sysconf (_SC_CPU_VERSION);
+
+- switch (cpu)
+- {
+- case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+- case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+- case CPU_PA_RISC2_0:
+- #if defined(_SC_KERNEL_BITS)
+- switch (bits)
+- {
+- case 64: puts ("hppa2.0w"); break;
+- case 32: puts ("hppa2.0n"); break;
+- default: puts ("hppa2.0"); break;
+- } break;
+- #else /* !defined(_SC_KERNEL_BITS) */
+- puts ("hppa2.0"); break;
+- #endif
+- default: puts ("hppa1.0"); break;
+- }
+- exit (0);
+- }
++ switch (cpu)
++ {
++ case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
++ case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
++ case CPU_PA_RISC2_0:
++ #if defined(_SC_KERNEL_BITS)
++ switch (bits)
++ {
++ case 64: puts ("hppa2.0w"); break;
++ case 32: puts ("hppa2.0n"); break;
++ default: puts ("hppa2.0"); break;
++ } break;
++ #else /* !defined(_SC_KERNEL_BITS) */
++ puts ("hppa2.0"); break;
++ #endif
++ default: puts ("hppa1.0"); break;
++ }
++ exit (0);
++ }
+ EOF
+ (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+ test -z "$HP_ARCH" && HP_ARCH=hppa
+@@ -727,22 +734,22 @@ EOF
+ exit ;;
+ C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
+ echo c1-convex-bsd
+- exit ;;
++ exit ;;
+ C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
+ if getsysinfo -f scalar_acc
+ then echo c32-convex-bsd
+ else echo c2-convex-bsd
+ fi
+- exit ;;
++ exit ;;
+ C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
+ echo c34-convex-bsd
+- exit ;;
++ exit ;;
+ C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
+ echo c38-convex-bsd
+- exit ;;
++ exit ;;
+ C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
+ echo c4-convex-bsd
+- exit ;;
++ exit ;;
+ CRAY*Y-MP:*:*:*)
+ echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ exit ;;
+@@ -766,14 +773,14 @@ EOF
+ exit ;;
+ F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
+ FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+- exit ;;
++ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
++ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
++ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
++ exit ;;
+ 5000:UNIX_System_V:4.*:*)
+- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+- echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
++ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
++ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
++ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+ exit ;;
+ i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+ echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+@@ -785,13 +792,12 @@ EOF
+ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+ exit ;;
+ *:FreeBSD:*:*)
+- case ${UNAME_MACHINE} in
+- pc98)
+- echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
++ UNAME_PROCESSOR=`/usr/bin/uname -p`
++ case ${UNAME_PROCESSOR} in
+ amd64)
+ echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ *)
+- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
++ echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ esac
+ exit ;;
+ i*:CYGWIN*:*)
+@@ -800,19 +806,22 @@ EOF
+ *:MINGW*:*)
+ echo ${UNAME_MACHINE}-pc-mingw32
+ exit ;;
++ i*:MSYS*:*)
++ echo ${UNAME_MACHINE}-pc-msys
++ exit ;;
+ i*:windows32*:*)
+- # uname -m includes "-pc" on this system.
+- echo ${UNAME_MACHINE}-mingw32
++ # uname -m includes "-pc" on this system.
++ echo ${UNAME_MACHINE}-mingw32
+ exit ;;
i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32
exit ;;
- *:Interix*:[3456]*)
+- case ${UNAME_MACHINE} in
+ *:Interix*:*)
- case ${UNAME_MACHINE} in
++ case ${UNAME_MACHINE} in
x86)
echo i586-pc-interix${UNAME_RELEASE}
exit ;;
@@ -262,7 +1044,7 @@ index e3a2116..dc84c68 100755
echo x86_64-unknown-interix${UNAME_RELEASE}
exit ;;
IA64)
-@@ -854,6 +857,20 @@ EOF
+@@ -854,6 +863,20 @@ EOF
i*86:Minix:*:*)
echo ${UNAME_MACHINE}-pc-minix
exit ;;
@@ -275,7 +1057,7 @@ index e3a2116..dc84c68 100755
+ EV6) UNAME_MACHINE=alphaev6 ;;
+ EV67) UNAME_MACHINE=alphaev67 ;;
+ EV68*) UNAME_MACHINE=alphaev68 ;;
-+ esac
++ esac
+ objdump --private-headers /bin/sh | grep -q ld.so.1
+ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
@@ -283,10 +1065,38 @@ index e3a2116..dc84c68 100755
arm*:Linux:*:*)
eval $set_cc_for_build
if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
-@@ -876,6 +893,17 @@ EOF
- frv:Linux:*:*)
- echo frv-unknown-linux-gnu
+@@ -861,20 +884,40 @@ EOF
+ then
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ else
+- echo ${UNAME_MACHINE}-unknown-linux-gnueabi
++ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
++ | grep -q __ARM_PCS_VFP
++ then
++ echo ${UNAME_MACHINE}-unknown-linux-gnueabi
++ else
++ echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
++ fi
+ fi
+ exit ;;
+ avr32*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ cris:Linux:*:*)
+- echo cris-axis-linux-gnu
++ echo ${UNAME_MACHINE}-axis-linux-gnu
exit ;;
+ crisv32:Linux:*:*)
+- echo crisv32-axis-linux-gnu
++ echo ${UNAME_MACHINE}-axis-linux-gnu
+ exit ;;
+ frv:Linux:*:*)
+- echo frv-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
++ exit ;;
++ hexagon:Linux:*:*)
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
++ exit ;;
+ i*86:Linux:*:*)
+ LIBC=gnu
+ eval $set_cc_for_build
@@ -297,11 +1107,10 @@ index e3a2116..dc84c68 100755
+EOF
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-+ exit ;;
+ exit ;;
ia64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
-@@ -901,39 +929,18 @@ EOF
+@@ -901,39 +944,18 @@ EOF
#endif
#endif
EOF
@@ -314,8 +1123,8 @@ index e3a2116..dc84c68 100755
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
;;
or32:Linux:*:*)
- echo or32-unknown-linux-gnu
- exit ;;
+- echo or32-unknown-linux-gnu
+- exit ;;
- ppc:Linux:*:*)
- echo powerpc-unknown-linux-gnu
- exit ;;
@@ -335,7 +1144,8 @@ index e3a2116..dc84c68 100755
- objdump --private-headers /bin/sh | grep -q ld.so.1
- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-- exit ;;
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
padre:Linux:*:*)
echo sparc-unknown-linux-gnu
exit ;;
@@ -345,7 +1155,7 @@ index e3a2116..dc84c68 100755
parisc:Linux:*:* | hppa:Linux:*:*)
# Look for CPU level
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-@@ -942,8 +949,11 @@ EOF
+@@ -942,14 +964,17 @@ EOF
*) echo hppa-unknown-linux-gnu ;;
esac
exit ;;
@@ -359,9 +1169,30 @@ index e3a2116..dc84c68 100755
exit ;;
s390:Linux:*:* | s390x:Linux:*:*)
echo ${UNAME_MACHINE}-ibm-linux
-@@ -966,58 +976,6 @@ EOF
+ exit ;;
+ sh64*:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ sh*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+@@ -957,67 +982,18 @@ EOF
+ sparc:Linux:*:* | sparc64:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
++ tile*:Linux:*:*)
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
++ exit ;;
+ vax:Linux:*:*)
+ echo ${UNAME_MACHINE}-dec-linux-gnu
+ exit ;;
+ x86_64:Linux:*:*)
+- echo x86_64-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
xtensa*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
- i*86:Linux:*:*)
- # The BFD linker knows what the default object file format is, so
@@ -418,7 +1249,90 @@ index e3a2116..dc84c68 100755
i*86:DYNIX/ptx:4*:*)
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
# earlier versions are messed up and put the nodename in both
-@@ -1247,6 +1205,16 @@ EOF
+@@ -1025,11 +1001,11 @@ EOF
+ echo i386-sequent-sysv4
+ exit ;;
+ i*86:UNIX_SV:4.2MP:2.*)
+- # Unixware is an offshoot of SVR4, but it has its own version
+- # number series starting with 2...
+- # I am not positive that other SVR4 systems won't match this,
++ # Unixware is an offshoot of SVR4, but it has its own version
++ # number series starting with 2...
++ # I am not positive that other SVR4 systems won't match this,
+ # I just have to hope. -- rms.
+- # Use sysv4.2uw... so that sysv4* matches it.
++ # Use sysv4.2uw... so that sysv4* matches it.
+ echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
+ exit ;;
+ i*86:OS/2:*:*)
+@@ -1061,7 +1037,7 @@ EOF
+ fi
+ exit ;;
+ i*86:*:5:[678]*)
+- # UnixWare 7.x, OpenUNIX and OpenServer 6.
++ # UnixWare 7.x, OpenUNIX and OpenServer 6.
+ case `/bin/uname -X | grep "^Machine"` in
+ *486*) UNAME_MACHINE=i486 ;;
+ *Pentium) UNAME_MACHINE=i586 ;;
+@@ -1089,13 +1065,13 @@ EOF
+ exit ;;
+ pc:*:*:*)
+ # Left here for compatibility:
+- # uname -m prints for DJGPP always 'pc', but it prints nothing about
+- # the processor, so we play safe by assuming i586.
++ # uname -m prints for DJGPP always 'pc', but it prints nothing about
++ # the processor, so we play safe by assuming i586.
+ # Note: whatever this is, it MUST be the same as what config.sub
+ # prints for the "djgpp" host, or else GDB configury will decide that
+ # this is a cross-build.
+ echo i586-pc-msdosdjgpp
+- exit ;;
++ exit ;;
+ Intel:Mach:3*:*)
+ echo i386-pc-mach3
+ exit ;;
+@@ -1130,8 +1106,8 @@ EOF
+ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+ 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
+- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+- && { echo i486-ncr-sysv4; exit; } ;;
++ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
++ && { echo i486-ncr-sysv4; exit; } ;;
+ NCR*:*:4.2:* | MPRAS*:*:4.2:*)
+ OS_REL='.3'
+ test -r /etc/.relid \
+@@ -1174,10 +1150,10 @@ EOF
+ echo ns32k-sni-sysv
+ fi
+ exit ;;
+- PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+- # says <Richard.M.Bartel at ccMail.Census.GOV>
+- echo i586-unisys-sysv4
+- exit ;;
++ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
++ # says <Richard.M.Bartel at ccMail.Census.GOV>
++ echo i586-unisys-sysv4
++ exit ;;
+ *:UNIX_System_V:4*:FTX*)
+ # From Gerald Hewes <hewes at openmarket.com>.
+ # How about differentiating between stratus architectures? -djm
+@@ -1203,11 +1179,11 @@ EOF
+ exit ;;
+ R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
+ if [ -d /usr/nec ]; then
+- echo mips-nec-sysv${UNAME_RELEASE}
++ echo mips-nec-sysv${UNAME_RELEASE}
+ else
+- echo mips-unknown-sysv${UNAME_RELEASE}
++ echo mips-unknown-sysv${UNAME_RELEASE}
+ fi
+- exit ;;
++ exit ;;
+ BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
+ echo powerpc-be-beos
+ exit ;;
+@@ -1247,6 +1223,16 @@ EOF
*:Darwin:*:*)
UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
case $UNAME_PROCESSOR in
@@ -435,16 +1349,62 @@ index e3a2116..dc84c68 100755
unknown) UNAME_PROCESSOR=powerpc ;;
esac
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+@@ -1262,6 +1248,9 @@ EOF
+ *:QNX:*:4*)
+ echo i386-pc-qnx
+ exit ;;
++ NEO-?:NONSTOP_KERNEL:*:*)
++ echo neo-tandem-nsk${UNAME_RELEASE}
++ exit ;;
+ NSE-?:NONSTOP_KERNEL:*:*)
+ echo nse-tandem-nsk${UNAME_RELEASE}
+ exit ;;
+@@ -1307,13 +1296,13 @@ EOF
+ echo pdp10-unknown-its
+ exit ;;
+ SEI:*:*:SEIUX)
+- echo mips-sei-seiux${UNAME_RELEASE}
++ echo mips-sei-seiux${UNAME_RELEASE}
+ exit ;;
+ *:DragonFly:*:*)
+ echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+ exit ;;
+ *:*VMS:*:*)
+- UNAME_MACHINE=`(uname -p) 2>/dev/null`
++ UNAME_MACHINE=`(uname -p) 2>/dev/null`
+ case "${UNAME_MACHINE}" in
+ A*) echo alpha-dec-vms ; exit ;;
+ I*) echo ia64-dec-vms ; exit ;;
+@@ -1353,11 +1342,11 @@ main ()
+ #include <sys/param.h>
+ printf ("m68k-sony-newsos%s\n",
+ #ifdef NEWSOS4
+- "4"
++ "4"
+ #else
+- ""
++ ""
+ #endif
+- ); exit (0);
++ ); exit (0);
+ #endif
+ #endif
+
diff --git a/build-aux/config.sub b/build-aux/config.sub
-index eb0389a..2a55a50 100755
+index eb0389a..d6b6b3c 100755
--- a/build-aux/config.sub
+++ b/build-aux/config.sub
-@@ -4,7 +4,7 @@
- # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
- # Free Software Foundation, Inc.
+@@ -1,10 +1,10 @@
+ #! /bin/sh
+ # Configuration validation subroutine script.
+ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+-# Free Software Foundation, Inc.
++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
++# 2011, 2012 Free Software Foundation, Inc.
-timestamp='2009-06-11'
-+timestamp='2009-11-20'
++timestamp='2012-01-01'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -466,7 +1426,31 @@ index eb0389a..2a55a50 100755
# This file is supposed to be the same for all GNU packages
# and recognize all the CPU types, system types and aliases
# that are meaningful with *any* GNU software.
-@@ -149,7 +152,7 @@ case $os in
+@@ -72,8 +75,9 @@ Report bugs and patches to <config-patches at gnu.org>."
+ version="\
+ GNU config.sub ($timestamp)
+
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
++Free Software Foundation, Inc.
+
+ This is free software; see the source for copying conditions. There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -120,8 +124,9 @@ esac
+ # Here we must recognize all the valid KERNEL-OS combinations.
+ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+ case $maybe_os in
+- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
+- uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
++ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
++ linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
++ knetbsd*-gnu* | netbsd*-gnu* | \
+ kopensolaris*-gnu* | \
+ storm-chaos* | os2-emx* | rtmk-nova*)
+ os=-$maybe_os
+@@ -149,12 +154,12 @@ case $os in
-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
@@ -475,31 +1459,129 @@ index eb0389a..2a55a50 100755
os=
basic_machine=$1
;;
-@@ -284,6 +287,7 @@ case $basic_machine in
+- -bluegene*)
+- os=-cnk
++ -bluegene*)
++ os=-cnk
+ ;;
+ -sim | -cisco | -oki | -wec | -winbond)
+ os=
+@@ -170,10 +175,10 @@ case $os in
+ os=-chorusos
+ basic_machine=$1
+ ;;
+- -chorusrdb)
+- os=-chorusrdb
++ -chorusrdb)
++ os=-chorusrdb
+ basic_machine=$1
+- ;;
++ ;;
+ -hiux*)
+ os=-hiuxwe2
+ ;;
+@@ -246,13 +251,17 @@ case $basic_machine in
+ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+ | am33_2.0 \
+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
++ | be32 | be64 \
+ | bfin \
+ | c4x | clipper \
+ | d10v | d30v | dlx | dsp16xx \
++ | epiphany \
+ | fido | fr30 | frv \
+ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
++ | hexagon \
+ | i370 | i860 | i960 | ia64 \
+ | ip2k | iq2000 \
++ | le32 | le64 \
+ | lm32 \
+ | m32c | m32r | m32rle | m68000 | m68k | m88k \
+ | maxq | mb | microblaze | mcore | mep | metag \
+@@ -278,27 +287,39 @@ case $basic_machine in
+ | moxie \
+ | mt \
+ | msp430 \
++ | nds32 | nds32le | nds32be \
+ | nios | nios2 \
+ | ns16k | ns32k \
++ | open8 \
+ | or32 \
| pdp10 | pdp11 | pj | pjl \
- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
++ | powerpc | powerpc64 | powerpc64le | powerpcle \
| pyramid \
-+ | rx \
++ | rl78 | rx \
| score \
| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
-@@ -291,13 +295,14 @@ case $basic_machine in
+ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
- | spu | strongarm \
- | tahoe | thumb | tic4x | tic80 | tron \
+- | spu | strongarm \
+- | tahoe | thumb | tic4x | tic80 | tron \
+- | v850 | v850e \
++ | spu \
++ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
+ | ubicom32 \
- | v850 | v850e \
++ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
| we32k \
- | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+- | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
++ | x86 | xc16x | xstormy16 | xtensa \
| z8k | z80)
basic_machine=$basic_machine-unknown
;;
- m6811 | m68hc11 | m6812 | m68hc12)
+- # Motorola 68HC11/12.
++ c54x)
++ basic_machine=tic54x-unknown
++ ;;
++ c55x)
++ basic_machine=tic55x-unknown
++ ;;
++ c6x)
++ basic_machine=tic6x-unknown
++ ;;
+ m6811 | m68hc11 | m6812 | m68hc12 | picochip)
- # Motorola 68HC11/12.
basic_machine=$basic_machine-unknown
os=-none
-@@ -340,7 +345,7 @@ case $basic_machine in
+ ;;
+@@ -308,6 +329,18 @@ case $basic_machine in
+ basic_machine=mt-unknown
+ ;;
+
++ strongarm | thumb | xscale)
++ basic_machine=arm-unknown
++ ;;
++
++ xscaleeb)
++ basic_machine=armeb-unknown
++ ;;
++
++ xscaleel)
++ basic_machine=armel-unknown
++ ;;
++
+ # We use `pc' rather than `unknown'
+ # because (1) that's what they normally are, and
+ # (2) the word "unknown" tends to confuse beginning users.
+@@ -327,20 +360,23 @@ case $basic_machine in
+ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
+ | avr-* | avr32-* \
++ | be32-* | be64-* \
+ | bfin-* | bs2000-* \
+- | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
++ | c[123]* | c30-* | [cjt]90-* | c4x-* \
+ | clipper-* | craynv-* | cydra-* \
+ | d10v-* | d30v-* | dlx-* \
+ | elxsi-* \
+ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+ | h8300-* | h8500-* \
+ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
++ | hexagon-* \
+ | i*86-* | i860-* | i960-* | ia64-* \
+ | ip2k-* | iq2000-* \
++ | le32-* | le64-* \
| lm32-* \
| m32c-* | m32r-* | m32rle-* \
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
@@ -508,44 +1590,204 @@ index eb0389a..2a55a50 100755
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
| mips16-* \
| mips64-* | mips64el-* \
-@@ -368,7 +373,7 @@ case $basic_machine in
+@@ -362,24 +398,29 @@ case $basic_machine in
+ | mmix-* \
+ | mt-* \
+ | msp430-* \
++ | nds32-* | nds32le-* | nds32be-* \
+ | nios-* | nios2-* \
+ | none-* | np1-* | ns16k-* | ns32k-* \
++ | open8-* \
+ | orion-* \
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
++ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
| pyramid-* \
- | romp-* | rs6000-* \
-+ | romp-* | rs6000-* | rx-* \
++ | rl78-* | romp-* | rs6000-* | rx-* \
| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
-@@ -377,6 +382,7 @@ case $basic_machine in
- | tahoe-* | thumb-* \
- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
+ | sparclite-* \
+- | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
+- | tahoe-* | thumb-* \
+- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
++ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
++ | tahoe-* \
++ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
++ | tile*-* \
| tron-* \
+- | v850-* | v850e-* | vax-* \
+ | ubicom32-* \
- | v850-* | v850e-* | vax-* \
++ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
++ | vax-* \
| we32k-* \
- | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
-@@ -726,6 +732,9 @@ case $basic_machine in
+- | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
++ | x86-* | x86_64-* | xc16x-* | xps100-* \
+ | xstormy16-* | xtensa*-* \
+ | ymp-* \
+ | z8k-* | z80-*)
+@@ -404,7 +445,7 @@ case $basic_machine in
+ basic_machine=a29k-amd
+ os=-udi
+ ;;
+- abacus)
++ abacus)
+ basic_machine=abacus-unknown
+ ;;
+ adobe68k)
+@@ -474,11 +515,20 @@ case $basic_machine in
+ basic_machine=powerpc-ibm
+ os=-cnk
+ ;;
++ c54x-*)
++ basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
++ ;;
++ c55x-*)
++ basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
++ ;;
++ c6x-*)
++ basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
++ ;;
+ c90)
+ basic_machine=c90-cray
+ os=-unicos
+ ;;
+- cegcc)
++ cegcc)
+ basic_machine=arm-unknown
+ os=-cegcc
+ ;;
+@@ -510,7 +560,7 @@ case $basic_machine in
+ basic_machine=craynv-cray
+ os=-unicosmp
+ ;;
+- cr16)
++ cr16 | cr16-*)
+ basic_machine=cr16-unknown
+ os=-elf
+ ;;
+@@ -668,7 +718,6 @@ case $basic_machine in
+ i370-ibm* | ibm*)
+ basic_machine=i370-ibm
+ ;;
+-# I'm not sure what "Sysv32" means. Should this be sysv3.2?
+ i*86v32)
+ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ os=-sysv32
+@@ -726,6 +775,9 @@ case $basic_machine in
basic_machine=ns32k-utek
os=-sysv
;;
-+ microblaze)
++ microblaze)
+ basic_machine=microblaze-xilinx
+ ;;
mingw32)
basic_machine=i386-pc
os=-mingw32
-@@ -1247,6 +1256,9 @@ case $os in
- # First match some system type aliases
- # that might get confused with valid system types.
+@@ -762,10 +814,18 @@ case $basic_machine in
+ ms1-*)
+ basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+ ;;
++ msys)
++ basic_machine=i386-pc
++ os=-msys
++ ;;
+ mvs)
+ basic_machine=i370-ibm
+ os=-mvs
+ ;;
++ nacl)
++ basic_machine=le32-unknown
++ os=-nacl
++ ;;
+ ncr3000)
+ basic_machine=i486-ncr
+ os=-sysv4
+@@ -830,6 +890,12 @@ case $basic_machine in
+ np1)
+ basic_machine=np1-gould
+ ;;
++ neo-tandem)
++ basic_machine=neo-tandem
++ ;;
++ nse-tandem)
++ basic_machine=nse-tandem
++ ;;
+ nsr-tandem)
+ basic_machine=nsr-tandem
+ ;;
+@@ -912,9 +978,10 @@ case $basic_machine in
+ ;;
+ power) basic_machine=power-ibm
+ ;;
+- ppc) basic_machine=powerpc-unknown
++ ppc | ppcbe) basic_machine=powerpc-unknown
+ ;;
+- ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
++ ppc-* | ppcbe-*)
++ basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ ppcle | powerpclittle | ppc-le | powerpc-little)
+ basic_machine=powerpcle-unknown
+@@ -1008,6 +1075,9 @@ case $basic_machine in
+ basic_machine=i860-stratus
+ os=-sysv4
+ ;;
++ strongarm-* | thumb-*)
++ basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
++ ;;
+ sun2)
+ basic_machine=m68000-sun
+ ;;
+@@ -1064,20 +1134,8 @@ case $basic_machine in
+ basic_machine=t90-cray
+ os=-unicos
+ ;;
+- tic54x | c54x*)
+- basic_machine=tic54x-unknown
+- os=-coff
+- ;;
+- tic55x | c55x*)
+- basic_machine=tic55x-unknown
+- os=-coff
+- ;;
+- tic6x | c6x*)
+- basic_machine=tic6x-unknown
+- os=-coff
+- ;;
+ tile*)
+- basic_machine=tile-unknown
++ basic_machine=$basic_machine-unknown
+ os=-linux-gnu
+ ;;
+ tx39)
+@@ -1147,6 +1205,9 @@ case $basic_machine in
+ xps | xps100)
+ basic_machine=xps100-honeywell
+ ;;
++ xscale-* | xscalee[bl]-*)
++ basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
++ ;;
+ ymp)
+ basic_machine=ymp-cray
+ os=-unicos
+@@ -1244,9 +1305,12 @@ esac
+ if [ x"$os" != x"" ]
+ then
+ case $os in
+- # First match some system type aliases
+- # that might get confused with valid system types.
++ # First match some system type aliases
++ # that might get confused with valid system types.
# -solaris* is a basic system type, with this one exception.
-+ -auroraux)
-+ os=-auroraux
++ -auroraux)
++ os=-auroraux
+ ;;
-solaris1 | -solaris1.*)
os=`echo $os | sed -e 's|solaris1|sunos4|'`
;;
-@@ -1268,8 +1280,8 @@ case $os in
+@@ -1268,8 +1332,8 @@ case $os in
# -sysv* is not here because it comes later, after sysvr4.
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
| -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
@@ -556,7 +1798,19 @@ index eb0389a..2a55a50 100755
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
| -aos* | -aros* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-@@ -1290,7 +1302,7 @@ case $os in
+@@ -1281,8 +1345,9 @@ case $os in
+ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+ | -chorusos* | -chorusrdb* | -cegcc* \
+- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
++ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
++ | -mingw32* | -linux-gnu* | -linux-android* \
++ | -linux-newlib* | -linux-uclibc* \
+ | -uxpv* | -beos* | -mpeix* | -udk* \
+ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+@@ -1290,7 +1355,7 @@ case $os in
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
@@ -565,24 +1819,328 @@ index eb0389a..2a55a50 100755
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
+@@ -1329,7 +1394,7 @@ case $os in
+ -opened*)
+ os=-openedition
+ ;;
+- -os400*)
++ -os400*)
+ os=-os400
+ ;;
+ -wince*)
+@@ -1378,7 +1443,7 @@ case $os in
+ -sinix*)
+ os=-sysv4
+ ;;
+- -tpf*)
++ -tpf*)
+ os=-tpf
+ ;;
+ -triton*)
+@@ -1423,6 +1488,8 @@ case $os in
+ -dicos*)
+ os=-dicos
+ ;;
++ -nacl*)
++ ;;
+ -none)
+ ;;
+ *)
+@@ -1445,10 +1512,10 @@ else
+ # system, and we'll never get to this point.
+
+ case $basic_machine in
+- score-*)
++ score-*)
+ os=-elf
+ ;;
+- spu-*)
++ spu-*)
+ os=-elf
+ ;;
+ *-acorn)
+@@ -1460,8 +1527,17 @@ case $basic_machine in
+ arm*-semi)
+ os=-aout
+ ;;
+- c4x-* | tic4x-*)
+- os=-coff
++ c4x-* | tic4x-*)
++ os=-coff
++ ;;
++ tic54x-*)
++ os=-coff
++ ;;
++ tic55x-*)
++ os=-coff
++ ;;
++ tic6x-*)
++ os=-coff
+ ;;
+ # This must come before the *-dec entry.
+ pdp10-*)
+@@ -1481,14 +1557,11 @@ case $basic_machine in
+ ;;
+ m68000-sun)
+ os=-sunos3
+- # This also exists in the configure program, but was not the
+- # default.
+- # os=-sunos4
+ ;;
+ m68*-cisco)
+ os=-aout
+ ;;
+- mep-*)
++ mep-*)
+ os=-elf
+ ;;
+ mips*-cisco)
+@@ -1515,7 +1588,7 @@ case $basic_machine in
+ *-ibm)
+ os=-aix
+ ;;
+- *-knuth)
++ *-knuth)
+ os=-mmixware
+ ;;
+ *-wec)
+diff --git a/build-aux/depcomp b/build-aux/depcomp
+index df8eea7..bd0ac08 100755
+--- a/build-aux/depcomp
++++ b/build-aux/depcomp
+@@ -1,10 +1,10 @@
+ #! /bin/sh
+ # depcomp - compile a program generating dependencies as side-effects
+
+-scriptversion=2009-04-28.21; # UTC
++scriptversion=2011-12-04.11; # UTC
+
+-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free
+-# Software Foundation, Inc.
++# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010,
++# 2011 Free Software Foundation, Inc.
+
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+@@ -44,7 +44,7 @@ Environment variables:
+ object Object file output by `PROGRAMS ARGS'.
+ DEPDIR directory where to store dependencies.
+ depfile Dependency file to output.
+- tmpdepfile Temporary file to use when outputing dependencies.
++ tmpdepfile Temporary file to use when outputting dependencies.
+ libtool Whether libtool is used (yes/no).
+
+ Report bugs to <bug-automake at gnu.org>.
+@@ -90,10 +90,18 @@ if test "$depmode" = msvcmsys; then
+ # This is just like msvisualcpp but w/o cygpath translation.
+ # Just convert the backslash-escaped backslashes to single forward
+ # slashes to satisfy depend.m4
+- cygpath_u="sed s,\\\\\\\\,/,g"
++ cygpath_u='sed s,\\\\,/,g'
+ depmode=msvisualcpp
+ fi
+
++if test "$depmode" = msvc7msys; then
++ # This is just like msvc7 but w/o cygpath translation.
++ # Just convert the backslash-escaped backslashes to single forward
++ # slashes to satisfy depend.m4
++ cygpath_u='sed s,\\\\,/,g'
++ depmode=msvc7
++fi
++
+ case "$depmode" in
+ gcc3)
+ ## gcc 3 implements dependency tracking that does exactly what
+@@ -158,10 +166,12 @@ gcc)
+ ' < "$tmpdepfile" |
+ ## Some versions of gcc put a space before the `:'. On the theory
+ ## that the space means something, we add a space to the output as
+-## well.
++## well. hp depmode also adds that space, but also prefixes the VPATH
++## to the object. Take care to not repeat it in the output.
+ ## Some versions of the HPUX 10.20 sed can't process this invocation
+ ## correctly. Breaking it into two sed invocations is a workaround.
+- sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
++ sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
++ | sed -e 's/$/ :/' >> "$depfile"
+ rm -f "$tmpdepfile"
+ ;;
+
+@@ -405,6 +415,52 @@ tru64)
+ rm -f "$tmpdepfile"
+ ;;
+
++msvc7)
++ if test "$libtool" = yes; then
++ showIncludes=-Wc,-showIncludes
++ else
++ showIncludes=-showIncludes
++ fi
++ "$@" $showIncludes > "$tmpdepfile"
++ stat=$?
++ grep -v '^Note: including file: ' "$tmpdepfile"
++ if test "$stat" = 0; then :
++ else
++ rm -f "$tmpdepfile"
++ exit $stat
++ fi
++ rm -f "$depfile"
++ echo "$object : \\" > "$depfile"
++ # The first sed program below extracts the file names and escapes
++ # backslashes for cygpath. The second sed program outputs the file
++ # name when reading, but also accumulates all include files in the
++ # hold buffer in order to output them again at the end. This only
++ # works with sed implementations that can handle large buffers.
++ sed < "$tmpdepfile" -n '
++/^Note: including file: *\(.*\)/ {
++ s//\1/
++ s/\\/\\\\/g
++ p
++}' | $cygpath_u | sort -u | sed -n '
++s/ /\\ /g
++s/\(.*\)/ \1 \\/p
++s/.\(.*\) \\/\1:/
++H
++$ {
++ s/.*/ /
++ G
++ p
++}' >> "$depfile"
++ rm -f "$tmpdepfile"
++ ;;
++
++msvc7msys)
++ # This case exists only to let depend.m4 do its work. It works by
++ # looking at the text of this script. This case will never be run,
++ # since it is checked for above.
++ exit 1
++ ;;
++
+ #nosideeffect)
+ # This comment above is used by automake to tell side-effect
+ # dependency tracking mechanisms from slower ones.
+@@ -503,7 +559,9 @@ makedepend)
+ touch "$tmpdepfile"
+ ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
+ rm -f "$depfile"
+- cat < "$tmpdepfile" > "$depfile"
++ # makedepend may prepend the VPATH from the source file name to the object.
++ # No need to regex-escape $object, excess matching of '.' is harmless.
++ sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
+ sed '1,2d' "$tmpdepfile" | tr ' ' '
+ ' | \
+ ## Some versions of the HPUX 10.20 sed can't process this invocation
+diff --git a/build-aux/install-sh b/build-aux/install-sh
+index 6781b98..a9244eb 100755
+--- a/build-aux/install-sh
++++ b/build-aux/install-sh
+@@ -1,7 +1,7 @@
+ #!/bin/sh
+ # install - install a program, script, or datafile
+
+-scriptversion=2009-04-28.21; # UTC
++scriptversion=2011-01-19.21; # UTC
+
+ # This originates from X11R5 (mit/util/scripts/install.sh), which was
+ # later released in X11R6 (xc/config/util/install.sh) with the
+@@ -156,6 +156,10 @@ while test $# -ne 0; do
+ -s) stripcmd=$stripprog;;
+
+ -t) dst_arg=$2
++ # Protect names problematic for `test' and other utilities.
++ case $dst_arg in
++ -* | [=\(\)!]) dst_arg=./$dst_arg;;
++ esac
+ shift;;
+
+ -T) no_target_directory=true;;
+@@ -186,6 +190,10 @@ if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
+ fi
+ shift # arg
+ dst_arg=$arg
++ # Protect names problematic for `test' and other utilities.
++ case $dst_arg in
++ -* | [=\(\)!]) dst_arg=./$dst_arg;;
++ esac
+ done
+ fi
+
+@@ -200,7 +208,11 @@ if test $# -eq 0; then
+ fi
+
+ if test -z "$dir_arg"; then
+- trap '(exit $?); exit' 1 2 13 15
++ do_exit='(exit $ret); exit $ret'
++ trap "ret=129; $do_exit" 1
++ trap "ret=130; $do_exit" 2
++ trap "ret=141; $do_exit" 13
++ trap "ret=143; $do_exit" 15
+
+ # Set umask so as not to create temps with too-generous modes.
+ # However, 'strip' requires both read and write access to temps.
+@@ -228,9 +240,9 @@ fi
+
+ for src
+ do
+- # Protect names starting with `-'.
++ # Protect names problematic for `test' and other utilities.
+ case $src in
+- -*) src=./$src;;
++ -* | [=\(\)!]) src=./$src;;
+ esac
+
+ if test -n "$dir_arg"; then
+@@ -252,12 +264,7 @@ do
+ echo "$0: no destination specified." >&2
+ exit 1
+ fi
+-
+ dst=$dst_arg
+- # Protect names starting with `-'.
+- case $dst in
+- -*) dst=./$dst;;
+- esac
+
+ # If destination is a directory, append the input filename; won't work
+ # if double slashes aren't ignored.
+@@ -385,7 +392,7 @@ do
+
+ case $dstdir in
+ /*) prefix='/';;
+- -*) prefix='./';;
++ [-=\(\)!]*) prefix='./';;
+ *) prefix='';;
+ esac
+
+@@ -403,7 +410,7 @@ do
+
+ for d
+ do
+- test -z "$d" && continue
++ test X"$d" = X && continue
+
+ prefix=$prefix$d
+ if test -d "$prefix"; then
diff --git a/build-aux/ltmain.sh b/build-aux/ltmain.sh
-index 7ed280b..aa5624c 100755
+old mode 100755
+new mode 100644
+index 7ed280b..63ae69d
--- a/build-aux/ltmain.sh
+++ b/build-aux/ltmain.sh
@@ -1,9 +1,9 @@
-# Generated from ltmain.m4sh.
-# ltmain.sh (GNU libtool) 2.2.6b
-+# libtool (GNU libtool) 2.4
++# libtool (GNU libtool) 2.4.2
# Written by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
-+# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
++# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
# This is free software; see the source for copying conditions. There is NO
# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-@@ -32,50 +32,56 @@
+@@ -32,50 +32,57 @@
#
# Provide generalized library-building support services.
#
@@ -606,6 +2164,7 @@ index 7ed280b..aa5624c 100755
+# --quiet, --silent don't print informational messages
+# --no-quiet, --no-silent
+# print informational messages (default)
++# --no-warn don't display warning messages
+# --tag=TAG use configuration variables from tag TAG
+# -v, --verbose print more informational messages than default
+# --no-verbose don't print the extra informational messages
@@ -650,7 +2209,7 @@ index 7ed280b..aa5624c 100755
+# compiler: $LTCC
+# compiler flags: $LTCFLAGS
+# linker: $LD (gnu? $with_gnu_ld)
-+# $progname: (GNU libtool) 2.4
++# $progname: (GNU libtool) 2.4.2
+# automake: $automake_version
+# autoconf: $autoconf_version
#
@@ -662,14 +2221,14 @@ index 7ed280b..aa5624c 100755
+PROGRAM=libtool
PACKAGE=libtool
-VERSION="2.2.6b Debian-2.2.6b-2ubuntu1"
-+VERSION=2.4
++VERSION=2.4.2
TIMESTAMP=""
-package_revision=1.3017
-+package_revision=1.3293
++package_revision=1.3337
# Be Bourne compatible
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-@@ -91,10 +97,15 @@ fi
+@@ -91,10 +98,15 @@ fi
BIN_SH=xpg4; export BIN_SH # for Tru64
DUALCASE=1; export DUALCASE # for MKS sh
@@ -688,7 +2247,7 @@ index 7ed280b..aa5624c 100755
lt_user_locale=
lt_safe_locale=
for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-@@ -107,15 +118,24 @@ do
+@@ -107,24 +119,28 @@ do
lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
fi"
done
@@ -710,11 +2269,20 @@ index 7ed280b..aa5624c 100755
: ${CP="cp -f"}
-: ${ECHO="echo"}
+-: ${EGREP="/bin/grep -E"}
+-: ${FGREP="/bin/grep -F"}
+-: ${GREP="/bin/grep"}
+-: ${LN_S="ln -s"}
+test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
- : ${EGREP="/bin/grep -E"}
- : ${FGREP="/bin/grep -F"}
- : ${GREP="/bin/grep"}
-@@ -144,6 +164,27 @@ IFS=" $lt_nl"
+ : ${MAKE="make"}
+ : ${MKDIR="mkdir"}
+ : ${MV="mv -f"}
+ : ${RM="rm -f"}
+-: ${SED="/bin/sed"}
+ : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
+ : ${Xsed="$SED -e 1s/^X//"}
+
+@@ -144,6 +160,27 @@ IFS=" $lt_nl"
dirname="s,/[^/]*$,,"
basename="s,^.*/,,"
@@ -742,7 +2310,7 @@ index 7ed280b..aa5624c 100755
# func_dirname_and_basename file append nondir_replacement
# perform func_basename and func_dirname in a single function
# call:
-@@ -158,33 +199,183 @@ basename="s,^.*/,,"
+@@ -158,33 +195,183 @@ basename="s,^.*/,,"
# those functions but instead duplicate the functionality here.
func_dirname_and_basename ()
{
@@ -946,7 +2514,16 @@ index 7ed280b..aa5624c 100755
# Make sure we have an absolute path for reexecution:
case $progpath in
-@@ -215,6 +406,15 @@ sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
+@@ -196,7 +383,7 @@ case $progpath in
+ ;;
+ *)
+ save_IFS="$IFS"
+- IFS=:
++ IFS=${PATH_SEPARATOR-:}
+ for progdir in $PATH; do
+ IFS="$save_IFS"
+ test -x "$progdir/$progname" && break
+@@ -215,6 +402,15 @@ sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
# Same as above, but do not quote variable references.
double_quote_subst='s/\(["`\\]\)/\\\1/g'
@@ -962,7 +2539,7 @@ index 7ed280b..aa5624c 100755
# Re-`\' parameter expansions in output of double_quote_subst that were
# `\'-ed in input to the same. If an odd number of `\' preceded a '$'
# in input to double_quote_subst, that '$' was protected from expansion.
-@@ -243,7 +443,7 @@ opt_warning=:
+@@ -243,7 +439,7 @@ opt_warning=:
# name if it has been set yet.
func_echo ()
{
@@ -971,7 +2548,7 @@ index 7ed280b..aa5624c 100755
}
# func_verbose arg...
-@@ -258,18 +458,25 @@ func_verbose ()
+@@ -258,18 +454,25 @@ func_verbose ()
:
}
@@ -999,7 +2576,7 @@ index 7ed280b..aa5624c 100755
# bash bug again:
:
-@@ -326,9 +533,9 @@ func_mkdir_p ()
+@@ -326,9 +529,9 @@ func_mkdir_p ()
case $my_directory_path in */*) ;; *) break ;; esac
# ...otherwise throw away the child directory and loop
@@ -1011,7 +2588,7 @@ index 7ed280b..aa5624c 100755
save_mkdir_p_IFS="$IFS"; IFS=':'
for my_dir in $my_dir_list; do
-@@ -378,7 +585,7 @@ func_mktempdir ()
+@@ -378,7 +581,7 @@ func_mktempdir ()
func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
fi
@@ -1020,7 +2597,7 @@ index 7ed280b..aa5624c 100755
}
-@@ -392,7 +599,7 @@ func_quote_for_eval ()
+@@ -392,7 +595,7 @@ func_quote_for_eval ()
{
case $1 in
*[\\\`\"\$]*)
@@ -1029,7 +2606,7 @@ index 7ed280b..aa5624c 100755
*)
func_quote_for_eval_unquoted_result="$1" ;;
esac
-@@ -419,7 +626,7 @@ func_quote_for_expand ()
+@@ -419,7 +622,7 @@ func_quote_for_expand ()
{
case $1 in
*[\\\`\"]*)
@@ -1038,7 +2615,7 @@ index 7ed280b..aa5624c 100755
-e "$double_quote_subst" -e "$sed_double_backslash"` ;;
*)
my_arg="$1" ;;
-@@ -488,15 +695,39 @@ func_show_eval_locale ()
+@@ -488,15 +691,39 @@ func_show_eval_locale ()
fi
}
@@ -1081,7 +2658,7 @@ index 7ed280b..aa5624c 100755
s/^# //
s/^# *$//
s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
-@@ -509,22 +740,28 @@ func_version ()
+@@ -509,22 +736,28 @@ func_version ()
# Echo short help message to standard output and exit.
func_usage ()
{
@@ -1114,9 +2691,14 @@ index 7ed280b..aa5624c 100755
s/^# //
s/^# *$//
s*\$progname*'$progname'*
-@@ -537,8 +774,15 @@ func_help ()
- s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
- s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
+@@ -534,11 +767,18 @@ func_help ()
+ s*\$LTCFLAGS*'"$LTCFLAGS"'*
+ s*\$LD*'"$LD"'*
+ s/\$with_gnu_ld/'"$with_gnu_ld"'/
+- s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
+- s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
++ s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/
++ s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/
p
- }' < "$progpath"
- exit $?
@@ -1132,7 +2714,7 @@ index 7ed280b..aa5624c 100755
}
# func_missing_arg argname
-@@ -546,63 +790,106 @@ func_help ()
+@@ -546,63 +786,106 @@ func_help ()
# exit_cmd.
func_missing_arg ()
{
@@ -1270,7 +2852,7 @@ index 7ed280b..aa5624c 100755
# func_fatal_configuration arg...
# Echo program name prefixed message to standard error, followed by
# a configuration failure hint, and exit.
-@@ -636,16 +923,16 @@ func_config ()
+@@ -636,16 +919,16 @@ func_config ()
# Display the features supported by this script.
func_features ()
{
@@ -1292,7 +2874,7 @@ index 7ed280b..aa5624c 100755
fi
exit $?
-@@ -692,117 +979,204 @@ func_enable_tag ()
+@@ -692,117 +975,209 @@ func_enable_tag ()
esac
}
@@ -1397,6 +2979,7 @@ index 7ed280b..aa5624c 100755
+opt_help=false
+opt_help_all=false
+opt_silent=:
++opt_warning=:
+opt_verbose=:
+opt_silent=false
+opt_verbose=false
@@ -1510,6 +3093,10 @@ index 7ed280b..aa5624c 100755
- --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break
- preserve_args="$preserve_args $opt $1"
- func_enable_tag "$1" # tagname is set here
++ --no-warning|--no-warn)
++ opt_warning=false
++func_append preserve_args " $opt"
++ ;;
+ --no-verbose)
+ opt_verbose=false
+func_append preserve_args " $opt"
@@ -1581,7 +3168,7 @@ index 7ed280b..aa5624c 100755
case $host in
*cygwin* | *mingw* | *pw32* | *cegcc*)
-@@ -810,82 +1184,44 @@ func_enable_tag ()
+@@ -810,82 +1185,44 @@ func_enable_tag ()
opt_duplicate_compiler_generated_deps=:
;;
*)
@@ -1635,13 +3222,13 @@ index 7ed280b..aa5624c 100755
- fi
-}
-
--
--## ----------- ##
--## Main. ##
--## ----------- ##
+ # Darwin sucks
+ eval std_shrext=\"$shrext_cmds\"
+-## ----------- ##
+-## Main. ##
+-## ----------- ##
+-
-$opt_help || {
- # Sanity checks first:
- func_check_version_match
@@ -1688,7 +3275,7 @@ index 7ed280b..aa5624c 100755
# func_lalib_p file
# True iff FILE is a libtool `.la' library or `.lo' object file.
-@@ -950,12 +1286,9 @@ func_ltwrapper_executable_p ()
+@@ -950,12 +1287,9 @@ func_ltwrapper_executable_p ()
# temporary ltwrapper_script.
func_ltwrapper_scriptname ()
{
@@ -1704,7 +3291,7 @@ index 7ed280b..aa5624c 100755
}
# func_ltwrapper_p file
-@@ -1001,6 +1334,37 @@ func_source ()
+@@ -1001,6 +1335,37 @@ func_source ()
}
@@ -1742,7 +3329,7 @@ index 7ed280b..aa5624c 100755
# func_infer_tag arg
# Infer tagged configuration to use if any are available and
# if one wasn't chosen via the "--tag" command line option.
-@@ -1013,13 +1377,15 @@ func_infer_tag ()
+@@ -1013,13 +1378,15 @@ func_infer_tag ()
if test -n "$available_tags" && test -z "$tagname"; then
CC_quoted=
for arg in $CC; do
@@ -1761,7 +3348,7 @@ index 7ed280b..aa5624c 100755
# Blanks at the start of $base_compile will cause this to fail
# if we don't check for them as well.
*)
-@@ -1030,11 +1396,13 @@ func_infer_tag ()
+@@ -1030,11 +1397,13 @@ func_infer_tag ()
CC_quoted=
for arg in $CC; do
# Double-quote args containing other shell metacharacters.
@@ -1778,7 +3365,7 @@ index 7ed280b..aa5624c 100755
# The compiler in the base compile command matches
# the one in the tagged configuration.
# Assume this is the tagged configuration we want.
-@@ -1097,6 +1465,486 @@ EOF
+@@ -1097,6 +1466,486 @@ EOF
}
}
@@ -2265,7 +3852,7 @@ index 7ed280b..aa5624c 100755
# func_mode_compile arg...
func_mode_compile ()
{
-@@ -1137,12 +1985,12 @@ func_mode_compile ()
+@@ -1137,12 +1986,12 @@ func_mode_compile ()
;;
-pie | -fpie | -fPIE)
@@ -2280,7 +3867,7 @@ index 7ed280b..aa5624c 100755
continue
;;
-@@ -1163,15 +2011,14 @@ func_mode_compile ()
+@@ -1163,15 +2012,14 @@ func_mode_compile ()
save_ifs="$IFS"; IFS=','
for arg in $args; do
IFS="$save_ifs"
@@ -2298,7 +3885,7 @@ index 7ed280b..aa5624c 100755
continue
;;
-@@ -1187,8 +2034,7 @@ func_mode_compile ()
+@@ -1187,8 +2035,7 @@ func_mode_compile ()
esac # case $arg_mode
# Aesthetically quote the previous argument.
@@ -2308,16 +3895,16 @@ index 7ed280b..aa5624c 100755
done # for arg
case $arg_mode in
-@@ -1213,7 +2059,7 @@ func_mode_compile ()
+@@ -1213,7 +2060,7 @@ func_mode_compile ()
*.[cCFSifmso] | \
*.ada | *.adb | *.ads | *.asm | \
*.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
- *.[fF][09]? | *.for | *.java | *.obj | *.sx)
-+ *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup)
++ *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup)
func_xform "$libobj"
libobj=$func_xform_result
;;
-@@ -1288,7 +2134,7 @@ func_mode_compile ()
+@@ -1288,7 +2135,7 @@ func_mode_compile ()
# Calculate the filename of the output object if compiler does
# not support -o with -c
if test "$compiler_c_o" = no; then
@@ -2326,7 +3913,7 @@ index 7ed280b..aa5624c 100755
lockfile="$output_obj.lock"
else
output_obj=
-@@ -1319,17 +2165,16 @@ compiler."
+@@ -1319,17 +2166,16 @@ compiler."
$opt_dry_run || $RM $removelist
exit $EXIT_FAILURE
fi
@@ -2348,7 +3935,7 @@ index 7ed280b..aa5624c 100755
func_quote_for_eval "$srcfile"
qsrcfile=$func_quote_for_eval_result
-@@ -1349,7 +2194,7 @@ compiler."
+@@ -1349,7 +2195,7 @@ compiler."
if test -z "$output_obj"; then
# Place PIC objects in $objdir
@@ -2357,7 +3944,7 @@ index 7ed280b..aa5624c 100755
fi
func_show_eval_locale "$command" \
-@@ -1396,11 +2241,11 @@ compiler."
+@@ -1396,11 +2242,11 @@ compiler."
command="$base_compile $qsrcfile $pic_flag"
fi
if test "$compiler_c_o" = yes; then
@@ -2371,7 +3958,7 @@ index 7ed280b..aa5624c 100755
func_show_eval_locale "$command" \
'$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
-@@ -1445,13 +2290,13 @@ compiler."
+@@ -1445,13 +2291,13 @@ compiler."
}
$opt_help || {
@@ -2387,7 +3974,7 @@ index 7ed280b..aa5624c 100755
"")
# Generic help is extracted from the usage comments
# at the start of this file.
-@@ -1482,10 +2327,11 @@ This mode accepts the following additional options:
+@@ -1482,10 +2328,11 @@ This mode accepts the following additional options:
-o OUTPUT-FILE set the output file name to OUTPUT-FILE
-no-suppress do not suppress compiler output for multiple passes
@@ -2401,7 +3988,7 @@ index 7ed280b..aa5624c 100755
COMPILE-COMMAND is a command to be used in creating a \`standard' object file
from the given SOURCEFILE.
-@@ -1538,7 +2384,7 @@ either the \`install' or \`cp' program.
+@@ -1538,7 +2385,7 @@ either the \`install' or \`cp' program.
The following components of INSTALL-COMMAND are treated specially:
@@ -2410,7 +3997,7 @@ index 7ed280b..aa5624c 100755
The rest of the components are interpreted as arguments to that command (only
BSD-compatible install options are recognized)."
-@@ -1558,6 +2404,8 @@ The following components of LINK-COMMAND are treated specially:
+@@ -1558,6 +2405,8 @@ The following components of LINK-COMMAND are treated specially:
-all-static do not do any dynamic linking at all
-avoid-version do not add a version suffix if possible
@@ -2419,7 +4006,7 @@ index 7ed280b..aa5624c 100755
-dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime
-dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols
-export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
-@@ -1586,6 +2434,11 @@ The following components of LINK-COMMAND are treated specially:
+@@ -1586,6 +2435,11 @@ The following components of LINK-COMMAND are treated specially:
-version-info CURRENT[:REVISION[:AGE]]
specify library version info [each variable defaults to 0]
-weak LIBNAME declare that the target provides the LIBNAME interface
@@ -2431,7 +4018,7 @@ index 7ed280b..aa5624c 100755
All other options (arguments beginning with \`-') are ignored.
-@@ -1619,18 +2472,44 @@ Otherwise, only FILE itself is deleted using RM."
+@@ -1619,18 +2473,44 @@ Otherwise, only FILE itself is deleted using RM."
;;
*)
@@ -2482,7 +4069,7 @@ index 7ed280b..aa5624c 100755
# func_mode_execute arg...
-@@ -1643,13 +2522,16 @@ func_mode_execute ()
+@@ -1643,13 +2523,16 @@ func_mode_execute ()
func_fatal_help "you must specify a COMMAND"
# Handle -dlopen flags immediately.
@@ -2500,7 +4087,7 @@ index 7ed280b..aa5624c 100755
# Check to see that this really is a libtool archive.
func_lalib_unsafe_p "$file" \
|| func_fatal_help "\`$lib' is not a valid libtool archive"
-@@ -1671,7 +2553,7 @@ func_mode_execute ()
+@@ -1671,7 +2554,7 @@ func_mode_execute ()
dir="$func_dirname_result"
if test -f "$dir/$objdir/$dlname"; then
@@ -2509,7 +4096,7 @@ index 7ed280b..aa5624c 100755
else
if test ! -f "$dir/$dlname"; then
func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
-@@ -1712,7 +2594,7 @@ func_mode_execute ()
+@@ -1712,7 +2595,7 @@ func_mode_execute ()
for file
do
case $file in
@@ -2518,7 +4105,7 @@ index 7ed280b..aa5624c 100755
*)
# Do a test to see if this is really a libtool program.
if func_ltwrapper_script_p "$file"; then
-@@ -1728,8 +2610,7 @@ func_mode_execute ()
+@@ -1728,8 +2611,7 @@ func_mode_execute ()
;;
esac
# Quote arguments (to preserve shell metacharacters).
@@ -2528,7 +4115,7 @@ index 7ed280b..aa5624c 100755
done
if test "X$opt_dry_run" = Xfalse; then
-@@ -1754,29 +2635,66 @@ func_mode_execute ()
+@@ -1754,29 +2636,66 @@ func_mode_execute ()
# Display what would be done.
if test -n "$shlibpath_var"; then
eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
@@ -2582,7 +4169,7 @@ index 7ed280b..aa5624c 100755
+ else
+ sysroot_cmd=
+ fi
-
++
+ # Remove sysroot references
+ if $opt_dry_run; then
+ for lib in $libs; do
@@ -2598,12 +4185,12 @@ index 7ed280b..aa5624c 100755
+ ${RM}r "$tmpdir"
+ fi
+ fi
-+
+
+ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
for libdir in $libdirs; do
if test -n "$finish_cmds"; then
# Do each command in the finish commands.
-@@ -1786,7 +2704,7 @@ func_mode_finish ()
+@@ -1786,7 +2705,7 @@ func_mode_finish ()
if test -n "$finish_eval"; then
# Do the single finish_eval.
eval cmds=\"$finish_eval\"
@@ -2612,7 +4199,7 @@ index 7ed280b..aa5624c 100755
$cmds"
fi
done
-@@ -1795,53 +2713,55 @@ func_mode_finish ()
+@@ -1795,53 +2714,55 @@ func_mode_finish ()
# Exit here if they wanted silent mode.
$opt_silent && exit $EXIT_SUCCESS
@@ -2659,16 +4246,7 @@ index 7ed280b..aa5624c 100755
+ if test -n "$hardcode_libdir_flag_spec"; then
+ libdir=LIBDIR
+ eval flag=\"$hardcode_libdir_flag_spec\"
-
-- $ECHO " - use the \`$flag' linker flag"
-- fi
-- if test -n "$admincmds"; then
-- $ECHO " - have your system administrator run these commands:$admincmds"
-- fi
-- if test -f /etc/ld.so.conf; then
-- $ECHO " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
-- fi
-- $ECHO
++
+ $ECHO " - use the \`$flag' linker flag"
+ fi
+ if test -n "$admincmds"; then
@@ -2679,17 +4257,13 @@ index 7ed280b..aa5624c 100755
+ fi
+ echo
-- $ECHO "See any operating system documentation about shared libraries for"
-- case $host in
-- solaris2.[6789]|solaris2.1[0-9])
-- $ECHO "more information, such as the ld(1), crle(1) and ld.so(8) manual"
-- $ECHO "pages."
-- ;;
-- *)
-- $ECHO "more information, such as the ld(1) and ld.so(8) manual pages."
-- ;;
-- esac
-- $ECHO "X----------------------------------------------------------------------" | $Xsed
+- $ECHO " - use the \`$flag' linker flag"
+- fi
+- if test -n "$admincmds"; then
+- $ECHO " - have your system administrator run these commands:$admincmds"
+- fi
+- if test -f /etc/ld.so.conf; then
+- $ECHO " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
+ echo "See any operating system documentation about shared libraries for"
+ case $host in
+ solaris2.[6789]|solaris2.1[0-9])
@@ -2701,7 +4275,20 @@ index 7ed280b..aa5624c 100755
+ ;;
+ esac
+ echo "----------------------------------------------------------------------"
-+ fi
+ fi
+- $ECHO
+-
+- $ECHO "See any operating system documentation about shared libraries for"
+- case $host in
+- solaris2.[6789]|solaris2.1[0-9])
+- $ECHO "more information, such as the ld(1), crle(1) and ld.so(8) manual"
+- $ECHO "pages."
+- ;;
+- *)
+- $ECHO "more information, such as the ld(1) and ld.so(8) manual pages."
+- ;;
+- esac
+- $ECHO "X----------------------------------------------------------------------" | $Xsed
exit $EXIT_SUCCESS
}
@@ -2710,7 +4297,7 @@ index 7ed280b..aa5624c 100755
# func_mode_install arg...
-@@ -1852,7 +2772,7 @@ func_mode_install ()
+@@ -1852,7 +2773,7 @@ func_mode_install ()
# install_prog (especially on Windows NT).
if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
# Allow the use of GNU shtool's install command.
@@ -2719,7 +4306,7 @@ index 7ed280b..aa5624c 100755
# Aesthetically quote it.
func_quote_for_eval "$nonopt"
install_prog="$func_quote_for_eval_result "
-@@ -1866,7 +2786,12 @@ func_mode_install ()
+@@ -1866,7 +2787,12 @@ func_mode_install ()
# The real first argument should be the name of the installation program.
# Aesthetically quote it.
func_quote_for_eval "$arg"
@@ -2733,7 +4320,7 @@ index 7ed280b..aa5624c 100755
# We need to accept at least all the BSD install flags.
dest=
-@@ -1876,10 +2801,12 @@ func_mode_install ()
+@@ -1876,10 +2802,12 @@ func_mode_install ()
install_type=
isdir=no
stripme=
@@ -2747,7 +4334,7 @@ index 7ed280b..aa5624c 100755
dest=$arg
continue
fi
-@@ -1887,10 +2814,9 @@ func_mode_install ()
+@@ -1887,10 +2815,9 @@ func_mode_install ()
case $arg in
-d) isdir=yes ;;
-f)
@@ -2761,7 +4348,7 @@ index 7ed280b..aa5624c 100755
;;
-g | -m | -o)
prev=$arg
-@@ -1904,6 +2830,10 @@ func_mode_install ()
+@@ -1904,6 +2831,10 @@ func_mode_install ()
*)
# If the previous option needed an argument, then skip it.
if test -n "$prev"; then
@@ -2772,7 +4359,7 @@ index 7ed280b..aa5624c 100755
prev=
else
dest=$arg
-@@ -1914,7 +2844,11 @@ func_mode_install ()
+@@ -1914,7 +2845,11 @@ func_mode_install ()
# Aesthetically quote the argument.
func_quote_for_eval "$arg"
@@ -2785,7 +4372,7 @@ index 7ed280b..aa5624c 100755
done
test -z "$install_prog" && \
-@@ -1923,6 +2857,13 @@ func_mode_install ()
+@@ -1923,6 +2858,13 @@ func_mode_install ()
test -n "$prev" && \
func_fatal_help "the \`$prev' option requires an argument"
@@ -2799,7 +4386,7 @@ index 7ed280b..aa5624c 100755
if test -z "$files"; then
if test -z "$dest"; then
func_fatal_help "no file or destination specified"
-@@ -1977,10 +2918,13 @@ func_mode_install ()
+@@ -1977,10 +2919,13 @@ func_mode_install ()
case $file in
*.$libext)
# Do the static libraries later.
@@ -2814,7 +4401,7 @@ index 7ed280b..aa5624c 100755
# Check to see that this really is a libtool archive.
func_lalib_unsafe_p "$file" \
|| func_fatal_help "\`$file' is not a valid libtool archive"
-@@ -1994,23 +2938,23 @@ func_mode_install ()
+@@ -1994,23 +2939,23 @@ func_mode_install ()
if test "X$destdir" = "X$libdir"; then
case "$current_libdirs " in
*" $libdir "*) ;;
@@ -2842,7 +4429,7 @@ index 7ed280b..aa5624c 100755
# Don't allow the user to place us outside of our expected
# location b/c this prevents finding dependent libraries that
-@@ -2023,9 +2967,9 @@ func_mode_install ()
+@@ -2023,9 +2968,9 @@ func_mode_install ()
if test -n "$inst_prefix_dir"; then
# Stick the inst_prefix_dir data into the link command.
@@ -2854,7 +4441,7 @@ index 7ed280b..aa5624c 100755
fi
func_warning "relinking \`$file'"
-@@ -2043,7 +2987,7 @@ func_mode_install ()
+@@ -2043,7 +2988,7 @@ func_mode_install ()
test -n "$relink_command" && srcname="$realname"T
# Install the shared library and build the symlinks.
@@ -2863,7 +4450,7 @@ index 7ed280b..aa5624c 100755
'exit $?'
tstripme="$stripme"
case $host_os in
-@@ -2083,7 +3027,7 @@ func_mode_install ()
+@@ -2083,7 +3028,7 @@ func_mode_install ()
func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
# Maybe install the static library, too.
@@ -2872,7 +4459,7 @@ index 7ed280b..aa5624c 100755
;;
*.lo)
-@@ -2183,7 +3127,7 @@ func_mode_install ()
+@@ -2183,7 +3128,7 @@ func_mode_install ()
if test -f "$lib"; then
func_source "$lib"
fi
@@ -2881,7 +4468,7 @@ index 7ed280b..aa5624c 100755
if test -n "$libdir" && test ! -f "$libfile"; then
func_warning "\`$lib' has not been installed in \`$libdir'"
finalize=no
-@@ -2202,7 +3146,7 @@ func_mode_install ()
+@@ -2202,7 +3147,7 @@ func_mode_install ()
file="$func_basename_result"
outputname="$tmpdir/$file"
# Replace the output file specification.
@@ -2890,7 +4477,7 @@ index 7ed280b..aa5624c 100755
$opt_silent || {
func_quote_for_expand "$relink_command"
-@@ -2221,7 +3165,7 @@ func_mode_install ()
+@@ -2221,7 +3166,7 @@ func_mode_install ()
}
else
# Install the binary that we compiled earlier.
@@ -2899,7 +4486,22 @@ index 7ed280b..aa5624c 100755
fi
fi
-@@ -2280,7 +3224,7 @@ func_mode_install ()
+@@ -2257,11 +3202,13 @@ func_mode_install ()
+
+ # Set up the ranlib parameters.
+ oldlib="$destdir/$name"
++ func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
++ tool_oldlib=$func_to_tool_file_result
+
+ func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
+
+ if test -n "$stripme" && test -n "$old_striplib"; then
+- func_show_eval "$old_striplib $oldlib" 'exit $?'
++ func_show_eval "$old_striplib $tool_oldlib" 'exit $?'
+ fi
+
+ # Do each command in the postinstall commands.
+@@ -2280,7 +3227,7 @@ func_mode_install ()
fi
}
@@ -2908,7 +4510,7 @@ index 7ed280b..aa5624c 100755
# func_generate_dlsyms outputname originator pic_p
-@@ -2323,6 +3267,22 @@ func_generate_dlsyms ()
+@@ -2323,6 +3270,22 @@ func_generate_dlsyms ()
extern \"C\" {
#endif
@@ -2931,7 +4533,7 @@ index 7ed280b..aa5624c 100755
/* External symbol declarations for the compiler. */\
"
-@@ -2332,10 +3292,11 @@ extern \"C\" {
+@@ -2332,10 +3295,11 @@ extern \"C\" {
$opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
# Add our own program objects to the symbol list.
@@ -2946,7 +4548,7 @@ index 7ed280b..aa5624c 100755
done
if test -n "$exclude_expsyms"; then
-@@ -2371,7 +3332,7 @@ extern \"C\" {
+@@ -2371,7 +3335,7 @@ extern \"C\" {
eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
eval '$MV "$nlist"T "$nlist"'
case $host in
@@ -2955,7 +4557,7 @@ index 7ed280b..aa5624c 100755
eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
;;
-@@ -2384,10 +3345,52 @@ extern \"C\" {
+@@ -2384,10 +3348,52 @@ extern \"C\" {
func_verbose "extracting global C symbols from \`$dlprefile'"
func_basename "$dlprefile"
name="$func_basename_result"
@@ -3012,7 +4614,7 @@ index 7ed280b..aa5624c 100755
done
$opt_dry_run || {
-@@ -2415,36 +3418,19 @@ extern \"C\" {
+@@ -2415,36 +3421,19 @@ extern \"C\" {
if test -f "$nlist"S; then
eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'
else
@@ -3053,7 +4655,7 @@ index 7ed280b..aa5624c 100755
lt_${my_prefix}_LTX_preloaded_symbols[] =
{\
{ \"$my_originator\", (void *) 0 },"
-@@ -2457,7 +3443,7 @@ lt_${my_prefix}_LTX_preloaded_symbols[] =
+@@ -2457,7 +3446,7 @@ lt_${my_prefix}_LTX_preloaded_symbols[] =
eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms"
;;
esac
@@ -3062,7 +4664,16 @@ index 7ed280b..aa5624c 100755
{0, (void *) 0}
};
-@@ -2500,7 +3486,7 @@ static const void *lt_preloaded_setup() {
+@@ -2484,7 +3473,7 @@ static const void *lt_preloaded_setup() {
+ # linked before any other PIC object. But we must not use
+ # pic_flag when linking with -static. The problem exists in
+ # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
+- *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
++ *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
+ pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
+ *-*-hpux*)
+ pic_flag_for_symtable=" $pic_flag" ;;
+@@ -2500,7 +3489,7 @@ static const void *lt_preloaded_setup() {
for arg in $LTCFLAGS; do
case $arg in
-pie | -fpie | -fPIE) ;;
@@ -3071,7 +4682,7 @@ index 7ed280b..aa5624c 100755
esac
done
-@@ -2515,16 +3501,16 @@ static const void *lt_preloaded_setup() {
+@@ -2515,16 +3504,16 @@ static const void *lt_preloaded_setup() {
case $host in
*cygwin* | *mingw* | *cegcc* )
if test -f "$output_objdir/$my_outputname.def"; then
@@ -3094,7 +4705,7 @@ index 7ed280b..aa5624c 100755
;;
esac
;;
-@@ -2538,8 +3524,8 @@ static const void *lt_preloaded_setup() {
+@@ -2538,8 +3527,8 @@ static const void *lt_preloaded_setup() {
# really was required.
# Nullify the symbol file.
@@ -3105,7 +4716,7 @@ index 7ed280b..aa5624c 100755
fi
}
-@@ -2549,6 +3535,7 @@ static const void *lt_preloaded_setup() {
+@@ -2549,6 +3538,7 @@ static const void *lt_preloaded_setup() {
# Need a lot of goo to handle *both* DLLs and import libs
# Has to be a shell function in order to 'eat' the argument
# that is supplied when $file_magic_command is called.
@@ -3113,7 +4724,7 @@ index 7ed280b..aa5624c 100755
func_win32_libid ()
{
$opt_debug
-@@ -2559,9 +3546,11 @@ func_win32_libid ()
+@@ -2559,9 +3549,11 @@ func_win32_libid ()
win32_libid_type="x86 archive import"
;;
*ar\ archive*) # could be an import, or static
@@ -3127,7 +4738,7 @@ index 7ed280b..aa5624c 100755
$SED -n -e '
1,100{
/ I /{
-@@ -2590,6 +3579,131 @@ func_win32_libid ()
+@@ -2590,6 +3582,131 @@ func_win32_libid ()
$ECHO "$win32_libid_type"
}
@@ -3259,7 +4870,7 @@ index 7ed280b..aa5624c 100755
# func_extract_an_archive dir oldlib
-@@ -2598,7 +3712,18 @@ func_extract_an_archive ()
+@@ -2598,7 +3715,18 @@ func_extract_an_archive ()
$opt_debug
f_ex_an_ar_dir="$1"; shift
f_ex_an_ar_oldlib="$1"
@@ -3279,7 +4890,7 @@ index 7ed280b..aa5624c 100755
if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
:
else
-@@ -2669,7 +3794,7 @@ func_extract_archives ()
+@@ -2669,7 +3797,7 @@ func_extract_archives ()
darwin_file=
darwin_files=
for darwin_file in $darwin_filelist; do
@@ -3288,7 +4899,7 @@ index 7ed280b..aa5624c 100755
$LIPO -create -output "$darwin_file" $darwin_files
done # $darwin_filelist
$RM -rf unfat-$$
-@@ -2684,25 +3809,30 @@ func_extract_archives ()
+@@ -2684,25 +3812,30 @@ func_extract_archives ()
func_extract_an_archive "$my_xdir" "$my_xabs"
;;
esac
@@ -3330,7 +4941,7 @@ index 7ed280b..aa5624c 100755
$ECHO "\
#! $SHELL
-@@ -2718,7 +3848,6 @@ func_emit_wrapper_part1 ()
+@@ -2718,7 +3851,6 @@ func_emit_wrapper_part1 ()
# Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings.
@@ -3338,7 +4949,7 @@ index 7ed280b..aa5624c 100755
sed_quote_subst='$sed_quote_subst'
# Be Bourne compatible
-@@ -2749,31 +3878,132 @@ if test \"\$libtool_install_magic\" = \"$magic\"; then
+@@ -2749,31 +3881,135 @@ if test \"\$libtool_install_magic\" = \"$magic\"; then
else
# When we are sourced in execute mode, \$file and \$ECHO are already set.
if test \"\$libtool_execute_magic\" != \"$magic\"; then
@@ -3461,14 +5072,17 @@ index 7ed280b..aa5624c 100755
+# launches target application with the remaining arguments.
+func_exec_program ()
+{
-+ for lt_wr_arg
-+ do
-+ case \$lt_wr_arg in
-+ --lt-*) ;;
-+ *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
-+ esac
-+ shift
-+ done
++ case \" \$* \" in
++ *\\ --lt-*)
++ for lt_wr_arg
++ do
++ case \$lt_wr_arg in
++ --lt-*) ;;
++ *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
++ esac
++ shift
++ done ;;
++ esac
+ func_exec_program_core \${1+\"\$@\"}
+}
+
@@ -3489,7 +5103,7 @@ index 7ed280b..aa5624c 100755
# If there was a directory component, then change thisdir.
if test \"x\$destdir\" != \"x\$file\"; then
-@@ -2783,30 +4013,13 @@ else
+@@ -2783,30 +4019,13 @@ else
esac
fi
@@ -3523,7 +5137,7 @@ index 7ed280b..aa5624c 100755
if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
# special case for '.'
if test \"\$thisdir\" = \".\"; then
-@@ -2814,7 +4027,7 @@ func_emit_wrapper_part2 ()
+@@ -2814,7 +4033,7 @@ func_emit_wrapper_part2 ()
fi
# remove .libs from thisdir
case \"\$thisdir\" in
@@ -3532,7 +5146,7 @@ index 7ed280b..aa5624c 100755
$objdir ) thisdir=. ;;
esac
fi
-@@ -2869,6 +4082,18 @@ func_emit_wrapper_part2 ()
+@@ -2869,6 +4088,18 @@ func_emit_wrapper_part2 ()
if test -f \"\$progdir/\$program\"; then"
@@ -3551,7 +5165,7 @@ index 7ed280b..aa5624c 100755
# Export our shlibpath_var if we have one.
if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
$ECHO "\
-@@ -2877,254 +4102,29 @@ func_emit_wrapper_part2 ()
+@@ -2877,253 +4108,28 @@ func_emit_wrapper_part2 ()
# Some systems cannot cope with colon-terminated $shlibpath_var
# The second colon is a workaround for a bug in BeOS R4 sed
@@ -3633,8 +5247,8 @@ index 7ed280b..aa5624c 100755
- func_emit_wrapper_part1 "${func_emit_wrapper_arg1}"
- func_emit_wrapper_part2 "${func_emit_wrapper_arg1}"
-}
-
-
+-
+-
-# func_to_host_path arg
-#
-# Convert paths to host format when used with build tools.
@@ -3707,7 +5321,7 @@ index 7ed280b..aa5624c 100755
- fi
-}
-# end: func_to_host_path
--
+
-# func_to_host_pathlist arg
-#
-# Convert pathlists to host format when used with build tools.
@@ -3805,11 +5419,10 @@ index 7ed280b..aa5624c 100755
- fi
-}
-# end: func_to_host_pathlist
--
+
# func_emit_cwrapperexe_src
# emit the source code for a wrapper executable on stdout
- # Must ONLY be called from within func_mode_link because
-@@ -3141,41 +4141,71 @@ func_emit_cwrapperexe_src ()
+@@ -3141,31 +4147,23 @@ func_emit_cwrapperexe_src ()
This wrapper executable should never be moved out of the build directory.
If it is, it will not operate correctly.
@@ -3837,17 +5450,17 @@ index 7ed280b..aa5624c 100755
# include <io.h>
-# define HAVE_SETENV
-# ifdef __STRICT_ANSI__
-+# endif
-+#endif
-+#include <malloc.h>
-+#include <stdarg.h>
-+#include <assert.h>
-+#include <string.h>
-+#include <ctype.h>
-+#include <errno.h>
-+#include <fcntl.h>
-+#include <sys/stat.h>
-+
+-char *realpath (const char *, char *);
+-int putenv (char *);
+-int setenv (const char *, const char *, int);
+-# endif
+ # endif
+ #endif
+ #include <malloc.h>
+@@ -3177,6 +4175,44 @@ int setenv (const char *, const char *, int);
+ #include <fcntl.h>
+ #include <sys/stat.h>
+
+/* declarations of non-ANSI functions */
+#if defined(__MINGW32__)
+# ifdef __STRICT_ANSI__
@@ -3855,11 +5468,10 @@ index 7ed280b..aa5624c 100755
+# endif
+#elif defined(__CYGWIN__)
+# ifdef __STRICT_ANSI__
- char *realpath (const char *, char *);
- int putenv (char *);
- int setenv (const char *, const char *, int);
--# endif
- # endif
++char *realpath (const char *, char *);
++int putenv (char *);
++int setenv (const char *, const char *, int);
++# endif
+/* #elif defined (other platforms) ... */
+#endif
+
@@ -3885,19 +5497,12 @@ index 7ed280b..aa5624c 100755
+# define HAVE_SETENV
+# define FOPEN_WB "wb"
+/* #elif defined (other platforms) ... */
- #endif
--#include <malloc.h>
--#include <stdarg.h>
--#include <assert.h>
--#include <string.h>
--#include <ctype.h>
--#include <errno.h>
--#include <fcntl.h>
--#include <sys/stat.h>
-
++#endif
++
#if defined(PATH_MAX)
# define LT_PATHMAX PATH_MAX
-@@ -3192,14 +4222,7 @@ int setenv (const char *, const char *, int);
+ #elif defined(MAXPATHLEN)
+@@ -3192,14 +4228,7 @@ int setenv (const char *, const char *, int);
# define S_IXGRP 0
#endif
@@ -3913,7 +5518,7 @@ index 7ed280b..aa5624c 100755
#ifndef DIR_SEPARATOR
# define DIR_SEPARATOR '/'
# define PATH_SEPARATOR ':'
-@@ -3230,10 +4253,6 @@ int setenv (const char *, const char *, int);
+@@ -3230,10 +4259,6 @@ int setenv (const char *, const char *, int);
# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
#endif /* PATH_SEPARATOR_2 */
@@ -3924,7 +5529,7 @@ index 7ed280b..aa5624c 100755
#ifndef FOPEN_WB
# define FOPEN_WB "w"
#endif
-@@ -3246,22 +4265,13 @@ int setenv (const char *, const char *, int);
+@@ -3246,22 +4271,13 @@ int setenv (const char *, const char *, int);
if (stale) { free ((void *) stale); stale = 0; } \
} while (0)
@@ -3951,7 +5556,7 @@ index 7ed280b..aa5624c 100755
void *xmalloc (size_t num);
char *xstrdup (const char *string);
-@@ -3271,41 +4281,27 @@ char *chase_symlinks (const char *pathspec);
+@@ -3271,41 +4287,27 @@ char *chase_symlinks (const char *pathspec);
int make_executable (const char *path);
int check_executable (const char *path);
char *strendzap (char *str, const char *pat);
@@ -4002,7 +5607,7 @@ index 7ed280b..aa5624c 100755
EOF
else
cat <<"EOF"
-@@ -3314,10 +4310,10 @@ EOF
+@@ -3314,10 +4316,10 @@ EOF
fi
if test -n "$dllsearchpath"; then
@@ -4015,7 +5620,7 @@ index 7ed280b..aa5624c 100755
EOF
else
cat <<"EOF"
-@@ -3340,24 +4336,10 @@ EOF
+@@ -3340,24 +4342,10 @@ EOF
cat <<"EOF"
#define LTWRAPPER_OPTION_PREFIX "--lt-"
@@ -4041,7 +5646,7 @@ index 7ed280b..aa5624c 100755
int
main (int argc, char *argv[])
-@@ -3374,10 +4356,13 @@ main (int argc, char *argv[])
+@@ -3374,10 +4362,13 @@ main (int argc, char *argv[])
int i;
program_name = (char *) xstrdup (base_name (argv[0]));
@@ -4058,7 +5663,7 @@ index 7ed280b..aa5624c 100755
for (i = 1; i < argc; i++)
{
if (strcmp (argv[i], dumpscript_opt) == 0)
-@@ -3391,25 +4376,57 @@ EOF
+@@ -3391,25 +4382,57 @@ EOF
esac
cat <<"EOF"
@@ -4125,7 +5730,7 @@ index 7ed280b..aa5624c 100755
strendzap (actual_cwrapper_path, actual_cwrapper_name);
/* wrapper name transforms */
-@@ -3427,8 +4444,9 @@ EOF
+@@ -3427,8 +4450,9 @@ EOF
target_name = tmp_pathspec;
tmp_pathspec = 0;
@@ -4137,7 +5742,7 @@ index 7ed280b..aa5624c 100755
EOF
cat <<EOF
-@@ -3478,80 +4496,19 @@ EOF
+@@ -3478,80 +4502,19 @@ EOF
lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
lt_setenv ("DUALCASE", "1"); /* for MSK sh */
@@ -4227,7 +5832,7 @@ index 7ed280b..aa5624c 100755
}
EOF
-@@ -3560,11 +4517,14 @@ EOF
+@@ -3560,11 +4523,14 @@ EOF
mingw*)
cat <<"EOF"
/* execv doesn't actually work on mingw as expected on unix */
@@ -4243,7 +5848,7 @@ index 7ed280b..aa5624c 100755
return 127;
}
return rval;
-@@ -3586,7 +4546,7 @@ xmalloc (size_t num)
+@@ -3586,7 +4552,7 @@ xmalloc (size_t num)
{
void *p = (void *) malloc (num);
if (!p)
@@ -4252,7 +5857,7 @@ index 7ed280b..aa5624c 100755
return p;
}
-@@ -3620,8 +4580,8 @@ check_executable (const char *path)
+@@ -3620,8 +4586,8 @@ check_executable (const char *path)
{
struct stat st;
@@ -4263,7 +5868,7 @@ index 7ed280b..aa5624c 100755
if ((!path) || (!*path))
return 0;
-@@ -3638,8 +4598,8 @@ make_executable (const char *path)
+@@ -3638,8 +4604,8 @@ make_executable (const char *path)
int rval = 0;
struct stat st;
@@ -4274,7 +5879,7 @@ index 7ed280b..aa5624c 100755
if ((!path) || (!*path))
return 0;
-@@ -3665,8 +4625,8 @@ find_executable (const char *wrapper)
+@@ -3665,8 +4631,8 @@ find_executable (const char *wrapper)
int tmp_len;
char *concat_name;
@@ -4285,7 +5890,7 @@ index 7ed280b..aa5624c 100755
if ((wrapper == NULL) || (*wrapper == '\0'))
return NULL;
-@@ -3719,7 +4679,8 @@ find_executable (const char *wrapper)
+@@ -3719,7 +4685,8 @@ find_executable (const char *wrapper)
{
/* empty path: current directory */
if (getcwd (tmp, LT_PATHMAX) == NULL)
@@ -4295,7 +5900,7 @@ index 7ed280b..aa5624c 100755
tmp_len = strlen (tmp);
concat_name =
XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
-@@ -3744,7 +4705,8 @@ find_executable (const char *wrapper)
+@@ -3744,7 +4711,8 @@ find_executable (const char *wrapper)
}
/* Relative path | not found in path: prepend cwd */
if (getcwd (tmp, LT_PATHMAX) == NULL)
@@ -4305,7 +5910,7 @@ index 7ed280b..aa5624c 100755
tmp_len = strlen (tmp);
concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
memcpy (concat_name, tmp, tmp_len);
-@@ -3770,8 +4732,9 @@ chase_symlinks (const char *pathspec)
+@@ -3770,8 +4738,9 @@ chase_symlinks (const char *pathspec)
int has_symlinks = 0;
while (strlen (tmp_pathspec) && !has_symlinks)
{
@@ -4317,7 +5922,7 @@ index 7ed280b..aa5624c 100755
if (lstat (tmp_pathspec, &s) == 0)
{
if (S_ISLNK (s.st_mode) != 0)
-@@ -3793,8 +4756,9 @@ chase_symlinks (const char *pathspec)
+@@ -3793,8 +4762,9 @@ chase_symlinks (const char *pathspec)
}
else
{
@@ -4329,7 +5934,7 @@ index 7ed280b..aa5624c 100755
}
}
XFREE (tmp_pathspec);
-@@ -3807,7 +4771,8 @@ chase_symlinks (const char *pathspec)
+@@ -3807,7 +4777,8 @@ chase_symlinks (const char *pathspec)
tmp_pathspec = realpath (pathspec, buf);
if (tmp_pathspec == 0)
{
@@ -4339,7 +5944,7 @@ index 7ed280b..aa5624c 100755
}
return xstrdup (tmp_pathspec);
#endif
-@@ -3833,11 +4798,25 @@ strendzap (char *str, const char *pat)
+@@ -3833,11 +4804,25 @@ strendzap (char *str, const char *pat)
return str;
}
@@ -4367,7 +5972,7 @@ index 7ed280b..aa5624c 100755
vfprintf (stderr, message, ap);
fprintf (stderr, ".\n");
-@@ -3846,20 +4825,32 @@ lt_error_core (int exit_status, const char *mode,
+@@ -3846,20 +4831,32 @@ lt_error_core (int exit_status, const char *mode,
}
void
@@ -4405,7 +6010,7 @@ index 7ed280b..aa5624c 100755
{
#ifdef HAVE_SETENV
/* always make a copy, for consistency with !HAVE_SETENV */
-@@ -3904,95 +4895,12 @@ lt_extend_str (const char *orig_value, const char *add, int to_end)
+@@ -3904,95 +4901,12 @@ lt_extend_str (const char *orig_value, const char *add, int to_end)
return new_value;
}
@@ -4504,7 +6109,7 @@ index 7ed280b..aa5624c 100755
if (name && *name && value && *value)
{
-@@ -4011,9 +4919,9 @@ lt_update_exe_path (const char *name, const char *value)
+@@ -4011,9 +4925,9 @@ lt_update_exe_path (const char *name, const char *value)
void
lt_update_lib_path (const char *name, const char *value)
{
@@ -4517,7 +6122,7 @@ index 7ed280b..aa5624c 100755
if (name && *name && value && *value)
{
-@@ -4023,11 +4931,152 @@ lt_update_lib_path (const char *name, const char *value)
+@@ -4023,11 +4937,158 @@ lt_update_lib_path (const char *name, const char *value)
}
}
@@ -4641,15 +6246,21 @@ index 7ed280b..aa5624c 100755
+EOF
+ ;;
+ esac
-+
+
+ cat <<"EOF"
+void lt_dump_script (FILE* f)
+{
+EOF
+ func_emit_wrapper yes |
-+ $SED -e 's/\([\\"]\)/\\\1/g' \
-+ -e 's/^/ fputs ("/' -e 's/$/\\n", f);/'
-
++ $SED -n -e '
++s/^\(.\{79\}\)\(..*\)/\1\
++\2/
++h
++s/\([\\"]\)/\\\1/g
++s/$/\\n/
++s/\([^\n]*\).*/ fputs ("\1", f);/p
++g
++D'
+ cat <<"EOF"
+}
EOF
@@ -4670,7 +6281,7 @@ index 7ed280b..aa5624c 100755
# func_mode_link arg...
func_mode_link ()
{
-@@ -4072,6 +5121,7 @@ func_mode_link ()
+@@ -4072,6 +5133,7 @@ func_mode_link ()
new_inherited_linker_flags=
avoid_version=no
@@ -4678,7 +6289,7 @@ index 7ed280b..aa5624c 100755
dlfiles=
dlprefiles=
dlself=no
-@@ -4164,6 +5214,11 @@ func_mode_link ()
+@@ -4164,6 +5226,11 @@ func_mode_link ()
esac
case $prev in
@@ -4690,7 +6301,7 @@ index 7ed280b..aa5624c 100755
dlfiles|dlprefiles)
if test "$preload" = no; then
# Add the symbol object into the linking commands.
-@@ -4195,9 +5250,9 @@ func_mode_link ()
+@@ -4195,9 +5262,9 @@ func_mode_link ()
;;
*)
if test "$prev" = dlfiles; then
@@ -4702,7 +6313,7 @@ index 7ed280b..aa5624c 100755
fi
prev=
continue
-@@ -4221,7 +5276,7 @@ func_mode_link ()
+@@ -4221,7 +5288,7 @@ func_mode_link ()
*-*-darwin*)
case "$deplibs " in
*" $qarg.ltframework "*) ;;
@@ -4711,7 +6322,7 @@ index 7ed280b..aa5624c 100755
;;
esac
;;
-@@ -4240,7 +5295,7 @@ func_mode_link ()
+@@ -4240,7 +5307,7 @@ func_mode_link ()
moreargs=
for fil in `cat "$save_arg"`
do
@@ -4720,7 +6331,7 @@ index 7ed280b..aa5624c 100755
arg=$fil
# A libtool-controlled object.
-@@ -4269,7 +5324,7 @@ func_mode_link ()
+@@ -4269,7 +5336,7 @@ func_mode_link ()
if test "$prev" = dlfiles; then
if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
@@ -4729,7 +6340,7 @@ index 7ed280b..aa5624c 100755
prev=
continue
else
-@@ -4281,7 +5336,7 @@ func_mode_link ()
+@@ -4281,7 +5348,7 @@ func_mode_link ()
# CHECK ME: I think I busted this. -Ossama
if test "$prev" = dlprefiles; then
# Preload the old-style object.
@@ -4738,7 +6349,7 @@ index 7ed280b..aa5624c 100755
prev=
fi
-@@ -4351,12 +5406,12 @@ func_mode_link ()
+@@ -4351,12 +5418,12 @@ func_mode_link ()
if test "$prev" = rpath; then
case "$rpath " in
*" $arg "*) ;;
@@ -4753,7 +6364,7 @@ index 7ed280b..aa5624c 100755
esac
fi
prev=
-@@ -4368,28 +5423,28 @@ func_mode_link ()
+@@ -4368,28 +5435,28 @@ func_mode_link ()
continue
;;
weak)
@@ -4788,7 +6399,7 @@ index 7ed280b..aa5624c 100755
prev=
func_append compile_command " $wl$qarg"
func_append finalize_command " $wl$qarg"
-@@ -4425,6 +5480,11 @@ func_mode_link ()
+@@ -4425,6 +5492,11 @@ func_mode_link ()
continue
;;
@@ -4800,7 +6411,7 @@ index 7ed280b..aa5624c 100755
-dlopen)
prev=dlfiles
continue
-@@ -4475,15 +5535,16 @@ func_mode_link ()
+@@ -4475,15 +5547,16 @@ func_mode_link ()
;;
-L*)
@@ -4820,7 +6431,7 @@ index 7ed280b..aa5624c 100755
# We need an absolute path.
case $dir in
[\\/]* | [A-Za-z]:[\\/]*) ;;
-@@ -4495,24 +5556,30 @@ func_mode_link ()
+@@ -4495,24 +5568,30 @@ func_mode_link ()
;;
esac
case "$deplibs " in
@@ -4857,7 +6468,7 @@ index 7ed280b..aa5624c 100755
esac
;;
esac
-@@ -4522,7 +5589,7 @@ func_mode_link ()
+@@ -4522,7 +5601,7 @@ func_mode_link ()
-l*)
if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
case $host in
@@ -4866,7 +6477,7 @@ index 7ed280b..aa5624c 100755
# These systems don't actually have a C or math library (as such)
continue
;;
-@@ -4536,7 +5603,7 @@ func_mode_link ()
+@@ -4536,7 +5615,7 @@ func_mode_link ()
;;
*-*-rhapsody* | *-*-darwin1.[012])
# Rhapsody C and math libraries are in the System framework
@@ -4875,7 +6486,7 @@ index 7ed280b..aa5624c 100755
continue
;;
*-*-sco3.2v5* | *-*-sco5v6*)
-@@ -4556,7 +5623,7 @@ func_mode_link ()
+@@ -4556,7 +5635,7 @@ func_mode_link ()
;;
esac
fi
@@ -4884,7 +6495,7 @@ index 7ed280b..aa5624c 100755
continue
;;
-@@ -4568,8 +5635,8 @@ func_mode_link ()
+@@ -4568,21 +5647,22 @@ func_mode_link ()
# Tru64 UNIX uses -model [arg] to determine the layout of C++
# classes, name mangling, and exception handling.
# Darwin uses the -arch flag to determine output architecture.
@@ -4895,11 +6506,13 @@ index 7ed280b..aa5624c 100755
func_append compile_command " $arg"
func_append finalize_command " $arg"
prev=xcompiler
-@@ -4577,12 +5644,12 @@ func_mode_link ()
+ continue
;;
- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
- compiler_flags="$compiler_flags $arg"
++ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
++ |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
+ func_append compiler_flags " $arg"
func_append compile_command " $arg"
func_append finalize_command " $arg"
@@ -4910,7 +6523,7 @@ index 7ed280b..aa5624c 100755
esac
continue
;;
-@@ -4649,13 +5716,17 @@ func_mode_link ()
+@@ -4649,13 +5729,17 @@ func_mode_link ()
# We need an absolute path.
case $dir in
[\\/]* | [A-Za-z]:[\\/]*) ;;
@@ -4929,7 +6542,7 @@ index 7ed280b..aa5624c 100755
esac
continue
;;
-@@ -4708,8 +5779,8 @@ func_mode_link ()
+@@ -4708,8 +5792,8 @@ func_mode_link ()
for flag in $args; do
IFS="$save_ifs"
func_quote_for_eval "$flag"
@@ -4940,7 +6553,7 @@ index 7ed280b..aa5624c 100755
done
IFS="$save_ifs"
func_stripname ' ' '' "$arg"
-@@ -4724,9 +5795,9 @@ func_mode_link ()
+@@ -4724,9 +5808,9 @@ func_mode_link ()
for flag in $args; do
IFS="$save_ifs"
func_quote_for_eval "$flag"
@@ -4953,7 +6566,7 @@ index 7ed280b..aa5624c 100755
done
IFS="$save_ifs"
func_stripname ' ' '' "$arg"
-@@ -4754,23 +5825,27 @@ func_mode_link ()
+@@ -4754,23 +5838,27 @@ func_mode_link ()
arg="$func_quote_for_eval_result"
;;
@@ -4993,7 +6606,7 @@ index 7ed280b..aa5624c 100755
continue
;;
-@@ -4782,7 +5857,7 @@ func_mode_link ()
+@@ -4782,7 +5870,7 @@ func_mode_link ()
*.$objext)
# A standard object.
@@ -5002,7 +6615,7 @@ index 7ed280b..aa5624c 100755
;;
*.lo)
-@@ -4813,7 +5888,7 @@ func_mode_link ()
+@@ -4813,7 +5901,7 @@ func_mode_link ()
if test "$prev" = dlfiles; then
if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
@@ -5011,7 +6624,7 @@ index 7ed280b..aa5624c 100755
prev=
continue
else
-@@ -4825,7 +5900,7 @@ func_mode_link ()
+@@ -4825,7 +5913,7 @@ func_mode_link ()
# CHECK ME: I think I busted this. -Ossama
if test "$prev" = dlprefiles; then
# Preload the old-style object.
@@ -5020,7 +6633,7 @@ index 7ed280b..aa5624c 100755
prev=
fi
-@@ -4870,24 +5945,25 @@ func_mode_link ()
+@@ -4870,24 +5958,25 @@ func_mode_link ()
*.$libext)
# An archive.
@@ -5051,7 +6664,7 @@ index 7ed280b..aa5624c 100755
fi
continue
;;
-@@ -4925,7 +6001,7 @@ func_mode_link ()
+@@ -4925,7 +6014,7 @@ func_mode_link ()
if test -n "$shlibpath_var"; then
# get the directories listed in $shlibpath_var
@@ -5060,7 +6673,7 @@ index 7ed280b..aa5624c 100755
else
shlib_search_path=
fi
-@@ -4934,6 +6010,8 @@ func_mode_link ()
+@@ -4934,6 +6023,8 @@ func_mode_link ()
func_dirname "$output" "/" ""
output_objdir="$func_dirname_result$objdir"
@@ -5069,7 +6682,7 @@ index 7ed280b..aa5624c 100755
# Create the object directory.
func_mkdir_p "$output_objdir"
-@@ -4954,12 +6032,12 @@ func_mode_link ()
+@@ -4954,12 +6045,12 @@ func_mode_link ()
# Find all interdependent deplibs by searching for libraries
# that are linked more than once (e.g. -la -lb -la)
for deplib in $deplibs; do
@@ -5085,7 +6698,7 @@ index 7ed280b..aa5624c 100755
done
if test "$linkmode" = lib; then
-@@ -4972,9 +6050,9 @@ func_mode_link ()
+@@ -4972,9 +6063,9 @@ func_mode_link ()
if $opt_duplicate_compiler_generated_deps; then
for pre_post_dep in $predeps $postdeps; do
case "$pre_post_deps " in
@@ -5097,7 +6710,7 @@ index 7ed280b..aa5624c 100755
done
fi
pre_post_deps=
-@@ -5033,10 +6111,7 @@ func_mode_link ()
+@@ -5033,10 +6124,7 @@ func_mode_link ()
case $pass in
dlopen) libs="$dlfiles" ;;
dlpreopen) libs="$dlprefiles" ;;
@@ -5109,7 +6722,7 @@ index 7ed280b..aa5624c 100755
esac
fi
if test "$linkmode,$pass" = "lib,dlpreopen"; then
-@@ -5044,17 +6119,19 @@ func_mode_link ()
+@@ -5044,17 +6132,19 @@ func_mode_link ()
for lib in $dlprefiles; do
# Ignore non-libtool-libs
dependency_libs=
@@ -5132,7 +6745,14 @@ index 7ed280b..aa5624c 100755
esac
done
done
-@@ -5075,11 +6152,11 @@ func_mode_link ()
+@@ -5070,16 +6160,17 @@ func_mode_link ()
+ lib=
+ found=no
+ case $deplib in
+- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
++ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
++ |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
+ if test "$linkmode,$pass" = "prog,link"; then
compile_deplibs="$deplib $compile_deplibs"
finalize_deplibs="$deplib $finalize_deplibs"
else
@@ -5146,7 +6766,7 @@ index 7ed280b..aa5624c 100755
esac
fi
fi
-@@ -5164,7 +6241,7 @@ func_mode_link ()
+@@ -5164,7 +6255,7 @@ func_mode_link ()
if test "$linkmode" = lib ; then
case "$new_inherited_linker_flags " in
*" $deplib "*) ;;
@@ -5155,7 +6775,7 @@ index 7ed280b..aa5624c 100755
esac
fi
fi
-@@ -5177,7 +6254,8 @@ func_mode_link ()
+@@ -5177,7 +6268,8 @@ func_mode_link ()
test "$pass" = conv && continue
newdependency_libs="$deplib $newdependency_libs"
func_stripname '-L' '' "$deplib"
@@ -5165,7 +6785,7 @@ index 7ed280b..aa5624c 100755
;;
prog)
if test "$pass" = conv; then
-@@ -5191,7 +6269,8 @@ func_mode_link ()
+@@ -5191,7 +6283,8 @@ func_mode_link ()
finalize_deplibs="$deplib $finalize_deplibs"
fi
func_stripname '-L' '' "$deplib"
@@ -5175,7 +6795,7 @@ index 7ed280b..aa5624c 100755
;;
*)
func_warning "\`-L' is ignored for archives/objects"
-@@ -5202,17 +6281,21 @@ func_mode_link ()
+@@ -5202,17 +6295,21 @@ func_mode_link ()
-R*)
if test "$pass" = link; then
func_stripname '-R' '' "$deplib"
@@ -5200,7 +6820,7 @@ index 7ed280b..aa5624c 100755
*.$libext)
if test "$pass" = conv; then
deplibs="$deplib $deplibs"
-@@ -5230,7 +6313,7 @@ func_mode_link ()
+@@ -5230,7 +6327,7 @@ func_mode_link ()
match_pattern*)
set dummy $deplibs_check_method; shift
match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
@@ -5209,7 +6829,7 @@ index 7ed280b..aa5624c 100755
| $EGREP "$match_pattern_regex" > /dev/null; then
valid_a_lib=yes
fi
-@@ -5240,15 +6323,15 @@ func_mode_link ()
+@@ -5240,15 +6337,15 @@ func_mode_link ()
;;
esac
if test "$valid_a_lib" != yes; then
@@ -5232,7 +6852,7 @@ index 7ed280b..aa5624c 100755
$ECHO "*** Warning: Linking the shared library $output against the"
$ECHO "*** static library $deplib is not portable!"
deplibs="$deplib $deplibs"
-@@ -5275,11 +6358,11 @@ func_mode_link ()
+@@ -5275,11 +6372,11 @@ func_mode_link ()
if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
# If there is no dlopen support or we're linking statically,
# we need to preload.
@@ -5246,7 +6866,7 @@ index 7ed280b..aa5624c 100755
fi
fi
continue
-@@ -5321,20 +6404,20 @@ func_mode_link ()
+@@ -5321,20 +6418,20 @@ func_mode_link ()
# Convert "-framework foo" to "foo.ltframework"
if test -n "$inherited_linker_flags"; then
@@ -5272,7 +6892,7 @@ index 7ed280b..aa5624c 100755
fi
if test "$pass" = conv; then
-@@ -5345,30 +6428,36 @@ func_mode_link ()
+@@ -5345,30 +6442,36 @@ func_mode_link ()
func_fatal_error "cannot find name of link library for \`$lib'"
fi
# It is a libtool convenience library, so add in its objects.
@@ -5324,7 +6944,7 @@ index 7ed280b..aa5624c 100755
if test -z "$linklib"; then
func_fatal_error "cannot find name of link library for \`$lib'"
fi
-@@ -5385,9 +6474,9 @@ func_mode_link ()
+@@ -5385,9 +6488,9 @@ func_mode_link ()
# statically, we need to preload. We also need to preload any
# dependent libraries so libltdl's deplib preloader doesn't
# bomb out in the load deplibs phase.
@@ -5336,7 +6956,7 @@ index 7ed280b..aa5624c 100755
fi
continue
fi # $pass = dlopen
-@@ -5409,14 +6498,14 @@ func_mode_link ()
+@@ -5409,14 +6512,14 @@ func_mode_link ()
# Find the relevant object directory and library name.
if test "X$installed" = Xyes; then
@@ -5354,7 +6974,7 @@ index 7ed280b..aa5624c 100755
fi
test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
else
-@@ -5424,12 +6513,12 @@ func_mode_link ()
+@@ -5424,12 +6527,12 @@ func_mode_link ()
dir="$ladir"
absdir="$abs_ladir"
# Remove this search path later
@@ -5369,7 +6989,7 @@ index 7ed280b..aa5624c 100755
fi
fi # $installed = yes
func_stripname 'lib' '.la' "$laname"
-@@ -5440,20 +6529,46 @@ func_mode_link ()
+@@ -5440,20 +6543,46 @@ func_mode_link ()
if test -z "$libdir" && test "$linkmode" = prog; then
func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
fi
@@ -5430,7 +7050,7 @@ index 7ed280b..aa5624c 100755
fi # $pass = dlpreopen
if test -z "$libdir"; then
-@@ -5471,7 +6586,7 @@ func_mode_link ()
+@@ -5471,7 +6600,7 @@ func_mode_link ()
if test "$linkmode" = prog && test "$pass" != link; then
@@ -5439,7 +7059,7 @@ index 7ed280b..aa5624c 100755
deplibs="$lib $deplibs"
linkalldeplibs=no
-@@ -5484,7 +6599,8 @@ func_mode_link ()
+@@ -5484,7 +6613,8 @@ func_mode_link ()
for deplib in $dependency_libs; do
case $deplib in
-L*) func_stripname '-L' '' "$deplib"
@@ -5449,7 +7069,7 @@ index 7ed280b..aa5624c 100755
;;
esac
# Need to link against all dependency_libs?
-@@ -5495,12 +6611,12 @@ func_mode_link ()
+@@ -5495,12 +6625,12 @@ func_mode_link ()
# or/and link against static libraries
newdependency_libs="$deplib $newdependency_libs"
fi
@@ -5465,7 +7085,7 @@ index 7ed280b..aa5624c 100755
done # for deplib
continue
fi # $linkmode = prog...
-@@ -5515,7 +6631,7 @@ func_mode_link ()
+@@ -5515,7 +6645,7 @@ func_mode_link ()
# Make sure the rpath contains only unique directories.
case "$temp_rpath:" in
*"$absdir:"*) ;;
@@ -5474,7 +7094,7 @@ index 7ed280b..aa5624c 100755
esac
fi
-@@ -5527,7 +6643,7 @@ func_mode_link ()
+@@ -5527,7 +6657,7 @@ func_mode_link ()
*)
case "$compile_rpath " in
*" $absdir "*) ;;
@@ -5483,7 +7103,7 @@ index 7ed280b..aa5624c 100755
esac
;;
esac
-@@ -5536,7 +6652,7 @@ func_mode_link ()
+@@ -5536,7 +6666,7 @@ func_mode_link ()
*)
case "$finalize_rpath " in
*" $libdir "*) ;;
@@ -5492,7 +7112,7 @@ index 7ed280b..aa5624c 100755
esac
;;
esac
-@@ -5561,12 +6677,12 @@ func_mode_link ()
+@@ -5561,12 +6691,12 @@ func_mode_link ()
case $host in
*cygwin* | *mingw* | *cegcc*)
# No point in relinking DLLs because paths are not encoded
@@ -5507,7 +7127,7 @@ index 7ed280b..aa5624c 100755
need_relink=yes
fi
;;
-@@ -5583,7 +6699,7 @@ func_mode_link ()
+@@ -5583,7 +6713,7 @@ func_mode_link ()
fi
done
if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
@@ -5516,7 +7136,7 @@ index 7ed280b..aa5624c 100755
if test "$linkmode" = prog; then
$ECHO "*** Warning: Linking the executable $output against the loadable module"
else
-@@ -5601,7 +6717,7 @@ func_mode_link ()
+@@ -5601,7 +6731,7 @@ func_mode_link ()
*)
case "$compile_rpath " in
*" $absdir "*) ;;
@@ -5525,7 +7145,7 @@ index 7ed280b..aa5624c 100755
esac
;;
esac
-@@ -5610,7 +6726,7 @@ func_mode_link ()
+@@ -5610,7 +6740,7 @@ func_mode_link ()
*)
case "$finalize_rpath " in
*" $libdir "*) ;;
@@ -5534,7 +7154,7 @@ index 7ed280b..aa5624c 100755
esac
;;
esac
-@@ -5664,7 +6780,7 @@ func_mode_link ()
+@@ -5664,7 +6794,7 @@ func_mode_link ()
linklib=$newlib
fi # test -n "$old_archive_from_expsyms_cmds"
@@ -5543,7 +7163,7 @@ index 7ed280b..aa5624c 100755
add_shlibpath=
add_dir=
add=
-@@ -5686,9 +6802,9 @@ func_mode_link ()
+@@ -5686,9 +6816,9 @@ func_mode_link ()
if test "X$dlopenmodule" != "X$lib"; then
$ECHO "*** Warning: lib $linklib is a module, not a shared library"
if test -z "$old_library" ; then
@@ -5556,7 +7176,13 @@ index 7ed280b..aa5624c 100755
else
add="$dir/$old_library"
fi
-@@ -5720,7 +6836,7 @@ func_mode_link ()
+@@ -5715,12 +6845,12 @@ func_mode_link ()
+ test "$hardcode_direct_absolute" = no; then
+ add="$dir/$linklib"
+ elif test "$hardcode_minus_L" = yes; then
+- add_dir="-L$dir"
++ add_dir="-L$absdir"
+ # Try looking first in the location we're being installed to.
if test -n "$inst_prefix_dir"; then
case $libdir in
[\\/]*)
@@ -5565,7 +7191,7 @@ index 7ed280b..aa5624c 100755
;;
esac
fi
-@@ -5742,7 +6858,7 @@ func_mode_link ()
+@@ -5742,7 +6872,7 @@ func_mode_link ()
if test -n "$add_shlibpath"; then
case :$compile_shlibpath: in
*":$add_shlibpath:"*) ;;
@@ -5574,7 +7200,7 @@ index 7ed280b..aa5624c 100755
esac
fi
if test "$linkmode" = prog; then
-@@ -5756,13 +6872,13 @@ func_mode_link ()
+@@ -5756,13 +6886,13 @@ func_mode_link ()
test "$hardcode_shlibpath_var" = yes; then
case :$finalize_shlibpath: in
*":$libdir:"*) ;;
@@ -5590,7 +7216,7 @@ index 7ed280b..aa5624c 100755
add_shlibpath=
add_dir=
add=
-@@ -5776,7 +6892,7 @@ func_mode_link ()
+@@ -5776,7 +6906,7 @@ func_mode_link ()
elif test "$hardcode_shlibpath_var" = yes; then
case :$finalize_shlibpath: in
*":$libdir:"*) ;;
@@ -5599,7 +7225,7 @@ index 7ed280b..aa5624c 100755
esac
add="-l$name"
elif test "$hardcode_automatic" = yes; then
-@@ -5793,7 +6909,7 @@ func_mode_link ()
+@@ -5793,7 +6923,7 @@ func_mode_link ()
if test -n "$inst_prefix_dir"; then
case $libdir in
[\\/]*)
@@ -5608,7 +7234,7 @@ index 7ed280b..aa5624c 100755
;;
esac
fi
-@@ -5828,21 +6944,21 @@ func_mode_link ()
+@@ -5828,21 +6958,21 @@ func_mode_link ()
# Just print a warning and add the library to dependency_libs so
# that the program can be linked against the static library.
@@ -5642,7 +7268,7 @@ index 7ed280b..aa5624c 100755
fi
if test "$build_old_libs" = no; then
build_libtool_libs=module
-@@ -5870,27 +6986,33 @@ func_mode_link ()
+@@ -5870,27 +7000,33 @@ func_mode_link ()
temp_xrpath=$func_stripname_result
case " $xrpath " in
*" $temp_xrpath "*) ;;
@@ -5682,7 +7308,7 @@ index 7ed280b..aa5624c 100755
done
if test "$link_all_deplibs" != no; then
-@@ -5900,8 +7022,10 @@ func_mode_link ()
+@@ -5900,8 +7036,10 @@ func_mode_link ()
case $deplib in
-L*) path="$deplib" ;;
*.la)
@@ -5694,7 +7320,7 @@ index 7ed280b..aa5624c 100755
# We need an absolute path.
case $dir in
[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
-@@ -5928,8 +7052,8 @@ func_mode_link ()
+@@ -5928,8 +7066,8 @@ func_mode_link ()
if test -z "$darwin_install_name"; then
darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
fi
@@ -5705,7 +7331,7 @@ index 7ed280b..aa5624c 100755
path=
fi
fi
-@@ -5962,7 +7086,7 @@ func_mode_link ()
+@@ -5962,7 +7100,7 @@ func_mode_link ()
compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
else
@@ -5714,7 +7340,7 @@ index 7ed280b..aa5624c 100755
fi
fi
dependency_libs="$newdependency_libs"
-@@ -5979,7 +7103,7 @@ func_mode_link ()
+@@ -5979,7 +7117,7 @@ func_mode_link ()
for dir in $newlib_search_path; do
case "$lib_search_path " in
*" $dir "*) ;;
@@ -5723,7 +7349,7 @@ index 7ed280b..aa5624c 100755
esac
done
newlib_search_path=
-@@ -6037,10 +7161,10 @@ func_mode_link ()
+@@ -6037,10 +7175,10 @@ func_mode_link ()
-L*)
case " $tmp_libs " in
*" $deplib "*) ;;
@@ -5736,7 +7362,7 @@ index 7ed280b..aa5624c 100755
esac
done
eval $var=\"$tmp_libs\"
-@@ -6056,7 +7180,7 @@ func_mode_link ()
+@@ -6056,7 +7194,7 @@ func_mode_link ()
;;
esac
if test -n "$i" ; then
@@ -5745,7 +7371,7 @@ index 7ed280b..aa5624c 100755
fi
done
dependency_libs=$tmp_libs
-@@ -6097,7 +7221,7 @@ func_mode_link ()
+@@ -6097,7 +7235,7 @@ func_mode_link ()
# Now set the variables for building old libraries.
build_libtool_libs=no
oldlibs="$output"
@@ -5754,7 +7380,7 @@ index 7ed280b..aa5624c 100755
;;
lib)
-@@ -6130,10 +7254,10 @@ func_mode_link ()
+@@ -6130,10 +7268,10 @@ func_mode_link ()
if test "$deplibs_check_method" != pass_all; then
func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"
else
@@ -5767,7 +7393,14 @@ index 7ed280b..aa5624c 100755
fi
fi
-@@ -6198,7 +7322,7 @@ func_mode_link ()
+@@ -6192,13 +7330,14 @@ func_mode_link ()
+ # which has an extra 1 added just for fun
+ #
+ case $version_type in
++ # correct linux to gnu/linux during the next big refactor
+ darwin|linux|osf|windows|none)
+ func_arith $number_major + $number_minor
+ current=$func_arith_result
age="$number_minor"
revision="$number_revision"
;;
@@ -5776,7 +7409,7 @@ index 7ed280b..aa5624c 100755
current="$number_major"
revision="$number_minor"
age="0"
-@@ -6210,9 +7334,6 @@ func_mode_link ()
+@@ -6210,9 +7349,6 @@ func_mode_link ()
revision="$number_minor"
lt_irix_increment=no
;;
@@ -5786,7 +7419,16 @@ index 7ed280b..aa5624c 100755
esac
;;
no)
-@@ -6334,7 +7455,7 @@ func_mode_link ()
+@@ -6311,7 +7447,7 @@ func_mode_link ()
+ versuffix="$major.$revision"
+ ;;
+
+- linux)
++ linux) # correct to gnu/linux during the next big refactor
+ func_arith $current - $age
+ major=.$func_arith_result
+ versuffix="$major.$age.$revision"
+@@ -6334,7 +7470,7 @@ func_mode_link ()
done
# Make executables depend on our current version.
@@ -5795,7 +7437,7 @@ index 7ed280b..aa5624c 100755
;;
qnx)
-@@ -6402,10 +7523,10 @@ func_mode_link ()
+@@ -6402,10 +7538,10 @@ func_mode_link ()
fi
func_generate_dlsyms "$libname" "$libname" "yes"
@@ -5808,7 +7450,7 @@ index 7ed280b..aa5624c 100755
# Remove our outputs, but don't remove object files since they
# may have been created when compiling PIC objects.
removelist=
-@@ -6421,7 +7542,7 @@ func_mode_link ()
+@@ -6421,7 +7557,7 @@ func_mode_link ()
continue
fi
fi
@@ -5817,7 +7459,7 @@ index 7ed280b..aa5624c 100755
;;
*) ;;
esac
-@@ -6432,27 +7553,28 @@ func_mode_link ()
+@@ -6432,27 +7568,28 @@ func_mode_link ()
# Now set the variables for building old libraries.
if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
@@ -5853,7 +7495,7 @@ index 7ed280b..aa5624c 100755
esac
done
if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
-@@ -6466,7 +7588,7 @@ func_mode_link ()
+@@ -6466,7 +7603,7 @@ func_mode_link ()
for lib in $old_dlfiles; do
case " $dlprefiles $dlfiles " in
*" $lib "*) ;;
@@ -5862,7 +7504,7 @@ index 7ed280b..aa5624c 100755
esac
done
-@@ -6476,19 +7598,19 @@ func_mode_link ()
+@@ -6476,19 +7613,19 @@ func_mode_link ()
for lib in $old_dlprefiles; do
case "$dlprefiles " in
*" $lib "*) ;;
@@ -5885,7 +7527,7 @@ index 7ed280b..aa5624c 100755
;;
*-*-netbsd*)
# Don't link with libc until the a.out ld.so is fixed.
-@@ -6505,7 +7627,7 @@ func_mode_link ()
+@@ -6505,7 +7642,7 @@ func_mode_link ()
*)
# Add libc to deplibs on all other systems if necessary.
if test "$build_libtool_need_lc" = "yes"; then
@@ -5894,7 +7536,7 @@ index 7ed280b..aa5624c 100755
fi
;;
esac
-@@ -6554,7 +7676,7 @@ EOF
+@@ -6554,7 +7691,7 @@ EOF
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
*" $i "*)
@@ -5903,7 +7545,7 @@ index 7ed280b..aa5624c 100755
i=""
;;
esac
-@@ -6565,21 +7687,21 @@ EOF
+@@ -6565,21 +7702,21 @@ EOF
set dummy $deplib_matches; shift
deplib_match=$1
if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
@@ -5933,7 +7575,7 @@ index 7ed280b..aa5624c 100755
;;
esac
done
-@@ -6597,7 +7719,7 @@ EOF
+@@ -6597,7 +7734,7 @@ EOF
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
*" $i "*)
@@ -5942,7 +7584,7 @@ index 7ed280b..aa5624c 100755
i=""
;;
esac
-@@ -6608,29 +7730,29 @@ EOF
+@@ -6608,29 +7745,29 @@ EOF
set dummy $deplib_matches; shift
deplib_match=$1
if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
@@ -5984,7 +7626,7 @@ index 7ed280b..aa5624c 100755
;;
esac
done
-@@ -6647,15 +7769,27 @@ EOF
+@@ -6647,15 +7784,27 @@ EOF
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
*" $a_deplib "*)
@@ -6014,7 +7656,7 @@ index 7ed280b..aa5624c 100755
for potent_lib in $potential_libs; do
# Follow soft links.
if ls -lLd "$potent_lib" 2>/dev/null |
-@@ -6672,13 +7806,13 @@ EOF
+@@ -6672,13 +7821,13 @@ EOF
potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
case $potliblink in
[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
@@ -6030,7 +7672,7 @@ index 7ed280b..aa5624c 100755
a_deplib=""
break 2
fi
-@@ -6687,12 +7821,12 @@ EOF
+@@ -6687,12 +7836,12 @@ EOF
fi
if test -n "$a_deplib" ; then
droppeddeps=yes
@@ -6048,7 +7690,7 @@ index 7ed280b..aa5624c 100755
if test -z "$potlib" ; then
$ECHO "*** with $libname but no candidates were found. (...for file magic test)"
else
-@@ -6703,7 +7837,7 @@ EOF
+@@ -6703,7 +7852,7 @@ EOF
;;
*)
# Add a -L argument.
@@ -6057,7 +7699,7 @@ index 7ed280b..aa5624c 100755
;;
esac
done # Gone through all deplibs.
-@@ -6719,7 +7853,7 @@ EOF
+@@ -6719,7 +7868,7 @@ EOF
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
*" $a_deplib "*)
@@ -6066,7 +7708,7 @@ index 7ed280b..aa5624c 100755
a_deplib=""
;;
esac
-@@ -6730,9 +7864,9 @@ EOF
+@@ -6730,9 +7879,9 @@ EOF
potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
for potent_lib in $potential_libs; do
potlib="$potent_lib" # see symlink-check above in file_magic test
@@ -6078,7 +7720,7 @@ index 7ed280b..aa5624c 100755
a_deplib=""
break 2
fi
-@@ -6741,12 +7875,12 @@ EOF
+@@ -6741,12 +7890,12 @@ EOF
fi
if test -n "$a_deplib" ; then
droppeddeps=yes
@@ -6096,7 +7738,7 @@ index 7ed280b..aa5624c 100755
if test -z "$potlib" ; then
$ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
else
-@@ -6757,32 +7891,32 @@ EOF
+@@ -6757,32 +7906,32 @@ EOF
;;
*)
# Add a -L argument.
@@ -6140,7 +7782,7 @@ index 7ed280b..aa5624c 100755
;;
esac
versuffix=$versuffix_save
-@@ -6794,23 +7928,23 @@ EOF
+@@ -6794,23 +7943,23 @@ EOF
case $host in
*-*-rhapsody* | *-*-darwin1.[012])
# On Rhapsody replace the C library with the System framework
@@ -6174,7 +7816,7 @@ index 7ed280b..aa5624c 100755
fi
if test "$build_old_libs" = no; then
oldlibs="$output_objdir/$libname.$libext"
-@@ -6820,16 +7954,16 @@ EOF
+@@ -6820,16 +7969,16 @@ EOF
build_libtool_libs=no
fi
else
@@ -6199,7 +7841,7 @@ index 7ed280b..aa5624c 100755
if test "$build_old_libs" = no; then
oldlibs="$output_objdir/$libname.$libext"
build_libtool_libs=module
-@@ -6846,9 +7980,9 @@ EOF
+@@ -6846,9 +7995,9 @@ EOF
# Time to change all our "foo.ltframework" stuff back to "-framework foo"
case $host in
*-*-darwin*)
@@ -6212,7 +7854,7 @@ index 7ed280b..aa5624c 100755
;;
esac
-@@ -6861,7 +7995,7 @@ EOF
+@@ -6861,7 +8010,7 @@ EOF
*)
case " $deplibs " in
*" -L$path/$objdir "*)
@@ -6221,7 +7863,7 @@ index 7ed280b..aa5624c 100755
esac
;;
esac
-@@ -6871,10 +8005,10 @@ EOF
+@@ -6871,10 +8020,10 @@ EOF
-L*)
case " $new_libs " in
*" $deplib "*) ;;
@@ -6234,7 +7876,17 @@ index 7ed280b..aa5624c 100755
esac
done
deplibs="$new_libs"
-@@ -6891,10 +8025,12 @@ EOF
+@@ -6886,15 +8035,22 @@ EOF
+
+ # Test again, we may have decided not to build it any more
+ if test "$build_libtool_libs" = yes; then
++ # Remove ${wl} instances when linking with ld.
++ # FIXME: should test the right _cmds variable.
++ case $archive_cmds in
++ *\$LD\ *) wl= ;;
++ esac
+ if test "$hardcode_into_libs" = yes; then
+ # Hardcode the library paths
hardcode_libdirs=
dep_rpath=
rpath="$finalize_rpath"
@@ -6248,7 +7900,7 @@ index 7ed280b..aa5624c 100755
if test -z "$hardcode_libdirs"; then
hardcode_libdirs="$libdir"
else
-@@ -6903,18 +8039,18 @@ EOF
+@@ -6903,18 +8059,18 @@ EOF
*"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
;;
*)
@@ -6266,11 +7918,22 @@ index 7ed280b..aa5624c 100755
case "$perm_rpath " in
*" $libdir "*) ;;
- *) perm_rpath="$perm_rpath $libdir" ;;
-+ *) func_apped perm_rpath " $libdir" ;;
++ *) func_append perm_rpath " $libdir" ;;
esac
fi
done
-@@ -6932,7 +8068,7 @@ EOF
+@@ -6922,17 +8078,13 @@ EOF
+ if test -n "$hardcode_libdir_separator" &&
+ test -n "$hardcode_libdirs"; then
+ libdir="$hardcode_libdirs"
+- if test -n "$hardcode_libdir_flag_spec_ld"; then
+- eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
+- else
+- eval dep_rpath=\"$hardcode_libdir_flag_spec\"
+- fi
++ eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
+ fi
+ if test -n "$runpath_var" && test -n "$perm_rpath"; then
# We should set the runpath_var.
rpath=
for dir in $perm_rpath; do
@@ -6279,7 +7942,7 @@ index 7ed280b..aa5624c 100755
done
eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
fi
-@@ -6940,7 +8076,7 @@ EOF
+@@ -6940,7 +8092,7 @@ EOF
fi
shlibpath="$finalize_shlibpath"
@@ -6288,7 +7951,7 @@ index 7ed280b..aa5624c 100755
if test -n "$shlibpath"; then
eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
fi
-@@ -6966,18 +8102,18 @@ EOF
+@@ -6966,18 +8118,18 @@ EOF
linknames=
for link
do
@@ -6310,7 +7973,7 @@ index 7ed280b..aa5624c 100755
fi
orig_export_symbols=
-@@ -7008,13 +8144,45 @@ EOF
+@@ -7008,13 +8160,45 @@ EOF
$opt_dry_run || $RM $export_symbols
cmds=$export_symbols_cmds
save_ifs="$IFS"; IFS='~'
@@ -6361,7 +8024,7 @@ index 7ed280b..aa5624c 100755
skipped_export=false
else
# The command line is too long to execute in one step.
-@@ -7036,7 +8204,7 @@ EOF
+@@ -7036,7 +8220,7 @@ EOF
if test -n "$export_symbols" && test -n "$include_expsyms"; then
tmp_export_symbols="$export_symbols"
test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
@@ -6370,7 +8033,7 @@ index 7ed280b..aa5624c 100755
fi
if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
-@@ -7048,7 +8216,7 @@ EOF
+@@ -7048,7 +8232,7 @@ EOF
# global variables. join(1) would be nice here, but unfortunately
# isn't a blessed tool.
$opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
@@ -6379,7 +8042,7 @@ index 7ed280b..aa5624c 100755
export_symbols=$output_objdir/$libname.def
$opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
fi
-@@ -7058,7 +8226,7 @@ EOF
+@@ -7058,7 +8242,7 @@ EOF
case " $convenience " in
*" $test_deplib "*) ;;
*)
@@ -6388,7 +8051,7 @@ index 7ed280b..aa5624c 100755
;;
esac
done
-@@ -7078,21 +8246,21 @@ EOF
+@@ -7078,21 +8262,21 @@ EOF
test "X$libobjs" = "X " && libobjs=
else
gentop="$output_objdir/${outputname}x"
@@ -6414,7 +8077,7 @@ index 7ed280b..aa5624c 100755
$opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
fi
-@@ -7137,7 +8305,8 @@ EOF
+@@ -7137,7 +8321,8 @@ EOF
save_libobjs=$libobjs
fi
save_output=$output
@@ -6424,7 +8087,7 @@ index 7ed280b..aa5624c 100755
# Clear the reloadable object creation command queue and
# initialize k to one.
-@@ -7150,13 +8319,16 @@ EOF
+@@ -7150,13 +8335,16 @@ EOF
if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
output=${output_objdir}/${output_la}.lnkscript
func_verbose "creating GNU ld script: $output"
@@ -6445,7 +8108,7 @@ index 7ed280b..aa5624c 100755
elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
output=${output_objdir}/${output_la}.lnk
func_verbose "creating linker input file list: $output"
-@@ -7170,10 +8342,12 @@ EOF
+@@ -7170,10 +8358,12 @@ EOF
fi
for obj
do
@@ -6461,7 +8124,7 @@ index 7ed280b..aa5624c 100755
else
if test -n "$save_libobjs"; then
func_verbose "creating reloadable object files..."
-@@ -7197,17 +8371,19 @@ EOF
+@@ -7197,17 +8387,19 @@ EOF
# command to the queue.
if test "$k" -eq 1 ; then
# The first file doesn't have a previous command to add.
@@ -6484,7 +8147,7 @@ index 7ed280b..aa5624c 100755
func_len " $last_robj"
func_arith $len0 + $func_len_result
len=$func_arith_result
-@@ -7217,11 +8393,12 @@ EOF
+@@ -7217,11 +8409,12 @@ EOF
# reloadable object file. All subsequent reloadable object
# files will link in the last one created.
test -z "$concat_cmds" || concat_cmds=$concat_cmds~
@@ -6499,7 +8162,7 @@ index 7ed280b..aa5624c 100755
else
output=
-@@ -7255,7 +8432,7 @@ EOF
+@@ -7255,7 +8448,7 @@ EOF
lt_exit=$?
# Restore the uninstalled library and exit
@@ -6508,7 +8171,7 @@ index 7ed280b..aa5624c 100755
( cd "$output_objdir" && \
$RM "${realname}T" && \
$MV "${realname}U" "$realname" )
-@@ -7276,7 +8453,7 @@ EOF
+@@ -7276,7 +8469,7 @@ EOF
if test -n "$export_symbols" && test -n "$include_expsyms"; then
tmp_export_symbols="$export_symbols"
test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
@@ -6517,7 +8180,7 @@ index 7ed280b..aa5624c 100755
fi
if test -n "$orig_export_symbols"; then
-@@ -7288,7 +8465,7 @@ EOF
+@@ -7288,7 +8481,7 @@ EOF
# global variables. join(1) would be nice here, but unfortunately
# isn't a blessed tool.
$opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
@@ -6526,7 +8189,7 @@ index 7ed280b..aa5624c 100755
export_symbols=$output_objdir/$libname.def
$opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
fi
-@@ -7329,10 +8506,10 @@ EOF
+@@ -7329,10 +8522,10 @@ EOF
# Add any objects from preloaded convenience libraries
if test -n "$dlprefiles"; then
gentop="$output_objdir/${outputname}x"
@@ -6539,7 +8202,7 @@ index 7ed280b..aa5624c 100755
test "X$libobjs" = "X " && libobjs=
fi
-@@ -7348,7 +8525,7 @@ EOF
+@@ -7348,7 +8541,7 @@ EOF
lt_exit=$?
# Restore the uninstalled library and exit
@@ -6548,7 +8211,7 @@ index 7ed280b..aa5624c 100755
( cd "$output_objdir" && \
$RM "${realname}T" && \
$MV "${realname}U" "$realname" )
-@@ -7360,7 +8537,7 @@ EOF
+@@ -7360,7 +8553,7 @@ EOF
IFS="$save_ifs"
# Restore the uninstalled library and exit
@@ -6557,7 +8220,7 @@ index 7ed280b..aa5624c 100755
$opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
if test -n "$convenience"; then
-@@ -7441,18 +8618,21 @@ EOF
+@@ -7441,18 +8634,21 @@ EOF
if test -n "$convenience"; then
if test -n "$whole_archive_flag_spec"; then
eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
@@ -6582,7 +8245,7 @@ index 7ed280b..aa5624c 100755
output="$obj"
func_execute_cmds "$reload_cmds" 'exit $?'
-@@ -7512,8 +8692,8 @@ EOF
+@@ -7512,8 +8708,8 @@ EOF
case $host in
*-*-rhapsody* | *-*-darwin1.[012])
# On Rhapsody replace the C library is the System framework
@@ -6593,7 +8256,7 @@ index 7ed280b..aa5624c 100755
;;
esac
-@@ -7524,14 +8704,14 @@ EOF
+@@ -7524,14 +8720,14 @@ EOF
if test "$tagname" = CXX ; then
case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
10.[0123])
@@ -6612,7 +8275,7 @@ index 7ed280b..aa5624c 100755
;;
esac
-@@ -7545,7 +8725,7 @@ EOF
+@@ -7545,7 +8741,7 @@ EOF
*)
case " $compile_deplibs " in
*" -L$path/$objdir "*)
@@ -6621,7 +8284,7 @@ index 7ed280b..aa5624c 100755
esac
;;
esac
-@@ -7555,17 +8735,17 @@ EOF
+@@ -7555,17 +8751,17 @@ EOF
-L*)
case " $new_libs " in
*" $deplib "*) ;;
@@ -6643,7 +8306,7 @@ index 7ed280b..aa5624c 100755
if test -n "$rpath$xrpath"; then
# If the user specified any rpath flags, then add them.
-@@ -7573,7 +8753,7 @@ EOF
+@@ -7573,7 +8769,7 @@ EOF
# This is the magic to use -rpath.
case "$finalize_rpath " in
*" $libdir "*) ;;
@@ -6652,7 +8315,7 @@ index 7ed280b..aa5624c 100755
esac
done
fi
-@@ -7592,18 +8772,18 @@ EOF
+@@ -7592,18 +8788,18 @@ EOF
*"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
;;
*)
@@ -6674,7 +8337,7 @@ index 7ed280b..aa5624c 100755
esac
fi
case $host in
-@@ -7612,12 +8792,12 @@ EOF
+@@ -7612,12 +8808,12 @@ EOF
case :$dllsearchpath: in
*":$libdir:"*) ;;
::) dllsearchpath=$libdir;;
@@ -6689,7 +8352,7 @@ index 7ed280b..aa5624c 100755
esac
;;
esac
-@@ -7643,18 +8823,18 @@ EOF
+@@ -7643,18 +8839,18 @@ EOF
*"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
;;
*)
@@ -6711,7 +8374,7 @@ index 7ed280b..aa5624c 100755
esac
fi
done
-@@ -7668,8 +8848,8 @@ EOF
+@@ -7668,8 +8864,8 @@ EOF
if test -n "$libobjs" && test "$build_old_libs" = yes; then
# Transform all the library objects into standard objects.
@@ -6722,7 +8385,7 @@ index 7ed280b..aa5624c 100755
fi
func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
-@@ -7681,15 +8861,15 @@ EOF
+@@ -7681,15 +8877,15 @@ EOF
wrappers_required=yes
case $host in
@@ -6742,7 +8405,7 @@ index 7ed280b..aa5624c 100755
*)
if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
wrappers_required=no
-@@ -7698,13 +8878,19 @@ EOF
+@@ -7698,13 +8894,19 @@ EOF
esac
if test "$wrappers_required" = no; then
# Replace the output file specification.
@@ -6763,7 +8426,7 @@ index 7ed280b..aa5624c 100755
# Delete the generated files.
if test -f "$output_objdir/${outputname}S.${objext}"; then
func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
-@@ -7727,7 +8913,7 @@ EOF
+@@ -7727,7 +8929,7 @@ EOF
# We should set the runpath_var.
rpath=
for dir in $perm_rpath; do
@@ -6772,7 +8435,7 @@ index 7ed280b..aa5624c 100755
done
compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
fi
-@@ -7735,7 +8921,7 @@ EOF
+@@ -7735,7 +8937,7 @@ EOF
# We should set the runpath_var.
rpath=
for dir in $finalize_perm_rpath; do
@@ -6781,7 +8444,7 @@ index 7ed280b..aa5624c 100755
done
finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
fi
-@@ -7745,11 +8931,18 @@ EOF
+@@ -7745,11 +8947,18 @@ EOF
# We don't need to create a wrapper script.
link_command="$compile_var$compile_command$compile_rpath"
# Replace the output file specification.
@@ -6801,7 +8464,7 @@ index 7ed280b..aa5624c 100755
exit $EXIT_SUCCESS
fi
-@@ -7764,7 +8957,7 @@ EOF
+@@ -7764,7 +8973,7 @@ EOF
if test "$fast_install" != no; then
link_command="$finalize_var$compile_command$finalize_rpath"
if test "$fast_install" = yes; then
@@ -6810,7 +8473,7 @@ index 7ed280b..aa5624c 100755
else
# fast_install is set to needless
relink_command=
-@@ -7776,13 +8969,19 @@ EOF
+@@ -7776,13 +8985,19 @@ EOF
fi
# Replace the output file specification.
@@ -6831,7 +8494,7 @@ index 7ed280b..aa5624c 100755
# Now create the wrapper script.
func_verbose "creating $output"
-@@ -7800,18 +8999,7 @@ EOF
+@@ -7800,18 +9015,7 @@ EOF
fi
done
relink_command="(cd `pwd`; $relink_command)"
@@ -6851,7 +8514,7 @@ index 7ed280b..aa5624c 100755
fi
# Only actually do things if not in dry run mode.
-@@ -7891,7 +9079,7 @@ EOF
+@@ -7891,7 +9095,7 @@ EOF
else
oldobjs="$old_deplibs $non_pic_objects"
if test "$preload" = yes && test -f "$symfileobj"; then
@@ -6860,7 +8523,7 @@ index 7ed280b..aa5624c 100755
fi
fi
addlibs="$old_convenience"
-@@ -7899,10 +9087,10 @@ EOF
+@@ -7899,10 +9103,10 @@ EOF
if test -n "$addlibs"; then
gentop="$output_objdir/${outputname}x"
@@ -6873,7 +8536,7 @@ index 7ed280b..aa5624c 100755
fi
# Do each command in the archive commands.
-@@ -7913,10 +9101,10 @@ EOF
+@@ -7913,10 +9117,10 @@ EOF
# Add any objects from preloaded convenience libraries
if test -n "$dlprefiles"; then
gentop="$output_objdir/${outputname}x"
@@ -6886,7 +8549,7 @@ index 7ed280b..aa5624c 100755
fi
# POSIX demands no paths to be encoded in archives. We have
-@@ -7932,9 +9120,9 @@ EOF
+@@ -7932,9 +9136,9 @@ EOF
done | sort | sort -uc >/dev/null 2>&1); then
:
else
@@ -6898,7 +8561,7 @@ index 7ed280b..aa5624c 100755
func_mkdir_p "$gentop"
save_oldobjs=$oldobjs
oldobjs=
-@@ -7958,9 +9146,9 @@ EOF
+@@ -7958,18 +9162,30 @@ EOF
esac
done
func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
@@ -6910,7 +8573,11 @@ index 7ed280b..aa5624c 100755
esac
done
fi
-@@ -7970,6 +9158,16 @@ EOF
++ func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
++ tool_oldlib=$func_to_tool_file_result
+ eval cmds=\"$old_archive_cmds\"
+
+ func_len " $cmds"
len=$func_len_result
if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
cmds=$old_archive_cmds
@@ -6927,7 +8594,7 @@ index 7ed280b..aa5624c 100755
else
# the command line is too long to link in one step, link in parts
func_verbose "using piecewise archive linking..."
-@@ -8043,7 +9241,7 @@ EOF
+@@ -8043,7 +9259,7 @@ EOF
done
# Quote the link command for shipping.
relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
@@ -6936,8 +8603,13 @@ index 7ed280b..aa5624c 100755
if test "$hardcode_automatic" = yes ; then
relink_command=
fi
-@@ -8066,9 +9264,19 @@ EOF
- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+@@ -8063,12 +9279,23 @@ EOF
+ *.la)
+ func_basename "$deplib"
+ name="$func_basename_result"
+- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
++ func_resolve_sysroot "$deplib"
++ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
test -z "$libdir" && \
func_fatal_error "\`$deplib' is not a valid libtool archive"
- newdependency_libs="$newdependency_libs $libdir/$name"
@@ -6958,7 +8630,7 @@ index 7ed280b..aa5624c 100755
esac
done
dependency_libs="$newdependency_libs"
-@@ -8082,9 +9290,9 @@ EOF
+@@ -8082,9 +9309,9 @@ EOF
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
test -z "$libdir" && \
func_fatal_error "\`$lib' is not a valid libtool archive"
@@ -6970,7 +8642,7 @@ index 7ed280b..aa5624c 100755
esac
done
dlfiles="$newdlfiles"
-@@ -8101,7 +9309,7 @@ EOF
+@@ -8101,7 +9328,7 @@ EOF
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
test -z "$libdir" && \
func_fatal_error "\`$lib' is not a valid libtool archive"
@@ -6979,7 +8651,7 @@ index 7ed280b..aa5624c 100755
;;
esac
done
-@@ -8113,7 +9321,7 @@ EOF
+@@ -8113,7 +9340,7 @@ EOF
[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
*) abs=`pwd`"/$lib" ;;
esac
@@ -6988,7 +8660,7 @@ index 7ed280b..aa5624c 100755
done
dlfiles="$newdlfiles"
newdlprefiles=
-@@ -8122,15 +9330,33 @@ EOF
+@@ -8122,15 +9349,33 @@ EOF
[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
*) abs=`pwd`"/$lib" ;;
esac
@@ -7024,7 +8696,7 @@ index 7ed280b..aa5624c 100755
esac
$ECHO > $output "\
# $outputname - a libtool library file
-@@ -8189,7 +9415,7 @@ relink_command=\"$relink_command\""
+@@ -8189,7 +9434,7 @@ relink_command=\"$relink_command\""
exit $EXIT_SUCCESS
}
@@ -7033,7 +8705,7 @@ index 7ed280b..aa5624c 100755
func_mode_link ${1+"$@"}
-@@ -8209,9 +9435,9 @@ func_mode_uninstall ()
+@@ -8209,9 +9454,9 @@ func_mode_uninstall ()
for arg
do
case $arg in
@@ -7046,7 +8718,7 @@ index 7ed280b..aa5624c 100755
esac
done
-@@ -8220,24 +9446,23 @@ func_mode_uninstall ()
+@@ -8220,24 +9465,23 @@ func_mode_uninstall ()
rmdirs=
@@ -7078,7 +8750,7 @@ index 7ed280b..aa5624c 100755
esac
fi
-@@ -8263,18 +9488,17 @@ func_mode_uninstall ()
+@@ -8263,18 +9507,17 @@ func_mode_uninstall ()
# Delete the libtool libraries and symlinks.
for n in $library_names; do
@@ -7103,7 +8775,7 @@ index 7ed280b..aa5624c 100755
;;
uninstall)
if test -n "$library_names"; then
-@@ -8302,19 +9526,19 @@ func_mode_uninstall ()
+@@ -8302,19 +9545,19 @@ func_mode_uninstall ()
# Add PIC object to the list of files to remove.
if test -n "$pic_object" &&
test "$pic_object" != none; then
@@ -7126,7 +8798,7 @@ index 7ed280b..aa5624c 100755
noexename=$name
case $file in
*.exe)
-@@ -8324,7 +9548,7 @@ func_mode_uninstall ()
+@@ -8324,7 +9567,7 @@ func_mode_uninstall ()
noexename=$func_stripname_result
# $file with .exe has already been added to rmfiles,
# add $file without .exe
@@ -7135,7 +8807,7 @@ index 7ed280b..aa5624c 100755
;;
esac
# Do a test to see if this is a libtool program.
-@@ -8333,7 +9557,7 @@ func_mode_uninstall ()
+@@ -8333,7 +9576,7 @@ func_mode_uninstall ()
func_ltwrapper_scriptname "$file"
relink_command=
func_source $func_ltwrapper_scriptname_result
@@ -7144,7 +8816,7 @@ index 7ed280b..aa5624c 100755
else
relink_command=
func_source $dir/$noexename
-@@ -8341,12 +9565,12 @@ func_mode_uninstall ()
+@@ -8341,12 +9584,12 @@ func_mode_uninstall ()
# note $name still contains .exe if it was in $file originally
# as does the version of $file that was added into $rmfiles
@@ -7160,7 +8832,7 @@ index 7ed280b..aa5624c 100755
fi
fi
fi
-@@ -8354,7 +9578,6 @@ func_mode_uninstall ()
+@@ -8354,7 +9597,6 @@ func_mode_uninstall ()
esac
func_show_eval "$RM $rmfiles" 'exit_status=1'
done
@@ -7168,7 +8840,7 @@ index 7ed280b..aa5624c 100755
# Try to remove the ${objdir}s in the directories where we deleted files
for dir in $rmdirs; do
-@@ -8366,16 +9589,16 @@ func_mode_uninstall ()
+@@ -8366,16 +9608,16 @@ func_mode_uninstall ()
exit $exit_status
}
@@ -7188,16 +8860,117 @@ index 7ed280b..aa5624c 100755
if test -n "$exec_cmd"; then
eval exec "$exec_cmd"
+diff --git a/build-aux/missing b/build-aux/missing
+index 28055d2..86a8fc3 100755
+--- a/build-aux/missing
++++ b/build-aux/missing
+@@ -1,10 +1,10 @@
+ #! /bin/sh
+ # Common stub for a few missing GNU programs while installing.
+
+-scriptversion=2009-04-28.21; # UTC
++scriptversion=2012-01-06.13; # UTC
+
+ # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
+-# 2008, 2009 Free Software Foundation, Inc.
++# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+ # Originally by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
+
+ # This program is free software; you can redistribute it and/or modify
+@@ -84,7 +84,6 @@ Supported PROGRAM values:
+ help2man touch the output file
+ lex create \`lex.yy.c', if possible, from existing .c
+ makeinfo touch the output file
+- tar try tar, gnutar, gtar, then tar without non-portable flags
+ yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+
+ Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
+@@ -122,15 +121,6 @@ case $1 in
+ # Not GNU programs, they don't have --version.
+ ;;
+
+- tar*)
+- if test -n "$run"; then
+- echo 1>&2 "ERROR: \`tar' requires --run"
+- exit 1
+- elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+- exit 1
+- fi
+- ;;
+-
+ *)
+ if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+ # We have it, but it failed.
+@@ -226,7 +216,7 @@ WARNING: \`$1' $msg. You should only need it if
+ \`Bison' from any GNU archive site."
+ rm -f y.tab.c y.tab.h
+ if test $# -ne 1; then
+- eval LASTARG="\${$#}"
++ eval LASTARG=\${$#}
+ case $LASTARG in
+ *.y)
+ SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
+@@ -256,7 +246,7 @@ WARNING: \`$1' is $msg. You should only need it if
+ \`Flex' from any GNU archive site."
+ rm -f lex.yy.c
+ if test $# -ne 1; then
+- eval LASTARG="\${$#}"
++ eval LASTARG=\${$#}
+ case $LASTARG in
+ *.l)
+ SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
+@@ -318,41 +308,6 @@ WARNING: \`$1' is $msg. You should only need it if
+ touch $file
+ ;;
+
+- tar*)
+- shift
+-
+- # We have already tried tar in the generic part.
+- # Look for gnutar/gtar before invocation to avoid ugly error
+- # messages.
+- if (gnutar --version > /dev/null 2>&1); then
+- gnutar "$@" && exit 0
+- fi
+- if (gtar --version > /dev/null 2>&1); then
+- gtar "$@" && exit 0
+- fi
+- firstarg="$1"
+- if shift; then
+- case $firstarg in
+- *o*)
+- firstarg=`echo "$firstarg" | sed s/o//`
+- tar "$firstarg" "$@" && exit 0
+- ;;
+- esac
+- case $firstarg in
+- *h*)
+- firstarg=`echo "$firstarg" | sed s/h//`
+- tar "$firstarg" "$@" && exit 0
+- ;;
+- esac
+- fi
+-
+- echo 1>&2 "\
+-WARNING: I can't seem to be able to run \`tar' with the given arguments.
+- You may want to install GNU tar or Free paxutils, or check the
+- command line arguments."
+- exit 1
+- ;;
+-
+ *)
+ echo 1>&2 "\
+ WARNING: \`$1' is needed, and is $msg.
diff --git a/configure b/configure
-index 4daa0e0..f161c99 100755
+index 5e79be6..c3a1b1a 100755
--- a/configure
+++ b/configure
@@ -1,12 +1,12 @@
#! /bin/sh
- # From configure.ac 1.0.2.
+ # From configure.ac 1.0.3.
# Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.65 for Apache CouchDB 1.0.2.
-+# Generated by GNU Autoconf 2.68 for Apache CouchDB 1.0.2.
+-# Generated by GNU Autoconf 2.65 for Apache CouchDB 1.0.3.
++# Generated by GNU Autoconf 2.68 for Apache CouchDB 1.0.3.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -7466,7 +9239,15 @@ index 4daa0e0..f161c99 100755
OBJDUMP
LN_S
NM
-@@ -916,6 +787,7 @@ enable_static
+@@ -833,6 +704,7 @@ CPP
+ am__fastdepCC_FALSE
+ am__fastdepCC_TRUE
+ CCDEPMODE
++am__nodep
+ AMDEPBACKSLASH
+ AMDEP_FALSE
+ AMDEP_TRUE
+@@ -916,6 +788,7 @@ enable_static
with_pic
enable_fast_install
with_gnu_ld
@@ -7474,7 +9255,7 @@ index 4daa0e0..f161c99 100755
enable_libtool_lock
with_erlang
with_js_include
-@@ -1003,8 +875,9 @@ do
+@@ -1003,8 +876,9 @@ do
fi
case $ac_option in
@@ -7486,7 +9267,7 @@ index 4daa0e0..f161c99 100755
esac
# Accept the important Cygnus configure options, so we can diagnose typos.
-@@ -1049,7 +922,7 @@ do
+@@ -1049,7 +923,7 @@ do
ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -7495,7 +9276,7 @@ index 4daa0e0..f161c99 100755
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1075,7 +948,7 @@ do
+@@ -1075,7 +949,7 @@ do
ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -7504,7 +9285,7 @@ index 4daa0e0..f161c99 100755
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1279,7 +1152,7 @@ do
+@@ -1279,7 +1153,7 @@ do
ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -7513,7 +9294,7 @@ index 4daa0e0..f161c99 100755
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1295,7 +1168,7 @@ do
+@@ -1295,7 +1169,7 @@ do
ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -7522,7 +9303,7 @@ index 4daa0e0..f161c99 100755
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1325,8 +1198,8 @@ do
+@@ -1325,8 +1199,8 @@ do
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
@@ -7533,7 +9314,7 @@ index 4daa0e0..f161c99 100755
;;
*=*)
-@@ -1334,7 +1207,7 @@ Try \`$0 --help' for more information."
+@@ -1334,7 +1208,7 @@ Try \`$0 --help' for more information."
# Reject names that are not valid shell variable names.
case $ac_envvar in #(
'' | [0-9]* | *[!_$as_cr_alnum]* )
@@ -7542,7 +9323,7 @@ index 4daa0e0..f161c99 100755
esac
eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
-@@ -1344,7 +1217,7 @@ Try \`$0 --help' for more information."
+@@ -1344,7 +1218,7 @@ Try \`$0 --help' for more information."
$as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
$as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
@@ -7551,7 +9332,7 @@ index 4daa0e0..f161c99 100755
;;
esac
-@@ -1352,13 +1225,13 @@ done
+@@ -1352,13 +1226,13 @@ done
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
@@ -7567,7 +9348,7 @@ index 4daa0e0..f161c99 100755
*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
esac
fi
-@@ -1381,7 +1254,7 @@ do
+@@ -1381,7 +1255,7 @@ do
[\\/$]* | ?:[\\/]* ) continue;;
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
esac
@@ -7576,7 +9357,7 @@ index 4daa0e0..f161c99 100755
done
# There might be people who depend on the old broken behavior: `$host'
-@@ -1395,8 +1268,8 @@ target=$target_alias
+@@ -1395,8 +1269,8 @@ target=$target_alias
if test "x$host_alias" != x; then
if test "x$build_alias" = x; then
cross_compiling=maybe
@@ -7587,7 +9368,7 @@ index 4daa0e0..f161c99 100755
elif test "x$build_alias" != "x$host_alias"; then
cross_compiling=yes
fi
-@@ -1411,9 +1284,9 @@ test "$silent" = yes && exec 6>/dev/null
+@@ -1411,9 +1285,9 @@ test "$silent" = yes && exec 6>/dev/null
ac_pwd=`pwd` && test -n "$ac_pwd" &&
ac_ls_di=`ls -di .` &&
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
@@ -7599,7 +9380,7 @@ index 4daa0e0..f161c99 100755
# Find the source files, if location was not specified.
-@@ -1452,11 +1325,11 @@ else
+@@ -1452,11 +1326,11 @@ else
fi
if test ! -r "$srcdir/$ac_unique_file"; then
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
@@ -7613,7 +9394,7 @@ index 4daa0e0..f161c99 100755
pwd)`
# When building in place, set srcdir=.
if test "$ac_abs_confdir" = "$ac_pwd"; then
-@@ -1496,7 +1369,7 @@ Configuration:
+@@ -1496,7 +1370,7 @@ Configuration:
--help=short display options specific to this package
--help=recursive display the short help of all the included packages
-V, --version display version information and exit
@@ -7622,8 +9403,12 @@ index 4daa0e0..f161c99 100755
--cache-file=FILE cache test results in FILE [disabled]
-C, --config-cache alias for \`--cache-file=config.cache'
-n, --no-create do not create output files
-@@ -1576,6 +1449,8 @@ Optional Packages:
- --with-pic try to use only PIC/non-PIC objects [default=use
+@@ -1573,9 +1447,11 @@ Optional Features:
+ Optional Packages:
+ --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
+ --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
+- --with-pic try to use only PIC/non-PIC objects [default=use
++ --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use
both]
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
+ --with-sysroot=DIR Search for dependent libraries within DIR
@@ -7631,10 +9416,10 @@ index 4daa0e0..f161c99 100755
--with-erlang=PATH set PATH to the Erlang include directory
--with-js-include=PATH set PATH to the SpiderMonkey include directory
--with-js-lib=PATH set PATH to the SpiderMonkey library directory
-@@ -1672,9 +1547,9 @@ test -n "$ac_init_help" && exit $ac_status
+@@ -1672,9 +1548,9 @@ test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
- Apache CouchDB configure 1.0.2
+ Apache CouchDB configure 1.0.3
-generated by GNU Autoconf 2.65
+generated by GNU Autoconf 2.68
@@ -7643,7 +9428,7 @@ index 4daa0e0..f161c99 100755
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
-@@ -1718,7 +1593,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -1718,7 +1594,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_retval=1
fi
@@ -7652,7 +9437,7 @@ index 4daa0e0..f161c99 100755
as_fn_set_status $ac_retval
} # ac_fn_c_try_compile
-@@ -1744,7 +1619,7 @@ $as_echo "$ac_try_echo"; } >&5
+@@ -1744,7 +1620,7 @@ $as_echo "$ac_try_echo"; } >&5
mv -f conftest.er1 conftest.err
fi
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
@@ -7661,7 +9446,7 @@ index 4daa0e0..f161c99 100755
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
}; then :
-@@ -1755,7 +1630,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -1755,7 +1631,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_retval=1
fi
@@ -7670,7 +9455,7 @@ index 4daa0e0..f161c99 100755
as_fn_set_status $ac_retval
} # ac_fn_c_try_cpp
-@@ -1768,10 +1643,10 @@ fi
+@@ -1768,10 +1644,10 @@ fi
ac_fn_c_check_header_mongrel ()
{
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
@@ -7683,7 +9468,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
fi
eval ac_res=\$$3
-@@ -1807,7 +1682,7 @@ if ac_fn_c_try_cpp "$LINENO"; then :
+@@ -1807,7 +1683,7 @@ if ac_fn_c_try_cpp "$LINENO"; then :
else
ac_header_preproc=no
fi
@@ -7692,7 +9477,7 @@ index 4daa0e0..f161c99 100755
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
$as_echo "$ac_header_preproc" >&6; }
-@@ -1834,7 +1709,7 @@ $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+@@ -1834,7 +1710,7 @@ $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
@@ -7701,7 +9486,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
eval "$3=\$ac_header_compiler"
-@@ -1843,7 +1718,7 @@ eval ac_res=\$$3
+@@ -1843,7 +1719,7 @@ eval ac_res=\$$3
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
fi
@@ -7710,7 +9495,7 @@ index 4daa0e0..f161c99 100755
} # ac_fn_c_check_header_mongrel
-@@ -1884,7 +1759,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -1884,7 +1760,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_retval=$ac_status
fi
rm -rf conftest.dSYM conftest_ipa8_conftest.oo
@@ -7719,7 +9504,7 @@ index 4daa0e0..f161c99 100755
as_fn_set_status $ac_retval
} # ac_fn_c_try_run
-@@ -1898,7 +1773,7 @@ ac_fn_c_check_header_compile ()
+@@ -1898,7 +1774,7 @@ ac_fn_c_check_header_compile ()
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
@@ -7728,7 +9513,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -1916,7 +1791,7 @@ fi
+@@ -1916,7 +1792,7 @@ fi
eval ac_res=\$$3
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
@@ -7737,7 +9522,7 @@ index 4daa0e0..f161c99 100755
} # ac_fn_c_check_header_compile
-@@ -1961,7 +1836,7 @@ fi
+@@ -1961,7 +1837,7 @@ fi
# interfere with the next link command; also delete a directory that is
# left behind by Apple's compiler. We do this before executing the actions.
rm -rf conftest.dSYM conftest_ipa8_conftest.oo
@@ -7746,7 +9531,7 @@ index 4daa0e0..f161c99 100755
as_fn_set_status $ac_retval
} # ac_fn_c_try_link
-@@ -1974,7 +1849,7 @@ ac_fn_c_check_func ()
+@@ -1974,7 +1850,7 @@ ac_fn_c_check_func ()
as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
$as_echo_n "checking for $2... " >&6; }
@@ -7755,7 +9540,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -2029,7 +1904,7 @@ fi
+@@ -2029,7 +1905,7 @@ fi
eval ac_res=\$$3
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
@@ -7764,16 +9549,16 @@ index 4daa0e0..f161c99 100755
} # ac_fn_c_check_func
cat >config.log <<_ACEOF
-@@ -2037,7 +1912,7 @@ This file contains any messages produced by compilers while
+@@ -2037,7 +1913,7 @@ This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
- It was created by Apache CouchDB $as_me 1.0.2, which was
+ It was created by Apache CouchDB $as_me 1.0.3, which was
-generated by GNU Autoconf 2.65. Invocation command line was
+generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
-@@ -2147,11 +2022,9 @@ trap 'exit_status=$?
+@@ -2147,11 +2023,9 @@ trap 'exit_status=$?
{
echo
@@ -7787,7 +9572,7 @@ index 4daa0e0..f161c99 100755
echo
# The following way of writing the cache mishandles newlines in values,
(
-@@ -2185,11 +2058,9 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+@@ -2185,11 +2059,9 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
)
echo
@@ -7801,7 +9586,7 @@ index 4daa0e0..f161c99 100755
echo
for ac_var in $ac_subst_vars
do
-@@ -2202,11 +2073,9 @@ _ASBOX
+@@ -2202,11 +2074,9 @@ _ASBOX
echo
if test -n "$ac_subst_files"; then
@@ -7815,7 +9600,7 @@ index 4daa0e0..f161c99 100755
echo
for ac_var in $ac_subst_files
do
-@@ -2220,11 +2089,9 @@ _ASBOX
+@@ -2220,11 +2090,9 @@ _ASBOX
fi
if test -s confdefs.h; then
@@ -7829,7 +9614,7 @@ index 4daa0e0..f161c99 100755
echo
cat confdefs.h
echo
-@@ -2279,7 +2146,12 @@ _ACEOF
+@@ -2279,7 +2147,12 @@ _ACEOF
ac_site_file1=NONE
ac_site_file2=NONE
if test -n "$CONFIG_SITE"; then
@@ -7843,7 +9628,7 @@ index 4daa0e0..f161c99 100755
elif test "x$prefix" != xNONE; then
ac_site_file1=$prefix/share/config.site
ac_site_file2=$prefix/etc/config.site
-@@ -2294,7 +2166,11 @@ do
+@@ -2294,7 +2167,11 @@ do
{ $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
$as_echo "$as_me: loading site script $ac_site_file" >&6;}
sed 's/^/| /' "$ac_site_file" >&5
@@ -7856,7 +9641,7 @@ index 4daa0e0..f161c99 100755
fi
done
-@@ -2370,7 +2246,7 @@ if $ac_cache_corrupted; then
+@@ -2370,7 +2247,7 @@ if $ac_cache_corrupted; then
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
{ $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
@@ -7865,7 +9650,7 @@ index 4daa0e0..f161c99 100755
fi
## -------------------- ##
## Main body of script. ##
-@@ -2389,16 +2265,22 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -2389,16 +2266,22 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
ac_aux_dir=
for ac_dir in build-aux "$srcdir"/build-aux; do
@@ -7896,7 +9681,7 @@ index 4daa0e0..f161c99 100755
fi
# These three variables are undocumented and unsupported,
-@@ -2434,7 +2316,7 @@ am__api_version='1.11'
+@@ -2434,7 +2317,7 @@ am__api_version='1.11'
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
$as_echo_n "checking for a BSD-compatible install... " >&6; }
if test -z "$INSTALL"; then
@@ -7905,7 +9690,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2521,11 +2403,11 @@ am_lf='
+@@ -2521,11 +2404,11 @@ am_lf='
'
case `pwd` in
*[\\\"\#\$\&\'\`$am_lf]*)
@@ -7919,7 +9704,7 @@ index 4daa0e0..f161c99 100755
esac
# Do `set' in a subshell so we don't clobber the current shell's
-@@ -2547,7 +2429,7 @@ if (
+@@ -2547,7 +2430,7 @@ if (
# if, for instance, CONFIG_SHELL is bash and it inherits a
# broken ls alias from the environment. This has actually
# happened. Such a system could not be considered "sane".
@@ -7928,7 +9713,7 @@ index 4daa0e0..f161c99 100755
alias in your environment" "$LINENO" 5
fi
-@@ -2557,7 +2439,7 @@ then
+@@ -2557,7 +2440,7 @@ then
# Ok.
:
else
@@ -7937,7 +9722,7 @@ index 4daa0e0..f161c99 100755
Check your system clock" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-@@ -2611,7 +2493,7 @@ if test "$cross_compiling" != no; then
+@@ -2611,7 +2494,7 @@ if test "$cross_compiling" != no; then
set dummy ${ac_tool_prefix}strip; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -7946,7 +9731,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
-@@ -2651,7 +2533,7 @@ if test -z "$ac_cv_prog_STRIP"; then
+@@ -2651,7 +2534,7 @@ if test -z "$ac_cv_prog_STRIP"; then
set dummy strip; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -7955,7 +9740,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
-@@ -2704,7 +2586,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+@@ -2704,7 +2587,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
if test -z "$MKDIR_P"; then
@@ -7964,7 +9749,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2755,7 +2637,7 @@ do
+@@ -2755,7 +2638,7 @@ do
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -7973,7 +9758,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
if test -n "$AWK"; then
-@@ -2795,7 +2677,7 @@ done
+@@ -2795,7 +2678,7 @@ done
$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
set x ${MAKE-make}
ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
@@ -7982,7 +9767,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
-@@ -2803,7 +2685,7 @@ SHELL = /bin/sh
+@@ -2803,7 +2686,7 @@ SHELL = /bin/sh
all:
@echo '@@@%%%=$(MAKE)=@@@%%%'
_ACEOF
@@ -7991,7 +9776,7 @@ index 4daa0e0..f161c99 100755
case `${MAKE-make} -f conftest.make 2>/dev/null` in
*@@@%%%=?*=@@@%%%*)
eval ac_cv_prog_make_${ac_make}_set=yes;;
-@@ -2837,7 +2719,7 @@ if test "`cd $srcdir && pwd`" != "`pwd`"; then
+@@ -2837,7 +2720,7 @@ if test "`cd $srcdir && pwd`" != "`pwd`"; then
am__isrc=' -I$(srcdir)'
# test to see if srcdir already configured
if test -f $srcdir/config.status; then
@@ -8000,7 +9785,31 @@ index 4daa0e0..f161c99 100755
fi
fi
-@@ -2966,7 +2848,7 @@ if test -n "$ac_tool_prefix"; then
+@@ -2883,11 +2766,11 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
+
+ # We need awk for the "check" target. The system "awk" is bad on
+ # some platforms.
+-# Always define AMTAR for backward compatibility.
+-
+-AMTAR=${AMTAR-"${am_missing_run}tar"}
++# Always define AMTAR for backward compatibility. Yes, it's still used
++# in the wild :-( We should find a proper way to deprecate it ...
++AMTAR='$${TAR-tar}'
+
+-am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
++am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
+
+
+
+@@ -2946,6 +2829,7 @@ fi
+ if test "x$enable_dependency_tracking" != xno; then
+ am_depcomp="$ac_aux_dir/depcomp"
+ AMDEPBACKSLASH='\'
++ am__nodep='_no'
+ fi
+ if test "x$enable_dependency_tracking" != xno; then
+ AMDEP_TRUE=
+@@ -2966,7 +2850,7 @@ if test -n "$ac_tool_prefix"; then
set dummy ${ac_tool_prefix}gcc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -8009,7 +9818,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3006,7 +2888,7 @@ if test -z "$ac_cv_prog_CC"; then
+@@ -3006,7 +2890,7 @@ if test -z "$ac_cv_prog_CC"; then
set dummy gcc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -8018,7 +9827,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -3059,7 +2941,7 @@ if test -z "$CC"; then
+@@ -3059,7 +2943,7 @@ if test -z "$CC"; then
set dummy ${ac_tool_prefix}cc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -8027,7 +9836,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3099,7 +2981,7 @@ if test -z "$CC"; then
+@@ -3099,7 +2983,7 @@ if test -z "$CC"; then
set dummy cc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -8036,7 +9845,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3158,7 +3040,7 @@ if test -z "$CC"; then
+@@ -3158,7 +3042,7 @@ if test -z "$CC"; then
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -8045,7 +9854,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3202,7 +3084,7 @@ do
+@@ -3202,7 +3086,7 @@ do
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -8054,7 +9863,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -3256,8 +3138,8 @@ fi
+@@ -3256,8 +3140,8 @@ fi
test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -8065,7 +9874,7 @@ index 4daa0e0..f161c99 100755
# Provide some information about the compiler.
$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-@@ -3371,9 +3253,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -3371,9 +3255,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -8077,7 +9886,7 @@ index 4daa0e0..f161c99 100755
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
-@@ -3415,8 +3296,8 @@ done
+@@ -3415,8 +3298,8 @@ done
else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -8088,7 +9897,7 @@ index 4daa0e0..f161c99 100755
fi
rm -f conftest conftest$ac_cv_exeext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-@@ -3473,9 +3354,9 @@ $as_echo "$ac_try_echo"; } >&5
+@@ -3473,9 +3356,9 @@ $as_echo "$ac_try_echo"; } >&5
else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -8100,7 +9909,7 @@ index 4daa0e0..f161c99 100755
fi
fi
fi
-@@ -3486,7 +3367,7 @@ rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
+@@ -3486,7 +3369,7 @@ rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
ac_clean_files=$ac_clean_files_save
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
$as_echo_n "checking for suffix of object files... " >&6; }
@@ -8109,7 +9918,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -3526,8 +3407,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -3526,8 +3409,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -8120,7 +9929,7 @@ index 4daa0e0..f161c99 100755
fi
rm -f conftest.$ac_cv_objext conftest.$ac_ext
fi
-@@ -3537,7 +3418,7 @@ OBJEXT=$ac_cv_objext
+@@ -3537,7 +3420,7 @@ OBJEXT=$ac_cv_objext
ac_objext=$OBJEXT
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
@@ -8129,7 +9938,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -3574,7 +3455,7 @@ ac_test_CFLAGS=${CFLAGS+set}
+@@ -3574,7 +3457,7 @@ ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
$as_echo_n "checking whether $CC accepts -g... " >&6; }
@@ -8138,7 +9947,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
ac_save_c_werror_flag=$ac_c_werror_flag
-@@ -3652,7 +3533,7 @@ else
+@@ -3652,7 +3535,7 @@ else
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
@@ -8147,7 +9956,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
ac_cv_prog_cc_c89=no
-@@ -3751,7 +3632,7 @@ depcc="$CC" am_compiler_list=
+@@ -3751,7 +3634,7 @@ depcc="$CC" am_compiler_list=
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
$as_echo_n "checking dependency style of $depcc... " >&6; }
@@ -8156,7 +9965,24 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -3887,7 +3768,7 @@ if test -n "$CPP" && test -d "$CPP"; then
+@@ -3760,6 +3643,7 @@ else
+ # instance it was reported that on HP-UX the gcc test will end up
+ # making a dummy file named `D' -- because `-MD' means `put the output
+ # in D'.
++ rm -rf conftest.dir
+ mkdir conftest.dir
+ # Copy depcomp to subdir because otherwise we won't find it if we're
+ # using a relative directory.
+@@ -3819,7 +3703,7 @@ else
+ break
+ fi
+ ;;
+- msvisualcpp | msvcmsys)
++ msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+ # This compiler won't grok `-c -o', but also, the minuso test has
+ # not run yet. These depmodes are late enough in the game, and
+ # so weak that their functioning should not be impacted.
+@@ -3887,7 +3771,7 @@ if test -n "$CPP" && test -d "$CPP"; then
CPP=
fi
if test -z "$CPP"; then
@@ -8165,7 +9991,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
# Double quotes because CPP needs to be expanded
-@@ -3917,7 +3798,7 @@ else
+@@ -3917,7 +3801,7 @@ else
# Broken: fails on valid input.
continue
fi
@@ -8174,7 +10000,7 @@ index 4daa0e0..f161c99 100755
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
-@@ -3933,11 +3814,11 @@ else
+@@ -3933,11 +3817,11 @@ else
ac_preproc_ok=:
break
fi
@@ -8188,7 +10014,7 @@ index 4daa0e0..f161c99 100755
if $ac_preproc_ok; then :
break
fi
-@@ -3976,7 +3857,7 @@ else
+@@ -3976,7 +3860,7 @@ else
# Broken: fails on valid input.
continue
fi
@@ -8197,7 +10023,7 @@ index 4daa0e0..f161c99 100755
# OK, works on sane cases. Now check whether nonexistent headers
# can be detected and how.
-@@ -3992,18 +3873,18 @@ else
+@@ -3992,18 +3876,18 @@ else
ac_preproc_ok=:
break
fi
@@ -8220,7 +10046,7 @@ index 4daa0e0..f161c99 100755
fi
ac_ext=c
-@@ -4015,7 +3896,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -4015,7 +3899,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
@@ -8229,7 +10055,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
if test -z "$GREP"; then
-@@ -4064,7 +3945,7 @@ esac
+@@ -4064,7 +3948,7 @@ esac
done
IFS=$as_save_IFS
if test -z "$ac_cv_path_GREP"; then
@@ -8238,7 +10064,7 @@ index 4daa0e0..f161c99 100755
fi
else
ac_cv_path_GREP=$GREP
-@@ -4078,7 +3959,7 @@ $as_echo "$ac_cv_path_GREP" >&6; }
+@@ -4078,7 +3962,7 @@ $as_echo "$ac_cv_path_GREP" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
$as_echo_n "checking for egrep... " >&6; }
@@ -8247,7 +10073,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-@@ -4130,7 +4011,7 @@ esac
+@@ -4130,7 +4014,7 @@ esac
done
IFS=$as_save_IFS
if test -z "$ac_cv_path_EGREP"; then
@@ -8256,7 +10082,7 @@ index 4daa0e0..f161c99 100755
fi
else
ac_cv_path_EGREP=$EGREP
-@@ -4145,7 +4026,7 @@ $as_echo "$ac_cv_path_EGREP" >&6; }
+@@ -4145,7 +4029,7 @@ $as_echo "$ac_cv_path_EGREP" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
$as_echo_n "checking for ANSI C header files... " >&6; }
@@ -8265,7 +10091,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -4262,8 +4143,7 @@ do :
+@@ -4262,8 +4146,7 @@ do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
"
@@ -8275,7 +10101,7 @@ index 4daa0e0..f161c99 100755
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -4275,7 +4155,7 @@ done
+@@ -4275,7 +4158,7 @@ done
ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default"
@@ -8284,7 +10110,7 @@ index 4daa0e0..f161c99 100755
MINIX=yes
else
MINIX=
-@@ -4297,7 +4177,7 @@ $as_echo "#define _MINIX 1" >>confdefs.h
+@@ -4297,7 +4180,7 @@ $as_echo "#define _MINIX 1" >>confdefs.h
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
@@ -8293,7 +10119,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -4408,7 +4288,7 @@ if test -n "$ac_tool_prefix"; then
+@@ -4408,7 +4291,7 @@ if test -n "$ac_tool_prefix"; then
set dummy ${ac_tool_prefix}gcc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -8302,7 +10128,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -4448,7 +4328,7 @@ if test -z "$ac_cv_prog_CC"; then
+@@ -4448,7 +4331,7 @@ if test -z "$ac_cv_prog_CC"; then
set dummy gcc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -8311,7 +10137,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -4501,7 +4381,7 @@ if test -z "$CC"; then
+@@ -4501,7 +4384,7 @@ if test -z "$CC"; then
set dummy ${ac_tool_prefix}cc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -8320,7 +10146,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -4541,7 +4421,7 @@ if test -z "$CC"; then
+@@ -4541,7 +4424,7 @@ if test -z "$CC"; then
set dummy cc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -8329,7 +10155,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -4600,7 +4480,7 @@ if test -z "$CC"; then
+@@ -4600,7 +4483,7 @@ if test -z "$CC"; then
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -8338,7 +10164,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -4644,7 +4524,7 @@ do
+@@ -4644,7 +4527,7 @@ do
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -8347,7 +10173,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -4698,8 +4578,8 @@ fi
+@@ -4698,8 +4581,8 @@ fi
test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -8358,7 +10184,7 @@ index 4daa0e0..f161c99 100755
# Provide some information about the compiler.
$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-@@ -4728,7 +4608,7 @@ done
+@@ -4728,7 +4611,7 @@ done
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
@@ -8367,7 +10193,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -4765,7 +4645,7 @@ ac_test_CFLAGS=${CFLAGS+set}
+@@ -4765,7 +4648,7 @@ ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
$as_echo_n "checking whether $CC accepts -g... " >&6; }
@@ -8376,7 +10202,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
ac_save_c_werror_flag=$ac_c_werror_flag
-@@ -4843,7 +4723,7 @@ else
+@@ -4843,7 +4726,7 @@ else
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
@@ -8385,7 +10211,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
ac_cv_prog_cc_c89=no
-@@ -4942,7 +4822,7 @@ depcc="$CC" am_compiler_list=
+@@ -4942,7 +4825,7 @@ depcc="$CC" am_compiler_list=
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
$as_echo_n "checking dependency style of $depcc... " >&6; }
@@ -8394,18 +10220,35 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -5073,8 +4953,8 @@ esac
+@@ -4951,6 +4834,7 @@ else
+ # instance it was reported that on HP-UX the gcc test will end up
+ # making a dummy file named `D' -- because `-MD' means `put the output
+ # in D'.
++ rm -rf conftest.dir
+ mkdir conftest.dir
+ # Copy depcomp to subdir because otherwise we won't find it if we're
+ # using a relative directory.
+@@ -5010,7 +4894,7 @@ else
+ break
+ fi
+ ;;
+- msvisualcpp | msvcmsys)
++ msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+ # This compiler won't grok `-c -o', but also, the minuso test has
+ # not run yet. These depmodes are late enough in the game, and
+ # so weak that their functioning should not be impacted.
+@@ -5073,8 +4957,8 @@ esac
-macro_version='2.2.6b'
-macro_revision='1.3017'
-+macro_version='2.4'
-+macro_revision='1.3293'
++macro_version='2.4.2'
++macro_revision='1.3337'
-@@ -5092,27 +4972,27 @@ ltmain="$ac_aux_dir/ltmain.sh"
+@@ -5092,27 +4976,27 @@ ltmain="$ac_aux_dir/ltmain.sh"
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
@@ -8438,7 +10281,7 @@ index 4daa0e0..f161c99 100755
esac
build=$ac_cv_build
ac_save_IFS=$IFS; IFS='-'
-@@ -5130,14 +5010,14 @@ case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+@@ -5130,14 +5014,14 @@ case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
$as_echo_n "checking host system type... " >&6; }
@@ -8455,7 +10298,7 @@ index 4daa0e0..f161c99 100755
fi
fi
-@@ -5145,7 +5025,7 @@ fi
+@@ -5145,7 +5029,7 @@ fi
$as_echo "$ac_cv_host" >&6; }
case $ac_cv_host in
*-*-*) ;;
@@ -8464,7 +10307,7 @@ index 4daa0e0..f161c99 100755
esac
host=$ac_cv_host
ac_save_IFS=$IFS; IFS='-'
-@@ -5161,9 +5041,78 @@ IFS=$ac_save_IFS
+@@ -5161,9 +5045,78 @@ IFS=$ac_save_IFS
case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
@@ -8544,7 +10387,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-@@ -5218,7 +5167,7 @@ esac
+@@ -5218,7 +5171,7 @@ esac
done
IFS=$as_save_IFS
if test -z "$ac_cv_path_SED"; then
@@ -8553,7 +10396,7 @@ index 4daa0e0..f161c99 100755
fi
else
ac_cv_path_SED=$SED
-@@ -5245,7 +5194,7 @@ Xsed="$SED -e 1s/^X//"
+@@ -5245,7 +5198,7 @@ Xsed="$SED -e 1s/^X//"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
$as_echo_n "checking for fgrep... " >&6; }
@@ -8562,7 +10405,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
-@@ -5297,7 +5246,7 @@ esac
+@@ -5297,7 +5250,7 @@ esac
done
IFS=$as_save_IFS
if test -z "$ac_cv_path_FGREP"; then
@@ -8571,7 +10414,7 @@ index 4daa0e0..f161c99 100755
fi
else
ac_cv_path_FGREP=$FGREP
-@@ -5376,7 +5325,7 @@ else
+@@ -5376,7 +5329,7 @@ else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
$as_echo_n "checking for non-GNU ld... " >&6; }
fi
@@ -8580,7 +10423,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
-@@ -5413,10 +5362,10 @@ else
+@@ -5413,10 +5366,10 @@ else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
@@ -8593,7 +10436,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
# I'd rather use --version here, but apparently some GNU lds only accept -v.
-@@ -5443,7 +5392,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
+@@ -5443,7 +5396,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
@@ -8602,7 +10445,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
if test -n "$NM"; then
-@@ -5496,14 +5445,17 @@ if test "$lt_cv_path_NM" != "no"; then
+@@ -5496,14 +5449,17 @@ if test "$lt_cv_path_NM" != "no"; then
NM="$lt_cv_path_NM"
else
# Didn't find any BSD compatible name lister, look for dumpbin.
@@ -8623,7 +10466,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
if test -n "$DUMPBIN"; then
-@@ -5541,13 +5493,13 @@ fi
+@@ -5541,13 +5497,13 @@ fi
fi
if test -z "$DUMPBIN"; then
ac_ct_DUMPBIN=$DUMPBIN
@@ -8639,7 +10482,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DUMPBIN"; then
-@@ -5596,6 +5548,15 @@ esac
+@@ -5596,6 +5552,15 @@ esac
fi
fi
@@ -8655,7 +10498,7 @@ index 4daa0e0..f161c99 100755
if test "$DUMPBIN" != ":"; then
NM="$DUMPBIN"
-@@ -5610,18 +5571,18 @@ test -z "$NM" && NM=nm
+@@ -5610,18 +5575,18 @@ test -z "$NM" && NM=nm
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
$as_echo_n "checking the name lister ($NM) interface... " >&6; }
@@ -8678,7 +10521,7 @@ index 4daa0e0..f161c99 100755
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
-@@ -5645,7 +5606,7 @@ fi
+@@ -5645,7 +5610,7 @@ fi
# find the maximum length of command line arguments
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
$as_echo_n "checking the maximum length of command line arguments... " >&6; }
@@ -8687,7 +10530,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
i=0
-@@ -5678,6 +5639,11 @@ else
+@@ -5678,6 +5643,11 @@ else
lt_cv_sys_max_cmd_len=8192;
;;
@@ -8699,18 +10542,30 @@ index 4daa0e0..f161c99 100755
amigaos*)
# On AmigaOS with pdksh, this test takes hours, literally.
# So we just punt and use a minimum line length of 8192.
-@@ -5742,8 +5708,8 @@ else
+@@ -5703,6 +5673,11 @@ else
+ lt_cv_sys_max_cmd_len=196608
+ ;;
+
++ os2*)
++ # The test takes a long time on OS/2.
++ lt_cv_sys_max_cmd_len=8192
++ ;;
++
+ osf*)
+ # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+ # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
+@@ -5742,8 +5717,8 @@ else
# If test is not a shell built-in, we'll probably end up computing a
# maximum length that is only half of the actual maximum length, but
# we can't tell.
- while { test "X"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
- = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
-+ while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
++ while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
+ = "X$teststring$teststring"; } >/dev/null 2>&1 &&
test $i != 17 # 1/2 MB should be enough
do
i=`expr $i + 1`
-@@ -5785,8 +5751,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
+@@ -5785,8 +5760,8 @@ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6;
# Try some XSI features
xsi_shell=no
( _lt_dummy="a/b/c"
@@ -8721,7 +10576,7 @@ index 4daa0e0..f161c99 100755
&& eval 'test $(( 1 + 1 )) -eq 2 \
&& test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
&& xsi_shell=yes
-@@ -5835,9 +5801,83 @@ esac
+@@ -5835,9 +5810,83 @@ esac
@@ -8806,7 +10661,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
lt_cv_ld_reload_flag='-r'
-@@ -5851,6 +5891,11 @@ case $reload_flag in
+@@ -5851,6 +5900,11 @@ case $reload_flag in
esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
case $host_os in
@@ -8818,7 +10673,7 @@ index 4daa0e0..f161c99 100755
darwin*)
if test "$GCC" = yes; then
reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
-@@ -5873,7 +5918,7 @@ if test -n "$ac_tool_prefix"; then
+@@ -5873,7 +5927,7 @@ if test -n "$ac_tool_prefix"; then
set dummy ${ac_tool_prefix}objdump; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -8827,7 +10682,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
if test -n "$OBJDUMP"; then
-@@ -5913,7 +5958,7 @@ if test -z "$ac_cv_prog_OBJDUMP"; then
+@@ -5913,7 +5967,7 @@ if test -z "$ac_cv_prog_OBJDUMP"; then
set dummy objdump; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -8836,7 +10691,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OBJDUMP"; then
-@@ -5972,7 +6017,7 @@ test -z "$OBJDUMP" && OBJDUMP=objdump
+@@ -5972,7 +6026,7 @@ test -z "$OBJDUMP" && OBJDUMP=objdump
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
$as_echo_n "checking how to recognize dependent libraries... " >&6; }
@@ -8845,7 +10700,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
lt_cv_file_magic_cmd='$MAGIC_CMD'
-@@ -6014,16 +6059,18 @@ mingw* | pw32*)
+@@ -6014,16 +6068,18 @@ mingw* | pw32*)
# Base MSYS/MinGW do not provide the 'file' command needed by
# func_win32_libid shell function, so use a weaker test based on 'objdump',
# unless we find 'file', for example because we are cross-compiling.
@@ -8867,7 +10722,7 @@ index 4daa0e0..f161c99 100755
# use the weaker test based on 'objdump'. See mingw*.
lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
lt_cv_file_magic_cmd='$OBJDUMP -f'
-@@ -6053,6 +6100,10 @@ gnu*)
+@@ -6053,6 +6109,10 @@ gnu*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -8878,7 +10733,7 @@ index 4daa0e0..f161c99 100755
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
case $host_cpu in
-@@ -6061,11 +6112,11 @@ hpux10.20* | hpux11*)
+@@ -6061,11 +6121,11 @@ hpux10.20* | hpux11*)
lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
;;
hppa*64*)
@@ -8892,7 +10747,13 @@ index 4daa0e0..f161c99 100755
lt_cv_file_magic_test_file=/usr/lib/libc.sl
;;
esac
-@@ -6091,7 +6142,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+@@ -6086,12 +6146,12 @@ irix5* | irix6* | nonstopux*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+-# This must be Linux ELF.
++# This must be glibc/ELF.
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
lt_cv_deplibs_check_method=pass_all
;;
@@ -8901,7 +10762,7 @@ index 4daa0e0..f161c99 100755
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
else
-@@ -6168,6 +6219,21 @@ esac
+@@ -6168,6 +6228,21 @@ esac
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
$as_echo "$lt_cv_deplibs_check_method" >&6; }
@@ -8923,7 +10784,7 @@ index 4daa0e0..f161c99 100755
file_magic_cmd=$lt_cv_file_magic_cmd
deplibs_check_method=$lt_cv_deplibs_check_method
test -z "$deplibs_check_method" && deplibs_check_method=unknown
-@@ -6183,16 +6249,26 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
+@@ -6183,16 +6258,26 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
@@ -8955,7 +10816,7 @@ index 4daa0e0..f161c99 100755
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
-@@ -6201,7 +6277,7 @@ do
+@@ -6201,7 +6286,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -8964,7 +10825,7 @@ index 4daa0e0..f161c99 100755
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -6211,10 +6287,10 @@ IFS=$as_save_IFS
+@@ -6211,10 +6296,10 @@ IFS=$as_save_IFS
fi
fi
@@ -8979,7 +10840,7 @@ index 4daa0e0..f161c99 100755
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
-@@ -6222,17 +6298,17 @@ fi
+@@ -6222,17 +6307,17 @@ fi
fi
@@ -9004,7 +10865,7 @@ index 4daa0e0..f161c99 100755
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
-@@ -6241,7 +6317,7 @@ do
+@@ -6241,7 +6326,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -9013,7 +10874,7 @@ index 4daa0e0..f161c99 100755
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -6251,17 +6327,17 @@ IFS=$as_save_IFS
+@@ -6251,17 +6336,17 @@ IFS=$as_save_IFS
fi
fi
@@ -9037,7 +10898,7 @@ index 4daa0e0..f161c99 100755
else
case $cross_compiling:$ac_tool_warned in
yes:)
-@@ -6269,14 +6345,14 @@ yes:)
+@@ -6269,35 +6354,73 @@ yes:)
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
@@ -9053,10 +10914,12 @@ index 4daa0e0..f161c99 100755
-test -z "$AR_FLAGS" && AR_FLAGS=cru
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+
++
++
++
-@@ -6286,18 +6362,56 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
@@ -9093,9 +10956,9 @@ index 4daa0e0..f161c99 100755
+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
+
+
-+
-+
-+
+
+
+
if test -n "$ac_tool_prefix"; then
@@ -9118,7 +10981,7 @@ index 4daa0e0..f161c99 100755
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
-@@ -6306,7 +6420,7 @@ do
+@@ -6306,7 +6429,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -9127,7 +10990,7 @@ index 4daa0e0..f161c99 100755
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -6316,28 +6430,32 @@ IFS=$as_save_IFS
+@@ -6316,28 +6439,197 @@ IFS=$as_save_IFS
fi
fi
@@ -9168,26 +11031,24 @@ index 4daa0e0..f161c99 100755
- ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+ if test -n "$ac_ct_AR"; then
+ ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
- else
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- for as_dir in $PATH
-@@ -6346,7 +6464,7 @@ do
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_prog_ac_ct_STRIP="strip"
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_AR="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-@@ -6356,10 +6474,175 @@ IFS=$as_save_IFS
-
- fi
- fi
--ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
--if test -n "$ac_ct_STRIP"; then
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
--$as_echo "$ac_ct_STRIP" >&6; }
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++ done
++IFS=$as_save_IFS
++
++fi
++fi
+ac_ct_AR=$ac_cv_prog_ac_ct_AR
+if test -n "$ac_ct_AR"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
@@ -9335,32 +11196,10 @@ index 4daa0e0..f161c99 100755
+else
+ if test -n "$ac_ct_STRIP"; then
+ ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ ac_cv_prog_ac_ct_STRIP="strip"
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+ done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-+if test -n "$ac_ct_STRIP"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-+$as_echo "$ac_ct_STRIP" >&6; }
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
-@@ -6392,7 +6675,7 @@ if test -n "$ac_tool_prefix"; then
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+@@ -6392,7 +6684,7 @@ if test -n "$ac_tool_prefix"; then
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -9369,7 +11208,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
if test -n "$RANLIB"; then
-@@ -6432,7 +6715,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
+@@ -6432,7 +6724,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
set dummy ranlib; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -9378,8 +11217,20 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_RANLIB"; then
-@@ -6503,6 +6786,18 @@ if test -n "$RANLIB"; then
- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+@@ -6494,15 +6786,27 @@ old_postuninstall_cmds=
+ if test -n "$RANLIB"; then
+ case $host_os in
+ openbsd*)
+- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
+ ;;
+ *)
+- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
+ ;;
+ esac
+- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
++ old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
fi
+case $host_os in
@@ -9397,7 +11248,7 @@ index 4daa0e0..f161c99 100755
-@@ -6549,7 +6844,7 @@ compiler=$CC
+@@ -6549,7 +6853,7 @@ compiler=$CC
# Check for command to grab the raw symbol name followed by C symbol from nm.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
@@ -9406,7 +11257,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
-@@ -6610,8 +6905,8 @@ esac
+@@ -6610,8 +6914,8 @@ esac
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
# Transform an extracted symbol line into symbol name and symbol address
@@ -9417,7 +11268,15 @@ index 4daa0e0..f161c99 100755
# Handle CRLF in mingw tool chain
opt_cr=
-@@ -6647,6 +6942,7 @@ for ac_symprfx in "" "_"; do
+@@ -6635,6 +6939,7 @@ for ac_symprfx in "" "_"; do
+ # which start with @ or ?.
+ lt_cv_sys_global_symbol_pipe="$AWK '"\
+ " {last_section=section; section=\$ 3};"\
++" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
+ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
+ " \$ 0!~/External *\|/{next};"\
+ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
+@@ -6647,6 +6952,7 @@ for ac_symprfx in "" "_"; do
else
lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
fi
@@ -9425,7 +11284,7 @@ index 4daa0e0..f161c99 100755
# Check to see that the pipe works correctly.
pipe_works=no
-@@ -6672,8 +6968,8 @@ _LT_EOF
+@@ -6672,8 +6978,8 @@ _LT_EOF
test $ac_status = 0; }; then
# Now try to grab the symbols.
nlist=conftest.nm
@@ -9436,7 +11295,7 @@ index 4daa0e0..f161c99 100755
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; } && test -s "$nlist"; then
-@@ -6688,6 +6984,18 @@ _LT_EOF
+@@ -6688,6 +6994,18 @@ _LT_EOF
if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
cat <<_LT_EOF > conftest.$ac_ext
@@ -9455,7 +11314,7 @@ index 4daa0e0..f161c99 100755
#ifdef __cplusplus
extern "C" {
#endif
-@@ -6699,7 +7007,7 @@ _LT_EOF
+@@ -6699,7 +7017,7 @@ _LT_EOF
cat <<_LT_EOF >> conftest.$ac_ext
/* The mapping between symbol names and symbols. */
@@ -9464,7 +11323,7 @@ index 4daa0e0..f161c99 100755
const char *name;
void *address;
}
-@@ -6725,8 +7033,8 @@ static const void *lt_preloaded_setup() {
+@@ -6725,8 +7043,8 @@ static const void *lt_preloaded_setup() {
_LT_EOF
# Now try linking the two files.
mv conftest.$ac_objext conftstm.$ac_objext
@@ -9475,7 +11334,7 @@ index 4daa0e0..f161c99 100755
LIBS="conftstm.$ac_objext"
CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-@@ -6736,8 +7044,8 @@ _LT_EOF
+@@ -6736,8 +7054,8 @@ _LT_EOF
test $ac_status = 0; } && test -s conftest${ac_exeext}; then
pipe_works=yes
fi
@@ -9486,7 +11345,7 @@ index 4daa0e0..f161c99 100755
else
echo "cannot find nm_test_func in $nlist" >&5
fi
-@@ -6774,6 +7082,15 @@ else
+@@ -6774,6 +7092,12 @@ else
$as_echo "ok" >&6; }
fi
@@ -9496,19 +11355,19 @@ index 4daa0e0..f161c99 100755
+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
+ nm_file_list_spec='@'
+fi
-+
-+
-+
-@@ -6795,6 +7112,46 @@ fi
+@@ -6795,6 +7119,49 @@ fi
+
+
+
++
++
++
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
+$as_echo_n "checking for sysroot... " >&6; }
+
@@ -9549,7 +11408,7 @@ index 4daa0e0..f161c99 100755
# Check whether --enable-libtool-lock was given.
if test "${enable_libtool_lock+set}" = set; then :
enableval=$enable_libtool_lock;
-@@ -6826,7 +7183,7 @@ ia64-*-hpux*)
+@@ -6826,7 +7193,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
@@ -9558,7 +11417,7 @@ index 4daa0e0..f161c99 100755
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -6920,7 +7277,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+@@ -6920,7 +7287,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
CFLAGS="$CFLAGS -belf"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
@@ -9567,7 +11426,38 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
ac_ext=c
-@@ -6988,6 +7345,123 @@ esac
+@@ -6961,7 +7328,7 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; }
+ CFLAGS="$SAVE_CFLAGS"
+ fi
+ ;;
+-sparc*-*solaris*)
++*-*solaris*)
+ # Find out which ABI we are using.
+ echo 'int i;' > conftest.$ac_ext
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+@@ -6972,7 +7339,20 @@ sparc*-*solaris*)
+ case `/usr/bin/file conftest.o` in
+ *64-bit*)
+ case $lt_cv_prog_gnu_ld in
+- yes*) LD="${LD-ld} -m elf64_sparc" ;;
++ yes*)
++ case $host in
++ i?86-*-solaris*)
++ LD="${LD-ld} -m elf_x86_64"
++ ;;
++ sparc*-*-solaris*)
++ LD="${LD-ld} -m elf64_sparc"
++ ;;
++ esac
++ # GNU ld 2.21 introduced _sol2 emulations. Use them if available.
++ if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
++ LD="${LD-ld}_sol2"
++ fi
++ ;;
+ *)
+ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+ LD="${LD-ld} -64"
+@@ -6988,6 +7368,123 @@ esac
need_locks="$enable_libtool_lock"
@@ -9691,7 +11581,7 @@ index 4daa0e0..f161c99 100755
case $host_os in
rhapsody* | darwin*)
-@@ -6996,7 +7470,7 @@ need_locks="$enable_libtool_lock"
+@@ -6996,7 +7493,7 @@ need_locks="$enable_libtool_lock"
set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -9700,7 +11590,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
if test -n "$DSYMUTIL"; then
-@@ -7036,7 +7510,7 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then
+@@ -7036,7 +7533,7 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then
set dummy dsymutil; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -9709,7 +11599,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DSYMUTIL"; then
-@@ -7088,7 +7562,7 @@ fi
+@@ -7088,7 +7585,7 @@ fi
set dummy ${ac_tool_prefix}nmedit; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -9718,7 +11608,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
if test -n "$NMEDIT"; then
-@@ -7128,7 +7602,7 @@ if test -z "$ac_cv_prog_NMEDIT"; then
+@@ -7128,7 +7625,7 @@ if test -z "$ac_cv_prog_NMEDIT"; then
set dummy nmedit; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -9727,7 +11617,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_NMEDIT"; then
-@@ -7180,7 +7654,7 @@ fi
+@@ -7180,7 +7677,7 @@ fi
set dummy ${ac_tool_prefix}lipo; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -9736,7 +11626,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
if test -n "$LIPO"; then
-@@ -7220,7 +7694,7 @@ if test -z "$ac_cv_prog_LIPO"; then
+@@ -7220,7 +7717,7 @@ if test -z "$ac_cv_prog_LIPO"; then
set dummy lipo; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -9745,7 +11635,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_LIPO"; then
-@@ -7272,7 +7746,7 @@ fi
+@@ -7272,7 +7769,7 @@ fi
set dummy ${ac_tool_prefix}otool; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -9754,7 +11644,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL"; then
-@@ -7312,7 +7786,7 @@ if test -z "$ac_cv_prog_OTOOL"; then
+@@ -7312,7 +7809,7 @@ if test -z "$ac_cv_prog_OTOOL"; then
set dummy otool; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -9763,7 +11653,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL"; then
-@@ -7364,7 +7838,7 @@ fi
+@@ -7364,7 +7861,7 @@ fi
set dummy ${ac_tool_prefix}otool64; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -9772,7 +11662,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL64"; then
-@@ -7404,7 +7878,7 @@ if test -z "$ac_cv_prog_OTOOL64"; then
+@@ -7404,7 +7901,7 @@ if test -z "$ac_cv_prog_OTOOL64"; then
set dummy otool64; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -9781,7 +11671,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL64"; then
-@@ -7479,7 +7953,7 @@ fi
+@@ -7479,7 +7976,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
$as_echo_n "checking for -single_module linker flag... " >&6; }
@@ -9790,8 +11680,26 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
lt_cv_apple_cc_single_mod=no
-@@ -7508,7 +7982,7 @@ fi
+@@ -7495,7 +7992,13 @@ else
+ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
+ _lt_result=$?
+- if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
++ # If there is a non-empty error log, and "single_module"
++ # appears in it, assume the flag caused a linker warning
++ if test -s conftest.err && $GREP single_module conftest.err; then
++ cat conftest.err >&5
++ # Otherwise, if the output was created with a 0 exit code from
++ # the compiler, it worked.
++ elif test -f libconftest.dylib && test $_lt_result -eq 0; then
+ lt_cv_apple_cc_single_mod=yes
+ else
+ cat conftest.err >&5
+@@ -7506,9 +8009,10 @@ else
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
++
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
-if test "${lt_cv_ld_exported_symbols_list+set}" = set; then :
@@ -9799,10 +11707,11 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
lt_cv_ld_exported_symbols_list=no
-@@ -7538,6 +8012,38 @@ rm -f core conftest.err conftest.$ac_objext \
+@@ -7538,6 +8042,41 @@ rm -f core conftest.err conftest.$ac_objext \
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
++
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
+$as_echo_n "checking for -force_load linker flag... " >&6; }
+if ${lt_cv_ld_force_load+:} false; then :
@@ -9824,7 +11733,9 @@ index 4daa0e0..f161c99 100755
+ echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
+ $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
+ _lt_result=$?
-+ if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
++ if test -s conftest.err && $GREP force_load conftest.err; then
++ cat conftest.err >&5
++ elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
+ lt_cv_ld_force_load=yes
+ else
+ cat conftest.err >&5
@@ -9838,7 +11749,7 @@ index 4daa0e0..f161c99 100755
case $host_os in
rhapsody* | darwin1.[012])
_lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-@@ -7565,7 +8071,7 @@ $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
+@@ -7565,7 +8104,7 @@ $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
else
_lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
fi
@@ -9847,7 +11758,7 @@ index 4daa0e0..f161c99 100755
_lt_dsymutil='~$DSYMUTIL $lib || :'
else
_lt_dsymutil=
-@@ -7577,7 +8083,7 @@ for ac_header in dlfcn.h
+@@ -7577,7 +8116,7 @@ for ac_header in dlfcn.h
do :
ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
"
@@ -9856,7 +11767,7 @@ index 4daa0e0..f161c99 100755
cat >>confdefs.h <<_ACEOF
#define HAVE_DLFCN_H 1
_ACEOF
-@@ -7588,6 +8094,8 @@ done
+@@ -7588,6 +8127,8 @@ done
@@ -9865,15 +11776,43 @@ index 4daa0e0..f161c99 100755
# Set options
-@@ -7680,6 +8188,7 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -7603,7 +8144,22 @@ done
+
+ # Check whether --with-pic was given.
+ if test "${with_pic+set}" = set; then :
+- withval=$with_pic; pic_mode="$withval"
++ withval=$with_pic; lt_p=${PACKAGE-default}
++ case $withval in
++ yes|no) pic_mode=$withval ;;
++ *)
++ pic_mode=default
++ # Look at the argument we got. We use all the common list separators.
++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++ for lt_pkg in $withval; do
++ IFS="$lt_save_ifs"
++ if test "X$lt_pkg" = "X$lt_p"; then
++ pic_mode=yes
++ fi
++ done
++ IFS="$lt_save_ifs"
++ ;;
++ esac
+ else
+ pic_mode=default
+ fi
+@@ -7680,6 +8236,11 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+
++
++
++
++
test -z "$LN_S" && LN_S="ln -s"
-@@ -7701,7 +8210,7 @@ fi
+@@ -7701,7 +8262,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
$as_echo_n "checking for objdir... " >&6; }
@@ -9882,7 +11821,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
rm -f .libs 2>/dev/null
-@@ -7729,19 +8238,6 @@ _ACEOF
+@@ -7729,19 +8290,6 @@ _ACEOF
@@ -9902,7 +11841,7 @@ index 4daa0e0..f161c99 100755
case $host_os in
aix3*)
# AIX sometimes has problems with the GCC collect2 program. For some
-@@ -7754,23 +8250,6 @@ aix3*)
+@@ -7754,23 +8302,6 @@ aix3*)
;;
esac
@@ -9926,7 +11865,7 @@ index 4daa0e0..f161c99 100755
# Global variables:
ofile=libtool
can_build_shared=yes
-@@ -7799,7 +8278,7 @@ for cc_temp in $compiler""; do
+@@ -7799,7 +8330,7 @@ for cc_temp in $compiler""; do
*) break;;
esac
done
@@ -9935,7 +11874,7 @@ index 4daa0e0..f161c99 100755
# Only perform the check for file, if the check method requires it
-@@ -7809,7 +8288,7 @@ file_magic*)
+@@ -7809,7 +8340,7 @@ file_magic*)
if test "$file_magic_cmd" = '$MAGIC_CMD'; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
@@ -9944,7 +11883,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
-@@ -7875,7 +8354,7 @@ if test -z "$lt_cv_path_MAGIC_CMD"; then
+@@ -7875,7 +8406,7 @@ if test -z "$lt_cv_path_MAGIC_CMD"; then
if test -n "$ac_tool_prefix"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
$as_echo_n "checking for file... " >&6; }
@@ -9953,7 +11892,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
-@@ -8008,11 +8487,16 @@ if test -n "$compiler"; then
+@@ -8008,11 +8539,16 @@ if test -n "$compiler"; then
lt_prog_compiler_no_builtin_flag=
if test "$GCC" = yes; then
@@ -9972,7 +11911,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_rtti_exceptions=no
-@@ -8028,15 +8512,15 @@ else
+@@ -8028,15 +8564,15 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -9991,7 +11930,7 @@ index 4daa0e0..f161c99 100755
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
lt_cv_prog_compiler_rtti_exceptions=yes
-@@ -8065,8 +8549,6 @@ fi
+@@ -8065,8 +8601,6 @@ fi
lt_prog_compiler_pic=
lt_prog_compiler_static=
@@ -10000,7 +11939,7 @@ index 4daa0e0..f161c99 100755
if test "$GCC" = yes; then
lt_prog_compiler_wl='-Wl,'
-@@ -8114,6 +8596,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+@@ -8114,6 +8648,12 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
lt_prog_compiler_pic='-fno-common'
;;
@@ -10013,7 +11952,7 @@ index 4daa0e0..f161c99 100755
hpux*)
# PIC is the default for 64-bit PA HP-UX, but not for 32-bit
# PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
-@@ -8156,6 +8644,13 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+@@ -8156,6 +8696,15 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
lt_prog_compiler_pic='-fPIC'
;;
esac
@@ -10021,13 +11960,15 @@ index 4daa0e0..f161c99 100755
+ case $cc_basename in
+ nvcc*) # Cuda Compiler Driver 2.2
+ lt_prog_compiler_wl='-Xlinker '
-+ lt_prog_compiler_pic='-Xcompiler -fPIC'
++ if test -n "$lt_prog_compiler_pic"; then
++ lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic"
++ fi
+ ;;
+ esac
else
# PORTME Check for flag to pass linker flags through the system compiler.
case $host_os in
-@@ -8218,7 +8713,13 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+@@ -8218,7 +8767,13 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
lt_prog_compiler_pic='--shared'
lt_prog_compiler_static='--static'
;;
@@ -10042,7 +11983,7 @@ index 4daa0e0..f161c99 100755
# Portland Group compilers (*not* the Pentium gcc compiler,
# which looks to be a dead project)
lt_prog_compiler_wl='-Wl,'
-@@ -8230,25 +8731,25 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+@@ -8230,25 +8785,40 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
# All Alpha code is PIC.
lt_prog_compiler_static='-non_shared'
;;
@@ -10056,27 +11997,40 @@ index 4daa0e0..f161c99 100755
;;
*)
case `$CC -V 2>&1 | sed 5q` in
-- *Sun\ C*)
-- # Sun C 5.9
-+ *Sun\ F* | *Sun*Fortran*)
++ *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*)
+ # Sun Fortran 8.3 passes all unrecognized flags to the linker
++ lt_prog_compiler_pic='-KPIC'
++ lt_prog_compiler_static='-Bstatic'
++ lt_prog_compiler_wl=''
++ ;;
++ *Sun\ F* | *Sun*Fortran*)
++ lt_prog_compiler_pic='-KPIC'
++ lt_prog_compiler_static='-Bstatic'
++ lt_prog_compiler_wl='-Qoption ld '
++ ;;
+ *Sun\ C*)
+ # Sun C 5.9
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
-- lt_prog_compiler_wl='-Wl,'
-+ lt_prog_compiler_wl=''
+ lt_prog_compiler_wl='-Wl,'
;;
- *Sun\ F*)
- # Sun Fortran 8.3 passes all unrecognized flags to the linker
-+ *Sun\ C*)
-+ # Sun C 5.9
- lt_prog_compiler_pic='-KPIC'
+- lt_prog_compiler_pic='-KPIC'
++ *Intel*\ [CF]*Compiler*)
++ lt_prog_compiler_wl='-Wl,'
++ lt_prog_compiler_pic='-fPIC'
++ lt_prog_compiler_static='-static'
++ ;;
++ *Portland\ Group*)
++ lt_prog_compiler_wl='-Wl,'
++ lt_prog_compiler_pic='-fpic'
lt_prog_compiler_static='-Bstatic'
- lt_prog_compiler_wl=''
-+ lt_prog_compiler_wl='-Wl,'
;;
esac
;;
-@@ -8280,7 +8781,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+@@ -8280,7 +8850,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
case $cc_basename in
@@ -10085,7 +12039,7 @@ index 4daa0e0..f161c99 100755
lt_prog_compiler_wl='-Qoption ld ';;
*)
lt_prog_compiler_wl='-Wl,';;
-@@ -8337,13 +8838,17 @@ case $host_os in
+@@ -8337,13 +8907,17 @@ case $host_os in
lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
;;
esac
@@ -10109,7 +12063,7 @@ index 4daa0e0..f161c99 100755
#
# Check to make sure the PIC flag actually works.
-@@ -8351,7 +8856,7 @@ $as_echo "$lt_prog_compiler_pic" >&6; }
+@@ -8351,7 +8925,7 @@ $as_echo "$lt_prog_compiler_pic" >&6; }
if test -n "$lt_prog_compiler_pic"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
@@ -10118,7 +12072,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_pic_works=no
-@@ -8367,15 +8872,15 @@ else
+@@ -8367,15 +8941,15 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -10137,7 +12091,7 @@ index 4daa0e0..f161c99 100755
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
lt_cv_prog_compiler_pic_works=yes
-@@ -8404,13 +8909,18 @@ fi
+@@ -8404,13 +8978,18 @@ fi
@@ -10157,7 +12111,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_static_works=no
-@@ -8423,7 +8933,7 @@ else
+@@ -8423,7 +9002,7 @@ else
if test -s conftest.err; then
# Append any errors to the config.log.
cat conftest.err 1>&5
@@ -10166,7 +12120,7 @@ index 4daa0e0..f161c99 100755
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
lt_cv_prog_compiler_static_works=yes
-@@ -8453,7 +8963,7 @@ fi
+@@ -8453,7 +9032,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
@@ -10175,7 +12129,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
-@@ -8472,16 +8982,16 @@ else
+@@ -8472,16 +9051,16 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -10195,7 +12149,7 @@ index 4daa0e0..f161c99 100755
$SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
lt_cv_prog_compiler_c_o=yes
-@@ -8508,7 +9018,7 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6; }
+@@ -8508,7 +9087,7 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
@@ -10204,7 +12158,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
-@@ -8527,16 +9037,16 @@ else
+@@ -8527,16 +9106,16 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -10224,7 +12178,15 @@ index 4daa0e0..f161c99 100755
$SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
lt_cv_prog_compiler_c_o=yes
-@@ -8646,13 +9156,36 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
+@@ -8602,7 +9181,6 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
+ hardcode_direct=no
+ hardcode_direct_absolute=no
+ hardcode_libdir_flag_spec=
+- hardcode_libdir_flag_spec_ld=
+ hardcode_libdir_separator=
+ hardcode_minus_L=no
+ hardcode_shlibpath_var=unsupported
+@@ -8646,13 +9224,36 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
openbsd*)
with_gnu_ld=no
;;
@@ -10264,7 +12226,7 @@ index 4daa0e0..f161c99 100755
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
-@@ -8686,11 +9219,12 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
+@@ -8686,11 +9287,12 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
ld_shlibs=no
cat <<_LT_EOF 1>&2
@@ -10280,7 +12242,7 @@ index 4daa0e0..f161c99 100755
_LT_EOF
fi
-@@ -8726,10 +9260,12 @@ _LT_EOF
+@@ -8726,10 +9328,12 @@ _LT_EOF
# _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
# as there is no search path for DLLs.
hardcode_libdir_flag_spec='-L$libdir'
@@ -10294,7 +12256,7 @@ index 4daa0e0..f161c99 100755
if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-@@ -8747,6 +9283,11 @@ _LT_EOF
+@@ -8747,6 +9351,11 @@ _LT_EOF
fi
;;
@@ -10306,7 +12268,7 @@ index 4daa0e0..f161c99 100755
interix[3-9]*)
hardcode_direct=no
hardcode_shlibpath_var=no
-@@ -8772,15 +9313,16 @@ _LT_EOF
+@@ -8772,15 +9381,16 @@ _LT_EOF
if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
&& test "$tmp_diet" = no
then
@@ -10327,7 +12289,7 @@ index 4daa0e0..f161c99 100755
tmp_addflag=' $pic_flag -Mnomain' ;;
ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
tmp_addflag=' -i_dynamic' ;;
-@@ -8791,13 +9333,17 @@ _LT_EOF
+@@ -8791,13 +9401,17 @@ _LT_EOF
lf95*) # Lahey Fortran 8.1
whole_archive_flag_spec=
tmp_sharedflag='--shared' ;;
@@ -10347,7 +12309,7 @@ index 4daa0e0..f161c99 100755
compiler_needs_object=yes
tmp_sharedflag='-G' ;;
*Sun\ F*) # Sun Fortran 8.3
-@@ -8813,17 +9359,17 @@ _LT_EOF
+@@ -8813,17 +9427,16 @@ _LT_EOF
fi
case $cc_basename in
@@ -10355,9 +12317,10 @@ index 4daa0e0..f161c99 100755
+ xlf* | bgf* | bgxlf* | mpixlf*)
# IBM XL Fortran 10.1 on PPC cannot create shared libs itself
whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
- hardcode_libdir_flag_spec=
- hardcode_libdir_flag_spec_ld='-rpath $libdir'
+- hardcode_libdir_flag_spec=
+- hardcode_libdir_flag_spec_ld='-rpath $libdir'
- archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
++ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+ archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
if test "x$supports_anon_versioning" = xyes; then
archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
@@ -10368,7 +12331,7 @@ index 4daa0e0..f161c99 100755
fi
;;
esac
-@@ -8832,13 +9378,13 @@ _LT_EOF
+@@ -8832,13 +9445,13 @@ _LT_EOF
fi
;;
@@ -10385,7 +12348,7 @@ index 4daa0e0..f161c99 100755
fi
;;
-@@ -8856,8 +9402,8 @@ _LT_EOF
+@@ -8856,8 +9469,8 @@ _LT_EOF
_LT_EOF
elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -10396,7 +12359,7 @@ index 4daa0e0..f161c99 100755
else
ld_shlibs=no
fi
-@@ -8903,8 +9449,8 @@ _LT_EOF
+@@ -8903,8 +9516,8 @@ _LT_EOF
*)
if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -10407,7 +12370,7 @@ index 4daa0e0..f161c99 100755
else
ld_shlibs=no
fi
-@@ -8944,8 +9490,10 @@ _LT_EOF
+@@ -8944,8 +9557,10 @@ _LT_EOF
else
# If we're using GNU nm, then we don't want the "-C" option.
# -C means demangle to AIX nm, but means don't demangle with GNU nm
@@ -10419,7 +12382,7 @@ index 4daa0e0..f161c99 100755
else
export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
fi
-@@ -9007,7 +9555,6 @@ _LT_EOF
+@@ -9007,7 +9622,6 @@ _LT_EOF
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
@@ -10427,7 +12390,7 @@ index 4daa0e0..f161c99 100755
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -9033,7 +9580,13 @@ _LT_EOF
+@@ -9033,7 +9647,13 @@ _LT_EOF
allow_undefined_flag='-berok'
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -10442,7 +12405,7 @@ index 4daa0e0..f161c99 100755
/* end confdefs.h. */
int
-@@ -9046,25 +9599,32 @@ main ()
+@@ -9046,25 +9666,32 @@ main ()
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
@@ -10489,7 +12452,7 @@ index 4daa0e0..f161c99 100755
else
if test "$host_cpu" = ia64; then
hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
-@@ -9073,7 +9633,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -9073,7 +9700,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
else
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -10504,7 +12467,7 @@ index 4daa0e0..f161c99 100755
/* end confdefs.h. */
int
-@@ -9086,30 +9652,42 @@ main ()
+@@ -9086,30 +9719,42 @@ main ()
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
@@ -10562,7 +12525,7 @@ index 4daa0e0..f161c99 100755
archive_cmds_need_lc=yes
# This is similar to how AIX traditionally builds its shared libraries.
archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-@@ -9141,20 +9719,63 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -9141,20 +9786,64 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
# Microsoft Visual C++.
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
@@ -10603,6 +12566,7 @@ index 4daa0e0..f161c99 100755
+ # The linker will not automatically build a static lib if we build a DLL.
+ # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
+ enable_shared_with_static_runtimes=yes
++ exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+ export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+ # Don't use ranlib
+ old_postinstall_cmds='chmod 644 $oldlib'
@@ -10640,20 +12604,21 @@ index 4daa0e0..f161c99 100755
;;
darwin* | rhapsody*)
-@@ -9164,7 +9785,11 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -9164,7 +9853,12 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_direct=no
hardcode_automatic=yes
hardcode_shlibpath_var=unsupported
- whole_archive_flag_spec=''
+ if test "$lt_cv_ld_force_load" = "yes"; then
+ whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
++
+ else
+ whole_archive_flag_spec=''
+ fi
link_all_deplibs=yes
allow_undefined_flag="$_lt_dar_allow_undefined"
case $cc_basename in
-@@ -9172,7 +9797,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -9172,7 +9866,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
*) _lt_dar_can_shared=$GCC ;;
esac
if test "$_lt_dar_can_shared" = "yes"; then
@@ -10662,7 +12627,27 @@ index 4daa0e0..f161c99 100755
archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-@@ -9215,7 +9840,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -9190,10 +9884,6 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ hardcode_shlibpath_var=no
+ ;;
+
+- freebsd1*)
+- ld_shlibs=no
+- ;;
+-
+ # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+ # support. Future versions do this automatically, but an explicit c++rt0.o
+ # does not break anything, and helps significantly (at the cost of a little
+@@ -9206,7 +9896,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ ;;
+
+ # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+- freebsd2*)
++ freebsd2.*)
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_direct=yes
+ hardcode_minus_L=yes
+@@ -9215,7 +9905,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
freebsd* | dragonfly*)
@@ -10671,7 +12656,7 @@ index 4daa0e0..f161c99 100755
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
-@@ -9223,7 +9848,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -9223,7 +9913,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hpux9*)
if test "$GCC" = yes; then
@@ -10680,7 +12665,7 @@ index 4daa0e0..f161c99 100755
else
archive_cmds='$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'
fi
-@@ -9238,8 +9863,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -9238,14 +9928,13 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
;;
hpux10*)
@@ -10691,7 +12676,13 @@ index 4daa0e0..f161c99 100755
else
archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -9257,16 +9882,16 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ if test "$with_gnu_ld" = no; then
+ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+- hardcode_libdir_flag_spec_ld='+b $libdir'
+ hardcode_libdir_separator=:
+ hardcode_direct=yes
+ hardcode_direct_absolute=yes
+@@ -9257,16 +9946,16 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
;;
hpux11*)
@@ -10711,7 +12702,7 @@ index 4daa0e0..f161c99 100755
;;
esac
else
-@@ -9278,7 +9903,46 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -9278,7 +9967,46 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
@@ -10759,7 +12750,7 @@ index 4daa0e0..f161c99 100755
;;
esac
fi
-@@ -9306,26 +9970,39 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -9306,26 +10034,39 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -10809,7 +12800,7 @@ index 4daa0e0..f161c99 100755
fi
archive_cmds_need_lc='no'
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-@@ -9334,7 +10011,7 @@ rm -f core conftest.err conftest.$ac_objext \
+@@ -9334,7 +10075,7 @@ rm -f core conftest.err conftest.$ac_objext \
link_all_deplibs=yes
;;
@@ -10818,7 +12809,7 @@ index 4daa0e0..f161c99 100755
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -9387,17 +10064,17 @@ rm -f core conftest.err conftest.$ac_objext \
+@@ -9387,17 +10128,17 @@ rm -f core conftest.err conftest.$ac_objext \
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
allow_undefined_flag=unsupported
@@ -10839,7 +12830,7 @@ index 4daa0e0..f161c99 100755
fi
archive_cmds_need_lc='no'
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-@@ -9407,13 +10084,13 @@ rm -f core conftest.err conftest.$ac_objext \
+@@ -9407,13 +10148,13 @@ rm -f core conftest.err conftest.$ac_objext \
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -10856,7 +12847,7 @@ index 4daa0e0..f161c99 100755
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec='-rpath $libdir'
-@@ -9426,9 +10103,9 @@ rm -f core conftest.err conftest.$ac_objext \
+@@ -9426,9 +10167,9 @@ rm -f core conftest.err conftest.$ac_objext \
no_undefined_flag=' -z defs'
if test "$GCC" = yes; then
wlarc='${wl}'
@@ -10868,7 +12859,7 @@ index 4daa0e0..f161c99 100755
else
case `$CC -V 2>&1` in
*"Compilers 5.0"*)
-@@ -9616,44 +10293,50 @@ x|xyes)
+@@ -9616,44 +10357,50 @@ x|xyes)
# to ld, don't add -lc before -lgcc.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
@@ -10948,7 +12939,19 @@ index 4daa0e0..f161c99 100755
;;
esac
fi
-@@ -9824,16 +10507,23 @@ if test "$GCC" = yes; then
+@@ -9811,11 +10558,6 @@ esac
+
+
+
+-
+-
+-
+-
+-
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
+ $as_echo_n "checking dynamic linker characteristics... " >&6; }
+
+@@ -9824,16 +10566,23 @@ if test "$GCC" = yes; then
darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
*) lt_awk_arg="/^libraries:/" ;;
esac
@@ -10978,7 +12981,7 @@ index 4daa0e0..f161c99 100755
# Ok, now we have the path, separated by spaces, we can step through it
# and add multilib dir if necessary.
lt_tmp_lt_search_path_spec=
-@@ -9846,7 +10536,7 @@ if test "$GCC" = yes; then
+@@ -9846,7 +10595,7 @@ if test "$GCC" = yes; then
lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
fi
done
@@ -10987,7 +12990,7 @@ index 4daa0e0..f161c99 100755
BEGIN {RS=" "; FS="/|\n";} {
lt_foo="";
lt_count=0;
-@@ -9866,7 +10556,13 @@ BEGIN {RS=" "; FS="/|\n";} {
+@@ -9866,7 +10615,13 @@ BEGIN {RS=" "; FS="/|\n";} {
if (lt_foo != "") { lt_freq[lt_foo]++; }
if (lt_freq[lt_foo] == 1) { print lt_foo; }
}'`
@@ -11002,7 +13005,25 @@ index 4daa0e0..f161c99 100755
else
sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
fi
-@@ -9954,7 +10650,7 @@ amigaos*)
+@@ -9892,7 +10647,7 @@ need_version=unknown
+
+ case $host_os in
+ aix3*)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+ shlibpath_var=LIBPATH
+
+@@ -9901,7 +10656,7 @@ aix3*)
+ ;;
+
+ aix[4-9]*)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ hardcode_into_libs=yes
+@@ -9954,7 +10709,7 @@ amigaos*)
m68k)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -11011,7 +13032,16 @@ index 4daa0e0..f161c99 100755
;;
esac
;;
-@@ -9985,8 +10681,9 @@ cygwin* | mingw* | pw32* | cegcc*)
+@@ -9966,7 +10721,7 @@ beos*)
+ ;;
+
+ bsdi[45]*)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+@@ -9985,8 +10740,9 @@ cygwin* | mingw* | pw32* | cegcc*)
need_version=no
need_lib_prefix=no
@@ -11023,7 +13053,7 @@ index 4daa0e0..f161c99 100755
library_names_spec='$libname.dll.a'
# DLL is installed to $(libdir)/../bin by postinstall_cmds
postinstall_cmds='base_file=`basename \${file}`~
-@@ -10007,36 +10704,83 @@ cygwin* | mingw* | pw32* | cegcc*)
+@@ -10007,36 +10763,83 @@ cygwin* | mingw* | pw32* | cegcc*)
cygwin*)
# Cygwin DLLs use 'cyg' prefix rather than 'lib'
soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
@@ -11121,12 +13151,61 @@ index 4daa0e0..f161c99 100755
# FIXME: first we should search . and the directory the executable is in
shlibpath_var=PATH
;;
-@@ -10123,6 +10867,19 @@ gnu*)
- hardcode_into_libs=yes
+@@ -10057,7 +10860,7 @@ darwin* | rhapsody*)
+ ;;
+
+ dgux*)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
+@@ -10065,10 +10868,6 @@ dgux*)
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+
+-freebsd1*)
+- dynamic_linker=no
+- ;;
+-
+ freebsd* | dragonfly*)
+ # DragonFly does not have aout. When/if they implement a new
+ # versioning mechanism, adjust this.
+@@ -10076,7 +10875,7 @@ freebsd* | dragonfly*)
+ objformat=`/usr/bin/objformat`
+ else
+ case $host_os in
+- freebsd[123]*) objformat=aout ;;
++ freebsd[23].*) objformat=aout ;;
+ *) objformat=elf ;;
+ esac
+ fi
+@@ -10094,7 +10893,7 @@ freebsd* | dragonfly*)
+ esac
+ shlibpath_var=LD_LIBRARY_PATH
+ case $host_os in
+- freebsd2*)
++ freebsd2.*)
+ shlibpath_overrides_runpath=yes
+ ;;
+ freebsd3.[01]* | freebsdelf3.[01]*)
+@@ -10114,12 +10913,26 @@ freebsd* | dragonfly*)
;;
+ gnu*)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ ;;
++
+haiku*)
-+ version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ dynamic_linker="$host_os runtime_loader"
@@ -11135,13 +13214,10 @@ index 4daa0e0..f161c99 100755
+ shlibpath_var=LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
-+ hardcode_into_libs=yes
-+ ;;
-+
- hpux9* | hpux10* | hpux11*)
- # Give a soname corresponding to the major version so that dld.sl refuses to
- # link against other versions.
-@@ -10165,8 +10922,10 @@ hpux9* | hpux10* | hpux11*)
+ hardcode_into_libs=yes
+ ;;
+
+@@ -10165,12 +10978,14 @@ hpux9* | hpux10* | hpux11*)
soname_spec='${libname}${release}${shared_ext}$major'
;;
esac
@@ -11153,7 +13229,33 @@ index 4daa0e0..f161c99 100755
;;
interix[3-9]*)
-@@ -10233,12 +10992,17 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+@@ -10186,7 +11001,7 @@ irix5* | irix6* | nonstopux*)
+ nonstopux*) version_type=nonstopux ;;
+ *)
+ if test "$lt_cv_prog_gnu_ld" = yes; then
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ else
+ version_type=irix
+ fi ;;
+@@ -10223,9 +11038,9 @@ linux*oldld* | linux*aout* | linux*coff*)
+ dynamic_linker=no
+ ;;
+
+-# This must be Linux ELF.
++# This must be glibc/ELF.
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -10233,12 +11048,17 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
@@ -11176,7 +13278,7 @@ index 4daa0e0..f161c99 100755
/* end confdefs.h. */
int
-@@ -10251,23 +11015,31 @@ main ()
+@@ -10251,23 +11071,31 @@ main ()
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
@@ -11213,7 +13315,7 @@ index 4daa0e0..f161c99 100755
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -10279,18 +11051,6 @@ rm -f core conftest.err conftest.$ac_objext \
+@@ -10279,18 +11107,6 @@ rm -f core conftest.err conftest.$ac_objext \
dynamic_linker='GNU/Linux ld.so'
;;
@@ -11232,7 +13334,61 @@ index 4daa0e0..f161c99 100755
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -10581,6 +11341,11 @@ fi
+@@ -10310,7 +11126,7 @@ netbsd*)
+ ;;
+
+ newsos6)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+@@ -10379,7 +11195,7 @@ rdos*)
+ ;;
+
+ solaris*)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -10404,7 +11220,7 @@ sunos4*)
+ ;;
+
+ sysv4 | sysv4.3*)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+@@ -10428,7 +11244,7 @@ sysv4 | sysv4.3*)
+
+ sysv4*MP*)
+ if test -d /usr/nec ;then
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+ soname_spec='$libname${shared_ext}.$major'
+ shlibpath_var=LD_LIBRARY_PATH
+@@ -10459,7 +11275,7 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+
+ tpf*)
+ # TPF is a cross-target only. Preferred cross-host = GNU/Linux.
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -10469,7 +11285,7 @@ tpf*)
+ ;;
+
+ uts4*)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+@@ -10581,6 +11397,11 @@ fi
@@ -11244,7 +13400,7 @@ index 4daa0e0..f161c99 100755
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
hardcode_action=
-@@ -10653,7 +11418,7 @@ else
+@@ -10653,7 +11474,7 @@ else
# if libdl is installed we need to link against it
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
$as_echo_n "checking for dlopen in -ldl... " >&6; }
@@ -11253,7 +13409,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -10687,7 +11452,7 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -10687,7 +11508,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
@@ -11262,7 +13418,7 @@ index 4daa0e0..f161c99 100755
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
else
-@@ -10701,12 +11466,12 @@ fi
+@@ -10701,12 +11522,12 @@ fi
*)
ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
@@ -11277,7 +13433,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -10740,16 +11505,16 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -10740,16 +11561,16 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
@@ -11297,7 +13453,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -10783,12 +11548,12 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -10783,12 +11604,12 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
@@ -11312,7 +13468,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -10822,12 +11587,12 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -10822,12 +11643,12 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
@@ -11327,7 +13483,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -10861,7 +11626,7 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -10861,7 +11682,7 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
@@ -11336,7 +13492,7 @@ index 4daa0e0..f161c99 100755
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
fi
-@@ -10902,7 +11667,7 @@ fi
+@@ -10902,7 +11723,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
$as_echo_n "checking whether a program can dlopen itself... " >&6; }
@@ -11345,7 +13501,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -10911,7 +11676,7 @@ else
+@@ -10911,7 +11732,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
@@ -11354,7 +13510,7 @@ index 4daa0e0..f161c99 100755
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -10952,7 +11717,13 @@ else
+@@ -10952,7 +11773,13 @@ else
# endif
#endif
@@ -11369,7 +13525,7 @@ index 4daa0e0..f161c99 100755
int main ()
{
void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-@@ -10961,7 +11732,11 @@ int main ()
+@@ -10961,7 +11788,11 @@ int main ()
if (self)
{
if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
@@ -11382,7 +13538,7 @@ index 4daa0e0..f161c99 100755
/* dlclose (self); */
}
else
-@@ -10998,7 +11773,7 @@ $as_echo "$lt_cv_dlopen_self" >&6; }
+@@ -10998,7 +11829,7 @@ $as_echo "$lt_cv_dlopen_self" >&6; }
wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
@@ -11391,7 +13547,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -11007,7 +11782,7 @@ else
+@@ -11007,7 +11838,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
@@ -11400,7 +13556,7 @@ index 4daa0e0..f161c99 100755
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11048,7 +11823,13 @@ else
+@@ -11048,7 +11879,13 @@ else
# endif
#endif
@@ -11415,7 +13571,7 @@ index 4daa0e0..f161c99 100755
int main ()
{
void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-@@ -11057,7 +11838,11 @@ int main ()
+@@ -11057,7 +11894,11 @@ int main ()
if (self)
{
if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
@@ -11428,7 +13584,16 @@ index 4daa0e0..f161c99 100755
/* dlclose (self); */
}
else
-@@ -11368,7 +12153,7 @@ fi
+@@ -11226,6 +12067,8 @@ CC="$lt_save_CC"
+
+
+
++
++
+ ac_config_commands="$ac_config_commands libtool"
+
+
+@@ -11368,7 +12211,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for JS_NewContext in -lmozjs" >&5
$as_echo_n "checking for JS_NewContext in -lmozjs... " >&6; }
@@ -11437,7 +13602,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -11402,13 +12187,13 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -11402,13 +12245,13 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mozjs_JS_NewContext" >&5
$as_echo "$ac_cv_lib_mozjs_JS_NewContext" >&6; }
@@ -11453,7 +13618,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -11442,13 +12227,13 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -11442,13 +12285,13 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_js_JS_NewContext" >&5
$as_echo "$ac_cv_lib_js_JS_NewContext" >&6; }
@@ -11469,7 +13634,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -11482,13 +12267,13 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -11482,13 +12325,13 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_js3250_JS_NewContext" >&5
$as_echo "$ac_cv_lib_js3250_JS_NewContext" >&6; }
@@ -11485,7 +13650,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -11522,11 +12307,11 @@ LIBS=$ac_check_lib_save_LIBS
+@@ -11522,11 +12365,11 @@ LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_js32_JS_NewContext" >&5
$as_echo "$ac_cv_lib_js32_JS_NewContext" >&6; }
@@ -11499,7 +13664,7 @@ index 4daa0e0..f161c99 100755
Is the Mozilla SpiderMonkey library installed?" "$LINENO" 5
fi
-@@ -11549,7 +12334,7 @@ if test x${IS_WINDOWS} = xTRUE; then
+@@ -11549,7 +12392,7 @@ if test x${IS_WINDOWS} = xTRUE; then
if test -f "$JS_LIB_DIR/../bin/$JS_LIB_BASE.dll"; then
JS_LIB_BINARY="$JS_LIB_DIR/../bin/$JS_LIB_BASE.dll"
else
@@ -11508,7 +13673,7 @@ index 4daa0e0..f161c99 100755
fi
fi
-@@ -11570,7 +12355,7 @@ fi
+@@ -11570,7 +12413,7 @@ fi
set dummy iscc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -11517,7 +13682,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
case $INNO_COMPILER_EXECUTABLE in
-@@ -11635,18 +12420,18 @@ fi
+@@ -11635,18 +12478,18 @@ fi
JSLIB=-l$JS_LIB_BASE
ac_fn_c_check_header_mongrel "$LINENO" "jsapi.h" "ac_cv_header_jsapi_h" "$ac_includes_default"
@@ -11539,7 +13704,7 @@ index 4daa0e0..f161c99 100755
Are the Mozilla SpiderMonkey headers installed?" "$LINENO" 5
-@@ -11713,7 +12498,7 @@ else
+@@ -11713,7 +12556,7 @@ else
set dummy icu-config; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -11548,7 +13713,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
case $ICU_CONFIG in
-@@ -11800,7 +12585,7 @@ $as_echo "$ICU_LIBS" >&6; }
+@@ -11800,7 +12643,7 @@ $as_echo "$ICU_LIBS" >&6; }
if test $succeeded = yes; then
:
else
@@ -11557,7 +13722,7 @@ index 4daa0e0..f161c99 100755
fi
ICU_LOCAL_CFLAGS=`$ICU_CONFIG --cppflags-searchpath`
-@@ -11834,7 +12619,7 @@ else
+@@ -11834,7 +12677,7 @@ else
set dummy curl-config; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -11566,7 +13731,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
case $CURL_CONFIG in
-@@ -11879,9 +12664,9 @@ fi
+@@ -11879,9 +12722,9 @@ fi
echo "*** Or see http://curl.haxx.se/"
else
CURL_VERSION=`$CURL_CONFIG --version | cut -d" " -f2`
@@ -11579,7 +13744,7 @@ index 4daa0e0..f161c99 100755
if test "$VERSION_CHECK" = "1" ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
-@@ -11903,7 +12688,7 @@ $as_echo "$CURL_LIBS" >&6; }
+@@ -11903,7 +12746,7 @@ $as_echo "$CURL_LIBS" >&6; }
CURL_LIBS=""
## If we have a custom action on failure, don't print errors, but
## do set a variable so people can do so.
@@ -11588,7 +13753,7 @@ index 4daa0e0..f161c99 100755
fi
-@@ -11913,7 +12698,7 @@ $as_echo "$CURL_LIBS" >&6; }
+@@ -11913,7 +12756,7 @@ $as_echo "$CURL_LIBS" >&6; }
if test $succeeded = yes; then
:
else
@@ -11597,7 +13762,7 @@ index 4daa0e0..f161c99 100755
fi
CURL_LDFLAGS=-lcurl
-@@ -11942,7 +12727,7 @@ esac
+@@ -11942,7 +12785,7 @@ esac
set dummy erl; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -11606,7 +13771,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
case $ERL in
-@@ -11980,7 +12765,7 @@ fi
+@@ -11980,7 +12823,7 @@ fi
if test x${ERL} = x; then
@@ -11615,7 +13780,7 @@ index 4daa0e0..f161c99 100755
fi
erlang_version_error="The installed Erlang version is less than 5.6.5 (R12B05)."
-@@ -11988,16 +12773,16 @@ erlang_version_error="The installed Erlang version is less than 5.6.5 (R12B05)."
+@@ -11988,16 +12831,16 @@ erlang_version_error="The installed Erlang version is less than 5.6.5 (R12B05)."
version="`${ERL} -version 2>&1 | ${SED} "s/[^0-9]/ /g"`"
if test `echo $version | ${AWK} "{print \\$1}"` -lt 5; then
@@ -11635,7 +13800,7 @@ index 4daa0e0..f161c99 100755
fi
fi
-@@ -12005,7 +12790,7 @@ fi
+@@ -12005,7 +12848,7 @@ fi
set dummy erlc; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -11644,7 +13809,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
case $ERLC in
-@@ -12043,15 +12828,15 @@ fi
+@@ -12043,15 +12886,15 @@ fi
if test x${ERLC} = x; then
@@ -11663,7 +13828,7 @@ index 4daa0e0..f161c99 100755
Are the Erlang headers installed? Use the \`--with-erlang' option to specify the
path to the Erlang include directory." "$LINENO" 5
-@@ -12063,7 +12848,7 @@ fi
+@@ -12063,7 +12906,7 @@ fi
set dummy help2man; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -11672,7 +13837,7 @@ index 4daa0e0..f161c99 100755
$as_echo_n "(cached) " >&6
else
case $HELP2MAN_EXECUTABLE in
-@@ -12129,22 +12914,30 @@ launchd_enabled=false
+@@ -12129,22 +12972,30 @@ launchd_enabled=false
if test "$use_init" = "yes"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking location of init directory" >&5
$as_echo_n "checking location of init directory... " >&6; }
@@ -11708,7 +13873,7 @@ index 4daa0e0..f161c99 100755
fi
fi
fi
-@@ -12235,9 +13028,9 @@ localconfdir=${sysconfdir}/${package_identifier}
+@@ -12235,9 +13086,9 @@ localconfdir=${sysconfdir}/${package_identifier}
localdatadir=${datadir}/${package_identifier}
@@ -11720,7 +13885,7 @@ index 4daa0e0..f161c99 100755
localstatelibdir=${localstatedir}/lib/${package_identifier}
-@@ -12253,7 +13046,7 @@ if test x${IS_WINDOWS} = xTRUE; then
+@@ -12253,7 +13104,7 @@ if test x${IS_WINDOWS} = xTRUE; then
localerlanglibdir=${libdir}
else
@@ -11729,7 +13894,7 @@ index 4daa0e0..f161c99 100755
localerlanglibdir=${locallibdir}/erlang/lib
-@@ -12307,14 +13100,6 @@ ac_config_files="$ac_config_files src/couchdb/Makefile"
+@@ -12307,14 +13158,6 @@ ac_config_files="$ac_config_files src/couchdb/Makefile"
ac_config_files="$ac_config_files src/couchdb/priv/Makefile"
@@ -11744,7 +13909,7 @@ index 4daa0e0..f161c99 100755
ac_config_files="$ac_config_files test/Makefile"
ac_config_files="$ac_config_files test/bench/Makefile"
-@@ -12396,10 +13181,21 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+@@ -12396,10 +13239,21 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
:end' >>confcache
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
if test -w "$cache_file"; then
@@ -11768,7 +13933,7 @@ index 4daa0e0..f161c99 100755
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-@@ -12415,6 +13211,7 @@ DEFS=-DHAVE_CONFIG_H
+@@ -12415,6 +13269,7 @@ DEFS=-DHAVE_CONFIG_H
ac_libobjs=
ac_ltlibobjs=
@@ -11776,7 +13941,7 @@ index 4daa0e0..f161c99 100755
for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
# 1. Remove the extension, and $U if already installed.
ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-@@ -12438,35 +13235,35 @@ else
+@@ -12438,35 +13293,35 @@ else
fi
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
@@ -11820,7 +13985,7 @@ index 4daa0e0..f161c99 100755
ac_write_fail=0
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-@@ -12567,6 +13364,7 @@ fi
+@@ -12567,6 +13422,7 @@ fi
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -11828,7 +13993,7 @@ index 4daa0e0..f161c99 100755
case $0 in #((
*[\\/]* ) as_myself=$0 ;;
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -12612,19 +13410,19 @@ export LANGUAGE
+@@ -12612,19 +13468,19 @@ export LANGUAGE
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
@@ -11856,7 +14021,7 @@ index 4daa0e0..f161c99 100755
as_fn_exit $as_status
} # as_fn_error
-@@ -12820,7 +13618,7 @@ $as_echo X"$as_dir" |
+@@ -12820,7 +13676,7 @@ $as_echo X"$as_dir" |
test -d "$as_dir" && break
done
test -z "$as_dirs" || eval "mkdir $as_dirs"
@@ -11865,19 +14030,19 @@ index 4daa0e0..f161c99 100755
} # as_fn_mkdir_p
-@@ -12874,7 +13672,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+@@ -12874,7 +13730,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# values after options handling.
ac_log="
- This file was extended by Apache CouchDB $as_me 1.0.2, which was
+ This file was extended by Apache CouchDB $as_me 1.0.3, which was
-generated by GNU Autoconf 2.65. Invocation command line was
+generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -12940,10 +13738,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+@@ -12940,10 +13796,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
- Apache CouchDB config.status 1.0.2
+ Apache CouchDB config.status 1.0.3
-configured by $0, generated by GNU Autoconf 2.65,
+configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
@@ -11887,7 +14052,7 @@ index 4daa0e0..f161c99 100755
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
-@@ -12961,11 +13759,16 @@ ac_need_defaults=:
+@@ -12961,11 +13817,16 @@ ac_need_defaults=:
while test $# != 0
do
case $1 in
@@ -11905,7 +14070,7 @@ index 4daa0e0..f161c99 100755
*)
ac_option=$1
ac_optarg=$2
-@@ -12987,6 +13790,7 @@ do
+@@ -12987,6 +13848,7 @@ do
$ac_shift
case $ac_optarg in
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
@@ -11913,7 +14078,7 @@ index 4daa0e0..f161c99 100755
esac
as_fn_append CONFIG_FILES " '$ac_optarg'"
ac_need_defaults=false;;
-@@ -12999,7 +13803,7 @@ do
+@@ -12999,7 +13861,7 @@ do
ac_need_defaults=false;;
--he | --h)
# Conflict between --help and --header
@@ -11922,7 +14087,7 @@ index 4daa0e0..f161c99 100755
Try \`$0 --help' for more information.";;
--help | --hel | -h )
$as_echo "$ac_cs_usage"; exit ;;
-@@ -13008,7 +13812,7 @@ Try \`$0 --help' for more information.";;
+@@ -13008,7 +13870,7 @@ Try \`$0 --help' for more information.";;
ac_cs_silent=: ;;
# This is an error.
@@ -11931,7 +14096,7 @@ index 4daa0e0..f161c99 100755
Try \`$0 --help' for more information." ;;
*) as_fn_append ac_config_targets " $1"
-@@ -13062,131 +13866,153 @@ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+@@ -13062,131 +13924,154 @@ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
sed_quote_subst='$sed_quote_subst'
double_quote_subst='$double_quote_subst'
delay_variable_subst='$delay_variable_subst'
@@ -12061,6 +14226,7 @@ index 4daa0e0..f161c99 100755
+enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
+SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
+ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
++PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
+host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
+host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
+host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
@@ -12143,7 +14309,6 @@ index 4daa0e0..f161c99 100755
+allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
+no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
-+hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
+hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
+hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
@@ -12200,11 +14365,12 @@ index 4daa0e0..f161c99 100755
-for var in SED \
+for var in SHELL \
+ECHO \
++PATH_SEPARATOR \
+SED \
GREP \
EGREP \
FGREP \
-@@ -13199,8 +14025,13 @@ reload_flag \
+@@ -13199,8 +14084,13 @@ reload_flag \
OBJDUMP \
deplibs_check_method \
file_magic_cmd \
@@ -12218,7 +14384,7 @@ index 4daa0e0..f161c99 100755
STRIP \
RANLIB \
CC \
-@@ -13210,14 +14041,14 @@ lt_cv_sys_global_symbol_pipe \
+@@ -13210,14 +14100,14 @@ lt_cv_sys_global_symbol_pipe \
lt_cv_sys_global_symbol_to_cdecl \
lt_cv_sys_global_symbol_to_c_name_address \
lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
@@ -12236,15 +14402,17 @@ index 4daa0e0..f161c99 100755
DSYMUTIL \
NMEDIT \
LIPO \
-@@ -13233,7 +14064,6 @@ no_undefined_flag \
+@@ -13231,9 +14121,7 @@ with_gnu_ld \
+ allow_undefined_flag \
+ no_undefined_flag \
hardcode_libdir_flag_spec \
- hardcode_libdir_flag_spec_ld \
+-hardcode_libdir_flag_spec_ld \
hardcode_libdir_separator \
-fix_srcfile_path \
exclude_expsyms \
include_expsyms \
file_list_spec \
-@@ -13241,12 +14071,13 @@ variables_saved_for_relink \
+@@ -13241,12 +14129,13 @@ variables_saved_for_relink \
libname_spec \
library_names_spec \
soname_spec \
@@ -12260,7 +14428,7 @@ index 4daa0e0..f161c99 100755
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-@@ -13268,14 +14099,15 @@ module_cmds \
+@@ -13268,14 +14157,15 @@ module_cmds \
module_expsym_cmds \
export_symbols_cmds \
prelink_cmds \
@@ -12278,7 +14446,7 @@ index 4daa0e0..f161c99 100755
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-@@ -13283,12 +14115,6 @@ sys_lib_dlsearch_path_spec; do
+@@ -13283,12 +14173,6 @@ sys_lib_dlsearch_path_spec; do
esac
done
@@ -12291,7 +14459,7 @@ index 4daa0e0..f161c99 100755
ac_aux_dir='$ac_aux_dir'
xsi_shell='$xsi_shell'
lt_shell_append='$lt_shell_append'
-@@ -13341,10 +14167,6 @@ do
+@@ -13341,10 +14225,6 @@ do
"src/couchdb/couch.app.tpl") CONFIG_FILES="$CONFIG_FILES src/couchdb/couch.app.tpl" ;;
"src/couchdb/Makefile") CONFIG_FILES="$CONFIG_FILES src/couchdb/Makefile" ;;
"src/couchdb/priv/Makefile") CONFIG_FILES="$CONFIG_FILES src/couchdb/priv/Makefile" ;;
@@ -12302,7 +14470,7 @@ index 4daa0e0..f161c99 100755
"test/Makefile") CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
"test/bench/Makefile") CONFIG_FILES="$CONFIG_FILES test/bench/Makefile" ;;
"test/etap/Makefile") CONFIG_FILES="$CONFIG_FILES test/etap/Makefile" ;;
-@@ -13354,7 +14176,7 @@ do
+@@ -13354,7 +14234,7 @@ do
"utils/Makefile") CONFIG_FILES="$CONFIG_FILES utils/Makefile" ;;
"var/Makefile") CONFIG_FILES="$CONFIG_FILES var/Makefile" ;;
@@ -12311,7 +14479,7 @@ index 4daa0e0..f161c99 100755
esac
done
-@@ -13377,9 +14199,10 @@ fi
+@@ -13377,9 +14257,10 @@ fi
# after its creation but before its name has been assigned to `$tmp'.
$debug ||
{
@@ -12324,7 +14492,7 @@ index 4daa0e0..f161c99 100755
' 0
trap 'as_fn_exit 1' 1 2 13 15
}
-@@ -13387,12 +14210,13 @@ $debug ||
+@@ -13387,12 +14268,13 @@ $debug ||
{
tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
@@ -12340,7 +14508,7 @@ index 4daa0e0..f161c99 100755
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
-@@ -13409,12 +14233,12 @@ if test "x$ac_cr" = x; then
+@@ -13409,12 +14291,12 @@ if test "x$ac_cr" = x; then
fi
ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
@@ -12355,7 +14523,7 @@ index 4daa0e0..f161c99 100755
_ACEOF
-@@ -13423,18 +14247,18 @@ _ACEOF
+@@ -13423,18 +14305,18 @@ _ACEOF
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
echo "_ACEOF"
} >conf$$subs.sh ||
@@ -12378,7 +14546,7 @@ index 4daa0e0..f161c99 100755
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -13442,7 +14266,7 @@ done
+@@ -13442,7 +14324,7 @@ done
rm -f conf$$subs.sh
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
@@ -12387,7 +14555,7 @@ index 4daa0e0..f161c99 100755
_ACEOF
sed -n '
h
-@@ -13490,7 +14314,7 @@ t delim
+@@ -13490,7 +14372,7 @@ t delim
rm -f conf$$subs.awk
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
_ACAWK
@@ -12396,7 +14564,7 @@ index 4daa0e0..f161c99 100755
for (key in S) S_is_set[key] = 1
FS = ""
-@@ -13522,21 +14346,29 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+@@ -13522,21 +14404,29 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
else
cat
@@ -12435,7 +14603,7 @@ index 4daa0e0..f161c99 100755
s/^[^=]*=[ ]*$//
}'
fi
-@@ -13548,7 +14380,7 @@ fi # test -n "$CONFIG_FILES"
+@@ -13548,7 +14438,7 @@ fi # test -n "$CONFIG_FILES"
# No need to generate them if there are no CONFIG_HEADERS.
# This happens for instance with `./config.status Makefile'.
if test -n "$CONFIG_HEADERS"; then
@@ -12444,7 +14612,7 @@ index 4daa0e0..f161c99 100755
BEGIN {
_ACEOF
-@@ -13560,11 +14392,11 @@ _ACEOF
+@@ -13560,11 +14450,11 @@ _ACEOF
# handling of long lines.
ac_delim='%!_!# '
for ac_last_try in false false :; do
@@ -12459,7 +14627,7 @@ index 4daa0e0..f161c99 100755
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -13649,7 +14481,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+@@ -13649,7 +14539,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
_ACAWK
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -12468,7 +14636,7 @@ index 4daa0e0..f161c99 100755
fi # test -n "$CONFIG_HEADERS"
-@@ -13662,7 +14494,7 @@ do
+@@ -13662,7 +14552,7 @@ do
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
@@ -12477,7 +14645,7 @@ index 4daa0e0..f161c99 100755
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
-@@ -13681,7 +14513,7 @@ do
+@@ -13681,7 +14571,7 @@ do
for ac_f
do
case $ac_f in
@@ -12486,7 +14654,7 @@ index 4daa0e0..f161c99 100755
*) # Look for the file first in the build tree, then in the source tree
# (if the path is not absolute). The absolute path cannot be DOS-style,
# because $ac_f cannot contain `:'.
-@@ -13690,7 +14522,7 @@ do
+@@ -13690,7 +14580,7 @@ do
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
@@ -12495,7 +14663,7 @@ index 4daa0e0..f161c99 100755
esac
case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
as_fn_append ac_file_inputs " '$ac_f'"
-@@ -13716,8 +14548,8 @@ $as_echo "$as_me: creating $ac_file" >&6;}
+@@ -13716,8 +14606,8 @@ $as_echo "$as_me: creating $ac_file" >&6;}
esac
case $ac_tag in
@@ -12506,7 +14674,7 @@ index 4daa0e0..f161c99 100755
esac
;;
esac
-@@ -13853,23 +14685,24 @@ s&@INSTALL@&$ac_INSTALL&;t t
+@@ -13853,23 +14743,24 @@ s&@INSTALL@&$ac_INSTALL&;t t
s&@MKDIR_P@&$ac_MKDIR_P&;t t
$ac_datarootdir_hack
"
@@ -12541,7 +14709,7 @@ index 4daa0e0..f161c99 100755
;;
:H)
#
-@@ -13878,21 +14711,21 @@ which seems to be undefined. Please make sure it is defined." >&2;}
+@@ -13878,21 +14769,21 @@ which seems to be undefined. Please make sure it is defined." >&2;}
if test x"$ac_file" != x-; then
{
$as_echo "/* $configure_input */" \
@@ -12571,17 +14739,17 @@ index 4daa0e0..f161c99 100755
fi
# Compute "$ac_file"'s index in $config_headers.
_am_arg="$ac_file"
-@@ -14053,7 +14886,8 @@ $as_echo X"$file" |
+@@ -14053,7 +14944,8 @@ $as_echo X"$file" |
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-# 2006, 2007, 2008 Free Software Foundation, Inc.
-+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-+# Inc.
++# 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
# Written by Gordon Matzigkeit, 1996
#
# This file is part of GNU Libtool.
-@@ -14101,6 +14935,12 @@ pic_mode=$pic_mode
+@@ -14101,6 +14993,15 @@ pic_mode=$pic_mode
# Whether or not to optimize for fast installation.
fast_install=$enable_fast_install
@@ -12591,10 +14759,13 @@ index 4daa0e0..f161c99 100755
+# An echo program that protects backslashes.
+ECHO=$lt_ECHO
+
++# The PATH separator for the build system.
++PATH_SEPARATOR=$lt_PATH_SEPARATOR
++
# The host system.
host_alias=$host_alias
host=$host
-@@ -14150,9 +14990,11 @@ SP2NL=$lt_lt_SP2NL
+@@ -14150,9 +15051,11 @@ SP2NL=$lt_lt_SP2NL
# turn newlines into spaces.
NL2SP=$lt_lt_NL2SP
@@ -12609,7 +14780,7 @@ index 4daa0e0..f161c99 100755
# An object symbol dumper.
OBJDUMP=$lt_OBJDUMP
-@@ -14160,13 +15002,30 @@ OBJDUMP=$lt_OBJDUMP
+@@ -14160,13 +15063,30 @@ OBJDUMP=$lt_OBJDUMP
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
@@ -12641,7 +14812,7 @@ index 4daa0e0..f161c99 100755
# A symbol stripping program.
STRIP=$lt_STRIP
-@@ -14175,6 +15034,9 @@ RANLIB=$lt_RANLIB
+@@ -14175,6 +15095,9 @@ RANLIB=$lt_RANLIB
old_postinstall_cmds=$lt_old_postinstall_cmds
old_postuninstall_cmds=$lt_old_postuninstall_cmds
@@ -12651,7 +14822,7 @@ index 4daa0e0..f161c99 100755
# A C compiler.
LTCC=$lt_CC
-@@ -14193,14 +15055,14 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+@@ -14193,14 +15116,14 @@ global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
# Transform the output of nm in a C name address pair when lib prefix is needed.
global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
@@ -12672,7 +14843,7 @@ index 4daa0e0..f161c99 100755
# Used to examine libraries when file_magic_cmd begins with "file".
MAGIC_CMD=$MAGIC_CMD
-@@ -14208,6 +15070,9 @@ MAGIC_CMD=$MAGIC_CMD
+@@ -14208,6 +15131,9 @@ MAGIC_CMD=$MAGIC_CMD
# Must we lock files when doing compilation?
need_locks=$lt_need_locks
@@ -12682,7 +14853,7 @@ index 4daa0e0..f161c99 100755
# Tool to manipulate archived DWARF debug symbol files on Mac OS X.
DSYMUTIL=$lt_DSYMUTIL
-@@ -14264,6 +15129,9 @@ library_names_spec=$lt_library_names_spec
+@@ -14264,6 +15190,9 @@ library_names_spec=$lt_library_names_spec
# The coded name of the library, if different from the real name.
soname_spec=$lt_soname_spec
@@ -12692,7 +14863,7 @@ index 4daa0e0..f161c99 100755
# Command to use after installation of a shared archive.
postinstall_cmds=$lt_postinstall_cmds
-@@ -14303,6 +15171,10 @@ striplib=$lt_striplib
+@@ -14303,6 +15232,10 @@ striplib=$lt_striplib
# The linker used to build libraries.
LD=$lt_LD
@@ -12703,7 +14874,7 @@ index 4daa0e0..f161c99 100755
# Commands used to build an old-style archive.
old_archive_cmds=$lt_old_archive_cmds
-@@ -14315,12 +15187,12 @@ with_gcc=$GCC
+@@ -14315,12 +15248,12 @@ with_gcc=$GCC
# Compiler flag to turn off builtin functions.
no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
@@ -12719,7 +14890,18 @@ index 4daa0e0..f161c99 100755
# Compiler flag to prevent dynamic linking.
link_static_flag=$lt_lt_prog_compiler_static
-@@ -14407,9 +15279,6 @@ inherit_rpath=$inherit_rpath
+@@ -14370,10 +15303,6 @@ no_undefined_flag=$lt_no_undefined_flag
+ # This must work even if \$libdir does not exist
+ hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
+
+-# If ld is used when linking, flag to hardcode \$libdir into a binary
+-# during linking. This must work even if \$libdir does not exist.
+-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
+-
+ # Whether we need a single "-rpath" flag with a separated argument.
+ hardcode_libdir_separator=$lt_hardcode_libdir_separator
+
+@@ -14407,9 +15336,6 @@ inherit_rpath=$inherit_rpath
# Whether libtool must link a program against all its dependency libraries.
link_all_deplibs=$link_all_deplibs
@@ -12729,7 +14911,7 @@ index 4daa0e0..f161c99 100755
# Set to "yes" if exported symbols are required.
always_export_symbols=$always_export_symbols
-@@ -14425,6 +15294,9 @@ include_expsyms=$lt_include_expsyms
+@@ -14425,6 +15351,9 @@ include_expsyms=$lt_include_expsyms
# Commands necessary for linking programs (against libraries) with templates.
prelink_cmds=$lt_prelink_cmds
@@ -12739,7 +14921,7 @@ index 4daa0e0..f161c99 100755
# Specify filename containing input files.
file_list_spec=$lt_file_list_spec
-@@ -14457,212 +15329,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
+@@ -14457,212 +15386,169 @@ ltmain="$ac_aux_dir/ltmain.sh"
# if finds mixed CR/LF and LF-only lines. Since sed operates in
# text mode, it properly converts lines to CR/LF. This bash problem
# is reportedly fixed, but why not run on old versions too?
@@ -13115,7 +15297,7 @@ index 4daa0e0..f161c99 100755
(rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
chmod +x "$ofile"
-@@ -14677,7 +15506,7 @@ _ACEOF
+@@ -14677,7 +15563,7 @@ _ACEOF
ac_clean_files=$ac_clean_files_save
test $ac_write_fail = 0 ||
@@ -13124,7 +15306,7 @@ index 4daa0e0..f161c99 100755
# configure is writing to config.log, and then calls config.status.
-@@ -14698,7 +15527,7 @@ if test "$no_create" != yes; then
+@@ -14698,7 +15584,7 @@ if test "$no_create" != yes; then
exec 5>>config.log
# Use ||, not &&, to avoid exiting from the if with $? = 1, which
# would make configure fail if this is the last instruction.
@@ -13134,10 +15316,36 @@ index 4daa0e0..f161c99 100755
if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
diff --git a/etc/Makefile.in b/etc/Makefile.in
-index bb3f308..1615920 100644
+index bb3f308..89c9da5 100644
--- a/etc/Makefile.in
+++ b/etc/Makefile.in
-@@ -138,6 +138,7 @@ CURL_LIBS = @CURL_LIBS@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -81,6 +81,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(initdir)" "$(DESTDIR)$(launchddir)" \
+ "$(DESTDIR)$(sysconfdir)"
+ DATA = $(init_DATA) $(launchd_DATA) $(nobase_sysconf_DATA)
+@@ -138,6 +144,7 @@ CURL_LIBS = @CURL_LIBS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -13145,7 +15353,7 @@ index bb3f308..1615920 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -178,6 +179,7 @@ LIPO = @LIPO@
+@@ -178,6 +185,7 @@ LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -13153,7 +15361,7 @@ index bb3f308..1615920 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -203,6 +205,7 @@ abs_builddir = @abs_builddir@
+@@ -203,6 +211,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -13161,7 +15369,7 @@ index bb3f308..1615920 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
-@@ -247,7 +250,6 @@ localstatedir = @localstatedir@
+@@ -247,7 +256,6 @@ localstatedir = @localstatedir@
localstatelibdir = @localstatelibdir@
localstatelogdir = @localstatelogdir@
localstaterundir = @localstaterundir@
@@ -13169,11 +15377,90 @@ index bb3f308..1615920 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
msvc_redist_dir = @msvc_redist_dir@
+@@ -343,9 +351,7 @@ uninstall-initDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(init_DATA)'; test -n "$(initdir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+- test -n "$$files" || exit 0; \
+- echo " ( cd '$(DESTDIR)$(initdir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(initdir)" && rm -f $$files
++ dir='$(DESTDIR)$(initdir)'; $(am__uninstall_files_from_dir)
+ install-launchdDATA: $(launchd_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(launchddir)" || $(MKDIR_P) "$(DESTDIR)$(launchddir)"
+@@ -363,9 +369,7 @@ uninstall-launchdDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(launchd_DATA)'; test -n "$(launchddir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+- test -n "$$files" || exit 0; \
+- echo " ( cd '$(DESTDIR)$(launchddir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(launchddir)" && rm -f $$files
++ dir='$(DESTDIR)$(launchddir)'; $(am__uninstall_files_from_dir)
+ install-nobase_sysconfDATA: $(nobase_sysconf_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)"
+@@ -386,9 +390,7 @@ uninstall-nobase_sysconfDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(nobase_sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \
+ $(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \
+- test -n "$$files" || exit 0; \
+- echo " ( cd '$(DESTDIR)$(sysconfdir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(sysconfdir)" && rm -f $$files
++ dir='$(DESTDIR)$(sysconfdir)'; $(am__uninstall_files_from_dir)
+
+ # This directory's subdirectories are mostly independent; you can cd
+ # into them and run `make' without going through this Makefile.
+@@ -601,10 +603,15 @@ install-am: all-am
+
+ installcheck: installcheck-recursive
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
diff --git a/etc/couchdb/Makefile.in b/etc/couchdb/Makefile.in
-index b9e44de..b30c6c5 100644
+index b9e44de..95393ca 100644
--- a/etc/couchdb/Makefile.in
+++ b/etc/couchdb/Makefile.in
-@@ -94,6 +94,7 @@ CURL_LIBS = @CURL_LIBS@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -71,6 +71,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(localconfdir)"
+ DATA = $(localconf_DATA) $(noinst_DATA)
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+@@ -94,6 +100,7 @@ CURL_LIBS = @CURL_LIBS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -13181,7 +15468,7 @@ index b9e44de..b30c6c5 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -134,6 +135,7 @@ LIPO = @LIPO@
+@@ -134,6 +141,7 @@ LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -13189,7 +15476,7 @@ index b9e44de..b30c6c5 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -159,6 +161,7 @@ abs_builddir = @abs_builddir@
+@@ -159,6 +167,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -13197,7 +15484,7 @@ index b9e44de..b30c6c5 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
-@@ -203,7 +206,6 @@ localstatedir = @localstatedir@
+@@ -203,7 +212,6 @@ localstatedir = @localstatedir@
localstatelibdir = @localstatelibdir@
localstatelogdir = @localstatelogdir@
localstaterundir = @localstaterundir@
@@ -13205,10 +15492,54 @@ index b9e44de..b30c6c5 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
msvc_redist_dir = @msvc_redist_dir@
+@@ -299,9 +307,7 @@ uninstall-localconfDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(localconf_DATA)'; test -n "$(localconfdir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+- test -n "$$files" || exit 0; \
+- echo " ( cd '$(DESTDIR)$(localconfdir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(localconfdir)" && rm -f $$files
++ dir='$(DESTDIR)$(localconfdir)'; $(am__uninstall_files_from_dir)
+ tags: TAGS
+ TAGS:
+
+@@ -356,10 +362,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
diff --git a/etc/default/Makefile.in b/etc/default/Makefile.in
-index f5f30c9..48af111 100644
+index f5f30c9..6cc93a3 100644
--- a/etc/default/Makefile.in
+++ b/etc/default/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
@@ -69,6 +69,7 @@ CURL_LIBS = @CURL_LIBS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
@@ -13241,10 +15572,43 @@ index f5f30c9..48af111 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
msvc_redist_dir = @msvc_redist_dir@
+@@ -298,10 +300,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
diff --git a/etc/init/Makefile.in b/etc/init/Makefile.in
-index d2d2368..84eda44 100644
+index d2d2368..3fc0ef6 100644
--- a/etc/init/Makefile.in
+++ b/etc/init/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
@@ -70,6 +70,7 @@ CURL_LIBS = @CURL_LIBS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
@@ -13277,10 +15641,43 @@ index d2d2368..84eda44 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
msvc_redist_dir = @msvc_redist_dir@
+@@ -301,10 +303,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
diff --git a/etc/launchd/Makefile.in b/etc/launchd/Makefile.in
-index 49cfb3d..2f3a55a 100644
+index 49cfb3d..c754c92 100644
--- a/etc/launchd/Makefile.in
+++ b/etc/launchd/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
@@ -70,6 +70,7 @@ CURL_LIBS = @CURL_LIBS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
@@ -13313,10 +15710,43 @@ index 49cfb3d..2f3a55a 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
msvc_redist_dir = @msvc_redist_dir@
+@@ -301,10 +303,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
diff --git a/etc/logrotate.d/Makefile.in b/etc/logrotate.d/Makefile.in
-index 6b5f398..7629b2c 100644
+index 6b5f398..b2eb297 100644
--- a/etc/logrotate.d/Makefile.in
+++ b/etc/logrotate.d/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
@@ -70,6 +70,7 @@ CURL_LIBS = @CURL_LIBS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
@@ -13349,10 +15779,43 @@ index 6b5f398..7629b2c 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
msvc_redist_dir = @msvc_redist_dir@
+@@ -301,10 +303,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
diff --git a/etc/windows/Makefile.in b/etc/windows/Makefile.in
-index 679b529..68ce862 100644
+index 679b529..234be23 100644
--- a/etc/windows/Makefile.in
+++ b/etc/windows/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
@@ -69,6 +69,7 @@ CURL_LIBS = @CURL_LIBS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
@@ -13385,8 +15848,28 @@ index 679b529..68ce862 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
msvc_redist_dir = @msvc_redist_dir@
+@@ -298,10 +300,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
diff --git a/m4/libtool.m4 b/m4/libtool.m4
-index a3fee53..88de383 100644
+index a3fee53..56666f0 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -1,7 +1,8 @@
@@ -13394,8 +15877,8 @@ index a3fee53..88de383 100644
#
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-# 2006, 2007, 2008 Free Software Foundation, Inc.
-+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-+# Inc.
++# 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
# Written by Gordon Matzigkeit, 1996
#
# This file is free software; the Free Software Foundation gives
@@ -13404,8 +15887,8 @@ index a3fee53..88de383 100644
m4_define([_LT_COPYING], [dnl
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-# 2006, 2007, 2008 Free Software Foundation, Inc.
-+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-+# Inc.
++# 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
# Written by Gordon Matzigkeit, 1996
#
# This file is part of GNU Libtool.
@@ -13444,17 +15927,19 @@ index a3fee53..88de383 100644
])
-@@ -138,6 +143,9 @@ m4_defun([_LT_FILEUTILS_DEFAULTS],
+@@ -138,6 +143,11 @@ m4_defun([_LT_FILEUTILS_DEFAULTS],
m4_defun([_LT_SETUP],
[AC_REQUIRE([AC_CANONICAL_HOST])dnl
AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
+
++_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl
++dnl
_LT_DECL([], [host_alias], [0], [The host system])dnl
_LT_DECL([], [host], [0])dnl
_LT_DECL([], [host_os], [0])dnl
-@@ -160,10 +168,13 @@ _LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
+@@ -160,10 +170,13 @@ _LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
dnl
m4_require([_LT_FILEUTILS_DEFAULTS])dnl
m4_require([_LT_CHECK_SHELL_FEATURES])dnl
@@ -13468,7 +15953,7 @@ index a3fee53..88de383 100644
_LT_CONFIG_LIBTOOL_INIT([
# See if we are running on zsh, and set the options which allow our
-@@ -179,7 +190,6 @@ fi
+@@ -179,7 +192,6 @@ fi
_LT_CHECK_OBJDIR
m4_require([_LT_TAG_COMPILER])dnl
@@ -13476,7 +15961,7 @@ index a3fee53..88de383 100644
case $host_os in
aix3*)
-@@ -193,23 +203,6 @@ aix3*)
+@@ -193,23 +205,6 @@ aix3*)
;;
esac
@@ -13500,7 +15985,7 @@ index a3fee53..88de383 100644
# Global variables:
ofile=libtool
can_build_shared=yes
-@@ -250,6 +243,28 @@ _LT_CONFIG_COMMANDS
+@@ -250,6 +245,28 @@ _LT_CONFIG_COMMANDS
])# _LT_SETUP
@@ -13529,7 +16014,7 @@ index a3fee53..88de383 100644
# _LT_PROG_LTMAIN
# ---------------
# Note that this code is called both from `configure', and `config.status'
-@@ -408,7 +423,7 @@ m4_define([_lt_decl_all_varnames],
+@@ -408,7 +425,7 @@ m4_define([_lt_decl_all_varnames],
# declaration there will have the same value as in `configure'. VARNAME
# must have a single quote delimited value for this to work.
m4_define([_LT_CONFIG_STATUS_DECLARE],
@@ -13538,7 +16023,7 @@ index a3fee53..88de383 100644
# _LT_CONFIG_STATUS_DECLARATIONS
-@@ -418,7 +433,7 @@ m4_define([_LT_CONFIG_STATUS_DECLARE],
+@@ -418,7 +435,7 @@ m4_define([_LT_CONFIG_STATUS_DECLARE],
# embedded single quotes properly. In configure, this macro expands
# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
#
@@ -13547,7 +16032,7 @@ index a3fee53..88de383 100644
m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
[m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
-@@ -517,12 +532,20 @@ LTCC='$LTCC'
+@@ -517,12 +534,20 @@ LTCC='$LTCC'
LTCFLAGS='$LTCFLAGS'
compiler='$compiler_DEFAULT'
@@ -13570,7 +16055,7 @@ index a3fee53..88de383 100644
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-@@ -533,9 +556,9 @@ done
+@@ -533,9 +558,9 @@ done
# Double-quote double-evaled strings.
for var in lt_decl_all_varnames([[ \
]], lt_decl_dquote_varnames); do
@@ -13582,7 +16067,7 @@ index a3fee53..88de383 100644
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-@@ -543,16 +566,38 @@ for var in lt_decl_all_varnames([[ \
+@@ -543,16 +568,38 @@ for var in lt_decl_all_varnames([[ \
esac
done
@@ -13628,7 +16113,7 @@ index a3fee53..88de383 100644
# LT_OUTPUT
# ---------
-@@ -562,20 +607,11 @@ _LT_OUTPUT_LIBTOOL_INIT
+@@ -562,20 +609,11 @@ _LT_OUTPUT_LIBTOOL_INIT
AC_DEFUN([LT_OUTPUT],
[: ${CONFIG_LT=./config.lt}
AC_MSG_NOTICE([creating $CONFIG_LT])
@@ -13652,16 +16137,16 @@ index a3fee53..88de383 100644
exec AS_MESSAGE_LOG_FD>>config.log
{
echo
-@@ -601,7 +637,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
+@@ -601,7 +639,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
configured by $[0], generated by m4_PACKAGE_STRING.
-Copyright (C) 2008 Free Software Foundation, Inc.
-+Copyright (C) 2010 Free Software Foundation, Inc.
++Copyright (C) 2011 Free Software Foundation, Inc.
This config.lt script is free software; the Free Software Foundation
gives unlimited permision to copy, distribute and modify it."
-@@ -646,15 +682,13 @@ chmod +x "$CONFIG_LT"
+@@ -646,15 +684,13 @@ chmod +x "$CONFIG_LT"
# appending to config.log, which fails on DOS, as config.log is still kept
# open by configure. Here we exec the FD to /dev/null, effectively closing
# config.log, so it can be properly (re)opened and appended to by config.lt.
@@ -13684,27 +16169,78 @@ index a3fee53..88de383 100644
])# LT_OUTPUT
-@@ -717,15 +751,12 @@ _LT_EOF
+@@ -717,15 +753,12 @@ _LT_EOF
# if finds mixed CR/LF and LF-only lines. Since sed operates in
# text mode, it properly converts lines to CR/LF. This bash problem
# is reportedly fixed, but why not run on old versions too?
- sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
- || (rm -f "$cfgfile"; exit 1)
+-
+- _LT_PROG_XSI_SHELLFNS
+ sed '$q' "$ltmain" >> "$cfgfile" \
+ || (rm -f "$cfgfile"; exit 1)
-- _LT_PROG_XSI_SHELLFNS
-+ _LT_PROG_REPLACE_SHELLFNS
-
- sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
- || (rm -f "$cfgfile"; exit 1)
--
++ _LT_PROG_REPLACE_SHELLFNS
+
- mv -f "$cfgfile" "$ofile" ||
+ mv -f "$cfgfile" "$ofile" ||
(rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
chmod +x "$ofile"
],
-@@ -831,11 +862,13 @@ AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)])
+@@ -770,6 +803,7 @@ AC_DEFUN([LT_LANG],
+ m4_case([$1],
+ [C], [_LT_LANG(C)],
+ [C++], [_LT_LANG(CXX)],
++ [Go], [_LT_LANG(GO)],
+ [Java], [_LT_LANG(GCJ)],
+ [Fortran 77], [_LT_LANG(F77)],
+ [Fortran], [_LT_LANG(FC)],
+@@ -791,6 +825,31 @@ m4_defun([_LT_LANG],
+ ])# _LT_LANG
+
+
++m4_ifndef([AC_PROG_GO], [
++############################################################
++# NOTE: This macro has been submitted for inclusion into #
++# GNU Autoconf as AC_PROG_GO. When it is available in #
++# a released version of Autoconf we should remove this #
++# macro and use it instead. #
++############################################################
++m4_defun([AC_PROG_GO],
++[AC_LANG_PUSH(Go)dnl
++AC_ARG_VAR([GOC], [Go compiler command])dnl
++AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl
++_AC_ARG_VAR_LDFLAGS()dnl
++AC_CHECK_TOOL(GOC, gccgo)
++if test -z "$GOC"; then
++ if test -n "$ac_tool_prefix"; then
++ AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo])
++ fi
++fi
++if test -z "$GOC"; then
++ AC_CHECK_PROG(GOC, gccgo, gccgo, false)
++fi
++])#m4_defun
++])#m4_ifndef
++
++
+ # _LT_LANG_DEFAULT_CONFIG
+ # -----------------------
+ m4_defun([_LT_LANG_DEFAULT_CONFIG],
+@@ -821,6 +880,10 @@ AC_PROVIDE_IFELSE([AC_PROG_GCJ],
+ m4_ifdef([LT_PROG_GCJ],
+ [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
+
++AC_PROVIDE_IFELSE([AC_PROG_GO],
++ [LT_LANG(GO)],
++ [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])])
++
+ AC_PROVIDE_IFELSE([LT_PROG_RC],
+ [LT_LANG(RC)],
+ [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
+@@ -831,11 +894,13 @@ AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)])
AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
@@ -13718,10 +16254,34 @@ index a3fee53..88de383 100644
# _LT_TAG_COMPILER
-@@ -940,6 +973,31 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
+@@ -921,7 +986,13 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
+ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
+ _lt_result=$?
+- if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
++ # If there is a non-empty error log, and "single_module"
++ # appears in it, assume the flag caused a linker warning
++ if test -s conftest.err && $GREP single_module conftest.err; then
++ cat conftest.err >&AS_MESSAGE_LOG_FD
++ # Otherwise, if the output was created with a 0 exit code from
++ # the compiler, it worked.
++ elif test -f libconftest.dylib && test $_lt_result -eq 0; then
+ lt_cv_apple_cc_single_mod=yes
+ else
+ cat conftest.err >&AS_MESSAGE_LOG_FD
+@@ -929,6 +1000,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
+ rm -rf libconftest.dylib*
+ rm -f conftest.*
+ fi])
++
+ AC_CACHE_CHECK([for -exported_symbols_list linker flag],
+ [lt_cv_ld_exported_symbols_list],
+ [lt_cv_ld_exported_symbols_list=no
+@@ -940,6 +1012,34 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
[lt_cv_ld_exported_symbols_list=no])
LDFLAGS="$save_LDFLAGS"
])
++
+ AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
+ [lt_cv_ld_force_load=no
+ cat > conftest.c << _LT_EOF
@@ -13739,7 +16299,9 @@ index a3fee53..88de383 100644
+ echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
+ $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
+ _lt_result=$?
-+ if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
++ if test -s conftest.err && $GREP force_load conftest.err; then
++ cat conftest.err >&AS_MESSAGE_LOG_FD
++ elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
+ lt_cv_ld_force_load=yes
+ else
+ cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -13750,7 +16312,7 @@ index a3fee53..88de383 100644
case $host_os in
rhapsody* | darwin1.[[012]])
_lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-@@ -967,7 +1025,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
+@@ -967,7 +1067,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
else
_lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
fi
@@ -13759,20 +16321,33 @@ index a3fee53..88de383 100644
_lt_dsymutil='~$DSYMUTIL $lib || :'
else
_lt_dsymutil=
-@@ -987,7 +1045,11 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
+@@ -977,8 +1077,8 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
+ ])
+
+
+-# _LT_DARWIN_LINKER_FEATURES
+-# --------------------------
++# _LT_DARWIN_LINKER_FEATURES([TAG])
++# ---------------------------------
+ # Checks for linker and compiler features on darwin
+ m4_defun([_LT_DARWIN_LINKER_FEATURES],
+ [
+@@ -987,7 +1087,13 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
_LT_TAGVAR(hardcode_direct, $1)=no
_LT_TAGVAR(hardcode_automatic, $1)=yes
_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
- _LT_TAGVAR(whole_archive_flag_spec, $1)=''
+ if test "$lt_cv_ld_force_load" = "yes"; then
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
++ m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
++ [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes])
+ else
+ _LT_TAGVAR(whole_archive_flag_spec, $1)=''
+ fi
_LT_TAGVAR(link_all_deplibs, $1)=yes
_LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
case $cc_basename in
-@@ -995,7 +1057,7 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
+@@ -995,7 +1101,7 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
*) _lt_dar_can_shared=$GCC ;;
esac
if test "$_lt_dar_can_shared" = "yes"; then
@@ -13781,7 +16356,7 @@ index a3fee53..88de383 100644
_LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
_LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
_LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-@@ -1011,203 +1073,142 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
+@@ -1011,203 +1117,142 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
fi
])
@@ -14092,7 +16667,7 @@ index a3fee53..88de383 100644
# _LT_ENABLE_LOCK
# ---------------
m4_defun([_LT_ENABLE_LOCK],
-@@ -1236,7 +1237,7 @@ ia64-*-hpux*)
+@@ -1236,7 +1281,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
@@ -14101,7 +16676,37 @@ index a3fee53..88de383 100644
if AC_TRY_EVAL(ac_compile); then
if test "$lt_cv_prog_gnu_ld" = yes; then
case `/usr/bin/file conftest.$ac_objext` in
-@@ -1354,14 +1355,47 @@ need_locks="$enable_libtool_lock"
+@@ -1329,14 +1374,27 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+ CFLAGS="$SAVE_CFLAGS"
+ fi
+ ;;
+-sparc*-*solaris*)
++*-*solaris*)
+ # Find out which ABI we are using.
+ echo 'int i;' > conftest.$ac_ext
+ if AC_TRY_EVAL(ac_compile); then
+ case `/usr/bin/file conftest.o` in
+ *64-bit*)
+ case $lt_cv_prog_gnu_ld in
+- yes*) LD="${LD-ld} -m elf64_sparc" ;;
++ yes*)
++ case $host in
++ i?86-*-solaris*)
++ LD="${LD-ld} -m elf_x86_64"
++ ;;
++ sparc*-*-solaris*)
++ LD="${LD-ld} -m elf64_sparc"
++ ;;
++ esac
++ # GNU ld 2.21 introduced _sol2 emulations. Use them if available.
++ if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
++ LD="${LD-ld}_sol2"
++ fi
++ ;;
+ *)
+ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+ LD="${LD-ld} -64"
+@@ -1354,14 +1412,47 @@ need_locks="$enable_libtool_lock"
])# _LT_ENABLE_LOCK
@@ -14154,9 +16759,20 @@ index a3fee53..88de383 100644
AC_CHECK_TOOL(STRIP, strip, :)
test -z "$STRIP" && STRIP=:
-@@ -1388,10 +1422,19 @@ if test -n "$RANLIB"; then
+@@ -1380,18 +1471,27 @@ old_postuninstall_cmds=
+ if test -n "$RANLIB"; then
+ case $host_os in
+ openbsd*)
+- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
+ ;;
+ *)
+- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
+ ;;
esac
- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
++ old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
fi
+
+case $host_os in
@@ -14174,7 +16790,7 @@ index a3fee53..88de383 100644
])# _LT_CMD_OLD_ARCHIVE
-@@ -1416,15 +1459,15 @@ AC_CACHE_CHECK([$1], [$2],
+@@ -1416,15 +1516,15 @@ AC_CACHE_CHECK([$1], [$2],
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -14193,7 +16809,7 @@ index a3fee53..88de383 100644
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
$2=yes
-@@ -1464,7 +1507,7 @@ AC_CACHE_CHECK([$1], [$2],
+@@ -1464,7 +1564,7 @@ AC_CACHE_CHECK([$1], [$2],
if test -s conftest.err; then
# Append any errors to the config.log.
cat conftest.err 1>&AS_MESSAGE_LOG_FD
@@ -14202,7 +16818,7 @@ index a3fee53..88de383 100644
$SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
if diff conftest.exp conftest.er2 >/dev/null; then
$2=yes
-@@ -1527,6 +1570,11 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
+@@ -1527,6 +1627,11 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
lt_cv_sys_max_cmd_len=8192;
;;
@@ -14214,18 +16830,30 @@ index a3fee53..88de383 100644
amigaos*)
# On AmigaOS with pdksh, this test takes hours, literally.
# So we just punt and use a minimum line length of 8192.
-@@ -1591,8 +1639,8 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
+@@ -1552,6 +1657,11 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
+ lt_cv_sys_max_cmd_len=196608
+ ;;
+
++ os2*)
++ # The test takes a long time on OS/2.
++ lt_cv_sys_max_cmd_len=8192
++ ;;
++
+ osf*)
+ # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+ # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
+@@ -1591,8 +1701,8 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
# If test is not a shell built-in, we'll probably end up computing a
# maximum length that is only half of the actual maximum length, but
# we can't tell.
- while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
- = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
-+ while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
++ while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
+ = "X$teststring$teststring"; } >/dev/null 2>&1 &&
test $i != 17 # 1/2 MB should be enough
do
i=`expr $i + 1`
-@@ -1643,7 +1691,7 @@ else
+@@ -1643,7 +1753,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
@@ -14234,7 +16862,7 @@ index a3fee53..88de383 100644
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -1684,7 +1732,13 @@ else
+@@ -1684,7 +1794,13 @@ else
# endif
#endif
@@ -14249,7 +16877,7 @@ index a3fee53..88de383 100644
int main ()
{
void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-@@ -1693,7 +1747,11 @@ int main ()
+@@ -1693,7 +1809,11 @@ int main ()
if (self)
{
if (dlsym (self,"fnord")) status = $lt_dlno_uscore;
@@ -14262,7 +16890,7 @@ index a3fee53..88de383 100644
/* dlclose (self); */
}
else
-@@ -1869,16 +1927,16 @@ AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
+@@ -1869,16 +1989,16 @@ AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -14282,7 +16910,7 @@ index a3fee53..88de383 100644
$SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-@@ -2037,6 +2095,7 @@ m4_require([_LT_DECL_EGREP])dnl
+@@ -2037,6 +2157,7 @@ m4_require([_LT_DECL_EGREP])dnl
m4_require([_LT_FILEUTILS_DEFAULTS])dnl
m4_require([_LT_DECL_OBJDUMP])dnl
m4_require([_LT_DECL_SED])dnl
@@ -14290,7 +16918,7 @@ index a3fee53..88de383 100644
AC_MSG_CHECKING([dynamic linker characteristics])
m4_if([$1],
[], [
-@@ -2045,16 +2104,23 @@ if test "$GCC" = yes; then
+@@ -2045,16 +2166,23 @@ if test "$GCC" = yes; then
darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
*) lt_awk_arg="/^libraries:/" ;;
esac
@@ -14320,7 +16948,7 @@ index a3fee53..88de383 100644
# Ok, now we have the path, separated by spaces, we can step through it
# and add multilib dir if necessary.
lt_tmp_lt_search_path_spec=
-@@ -2067,7 +2133,7 @@ if test "$GCC" = yes; then
+@@ -2067,7 +2195,7 @@ if test "$GCC" = yes; then
lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
fi
done
@@ -14329,7 +16957,7 @@ index a3fee53..88de383 100644
BEGIN {RS=" "; FS="/|\n";} {
lt_foo="";
lt_count=0;
-@@ -2087,7 +2153,13 @@ BEGIN {RS=" "; FS="/|\n";} {
+@@ -2087,7 +2215,13 @@ BEGIN {RS=" "; FS="/|\n";} {
if (lt_foo != "") { lt_freq[[lt_foo]]++; }
if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
}'`
@@ -14344,7 +16972,25 @@ index a3fee53..88de383 100644
else
sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
fi])
-@@ -2175,7 +2247,7 @@ amigaos*)
+@@ -2113,7 +2247,7 @@ need_version=unknown
+
+ case $host_os in
+ aix3*)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+ shlibpath_var=LIBPATH
+
+@@ -2122,7 +2256,7 @@ aix3*)
+ ;;
+
+ aix[[4-9]]*)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ hardcode_into_libs=yes
+@@ -2175,7 +2309,7 @@ amigaos*)
m68k)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -14353,7 +16999,16 @@ index a3fee53..88de383 100644
;;
esac
;;
-@@ -2206,8 +2278,9 @@ cygwin* | mingw* | pw32* | cegcc*)
+@@ -2187,7 +2321,7 @@ beos*)
+ ;;
+
+ bsdi[[45]]*)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+@@ -2206,8 +2340,9 @@ cygwin* | mingw* | pw32* | cegcc*)
need_version=no
need_lib_prefix=no
@@ -14365,7 +17020,7 @@ index a3fee53..88de383 100644
library_names_spec='$libname.dll.a'
# DLL is installed to $(libdir)/../bin by postinstall_cmds
postinstall_cmds='base_file=`basename \${file}`~
-@@ -2228,36 +2301,83 @@ cygwin* | mingw* | pw32* | cegcc*)
+@@ -2228,36 +2363,83 @@ cygwin* | mingw* | pw32* | cegcc*)
cygwin*)
# Cygwin DLLs use 'cyg' prefix rather than 'lib'
soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
@@ -14463,12 +17118,61 @@ index a3fee53..88de383 100644
# FIXME: first we should search . and the directory the executable is in
shlibpath_var=PATH
;;
-@@ -2344,6 +2464,19 @@ gnu*)
- hardcode_into_libs=yes
+@@ -2278,7 +2460,7 @@ m4_if([$1], [],[
+ ;;
+
+ dgux*)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
+@@ -2286,10 +2468,6 @@ dgux*)
+ shlibpath_var=LD_LIBRARY_PATH
;;
+-freebsd1*)
+- dynamic_linker=no
+- ;;
+-
+ freebsd* | dragonfly*)
+ # DragonFly does not have aout. When/if they implement a new
+ # versioning mechanism, adjust this.
+@@ -2297,7 +2475,7 @@ freebsd* | dragonfly*)
+ objformat=`/usr/bin/objformat`
+ else
+ case $host_os in
+- freebsd[[123]]*) objformat=aout ;;
++ freebsd[[23]].*) objformat=aout ;;
+ *) objformat=elf ;;
+ esac
+ fi
+@@ -2315,7 +2493,7 @@ freebsd* | dragonfly*)
+ esac
+ shlibpath_var=LD_LIBRARY_PATH
+ case $host_os in
+- freebsd2*)
++ freebsd2.*)
+ shlibpath_overrides_runpath=yes
+ ;;
+ freebsd3.[[01]]* | freebsdelf3.[[01]]*)
+@@ -2335,12 +2513,26 @@ freebsd* | dragonfly*)
+ ;;
+
+ gnu*)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ ;;
++
+haiku*)
-+ version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ dynamic_linker="$host_os runtime_loader"
@@ -14477,13 +17181,10 @@ index a3fee53..88de383 100644
+ shlibpath_var=LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+ sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
-+ hardcode_into_libs=yes
-+ ;;
-+
- hpux9* | hpux10* | hpux11*)
- # Give a soname corresponding to the major version so that dld.sl refuses to
- # link against other versions.
-@@ -2386,8 +2519,10 @@ hpux9* | hpux10* | hpux11*)
+ hardcode_into_libs=yes
+ ;;
+
+@@ -2386,12 +2578,14 @@ hpux9* | hpux10* | hpux11*)
soname_spec='${libname}${release}${shared_ext}$major'
;;
esac
@@ -14495,7 +17196,33 @@ index a3fee53..88de383 100644
;;
interix[[3-9]]*)
-@@ -2454,26 +2589,35 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+@@ -2407,7 +2601,7 @@ irix5* | irix6* | nonstopux*)
+ nonstopux*) version_type=nonstopux ;;
+ *)
+ if test "$lt_cv_prog_gnu_ld" = yes; then
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ else
+ version_type=irix
+ fi ;;
+@@ -2444,9 +2638,9 @@ linux*oldld* | linux*aout* | linux*coff*)
+ dynamic_linker=no
+ ;;
+
+-# This must be Linux ELF.
++# This must be glibc/ELF.
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -2454,26 +2648,35 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
@@ -14542,7 +17269,7 @@ index a3fee53..88de383 100644
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -2485,18 +2629,6 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+@@ -2485,18 +2688,6 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
dynamic_linker='GNU/Linux ld.so'
;;
@@ -14561,7 +17288,61 @@ index a3fee53..88de383 100644
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -2717,6 +2849,8 @@ _LT_DECL([], [library_names_spec], [1],
+@@ -2516,7 +2707,7 @@ netbsd*)
+ ;;
+
+ newsos6)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+@@ -2585,7 +2776,7 @@ rdos*)
+ ;;
+
+ solaris*)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -2610,7 +2801,7 @@ sunos4*)
+ ;;
+
+ sysv4 | sysv4.3*)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+@@ -2634,7 +2825,7 @@ sysv4 | sysv4.3*)
+
+ sysv4*MP*)
+ if test -d /usr/nec ;then
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
+ soname_spec='$libname${shared_ext}.$major'
+ shlibpath_var=LD_LIBRARY_PATH
+@@ -2665,7 +2856,7 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+
+ tpf*)
+ # TPF is a cross-target only. Preferred cross-host = GNU/Linux.
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -2675,7 +2866,7 @@ tpf*)
+ ;;
+
+ uts4*)
+- version_type=linux
++ version_type=linux # correct to gnu/linux during the next big refactor
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+@@ -2717,6 +2908,8 @@ _LT_DECL([], [library_names_spec], [1],
The last name is the one that the linker finds with -lNAME]])
_LT_DECL([], [soname_spec], [1],
[[The coded name of the library, if different from the real name]])
@@ -14570,7 +17351,7 @@ index a3fee53..88de383 100644
_LT_DECL([], [postinstall_cmds], [2],
[Command to use after installation of a shared archive])
_LT_DECL([], [postuninstall_cmds], [2],
-@@ -2829,6 +2963,7 @@ AC_REQUIRE([AC_CANONICAL_HOST])dnl
+@@ -2829,6 +3022,7 @@ AC_REQUIRE([AC_CANONICAL_HOST])dnl
AC_REQUIRE([AC_CANONICAL_BUILD])dnl
m4_require([_LT_DECL_SED])dnl
m4_require([_LT_DECL_EGREP])dnl
@@ -14578,7 +17359,7 @@ index a3fee53..88de383 100644
AC_ARG_WITH([gnu-ld],
[AS_HELP_STRING([--with-gnu-ld],
-@@ -2950,6 +3085,11 @@ case $reload_flag in
+@@ -2950,6 +3144,11 @@ case $reload_flag in
esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
case $host_os in
@@ -14590,7 +17371,7 @@ index a3fee53..88de383 100644
darwin*)
if test "$GCC" = yes; then
reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
-@@ -2958,8 +3098,8 @@ case $host_os in
+@@ -2958,8 +3157,8 @@ case $host_os in
fi
;;
esac
@@ -14601,7 +17382,7 @@ index a3fee53..88de383 100644
])# _LT_CMD_RELOAD
-@@ -3011,16 +3151,18 @@ mingw* | pw32*)
+@@ -3011,16 +3210,18 @@ mingw* | pw32*)
# Base MSYS/MinGW do not provide the 'file' command needed by
# func_win32_libid shell function, so use a weaker test based on 'objdump',
# unless we find 'file', for example because we are cross-compiling.
@@ -14623,7 +17404,7 @@ index a3fee53..88de383 100644
# use the weaker test based on 'objdump'. See mingw*.
lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
lt_cv_file_magic_cmd='$OBJDUMP -f'
-@@ -3050,6 +3192,10 @@ gnu*)
+@@ -3050,6 +3251,10 @@ gnu*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -14634,7 +17415,7 @@ index a3fee53..88de383 100644
hpux10.20* | hpux11*)
lt_cv_file_magic_cmd=/usr/bin/file
case $host_cpu in
-@@ -3058,11 +3204,11 @@ hpux10.20* | hpux11*)
+@@ -3058,11 +3263,11 @@ hpux10.20* | hpux11*)
lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
;;
hppa*64*)
@@ -14648,7 +17429,13 @@ index a3fee53..88de383 100644
lt_cv_file_magic_test_file=/usr/lib/libc.sl
;;
esac
-@@ -3088,7 +3234,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+@@ -3083,12 +3288,12 @@ irix5* | irix6* | nonstopux*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+-# This must be Linux ELF.
++# This must be glibc/ELF.
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
lt_cv_deplibs_check_method=pass_all
;;
@@ -14657,7 +17444,7 @@ index a3fee53..88de383 100644
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
else
-@@ -3162,6 +3308,21 @@ tpf*)
+@@ -3162,6 +3367,21 @@ tpf*)
;;
esac
])
@@ -14679,7 +17466,7 @@ index a3fee53..88de383 100644
file_magic_cmd=$lt_cv_file_magic_cmd
deplibs_check_method=$lt_cv_deplibs_check_method
test -z "$deplibs_check_method" && deplibs_check_method=unknown
-@@ -3169,7 +3330,11 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
+@@ -3169,7 +3389,11 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown
_LT_DECL([], [deplibs_check_method], [1],
[Method to check whether dependent libraries are shared objects])
_LT_DECL([], [file_magic_cmd], [1],
@@ -14692,11 +17479,12 @@ index a3fee53..88de383 100644
])# _LT_CHECK_MAGIC_METHOD
-@@ -3226,7 +3391,19 @@ if test "$lt_cv_path_NM" != "no"; then
+@@ -3226,8 +3450,20 @@ if test "$lt_cv_path_NM" != "no"; then
NM="$lt_cv_path_NM"
else
# Didn't find any BSD compatible name lister, look for dumpbin.
- AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :)
+- AC_SUBST([DUMPBIN])
+ if test -n "$DUMPBIN"; then :
+ # Let the user override the test.
+ else
@@ -14710,10 +17498,11 @@ index a3fee53..88de383 100644
+ ;;
+ esac
+ fi
- AC_SUBST([DUMPBIN])
++ AC_SUBST([DUMPBIN])
if test "$DUMPBIN" != ":"; then
NM="$DUMPBIN"
-@@ -3239,13 +3416,13 @@ _LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl
+ fi
+@@ -3239,13 +3475,13 @@ _LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl
AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
[lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
@@ -14730,7 +17519,7 @@ index a3fee53..88de383 100644
cat conftest.out >&AS_MESSAGE_LOG_FD
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
-@@ -3260,20 +3437,81 @@ dnl aclocal-1.4 backwards compatibility:
+@@ -3260,6 +3496,67 @@ dnl aclocal-1.4 backwards compatibility:
dnl AC_DEFUN([AM_PROG_NM], [])
dnl AC_DEFUN([AC_PROG_NM], [])
@@ -14746,20 +17535,7 @@ index a3fee53..88de383 100644
+AC_CACHE_CHECK([how to associate runtime and link libraries],
+lt_cv_sharedlib_from_linklib_cmd,
+[lt_cv_sharedlib_from_linklib_cmd='unknown'
-
--# LT_LIB_M
--# --------
--# check for math library
--AC_DEFUN([LT_LIB_M],
--[AC_REQUIRE([AC_CANONICAL_HOST])dnl
--LIBM=
--case $host in
--*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
-- # These system don't have libm, or don't need it
-- ;;
--*-ncr-sysv4.3*)
-- AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
-- AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
++
+case $host_os in
+cygwin* | mingw* | pw32* | cegcc*)
+ # two different shell functions defined in ltmain.sh
@@ -14808,24 +17584,19 @@ index a3fee53..88de383 100644
+_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
+])# _LT_PATH_MANIFEST_TOOL
+
-+
-+# LT_LIB_M
-+# --------
-+# check for math library
-+AC_DEFUN([LT_LIB_M],
-+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+LIBM=
-+case $host in
+
+ # LT_LIB_M
+ # --------
+@@ -3268,7 +3565,7 @@ AC_DEFUN([LT_LIB_M],
+ [AC_REQUIRE([AC_CANONICAL_HOST])dnl
+ LIBM=
+ case $host in
+-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
+*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
-+ # These system don't have libm, or don't need it
-+ ;;
-+*-ncr-sysv4.3*)
-+ AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
-+ AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
+ # These system don't have libm, or don't need it
;;
- *)
- AC_CHECK_LIB(m, cos, LIBM="-lm")
-@@ -3296,7 +3534,12 @@ m4_defun([_LT_COMPILER_NO_RTTI],
+ *-ncr-sysv4.3*)
+@@ -3296,7 +3593,12 @@ m4_defun([_LT_COMPILER_NO_RTTI],
_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
if test "$GCC" = yes; then
@@ -14839,7 +17610,7 @@ index a3fee53..88de383 100644
_LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
lt_cv_prog_compiler_rtti_exceptions,
-@@ -3313,6 +3556,7 @@ _LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1],
+@@ -3313,6 +3615,7 @@ _LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1],
m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
[AC_REQUIRE([AC_CANONICAL_HOST])dnl
AC_REQUIRE([AC_PROG_CC])dnl
@@ -14847,7 +17618,7 @@ index a3fee53..88de383 100644
AC_REQUIRE([LT_PATH_NM])dnl
AC_REQUIRE([LT_PATH_LD])dnl
m4_require([_LT_DECL_SED])dnl
-@@ -3380,8 +3624,8 @@ esac
+@@ -3380,8 +3683,8 @@ esac
lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
# Transform an extracted symbol line into symbol name and symbol address
@@ -14858,7 +17629,15 @@ index a3fee53..88de383 100644
# Handle CRLF in mingw tool chain
opt_cr=
-@@ -3417,6 +3661,7 @@ for ac_symprfx in "" "_"; do
+@@ -3405,6 +3708,7 @@ for ac_symprfx in "" "_"; do
+ # which start with @ or ?.
+ lt_cv_sys_global_symbol_pipe="$AWK ['"\
+ " {last_section=section; section=\$ 3};"\
++" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
+ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
+ " \$ 0!~/External *\|/{next};"\
+ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
+@@ -3417,6 +3721,7 @@ for ac_symprfx in "" "_"; do
else
lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
fi
@@ -14866,7 +17645,7 @@ index a3fee53..88de383 100644
# Check to see that the pipe works correctly.
pipe_works=no
-@@ -3438,7 +3683,7 @@ _LT_EOF
+@@ -3438,7 +3743,7 @@ _LT_EOF
if AC_TRY_EVAL(ac_compile); then
# Now try to grab the symbols.
nlist=conftest.nm
@@ -14875,7 +17654,7 @@ index a3fee53..88de383 100644
# Try sorting and uniquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then
mv -f "$nlist"T "$nlist"
-@@ -3450,6 +3695,18 @@ _LT_EOF
+@@ -3450,6 +3755,18 @@ _LT_EOF
if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
cat <<_LT_EOF > conftest.$ac_ext
@@ -14894,7 +17673,7 @@ index a3fee53..88de383 100644
#ifdef __cplusplus
extern "C" {
#endif
-@@ -3461,7 +3718,7 @@ _LT_EOF
+@@ -3461,7 +3778,7 @@ _LT_EOF
cat <<_LT_EOF >> conftest.$ac_ext
/* The mapping between symbol names and symbols. */
@@ -14903,7 +17682,7 @@ index a3fee53..88de383 100644
const char *name;
void *address;
}
-@@ -3487,15 +3744,15 @@ static const void *lt_preloaded_setup() {
+@@ -3487,15 +3804,15 @@ static const void *lt_preloaded_setup() {
_LT_EOF
# Now try linking the two files.
mv conftest.$ac_objext conftstm.$ac_objext
@@ -14923,7 +17702,7 @@ index a3fee53..88de383 100644
else
echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
fi
-@@ -3528,6 +3785,13 @@ else
+@@ -3528,6 +3845,13 @@ else
AC_MSG_RESULT(ok)
fi
@@ -14937,7 +17716,7 @@ index a3fee53..88de383 100644
_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
[Take the output of nm and produce a listing of raw symbols and C names])
_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
-@@ -3538,6 +3802,8 @@ _LT_DECL([global_symbol_to_c_name_address],
+@@ -3538,6 +3862,8 @@ _LT_DECL([global_symbol_to_c_name_address],
_LT_DECL([global_symbol_to_c_name_address_lib_prefix],
[lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
[Transform the output of nm in a C name address pair when lib prefix is needed])
@@ -14946,7 +17725,7 @@ index a3fee53..88de383 100644
]) # _LT_CMD_GLOBAL_SYMBOLS
-@@ -3549,7 +3815,6 @@ _LT_TAGVAR(lt_prog_compiler_wl, $1)=
+@@ -3549,7 +3875,6 @@ _LT_TAGVAR(lt_prog_compiler_wl, $1)=
_LT_TAGVAR(lt_prog_compiler_pic, $1)=
_LT_TAGVAR(lt_prog_compiler_static, $1)=
@@ -14954,7 +17733,7 @@ index a3fee53..88de383 100644
m4_if([$1], [CXX], [
# C++ specific cases for pic, static, wl, etc.
if test "$GXX" = yes; then
-@@ -3600,6 +3865,11 @@ m4_if([$1], [CXX], [
+@@ -3600,6 +3925,11 @@ m4_if([$1], [CXX], [
# DJGPP does not support shared libraries at all
_LT_TAGVAR(lt_prog_compiler_pic, $1)=
;;
@@ -14966,7 +17745,7 @@ index a3fee53..88de383 100644
interix[[3-9]]*)
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
-@@ -3649,6 +3919,12 @@ m4_if([$1], [CXX], [
+@@ -3649,6 +3979,12 @@ m4_if([$1], [CXX], [
;;
esac
;;
@@ -14979,7 +17758,7 @@ index a3fee53..88de383 100644
dgux*)
case $cc_basename in
ec++*)
-@@ -3738,8 +4014,8 @@ m4_if([$1], [CXX], [
+@@ -3738,8 +4074,8 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_pic, $1)=
_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
@@ -14990,7 +17769,7 @@ index a3fee53..88de383 100644
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
-@@ -3769,7 +4045,7 @@ m4_if([$1], [CXX], [
+@@ -3769,7 +4105,7 @@ m4_if([$1], [CXX], [
;;
esac
;;
@@ -14999,7 +17778,7 @@ index a3fee53..88de383 100644
;;
*qnx* | *nto*)
# QNX uses GNU C++, but need to define -shared option too, otherwise
-@@ -3801,7 +4077,7 @@ m4_if([$1], [CXX], [
+@@ -3801,7 +4137,7 @@ m4_if([$1], [CXX], [
;;
solaris*)
case $cc_basename in
@@ -15008,7 +17787,7 @@ index a3fee53..88de383 100644
# Sun C++ 4.2, 5.x and Centerline C++
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-@@ -3905,6 +4181,12 @@ m4_if([$1], [CXX], [
+@@ -3905,6 +4241,12 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
;;
@@ -15021,7 +17800,7 @@ index a3fee53..88de383 100644
hpux*)
# PIC is the default for 64-bit PA HP-UX, but not for 32-bit
# PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag
-@@ -3947,6 +4229,13 @@ m4_if([$1], [CXX], [
+@@ -3947,6 +4289,15 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
;;
esac
@@ -15029,13 +17808,15 @@ index a3fee53..88de383 100644
+ case $cc_basename in
+ nvcc*) # Cuda Compiler Driver 2.2
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
-+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC'
++ if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
++ _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)"
++ fi
+ ;;
+ esac
else
# PORTME Check for flag to pass linker flags through the system compiler.
case $host_os in
-@@ -4010,7 +4299,13 @@ m4_if([$1], [CXX], [
+@@ -4010,7 +4361,13 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
_LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
;;
@@ -15050,7 +17831,7 @@ index a3fee53..88de383 100644
# Portland Group compilers (*not* the Pentium gcc compiler,
# which looks to be a dead project)
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-@@ -4022,25 +4317,25 @@ m4_if([$1], [CXX], [
+@@ -4022,25 +4379,40 @@ m4_if([$1], [CXX], [
# All Alpha code is PIC.
_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
@@ -15064,27 +17845,40 @@ index a3fee53..88de383 100644
;;
*)
case `$CC -V 2>&1 | sed 5q` in
-- *Sun\ C*)
-- # Sun C 5.9
-+ *Sun\ F* | *Sun*Fortran*)
++ *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*)
+ # Sun Fortran 8.3 passes all unrecognized flags to the linker
++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++ _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
++ ;;
++ *Sun\ F* | *Sun*Fortran*)
++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
++ ;;
+ *Sun\ C*)
+ # Sun C 5.9
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-- _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
;;
- *Sun\ F*)
- # Sun Fortran 8.3 passes all unrecognized flags to the linker
-+ *Sun\ C*)
-+ # Sun C 5.9
- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+- _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++ *Intel*\ [[CF]]*Compiler*)
++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
++ ;;
++ *Portland\ Group*)
++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
- _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
-+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
;;
esac
;;
-@@ -4072,7 +4367,7 @@ m4_if([$1], [CXX], [
+@@ -4072,7 +4444,7 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
case $cc_basename in
@@ -15093,7 +17887,7 @@ index a3fee53..88de383 100644
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
*)
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
-@@ -4129,9 +4424,11 @@ case $host_os in
+@@ -4129,9 +4501,11 @@ case $host_os in
_LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t at m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
;;
esac
@@ -15108,7 +17902,7 @@ index a3fee53..88de383 100644
#
# Check to make sure the PIC flag actually works.
-@@ -4150,6 +4447,8 @@ fi
+@@ -4150,6 +4524,8 @@ fi
_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
[Additional compiler flags for building library objects])
@@ -15117,7 +17911,7 @@ index a3fee53..88de383 100644
#
# Check to make sure the static flag actually works.
#
-@@ -4170,6 +4469,7 @@ _LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
+@@ -4170,6 +4546,7 @@ _LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
m4_defun([_LT_LINKER_SHLIBS],
[AC_REQUIRE([LT_PATH_LD])dnl
AC_REQUIRE([LT_PATH_NM])dnl
@@ -15125,7 +17919,7 @@ index a3fee53..88de383 100644
m4_require([_LT_FILEUTILS_DEFAULTS])dnl
m4_require([_LT_DECL_EGREP])dnl
m4_require([_LT_DECL_SED])dnl
-@@ -4178,30 +4478,35 @@ m4_require([_LT_TAG_COMPILER])dnl
+@@ -4178,30 +4555,37 @@ m4_require([_LT_TAG_COMPILER])dnl
AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
m4_if([$1], [CXX], [
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
@@ -15154,7 +17948,9 @@ index a3fee53..88de383 100644
- _LT_TAGVAR(link_all_deplibs, $1)=no
- ;;
+ case $cc_basename in
-+ cl*) ;;
++ cl*)
++ _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
++ ;;
+ *)
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
+ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
@@ -15170,7 +17966,15 @@ index a3fee53..88de383 100644
], [
runpath_var=
_LT_TAGVAR(allow_undefined_flag, $1)=
-@@ -4261,13 +4566,36 @@ dnl Note also adjust exclude_expsyms for C++ above.
+@@ -4216,7 +4600,6 @@ m4_if([$1], [CXX], [
+ _LT_TAGVAR(hardcode_direct, $1)=no
+ _LT_TAGVAR(hardcode_direct_absolute, $1)=no
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+- _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=
+ _LT_TAGVAR(hardcode_minus_L, $1)=no
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+@@ -4261,13 +4644,36 @@ dnl Note also adjust exclude_expsyms for C++ above.
openbsd*)
with_gnu_ld=no
;;
@@ -15210,7 +18014,7 @@ index a3fee53..88de383 100644
# If archive_cmds runs LD, not CC, wlarc should be empty
wlarc='${wl}'
-@@ -4301,11 +4629,12 @@ dnl Note also adjust exclude_expsyms for C++ above.
+@@ -4301,11 +4707,12 @@ dnl Note also adjust exclude_expsyms for C++ above.
_LT_TAGVAR(ld_shlibs, $1)=no
cat <<_LT_EOF 1>&2
@@ -15226,7 +18030,7 @@ index a3fee53..88de383 100644
_LT_EOF
fi
-@@ -4341,10 +4670,12 @@ _LT_EOF
+@@ -4341,10 +4748,12 @@ _LT_EOF
# _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
# as there is no search path for DLLs.
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
@@ -15240,7 +18044,7 @@ index a3fee53..88de383 100644
if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-@@ -4362,6 +4693,11 @@ _LT_EOF
+@@ -4362,6 +4771,11 @@ _LT_EOF
fi
;;
@@ -15252,7 +18056,7 @@ index a3fee53..88de383 100644
interix[[3-9]]*)
_LT_TAGVAR(hardcode_direct, $1)=no
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -4387,15 +4723,16 @@ _LT_EOF
+@@ -4387,15 +4801,16 @@ _LT_EOF
if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
&& test "$tmp_diet" = no
then
@@ -15273,7 +18077,7 @@ index a3fee53..88de383 100644
tmp_addflag=' $pic_flag -Mnomain' ;;
ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
tmp_addflag=' -i_dynamic' ;;
-@@ -4406,13 +4743,17 @@ _LT_EOF
+@@ -4406,13 +4821,17 @@ _LT_EOF
lf95*) # Lahey Fortran 8.1
_LT_TAGVAR(whole_archive_flag_spec, $1)=
tmp_sharedflag='--shared' ;;
@@ -15293,7 +18097,7 @@ index a3fee53..88de383 100644
_LT_TAGVAR(compiler_needs_object, $1)=yes
tmp_sharedflag='-G' ;;
*Sun\ F*) # Sun Fortran 8.3
-@@ -4428,17 +4769,17 @@ _LT_EOF
+@@ -4428,17 +4847,16 @@ _LT_EOF
fi
case $cc_basename in
@@ -15301,9 +18105,10 @@ index a3fee53..88de383 100644
+ xlf* | bgf* | bgxlf* | mpixlf*)
# IBM XL Fortran 10.1 on PPC cannot create shared libs itself
_LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
- _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
+- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+- _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
- _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
if test "x$supports_anon_versioning" = xyes; then
_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
@@ -15314,7 +18119,7 @@ index a3fee53..88de383 100644
fi
;;
esac
-@@ -4447,13 +4788,13 @@ _LT_EOF
+@@ -4447,13 +4865,13 @@ _LT_EOF
fi
;;
@@ -15331,7 +18136,7 @@ index a3fee53..88de383 100644
fi
;;
-@@ -4471,8 +4812,8 @@ _LT_EOF
+@@ -4471,8 +4889,8 @@ _LT_EOF
_LT_EOF
elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -15342,7 +18147,7 @@ index a3fee53..88de383 100644
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -4518,8 +4859,8 @@ _LT_EOF
+@@ -4518,8 +4936,8 @@ _LT_EOF
*)
if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
@@ -15353,7 +18158,7 @@ index a3fee53..88de383 100644
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -4559,8 +4900,10 @@ _LT_EOF
+@@ -4559,8 +4977,10 @@ _LT_EOF
else
# If we're using GNU nm, then we don't want the "-C" option.
# -C means demangle to AIX nm, but means don't demangle with GNU nm
@@ -15365,7 +18170,7 @@ index a3fee53..88de383 100644
else
_LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
fi
-@@ -4622,7 +4965,6 @@ _LT_EOF
+@@ -4622,7 +5042,6 @@ _LT_EOF
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
@@ -15373,7 +18178,7 @@ index a3fee53..88de383 100644
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -4648,9 +4990,9 @@ _LT_EOF
+@@ -4648,9 +5067,9 @@ _LT_EOF
_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -15385,7 +18190,7 @@ index a3fee53..88de383 100644
else
if test "$host_cpu" = ia64; then
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-@@ -4659,14 +5001,19 @@ _LT_EOF
+@@ -4659,14 +5078,19 @@ _LT_EOF
else
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -15408,7 +18213,7 @@ index a3fee53..88de383 100644
_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
# This is similar to how AIX traditionally builds its shared libraries.
_LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-@@ -4698,20 +5045,63 @@ _LT_EOF
+@@ -4698,20 +5122,64 @@ _LT_EOF
# Microsoft Visual C++.
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
@@ -15449,6 +18254,7 @@ index a3fee53..88de383 100644
+ # The linker will not automatically build a static lib if we build a DLL.
+ # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
++ _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+ # Don't use ranlib
+ _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
@@ -15486,7 +18292,27 @@ index a3fee53..88de383 100644
;;
darwin* | rhapsody*)
-@@ -4749,7 +5139,7 @@ _LT_EOF
+@@ -4724,10 +5192,6 @@ _LT_EOF
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+ ;;
+
+- freebsd1*)
+- _LT_TAGVAR(ld_shlibs, $1)=no
+- ;;
+-
+ # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+ # support. Future versions do this automatically, but an explicit c++rt0.o
+ # does not break anything, and helps significantly (at the cost of a little
+@@ -4740,7 +5204,7 @@ _LT_EOF
+ ;;
+
+ # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+- freebsd2*)
++ freebsd2.*)
+ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ _LT_TAGVAR(hardcode_direct, $1)=yes
+ _LT_TAGVAR(hardcode_minus_L, $1)=yes
+@@ -4749,7 +5213,7 @@ _LT_EOF
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
freebsd* | dragonfly*)
@@ -15495,7 +18321,7 @@ index a3fee53..88de383 100644
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
_LT_TAGVAR(hardcode_direct, $1)=yes
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -4757,7 +5147,7 @@ _LT_EOF
+@@ -4757,7 +5221,7 @@ _LT_EOF
hpux9*)
if test "$GCC" = yes; then
@@ -15504,7 +18330,7 @@ index a3fee53..88de383 100644
else
_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
fi
-@@ -4772,8 +5162,8 @@ _LT_EOF
+@@ -4772,14 +5236,13 @@ _LT_EOF
;;
hpux10*)
@@ -15515,7 +18341,13 @@ index a3fee53..88de383 100644
else
_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
fi
-@@ -4791,16 +5181,16 @@ _LT_EOF
+ if test "$with_gnu_ld" = no; then
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+- _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+ _LT_TAGVAR(hardcode_direct, $1)=yes
+ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+@@ -4791,16 +5254,16 @@ _LT_EOF
;;
hpux11*)
@@ -15535,7 +18367,7 @@ index a3fee53..88de383 100644
;;
esac
else
-@@ -4812,7 +5202,14 @@ _LT_EOF
+@@ -4812,7 +5275,14 @@ _LT_EOF
_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
@@ -15551,7 +18383,7 @@ index a3fee53..88de383 100644
;;
esac
fi
-@@ -4840,19 +5237,34 @@ _LT_EOF
+@@ -4840,19 +5310,34 @@ _LT_EOF
irix5* | irix6* | nonstopux*)
if test "$GCC" = yes; then
@@ -15595,7 +18427,7 @@ index a3fee53..88de383 100644
fi
_LT_TAGVAR(archive_cmds_need_lc, $1)='no'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-@@ -4861,7 +5273,7 @@ _LT_EOF
+@@ -4861,7 +5346,7 @@ _LT_EOF
_LT_TAGVAR(link_all_deplibs, $1)=yes
;;
@@ -15604,7 +18436,7 @@ index a3fee53..88de383 100644
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -4914,17 +5326,17 @@ _LT_EOF
+@@ -4914,17 +5399,17 @@ _LT_EOF
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
_LT_TAGVAR(hardcode_minus_L, $1)=yes
_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
@@ -15625,7 +18457,7 @@ index a3fee53..88de383 100644
fi
_LT_TAGVAR(archive_cmds_need_lc, $1)='no'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-@@ -4934,13 +5346,13 @@ _LT_EOF
+@@ -4934,13 +5419,13 @@ _LT_EOF
osf4* | osf5*) # as osf3* with the addition of -msym flag
if test "$GCC" = yes; then
_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -15642,7 +18474,7 @@ index a3fee53..88de383 100644
# Both c and cxx compiler support -rpath directly
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -4953,9 +5365,9 @@ _LT_EOF
+@@ -4953,9 +5438,9 @@ _LT_EOF
_LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
if test "$GCC" = yes; then
wlarc='${wl}'
@@ -15654,7 +18486,7 @@ index a3fee53..88de383 100644
else
case `$CC -V 2>&1` in
*"Compilers 5.0"*)
-@@ -5131,36 +5543,38 @@ x|xyes)
+@@ -5131,36 +5616,38 @@ x|xyes)
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
@@ -15723,7 +18555,17 @@ index a3fee53..88de383 100644
;;
esac
fi
-@@ -5225,8 +5639,6 @@ _LT_TAGDECL([], [inherit_rpath], [0],
+@@ -5197,9 +5684,6 @@ _LT_TAGDECL([], [no_undefined_flag], [1],
+ _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
+ [Flag to hardcode $libdir into a binary during linking.
+ This must work even if $libdir does not exist])
+-_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1],
+- [[If ld is used when linking, flag to hardcode $libdir into a binary
+- during linking. This must work even if $libdir does not exist]])
+ _LT_TAGDECL([], [hardcode_libdir_separator], [1],
+ [Whether we need a single "-rpath" flag with a separated argument])
+ _LT_TAGDECL([], [hardcode_direct], [0],
+@@ -5225,8 +5709,6 @@ _LT_TAGDECL([], [inherit_rpath], [0],
to runtime path list])
_LT_TAGDECL([], [link_all_deplibs], [0],
[Whether libtool must link a program against all its dependency libraries])
@@ -15732,7 +18574,7 @@ index a3fee53..88de383 100644
_LT_TAGDECL([], [always_export_symbols], [0],
[Set to "yes" if exported symbols are required])
_LT_TAGDECL([], [export_symbols_cmds], [2],
-@@ -5237,6 +5649,8 @@ _LT_TAGDECL([], [include_expsyms], [1],
+@@ -5237,6 +5719,8 @@ _LT_TAGDECL([], [include_expsyms], [1],
[Symbols that must always be exported])
_LT_TAGDECL([], [prelink_cmds], [2],
[Commands necessary for linking programs (against libraries) with templates])
@@ -15741,7 +18583,7 @@ index a3fee53..88de383 100644
_LT_TAGDECL([], [file_list_spec], [1],
[Specify filename containing input files])
dnl FIXME: Not yet implemented
-@@ -5330,37 +5744,22 @@ CC="$lt_save_CC"
+@@ -5330,37 +5814,22 @@ CC="$lt_save_CC"
])# _LT_LANG_C_CONFIG
@@ -15788,7 +18630,15 @@ index a3fee53..88de383 100644
AC_LANG_PUSH(C++)
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-@@ -5382,6 +5781,8 @@ _LT_TAGVAR(module_cmds, $1)=
+@@ -5372,7 +5841,6 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)=
+ _LT_TAGVAR(hardcode_direct, $1)=no
+ _LT_TAGVAR(hardcode_direct_absolute, $1)=no
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=
+ _LT_TAGVAR(hardcode_minus_L, $1)=no
+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+@@ -5382,6 +5850,8 @@ _LT_TAGVAR(module_cmds, $1)=
_LT_TAGVAR(module_expsym_cmds, $1)=
_LT_TAGVAR(link_all_deplibs, $1)=unknown
_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
@@ -15797,7 +18647,7 @@ index a3fee53..88de383 100644
_LT_TAGVAR(no_undefined_flag, $1)=
_LT_TAGVAR(whole_archive_flag_spec, $1)=
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-@@ -5413,6 +5814,7 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -5413,6 +5883,7 @@ if test "$_lt_caught_CXX_error" != yes; then
# Allow CC to be a program name with arguments.
lt_save_CC=$CC
@@ -15805,7 +18655,7 @@ index a3fee53..88de383 100644
lt_save_LD=$LD
lt_save_GCC=$GCC
GCC=$GXX
-@@ -5430,6 +5832,7 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -5430,6 +5901,7 @@ if test "$_lt_caught_CXX_error" != yes; then
fi
test -z "${LDCXX+set}" || LD=$LDCXX
CC=${CXX-"c++"}
@@ -15813,7 +18663,7 @@ index a3fee53..88de383 100644
compiler=$CC
_LT_TAGVAR(compiler, $1)=$CC
_LT_CC_BASENAME([$compiler])
-@@ -5451,8 +5854,8 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -5451,8 +5923,8 @@ if test "$_lt_caught_CXX_error" != yes; then
# Check if GNU C++ uses GNU ld as the underlying linker, since the
# archiving commands below assume that GNU ld is being used.
if test "$with_gnu_ld" = yes; then
@@ -15824,7 +18674,7 @@ index a3fee53..88de383 100644
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-@@ -5484,7 +5887,7 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -5484,7 +5956,7 @@ if test "$_lt_caught_CXX_error" != yes; then
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
@@ -15833,7 +18683,7 @@ index a3fee53..88de383 100644
else
GXX=no
-@@ -5593,10 +5996,10 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -5593,10 +6065,10 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
# Determine the default libpath from the value encoded in an empty
# executable.
@@ -15846,7 +18696,7 @@ index a3fee53..88de383 100644
else
if test "$host_cpu" = ia64; then
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-@@ -5605,14 +6008,19 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -5605,14 +6077,19 @@ if test "$_lt_caught_CXX_error" != yes; then
else
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -15869,7 +18719,7 @@ index a3fee53..88de383 100644
_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
# This is similar to how AIX traditionally builds its shared
# libraries.
-@@ -5642,28 +6050,75 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -5642,28 +6119,75 @@ if test "$_lt_caught_CXX_error" != yes; then
;;
cygwin* | mingw* | pw32* | cegcc*)
@@ -15967,7 +18817,16 @@ index a3fee53..88de383 100644
darwin* | rhapsody*)
_LT_DARWIN_LINKER_FEATURES($1)
;;
-@@ -5705,6 +6160,11 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -5686,7 +6210,7 @@ if test "$_lt_caught_CXX_error" != yes; then
+ esac
+ ;;
+
+- freebsd[[12]]*)
++ freebsd2.*)
+ # C++ shared libraries reported to be fairly broken before
+ # switch to ELF
+ _LT_TAGVAR(ld_shlibs, $1)=no
+@@ -5705,6 +6229,11 @@ if test "$_lt_caught_CXX_error" != yes; then
gnu*)
;;
@@ -15979,7 +18838,7 @@ index a3fee53..88de383 100644
hpux9*)
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -5729,11 +6189,11 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -5729,11 +6258,11 @@ if test "$_lt_caught_CXX_error" != yes; then
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
@@ -15993,7 +18852,7 @@ index a3fee53..88de383 100644
else
# FIXME: insert proper C++ library support
_LT_TAGVAR(ld_shlibs, $1)=no
-@@ -5794,7 +6254,7 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -5794,7 +6323,7 @@ if test "$_lt_caught_CXX_error" != yes; then
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
@@ -16002,7 +18861,7 @@ index a3fee53..88de383 100644
;;
*)
if test "$GXX" = yes; then
-@@ -5804,10 +6264,10 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -5804,10 +6333,10 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
ia64*)
@@ -16015,7 +18874,7 @@ index a3fee53..88de383 100644
;;
esac
fi
-@@ -5837,7 +6297,7 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -5837,7 +6366,7 @@ if test "$_lt_caught_CXX_error" != yes; then
case $cc_basename in
CC*)
# SGI C++
@@ -16024,7 +18883,7 @@ index a3fee53..88de383 100644
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
-@@ -5848,9 +6308,9 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -5848,9 +6377,9 @@ if test "$_lt_caught_CXX_error" != yes; then
*)
if test "$GXX" = yes; then
if test "$with_gnu_ld" = no; then
@@ -16036,7 +18895,7 @@ index a3fee53..88de383 100644
fi
fi
_LT_TAGVAR(link_all_deplibs, $1)=yes
-@@ -5879,7 +6339,7 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -5879,7 +6408,7 @@ if test "$_lt_caught_CXX_error" != yes; then
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
@@ -16045,7 +18904,7 @@ index a3fee53..88de383 100644
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-@@ -5916,26 +6376,26 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -5916,26 +6445,26 @@ if test "$_lt_caught_CXX_error" != yes; then
pgCC* | pgcpp*)
# Portland Group C++ compiler
case `$CC -V` in
@@ -16078,7 +18937,7 @@ index a3fee53..88de383 100644
_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
;;
-@@ -5943,7 +6403,7 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -5943,7 +6472,7 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
@@ -16087,7 +18946,7 @@ index a3fee53..88de383 100644
;;
cxx*)
# Compaq C++
-@@ -5962,9 +6422,9 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -5962,9 +6491,9 @@ if test "$_lt_caught_CXX_error" != yes; then
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
@@ -16099,7 +18958,7 @@ index a3fee53..88de383 100644
# IBM XL 8.0 on PPC, with GNU ld
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-@@ -5984,13 +6444,13 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -5984,13 +6513,13 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
@@ -16115,7 +18974,7 @@ index a3fee53..88de383 100644
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -6059,7 +6519,7 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -6059,7 +6588,7 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
_LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
fi
@@ -16124,7 +18983,7 @@ index a3fee53..88de383 100644
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
-@@ -6094,15 +6554,15 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -6094,15 +6623,15 @@ if test "$_lt_caught_CXX_error" != yes; then
case $host in
osf3*)
_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -16143,7 +19002,7 @@ index a3fee53..88de383 100644
$RM $lib.exp'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
;;
-@@ -6118,17 +6578,17 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -6118,17 +6647,17 @@ if test "$_lt_caught_CXX_error" != yes; then
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
@@ -16164,7 +19023,7 @@ index a3fee53..88de383 100644
;;
esac
-@@ -6138,7 +6598,7 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -6138,7 +6667,7 @@ if test "$_lt_caught_CXX_error" != yes; then
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
@@ -16173,7 +19032,7 @@ index a3fee53..88de383 100644
else
# FIXME: insert proper C++ library support
-@@ -6174,7 +6634,7 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -6174,7 +6703,7 @@ if test "$_lt_caught_CXX_error" != yes; then
solaris*)
case $cc_basename in
@@ -16182,7 +19041,7 @@ index a3fee53..88de383 100644
# Sun C++ 4.2, 5.x and Centerline C++
_LT_TAGVAR(archive_cmds_need_lc,$1)=yes
_LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-@@ -6195,7 +6655,7 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -6195,7 +6724,7 @@ if test "$_lt_caught_CXX_error" != yes; then
esac
_LT_TAGVAR(link_all_deplibs, $1)=yes
@@ -16191,7 +19050,7 @@ index a3fee53..88de383 100644
# Archives containing C++ object files must be created using
# "CC -xar", where "CC" is the Sun C++ compiler. This is
-@@ -6215,14 +6675,14 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -6215,14 +6744,14 @@ if test "$_lt_caught_CXX_error" != yes; then
if test "$GXX" = yes && test "$with_gnu_ld" = no; then
_LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
if $CC --version | $GREP -v '^2\.7' > /dev/null; then
@@ -16209,7 +19068,7 @@ index a3fee53..88de383 100644
else
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
-@@ -6233,7 +6693,7 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -6233,7 +6762,7 @@ if test "$_lt_caught_CXX_error" != yes; then
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
@@ -16218,7 +19077,7 @@ index a3fee53..88de383 100644
fi
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
-@@ -6287,6 +6747,10 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -6287,6 +6816,10 @@ if test "$_lt_caught_CXX_error" != yes; then
CC*)
_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -16229,7 +19088,7 @@ index a3fee53..88de383 100644
;;
*)
_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-@@ -6342,6 +6806,7 @@ if test "$_lt_caught_CXX_error" != yes; then
+@@ -6342,6 +6875,7 @@ if test "$_lt_caught_CXX_error" != yes; then
fi # test -n "$compiler"
CC=$lt_save_CC
@@ -16237,7 +19096,7 @@ index a3fee53..88de383 100644
LDCXX=$LD
LD=$lt_save_LD
GCC=$lt_save_GCC
-@@ -6356,6 +6821,29 @@ AC_LANG_POP
+@@ -6356,6 +6890,29 @@ AC_LANG_POP
])# _LT_LANG_CXX_CONFIG
@@ -16267,7 +19126,7 @@ index a3fee53..88de383 100644
# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
# ---------------------------------
# Figure out "hidden" library dependencies from verbose
-@@ -6364,6 +6852,7 @@ AC_LANG_POP
+@@ -6364,6 +6921,7 @@ AC_LANG_POP
# objects, libraries and library flags.
m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
@@ -16275,21 +19134,28 @@ index a3fee53..88de383 100644
# Dependencies to place before and after the object being linked:
_LT_TAGVAR(predep_objects, $1)=
_LT_TAGVAR(postdep_objects, $1)=
-@@ -6414,6 +6903,13 @@ public class foo {
+@@ -6413,7 +6971,20 @@ public class foo {
+ }
};
_LT_EOF
++], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF
++package foo
++func foo() {
++}
++_LT_EOF
])
+
+_lt_libdeps_save_CFLAGS=$CFLAGS
+case "$CC $CFLAGS " in #(
+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
++*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
+esac
+
dnl Parse the compiler output and extract the necessary
dnl objects, libraries and library flags.
if AC_TRY_EVAL(ac_compile); then
-@@ -6425,7 +6921,7 @@ if AC_TRY_EVAL(ac_compile); then
+@@ -6425,7 +6996,7 @@ if AC_TRY_EVAL(ac_compile); then
pre_test_object_deps_done=no
for p in `eval "$output_verbose_link_cmd"`; do
@@ -16298,7 +19164,7 @@ index a3fee53..88de383 100644
-L* | -R* | -l*)
# Some compilers place space between "-{L,R}" and the path.
-@@ -6434,13 +6930,22 @@ if AC_TRY_EVAL(ac_compile); then
+@@ -6434,13 +7005,22 @@ if AC_TRY_EVAL(ac_compile); then
test $p = "-R"; then
prev=$p
continue
@@ -16325,7 +19191,7 @@ index a3fee53..88de383 100644
# Internal compiler library paths should come after those
# provided the user. The postdeps already come after the
# user supplied libs so there is no need to process them.
-@@ -6460,8 +6965,10 @@ if AC_TRY_EVAL(ac_compile); then
+@@ -6460,8 +7040,10 @@ if AC_TRY_EVAL(ac_compile); then
_LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
fi
fi
@@ -16336,7 +19202,7 @@ index a3fee53..88de383 100644
*.$objext)
# This assumes that the test object file only shows up
# once in the compiler output.
-@@ -6497,6 +7004,7 @@ else
+@@ -6497,6 +7079,7 @@ else
fi
$RM -f confest.$objext
@@ -16344,7 +19210,7 @@ index a3fee53..88de383 100644
# PORTME: override above test on systems where it is broken
m4_if([$1], [CXX],
-@@ -6533,7 +7041,7 @@ linux*)
+@@ -6533,7 +7116,7 @@ linux*)
solaris*)
case $cc_basename in
@@ -16353,7 +19219,7 @@ index a3fee53..88de383 100644
# The more standards-conforming stlport4 library is
# incompatible with the Cstd library. Avoid specifying
# it if it's in CXXFLAGS. Ignore libCrun as
-@@ -6577,32 +7085,16 @@ _LT_TAGDECL([], [compiler_lib_search_path], [1],
+@@ -6577,32 +7160,16 @@ _LT_TAGDECL([], [compiler_lib_search_path], [1],
])# _LT_SYS_HIDDEN_LIBDEPS
@@ -16390,7 +19256,15 @@ index a3fee53..88de383 100644
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_TAGVAR(allow_undefined_flag, $1)=
-@@ -6621,6 +7113,8 @@ _LT_TAGVAR(module_cmds, $1)=
+@@ -6612,7 +7179,6 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)=
+ _LT_TAGVAR(hardcode_direct, $1)=no
+ _LT_TAGVAR(hardcode_direct_absolute, $1)=no
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=
+ _LT_TAGVAR(hardcode_minus_L, $1)=no
+ _LT_TAGVAR(hardcode_automatic, $1)=no
+@@ -6621,6 +7187,8 @@ _LT_TAGVAR(module_cmds, $1)=
_LT_TAGVAR(module_expsym_cmds, $1)=
_LT_TAGVAR(link_all_deplibs, $1)=unknown
_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
@@ -16399,7 +19273,7 @@ index a3fee53..88de383 100644
_LT_TAGVAR(no_undefined_flag, $1)=
_LT_TAGVAR(whole_archive_flag_spec, $1)=
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-@@ -6660,7 +7154,9 @@ if test "$_lt_disable_F77" != yes; then
+@@ -6660,7 +7228,9 @@ if test "$_lt_disable_F77" != yes; then
# Allow CC to be a program name with arguments.
lt_save_CC="$CC"
lt_save_GCC=$GCC
@@ -16409,7 +19283,7 @@ index a3fee53..88de383 100644
compiler=$CC
_LT_TAGVAR(compiler, $1)=$CC
_LT_CC_BASENAME([$compiler])
-@@ -6714,38 +7210,24 @@ if test "$_lt_disable_F77" != yes; then
+@@ -6714,38 +7284,24 @@ if test "$_lt_disable_F77" != yes; then
GCC=$lt_save_GCC
CC="$lt_save_CC"
@@ -16454,7 +19328,15 @@ index a3fee53..88de383 100644
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_TAGVAR(allow_undefined_flag, $1)=
-@@ -6764,6 +7246,8 @@ _LT_TAGVAR(module_cmds, $1)=
+@@ -6755,7 +7311,6 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)=
+ _LT_TAGVAR(hardcode_direct, $1)=no
+ _LT_TAGVAR(hardcode_direct_absolute, $1)=no
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+ _LT_TAGVAR(hardcode_libdir_separator, $1)=
+ _LT_TAGVAR(hardcode_minus_L, $1)=no
+ _LT_TAGVAR(hardcode_automatic, $1)=no
+@@ -6764,6 +7319,8 @@ _LT_TAGVAR(module_cmds, $1)=
_LT_TAGVAR(module_expsym_cmds, $1)=
_LT_TAGVAR(link_all_deplibs, $1)=unknown
_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
@@ -16463,7 +19345,7 @@ index a3fee53..88de383 100644
_LT_TAGVAR(no_undefined_flag, $1)=
_LT_TAGVAR(whole_archive_flag_spec, $1)=
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-@@ -6803,7 +7287,9 @@ if test "$_lt_disable_FC" != yes; then
+@@ -6803,7 +7360,9 @@ if test "$_lt_disable_FC" != yes; then
# Allow CC to be a program name with arguments.
lt_save_CC="$CC"
lt_save_GCC=$GCC
@@ -16473,7 +19355,7 @@ index a3fee53..88de383 100644
compiler=$CC
GCC=$ac_cv_fc_compiler_gnu
-@@ -6859,7 +7345,8 @@ if test "$_lt_disable_FC" != yes; then
+@@ -6859,7 +7418,8 @@ if test "$_lt_disable_FC" != yes; then
fi # test -n "$compiler"
GCC=$lt_save_GCC
@@ -16483,7 +19365,7 @@ index a3fee53..88de383 100644
fi # test "$_lt_disable_FC" != yes
AC_LANG_POP
-@@ -6896,10 +7383,12 @@ _LT_COMPILER_BOILERPLATE
+@@ -6896,10 +7456,12 @@ _LT_COMPILER_BOILERPLATE
_LT_LINKER_BOILERPLATE
# Allow CC to be a program name with arguments.
@@ -16497,7 +19379,7 @@ index a3fee53..88de383 100644
compiler=$CC
_LT_TAGVAR(compiler, $1)=$CC
_LT_TAGVAR(LD, $1)="$LD"
-@@ -6909,6 +7398,8 @@ _LT_CC_BASENAME([$compiler])
+@@ -6909,6 +7471,8 @@ _LT_CC_BASENAME([$compiler])
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
@@ -16506,7 +19388,7 @@ index a3fee53..88de383 100644
## CAVEAT EMPTOR:
## There is no encapsulation within the following macros, do not change
-@@ -6928,7 +7419,8 @@ fi
+@@ -6928,10 +7492,82 @@ fi
AC_LANG_RESTORE
GCC=$lt_save_GCC
@@ -16516,7 +19398,81 @@ index a3fee53..88de383 100644
])# _LT_LANG_GCJ_CONFIG
-@@ -6963,9 +7455,11 @@ _LT_LINKER_BOILERPLATE
++# _LT_LANG_GO_CONFIG([TAG])
++# --------------------------
++# Ensure that the configuration variables for the GNU Go compiler
++# are suitably defined. These variables are subsequently used by _LT_CONFIG
++# to write the compiler configuration to `libtool'.
++m4_defun([_LT_LANG_GO_CONFIG],
++[AC_REQUIRE([LT_PROG_GO])dnl
++AC_LANG_SAVE
++
++# Source file extension for Go test sources.
++ac_ext=go
++
++# Object file extension for compiled Go test sources.
++objext=o
++_LT_TAGVAR(objext, $1)=$objext
++
++# Code to be used in simple compile tests
++lt_simple_compile_test_code="package main; func main() { }"
++
++# Code to be used in simple link tests
++lt_simple_link_test_code='package main; func main() { }'
++
++# ltmain only uses $CC for tagged configurations so make sure $CC is set.
++_LT_TAG_COMPILER
++
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
++# Allow CC to be a program name with arguments.
++lt_save_CC=$CC
++lt_save_CFLAGS=$CFLAGS
++lt_save_GCC=$GCC
++GCC=yes
++CC=${GOC-"gccgo"}
++CFLAGS=$GOFLAGS
++compiler=$CC
++_LT_TAGVAR(compiler, $1)=$CC
++_LT_TAGVAR(LD, $1)="$LD"
++_LT_CC_BASENAME([$compiler])
++
++# Go did not exist at the time GCC didn't implicitly link libc in.
++_LT_TAGVAR(archive_cmds_need_lc, $1)=no
++
++_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
++_LT_TAGVAR(reload_flag, $1)=$reload_flag
++_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
++
++## CAVEAT EMPTOR:
++## There is no encapsulation within the following macros, do not change
++## the running order or otherwise move them around unless you know exactly
++## what you are doing...
++if test -n "$compiler"; then
++ _LT_COMPILER_NO_RTTI($1)
++ _LT_COMPILER_PIC($1)
++ _LT_COMPILER_C_O($1)
++ _LT_COMPILER_FILE_LOCKS($1)
++ _LT_LINKER_SHLIBS($1)
++ _LT_LINKER_HARDCODE_LIBPATH($1)
++
++ _LT_CONFIG($1)
++fi
++
++AC_LANG_RESTORE
++
++GCC=$lt_save_GCC
++CC=$lt_save_CC
++CFLAGS=$lt_save_CFLAGS
++])# _LT_LANG_GO_CONFIG
++
++
+ # _LT_LANG_RC_CONFIG([TAG])
+ # -------------------------
+ # Ensure that the configuration variables for the Windows resource compiler
+@@ -6963,9 +7599,11 @@ _LT_LINKER_BOILERPLATE
# Allow CC to be a program name with arguments.
lt_save_CC="$CC"
@@ -16528,7 +19484,7 @@ index a3fee53..88de383 100644
compiler=$CC
_LT_TAGVAR(compiler, $1)=$CC
_LT_CC_BASENAME([$compiler])
-@@ -6978,7 +7472,8 @@ fi
+@@ -6978,7 +7616,8 @@ fi
GCC=$lt_save_GCC
AC_LANG_RESTORE
@@ -16538,7 +19494,21 @@ index a3fee53..88de383 100644
])# _LT_LANG_RC_CONFIG
-@@ -7037,6 +7532,15 @@ _LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
+@@ -6998,6 +7637,13 @@ dnl aclocal-1.4 backwards compatibility:
+ dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
+
+
++# LT_PROG_GO
++# ----------
++AC_DEFUN([LT_PROG_GO],
++[AC_CHECK_TOOL(GOC, gccgo,)
++])
++
++
+ # LT_PROG_RC
+ # ----------
+ AC_DEFUN([LT_PROG_RC],
+@@ -7037,6 +7683,15 @@ _LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
AC_SUBST([OBJDUMP])
])
@@ -16554,7 +19524,7 @@ index a3fee53..88de383 100644
# _LT_DECL_SED
# ------------
-@@ -7130,8 +7634,8 @@ m4_defun([_LT_CHECK_SHELL_FEATURES],
+@@ -7130,8 +7785,8 @@ m4_defun([_LT_CHECK_SHELL_FEATURES],
# Try some XSI features
xsi_shell=no
( _lt_dummy="a/b/c"
@@ -16565,7 +19535,7 @@ index a3fee53..88de383 100644
&& eval 'test $(( 1 + 1 )) -eq 2 \
&& test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
&& xsi_shell=yes
-@@ -7170,208 +7674,162 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
+@@ -7170,208 +7825,162 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
])# _LT_CHECK_SHELL_FEATURES
@@ -16774,40 +19744,40 @@ index a3fee53..88de383 100644
- func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
- func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
-}
-+ _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}])
-+fi
-
+-
-# func_lo2o object
-func_lo2o ()
-{
- func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
-}
-+if test x"$lt_shell_append" = xyes; then
-+ _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"])
-
+-
-# func_xform libobj-or-source
-func_xform ()
-{
- func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'`
-}
-+ _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl
-+ func_quote_for_eval "${2}"
-+dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \
-+ eval "${1}+=\\\\ \\$func_quote_for_eval_result"])
++ _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}])
++fi
-# func_arith arithmetic-term...
-func_arith ()
-{
- func_arith_result=`expr "$[@]"`
-}
--
++if test x"$lt_shell_append" = xyes; then
++ _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"])
+
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
- func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len`
-}
--
++ _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl
++ func_quote_for_eval "${2}"
++dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \
++ eval "${1}+=\\\\ \\$func_quote_for_eval_result"])
+
-_LT_EOF
-esac
+ # Save a `func_append' function call where possible by direct use of '+='
@@ -16917,7 +19887,7 @@ index a3fee53..88de383 100644
+ [0], [convert $build files to toolchain format])dnl
+])# _LT_PATH_CONVERSION_FUNCTIONS
diff --git a/m4/ltoptions.m4 b/m4/ltoptions.m4
-index 34151a3..17cfd51 100644
+index 34151a3..5d9acd8 100644
--- a/m4/ltoptions.m4
+++ b/m4/ltoptions.m4
@@ -1,13 +1,14 @@
@@ -16963,8 +19933,35 @@ index 34151a3..17cfd51 100644
])# win32-dll
AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
+@@ -325,9 +326,24 @@ dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
+ # MODE is either `yes' or `no'. If omitted, it defaults to `both'.
+ m4_define([_LT_WITH_PIC],
+ [AC_ARG_WITH([pic],
+- [AS_HELP_STRING([--with-pic],
++ [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
+ [try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
+- [pic_mode="$withval"],
++ [lt_p=${PACKAGE-default}
++ case $withval in
++ yes|no) pic_mode=$withval ;;
++ *)
++ pic_mode=default
++ # Look at the argument we got. We use all the common list separators.
++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++ for lt_pkg in $withval; do
++ IFS="$lt_save_ifs"
++ if test "X$lt_pkg" = "X$lt_p"; then
++ pic_mode=yes
++ fi
++ done
++ IFS="$lt_save_ifs"
++ ;;
++ esac],
+ [pic_mode=default])
+
+ test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
diff --git a/m4/ltversion.m4 b/m4/ltversion.m4
-index f3c5309..9c7b5d4 100644
+index f3c5309..07a8602 100644
--- a/m4/ltversion.m4
+++ b/m4/ltversion.m4
@@ -7,17 +7,17 @@
@@ -16975,19 +19972,19 @@ index f3c5309..9c7b5d4 100644
+# @configure_input@
-# serial 3017 ltversion.m4
-+# serial 3293 ltversion.m4
++# serial 3337 ltversion.m4
# This file is part of GNU Libtool
-m4_define([LT_PACKAGE_VERSION], [2.2.6b])
-m4_define([LT_PACKAGE_REVISION], [1.3017])
-+m4_define([LT_PACKAGE_VERSION], [2.4])
-+m4_define([LT_PACKAGE_REVISION], [1.3293])
++m4_define([LT_PACKAGE_VERSION], [2.4.2])
++m4_define([LT_PACKAGE_REVISION], [1.3337])
AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.2.6b'
-macro_revision='1.3017'
-+[macro_version='2.4'
-+macro_revision='1.3293'
++[macro_version='2.4.2'
++macro_revision='1.3337'
_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
_LT_DECL(, macro_revision, 0)
])
@@ -17031,10 +20028,36 @@ index 637bb20..c573da9 100644
+m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])])
+m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])])
diff --git a/share/Makefile.in b/share/Makefile.in
-index ad2b9f3..f00fa77 100644
+index 8992e02..286265c 100644
--- a/share/Makefile.in
+++ b/share/Makefile.in
-@@ -97,6 +97,7 @@ CURL_LIBS = @CURL_LIBS@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -71,6 +71,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(localdatadir)" \
+ "$(DESTDIR)$(localdatadir)"
+ SCRIPTS = $(nobase_localdata_SCRIPTS)
+@@ -97,6 +103,7 @@ CURL_LIBS = @CURL_LIBS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -17042,7 +20065,7 @@ index ad2b9f3..f00fa77 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -137,6 +138,7 @@ LIPO = @LIPO@
+@@ -137,6 +144,7 @@ LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -17050,7 +20073,7 @@ index ad2b9f3..f00fa77 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -162,6 +164,7 @@ abs_builddir = @abs_builddir@
+@@ -162,6 +170,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -17058,7 +20081,7 @@ index ad2b9f3..f00fa77 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
-@@ -206,7 +209,6 @@ localstatedir = @localstatedir@
+@@ -206,7 +215,6 @@ localstatedir = @localstatedir@
localstatelibdir = @localstatelibdir@
localstatelogdir = @localstatelogdir@
localstaterundir = @localstaterundir@
@@ -17066,10 +20089,65 @@ index ad2b9f3..f00fa77 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
msvc_redist_dir = @msvc_redist_dir@
+@@ -483,9 +491,7 @@ uninstall-nobase_localdataSCRIPTS:
+ $(am__nobase_strip_setup); \
+ files=`$(am__nobase_strip) \
+ -e 'h;s,.*/,,;$(transform);x;s|[^/]*$$||;G;s,\n,,'`; \
+- test -n "$$list" || exit 0; \
+- echo " ( cd '$(DESTDIR)$(localdatadir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(localdatadir)" && rm -f $$files
++ dir='$(DESTDIR)$(localdatadir)'; $(am__uninstall_files_from_dir)
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -512,9 +518,7 @@ uninstall-nobase_dist_localdataDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(nobase_dist_localdata_DATA)'; test -n "$(localdatadir)" || list=; \
+ $(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \
+- test -n "$$files" || exit 0; \
+- echo " ( cd '$(DESTDIR)$(localdatadir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(localdatadir)" && rm -f $$files
++ dir='$(DESTDIR)$(localdatadir)'; $(am__uninstall_files_from_dir)
+ tags: TAGS
+ TAGS:
+
+@@ -569,10 +573,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
diff --git a/src/Makefile.in b/src/Makefile.in
-index e1cc728..2b0b05b 100644
+index e1cc728..d656e74 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
@@ -109,6 +109,7 @@ CURL_LIBS = @CURL_LIBS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
@@ -17111,11 +20189,57 @@ index e1cc728..2b0b05b 100644
all: all-recursive
.SUFFIXES:
+@@ -497,10 +499,15 @@ install-am: all-am
+
+ installcheck: installcheck-recursive
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
diff --git a/src/couchdb/Makefile.in b/src/couchdb/Makefile.in
-index 3db2b7f..1e3d210 100644
+index 3db2b7f..b1ceb4b 100644
--- a/src/couchdb/Makefile.in
+++ b/src/couchdb/Makefile.in
-@@ -135,6 +135,7 @@ CURL_LIBS = @CURL_LIBS@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -79,6 +79,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(couchebindir)" \
+ "$(DESTDIR)$(couchincludedir)"
+ DATA = $(couchebin_DATA) $(couchinclude_DATA)
+@@ -135,6 +141,7 @@ CURL_LIBS = @CURL_LIBS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -17123,7 +20247,7 @@ index 3db2b7f..1e3d210 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -175,6 +176,7 @@ LIPO = @LIPO@
+@@ -175,6 +182,7 @@ LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -17131,7 +20255,7 @@ index 3db2b7f..1e3d210 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -200,6 +202,7 @@ abs_builddir = @abs_builddir@
+@@ -200,6 +208,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -17139,7 +20263,7 @@ index 3db2b7f..1e3d210 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
-@@ -244,7 +247,6 @@ localstatedir = @localstatedir@
+@@ -244,7 +253,6 @@ localstatedir = @localstatedir@
localstatelibdir = @localstatelibdir@
localstatelogdir = @localstatelogdir@
localstaterundir = @localstaterundir@
@@ -17147,11 +20271,79 @@ index 3db2b7f..1e3d210 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
msvc_redist_dir = @msvc_redist_dir@
+@@ -457,9 +465,7 @@ uninstall-couchebinDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(couchebin_DATA)'; test -n "$(couchebindir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+- test -n "$$files" || exit 0; \
+- echo " ( cd '$(DESTDIR)$(couchebindir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(couchebindir)" && rm -f $$files
++ dir='$(DESTDIR)$(couchebindir)'; $(am__uninstall_files_from_dir)
+ install-couchincludeDATA: $(couchinclude_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(couchincludedir)" || $(MKDIR_P) "$(DESTDIR)$(couchincludedir)"
+@@ -477,9 +483,7 @@ uninstall-couchincludeDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(couchinclude_DATA)'; test -n "$(couchincludedir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+- test -n "$$files" || exit 0; \
+- echo " ( cd '$(DESTDIR)$(couchincludedir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(couchincludedir)" && rm -f $$files
++ dir='$(DESTDIR)$(couchincludedir)'; $(am__uninstall_files_from_dir)
+
+ # This directory's subdirectories are mostly independent; you can cd
+ # into them and run `make' without going through this Makefile.
+@@ -692,10 +696,15 @@ install-am: all-am
+
+ installcheck: installcheck-recursive
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
diff --git a/src/couchdb/priv/Makefile.in b/src/couchdb/priv/Makefile.in
-index abccac8..9986f70 100644
+index a5551a2..19d2484 100644
--- a/src/couchdb/priv/Makefile.in
+++ b/src/couchdb/priv/Makefile.in
-@@ -142,6 +142,7 @@ CURL_LIBS = @CURL_LIBS@
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -74,6 +74,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
+ am__base_list = \
+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++am__uninstall_files_from_dir = { \
++ test -z "$$files" \
++ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
++ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
++ $(am__cd) "$$dir" && rm -f $$files; }; \
++ }
+ am__installdirs = "$(DESTDIR)$(couchprivlibdir)" \
+ "$(DESTDIR)$(couchprivdir)" "$(DESTDIR)$(locallibbindir)" \
+ "$(DESTDIR)$(couchprivdir)"
+@@ -142,6 +148,7 @@ CURL_LIBS = @CURL_LIBS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -17159,7 +20351,7 @@ index abccac8..9986f70 100644
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
-@@ -182,6 +183,7 @@ LIPO = @LIPO@
+@@ -182,6 +189,7 @@ LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
@@ -17167,7 +20359,7 @@ index abccac8..9986f70 100644
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-@@ -207,6 +209,7 @@ abs_builddir = @abs_builddir@
+@@ -207,6 +215,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
@@ -17175,7 +20367,7 @@ index abccac8..9986f70 100644
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
-@@ -251,7 +254,6 @@ localstatedir = @localstatedir@
+@@ -251,7 +260,6 @@ localstatedir = @localstatedir@
localstatelibdir = @localstatelibdir@
localstatelogdir = @localstatelogdir@
localstaterundir = @localstaterundir@
@@ -17183,10 +20375,76 @@ index abccac8..9986f70 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
msvc_redist_dir = @msvc_redist_dir@
+@@ -376,7 +384,7 @@ clean-couchprivlibLTLIBRARIES:
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+-couch_icu_driver.la: $(couch_icu_driver_la_OBJECTS) $(couch_icu_driver_la_DEPENDENCIES)
++couch_icu_driver.la: $(couch_icu_driver_la_OBJECTS) $(couch_icu_driver_la_DEPENDENCIES) $(EXTRA_couch_icu_driver_la_DEPENDENCIES)
+ $(couch_icu_driver_la_LINK) -rpath $(couchprivlibdir) $(couch_icu_driver_la_OBJECTS) $(couch_icu_driver_la_LIBADD) $(LIBS)
+ install-couchprivPROGRAMS: $(couchpriv_PROGRAMS)
+ @$(NORMAL_INSTALL)
+@@ -464,10 +472,10 @@ clean-locallibbinPROGRAMS:
+ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+ echo " rm -f" $$list; \
+ rm -f $$list
+-couchjs$(EXEEXT): $(couchjs_OBJECTS) $(couchjs_DEPENDENCIES)
++couchjs$(EXEEXT): $(couchjs_OBJECTS) $(couchjs_DEPENDENCIES) $(EXTRA_couchjs_DEPENDENCIES)
+ @rm -f couchjs$(EXEEXT)
+ $(couchjs_LINK) $(couchjs_OBJECTS) $(couchjs_LDADD) $(LIBS)
+- at WINDOWS_TRUE@couchspawnkillable$(EXEEXT): $(couchspawnkillable_OBJECTS) $(couchspawnkillable_DEPENDENCIES)
++ at WINDOWS_TRUE@couchspawnkillable$(EXEEXT): $(couchspawnkillable_OBJECTS) $(couchspawnkillable_DEPENDENCIES) $(EXTRA_couchspawnkillable_DEPENDENCIES)
+ @WINDOWS_TRUE@ @rm -f couchspawnkillable$(EXEEXT)
+ @WINDOWS_TRUE@ $(LINK) $(couchspawnkillable_OBJECTS) $(couchspawnkillable_LDADD) $(LIBS)
+
+@@ -589,9 +597,7 @@ uninstall-couchprivDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(couchpriv_DATA)'; test -n "$(couchprivdir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+- test -n "$$files" || exit 0; \
+- echo " ( cd '$(DESTDIR)$(couchprivdir)' && rm -f" $$files ")"; \
+- cd "$(DESTDIR)$(couchprivdir)" && rm -f $$files
++ dir='$(DESTDIR)$(couchprivdir)'; $(am__uninstall_files_from_dir)
+
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+@@ -692,10 +698,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
diff --git a/test/Makefile.in b/test/Makefile.in
-index 1839a14..2971d60 100644
+index 1839a14..26d11c0 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
@@ -109,6 +109,7 @@ CURL_LIBS = @CURL_LIBS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
@@ -17219,10 +20477,43 @@ index 1839a14..2971d60 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
msvc_redist_dir = @msvc_redist_dir@
+@@ -497,10 +499,15 @@ install-am: all-am
+
+ installcheck: installcheck-recursive
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
diff --git a/test/bench/Makefile.in b/test/bench/Makefile.in
-index eefad42..41638f5 100644
+index eefad42..3c9b3b8 100644
--- a/test/bench/Makefile.in
+++ b/test/bench/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
@@ -71,6 +71,7 @@ CURL_LIBS = @CURL_LIBS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
@@ -17255,10 +20546,43 @@ index eefad42..41638f5 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
msvc_redist_dir = @msvc_redist_dir@
+@@ -303,10 +305,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
diff --git a/test/etap/Makefile.in b/test/etap/Makefile.in
-index 87b6d7e..05bad91 100644
+index 306e1e0..ef92fa3 100644
--- a/test/etap/Makefile.in
+++ b/test/etap/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
@@ -74,6 +74,7 @@ CURL_LIBS = @CURL_LIBS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
@@ -17291,10 +20615,43 @@ index 87b6d7e..05bad91 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
msvc_redist_dir = @msvc_redist_dir@
+@@ -355,10 +357,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
diff --git a/test/javascript/Makefile.in b/test/javascript/Makefile.in
-index a9afc76..847bcb5 100644
+index a9afc76..b4184a2 100644
--- a/test/javascript/Makefile.in
+++ b/test/javascript/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
@@ -71,6 +71,7 @@ CURL_LIBS = @CURL_LIBS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
@@ -17327,10 +20684,43 @@ index a9afc76..847bcb5 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
msvc_redist_dir = @msvc_redist_dir@
+@@ -307,10 +309,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
diff --git a/test/view_server/Makefile.in b/test/view_server/Makefile.in
-index 2c44f55..0dec0b6 100644
+index 2c44f55..a87a85e 100644
--- a/test/view_server/Makefile.in
+++ b/test/view_server/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
@@ -69,6 +69,7 @@ CURL_LIBS = @CURL_LIBS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
@@ -17363,10 +20753,43 @@ index 2c44f55..0dec0b6 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
msvc_redist_dir = @msvc_redist_dir@
+@@ -302,10 +304,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
diff --git a/utils/Makefile.in b/utils/Makefile.in
-index 223f53c..084d4e8 100644
+index 223f53c..e40780d 100644
--- a/utils/Makefile.in
+++ b/utils/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
@@ -71,6 +71,7 @@ CURL_LIBS = @CURL_LIBS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
@@ -17399,10 +20822,43 @@ index 223f53c..084d4e8 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
msvc_redist_dir = @msvc_redist_dir@
+@@ -303,10 +305,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
diff --git a/var/Makefile.in b/var/Makefile.in
-index 8602c44..1a3b7aa 100644
+index 8602c44..cad1a0c 100644
--- a/var/Makefile.in
+++ b/var/Makefile.in
+@@ -1,9 +1,9 @@
+-# Makefile.in generated by automake 1.11.1 from Makefile.am.
++# Makefile.in generated by automake 1.11.3 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
++# Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
@@ -69,6 +69,7 @@ CURL_LIBS = @CURL_LIBS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
@@ -17435,6 +20891,26 @@ index 8602c44..1a3b7aa 100644
mandir = @mandir@
mkdir_p = @mkdir_p@
msvc_redist_dir = @msvc_redist_dir@
+@@ -298,10 +300,15 @@ install-am: all-am
+
+ installcheck: installcheck-am
+ install-strip:
+- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+- `test -z '$(STRIP)' || \
+- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++ if test -z '$(STRIP)'; then \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ install; \
++ else \
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
++ fi
+ mostlyclean-generic:
+
+ clean-generic:
--
-1.7.6
+1.7.8.3
diff --git a/couchdb.spec b/couchdb.spec
index 8c4a26f..f58cadc 100644
--- a/couchdb.spec
+++ b/couchdb.spec
@@ -4,17 +4,18 @@
Name: couchdb
Version: 1.0.3
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: A document database server, accessible via a RESTful JSON API
Group: Applications/Databases
License: ASL 2.0
URL: http://couchdb.apache.org/
Source0: http://www.apache.org/dist/%{name}/%{version}/apache-%{name}-%{version}.tar.gz
-Source1: %{name}.service
+Source1: %{name}.init
+Source2: %{name}.service
Patch1: couchdb-0001-Do-not-gzip-doc-files-and-do-not-install-installatio.patch
Patch2: couchdb-0002-Install-docs-into-versioned-directory.patch
-#Patch3: couchdb-0003-More-directories-to-search-for-place-for-init-script.patch
+Patch3: couchdb-0003-More-directories-to-search-for-place-for-init-script.patch
Patch4: couchdb-0004-Install-into-erllibdir-by-default.patch
Patch5: couchdb-0005-Don-t-use-bundled-etap-erlang-oauth-ibrowse-and-moch.patch
Patch6: couchdb-0006-Fixes-for-system-wide-ibrowse.patch
@@ -57,12 +58,14 @@ Requires: erlang-stdlib
Requires: erlang-tools
#Initscripts
-#Requires(post): chkconfig
-#Requires(preun): chkconfig initscripts
+%if 0%{?fc17}%{?fc18}
Requires(post): systemd-units
Requires(preun): systemd-units
Requires(postun): systemd-units
-
+%else
+Requires(post): chkconfig
+Requires(preun): chkconfig initscripts
+%endif
# Users and groups
Requires(pre): shadow-utils
@@ -81,7 +84,7 @@ JavaScript acting as the default view definition language.
%setup -q -n apache-%{name}-%{version}
%patch1 -p1 -b .dont_gzip
%patch2 -p1 -b .use_versioned_docdir
-#%patch3 -p1 -b .more_init_dirs
+%patch3 -p1 -b .more_init_dirs
%patch4 -p1 -b .install_into_erldir
%patch5 -p1 -b .remove_bundled_libs
%patch6 -p1 -b .workaround_for_system_wide_ibrowse
@@ -92,7 +95,7 @@ JavaScript acting as the default view definition language.
# Old CURL library
%patch10 -p1 -b .curl_7_15
%endif
-%if 0%{?fc15}%{?fc16}
+%if 0%{?fc15}%{?fc16}%{?fc17}%{?fc18}
# JS 1.8.5
%patch11 -p1 -b .to_new_js
%endif
@@ -125,14 +128,18 @@ rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# Install our custom couchdb initscript
-install -D -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_unitdir}/%{name}.service
+%if 0%{?fc17}%{?fc18}
+install -D -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_unitdir}/%{name}.service
rm -rf $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/
+%else
+install -D -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/%{name}
+%endif
# Use /etc/sysconfig instead of /etc/default
mv $RPM_BUILD_ROOT%{_sysconfdir}/{default,sysconfig}
# create /etc/tmpfiles.d entry
-%if 0%{?fc15}%{?fc16}
+%if 0%{?fc15}%{?fc16}%{?fc17}%{?fc18}
install -d $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d
echo "d /var/run/couchdb 0755 %{couchdb_user} root" > $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d/%{name}.conf
%endif
@@ -155,33 +162,42 @@ exit 0
%post
-#/sbin/chkconfig --add couchdb
+%if 0%{?fc17}%{?fc18}
if [ $1 -eq 1 ] ; then
# Initial installation
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
fi
+%else
+/sbin/chkconfig --add couchdb
+%endif
%preun
-#if [ $1 = 0 ] ; then
-# /sbin/service couchdb stop >/dev/null 2>&1
-# /sbin/chkconfig --del couchdb
-#fi
+%if 0%{?fc17}%{?fc18}
if [ $1 -eq 0 ] ; then
# Package removal, not upgrade
/bin/systemctl --no-reload disable couchdb.service > /dev/null 2>&1 || :
/bin/systemctl stop couchdb.service > /dev/null 2>&1 || :
fi
+%else
+if [ $1 = 0 ] ; then
+ /sbin/service couchdb stop >/dev/null 2>&1
+ /sbin/chkconfig --del couchdb
+fi
+%endif
%postun
+%if 0%{?fc17}%{?fc18}
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
if [ $1 -ge 1 ] ; then
# Package upgrade, not uninstall
/bin/systemctl try-restart couchdb.service >/dev/null 2>&1 || :
fi
+%endif
+%if 0%{?fc17}%{?fc18}
%triggerun -- couchdb < 1.0.3-5
# Save the current service runlevel info
# User must manually run systemd-sysv-convert --apply httpd
@@ -191,6 +207,7 @@ fi
# Run these because the SysV package being removed won't do them
/sbin/chkconfig --del couchdb >/dev/null 2>&1 || :
/bin/systemctl try-restart couchdb.service >/dev/null 2>&1 || :
+%endif
@@ -204,10 +221,14 @@ fi
%config(noreplace) %attr(0644, %{couchdb_user}, root) %{_sysconfdir}/%{name}/local.ini
%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
-%if 0%{?fc15}%{?fc16}
+%if 0%{?fc15}%{?fc16}%{?fc17}%{?fc18}
%{_sysconfdir}/tmpfiles.d/%{name}.conf
%endif
+%if 0%{?fc17}%{?fc18}
%{_unitdir}/%{name}.service
+%else
+%{_initrddir}/%{name}
+%endif
%{_bindir}/%{name}
%{_bindir}/couchjs
%{_libdir}/erlang/lib/couch-%{version}
@@ -220,6 +241,9 @@ fi
%changelog
+* Sun Mar 11 2012 Peter Lemenkov <lemenkov at gmail.com> - 1.0.3-6
+- Fix building on f18
+
* Wed Feb 15 2012 Jon Ciesla <limburgher at gmail.com> - 1.0.3-5
- Migrate to systemd, BZ 771434.
More information about the scm-commits
mailing list